diff --git a/bin/generate-docs.js b/bin/generate-docs.js
index d62f19c77..560828d57 100644
--- a/bin/generate-docs.js
+++ b/bin/generate-docs.js
@@ -207,7 +207,7 @@ function createDeleteExample(serviceName, resourceName, resourceData, thisSchema
 ${sqlCodeBlockStart}
 /*+ delete */
 DELETE FROM ${providerName}.${serviceName}.${resourceName}
-WHERE Identifier = '<${resourceData['x-identifiers'].join('|')}>'
+WHERE Identifier = '${resourceData['x-identifiers'].map(id => `{{ ${toSnakeCase(fixCamelCaseIssues(id))} }}`).join('|')}'
 AND region = 'us-east-1';
 ${codeBlockEnd}
 `;
@@ -230,7 +230,7 @@ function createUpdateExample(serviceName, resourceName, resourceData, thisSchema
     }
 
     const patchFields = updatableProps.map(p => `    "${p}": ${toSnakeCase(fixCamelCaseIssues(p))}`).join(',\n');
-    const identifierValues = (resourceData['x-identifiers'] || []).map(id => `<${id}>`).join('|');
+    const identifierValues = (resourceData['x-identifiers'] || []).map(id => `{{ ${toSnakeCase(fixCamelCaseIssues(id))} }}`).join('|');
 
     return `\n## ${mdCodeAnchor}UPDATE${mdCodeAnchor} example
 
@@ -320,14 +320,15 @@ function createInsertExample(serviceName, resourceName, resourceData, thisSchema
     
     function templateObjectValues(obj) {
         const templatedObj = JSON.parse(JSON.stringify(obj), (key, value) => {
+            const snakeKey = key ? toSnakeCase(fixCamelCaseIssues(key)) : key;
             if (typeof value === 'string') {
-                return `{{ ${key} }}`;
+                return `{{ ${snakeKey} }}`;
             }
             if (typeof value === 'boolean' || typeof value === 'number') {
-                return `{{ ${key} }}`;
+                return `{{ ${snakeKey} }}`;
             }
             if (Array.isArray(value) && value.length > 0 && typeof value[0] === 'string') {
-                return [`{{ ${key}[0] }}`];
+                return [`{{ ${snakeKey}[0] }}`];
             }
             return value;
         });
@@ -350,13 +351,13 @@ function createInsertExample(serviceName, resourceName, resourceData, thisSchema
 
       function transformDataToResource(templateData, resourceName, isRoot = true) {
         if (!templateData) return null;
-    
+
         if (isRoot) {
             // If it's the root object, return a structured resource
             return {
                 name: `${pluralize.singular(resourceName)}`,
                 props: Object.entries(templateData).map(([key, value]) => ({
-                    name: key,
+                    name: toSnakeCase(fixCamelCaseIssues(key)),
                     value: transformDataToResource(value, resourceName, false)
                 }))
             };
@@ -367,7 +368,7 @@ function createInsertExample(serviceName, resourceName, resourceData, thisSchema
             // For object values, recursively call transformation for each property
             const transformedObject = {};
             for (const [key, value] of Object.entries(templateData)) {
-                transformedObject[key] = transformDataToResource(value, resourceName, false);
+                transformedObject[toSnakeCase(fixCamelCaseIssues(key))] = transformDataToResource(value, resourceName, false);
             }
             return transformedObject;
         } else {
@@ -378,6 +379,11 @@ function createInsertExample(serviceName, resourceName, resourceData, thisSchema
 
     templateObject.resources.push(transformDataToResource(templateObjectValues(resolveType(thisSchema, false)), resourceName));
 
+    const requiredKeys = getObjectDetails(resolveType(thisSchema, true), 'keys');
+    const allKeys = getObjectDetails(resolveType(thisSchema, false), 'keys');
+    const requiredSnakeKeys = requiredKeys.map(k => toSnakeCase(fixCamelCaseIssues(k)));
+    const allSnakeKeys = allKeys.map(k => toSnakeCase(fixCamelCaseIssues(k)));
+
     return `\n## ${mdCodeAnchor}INSERT${mdCodeAnchor} example
 
 Use the following StackQL query and manifest file to create a new <code>${pluralize.singular(resourceName)}</code> resource, using [__${mdCodeAnchor}stack-deploy${mdCodeAnchor}__](https://pypi.org/project/stack-deploy/).
@@ -395,11 +401,11 @@ Use the following StackQL query and manifest file to create a new <code>${plural
 ${sqlCodeBlockStart}
 /*+ create */
 INSERT INTO ${providerName}.${serviceName}.${resourceName} (
- ${getObjectDetails(resolveType(thisSchema, true), 'keys').join(",\n ")},
+ ${requiredKeys.join(",\n ")},
  region
 )
-SELECT 
-'{{ ${getObjectDetails(resolveType(thisSchema, true), 'keys').join(" }}',\n '{{ ")} }}',
+SELECT
+'{{ ${requiredSnakeKeys.join(" }}',\n '{{ ")} }}',
 '{{ region }}';
 ${codeBlockEnd}
 </TabItem>
@@ -408,18 +414,18 @@ ${codeBlockEnd}
 ${sqlCodeBlockStart}
 /*+ create */
 INSERT INTO ${providerName}.${serviceName}.${resourceName} (
- ${getObjectDetails(resolveType(thisSchema, false), 'keys').join(",\n ")},
+ ${allKeys.join(",\n ")},
  region
 )
-SELECT 
- '{{ ${getObjectDetails(resolveType(thisSchema, false), 'keys').join(" }}',\n '{{ ")} }}',
+SELECT
+ '{{ ${allSnakeKeys.join(" }}',\n '{{ ")} }}',
  '{{ region }}';
 ${codeBlockEnd}
 </TabItem>
 <TabItem value="manifest">
 
 ${yamlCodeBlockStart}
-${yaml.dump(templateObject)}
+${yaml.dump(templateObject, { lineWidth: -1 }).trimEnd()}
 ${codeBlockEnd}
 </TabItem>
 </Tabs>`;
@@ -454,8 +460,7 @@ function createResourceIndexContent(serviceName, resourceName, resourceType, res
     const sqlExampleSelect = `SELECT`;
     const sqlExampleFrom = `FROM ${providerName}.${serviceName}.${resourceName}`;
 
-    const globalServices = ['iam', 'route53', 'cloudfront', 'wafv2', 'shield', 'globalaccelerator'];
-    sqlExampleWhere = globalServices.includes(serviceName) ? "" : "WHERE region = 'us-east-1'";
+    sqlExampleWhere = "WHERE region = 'us-east-1'";
   
     let fields = resourceIdentifiers;
 
@@ -664,11 +669,11 @@ ${tabItems}
             });
         }
 
-        const identifierValues = resourceIdentifiers.map(id => `<${id}>`).join('|');
+        const identifierValues = resourceIdentifiers.map(id => `{{ ${toSnakeCase(fixCamelCaseIssues(id))} }}`).join('|');
         const identifierClause = `Identifier = '${identifierValues}'`;
 
         sqlExampleListWhere = `${sqlExampleWhere};`;
-        globalServices.includes(serviceName) ? sqlExampleGetWhere = `WHERE ${identifierClause};`: sqlExampleGetWhere = `${sqlExampleWhere} AND ${identifierClause};`;
+        sqlExampleGetWhere = `${sqlExampleWhere} AND ${identifierClause};`;
 
     }
    
diff --git a/website/docs/services/accessanalyzer/analyzers/index.md b/website/docs/services/accessanalyzer/analyzers/index.md
index e025b4e29..76c866714 100644
--- a/website/docs/services/accessanalyzer/analyzers/index.md
+++ b/website/docs/services/accessanalyzer/analyzers/index.md
@@ -260,7 +260,7 @@ tags,
 type,
 analyzer_configuration
 FROM awscc.accessanalyzer.analyzers
-WHERE region = 'us-east-1' AND Identifier = '<Arn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -296,8 +296,8 @@ INSERT INTO awscc.accessanalyzer.analyzers (
  Type,
  region
 )
-SELECT 
-'{{ Type }}',
+SELECT
+'{{ type }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -313,12 +313,12 @@ INSERT INTO awscc.accessanalyzer.analyzers (
  AnalyzerConfiguration,
  region
 )
-SELECT 
- '{{ AnalyzerName }}',
- '{{ ArchiveRules }}',
- '{{ Tags }}',
- '{{ Type }}',
- '{{ AnalyzerConfiguration }}',
+SELECT
+ '{{ analyzer_name }}',
+ '{{ archive_rules }}',
+ '{{ tags }}',
+ '{{ type }}',
+ '{{ analyzer_configuration }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -336,46 +336,45 @@ globals:
 resources:
   - name: analyzer
     props:
-      - name: AnalyzerName
-        value: '{{ AnalyzerName }}'
-      - name: ArchiveRules
+      - name: analyzer_name
+        value: '{{ analyzer_name }}'
+      - name: archive_rules
         value:
-          - Filter:
-              - Contains:
-                  - '{{ Contains[0] }}'
-                Eq:
-                  - '{{ Eq[0] }}'
-                Exists: '{{ Exists }}'
-                Property: '{{ Property }}'
-                Neq:
-                  - '{{ Neq[0] }}'
-            RuleName: '{{ RuleName }}'
-      - name: Tags
+          - filter:
+              - contains:
+                  - '{{ contains[0] }}'
+                eq:
+                  - '{{ eq[0] }}'
+                exists: '{{ exists }}'
+                property: '{{ property }}'
+                neq:
+                  - '{{ neq[0] }}'
+            rule_name: '{{ rule_name }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-      - name: Type
-        value: '{{ Type }}'
-      - name: AnalyzerConfiguration
+          - key: '{{ key }}'
+            value: '{{ value }}'
+      - name: type
+        value: '{{ type }}'
+      - name: analyzer_configuration
         value:
-          UnusedAccessConfiguration:
-            UnusedAccessAge: '{{ UnusedAccessAge }}'
-            AnalysisRule:
-              Exclusions:
-                - AccountIds:
-                    - '{{ AccountIds[0] }}'
-                  ResourceTags:
+          unused_access_configuration:
+            unused_access_age: '{{ unused_access_age }}'
+            analysis_rule:
+              exclusions:
+                - account_ids:
+                    - '{{ account_ids[0] }}'
+                  resource_tags:
                     - - null
-          InternalAccessConfiguration:
-            InternalAccessAnalysisRule:
-              Inclusions:
-                - AccountIds:
-                    - '{{ AccountIds[0] }}'
-                  ResourceArns:
-                    - '{{ ResourceArns[0] }}'
-                  ResourceTypes:
-                    - '{{ ResourceTypes[0] }}'
-
+          internal_access_configuration:
+            internal_access_analysis_rule:
+              inclusions:
+                - account_ids:
+                    - '{{ account_ids[0] }}'
+                  resource_arns:
+                    - '{{ resource_arns[0] }}'
+                  resource_types:
+                    - '{{ resource_types[0] }}'
 ```
 </TabItem>
 </Tabs>
@@ -393,7 +392,7 @@ SET PatchDocument = string('{{ {
     "AnalyzerConfiguration": analyzer_configuration
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Arn>';
+AND Identifier = '{{ arn }}';
 ```
 
 
@@ -402,7 +401,7 @@ AND Identifier = '<Arn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.accessanalyzer.analyzers
-WHERE Identifier = '<Arn>'
+WHERE Identifier = '{{ arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/acmpca/certificate_authorities/index.md b/website/docs/services/acmpca/certificate_authorities/index.md
index aff453668..9d8fe842e 100644
--- a/website/docs/services/acmpca/certificate_authorities/index.md
+++ b/website/docs/services/acmpca/certificate_authorities/index.md
@@ -488,7 +488,7 @@ csr_extensions,
 key_storage_security_standard,
 usage_mode
 FROM awscc.acmpca.certificate_authorities
-WHERE region = 'us-east-1' AND Identifier = '<Arn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -527,11 +527,11 @@ INSERT INTO awscc.acmpca.certificate_authorities (
  Subject,
  region
 )
-SELECT 
-'{{ Type }}',
- '{{ KeyAlgorithm }}',
- '{{ SigningAlgorithm }}',
- '{{ Subject }}',
+SELECT
+'{{ type }}',
+ '{{ key_algorithm }}',
+ '{{ signing_algorithm }}',
+ '{{ subject }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -551,16 +551,16 @@ INSERT INTO awscc.acmpca.certificate_authorities (
  UsageMode,
  region
 )
-SELECT 
- '{{ Type }}',
- '{{ KeyAlgorithm }}',
- '{{ SigningAlgorithm }}',
- '{{ Subject }}',
- '{{ RevocationConfiguration }}',
- '{{ Tags }}',
- '{{ CsrExtensions }}',
- '{{ KeyStorageSecurityStandard }}',
- '{{ UsageMode }}',
+SELECT
+ '{{ type }}',
+ '{{ key_algorithm }}',
+ '{{ signing_algorithm }}',
+ '{{ subject }}',
+ '{{ revocation_configuration }}',
+ '{{ tags }}',
+ '{{ csr_extensions }}',
+ '{{ key_storage_security_standard }}',
+ '{{ usage_mode }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -578,84 +578,83 @@ globals:
 resources:
   - name: certificate_authority
     props:
-      - name: Type
-        value: '{{ Type }}'
-      - name: KeyAlgorithm
-        value: '{{ KeyAlgorithm }}'
-      - name: SigningAlgorithm
-        value: '{{ SigningAlgorithm }}'
-      - name: Subject
+      - name: type
+        value: '{{ type }}'
+      - name: key_algorithm
+        value: '{{ key_algorithm }}'
+      - name: signing_algorithm
+        value: '{{ signing_algorithm }}'
+      - name: subject
         value:
-          Country: '{{ Country }}'
-          Organization: '{{ Organization }}'
-          OrganizationalUnit: '{{ OrganizationalUnit }}'
-          DistinguishedNameQualifier: '{{ DistinguishedNameQualifier }}'
-          State: '{{ State }}'
-          CommonName: '{{ CommonName }}'
-          SerialNumber: '{{ SerialNumber }}'
-          Locality: '{{ Locality }}'
-          Title: '{{ Title }}'
-          Surname: '{{ Surname }}'
-          GivenName: '{{ GivenName }}'
-          Initials: '{{ Initials }}'
-          Pseudonym: '{{ Pseudonym }}'
-          GenerationQualifier: '{{ GenerationQualifier }}'
-          CustomAttributes:
-            - ObjectIdentifier: '{{ ObjectIdentifier }}'
-              Value: '{{ Value }}'
-      - name: RevocationConfiguration
+          country: '{{ country }}'
+          organization: '{{ organization }}'
+          organizational_unit: '{{ organizational_unit }}'
+          distinguished_name_qualifier: '{{ distinguished_name_qualifier }}'
+          state: '{{ state }}'
+          common_name: '{{ common_name }}'
+          serial_number: '{{ serial_number }}'
+          locality: '{{ locality }}'
+          title: '{{ title }}'
+          surname: '{{ surname }}'
+          given_name: '{{ given_name }}'
+          initials: '{{ initials }}'
+          pseudonym: '{{ pseudonym }}'
+          generation_qualifier: '{{ generation_qualifier }}'
+          custom_attributes:
+            - object_identifier: '{{ object_identifier }}'
+              value: '{{ value }}'
+      - name: revocation_configuration
         value:
-          CrlConfiguration:
-            Enabled: '{{ Enabled }}'
-            ExpirationInDays: '{{ ExpirationInDays }}'
-            CustomCname: '{{ CustomCname }}'
-            S3BucketName: '{{ S3BucketName }}'
-            S3ObjectAcl: '{{ S3ObjectAcl }}'
-            CrlDistributionPointExtensionConfiguration:
-              OmitExtension: '{{ OmitExtension }}'
-            CrlType: '{{ CrlType }}'
-            CustomPath: '{{ CustomPath }}'
-          OcspConfiguration:
-            Enabled: '{{ Enabled }}'
-            OcspCustomCname: '{{ OcspCustomCname }}'
-      - name: Tags
+          crl_configuration:
+            enabled: '{{ enabled }}'
+            expiration_in_days: '{{ expiration_in_days }}'
+            custom_cname: '{{ custom_cname }}'
+            s3_bucket_name: '{{ s3_bucket_name }}'
+            s3_object_acl: '{{ s3_object_acl }}'
+            crl_distribution_point_extension_configuration:
+              omit_extension: '{{ omit_extension }}'
+            crl_type: '{{ crl_type }}'
+            custom_path: '{{ custom_path }}'
+          ocsp_configuration:
+            enabled: '{{ enabled }}'
+            ocsp_custom_cname: '{{ ocsp_custom_cname }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-      - name: CsrExtensions
+          - key: '{{ key }}'
+            value: '{{ value }}'
+      - name: csr_extensions
         value:
-          KeyUsage:
-            DigitalSignature: '{{ DigitalSignature }}'
-            NonRepudiation: '{{ NonRepudiation }}'
-            KeyEncipherment: '{{ KeyEncipherment }}'
-            DataEncipherment: '{{ DataEncipherment }}'
-            KeyAgreement: '{{ KeyAgreement }}'
-            KeyCertSign: '{{ KeyCertSign }}'
-            CRLSign: '{{ CRLSign }}'
-            EncipherOnly: '{{ EncipherOnly }}'
-            DecipherOnly: '{{ DecipherOnly }}'
-          SubjectInformationAccess:
-            - AccessMethod:
-                CustomObjectIdentifier: null
-                AccessMethodType: '{{ AccessMethodType }}'
-              AccessLocation:
-                OtherName:
-                  TypeId: null
-                  Value: '{{ Value }}'
-                Rfc822Name: '{{ Rfc822Name }}'
-                DnsName: '{{ DnsName }}'
-                DirectoryName: null
-                EdiPartyName:
-                  PartyName: '{{ PartyName }}'
-                  NameAssigner: '{{ NameAssigner }}'
-                UniformResourceIdentifier: '{{ UniformResourceIdentifier }}'
-                IpAddress: '{{ IpAddress }}'
-                RegisteredId: null
-      - name: KeyStorageSecurityStandard
-        value: '{{ KeyStorageSecurityStandard }}'
-      - name: UsageMode
-        value: '{{ UsageMode }}'
-
+          key_usage:
+            digital_signature: '{{ digital_signature }}'
+            non_repudiation: '{{ non_repudiation }}'
+            key_encipherment: '{{ key_encipherment }}'
+            data_encipherment: '{{ data_encipherment }}'
+            key_agreement: '{{ key_agreement }}'
+            key_cert_sign: '{{ key_cert_sign }}'
+            c_rl_sign: '{{ c_rl_sign }}'
+            encipher_only: '{{ encipher_only }}'
+            decipher_only: '{{ decipher_only }}'
+          subject_information_access:
+            - access_method:
+                custom_object_identifier: null
+                access_method_type: '{{ access_method_type }}'
+              access_location:
+                other_name:
+                  type_id: null
+                  value: '{{ value }}'
+                rfc822_name: '{{ rfc822_name }}'
+                dns_name: '{{ dns_name }}'
+                directory_name: null
+                edi_party_name:
+                  party_name: '{{ party_name }}'
+                  name_assigner: '{{ name_assigner }}'
+                uniform_resource_identifier: '{{ uniform_resource_identifier }}'
+                ip_address: '{{ ip_address }}'
+                registered_id: null
+      - name: key_storage_security_standard
+        value: '{{ key_storage_security_standard }}'
+      - name: usage_mode
+        value: '{{ usage_mode }}'
 ```
 </TabItem>
 </Tabs>
@@ -672,7 +671,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Arn>';
+AND Identifier = '{{ arn }}';
 ```
 
 
@@ -681,7 +680,7 @@ AND Identifier = '<Arn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.acmpca.certificate_authorities
-WHERE Identifier = '<Arn>'
+WHERE Identifier = '{{ arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/acmpca/certificate_authority_activations/index.md b/website/docs/services/acmpca/certificate_authority_activations/index.md
index 88ba7ee1d..09fa0ff31 100644
--- a/website/docs/services/acmpca/certificate_authority_activations/index.md
+++ b/website/docs/services/acmpca/certificate_authority_activations/index.md
@@ -112,7 +112,7 @@ certificate_chain,
 status,
 complete_certificate_chain
 FROM awscc.acmpca.certificate_authority_activations
-WHERE region = 'us-east-1' AND Identifier = '<CertificateAuthorityArn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ certificate_authority_arn }}';
 ```
 
 ## `INSERT` example
@@ -136,9 +136,9 @@ INSERT INTO awscc.acmpca.certificate_authority_activations (
  Certificate,
  region
 )
-SELECT 
-'{{ CertificateAuthorityArn }}',
- '{{ Certificate }}',
+SELECT
+'{{ certificate_authority_arn }}',
+ '{{ certificate }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -153,11 +153,11 @@ INSERT INTO awscc.acmpca.certificate_authority_activations (
  Status,
  region
 )
-SELECT 
- '{{ CertificateAuthorityArn }}',
- '{{ Certificate }}',
- '{{ CertificateChain }}',
- '{{ Status }}',
+SELECT
+ '{{ certificate_authority_arn }}',
+ '{{ certificate }}',
+ '{{ certificate_chain }}',
+ '{{ status }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -175,15 +175,14 @@ globals:
 resources:
   - name: certificate_authority_activation
     props:
-      - name: CertificateAuthorityArn
-        value: '{{ CertificateAuthorityArn }}'
-      - name: Certificate
-        value: '{{ Certificate }}'
-      - name: CertificateChain
-        value: '{{ CertificateChain }}'
-      - name: Status
-        value: '{{ Status }}'
-
+      - name: certificate_authority_arn
+        value: '{{ certificate_authority_arn }}'
+      - name: certificate
+        value: '{{ certificate }}'
+      - name: certificate_chain
+        value: '{{ certificate_chain }}'
+      - name: status
+        value: '{{ status }}'
 ```
 </TabItem>
 </Tabs>
@@ -201,7 +200,7 @@ SET PatchDocument = string('{{ {
     "Status": status
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<CertificateAuthorityArn>';
+AND Identifier = '{{ certificate_authority_arn }}';
 ```
 
 
@@ -210,7 +209,7 @@ AND Identifier = '<CertificateAuthorityArn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.acmpca.certificate_authority_activations
-WHERE Identifier = '<CertificateAuthorityArn>'
+WHERE Identifier = '{{ certificate_authority_arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/acmpca/certificates/index.md b/website/docs/services/acmpca/certificates/index.md
index b5fc59552..62cd19355 100644
--- a/website/docs/services/acmpca/certificates/index.md
+++ b/website/docs/services/acmpca/certificates/index.md
@@ -386,7 +386,7 @@ validity_not_before,
 certificate,
 arn
 FROM awscc.acmpca.certificates
-WHERE region = 'us-east-1' AND Identifier = '<Arn>|<CertificateAuthorityArn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ arn }}|{{ certificate_authority_arn }}';
 ```
 
 ## `INSERT` example
@@ -412,11 +412,11 @@ INSERT INTO awscc.acmpca.certificates (
  Validity,
  region
 )
-SELECT 
-'{{ CertificateAuthorityArn }}',
- '{{ CertificateSigningRequest }}',
- '{{ SigningAlgorithm }}',
- '{{ Validity }}',
+SELECT
+'{{ certificate_authority_arn }}',
+ '{{ certificate_signing_request }}',
+ '{{ signing_algorithm }}',
+ '{{ validity }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -434,14 +434,14 @@ INSERT INTO awscc.acmpca.certificates (
  ValidityNotBefore,
  region
 )
-SELECT 
- '{{ ApiPassthrough }}',
- '{{ CertificateAuthorityArn }}',
- '{{ CertificateSigningRequest }}',
- '{{ SigningAlgorithm }}',
- '{{ TemplateArn }}',
- '{{ Validity }}',
- '{{ ValidityNotBefore }}',
+SELECT
+ '{{ api_passthrough }}',
+ '{{ certificate_authority_arn }}',
+ '{{ certificate_signing_request }}',
+ '{{ signing_algorithm }}',
+ '{{ template_arn }}',
+ '{{ validity }}',
+ '{{ validity_not_before }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -459,78 +459,77 @@ globals:
 resources:
   - name: certificate
     props:
-      - name: ApiPassthrough
+      - name: api_passthrough
         value:
-          Extensions:
-            CertificatePolicies:
-              - CertPolicyId: '{{ CertPolicyId }}'
-                PolicyQualifiers:
-                  - PolicyQualifierId: '{{ PolicyQualifierId }}'
-                    Qualifier:
-                      CpsUri: '{{ CpsUri }}'
-            ExtendedKeyUsage:
-              - ExtendedKeyUsageType: '{{ ExtendedKeyUsageType }}'
-                ExtendedKeyUsageObjectIdentifier: null
-            KeyUsage:
-              DigitalSignature: '{{ DigitalSignature }}'
-              NonRepudiation: '{{ NonRepudiation }}'
-              KeyEncipherment: '{{ KeyEncipherment }}'
-              DataEncipherment: '{{ DataEncipherment }}'
-              KeyAgreement: '{{ KeyAgreement }}'
-              KeyCertSign: '{{ KeyCertSign }}'
-              CRLSign: '{{ CRLSign }}'
-              EncipherOnly: '{{ EncipherOnly }}'
-              DecipherOnly: '{{ DecipherOnly }}'
-            SubjectAlternativeNames:
-              - OtherName:
-                  TypeId: null
-                  Value: '{{ Value }}'
-                Rfc822Name: '{{ Rfc822Name }}'
-                DnsName: '{{ DnsName }}'
-                DirectoryName:
-                  Country: '{{ Country }}'
-                  Organization: '{{ Organization }}'
-                  OrganizationalUnit: '{{ OrganizationalUnit }}'
-                  DistinguishedNameQualifier: '{{ DistinguishedNameQualifier }}'
-                  State: '{{ State }}'
-                  CommonName: '{{ CommonName }}'
-                  SerialNumber: '{{ SerialNumber }}'
-                  Locality: '{{ Locality }}'
-                  Title: '{{ Title }}'
-                  Surname: '{{ Surname }}'
-                  GivenName: '{{ GivenName }}'
-                  Initials: '{{ Initials }}'
-                  Pseudonym: '{{ Pseudonym }}'
-                  GenerationQualifier: '{{ GenerationQualifier }}'
-                  CustomAttributes:
-                    - ObjectIdentifier: null
-                      Value: '{{ Value }}'
-                EdiPartyName:
-                  PartyName: '{{ PartyName }}'
-                  NameAssigner: '{{ NameAssigner }}'
-                UniformResourceIdentifier: '{{ UniformResourceIdentifier }}'
-                IpAddress: '{{ IpAddress }}'
-                RegisteredId: null
-            CustomExtensions:
-              - Critical: '{{ Critical }}'
-                ObjectIdentifier: null
-                Value: '{{ Value }}'
-          Subject: null
-      - name: CertificateAuthorityArn
-        value: '{{ CertificateAuthorityArn }}'
-      - name: CertificateSigningRequest
-        value: '{{ CertificateSigningRequest }}'
-      - name: SigningAlgorithm
-        value: '{{ SigningAlgorithm }}'
-      - name: TemplateArn
+          extensions:
+            certificate_policies:
+              - cert_policy_id: '{{ cert_policy_id }}'
+                policy_qualifiers:
+                  - policy_qualifier_id: '{{ policy_qualifier_id }}'
+                    qualifier:
+                      cps_uri: '{{ cps_uri }}'
+            extended_key_usage:
+              - extended_key_usage_type: '{{ extended_key_usage_type }}'
+                extended_key_usage_object_identifier: null
+            key_usage:
+              digital_signature: '{{ digital_signature }}'
+              non_repudiation: '{{ non_repudiation }}'
+              key_encipherment: '{{ key_encipherment }}'
+              data_encipherment: '{{ data_encipherment }}'
+              key_agreement: '{{ key_agreement }}'
+              key_cert_sign: '{{ key_cert_sign }}'
+              c_rl_sign: '{{ c_rl_sign }}'
+              encipher_only: '{{ encipher_only }}'
+              decipher_only: '{{ decipher_only }}'
+            subject_alternative_names:
+              - other_name:
+                  type_id: null
+                  value: '{{ value }}'
+                rfc822_name: '{{ rfc822_name }}'
+                dns_name: '{{ dns_name }}'
+                directory_name:
+                  country: '{{ country }}'
+                  organization: '{{ organization }}'
+                  organizational_unit: '{{ organizational_unit }}'
+                  distinguished_name_qualifier: '{{ distinguished_name_qualifier }}'
+                  state: '{{ state }}'
+                  common_name: '{{ common_name }}'
+                  serial_number: '{{ serial_number }}'
+                  locality: '{{ locality }}'
+                  title: '{{ title }}'
+                  surname: '{{ surname }}'
+                  given_name: '{{ given_name }}'
+                  initials: '{{ initials }}'
+                  pseudonym: '{{ pseudonym }}'
+                  generation_qualifier: '{{ generation_qualifier }}'
+                  custom_attributes:
+                    - object_identifier: null
+                      value: '{{ value }}'
+                edi_party_name:
+                  party_name: '{{ party_name }}'
+                  name_assigner: '{{ name_assigner }}'
+                uniform_resource_identifier: '{{ uniform_resource_identifier }}'
+                ip_address: '{{ ip_address }}'
+                registered_id: null
+            custom_extensions:
+              - critical: '{{ critical }}'
+                object_identifier: null
+                value: '{{ value }}'
+          subject: null
+      - name: certificate_authority_arn
+        value: '{{ certificate_authority_arn }}'
+      - name: certificate_signing_request
+        value: '{{ certificate_signing_request }}'
+      - name: signing_algorithm
+        value: '{{ signing_algorithm }}'
+      - name: template_arn
         value: null
-      - name: Validity
+      - name: validity
         value:
-          Value: null
-          Type: '{{ Type }}'
-      - name: ValidityNotBefore
+          value: null
+          type: '{{ type }}'
+      - name: validity_not_before
         value: null
-
 ```
 </TabItem>
 </Tabs>
@@ -541,7 +540,7 @@ resources:
 ```sql
 /*+ delete */
 DELETE FROM awscc.acmpca.certificates
-WHERE Identifier = '<Arn|CertificateAuthorityArn>'
+WHERE Identifier = '{{ arn }}|{{ certificate_authority_arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/acmpca/permissions/index.md b/website/docs/services/acmpca/permissions/index.md
index faec976c2..79a86df23 100644
--- a/website/docs/services/acmpca/permissions/index.md
+++ b/website/docs/services/acmpca/permissions/index.md
@@ -101,7 +101,7 @@ certificate_authority_arn,
 principal,
 source_account
 FROM awscc.acmpca.permissions
-WHERE region = 'us-east-1' AND Identifier = '<CertificateAuthorityArn>|<Principal>';
+WHERE region = 'us-east-1' AND Identifier = '{{ certificate_authority_arn }}|{{ principal }}';
 ```
 
 ## `INSERT` example
@@ -126,10 +126,10 @@ INSERT INTO awscc.acmpca.permissions (
  Principal,
  region
 )
-SELECT 
-'{{ Actions }}',
- '{{ CertificateAuthorityArn }}',
- '{{ Principal }}',
+SELECT
+'{{ actions }}',
+ '{{ certificate_authority_arn }}',
+ '{{ principal }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -144,11 +144,11 @@ INSERT INTO awscc.acmpca.permissions (
  SourceAccount,
  region
 )
-SELECT 
- '{{ Actions }}',
- '{{ CertificateAuthorityArn }}',
- '{{ Principal }}',
- '{{ SourceAccount }}',
+SELECT
+ '{{ actions }}',
+ '{{ certificate_authority_arn }}',
+ '{{ principal }}',
+ '{{ source_account }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -166,16 +166,15 @@ globals:
 resources:
   - name: permission
     props:
-      - name: Actions
+      - name: actions
         value:
-          - '{{ Actions[0] }}'
-      - name: CertificateAuthorityArn
-        value: '{{ CertificateAuthorityArn }}'
-      - name: Principal
-        value: '{{ Principal }}'
-      - name: SourceAccount
-        value: '{{ SourceAccount }}'
-
+          - '{{ actions[0] }}'
+      - name: certificate_authority_arn
+        value: '{{ certificate_authority_arn }}'
+      - name: principal
+        value: '{{ principal }}'
+      - name: source_account
+        value: '{{ source_account }}'
 ```
 </TabItem>
 </Tabs>
@@ -186,7 +185,7 @@ resources:
 ```sql
 /*+ delete */
 DELETE FROM awscc.acmpca.permissions
-WHERE Identifier = '<CertificateAuthorityArn|Principal>'
+WHERE Identifier = '{{ certificate_authority_arn }}|{{ principal }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/aiops/investigation_groups/index.md b/website/docs/services/aiops/investigation_groups/index.md
index b9ebca432..77e1c75b9 100644
--- a/website/docs/services/aiops/investigation_groups/index.md
+++ b/website/docs/services/aiops/investigation_groups/index.md
@@ -239,7 +239,7 @@ chatbot_notification_channels,
 cross_account_configurations,
 tags
 FROM awscc.aiops.investigation_groups
-WHERE region = 'us-east-1' AND Identifier = '<Arn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -275,8 +275,8 @@ INSERT INTO awscc.aiops.investigation_groups (
  Name,
  region
 )
-SELECT 
-'{{ Name }}',
+SELECT
+'{{ name }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -297,17 +297,17 @@ INSERT INTO awscc.aiops.investigation_groups (
  Tags,
  region
 )
-SELECT 
- '{{ RoleArn }}',
- '{{ Name }}',
- '{{ RetentionInDays }}',
- '{{ EncryptionConfig }}',
- '{{ InvestigationGroupPolicy }}',
- '{{ IsCloudTrailEventHistoryEnabled }}',
- '{{ TagKeyBoundaries }}',
- '{{ ChatbotNotificationChannels }}',
- '{{ CrossAccountConfigurations }}',
- '{{ Tags }}',
+SELECT
+ '{{ role_arn }}',
+ '{{ name }}',
+ '{{ retention_in_days }}',
+ '{{ encryption_config }}',
+ '{{ investigation_group_policy }}',
+ '{{ is_cloud_trail_event_history_enabled }}',
+ '{{ tag_key_boundaries }}',
+ '{{ chatbot_notification_channels }}',
+ '{{ cross_account_configurations }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -325,36 +325,35 @@ globals:
 resources:
   - name: investigation_group
     props:
-      - name: RoleArn
-        value: '{{ RoleArn }}'
-      - name: Name
-        value: '{{ Name }}'
-      - name: RetentionInDays
-        value: '{{ RetentionInDays }}'
-      - name: EncryptionConfig
+      - name: role_arn
+        value: '{{ role_arn }}'
+      - name: name
+        value: '{{ name }}'
+      - name: retention_in_days
+        value: '{{ retention_in_days }}'
+      - name: encryption_config
         value:
-          EncryptionConfigurationType: '{{ EncryptionConfigurationType }}'
-          KmsKeyId: '{{ KmsKeyId }}'
-      - name: InvestigationGroupPolicy
-        value: '{{ InvestigationGroupPolicy }}'
-      - name: IsCloudTrailEventHistoryEnabled
-        value: '{{ IsCloudTrailEventHistoryEnabled }}'
-      - name: TagKeyBoundaries
+          encryption_configuration_type: '{{ encryption_configuration_type }}'
+          kms_key_id: '{{ kms_key_id }}'
+      - name: investigation_group_policy
+        value: '{{ investigation_group_policy }}'
+      - name: is_cloud_trail_event_history_enabled
+        value: '{{ is_cloud_trail_event_history_enabled }}'
+      - name: tag_key_boundaries
         value:
-          - '{{ TagKeyBoundaries[0] }}'
-      - name: ChatbotNotificationChannels
+          - '{{ tag_key_boundaries[0] }}'
+      - name: chatbot_notification_channels
         value:
-          - SNSTopicArn: '{{ SNSTopicArn }}'
-            ChatConfigurationArns:
-              - '{{ ChatConfigurationArns[0] }}'
-      - name: CrossAccountConfigurations
+          - sns_topic_arn: '{{ sns_topic_arn }}'
+            chat_configuration_arns:
+              - '{{ chat_configuration_arns[0] }}'
+      - name: cross_account_configurations
         value:
-          - SourceRoleArn: null
-      - name: Tags
+          - source_role_arn: null
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -377,7 +376,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Arn>';
+AND Identifier = '{{ arn }}';
 ```
 
 
@@ -386,7 +385,7 @@ AND Identifier = '<Arn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.aiops.investigation_groups
-WHERE Identifier = '<Arn>'
+WHERE Identifier = '{{ arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/amazonmq/configurations/index.md b/website/docs/services/amazonmq/configurations/index.md
index 1b4bac0e8..a3ffabea1 100644
--- a/website/docs/services/amazonmq/configurations/index.md
+++ b/website/docs/services/amazonmq/configurations/index.md
@@ -200,7 +200,7 @@ name,
 revision,
 tags
 FROM awscc.amazonmq.configurations
-WHERE region = 'us-east-1' AND Identifier = '<Id>';
+WHERE region = 'us-east-1' AND Identifier = '{{ id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -237,9 +237,9 @@ INSERT INTO awscc.amazonmq.configurations (
  Name,
  region
 )
-SELECT 
-'{{ EngineType }}',
- '{{ Name }}',
+SELECT
+'{{ engine_type }}',
+ '{{ name }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -257,14 +257,14 @@ INSERT INTO awscc.amazonmq.configurations (
  Tags,
  region
 )
-SELECT 
- '{{ AuthenticationStrategy }}',
- '{{ EngineType }}',
- '{{ EngineVersion }}',
- '{{ Data }}',
- '{{ Description }}',
- '{{ Name }}',
- '{{ Tags }}',
+SELECT
+ '{{ authentication_strategy }}',
+ '{{ engine_type }}',
+ '{{ engine_version }}',
+ '{{ data }}',
+ '{{ description }}',
+ '{{ name }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -282,23 +282,22 @@ globals:
 resources:
   - name: configuration
     props:
-      - name: AuthenticationStrategy
-        value: '{{ AuthenticationStrategy }}'
-      - name: EngineType
-        value: '{{ EngineType }}'
-      - name: EngineVersion
-        value: '{{ EngineVersion }}'
-      - name: Data
-        value: '{{ Data }}'
-      - name: Description
-        value: '{{ Description }}'
-      - name: Name
-        value: '{{ Name }}'
-      - name: Tags
+      - name: authentication_strategy
+        value: '{{ authentication_strategy }}'
+      - name: engine_type
+        value: '{{ engine_type }}'
+      - name: engine_version
+        value: '{{ engine_version }}'
+      - name: data
+        value: '{{ data }}'
+      - name: description
+        value: '{{ description }}'
+      - name: name
+        value: '{{ name }}'
+      - name: tags
         value:
-          - Value: '{{ Value }}'
-            Key: '{{ Key }}'
-
+          - value: '{{ value }}'
+            key: '{{ key }}'
 ```
 </TabItem>
 </Tabs>
@@ -316,7 +315,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Id>';
+AND Identifier = '{{ id }}';
 ```
 
 
@@ -325,7 +324,7 @@ AND Identifier = '<Id>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.amazonmq.configurations
-WHERE Identifier = '<Id>'
+WHERE Identifier = '{{ id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/amplify/apps/index.md b/website/docs/services/amplify/apps/index.md
index a1656b896..70581b421 100644
--- a/website/docs/services/amplify/apps/index.md
+++ b/website/docs/services/amplify/apps/index.md
@@ -423,7 +423,7 @@ repository,
 tags,
 job_config
 FROM awscc.amplify.apps
-WHERE region = 'us-east-1' AND Identifier = '<Arn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -459,8 +459,8 @@ INSERT INTO awscc.amplify.apps (
  Name,
  region
 )
-SELECT 
-'{{ Name }}',
+SELECT
+'{{ name }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -489,25 +489,25 @@ INSERT INTO awscc.amplify.apps (
  JobConfig,
  region
 )
-SELECT 
- '{{ AccessToken }}',
- '{{ AutoBranchCreationConfig }}',
- '{{ BasicAuthConfig }}',
- '{{ BuildSpec }}',
- '{{ CacheConfig }}',
- '{{ ComputeRoleArn }}',
- '{{ CustomHeaders }}',
- '{{ CustomRules }}',
- '{{ Description }}',
- '{{ EnableBranchAutoDeletion }}',
- '{{ EnvironmentVariables }}',
- '{{ IAMServiceRole }}',
- '{{ Name }}',
- '{{ OauthToken }}',
- '{{ Platform }}',
- '{{ Repository }}',
- '{{ Tags }}',
- '{{ JobConfig }}',
+SELECT
+ '{{ access_token }}',
+ '{{ auto_branch_creation_config }}',
+ '{{ basic_auth_config }}',
+ '{{ build_spec }}',
+ '{{ cache_config }}',
+ '{{ compute_role_arn }}',
+ '{{ custom_headers }}',
+ '{{ custom_rules }}',
+ '{{ description }}',
+ '{{ enable_branch_auto_deletion }}',
+ '{{ environment_variables }}',
+ '{{ iam_service_role }}',
+ '{{ name }}',
+ '{{ oauth_token }}',
+ '{{ platform }}',
+ '{{ repository }}',
+ '{{ tags }}',
+ '{{ job_config }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -525,69 +525,68 @@ globals:
 resources:
   - name: app
     props:
-      - name: AccessToken
-        value: '{{ AccessToken }}'
-      - name: AutoBranchCreationConfig
+      - name: access_token
+        value: '{{ access_token }}'
+      - name: auto_branch_creation_config
         value:
-          AutoBranchCreationPatterns:
-            - '{{ AutoBranchCreationPatterns[0] }}'
-          BasicAuthConfig:
-            EnableBasicAuth: '{{ EnableBasicAuth }}'
-            Username: '{{ Username }}'
-            Password: '{{ Password }}'
-          BuildSpec: '{{ BuildSpec }}'
-          EnableAutoBranchCreation: '{{ EnableAutoBranchCreation }}'
-          EnableAutoBuild: '{{ EnableAutoBuild }}'
-          EnablePerformanceMode: '{{ EnablePerformanceMode }}'
-          EnablePullRequestPreview: '{{ EnablePullRequestPreview }}'
-          EnvironmentVariables:
-            - Name: '{{ Name }}'
-              Value: '{{ Value }}'
-          Framework: '{{ Framework }}'
-          PullRequestEnvironmentName: '{{ PullRequestEnvironmentName }}'
-          Stage: '{{ Stage }}'
-      - name: BasicAuthConfig
+          auto_branch_creation_patterns:
+            - '{{ auto_branch_creation_patterns[0] }}'
+          basic_auth_config:
+            enable_basic_auth: '{{ enable_basic_auth }}'
+            username: '{{ username }}'
+            password: '{{ password }}'
+          build_spec: '{{ build_spec }}'
+          enable_auto_branch_creation: '{{ enable_auto_branch_creation }}'
+          enable_auto_build: '{{ enable_auto_build }}'
+          enable_performance_mode: '{{ enable_performance_mode }}'
+          enable_pull_request_preview: '{{ enable_pull_request_preview }}'
+          environment_variables:
+            - name: '{{ name }}'
+              value: '{{ value }}'
+          framework: '{{ framework }}'
+          pull_request_environment_name: '{{ pull_request_environment_name }}'
+          stage: '{{ stage }}'
+      - name: basic_auth_config
         value: null
-      - name: BuildSpec
-        value: '{{ BuildSpec }}'
-      - name: CacheConfig
+      - name: build_spec
+        value: '{{ build_spec }}'
+      - name: cache_config
         value:
-          Type: '{{ Type }}'
-      - name: ComputeRoleArn
-        value: '{{ ComputeRoleArn }}'
-      - name: CustomHeaders
-        value: '{{ CustomHeaders }}'
-      - name: CustomRules
+          type: '{{ type }}'
+      - name: compute_role_arn
+        value: '{{ compute_role_arn }}'
+      - name: custom_headers
+        value: '{{ custom_headers }}'
+      - name: custom_rules
         value:
-          - Condition: '{{ Condition }}'
-            Status: '{{ Status }}'
-            Target: '{{ Target }}'
-            Source: '{{ Source }}'
-      - name: Description
-        value: '{{ Description }}'
-      - name: EnableBranchAutoDeletion
-        value: '{{ EnableBranchAutoDeletion }}'
-      - name: EnvironmentVariables
+          - condition: '{{ condition }}'
+            status: '{{ status }}'
+            target: '{{ target }}'
+            source: '{{ source }}'
+      - name: description
+        value: '{{ description }}'
+      - name: enable_branch_auto_deletion
+        value: '{{ enable_branch_auto_deletion }}'
+      - name: environment_variables
         value:
           - null
-      - name: IAMServiceRole
-        value: '{{ IAMServiceRole }}'
-      - name: Name
-        value: '{{ Name }}'
-      - name: OauthToken
-        value: '{{ OauthToken }}'
-      - name: Platform
-        value: '{{ Platform }}'
-      - name: Repository
-        value: '{{ Repository }}'
-      - name: Tags
+      - name: iam_service_role
+        value: '{{ iam_service_role }}'
+      - name: name
+        value: '{{ name }}'
+      - name: oauth_token
+        value: '{{ oauth_token }}'
+      - name: platform
+        value: '{{ platform }}'
+      - name: repository
+        value: '{{ repository }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-      - name: JobConfig
+          - key: '{{ key }}'
+            value: '{{ value }}'
+      - name: job_config
         value:
-          BuildComputeType: '{{ BuildComputeType }}'
-
+          build_compute_type: '{{ build_compute_type }}'
 ```
 </TabItem>
 </Tabs>
@@ -620,7 +619,7 @@ SET PatchDocument = string('{{ {
     "JobConfig": job_config
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Arn>';
+AND Identifier = '{{ arn }}';
 ```
 
 
@@ -629,7 +628,7 @@ AND Identifier = '<Arn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.amplify.apps
-WHERE Identifier = '<Arn>'
+WHERE Identifier = '{{ arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/amplify/branches/index.md b/website/docs/services/amplify/branches/index.md
index 1dc858e79..995e4bbfa 100644
--- a/website/docs/services/amplify/branches/index.md
+++ b/website/docs/services/amplify/branches/index.md
@@ -278,7 +278,7 @@ pull_request_environment_name,
 stage,
 tags
 FROM awscc.amplify.branches
-WHERE region = 'us-east-1' AND Identifier = '<Arn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -315,9 +315,9 @@ INSERT INTO awscc.amplify.branches (
  BranchName,
  region
 )
-SELECT 
-'{{ AppId }}',
- '{{ BranchName }}',
+SELECT
+'{{ app_id }}',
+ '{{ branch_name }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -344,23 +344,23 @@ INSERT INTO awscc.amplify.branches (
  Tags,
  region
 )
-SELECT 
- '{{ AppId }}',
- '{{ BasicAuthConfig }}',
- '{{ Backend }}',
- '{{ BranchName }}',
- '{{ BuildSpec }}',
- '{{ ComputeRoleArn }}',
- '{{ Description }}',
- '{{ EnableAutoBuild }}',
- '{{ EnablePerformanceMode }}',
- '{{ EnablePullRequestPreview }}',
- '{{ EnableSkewProtection }}',
- '{{ EnvironmentVariables }}',
- '{{ Framework }}',
- '{{ PullRequestEnvironmentName }}',
- '{{ Stage }}',
- '{{ Tags }}',
+SELECT
+ '{{ app_id }}',
+ '{{ basic_auth_config }}',
+ '{{ backend }}',
+ '{{ branch_name }}',
+ '{{ build_spec }}',
+ '{{ compute_role_arn }}',
+ '{{ description }}',
+ '{{ enable_auto_build }}',
+ '{{ enable_performance_mode }}',
+ '{{ enable_pull_request_preview }}',
+ '{{ enable_skew_protection }}',
+ '{{ environment_variables }}',
+ '{{ framework }}',
+ '{{ pull_request_environment_name }}',
+ '{{ stage }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -378,47 +378,46 @@ globals:
 resources:
   - name: branch
     props:
-      - name: AppId
-        value: '{{ AppId }}'
-      - name: BasicAuthConfig
+      - name: app_id
+        value: '{{ app_id }}'
+      - name: basic_auth_config
         value:
-          EnableBasicAuth: '{{ EnableBasicAuth }}'
-          Username: '{{ Username }}'
-          Password: '{{ Password }}'
-      - name: Backend
+          enable_basic_auth: '{{ enable_basic_auth }}'
+          username: '{{ username }}'
+          password: '{{ password }}'
+      - name: backend
         value:
-          StackArn: '{{ StackArn }}'
-      - name: BranchName
-        value: '{{ BranchName }}'
-      - name: BuildSpec
-        value: '{{ BuildSpec }}'
-      - name: ComputeRoleArn
-        value: '{{ ComputeRoleArn }}'
-      - name: Description
-        value: '{{ Description }}'
-      - name: EnableAutoBuild
-        value: '{{ EnableAutoBuild }}'
-      - name: EnablePerformanceMode
-        value: '{{ EnablePerformanceMode }}'
-      - name: EnablePullRequestPreview
-        value: '{{ EnablePullRequestPreview }}'
-      - name: EnableSkewProtection
-        value: '{{ EnableSkewProtection }}'
-      - name: EnvironmentVariables
+          stack_arn: '{{ stack_arn }}'
+      - name: branch_name
+        value: '{{ branch_name }}'
+      - name: build_spec
+        value: '{{ build_spec }}'
+      - name: compute_role_arn
+        value: '{{ compute_role_arn }}'
+      - name: description
+        value: '{{ description }}'
+      - name: enable_auto_build
+        value: '{{ enable_auto_build }}'
+      - name: enable_performance_mode
+        value: '{{ enable_performance_mode }}'
+      - name: enable_pull_request_preview
+        value: '{{ enable_pull_request_preview }}'
+      - name: enable_skew_protection
+        value: '{{ enable_skew_protection }}'
+      - name: environment_variables
         value:
-          - Name: '{{ Name }}'
-            Value: '{{ Value }}'
-      - name: Framework
-        value: '{{ Framework }}'
-      - name: PullRequestEnvironmentName
-        value: '{{ PullRequestEnvironmentName }}'
-      - name: Stage
-        value: '{{ Stage }}'
-      - name: Tags
+          - name: '{{ name }}'
+            value: '{{ value }}'
+      - name: framework
+        value: '{{ framework }}'
+      - name: pull_request_environment_name
+        value: '{{ pull_request_environment_name }}'
+      - name: stage
+        value: '{{ stage }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -447,7 +446,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Arn>';
+AND Identifier = '{{ arn }}';
 ```
 
 
@@ -456,7 +455,7 @@ AND Identifier = '<Arn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.amplify.branches
-WHERE Identifier = '<Arn>'
+WHERE Identifier = '{{ arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/amplify/domains/index.md b/website/docs/services/amplify/domains/index.md
index 607d281d1..79c6ae6d4 100644
--- a/website/docs/services/amplify/domains/index.md
+++ b/website/docs/services/amplify/domains/index.md
@@ -247,7 +247,7 @@ enable_auto_sub_domain,
 status_reason,
 sub_domain_settings
 FROM awscc.amplify.domains
-WHERE region = 'us-east-1' AND Identifier = '<Arn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -285,10 +285,10 @@ INSERT INTO awscc.amplify.domains (
  SubDomainSettings,
  region
 )
-SELECT 
-'{{ AppId }}',
- '{{ DomainName }}',
- '{{ SubDomainSettings }}',
+SELECT
+'{{ app_id }}',
+ '{{ domain_name }}',
+ '{{ sub_domain_settings }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -306,14 +306,14 @@ INSERT INTO awscc.amplify.domains (
  SubDomainSettings,
  region
 )
-SELECT 
- '{{ AppId }}',
- '{{ AutoSubDomainCreationPatterns }}',
- '{{ AutoSubDomainIAMRole }}',
- '{{ CertificateSettings }}',
- '{{ DomainName }}',
- '{{ EnableAutoSubDomain }}',
- '{{ SubDomainSettings }}',
+SELECT
+ '{{ app_id }}',
+ '{{ auto_sub_domain_creation_patterns }}',
+ '{{ auto_sub_domain_iam_role }}',
+ '{{ certificate_settings }}',
+ '{{ domain_name }}',
+ '{{ enable_auto_sub_domain }}',
+ '{{ sub_domain_settings }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -331,26 +331,25 @@ globals:
 resources:
   - name: domain
     props:
-      - name: AppId
-        value: '{{ AppId }}'
-      - name: AutoSubDomainCreationPatterns
+      - name: app_id
+        value: '{{ app_id }}'
+      - name: auto_sub_domain_creation_patterns
         value:
-          - '{{ AutoSubDomainCreationPatterns[0] }}'
-      - name: AutoSubDomainIAMRole
-        value: '{{ AutoSubDomainIAMRole }}'
-      - name: CertificateSettings
+          - '{{ auto_sub_domain_creation_patterns[0] }}'
+      - name: auto_sub_domain_iam_role
+        value: '{{ auto_sub_domain_iam_role }}'
+      - name: certificate_settings
         value:
-          CertificateType: '{{ CertificateType }}'
-          CustomCertificateArn: '{{ CustomCertificateArn }}'
-      - name: DomainName
-        value: '{{ DomainName }}'
-      - name: EnableAutoSubDomain
-        value: '{{ EnableAutoSubDomain }}'
-      - name: SubDomainSettings
+          certificate_type: '{{ certificate_type }}'
+          custom_certificate_arn: '{{ custom_certificate_arn }}'
+      - name: domain_name
+        value: '{{ domain_name }}'
+      - name: enable_auto_sub_domain
+        value: '{{ enable_auto_sub_domain }}'
+      - name: sub_domain_settings
         value:
-          - Prefix: '{{ Prefix }}'
-            BranchName: '{{ BranchName }}'
-
+          - prefix: '{{ prefix }}'
+            branch_name: '{{ branch_name }}'
 ```
 </TabItem>
 </Tabs>
@@ -370,7 +369,7 @@ SET PatchDocument = string('{{ {
     "SubDomainSettings": sub_domain_settings
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Arn>';
+AND Identifier = '{{ arn }}';
 ```
 
 
@@ -379,7 +378,7 @@ AND Identifier = '<Arn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.amplify.domains
-WHERE Identifier = '<Arn>'
+WHERE Identifier = '{{ arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/amplifyuibuilder/components/index.md b/website/docs/services/amplifyuibuilder/components/index.md
index 1c1e89f5d..e2a161bf5 100644
--- a/website/docs/services/amplifyuibuilder/components/index.md
+++ b/website/docs/services/amplifyuibuilder/components/index.md
@@ -284,7 +284,7 @@ source_id,
 tags,
 variants
 FROM awscc.amplifyuibuilder.components
-WHERE region = 'us-east-1' AND Identifier = '<AppId>|<EnvironmentName>|<Id>';
+WHERE region = 'us-east-1' AND Identifier = '{{ app_id }}|{{ environment_name }}|{{ id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -335,21 +335,21 @@ INSERT INTO awscc.amplifyuibuilder.components (
  Variants,
  region
 )
-SELECT 
-'{{ AppId }}',
- '{{ BindingProperties }}',
- '{{ Children }}',
- '{{ CollectionProperties }}',
- '{{ ComponentType }}',
- '{{ EnvironmentName }}',
- '{{ Events }}',
- '{{ Name }}',
- '{{ Overrides }}',
- '{{ Properties }}',
- '{{ SchemaVersion }}',
- '{{ SourceId }}',
- '{{ Tags }}',
- '{{ Variants }}',
+SELECT
+'{{ app_id }}',
+ '{{ binding_properties }}',
+ '{{ children }}',
+ '{{ collection_properties }}',
+ '{{ component_type }}',
+ '{{ environment_name }}',
+ '{{ events }}',
+ '{{ name }}',
+ '{{ overrides }}',
+ '{{ properties }}',
+ '{{ schema_version }}',
+ '{{ source_id }}',
+ '{{ tags }}',
+ '{{ variants }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -374,21 +374,21 @@ INSERT INTO awscc.amplifyuibuilder.components (
  Variants,
  region
 )
-SELECT 
- '{{ AppId }}',
- '{{ BindingProperties }}',
- '{{ Children }}',
- '{{ CollectionProperties }}',
- '{{ ComponentType }}',
- '{{ EnvironmentName }}',
- '{{ Events }}',
- '{{ Name }}',
- '{{ Overrides }}',
- '{{ Properties }}',
- '{{ SchemaVersion }}',
- '{{ SourceId }}',
- '{{ Tags }}',
- '{{ Variants }}',
+SELECT
+ '{{ app_id }}',
+ '{{ binding_properties }}',
+ '{{ children }}',
+ '{{ collection_properties }}',
+ '{{ component_type }}',
+ '{{ environment_name }}',
+ '{{ events }}',
+ '{{ name }}',
+ '{{ overrides }}',
+ '{{ properties }}',
+ '{{ schema_version }}',
+ '{{ source_id }}',
+ '{{ tags }}',
+ '{{ variants }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -406,44 +406,43 @@ globals:
 resources:
   - name: component
     props:
-      - name: AppId
-        value: '{{ AppId }}'
-      - name: BindingProperties
+      - name: app_id
+        value: '{{ app_id }}'
+      - name: binding_properties
         value: {}
-      - name: Children
+      - name: children
         value:
-          - ComponentType: '{{ ComponentType }}'
-            Name: '{{ Name }}'
-            Properties: {}
-            Children:
+          - component_type: '{{ component_type }}'
+            name: '{{ name }}'
+            properties: {}
+            children:
               - null
-            Events: {}
-            SourceId: '{{ SourceId }}'
-      - name: CollectionProperties
+            events: {}
+            source_id: '{{ source_id }}'
+      - name: collection_properties
         value: {}
-      - name: ComponentType
-        value: '{{ ComponentType }}'
-      - name: EnvironmentName
-        value: '{{ EnvironmentName }}'
-      - name: Events
+      - name: component_type
+        value: '{{ component_type }}'
+      - name: environment_name
+        value: '{{ environment_name }}'
+      - name: events
         value: null
-      - name: Name
-        value: '{{ Name }}'
-      - name: Overrides
+      - name: name
+        value: '{{ name }}'
+      - name: overrides
         value: {}
-      - name: Properties
+      - name: properties
         value: null
-      - name: SchemaVersion
-        value: '{{ SchemaVersion }}'
-      - name: SourceId
-        value: '{{ SourceId }}'
-      - name: Tags
+      - name: schema_version
+        value: '{{ schema_version }}'
+      - name: source_id
+        value: '{{ source_id }}'
+      - name: tags
         value: {}
-      - name: Variants
+      - name: variants
         value:
-          - VariantValues: {}
-            Overrides: null
-
+          - variant_values: {}
+            overrides: null
 ```
 </TabItem>
 </Tabs>
@@ -470,7 +469,7 @@ SET PatchDocument = string('{{ {
     "Variants": variants
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<AppId>|<EnvironmentName>|<Id>';
+AND Identifier = '{{ app_id }}|{{ environment_name }}|{{ id }}';
 ```
 
 
@@ -479,7 +478,7 @@ AND Identifier = '<AppId>|<EnvironmentName>|<Id>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.amplifyuibuilder.components
-WHERE Identifier = '<AppId|EnvironmentName|Id>'
+WHERE Identifier = '{{ app_id }}|{{ environment_name }}|{{ id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/amplifyuibuilder/forms/index.md b/website/docs/services/amplifyuibuilder/forms/index.md
index 1bf4a6378..e9b72c8d6 100644
--- a/website/docs/services/amplifyuibuilder/forms/index.md
+++ b/website/docs/services/amplifyuibuilder/forms/index.md
@@ -269,7 +269,7 @@ sectional_elements,
 style,
 tags
 FROM awscc.amplifyuibuilder.forms
-WHERE region = 'us-east-1' AND Identifier = '<AppId>|<EnvironmentName>|<Id>';
+WHERE region = 'us-east-1' AND Identifier = '{{ app_id }}|{{ environment_name }}|{{ id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -318,19 +318,19 @@ INSERT INTO awscc.amplifyuibuilder.forms (
  Tags,
  region
 )
-SELECT 
-'{{ AppId }}',
- '{{ Cta }}',
- '{{ DataType }}',
- '{{ EnvironmentName }}',
- '{{ Fields }}',
- '{{ FormActionType }}',
- '{{ LabelDecorator }}',
- '{{ Name }}',
- '{{ SchemaVersion }}',
- '{{ SectionalElements }}',
- '{{ Style }}',
- '{{ Tags }}',
+SELECT
+'{{ app_id }}',
+ '{{ cta }}',
+ '{{ data_type }}',
+ '{{ environment_name }}',
+ '{{ fields }}',
+ '{{ form_action_type }}',
+ '{{ label_decorator }}',
+ '{{ name }}',
+ '{{ schema_version }}',
+ '{{ sectional_elements }}',
+ '{{ style }}',
+ '{{ tags }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -353,19 +353,19 @@ INSERT INTO awscc.amplifyuibuilder.forms (
  Tags,
  region
 )
-SELECT 
- '{{ AppId }}',
- '{{ Cta }}',
- '{{ DataType }}',
- '{{ EnvironmentName }}',
- '{{ Fields }}',
- '{{ FormActionType }}',
- '{{ LabelDecorator }}',
- '{{ Name }}',
- '{{ SchemaVersion }}',
- '{{ SectionalElements }}',
- '{{ Style }}',
- '{{ Tags }}',
+SELECT
+ '{{ app_id }}',
+ '{{ cta }}',
+ '{{ data_type }}',
+ '{{ environment_name }}',
+ '{{ fields }}',
+ '{{ form_action_type }}',
+ '{{ label_decorator }}',
+ '{{ name }}',
+ '{{ schema_version }}',
+ '{{ sectional_elements }}',
+ '{{ style }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -383,43 +383,42 @@ globals:
 resources:
   - name: form
     props:
-      - name: AppId
-        value: '{{ AppId }}'
-      - name: Cta
+      - name: app_id
+        value: '{{ app_id }}'
+      - name: cta
         value:
-          Position: '{{ Position }}'
-          Clear:
-            Excluded: '{{ Excluded }}'
-            Children: '{{ Children }}'
-            Position: null
-          Cancel: null
-          Submit: null
-      - name: DataType
+          position: '{{ position }}'
+          clear:
+            excluded: '{{ excluded }}'
+            children: '{{ children }}'
+            position: null
+          cancel: null
+          submit: null
+      - name: data_type
         value:
-          DataSourceType: '{{ DataSourceType }}'
-          DataTypeName: '{{ DataTypeName }}'
-      - name: EnvironmentName
-        value: '{{ EnvironmentName }}'
-      - name: Fields
+          data_source_type: '{{ data_source_type }}'
+          data_type_name: '{{ data_type_name }}'
+      - name: environment_name
+        value: '{{ environment_name }}'
+      - name: fields
         value: {}
-      - name: FormActionType
-        value: '{{ FormActionType }}'
-      - name: LabelDecorator
-        value: '{{ LabelDecorator }}'
-      - name: Name
-        value: '{{ Name }}'
-      - name: SchemaVersion
-        value: '{{ SchemaVersion }}'
-      - name: SectionalElements
+      - name: form_action_type
+        value: '{{ form_action_type }}'
+      - name: label_decorator
+        value: '{{ label_decorator }}'
+      - name: name
+        value: '{{ name }}'
+      - name: schema_version
+        value: '{{ schema_version }}'
+      - name: sectional_elements
         value: {}
-      - name: Style
+      - name: style
         value:
-          HorizontalGap: null
-          VerticalGap: null
-          OuterPadding: null
-      - name: Tags
+          horizontal_gap: null
+          vertical_gap: null
+          outer_padding: null
+      - name: tags
         value: {}
-
 ```
 </TabItem>
 </Tabs>
@@ -444,7 +443,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<AppId>|<EnvironmentName>|<Id>';
+AND Identifier = '{{ app_id }}|{{ environment_name }}|{{ id }}';
 ```
 
 
@@ -453,7 +452,7 @@ AND Identifier = '<AppId>|<EnvironmentName>|<Id>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.amplifyuibuilder.forms
-WHERE Identifier = '<AppId|EnvironmentName|Id>'
+WHERE Identifier = '{{ app_id }}|{{ environment_name }}|{{ id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/amplifyuibuilder/themes/index.md b/website/docs/services/amplifyuibuilder/themes/index.md
index e6707306e..844a50db5 100644
--- a/website/docs/services/amplifyuibuilder/themes/index.md
+++ b/website/docs/services/amplifyuibuilder/themes/index.md
@@ -221,7 +221,7 @@ overrides,
 tags,
 values
 FROM awscc.amplifyuibuilder.themes
-WHERE region = 'us-east-1' AND Identifier = '<AppId>|<EnvironmentName>|<Id>';
+WHERE region = 'us-east-1' AND Identifier = '{{ app_id }}|{{ environment_name }}|{{ id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -264,13 +264,13 @@ INSERT INTO awscc.amplifyuibuilder.themes (
  Values,
  region
 )
-SELECT 
-'{{ AppId }}',
- '{{ EnvironmentName }}',
- '{{ Name }}',
- '{{ Overrides }}',
- '{{ Tags }}',
- '{{ Values }}',
+SELECT
+'{{ app_id }}',
+ '{{ environment_name }}',
+ '{{ name }}',
+ '{{ overrides }}',
+ '{{ tags }}',
+ '{{ values }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -287,13 +287,13 @@ INSERT INTO awscc.amplifyuibuilder.themes (
  Values,
  region
 )
-SELECT 
- '{{ AppId }}',
- '{{ EnvironmentName }}',
- '{{ Name }}',
- '{{ Overrides }}',
- '{{ Tags }}',
- '{{ Values }}',
+SELECT
+ '{{ app_id }}',
+ '{{ environment_name }}',
+ '{{ name }}',
+ '{{ overrides }}',
+ '{{ tags }}',
+ '{{ values }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -311,25 +311,24 @@ globals:
 resources:
   - name: theme
     props:
-      - name: AppId
-        value: '{{ AppId }}'
-      - name: EnvironmentName
-        value: '{{ EnvironmentName }}'
-      - name: Name
-        value: '{{ Name }}'
-      - name: Overrides
+      - name: app_id
+        value: '{{ app_id }}'
+      - name: environment_name
+        value: '{{ environment_name }}'
+      - name: name
+        value: '{{ name }}'
+      - name: overrides
         value:
-          - Key: '{{ Key }}'
-            Value:
-              Value: '{{ Value }}'
-              Children:
+          - key: '{{ key }}'
+            value:
+              value: '{{ value }}'
+              children:
                 - null
-      - name: Tags
+      - name: tags
         value: {}
-      - name: Values
+      - name: values
         value:
           - null
-
 ```
 </TabItem>
 </Tabs>
@@ -348,7 +347,7 @@ SET PatchDocument = string('{{ {
     "Values": values
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<AppId>|<EnvironmentName>|<Id>';
+AND Identifier = '{{ app_id }}|{{ environment_name }}|{{ id }}';
 ```
 
 
@@ -357,7 +356,7 @@ AND Identifier = '<AppId>|<EnvironmentName>|<Id>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.amplifyuibuilder.themes
-WHERE Identifier = '<AppId|EnvironmentName|Id>'
+WHERE Identifier = '{{ app_id }}|{{ environment_name }}|{{ id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/apigateway/accounts/index.md b/website/docs/services/apigateway/accounts/index.md
index 9e30385cf..f7deb3af7 100644
--- a/website/docs/services/apigateway/accounts/index.md
+++ b/website/docs/services/apigateway/accounts/index.md
@@ -94,7 +94,7 @@ region,
 id,
 cloud_watch_role_arn
 FROM awscc.apigateway.accounts
-WHERE region = 'us-east-1' AND Identifier = '<Id>';
+WHERE region = 'us-east-1' AND Identifier = '{{ id }}';
 ```
 
 ## `INSERT` example
@@ -117,8 +117,8 @@ INSERT INTO awscc.apigateway.accounts (
  CloudWatchRoleArn,
  region
 )
-SELECT 
-'{{ CloudWatchRoleArn }}',
+SELECT
+'{{ cloud_watch_role_arn }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -130,8 +130,8 @@ INSERT INTO awscc.apigateway.accounts (
  CloudWatchRoleArn,
  region
 )
-SELECT 
- '{{ CloudWatchRoleArn }}',
+SELECT
+ '{{ cloud_watch_role_arn }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -149,9 +149,8 @@ globals:
 resources:
   - name: account
     props:
-      - name: CloudWatchRoleArn
-        value: '{{ CloudWatchRoleArn }}'
-
+      - name: cloud_watch_role_arn
+        value: '{{ cloud_watch_role_arn }}'
 ```
 </TabItem>
 </Tabs>
@@ -167,7 +166,7 @@ SET PatchDocument = string('{{ {
     "CloudWatchRoleArn": cloud_watch_role_arn
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Id>';
+AND Identifier = '{{ id }}';
 ```
 
 
@@ -176,7 +175,7 @@ AND Identifier = '<Id>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.apigateway.accounts
-WHERE Identifier = '<Id>'
+WHERE Identifier = '{{ id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/apigateway/api_keys/index.md b/website/docs/services/apigateway/api_keys/index.md
index 26b2bf748..31f4ae484 100644
--- a/website/docs/services/apigateway/api_keys/index.md
+++ b/website/docs/services/apigateway/api_keys/index.md
@@ -206,7 +206,7 @@ stage_keys,
 tags,
 value
 FROM awscc.apigateway.api_keys
-WHERE region = 'us-east-1' AND Identifier = '<APIKeyId>';
+WHERE region = 'us-east-1' AND Identifier = '{{ api_key_id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -249,15 +249,15 @@ INSERT INTO awscc.apigateway.api_keys (
  Value,
  region
 )
-SELECT 
-'{{ CustomerId }}',
- '{{ Description }}',
- '{{ Enabled }}',
- '{{ GenerateDistinctId }}',
- '{{ Name }}',
- '{{ StageKeys }}',
- '{{ Tags }}',
- '{{ Value }}',
+SELECT
+'{{ customer_id }}',
+ '{{ description }}',
+ '{{ enabled }}',
+ '{{ generate_distinct_id }}',
+ '{{ name }}',
+ '{{ stage_keys }}',
+ '{{ tags }}',
+ '{{ value }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -276,15 +276,15 @@ INSERT INTO awscc.apigateway.api_keys (
  Value,
  region
 )
-SELECT 
- '{{ CustomerId }}',
- '{{ Description }}',
- '{{ Enabled }}',
- '{{ GenerateDistinctId }}',
- '{{ Name }}',
- '{{ StageKeys }}',
- '{{ Tags }}',
- '{{ Value }}',
+SELECT
+ '{{ customer_id }}',
+ '{{ description }}',
+ '{{ enabled }}',
+ '{{ generate_distinct_id }}',
+ '{{ name }}',
+ '{{ stage_keys }}',
+ '{{ tags }}',
+ '{{ value }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -302,27 +302,26 @@ globals:
 resources:
   - name: api_key
     props:
-      - name: CustomerId
-        value: '{{ CustomerId }}'
-      - name: Description
-        value: '{{ Description }}'
-      - name: Enabled
-        value: '{{ Enabled }}'
-      - name: GenerateDistinctId
-        value: '{{ GenerateDistinctId }}'
-      - name: Name
-        value: '{{ Name }}'
-      - name: StageKeys
+      - name: customer_id
+        value: '{{ customer_id }}'
+      - name: description
+        value: '{{ description }}'
+      - name: enabled
+        value: '{{ enabled }}'
+      - name: generate_distinct_id
+        value: '{{ generate_distinct_id }}'
+      - name: name
+        value: '{{ name }}'
+      - name: stage_keys
         value:
-          - RestApiId: '{{ RestApiId }}'
-            StageName: '{{ StageName }}'
-      - name: Tags
+          - rest_api_id: '{{ rest_api_id }}'
+            stage_name: '{{ stage_name }}'
+      - name: tags
         value:
-          - Value: '{{ Value }}'
-            Key: '{{ Key }}'
-      - name: Value
-        value: '{{ Value }}'
-
+          - value: '{{ value }}'
+            key: '{{ key }}'
+      - name: value
+        value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -342,7 +341,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<APIKeyId>';
+AND Identifier = '{{ api_key_id }}';
 ```
 
 
@@ -351,7 +350,7 @@ AND Identifier = '<APIKeyId>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.apigateway.api_keys
-WHERE Identifier = '<APIKeyId>'
+WHERE Identifier = '{{ api_key_id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/apigateway/authorizers/index.md b/website/docs/services/apigateway/authorizers/index.md
index 17b7a0356..54647837f 100644
--- a/website/docs/services/apigateway/authorizers/index.md
+++ b/website/docs/services/apigateway/authorizers/index.md
@@ -199,7 +199,7 @@ name,
 provider_arns,
 type
 FROM awscc.apigateway.authorizers
-WHERE region = 'us-east-1' AND Identifier = '<RestApiId>|<AuthorizerId>';
+WHERE region = 'us-east-1' AND Identifier = '{{ rest_api_id }}|{{ authorizer_id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -238,10 +238,10 @@ INSERT INTO awscc.apigateway.authorizers (
  Type,
  region
 )
-SELECT 
-'{{ RestApiId }}',
- '{{ Name }}',
- '{{ Type }}',
+SELECT
+'{{ rest_api_id }}',
+ '{{ name }}',
+ '{{ type }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -262,17 +262,17 @@ INSERT INTO awscc.apigateway.authorizers (
  Type,
  region
 )
-SELECT 
- '{{ RestApiId }}',
- '{{ AuthType }}',
- '{{ AuthorizerCredentials }}',
- '{{ AuthorizerResultTtlInSeconds }}',
- '{{ AuthorizerUri }}',
- '{{ IdentitySource }}',
- '{{ IdentityValidationExpression }}',
- '{{ Name }}',
- '{{ ProviderARNs }}',
- '{{ Type }}',
+SELECT
+ '{{ rest_api_id }}',
+ '{{ auth_type }}',
+ '{{ authorizer_credentials }}',
+ '{{ authorizer_result_ttl_in_seconds }}',
+ '{{ authorizer_uri }}',
+ '{{ identity_source }}',
+ '{{ identity_validation_expression }}',
+ '{{ name }}',
+ '{{ provider_arns }}',
+ '{{ type }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -290,28 +290,27 @@ globals:
 resources:
   - name: authorizer
     props:
-      - name: RestApiId
-        value: '{{ RestApiId }}'
-      - name: AuthType
-        value: '{{ AuthType }}'
-      - name: AuthorizerCredentials
-        value: '{{ AuthorizerCredentials }}'
-      - name: AuthorizerResultTtlInSeconds
-        value: '{{ AuthorizerResultTtlInSeconds }}'
-      - name: AuthorizerUri
-        value: '{{ AuthorizerUri }}'
-      - name: IdentitySource
-        value: '{{ IdentitySource }}'
-      - name: IdentityValidationExpression
-        value: '{{ IdentityValidationExpression }}'
-      - name: Name
-        value: '{{ Name }}'
-      - name: ProviderARNs
+      - name: rest_api_id
+        value: '{{ rest_api_id }}'
+      - name: auth_type
+        value: '{{ auth_type }}'
+      - name: authorizer_credentials
+        value: '{{ authorizer_credentials }}'
+      - name: authorizer_result_ttl_in_seconds
+        value: '{{ authorizer_result_ttl_in_seconds }}'
+      - name: authorizer_uri
+        value: '{{ authorizer_uri }}'
+      - name: identity_source
+        value: '{{ identity_source }}'
+      - name: identity_validation_expression
+        value: '{{ identity_validation_expression }}'
+      - name: name
+        value: '{{ name }}'
+      - name: provider_arns
         value:
-          - '{{ ProviderARNs[0] }}'
-      - name: Type
-        value: '{{ Type }}'
-
+          - '{{ provider_arns[0] }}'
+      - name: type
+        value: '{{ type }}'
 ```
 </TabItem>
 </Tabs>
@@ -335,7 +334,7 @@ SET PatchDocument = string('{{ {
     "Type": type
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<RestApiId>|<AuthorizerId>';
+AND Identifier = '{{ rest_api_id }}|{{ authorizer_id }}';
 ```
 
 
@@ -344,7 +343,7 @@ AND Identifier = '<RestApiId>|<AuthorizerId>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.apigateway.authorizers
-WHERE Identifier = '<RestApiId|AuthorizerId>'
+WHERE Identifier = '{{ rest_api_id }}|{{ authorizer_id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/apigateway/base_path_mapping_v2s/index.md b/website/docs/services/apigateway/base_path_mapping_v2s/index.md
index dd379d413..9e870ff2e 100644
--- a/website/docs/services/apigateway/base_path_mapping_v2s/index.md
+++ b/website/docs/services/apigateway/base_path_mapping_v2s/index.md
@@ -163,7 +163,7 @@ rest_api_id,
 stage,
 base_path_mapping_arn
 FROM awscc.apigateway.base_path_mapping_v2s
-WHERE region = 'us-east-1' AND Identifier = '<BasePathMappingArn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ base_path_mapping_arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -200,9 +200,9 @@ INSERT INTO awscc.apigateway.base_path_mapping_v2s (
  RestApiId,
  region
 )
-SELECT 
-'{{ DomainNameArn }}',
- '{{ RestApiId }}',
+SELECT
+'{{ domain_name_arn }}',
+ '{{ rest_api_id }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -217,11 +217,11 @@ INSERT INTO awscc.apigateway.base_path_mapping_v2s (
  Stage,
  region
 )
-SELECT 
- '{{ BasePath }}',
- '{{ DomainNameArn }}',
- '{{ RestApiId }}',
- '{{ Stage }}',
+SELECT
+ '{{ base_path }}',
+ '{{ domain_name_arn }}',
+ '{{ rest_api_id }}',
+ '{{ stage }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -239,15 +239,14 @@ globals:
 resources:
   - name: base_path_mapping_v2
     props:
-      - name: BasePath
-        value: '{{ BasePath }}'
-      - name: DomainNameArn
-        value: '{{ DomainNameArn }}'
-      - name: RestApiId
-        value: '{{ RestApiId }}'
-      - name: Stage
-        value: '{{ Stage }}'
-
+      - name: base_path
+        value: '{{ base_path }}'
+      - name: domain_name_arn
+        value: '{{ domain_name_arn }}'
+      - name: rest_api_id
+        value: '{{ rest_api_id }}'
+      - name: stage
+        value: '{{ stage }}'
 ```
 </TabItem>
 </Tabs>
@@ -264,7 +263,7 @@ SET PatchDocument = string('{{ {
     "Stage": stage
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<BasePathMappingArn>';
+AND Identifier = '{{ base_path_mapping_arn }}';
 ```
 
 
@@ -273,7 +272,7 @@ AND Identifier = '<BasePathMappingArn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.apigateway.base_path_mapping_v2s
-WHERE Identifier = '<BasePathMappingArn>'
+WHERE Identifier = '{{ base_path_mapping_arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/apigateway/base_path_mappings/index.md b/website/docs/services/apigateway/base_path_mappings/index.md
index 73ca41651..c879a4270 100644
--- a/website/docs/services/apigateway/base_path_mappings/index.md
+++ b/website/docs/services/apigateway/base_path_mappings/index.md
@@ -157,7 +157,7 @@ domain_name,
 rest_api_id,
 stage
 FROM awscc.apigateway.base_path_mappings
-WHERE region = 'us-east-1' AND Identifier = '<DomainName>|<BasePath>';
+WHERE region = 'us-east-1' AND Identifier = '{{ domain_name }}|{{ base_path }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -194,8 +194,8 @@ INSERT INTO awscc.apigateway.base_path_mappings (
  DomainName,
  region
 )
-SELECT 
-'{{ DomainName }}',
+SELECT
+'{{ domain_name }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -210,11 +210,11 @@ INSERT INTO awscc.apigateway.base_path_mappings (
  Stage,
  region
 )
-SELECT 
- '{{ BasePath }}',
- '{{ DomainName }}',
- '{{ RestApiId }}',
- '{{ Stage }}',
+SELECT
+ '{{ base_path }}',
+ '{{ domain_name }}',
+ '{{ rest_api_id }}',
+ '{{ stage }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -232,15 +232,14 @@ globals:
 resources:
   - name: base_path_mapping
     props:
-      - name: BasePath
-        value: '{{ BasePath }}'
-      - name: DomainName
-        value: '{{ DomainName }}'
-      - name: RestApiId
-        value: '{{ RestApiId }}'
-      - name: Stage
-        value: '{{ Stage }}'
-
+      - name: base_path
+        value: '{{ base_path }}'
+      - name: domain_name
+        value: '{{ domain_name }}'
+      - name: rest_api_id
+        value: '{{ rest_api_id }}'
+      - name: stage
+        value: '{{ stage }}'
 ```
 </TabItem>
 </Tabs>
@@ -257,7 +256,7 @@ SET PatchDocument = string('{{ {
     "Stage": stage
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<DomainName>|<BasePath>';
+AND Identifier = '{{ domain_name }}|{{ base_path }}';
 ```
 
 
@@ -266,7 +265,7 @@ AND Identifier = '<DomainName>|<BasePath>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.apigateway.base_path_mappings
-WHERE Identifier = '<DomainName|BasePath>'
+WHERE Identifier = '{{ domain_name }}|{{ base_path }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/apigateway/client_certificates/index.md b/website/docs/services/apigateway/client_certificates/index.md
index 7a62a95c3..bf2ef1f3b 100644
--- a/website/docs/services/apigateway/client_certificates/index.md
+++ b/website/docs/services/apigateway/client_certificates/index.md
@@ -158,7 +158,7 @@ client_certificate_id,
 description,
 tags
 FROM awscc.apigateway.client_certificates
-WHERE region = 'us-east-1' AND Identifier = '<ClientCertificateId>';
+WHERE region = 'us-east-1' AND Identifier = '{{ client_certificate_id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -195,9 +195,9 @@ INSERT INTO awscc.apigateway.client_certificates (
  Tags,
  region
 )
-SELECT 
-'{{ Description }}',
- '{{ Tags }}',
+SELECT
+'{{ description }}',
+ '{{ tags }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -210,9 +210,9 @@ INSERT INTO awscc.apigateway.client_certificates (
  Tags,
  region
 )
-SELECT 
- '{{ Description }}',
- '{{ Tags }}',
+SELECT
+ '{{ description }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -230,13 +230,12 @@ globals:
 resources:
   - name: client_certificate
     props:
-      - name: Description
-        value: '{{ Description }}'
-      - name: Tags
+      - name: description
+        value: '{{ description }}'
+      - name: tags
         value:
-          - Value: '{{ Value }}'
-            Key: '{{ Key }}'
-
+          - value: '{{ value }}'
+            key: '{{ key }}'
 ```
 </TabItem>
 </Tabs>
@@ -253,7 +252,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<ClientCertificateId>';
+AND Identifier = '{{ client_certificate_id }}';
 ```
 
 
@@ -262,7 +261,7 @@ AND Identifier = '<ClientCertificateId>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.apigateway.client_certificates
-WHERE Identifier = '<ClientCertificateId>'
+WHERE Identifier = '{{ client_certificate_id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/apigateway/deployments/index.md b/website/docs/services/apigateway/deployments/index.md
index 2ea35bad9..a85d542b6 100644
--- a/website/docs/services/apigateway/deployments/index.md
+++ b/website/docs/services/apigateway/deployments/index.md
@@ -381,7 +381,7 @@ stage_name,
 rest_api_id,
 deployment_canary_settings
 FROM awscc.apigateway.deployments
-WHERE region = 'us-east-1' AND Identifier = '<DeploymentId>|<RestApiId>';
+WHERE region = 'us-east-1' AND Identifier = '{{ deployment_id }}|{{ rest_api_id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -418,8 +418,8 @@ INSERT INTO awscc.apigateway.deployments (
  RestApiId,
  region
 )
-SELECT 
-'{{ RestApiId }}',
+SELECT
+'{{ rest_api_id }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -435,12 +435,12 @@ INSERT INTO awscc.apigateway.deployments (
  DeploymentCanarySettings,
  region
 )
-SELECT 
- '{{ Description }}',
- '{{ StageDescription }}',
- '{{ StageName }}',
- '{{ RestApiId }}',
- '{{ DeploymentCanarySettings }}',
+SELECT
+ '{{ description }}',
+ '{{ stage_description }}',
+ '{{ stage_name }}',
+ '{{ rest_api_id }}',
+ '{{ deployment_canary_settings }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -458,57 +458,56 @@ globals:
 resources:
   - name: deployment
     props:
-      - name: Description
-        value: '{{ Description }}'
-      - name: StageDescription
+      - name: description
+        value: '{{ description }}'
+      - name: stage_description
         value:
-          CacheTtlInSeconds: '{{ CacheTtlInSeconds }}'
-          Description: '{{ Description }}'
-          LoggingLevel: '{{ LoggingLevel }}'
-          CanarySetting:
-            DeploymentId: '{{ DeploymentId }}'
-            PercentTraffic: null
-            StageVariableOverrides: {}
-            UseStageCache: '{{ UseStageCache }}'
-          ThrottlingRateLimit: null
-          ClientCertificateId: '{{ ClientCertificateId }}'
-          Variables: {}
-          DocumentationVersion: '{{ DocumentationVersion }}'
-          CacheDataEncrypted: '{{ CacheDataEncrypted }}'
-          DataTraceEnabled: '{{ DataTraceEnabled }}'
-          ThrottlingBurstLimit: '{{ ThrottlingBurstLimit }}'
-          CachingEnabled: '{{ CachingEnabled }}'
-          TracingEnabled: '{{ TracingEnabled }}'
-          MethodSettings:
-            - CacheDataEncrypted: '{{ CacheDataEncrypted }}'
-              CacheTtlInSeconds: '{{ CacheTtlInSeconds }}'
-              CachingEnabled: '{{ CachingEnabled }}'
-              DataTraceEnabled: '{{ DataTraceEnabled }}'
-              HttpMethod: '{{ HttpMethod }}'
-              LoggingLevel: '{{ LoggingLevel }}'
-              MetricsEnabled: '{{ MetricsEnabled }}'
-              ResourcePath: '{{ ResourcePath }}'
-              ThrottlingBurstLimit: '{{ ThrottlingBurstLimit }}'
-              ThrottlingRateLimit: null
-          AccessLogSetting:
-            DestinationArn: '{{ DestinationArn }}'
-            Format: '{{ Format }}'
-          CacheClusterSize: '{{ CacheClusterSize }}'
-          MetricsEnabled: '{{ MetricsEnabled }}'
-          Tags:
-            - Value: '{{ Value }}'
-              Key: '{{ Key }}'
-          CacheClusterEnabled: '{{ CacheClusterEnabled }}'
-      - name: StageName
-        value: '{{ StageName }}'
-      - name: RestApiId
-        value: '{{ RestApiId }}'
-      - name: DeploymentCanarySettings
+          cache_ttl_in_seconds: '{{ cache_ttl_in_seconds }}'
+          description: '{{ description }}'
+          logging_level: '{{ logging_level }}'
+          canary_setting:
+            deployment_id: '{{ deployment_id }}'
+            percent_traffic: null
+            stage_variable_overrides: {}
+            use_stage_cache: '{{ use_stage_cache }}'
+          throttling_rate_limit: null
+          client_certificate_id: '{{ client_certificate_id }}'
+          variables: {}
+          documentation_version: '{{ documentation_version }}'
+          cache_data_encrypted: '{{ cache_data_encrypted }}'
+          data_trace_enabled: '{{ data_trace_enabled }}'
+          throttling_burst_limit: '{{ throttling_burst_limit }}'
+          caching_enabled: '{{ caching_enabled }}'
+          tracing_enabled: '{{ tracing_enabled }}'
+          method_settings:
+            - cache_data_encrypted: '{{ cache_data_encrypted }}'
+              cache_ttl_in_seconds: '{{ cache_ttl_in_seconds }}'
+              caching_enabled: '{{ caching_enabled }}'
+              data_trace_enabled: '{{ data_trace_enabled }}'
+              http_method: '{{ http_method }}'
+              logging_level: '{{ logging_level }}'
+              metrics_enabled: '{{ metrics_enabled }}'
+              resource_path: '{{ resource_path }}'
+              throttling_burst_limit: '{{ throttling_burst_limit }}'
+              throttling_rate_limit: null
+          access_log_setting:
+            destination_arn: '{{ destination_arn }}'
+            format: '{{ format }}'
+          cache_cluster_size: '{{ cache_cluster_size }}'
+          metrics_enabled: '{{ metrics_enabled }}'
+          tags:
+            - value: '{{ value }}'
+              key: '{{ key }}'
+          cache_cluster_enabled: '{{ cache_cluster_enabled }}'
+      - name: stage_name
+        value: '{{ stage_name }}'
+      - name: rest_api_id
+        value: '{{ rest_api_id }}'
+      - name: deployment_canary_settings
         value:
-          StageVariableOverrides: {}
-          PercentTraffic: null
-          UseStageCache: '{{ UseStageCache }}'
-
+          stage_variable_overrides: {}
+          percent_traffic: null
+          use_stage_cache: '{{ use_stage_cache }}'
 ```
 </TabItem>
 </Tabs>
@@ -526,7 +525,7 @@ SET PatchDocument = string('{{ {
     "StageName": stage_name
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<DeploymentId>|<RestApiId>';
+AND Identifier = '{{ deployment_id }}|{{ rest_api_id }}';
 ```
 
 
@@ -535,7 +534,7 @@ AND Identifier = '<DeploymentId>|<RestApiId>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.apigateway.deployments
-WHERE Identifier = '<DeploymentId|RestApiId>'
+WHERE Identifier = '{{ deployment_id }}|{{ rest_api_id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/apigateway/documentation_parts/index.md b/website/docs/services/apigateway/documentation_parts/index.md
index d17dbc615..efaa8a28e 100644
--- a/website/docs/services/apigateway/documentation_parts/index.md
+++ b/website/docs/services/apigateway/documentation_parts/index.md
@@ -184,7 +184,7 @@ location,
 properties,
 rest_api_id
 FROM awscc.apigateway.documentation_parts
-WHERE region = 'us-east-1' AND Identifier = '<DocumentationPartId>|<RestApiId>';
+WHERE region = 'us-east-1' AND Identifier = '{{ documentation_part_id }}|{{ rest_api_id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -223,10 +223,10 @@ INSERT INTO awscc.apigateway.documentation_parts (
  RestApiId,
  region
 )
-SELECT 
-'{{ Location }}',
- '{{ Properties }}',
- '{{ RestApiId }}',
+SELECT
+'{{ location }}',
+ '{{ properties }}',
+ '{{ rest_api_id }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -240,10 +240,10 @@ INSERT INTO awscc.apigateway.documentation_parts (
  RestApiId,
  region
 )
-SELECT 
- '{{ Location }}',
- '{{ Properties }}',
- '{{ RestApiId }}',
+SELECT
+ '{{ location }}',
+ '{{ properties }}',
+ '{{ rest_api_id }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -261,18 +261,17 @@ globals:
 resources:
   - name: documentation_part
     props:
-      - name: Location
+      - name: location
         value:
-          Method: '{{ Method }}'
-          Name: '{{ Name }}'
-          Path: '{{ Path }}'
-          StatusCode: '{{ StatusCode }}'
-          Type: '{{ Type }}'
-      - name: Properties
-        value: '{{ Properties }}'
-      - name: RestApiId
-        value: '{{ RestApiId }}'
-
+          method: '{{ method }}'
+          name: '{{ name }}'
+          path: '{{ path }}'
+          status_code: '{{ status_code }}'
+          type: '{{ type }}'
+      - name: properties
+        value: '{{ properties }}'
+      - name: rest_api_id
+        value: '{{ rest_api_id }}'
 ```
 </TabItem>
 </Tabs>
@@ -288,7 +287,7 @@ SET PatchDocument = string('{{ {
     "Properties": properties
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<DocumentationPartId>|<RestApiId>';
+AND Identifier = '{{ documentation_part_id }}|{{ rest_api_id }}';
 ```
 
 
@@ -297,7 +296,7 @@ AND Identifier = '<DocumentationPartId>|<RestApiId>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.apigateway.documentation_parts
-WHERE Identifier = '<DocumentationPartId|RestApiId>'
+WHERE Identifier = '{{ documentation_part_id }}|{{ rest_api_id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/apigateway/documentation_versions/index.md b/website/docs/services/apigateway/documentation_versions/index.md
index 7a8d04e76..78273ee6b 100644
--- a/website/docs/services/apigateway/documentation_versions/index.md
+++ b/website/docs/services/apigateway/documentation_versions/index.md
@@ -151,7 +151,7 @@ description,
 documentation_version,
 rest_api_id
 FROM awscc.apigateway.documentation_versions
-WHERE region = 'us-east-1' AND Identifier = '<DocumentationVersion>|<RestApiId>';
+WHERE region = 'us-east-1' AND Identifier = '{{ documentation_version }}|{{ rest_api_id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -189,9 +189,9 @@ INSERT INTO awscc.apigateway.documentation_versions (
  RestApiId,
  region
 )
-SELECT 
-'{{ DocumentationVersion }}',
- '{{ RestApiId }}',
+SELECT
+'{{ documentation_version }}',
+ '{{ rest_api_id }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -205,10 +205,10 @@ INSERT INTO awscc.apigateway.documentation_versions (
  RestApiId,
  region
 )
-SELECT 
- '{{ Description }}',
- '{{ DocumentationVersion }}',
- '{{ RestApiId }}',
+SELECT
+ '{{ description }}',
+ '{{ documentation_version }}',
+ '{{ rest_api_id }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -226,13 +226,12 @@ globals:
 resources:
   - name: documentation_version
     props:
-      - name: Description
-        value: '{{ Description }}'
-      - name: DocumentationVersion
-        value: '{{ DocumentationVersion }}'
-      - name: RestApiId
-        value: '{{ RestApiId }}'
-
+      - name: description
+        value: '{{ description }}'
+      - name: documentation_version
+        value: '{{ documentation_version }}'
+      - name: rest_api_id
+        value: '{{ rest_api_id }}'
 ```
 </TabItem>
 </Tabs>
@@ -248,7 +247,7 @@ SET PatchDocument = string('{{ {
     "Description": description
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<DocumentationVersion>|<RestApiId>';
+AND Identifier = '{{ documentation_version }}|{{ rest_api_id }}';
 ```
 
 
@@ -257,7 +256,7 @@ AND Identifier = '<DocumentationVersion>|<RestApiId>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.apigateway.documentation_versions
-WHERE Identifier = '<DocumentationVersion|RestApiId>'
+WHERE Identifier = '{{ documentation_version }}|{{ rest_api_id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/apigateway/domain_name_access_associations/index.md b/website/docs/services/apigateway/domain_name_access_associations/index.md
index 0f5b61f45..2210921a5 100644
--- a/website/docs/services/apigateway/domain_name_access_associations/index.md
+++ b/website/docs/services/apigateway/domain_name_access_associations/index.md
@@ -164,7 +164,7 @@ access_association_source,
 access_association_source_type,
 tags
 FROM awscc.apigateway.domain_name_access_associations
-WHERE region = 'us-east-1' AND Identifier = '<DomainNameAccessAssociationArn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ domain_name_access_association_arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -202,10 +202,10 @@ INSERT INTO awscc.apigateway.domain_name_access_associations (
  AccessAssociationSourceType,
  region
 )
-SELECT 
-'{{ DomainNameArn }}',
- '{{ AccessAssociationSource }}',
- '{{ AccessAssociationSourceType }}',
+SELECT
+'{{ domain_name_arn }}',
+ '{{ access_association_source }}',
+ '{{ access_association_source_type }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -220,11 +220,11 @@ INSERT INTO awscc.apigateway.domain_name_access_associations (
  Tags,
  region
 )
-SELECT 
- '{{ DomainNameArn }}',
- '{{ AccessAssociationSource }}',
- '{{ AccessAssociationSourceType }}',
- '{{ Tags }}',
+SELECT
+ '{{ domain_name_arn }}',
+ '{{ access_association_source }}',
+ '{{ access_association_source_type }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -242,17 +242,16 @@ globals:
 resources:
   - name: domain_name_access_association
     props:
-      - name: DomainNameArn
-        value: '{{ DomainNameArn }}'
-      - name: AccessAssociationSource
-        value: '{{ AccessAssociationSource }}'
-      - name: AccessAssociationSourceType
-        value: '{{ AccessAssociationSourceType }}'
-      - name: Tags
+      - name: domain_name_arn
+        value: '{{ domain_name_arn }}'
+      - name: access_association_source
+        value: '{{ access_association_source }}'
+      - name: access_association_source_type
+        value: '{{ access_association_source_type }}'
+      - name: tags
         value:
-          - Value: '{{ Value }}'
-            Key: '{{ Key }}'
-
+          - value: '{{ value }}'
+            key: '{{ key }}'
 ```
 </TabItem>
 </Tabs>
@@ -263,7 +262,7 @@ resources:
 ```sql
 /*+ delete */
 DELETE FROM awscc.apigateway.domain_name_access_associations
-WHERE Identifier = '<DomainNameAccessAssociationArn>'
+WHERE Identifier = '{{ domain_name_access_association_arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/apigateway/domain_name_v2s/index.md b/website/docs/services/apigateway/domain_name_v2s/index.md
index e979ad5b4..6bebeaafa 100644
--- a/website/docs/services/apigateway/domain_name_v2s/index.md
+++ b/website/docs/services/apigateway/domain_name_v2s/index.md
@@ -216,7 +216,7 @@ domain_name_arn,
 routing_mode,
 tags
 FROM awscc.apigateway.domain_name_v2s
-WHERE region = 'us-east-1' AND Identifier = '<DomainNameArn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ domain_name_arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -258,14 +258,14 @@ INSERT INTO awscc.apigateway.domain_name_v2s (
  Tags,
  region
 )
-SELECT 
-'{{ CertificateArn }}',
- '{{ DomainName }}',
- '{{ EndpointConfiguration }}',
- '{{ SecurityPolicy }}',
- '{{ Policy }}',
- '{{ RoutingMode }}',
- '{{ Tags }}',
+SELECT
+'{{ certificate_arn }}',
+ '{{ domain_name }}',
+ '{{ endpoint_configuration }}',
+ '{{ security_policy }}',
+ '{{ policy }}',
+ '{{ routing_mode }}',
+ '{{ tags }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -283,14 +283,14 @@ INSERT INTO awscc.apigateway.domain_name_v2s (
  Tags,
  region
 )
-SELECT 
- '{{ CertificateArn }}',
- '{{ DomainName }}',
- '{{ EndpointConfiguration }}',
- '{{ SecurityPolicy }}',
- '{{ Policy }}',
- '{{ RoutingMode }}',
- '{{ Tags }}',
+SELECT
+ '{{ certificate_arn }}',
+ '{{ domain_name }}',
+ '{{ endpoint_configuration }}',
+ '{{ security_policy }}',
+ '{{ policy }}',
+ '{{ routing_mode }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -308,28 +308,27 @@ globals:
 resources:
   - name: domain_name_v2
     props:
-      - name: CertificateArn
-        value: '{{ CertificateArn }}'
-      - name: DomainName
-        value: '{{ DomainName }}'
-      - name: EndpointConfiguration
+      - name: certificate_arn
+        value: '{{ certificate_arn }}'
+      - name: domain_name
+        value: '{{ domain_name }}'
+      - name: endpoint_configuration
         value:
-          IpAddressType: '{{ IpAddressType }}'
-          Types:
-            - '{{ Types[0] }}'
-          VpcEndpointIds:
-            - '{{ VpcEndpointIds[0] }}'
-      - name: SecurityPolicy
-        value: '{{ SecurityPolicy }}'
-      - name: Policy
+          ip_address_type: '{{ ip_address_type }}'
+          types:
+            - '{{ types[0] }}'
+          vpc_endpoint_ids:
+            - '{{ vpc_endpoint_ids[0] }}'
+      - name: security_policy
+        value: '{{ security_policy }}'
+      - name: policy
         value: {}
-      - name: RoutingMode
-        value: '{{ RoutingMode }}'
-      - name: Tags
+      - name: routing_mode
+        value: '{{ routing_mode }}'
+      - name: tags
         value:
-          - Value: '{{ Value }}'
-            Key: '{{ Key }}'
-
+          - value: '{{ value }}'
+            key: '{{ key }}'
 ```
 </TabItem>
 </Tabs>
@@ -348,7 +347,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<DomainNameArn>';
+AND Identifier = '{{ domain_name_arn }}';
 ```
 
 
@@ -357,7 +356,7 @@ AND Identifier = '<DomainNameArn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.apigateway.domain_name_v2s
-WHERE Identifier = '<DomainNameArn>'
+WHERE Identifier = '{{ domain_name_arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/apigateway/domain_names/index.md b/website/docs/services/apigateway/domain_names/index.md
index e184c089d..7dcaee119 100644
--- a/website/docs/services/apigateway/domain_names/index.md
+++ b/website/docs/services/apigateway/domain_names/index.md
@@ -253,7 +253,7 @@ security_policy,
 routing_mode,
 tags
 FROM awscc.apigateway.domain_names
-WHERE region = 'us-east-1' AND Identifier = '<DomainName>';
+WHERE region = 'us-east-1' AND Identifier = '{{ domain_name }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -297,16 +297,16 @@ INSERT INTO awscc.apigateway.domain_names (
  Tags,
  region
 )
-SELECT 
-'{{ DomainName }}',
- '{{ EndpointConfiguration }}',
- '{{ MutualTlsAuthentication }}',
- '{{ CertificateArn }}',
- '{{ RegionalCertificateArn }}',
- '{{ OwnershipVerificationCertificateArn }}',
- '{{ SecurityPolicy }}',
- '{{ RoutingMode }}',
- '{{ Tags }}',
+SELECT
+'{{ domain_name }}',
+ '{{ endpoint_configuration }}',
+ '{{ mutual_tls_authentication }}',
+ '{{ certificate_arn }}',
+ '{{ regional_certificate_arn }}',
+ '{{ ownership_verification_certificate_arn }}',
+ '{{ security_policy }}',
+ '{{ routing_mode }}',
+ '{{ tags }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -326,16 +326,16 @@ INSERT INTO awscc.apigateway.domain_names (
  Tags,
  region
 )
-SELECT 
- '{{ DomainName }}',
- '{{ EndpointConfiguration }}',
- '{{ MutualTlsAuthentication }}',
- '{{ CertificateArn }}',
- '{{ RegionalCertificateArn }}',
- '{{ OwnershipVerificationCertificateArn }}',
- '{{ SecurityPolicy }}',
- '{{ RoutingMode }}',
- '{{ Tags }}',
+SELECT
+ '{{ domain_name }}',
+ '{{ endpoint_configuration }}',
+ '{{ mutual_tls_authentication }}',
+ '{{ certificate_arn }}',
+ '{{ regional_certificate_arn }}',
+ '{{ ownership_verification_certificate_arn }}',
+ '{{ security_policy }}',
+ '{{ routing_mode }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -353,34 +353,33 @@ globals:
 resources:
   - name: domain_name
     props:
-      - name: DomainName
-        value: '{{ DomainName }}'
-      - name: EndpointConfiguration
+      - name: domain_name
+        value: '{{ domain_name }}'
+      - name: endpoint_configuration
         value:
-          IpAddressType: '{{ IpAddressType }}'
-          Types:
-            - '{{ Types[0] }}'
-          VpcEndpointIds:
-            - '{{ VpcEndpointIds[0] }}'
-      - name: MutualTlsAuthentication
+          ip_address_type: '{{ ip_address_type }}'
+          types:
+            - '{{ types[0] }}'
+          vpc_endpoint_ids:
+            - '{{ vpc_endpoint_ids[0] }}'
+      - name: mutual_tls_authentication
         value:
-          TruststoreUri: '{{ TruststoreUri }}'
-          TruststoreVersion: '{{ TruststoreVersion }}'
-      - name: CertificateArn
-        value: '{{ CertificateArn }}'
-      - name: RegionalCertificateArn
-        value: '{{ RegionalCertificateArn }}'
-      - name: OwnershipVerificationCertificateArn
-        value: '{{ OwnershipVerificationCertificateArn }}'
-      - name: SecurityPolicy
-        value: '{{ SecurityPolicy }}'
-      - name: RoutingMode
-        value: '{{ RoutingMode }}'
-      - name: Tags
+          truststore_uri: '{{ truststore_uri }}'
+          truststore_version: '{{ truststore_version }}'
+      - name: certificate_arn
+        value: '{{ certificate_arn }}'
+      - name: regional_certificate_arn
+        value: '{{ regional_certificate_arn }}'
+      - name: ownership_verification_certificate_arn
+        value: '{{ ownership_verification_certificate_arn }}'
+      - name: security_policy
+        value: '{{ security_policy }}'
+      - name: routing_mode
+        value: '{{ routing_mode }}'
+      - name: tags
         value:
-          - Value: '{{ Value }}'
-            Key: '{{ Key }}'
-
+          - value: '{{ value }}'
+            key: '{{ key }}'
 ```
 </TabItem>
 </Tabs>
@@ -403,7 +402,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<DomainName>';
+AND Identifier = '{{ domain_name }}';
 ```
 
 
@@ -412,7 +411,7 @@ AND Identifier = '<DomainName>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.apigateway.domain_names
-WHERE Identifier = '<DomainName>'
+WHERE Identifier = '{{ domain_name }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/apigateway/gateway_responses/index.md b/website/docs/services/apigateway/gateway_responses/index.md
index 276855e39..f9f5cd7d1 100644
--- a/website/docs/services/apigateway/gateway_responses/index.md
+++ b/website/docs/services/apigateway/gateway_responses/index.md
@@ -164,7 +164,7 @@ status_code,
 response_parameters,
 response_templates
 FROM awscc.apigateway.gateway_responses
-WHERE region = 'us-east-1' AND Identifier = '<Id>';
+WHERE region = 'us-east-1' AND Identifier = '{{ id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -201,9 +201,9 @@ INSERT INTO awscc.apigateway.gateway_responses (
  ResponseType,
  region
 )
-SELECT 
-'{{ RestApiId }}',
- '{{ ResponseType }}',
+SELECT
+'{{ rest_api_id }}',
+ '{{ response_type }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -219,12 +219,12 @@ INSERT INTO awscc.apigateway.gateway_responses (
  ResponseTemplates,
  region
 )
-SELECT 
- '{{ RestApiId }}',
- '{{ ResponseType }}',
- '{{ StatusCode }}',
- '{{ ResponseParameters }}',
- '{{ ResponseTemplates }}',
+SELECT
+ '{{ rest_api_id }}',
+ '{{ response_type }}',
+ '{{ status_code }}',
+ '{{ response_parameters }}',
+ '{{ response_templates }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -242,17 +242,16 @@ globals:
 resources:
   - name: gateway_response
     props:
-      - name: RestApiId
-        value: '{{ RestApiId }}'
-      - name: ResponseType
-        value: '{{ ResponseType }}'
-      - name: StatusCode
-        value: '{{ StatusCode }}'
-      - name: ResponseParameters
+      - name: rest_api_id
+        value: '{{ rest_api_id }}'
+      - name: response_type
+        value: '{{ response_type }}'
+      - name: status_code
+        value: '{{ status_code }}'
+      - name: response_parameters
         value: {}
-      - name: ResponseTemplates
+      - name: response_templates
         value: {}
-
 ```
 </TabItem>
 </Tabs>
@@ -270,7 +269,7 @@ SET PatchDocument = string('{{ {
     "ResponseTemplates": response_templates
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Id>';
+AND Identifier = '{{ id }}';
 ```
 
 
@@ -279,7 +278,7 @@ AND Identifier = '<Id>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.apigateway.gateway_responses
-WHERE Identifier = '<Id>'
+WHERE Identifier = '{{ id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/apigateway/methods/index.md b/website/docs/services/apigateway/methods/index.md
index 211f4a141..bef416647 100644
--- a/website/docs/services/apigateway/methods/index.md
+++ b/website/docs/services/apigateway/methods/index.md
@@ -276,7 +276,7 @@ api_key_required,
 authorization_type,
 http_method
 FROM awscc.apigateway.methods
-WHERE region = 'us-east-1' AND Identifier = '<RestApiId>|<ResourceId>|<HttpMethod>';
+WHERE region = 'us-east-1' AND Identifier = '{{ rest_api_id }}|{{ resource_id }}|{{ http_method }}';
 ```
 
 ## `INSERT` example
@@ -301,10 +301,10 @@ INSERT INTO awscc.apigateway.methods (
  HttpMethod,
  region
 )
-SELECT 
-'{{ RestApiId }}',
- '{{ ResourceId }}',
- '{{ HttpMethod }}',
+SELECT
+'{{ rest_api_id }}',
+ '{{ resource_id }}',
+ '{{ http_method }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -328,20 +328,20 @@ INSERT INTO awscc.apigateway.methods (
  HttpMethod,
  region
 )
-SELECT 
- '{{ Integration }}',
- '{{ OperationName }}',
- '{{ RequestModels }}',
- '{{ RestApiId }}',
- '{{ AuthorizationScopes }}',
- '{{ RequestValidatorId }}',
- '{{ RequestParameters }}',
- '{{ MethodResponses }}',
- '{{ AuthorizerId }}',
- '{{ ResourceId }}',
- '{{ ApiKeyRequired }}',
- '{{ AuthorizationType }}',
- '{{ HttpMethod }}',
+SELECT
+ '{{ integration }}',
+ '{{ operation_name }}',
+ '{{ request_models }}',
+ '{{ rest_api_id }}',
+ '{{ authorization_scopes }}',
+ '{{ request_validator_id }}',
+ '{{ request_parameters }}',
+ '{{ method_responses }}',
+ '{{ authorizer_id }}',
+ '{{ resource_id }}',
+ '{{ api_key_required }}',
+ '{{ authorization_type }}',
+ '{{ http_method }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -359,57 +359,56 @@ globals:
 resources:
   - name: method
     props:
-      - name: Integration
+      - name: integration
         value:
-          CacheNamespace: '{{ CacheNamespace }}'
-          ConnectionType: '{{ ConnectionType }}'
-          IntegrationResponses:
-            - ResponseTemplates: {}
-              SelectionPattern: '{{ SelectionPattern }}'
-              ContentHandling: '{{ ContentHandling }}'
-              ResponseParameters: {}
-              StatusCode: '{{ StatusCode }}'
-          IntegrationHttpMethod: '{{ IntegrationHttpMethod }}'
-          Uri: '{{ Uri }}'
-          PassthroughBehavior: '{{ PassthroughBehavior }}'
-          RequestParameters: {}
-          ConnectionId: '{{ ConnectionId }}'
-          Type: '{{ Type }}'
-          CacheKeyParameters:
-            - '{{ CacheKeyParameters[0] }}'
-          ContentHandling: '{{ ContentHandling }}'
-          RequestTemplates: {}
-          TimeoutInMillis: '{{ TimeoutInMillis }}'
-          Credentials: '{{ Credentials }}'
-      - name: OperationName
-        value: '{{ OperationName }}'
-      - name: RequestModels
+          cache_namespace: '{{ cache_namespace }}'
+          connection_type: '{{ connection_type }}'
+          integration_responses:
+            - response_templates: {}
+              selection_pattern: '{{ selection_pattern }}'
+              content_handling: '{{ content_handling }}'
+              response_parameters: {}
+              status_code: '{{ status_code }}'
+          integration_http_method: '{{ integration_http_method }}'
+          uri: '{{ uri }}'
+          passthrough_behavior: '{{ passthrough_behavior }}'
+          request_parameters: {}
+          connection_id: '{{ connection_id }}'
+          type: '{{ type }}'
+          cache_key_parameters:
+            - '{{ cache_key_parameters[0] }}'
+          content_handling: '{{ content_handling }}'
+          request_templates: {}
+          timeout_in_millis: '{{ timeout_in_millis }}'
+          credentials: '{{ credentials }}'
+      - name: operation_name
+        value: '{{ operation_name }}'
+      - name: request_models
         value: {}
-      - name: RestApiId
-        value: '{{ RestApiId }}'
-      - name: AuthorizationScopes
+      - name: rest_api_id
+        value: '{{ rest_api_id }}'
+      - name: authorization_scopes
         value:
-          - '{{ AuthorizationScopes[0] }}'
-      - name: RequestValidatorId
-        value: '{{ RequestValidatorId }}'
-      - name: RequestParameters
+          - '{{ authorization_scopes[0] }}'
+      - name: request_validator_id
+        value: '{{ request_validator_id }}'
+      - name: request_parameters
         value: {}
-      - name: MethodResponses
+      - name: method_responses
         value:
-          - ResponseParameters: {}
-            StatusCode: '{{ StatusCode }}'
-            ResponseModels: {}
-      - name: AuthorizerId
-        value: '{{ AuthorizerId }}'
-      - name: ResourceId
-        value: '{{ ResourceId }}'
-      - name: ApiKeyRequired
-        value: '{{ ApiKeyRequired }}'
-      - name: AuthorizationType
-        value: '{{ AuthorizationType }}'
-      - name: HttpMethod
-        value: '{{ HttpMethod }}'
-
+          - response_parameters: {}
+            status_code: '{{ status_code }}'
+            response_models: {}
+      - name: authorizer_id
+        value: '{{ authorizer_id }}'
+      - name: resource_id
+        value: '{{ resource_id }}'
+      - name: api_key_required
+        value: '{{ api_key_required }}'
+      - name: authorization_type
+        value: '{{ authorization_type }}'
+      - name: http_method
+        value: '{{ http_method }}'
 ```
 </TabItem>
 </Tabs>
@@ -434,7 +433,7 @@ SET PatchDocument = string('{{ {
     "AuthorizationType": authorization_type
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<RestApiId>|<ResourceId>|<HttpMethod>';
+AND Identifier = '{{ rest_api_id }}|{{ resource_id }}|{{ http_method }}';
 ```
 
 
@@ -443,7 +442,7 @@ AND Identifier = '<RestApiId>|<ResourceId>|<HttpMethod>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.apigateway.methods
-WHERE Identifier = '<RestApiId|ResourceId|HttpMethod>'
+WHERE Identifier = '{{ rest_api_id }}|{{ resource_id }}|{{ http_method }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/apigateway/models/index.md b/website/docs/services/apigateway/models/index.md
index 06f48c483..410a246ce 100644
--- a/website/docs/services/apigateway/models/index.md
+++ b/website/docs/services/apigateway/models/index.md
@@ -163,7 +163,7 @@ name,
 rest_api_id,
 schema
 FROM awscc.apigateway.models
-WHERE region = 'us-east-1' AND Identifier = '<RestApiId>|<Name>';
+WHERE region = 'us-east-1' AND Identifier = '{{ rest_api_id }}|{{ name }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -200,8 +200,8 @@ INSERT INTO awscc.apigateway.models (
  RestApiId,
  region
 )
-SELECT 
-'{{ RestApiId }}',
+SELECT
+'{{ rest_api_id }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -217,12 +217,12 @@ INSERT INTO awscc.apigateway.models (
  Schema,
  region
 )
-SELECT 
- '{{ ContentType }}',
- '{{ Description }}',
- '{{ Name }}',
- '{{ RestApiId }}',
- '{{ Schema }}',
+SELECT
+ '{{ content_type }}',
+ '{{ description }}',
+ '{{ name }}',
+ '{{ rest_api_id }}',
+ '{{ schema }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -240,17 +240,16 @@ globals:
 resources:
   - name: model
     props:
-      - name: ContentType
-        value: '{{ ContentType }}'
-      - name: Description
-        value: '{{ Description }}'
-      - name: Name
-        value: '{{ Name }}'
-      - name: RestApiId
-        value: '{{ RestApiId }}'
-      - name: Schema
+      - name: content_type
+        value: '{{ content_type }}'
+      - name: description
+        value: '{{ description }}'
+      - name: name
+        value: '{{ name }}'
+      - name: rest_api_id
+        value: '{{ rest_api_id }}'
+      - name: schema
         value: {}
-
 ```
 </TabItem>
 </Tabs>
@@ -267,7 +266,7 @@ SET PatchDocument = string('{{ {
     "Schema": schema
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<RestApiId>|<Name>';
+AND Identifier = '{{ rest_api_id }}|{{ name }}';
 ```
 
 
@@ -276,7 +275,7 @@ AND Identifier = '<RestApiId>|<Name>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.apigateway.models
-WHERE Identifier = '<RestApiId|Name>'
+WHERE Identifier = '{{ rest_api_id }}|{{ name }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/apigateway/request_validators/index.md b/website/docs/services/apigateway/request_validators/index.md
index 330577fe8..42706bd66 100644
--- a/website/docs/services/apigateway/request_validators/index.md
+++ b/website/docs/services/apigateway/request_validators/index.md
@@ -163,7 +163,7 @@ rest_api_id,
 validate_request_body,
 validate_request_parameters
 FROM awscc.apigateway.request_validators
-WHERE region = 'us-east-1' AND Identifier = '<RestApiId>|<RequestValidatorId>';
+WHERE region = 'us-east-1' AND Identifier = '{{ rest_api_id }}|{{ request_validator_id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -200,8 +200,8 @@ INSERT INTO awscc.apigateway.request_validators (
  RestApiId,
  region
 )
-SELECT 
-'{{ RestApiId }}',
+SELECT
+'{{ rest_api_id }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -216,11 +216,11 @@ INSERT INTO awscc.apigateway.request_validators (
  ValidateRequestParameters,
  region
 )
-SELECT 
- '{{ Name }}',
- '{{ RestApiId }}',
- '{{ ValidateRequestBody }}',
- '{{ ValidateRequestParameters }}',
+SELECT
+ '{{ name }}',
+ '{{ rest_api_id }}',
+ '{{ validate_request_body }}',
+ '{{ validate_request_parameters }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -238,15 +238,14 @@ globals:
 resources:
   - name: request_validator
     props:
-      - name: Name
-        value: '{{ Name }}'
-      - name: RestApiId
-        value: '{{ RestApiId }}'
-      - name: ValidateRequestBody
-        value: '{{ ValidateRequestBody }}'
-      - name: ValidateRequestParameters
-        value: '{{ ValidateRequestParameters }}'
-
+      - name: name
+        value: '{{ name }}'
+      - name: rest_api_id
+        value: '{{ rest_api_id }}'
+      - name: validate_request_body
+        value: '{{ validate_request_body }}'
+      - name: validate_request_parameters
+        value: '{{ validate_request_parameters }}'
 ```
 </TabItem>
 </Tabs>
@@ -263,7 +262,7 @@ SET PatchDocument = string('{{ {
     "ValidateRequestParameters": validate_request_parameters
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<RestApiId>|<RequestValidatorId>';
+AND Identifier = '{{ rest_api_id }}|{{ request_validator_id }}';
 ```
 
 
@@ -272,7 +271,7 @@ AND Identifier = '<RestApiId>|<RequestValidatorId>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.apigateway.request_validators
-WHERE Identifier = '<RestApiId|RequestValidatorId>'
+WHERE Identifier = '{{ rest_api_id }}|{{ request_validator_id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/apigateway/resources/index.md b/website/docs/services/apigateway/resources/index.md
index 1f2dda5e6..87e00f67f 100644
--- a/website/docs/services/apigateway/resources/index.md
+++ b/website/docs/services/apigateway/resources/index.md
@@ -157,7 +157,7 @@ path_part,
 resource_id,
 rest_api_id
 FROM awscc.apigateway.resources
-WHERE region = 'us-east-1' AND Identifier = '<RestApiId>|<ResourceId>';
+WHERE region = 'us-east-1' AND Identifier = '{{ rest_api_id }}|{{ resource_id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -196,10 +196,10 @@ INSERT INTO awscc.apigateway.resources (
  RestApiId,
  region
 )
-SELECT 
-'{{ ParentId }}',
- '{{ PathPart }}',
- '{{ RestApiId }}',
+SELECT
+'{{ parent_id }}',
+ '{{ path_part }}',
+ '{{ rest_api_id }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -213,10 +213,10 @@ INSERT INTO awscc.apigateway.resources (
  RestApiId,
  region
 )
-SELECT 
- '{{ ParentId }}',
- '{{ PathPart }}',
- '{{ RestApiId }}',
+SELECT
+ '{{ parent_id }}',
+ '{{ path_part }}',
+ '{{ rest_api_id }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -234,13 +234,12 @@ globals:
 resources:
   - name: resource
     props:
-      - name: ParentId
-        value: '{{ ParentId }}'
-      - name: PathPart
-        value: '{{ PathPart }}'
-      - name: RestApiId
-        value: '{{ RestApiId }}'
-
+      - name: parent_id
+        value: '{{ parent_id }}'
+      - name: path_part
+        value: '{{ path_part }}'
+      - name: rest_api_id
+        value: '{{ rest_api_id }}'
 ```
 </TabItem>
 </Tabs>
@@ -251,7 +250,7 @@ resources:
 ```sql
 /*+ delete */
 DELETE FROM awscc.apigateway.resources
-WHERE Identifier = '<RestApiId|ResourceId>'
+WHERE Identifier = '{{ rest_api_id }}|{{ resource_id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/apigateway/rest_apis/index.md b/website/docs/services/apigateway/rest_apis/index.md
index e121c73c9..2ea71a621 100644
--- a/website/docs/services/apigateway/rest_apis/index.md
+++ b/website/docs/services/apigateway/rest_apis/index.md
@@ -281,7 +281,7 @@ endpoint_configuration,
 body,
 tags
 FROM awscc.apigateway.rest_apis
-WHERE region = 'us-east-1' AND Identifier = '<RestApiId>';
+WHERE region = 'us-east-1' AND Identifier = '{{ rest_api_id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -331,22 +331,22 @@ INSERT INTO awscc.apigateway.rest_apis (
  Tags,
  region
 )
-SELECT 
-'{{ Policy }}',
- '{{ BodyS3Location }}',
- '{{ Description }}',
- '{{ MinimumCompressionSize }}',
- '{{ Parameters }}',
- '{{ CloneFrom }}',
- '{{ Mode }}',
- '{{ DisableExecuteApiEndpoint }}',
- '{{ FailOnWarnings }}',
- '{{ BinaryMediaTypes }}',
- '{{ Name }}',
- '{{ ApiKeySourceType }}',
- '{{ EndpointConfiguration }}',
- '{{ Body }}',
- '{{ Tags }}',
+SELECT
+'{{ policy }}',
+ '{{ body_s3_location }}',
+ '{{ description }}',
+ '{{ minimum_compression_size }}',
+ '{{ parameters }}',
+ '{{ clone_from }}',
+ '{{ mode }}',
+ '{{ disable_execute_api_endpoint }}',
+ '{{ fail_on_warnings }}',
+ '{{ binary_media_types }}',
+ '{{ name }}',
+ '{{ api_key_source_type }}',
+ '{{ endpoint_configuration }}',
+ '{{ body }}',
+ '{{ tags }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -372,22 +372,22 @@ INSERT INTO awscc.apigateway.rest_apis (
  Tags,
  region
 )
-SELECT 
- '{{ Policy }}',
- '{{ BodyS3Location }}',
- '{{ Description }}',
- '{{ MinimumCompressionSize }}',
- '{{ Parameters }}',
- '{{ CloneFrom }}',
- '{{ Mode }}',
- '{{ DisableExecuteApiEndpoint }}',
- '{{ FailOnWarnings }}',
- '{{ BinaryMediaTypes }}',
- '{{ Name }}',
- '{{ ApiKeySourceType }}',
- '{{ EndpointConfiguration }}',
- '{{ Body }}',
- '{{ Tags }}',
+SELECT
+ '{{ policy }}',
+ '{{ body_s3_location }}',
+ '{{ description }}',
+ '{{ minimum_compression_size }}',
+ '{{ parameters }}',
+ '{{ clone_from }}',
+ '{{ mode }}',
+ '{{ disable_execute_api_endpoint }}',
+ '{{ fail_on_warnings }}',
+ '{{ binary_media_types }}',
+ '{{ name }}',
+ '{{ api_key_source_type }}',
+ '{{ endpoint_configuration }}',
+ '{{ body }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -405,49 +405,48 @@ globals:
 resources:
   - name: rest_api
     props:
-      - name: Policy
+      - name: policy
         value: {}
-      - name: BodyS3Location
+      - name: body_s3_location
         value:
-          Bucket: '{{ Bucket }}'
-          ETag: '{{ ETag }}'
-          Version: '{{ Version }}'
-          Key: '{{ Key }}'
-      - name: Description
-        value: '{{ Description }}'
-      - name: MinimumCompressionSize
-        value: '{{ MinimumCompressionSize }}'
-      - name: Parameters
+          bucket: '{{ bucket }}'
+          e_tag: '{{ e_tag }}'
+          version: '{{ version }}'
+          key: '{{ key }}'
+      - name: description
+        value: '{{ description }}'
+      - name: minimum_compression_size
+        value: '{{ minimum_compression_size }}'
+      - name: parameters
         value: {}
-      - name: CloneFrom
-        value: '{{ CloneFrom }}'
-      - name: Mode
-        value: '{{ Mode }}'
-      - name: DisableExecuteApiEndpoint
-        value: '{{ DisableExecuteApiEndpoint }}'
-      - name: FailOnWarnings
-        value: '{{ FailOnWarnings }}'
-      - name: BinaryMediaTypes
+      - name: clone_from
+        value: '{{ clone_from }}'
+      - name: mode
+        value: '{{ mode }}'
+      - name: disable_execute_api_endpoint
+        value: '{{ disable_execute_api_endpoint }}'
+      - name: fail_on_warnings
+        value: '{{ fail_on_warnings }}'
+      - name: binary_media_types
         value:
-          - '{{ BinaryMediaTypes[0] }}'
-      - name: Name
-        value: '{{ Name }}'
-      - name: ApiKeySourceType
-        value: '{{ ApiKeySourceType }}'
-      - name: EndpointConfiguration
+          - '{{ binary_media_types[0] }}'
+      - name: name
+        value: '{{ name }}'
+      - name: api_key_source_type
+        value: '{{ api_key_source_type }}'
+      - name: endpoint_configuration
         value:
-          IpAddressType: '{{ IpAddressType }}'
-          Types:
-            - '{{ Types[0] }}'
-          VpcEndpointIds:
-            - '{{ VpcEndpointIds[0] }}'
-      - name: Body
+          ip_address_type: '{{ ip_address_type }}'
+          types:
+            - '{{ types[0] }}'
+          vpc_endpoint_ids:
+            - '{{ vpc_endpoint_ids[0] }}'
+      - name: body
         value: {}
-      - name: Tags
+      - name: tags
         value:
-          - Value: '{{ Value }}'
-            Key: '{{ Key }}'
-
+          - value: '{{ value }}'
+            key: '{{ key }}'
 ```
 </TabItem>
 </Tabs>
@@ -477,7 +476,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<RestApiId>';
+AND Identifier = '{{ rest_api_id }}';
 ```
 
 
@@ -486,7 +485,7 @@ AND Identifier = '<RestApiId>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.apigateway.rest_apis
-WHERE Identifier = '<RestApiId>'
+WHERE Identifier = '{{ rest_api_id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/apigateway/stages/index.md b/website/docs/services/apigateway/stages/index.md
index 32fd10fe2..50af17ccc 100644
--- a/website/docs/services/apigateway/stages/index.md
+++ b/website/docs/services/apigateway/stages/index.md
@@ -315,7 +315,7 @@ tags,
 tracing_enabled,
 variables
 FROM awscc.apigateway.stages
-WHERE region = 'us-east-1' AND Identifier = '<RestApiId>|<StageName>';
+WHERE region = 'us-east-1' AND Identifier = '{{ rest_api_id }}|{{ stage_name }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -352,8 +352,8 @@ INSERT INTO awscc.apigateway.stages (
  RestApiId,
  region
 )
-SELECT 
-'{{ RestApiId }}',
+SELECT
+'{{ rest_api_id }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -378,21 +378,21 @@ INSERT INTO awscc.apigateway.stages (
  Variables,
  region
 )
-SELECT 
- '{{ AccessLogSetting }}',
- '{{ CacheClusterEnabled }}',
- '{{ CacheClusterSize }}',
- '{{ CanarySetting }}',
- '{{ ClientCertificateId }}',
- '{{ DeploymentId }}',
- '{{ Description }}',
- '{{ DocumentationVersion }}',
- '{{ MethodSettings }}',
- '{{ RestApiId }}',
- '{{ StageName }}',
- '{{ Tags }}',
- '{{ TracingEnabled }}',
- '{{ Variables }}',
+SELECT
+ '{{ access_log_setting }}',
+ '{{ cache_cluster_enabled }}',
+ '{{ cache_cluster_size }}',
+ '{{ canary_setting }}',
+ '{{ client_certificate_id }}',
+ '{{ deployment_id }}',
+ '{{ description }}',
+ '{{ documentation_version }}',
+ '{{ method_settings }}',
+ '{{ rest_api_id }}',
+ '{{ stage_name }}',
+ '{{ tags }}',
+ '{{ tracing_enabled }}',
+ '{{ variables }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -410,53 +410,52 @@ globals:
 resources:
   - name: stage
     props:
-      - name: AccessLogSetting
+      - name: access_log_setting
         value:
-          DestinationArn: '{{ DestinationArn }}'
-          Format: '{{ Format }}'
-      - name: CacheClusterEnabled
-        value: '{{ CacheClusterEnabled }}'
-      - name: CacheClusterSize
-        value: '{{ CacheClusterSize }}'
-      - name: CanarySetting
+          destination_arn: '{{ destination_arn }}'
+          format: '{{ format }}'
+      - name: cache_cluster_enabled
+        value: '{{ cache_cluster_enabled }}'
+      - name: cache_cluster_size
+        value: '{{ cache_cluster_size }}'
+      - name: canary_setting
         value:
-          DeploymentId: '{{ DeploymentId }}'
-          PercentTraffic: null
-          StageVariableOverrides: {}
-          UseStageCache: '{{ UseStageCache }}'
-      - name: ClientCertificateId
-        value: '{{ ClientCertificateId }}'
-      - name: DeploymentId
-        value: '{{ DeploymentId }}'
-      - name: Description
-        value: '{{ Description }}'
-      - name: DocumentationVersion
-        value: '{{ DocumentationVersion }}'
-      - name: MethodSettings
+          deployment_id: '{{ deployment_id }}'
+          percent_traffic: null
+          stage_variable_overrides: {}
+          use_stage_cache: '{{ use_stage_cache }}'
+      - name: client_certificate_id
+        value: '{{ client_certificate_id }}'
+      - name: deployment_id
+        value: '{{ deployment_id }}'
+      - name: description
+        value: '{{ description }}'
+      - name: documentation_version
+        value: '{{ documentation_version }}'
+      - name: method_settings
         value:
-          - CacheDataEncrypted: '{{ CacheDataEncrypted }}'
-            CacheTtlInSeconds: '{{ CacheTtlInSeconds }}'
-            CachingEnabled: '{{ CachingEnabled }}'
-            DataTraceEnabled: '{{ DataTraceEnabled }}'
-            HttpMethod: '{{ HttpMethod }}'
-            LoggingLevel: '{{ LoggingLevel }}'
-            MetricsEnabled: '{{ MetricsEnabled }}'
-            ResourcePath: '{{ ResourcePath }}'
-            ThrottlingBurstLimit: '{{ ThrottlingBurstLimit }}'
-            ThrottlingRateLimit: null
-      - name: RestApiId
-        value: '{{ RestApiId }}'
-      - name: StageName
-        value: '{{ StageName }}'
-      - name: Tags
+          - cache_data_encrypted: '{{ cache_data_encrypted }}'
+            cache_ttl_in_seconds: '{{ cache_ttl_in_seconds }}'
+            caching_enabled: '{{ caching_enabled }}'
+            data_trace_enabled: '{{ data_trace_enabled }}'
+            http_method: '{{ http_method }}'
+            logging_level: '{{ logging_level }}'
+            metrics_enabled: '{{ metrics_enabled }}'
+            resource_path: '{{ resource_path }}'
+            throttling_burst_limit: '{{ throttling_burst_limit }}'
+            throttling_rate_limit: null
+      - name: rest_api_id
+        value: '{{ rest_api_id }}'
+      - name: stage_name
+        value: '{{ stage_name }}'
+      - name: tags
         value:
-          - Value: '{{ Value }}'
-            Key: '{{ Key }}'
-      - name: TracingEnabled
-        value: '{{ TracingEnabled }}'
-      - name: Variables
+          - value: '{{ value }}'
+            key: '{{ key }}'
+      - name: tracing_enabled
+        value: '{{ tracing_enabled }}'
+      - name: variables
         value: {}
-
 ```
 </TabItem>
 </Tabs>
@@ -483,7 +482,7 @@ SET PatchDocument = string('{{ {
     "Variables": variables
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<RestApiId>|<StageName>';
+AND Identifier = '{{ rest_api_id }}|{{ stage_name }}';
 ```
 
 
@@ -492,7 +491,7 @@ AND Identifier = '<RestApiId>|<StageName>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.apigateway.stages
-WHERE Identifier = '<RestApiId|StageName>'
+WHERE Identifier = '{{ rest_api_id }}|{{ stage_name }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/apigateway/usage_plan_keys/index.md b/website/docs/services/apigateway/usage_plan_keys/index.md
index 2d637df5e..e50785d86 100644
--- a/website/docs/services/apigateway/usage_plan_keys/index.md
+++ b/website/docs/services/apigateway/usage_plan_keys/index.md
@@ -146,7 +146,7 @@ key_type,
 usage_plan_id,
 id
 FROM awscc.apigateway.usage_plan_keys
-WHERE region = 'us-east-1' AND Identifier = '<Id>';
+WHERE region = 'us-east-1' AND Identifier = '{{ id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -184,10 +184,10 @@ INSERT INTO awscc.apigateway.usage_plan_keys (
  UsagePlanId,
  region
 )
-SELECT 
-'{{ KeyId }}',
- '{{ KeyType }}',
- '{{ UsagePlanId }}',
+SELECT
+'{{ key_id }}',
+ '{{ key_type }}',
+ '{{ usage_plan_id }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -201,10 +201,10 @@ INSERT INTO awscc.apigateway.usage_plan_keys (
  UsagePlanId,
  region
 )
-SELECT 
- '{{ KeyId }}',
- '{{ KeyType }}',
- '{{ UsagePlanId }}',
+SELECT
+ '{{ key_id }}',
+ '{{ key_type }}',
+ '{{ usage_plan_id }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -222,13 +222,12 @@ globals:
 resources:
   - name: usage_plan_key
     props:
-      - name: KeyId
-        value: '{{ KeyId }}'
-      - name: KeyType
-        value: '{{ KeyType }}'
-      - name: UsagePlanId
-        value: '{{ UsagePlanId }}'
-
+      - name: key_id
+        value: '{{ key_id }}'
+      - name: key_type
+        value: '{{ key_type }}'
+      - name: usage_plan_id
+        value: '{{ usage_plan_id }}'
 ```
 </TabItem>
 </Tabs>
@@ -239,7 +238,7 @@ resources:
 ```sql
 /*+ delete */
 DELETE FROM awscc.apigateway.usage_plan_keys
-WHERE Identifier = '<Id>'
+WHERE Identifier = '{{ id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/apigateway/usage_plans/index.md b/website/docs/services/apigateway/usage_plans/index.md
index 88b5b8dd0..3c7f74d53 100644
--- a/website/docs/services/apigateway/usage_plans/index.md
+++ b/website/docs/services/apigateway/usage_plans/index.md
@@ -228,7 +228,7 @@ tags,
 throttle,
 usage_plan_name
 FROM awscc.apigateway.usage_plans
-WHERE region = 'us-east-1' AND Identifier = '<Id>';
+WHERE region = 'us-east-1' AND Identifier = '{{ id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -269,13 +269,13 @@ INSERT INTO awscc.apigateway.usage_plans (
  UsagePlanName,
  region
 )
-SELECT 
-'{{ ApiStages }}',
- '{{ Description }}',
- '{{ Quota }}',
- '{{ Tags }}',
- '{{ Throttle }}',
- '{{ UsagePlanName }}',
+SELECT
+'{{ api_stages }}',
+ '{{ description }}',
+ '{{ quota }}',
+ '{{ tags }}',
+ '{{ throttle }}',
+ '{{ usage_plan_name }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -292,13 +292,13 @@ INSERT INTO awscc.apigateway.usage_plans (
  UsagePlanName,
  region
 )
-SELECT 
- '{{ ApiStages }}',
- '{{ Description }}',
- '{{ Quota }}',
- '{{ Tags }}',
- '{{ Throttle }}',
- '{{ UsagePlanName }}',
+SELECT
+ '{{ api_stages }}',
+ '{{ description }}',
+ '{{ quota }}',
+ '{{ tags }}',
+ '{{ throttle }}',
+ '{{ usage_plan_name }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -316,29 +316,28 @@ globals:
 resources:
   - name: usage_plan
     props:
-      - name: ApiStages
+      - name: api_stages
         value:
-          - ApiId: '{{ ApiId }}'
-            Stage: '{{ Stage }}'
-            Throttle: {}
-      - name: Description
-        value: '{{ Description }}'
-      - name: Quota
+          - api_id: '{{ api_id }}'
+            stage: '{{ stage }}'
+            throttle: {}
+      - name: description
+        value: '{{ description }}'
+      - name: quota
         value:
-          Limit: '{{ Limit }}'
-          Offset: '{{ Offset }}'
-          Period: '{{ Period }}'
-      - name: Tags
+          limit: '{{ limit }}'
+          offset: '{{ offset }}'
+          period: '{{ period }}'
+      - name: tags
         value:
-          - Value: '{{ Value }}'
-            Key: '{{ Key }}'
-      - name: Throttle
+          - value: '{{ value }}'
+            key: '{{ key }}'
+      - name: throttle
         value:
-          BurstLimit: '{{ BurstLimit }}'
-          RateLimit: null
-      - name: UsagePlanName
-        value: '{{ UsagePlanName }}'
-
+          burst_limit: '{{ burst_limit }}'
+          rate_limit: null
+      - name: usage_plan_name
+        value: '{{ usage_plan_name }}'
 ```
 </TabItem>
 </Tabs>
@@ -359,7 +358,7 @@ SET PatchDocument = string('{{ {
     "UsagePlanName": usage_plan_name
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Id>';
+AND Identifier = '{{ id }}';
 ```
 
 
@@ -368,7 +367,7 @@ AND Identifier = '<Id>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.apigateway.usage_plans
-WHERE Identifier = '<Id>'
+WHERE Identifier = '{{ id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/apigateway/vpc_links/index.md b/website/docs/services/apigateway/vpc_links/index.md
index 0cb8dafbd..f912404b1 100644
--- a/website/docs/services/apigateway/vpc_links/index.md
+++ b/website/docs/services/apigateway/vpc_links/index.md
@@ -170,7 +170,7 @@ tags,
 target_arns,
 vpc_link_id
 FROM awscc.apigateway.vpc_links
-WHERE region = 'us-east-1' AND Identifier = '<VpcLinkId>';
+WHERE region = 'us-east-1' AND Identifier = '{{ vpc_link_id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -207,9 +207,9 @@ INSERT INTO awscc.apigateway.vpc_links (
  TargetArns,
  region
 )
-SELECT 
-'{{ Name }}',
- '{{ TargetArns }}',
+SELECT
+'{{ name }}',
+ '{{ target_arns }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -224,11 +224,11 @@ INSERT INTO awscc.apigateway.vpc_links (
  TargetArns,
  region
 )
-SELECT 
- '{{ Name }}',
- '{{ Description }}',
- '{{ Tags }}',
- '{{ TargetArns }}',
+SELECT
+ '{{ name }}',
+ '{{ description }}',
+ '{{ tags }}',
+ '{{ target_arns }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -246,18 +246,17 @@ globals:
 resources:
   - name: vpc_link
     props:
-      - name: Name
-        value: '{{ Name }}'
-      - name: Description
-        value: '{{ Description }}'
-      - name: Tags
+      - name: name
+        value: '{{ name }}'
+      - name: description
+        value: '{{ description }}'
+      - name: tags
         value:
-          - Value: '{{ Value }}'
-            Key: '{{ Key }}'
-      - name: TargetArns
+          - value: '{{ value }}'
+            key: '{{ key }}'
+      - name: target_arns
         value:
-          - '{{ TargetArns[0] }}'
-
+          - '{{ target_arns[0] }}'
 ```
 </TabItem>
 </Tabs>
@@ -275,7 +274,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<VpcLinkId>';
+AND Identifier = '{{ vpc_link_id }}';
 ```
 
 
@@ -284,7 +283,7 @@ AND Identifier = '<VpcLinkId>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.apigateway.vpc_links
-WHERE Identifier = '<VpcLinkId>'
+WHERE Identifier = '{{ vpc_link_id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/apigatewayv2/api_mappings/index.md b/website/docs/services/apigatewayv2/api_mappings/index.md
index 248256045..6035512ff 100644
--- a/website/docs/services/apigatewayv2/api_mappings/index.md
+++ b/website/docs/services/apigatewayv2/api_mappings/index.md
@@ -163,7 +163,7 @@ stage,
 api_mapping_key,
 api_id
 FROM awscc.apigatewayv2.api_mappings
-WHERE region = 'us-east-1' AND Identifier = '<ApiMappingId>|<DomainName>';
+WHERE region = 'us-east-1' AND Identifier = '{{ api_mapping_id }}|{{ domain_name }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -202,10 +202,10 @@ INSERT INTO awscc.apigatewayv2.api_mappings (
  ApiId,
  region
 )
-SELECT 
-'{{ DomainName }}',
- '{{ Stage }}',
- '{{ ApiId }}',
+SELECT
+'{{ domain_name }}',
+ '{{ stage }}',
+ '{{ api_id }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -220,11 +220,11 @@ INSERT INTO awscc.apigatewayv2.api_mappings (
  ApiId,
  region
 )
-SELECT 
- '{{ DomainName }}',
- '{{ Stage }}',
- '{{ ApiMappingKey }}',
- '{{ ApiId }}',
+SELECT
+ '{{ domain_name }}',
+ '{{ stage }}',
+ '{{ api_mapping_key }}',
+ '{{ api_id }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -242,15 +242,14 @@ globals:
 resources:
   - name: api_mapping
     props:
-      - name: DomainName
-        value: '{{ DomainName }}'
-      - name: Stage
-        value: '{{ Stage }}'
-      - name: ApiMappingKey
-        value: '{{ ApiMappingKey }}'
-      - name: ApiId
-        value: '{{ ApiId }}'
-
+      - name: domain_name
+        value: '{{ domain_name }}'
+      - name: stage
+        value: '{{ stage }}'
+      - name: api_mapping_key
+        value: '{{ api_mapping_key }}'
+      - name: api_id
+        value: '{{ api_id }}'
 ```
 </TabItem>
 </Tabs>
@@ -268,7 +267,7 @@ SET PatchDocument = string('{{ {
     "ApiId": api_id
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<ApiMappingId>|<DomainName>';
+AND Identifier = '{{ api_mapping_id }}|{{ domain_name }}';
 ```
 
 
@@ -277,7 +276,7 @@ AND Identifier = '<ApiMappingId>|<DomainName>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.apigatewayv2.api_mappings
-WHERE Identifier = '<ApiMappingId|DomainName>'
+WHERE Identifier = '{{ api_mapping_id }}|{{ domain_name }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/apigatewayv2/apis/index.md b/website/docs/services/apigatewayv2/apis/index.md
index f54d739e5..65af84bc9 100644
--- a/website/docs/services/apigatewayv2/apis/index.md
+++ b/website/docs/services/apigatewayv2/apis/index.md
@@ -302,7 +302,7 @@ tags,
 api_key_selection_expression,
 ip_address_type
 FROM awscc.apigatewayv2.apis
-WHERE region = 'us-east-1' AND Identifier = '<ApiId>';
+WHERE region = 'us-east-1' AND Identifier = '{{ api_id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -355,25 +355,25 @@ INSERT INTO awscc.apigatewayv2.apis (
  IpAddressType,
  region
 )
-SELECT 
-'{{ RouteSelectionExpression }}',
- '{{ Body }}',
- '{{ BodyS3Location }}',
- '{{ BasePath }}',
- '{{ CredentialsArn }}',
- '{{ CorsConfiguration }}',
- '{{ RouteKey }}',
- '{{ Target }}',
- '{{ FailOnWarnings }}',
- '{{ Description }}',
- '{{ DisableExecuteApiEndpoint }}',
- '{{ DisableSchemaValidation }}',
- '{{ Name }}',
- '{{ Version }}',
- '{{ ProtocolType }}',
- '{{ Tags }}',
- '{{ ApiKeySelectionExpression }}',
- '{{ IpAddressType }}',
+SELECT
+'{{ route_selection_expression }}',
+ '{{ body }}',
+ '{{ body_s3_location }}',
+ '{{ base_path }}',
+ '{{ credentials_arn }}',
+ '{{ cors_configuration }}',
+ '{{ route_key }}',
+ '{{ target }}',
+ '{{ fail_on_warnings }}',
+ '{{ description }}',
+ '{{ disable_execute_api_endpoint }}',
+ '{{ disable_schema_validation }}',
+ '{{ name }}',
+ '{{ version }}',
+ '{{ protocol_type }}',
+ '{{ tags }}',
+ '{{ api_key_selection_expression }}',
+ '{{ ip_address_type }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -402,25 +402,25 @@ INSERT INTO awscc.apigatewayv2.apis (
  IpAddressType,
  region
 )
-SELECT 
- '{{ RouteSelectionExpression }}',
- '{{ Body }}',
- '{{ BodyS3Location }}',
- '{{ BasePath }}',
- '{{ CredentialsArn }}',
- '{{ CorsConfiguration }}',
- '{{ RouteKey }}',
- '{{ Target }}',
- '{{ FailOnWarnings }}',
- '{{ Description }}',
- '{{ DisableExecuteApiEndpoint }}',
- '{{ DisableSchemaValidation }}',
- '{{ Name }}',
- '{{ Version }}',
- '{{ ProtocolType }}',
- '{{ Tags }}',
- '{{ ApiKeySelectionExpression }}',
- '{{ IpAddressType }}',
+SELECT
+ '{{ route_selection_expression }}',
+ '{{ body }}',
+ '{{ body_s3_location }}',
+ '{{ base_path }}',
+ '{{ credentials_arn }}',
+ '{{ cors_configuration }}',
+ '{{ route_key }}',
+ '{{ target }}',
+ '{{ fail_on_warnings }}',
+ '{{ description }}',
+ '{{ disable_execute_api_endpoint }}',
+ '{{ disable_schema_validation }}',
+ '{{ name }}',
+ '{{ version }}',
+ '{{ protocol_type }}',
+ '{{ tags }}',
+ '{{ api_key_selection_expression }}',
+ '{{ ip_address_type }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -438,57 +438,56 @@ globals:
 resources:
   - name: api
     props:
-      - name: RouteSelectionExpression
-        value: '{{ RouteSelectionExpression }}'
-      - name: Body
+      - name: route_selection_expression
+        value: '{{ route_selection_expression }}'
+      - name: body
         value: {}
-      - name: BodyS3Location
+      - name: body_s3_location
         value:
-          Etag: '{{ Etag }}'
-          Bucket: '{{ Bucket }}'
-          Version: '{{ Version }}'
-          Key: '{{ Key }}'
-      - name: BasePath
-        value: '{{ BasePath }}'
-      - name: CredentialsArn
-        value: '{{ CredentialsArn }}'
-      - name: CorsConfiguration
+          etag: '{{ etag }}'
+          bucket: '{{ bucket }}'
+          version: '{{ version }}'
+          key: '{{ key }}'
+      - name: base_path
+        value: '{{ base_path }}'
+      - name: credentials_arn
+        value: '{{ credentials_arn }}'
+      - name: cors_configuration
         value:
-          AllowOrigins:
-            - '{{ AllowOrigins[0] }}'
-          AllowCredentials: '{{ AllowCredentials }}'
-          ExposeHeaders:
-            - '{{ ExposeHeaders[0] }}'
-          AllowHeaders:
-            - '{{ AllowHeaders[0] }}'
-          MaxAge: '{{ MaxAge }}'
-          AllowMethods:
-            - '{{ AllowMethods[0] }}'
-      - name: RouteKey
-        value: '{{ RouteKey }}'
-      - name: Target
-        value: '{{ Target }}'
-      - name: FailOnWarnings
-        value: '{{ FailOnWarnings }}'
-      - name: Description
-        value: '{{ Description }}'
-      - name: DisableExecuteApiEndpoint
-        value: '{{ DisableExecuteApiEndpoint }}'
-      - name: DisableSchemaValidation
-        value: '{{ DisableSchemaValidation }}'
-      - name: Name
-        value: '{{ Name }}'
-      - name: Version
-        value: '{{ Version }}'
-      - name: ProtocolType
-        value: '{{ ProtocolType }}'
-      - name: Tags
+          allow_origins:
+            - '{{ allow_origins[0] }}'
+          allow_credentials: '{{ allow_credentials }}'
+          expose_headers:
+            - '{{ expose_headers[0] }}'
+          allow_headers:
+            - '{{ allow_headers[0] }}'
+          max_age: '{{ max_age }}'
+          allow_methods:
+            - '{{ allow_methods[0] }}'
+      - name: route_key
+        value: '{{ route_key }}'
+      - name: target
+        value: '{{ target }}'
+      - name: fail_on_warnings
+        value: '{{ fail_on_warnings }}'
+      - name: description
+        value: '{{ description }}'
+      - name: disable_execute_api_endpoint
+        value: '{{ disable_execute_api_endpoint }}'
+      - name: disable_schema_validation
+        value: '{{ disable_schema_validation }}'
+      - name: name
+        value: '{{ name }}'
+      - name: version
+        value: '{{ version }}'
+      - name: protocol_type
+        value: '{{ protocol_type }}'
+      - name: tags
         value: {}
-      - name: ApiKeySelectionExpression
-        value: '{{ ApiKeySelectionExpression }}'
-      - name: IpAddressType
-        value: '{{ IpAddressType }}'
-
+      - name: api_key_selection_expression
+        value: '{{ api_key_selection_expression }}'
+      - name: ip_address_type
+        value: '{{ ip_address_type }}'
 ```
 </TabItem>
 </Tabs>
@@ -520,7 +519,7 @@ SET PatchDocument = string('{{ {
     "IpAddressType": ip_address_type
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<ApiId>';
+AND Identifier = '{{ api_id }}';
 ```
 
 
@@ -529,7 +528,7 @@ AND Identifier = '<ApiId>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.apigatewayv2.apis
-WHERE Identifier = '<ApiId>'
+WHERE Identifier = '{{ api_id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/apigatewayv2/authorizers/index.md b/website/docs/services/apigatewayv2/authorizers/index.md
index 55755f151..400240a55 100644
--- a/website/docs/services/apigatewayv2/authorizers/index.md
+++ b/website/docs/services/apigatewayv2/authorizers/index.md
@@ -217,7 +217,7 @@ api_id,
 authorizer_id,
 name
 FROM awscc.apigatewayv2.authorizers
-WHERE region = 'us-east-1' AND Identifier = '<AuthorizerId>|<ApiId>';
+WHERE region = 'us-east-1' AND Identifier = '{{ authorizer_id }}|{{ api_id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -256,10 +256,10 @@ INSERT INTO awscc.apigatewayv2.authorizers (
  Name,
  region
 )
-SELECT 
-'{{ AuthorizerType }}',
- '{{ ApiId }}',
- '{{ Name }}',
+SELECT
+'{{ authorizer_type }}',
+ '{{ api_id }}',
+ '{{ name }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -281,18 +281,18 @@ INSERT INTO awscc.apigatewayv2.authorizers (
  Name,
  region
 )
-SELECT 
- '{{ IdentityValidationExpression }}',
- '{{ AuthorizerUri }}',
- '{{ AuthorizerCredentialsArn }}',
- '{{ AuthorizerType }}',
- '{{ IdentitySource }}',
- '{{ JwtConfiguration }}',
- '{{ AuthorizerResultTtlInSeconds }}',
- '{{ AuthorizerPayloadFormatVersion }}',
- '{{ EnableSimpleResponses }}',
- '{{ ApiId }}',
- '{{ Name }}',
+SELECT
+ '{{ identity_validation_expression }}',
+ '{{ authorizer_uri }}',
+ '{{ authorizer_credentials_arn }}',
+ '{{ authorizer_type }}',
+ '{{ identity_source }}',
+ '{{ jwt_configuration }}',
+ '{{ authorizer_result_ttl_in_seconds }}',
+ '{{ authorizer_payload_format_version }}',
+ '{{ enable_simple_responses }}',
+ '{{ api_id }}',
+ '{{ name }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -310,33 +310,32 @@ globals:
 resources:
   - name: authorizer
     props:
-      - name: IdentityValidationExpression
-        value: '{{ IdentityValidationExpression }}'
-      - name: AuthorizerUri
-        value: '{{ AuthorizerUri }}'
-      - name: AuthorizerCredentialsArn
-        value: '{{ AuthorizerCredentialsArn }}'
-      - name: AuthorizerType
-        value: '{{ AuthorizerType }}'
-      - name: IdentitySource
+      - name: identity_validation_expression
+        value: '{{ identity_validation_expression }}'
+      - name: authorizer_uri
+        value: '{{ authorizer_uri }}'
+      - name: authorizer_credentials_arn
+        value: '{{ authorizer_credentials_arn }}'
+      - name: authorizer_type
+        value: '{{ authorizer_type }}'
+      - name: identity_source
         value:
-          - '{{ IdentitySource[0] }}'
-      - name: JwtConfiguration
+          - '{{ identity_source[0] }}'
+      - name: jwt_configuration
         value:
-          Issuer: '{{ Issuer }}'
-          Audience:
-            - '{{ Audience[0] }}'
-      - name: AuthorizerResultTtlInSeconds
-        value: '{{ AuthorizerResultTtlInSeconds }}'
-      - name: AuthorizerPayloadFormatVersion
-        value: '{{ AuthorizerPayloadFormatVersion }}'
-      - name: EnableSimpleResponses
-        value: '{{ EnableSimpleResponses }}'
-      - name: ApiId
-        value: '{{ ApiId }}'
-      - name: Name
-        value: '{{ Name }}'
-
+          issuer: '{{ issuer }}'
+          audience:
+            - '{{ audience[0] }}'
+      - name: authorizer_result_ttl_in_seconds
+        value: '{{ authorizer_result_ttl_in_seconds }}'
+      - name: authorizer_payload_format_version
+        value: '{{ authorizer_payload_format_version }}'
+      - name: enable_simple_responses
+        value: '{{ enable_simple_responses }}'
+      - name: api_id
+        value: '{{ api_id }}'
+      - name: name
+        value: '{{ name }}'
 ```
 </TabItem>
 </Tabs>
@@ -361,7 +360,7 @@ SET PatchDocument = string('{{ {
     "Name": name
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<AuthorizerId>|<ApiId>';
+AND Identifier = '{{ authorizer_id }}|{{ api_id }}';
 ```
 
 
@@ -370,7 +369,7 @@ AND Identifier = '<AuthorizerId>|<ApiId>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.apigatewayv2.authorizers
-WHERE Identifier = '<AuthorizerId|ApiId>'
+WHERE Identifier = '{{ authorizer_id }}|{{ api_id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/apigatewayv2/deployments/index.md b/website/docs/services/apigatewayv2/deployments/index.md
index 483fdb1c7..f32267570 100644
--- a/website/docs/services/apigatewayv2/deployments/index.md
+++ b/website/docs/services/apigatewayv2/deployments/index.md
@@ -157,7 +157,7 @@ description,
 stage_name,
 api_id
 FROM awscc.apigatewayv2.deployments
-WHERE region = 'us-east-1' AND Identifier = '<ApiId>|<DeploymentId>';
+WHERE region = 'us-east-1' AND Identifier = '{{ api_id }}|{{ deployment_id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -194,8 +194,8 @@ INSERT INTO awscc.apigatewayv2.deployments (
  ApiId,
  region
 )
-SELECT 
-'{{ ApiId }}',
+SELECT
+'{{ api_id }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -209,10 +209,10 @@ INSERT INTO awscc.apigatewayv2.deployments (
  ApiId,
  region
 )
-SELECT 
- '{{ Description }}',
- '{{ StageName }}',
- '{{ ApiId }}',
+SELECT
+ '{{ description }}',
+ '{{ stage_name }}',
+ '{{ api_id }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -230,13 +230,12 @@ globals:
 resources:
   - name: deployment
     props:
-      - name: Description
-        value: '{{ Description }}'
-      - name: StageName
-        value: '{{ StageName }}'
-      - name: ApiId
-        value: '{{ ApiId }}'
-
+      - name: description
+        value: '{{ description }}'
+      - name: stage_name
+        value: '{{ stage_name }}'
+      - name: api_id
+        value: '{{ api_id }}'
 ```
 </TabItem>
 </Tabs>
@@ -253,7 +252,7 @@ SET PatchDocument = string('{{ {
     "StageName": stage_name
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<ApiId>|<DeploymentId>';
+AND Identifier = '{{ api_id }}|{{ deployment_id }}';
 ```
 
 
@@ -262,7 +261,7 @@ AND Identifier = '<ApiId>|<DeploymentId>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.apigatewayv2.deployments
-WHERE Identifier = '<ApiId|DeploymentId>'
+WHERE Identifier = '{{ api_id }}|{{ deployment_id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/apigatewayv2/domain_names/index.md b/website/docs/services/apigatewayv2/domain_names/index.md
index d4a5ee927..3879370ff 100644
--- a/website/docs/services/apigatewayv2/domain_names/index.md
+++ b/website/docs/services/apigatewayv2/domain_names/index.md
@@ -220,7 +220,7 @@ domain_name_configurations,
 routing_mode,
 tags
 FROM awscc.apigatewayv2.domain_names
-WHERE region = 'us-east-1' AND Identifier = '<DomainName>';
+WHERE region = 'us-east-1' AND Identifier = '{{ domain_name }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -256,8 +256,8 @@ INSERT INTO awscc.apigatewayv2.domain_names (
  DomainName,
  region
 )
-SELECT 
-'{{ DomainName }}',
+SELECT
+'{{ domain_name }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -273,12 +273,12 @@ INSERT INTO awscc.apigatewayv2.domain_names (
  Tags,
  region
 )
-SELECT 
- '{{ MutualTlsAuthentication }}',
- '{{ DomainName }}',
- '{{ DomainNameConfigurations }}',
- '{{ RoutingMode }}',
- '{{ Tags }}',
+SELECT
+ '{{ mutual_tls_authentication }}',
+ '{{ domain_name }}',
+ '{{ domain_name_configurations }}',
+ '{{ routing_mode }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -296,25 +296,24 @@ globals:
 resources:
   - name: domain_name
     props:
-      - name: MutualTlsAuthentication
+      - name: mutual_tls_authentication
         value:
-          TruststoreVersion: '{{ TruststoreVersion }}'
-          TruststoreUri: '{{ TruststoreUri }}'
-      - name: DomainName
-        value: '{{ DomainName }}'
-      - name: DomainNameConfigurations
+          truststore_version: '{{ truststore_version }}'
+          truststore_uri: '{{ truststore_uri }}'
+      - name: domain_name
+        value: '{{ domain_name }}'
+      - name: domain_name_configurations
         value:
-          - OwnershipVerificationCertificateArn: '{{ OwnershipVerificationCertificateArn }}'
-            EndpointType: '{{ EndpointType }}'
-            CertificateName: '{{ CertificateName }}'
-            SecurityPolicy: '{{ SecurityPolicy }}'
-            CertificateArn: '{{ CertificateArn }}'
-            IpAddressType: '{{ IpAddressType }}'
-      - name: RoutingMode
-        value: '{{ RoutingMode }}'
-      - name: Tags
+          - ownership_verification_certificate_arn: '{{ ownership_verification_certificate_arn }}'
+            endpoint_type: '{{ endpoint_type }}'
+            certificate_name: '{{ certificate_name }}'
+            security_policy: '{{ security_policy }}'
+            certificate_arn: '{{ certificate_arn }}'
+            ip_address_type: '{{ ip_address_type }}'
+      - name: routing_mode
+        value: '{{ routing_mode }}'
+      - name: tags
         value: {}
-
 ```
 </TabItem>
 </Tabs>
@@ -333,7 +332,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<DomainName>';
+AND Identifier = '{{ domain_name }}';
 ```
 
 
@@ -342,7 +341,7 @@ AND Identifier = '<DomainName>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.apigatewayv2.domain_names
-WHERE Identifier = '<DomainName>'
+WHERE Identifier = '{{ domain_name }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/apigatewayv2/integration_responses/index.md b/website/docs/services/apigatewayv2/integration_responses/index.md
index 70db74df9..95eafd49e 100644
--- a/website/docs/services/apigatewayv2/integration_responses/index.md
+++ b/website/docs/services/apigatewayv2/integration_responses/index.md
@@ -186,7 +186,7 @@ integration_id,
 integration_response_key,
 api_id
 FROM awscc.apigatewayv2.integration_responses
-WHERE region = 'us-east-1' AND Identifier = '<ApiId>|<IntegrationId>|<IntegrationResponseId>';
+WHERE region = 'us-east-1' AND Identifier = '{{ api_id }}|{{ integration_id }}|{{ integration_response_id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -226,10 +226,10 @@ INSERT INTO awscc.apigatewayv2.integration_responses (
  ApiId,
  region
 )
-SELECT 
-'{{ IntegrationId }}',
- '{{ IntegrationResponseKey }}',
- '{{ ApiId }}',
+SELECT
+'{{ integration_id }}',
+ '{{ integration_response_key }}',
+ '{{ api_id }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -247,14 +247,14 @@ INSERT INTO awscc.apigatewayv2.integration_responses (
  ApiId,
  region
 )
-SELECT 
- '{{ ResponseTemplates }}',
- '{{ TemplateSelectionExpression }}',
- '{{ ResponseParameters }}',
- '{{ ContentHandlingStrategy }}',
- '{{ IntegrationId }}',
- '{{ IntegrationResponseKey }}',
- '{{ ApiId }}',
+SELECT
+ '{{ response_templates }}',
+ '{{ template_selection_expression }}',
+ '{{ response_parameters }}',
+ '{{ content_handling_strategy }}',
+ '{{ integration_id }}',
+ '{{ integration_response_key }}',
+ '{{ api_id }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -272,21 +272,20 @@ globals:
 resources:
   - name: integration_response
     props:
-      - name: ResponseTemplates
+      - name: response_templates
         value: {}
-      - name: TemplateSelectionExpression
-        value: '{{ TemplateSelectionExpression }}'
-      - name: ResponseParameters
+      - name: template_selection_expression
+        value: '{{ template_selection_expression }}'
+      - name: response_parameters
         value: {}
-      - name: ContentHandlingStrategy
-        value: '{{ ContentHandlingStrategy }}'
-      - name: IntegrationId
-        value: '{{ IntegrationId }}'
-      - name: IntegrationResponseKey
-        value: '{{ IntegrationResponseKey }}'
-      - name: ApiId
-        value: '{{ ApiId }}'
-
+      - name: content_handling_strategy
+        value: '{{ content_handling_strategy }}'
+      - name: integration_id
+        value: '{{ integration_id }}'
+      - name: integration_response_key
+        value: '{{ integration_response_key }}'
+      - name: api_id
+        value: '{{ api_id }}'
 ```
 </TabItem>
 </Tabs>
@@ -306,7 +305,7 @@ SET PatchDocument = string('{{ {
     "IntegrationResponseKey": integration_response_key
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<ApiId>|<IntegrationId>|<IntegrationResponseId>';
+AND Identifier = '{{ api_id }}|{{ integration_id }}|{{ integration_response_id }}';
 ```
 
 
@@ -315,7 +314,7 @@ AND Identifier = '<ApiId>|<IntegrationId>|<IntegrationResponseId>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.apigatewayv2.integration_responses
-WHERE Identifier = '<ApiId|IntegrationId|IntegrationResponseId>'
+WHERE Identifier = '{{ api_id }}|{{ integration_id }}|{{ integration_response_id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/apigatewayv2/integrations/index.md b/website/docs/services/apigatewayv2/integrations/index.md
index 06b7e21d6..c052c4fcf 100644
--- a/website/docs/services/apigatewayv2/integrations/index.md
+++ b/website/docs/services/apigatewayv2/integrations/index.md
@@ -254,7 +254,7 @@ template_selection_expression,
 timeout_in_millis,
 tls_config
 FROM awscc.apigatewayv2.integrations
-WHERE region = 'us-east-1' AND Identifier = '<ApiId>|<IntegrationId>';
+WHERE region = 'us-east-1' AND Identifier = '{{ api_id }}|{{ integration_id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -292,9 +292,9 @@ INSERT INTO awscc.apigatewayv2.integrations (
  IntegrationType,
  region
 )
-SELECT 
-'{{ ApiId }}',
- '{{ IntegrationType }}',
+SELECT
+'{{ api_id }}',
+ '{{ integration_type }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -323,25 +323,25 @@ INSERT INTO awscc.apigatewayv2.integrations (
  TlsConfig,
  region
 )
-SELECT 
- '{{ ApiId }}',
- '{{ ConnectionId }}',
- '{{ ConnectionType }}',
- '{{ ContentHandlingStrategy }}',
- '{{ CredentialsArn }}',
- '{{ Description }}',
- '{{ IntegrationMethod }}',
- '{{ IntegrationSubtype }}',
- '{{ IntegrationType }}',
- '{{ IntegrationUri }}',
- '{{ PassthroughBehavior }}',
- '{{ PayloadFormatVersion }}',
- '{{ RequestParameters }}',
- '{{ RequestTemplates }}',
- '{{ ResponseParameters }}',
- '{{ TemplateSelectionExpression }}',
- '{{ TimeoutInMillis }}',
- '{{ TlsConfig }}',
+SELECT
+ '{{ api_id }}',
+ '{{ connection_id }}',
+ '{{ connection_type }}',
+ '{{ content_handling_strategy }}',
+ '{{ credentials_arn }}',
+ '{{ description }}',
+ '{{ integration_method }}',
+ '{{ integration_subtype }}',
+ '{{ integration_type }}',
+ '{{ integration_uri }}',
+ '{{ passthrough_behavior }}',
+ '{{ payload_format_version }}',
+ '{{ request_parameters }}',
+ '{{ request_templates }}',
+ '{{ response_parameters }}',
+ '{{ template_selection_expression }}',
+ '{{ timeout_in_millis }}',
+ '{{ tls_config }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -359,44 +359,43 @@ globals:
 resources:
   - name: integration
     props:
-      - name: ApiId
-        value: '{{ ApiId }}'
-      - name: ConnectionId
-        value: '{{ ConnectionId }}'
-      - name: ConnectionType
-        value: '{{ ConnectionType }}'
-      - name: ContentHandlingStrategy
-        value: '{{ ContentHandlingStrategy }}'
-      - name: CredentialsArn
-        value: '{{ CredentialsArn }}'
-      - name: Description
-        value: '{{ Description }}'
-      - name: IntegrationMethod
-        value: '{{ IntegrationMethod }}'
-      - name: IntegrationSubtype
-        value: '{{ IntegrationSubtype }}'
-      - name: IntegrationType
-        value: '{{ IntegrationType }}'
-      - name: IntegrationUri
-        value: '{{ IntegrationUri }}'
-      - name: PassthroughBehavior
-        value: '{{ PassthroughBehavior }}'
-      - name: PayloadFormatVersion
-        value: '{{ PayloadFormatVersion }}'
-      - name: RequestParameters
+      - name: api_id
+        value: '{{ api_id }}'
+      - name: connection_id
+        value: '{{ connection_id }}'
+      - name: connection_type
+        value: '{{ connection_type }}'
+      - name: content_handling_strategy
+        value: '{{ content_handling_strategy }}'
+      - name: credentials_arn
+        value: '{{ credentials_arn }}'
+      - name: description
+        value: '{{ description }}'
+      - name: integration_method
+        value: '{{ integration_method }}'
+      - name: integration_subtype
+        value: '{{ integration_subtype }}'
+      - name: integration_type
+        value: '{{ integration_type }}'
+      - name: integration_uri
+        value: '{{ integration_uri }}'
+      - name: passthrough_behavior
+        value: '{{ passthrough_behavior }}'
+      - name: payload_format_version
+        value: '{{ payload_format_version }}'
+      - name: request_parameters
         value: {}
-      - name: RequestTemplates
+      - name: request_templates
         value: {}
-      - name: ResponseParameters
+      - name: response_parameters
         value: {}
-      - name: TemplateSelectionExpression
-        value: '{{ TemplateSelectionExpression }}'
-      - name: TimeoutInMillis
-        value: '{{ TimeoutInMillis }}'
-      - name: TlsConfig
+      - name: template_selection_expression
+        value: '{{ template_selection_expression }}'
+      - name: timeout_in_millis
+        value: '{{ timeout_in_millis }}'
+      - name: tls_config
         value:
-          ServerNameToVerify: '{{ ServerNameToVerify }}'
-
+          server_name_to_verify: '{{ server_name_to_verify }}'
 ```
 </TabItem>
 </Tabs>
@@ -428,7 +427,7 @@ SET PatchDocument = string('{{ {
     "TlsConfig": tls_config
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<ApiId>|<IntegrationId>';
+AND Identifier = '{{ api_id }}|{{ integration_id }}';
 ```
 
 
@@ -437,7 +436,7 @@ AND Identifier = '<ApiId>|<IntegrationId>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.apigatewayv2.integrations
-WHERE Identifier = '<ApiId|IntegrationId>'
+WHERE Identifier = '{{ api_id }}|{{ integration_id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/apigatewayv2/models/index.md b/website/docs/services/apigatewayv2/models/index.md
index 1557c6e2f..5d8ae298b 100644
--- a/website/docs/services/apigatewayv2/models/index.md
+++ b/website/docs/services/apigatewayv2/models/index.md
@@ -169,7 +169,7 @@ schema,
 api_id,
 name
 FROM awscc.apigatewayv2.models
-WHERE region = 'us-east-1' AND Identifier = '<ApiId>|<ModelId>';
+WHERE region = 'us-east-1' AND Identifier = '{{ api_id }}|{{ model_id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -208,10 +208,10 @@ INSERT INTO awscc.apigatewayv2.models (
  Name,
  region
 )
-SELECT 
-'{{ Schema }}',
- '{{ ApiId }}',
- '{{ Name }}',
+SELECT
+'{{ schema }}',
+ '{{ api_id }}',
+ '{{ name }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -227,12 +227,12 @@ INSERT INTO awscc.apigatewayv2.models (
  Name,
  region
 )
-SELECT 
- '{{ Description }}',
- '{{ ContentType }}',
- '{{ Schema }}',
- '{{ ApiId }}',
- '{{ Name }}',
+SELECT
+ '{{ description }}',
+ '{{ content_type }}',
+ '{{ schema }}',
+ '{{ api_id }}',
+ '{{ name }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -250,17 +250,16 @@ globals:
 resources:
   - name: model
     props:
-      - name: Description
-        value: '{{ Description }}'
-      - name: ContentType
-        value: '{{ ContentType }}'
-      - name: Schema
+      - name: description
+        value: '{{ description }}'
+      - name: content_type
+        value: '{{ content_type }}'
+      - name: schema
         value: {}
-      - name: ApiId
-        value: '{{ ApiId }}'
-      - name: Name
-        value: '{{ Name }}'
-
+      - name: api_id
+        value: '{{ api_id }}'
+      - name: name
+        value: '{{ name }}'
 ```
 </TabItem>
 </Tabs>
@@ -279,7 +278,7 @@ SET PatchDocument = string('{{ {
     "Name": name
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<ApiId>|<ModelId>';
+AND Identifier = '{{ api_id }}|{{ model_id }}';
 ```
 
 
@@ -288,7 +287,7 @@ AND Identifier = '<ApiId>|<ModelId>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.apigatewayv2.models
-WHERE Identifier = '<ApiId|ModelId>'
+WHERE Identifier = '{{ api_id }}|{{ model_id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/apigatewayv2/route_responses/index.md b/website/docs/services/apigatewayv2/route_responses/index.md
index ed54d9019..f20ed7a29 100644
--- a/website/docs/services/apigatewayv2/route_responses/index.md
+++ b/website/docs/services/apigatewayv2/route_responses/index.md
@@ -180,7 +180,7 @@ api_id,
 response_models,
 route_response_id
 FROM awscc.apigatewayv2.route_responses
-WHERE region = 'us-east-1' AND Identifier = '<ApiId>|<RouteId>|<RouteResponseId>';
+WHERE region = 'us-east-1' AND Identifier = '{{ api_id }}|{{ route_id }}|{{ route_response_id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -220,10 +220,10 @@ INSERT INTO awscc.apigatewayv2.route_responses (
  ApiId,
  region
 )
-SELECT 
-'{{ RouteResponseKey }}',
- '{{ RouteId }}',
- '{{ ApiId }}',
+SELECT
+'{{ route_response_key }}',
+ '{{ route_id }}',
+ '{{ api_id }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -240,13 +240,13 @@ INSERT INTO awscc.apigatewayv2.route_responses (
  ResponseModels,
  region
 )
-SELECT 
- '{{ RouteResponseKey }}',
- '{{ ResponseParameters }}',
- '{{ RouteId }}',
- '{{ ModelSelectionExpression }}',
- '{{ ApiId }}',
- '{{ ResponseModels }}',
+SELECT
+ '{{ route_response_key }}',
+ '{{ response_parameters }}',
+ '{{ route_id }}',
+ '{{ model_selection_expression }}',
+ '{{ api_id }}',
+ '{{ response_models }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -264,19 +264,18 @@ globals:
 resources:
   - name: route_response
     props:
-      - name: RouteResponseKey
-        value: '{{ RouteResponseKey }}'
-      - name: ResponseParameters
+      - name: route_response_key
+        value: '{{ route_response_key }}'
+      - name: response_parameters
         value: null
-      - name: RouteId
-        value: '{{ RouteId }}'
-      - name: ModelSelectionExpression
-        value: '{{ ModelSelectionExpression }}'
-      - name: ApiId
-        value: '{{ ApiId }}'
-      - name: ResponseModels
+      - name: route_id
+        value: '{{ route_id }}'
+      - name: model_selection_expression
+        value: '{{ model_selection_expression }}'
+      - name: api_id
+        value: '{{ api_id }}'
+      - name: response_models
         value: {}
-
 ```
 </TabItem>
 </Tabs>
@@ -295,7 +294,7 @@ SET PatchDocument = string('{{ {
     "ResponseModels": response_models
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<ApiId>|<RouteId>|<RouteResponseId>';
+AND Identifier = '{{ api_id }}|{{ route_id }}|{{ route_response_id }}';
 ```
 
 
@@ -304,7 +303,7 @@ AND Identifier = '<ApiId>|<RouteId>|<RouteResponseId>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.apigatewayv2.route_responses
-WHERE Identifier = '<ApiId|RouteId|RouteResponseId>'
+WHERE Identifier = '{{ api_id }}|{{ route_id }}|{{ route_response_id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/apigatewayv2/routes/index.md b/website/docs/services/apigatewayv2/routes/index.md
index 6e691913c..09e250192 100644
--- a/website/docs/services/apigatewayv2/routes/index.md
+++ b/website/docs/services/apigatewayv2/routes/index.md
@@ -211,7 +211,7 @@ request_parameters,
 target,
 authorizer_id
 FROM awscc.apigatewayv2.routes
-WHERE region = 'us-east-1' AND Identifier = '<ApiId>|<RouteId>';
+WHERE region = 'us-east-1' AND Identifier = '{{ api_id }}|{{ route_id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -249,9 +249,9 @@ INSERT INTO awscc.apigatewayv2.routes (
  ApiId,
  region
 )
-SELECT 
-'{{ RouteKey }}',
- '{{ ApiId }}',
+SELECT
+'{{ route_key }}',
+ '{{ api_id }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -274,19 +274,19 @@ INSERT INTO awscc.apigatewayv2.routes (
  AuthorizerId,
  region
 )
-SELECT 
- '{{ RouteResponseSelectionExpression }}',
- '{{ RequestModels }}',
- '{{ OperationName }}',
- '{{ AuthorizationScopes }}',
- '{{ ApiKeyRequired }}',
- '{{ RouteKey }}',
- '{{ AuthorizationType }}',
- '{{ ModelSelectionExpression }}',
- '{{ ApiId }}',
- '{{ RequestParameters }}',
- '{{ Target }}',
- '{{ AuthorizerId }}',
+SELECT
+ '{{ route_response_selection_expression }}',
+ '{{ request_models }}',
+ '{{ operation_name }}',
+ '{{ authorization_scopes }}',
+ '{{ api_key_required }}',
+ '{{ route_key }}',
+ '{{ authorization_type }}',
+ '{{ model_selection_expression }}',
+ '{{ api_id }}',
+ '{{ request_parameters }}',
+ '{{ target }}',
+ '{{ authorizer_id }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -304,32 +304,31 @@ globals:
 resources:
   - name: route
     props:
-      - name: RouteResponseSelectionExpression
-        value: '{{ RouteResponseSelectionExpression }}'
-      - name: RequestModels
+      - name: route_response_selection_expression
+        value: '{{ route_response_selection_expression }}'
+      - name: request_models
         value: {}
-      - name: OperationName
-        value: '{{ OperationName }}'
-      - name: AuthorizationScopes
+      - name: operation_name
+        value: '{{ operation_name }}'
+      - name: authorization_scopes
         value:
-          - '{{ AuthorizationScopes[0] }}'
-      - name: ApiKeyRequired
-        value: '{{ ApiKeyRequired }}'
-      - name: RouteKey
-        value: '{{ RouteKey }}'
-      - name: AuthorizationType
-        value: '{{ AuthorizationType }}'
-      - name: ModelSelectionExpression
-        value: '{{ ModelSelectionExpression }}'
-      - name: ApiId
-        value: '{{ ApiId }}'
-      - name: RequestParameters
+          - '{{ authorization_scopes[0] }}'
+      - name: api_key_required
+        value: '{{ api_key_required }}'
+      - name: route_key
+        value: '{{ route_key }}'
+      - name: authorization_type
+        value: '{{ authorization_type }}'
+      - name: model_selection_expression
+        value: '{{ model_selection_expression }}'
+      - name: api_id
+        value: '{{ api_id }}'
+      - name: request_parameters
         value: {}
-      - name: Target
-        value: '{{ Target }}'
-      - name: AuthorizerId
-        value: '{{ AuthorizerId }}'
-
+      - name: target
+        value: '{{ target }}'
+      - name: authorizer_id
+        value: '{{ authorizer_id }}'
 ```
 </TabItem>
 </Tabs>
@@ -355,7 +354,7 @@ SET PatchDocument = string('{{ {
     "AuthorizerId": authorizer_id
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<ApiId>|<RouteId>';
+AND Identifier = '{{ api_id }}|{{ route_id }}';
 ```
 
 
@@ -364,7 +363,7 @@ AND Identifier = '<ApiId>|<RouteId>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.apigatewayv2.routes
-WHERE Identifier = '<ApiId|RouteId>'
+WHERE Identifier = '{{ api_id }}|{{ route_id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/apigatewayv2/routing_rules/index.md b/website/docs/services/apigatewayv2/routing_rules/index.md
index 23c18a4ff..b8ae5d75f 100644
--- a/website/docs/services/apigatewayv2/routing_rules/index.md
+++ b/website/docs/services/apigatewayv2/routing_rules/index.md
@@ -226,7 +226,7 @@ priority,
 conditions,
 actions
 FROM awscc.apigatewayv2.routing_rules
-WHERE region = 'us-east-1' AND Identifier = '<RoutingRuleArn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ routing_rule_arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -265,11 +265,11 @@ INSERT INTO awscc.apigatewayv2.routing_rules (
  Actions,
  region
 )
-SELECT 
-'{{ DomainNameArn }}',
- '{{ Priority }}',
- '{{ Conditions }}',
- '{{ Actions }}',
+SELECT
+'{{ domain_name_arn }}',
+ '{{ priority }}',
+ '{{ conditions }}',
+ '{{ actions }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -284,11 +284,11 @@ INSERT INTO awscc.apigatewayv2.routing_rules (
  Actions,
  region
 )
-SELECT 
- '{{ DomainNameArn }}',
- '{{ Priority }}',
- '{{ Conditions }}',
- '{{ Actions }}',
+SELECT
+ '{{ domain_name_arn }}',
+ '{{ priority }}',
+ '{{ conditions }}',
+ '{{ actions }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -306,26 +306,25 @@ globals:
 resources:
   - name: routing_rule
     props:
-      - name: DomainNameArn
-        value: '{{ DomainNameArn }}'
-      - name: Priority
-        value: '{{ Priority }}'
-      - name: Conditions
+      - name: domain_name_arn
+        value: '{{ domain_name_arn }}'
+      - name: priority
+        value: '{{ priority }}'
+      - name: conditions
         value:
-          - MatchHeaders:
-              AnyOf:
-                - Header: '{{ Header }}'
-                  ValueGlob: '{{ ValueGlob }}'
-            MatchBasePaths:
-              AnyOf:
-                - '{{ AnyOf[0] }}'
-      - name: Actions
+          - match_headers:
+              any_of:
+                - header: '{{ header }}'
+                  value_glob: '{{ value_glob }}'
+            match_base_paths:
+              any_of:
+                - '{{ any_of[0] }}'
+      - name: actions
         value:
-          - InvokeApi:
-              ApiId: '{{ ApiId }}'
-              Stage: '{{ Stage }}'
-              StripBasePath: '{{ StripBasePath }}'
-
+          - invoke_api:
+              api_id: '{{ api_id }}'
+              stage: '{{ stage }}'
+              strip_base_path: '{{ strip_base_path }}'
 ```
 </TabItem>
 </Tabs>
@@ -343,7 +342,7 @@ SET PatchDocument = string('{{ {
     "Actions": actions
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<RoutingRuleArn>';
+AND Identifier = '{{ routing_rule_arn }}';
 ```
 
 
@@ -352,7 +351,7 @@ AND Identifier = '<RoutingRuleArn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.apigatewayv2.routing_rules
-WHERE Identifier = '<RoutingRuleArn>'
+WHERE Identifier = '{{ routing_rule_arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/apigatewayv2/vpc_links/index.md b/website/docs/services/apigatewayv2/vpc_links/index.md
index 66f3ea3c7..9c085ce3d 100644
--- a/website/docs/services/apigatewayv2/vpc_links/index.md
+++ b/website/docs/services/apigatewayv2/vpc_links/index.md
@@ -158,7 +158,7 @@ security_group_ids,
 tags,
 name
 FROM awscc.apigatewayv2.vpc_links
-WHERE region = 'us-east-1' AND Identifier = '<VpcLinkId>';
+WHERE region = 'us-east-1' AND Identifier = '{{ vpc_link_id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -195,9 +195,9 @@ INSERT INTO awscc.apigatewayv2.vpc_links (
  Name,
  region
 )
-SELECT 
-'{{ SubnetIds }}',
- '{{ Name }}',
+SELECT
+'{{ subnet_ids }}',
+ '{{ name }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -212,11 +212,11 @@ INSERT INTO awscc.apigatewayv2.vpc_links (
  Name,
  region
 )
-SELECT 
- '{{ SubnetIds }}',
- '{{ SecurityGroupIds }}',
- '{{ Tags }}',
- '{{ Name }}',
+SELECT
+ '{{ subnet_ids }}',
+ '{{ security_group_ids }}',
+ '{{ tags }}',
+ '{{ name }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -234,17 +234,16 @@ globals:
 resources:
   - name: vpc_link
     props:
-      - name: SubnetIds
+      - name: subnet_ids
         value:
-          - '{{ SubnetIds[0] }}'
-      - name: SecurityGroupIds
+          - '{{ subnet_ids[0] }}'
+      - name: security_group_ids
         value:
-          - '{{ SecurityGroupIds[0] }}'
-      - name: Tags
+          - '{{ security_group_ids[0] }}'
+      - name: tags
         value: {}
-      - name: Name
-        value: '{{ Name }}'
-
+      - name: name
+        value: '{{ name }}'
 ```
 </TabItem>
 </Tabs>
@@ -261,7 +260,7 @@ SET PatchDocument = string('{{ {
     "Name": name
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<VpcLinkId>';
+AND Identifier = '{{ vpc_link_id }}';
 ```
 
 
@@ -270,7 +269,7 @@ AND Identifier = '<VpcLinkId>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.apigatewayv2.vpc_links
-WHERE Identifier = '<VpcLinkId>'
+WHERE Identifier = '{{ vpc_link_id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/appconfig/applications/index.md b/website/docs/services/appconfig/applications/index.md
index 5f8cd4f29..bd5a702e8 100644
--- a/website/docs/services/appconfig/applications/index.md
+++ b/website/docs/services/appconfig/applications/index.md
@@ -164,7 +164,7 @@ application_id,
 tags,
 name
 FROM awscc.appconfig.applications
-WHERE region = 'us-east-1' AND Identifier = '<ApplicationId>';
+WHERE region = 'us-east-1' AND Identifier = '{{ application_id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -200,8 +200,8 @@ INSERT INTO awscc.appconfig.applications (
  Name,
  region
 )
-SELECT 
-'{{ Name }}',
+SELECT
+'{{ name }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -215,10 +215,10 @@ INSERT INTO awscc.appconfig.applications (
  Name,
  region
 )
-SELECT 
- '{{ Description }}',
- '{{ Tags }}',
- '{{ Name }}',
+SELECT
+ '{{ description }}',
+ '{{ tags }}',
+ '{{ name }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -236,15 +236,14 @@ globals:
 resources:
   - name: application
     props:
-      - name: Description
-        value: '{{ Description }}'
-      - name: Tags
+      - name: description
+        value: '{{ description }}'
+      - name: tags
         value:
-          - Value: '{{ Value }}'
-            Key: '{{ Key }}'
-      - name: Name
-        value: '{{ Name }}'
-
+          - value: '{{ value }}'
+            key: '{{ key }}'
+      - name: name
+        value: '{{ name }}'
 ```
 </TabItem>
 </Tabs>
@@ -262,7 +261,7 @@ SET PatchDocument = string('{{ {
     "Name": name
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<ApplicationId>';
+AND Identifier = '{{ application_id }}';
 ```
 
 
@@ -271,7 +270,7 @@ AND Identifier = '<ApplicationId>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.appconfig.applications
-WHERE Identifier = '<ApplicationId>'
+WHERE Identifier = '{{ application_id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/appconfig/configuration_profiles/index.md b/website/docs/services/appconfig/configuration_profiles/index.md
index 684fb7f3b..ab959a9bc 100644
--- a/website/docs/services/appconfig/configuration_profiles/index.md
+++ b/website/docs/services/appconfig/configuration_profiles/index.md
@@ -229,7 +229,7 @@ application_id,
 tags,
 name
 FROM awscc.appconfig.configuration_profiles
-WHERE region = 'us-east-1' AND Identifier = '<ApplicationId>|<ConfigurationProfileId>';
+WHERE region = 'us-east-1' AND Identifier = '{{ application_id }}|{{ configuration_profile_id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -268,10 +268,10 @@ INSERT INTO awscc.appconfig.configuration_profiles (
  Name,
  region
 )
-SELECT 
-'{{ LocationUri }}',
- '{{ ApplicationId }}',
- '{{ Name }}',
+SELECT
+'{{ location_uri }}',
+ '{{ application_id }}',
+ '{{ name }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -292,17 +292,17 @@ INSERT INTO awscc.appconfig.configuration_profiles (
  Name,
  region
 )
-SELECT 
- '{{ LocationUri }}',
- '{{ Type }}',
- '{{ KmsKeyIdentifier }}',
- '{{ Description }}',
- '{{ Validators }}',
- '{{ RetrievalRoleArn }}',
- '{{ DeletionProtectionCheck }}',
- '{{ ApplicationId }}',
- '{{ Tags }}',
- '{{ Name }}',
+SELECT
+ '{{ location_uri }}',
+ '{{ type }}',
+ '{{ kms_key_identifier }}',
+ '{{ description }}',
+ '{{ validators }}',
+ '{{ retrieval_role_arn }}',
+ '{{ deletion_protection_check }}',
+ '{{ application_id }}',
+ '{{ tags }}',
+ '{{ name }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -320,31 +320,30 @@ globals:
 resources:
   - name: configuration_profile
     props:
-      - name: LocationUri
-        value: '{{ LocationUri }}'
-      - name: Type
-        value: '{{ Type }}'
-      - name: KmsKeyIdentifier
-        value: '{{ KmsKeyIdentifier }}'
-      - name: Description
-        value: '{{ Description }}'
-      - name: Validators
+      - name: location_uri
+        value: '{{ location_uri }}'
+      - name: type
+        value: '{{ type }}'
+      - name: kms_key_identifier
+        value: '{{ kms_key_identifier }}'
+      - name: description
+        value: '{{ description }}'
+      - name: validators
         value:
-          - Type: '{{ Type }}'
-            Content: '{{ Content }}'
-      - name: RetrievalRoleArn
-        value: '{{ RetrievalRoleArn }}'
-      - name: DeletionProtectionCheck
-        value: '{{ DeletionProtectionCheck }}'
-      - name: ApplicationId
-        value: '{{ ApplicationId }}'
-      - name: Tags
+          - type: '{{ type }}'
+            content: '{{ content }}'
+      - name: retrieval_role_arn
+        value: '{{ retrieval_role_arn }}'
+      - name: deletion_protection_check
+        value: '{{ deletion_protection_check }}'
+      - name: application_id
+        value: '{{ application_id }}'
+      - name: tags
         value:
-          - Value: '{{ Value }}'
-            Key: '{{ Key }}'
-      - name: Name
-        value: '{{ Name }}'
-
+          - value: '{{ value }}'
+            key: '{{ key }}'
+      - name: name
+        value: '{{ name }}'
 ```
 </TabItem>
 </Tabs>
@@ -366,7 +365,7 @@ SET PatchDocument = string('{{ {
     "Name": name
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<ApplicationId>|<ConfigurationProfileId>';
+AND Identifier = '{{ application_id }}|{{ configuration_profile_id }}';
 ```
 
 
@@ -375,7 +374,7 @@ AND Identifier = '<ApplicationId>|<ConfigurationProfileId>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.appconfig.configuration_profiles
-WHERE Identifier = '<ApplicationId|ConfigurationProfileId>'
+WHERE Identifier = '{{ application_id }}|{{ configuration_profile_id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/appconfig/deployment_strategies/index.md b/website/docs/services/appconfig/deployment_strategies/index.md
index 7b35acd5f..bb3a9b71d 100644
--- a/website/docs/services/appconfig/deployment_strategies/index.md
+++ b/website/docs/services/appconfig/deployment_strategies/index.md
@@ -194,7 +194,7 @@ replicate_to,
 tags,
 id
 FROM awscc.appconfig.deployment_strategies
-WHERE region = 'us-east-1' AND Identifier = '<Id>';
+WHERE region = 'us-east-1' AND Identifier = '{{ id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -233,11 +233,11 @@ INSERT INTO awscc.appconfig.deployment_strategies (
  ReplicateTo,
  region
 )
-SELECT 
-'{{ DeploymentDurationInMinutes }}',
- '{{ GrowthFactor }}',
- '{{ Name }}',
- '{{ ReplicateTo }}',
+SELECT
+'{{ deployment_duration_in_minutes }}',
+ '{{ growth_factor }}',
+ '{{ name }}',
+ '{{ replicate_to }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -256,15 +256,15 @@ INSERT INTO awscc.appconfig.deployment_strategies (
  Tags,
  region
 )
-SELECT 
- '{{ DeploymentDurationInMinutes }}',
- '{{ Description }}',
- '{{ FinalBakeTimeInMinutes }}',
- '{{ GrowthFactor }}',
- '{{ GrowthType }}',
- '{{ Name }}',
- '{{ ReplicateTo }}',
- '{{ Tags }}',
+SELECT
+ '{{ deployment_duration_in_minutes }}',
+ '{{ description }}',
+ '{{ final_bake_time_in_minutes }}',
+ '{{ growth_factor }}',
+ '{{ growth_type }}',
+ '{{ name }}',
+ '{{ replicate_to }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -282,25 +282,24 @@ globals:
 resources:
   - name: deployment_strategy
     props:
-      - name: DeploymentDurationInMinutes
+      - name: deployment_duration_in_minutes
         value: null
-      - name: Description
-        value: '{{ Description }}'
-      - name: FinalBakeTimeInMinutes
+      - name: description
+        value: '{{ description }}'
+      - name: final_bake_time_in_minutes
         value: null
-      - name: GrowthFactor
+      - name: growth_factor
         value: null
-      - name: GrowthType
-        value: '{{ GrowthType }}'
-      - name: Name
-        value: '{{ Name }}'
-      - name: ReplicateTo
-        value: '{{ ReplicateTo }}'
-      - name: Tags
+      - name: growth_type
+        value: '{{ growth_type }}'
+      - name: name
+        value: '{{ name }}'
+      - name: replicate_to
+        value: '{{ replicate_to }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -321,7 +320,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Id>';
+AND Identifier = '{{ id }}';
 ```
 
 
@@ -330,7 +329,7 @@ AND Identifier = '<Id>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.appconfig.deployment_strategies
-WHERE Identifier = '<Id>'
+WHERE Identifier = '{{ id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/appconfig/deployments/index.md b/website/docs/services/appconfig/deployments/index.md
index 4e4aa2f5d..60bc1de16 100644
--- a/website/docs/services/appconfig/deployments/index.md
+++ b/website/docs/services/appconfig/deployments/index.md
@@ -227,7 +227,7 @@ application_id,
 dynamic_extension_parameters,
 tags
 FROM awscc.appconfig.deployments
-WHERE region = 'us-east-1' AND Identifier = '<ApplicationId>|<EnvironmentId>|<DeploymentNumber>';
+WHERE region = 'us-east-1' AND Identifier = '{{ application_id }}|{{ environment_id }}|{{ deployment_number }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -269,12 +269,12 @@ INSERT INTO awscc.appconfig.deployments (
  ApplicationId,
  region
 )
-SELECT 
-'{{ DeploymentStrategyId }}',
- '{{ ConfigurationProfileId }}',
- '{{ EnvironmentId }}',
- '{{ ConfigurationVersion }}',
- '{{ ApplicationId }}',
+SELECT
+'{{ deployment_strategy_id }}',
+ '{{ configuration_profile_id }}',
+ '{{ environment_id }}',
+ '{{ configuration_version }}',
+ '{{ application_id }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -294,16 +294,16 @@ INSERT INTO awscc.appconfig.deployments (
  Tags,
  region
 )
-SELECT 
- '{{ DeploymentStrategyId }}',
- '{{ ConfigurationProfileId }}',
- '{{ EnvironmentId }}',
- '{{ KmsKeyIdentifier }}',
- '{{ Description }}',
- '{{ ConfigurationVersion }}',
- '{{ ApplicationId }}',
- '{{ DynamicExtensionParameters }}',
- '{{ Tags }}',
+SELECT
+ '{{ deployment_strategy_id }}',
+ '{{ configuration_profile_id }}',
+ '{{ environment_id }}',
+ '{{ kms_key_identifier }}',
+ '{{ description }}',
+ '{{ configuration_version }}',
+ '{{ application_id }}',
+ '{{ dynamic_extension_parameters }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -321,30 +321,29 @@ globals:
 resources:
   - name: deployment
     props:
-      - name: DeploymentStrategyId
-        value: '{{ DeploymentStrategyId }}'
-      - name: ConfigurationProfileId
-        value: '{{ ConfigurationProfileId }}'
-      - name: EnvironmentId
-        value: '{{ EnvironmentId }}'
-      - name: KmsKeyIdentifier
-        value: '{{ KmsKeyIdentifier }}'
-      - name: Description
-        value: '{{ Description }}'
-      - name: ConfigurationVersion
-        value: '{{ ConfigurationVersion }}'
-      - name: ApplicationId
-        value: '{{ ApplicationId }}'
-      - name: DynamicExtensionParameters
+      - name: deployment_strategy_id
+        value: '{{ deployment_strategy_id }}'
+      - name: configuration_profile_id
+        value: '{{ configuration_profile_id }}'
+      - name: environment_id
+        value: '{{ environment_id }}'
+      - name: kms_key_identifier
+        value: '{{ kms_key_identifier }}'
+      - name: description
+        value: '{{ description }}'
+      - name: configuration_version
+        value: '{{ configuration_version }}'
+      - name: application_id
+        value: '{{ application_id }}'
+      - name: dynamic_extension_parameters
         value:
-          - ParameterValue: '{{ ParameterValue }}'
-            ExtensionReference: '{{ ExtensionReference }}'
-            ParameterName: '{{ ParameterName }}'
-      - name: Tags
+          - parameter_value: '{{ parameter_value }}'
+            extension_reference: '{{ extension_reference }}'
+            parameter_name: '{{ parameter_name }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -355,7 +354,7 @@ resources:
 ```sql
 /*+ delete */
 DELETE FROM awscc.appconfig.deployments
-WHERE Identifier = '<ApplicationId|EnvironmentId|DeploymentNumber>'
+WHERE Identifier = '{{ application_id }}|{{ environment_id }}|{{ deployment_number }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/appconfig/environments/index.md b/website/docs/services/appconfig/environments/index.md
index 7cf8c932a..bdddce467 100644
--- a/website/docs/services/appconfig/environments/index.md
+++ b/website/docs/services/appconfig/environments/index.md
@@ -199,7 +199,7 @@ application_id,
 tags,
 name
 FROM awscc.appconfig.environments
-WHERE region = 'us-east-1' AND Identifier = '<ApplicationId>|<EnvironmentId>';
+WHERE region = 'us-east-1' AND Identifier = '{{ application_id }}|{{ environment_id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -237,9 +237,9 @@ INSERT INTO awscc.appconfig.environments (
  Name,
  region
 )
-SELECT 
-'{{ ApplicationId }}',
- '{{ Name }}',
+SELECT
+'{{ application_id }}',
+ '{{ name }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -256,13 +256,13 @@ INSERT INTO awscc.appconfig.environments (
  Name,
  region
 )
-SELECT 
- '{{ Description }}',
- '{{ Monitors }}',
- '{{ DeletionProtectionCheck }}',
- '{{ ApplicationId }}',
- '{{ Tags }}',
- '{{ Name }}',
+SELECT
+ '{{ description }}',
+ '{{ monitors }}',
+ '{{ deletion_protection_check }}',
+ '{{ application_id }}',
+ '{{ tags }}',
+ '{{ name }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -280,23 +280,22 @@ globals:
 resources:
   - name: environment
     props:
-      - name: Description
-        value: '{{ Description }}'
-      - name: Monitors
+      - name: description
+        value: '{{ description }}'
+      - name: monitors
         value:
-          - AlarmArn: '{{ AlarmArn }}'
-            AlarmRoleArn: '{{ AlarmRoleArn }}'
-      - name: DeletionProtectionCheck
-        value: '{{ DeletionProtectionCheck }}'
-      - name: ApplicationId
-        value: '{{ ApplicationId }}'
-      - name: Tags
+          - alarm_arn: '{{ alarm_arn }}'
+            alarm_role_arn: '{{ alarm_role_arn }}'
+      - name: deletion_protection_check
+        value: '{{ deletion_protection_check }}'
+      - name: application_id
+        value: '{{ application_id }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-      - name: Name
-        value: '{{ Name }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
+      - name: name
+        value: '{{ name }}'
 ```
 </TabItem>
 </Tabs>
@@ -316,7 +315,7 @@ SET PatchDocument = string('{{ {
     "Name": name
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<ApplicationId>|<EnvironmentId>';
+AND Identifier = '{{ application_id }}|{{ environment_id }}';
 ```
 
 
@@ -325,7 +324,7 @@ AND Identifier = '<ApplicationId>|<EnvironmentId>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.appconfig.environments
-WHERE Identifier = '<ApplicationId|EnvironmentId>'
+WHERE Identifier = '{{ application_id }}|{{ environment_id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/appconfig/extension_associations/index.md b/website/docs/services/appconfig/extension_associations/index.md
index 73f4235c4..e96dcf45d 100644
--- a/website/docs/services/appconfig/extension_associations/index.md
+++ b/website/docs/services/appconfig/extension_associations/index.md
@@ -194,7 +194,7 @@ extension_version_number,
 parameters,
 tags
 FROM awscc.appconfig.extension_associations
-WHERE region = 'us-east-1' AND Identifier = '<Id>';
+WHERE region = 'us-east-1' AND Identifier = '{{ id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -234,12 +234,12 @@ INSERT INTO awscc.appconfig.extension_associations (
  Tags,
  region
 )
-SELECT 
-'{{ ExtensionIdentifier }}',
- '{{ ResourceIdentifier }}',
- '{{ ExtensionVersionNumber }}',
- '{{ Parameters }}',
- '{{ Tags }}',
+SELECT
+'{{ extension_identifier }}',
+ '{{ resource_identifier }}',
+ '{{ extension_version_number }}',
+ '{{ parameters }}',
+ '{{ tags }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -255,12 +255,12 @@ INSERT INTO awscc.appconfig.extension_associations (
  Tags,
  region
 )
-SELECT 
- '{{ ExtensionIdentifier }}',
- '{{ ResourceIdentifier }}',
- '{{ ExtensionVersionNumber }}',
- '{{ Parameters }}',
- '{{ Tags }}',
+SELECT
+ '{{ extension_identifier }}',
+ '{{ resource_identifier }}',
+ '{{ extension_version_number }}',
+ '{{ parameters }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -278,19 +278,18 @@ globals:
 resources:
   - name: extension_association
     props:
-      - name: ExtensionIdentifier
-        value: '{{ ExtensionIdentifier }}'
-      - name: ResourceIdentifier
-        value: '{{ ResourceIdentifier }}'
-      - name: ExtensionVersionNumber
-        value: '{{ ExtensionVersionNumber }}'
-      - name: Parameters
+      - name: extension_identifier
+        value: '{{ extension_identifier }}'
+      - name: resource_identifier
+        value: '{{ resource_identifier }}'
+      - name: extension_version_number
+        value: '{{ extension_version_number }}'
+      - name: parameters
         value: {}
-      - name: Tags
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -307,7 +306,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Id>';
+AND Identifier = '{{ id }}';
 ```
 
 
@@ -316,7 +315,7 @@ AND Identifier = '<Id>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.appconfig.extension_associations
-WHERE Identifier = '<Id>'
+WHERE Identifier = '{{ id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/appconfig/extensions/index.md b/website/docs/services/appconfig/extensions/index.md
index 07b006c43..030e19c7c 100644
--- a/website/docs/services/appconfig/extensions/index.md
+++ b/website/docs/services/appconfig/extensions/index.md
@@ -194,7 +194,7 @@ parameters,
 latest_version_number,
 tags
 FROM awscc.appconfig.extensions
-WHERE region = 'us-east-1' AND Identifier = '<Id>';
+WHERE region = 'us-east-1' AND Identifier = '{{ id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -231,9 +231,9 @@ INSERT INTO awscc.appconfig.extensions (
  Actions,
  region
 )
-SELECT 
-'{{ Name }}',
- '{{ Actions }}',
+SELECT
+'{{ name }}',
+ '{{ actions }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -250,13 +250,13 @@ INSERT INTO awscc.appconfig.extensions (
  Tags,
  region
 )
-SELECT 
- '{{ Name }}',
- '{{ Description }}',
- '{{ Actions }}',
- '{{ Parameters }}',
- '{{ LatestVersionNumber }}',
- '{{ Tags }}',
+SELECT
+ '{{ name }}',
+ '{{ description }}',
+ '{{ actions }}',
+ '{{ parameters }}',
+ '{{ latest_version_number }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -274,21 +274,20 @@ globals:
 resources:
   - name: extension
     props:
-      - name: Name
-        value: '{{ Name }}'
-      - name: Description
-        value: '{{ Description }}'
-      - name: Actions
+      - name: name
+        value: '{{ name }}'
+      - name: description
+        value: '{{ description }}'
+      - name: actions
         value: {}
-      - name: Parameters
+      - name: parameters
         value: {}
-      - name: LatestVersionNumber
-        value: '{{ LatestVersionNumber }}'
-      - name: Tags
+      - name: latest_version_number
+        value: '{{ latest_version_number }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -308,7 +307,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Id>';
+AND Identifier = '{{ id }}';
 ```
 
 
@@ -317,7 +316,7 @@ AND Identifier = '<Id>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.appconfig.extensions
-WHERE Identifier = '<Id>'
+WHERE Identifier = '{{ id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/appconfig/hosted_configuration_versions/index.md b/website/docs/services/appconfig/hosted_configuration_versions/index.md
index dceb73572..66e70de83 100644
--- a/website/docs/services/appconfig/hosted_configuration_versions/index.md
+++ b/website/docs/services/appconfig/hosted_configuration_versions/index.md
@@ -180,7 +180,7 @@ version_label,
 application_id,
 version_number
 FROM awscc.appconfig.hosted_configuration_versions
-WHERE region = 'us-east-1' AND Identifier = '<ApplicationId>|<ConfigurationProfileId>|<VersionNumber>';
+WHERE region = 'us-east-1' AND Identifier = '{{ application_id }}|{{ configuration_profile_id }}|{{ version_number }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -221,11 +221,11 @@ INSERT INTO awscc.appconfig.hosted_configuration_versions (
  ApplicationId,
  region
 )
-SELECT 
-'{{ ConfigurationProfileId }}',
- '{{ ContentType }}',
- '{{ Content }}',
- '{{ ApplicationId }}',
+SELECT
+'{{ configuration_profile_id }}',
+ '{{ content_type }}',
+ '{{ content }}',
+ '{{ application_id }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -243,14 +243,14 @@ INSERT INTO awscc.appconfig.hosted_configuration_versions (
  ApplicationId,
  region
 )
-SELECT 
- '{{ ConfigurationProfileId }}',
- '{{ Description }}',
- '{{ ContentType }}',
- '{{ LatestVersionNumber }}',
- '{{ Content }}',
- '{{ VersionLabel }}',
- '{{ ApplicationId }}',
+SELECT
+ '{{ configuration_profile_id }}',
+ '{{ description }}',
+ '{{ content_type }}',
+ '{{ latest_version_number }}',
+ '{{ content }}',
+ '{{ version_label }}',
+ '{{ application_id }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -268,21 +268,20 @@ globals:
 resources:
   - name: hosted_configuration_version
     props:
-      - name: ConfigurationProfileId
-        value: '{{ ConfigurationProfileId }}'
-      - name: Description
-        value: '{{ Description }}'
-      - name: ContentType
-        value: '{{ ContentType }}'
-      - name: LatestVersionNumber
-        value: '{{ LatestVersionNumber }}'
-      - name: Content
-        value: '{{ Content }}'
-      - name: VersionLabel
-        value: '{{ VersionLabel }}'
-      - name: ApplicationId
-        value: '{{ ApplicationId }}'
-
+      - name: configuration_profile_id
+        value: '{{ configuration_profile_id }}'
+      - name: description
+        value: '{{ description }}'
+      - name: content_type
+        value: '{{ content_type }}'
+      - name: latest_version_number
+        value: '{{ latest_version_number }}'
+      - name: content
+        value: '{{ content }}'
+      - name: version_label
+        value: '{{ version_label }}'
+      - name: application_id
+        value: '{{ application_id }}'
 ```
 </TabItem>
 </Tabs>
@@ -293,7 +292,7 @@ resources:
 ```sql
 /*+ delete */
 DELETE FROM awscc.appconfig.hosted_configuration_versions
-WHERE Identifier = '<ApplicationId|ConfigurationProfileId|VersionNumber>'
+WHERE Identifier = '{{ application_id }}|{{ configuration_profile_id }}|{{ version_number }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/appflow/connector_profiles/index.md b/website/docs/services/appflow/connector_profiles/index.md
index beb4206e4..fffa93824 100644
--- a/website/docs/services/appflow/connector_profiles/index.md
+++ b/website/docs/services/appflow/connector_profiles/index.md
@@ -881,7 +881,7 @@ connection_mode,
 connector_profile_config,
 credentials_arn
 FROM awscc.appflow.connector_profiles
-WHERE region = 'us-east-1' AND Identifier = '<ConnectorProfileName>';
+WHERE region = 'us-east-1' AND Identifier = '{{ connector_profile_name }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -919,10 +919,10 @@ INSERT INTO awscc.appflow.connector_profiles (
  ConnectionMode,
  region
 )
-SELECT 
-'{{ ConnectorProfileName }}',
- '{{ ConnectorType }}',
- '{{ ConnectionMode }}',
+SELECT
+'{{ connector_profile_name }}',
+ '{{ connector_type }}',
+ '{{ connection_mode }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -939,13 +939,13 @@ INSERT INTO awscc.appflow.connector_profiles (
  ConnectorProfileConfig,
  region
 )
-SELECT 
- '{{ ConnectorLabel }}',
- '{{ ConnectorProfileName }}',
- '{{ KMSArn }}',
- '{{ ConnectorType }}',
- '{{ ConnectionMode }}',
- '{{ ConnectorProfileConfig }}',
+SELECT
+ '{{ connector_label }}',
+ '{{ connector_profile_name }}',
+ '{{ kms_arn }}',
+ '{{ connector_type }}',
+ '{{ connection_mode }}',
+ '{{ connector_profile_config }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -963,172 +963,171 @@ globals:
 resources:
   - name: connector_profile
     props:
-      - name: ConnectorLabel
-        value: '{{ ConnectorLabel }}'
-      - name: ConnectorProfileName
-        value: '{{ ConnectorProfileName }}'
-      - name: KMSArn
-        value: '{{ KMSArn }}'
-      - name: ConnectorType
-        value: '{{ ConnectorType }}'
-      - name: ConnectionMode
-        value: '{{ ConnectionMode }}'
-      - name: ConnectorProfileConfig
+      - name: connector_label
+        value: '{{ connector_label }}'
+      - name: connector_profile_name
+        value: '{{ connector_profile_name }}'
+      - name: kms_arn
+        value: '{{ kms_arn }}'
+      - name: connector_type
+        value: '{{ connector_type }}'
+      - name: connection_mode
+        value: '{{ connection_mode }}'
+      - name: connector_profile_config
         value:
-          ConnectorProfileProperties:
-            Datadog:
-              InstanceUrl: '{{ InstanceUrl }}'
-            Dynatrace:
-              InstanceUrl: null
-            InforNexus:
-              InstanceUrl: null
-            Marketo:
-              InstanceUrl: null
-            Redshift:
-              DatabaseUrl: '{{ DatabaseUrl }}'
-              BucketName: '{{ BucketName }}'
-              BucketPrefix: '{{ BucketPrefix }}'
-              RoleArn: '{{ RoleArn }}'
-              IsRedshiftServerless: '{{ IsRedshiftServerless }}'
-              DataApiRoleArn: '{{ DataApiRoleArn }}'
-              ClusterIdentifier: '{{ ClusterIdentifier }}'
-              WorkgroupName: '{{ WorkgroupName }}'
-              DatabaseName: '{{ DatabaseName }}'
-            SAPOData:
-              ApplicationHostUrl: '{{ ApplicationHostUrl }}'
-              ApplicationServicePath: '{{ ApplicationServicePath }}'
-              PortNumber: '{{ PortNumber }}'
-              ClientNumber: '{{ ClientNumber }}'
-              LogonLanguage: '{{ LogonLanguage }}'
-              PrivateLinkServiceName: '{{ PrivateLinkServiceName }}'
-              OAuthProperties:
-                AuthCodeUrl: '{{ AuthCodeUrl }}'
-                TokenUrl: '{{ TokenUrl }}'
-                OAuthScopes:
-                  - '{{ OAuthScopes[0] }}'
-              DisableSSO: '{{ DisableSSO }}'
-            Salesforce:
-              InstanceUrl: null
-              isSandboxEnvironment: '{{ isSandboxEnvironment }}'
-              usePrivateLinkForMetadataAndAuthorization: '{{ usePrivateLinkForMetadataAndAuthorization }}'
-            Pardot:
-              InstanceUrl: null
-              IsSandboxEnvironment: '{{ IsSandboxEnvironment }}'
-              BusinessUnitId: '{{ BusinessUnitId }}'
-            ServiceNow:
-              InstanceUrl: null
-            Slack:
-              InstanceUrl: null
-            Snowflake:
-              Warehouse: '{{ Warehouse }}'
-              Stage: '{{ Stage }}'
-              BucketName: null
-              BucketPrefix: null
-              PrivateLinkServiceName: null
-              AccountName: '{{ AccountName }}'
-              Region: '{{ Region }}'
-            Veeva:
-              InstanceUrl: null
-            Zendesk:
-              InstanceUrl: null
-            CustomConnector:
-              ProfileProperties: {}
-              OAuth2Properties:
-                TokenUrl: '{{ TokenUrl }}'
-                OAuth2GrantType: '{{ OAuth2GrantType }}'
-                TokenUrlCustomProperties: {}
-          ConnectorProfileCredentials:
-            Amplitude:
-              ApiKey: '{{ ApiKey }}'
-              SecretKey: '{{ SecretKey }}'
-            Datadog:
-              ApiKey: null
-              ApplicationKey: '{{ ApplicationKey }}'
-            Dynatrace:
-              ApiToken: '{{ ApiToken }}'
-            GoogleAnalytics:
-              ClientId: '{{ ClientId }}'
-              ClientSecret: '{{ ClientSecret }}'
-              AccessToken: '{{ AccessToken }}'
-              RefreshToken: '{{ RefreshToken }}'
-              ConnectorOAuthRequest:
-                AuthCode: '{{ AuthCode }}'
-                RedirectUri: '{{ RedirectUri }}'
-            InforNexus:
-              AccessKeyId: '{{ AccessKeyId }}'
-              UserId: '{{ UserId }}'
-              SecretAccessKey: '{{ SecretAccessKey }}'
-              Datakey: null
-            Marketo:
-              ClientId: null
-              ClientSecret: null
-              AccessToken: null
-              ConnectorOAuthRequest: null
-            Redshift:
-              Username: null
-              Password: '{{ Password }}'
-            SAPOData:
-              BasicAuthCredentials:
-                Username: null
-                Password: null
-              OAuthCredentials:
-                AccessToken: null
-                RefreshToken: null
-                ConnectorOAuthRequest: null
-                ClientId: null
-                ClientSecret: null
-            Salesforce:
-              AccessToken: null
-              RefreshToken: null
-              ConnectorOAuthRequest: null
-              ClientCredentialsArn: '{{ ClientCredentialsArn }}'
-              OAuth2GrantType: null
-              JwtToken: '{{ JwtToken }}'
-            Pardot:
-              AccessToken: null
-              RefreshToken: null
-              ConnectorOAuthRequest: null
-              ClientCredentialsArn: null
-            ServiceNow:
-              Username: null
-              Password: null
-              OAuth2Credentials:
-                ClientId: null
-                ClientSecret: null
-                AccessToken: null
-                RefreshToken: null
-                OAuthRequest: null
-            Singular:
-              ApiKey: null
-            Slack:
-              ClientId: null
-              ClientSecret: null
-              AccessToken: null
-              ConnectorOAuthRequest: null
-            Snowflake:
-              Username: null
-              Password: null
-            Trendmicro:
-              ApiSecretKey: '{{ ApiSecretKey }}'
-            Veeva:
-              Username: null
-              Password: null
-            Zendesk:
-              ClientId: null
-              ClientSecret: null
-              AccessToken: null
-              ConnectorOAuthRequest: null
-            CustomConnector:
-              AuthenticationType: '{{ AuthenticationType }}'
-              Basic: null
-              Oauth2: null
-              ApiKey:
-                ApiKey: null
-                ApiSecretKey: null
-              Custom:
-                CustomAuthenticationType: '{{ CustomAuthenticationType }}'
-                CredentialsMap: {}
-
+          connector_profile_properties:
+            datadog:
+              instance_url: '{{ instance_url }}'
+            dynatrace:
+              instance_url: null
+            infor_nexus:
+              instance_url: null
+            marketo:
+              instance_url: null
+            redshift:
+              database_url: '{{ database_url }}'
+              bucket_name: '{{ bucket_name }}'
+              bucket_prefix: '{{ bucket_prefix }}'
+              role_arn: '{{ role_arn }}'
+              is_redshift_serverless: '{{ is_redshift_serverless }}'
+              data_api_role_arn: '{{ data_api_role_arn }}'
+              cluster_identifier: '{{ cluster_identifier }}'
+              workgroup_name: '{{ workgroup_name }}'
+              database_name: '{{ database_name }}'
+            s_ap_odata:
+              application_host_url: '{{ application_host_url }}'
+              application_service_path: '{{ application_service_path }}'
+              port_number: '{{ port_number }}'
+              client_number: '{{ client_number }}'
+              logon_language: '{{ logon_language }}'
+              private_link_service_name: '{{ private_link_service_name }}'
+              oauth_properties:
+                auth_code_url: '{{ auth_code_url }}'
+                token_url: '{{ token_url }}'
+                oauth_scopes:
+                  - '{{ oauth_scopes[0] }}'
+              disable_ss_o: '{{ disable_ss_o }}'
+            salesforce:
+              instance_url: null
+              is_sandbox_environment: '{{ is_sandbox_environment }}'
+              use_private_link_for_metadata_and_authorization: '{{ use_private_link_for_metadata_and_authorization }}'
+            pardot:
+              instance_url: null
+              is_sandbox_environment: '{{ is_sandbox_environment }}'
+              business_unit_id: '{{ business_unit_id }}'
+            service_now:
+              instance_url: null
+            slack:
+              instance_url: null
+            snowflake:
+              warehouse: '{{ warehouse }}'
+              stage: '{{ stage }}'
+              bucket_name: null
+              bucket_prefix: null
+              private_link_service_name: null
+              account_name: '{{ account_name }}'
+              region: '{{ region }}'
+            veeva:
+              instance_url: null
+            zendesk:
+              instance_url: null
+            custom_connector:
+              profile_properties: {}
+              oauth2_properties:
+                token_url: '{{ token_url }}'
+                oauth2_grant_type: '{{ oauth2_grant_type }}'
+                token_url_custom_properties: {}
+          connector_profile_credentials:
+            amplitude:
+              api_key: '{{ api_key }}'
+              secret_key: '{{ secret_key }}'
+            datadog:
+              api_key: null
+              application_key: '{{ application_key }}'
+            dynatrace:
+              api_token: '{{ api_token }}'
+            google_analytics:
+              client_id: '{{ client_id }}'
+              client_secret: '{{ client_secret }}'
+              access_token: '{{ access_token }}'
+              refresh_token: '{{ refresh_token }}'
+              connector_oauth_request:
+                auth_code: '{{ auth_code }}'
+                redirect_uri: '{{ redirect_uri }}'
+            infor_nexus:
+              access_key_id: '{{ access_key_id }}'
+              user_id: '{{ user_id }}'
+              secret_access_key: '{{ secret_access_key }}'
+              datakey: null
+            marketo:
+              client_id: null
+              client_secret: null
+              access_token: null
+              connector_oauth_request: null
+            redshift:
+              username: null
+              password: '{{ password }}'
+            s_ap_odata:
+              basic_auth_credentials:
+                username: null
+                password: null
+              oauth_credentials:
+                access_token: null
+                refresh_token: null
+                connector_oauth_request: null
+                client_id: null
+                client_secret: null
+            salesforce:
+              access_token: null
+              refresh_token: null
+              connector_oauth_request: null
+              client_credentials_arn: '{{ client_credentials_arn }}'
+              oauth2_grant_type: null
+              jwt_token: '{{ jwt_token }}'
+            pardot:
+              access_token: null
+              refresh_token: null
+              connector_oauth_request: null
+              client_credentials_arn: null
+            service_now:
+              username: null
+              password: null
+              oauth2_credentials:
+                client_id: null
+                client_secret: null
+                access_token: null
+                refresh_token: null
+                oauth_request: null
+            singular:
+              api_key: null
+            slack:
+              client_id: null
+              client_secret: null
+              access_token: null
+              connector_oauth_request: null
+            snowflake:
+              username: null
+              password: null
+            trendmicro:
+              api_secret_key: '{{ api_secret_key }}'
+            veeva:
+              username: null
+              password: null
+            zendesk:
+              client_id: null
+              client_secret: null
+              access_token: null
+              connector_oauth_request: null
+            custom_connector:
+              authentication_type: '{{ authentication_type }}'
+              basic: null
+              oauth2: null
+              api_key:
+                api_key: null
+                api_secret_key: null
+              custom:
+                custom_authentication_type: '{{ custom_authentication_type }}'
+                credentials_map: {}
 ```
 </TabItem>
 </Tabs>
@@ -1146,7 +1145,7 @@ SET PatchDocument = string('{{ {
     "ConnectorProfileConfig": connector_profile_config
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<ConnectorProfileName>';
+AND Identifier = '{{ connector_profile_name }}';
 ```
 
 
@@ -1155,7 +1154,7 @@ AND Identifier = '<ConnectorProfileName>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.appflow.connector_profiles
-WHERE Identifier = '<ConnectorProfileName>'
+WHERE Identifier = '{{ connector_profile_name }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/appflow/connectors/index.md b/website/docs/services/appflow/connectors/index.md
index 9a861a6ac..6c955e4ff 100644
--- a/website/docs/services/appflow/connectors/index.md
+++ b/website/docs/services/appflow/connectors/index.md
@@ -172,7 +172,7 @@ connector_provisioning_type,
 connector_provisioning_config,
 description
 FROM awscc.appflow.connectors
-WHERE region = 'us-east-1' AND Identifier = '<ConnectorLabel>';
+WHERE region = 'us-east-1' AND Identifier = '{{ connector_label }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -209,9 +209,9 @@ INSERT INTO awscc.appflow.connectors (
  ConnectorProvisioningConfig,
  region
 )
-SELECT 
-'{{ ConnectorProvisioningType }}',
- '{{ ConnectorProvisioningConfig }}',
+SELECT
+'{{ connector_provisioning_type }}',
+ '{{ connector_provisioning_config }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -226,11 +226,11 @@ INSERT INTO awscc.appflow.connectors (
  Description,
  region
 )
-SELECT 
- '{{ ConnectorLabel }}',
- '{{ ConnectorProvisioningType }}',
- '{{ ConnectorProvisioningConfig }}',
- '{{ Description }}',
+SELECT
+ '{{ connector_label }}',
+ '{{ connector_provisioning_type }}',
+ '{{ connector_provisioning_config }}',
+ '{{ description }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -248,17 +248,16 @@ globals:
 resources:
   - name: connector
     props:
-      - name: ConnectorLabel
-        value: '{{ ConnectorLabel }}'
-      - name: ConnectorProvisioningType
-        value: '{{ ConnectorProvisioningType }}'
-      - name: ConnectorProvisioningConfig
+      - name: connector_label
+        value: '{{ connector_label }}'
+      - name: connector_provisioning_type
+        value: '{{ connector_provisioning_type }}'
+      - name: connector_provisioning_config
         value:
-          Lambda:
-            LambdaArn: '{{ LambdaArn }}'
-      - name: Description
-        value: '{{ Description }}'
-
+          lambda:
+            lambda_arn: '{{ lambda_arn }}'
+      - name: description
+        value: '{{ description }}'
 ```
 </TabItem>
 </Tabs>
@@ -276,7 +275,7 @@ SET PatchDocument = string('{{ {
     "Description": description
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<ConnectorLabel>';
+AND Identifier = '{{ connector_label }}';
 ```
 
 
@@ -285,7 +284,7 @@ AND Identifier = '<ConnectorLabel>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.appflow.connectors
-WHERE Identifier = '<ConnectorLabel>'
+WHERE Identifier = '{{ connector_label }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/appflow/flows/index.md b/website/docs/services/appflow/flows/index.md
index 377989088..52a281aff 100644
--- a/website/docs/services/appflow/flows/index.md
+++ b/website/docs/services/appflow/flows/index.md
@@ -1006,7 +1006,7 @@ tasks,
 tags,
 metadata_catalog_config
 FROM awscc.appflow.flows
-WHERE region = 'us-east-1' AND Identifier = '<FlowName>';
+WHERE region = 'us-east-1' AND Identifier = '{{ flow_name }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -1046,12 +1046,12 @@ INSERT INTO awscc.appflow.flows (
  Tasks,
  region
 )
-SELECT 
-'{{ FlowName }}',
- '{{ TriggerConfig }}',
- '{{ SourceFlowConfig }}',
- '{{ DestinationFlowConfigList }}',
- '{{ Tasks }}',
+SELECT
+'{{ flow_name }}',
+ '{{ trigger_config }}',
+ '{{ source_flow_config }}',
+ '{{ destination_flow_config_list }}',
+ '{{ tasks }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -1072,17 +1072,17 @@ INSERT INTO awscc.appflow.flows (
  MetadataCatalogConfig,
  region
 )
-SELECT 
- '{{ FlowName }}',
- '{{ Description }}',
- '{{ KMSArn }}',
- '{{ TriggerConfig }}',
- '{{ FlowStatus }}',
- '{{ SourceFlowConfig }}',
- '{{ DestinationFlowConfigList }}',
- '{{ Tasks }}',
- '{{ Tags }}',
- '{{ MetadataCatalogConfig }}',
+SELECT
+ '{{ flow_name }}',
+ '{{ description }}',
+ '{{ kms_arn }}',
+ '{{ trigger_config }}',
+ '{{ flow_status }}',
+ '{{ source_flow_config }}',
+ '{{ destination_flow_config_list }}',
+ '{{ tasks }}',
+ '{{ tags }}',
+ '{{ metadata_catalog_config }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -1100,201 +1100,200 @@ globals:
 resources:
   - name: flow
     props:
-      - name: FlowName
-        value: '{{ FlowName }}'
-      - name: Description
-        value: '{{ Description }}'
-      - name: KMSArn
-        value: '{{ KMSArn }}'
-      - name: TriggerConfig
+      - name: flow_name
+        value: '{{ flow_name }}'
+      - name: description
+        value: '{{ description }}'
+      - name: kms_arn
+        value: '{{ kms_arn }}'
+      - name: trigger_config
         value:
-          TriggerType: '{{ TriggerType }}'
-          TriggerProperties:
-            ScheduleExpression: '{{ ScheduleExpression }}'
-            DataPullMode: '{{ DataPullMode }}'
-            ScheduleStartTime: null
-            ScheduleEndTime: null
-            FirstExecutionFrom: null
-            TimeZone: '{{ TimeZone }}'
-            ScheduleOffset: null
-            FlowErrorDeactivationThreshold: '{{ FlowErrorDeactivationThreshold }}'
-      - name: FlowStatus
-        value: '{{ FlowStatus }}'
-      - name: SourceFlowConfig
+          trigger_type: '{{ trigger_type }}'
+          trigger_properties:
+            schedule_expression: '{{ schedule_expression }}'
+            data_pull_mode: '{{ data_pull_mode }}'
+            schedule_start_time: null
+            schedule_end_time: null
+            first_execution_from: null
+            time_zone: '{{ time_zone }}'
+            schedule_offset: null
+            flow_error_deactivation_threshold: '{{ flow_error_deactivation_threshold }}'
+      - name: flow_status
+        value: '{{ flow_status }}'
+      - name: source_flow_config
         value:
-          ConnectorType: '{{ ConnectorType }}'
-          ApiVersion: '{{ ApiVersion }}'
-          ConnectorProfileName: '{{ ConnectorProfileName }}'
-          SourceConnectorProperties:
-            Amplitude:
-              Object: '{{ Object }}'
-            Datadog:
-              Object: null
-            Dynatrace:
-              Object: null
-            GoogleAnalytics:
-              Object: null
-            InforNexus:
-              Object: null
-            Marketo:
-              Object: null
-            S3:
-              BucketName: '{{ BucketName }}'
-              BucketPrefix: '{{ BucketPrefix }}'
-              S3InputFormatConfig:
-                S3InputFileType: '{{ S3InputFileType }}'
-            SAPOData:
-              ObjectPath: null
-              parallelismConfig:
-                maxParallelism: '{{ maxParallelism }}'
-              paginationConfig:
-                maxPageSize: '{{ maxPageSize }}'
-            Salesforce:
-              Object: null
-              EnableDynamicFieldUpdate: '{{ EnableDynamicFieldUpdate }}'
-              IncludeDeletedRecords: '{{ IncludeDeletedRecords }}'
-              DataTransferApi: '{{ DataTransferApi }}'
-            Pardot:
-              Object: null
-            ServiceNow:
-              Object: null
-            Singular:
-              Object: null
-            Slack:
-              Object: null
-            Trendmicro:
-              Object: null
-            Veeva:
-              Object: null
-              DocumentType: '{{ DocumentType }}'
-              IncludeSourceFiles: '{{ IncludeSourceFiles }}'
-              IncludeRenditions: '{{ IncludeRenditions }}'
-              IncludeAllVersions: '{{ IncludeAllVersions }}'
-            Zendesk:
-              Object: null
-            CustomConnector:
-              EntityName: '{{ EntityName }}'
-              CustomProperties: {}
-              DataTransferApi:
-                Name: '{{ Name }}'
-                Type: '{{ Type }}'
-          IncrementalPullConfig:
-            DatetimeTypeFieldName: '{{ DatetimeTypeFieldName }}'
-      - name: DestinationFlowConfigList
+          connector_type: '{{ connector_type }}'
+          api_version: '{{ api_version }}'
+          connector_profile_name: '{{ connector_profile_name }}'
+          source_connector_properties:
+            amplitude:
+              object: '{{ object }}'
+            datadog:
+              object: null
+            dynatrace:
+              object: null
+            google_analytics:
+              object: null
+            infor_nexus:
+              object: null
+            marketo:
+              object: null
+            s3:
+              bucket_name: '{{ bucket_name }}'
+              bucket_prefix: '{{ bucket_prefix }}'
+              s3_input_format_config:
+                s3_input_file_type: '{{ s3_input_file_type }}'
+            s_ap_odata:
+              object_path: null
+              parallelism_config:
+                max_parallelism: '{{ max_parallelism }}'
+              pagination_config:
+                max_page_size: '{{ max_page_size }}'
+            salesforce:
+              object: null
+              enable_dynamic_field_update: '{{ enable_dynamic_field_update }}'
+              include_deleted_records: '{{ include_deleted_records }}'
+              data_transfer_api: '{{ data_transfer_api }}'
+            pardot:
+              object: null
+            service_now:
+              object: null
+            singular:
+              object: null
+            slack:
+              object: null
+            trendmicro:
+              object: null
+            veeva:
+              object: null
+              document_type: '{{ document_type }}'
+              include_source_files: '{{ include_source_files }}'
+              include_renditions: '{{ include_renditions }}'
+              include_all_versions: '{{ include_all_versions }}'
+            zendesk:
+              object: null
+            custom_connector:
+              entity_name: '{{ entity_name }}'
+              custom_properties: {}
+              data_transfer_api:
+                name: '{{ name }}'
+                type: '{{ type }}'
+          incremental_pull_config:
+            datetime_type_field_name: '{{ datetime_type_field_name }}'
+      - name: destination_flow_config_list
         value:
-          - ConnectorType: null
-            ApiVersion: null
-            ConnectorProfileName: null
-            DestinationConnectorProperties:
-              Redshift:
-                Object: null
-                IntermediateBucketName: null
-                BucketPrefix: null
-                ErrorHandlingConfig:
-                  FailOnFirstError: '{{ FailOnFirstError }}'
-                  BucketPrefix: null
-                  BucketName: null
-              S3:
-                BucketName: null
-                BucketPrefix: null
-                S3OutputFormatConfig:
-                  FileType: '{{ FileType }}'
-                  PrefixConfig:
-                    PrefixType: '{{ PrefixType }}'
-                    PrefixFormat: '{{ PrefixFormat }}'
-                    PathPrefixHierarchy:
-                      - '{{ PathPrefixHierarchy[0] }}'
-                  AggregationConfig:
-                    AggregationType: '{{ AggregationType }}'
-                    TargetFileSize: '{{ TargetFileSize }}'
-                  PreserveSourceDataTyping: '{{ PreserveSourceDataTyping }}'
-              Salesforce:
-                Object: null
-                ErrorHandlingConfig: null
-                IdFieldNames:
-                  - '{{ IdFieldNames[0] }}'
-                WriteOperationType: '{{ WriteOperationType }}'
-                DataTransferApi: null
-              Snowflake:
-                Object: null
-                IntermediateBucketName: null
-                BucketPrefix: null
-                ErrorHandlingConfig: null
-              EventBridge:
-                Object: null
-                ErrorHandlingConfig: null
-              Upsolver:
-                BucketName: '{{ BucketName }}'
-                BucketPrefix: null
-                S3OutputFormatConfig:
-                  FileType: null
-                  PrefixConfig: null
-                  AggregationConfig: null
-              LookoutMetrics:
-                Object: null
-              Marketo:
-                Object: null
-                ErrorHandlingConfig: null
-              Zendesk:
-                Object: null
-                ErrorHandlingConfig: null
-                IdFieldNames:
-                  - '{{ IdFieldNames[0] }}'
-                WriteOperationType: null
-              CustomConnector:
-                EntityName: null
-                ErrorHandlingConfig: null
-                WriteOperationType: null
-                IdFieldNames:
-                  - '{{ IdFieldNames[0] }}'
-                CustomProperties: null
-              SAPOData:
-                ObjectPath: null
-                ErrorHandlingConfig: null
-                SuccessResponseHandlingConfig:
-                  BucketPrefix: null
-                  BucketName: null
-                IdFieldNames:
-                  - '{{ IdFieldNames[0] }}'
-                WriteOperationType: null
-      - name: Tasks
+          - connector_type: null
+            api_version: null
+            connector_profile_name: null
+            destination_connector_properties:
+              redshift:
+                object: null
+                intermediate_bucket_name: null
+                bucket_prefix: null
+                error_handling_config:
+                  fail_on_first_error: '{{ fail_on_first_error }}'
+                  bucket_prefix: null
+                  bucket_name: null
+              s3:
+                bucket_name: null
+                bucket_prefix: null
+                s3_output_format_config:
+                  file_type: '{{ file_type }}'
+                  prefix_config:
+                    prefix_type: '{{ prefix_type }}'
+                    prefix_format: '{{ prefix_format }}'
+                    path_prefix_hierarchy:
+                      - '{{ path_prefix_hierarchy[0] }}'
+                  aggregation_config:
+                    aggregation_type: '{{ aggregation_type }}'
+                    target_file_size: '{{ target_file_size }}'
+                  preserve_source_data_typing: '{{ preserve_source_data_typing }}'
+              salesforce:
+                object: null
+                error_handling_config: null
+                id_field_names:
+                  - '{{ id_field_names[0] }}'
+                write_operation_type: '{{ write_operation_type }}'
+                data_transfer_api: null
+              snowflake:
+                object: null
+                intermediate_bucket_name: null
+                bucket_prefix: null
+                error_handling_config: null
+              event_bridge:
+                object: null
+                error_handling_config: null
+              upsolver:
+                bucket_name: '{{ bucket_name }}'
+                bucket_prefix: null
+                s3_output_format_config:
+                  file_type: null
+                  prefix_config: null
+                  aggregation_config: null
+              lookout_metrics:
+                object: null
+              marketo:
+                object: null
+                error_handling_config: null
+              zendesk:
+                object: null
+                error_handling_config: null
+                id_field_names:
+                  - '{{ id_field_names[0] }}'
+                write_operation_type: null
+              custom_connector:
+                entity_name: null
+                error_handling_config: null
+                write_operation_type: null
+                id_field_names:
+                  - '{{ id_field_names[0] }}'
+                custom_properties: null
+              s_ap_odata:
+                object_path: null
+                error_handling_config: null
+                success_response_handling_config:
+                  bucket_prefix: null
+                  bucket_name: null
+                id_field_names:
+                  - '{{ id_field_names[0] }}'
+                write_operation_type: null
+      - name: tasks
         value:
-          - SourceFields:
-              - '{{ SourceFields[0] }}'
-            ConnectorOperator:
-              Amplitude: '{{ Amplitude }}'
-              Datadog: '{{ Datadog }}'
-              Dynatrace: '{{ Dynatrace }}'
-              GoogleAnalytics: '{{ GoogleAnalytics }}'
-              InforNexus: '{{ InforNexus }}'
-              Marketo: '{{ Marketo }}'
-              S3: '{{ S3 }}'
-              SAPOData: '{{ SAPOData }}'
-              Salesforce: '{{ Salesforce }}'
-              Pardot: '{{ Pardot }}'
-              ServiceNow: '{{ ServiceNow }}'
-              Singular: '{{ Singular }}'
-              Slack: '{{ Slack }}'
-              Trendmicro: '{{ Trendmicro }}'
-              Veeva: '{{ Veeva }}'
-              Zendesk: '{{ Zendesk }}'
-              CustomConnector: '{{ CustomConnector }}'
-            DestinationField: '{{ DestinationField }}'
-            TaskType: '{{ TaskType }}'
-            TaskProperties:
-              - Key: '{{ Key }}'
-                Value: '{{ Value }}'
-      - name: Tags
+          - source_fields:
+              - '{{ source_fields[0] }}'
+            connector_operator:
+              amplitude: '{{ amplitude }}'
+              datadog: '{{ datadog }}'
+              dynatrace: '{{ dynatrace }}'
+              google_analytics: '{{ google_analytics }}'
+              infor_nexus: '{{ infor_nexus }}'
+              marketo: '{{ marketo }}'
+              s3: '{{ s3 }}'
+              s_ap_odata: '{{ s_ap_odata }}'
+              salesforce: '{{ salesforce }}'
+              pardot: '{{ pardot }}'
+              service_now: '{{ service_now }}'
+              singular: '{{ singular }}'
+              slack: '{{ slack }}'
+              trendmicro: '{{ trendmicro }}'
+              veeva: '{{ veeva }}'
+              zendesk: '{{ zendesk }}'
+              custom_connector: '{{ custom_connector }}'
+            destination_field: '{{ destination_field }}'
+            task_type: '{{ task_type }}'
+            task_properties:
+              - key: '{{ key }}'
+                value: '{{ value }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-      - name: MetadataCatalogConfig
+          - key: '{{ key }}'
+            value: '{{ value }}'
+      - name: metadata_catalog_config
         value:
-          GlueDataCatalog:
-            RoleArn: '{{ RoleArn }}'
-            DatabaseName: '{{ DatabaseName }}'
-            TablePrefix: '{{ TablePrefix }}'
-
+          glue_data_catalog:
+            role_arn: '{{ role_arn }}'
+            database_name: '{{ database_name }}'
+            table_prefix: '{{ table_prefix }}'
 ```
 </TabItem>
 </Tabs>
@@ -1317,7 +1316,7 @@ SET PatchDocument = string('{{ {
     "MetadataCatalogConfig": metadata_catalog_config
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<FlowName>';
+AND Identifier = '{{ flow_name }}';
 ```
 
 
@@ -1326,7 +1325,7 @@ AND Identifier = '<FlowName>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.appflow.flows
-WHERE Identifier = '<FlowName>'
+WHERE Identifier = '{{ flow_name }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/appintegrations/applications/index.md b/website/docs/services/appintegrations/applications/index.md
index 529b61864..b5c37f02e 100644
--- a/website/docs/services/appintegrations/applications/index.md
+++ b/website/docs/services/appintegrations/applications/index.md
@@ -257,7 +257,7 @@ initialization_timeout,
 application_config,
 iframe_config
 FROM awscc.appintegrations.applications
-WHERE region = 'us-east-1' AND Identifier = '<ApplicationArn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ application_arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -296,11 +296,11 @@ INSERT INTO awscc.appintegrations.applications (
  ApplicationSourceConfig,
  region
 )
-SELECT 
-'{{ Name }}',
- '{{ Namespace }}',
- '{{ Description }}',
- '{{ ApplicationSourceConfig }}',
+SELECT
+'{{ name }}',
+ '{{ namespace }}',
+ '{{ description }}',
+ '{{ application_source_config }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -321,17 +321,17 @@ INSERT INTO awscc.appintegrations.applications (
  IframeConfig,
  region
 )
-SELECT 
- '{{ Name }}',
- '{{ Namespace }}',
- '{{ Description }}',
- '{{ ApplicationSourceConfig }}',
- '{{ Permissions }}',
- '{{ Tags }}',
- '{{ IsService }}',
- '{{ InitializationTimeout }}',
- '{{ ApplicationConfig }}',
- '{{ IframeConfig }}',
+SELECT
+ '{{ name }}',
+ '{{ namespace }}',
+ '{{ description }}',
+ '{{ application_source_config }}',
+ '{{ permissions }}',
+ '{{ tags }}',
+ '{{ is_service }}',
+ '{{ initialization_timeout }}',
+ '{{ application_config }}',
+ '{{ iframe_config }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -349,40 +349,39 @@ globals:
 resources:
   - name: application
     props:
-      - name: Name
-        value: '{{ Name }}'
-      - name: Namespace
-        value: '{{ Namespace }}'
-      - name: Description
-        value: '{{ Description }}'
-      - name: ApplicationSourceConfig
+      - name: name
+        value: '{{ name }}'
+      - name: namespace
+        value: '{{ namespace }}'
+      - name: description
+        value: '{{ description }}'
+      - name: application_source_config
         value:
-          ExternalUrlConfig:
-            AccessUrl: '{{ AccessUrl }}'
-            ApprovedOrigins:
-              - '{{ ApprovedOrigins[0] }}'
-      - name: Permissions
+          external_url_config:
+            access_url: '{{ access_url }}'
+            approved_origins:
+              - '{{ approved_origins[0] }}'
+      - name: permissions
         value:
-          - '{{ Permissions[0] }}'
-      - name: Tags
+          - '{{ permissions[0] }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-      - name: IsService
-        value: '{{ IsService }}'
-      - name: InitializationTimeout
-        value: '{{ InitializationTimeout }}'
-      - name: ApplicationConfig
+          - key: '{{ key }}'
+            value: '{{ value }}'
+      - name: is_service
+        value: '{{ is_service }}'
+      - name: initialization_timeout
+        value: '{{ initialization_timeout }}'
+      - name: application_config
         value:
-          ContactHandling:
-            Scope: '{{ Scope }}'
-      - name: IframeConfig
+          contact_handling:
+            scope: '{{ scope }}'
+      - name: iframe_config
         value:
-          Allow:
-            - '{{ Allow[0] }}'
-          Sandbox:
-            - '{{ Sandbox[0] }}'
-
+          allow:
+            - '{{ allow[0] }}'
+          sandbox:
+            - '{{ sandbox[0] }}'
 ```
 </TabItem>
 </Tabs>
@@ -407,7 +406,7 @@ SET PatchDocument = string('{{ {
     "IframeConfig": iframe_config
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<ApplicationArn>';
+AND Identifier = '{{ application_arn }}';
 ```
 
 
@@ -416,7 +415,7 @@ AND Identifier = '<ApplicationArn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.appintegrations.applications
-WHERE Identifier = '<ApplicationArn>'
+WHERE Identifier = '{{ application_arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/appintegrations/data_integrations/index.md b/website/docs/services/appintegrations/data_integrations/index.md
index adb826506..5f941ffa8 100644
--- a/website/docs/services/appintegrations/data_integrations/index.md
+++ b/website/docs/services/appintegrations/data_integrations/index.md
@@ -229,7 +229,7 @@ tags,
 file_configuration,
 object_configuration
 FROM awscc.appintegrations.data_integrations
-WHERE region = 'us-east-1' AND Identifier = '<Id>';
+WHERE region = 'us-east-1' AND Identifier = '{{ id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -267,10 +267,10 @@ INSERT INTO awscc.appintegrations.data_integrations (
  SourceURI,
  region
 )
-SELECT 
-'{{ Name }}',
- '{{ KmsKey }}',
- '{{ SourceURI }}',
+SELECT
+'{{ name }}',
+ '{{ kms_key }}',
+ '{{ source_uri }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -289,15 +289,15 @@ INSERT INTO awscc.appintegrations.data_integrations (
  ObjectConfiguration,
  region
 )
-SELECT 
- '{{ Description }}',
- '{{ Name }}',
- '{{ KmsKey }}',
- '{{ ScheduleConfig }}',
- '{{ SourceURI }}',
- '{{ Tags }}',
- '{{ FileConfiguration }}',
- '{{ ObjectConfiguration }}',
+SELECT
+ '{{ description }}',
+ '{{ name }}',
+ '{{ kms_key }}',
+ '{{ schedule_config }}',
+ '{{ source_uri }}',
+ '{{ tags }}',
+ '{{ file_configuration }}',
+ '{{ object_configuration }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -315,31 +315,30 @@ globals:
 resources:
   - name: data_integration
     props:
-      - name: Description
-        value: '{{ Description }}'
-      - name: Name
-        value: '{{ Name }}'
-      - name: KmsKey
-        value: '{{ KmsKey }}'
-      - name: ScheduleConfig
+      - name: description
+        value: '{{ description }}'
+      - name: name
+        value: '{{ name }}'
+      - name: kms_key
+        value: '{{ kms_key }}'
+      - name: schedule_config
         value:
-          FirstExecutionFrom: '{{ FirstExecutionFrom }}'
-          Object: '{{ Object }}'
-          ScheduleExpression: '{{ ScheduleExpression }}'
-      - name: SourceURI
-        value: '{{ SourceURI }}'
-      - name: Tags
+          first_execution_from: '{{ first_execution_from }}'
+          object: '{{ object }}'
+          schedule_expression: '{{ schedule_expression }}'
+      - name: source_uri
+        value: '{{ source_uri }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-      - name: FileConfiguration
+          - key: '{{ key }}'
+            value: '{{ value }}'
+      - name: file_configuration
         value:
-          Folders:
-            - '{{ Folders[0] }}'
-          Filters: {}
-      - name: ObjectConfiguration
+          folders:
+            - '{{ folders[0] }}'
+          filters: {}
+      - name: object_configuration
         value: {}
-
 ```
 </TabItem>
 </Tabs>
@@ -359,7 +358,7 @@ SET PatchDocument = string('{{ {
     "ObjectConfiguration": object_configuration
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Id>';
+AND Identifier = '{{ id }}';
 ```
 
 
@@ -368,7 +367,7 @@ AND Identifier = '<Id>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.appintegrations.data_integrations
-WHERE Identifier = '<Id>'
+WHERE Identifier = '{{ id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/appintegrations/event_integrations/index.md b/website/docs/services/appintegrations/event_integrations/index.md
index 3bfe07c94..379b8df7f 100644
--- a/website/docs/services/appintegrations/event_integrations/index.md
+++ b/website/docs/services/appintegrations/event_integrations/index.md
@@ -183,7 +183,7 @@ event_bridge_bus,
 event_filter,
 tags
 FROM awscc.appintegrations.event_integrations
-WHERE region = 'us-east-1' AND Identifier = '<Name>';
+WHERE region = 'us-east-1' AND Identifier = '{{ name }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -221,10 +221,10 @@ INSERT INTO awscc.appintegrations.event_integrations (
  EventFilter,
  region
 )
-SELECT 
-'{{ Name }}',
- '{{ EventBridgeBus }}',
- '{{ EventFilter }}',
+SELECT
+'{{ name }}',
+ '{{ event_bridge_bus }}',
+ '{{ event_filter }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -240,12 +240,12 @@ INSERT INTO awscc.appintegrations.event_integrations (
  Tags,
  region
 )
-SELECT 
- '{{ Description }}',
- '{{ Name }}',
- '{{ EventBridgeBus }}',
- '{{ EventFilter }}',
- '{{ Tags }}',
+SELECT
+ '{{ description }}',
+ '{{ name }}',
+ '{{ event_bridge_bus }}',
+ '{{ event_filter }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -263,20 +263,19 @@ globals:
 resources:
   - name: event_integration
     props:
-      - name: Description
-        value: '{{ Description }}'
-      - name: Name
-        value: '{{ Name }}'
-      - name: EventBridgeBus
-        value: '{{ EventBridgeBus }}'
-      - name: EventFilter
+      - name: description
+        value: '{{ description }}'
+      - name: name
+        value: '{{ name }}'
+      - name: event_bridge_bus
+        value: '{{ event_bridge_bus }}'
+      - name: event_filter
         value:
-          Source: '{{ Source }}'
-      - name: Tags
+          source: '{{ source }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -293,7 +292,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Name>';
+AND Identifier = '{{ name }}';
 ```
 
 
@@ -302,7 +301,7 @@ AND Identifier = '<Name>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.appintegrations.event_integrations
-WHERE Identifier = '<Name>'
+WHERE Identifier = '{{ name }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/applicationautoscaling/scalable_targets/index.md b/website/docs/services/applicationautoscaling/scalable_targets/index.md
index e40373443..61ff98f63 100644
--- a/website/docs/services/applicationautoscaling/scalable_targets/index.md
+++ b/website/docs/services/applicationautoscaling/scalable_targets/index.md
@@ -258,7 +258,7 @@ min_capacity,
 role_arn,
 max_capacity
 FROM awscc.applicationautoscaling.scalable_targets
-WHERE region = 'us-east-1' AND Identifier = '<ResourceId>|<ScalableDimension>|<ServiceNamespace>';
+WHERE region = 'us-east-1' AND Identifier = '{{ resource_id }}|{{ scalable_dimension }}|{{ service_namespace }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -300,12 +300,12 @@ INSERT INTO awscc.applicationautoscaling.scalable_targets (
  MaxCapacity,
  region
 )
-SELECT 
-'{{ ResourceId }}',
- '{{ ServiceNamespace }}',
- '{{ ScalableDimension }}',
- '{{ MinCapacity }}',
- '{{ MaxCapacity }}',
+SELECT
+'{{ resource_id }}',
+ '{{ service_namespace }}',
+ '{{ scalable_dimension }}',
+ '{{ min_capacity }}',
+ '{{ max_capacity }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -324,15 +324,15 @@ INSERT INTO awscc.applicationautoscaling.scalable_targets (
  MaxCapacity,
  region
 )
-SELECT 
- '{{ ScheduledActions }}',
- '{{ ResourceId }}',
- '{{ ServiceNamespace }}',
- '{{ ScalableDimension }}',
- '{{ SuspendedState }}',
- '{{ MinCapacity }}',
- '{{ RoleARN }}',
- '{{ MaxCapacity }}',
+SELECT
+ '{{ scheduled_actions }}',
+ '{{ resource_id }}',
+ '{{ service_namespace }}',
+ '{{ scalable_dimension }}',
+ '{{ suspended_state }}',
+ '{{ min_capacity }}',
+ '{{ role_arn }}',
+ '{{ max_capacity }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -350,34 +350,33 @@ globals:
 resources:
   - name: scalable_target
     props:
-      - name: ScheduledActions
+      - name: scheduled_actions
         value:
-          - Timezone: '{{ Timezone }}'
-            ScheduledActionName: '{{ ScheduledActionName }}'
-            EndTime: '{{ EndTime }}'
-            Schedule: '{{ Schedule }}'
-            StartTime: '{{ StartTime }}'
-            ScalableTargetAction:
-              MinCapacity: '{{ MinCapacity }}'
-              MaxCapacity: '{{ MaxCapacity }}'
-      - name: ResourceId
-        value: '{{ ResourceId }}'
-      - name: ServiceNamespace
-        value: '{{ ServiceNamespace }}'
-      - name: ScalableDimension
-        value: '{{ ScalableDimension }}'
-      - name: SuspendedState
+          - timezone: '{{ timezone }}'
+            scheduled_action_name: '{{ scheduled_action_name }}'
+            end_time: '{{ end_time }}'
+            schedule: '{{ schedule }}'
+            start_time: '{{ start_time }}'
+            scalable_target_action:
+              min_capacity: '{{ min_capacity }}'
+              max_capacity: '{{ max_capacity }}'
+      - name: resource_id
+        value: '{{ resource_id }}'
+      - name: service_namespace
+        value: '{{ service_namespace }}'
+      - name: scalable_dimension
+        value: '{{ scalable_dimension }}'
+      - name: suspended_state
         value:
-          DynamicScalingOutSuspended: '{{ DynamicScalingOutSuspended }}'
-          ScheduledScalingSuspended: '{{ ScheduledScalingSuspended }}'
-          DynamicScalingInSuspended: '{{ DynamicScalingInSuspended }}'
-      - name: MinCapacity
-        value: '{{ MinCapacity }}'
-      - name: RoleARN
-        value: '{{ RoleARN }}'
-      - name: MaxCapacity
-        value: '{{ MaxCapacity }}'
-
+          dynamic_scaling_out_suspended: '{{ dynamic_scaling_out_suspended }}'
+          scheduled_scaling_suspended: '{{ scheduled_scaling_suspended }}'
+          dynamic_scaling_in_suspended: '{{ dynamic_scaling_in_suspended }}'
+      - name: min_capacity
+        value: '{{ min_capacity }}'
+      - name: role_arn
+        value: '{{ role_arn }}'
+      - name: max_capacity
+        value: '{{ max_capacity }}'
 ```
 </TabItem>
 </Tabs>
@@ -397,7 +396,7 @@ SET PatchDocument = string('{{ {
     "MaxCapacity": max_capacity
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<ResourceId>|<ScalableDimension>|<ServiceNamespace>';
+AND Identifier = '{{ resource_id }}|{{ scalable_dimension }}|{{ service_namespace }}';
 ```
 
 
@@ -406,7 +405,7 @@ AND Identifier = '<ResourceId>|<ScalableDimension>|<ServiceNamespace>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.applicationautoscaling.scalable_targets
-WHERE Identifier = '<ResourceId|ScalableDimension|ServiceNamespace>'
+WHERE Identifier = '{{ resource_id }}|{{ scalable_dimension }}|{{ service_namespace }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/applicationautoscaling/scaling_policies/index.md b/website/docs/services/applicationautoscaling/scaling_policies/index.md
index 9357b397d..f2ec4894f 100644
--- a/website/docs/services/applicationautoscaling/scaling_policies/index.md
+++ b/website/docs/services/applicationautoscaling/scaling_policies/index.md
@@ -473,7 +473,7 @@ arn,
 step_scaling_policy_configuration,
 predictive_scaling_policy_configuration
 FROM awscc.applicationautoscaling.scaling_policies
-WHERE region = 'us-east-1' AND Identifier = '<Arn>|<ScalableDimension>';
+WHERE region = 'us-east-1' AND Identifier = '{{ arn }}|{{ scalable_dimension }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -511,9 +511,9 @@ INSERT INTO awscc.applicationautoscaling.scaling_policies (
  PolicyName,
  region
 )
-SELECT 
-'{{ PolicyType }}',
- '{{ PolicyName }}',
+SELECT
+'{{ policy_type }}',
+ '{{ policy_name }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -533,16 +533,16 @@ INSERT INTO awscc.applicationautoscaling.scaling_policies (
  PredictiveScalingPolicyConfiguration,
  region
 )
-SELECT 
- '{{ PolicyType }}',
- '{{ ResourceId }}',
- '{{ ScalingTargetId }}',
- '{{ PolicyName }}',
- '{{ ServiceNamespace }}',
- '{{ ScalableDimension }}',
- '{{ TargetTrackingScalingPolicyConfiguration }}',
- '{{ StepScalingPolicyConfiguration }}',
- '{{ PredictiveScalingPolicyConfiguration }}',
+SELECT
+ '{{ policy_type }}',
+ '{{ resource_id }}',
+ '{{ scaling_target_id }}',
+ '{{ policy_name }}',
+ '{{ service_namespace }}',
+ '{{ scalable_dimension }}',
+ '{{ target_tracking_scaling_policy_configuration }}',
+ '{{ step_scaling_policy_configuration }}',
+ '{{ predictive_scaling_policy_configuration }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -560,98 +560,97 @@ globals:
 resources:
   - name: scaling_policy
     props:
-      - name: PolicyType
-        value: '{{ PolicyType }}'
-      - name: ResourceId
-        value: '{{ ResourceId }}'
-      - name: ScalingTargetId
-        value: '{{ ScalingTargetId }}'
-      - name: PolicyName
-        value: '{{ PolicyName }}'
-      - name: ServiceNamespace
-        value: '{{ ServiceNamespace }}'
-      - name: ScalableDimension
-        value: '{{ ScalableDimension }}'
-      - name: TargetTrackingScalingPolicyConfiguration
+      - name: policy_type
+        value: '{{ policy_type }}'
+      - name: resource_id
+        value: '{{ resource_id }}'
+      - name: scaling_target_id
+        value: '{{ scaling_target_id }}'
+      - name: policy_name
+        value: '{{ policy_name }}'
+      - name: service_namespace
+        value: '{{ service_namespace }}'
+      - name: scalable_dimension
+        value: '{{ scalable_dimension }}'
+      - name: target_tracking_scaling_policy_configuration
         value:
-          ScaleOutCooldown: '{{ ScaleOutCooldown }}'
-          TargetValue: null
-          CustomizedMetricSpecification:
-            MetricName: '{{ MetricName }}'
-            Metrics:
-              - ReturnData: '{{ ReturnData }}'
-                Expression: '{{ Expression }}'
-                Label: '{{ Label }}'
-                MetricStat:
-                  Stat: '{{ Stat }}'
-                  Metric:
-                    MetricName: '{{ MetricName }}'
-                    Dimensions:
-                      - Value: '{{ Value }}'
-                        Name: '{{ Name }}'
-                    Namespace: '{{ Namespace }}'
-                  Unit: '{{ Unit }}'
-                Id: '{{ Id }}'
-            Statistic: '{{ Statistic }}'
-            Dimensions:
-              - Value: '{{ Value }}'
-                Name: '{{ Name }}'
-            Unit: '{{ Unit }}'
-            Namespace: '{{ Namespace }}'
-          DisableScaleIn: '{{ DisableScaleIn }}'
-          ScaleInCooldown: '{{ ScaleInCooldown }}'
-          PredefinedMetricSpecification:
-            PredefinedMetricType: '{{ PredefinedMetricType }}'
-            ResourceLabel: '{{ ResourceLabel }}'
-      - name: StepScalingPolicyConfiguration
+          scale_out_cooldown: '{{ scale_out_cooldown }}'
+          target_value: null
+          customized_metric_specification:
+            metric_name: '{{ metric_name }}'
+            metrics:
+              - return_data: '{{ return_data }}'
+                expression: '{{ expression }}'
+                label: '{{ label }}'
+                metric_stat:
+                  stat: '{{ stat }}'
+                  metric:
+                    metric_name: '{{ metric_name }}'
+                    dimensions:
+                      - value: '{{ value }}'
+                        name: '{{ name }}'
+                    namespace: '{{ namespace }}'
+                  unit: '{{ unit }}'
+                id: '{{ id }}'
+            statistic: '{{ statistic }}'
+            dimensions:
+              - value: '{{ value }}'
+                name: '{{ name }}'
+            unit: '{{ unit }}'
+            namespace: '{{ namespace }}'
+          disable_scale_in: '{{ disable_scale_in }}'
+          scale_in_cooldown: '{{ scale_in_cooldown }}'
+          predefined_metric_specification:
+            predefined_metric_type: '{{ predefined_metric_type }}'
+            resource_label: '{{ resource_label }}'
+      - name: step_scaling_policy_configuration
         value:
-          MetricAggregationType: '{{ MetricAggregationType }}'
-          Cooldown: '{{ Cooldown }}'
-          StepAdjustments:
-            - MetricIntervalUpperBound: null
-              MetricIntervalLowerBound: null
-              ScalingAdjustment: '{{ ScalingAdjustment }}'
-          MinAdjustmentMagnitude: '{{ MinAdjustmentMagnitude }}'
-          AdjustmentType: '{{ AdjustmentType }}'
-      - name: PredictiveScalingPolicyConfiguration
+          metric_aggregation_type: '{{ metric_aggregation_type }}'
+          cooldown: '{{ cooldown }}'
+          step_adjustments:
+            - metric_interval_upper_bound: null
+              metric_interval_lower_bound: null
+              scaling_adjustment: '{{ scaling_adjustment }}'
+          min_adjustment_magnitude: '{{ min_adjustment_magnitude }}'
+          adjustment_type: '{{ adjustment_type }}'
+      - name: predictive_scaling_policy_configuration
         value:
-          MaxCapacityBreachBehavior: '{{ MaxCapacityBreachBehavior }}'
-          MaxCapacityBuffer: '{{ MaxCapacityBuffer }}'
-          Mode: '{{ Mode }}'
-          MetricSpecifications:
-            - CustomizedLoadMetricSpecification:
-                MetricDataQueries:
-                  - ReturnData: '{{ ReturnData }}'
-                    Expression: '{{ Expression }}'
-                    Label: '{{ Label }}'
-                    MetricStat:
-                      Stat: '{{ Stat }}'
-                      Metric:
-                        MetricName: '{{ MetricName }}'
-                        Dimensions:
-                          - Value: '{{ Value }}'
-                            Name: '{{ Name }}'
-                        Namespace: '{{ Namespace }}'
-                      Unit: '{{ Unit }}'
-                    Id: '{{ Id }}'
-              PredefinedLoadMetricSpecification:
-                PredefinedMetricType: '{{ PredefinedMetricType }}'
-                ResourceLabel: '{{ ResourceLabel }}'
-              TargetValue: null
-              PredefinedScalingMetricSpecification:
-                PredefinedMetricType: '{{ PredefinedMetricType }}'
-                ResourceLabel: '{{ ResourceLabel }}'
-              CustomizedCapacityMetricSpecification:
-                MetricDataQueries:
+          max_capacity_breach_behavior: '{{ max_capacity_breach_behavior }}'
+          max_capacity_buffer: '{{ max_capacity_buffer }}'
+          mode: '{{ mode }}'
+          metric_specifications:
+            - customized_load_metric_specification:
+                metric_data_queries:
+                  - return_data: '{{ return_data }}'
+                    expression: '{{ expression }}'
+                    label: '{{ label }}'
+                    metric_stat:
+                      stat: '{{ stat }}'
+                      metric:
+                        metric_name: '{{ metric_name }}'
+                        dimensions:
+                          - value: '{{ value }}'
+                            name: '{{ name }}'
+                        namespace: '{{ namespace }}'
+                      unit: '{{ unit }}'
+                    id: '{{ id }}'
+              predefined_load_metric_specification:
+                predefined_metric_type: '{{ predefined_metric_type }}'
+                resource_label: '{{ resource_label }}'
+              target_value: null
+              predefined_scaling_metric_specification:
+                predefined_metric_type: '{{ predefined_metric_type }}'
+                resource_label: '{{ resource_label }}'
+              customized_capacity_metric_specification:
+                metric_data_queries:
                   - null
-              CustomizedScalingMetricSpecification:
-                MetricDataQueries:
+              customized_scaling_metric_specification:
+                metric_data_queries:
                   - null
-              PredefinedMetricPairSpecification:
-                PredefinedMetricType: '{{ PredefinedMetricType }}'
-                ResourceLabel: '{{ ResourceLabel }}'
-          SchedulingBufferTime: '{{ SchedulingBufferTime }}'
-
+              predefined_metric_pair_specification:
+                predefined_metric_type: '{{ predefined_metric_type }}'
+                resource_label: '{{ resource_label }}'
+          scheduling_buffer_time: '{{ scheduling_buffer_time }}'
 ```
 </TabItem>
 </Tabs>
@@ -670,7 +669,7 @@ SET PatchDocument = string('{{ {
     "PredictiveScalingPolicyConfiguration": predictive_scaling_policy_configuration
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Arn>|<ScalableDimension>';
+AND Identifier = '{{ arn }}|{{ scalable_dimension }}';
 ```
 
 
@@ -679,7 +678,7 @@ AND Identifier = '<Arn>|<ScalableDimension>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.applicationautoscaling.scaling_policies
-WHERE Identifier = '<Arn|ScalableDimension>'
+WHERE Identifier = '{{ arn }}|{{ scalable_dimension }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/applicationinsights/applications/index.md b/website/docs/services/applicationinsights/applications/index.md
index c3892b441..b324d4dd9 100644
--- a/website/docs/services/applicationinsights/applications/index.md
+++ b/website/docs/services/applicationinsights/applications/index.md
@@ -362,7 +362,7 @@ component_monitoring_settings,
 grouping_type,
 attach_missing_permission
 FROM awscc.applicationinsights.applications
-WHERE region = 'us-east-1' AND Identifier = '<ApplicationARN>';
+WHERE region = 'us-east-1' AND Identifier = '{{ application_arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -398,8 +398,8 @@ INSERT INTO awscc.applicationinsights.applications (
  ResourceGroupName,
  region
 )
-SELECT 
-'{{ ResourceGroupName }}',
+SELECT
+'{{ resource_group_name }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -422,19 +422,19 @@ INSERT INTO awscc.applicationinsights.applications (
  AttachMissingPermission,
  region
 )
-SELECT 
- '{{ ResourceGroupName }}',
- '{{ CWEMonitorEnabled }}',
- '{{ OpsCenterEnabled }}',
- '{{ OpsItemSNSTopicArn }}',
- '{{ SNSNotificationArn }}',
- '{{ Tags }}',
- '{{ CustomComponents }}',
- '{{ LogPatternSets }}',
- '{{ AutoConfigurationEnabled }}',
- '{{ ComponentMonitoringSettings }}',
- '{{ GroupingType }}',
- '{{ AttachMissingPermission }}',
+SELECT
+ '{{ resource_group_name }}',
+ '{{ cwe_monitor_enabled }}',
+ '{{ ops_center_enabled }}',
+ '{{ ops_item_sns_topic_arn }}',
+ '{{ sns_notification_arn }}',
+ '{{ tags }}',
+ '{{ custom_components }}',
+ '{{ log_pattern_sets }}',
+ '{{ auto_configuration_enabled }}',
+ '{{ component_monitoring_settings }}',
+ '{{ grouping_type }}',
+ '{{ attach_missing_permission }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -452,100 +452,99 @@ globals:
 resources:
   - name: application
     props:
-      - name: ResourceGroupName
-        value: '{{ ResourceGroupName }}'
-      - name: CWEMonitorEnabled
-        value: '{{ CWEMonitorEnabled }}'
-      - name: OpsCenterEnabled
-        value: '{{ OpsCenterEnabled }}'
-      - name: OpsItemSNSTopicArn
-        value: '{{ OpsItemSNSTopicArn }}'
-      - name: SNSNotificationArn
-        value: '{{ SNSNotificationArn }}'
-      - name: Tags
+      - name: resource_group_name
+        value: '{{ resource_group_name }}'
+      - name: cwe_monitor_enabled
+        value: '{{ cwe_monitor_enabled }}'
+      - name: ops_center_enabled
+        value: '{{ ops_center_enabled }}'
+      - name: ops_item_sns_topic_arn
+        value: '{{ ops_item_sns_topic_arn }}'
+      - name: sns_notification_arn
+        value: '{{ sns_notification_arn }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-      - name: CustomComponents
+          - key: '{{ key }}'
+            value: '{{ value }}'
+      - name: custom_components
         value:
-          - ComponentName: '{{ ComponentName }}'
-            ResourceList:
-              - '{{ ResourceList[0] }}'
-      - name: LogPatternSets
+          - component_name: '{{ component_name }}'
+            resource_list:
+              - '{{ resource_list[0] }}'
+      - name: log_pattern_sets
         value:
-          - PatternSetName: '{{ PatternSetName }}'
-            LogPatterns:
-              - PatternName: '{{ PatternName }}'
-                Pattern: '{{ Pattern }}'
-                Rank: '{{ Rank }}'
-      - name: AutoConfigurationEnabled
-        value: '{{ AutoConfigurationEnabled }}'
-      - name: ComponentMonitoringSettings
+          - pattern_set_name: '{{ pattern_set_name }}'
+            log_patterns:
+              - pattern_name: '{{ pattern_name }}'
+                pattern: '{{ pattern }}'
+                rank: '{{ rank }}'
+      - name: auto_configuration_enabled
+        value: '{{ auto_configuration_enabled }}'
+      - name: component_monitoring_settings
         value:
-          - ComponentName: '{{ ComponentName }}'
-            ComponentARN: '{{ ComponentARN }}'
-            Tier: '{{ Tier }}'
-            ComponentConfigurationMode: '{{ ComponentConfigurationMode }}'
-            DefaultOverwriteComponentConfiguration:
-              ConfigurationDetails:
-                AlarmMetrics:
-                  - AlarmMetricName: '{{ AlarmMetricName }}'
-                Logs:
-                  - LogGroupName: '{{ LogGroupName }}'
-                    LogPath: '{{ LogPath }}'
-                    LogType: '{{ LogType }}'
-                    Encoding: '{{ Encoding }}'
-                    PatternSet: '{{ PatternSet }}'
-                WindowsEvents:
-                  - LogGroupName: '{{ LogGroupName }}'
-                    EventName: '{{ EventName }}'
-                    EventLevels:
-                      - '{{ EventLevels[0] }}'
-                    PatternSet: '{{ PatternSet }}'
-                Processes:
-                  - ProcessName: '{{ ProcessName }}'
-                    AlarmMetrics:
+          - component_name: '{{ component_name }}'
+            component_arn: '{{ component_arn }}'
+            tier: '{{ tier }}'
+            component_configuration_mode: '{{ component_configuration_mode }}'
+            default_overwrite_component_configuration:
+              configuration_details:
+                alarm_metrics:
+                  - alarm_metric_name: '{{ alarm_metric_name }}'
+                logs:
+                  - log_group_name: '{{ log_group_name }}'
+                    log_path: '{{ log_path }}'
+                    log_type: '{{ log_type }}'
+                    encoding: '{{ encoding }}'
+                    pattern_set: '{{ pattern_set }}'
+                windows_events:
+                  - log_group_name: '{{ log_group_name }}'
+                    event_name: '{{ event_name }}'
+                    event_levels:
+                      - '{{ event_levels[0] }}'
+                    pattern_set: '{{ pattern_set }}'
+                processes:
+                  - process_name: '{{ process_name }}'
+                    alarm_metrics:
                       - null
-                Alarms:
-                  - AlarmName: '{{ AlarmName }}'
-                    Severity: '{{ Severity }}'
-                JMXPrometheusExporter:
-                  JMXURL: '{{ JMXURL }}'
-                  HostPort: '{{ HostPort }}'
-                  PrometheusPort: '{{ PrometheusPort }}'
-                HANAPrometheusExporter:
-                  HANASID: '{{ HANASID }}'
-                  HANAPort: '{{ HANAPort }}'
-                  HANASecretName: '{{ HANASecretName }}'
-                  AgreeToInstallHANADBClient: '{{ AgreeToInstallHANADBClient }}'
-                  PrometheusPort: '{{ PrometheusPort }}'
-                HAClusterPrometheusExporter:
-                  PrometheusPort: '{{ PrometheusPort }}'
-                NetWeaverPrometheusExporter:
-                  SAPSID: '{{ SAPSID }}'
-                  InstanceNumbers:
-                    - '{{ InstanceNumbers[0] }}'
-                  PrometheusPort: '{{ PrometheusPort }}'
-                SQLServerPrometheusExporter:
-                  PrometheusPort: '{{ PrometheusPort }}'
-                  SQLSecretName: '{{ SQLSecretName }}'
-              SubComponentTypeConfigurations:
-                - SubComponentType: '{{ SubComponentType }}'
-                  SubComponentConfigurationDetails:
-                    AlarmMetrics:
+                alarms:
+                  - alarm_name: '{{ alarm_name }}'
+                    severity: '{{ severity }}'
+                j_mx_prometheus_exporter:
+                  j_mx_url: '{{ j_mx_url }}'
+                  host_port: '{{ host_port }}'
+                  prometheus_port: '{{ prometheus_port }}'
+                h_an_aprometheus_exporter:
+                  h_an_as_id: '{{ h_an_as_id }}'
+                  h_an_aport: '{{ h_an_aport }}'
+                  h_an_asecret_name: '{{ h_an_asecret_name }}'
+                  agree_to_install_ha_na_db_client: '{{ agree_to_install_ha_na_db_client }}'
+                  prometheus_port: '{{ prometheus_port }}'
+                h_acluster_prometheus_exporter:
+                  prometheus_port: '{{ prometheus_port }}'
+                net_weaver_prometheus_exporter:
+                  s_ap_sid: '{{ s_ap_sid }}'
+                  instance_numbers:
+                    - '{{ instance_numbers[0] }}'
+                  prometheus_port: '{{ prometheus_port }}'
+                sq_lserver_prometheus_exporter:
+                  prometheus_port: '{{ prometheus_port }}'
+                  sq_lsecret_name: '{{ sq_lsecret_name }}'
+              sub_component_type_configurations:
+                - sub_component_type: '{{ sub_component_type }}'
+                  sub_component_configuration_details:
+                    alarm_metrics:
                       - null
-                    Logs:
+                    logs:
                       - null
-                    WindowsEvents:
+                    windows_events:
                       - null
-                    Processes:
+                    processes:
                       - null
-            CustomComponentConfiguration: null
-      - name: GroupingType
-        value: '{{ GroupingType }}'
-      - name: AttachMissingPermission
-        value: '{{ AttachMissingPermission }}'
-
+            custom_component_configuration: null
+      - name: grouping_type
+        value: '{{ grouping_type }}'
+      - name: attach_missing_permission
+        value: '{{ attach_missing_permission }}'
 ```
 </TabItem>
 </Tabs>
@@ -570,7 +569,7 @@ SET PatchDocument = string('{{ {
     "AttachMissingPermission": attach_missing_permission
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<ApplicationARN>';
+AND Identifier = '{{ application_arn }}';
 ```
 
 
@@ -579,7 +578,7 @@ AND Identifier = '<ApplicationARN>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.applicationinsights.applications
-WHERE Identifier = '<ApplicationARN>'
+WHERE Identifier = '{{ application_arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/applicationsignals/discoveries/index.md b/website/docs/services/applicationsignals/discoveries/index.md
index a8827f01d..77e99b654 100644
--- a/website/docs/services/applicationsignals/discoveries/index.md
+++ b/website/docs/services/applicationsignals/discoveries/index.md
@@ -134,7 +134,7 @@ SELECT
 region,
 account_id
 FROM awscc.applicationsignals.discoveries
-WHERE region = 'us-east-1' AND Identifier = '<AccountId>';
+WHERE region = 'us-east-1' AND Identifier = '{{ account_id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -170,7 +170,7 @@ INSERT INTO awscc.applicationsignals.discoveries (
  ,
  region
 )
-SELECT 
+SELECT
 '{{  }}',
 '{{ region }}';
 ```
@@ -183,7 +183,7 @@ INSERT INTO awscc.applicationsignals.discoveries (
  ,
  region
 )
-SELECT 
+SELECT
  '{{  }}',
  '{{ region }}';
 ```
@@ -202,7 +202,6 @@ globals:
 resources:
   - name: discovery
     props: []
-
 ```
 </TabItem>
 </Tabs>
@@ -213,7 +212,7 @@ resources:
 ```sql
 /*+ delete */
 DELETE FROM awscc.applicationsignals.discoveries
-WHERE Identifier = '<AccountId>'
+WHERE Identifier = '{{ account_id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/applicationsignals/service_level_objectives/index.md b/website/docs/services/applicationsignals/service_level_objectives/index.md
index d798aa739..241e56040 100644
--- a/website/docs/services/applicationsignals/service_level_objectives/index.md
+++ b/website/docs/services/applicationsignals/service_level_objectives/index.md
@@ -499,7 +499,7 @@ tags,
 burn_rate_configurations,
 exclusion_windows
 FROM awscc.applicationsignals.service_level_objectives
-WHERE region = 'us-east-1' AND Identifier = '<Arn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -535,8 +535,8 @@ INSERT INTO awscc.applicationsignals.service_level_objectives (
  Name,
  region
 )
-SELECT 
-'{{ Name }}',
+SELECT
+'{{ name }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -555,15 +555,15 @@ INSERT INTO awscc.applicationsignals.service_level_objectives (
  ExclusionWindows,
  region
 )
-SELECT 
- '{{ Name }}',
- '{{ Description }}',
- '{{ Sli }}',
- '{{ RequestBasedSli }}',
- '{{ Goal }}',
- '{{ Tags }}',
- '{{ BurnRateConfigurations }}',
- '{{ ExclusionWindows }}',
+SELECT
+ '{{ name }}',
+ '{{ description }}',
+ '{{ sli }}',
+ '{{ request_based_sli }}',
+ '{{ goal }}',
+ '{{ tags }}',
+ '{{ burn_rate_configurations }}',
+ '{{ exclusion_windows }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -581,80 +581,79 @@ globals:
 resources:
   - name: service_level_objective
     props:
-      - name: Name
-        value: '{{ Name }}'
-      - name: Description
-        value: '{{ Description }}'
-      - name: Sli
+      - name: name
+        value: '{{ name }}'
+      - name: description
+        value: '{{ description }}'
+      - name: sli
         value:
-          SliMetric:
-            KeyAttributes: null
-            OperationName: '{{ OperationName }}'
-            MetricType: '{{ MetricType }}'
-            Statistic: '{{ Statistic }}'
-            PeriodSeconds: '{{ PeriodSeconds }}'
-            MetricDataQueries:
-              - MetricStat:
-                  Period: '{{ Period }}'
-                  Metric:
-                    MetricName: '{{ MetricName }}'
-                    Dimensions:
-                      - Value: '{{ Value }}'
-                        Name: '{{ Name }}'
-                    Namespace: '{{ Namespace }}'
-                  Stat: '{{ Stat }}'
-                  Unit: '{{ Unit }}'
-                Id: '{{ Id }}'
-                ReturnData: '{{ ReturnData }}'
-                Expression: '{{ Expression }}'
-                AccountId: '{{ AccountId }}'
-            DependencyConfig:
-              DependencyKeyAttributes: null
-              DependencyOperationName: '{{ DependencyOperationName }}'
-          MetricThreshold: null
-          ComparisonOperator: '{{ ComparisonOperator }}'
-      - name: RequestBasedSli
+          sli_metric:
+            key_attributes: null
+            operation_name: '{{ operation_name }}'
+            metric_type: '{{ metric_type }}'
+            statistic: '{{ statistic }}'
+            period_seconds: '{{ period_seconds }}'
+            metric_data_queries:
+              - metric_stat:
+                  period: '{{ period }}'
+                  metric:
+                    metric_name: '{{ metric_name }}'
+                    dimensions:
+                      - value: '{{ value }}'
+                        name: '{{ name }}'
+                    namespace: '{{ namespace }}'
+                  stat: '{{ stat }}'
+                  unit: '{{ unit }}'
+                id: '{{ id }}'
+                return_data: '{{ return_data }}'
+                expression: '{{ expression }}'
+                account_id: '{{ account_id }}'
+            dependency_config:
+              dependency_key_attributes: null
+              dependency_operation_name: '{{ dependency_operation_name }}'
+          metric_threshold: null
+          comparison_operator: '{{ comparison_operator }}'
+      - name: request_based_sli
         value:
-          RequestBasedSliMetric:
-            KeyAttributes: null
-            OperationName: '{{ OperationName }}'
-            MetricType: '{{ MetricType }}'
-            TotalRequestCountMetric: null
-            MonitoredRequestCountMetric:
-              GoodCountMetric: null
-              BadCountMetric: null
-            DependencyConfig: null
-          MetricThreshold: null
-          ComparisonOperator: '{{ ComparisonOperator }}'
-      - name: Goal
+          request_based_sli_metric:
+            key_attributes: null
+            operation_name: '{{ operation_name }}'
+            metric_type: '{{ metric_type }}'
+            total_request_count_metric: null
+            monitored_request_count_metric:
+              good_count_metric: null
+              bad_count_metric: null
+            dependency_config: null
+          metric_threshold: null
+          comparison_operator: '{{ comparison_operator }}'
+      - name: goal
         value:
-          Interval:
-            RollingInterval:
-              DurationUnit: '{{ DurationUnit }}'
-              Duration: '{{ Duration }}'
-            CalendarInterval:
-              StartTime: '{{ StartTime }}'
-              DurationUnit: null
-              Duration: null
-          AttainmentGoal: null
-          WarningThreshold: null
-      - name: Tags
+          interval:
+            rolling_interval:
+              duration_unit: '{{ duration_unit }}'
+              duration: '{{ duration }}'
+            calendar_interval:
+              start_time: '{{ start_time }}'
+              duration_unit: null
+              duration: null
+          attainment_goal: null
+          warning_threshold: null
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-      - name: BurnRateConfigurations
+          - key: '{{ key }}'
+            value: '{{ value }}'
+      - name: burn_rate_configurations
         value:
-          - LookBackWindowMinutes: '{{ LookBackWindowMinutes }}'
-      - name: ExclusionWindows
+          - look_back_window_minutes: '{{ look_back_window_minutes }}'
+      - name: exclusion_windows
         value:
-          - Window:
-              DurationUnit: null
-              Duration: null
-            StartTime: '{{ StartTime }}'
-            RecurrenceRule:
-              Expression: '{{ Expression }}'
-            Reason: '{{ Reason }}'
-
+          - window:
+              duration_unit: null
+              duration: null
+            start_time: '{{ start_time }}'
+            recurrence_rule:
+              expression: '{{ expression }}'
+            reason: '{{ reason }}'
 ```
 </TabItem>
 </Tabs>
@@ -676,7 +675,7 @@ SET PatchDocument = string('{{ {
     "ExclusionWindows": exclusion_windows
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Arn>';
+AND Identifier = '{{ arn }}';
 ```
 
 
@@ -685,7 +684,7 @@ AND Identifier = '<Arn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.applicationsignals.service_level_objectives
-WHERE Identifier = '<Arn>'
+WHERE Identifier = '{{ arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/apprunner/auto_scaling_configurations/index.md b/website/docs/services/apprunner/auto_scaling_configurations/index.md
index 02a3fe928..c1d6290d9 100644
--- a/website/docs/services/apprunner/auto_scaling_configurations/index.md
+++ b/website/docs/services/apprunner/auto_scaling_configurations/index.md
@@ -182,7 +182,7 @@ min_size,
 latest,
 tags
 FROM awscc.apprunner.auto_scaling_configurations
-WHERE region = 'us-east-1' AND Identifier = '<AutoScalingConfigurationArn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ auto_scaling_configuration_arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -222,12 +222,12 @@ INSERT INTO awscc.apprunner.auto_scaling_configurations (
  Tags,
  region
 )
-SELECT 
-'{{ AutoScalingConfigurationName }}',
- '{{ MaxConcurrency }}',
- '{{ MaxSize }}',
- '{{ MinSize }}',
- '{{ Tags }}',
+SELECT
+'{{ auto_scaling_configuration_name }}',
+ '{{ max_concurrency }}',
+ '{{ max_size }}',
+ '{{ min_size }}',
+ '{{ tags }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -243,12 +243,12 @@ INSERT INTO awscc.apprunner.auto_scaling_configurations (
  Tags,
  region
 )
-SELECT 
- '{{ AutoScalingConfigurationName }}',
- '{{ MaxConcurrency }}',
- '{{ MaxSize }}',
- '{{ MinSize }}',
- '{{ Tags }}',
+SELECT
+ '{{ auto_scaling_configuration_name }}',
+ '{{ max_concurrency }}',
+ '{{ max_size }}',
+ '{{ min_size }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -266,19 +266,18 @@ globals:
 resources:
   - name: auto_scaling_configuration
     props:
-      - name: AutoScalingConfigurationName
-        value: '{{ AutoScalingConfigurationName }}'
-      - name: MaxConcurrency
-        value: '{{ MaxConcurrency }}'
-      - name: MaxSize
-        value: '{{ MaxSize }}'
-      - name: MinSize
-        value: '{{ MinSize }}'
-      - name: Tags
+      - name: auto_scaling_configuration_name
+        value: '{{ auto_scaling_configuration_name }}'
+      - name: max_concurrency
+        value: '{{ max_concurrency }}'
+      - name: max_size
+        value: '{{ max_size }}'
+      - name: min_size
+        value: '{{ min_size }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -289,7 +288,7 @@ resources:
 ```sql
 /*+ delete */
 DELETE FROM awscc.apprunner.auto_scaling_configurations
-WHERE Identifier = '<AutoScalingConfigurationArn>'
+WHERE Identifier = '{{ auto_scaling_configuration_arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/apprunner/observability_configurations/index.md b/website/docs/services/apprunner/observability_configurations/index.md
index 2bff77a46..1540527ab 100644
--- a/website/docs/services/apprunner/observability_configurations/index.md
+++ b/website/docs/services/apprunner/observability_configurations/index.md
@@ -177,7 +177,7 @@ latest,
 trace_configuration,
 tags
 FROM awscc.apprunner.observability_configurations
-WHERE region = 'us-east-1' AND Identifier = '<ObservabilityConfigurationArn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ observability_configuration_arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -213,7 +213,7 @@ INSERT INTO awscc.apprunner.observability_configurations (
  ,
  region
 )
-SELECT 
+SELECT
 '{{  }}',
 '{{ region }}';
 ```
@@ -228,10 +228,10 @@ INSERT INTO awscc.apprunner.observability_configurations (
  Tags,
  region
 )
-SELECT 
- '{{ ObservabilityConfigurationName }}',
- '{{ TraceConfiguration }}',
- '{{ Tags }}',
+SELECT
+ '{{ observability_configuration_name }}',
+ '{{ trace_configuration }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -249,16 +249,15 @@ globals:
 resources:
   - name: observability_configuration
     props:
-      - name: ObservabilityConfigurationName
-        value: '{{ ObservabilityConfigurationName }}'
-      - name: TraceConfiguration
+      - name: observability_configuration_name
+        value: '{{ observability_configuration_name }}'
+      - name: trace_configuration
         value:
-          Vendor: '{{ Vendor }}'
-      - name: Tags
+          vendor: '{{ vendor }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -269,7 +268,7 @@ resources:
 ```sql
 /*+ delete */
 DELETE FROM awscc.apprunner.observability_configurations
-WHERE Identifier = '<ObservabilityConfigurationArn>'
+WHERE Identifier = '{{ observability_configuration_arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/apprunner/services/index.md b/website/docs/services/apprunner/services/index.md
index 7a57cb8d5..705530403 100644
--- a/website/docs/services/apprunner/services/index.md
+++ b/website/docs/services/apprunner/services/index.md
@@ -441,7 +441,7 @@ observability_configuration,
 auto_scaling_configuration_arn,
 network_configuration
 FROM awscc.apprunner.services
-WHERE region = 'us-east-1' AND Identifier = '<ServiceArn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ service_arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -477,8 +477,8 @@ INSERT INTO awscc.apprunner.services (
  SourceConfiguration,
  region
 )
-SELECT 
-'{{ SourceConfiguration }}',
+SELECT
+'{{ source_configuration }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -498,16 +498,16 @@ INSERT INTO awscc.apprunner.services (
  NetworkConfiguration,
  region
 )
-SELECT 
- '{{ ServiceName }}',
- '{{ SourceConfiguration }}',
- '{{ InstanceConfiguration }}',
- '{{ Tags }}',
- '{{ EncryptionConfiguration }}',
- '{{ HealthCheckConfiguration }}',
- '{{ ObservabilityConfiguration }}',
- '{{ AutoScalingConfigurationArn }}',
- '{{ NetworkConfiguration }}',
+SELECT
+ '{{ service_name }}',
+ '{{ source_configuration }}',
+ '{{ instance_configuration }}',
+ '{{ tags }}',
+ '{{ encryption_configuration }}',
+ '{{ health_check_configuration }}',
+ '{{ observability_configuration }}',
+ '{{ auto_scaling_configuration_arn }}',
+ '{{ network_configuration }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -525,77 +525,76 @@ globals:
 resources:
   - name: service
     props:
-      - name: ServiceName
-        value: '{{ ServiceName }}'
-      - name: SourceConfiguration
+      - name: service_name
+        value: '{{ service_name }}'
+      - name: source_configuration
         value:
-          CodeRepository:
-            RepositoryUrl: '{{ RepositoryUrl }}'
-            SourceCodeVersion:
-              Type: '{{ Type }}'
-              Value: '{{ Value }}'
-            CodeConfiguration:
-              ConfigurationSource: '{{ ConfigurationSource }}'
-              CodeConfigurationValues:
-                Runtime: '{{ Runtime }}'
-                BuildCommand: '{{ BuildCommand }}'
-                StartCommand: '{{ StartCommand }}'
-                Port: '{{ Port }}'
-                RuntimeEnvironmentVariables:
-                  - Name: '{{ Name }}'
-                    Value: '{{ Value }}'
-                RuntimeEnvironmentSecrets:
+          code_repository:
+            repository_url: '{{ repository_url }}'
+            source_code_version:
+              type: '{{ type }}'
+              value: '{{ value }}'
+            code_configuration:
+              configuration_source: '{{ configuration_source }}'
+              code_configuration_values:
+                runtime: '{{ runtime }}'
+                build_command: '{{ build_command }}'
+                start_command: '{{ start_command }}'
+                port: '{{ port }}'
+                runtime_environment_variables:
+                  - name: '{{ name }}'
+                    value: '{{ value }}'
+                runtime_environment_secrets:
                   - null
-            SourceDirectory: '{{ SourceDirectory }}'
-          ImageRepository:
-            ImageIdentifier: '{{ ImageIdentifier }}'
-            ImageConfiguration:
-              StartCommand: '{{ StartCommand }}'
-              Port: '{{ Port }}'
-              RuntimeEnvironmentVariables:
+            source_directory: '{{ source_directory }}'
+          image_repository:
+            image_identifier: '{{ image_identifier }}'
+            image_configuration:
+              start_command: '{{ start_command }}'
+              port: '{{ port }}'
+              runtime_environment_variables:
                 - null
-              RuntimeEnvironmentSecrets:
+              runtime_environment_secrets:
                 - null
-            ImageRepositoryType: '{{ ImageRepositoryType }}'
-          AutoDeploymentsEnabled: '{{ AutoDeploymentsEnabled }}'
-          AuthenticationConfiguration:
-            ConnectionArn: '{{ ConnectionArn }}'
-            AccessRoleArn: '{{ AccessRoleArn }}'
-      - name: InstanceConfiguration
+            image_repository_type: '{{ image_repository_type }}'
+          auto_deployments_enabled: '{{ auto_deployments_enabled }}'
+          authentication_configuration:
+            connection_arn: '{{ connection_arn }}'
+            access_role_arn: '{{ access_role_arn }}'
+      - name: instance_configuration
         value:
-          Cpu: '{{ Cpu }}'
-          Memory: '{{ Memory }}'
-          InstanceRoleArn: null
-      - name: Tags
+          cpu: '{{ cpu }}'
+          memory: '{{ memory }}'
+          instance_role_arn: null
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-      - name: EncryptionConfiguration
+          - key: '{{ key }}'
+            value: '{{ value }}'
+      - name: encryption_configuration
         value:
-          KmsKey: '{{ KmsKey }}'
-      - name: HealthCheckConfiguration
+          kms_key: '{{ kms_key }}'
+      - name: health_check_configuration
         value:
-          Protocol: '{{ Protocol }}'
-          Path: '{{ Path }}'
-          Interval: '{{ Interval }}'
-          Timeout: '{{ Timeout }}'
-          HealthyThreshold: '{{ HealthyThreshold }}'
-          UnhealthyThreshold: '{{ UnhealthyThreshold }}'
-      - name: ObservabilityConfiguration
+          protocol: '{{ protocol }}'
+          path: '{{ path }}'
+          interval: '{{ interval }}'
+          timeout: '{{ timeout }}'
+          healthy_threshold: '{{ healthy_threshold }}'
+          unhealthy_threshold: '{{ unhealthy_threshold }}'
+      - name: observability_configuration
         value:
-          ObservabilityEnabled: '{{ ObservabilityEnabled }}'
-          ObservabilityConfigurationArn: '{{ ObservabilityConfigurationArn }}'
-      - name: AutoScalingConfigurationArn
-        value: '{{ AutoScalingConfigurationArn }}'
-      - name: NetworkConfiguration
+          observability_enabled: '{{ observability_enabled }}'
+          observability_configuration_arn: '{{ observability_configuration_arn }}'
+      - name: auto_scaling_configuration_arn
+        value: '{{ auto_scaling_configuration_arn }}'
+      - name: network_configuration
         value:
-          EgressConfiguration:
-            EgressType: '{{ EgressType }}'
-            VpcConnectorArn: '{{ VpcConnectorArn }}'
-          IngressConfiguration:
-            IsPubliclyAccessible: '{{ IsPubliclyAccessible }}'
-          IpAddressType: '{{ IpAddressType }}'
-
+          egress_configuration:
+            egress_type: '{{ egress_type }}'
+            vpc_connector_arn: '{{ vpc_connector_arn }}'
+          ingress_configuration:
+            is_publicly_accessible: '{{ is_publicly_accessible }}'
+          ip_address_type: '{{ ip_address_type }}'
 ```
 </TabItem>
 </Tabs>
@@ -617,7 +616,7 @@ SET PatchDocument = string('{{ {
     "NetworkConfiguration": network_configuration
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<ServiceArn>';
+AND Identifier = '{{ service_arn }}';
 ```
 
 
@@ -626,7 +625,7 @@ AND Identifier = '<ServiceArn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.apprunner.services
-WHERE Identifier = '<ServiceArn>'
+WHERE Identifier = '{{ service_arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/apprunner/vpc_connectors/index.md b/website/docs/services/apprunner/vpc_connectors/index.md
index 0e85d435f..8254ec7d8 100644
--- a/website/docs/services/apprunner/vpc_connectors/index.md
+++ b/website/docs/services/apprunner/vpc_connectors/index.md
@@ -170,7 +170,7 @@ subnets,
 security_groups,
 tags
 FROM awscc.apprunner.vpc_connectors
-WHERE region = 'us-east-1' AND Identifier = '<VpcConnectorArn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ vpc_connector_arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -206,8 +206,8 @@ INSERT INTO awscc.apprunner.vpc_connectors (
  Subnets,
  region
 )
-SELECT 
-'{{ Subnets }}',
+SELECT
+'{{ subnets }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -222,11 +222,11 @@ INSERT INTO awscc.apprunner.vpc_connectors (
  Tags,
  region
 )
-SELECT 
- '{{ VpcConnectorName }}',
- '{{ Subnets }}',
- '{{ SecurityGroups }}',
- '{{ Tags }}',
+SELECT
+ '{{ vpc_connector_name }}',
+ '{{ subnets }}',
+ '{{ security_groups }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -244,19 +244,18 @@ globals:
 resources:
   - name: vpc_connector
     props:
-      - name: VpcConnectorName
-        value: '{{ VpcConnectorName }}'
-      - name: Subnets
+      - name: vpc_connector_name
+        value: '{{ vpc_connector_name }}'
+      - name: subnets
         value:
-          - '{{ Subnets[0] }}'
-      - name: SecurityGroups
+          - '{{ subnets[0] }}'
+      - name: security_groups
         value:
-          - '{{ SecurityGroups[0] }}'
-      - name: Tags
+          - '{{ security_groups[0] }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -267,7 +266,7 @@ resources:
 ```sql
 /*+ delete */
 DELETE FROM awscc.apprunner.vpc_connectors
-WHERE Identifier = '<VpcConnectorArn>'
+WHERE Identifier = '{{ vpc_connector_arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/apprunner/vpc_ingress_connections/index.md b/website/docs/services/apprunner/vpc_ingress_connections/index.md
index acdcb9076..6d97a4f44 100644
--- a/website/docs/services/apprunner/vpc_ingress_connections/index.md
+++ b/website/docs/services/apprunner/vpc_ingress_connections/index.md
@@ -194,7 +194,7 @@ domain_name,
 ingress_vpc_configuration,
 tags
 FROM awscc.apprunner.vpc_ingress_connections
-WHERE region = 'us-east-1' AND Identifier = '<VpcIngressConnectionArn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ vpc_ingress_connection_arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -231,9 +231,9 @@ INSERT INTO awscc.apprunner.vpc_ingress_connections (
  IngressVpcConfiguration,
  region
 )
-SELECT 
-'{{ ServiceArn }}',
- '{{ IngressVpcConfiguration }}',
+SELECT
+'{{ service_arn }}',
+ '{{ ingress_vpc_configuration }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -248,11 +248,11 @@ INSERT INTO awscc.apprunner.vpc_ingress_connections (
  Tags,
  region
 )
-SELECT 
- '{{ VpcIngressConnectionName }}',
- '{{ ServiceArn }}',
- '{{ IngressVpcConfiguration }}',
- '{{ Tags }}',
+SELECT
+ '{{ vpc_ingress_connection_name }}',
+ '{{ service_arn }}',
+ '{{ ingress_vpc_configuration }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -270,19 +270,18 @@ globals:
 resources:
   - name: vpc_ingress_connection
     props:
-      - name: VpcIngressConnectionName
-        value: '{{ VpcIngressConnectionName }}'
-      - name: ServiceArn
-        value: '{{ ServiceArn }}'
-      - name: IngressVpcConfiguration
+      - name: vpc_ingress_connection_name
+        value: '{{ vpc_ingress_connection_name }}'
+      - name: service_arn
+        value: '{{ service_arn }}'
+      - name: ingress_vpc_configuration
         value:
-          VpcId: '{{ VpcId }}'
-          VpcEndpointId: '{{ VpcEndpointId }}'
-      - name: Tags
+          vpc_id: '{{ vpc_id }}'
+          vpc_endpoint_id: '{{ vpc_endpoint_id }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -298,7 +297,7 @@ SET PatchDocument = string('{{ {
     "IngressVpcConfiguration": ingress_vpc_configuration
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<VpcIngressConnectionArn>';
+AND Identifier = '{{ vpc_ingress_connection_arn }}';
 ```
 
 
@@ -307,7 +306,7 @@ AND Identifier = '<VpcIngressConnectionArn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.apprunner.vpc_ingress_connections
-WHERE Identifier = '<VpcIngressConnectionArn>'
+WHERE Identifier = '{{ vpc_ingress_connection_arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/appstream/app_block_builders/index.md b/website/docs/services/appstream/app_block_builders/index.md
index cf9c0531f..55eb01384 100644
--- a/website/docs/services/appstream/app_block_builders/index.md
+++ b/website/docs/services/appstream/app_block_builders/index.md
@@ -242,7 +242,7 @@ created_time,
 instance_type,
 app_block_arns
 FROM awscc.appstream.app_block_builders
-WHERE region = 'us-east-1' AND Identifier = '<Name>';
+WHERE region = 'us-east-1' AND Identifier = '{{ name }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -281,11 +281,11 @@ INSERT INTO awscc.appstream.app_block_builders (
  InstanceType,
  region
 )
-SELECT 
-'{{ Name }}',
- '{{ Platform }}',
- '{{ VpcConfig }}',
- '{{ InstanceType }}',
+SELECT
+'{{ name }}',
+ '{{ platform }}',
+ '{{ vpc_config }}',
+ '{{ instance_type }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -307,18 +307,18 @@ INSERT INTO awscc.appstream.app_block_builders (
  AppBlockArns,
  region
 )
-SELECT 
- '{{ Name }}',
- '{{ Description }}',
- '{{ DisplayName }}',
- '{{ Platform }}',
- '{{ AccessEndpoints }}',
- '{{ Tags }}',
- '{{ VpcConfig }}',
- '{{ EnableDefaultInternetAccess }}',
- '{{ IamRoleArn }}',
- '{{ InstanceType }}',
- '{{ AppBlockArns }}',
+SELECT
+ '{{ name }}',
+ '{{ description }}',
+ '{{ display_name }}',
+ '{{ platform }}',
+ '{{ access_endpoints }}',
+ '{{ tags }}',
+ '{{ vpc_config }}',
+ '{{ enable_default_internet_access }}',
+ '{{ iam_role_arn }}',
+ '{{ instance_type }}',
+ '{{ app_block_arns }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -336,38 +336,37 @@ globals:
 resources:
   - name: app_block_builder
     props:
-      - name: Name
-        value: '{{ Name }}'
-      - name: Description
-        value: '{{ Description }}'
-      - name: DisplayName
-        value: '{{ DisplayName }}'
-      - name: Platform
-        value: '{{ Platform }}'
-      - name: AccessEndpoints
+      - name: name
+        value: '{{ name }}'
+      - name: description
+        value: '{{ description }}'
+      - name: display_name
+        value: '{{ display_name }}'
+      - name: platform
+        value: '{{ platform }}'
+      - name: access_endpoints
         value:
-          - EndpointType: '{{ EndpointType }}'
-            VpceId: '{{ VpceId }}'
-      - name: Tags
+          - endpoint_type: '{{ endpoint_type }}'
+            vpce_id: '{{ vpce_id }}'
+      - name: tags
         value:
-          - Value: '{{ Value }}'
-            Key: '{{ Key }}'
-      - name: VpcConfig
+          - value: '{{ value }}'
+            key: '{{ key }}'
+      - name: vpc_config
         value:
-          SecurityGroupIds:
-            - '{{ SecurityGroupIds[0] }}'
-          SubnetIds:
-            - '{{ SubnetIds[0] }}'
-      - name: EnableDefaultInternetAccess
-        value: '{{ EnableDefaultInternetAccess }}'
-      - name: IamRoleArn
-        value: '{{ IamRoleArn }}'
-      - name: InstanceType
-        value: '{{ InstanceType }}'
-      - name: AppBlockArns
+          security_group_ids:
+            - '{{ security_group_ids[0] }}'
+          subnet_ids:
+            - '{{ subnet_ids[0] }}'
+      - name: enable_default_internet_access
+        value: '{{ enable_default_internet_access }}'
+      - name: iam_role_arn
+        value: '{{ iam_role_arn }}'
+      - name: instance_type
+        value: '{{ instance_type }}'
+      - name: app_block_arns
         value:
-          - '{{ AppBlockArns[0] }}'
-
+          - '{{ app_block_arns[0] }}'
 ```
 </TabItem>
 </Tabs>
@@ -392,7 +391,7 @@ SET PatchDocument = string('{{ {
     "AppBlockArns": app_block_arns
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Name>';
+AND Identifier = '{{ name }}';
 ```
 
 
@@ -401,7 +400,7 @@ AND Identifier = '<Name>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.appstream.app_block_builders
-WHERE Identifier = '<Name>'
+WHERE Identifier = '{{ name }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/appstream/app_blocks/index.md b/website/docs/services/appstream/app_blocks/index.md
index 1265b334e..053e0c124 100644
--- a/website/docs/services/appstream/app_blocks/index.md
+++ b/website/docs/services/appstream/app_blocks/index.md
@@ -178,7 +178,7 @@ created_time,
 packaging_type,
 post_setup_script_details
 FROM awscc.appstream.app_blocks
-WHERE region = 'us-east-1' AND Identifier = '<Arn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ arn }}';
 ```
 
 ## `INSERT` example
@@ -202,9 +202,9 @@ INSERT INTO awscc.appstream.app_blocks (
  SourceS3Location,
  region
 )
-SELECT 
-'{{ Name }}',
- '{{ SourceS3Location }}',
+SELECT
+'{{ name }}',
+ '{{ source_s3_location }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -223,15 +223,15 @@ INSERT INTO awscc.appstream.app_blocks (
  PostSetupScriptDetails,
  region
 )
-SELECT 
- '{{ Name }}',
- '{{ Description }}',
- '{{ DisplayName }}',
- '{{ SourceS3Location }}',
- '{{ SetupScriptDetails }}',
- '{{ Tags }}',
- '{{ PackagingType }}',
- '{{ PostSetupScriptDetails }}',
+SELECT
+ '{{ name }}',
+ '{{ description }}',
+ '{{ display_name }}',
+ '{{ source_s3_location }}',
+ '{{ setup_script_details }}',
+ '{{ tags }}',
+ '{{ packaging_type }}',
+ '{{ post_setup_script_details }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -249,31 +249,30 @@ globals:
 resources:
   - name: app_block
     props:
-      - name: Name
-        value: '{{ Name }}'
-      - name: Description
-        value: '{{ Description }}'
-      - name: DisplayName
-        value: '{{ DisplayName }}'
-      - name: SourceS3Location
+      - name: name
+        value: '{{ name }}'
+      - name: description
+        value: '{{ description }}'
+      - name: display_name
+        value: '{{ display_name }}'
+      - name: source_s3_location
         value:
-          S3Bucket: '{{ S3Bucket }}'
-          S3Key: '{{ S3Key }}'
-      - name: SetupScriptDetails
+          s3_bucket: '{{ s3_bucket }}'
+          s3_key: '{{ s3_key }}'
+      - name: setup_script_details
         value:
-          ScriptS3Location: null
-          ExecutablePath: '{{ ExecutablePath }}'
-          ExecutableParameters: '{{ ExecutableParameters }}'
-          TimeoutInSeconds: '{{ TimeoutInSeconds }}'
-      - name: Tags
+          script_s3_location: null
+          executable_path: '{{ executable_path }}'
+          executable_parameters: '{{ executable_parameters }}'
+          timeout_in_seconds: '{{ timeout_in_seconds }}'
+      - name: tags
         value:
-          - Value: '{{ Value }}'
-            Key: '{{ Key }}'
-      - name: PackagingType
-        value: '{{ PackagingType }}'
-      - name: PostSetupScriptDetails
+          - value: '{{ value }}'
+            key: '{{ key }}'
+      - name: packaging_type
+        value: '{{ packaging_type }}'
+      - name: post_setup_script_details
         value: null
-
 ```
 </TabItem>
 </Tabs>
@@ -289,7 +288,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Arn>';
+AND Identifier = '{{ arn }}';
 ```
 
 
@@ -298,7 +297,7 @@ AND Identifier = '<Arn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.appstream.app_blocks
-WHERE Identifier = '<Arn>'
+WHERE Identifier = '{{ arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/appstream/application_entitlement_associations/index.md b/website/docs/services/appstream/application_entitlement_associations/index.md
index 8984aa58f..b5ce2d23a 100644
--- a/website/docs/services/appstream/application_entitlement_associations/index.md
+++ b/website/docs/services/appstream/application_entitlement_associations/index.md
@@ -95,7 +95,7 @@ stack_name,
 entitlement_name,
 application_identifier
 FROM awscc.appstream.application_entitlement_associations
-WHERE region = 'us-east-1' AND Identifier = '<StackName>|<EntitlementName>|<ApplicationIdentifier>';
+WHERE region = 'us-east-1' AND Identifier = '{{ stack_name }}|{{ entitlement_name }}|{{ application_identifier }}';
 ```
 
 ## `INSERT` example
@@ -120,10 +120,10 @@ INSERT INTO awscc.appstream.application_entitlement_associations (
  ApplicationIdentifier,
  region
 )
-SELECT 
-'{{ StackName }}',
- '{{ EntitlementName }}',
- '{{ ApplicationIdentifier }}',
+SELECT
+'{{ stack_name }}',
+ '{{ entitlement_name }}',
+ '{{ application_identifier }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -137,10 +137,10 @@ INSERT INTO awscc.appstream.application_entitlement_associations (
  ApplicationIdentifier,
  region
 )
-SELECT 
- '{{ StackName }}',
- '{{ EntitlementName }}',
- '{{ ApplicationIdentifier }}',
+SELECT
+ '{{ stack_name }}',
+ '{{ entitlement_name }}',
+ '{{ application_identifier }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -158,13 +158,12 @@ globals:
 resources:
   - name: application_entitlement_association
     props:
-      - name: StackName
-        value: '{{ StackName }}'
-      - name: EntitlementName
-        value: '{{ EntitlementName }}'
-      - name: ApplicationIdentifier
-        value: '{{ ApplicationIdentifier }}'
-
+      - name: stack_name
+        value: '{{ stack_name }}'
+      - name: entitlement_name
+        value: '{{ entitlement_name }}'
+      - name: application_identifier
+        value: '{{ application_identifier }}'
 ```
 </TabItem>
 </Tabs>
@@ -175,7 +174,7 @@ resources:
 ```sql
 /*+ delete */
 DELETE FROM awscc.appstream.application_entitlement_associations
-WHERE Identifier = '<StackName|EntitlementName|ApplicationIdentifier>'
+WHERE Identifier = '{{ stack_name }}|{{ entitlement_name }}|{{ application_identifier }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/appstream/application_fleet_associations/index.md b/website/docs/services/appstream/application_fleet_associations/index.md
index 0738b1317..c3d062ee5 100644
--- a/website/docs/services/appstream/application_fleet_associations/index.md
+++ b/website/docs/services/appstream/application_fleet_associations/index.md
@@ -89,7 +89,7 @@ region,
 fleet_name,
 application_arn
 FROM awscc.appstream.application_fleet_associations
-WHERE region = 'us-east-1' AND Identifier = '<FleetName>|<ApplicationArn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ fleet_name }}|{{ application_arn }}';
 ```
 
 ## `INSERT` example
@@ -113,9 +113,9 @@ INSERT INTO awscc.appstream.application_fleet_associations (
  ApplicationArn,
  region
 )
-SELECT 
-'{{ FleetName }}',
- '{{ ApplicationArn }}',
+SELECT
+'{{ fleet_name }}',
+ '{{ application_arn }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -128,9 +128,9 @@ INSERT INTO awscc.appstream.application_fleet_associations (
  ApplicationArn,
  region
 )
-SELECT 
- '{{ FleetName }}',
- '{{ ApplicationArn }}',
+SELECT
+ '{{ fleet_name }}',
+ '{{ application_arn }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -148,11 +148,10 @@ globals:
 resources:
   - name: application_fleet_association
     props:
-      - name: FleetName
-        value: '{{ FleetName }}'
-      - name: ApplicationArn
-        value: '{{ ApplicationArn }}'
-
+      - name: fleet_name
+        value: '{{ fleet_name }}'
+      - name: application_arn
+        value: '{{ application_arn }}'
 ```
 </TabItem>
 </Tabs>
@@ -163,7 +162,7 @@ resources:
 ```sql
 /*+ delete */
 DELETE FROM awscc.appstream.application_fleet_associations
-WHERE Identifier = '<FleetName|ApplicationArn>'
+WHERE Identifier = '{{ fleet_name }}|{{ application_arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/appstream/applications/index.md b/website/docs/services/appstream/applications/index.md
index 03386bb24..7ae67995b 100644
--- a/website/docs/services/appstream/applications/index.md
+++ b/website/docs/services/appstream/applications/index.md
@@ -185,7 +185,7 @@ tags,
 attributes_to_delete,
 created_time
 FROM awscc.appstream.applications
-WHERE region = 'us-east-1' AND Identifier = '<Arn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ arn }}';
 ```
 
 ## `INSERT` example
@@ -213,13 +213,13 @@ INSERT INTO awscc.appstream.applications (
  Platforms,
  region
 )
-SELECT 
-'{{ Name }}',
- '{{ LaunchPath }}',
- '{{ InstanceFamilies }}',
- '{{ IconS3Location }}',
- '{{ AppBlockArn }}',
- '{{ Platforms }}',
+SELECT
+'{{ name }}',
+ '{{ launch_path }}',
+ '{{ instance_families }}',
+ '{{ icon_s3_location }}',
+ '{{ app_block_arn }}',
+ '{{ platforms }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -242,19 +242,19 @@ INSERT INTO awscc.appstream.applications (
  AttributesToDelete,
  region
 )
-SELECT 
- '{{ Name }}',
- '{{ DisplayName }}',
- '{{ Description }}',
- '{{ LaunchPath }}',
- '{{ LaunchParameters }}',
- '{{ WorkingDirectory }}',
- '{{ InstanceFamilies }}',
- '{{ IconS3Location }}',
- '{{ AppBlockArn }}',
- '{{ Platforms }}',
- '{{ Tags }}',
- '{{ AttributesToDelete }}',
+SELECT
+ '{{ name }}',
+ '{{ display_name }}',
+ '{{ description }}',
+ '{{ launch_path }}',
+ '{{ launch_parameters }}',
+ '{{ working_directory }}',
+ '{{ instance_families }}',
+ '{{ icon_s3_location }}',
+ '{{ app_block_arn }}',
+ '{{ platforms }}',
+ '{{ tags }}',
+ '{{ attributes_to_delete }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -272,38 +272,37 @@ globals:
 resources:
   - name: application
     props:
-      - name: Name
-        value: '{{ Name }}'
-      - name: DisplayName
-        value: '{{ DisplayName }}'
-      - name: Description
-        value: '{{ Description }}'
-      - name: LaunchPath
-        value: '{{ LaunchPath }}'
-      - name: LaunchParameters
-        value: '{{ LaunchParameters }}'
-      - name: WorkingDirectory
-        value: '{{ WorkingDirectory }}'
-      - name: InstanceFamilies
+      - name: name
+        value: '{{ name }}'
+      - name: display_name
+        value: '{{ display_name }}'
+      - name: description
+        value: '{{ description }}'
+      - name: launch_path
+        value: '{{ launch_path }}'
+      - name: launch_parameters
+        value: '{{ launch_parameters }}'
+      - name: working_directory
+        value: '{{ working_directory }}'
+      - name: instance_families
         value:
-          - '{{ InstanceFamilies[0] }}'
-      - name: IconS3Location
+          - '{{ instance_families[0] }}'
+      - name: icon_s3_location
         value:
-          S3Bucket: '{{ S3Bucket }}'
-          S3Key: '{{ S3Key }}'
-      - name: AppBlockArn
-        value: '{{ AppBlockArn }}'
-      - name: Platforms
+          s3_bucket: '{{ s3_bucket }}'
+          s3_key: '{{ s3_key }}'
+      - name: app_block_arn
+        value: '{{ app_block_arn }}'
+      - name: platforms
         value:
-          - '{{ Platforms[0] }}'
-      - name: Tags
+          - '{{ platforms[0] }}'
+      - name: tags
         value:
-          - Value: '{{ Value }}'
-            Key: '{{ Key }}'
-      - name: AttributesToDelete
+          - value: '{{ value }}'
+            key: '{{ key }}'
+      - name: attributes_to_delete
         value:
-          - '{{ AttributesToDelete[0] }}'
-
+          - '{{ attributes_to_delete[0] }}'
 ```
 </TabItem>
 </Tabs>
@@ -327,7 +326,7 @@ SET PatchDocument = string('{{ {
     "AttributesToDelete": attributes_to_delete
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Arn>';
+AND Identifier = '{{ arn }}';
 ```
 
 
@@ -336,7 +335,7 @@ AND Identifier = '<Arn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.appstream.applications
-WHERE Identifier = '<Arn>'
+WHERE Identifier = '{{ arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/appstream/directory_configs/index.md b/website/docs/services/appstream/directory_configs/index.md
index af6ec0c33..3bf8005d2 100644
--- a/website/docs/services/appstream/directory_configs/index.md
+++ b/website/docs/services/appstream/directory_configs/index.md
@@ -176,7 +176,7 @@ service_account_credentials,
 directory_name,
 certificate_based_auth_properties
 FROM awscc.appstream.directory_configs
-WHERE region = 'us-east-1' AND Identifier = '<DirectoryName>';
+WHERE region = 'us-east-1' AND Identifier = '{{ directory_name }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -214,10 +214,10 @@ INSERT INTO awscc.appstream.directory_configs (
  DirectoryName,
  region
 )
-SELECT 
-'{{ OrganizationalUnitDistinguishedNames }}',
- '{{ ServiceAccountCredentials }}',
- '{{ DirectoryName }}',
+SELECT
+'{{ organizational_unit_distinguished_names }}',
+ '{{ service_account_credentials }}',
+ '{{ directory_name }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -232,11 +232,11 @@ INSERT INTO awscc.appstream.directory_configs (
  CertificateBasedAuthProperties,
  region
 )
-SELECT 
- '{{ OrganizationalUnitDistinguishedNames }}',
- '{{ ServiceAccountCredentials }}',
- '{{ DirectoryName }}',
- '{{ CertificateBasedAuthProperties }}',
+SELECT
+ '{{ organizational_unit_distinguished_names }}',
+ '{{ service_account_credentials }}',
+ '{{ directory_name }}',
+ '{{ certificate_based_auth_properties }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -254,20 +254,19 @@ globals:
 resources:
   - name: directory_config
     props:
-      - name: OrganizationalUnitDistinguishedNames
+      - name: organizational_unit_distinguished_names
         value:
-          - '{{ OrganizationalUnitDistinguishedNames[0] }}'
-      - name: ServiceAccountCredentials
+          - '{{ organizational_unit_distinguished_names[0] }}'
+      - name: service_account_credentials
         value:
-          AccountName: '{{ AccountName }}'
-          AccountPassword: '{{ AccountPassword }}'
-      - name: DirectoryName
-        value: '{{ DirectoryName }}'
-      - name: CertificateBasedAuthProperties
+          account_name: '{{ account_name }}'
+          account_password: '{{ account_password }}'
+      - name: directory_name
+        value: '{{ directory_name }}'
+      - name: certificate_based_auth_properties
         value:
-          Status: '{{ Status }}'
-          CertificateAuthorityArn: '{{ CertificateAuthorityArn }}'
-
+          status: '{{ status }}'
+          certificate_authority_arn: '{{ certificate_authority_arn }}'
 ```
 </TabItem>
 </Tabs>
@@ -285,7 +284,7 @@ SET PatchDocument = string('{{ {
     "CertificateBasedAuthProperties": certificate_based_auth_properties
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<DirectoryName>';
+AND Identifier = '{{ directory_name }}';
 ```
 
 
@@ -294,7 +293,7 @@ AND Identifier = '<DirectoryName>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.appstream.directory_configs
-WHERE Identifier = '<DirectoryName>'
+WHERE Identifier = '{{ directory_name }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/appstream/entitlements/index.md b/website/docs/services/appstream/entitlements/index.md
index e7b9e4d75..7b753e966 100644
--- a/website/docs/services/appstream/entitlements/index.md
+++ b/website/docs/services/appstream/entitlements/index.md
@@ -136,7 +136,7 @@ attributes,
 created_time,
 last_modified_time
 FROM awscc.appstream.entitlements
-WHERE region = 'us-east-1' AND Identifier = '<StackName>|<Name>';
+WHERE region = 'us-east-1' AND Identifier = '{{ stack_name }}|{{ name }}';
 ```
 
 ## `INSERT` example
@@ -162,11 +162,11 @@ INSERT INTO awscc.appstream.entitlements (
  Attributes,
  region
 )
-SELECT 
-'{{ Name }}',
- '{{ StackName }}',
- '{{ AppVisibility }}',
- '{{ Attributes }}',
+SELECT
+'{{ name }}',
+ '{{ stack_name }}',
+ '{{ app_visibility }}',
+ '{{ attributes }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -182,12 +182,12 @@ INSERT INTO awscc.appstream.entitlements (
  Attributes,
  region
 )
-SELECT 
- '{{ Name }}',
- '{{ StackName }}',
- '{{ Description }}',
- '{{ AppVisibility }}',
- '{{ Attributes }}',
+SELECT
+ '{{ name }}',
+ '{{ stack_name }}',
+ '{{ description }}',
+ '{{ app_visibility }}',
+ '{{ attributes }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -205,19 +205,18 @@ globals:
 resources:
   - name: entitlement
     props:
-      - name: Name
-        value: '{{ Name }}'
-      - name: StackName
-        value: '{{ StackName }}'
-      - name: Description
-        value: '{{ Description }}'
-      - name: AppVisibility
-        value: '{{ AppVisibility }}'
-      - name: Attributes
+      - name: name
+        value: '{{ name }}'
+      - name: stack_name
+        value: '{{ stack_name }}'
+      - name: description
+        value: '{{ description }}'
+      - name: app_visibility
+        value: '{{ app_visibility }}'
+      - name: attributes
         value:
-          - Name: '{{ Name }}'
-            Value: '{{ Value }}'
-
+          - name: '{{ name }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -235,7 +234,7 @@ SET PatchDocument = string('{{ {
     "Attributes": attributes
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<StackName>|<Name>';
+AND Identifier = '{{ stack_name }}|{{ name }}';
 ```
 
 
@@ -244,7 +243,7 @@ AND Identifier = '<StackName>|<Name>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.appstream.entitlements
-WHERE Identifier = '<StackName|Name>'
+WHERE Identifier = '{{ stack_name }}|{{ name }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/appstream/image_builders/index.md b/website/docs/services/appstream/image_builders/index.md
index bed8eb23b..cfb37519d 100644
--- a/website/docs/services/appstream/image_builders/index.md
+++ b/website/docs/services/appstream/image_builders/index.md
@@ -254,7 +254,7 @@ streaming_url,
 image_arn,
 access_endpoints
 FROM awscc.appstream.image_builders
-WHERE region = 'us-east-1' AND Identifier = '<Name>';
+WHERE region = 'us-east-1' AND Identifier = '{{ name }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -291,9 +291,9 @@ INSERT INTO awscc.appstream.image_builders (
  InstanceType,
  region
 )
-SELECT 
-'{{ Name }}',
- '{{ InstanceType }}',
+SELECT
+'{{ name }}',
+ '{{ instance_type }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -317,20 +317,20 @@ INSERT INTO awscc.appstream.image_builders (
  AccessEndpoints,
  region
 )
-SELECT 
- '{{ Description }}',
- '{{ VpcConfig }}',
- '{{ EnableDefaultInternetAccess }}',
- '{{ DomainJoinInfo }}',
- '{{ AppstreamAgentVersion }}',
- '{{ Name }}',
- '{{ ImageName }}',
- '{{ DisplayName }}',
- '{{ IamRoleArn }}',
- '{{ InstanceType }}',
- '{{ Tags }}',
- '{{ ImageArn }}',
- '{{ AccessEndpoints }}',
+SELECT
+ '{{ description }}',
+ '{{ vpc_config }}',
+ '{{ enable_default_internet_access }}',
+ '{{ domain_join_info }}',
+ '{{ appstream_agent_version }}',
+ '{{ name }}',
+ '{{ image_name }}',
+ '{{ display_name }}',
+ '{{ iam_role_arn }}',
+ '{{ instance_type }}',
+ '{{ tags }}',
+ '{{ image_arn }}',
+ '{{ access_endpoints }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -348,43 +348,42 @@ globals:
 resources:
   - name: image_builder
     props:
-      - name: Description
-        value: '{{ Description }}'
-      - name: VpcConfig
+      - name: description
+        value: '{{ description }}'
+      - name: vpc_config
         value:
-          SecurityGroupIds:
-            - '{{ SecurityGroupIds[0] }}'
-          SubnetIds:
-            - '{{ SubnetIds[0] }}'
-      - name: EnableDefaultInternetAccess
-        value: '{{ EnableDefaultInternetAccess }}'
-      - name: DomainJoinInfo
+          security_group_ids:
+            - '{{ security_group_ids[0] }}'
+          subnet_ids:
+            - '{{ subnet_ids[0] }}'
+      - name: enable_default_internet_access
+        value: '{{ enable_default_internet_access }}'
+      - name: domain_join_info
         value:
-          OrganizationalUnitDistinguishedName: '{{ OrganizationalUnitDistinguishedName }}'
-          DirectoryName: '{{ DirectoryName }}'
-      - name: AppstreamAgentVersion
-        value: '{{ AppstreamAgentVersion }}'
-      - name: Name
-        value: '{{ Name }}'
-      - name: ImageName
-        value: '{{ ImageName }}'
-      - name: DisplayName
-        value: '{{ DisplayName }}'
-      - name: IamRoleArn
-        value: '{{ IamRoleArn }}'
-      - name: InstanceType
-        value: '{{ InstanceType }}'
-      - name: Tags
+          organizational_unit_distinguished_name: '{{ organizational_unit_distinguished_name }}'
+          directory_name: '{{ directory_name }}'
+      - name: appstream_agent_version
+        value: '{{ appstream_agent_version }}'
+      - name: name
+        value: '{{ name }}'
+      - name: image_name
+        value: '{{ image_name }}'
+      - name: display_name
+        value: '{{ display_name }}'
+      - name: iam_role_arn
+        value: '{{ iam_role_arn }}'
+      - name: instance_type
+        value: '{{ instance_type }}'
+      - name: tags
         value:
-          - Value: '{{ Value }}'
-            Key: '{{ Key }}'
-      - name: ImageArn
-        value: '{{ ImageArn }}'
-      - name: AccessEndpoints
+          - value: '{{ value }}'
+            key: '{{ key }}'
+      - name: image_arn
+        value: '{{ image_arn }}'
+      - name: access_endpoints
         value:
-          - EndpointType: '{{ EndpointType }}'
-            VpceId: '{{ VpceId }}'
-
+          - endpoint_type: '{{ endpoint_type }}'
+            vpce_id: '{{ vpce_id }}'
 ```
 </TabItem>
 </Tabs>
@@ -395,7 +394,7 @@ resources:
 ```sql
 /*+ delete */
 DELETE FROM awscc.appstream.image_builders
-WHERE Identifier = '<Name>'
+WHERE Identifier = '{{ name }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/appsync/apis/index.md b/website/docs/services/appsync/apis/index.md
index 2cada7834..36c00aa1f 100644
--- a/website/docs/services/appsync/apis/index.md
+++ b/website/docs/services/appsync/apis/index.md
@@ -308,7 +308,7 @@ dns,
 event_config,
 tags
 FROM awscc.appsync.apis
-WHERE region = 'us-east-1' AND Identifier = '<ApiArn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ api_arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -344,8 +344,8 @@ INSERT INTO awscc.appsync.apis (
  Name,
  region
 )
-SELECT 
-'{{ Name }}',
+SELECT
+'{{ name }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -360,11 +360,11 @@ INSERT INTO awscc.appsync.apis (
  Tags,
  region
 )
-SELECT 
- '{{ Name }}',
- '{{ OwnerContact }}',
- '{{ EventConfig }}',
- '{{ Tags }}',
+SELECT
+ '{{ name }}',
+ '{{ owner_contact }}',
+ '{{ event_config }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -382,39 +382,38 @@ globals:
 resources:
   - name: api
     props:
-      - name: Name
-        value: '{{ Name }}'
-      - name: OwnerContact
-        value: '{{ OwnerContact }}'
-      - name: EventConfig
+      - name: name
+        value: '{{ name }}'
+      - name: owner_contact
+        value: '{{ owner_contact }}'
+      - name: event_config
         value:
-          AuthProviders:
-            - AuthType: '{{ AuthType }}'
-              OpenIDConnectConfig:
-                ClientId: '{{ ClientId }}'
-                AuthTTL: null
-                Issuer: '{{ Issuer }}'
-                IatTTL: null
-              CognitoConfig:
-                AppIdClientRegex: '{{ AppIdClientRegex }}'
-                UserPoolId: '{{ UserPoolId }}'
-                AwsRegion: '{{ AwsRegion }}'
-              LambdaAuthorizerConfig:
-                IdentityValidationExpression: '{{ IdentityValidationExpression }}'
-                AuthorizerUri: '{{ AuthorizerUri }}'
-                AuthorizerResultTtlInSeconds: '{{ AuthorizerResultTtlInSeconds }}'
-          ConnectionAuthModes:
-            - AuthType: null
-          DefaultPublishAuthModes: null
-          DefaultSubscribeAuthModes: null
-          LogConfig:
-            LogLevel: '{{ LogLevel }}'
-            CloudWatchLogsRoleArn: '{{ CloudWatchLogsRoleArn }}'
-      - name: Tags
+          auth_providers:
+            - auth_type: '{{ auth_type }}'
+              open_id_connect_config:
+                client_id: '{{ client_id }}'
+                auth_ttl: null
+                issuer: '{{ issuer }}'
+                iat_ttl: null
+              cognito_config:
+                app_id_client_regex: '{{ app_id_client_regex }}'
+                user_pool_id: '{{ user_pool_id }}'
+                aws_region: '{{ aws_region }}'
+              lambda_authorizer_config:
+                identity_validation_expression: '{{ identity_validation_expression }}'
+                authorizer_uri: '{{ authorizer_uri }}'
+                authorizer_result_ttl_in_seconds: '{{ authorizer_result_ttl_in_seconds }}'
+          connection_auth_modes:
+            - auth_type: null
+          default_publish_auth_modes: null
+          default_subscribe_auth_modes: null
+          log_config:
+            log_level: '{{ log_level }}'
+            cloud_watch_logs_role_arn: '{{ cloud_watch_logs_role_arn }}'
+      - name: tags
         value:
-          - Value: '{{ Value }}'
-            Key: '{{ Key }}'
-
+          - value: '{{ value }}'
+            key: '{{ key }}'
 ```
 </TabItem>
 </Tabs>
@@ -433,7 +432,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<ApiArn>';
+AND Identifier = '{{ api_arn }}';
 ```
 
 
@@ -442,7 +441,7 @@ AND Identifier = '<ApiArn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.appsync.apis
-WHERE Identifier = '<ApiArn>'
+WHERE Identifier = '{{ api_arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/appsync/channel_namespaces/index.md b/website/docs/services/appsync/channel_namespaces/index.md
index be3155e58..5b6aecf99 100644
--- a/website/docs/services/appsync/channel_namespaces/index.md
+++ b/website/docs/services/appsync/channel_namespaces/index.md
@@ -232,7 +232,7 @@ channel_namespace_arn,
 tags,
 handler_configs
 FROM awscc.appsync.channel_namespaces
-WHERE region = 'us-east-1' AND Identifier = '<ChannelNamespaceArn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ channel_namespace_arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -269,9 +269,9 @@ INSERT INTO awscc.appsync.channel_namespaces (
  Name,
  region
 )
-SELECT 
-'{{ ApiId }}',
- '{{ Name }}',
+SELECT
+'{{ api_id }}',
+ '{{ name }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -290,15 +290,15 @@ INSERT INTO awscc.appsync.channel_namespaces (
  HandlerConfigs,
  region
 )
-SELECT 
- '{{ ApiId }}',
- '{{ Name }}',
- '{{ SubscribeAuthModes }}',
- '{{ PublishAuthModes }}',
- '{{ CodeHandlers }}',
- '{{ CodeS3Location }}',
- '{{ Tags }}',
- '{{ HandlerConfigs }}',
+SELECT
+ '{{ api_id }}',
+ '{{ name }}',
+ '{{ subscribe_auth_modes }}',
+ '{{ publish_auth_modes }}',
+ '{{ code_handlers }}',
+ '{{ code_s3_location }}',
+ '{{ tags }}',
+ '{{ handler_configs }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -316,33 +316,32 @@ globals:
 resources:
   - name: channel_namespace
     props:
-      - name: ApiId
-        value: '{{ ApiId }}'
-      - name: Name
-        value: '{{ Name }}'
-      - name: SubscribeAuthModes
+      - name: api_id
+        value: '{{ api_id }}'
+      - name: name
+        value: '{{ name }}'
+      - name: subscribe_auth_modes
         value:
-          - AuthType: '{{ AuthType }}'
-      - name: PublishAuthModes
+          - auth_type: '{{ auth_type }}'
+      - name: publish_auth_modes
         value: null
-      - name: CodeHandlers
-        value: '{{ CodeHandlers }}'
-      - name: CodeS3Location
-        value: '{{ CodeS3Location }}'
-      - name: Tags
+      - name: code_handlers
+        value: '{{ code_handlers }}'
+      - name: code_s3_location
+        value: '{{ code_s3_location }}'
+      - name: tags
         value:
-          - Value: '{{ Value }}'
-            Key: '{{ Key }}'
-      - name: HandlerConfigs
+          - value: '{{ value }}'
+            key: '{{ key }}'
+      - name: handler_configs
         value:
-          OnPublish:
-            Behavior: '{{ Behavior }}'
-            Integration:
-              DataSourceName: '{{ DataSourceName }}'
-              LambdaConfig:
-                LambdaFunctionArn: '{{ LambdaFunctionArn }}'
-          OnSubscribe: null
-
+          on_publish:
+            behavior: '{{ behavior }}'
+            integration:
+              data_source_name: '{{ data_source_name }}'
+              lambda_config:
+                lambda_function_arn: '{{ lambda_function_arn }}'
+          on_subscribe: null
 ```
 </TabItem>
 </Tabs>
@@ -363,7 +362,7 @@ SET PatchDocument = string('{{ {
     "HandlerConfigs": handler_configs
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<ChannelNamespaceArn>';
+AND Identifier = '{{ channel_namespace_arn }}';
 ```
 
 
@@ -372,7 +371,7 @@ AND Identifier = '<ChannelNamespaceArn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.appsync.channel_namespaces
-WHERE Identifier = '<ChannelNamespaceArn>'
+WHERE Identifier = '{{ channel_namespace_arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/appsync/data_sources/index.md b/website/docs/services/appsync/data_sources/index.md
index 6fbce7c1f..9e2515312 100644
--- a/website/docs/services/appsync/data_sources/index.md
+++ b/website/docs/services/appsync/data_sources/index.md
@@ -369,7 +369,7 @@ type,
 data_source_arn,
 metrics_config
 FROM awscc.appsync.data_sources
-WHERE region = 'us-east-1' AND Identifier = '<DataSourceArn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ data_source_arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -407,10 +407,10 @@ INSERT INTO awscc.appsync.data_sources (
  Type,
  region
 )
-SELECT 
-'{{ ApiId }}',
- '{{ Name }}',
- '{{ Type }}',
+SELECT
+'{{ api_id }}',
+ '{{ name }}',
+ '{{ type }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -434,20 +434,20 @@ INSERT INTO awscc.appsync.data_sources (
  MetricsConfig,
  region
 )
-SELECT 
- '{{ ApiId }}',
- '{{ Description }}',
- '{{ DynamoDBConfig }}',
- '{{ ElasticsearchConfig }}',
- '{{ EventBridgeConfig }}',
- '{{ HttpConfig }}',
- '{{ LambdaConfig }}',
- '{{ Name }}',
- '{{ OpenSearchServiceConfig }}',
- '{{ RelationalDatabaseConfig }}',
- '{{ ServiceRoleArn }}',
- '{{ Type }}',
- '{{ MetricsConfig }}',
+SELECT
+ '{{ api_id }}',
+ '{{ description }}',
+ '{{ dynamo_db_config }}',
+ '{{ elasticsearch_config }}',
+ '{{ event_bridge_config }}',
+ '{{ http_config }}',
+ '{{ lambda_config }}',
+ '{{ name }}',
+ '{{ open_search_service_config }}',
+ '{{ relational_database_config }}',
+ '{{ service_role_arn }}',
+ '{{ type }}',
+ '{{ metrics_config }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -465,60 +465,59 @@ globals:
 resources:
   - name: data_source
     props:
-      - name: ApiId
-        value: '{{ ApiId }}'
-      - name: Description
-        value: '{{ Description }}'
-      - name: DynamoDBConfig
+      - name: api_id
+        value: '{{ api_id }}'
+      - name: description
+        value: '{{ description }}'
+      - name: dynamo_db_config
         value:
-          TableName: '{{ TableName }}'
-          DeltaSyncConfig:
-            BaseTableTTL: '{{ BaseTableTTL }}'
-            DeltaSyncTableTTL: '{{ DeltaSyncTableTTL }}'
-            DeltaSyncTableName: '{{ DeltaSyncTableName }}'
-          UseCallerCredentials: '{{ UseCallerCredentials }}'
-          AwsRegion: '{{ AwsRegion }}'
-          Versioned: '{{ Versioned }}'
-      - name: ElasticsearchConfig
+          table_name: '{{ table_name }}'
+          delta_sync_config:
+            base_table_ttl: '{{ base_table_ttl }}'
+            delta_sync_table_ttl: '{{ delta_sync_table_ttl }}'
+            delta_sync_table_name: '{{ delta_sync_table_name }}'
+          use_caller_credentials: '{{ use_caller_credentials }}'
+          aws_region: '{{ aws_region }}'
+          versioned: '{{ versioned }}'
+      - name: elasticsearch_config
         value:
-          AwsRegion: '{{ AwsRegion }}'
-          Endpoint: '{{ Endpoint }}'
-      - name: EventBridgeConfig
+          aws_region: '{{ aws_region }}'
+          endpoint: '{{ endpoint }}'
+      - name: event_bridge_config
         value:
-          EventBusArn: '{{ EventBusArn }}'
-      - name: HttpConfig
+          event_bus_arn: '{{ event_bus_arn }}'
+      - name: http_config
         value:
-          Endpoint: '{{ Endpoint }}'
-          AuthorizationConfig:
-            AuthorizationType: '{{ AuthorizationType }}'
-            AwsIamConfig:
-              SigningRegion: '{{ SigningRegion }}'
-              SigningServiceName: '{{ SigningServiceName }}'
-      - name: LambdaConfig
+          endpoint: '{{ endpoint }}'
+          authorization_config:
+            authorization_type: '{{ authorization_type }}'
+            aws_iam_config:
+              signing_region: '{{ signing_region }}'
+              signing_service_name: '{{ signing_service_name }}'
+      - name: lambda_config
         value:
-          LambdaFunctionArn: '{{ LambdaFunctionArn }}'
-      - name: Name
-        value: '{{ Name }}'
-      - name: OpenSearchServiceConfig
+          lambda_function_arn: '{{ lambda_function_arn }}'
+      - name: name
+        value: '{{ name }}'
+      - name: open_search_service_config
         value:
-          AwsRegion: '{{ AwsRegion }}'
-          Endpoint: '{{ Endpoint }}'
-      - name: RelationalDatabaseConfig
+          aws_region: '{{ aws_region }}'
+          endpoint: '{{ endpoint }}'
+      - name: relational_database_config
         value:
-          RdsHttpEndpointConfig:
-            DatabaseName: '{{ DatabaseName }}'
-            AwsRegion: '{{ AwsRegion }}'
-            DbClusterIdentifier: '{{ DbClusterIdentifier }}'
-            AwsSecretStoreArn: '{{ AwsSecretStoreArn }}'
-            Schema: '{{ Schema }}'
-          RelationalDatabaseSourceType: '{{ RelationalDatabaseSourceType }}'
-      - name: ServiceRoleArn
-        value: '{{ ServiceRoleArn }}'
-      - name: Type
-        value: '{{ Type }}'
-      - name: MetricsConfig
-        value: '{{ MetricsConfig }}'
-
+          rds_http_endpoint_config:
+            database_name: '{{ database_name }}'
+            aws_region: '{{ aws_region }}'
+            db_cluster_identifier: '{{ db_cluster_identifier }}'
+            aws_secret_store_arn: '{{ aws_secret_store_arn }}'
+            schema: '{{ schema }}'
+          relational_database_source_type: '{{ relational_database_source_type }}'
+      - name: service_role_arn
+        value: '{{ service_role_arn }}'
+      - name: type
+        value: '{{ type }}'
+      - name: metrics_config
+        value: '{{ metrics_config }}'
 ```
 </TabItem>
 </Tabs>
@@ -544,7 +543,7 @@ SET PatchDocument = string('{{ {
     "MetricsConfig": metrics_config
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<DataSourceArn>';
+AND Identifier = '{{ data_source_arn }}';
 ```
 
 
@@ -553,7 +552,7 @@ AND Identifier = '<DataSourceArn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.appsync.data_sources
-WHERE Identifier = '<DataSourceArn>'
+WHERE Identifier = '{{ data_source_arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/appsync/domain_name_api_associations/index.md b/website/docs/services/appsync/domain_name_api_associations/index.md
index 7ec59d9fd..570d48525 100644
--- a/website/docs/services/appsync/domain_name_api_associations/index.md
+++ b/website/docs/services/appsync/domain_name_api_associations/index.md
@@ -100,7 +100,7 @@ domain_name,
 api_id,
 api_association_identifier
 FROM awscc.appsync.domain_name_api_associations
-WHERE region = 'us-east-1' AND Identifier = '<ApiAssociationIdentifier>';
+WHERE region = 'us-east-1' AND Identifier = '{{ api_association_identifier }}';
 ```
 
 ## `INSERT` example
@@ -124,9 +124,9 @@ INSERT INTO awscc.appsync.domain_name_api_associations (
  ApiId,
  region
 )
-SELECT 
-'{{ DomainName }}',
- '{{ ApiId }}',
+SELECT
+'{{ domain_name }}',
+ '{{ api_id }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -139,9 +139,9 @@ INSERT INTO awscc.appsync.domain_name_api_associations (
  ApiId,
  region
 )
-SELECT 
- '{{ DomainName }}',
- '{{ ApiId }}',
+SELECT
+ '{{ domain_name }}',
+ '{{ api_id }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -159,11 +159,10 @@ globals:
 resources:
   - name: domain_name_api_association
     props:
-      - name: DomainName
-        value: '{{ DomainName }}'
-      - name: ApiId
-        value: '{{ ApiId }}'
-
+      - name: domain_name
+        value: '{{ domain_name }}'
+      - name: api_id
+        value: '{{ api_id }}'
 ```
 </TabItem>
 </Tabs>
@@ -179,7 +178,7 @@ SET PatchDocument = string('{{ {
     "ApiId": api_id
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<ApiAssociationIdentifier>';
+AND Identifier = '{{ api_association_identifier }}';
 ```
 
 
@@ -188,7 +187,7 @@ AND Identifier = '<ApiAssociationIdentifier>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.appsync.domain_name_api_associations
-WHERE Identifier = '<ApiAssociationIdentifier>'
+WHERE Identifier = '{{ api_association_identifier }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/appsync/domain_names/index.md b/website/docs/services/appsync/domain_names/index.md
index df2fdb0bc..83e27fcfa 100644
--- a/website/docs/services/appsync/domain_names/index.md
+++ b/website/docs/services/appsync/domain_names/index.md
@@ -182,7 +182,7 @@ hosted_zone_id,
 domain_name_arn,
 tags
 FROM awscc.appsync.domain_names
-WHERE region = 'us-east-1' AND Identifier = '<DomainName>';
+WHERE region = 'us-east-1' AND Identifier = '{{ domain_name }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -219,9 +219,9 @@ INSERT INTO awscc.appsync.domain_names (
  CertificateArn,
  region
 )
-SELECT 
-'{{ DomainName }}',
- '{{ CertificateArn }}',
+SELECT
+'{{ domain_name }}',
+ '{{ certificate_arn }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -236,11 +236,11 @@ INSERT INTO awscc.appsync.domain_names (
  Tags,
  region
 )
-SELECT 
- '{{ DomainName }}',
- '{{ Description }}',
- '{{ CertificateArn }}',
- '{{ Tags }}',
+SELECT
+ '{{ domain_name }}',
+ '{{ description }}',
+ '{{ certificate_arn }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -258,17 +258,16 @@ globals:
 resources:
   - name: domain_name
     props:
-      - name: DomainName
-        value: '{{ DomainName }}'
-      - name: Description
-        value: '{{ Description }}'
-      - name: CertificateArn
-        value: '{{ CertificateArn }}'
-      - name: Tags
+      - name: domain_name
+        value: '{{ domain_name }}'
+      - name: description
+        value: '{{ description }}'
+      - name: certificate_arn
+        value: '{{ certificate_arn }}'
+      - name: tags
         value:
-          - Value: '{{ Value }}'
-            Key: '{{ Key }}'
-
+          - value: '{{ value }}'
+            key: '{{ key }}'
 ```
 </TabItem>
 </Tabs>
@@ -285,7 +284,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<DomainName>';
+AND Identifier = '{{ domain_name }}';
 ```
 
 
@@ -294,7 +293,7 @@ AND Identifier = '<DomainName>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.appsync.domain_names
-WHERE Identifier = '<DomainName>'
+WHERE Identifier = '{{ domain_name }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/appsync/function_configurations/index.md b/website/docs/services/appsync/function_configurations/index.md
index 731ce9203..b594b05c1 100644
--- a/website/docs/services/appsync/function_configurations/index.md
+++ b/website/docs/services/appsync/function_configurations/index.md
@@ -260,7 +260,7 @@ response_mapping_template_s3_location,
 runtime,
 sync_config
 FROM awscc.appsync.function_configurations
-WHERE region = 'us-east-1' AND Identifier = '<FunctionArn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ function_arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -298,10 +298,10 @@ INSERT INTO awscc.appsync.function_configurations (
  Name,
  region
 )
-SELECT 
-'{{ ApiId }}',
- '{{ DataSourceName }}',
- '{{ Name }}',
+SELECT
+'{{ api_id }}',
+ '{{ data_source_name }}',
+ '{{ name }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -326,21 +326,21 @@ INSERT INTO awscc.appsync.function_configurations (
  SyncConfig,
  region
 )
-SELECT 
- '{{ ApiId }}',
- '{{ Code }}',
- '{{ CodeS3Location }}',
- '{{ DataSourceName }}',
- '{{ Description }}',
- '{{ FunctionVersion }}',
- '{{ MaxBatchSize }}',
- '{{ Name }}',
- '{{ RequestMappingTemplate }}',
- '{{ RequestMappingTemplateS3Location }}',
- '{{ ResponseMappingTemplate }}',
- '{{ ResponseMappingTemplateS3Location }}',
- '{{ Runtime }}',
- '{{ SyncConfig }}',
+SELECT
+ '{{ api_id }}',
+ '{{ code }}',
+ '{{ code_s3_location }}',
+ '{{ data_source_name }}',
+ '{{ description }}',
+ '{{ function_version }}',
+ '{{ max_batch_size }}',
+ '{{ name }}',
+ '{{ request_mapping_template }}',
+ '{{ request_mapping_template_s3_location }}',
+ '{{ response_mapping_template }}',
+ '{{ response_mapping_template_s3_location }}',
+ '{{ runtime }}',
+ '{{ sync_config }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -358,41 +358,40 @@ globals:
 resources:
   - name: function_configuration
     props:
-      - name: ApiId
-        value: '{{ ApiId }}'
-      - name: Code
-        value: '{{ Code }}'
-      - name: CodeS3Location
-        value: '{{ CodeS3Location }}'
-      - name: DataSourceName
-        value: '{{ DataSourceName }}'
-      - name: Description
-        value: '{{ Description }}'
-      - name: FunctionVersion
-        value: '{{ FunctionVersion }}'
-      - name: MaxBatchSize
-        value: '{{ MaxBatchSize }}'
-      - name: Name
-        value: '{{ Name }}'
-      - name: RequestMappingTemplate
-        value: '{{ RequestMappingTemplate }}'
-      - name: RequestMappingTemplateS3Location
-        value: '{{ RequestMappingTemplateS3Location }}'
-      - name: ResponseMappingTemplate
-        value: '{{ ResponseMappingTemplate }}'
-      - name: ResponseMappingTemplateS3Location
-        value: '{{ ResponseMappingTemplateS3Location }}'
-      - name: Runtime
+      - name: api_id
+        value: '{{ api_id }}'
+      - name: code
+        value: '{{ code }}'
+      - name: code_s3_location
+        value: '{{ code_s3_location }}'
+      - name: data_source_name
+        value: '{{ data_source_name }}'
+      - name: description
+        value: '{{ description }}'
+      - name: function_version
+        value: '{{ function_version }}'
+      - name: max_batch_size
+        value: '{{ max_batch_size }}'
+      - name: name
+        value: '{{ name }}'
+      - name: request_mapping_template
+        value: '{{ request_mapping_template }}'
+      - name: request_mapping_template_s3_location
+        value: '{{ request_mapping_template_s3_location }}'
+      - name: response_mapping_template
+        value: '{{ response_mapping_template }}'
+      - name: response_mapping_template_s3_location
+        value: '{{ response_mapping_template_s3_location }}'
+      - name: runtime
         value:
-          RuntimeVersion: '{{ RuntimeVersion }}'
-          Name: '{{ Name }}'
-      - name: SyncConfig
+          runtime_version: '{{ runtime_version }}'
+          name: '{{ name }}'
+      - name: sync_config
         value:
-          ConflictHandler: '{{ ConflictHandler }}'
-          ConflictDetection: '{{ ConflictDetection }}'
-          LambdaConflictHandlerConfig:
-            LambdaConflictHandlerArn: '{{ LambdaConflictHandlerArn }}'
-
+          conflict_handler: '{{ conflict_handler }}'
+          conflict_detection: '{{ conflict_detection }}'
+          lambda_conflict_handler_config:
+            lambda_conflict_handler_arn: '{{ lambda_conflict_handler_arn }}'
 ```
 </TabItem>
 </Tabs>
@@ -420,7 +419,7 @@ SET PatchDocument = string('{{ {
     "SyncConfig": sync_config
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<FunctionArn>';
+AND Identifier = '{{ function_arn }}';
 ```
 
 
@@ -429,7 +428,7 @@ AND Identifier = '<FunctionArn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.appsync.function_configurations
-WHERE Identifier = '<FunctionArn>'
+WHERE Identifier = '{{ function_arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/appsync/graphql_apis/index.md b/website/docs/services/appsync/graphql_apis/index.md
index ee195b971..a738d8f8d 100644
--- a/website/docs/services/appsync/graphql_apis/index.md
+++ b/website/docs/services/appsync/graphql_apis/index.md
@@ -463,7 +463,7 @@ user_pool_config,
 visibility,
 xray_enabled
 FROM awscc.appsync.graphql_apis
-WHERE region = 'us-east-1' AND Identifier = '<ApiId>';
+WHERE region = 'us-east-1' AND Identifier = '{{ api_id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -500,9 +500,9 @@ INSERT INTO awscc.appsync.graphql_apis (
  Name,
  region
 )
-SELECT 
-'{{ AuthenticationType }}',
- '{{ Name }}',
+SELECT
+'{{ authentication_type }}',
+ '{{ name }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -531,25 +531,25 @@ INSERT INTO awscc.appsync.graphql_apis (
  XrayEnabled,
  region
 )
-SELECT 
- '{{ AdditionalAuthenticationProviders }}',
- '{{ ApiType }}',
- '{{ AuthenticationType }}',
- '{{ EnhancedMetricsConfig }}',
- '{{ EnvironmentVariables }}',
- '{{ IntrospectionConfig }}',
- '{{ LambdaAuthorizerConfig }}',
- '{{ LogConfig }}',
- '{{ MergedApiExecutionRoleArn }}',
- '{{ Name }}',
- '{{ OpenIDConnectConfig }}',
- '{{ OwnerContact }}',
- '{{ QueryDepthLimit }}',
- '{{ ResolverCountLimit }}',
- '{{ Tags }}',
- '{{ UserPoolConfig }}',
- '{{ Visibility }}',
- '{{ XrayEnabled }}',
+SELECT
+ '{{ additional_authentication_providers }}',
+ '{{ api_type }}',
+ '{{ authentication_type }}',
+ '{{ enhanced_metrics_config }}',
+ '{{ environment_variables }}',
+ '{{ introspection_config }}',
+ '{{ lambda_authorizer_config }}',
+ '{{ log_config }}',
+ '{{ merged_api_execution_role_arn }}',
+ '{{ name }}',
+ '{{ open_id_connect_config }}',
+ '{{ owner_contact }}',
+ '{{ query_depth_limit }}',
+ '{{ resolver_count_limit }}',
+ '{{ tags }}',
+ '{{ user_pool_config }}',
+ '{{ visibility }}',
+ '{{ xray_enabled }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -567,69 +567,68 @@ globals:
 resources:
   - name: graphql_api
     props:
-      - name: AdditionalAuthenticationProviders
+      - name: additional_authentication_providers
         value:
-          - LambdaAuthorizerConfig:
-              IdentityValidationExpression: '{{ IdentityValidationExpression }}'
-              AuthorizerUri: '{{ AuthorizerUri }}'
-              AuthorizerResultTtlInSeconds: '{{ AuthorizerResultTtlInSeconds }}'
-            OpenIDConnectConfig:
-              ClientId: '{{ ClientId }}'
-              AuthTTL: null
-              Issuer: '{{ Issuer }}'
-              IatTTL: null
-            UserPoolConfig:
-              AppIdClientRegex: '{{ AppIdClientRegex }}'
-              UserPoolId: '{{ UserPoolId }}'
-              AwsRegion: '{{ AwsRegion }}'
-            AuthenticationType: '{{ AuthenticationType }}'
-      - name: ApiType
-        value: '{{ ApiType }}'
-      - name: AuthenticationType
-        value: '{{ AuthenticationType }}'
-      - name: EnhancedMetricsConfig
+          - lambda_authorizer_config:
+              identity_validation_expression: '{{ identity_validation_expression }}'
+              authorizer_uri: '{{ authorizer_uri }}'
+              authorizer_result_ttl_in_seconds: '{{ authorizer_result_ttl_in_seconds }}'
+            open_id_connect_config:
+              client_id: '{{ client_id }}'
+              auth_ttl: null
+              issuer: '{{ issuer }}'
+              iat_ttl: null
+            user_pool_config:
+              app_id_client_regex: '{{ app_id_client_regex }}'
+              user_pool_id: '{{ user_pool_id }}'
+              aws_region: '{{ aws_region }}'
+            authentication_type: '{{ authentication_type }}'
+      - name: api_type
+        value: '{{ api_type }}'
+      - name: authentication_type
+        value: '{{ authentication_type }}'
+      - name: enhanced_metrics_config
         value:
-          OperationLevelMetricsConfig: '{{ OperationLevelMetricsConfig }}'
-          ResolverLevelMetricsBehavior: '{{ ResolverLevelMetricsBehavior }}'
-          DataSourceLevelMetricsBehavior: '{{ DataSourceLevelMetricsBehavior }}'
-      - name: EnvironmentVariables
+          operation_level_metrics_config: '{{ operation_level_metrics_config }}'
+          resolver_level_metrics_behavior: '{{ resolver_level_metrics_behavior }}'
+          data_source_level_metrics_behavior: '{{ data_source_level_metrics_behavior }}'
+      - name: environment_variables
         value: {}
-      - name: IntrospectionConfig
-        value: '{{ IntrospectionConfig }}'
-      - name: LambdaAuthorizerConfig
+      - name: introspection_config
+        value: '{{ introspection_config }}'
+      - name: lambda_authorizer_config
         value: null
-      - name: LogConfig
+      - name: log_config
         value:
-          ExcludeVerboseContent: '{{ ExcludeVerboseContent }}'
-          FieldLogLevel: '{{ FieldLogLevel }}'
-          CloudWatchLogsRoleArn: '{{ CloudWatchLogsRoleArn }}'
-      - name: MergedApiExecutionRoleArn
-        value: '{{ MergedApiExecutionRoleArn }}'
-      - name: Name
-        value: '{{ Name }}'
-      - name: OpenIDConnectConfig
+          exclude_verbose_content: '{{ exclude_verbose_content }}'
+          field_log_level: '{{ field_log_level }}'
+          cloud_watch_logs_role_arn: '{{ cloud_watch_logs_role_arn }}'
+      - name: merged_api_execution_role_arn
+        value: '{{ merged_api_execution_role_arn }}'
+      - name: name
+        value: '{{ name }}'
+      - name: open_id_connect_config
         value: null
-      - name: OwnerContact
-        value: '{{ OwnerContact }}'
-      - name: QueryDepthLimit
-        value: '{{ QueryDepthLimit }}'
-      - name: ResolverCountLimit
-        value: '{{ ResolverCountLimit }}'
-      - name: Tags
+      - name: owner_contact
+        value: '{{ owner_contact }}'
+      - name: query_depth_limit
+        value: '{{ query_depth_limit }}'
+      - name: resolver_count_limit
+        value: '{{ resolver_count_limit }}'
+      - name: tags
         value:
-          - Value: '{{ Value }}'
-            Key: '{{ Key }}'
-      - name: UserPoolConfig
+          - value: '{{ value }}'
+            key: '{{ key }}'
+      - name: user_pool_config
         value:
-          AppIdClientRegex: '{{ AppIdClientRegex }}'
-          UserPoolId: '{{ UserPoolId }}'
-          AwsRegion: '{{ AwsRegion }}'
-          DefaultAction: '{{ DefaultAction }}'
-      - name: Visibility
-        value: '{{ Visibility }}'
-      - name: XrayEnabled
-        value: '{{ XrayEnabled }}'
-
+          app_id_client_regex: '{{ app_id_client_regex }}'
+          user_pool_id: '{{ user_pool_id }}'
+          aws_region: '{{ aws_region }}'
+          default_action: '{{ default_action }}'
+      - name: visibility
+        value: '{{ visibility }}'
+      - name: xray_enabled
+        value: '{{ xray_enabled }}'
 ```
 </TabItem>
 </Tabs>
@@ -662,7 +661,7 @@ SET PatchDocument = string('{{ {
     "XrayEnabled": xray_enabled
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<ApiId>';
+AND Identifier = '{{ api_id }}';
 ```
 
 
@@ -671,7 +670,7 @@ AND Identifier = '<ApiId>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.appsync.graphql_apis
-WHERE Identifier = '<ApiId>'
+WHERE Identifier = '{{ api_id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/appsync/resolvers/index.md b/website/docs/services/appsync/resolvers/index.md
index b32acb16e..191100e7b 100644
--- a/website/docs/services/appsync/resolvers/index.md
+++ b/website/docs/services/appsync/resolvers/index.md
@@ -291,7 +291,7 @@ sync_config,
 type_name,
 metrics_config
 FROM awscc.appsync.resolvers
-WHERE region = 'us-east-1' AND Identifier = '<ResolverArn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ resolver_arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -329,10 +329,10 @@ INSERT INTO awscc.appsync.resolvers (
  TypeName,
  region
 )
-SELECT 
-'{{ ApiId }}',
- '{{ FieldName }}',
- '{{ TypeName }}',
+SELECT
+'{{ api_id }}',
+ '{{ field_name }}',
+ '{{ type_name }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -360,24 +360,24 @@ INSERT INTO awscc.appsync.resolvers (
  MetricsConfig,
  region
 )
-SELECT 
- '{{ ApiId }}',
- '{{ CachingConfig }}',
- '{{ Code }}',
- '{{ CodeS3Location }}',
- '{{ DataSourceName }}',
- '{{ FieldName }}',
- '{{ Kind }}',
- '{{ MaxBatchSize }}',
- '{{ PipelineConfig }}',
- '{{ RequestMappingTemplate }}',
- '{{ RequestMappingTemplateS3Location }}',
- '{{ ResponseMappingTemplate }}',
- '{{ ResponseMappingTemplateS3Location }}',
- '{{ Runtime }}',
- '{{ SyncConfig }}',
- '{{ TypeName }}',
- '{{ MetricsConfig }}',
+SELECT
+ '{{ api_id }}',
+ '{{ caching_config }}',
+ '{{ code }}',
+ '{{ code_s3_location }}',
+ '{{ data_source_name }}',
+ '{{ field_name }}',
+ '{{ kind }}',
+ '{{ max_batch_size }}',
+ '{{ pipeline_config }}',
+ '{{ request_mapping_template }}',
+ '{{ request_mapping_template_s3_location }}',
+ '{{ response_mapping_template }}',
+ '{{ response_mapping_template_s3_location }}',
+ '{{ runtime }}',
+ '{{ sync_config }}',
+ '{{ type_name }}',
+ '{{ metrics_config }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -395,52 +395,51 @@ globals:
 resources:
   - name: resolver
     props:
-      - name: ApiId
-        value: '{{ ApiId }}'
-      - name: CachingConfig
+      - name: api_id
+        value: '{{ api_id }}'
+      - name: caching_config
         value:
-          CachingKeys:
-            - '{{ CachingKeys[0] }}'
-          Ttl: null
-      - name: Code
-        value: '{{ Code }}'
-      - name: CodeS3Location
-        value: '{{ CodeS3Location }}'
-      - name: DataSourceName
-        value: '{{ DataSourceName }}'
-      - name: FieldName
-        value: '{{ FieldName }}'
-      - name: Kind
-        value: '{{ Kind }}'
-      - name: MaxBatchSize
-        value: '{{ MaxBatchSize }}'
-      - name: PipelineConfig
+          caching_keys:
+            - '{{ caching_keys[0] }}'
+          ttl: null
+      - name: code
+        value: '{{ code }}'
+      - name: code_s3_location
+        value: '{{ code_s3_location }}'
+      - name: data_source_name
+        value: '{{ data_source_name }}'
+      - name: field_name
+        value: '{{ field_name }}'
+      - name: kind
+        value: '{{ kind }}'
+      - name: max_batch_size
+        value: '{{ max_batch_size }}'
+      - name: pipeline_config
         value:
-          Functions:
-            - '{{ Functions[0] }}'
-      - name: RequestMappingTemplate
-        value: '{{ RequestMappingTemplate }}'
-      - name: RequestMappingTemplateS3Location
-        value: '{{ RequestMappingTemplateS3Location }}'
-      - name: ResponseMappingTemplate
-        value: '{{ ResponseMappingTemplate }}'
-      - name: ResponseMappingTemplateS3Location
-        value: '{{ ResponseMappingTemplateS3Location }}'
-      - name: Runtime
+          functions:
+            - '{{ functions[0] }}'
+      - name: request_mapping_template
+        value: '{{ request_mapping_template }}'
+      - name: request_mapping_template_s3_location
+        value: '{{ request_mapping_template_s3_location }}'
+      - name: response_mapping_template
+        value: '{{ response_mapping_template }}'
+      - name: response_mapping_template_s3_location
+        value: '{{ response_mapping_template_s3_location }}'
+      - name: runtime
         value:
-          RuntimeVersion: '{{ RuntimeVersion }}'
-          Name: '{{ Name }}'
-      - name: SyncConfig
+          runtime_version: '{{ runtime_version }}'
+          name: '{{ name }}'
+      - name: sync_config
         value:
-          ConflictHandler: '{{ ConflictHandler }}'
-          ConflictDetection: '{{ ConflictDetection }}'
-          LambdaConflictHandlerConfig:
-            LambdaConflictHandlerArn: '{{ LambdaConflictHandlerArn }}'
-      - name: TypeName
-        value: '{{ TypeName }}'
-      - name: MetricsConfig
-        value: '{{ MetricsConfig }}'
-
+          conflict_handler: '{{ conflict_handler }}'
+          conflict_detection: '{{ conflict_detection }}'
+          lambda_conflict_handler_config:
+            lambda_conflict_handler_arn: '{{ lambda_conflict_handler_arn }}'
+      - name: type_name
+        value: '{{ type_name }}'
+      - name: metrics_config
+        value: '{{ metrics_config }}'
 ```
 </TabItem>
 </Tabs>
@@ -469,7 +468,7 @@ SET PatchDocument = string('{{ {
     "MetricsConfig": metrics_config
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<ResolverArn>';
+AND Identifier = '{{ resolver_arn }}';
 ```
 
 
@@ -478,7 +477,7 @@ AND Identifier = '<ResolverArn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.appsync.resolvers
-WHERE Identifier = '<ResolverArn>'
+WHERE Identifier = '{{ resolver_arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/appsync/source_api_associations/index.md b/website/docs/services/appsync/source_api_associations/index.md
index 1cc710457..ffc24879c 100644
--- a/website/docs/services/appsync/source_api_associations/index.md
+++ b/website/docs/services/appsync/source_api_associations/index.md
@@ -213,7 +213,7 @@ source_api_association_status,
 source_api_association_status_detail,
 last_successful_merge_date
 FROM awscc.appsync.source_api_associations
-WHERE region = 'us-east-1' AND Identifier = '<AssociationArn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ association_arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -252,11 +252,11 @@ INSERT INTO awscc.appsync.source_api_associations (
  SourceApiAssociationConfig,
  region
 )
-SELECT 
-'{{ SourceApiIdentifier }}',
- '{{ MergedApiIdentifier }}',
- '{{ Description }}',
- '{{ SourceApiAssociationConfig }}',
+SELECT
+'{{ source_api_identifier }}',
+ '{{ merged_api_identifier }}',
+ '{{ description }}',
+ '{{ source_api_association_config }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -271,11 +271,11 @@ INSERT INTO awscc.appsync.source_api_associations (
  SourceApiAssociationConfig,
  region
 )
-SELECT 
- '{{ SourceApiIdentifier }}',
- '{{ MergedApiIdentifier }}',
- '{{ Description }}',
- '{{ SourceApiAssociationConfig }}',
+SELECT
+ '{{ source_api_identifier }}',
+ '{{ merged_api_identifier }}',
+ '{{ description }}',
+ '{{ source_api_association_config }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -293,15 +293,14 @@ globals:
 resources:
   - name: source_api_association
     props:
-      - name: SourceApiIdentifier
-        value: '{{ SourceApiIdentifier }}'
-      - name: MergedApiIdentifier
-        value: '{{ MergedApiIdentifier }}'
-      - name: Description
-        value: '{{ Description }}'
-      - name: SourceApiAssociationConfig
+      - name: source_api_identifier
+        value: '{{ source_api_identifier }}'
+      - name: merged_api_identifier
+        value: '{{ merged_api_identifier }}'
+      - name: description
+        value: '{{ description }}'
+      - name: source_api_association_config
         value: null
-
 ```
 </TabItem>
 </Tabs>
@@ -318,7 +317,7 @@ SET PatchDocument = string('{{ {
     "SourceApiAssociationConfig": source_api_association_config
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<AssociationArn>';
+AND Identifier = '{{ association_arn }}';
 ```
 
 
@@ -327,7 +326,7 @@ AND Identifier = '<AssociationArn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.appsync.source_api_associations
-WHERE Identifier = '<AssociationArn>'
+WHERE Identifier = '{{ association_arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/apptest/test_cases/index.md b/website/docs/services/apptest/test_cases/index.md
index ceaaeb6dc..d34802979 100644
--- a/website/docs/services/apptest/test_cases/index.md
+++ b/website/docs/services/apptest/test_cases/index.md
@@ -223,7 +223,7 @@ test_case_arn,
 test_case_id,
 test_case_version
 FROM awscc.apptest.test_cases
-WHERE region = 'us-east-1' AND Identifier = '<TestCaseId>';
+WHERE region = 'us-east-1' AND Identifier = '{{ test_case_id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -260,9 +260,9 @@ INSERT INTO awscc.apptest.test_cases (
  Steps,
  region
 )
-SELECT 
-'{{ Name }}',
- '{{ Steps }}',
+SELECT
+'{{ name }}',
+ '{{ steps }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -277,11 +277,11 @@ INSERT INTO awscc.apptest.test_cases (
  Tags,
  region
 )
-SELECT 
- '{{ Description }}',
- '{{ Name }}',
- '{{ Steps }}',
- '{{ Tags }}',
+SELECT
+ '{{ description }}',
+ '{{ name }}',
+ '{{ steps }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -299,18 +299,17 @@ globals:
 resources:
   - name: test_case
     props:
-      - name: Description
-        value: '{{ Description }}'
-      - name: Name
-        value: '{{ Name }}'
-      - name: Steps
+      - name: description
+        value: '{{ description }}'
+      - name: name
+        value: '{{ name }}'
+      - name: steps
         value:
-          - Name: '{{ Name }}'
-            Description: '{{ Description }}'
-            Action: null
-      - name: Tags
+          - name: '{{ name }}'
+            description: '{{ description }}'
+            action: null
+      - name: tags
         value: {}
-
 ```
 </TabItem>
 </Tabs>
@@ -328,7 +327,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<TestCaseId>';
+AND Identifier = '{{ test_case_id }}';
 ```
 
 
@@ -337,7 +336,7 @@ AND Identifier = '<TestCaseId>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.apptest.test_cases
-WHERE Identifier = '<TestCaseId>'
+WHERE Identifier = '{{ test_case_id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/aps/resource_policies/index.md b/website/docs/services/aps/resource_policies/index.md
index 58cdd0b7b..68aee4ed0 100644
--- a/website/docs/services/aps/resource_policies/index.md
+++ b/website/docs/services/aps/resource_policies/index.md
@@ -140,7 +140,7 @@ region,
 workspace_arn,
 policy_document
 FROM awscc.aps.resource_policies
-WHERE region = 'us-east-1' AND Identifier = '<WorkspaceArn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ workspace_arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -177,9 +177,9 @@ INSERT INTO awscc.aps.resource_policies (
  PolicyDocument,
  region
 )
-SELECT 
-'{{ WorkspaceArn }}',
- '{{ PolicyDocument }}',
+SELECT
+'{{ workspace_arn }}',
+ '{{ policy_document }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -192,9 +192,9 @@ INSERT INTO awscc.aps.resource_policies (
  PolicyDocument,
  region
 )
-SELECT 
- '{{ WorkspaceArn }}',
- '{{ PolicyDocument }}',
+SELECT
+ '{{ workspace_arn }}',
+ '{{ policy_document }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -212,11 +212,10 @@ globals:
 resources:
   - name: resource_policy
     props:
-      - name: WorkspaceArn
-        value: '{{ WorkspaceArn }}'
-      - name: PolicyDocument
-        value: '{{ PolicyDocument }}'
-
+      - name: workspace_arn
+        value: '{{ workspace_arn }}'
+      - name: policy_document
+        value: '{{ policy_document }}'
 ```
 </TabItem>
 </Tabs>
@@ -232,7 +231,7 @@ SET PatchDocument = string('{{ {
     "PolicyDocument": policy_document
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<WorkspaceArn>';
+AND Identifier = '{{ workspace_arn }}';
 ```
 
 
@@ -241,7 +240,7 @@ AND Identifier = '<WorkspaceArn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.aps.resource_policies
-WHERE Identifier = '<WorkspaceArn>'
+WHERE Identifier = '{{ workspace_arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/aps/rule_groups_namespaces/index.md b/website/docs/services/aps/rule_groups_namespaces/index.md
index 99a89426f..9b7bfdf45 100644
--- a/website/docs/services/aps/rule_groups_namespaces/index.md
+++ b/website/docs/services/aps/rule_groups_namespaces/index.md
@@ -170,7 +170,7 @@ data,
 arn,
 tags
 FROM awscc.aps.rule_groups_namespaces
-WHERE region = 'us-east-1' AND Identifier = '<Arn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -208,10 +208,10 @@ INSERT INTO awscc.aps.rule_groups_namespaces (
  Data,
  region
 )
-SELECT 
-'{{ Workspace }}',
- '{{ Name }}',
- '{{ Data }}',
+SELECT
+'{{ workspace }}',
+ '{{ name }}',
+ '{{ data }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -226,11 +226,11 @@ INSERT INTO awscc.aps.rule_groups_namespaces (
  Tags,
  region
 )
-SELECT 
- '{{ Workspace }}',
- '{{ Name }}',
- '{{ Data }}',
- '{{ Tags }}',
+SELECT
+ '{{ workspace }}',
+ '{{ name }}',
+ '{{ data }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -248,17 +248,16 @@ globals:
 resources:
   - name: rule_groups_namespace
     props:
-      - name: Workspace
-        value: '{{ Workspace }}'
-      - name: Name
-        value: '{{ Name }}'
-      - name: Data
-        value: '{{ Data }}'
-      - name: Tags
+      - name: workspace
+        value: '{{ workspace }}'
+      - name: name
+        value: '{{ name }}'
+      - name: data
+        value: '{{ data }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -275,7 +274,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Arn>';
+AND Identifier = '{{ arn }}';
 ```
 
 
@@ -284,7 +283,7 @@ AND Identifier = '<Arn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.aps.rule_groups_namespaces
-WHERE Identifier = '<Arn>'
+WHERE Identifier = '{{ arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/aps/scrapers/index.md b/website/docs/services/aps/scrapers/index.md
index 09ae14fce..3d131194f 100644
--- a/website/docs/services/aps/scrapers/index.md
+++ b/website/docs/services/aps/scrapers/index.md
@@ -251,7 +251,7 @@ source,
 destination,
 tags
 FROM awscc.aps.scrapers
-WHERE region = 'us-east-1' AND Identifier = '<Arn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -289,10 +289,10 @@ INSERT INTO awscc.aps.scrapers (
  Destination,
  region
 )
-SELECT 
-'{{ ScrapeConfiguration }}',
- '{{ Source }}',
- '{{ Destination }}',
+SELECT
+'{{ scrape_configuration }}',
+ '{{ source }}',
+ '{{ destination }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -309,13 +309,13 @@ INSERT INTO awscc.aps.scrapers (
  Tags,
  region
 )
-SELECT 
- '{{ Alias }}',
- '{{ ScrapeConfiguration }}',
- '{{ RoleConfiguration }}',
- '{{ Source }}',
- '{{ Destination }}',
- '{{ Tags }}',
+SELECT
+ '{{ alias }}',
+ '{{ scrape_configuration }}',
+ '{{ role_configuration }}',
+ '{{ source }}',
+ '{{ destination }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -333,32 +333,31 @@ globals:
 resources:
   - name: scraper
     props:
-      - name: Alias
-        value: '{{ Alias }}'
-      - name: ScrapeConfiguration
+      - name: alias
+        value: '{{ alias }}'
+      - name: scrape_configuration
         value:
-          ConfigurationBlob: '{{ ConfigurationBlob }}'
-      - name: RoleConfiguration
+          configuration_blob: '{{ configuration_blob }}'
+      - name: role_configuration
         value:
-          SourceRoleArn: '{{ SourceRoleArn }}'
-          TargetRoleArn: '{{ TargetRoleArn }}'
-      - name: Source
+          source_role_arn: '{{ source_role_arn }}'
+          target_role_arn: '{{ target_role_arn }}'
+      - name: source
         value:
-          EksConfiguration:
-            ClusterArn: '{{ ClusterArn }}'
-            SecurityGroupIds:
-              - '{{ SecurityGroupIds[0] }}'
-            SubnetIds:
-              - '{{ SubnetIds[0] }}'
-      - name: Destination
+          eks_configuration:
+            cluster_arn: '{{ cluster_arn }}'
+            security_group_ids:
+              - '{{ security_group_ids[0] }}'
+            subnet_ids:
+              - '{{ subnet_ids[0] }}'
+      - name: destination
         value:
-          AmpConfiguration:
-            WorkspaceArn: '{{ WorkspaceArn }}'
-      - name: Tags
+          amp_configuration:
+            workspace_arn: '{{ workspace_arn }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -378,7 +377,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Arn>';
+AND Identifier = '{{ arn }}';
 ```
 
 
@@ -387,7 +386,7 @@ AND Identifier = '<Arn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.aps.scrapers
-WHERE Identifier = '<Arn>'
+WHERE Identifier = '{{ arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/aps/workspaces/index.md b/website/docs/services/aps/workspaces/index.md
index 16568de3a..6c7db9180 100644
--- a/website/docs/services/aps/workspaces/index.md
+++ b/website/docs/services/aps/workspaces/index.md
@@ -283,7 +283,7 @@ query_logging_configuration,
 kms_key_arn,
 tags
 FROM awscc.aps.workspaces
-WHERE region = 'us-east-1' AND Identifier = '<Arn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -319,7 +319,7 @@ INSERT INTO awscc.aps.workspaces (
  ,
  region
 )
-SELECT 
+SELECT
 '{{  }}',
 '{{ region }}';
 ```
@@ -338,14 +338,14 @@ INSERT INTO awscc.aps.workspaces (
  Tags,
  region
 )
-SELECT 
- '{{ Alias }}',
- '{{ AlertManagerDefinition }}',
- '{{ LoggingConfiguration }}',
- '{{ WorkspaceConfiguration }}',
- '{{ QueryLoggingConfiguration }}',
- '{{ KmsKeyArn }}',
- '{{ Tags }}',
+SELECT
+ '{{ alias }}',
+ '{{ alert_manager_definition }}',
+ '{{ logging_configuration }}',
+ '{{ workspace_configuration }}',
+ '{{ query_logging_configuration }}',
+ '{{ kms_key_arn }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -363,36 +363,35 @@ globals:
 resources:
   - name: workspace
     props:
-      - name: Alias
-        value: '{{ Alias }}'
-      - name: AlertManagerDefinition
-        value: '{{ AlertManagerDefinition }}'
-      - name: LoggingConfiguration
+      - name: alias
+        value: '{{ alias }}'
+      - name: alert_manager_definition
+        value: '{{ alert_manager_definition }}'
+      - name: logging_configuration
         value:
-          LogGroupArn: '{{ LogGroupArn }}'
-      - name: WorkspaceConfiguration
+          log_group_arn: '{{ log_group_arn }}'
+      - name: workspace_configuration
         value:
-          RetentionPeriodInDays: '{{ RetentionPeriodInDays }}'
-          LimitsPerLabelSets:
-            - Limits:
-                MaxSeries: '{{ MaxSeries }}'
-              LabelSet:
-                - Name: '{{ Name }}'
-                  Value: '{{ Value }}'
-      - name: QueryLoggingConfiguration
+          retention_period_in_days: '{{ retention_period_in_days }}'
+          limits_per_label_sets:
+            - limits:
+                max_series: '{{ max_series }}'
+              label_set:
+                - name: '{{ name }}'
+                  value: '{{ value }}'
+      - name: query_logging_configuration
         value:
-          Destinations:
-            - CloudWatchLogs:
-                LogGroupArn: '{{ LogGroupArn }}'
-              Filters:
-                QspThreshold: '{{ QspThreshold }}'
-      - name: KmsKeyArn
-        value: '{{ KmsKeyArn }}'
-      - name: Tags
+          destinations:
+            - cloud_watch_logs:
+                log_group_arn: '{{ log_group_arn }}'
+              filters:
+                qsp_threshold: '{{ qsp_threshold }}'
+      - name: kms_key_arn
+        value: '{{ kms_key_arn }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -413,7 +412,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Arn>';
+AND Identifier = '{{ arn }}';
 ```
 
 
@@ -422,7 +421,7 @@ AND Identifier = '<Arn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.aps.workspaces
-WHERE Identifier = '<Arn>'
+WHERE Identifier = '{{ arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/arcregionswitch/plans/index.md b/website/docs/services/arcregionswitch/plans/index.md
index 088879c20..a2582a086 100644
--- a/website/docs/services/arcregionswitch/plans/index.md
+++ b/website/docs/services/arcregionswitch/plans/index.md
@@ -329,7 +329,7 @@ workflows,
 health_checks_for_plan,
 route53_health_checks
 FROM awscc.arcregionswitch.plans
-WHERE region = 'us-east-1' AND Identifier = '<Arn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -369,12 +369,12 @@ INSERT INTO awscc.arcregionswitch.plans (
  Workflows,
  region
 )
-SELECT 
-'{{ ExecutionRole }}',
- '{{ Name }}',
- '{{ RecoveryApproach }}',
- '{{ Regions }}',
- '{{ Workflows }}',
+SELECT
+'{{ execution_role }}',
+ '{{ name }}',
+ '{{ recovery_approach }}',
+ '{{ regions }}',
+ '{{ workflows }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -396,18 +396,18 @@ INSERT INTO awscc.arcregionswitch.plans (
  Workflows,
  region
 )
-SELECT 
- '{{ AssociatedAlarms }}',
- '{{ Description }}',
- '{{ ExecutionRole }}',
- '{{ Name }}',
- '{{ PrimaryRegion }}',
- '{{ RecoveryApproach }}',
- '{{ RecoveryTimeObjectiveMinutes }}',
- '{{ Regions }}',
- '{{ Tags }}',
- '{{ Triggers }}',
- '{{ Workflows }}',
+SELECT
+ '{{ associated_alarms }}',
+ '{{ description }}',
+ '{{ execution_role }}',
+ '{{ name }}',
+ '{{ primary_region }}',
+ '{{ recovery_approach }}',
+ '{{ recovery_time_objective_minutes }}',
+ '{{ regions }}',
+ '{{ tags }}',
+ '{{ triggers }}',
+ '{{ workflows }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -425,45 +425,44 @@ globals:
 resources:
   - name: plan
     props:
-      - name: AssociatedAlarms
+      - name: associated_alarms
         value: {}
-      - name: Description
-        value: '{{ Description }}'
-      - name: ExecutionRole
-        value: '{{ ExecutionRole }}'
-      - name: Name
-        value: '{{ Name }}'
-      - name: PrimaryRegion
-        value: '{{ PrimaryRegion }}'
-      - name: RecoveryApproach
-        value: '{{ RecoveryApproach }}'
-      - name: RecoveryTimeObjectiveMinutes
+      - name: description
+        value: '{{ description }}'
+      - name: execution_role
+        value: '{{ execution_role }}'
+      - name: name
+        value: '{{ name }}'
+      - name: primary_region
+        value: '{{ primary_region }}'
+      - name: recovery_approach
+        value: '{{ recovery_approach }}'
+      - name: recovery_time_objective_minutes
         value: null
-      - name: Regions
+      - name: regions
         value:
-          - '{{ Regions[0] }}'
-      - name: Tags
+          - '{{ regions[0] }}'
+      - name: tags
         value: {}
-      - name: Triggers
+      - name: triggers
         value:
-          - Description: '{{ Description }}'
-            TargetRegion: '{{ TargetRegion }}'
-            Action: '{{ Action }}'
-            Conditions:
-              - AssociatedAlarmName: '{{ AssociatedAlarmName }}'
-                Condition: '{{ Condition }}'
-            MinDelayMinutesBetweenExecutions: null
-      - name: Workflows
+          - description: '{{ description }}'
+            target_region: '{{ target_region }}'
+            action: '{{ action }}'
+            conditions:
+              - associated_alarm_name: '{{ associated_alarm_name }}'
+                condition: '{{ condition }}'
+            min_delay_minutes_between_executions: null
+      - name: workflows
         value:
-          - Steps:
-              - Name: '{{ Name }}'
-                Description: '{{ Description }}'
-                ExecutionBlockConfiguration: null
-                ExecutionBlockType: '{{ ExecutionBlockType }}'
-            WorkflowTargetAction: null
-            WorkflowTargetRegion: '{{ WorkflowTargetRegion }}'
-            WorkflowDescription: '{{ WorkflowDescription }}'
-
+          - steps:
+              - name: '{{ name }}'
+                description: '{{ description }}'
+                execution_block_configuration: null
+                execution_block_type: '{{ execution_block_type }}'
+            workflow_target_action: null
+            workflow_target_region: '{{ workflow_target_region }}'
+            workflow_description: '{{ workflow_description }}'
 ```
 </TabItem>
 </Tabs>
@@ -485,7 +484,7 @@ SET PatchDocument = string('{{ {
     "Workflows": workflows
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Arn>';
+AND Identifier = '{{ arn }}';
 ```
 
 
@@ -494,7 +493,7 @@ AND Identifier = '<Arn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.arcregionswitch.plans
-WHERE Identifier = '<Arn>'
+WHERE Identifier = '{{ arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/arczonalshift/autoshift_observer_notification_statuses/index.md b/website/docs/services/arczonalshift/autoshift_observer_notification_statuses/index.md
index cdc8e6296..8f93bb5dc 100644
--- a/website/docs/services/arczonalshift/autoshift_observer_notification_statuses/index.md
+++ b/website/docs/services/arczonalshift/autoshift_observer_notification_statuses/index.md
@@ -157,7 +157,7 @@ status,
 account_id,
 region
 FROM awscc.arczonalshift.autoshift_observer_notification_statuses
-WHERE region = 'us-east-1' AND Identifier = '<AccountId>|<Region>';
+WHERE region = 'us-east-1' AND Identifier = '{{ account_id }}|{{ region }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -194,8 +194,8 @@ INSERT INTO awscc.arczonalshift.autoshift_observer_notification_statuses (
  Status,
  region
 )
-SELECT 
-'{{ Status }}',
+SELECT
+'{{ status }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -207,8 +207,8 @@ INSERT INTO awscc.arczonalshift.autoshift_observer_notification_statuses (
  Status,
  region
 )
-SELECT 
- '{{ Status }}',
+SELECT
+ '{{ status }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -226,10 +226,9 @@ globals:
 resources:
   - name: autoshift_observer_notification_status
     props:
-      - name: Status
+      - name: status
         value:
-          Status: null
-
+          status: null
 ```
 </TabItem>
 </Tabs>
@@ -240,7 +239,7 @@ resources:
 ```sql
 /*+ delete */
 DELETE FROM awscc.arczonalshift.autoshift_observer_notification_statuses
-WHERE Identifier = '<AccountId|Region>'
+WHERE Identifier = '{{ account_id }}|{{ region }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/arczonalshift/zonal_autoshift_configurations/index.md b/website/docs/services/arczonalshift/zonal_autoshift_configurations/index.md
index 1db7b15a3..e8397e026 100644
--- a/website/docs/services/arczonalshift/zonal_autoshift_configurations/index.md
+++ b/website/docs/services/arczonalshift/zonal_autoshift_configurations/index.md
@@ -180,7 +180,7 @@ zonal_autoshift_status,
 practice_run_configuration,
 resource_identifier
 FROM awscc.arczonalshift.zonal_autoshift_configurations
-WHERE region = 'us-east-1' AND Identifier = '<ResourceIdentifier>';
+WHERE region = 'us-east-1' AND Identifier = '{{ resource_identifier }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -218,10 +218,10 @@ INSERT INTO awscc.arczonalshift.zonal_autoshift_configurations (
  ResourceIdentifier,
  region
 )
-SELECT 
-'{{ ZonalAutoshiftStatus }}',
- '{{ PracticeRunConfiguration }}',
- '{{ ResourceIdentifier }}',
+SELECT
+'{{ zonal_autoshift_status }}',
+ '{{ practice_run_configuration }}',
+ '{{ resource_identifier }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -235,10 +235,10 @@ INSERT INTO awscc.arczonalshift.zonal_autoshift_configurations (
  ResourceIdentifier,
  region
 )
-SELECT 
- '{{ ZonalAutoshiftStatus }}',
- '{{ PracticeRunConfiguration }}',
- '{{ ResourceIdentifier }}',
+SELECT
+ '{{ zonal_autoshift_status }}',
+ '{{ practice_run_configuration }}',
+ '{{ resource_identifier }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -256,22 +256,21 @@ globals:
 resources:
   - name: zonal_autoshift_configuration
     props:
-      - name: ZonalAutoshiftStatus
-        value: '{{ ZonalAutoshiftStatus }}'
-      - name: PracticeRunConfiguration
+      - name: zonal_autoshift_status
+        value: '{{ zonal_autoshift_status }}'
+      - name: practice_run_configuration
         value:
-          BlockingAlarms:
-            - Type: '{{ Type }}'
-              AlarmIdentifier: '{{ AlarmIdentifier }}'
-          OutcomeAlarms:
+          blocking_alarms:
+            - type: '{{ type }}'
+              alarm_identifier: '{{ alarm_identifier }}'
+          outcome_alarms:
             - null
-          BlockedDates:
-            - '{{ BlockedDates[0] }}'
-          BlockedWindows:
-            - '{{ BlockedWindows[0] }}'
-      - name: ResourceIdentifier
-        value: '{{ ResourceIdentifier }}'
-
+          blocked_dates:
+            - '{{ blocked_dates[0] }}'
+          blocked_windows:
+            - '{{ blocked_windows[0] }}'
+      - name: resource_identifier
+        value: '{{ resource_identifier }}'
 ```
 </TabItem>
 </Tabs>
@@ -288,7 +287,7 @@ SET PatchDocument = string('{{ {
     "PracticeRunConfiguration": practice_run_configuration
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<ResourceIdentifier>';
+AND Identifier = '{{ resource_identifier }}';
 ```
 
 
@@ -297,7 +296,7 @@ AND Identifier = '<ResourceIdentifier>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.arczonalshift.zonal_autoshift_configurations
-WHERE Identifier = '<ResourceIdentifier>'
+WHERE Identifier = '{{ resource_identifier }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/athena/capacity_reservations/index.md b/website/docs/services/athena/capacity_reservations/index.md
index 6391730d7..727d4461b 100644
--- a/website/docs/services/athena/capacity_reservations/index.md
+++ b/website/docs/services/athena/capacity_reservations/index.md
@@ -208,7 +208,7 @@ creation_time,
 last_successful_allocation_time,
 tags
 FROM awscc.athena.capacity_reservations
-WHERE region = 'us-east-1' AND Identifier = '<Arn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -245,9 +245,9 @@ INSERT INTO awscc.athena.capacity_reservations (
  TargetDpus,
  region
 )
-SELECT 
-'{{ Name }}',
- '{{ TargetDpus }}',
+SELECT
+'{{ name }}',
+ '{{ target_dpus }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -262,11 +262,11 @@ INSERT INTO awscc.athena.capacity_reservations (
  Tags,
  region
 )
-SELECT 
- '{{ Name }}',
- '{{ TargetDpus }}',
- '{{ CapacityAssignmentConfiguration }}',
- '{{ Tags }}',
+SELECT
+ '{{ name }}',
+ '{{ target_dpus }}',
+ '{{ capacity_assignment_configuration }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -284,20 +284,19 @@ globals:
 resources:
   - name: capacity_reservation
     props:
-      - name: Name
-        value: '{{ Name }}'
-      - name: TargetDpus
-        value: '{{ TargetDpus }}'
-      - name: CapacityAssignmentConfiguration
+      - name: name
+        value: '{{ name }}'
+      - name: target_dpus
+        value: '{{ target_dpus }}'
+      - name: capacity_assignment_configuration
         value:
-          CapacityAssignments:
-            - WorkgroupNames:
-                - '{{ WorkgroupNames[0] }}'
-      - name: Tags
+          capacity_assignments:
+            - workgroup_names:
+                - '{{ workgroup_names[0] }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -315,7 +314,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Arn>';
+AND Identifier = '{{ arn }}';
 ```
 
 
@@ -324,7 +323,7 @@ AND Identifier = '<Arn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.athena.capacity_reservations
-WHERE Identifier = '<Arn>'
+WHERE Identifier = '{{ arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/athena/data_catalogs/index.md b/website/docs/services/athena/data_catalogs/index.md
index 76d7e90f6..670ccfc63 100644
--- a/website/docs/services/athena/data_catalogs/index.md
+++ b/website/docs/services/athena/data_catalogs/index.md
@@ -188,7 +188,7 @@ status,
 connection_type,
 error
 FROM awscc.athena.data_catalogs
-WHERE region = 'us-east-1' AND Identifier = '<Name>';
+WHERE region = 'us-east-1' AND Identifier = '{{ name }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -225,9 +225,9 @@ INSERT INTO awscc.athena.data_catalogs (
  Type,
  region
 )
-SELECT 
-'{{ Name }}',
- '{{ Type }}',
+SELECT
+'{{ name }}',
+ '{{ type }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -246,15 +246,15 @@ INSERT INTO awscc.athena.data_catalogs (
  Error,
  region
 )
-SELECT 
- '{{ Name }}',
- '{{ Description }}',
- '{{ Parameters }}',
- '{{ Tags }}',
- '{{ Type }}',
- '{{ Status }}',
- '{{ ConnectionType }}',
- '{{ Error }}',
+SELECT
+ '{{ name }}',
+ '{{ description }}',
+ '{{ parameters }}',
+ '{{ tags }}',
+ '{{ type }}',
+ '{{ status }}',
+ '{{ connection_type }}',
+ '{{ error }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -272,25 +272,24 @@ globals:
 resources:
   - name: data_catalog
     props:
-      - name: Name
-        value: '{{ Name }}'
-      - name: Description
-        value: '{{ Description }}'
-      - name: Parameters
+      - name: name
+        value: '{{ name }}'
+      - name: description
+        value: '{{ description }}'
+      - name: parameters
         value: {}
-      - name: Tags
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-      - name: Type
-        value: '{{ Type }}'
-      - name: Status
-        value: '{{ Status }}'
-      - name: ConnectionType
-        value: '{{ ConnectionType }}'
-      - name: Error
-        value: '{{ Error }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
+      - name: type
+        value: '{{ type }}'
+      - name: status
+        value: '{{ status }}'
+      - name: connection_type
+        value: '{{ connection_type }}'
+      - name: error
+        value: '{{ error }}'
 ```
 </TabItem>
 </Tabs>
@@ -312,7 +311,7 @@ SET PatchDocument = string('{{ {
     "Error": error
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Name>';
+AND Identifier = '{{ name }}';
 ```
 
 
@@ -321,7 +320,7 @@ AND Identifier = '<Name>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.athena.data_catalogs
-WHERE Identifier = '<Name>'
+WHERE Identifier = '{{ name }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/athena/named_queries/index.md b/website/docs/services/athena/named_queries/index.md
index 67d96c7d2..a1e3ad519 100644
--- a/website/docs/services/athena/named_queries/index.md
+++ b/website/docs/services/athena/named_queries/index.md
@@ -163,7 +163,7 @@ query_string,
 work_group,
 named_query_id
 FROM awscc.athena.named_queries
-WHERE region = 'us-east-1' AND Identifier = '<NamedQueryId>';
+WHERE region = 'us-east-1' AND Identifier = '{{ named_query_id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -200,9 +200,9 @@ INSERT INTO awscc.athena.named_queries (
  QueryString,
  region
 )
-SELECT 
-'{{ Database }}',
- '{{ QueryString }}',
+SELECT
+'{{ database }}',
+ '{{ query_string }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -218,12 +218,12 @@ INSERT INTO awscc.athena.named_queries (
  WorkGroup,
  region
 )
-SELECT 
- '{{ Name }}',
- '{{ Database }}',
- '{{ Description }}',
- '{{ QueryString }}',
- '{{ WorkGroup }}',
+SELECT
+ '{{ name }}',
+ '{{ database }}',
+ '{{ description }}',
+ '{{ query_string }}',
+ '{{ work_group }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -241,17 +241,16 @@ globals:
 resources:
   - name: named_query
     props:
-      - name: Name
-        value: '{{ Name }}'
-      - name: Database
-        value: '{{ Database }}'
-      - name: Description
-        value: '{{ Description }}'
-      - name: QueryString
-        value: '{{ QueryString }}'
-      - name: WorkGroup
-        value: '{{ WorkGroup }}'
-
+      - name: name
+        value: '{{ name }}'
+      - name: database
+        value: '{{ database }}'
+      - name: description
+        value: '{{ description }}'
+      - name: query_string
+        value: '{{ query_string }}'
+      - name: work_group
+        value: '{{ work_group }}'
 ```
 </TabItem>
 </Tabs>
@@ -262,7 +261,7 @@ resources:
 ```sql
 /*+ delete */
 DELETE FROM awscc.athena.named_queries
-WHERE Identifier = '<NamedQueryId>'
+WHERE Identifier = '{{ named_query_id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/athena/prepared_statements/index.md b/website/docs/services/athena/prepared_statements/index.md
index 8e7f19a56..256281fae 100644
--- a/website/docs/services/athena/prepared_statements/index.md
+++ b/website/docs/services/athena/prepared_statements/index.md
@@ -157,7 +157,7 @@ work_group,
 description,
 query_statement
 FROM awscc.athena.prepared_statements
-WHERE region = 'us-east-1' AND Identifier = '<StatementName>|<WorkGroup>';
+WHERE region = 'us-east-1' AND Identifier = '{{ statement_name }}|{{ work_group }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -196,10 +196,10 @@ INSERT INTO awscc.athena.prepared_statements (
  QueryStatement,
  region
 )
-SELECT 
-'{{ StatementName }}',
- '{{ WorkGroup }}',
- '{{ QueryStatement }}',
+SELECT
+'{{ statement_name }}',
+ '{{ work_group }}',
+ '{{ query_statement }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -214,11 +214,11 @@ INSERT INTO awscc.athena.prepared_statements (
  QueryStatement,
  region
 )
-SELECT 
- '{{ StatementName }}',
- '{{ WorkGroup }}',
- '{{ Description }}',
- '{{ QueryStatement }}',
+SELECT
+ '{{ statement_name }}',
+ '{{ work_group }}',
+ '{{ description }}',
+ '{{ query_statement }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -236,15 +236,14 @@ globals:
 resources:
   - name: prepared_statement
     props:
-      - name: StatementName
-        value: '{{ StatementName }}'
-      - name: WorkGroup
-        value: '{{ WorkGroup }}'
-      - name: Description
-        value: '{{ Description }}'
-      - name: QueryStatement
-        value: '{{ QueryStatement }}'
-
+      - name: statement_name
+        value: '{{ statement_name }}'
+      - name: work_group
+        value: '{{ work_group }}'
+      - name: description
+        value: '{{ description }}'
+      - name: query_statement
+        value: '{{ query_statement }}'
 ```
 </TabItem>
 </Tabs>
@@ -261,7 +260,7 @@ SET PatchDocument = string('{{ {
     "QueryStatement": query_statement
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<StatementName>|<WorkGroup>';
+AND Identifier = '{{ statement_name }}|{{ work_group }}';
 ```
 
 
@@ -270,7 +269,7 @@ AND Identifier = '<StatementName>|<WorkGroup>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.athena.prepared_statements
-WHERE Identifier = '<StatementName|WorkGroup>'
+WHERE Identifier = '{{ statement_name }}|{{ work_group }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/athena/work_groups/index.md b/website/docs/services/athena/work_groups/index.md
index b1244df4e..a257cd815 100644
--- a/website/docs/services/athena/work_groups/index.md
+++ b/website/docs/services/athena/work_groups/index.md
@@ -480,7 +480,7 @@ creation_time,
 state,
 recursive_delete_option
 FROM awscc.athena.work_groups
-WHERE region = 'us-east-1' AND Identifier = '<Name>';
+WHERE region = 'us-east-1' AND Identifier = '{{ name }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -516,8 +516,8 @@ INSERT INTO awscc.athena.work_groups (
  Name,
  region
 )
-SELECT 
-'{{ Name }}',
+SELECT
+'{{ name }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -535,14 +535,14 @@ INSERT INTO awscc.athena.work_groups (
  RecursiveDeleteOption,
  region
 )
-SELECT 
- '{{ Name }}',
- '{{ Description }}',
- '{{ Tags }}',
- '{{ WorkGroupConfiguration }}',
- '{{ WorkGroupConfigurationUpdates }}',
- '{{ State }}',
- '{{ RecursiveDeleteOption }}',
+SELECT
+ '{{ name }}',
+ '{{ description }}',
+ '{{ tags }}',
+ '{{ work_group_configuration }}',
+ '{{ work_group_configuration_updates }}',
+ '{{ state }}',
+ '{{ recursive_delete_option }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -560,66 +560,65 @@ globals:
 resources:
   - name: work_group
     props:
-      - name: Name
-        value: '{{ Name }}'
-      - name: Description
-        value: '{{ Description }}'
-      - name: Tags
+      - name: name
+        value: '{{ name }}'
+      - name: description
+        value: '{{ description }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-      - name: WorkGroupConfiguration
+          - key: '{{ key }}'
+            value: '{{ value }}'
+      - name: work_group_configuration
         value:
-          BytesScannedCutoffPerQuery: '{{ BytesScannedCutoffPerQuery }}'
-          EnforceWorkGroupConfiguration: '{{ EnforceWorkGroupConfiguration }}'
-          PublishCloudWatchMetricsEnabled: '{{ PublishCloudWatchMetricsEnabled }}'
-          RequesterPaysEnabled: '{{ RequesterPaysEnabled }}'
-          ResultConfiguration:
-            EncryptionConfiguration:
-              EncryptionOption: '{{ EncryptionOption }}'
-              KmsKey: '{{ KmsKey }}'
-            OutputLocation: '{{ OutputLocation }}'
-            ExpectedBucketOwner: '{{ ExpectedBucketOwner }}'
-            AclConfiguration:
-              S3AclOption: '{{ S3AclOption }}'
-          EngineVersion:
-            SelectedEngineVersion: '{{ SelectedEngineVersion }}'
-            EffectiveEngineVersion: '{{ EffectiveEngineVersion }}'
-          AdditionalConfiguration: '{{ AdditionalConfiguration }}'
-          ExecutionRole: '{{ ExecutionRole }}'
-          CustomerContentEncryptionConfiguration:
-            KmsKey: null
-          ManagedQueryResultsConfiguration:
-            EncryptionConfiguration:
-              KmsKey: null
-            Enabled: '{{ Enabled }}'
-      - name: WorkGroupConfigurationUpdates
+          bytes_scanned_cutoff_per_query: '{{ bytes_scanned_cutoff_per_query }}'
+          enforce_work_group_configuration: '{{ enforce_work_group_configuration }}'
+          publish_cloud_watch_metrics_enabled: '{{ publish_cloud_watch_metrics_enabled }}'
+          requester_pays_enabled: '{{ requester_pays_enabled }}'
+          result_configuration:
+            encryption_configuration:
+              encryption_option: '{{ encryption_option }}'
+              kms_key: '{{ kms_key }}'
+            output_location: '{{ output_location }}'
+            expected_bucket_owner: '{{ expected_bucket_owner }}'
+            acl_configuration:
+              s3_acl_option: '{{ s3_acl_option }}'
+          engine_version:
+            selected_engine_version: '{{ selected_engine_version }}'
+            effective_engine_version: '{{ effective_engine_version }}'
+          additional_configuration: '{{ additional_configuration }}'
+          execution_role: '{{ execution_role }}'
+          customer_content_encryption_configuration:
+            kms_key: null
+          managed_query_results_configuration:
+            encryption_configuration:
+              kms_key: null
+            enabled: '{{ enabled }}'
+      - name: work_group_configuration_updates
         value:
-          BytesScannedCutoffPerQuery: null
-          EnforceWorkGroupConfiguration: null
-          PublishCloudWatchMetricsEnabled: null
-          RequesterPaysEnabled: null
-          ResultConfigurationUpdates:
-            EncryptionConfiguration: null
-            OutputLocation: null
-            ExpectedBucketOwner: null
-            AclConfiguration: null
-            RemoveEncryptionConfiguration: '{{ RemoveEncryptionConfiguration }}'
-            RemoveOutputLocation: '{{ RemoveOutputLocation }}'
-            RemoveExpectedBucketOwner: '{{ RemoveExpectedBucketOwner }}'
-            RemoveAclConfiguration: '{{ RemoveAclConfiguration }}'
-          RemoveBytesScannedCutoffPerQuery: '{{ RemoveBytesScannedCutoffPerQuery }}'
-          EngineVersion: null
-          AdditionalConfiguration: null
-          ExecutionRole: null
-          CustomerContentEncryptionConfiguration: null
-          RemoveCustomerContentEncryptionConfiguration: '{{ RemoveCustomerContentEncryptionConfiguration }}'
-          ManagedQueryResultsConfiguration: null
-      - name: State
-        value: '{{ State }}'
-      - name: RecursiveDeleteOption
-        value: '{{ RecursiveDeleteOption }}'
-
+          bytes_scanned_cutoff_per_query: null
+          enforce_work_group_configuration: null
+          publish_cloud_watch_metrics_enabled: null
+          requester_pays_enabled: null
+          result_configuration_updates:
+            encryption_configuration: null
+            output_location: null
+            expected_bucket_owner: null
+            acl_configuration: null
+            remove_encryption_configuration: '{{ remove_encryption_configuration }}'
+            remove_output_location: '{{ remove_output_location }}'
+            remove_expected_bucket_owner: '{{ remove_expected_bucket_owner }}'
+            remove_acl_configuration: '{{ remove_acl_configuration }}'
+          remove_bytes_scanned_cutoff_per_query: '{{ remove_bytes_scanned_cutoff_per_query }}'
+          engine_version: null
+          additional_configuration: null
+          execution_role: null
+          customer_content_encryption_configuration: null
+          remove_customer_content_encryption_configuration: '{{ remove_customer_content_encryption_configuration }}'
+          managed_query_results_configuration: null
+      - name: state
+        value: '{{ state }}'
+      - name: recursive_delete_option
+        value: '{{ recursive_delete_option }}'
 ```
 </TabItem>
 </Tabs>
@@ -638,7 +637,7 @@ SET PatchDocument = string('{{ {
     "RecursiveDeleteOption": recursive_delete_option
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Name>';
+AND Identifier = '{{ name }}';
 ```
 
 
@@ -647,7 +646,7 @@ AND Identifier = '<Name>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.athena.work_groups
-WHERE Identifier = '<Name>'
+WHERE Identifier = '{{ name }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/auditmanager/assessments/index.md b/website/docs/services/auditmanager/assessments/index.md
index a0fb5b243..812a1eded 100644
--- a/website/docs/services/auditmanager/assessments/index.md
+++ b/website/docs/services/auditmanager/assessments/index.md
@@ -320,7 +320,7 @@ creation_time,
 name,
 description
 FROM awscc.auditmanager.assessments
-WHERE region = 'us-east-1' AND Identifier = '<AssessmentId>';
+WHERE region = 'us-east-1' AND Identifier = '{{ assessment_id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -356,7 +356,7 @@ INSERT INTO awscc.auditmanager.assessments (
  ,
  region
 )
-SELECT 
+SELECT
 '{{  }}',
 '{{ region }}';
 ```
@@ -378,17 +378,17 @@ INSERT INTO awscc.auditmanager.assessments (
  Description,
  region
 )
-SELECT 
- '{{ FrameworkId }}',
- '{{ AwsAccount }}',
- '{{ Tags }}',
- '{{ Delegations }}',
- '{{ Roles }}',
- '{{ Scope }}',
- '{{ AssessmentReportsDestination }}',
- '{{ Status }}',
- '{{ Name }}',
- '{{ Description }}',
+SELECT
+ '{{ framework_id }}',
+ '{{ aws_account }}',
+ '{{ tags }}',
+ '{{ delegations }}',
+ '{{ roles }}',
+ '{{ scope }}',
+ '{{ assessment_reports_destination }}',
+ '{{ status }}',
+ '{{ name }}',
+ '{{ description }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -406,51 +406,50 @@ globals:
 resources:
   - name: assessment
     props:
-      - name: FrameworkId
-        value: '{{ FrameworkId }}'
-      - name: AwsAccount
+      - name: framework_id
+        value: '{{ framework_id }}'
+      - name: aws_account
         value:
-          Id: '{{ Id }}'
-          EmailAddress: '{{ EmailAddress }}'
-          Name: '{{ Name }}'
-      - name: Tags
+          id: '{{ id }}'
+          email_address: '{{ email_address }}'
+          name: '{{ name }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-      - name: Delegations
+          - key: '{{ key }}'
+            value: '{{ value }}'
+      - name: delegations
         value:
-          - LastUpdated: null
-            ControlSetId: '{{ ControlSetId }}'
-            CreationTime: null
-            CreatedBy: '{{ CreatedBy }}'
-            RoleArn: '{{ RoleArn }}'
-            AssessmentName: '{{ AssessmentName }}'
-            Comment: '{{ Comment }}'
-            Id: '{{ Id }}'
-            RoleType: '{{ RoleType }}'
-            AssessmentId: null
-            Status: '{{ Status }}'
-      - name: Roles
+          - last_updated: null
+            control_set_id: '{{ control_set_id }}'
+            creation_time: null
+            created_by: '{{ created_by }}'
+            role_arn: '{{ role_arn }}'
+            assessment_name: '{{ assessment_name }}'
+            comment: '{{ comment }}'
+            id: '{{ id }}'
+            role_type: '{{ role_type }}'
+            assessment_id: null
+            status: '{{ status }}'
+      - name: roles
         value:
-          - RoleArn: null
-            RoleType: null
-      - name: Scope
+          - role_arn: null
+            role_type: null
+      - name: scope
         value:
-          AwsAccounts:
+          aws_accounts:
             - null
-          AwsServices:
-            - ServiceName: '{{ ServiceName }}'
-      - name: AssessmentReportsDestination
+          aws_services:
+            - service_name: '{{ service_name }}'
+      - name: assessment_reports_destination
         value:
-          Destination: '{{ Destination }}'
-          DestinationType: '{{ DestinationType }}'
-      - name: Status
-        value: '{{ Status }}'
-      - name: Name
+          destination: '{{ destination }}'
+          destination_type: '{{ destination_type }}'
+      - name: status
+        value: '{{ status }}'
+      - name: name
         value: null
-      - name: Description
-        value: '{{ Description }}'
-
+      - name: description
+        value: '{{ description }}'
 ```
 </TabItem>
 </Tabs>
@@ -473,7 +472,7 @@ SET PatchDocument = string('{{ {
     "Description": description
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<AssessmentId>';
+AND Identifier = '{{ assessment_id }}';
 ```
 
 
@@ -482,7 +481,7 @@ AND Identifier = '<AssessmentId>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.auditmanager.assessments
-WHERE Identifier = '<AssessmentId>'
+WHERE Identifier = '{{ assessment_id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/autoscaling/auto_scaling_groups/index.md b/website/docs/services/autoscaling/auto_scaling_groups/index.md
index 8e1684edf..3d51cd4a3 100644
--- a/website/docs/services/autoscaling/auto_scaling_groups/index.md
+++ b/website/docs/services/autoscaling/auto_scaling_groups/index.md
@@ -569,7 +569,7 @@ capacity_reservation_specification,
 health_check_type,
 max_instance_lifetime
 FROM awscc.autoscaling.auto_scaling_groups
-WHERE region = 'us-east-1' AND Identifier = '<AutoScalingGroupName>';
+WHERE region = 'us-east-1' AND Identifier = '{{ auto_scaling_group_name }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -606,9 +606,9 @@ INSERT INTO awscc.autoscaling.auto_scaling_groups (
  MinSize,
  region
 )
-SELECT 
-'{{ MaxSize }}',
- '{{ MinSize }}',
+SELECT
+'{{ max_size }}',
+ '{{ min_size }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -654,42 +654,42 @@ INSERT INTO awscc.autoscaling.auto_scaling_groups (
  MaxInstanceLifetime,
  region
 )
-SELECT 
- '{{ LifecycleHookSpecificationList }}',
- '{{ LoadBalancerNames }}',
- '{{ LaunchConfigurationName }}',
- '{{ ServiceLinkedRoleARN }}',
- '{{ AvailabilityZoneImpairmentPolicy }}',
- '{{ TargetGroupARNs }}',
- '{{ Cooldown }}',
- '{{ NotificationConfigurations }}',
- '{{ DesiredCapacity }}',
- '{{ HealthCheckGracePeriod }}',
- '{{ DefaultInstanceWarmup }}',
- '{{ SkipZonalShiftValidation }}',
- '{{ NewInstancesProtectedFromScaleIn }}',
- '{{ LaunchTemplate }}',
- '{{ MixedInstancesPolicy }}',
- '{{ VPCZoneIdentifier }}',
- '{{ Tags }}',
- '{{ Context }}',
- '{{ CapacityRebalance }}',
- '{{ InstanceId }}',
- '{{ AvailabilityZones }}',
- '{{ NotificationConfiguration }}',
- '{{ AvailabilityZoneDistribution }}',
- '{{ MetricsCollection }}',
- '{{ InstanceMaintenancePolicy }}',
- '{{ MaxSize }}',
- '{{ MinSize }}',
- '{{ TerminationPolicies }}',
- '{{ AutoScalingGroupName }}',
- '{{ TrafficSources }}',
- '{{ DesiredCapacityType }}',
- '{{ PlacementGroup }}',
- '{{ CapacityReservationSpecification }}',
- '{{ HealthCheckType }}',
- '{{ MaxInstanceLifetime }}',
+SELECT
+ '{{ lifecycle_hook_specification_list }}',
+ '{{ load_balancer_names }}',
+ '{{ launch_configuration_name }}',
+ '{{ service_linked_role_arn }}',
+ '{{ availability_zone_impairment_policy }}',
+ '{{ target_group_arns }}',
+ '{{ cooldown }}',
+ '{{ notification_configurations }}',
+ '{{ desired_capacity }}',
+ '{{ health_check_grace_period }}',
+ '{{ default_instance_warmup }}',
+ '{{ skip_zonal_shift_validation }}',
+ '{{ new_instances_protected_from_scale_in }}',
+ '{{ launch_template }}',
+ '{{ mixed_instances_policy }}',
+ '{{ vpc_zone_identifier }}',
+ '{{ tags }}',
+ '{{ context }}',
+ '{{ capacity_rebalance }}',
+ '{{ instance_id }}',
+ '{{ availability_zones }}',
+ '{{ notification_configuration }}',
+ '{{ availability_zone_distribution }}',
+ '{{ metrics_collection }}',
+ '{{ instance_maintenance_policy }}',
+ '{{ max_size }}',
+ '{{ min_size }}',
+ '{{ termination_policies }}',
+ '{{ auto_scaling_group_name }}',
+ '{{ traffic_sources }}',
+ '{{ desired_capacity_type }}',
+ '{{ placement_group }}',
+ '{{ capacity_reservation_specification }}',
+ '{{ health_check_type }}',
+ '{{ max_instance_lifetime }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -707,183 +707,182 @@ globals:
 resources:
   - name: auto_scaling_group
     props:
-      - name: LifecycleHookSpecificationList
+      - name: lifecycle_hook_specification_list
         value:
-          - LifecycleHookName: '{{ LifecycleHookName }}'
-            LifecycleTransition: '{{ LifecycleTransition }}'
-            HeartbeatTimeout: '{{ HeartbeatTimeout }}'
-            NotificationMetadata: '{{ NotificationMetadata }}'
-            DefaultResult: '{{ DefaultResult }}'
-            NotificationTargetARN: '{{ NotificationTargetARN }}'
-            RoleARN: '{{ RoleARN }}'
-      - name: LoadBalancerNames
+          - lifecycle_hook_name: '{{ lifecycle_hook_name }}'
+            lifecycle_transition: '{{ lifecycle_transition }}'
+            heartbeat_timeout: '{{ heartbeat_timeout }}'
+            notification_metadata: '{{ notification_metadata }}'
+            default_result: '{{ default_result }}'
+            notification_target_arn: '{{ notification_target_arn }}'
+            role_arn: '{{ role_arn }}'
+      - name: load_balancer_names
         value:
-          - '{{ LoadBalancerNames[0] }}'
-      - name: LaunchConfigurationName
-        value: '{{ LaunchConfigurationName }}'
-      - name: ServiceLinkedRoleARN
-        value: '{{ ServiceLinkedRoleARN }}'
-      - name: AvailabilityZoneImpairmentPolicy
+          - '{{ load_balancer_names[0] }}'
+      - name: launch_configuration_name
+        value: '{{ launch_configuration_name }}'
+      - name: service_linked_role_arn
+        value: '{{ service_linked_role_arn }}'
+      - name: availability_zone_impairment_policy
         value:
-          ZonalShiftEnabled: '{{ ZonalShiftEnabled }}'
-          ImpairedZoneHealthCheckBehavior: '{{ ImpairedZoneHealthCheckBehavior }}'
-      - name: TargetGroupARNs
+          zonal_shift_enabled: '{{ zonal_shift_enabled }}'
+          impaired_zone_health_check_behavior: '{{ impaired_zone_health_check_behavior }}'
+      - name: target_group_arns
         value:
-          - '{{ TargetGroupARNs[0] }}'
-      - name: Cooldown
-        value: '{{ Cooldown }}'
-      - name: NotificationConfigurations
+          - '{{ target_group_arns[0] }}'
+      - name: cooldown
+        value: '{{ cooldown }}'
+      - name: notification_configurations
         value:
-          - TopicARN:
-              - '{{ TopicARN[0] }}'
-            NotificationTypes:
-              - '{{ NotificationTypes[0] }}'
-      - name: DesiredCapacity
-        value: '{{ DesiredCapacity }}'
-      - name: HealthCheckGracePeriod
-        value: '{{ HealthCheckGracePeriod }}'
-      - name: DefaultInstanceWarmup
-        value: '{{ DefaultInstanceWarmup }}'
-      - name: SkipZonalShiftValidation
-        value: '{{ SkipZonalShiftValidation }}'
-      - name: NewInstancesProtectedFromScaleIn
-        value: '{{ NewInstancesProtectedFromScaleIn }}'
-      - name: LaunchTemplate
+          - topic_arn:
+              - '{{ topic_arn[0] }}'
+            notification_types:
+              - '{{ notification_types[0] }}'
+      - name: desired_capacity
+        value: '{{ desired_capacity }}'
+      - name: health_check_grace_period
+        value: '{{ health_check_grace_period }}'
+      - name: default_instance_warmup
+        value: '{{ default_instance_warmup }}'
+      - name: skip_zonal_shift_validation
+        value: '{{ skip_zonal_shift_validation }}'
+      - name: new_instances_protected_from_scale_in
+        value: '{{ new_instances_protected_from_scale_in }}'
+      - name: launch_template
         value:
-          LaunchTemplateName: '{{ LaunchTemplateName }}'
-          Version: '{{ Version }}'
-          LaunchTemplateId: '{{ LaunchTemplateId }}'
-      - name: MixedInstancesPolicy
+          launch_template_name: '{{ launch_template_name }}'
+          version: '{{ version }}'
+          launch_template_id: '{{ launch_template_id }}'
+      - name: mixed_instances_policy
         value:
-          InstancesDistribution:
-            OnDemandAllocationStrategy: '{{ OnDemandAllocationStrategy }}'
-            OnDemandBaseCapacity: '{{ OnDemandBaseCapacity }}'
-            OnDemandPercentageAboveBaseCapacity: '{{ OnDemandPercentageAboveBaseCapacity }}'
-            SpotInstancePools: '{{ SpotInstancePools }}'
-            SpotAllocationStrategy: '{{ SpotAllocationStrategy }}'
-            SpotMaxPrice: '{{ SpotMaxPrice }}'
-          LaunchTemplate:
-            LaunchTemplateSpecification: null
-            Overrides:
-              - LaunchTemplateSpecification: null
-                WeightedCapacity: '{{ WeightedCapacity }}'
-                InstanceRequirements:
-                  InstanceGenerations:
-                    - '{{ InstanceGenerations[0] }}'
-                  AcceleratorTypes:
-                    - '{{ AcceleratorTypes[0] }}'
-                  MemoryGiBPerVCpu:
-                    Min: null
-                    Max: null
-                  AcceleratorManufacturers:
-                    - '{{ AcceleratorManufacturers[0] }}'
-                  VCpuCount:
-                    Min: '{{ Min }}'
-                    Max: '{{ Max }}'
-                  LocalStorage: '{{ LocalStorage }}'
-                  CpuManufacturers:
-                    - '{{ CpuManufacturers[0] }}'
-                  BareMetal: '{{ BareMetal }}'
-                  RequireHibernateSupport: '{{ RequireHibernateSupport }}'
-                  MaxSpotPriceAsPercentageOfOptimalOnDemandPrice: '{{ MaxSpotPriceAsPercentageOfOptimalOnDemandPrice }}'
-                  OnDemandMaxPricePercentageOverLowestPrice: '{{ OnDemandMaxPricePercentageOverLowestPrice }}'
-                  MemoryMiB:
-                    Min: '{{ Min }}'
-                    Max: '{{ Max }}'
-                  LocalStorageTypes:
-                    - '{{ LocalStorageTypes[0] }}'
-                  NetworkInterfaceCount:
-                    Min: '{{ Min }}'
-                    Max: '{{ Max }}'
-                  ExcludedInstanceTypes:
-                    - '{{ ExcludedInstanceTypes[0] }}'
-                  AllowedInstanceTypes:
-                    - '{{ AllowedInstanceTypes[0] }}'
-                  AcceleratorCount:
-                    Min: '{{ Min }}'
-                    Max: '{{ Max }}'
-                  NetworkBandwidthGbps:
-                    Min: null
-                    Max: null
-                  BaselinePerformanceFactors:
-                    Cpu:
-                      References:
-                        - InstanceFamily: '{{ InstanceFamily }}'
-                  BaselineEbsBandwidthMbps:
-                    Min: '{{ Min }}'
-                    Max: '{{ Max }}'
-                  SpotMaxPricePercentageOverLowestPrice: '{{ SpotMaxPricePercentageOverLowestPrice }}'
-                  AcceleratorNames:
-                    - '{{ AcceleratorNames[0] }}'
-                  AcceleratorTotalMemoryMiB:
-                    Min: '{{ Min }}'
-                    Max: '{{ Max }}'
-                  BurstablePerformance: '{{ BurstablePerformance }}'
-                  TotalLocalStorageGB:
-                    Min: null
-                    Max: null
-                InstanceType: '{{ InstanceType }}'
-      - name: VPCZoneIdentifier
+          instances_distribution:
+            on_demand_allocation_strategy: '{{ on_demand_allocation_strategy }}'
+            on_demand_base_capacity: '{{ on_demand_base_capacity }}'
+            on_demand_percentage_above_base_capacity: '{{ on_demand_percentage_above_base_capacity }}'
+            spot_instance_pools: '{{ spot_instance_pools }}'
+            spot_allocation_strategy: '{{ spot_allocation_strategy }}'
+            spot_max_price: '{{ spot_max_price }}'
+          launch_template:
+            launch_template_specification: null
+            overrides:
+              - launch_template_specification: null
+                weighted_capacity: '{{ weighted_capacity }}'
+                instance_requirements:
+                  instance_generations:
+                    - '{{ instance_generations[0] }}'
+                  accelerator_types:
+                    - '{{ accelerator_types[0] }}'
+                  memory_gi_bper_vcpu:
+                    min: null
+                    max: null
+                  accelerator_manufacturers:
+                    - '{{ accelerator_manufacturers[0] }}'
+                  v_cpu_count:
+                    min: '{{ min }}'
+                    max: '{{ max }}'
+                  local_storage: '{{ local_storage }}'
+                  cpu_manufacturers:
+                    - '{{ cpu_manufacturers[0] }}'
+                  bare_metal: '{{ bare_metal }}'
+                  require_hibernate_support: '{{ require_hibernate_support }}'
+                  max_spot_price_as_percentage_of_optimal_on_demand_price: '{{ max_spot_price_as_percentage_of_optimal_on_demand_price }}'
+                  on_demand_max_price_percentage_over_lowest_price: '{{ on_demand_max_price_percentage_over_lowest_price }}'
+                  memory_mi_b:
+                    min: '{{ min }}'
+                    max: '{{ max }}'
+                  local_storage_types:
+                    - '{{ local_storage_types[0] }}'
+                  network_interface_count:
+                    min: '{{ min }}'
+                    max: '{{ max }}'
+                  excluded_instance_types:
+                    - '{{ excluded_instance_types[0] }}'
+                  allowed_instance_types:
+                    - '{{ allowed_instance_types[0] }}'
+                  accelerator_count:
+                    min: '{{ min }}'
+                    max: '{{ max }}'
+                  network_bandwidth_gbps:
+                    min: null
+                    max: null
+                  baseline_performance_factors:
+                    cpu:
+                      references:
+                        - instance_family: '{{ instance_family }}'
+                  baseline_ebs_bandwidth_mbps:
+                    min: '{{ min }}'
+                    max: '{{ max }}'
+                  spot_max_price_percentage_over_lowest_price: '{{ spot_max_price_percentage_over_lowest_price }}'
+                  accelerator_names:
+                    - '{{ accelerator_names[0] }}'
+                  accelerator_total_memory_mi_b:
+                    min: '{{ min }}'
+                    max: '{{ max }}'
+                  burstable_performance: '{{ burstable_performance }}'
+                  total_local_storage_gb:
+                    min: null
+                    max: null
+                instance_type: '{{ instance_type }}'
+      - name: vpc_zone_identifier
         value:
-          - '{{ VPCZoneIdentifier[0] }}'
-      - name: Tags
+          - '{{ vpc_zone_identifier[0] }}'
+      - name: tags
         value:
-          - Value: '{{ Value }}'
-            Key: '{{ Key }}'
-            PropagateAtLaunch: '{{ PropagateAtLaunch }}'
-      - name: Context
-        value: '{{ Context }}'
-      - name: CapacityRebalance
-        value: '{{ CapacityRebalance }}'
-      - name: InstanceId
-        value: '{{ InstanceId }}'
-      - name: AvailabilityZones
+          - value: '{{ value }}'
+            key: '{{ key }}'
+            propagate_at_launch: '{{ propagate_at_launch }}'
+      - name: context
+        value: '{{ context }}'
+      - name: capacity_rebalance
+        value: '{{ capacity_rebalance }}'
+      - name: instance_id
+        value: '{{ instance_id }}'
+      - name: availability_zones
         value:
-          - '{{ AvailabilityZones[0] }}'
-      - name: NotificationConfiguration
+          - '{{ availability_zones[0] }}'
+      - name: notification_configuration
         value: null
-      - name: AvailabilityZoneDistribution
+      - name: availability_zone_distribution
         value:
-          CapacityDistributionStrategy: '{{ CapacityDistributionStrategy }}'
-      - name: MetricsCollection
+          capacity_distribution_strategy: '{{ capacity_distribution_strategy }}'
+      - name: metrics_collection
         value:
-          - Metrics:
-              - '{{ Metrics[0] }}'
-            Granularity: '{{ Granularity }}'
-      - name: InstanceMaintenancePolicy
+          - metrics:
+              - '{{ metrics[0] }}'
+            granularity: '{{ granularity }}'
+      - name: instance_maintenance_policy
         value:
-          MaxHealthyPercentage: '{{ MaxHealthyPercentage }}'
-          MinHealthyPercentage: '{{ MinHealthyPercentage }}'
-      - name: MaxSize
-        value: '{{ MaxSize }}'
-      - name: MinSize
-        value: '{{ MinSize }}'
-      - name: TerminationPolicies
+          max_healthy_percentage: '{{ max_healthy_percentage }}'
+          min_healthy_percentage: '{{ min_healthy_percentage }}'
+      - name: max_size
+        value: '{{ max_size }}'
+      - name: min_size
+        value: '{{ min_size }}'
+      - name: termination_policies
         value:
-          - '{{ TerminationPolicies[0] }}'
-      - name: AutoScalingGroupName
-        value: '{{ AutoScalingGroupName }}'
-      - name: TrafficSources
+          - '{{ termination_policies[0] }}'
+      - name: auto_scaling_group_name
+        value: '{{ auto_scaling_group_name }}'
+      - name: traffic_sources
         value:
-          - Type: '{{ Type }}'
-            Identifier: '{{ Identifier }}'
-      - name: DesiredCapacityType
-        value: '{{ DesiredCapacityType }}'
-      - name: PlacementGroup
-        value: '{{ PlacementGroup }}'
-      - name: CapacityReservationSpecification
+          - type: '{{ type }}'
+            identifier: '{{ identifier }}'
+      - name: desired_capacity_type
+        value: '{{ desired_capacity_type }}'
+      - name: placement_group
+        value: '{{ placement_group }}'
+      - name: capacity_reservation_specification
         value:
-          CapacityReservationPreference: '{{ CapacityReservationPreference }}'
-          CapacityReservationTarget:
-            CapacityReservationIds:
-              - '{{ CapacityReservationIds[0] }}'
-            CapacityReservationResourceGroupArns:
-              - '{{ CapacityReservationResourceGroupArns[0] }}'
-      - name: HealthCheckType
-        value: '{{ HealthCheckType }}'
-      - name: MaxInstanceLifetime
-        value: '{{ MaxInstanceLifetime }}'
-
+          capacity_reservation_preference: '{{ capacity_reservation_preference }}'
+          capacity_reservation_target:
+            capacity_reservation_ids:
+              - '{{ capacity_reservation_ids[0] }}'
+            capacity_reservation_resource_group_arns:
+              - '{{ capacity_reservation_resource_group_arns[0] }}'
+      - name: health_check_type
+        value: '{{ health_check_type }}'
+      - name: max_instance_lifetime
+        value: '{{ max_instance_lifetime }}'
 ```
 </TabItem>
 </Tabs>
@@ -931,7 +930,7 @@ SET PatchDocument = string('{{ {
     "MaxInstanceLifetime": max_instance_lifetime
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<AutoScalingGroupName>';
+AND Identifier = '{{ auto_scaling_group_name }}';
 ```
 
 
@@ -940,7 +939,7 @@ AND Identifier = '<AutoScalingGroupName>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.autoscaling.auto_scaling_groups
-WHERE Identifier = '<AutoScalingGroupName>'
+WHERE Identifier = '{{ auto_scaling_group_name }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/autoscaling/launch_configurations/index.md b/website/docs/services/autoscaling/launch_configurations/index.md
index e0a8c4adc..756173b09 100644
--- a/website/docs/services/autoscaling/launch_configurations/index.md
+++ b/website/docs/services/autoscaling/launch_configurations/index.md
@@ -312,7 +312,7 @@ instance_type,
 ram_disk_id,
 instance_monitoring
 FROM awscc.autoscaling.launch_configurations
-WHERE region = 'us-east-1' AND Identifier = '<LaunchConfigurationName>';
+WHERE region = 'us-east-1' AND Identifier = '{{ launch_configuration_name }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -349,9 +349,9 @@ INSERT INTO awscc.autoscaling.launch_configurations (
  InstanceType,
  region
 )
-SELECT 
-'{{ ImageId }}',
- '{{ InstanceType }}',
+SELECT
+'{{ image_id }}',
+ '{{ instance_type }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -381,26 +381,26 @@ INSERT INTO awscc.autoscaling.launch_configurations (
  InstanceMonitoring,
  region
 )
-SELECT 
- '{{ PlacementTenancy }}',
- '{{ SecurityGroups }}',
- '{{ LaunchConfigurationName }}',
- '{{ MetadataOptions }}',
- '{{ InstanceId }}',
- '{{ UserData }}',
- '{{ ClassicLinkVPCSecurityGroups }}',
- '{{ BlockDeviceMappings }}',
- '{{ IamInstanceProfile }}',
- '{{ KernelId }}',
- '{{ AssociatePublicIpAddress }}',
- '{{ ClassicLinkVPCId }}',
- '{{ EbsOptimized }}',
- '{{ KeyName }}',
- '{{ SpotPrice }}',
- '{{ ImageId }}',
- '{{ InstanceType }}',
- '{{ RamDiskId }}',
- '{{ InstanceMonitoring }}',
+SELECT
+ '{{ placement_tenancy }}',
+ '{{ security_groups }}',
+ '{{ launch_configuration_name }}',
+ '{{ metadata_options }}',
+ '{{ instance_id }}',
+ '{{ user_data }}',
+ '{{ classic_link_vpc_security_groups }}',
+ '{{ block_device_mappings }}',
+ '{{ iam_instance_profile }}',
+ '{{ kernel_id }}',
+ '{{ associate_public_ip_address }}',
+ '{{ classic_link_vpc_id }}',
+ '{{ ebs_optimized }}',
+ '{{ key_name }}',
+ '{{ spot_price }}',
+ '{{ image_id }}',
+ '{{ instance_type }}',
+ '{{ ram_disk_id }}',
+ '{{ instance_monitoring }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -418,61 +418,60 @@ globals:
 resources:
   - name: launch_configuration
     props:
-      - name: PlacementTenancy
-        value: '{{ PlacementTenancy }}'
-      - name: SecurityGroups
+      - name: placement_tenancy
+        value: '{{ placement_tenancy }}'
+      - name: security_groups
         value:
-          - '{{ SecurityGroups[0] }}'
-      - name: LaunchConfigurationName
-        value: '{{ LaunchConfigurationName }}'
-      - name: MetadataOptions
+          - '{{ security_groups[0] }}'
+      - name: launch_configuration_name
+        value: '{{ launch_configuration_name }}'
+      - name: metadata_options
         value:
-          HttpPutResponseHopLimit: '{{ HttpPutResponseHopLimit }}'
-          HttpTokens: '{{ HttpTokens }}'
-          HttpEndpoint: '{{ HttpEndpoint }}'
-      - name: InstanceId
-        value: '{{ InstanceId }}'
-      - name: UserData
-        value: '{{ UserData }}'
-      - name: ClassicLinkVPCSecurityGroups
+          http_put_response_hop_limit: '{{ http_put_response_hop_limit }}'
+          http_tokens: '{{ http_tokens }}'
+          http_endpoint: '{{ http_endpoint }}'
+      - name: instance_id
+        value: '{{ instance_id }}'
+      - name: user_data
+        value: '{{ user_data }}'
+      - name: classic_link_vpc_security_groups
         value:
-          - '{{ ClassicLinkVPCSecurityGroups[0] }}'
-      - name: BlockDeviceMappings
+          - '{{ classic_link_vpc_security_groups[0] }}'
+      - name: block_device_mappings
         value:
-          - Ebs:
-              SnapshotId: '{{ SnapshotId }}'
-              VolumeType: '{{ VolumeType }}'
-              Encrypted: '{{ Encrypted }}'
-              Throughput: '{{ Throughput }}'
-              Iops: '{{ Iops }}'
-              VolumeSize: '{{ VolumeSize }}'
-              DeleteOnTermination: '{{ DeleteOnTermination }}'
-            NoDevice: '{{ NoDevice }}'
-            VirtualName: '{{ VirtualName }}'
-            DeviceName: '{{ DeviceName }}'
-      - name: IamInstanceProfile
-        value: '{{ IamInstanceProfile }}'
-      - name: KernelId
-        value: '{{ KernelId }}'
-      - name: AssociatePublicIpAddress
-        value: '{{ AssociatePublicIpAddress }}'
-      - name: ClassicLinkVPCId
-        value: '{{ ClassicLinkVPCId }}'
-      - name: EbsOptimized
-        value: '{{ EbsOptimized }}'
-      - name: KeyName
-        value: '{{ KeyName }}'
-      - name: SpotPrice
-        value: '{{ SpotPrice }}'
-      - name: ImageId
-        value: '{{ ImageId }}'
-      - name: InstanceType
-        value: '{{ InstanceType }}'
-      - name: RamDiskId
-        value: '{{ RamDiskId }}'
-      - name: InstanceMonitoring
-        value: '{{ InstanceMonitoring }}'
-
+          - ebs:
+              snapshot_id: '{{ snapshot_id }}'
+              volume_type: '{{ volume_type }}'
+              encrypted: '{{ encrypted }}'
+              throughput: '{{ throughput }}'
+              iops: '{{ iops }}'
+              volume_size: '{{ volume_size }}'
+              delete_on_termination: '{{ delete_on_termination }}'
+            no_device: '{{ no_device }}'
+            virtual_name: '{{ virtual_name }}'
+            device_name: '{{ device_name }}'
+      - name: iam_instance_profile
+        value: '{{ iam_instance_profile }}'
+      - name: kernel_id
+        value: '{{ kernel_id }}'
+      - name: associate_public_ip_address
+        value: '{{ associate_public_ip_address }}'
+      - name: classic_link_vpc_id
+        value: '{{ classic_link_vpc_id }}'
+      - name: ebs_optimized
+        value: '{{ ebs_optimized }}'
+      - name: key_name
+        value: '{{ key_name }}'
+      - name: spot_price
+        value: '{{ spot_price }}'
+      - name: image_id
+        value: '{{ image_id }}'
+      - name: instance_type
+        value: '{{ instance_type }}'
+      - name: ram_disk_id
+        value: '{{ ram_disk_id }}'
+      - name: instance_monitoring
+        value: '{{ instance_monitoring }}'
 ```
 </TabItem>
 </Tabs>
@@ -483,7 +482,7 @@ resources:
 ```sql
 /*+ delete */
 DELETE FROM awscc.autoscaling.launch_configurations
-WHERE Identifier = '<LaunchConfigurationName>'
+WHERE Identifier = '{{ launch_configuration_name }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/autoscaling/lifecycle_hooks/index.md b/website/docs/services/autoscaling/lifecycle_hooks/index.md
index 5cbe17313..920457b24 100644
--- a/website/docs/services/autoscaling/lifecycle_hooks/index.md
+++ b/website/docs/services/autoscaling/lifecycle_hooks/index.md
@@ -181,7 +181,7 @@ notification_metadata,
 notification_target_arn,
 role_arn
 FROM awscc.autoscaling.lifecycle_hooks
-WHERE region = 'us-east-1' AND Identifier = '<AutoScalingGroupName>|<LifecycleHookName>';
+WHERE region = 'us-east-1' AND Identifier = '{{ auto_scaling_group_name }}|{{ lifecycle_hook_name }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -219,9 +219,9 @@ INSERT INTO awscc.autoscaling.lifecycle_hooks (
  LifecycleTransition,
  region
 )
-SELECT 
-'{{ AutoScalingGroupName }}',
- '{{ LifecycleTransition }}',
+SELECT
+'{{ auto_scaling_group_name }}',
+ '{{ lifecycle_transition }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -240,15 +240,15 @@ INSERT INTO awscc.autoscaling.lifecycle_hooks (
  RoleARN,
  region
 )
-SELECT 
- '{{ AutoScalingGroupName }}',
- '{{ DefaultResult }}',
- '{{ HeartbeatTimeout }}',
- '{{ LifecycleHookName }}',
- '{{ LifecycleTransition }}',
- '{{ NotificationMetadata }}',
- '{{ NotificationTargetARN }}',
- '{{ RoleARN }}',
+SELECT
+ '{{ auto_scaling_group_name }}',
+ '{{ default_result }}',
+ '{{ heartbeat_timeout }}',
+ '{{ lifecycle_hook_name }}',
+ '{{ lifecycle_transition }}',
+ '{{ notification_metadata }}',
+ '{{ notification_target_arn }}',
+ '{{ role_arn }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -266,23 +266,22 @@ globals:
 resources:
   - name: lifecycle_hook
     props:
-      - name: AutoScalingGroupName
-        value: '{{ AutoScalingGroupName }}'
-      - name: DefaultResult
-        value: '{{ DefaultResult }}'
-      - name: HeartbeatTimeout
-        value: '{{ HeartbeatTimeout }}'
-      - name: LifecycleHookName
-        value: '{{ LifecycleHookName }}'
-      - name: LifecycleTransition
-        value: '{{ LifecycleTransition }}'
-      - name: NotificationMetadata
-        value: '{{ NotificationMetadata }}'
-      - name: NotificationTargetARN
-        value: '{{ NotificationTargetARN }}'
-      - name: RoleARN
-        value: '{{ RoleARN }}'
-
+      - name: auto_scaling_group_name
+        value: '{{ auto_scaling_group_name }}'
+      - name: default_result
+        value: '{{ default_result }}'
+      - name: heartbeat_timeout
+        value: '{{ heartbeat_timeout }}'
+      - name: lifecycle_hook_name
+        value: '{{ lifecycle_hook_name }}'
+      - name: lifecycle_transition
+        value: '{{ lifecycle_transition }}'
+      - name: notification_metadata
+        value: '{{ notification_metadata }}'
+      - name: notification_target_arn
+        value: '{{ notification_target_arn }}'
+      - name: role_arn
+        value: '{{ role_arn }}'
 ```
 </TabItem>
 </Tabs>
@@ -303,7 +302,7 @@ SET PatchDocument = string('{{ {
     "RoleARN": role_arn
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<AutoScalingGroupName>|<LifecycleHookName>';
+AND Identifier = '{{ auto_scaling_group_name }}|{{ lifecycle_hook_name }}';
 ```
 
 
@@ -312,7 +311,7 @@ AND Identifier = '<AutoScalingGroupName>|<LifecycleHookName>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.autoscaling.lifecycle_hooks
-WHERE Identifier = '<AutoScalingGroupName|LifecycleHookName>'
+WHERE Identifier = '{{ auto_scaling_group_name }}|{{ lifecycle_hook_name }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/autoscaling/scaling_policies/index.md b/website/docs/services/autoscaling/scaling_policies/index.md
index 6af1fa1c8..594076c24 100644
--- a/website/docs/services/autoscaling/scaling_policies/index.md
+++ b/website/docs/services/autoscaling/scaling_policies/index.md
@@ -459,7 +459,7 @@ estimated_instance_warmup,
 adjustment_type,
 arn
 FROM awscc.autoscaling.scaling_policies
-WHERE region = 'us-east-1' AND Identifier = '<Arn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -495,8 +495,8 @@ INSERT INTO awscc.autoscaling.scaling_policies (
  AutoScalingGroupName,
  region
 )
-SELECT 
-'{{ AutoScalingGroupName }}',
+SELECT
+'{{ auto_scaling_group_name }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -518,18 +518,18 @@ INSERT INTO awscc.autoscaling.scaling_policies (
  AdjustmentType,
  region
 )
-SELECT 
- '{{ MetricAggregationType }}',
- '{{ PolicyType }}',
- '{{ PredictiveScalingConfiguration }}',
- '{{ ScalingAdjustment }}',
- '{{ Cooldown }}',
- '{{ StepAdjustments }}',
- '{{ AutoScalingGroupName }}',
- '{{ MinAdjustmentMagnitude }}',
- '{{ TargetTrackingConfiguration }}',
- '{{ EstimatedInstanceWarmup }}',
- '{{ AdjustmentType }}',
+SELECT
+ '{{ metric_aggregation_type }}',
+ '{{ policy_type }}',
+ '{{ predictive_scaling_configuration }}',
+ '{{ scaling_adjustment }}',
+ '{{ cooldown }}',
+ '{{ step_adjustments }}',
+ '{{ auto_scaling_group_name }}',
+ '{{ min_adjustment_magnitude }}',
+ '{{ target_tracking_configuration }}',
+ '{{ estimated_instance_warmup }}',
+ '{{ adjustment_type }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -547,92 +547,91 @@ globals:
 resources:
   - name: scaling_policy
     props:
-      - name: MetricAggregationType
-        value: '{{ MetricAggregationType }}'
-      - name: PolicyType
-        value: '{{ PolicyType }}'
-      - name: PredictiveScalingConfiguration
+      - name: metric_aggregation_type
+        value: '{{ metric_aggregation_type }}'
+      - name: policy_type
+        value: '{{ policy_type }}'
+      - name: predictive_scaling_configuration
         value:
-          MetricSpecifications:
-            - CustomizedCapacityMetricSpecification:
-                MetricDataQueries:
-                  - Label: '{{ Label }}'
-                    MetricStat:
-                      Metric:
-                        MetricName: '{{ MetricName }}'
-                        Dimensions:
-                          - Value: '{{ Value }}'
-                            Name: '{{ Name }}'
-                        Namespace: '{{ Namespace }}'
-                      Stat: '{{ Stat }}'
-                      Unit: '{{ Unit }}'
-                    Id: '{{ Id }}'
-                    ReturnData: '{{ ReturnData }}'
-                    Expression: '{{ Expression }}'
-              CustomizedLoadMetricSpecification:
-                MetricDataQueries:
+          metric_specifications:
+            - customized_capacity_metric_specification:
+                metric_data_queries:
+                  - label: '{{ label }}'
+                    metric_stat:
+                      metric:
+                        metric_name: '{{ metric_name }}'
+                        dimensions:
+                          - value: '{{ value }}'
+                            name: '{{ name }}'
+                        namespace: '{{ namespace }}'
+                      stat: '{{ stat }}'
+                      unit: '{{ unit }}'
+                    id: '{{ id }}'
+                    return_data: '{{ return_data }}'
+                    expression: '{{ expression }}'
+              customized_load_metric_specification:
+                metric_data_queries:
                   - null
-              CustomizedScalingMetricSpecification:
-                MetricDataQueries:
+              customized_scaling_metric_specification:
+                metric_data_queries:
                   - null
-              PredefinedLoadMetricSpecification:
-                ResourceLabel: '{{ ResourceLabel }}'
-                PredefinedMetricType: '{{ PredefinedMetricType }}'
-              TargetValue: null
-              PredefinedScalingMetricSpecification:
-                ResourceLabel: '{{ ResourceLabel }}'
-                PredefinedMetricType: '{{ PredefinedMetricType }}'
-              PredefinedMetricPairSpecification:
-                ResourceLabel: '{{ ResourceLabel }}'
-                PredefinedMetricType: '{{ PredefinedMetricType }}'
-          MaxCapacityBreachBehavior: '{{ MaxCapacityBreachBehavior }}'
-          MaxCapacityBuffer: '{{ MaxCapacityBuffer }}'
-          SchedulingBufferTime: '{{ SchedulingBufferTime }}'
-          Mode: '{{ Mode }}'
-      - name: ScalingAdjustment
-        value: '{{ ScalingAdjustment }}'
-      - name: Cooldown
-        value: '{{ Cooldown }}'
-      - name: StepAdjustments
+              predefined_load_metric_specification:
+                resource_label: '{{ resource_label }}'
+                predefined_metric_type: '{{ predefined_metric_type }}'
+              target_value: null
+              predefined_scaling_metric_specification:
+                resource_label: '{{ resource_label }}'
+                predefined_metric_type: '{{ predefined_metric_type }}'
+              predefined_metric_pair_specification:
+                resource_label: '{{ resource_label }}'
+                predefined_metric_type: '{{ predefined_metric_type }}'
+          max_capacity_breach_behavior: '{{ max_capacity_breach_behavior }}'
+          max_capacity_buffer: '{{ max_capacity_buffer }}'
+          scheduling_buffer_time: '{{ scheduling_buffer_time }}'
+          mode: '{{ mode }}'
+      - name: scaling_adjustment
+        value: '{{ scaling_adjustment }}'
+      - name: cooldown
+        value: '{{ cooldown }}'
+      - name: step_adjustments
         value:
-          - MetricIntervalUpperBound: null
-            MetricIntervalLowerBound: null
-            ScalingAdjustment: '{{ ScalingAdjustment }}'
-      - name: AutoScalingGroupName
-        value: '{{ AutoScalingGroupName }}'
-      - name: MinAdjustmentMagnitude
-        value: '{{ MinAdjustmentMagnitude }}'
-      - name: TargetTrackingConfiguration
+          - metric_interval_upper_bound: null
+            metric_interval_lower_bound: null
+            scaling_adjustment: '{{ scaling_adjustment }}'
+      - name: auto_scaling_group_name
+        value: '{{ auto_scaling_group_name }}'
+      - name: min_adjustment_magnitude
+        value: '{{ min_adjustment_magnitude }}'
+      - name: target_tracking_configuration
         value:
-          CustomizedMetricSpecification:
-            MetricName: '{{ MetricName }}'
-            Dimensions:
+          customized_metric_specification:
+            metric_name: '{{ metric_name }}'
+            dimensions:
               - null
-            Metrics:
-              - Label: '{{ Label }}'
-                MetricStat:
-                  Metric: null
-                  Stat: '{{ Stat }}'
-                  Unit: '{{ Unit }}'
-                  Period: '{{ Period }}'
-                Id: '{{ Id }}'
-                ReturnData: '{{ ReturnData }}'
-                Expression: '{{ Expression }}'
-                Period: '{{ Period }}'
-            Statistic: '{{ Statistic }}'
-            Unit: '{{ Unit }}'
-            Namespace: '{{ Namespace }}'
-            Period: '{{ Period }}'
-          TargetValue: null
-          DisableScaleIn: '{{ DisableScaleIn }}'
-          PredefinedMetricSpecification:
-            ResourceLabel: '{{ ResourceLabel }}'
-            PredefinedMetricType: '{{ PredefinedMetricType }}'
-      - name: EstimatedInstanceWarmup
-        value: '{{ EstimatedInstanceWarmup }}'
-      - name: AdjustmentType
-        value: '{{ AdjustmentType }}'
-
+            metrics:
+              - label: '{{ label }}'
+                metric_stat:
+                  metric: null
+                  stat: '{{ stat }}'
+                  unit: '{{ unit }}'
+                  period: '{{ period }}'
+                id: '{{ id }}'
+                return_data: '{{ return_data }}'
+                expression: '{{ expression }}'
+                period: '{{ period }}'
+            statistic: '{{ statistic }}'
+            unit: '{{ unit }}'
+            namespace: '{{ namespace }}'
+            period: '{{ period }}'
+          target_value: null
+          disable_scale_in: '{{ disable_scale_in }}'
+          predefined_metric_specification:
+            resource_label: '{{ resource_label }}'
+            predefined_metric_type: '{{ predefined_metric_type }}'
+      - name: estimated_instance_warmup
+        value: '{{ estimated_instance_warmup }}'
+      - name: adjustment_type
+        value: '{{ adjustment_type }}'
 ```
 </TabItem>
 </Tabs>
@@ -657,7 +656,7 @@ SET PatchDocument = string('{{ {
     "AdjustmentType": adjustment_type
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Arn>';
+AND Identifier = '{{ arn }}';
 ```
 
 
@@ -666,7 +665,7 @@ AND Identifier = '<Arn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.autoscaling.scaling_policies
-WHERE Identifier = '<Arn>'
+WHERE Identifier = '{{ arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/autoscaling/scheduled_actions/index.md b/website/docs/services/autoscaling/scheduled_actions/index.md
index 159e46b17..adf0c08f3 100644
--- a/website/docs/services/autoscaling/scheduled_actions/index.md
+++ b/website/docs/services/autoscaling/scheduled_actions/index.md
@@ -187,7 +187,7 @@ start_time,
 desired_capacity,
 max_size
 FROM awscc.autoscaling.scheduled_actions
-WHERE region = 'us-east-1' AND Identifier = '<ScheduledActionName>|<AutoScalingGroupName>';
+WHERE region = 'us-east-1' AND Identifier = '{{ scheduled_action_name }}|{{ auto_scaling_group_name }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -224,8 +224,8 @@ INSERT INTO awscc.autoscaling.scheduled_actions (
  AutoScalingGroupName,
  region
 )
-SELECT 
-'{{ AutoScalingGroupName }}',
+SELECT
+'{{ auto_scaling_group_name }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -244,15 +244,15 @@ INSERT INTO awscc.autoscaling.scheduled_actions (
  MaxSize,
  region
 )
-SELECT 
- '{{ MinSize }}',
- '{{ Recurrence }}',
- '{{ TimeZone }}',
- '{{ EndTime }}',
- '{{ AutoScalingGroupName }}',
- '{{ StartTime }}',
- '{{ DesiredCapacity }}',
- '{{ MaxSize }}',
+SELECT
+ '{{ min_size }}',
+ '{{ recurrence }}',
+ '{{ time_zone }}',
+ '{{ end_time }}',
+ '{{ auto_scaling_group_name }}',
+ '{{ start_time }}',
+ '{{ desired_capacity }}',
+ '{{ max_size }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -270,23 +270,22 @@ globals:
 resources:
   - name: scheduled_action
     props:
-      - name: MinSize
-        value: '{{ MinSize }}'
-      - name: Recurrence
-        value: '{{ Recurrence }}'
-      - name: TimeZone
-        value: '{{ TimeZone }}'
-      - name: EndTime
-        value: '{{ EndTime }}'
-      - name: AutoScalingGroupName
-        value: '{{ AutoScalingGroupName }}'
-      - name: StartTime
-        value: '{{ StartTime }}'
-      - name: DesiredCapacity
-        value: '{{ DesiredCapacity }}'
-      - name: MaxSize
-        value: '{{ MaxSize }}'
-
+      - name: min_size
+        value: '{{ min_size }}'
+      - name: recurrence
+        value: '{{ recurrence }}'
+      - name: time_zone
+        value: '{{ time_zone }}'
+      - name: end_time
+        value: '{{ end_time }}'
+      - name: auto_scaling_group_name
+        value: '{{ auto_scaling_group_name }}'
+      - name: start_time
+        value: '{{ start_time }}'
+      - name: desired_capacity
+        value: '{{ desired_capacity }}'
+      - name: max_size
+        value: '{{ max_size }}'
 ```
 </TabItem>
 </Tabs>
@@ -308,7 +307,7 @@ SET PatchDocument = string('{{ {
     "MaxSize": max_size
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<ScheduledActionName>|<AutoScalingGroupName>';
+AND Identifier = '{{ scheduled_action_name }}|{{ auto_scaling_group_name }}';
 ```
 
 
@@ -317,7 +316,7 @@ AND Identifier = '<ScheduledActionName>|<AutoScalingGroupName>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.autoscaling.scheduled_actions
-WHERE Identifier = '<ScheduledActionName|AutoScalingGroupName>'
+WHERE Identifier = '{{ scheduled_action_name }}|{{ auto_scaling_group_name }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/autoscaling/warm_pools/index.md b/website/docs/services/autoscaling/warm_pools/index.md
index 741c76385..0987e31cd 100644
--- a/website/docs/services/autoscaling/warm_pools/index.md
+++ b/website/docs/services/autoscaling/warm_pools/index.md
@@ -165,7 +165,7 @@ min_size,
 pool_state,
 instance_reuse_policy
 FROM awscc.autoscaling.warm_pools
-WHERE region = 'us-east-1' AND Identifier = '<AutoScalingGroupName>';
+WHERE region = 'us-east-1' AND Identifier = '{{ auto_scaling_group_name }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -201,8 +201,8 @@ INSERT INTO awscc.autoscaling.warm_pools (
  AutoScalingGroupName,
  region
 )
-SELECT 
-'{{ AutoScalingGroupName }}',
+SELECT
+'{{ auto_scaling_group_name }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -218,12 +218,12 @@ INSERT INTO awscc.autoscaling.warm_pools (
  InstanceReusePolicy,
  region
 )
-SELECT 
- '{{ AutoScalingGroupName }}',
- '{{ MaxGroupPreparedCapacity }}',
- '{{ MinSize }}',
- '{{ PoolState }}',
- '{{ InstanceReusePolicy }}',
+SELECT
+ '{{ auto_scaling_group_name }}',
+ '{{ max_group_prepared_capacity }}',
+ '{{ min_size }}',
+ '{{ pool_state }}',
+ '{{ instance_reuse_policy }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -241,18 +241,17 @@ globals:
 resources:
   - name: warm_pool
     props:
-      - name: AutoScalingGroupName
-        value: '{{ AutoScalingGroupName }}'
-      - name: MaxGroupPreparedCapacity
-        value: '{{ MaxGroupPreparedCapacity }}'
-      - name: MinSize
-        value: '{{ MinSize }}'
-      - name: PoolState
-        value: '{{ PoolState }}'
-      - name: InstanceReusePolicy
+      - name: auto_scaling_group_name
+        value: '{{ auto_scaling_group_name }}'
+      - name: max_group_prepared_capacity
+        value: '{{ max_group_prepared_capacity }}'
+      - name: min_size
+        value: '{{ min_size }}'
+      - name: pool_state
+        value: '{{ pool_state }}'
+      - name: instance_reuse_policy
         value:
-          ReuseOnScaleIn: '{{ ReuseOnScaleIn }}'
-
+          reuse_on_scale_in: '{{ reuse_on_scale_in }}'
 ```
 </TabItem>
 </Tabs>
@@ -271,7 +270,7 @@ SET PatchDocument = string('{{ {
     "InstanceReusePolicy": instance_reuse_policy
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<AutoScalingGroupName>';
+AND Identifier = '{{ auto_scaling_group_name }}';
 ```
 
 
@@ -280,7 +279,7 @@ AND Identifier = '<AutoScalingGroupName>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.autoscaling.warm_pools
-WHERE Identifier = '<AutoScalingGroupName>'
+WHERE Identifier = '{{ auto_scaling_group_name }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/b2bi/capabilities/index.md b/website/docs/services/b2bi/capabilities/index.md
index 1c331bf15..9bfbb13b9 100644
--- a/website/docs/services/b2bi/capabilities/index.md
+++ b/website/docs/services/b2bi/capabilities/index.md
@@ -206,7 +206,7 @@ name,
 tags,
 type
 FROM awscc.b2bi.capabilities
-WHERE region = 'us-east-1' AND Identifier = '<CapabilityId>';
+WHERE region = 'us-east-1' AND Identifier = '{{ capability_id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -244,10 +244,10 @@ INSERT INTO awscc.b2bi.capabilities (
  Type,
  region
 )
-SELECT 
-'{{ Configuration }}',
- '{{ Name }}',
- '{{ Type }}',
+SELECT
+'{{ configuration }}',
+ '{{ name }}',
+ '{{ type }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -263,12 +263,12 @@ INSERT INTO awscc.b2bi.capabilities (
  Type,
  region
 )
-SELECT 
- '{{ Configuration }}',
- '{{ InstructionsDocuments }}',
- '{{ Name }}',
- '{{ Tags }}',
- '{{ Type }}',
+SELECT
+ '{{ configuration }}',
+ '{{ instructions_documents }}',
+ '{{ name }}',
+ '{{ tags }}',
+ '{{ type }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -286,21 +286,20 @@ globals:
 resources:
   - name: capability
     props:
-      - name: Configuration
+      - name: configuration
         value: null
-      - name: InstructionsDocuments
+      - name: instructions_documents
         value:
-          - BucketName: '{{ BucketName }}'
-            Key: '{{ Key }}'
-      - name: Name
-        value: '{{ Name }}'
-      - name: Tags
+          - bucket_name: '{{ bucket_name }}'
+            key: '{{ key }}'
+      - name: name
+        value: '{{ name }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-      - name: Type
-        value: '{{ Type }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
+      - name: type
+        value: '{{ type }}'
 ```
 </TabItem>
 </Tabs>
@@ -319,7 +318,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<CapabilityId>';
+AND Identifier = '{{ capability_id }}';
 ```
 
 
@@ -328,7 +327,7 @@ AND Identifier = '<CapabilityId>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.b2bi.capabilities
-WHERE Identifier = '<CapabilityId>'
+WHERE Identifier = '{{ capability_id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/b2bi/partnerships/index.md b/website/docs/services/b2bi/partnerships/index.md
index 45f06fe4a..3cf5904b8 100644
--- a/website/docs/services/b2bi/partnerships/index.md
+++ b/website/docs/services/b2bi/partnerships/index.md
@@ -238,7 +238,7 @@ profile_id,
 tags,
 trading_partner_id
 FROM awscc.b2bi.partnerships
-WHERE region = 'us-east-1' AND Identifier = '<PartnershipId>';
+WHERE region = 'us-east-1' AND Identifier = '{{ partnership_id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -277,11 +277,11 @@ INSERT INTO awscc.b2bi.partnerships (
  ProfileId,
  region
 )
-SELECT 
-'{{ Capabilities }}',
- '{{ Email }}',
- '{{ Name }}',
- '{{ ProfileId }}',
+SELECT
+'{{ capabilities }}',
+ '{{ email }}',
+ '{{ name }}',
+ '{{ profile_id }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -299,14 +299,14 @@ INSERT INTO awscc.b2bi.partnerships (
  Tags,
  region
 )
-SELECT 
- '{{ Capabilities }}',
- '{{ CapabilityOptions }}',
- '{{ Email }}',
- '{{ Name }}',
- '{{ Phone }}',
- '{{ ProfileId }}',
- '{{ Tags }}',
+SELECT
+ '{{ capabilities }}',
+ '{{ capability_options }}',
+ '{{ email }}',
+ '{{ name }}',
+ '{{ phone }}',
+ '{{ profile_id }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -324,30 +324,29 @@ globals:
 resources:
   - name: partnership
     props:
-      - name: Capabilities
+      - name: capabilities
         value:
-          - '{{ Capabilities[0] }}'
-      - name: CapabilityOptions
+          - '{{ capabilities[0] }}'
+      - name: capability_options
         value:
-          OutboundEdi: null
-          InboundEdi:
-            X12:
-              AcknowledgmentOptions:
-                FunctionalAcknowledgment: '{{ FunctionalAcknowledgment }}'
-                TechnicalAcknowledgment: '{{ TechnicalAcknowledgment }}'
-      - name: Email
-        value: '{{ Email }}'
-      - name: Name
-        value: '{{ Name }}'
-      - name: Phone
-        value: '{{ Phone }}'
-      - name: ProfileId
-        value: '{{ ProfileId }}'
-      - name: Tags
+          outbound_edi: null
+          inbound_edi:
+            x12:
+              acknowledgment_options:
+                functional_acknowledgment: '{{ functional_acknowledgment }}'
+                technical_acknowledgment: '{{ technical_acknowledgment }}'
+      - name: email
+        value: '{{ email }}'
+      - name: name
+        value: '{{ name }}'
+      - name: phone
+        value: '{{ phone }}'
+      - name: profile_id
+        value: '{{ profile_id }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -366,7 +365,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<PartnershipId>';
+AND Identifier = '{{ partnership_id }}';
 ```
 
 
@@ -375,7 +374,7 @@ AND Identifier = '<PartnershipId>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.b2bi.partnerships
-WHERE Identifier = '<PartnershipId>'
+WHERE Identifier = '{{ partnership_id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/b2bi/profiles/index.md b/website/docs/services/b2bi/profiles/index.md
index bf0fd754e..c0b622b0f 100644
--- a/website/docs/services/b2bi/profiles/index.md
+++ b/website/docs/services/b2bi/profiles/index.md
@@ -206,7 +206,7 @@ profile_arn,
 profile_id,
 tags
 FROM awscc.b2bi.profiles
-WHERE region = 'us-east-1' AND Identifier = '<ProfileId>';
+WHERE region = 'us-east-1' AND Identifier = '{{ profile_id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -245,11 +245,11 @@ INSERT INTO awscc.b2bi.profiles (
  Phone,
  region
 )
-SELECT 
-'{{ BusinessName }}',
- '{{ Logging }}',
- '{{ Name }}',
- '{{ Phone }}',
+SELECT
+'{{ business_name }}',
+ '{{ logging }}',
+ '{{ name }}',
+ '{{ phone }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -266,13 +266,13 @@ INSERT INTO awscc.b2bi.profiles (
  Tags,
  region
 )
-SELECT 
- '{{ BusinessName }}',
- '{{ Email }}',
- '{{ Logging }}',
- '{{ Name }}',
- '{{ Phone }}',
- '{{ Tags }}',
+SELECT
+ '{{ business_name }}',
+ '{{ email }}',
+ '{{ logging }}',
+ '{{ name }}',
+ '{{ phone }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -290,21 +290,20 @@ globals:
 resources:
   - name: profile
     props:
-      - name: BusinessName
-        value: '{{ BusinessName }}'
-      - name: Email
-        value: '{{ Email }}'
-      - name: Logging
-        value: '{{ Logging }}'
-      - name: Name
-        value: '{{ Name }}'
-      - name: Phone
-        value: '{{ Phone }}'
-      - name: Tags
+      - name: business_name
+        value: '{{ business_name }}'
+      - name: email
+        value: '{{ email }}'
+      - name: logging
+        value: '{{ logging }}'
+      - name: name
+        value: '{{ name }}'
+      - name: phone
+        value: '{{ phone }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -324,7 +323,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<ProfileId>';
+AND Identifier = '{{ profile_id }}';
 ```
 
 
@@ -333,7 +332,7 @@ AND Identifier = '<ProfileId>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.b2bi.profiles
-WHERE Identifier = '<ProfileId>'
+WHERE Identifier = '{{ profile_id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/b2bi/transformers/index.md b/website/docs/services/b2bi/transformers/index.md
index b4e290f0b..9ffb86a65 100644
--- a/website/docs/services/b2bi/transformers/index.md
+++ b/website/docs/services/b2bi/transformers/index.md
@@ -338,7 +338,7 @@ tags,
 transformer_arn,
 transformer_id
 FROM awscc.b2bi.transformers
-WHERE region = 'us-east-1' AND Identifier = '<TransformerId>';
+WHERE region = 'us-east-1' AND Identifier = '{{ transformer_id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -375,9 +375,9 @@ INSERT INTO awscc.b2bi.transformers (
  Status,
  region
 )
-SELECT 
-'{{ Name }}',
- '{{ Status }}',
+SELECT
+'{{ name }}',
+ '{{ status }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -399,18 +399,18 @@ INSERT INTO awscc.b2bi.transformers (
  Tags,
  region
 )
-SELECT 
- '{{ EdiType }}',
- '{{ FileFormat }}',
- '{{ InputConversion }}',
- '{{ Mapping }}',
- '{{ MappingTemplate }}',
- '{{ Name }}',
- '{{ OutputConversion }}',
- '{{ SampleDocument }}',
- '{{ SampleDocuments }}',
- '{{ Status }}',
- '{{ Tags }}',
+SELECT
+ '{{ edi_type }}',
+ '{{ file_format }}',
+ '{{ input_conversion }}',
+ '{{ mapping }}',
+ '{{ mapping_template }}',
+ '{{ name }}',
+ '{{ output_conversion }}',
+ '{{ sample_document }}',
+ '{{ sample_documents }}',
+ '{{ status }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -428,49 +428,48 @@ globals:
 resources:
   - name: transformer
     props:
-      - name: EdiType
+      - name: edi_type
         value: null
-      - name: FileFormat
-        value: '{{ FileFormat }}'
-      - name: InputConversion
+      - name: file_format
+        value: '{{ file_format }}'
+      - name: input_conversion
         value:
-          FromFormat: '{{ FromFormat }}'
-          FormatOptions: null
-          AdvancedOptions:
-            X12:
-              SplitOptions:
-                SplitBy: '{{ SplitBy }}'
-              ValidationOptions:
-                ValidationRules:
+          from_format: '{{ from_format }}'
+          format_options: null
+          advanced_options:
+            x12:
+              split_options:
+                split_by: '{{ split_by }}'
+              validation_options:
+                validation_rules:
                   - null
-      - name: Mapping
+      - name: mapping
         value:
-          TemplateLanguage: '{{ TemplateLanguage }}'
-          Template: '{{ Template }}'
-      - name: MappingTemplate
-        value: '{{ MappingTemplate }}'
-      - name: Name
-        value: '{{ Name }}'
-      - name: OutputConversion
+          template_language: '{{ template_language }}'
+          template: '{{ template }}'
+      - name: mapping_template
+        value: '{{ mapping_template }}'
+      - name: name
+        value: '{{ name }}'
+      - name: output_conversion
         value:
-          ToFormat: '{{ ToFormat }}'
-          FormatOptions: null
-          AdvancedOptions: null
-      - name: SampleDocument
-        value: '{{ SampleDocument }}'
-      - name: SampleDocuments
+          to_format: '{{ to_format }}'
+          format_options: null
+          advanced_options: null
+      - name: sample_document
+        value: '{{ sample_document }}'
+      - name: sample_documents
         value:
-          BucketName: '{{ BucketName }}'
-          Keys:
-            - Input: '{{ Input }}'
-              Output: '{{ Output }}'
-      - name: Status
-        value: '{{ Status }}'
-      - name: Tags
+          bucket_name: '{{ bucket_name }}'
+          keys:
+            - input: '{{ input }}'
+              output: '{{ output }}'
+      - name: status
+        value: '{{ status }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -496,7 +495,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<TransformerId>';
+AND Identifier = '{{ transformer_id }}';
 ```
 
 
@@ -505,7 +504,7 @@ AND Identifier = '<TransformerId>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.b2bi.transformers
-WHERE Identifier = '<TransformerId>'
+WHERE Identifier = '{{ transformer_id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/backup/backup_plans/index.md b/website/docs/services/backup/backup_plans/index.md
index 9145d1df4..31d6f73b8 100644
--- a/website/docs/services/backup/backup_plans/index.md
+++ b/website/docs/services/backup/backup_plans/index.md
@@ -407,7 +407,7 @@ backup_plan_arn,
 backup_plan_id,
 version_id
 FROM awscc.backup.backup_plans
-WHERE region = 'us-east-1' AND Identifier = '<BackupPlanId>';
+WHERE region = 'us-east-1' AND Identifier = '{{ backup_plan_id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -443,8 +443,8 @@ INSERT INTO awscc.backup.backup_plans (
  BackupPlan,
  region
 )
-SELECT 
-'{{ BackupPlan }}',
+SELECT
+'{{ backup_plan }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -457,9 +457,9 @@ INSERT INTO awscc.backup.backup_plans (
  BackupPlanTags,
  region
 )
-SELECT 
- '{{ BackupPlan }}',
- '{{ BackupPlanTags }}',
+SELECT
+ '{{ backup_plan }}',
+ '{{ backup_plan_tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -477,34 +477,33 @@ globals:
 resources:
   - name: backup_plan
     props:
-      - name: BackupPlan
+      - name: backup_plan
         value:
-          BackupPlanName: '{{ BackupPlanName }}'
-          AdvancedBackupSettings:
-            - BackupOptions: {}
-              ResourceType: '{{ ResourceType }}'
-          BackupPlanRule:
-            - RuleName: '{{ RuleName }}'
-              TargetBackupVault: '{{ TargetBackupVault }}'
-              StartWindowMinutes: null
-              CompletionWindowMinutes: null
-              ScheduleExpression: '{{ ScheduleExpression }}'
-              ScheduleExpressionTimezone: '{{ ScheduleExpressionTimezone }}'
-              IndexActions:
-                - ResourceTypes:
-                    - '{{ ResourceTypes[0] }}'
-              RecoveryPointTags: {}
-              CopyActions:
-                - Lifecycle:
-                    MoveToColdStorageAfterDays: null
-                    DeleteAfterDays: null
-                    OptInToArchiveForSupportedResources: '{{ OptInToArchiveForSupportedResources }}'
-                  DestinationBackupVaultArn: '{{ DestinationBackupVaultArn }}'
-              Lifecycle: null
-              EnableContinuousBackup: '{{ EnableContinuousBackup }}'
-      - name: BackupPlanTags
+          backup_plan_name: '{{ backup_plan_name }}'
+          advanced_backup_settings:
+            - backup_options: {}
+              resource_type: '{{ resource_type }}'
+          backup_plan_rule:
+            - rule_name: '{{ rule_name }}'
+              target_backup_vault: '{{ target_backup_vault }}'
+              start_window_minutes: null
+              completion_window_minutes: null
+              schedule_expression: '{{ schedule_expression }}'
+              schedule_expression_timezone: '{{ schedule_expression_timezone }}'
+              index_actions:
+                - resource_types:
+                    - '{{ resource_types[0] }}'
+              recovery_point_tags: {}
+              copy_actions:
+                - lifecycle:
+                    move_to_cold_storage_after_days: null
+                    delete_after_days: null
+                    opt_in_to_archive_for_supported_resources: '{{ opt_in_to_archive_for_supported_resources }}'
+                  destination_backup_vault_arn: '{{ destination_backup_vault_arn }}'
+              lifecycle: null
+              enable_continuous_backup: '{{ enable_continuous_backup }}'
+      - name: backup_plan_tags
         value: {}
-
 ```
 </TabItem>
 </Tabs>
@@ -521,7 +520,7 @@ SET PatchDocument = string('{{ {
     "BackupPlanTags": backup_plan_tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<BackupPlanId>';
+AND Identifier = '{{ backup_plan_id }}';
 ```
 
 
@@ -530,7 +529,7 @@ AND Identifier = '<BackupPlanId>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.backup.backup_plans
-WHERE Identifier = '<BackupPlanId>'
+WHERE Identifier = '{{ backup_plan_id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/backup/backup_selections/index.md b/website/docs/services/backup/backup_selections/index.md
index e2d9b3397..cdb3f4e2f 100644
--- a/website/docs/services/backup/backup_selections/index.md
+++ b/website/docs/services/backup/backup_selections/index.md
@@ -229,7 +229,7 @@ backup_plan_id,
 backup_selection,
 selection_id
 FROM awscc.backup.backup_selections
-WHERE region = 'us-east-1' AND Identifier = '<Id>';
+WHERE region = 'us-east-1' AND Identifier = '{{ id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -266,9 +266,9 @@ INSERT INTO awscc.backup.backup_selections (
  BackupSelection,
  region
 )
-SELECT 
-'{{ BackupPlanId }}',
- '{{ BackupSelection }}',
+SELECT
+'{{ backup_plan_id }}',
+ '{{ backup_selection }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -281,9 +281,9 @@ INSERT INTO awscc.backup.backup_selections (
  BackupSelection,
  region
 )
-SELECT 
- '{{ BackupPlanId }}',
- '{{ BackupSelection }}',
+SELECT
+ '{{ backup_plan_id }}',
+ '{{ backup_selection }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -301,31 +301,30 @@ globals:
 resources:
   - name: backup_selection
     props:
-      - name: BackupPlanId
-        value: '{{ BackupPlanId }}'
-      - name: BackupSelection
+      - name: backup_plan_id
+        value: '{{ backup_plan_id }}'
+      - name: backup_selection
         value:
-          IamRoleArn: '{{ IamRoleArn }}'
-          ListOfTags:
-            - ConditionKey: '{{ ConditionKey }}'
-              ConditionValue: '{{ ConditionValue }}'
-              ConditionType: '{{ ConditionType }}'
-          Resources:
-            - '{{ Resources[0] }}'
-          SelectionName: '{{ SelectionName }}'
-          NotResources:
-            - '{{ NotResources[0] }}'
-          Conditions:
-            StringEquals:
-              - ConditionKey: '{{ ConditionKey }}'
-                ConditionValue: '{{ ConditionValue }}'
-            StringNotEquals:
+          iam_role_arn: '{{ iam_role_arn }}'
+          list_of_tags:
+            - condition_key: '{{ condition_key }}'
+              condition_value: '{{ condition_value }}'
+              condition_type: '{{ condition_type }}'
+          resources:
+            - '{{ resources[0] }}'
+          selection_name: '{{ selection_name }}'
+          not_resources:
+            - '{{ not_resources[0] }}'
+          conditions:
+            string_equals:
+              - condition_key: '{{ condition_key }}'
+                condition_value: '{{ condition_value }}'
+            string_not_equals:
               - null
-            StringLike:
+            string_like:
               - null
-            StringNotLike:
+            string_not_like:
               - null
-
 ```
 </TabItem>
 </Tabs>
@@ -336,7 +335,7 @@ resources:
 ```sql
 /*+ delete */
 DELETE FROM awscc.backup.backup_selections
-WHERE Identifier = '<Id>'
+WHERE Identifier = '{{ id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/backup/backup_vaults/index.md b/website/docs/services/backup/backup_vaults/index.md
index 3d8721353..b74326478 100644
--- a/website/docs/services/backup/backup_vaults/index.md
+++ b/website/docs/services/backup/backup_vaults/index.md
@@ -199,7 +199,7 @@ notifications,
 lock_configuration,
 backup_vault_arn
 FROM awscc.backup.backup_vaults
-WHERE region = 'us-east-1' AND Identifier = '<BackupVaultName>';
+WHERE region = 'us-east-1' AND Identifier = '{{ backup_vault_name }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -235,8 +235,8 @@ INSERT INTO awscc.backup.backup_vaults (
  BackupVaultName,
  region
 )
-SELECT 
-'{{ BackupVaultName }}',
+SELECT
+'{{ backup_vault_name }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -253,13 +253,13 @@ INSERT INTO awscc.backup.backup_vaults (
  LockConfiguration,
  region
 )
-SELECT 
- '{{ AccessPolicy }}',
- '{{ BackupVaultName }}',
- '{{ BackupVaultTags }}',
- '{{ EncryptionKeyArn }}',
- '{{ Notifications }}',
- '{{ LockConfiguration }}',
+SELECT
+ '{{ access_policy }}',
+ '{{ backup_vault_name }}',
+ '{{ backup_vault_tags }}',
+ '{{ encryption_key_arn }}',
+ '{{ notifications }}',
+ '{{ lock_configuration }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -277,25 +277,24 @@ globals:
 resources:
   - name: backup_vault
     props:
-      - name: AccessPolicy
+      - name: access_policy
         value: {}
-      - name: BackupVaultName
-        value: '{{ BackupVaultName }}'
-      - name: BackupVaultTags
+      - name: backup_vault_name
+        value: '{{ backup_vault_name }}'
+      - name: backup_vault_tags
         value: {}
-      - name: EncryptionKeyArn
-        value: '{{ EncryptionKeyArn }}'
-      - name: Notifications
+      - name: encryption_key_arn
+        value: '{{ encryption_key_arn }}'
+      - name: notifications
         value:
-          SNSTopicArn: '{{ SNSTopicArn }}'
-          BackupVaultEvents:
-            - '{{ BackupVaultEvents[0] }}'
-      - name: LockConfiguration
+          sns_topic_arn: '{{ sns_topic_arn }}'
+          backup_vault_events:
+            - '{{ backup_vault_events[0] }}'
+      - name: lock_configuration
         value:
-          MinRetentionDays: '{{ MinRetentionDays }}'
-          MaxRetentionDays: '{{ MaxRetentionDays }}'
-          ChangeableForDays: '{{ ChangeableForDays }}'
-
+          min_retention_days: '{{ min_retention_days }}'
+          max_retention_days: '{{ max_retention_days }}'
+          changeable_for_days: '{{ changeable_for_days }}'
 ```
 </TabItem>
 </Tabs>
@@ -314,7 +313,7 @@ SET PatchDocument = string('{{ {
     "LockConfiguration": lock_configuration
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<BackupVaultName>';
+AND Identifier = '{{ backup_vault_name }}';
 ```
 
 
@@ -323,7 +322,7 @@ AND Identifier = '<BackupVaultName>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.backup.backup_vaults
-WHERE Identifier = '<BackupVaultName>'
+WHERE Identifier = '{{ backup_vault_name }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/backup/frameworks/index.md b/website/docs/services/backup/frameworks/index.md
index 280075f66..111a37d7c 100644
--- a/website/docs/services/backup/frameworks/index.md
+++ b/website/docs/services/backup/frameworks/index.md
@@ -246,7 +246,7 @@ framework_controls,
 framework_status,
 framework_tags
 FROM awscc.backup.frameworks
-WHERE region = 'us-east-1' AND Identifier = '<FrameworkArn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ framework_arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -282,8 +282,8 @@ INSERT INTO awscc.backup.frameworks (
  FrameworkControls,
  region
 )
-SELECT 
-'{{ FrameworkControls }}',
+SELECT
+'{{ framework_controls }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -298,11 +298,11 @@ INSERT INTO awscc.backup.frameworks (
  FrameworkTags,
  region
 )
-SELECT 
- '{{ FrameworkName }}',
- '{{ FrameworkDescription }}',
- '{{ FrameworkControls }}',
- '{{ FrameworkTags }}',
+SELECT
+ '{{ framework_name }}',
+ '{{ framework_description }}',
+ '{{ framework_controls }}',
+ '{{ framework_tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -320,28 +320,27 @@ globals:
 resources:
   - name: framework
     props:
-      - name: FrameworkName
-        value: '{{ FrameworkName }}'
-      - name: FrameworkDescription
-        value: '{{ FrameworkDescription }}'
-      - name: FrameworkControls
+      - name: framework_name
+        value: '{{ framework_name }}'
+      - name: framework_description
+        value: '{{ framework_description }}'
+      - name: framework_controls
         value:
-          - ControlName: '{{ ControlName }}'
-            ControlInputParameters:
-              - ParameterName: '{{ ParameterName }}'
-                ParameterValue: '{{ ParameterValue }}'
-            ControlScope:
-              ComplianceResourceIds:
-                - '{{ ComplianceResourceIds[0] }}'
-              ComplianceResourceTypes:
-                - '{{ ComplianceResourceTypes[0] }}'
-              Tags:
-                - Value: '{{ Value }}'
-                  Key: '{{ Key }}'
-      - name: FrameworkTags
+          - control_name: '{{ control_name }}'
+            control_input_parameters:
+              - parameter_name: '{{ parameter_name }}'
+                parameter_value: '{{ parameter_value }}'
+            control_scope:
+              compliance_resource_ids:
+                - '{{ compliance_resource_ids[0] }}'
+              compliance_resource_types:
+                - '{{ compliance_resource_types[0] }}'
+              tags:
+                - value: '{{ value }}'
+                  key: '{{ key }}'
+      - name: framework_tags
         value:
           - null
-
 ```
 </TabItem>
 </Tabs>
@@ -359,7 +358,7 @@ SET PatchDocument = string('{{ {
     "FrameworkTags": framework_tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<FrameworkArn>';
+AND Identifier = '{{ framework_arn }}';
 ```
 
 
@@ -368,7 +367,7 @@ AND Identifier = '<FrameworkArn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.backup.frameworks
-WHERE Identifier = '<FrameworkArn>'
+WHERE Identifier = '{{ framework_arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/backup/logically_air_gapped_backup_vaults/index.md b/website/docs/services/backup/logically_air_gapped_backup_vaults/index.md
index baa51423d..0fe362317 100644
--- a/website/docs/services/backup/logically_air_gapped_backup_vaults/index.md
+++ b/website/docs/services/backup/logically_air_gapped_backup_vaults/index.md
@@ -200,7 +200,7 @@ min_retention_days,
 notifications,
 access_policy
 FROM awscc.backup.logically_air_gapped_backup_vaults
-WHERE region = 'us-east-1' AND Identifier = '<BackupVaultName>';
+WHERE region = 'us-east-1' AND Identifier = '{{ backup_vault_name }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -238,10 +238,10 @@ INSERT INTO awscc.backup.logically_air_gapped_backup_vaults (
  MinRetentionDays,
  region
 )
-SELECT 
-'{{ BackupVaultName }}',
- '{{ MaxRetentionDays }}',
- '{{ MinRetentionDays }}',
+SELECT
+'{{ backup_vault_name }}',
+ '{{ max_retention_days }}',
+ '{{ min_retention_days }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -258,13 +258,13 @@ INSERT INTO awscc.backup.logically_air_gapped_backup_vaults (
  AccessPolicy,
  region
 )
-SELECT 
- '{{ BackupVaultTags }}',
- '{{ BackupVaultName }}',
- '{{ MaxRetentionDays }}',
- '{{ MinRetentionDays }}',
- '{{ Notifications }}',
- '{{ AccessPolicy }}',
+SELECT
+ '{{ backup_vault_tags }}',
+ '{{ backup_vault_name }}',
+ '{{ max_retention_days }}',
+ '{{ min_retention_days }}',
+ '{{ notifications }}',
+ '{{ access_policy }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -282,22 +282,21 @@ globals:
 resources:
   - name: logically_air_gapped_backup_vault
     props:
-      - name: BackupVaultTags
+      - name: backup_vault_tags
         value: {}
-      - name: BackupVaultName
-        value: '{{ BackupVaultName }}'
-      - name: MaxRetentionDays
-        value: '{{ MaxRetentionDays }}'
-      - name: MinRetentionDays
-        value: '{{ MinRetentionDays }}'
-      - name: Notifications
+      - name: backup_vault_name
+        value: '{{ backup_vault_name }}'
+      - name: max_retention_days
+        value: '{{ max_retention_days }}'
+      - name: min_retention_days
+        value: '{{ min_retention_days }}'
+      - name: notifications
         value:
-          SNSTopicArn: '{{ SNSTopicArn }}'
-          BackupVaultEvents:
-            - '{{ BackupVaultEvents[0] }}'
-      - name: AccessPolicy
+          sns_topic_arn: '{{ sns_topic_arn }}'
+          backup_vault_events:
+            - '{{ backup_vault_events[0] }}'
+      - name: access_policy
         value: {}
-
 ```
 </TabItem>
 </Tabs>
@@ -315,7 +314,7 @@ SET PatchDocument = string('{{ {
     "AccessPolicy": access_policy
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<BackupVaultName>';
+AND Identifier = '{{ backup_vault_name }}';
 ```
 
 
@@ -324,7 +323,7 @@ AND Identifier = '<BackupVaultName>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.backup.logically_air_gapped_backup_vaults
-WHERE Identifier = '<BackupVaultName>'
+WHERE Identifier = '{{ backup_vault_name }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/backup/report_plans/index.md b/website/docs/services/backup/report_plans/index.md
index 5b787c19f..3a1f98cf1 100644
--- a/website/docs/services/backup/report_plans/index.md
+++ b/website/docs/services/backup/report_plans/index.md
@@ -220,7 +220,7 @@ report_plan_tags,
 report_delivery_channel,
 report_setting
 FROM awscc.backup.report_plans
-WHERE region = 'us-east-1' AND Identifier = '<ReportPlanArn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ report_plan_arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -257,9 +257,9 @@ INSERT INTO awscc.backup.report_plans (
  ReportSetting,
  region
 )
-SELECT 
-'{{ ReportDeliveryChannel }}',
- '{{ ReportSetting }}',
+SELECT
+'{{ report_delivery_channel }}',
+ '{{ report_setting }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -275,12 +275,12 @@ INSERT INTO awscc.backup.report_plans (
  ReportSetting,
  region
 )
-SELECT 
- '{{ ReportPlanName }}',
- '{{ ReportPlanDescription }}',
- '{{ ReportPlanTags }}',
- '{{ ReportDeliveryChannel }}',
- '{{ ReportSetting }}',
+SELECT
+ '{{ report_plan_name }}',
+ '{{ report_plan_description }}',
+ '{{ report_plan_tags }}',
+ '{{ report_delivery_channel }}',
+ '{{ report_setting }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -298,32 +298,31 @@ globals:
 resources:
   - name: report_plan
     props:
-      - name: ReportPlanName
-        value: '{{ ReportPlanName }}'
-      - name: ReportPlanDescription
-        value: '{{ ReportPlanDescription }}'
-      - name: ReportPlanTags
+      - name: report_plan_name
+        value: '{{ report_plan_name }}'
+      - name: report_plan_description
+        value: '{{ report_plan_description }}'
+      - name: report_plan_tags
         value:
-          - Value: '{{ Value }}'
-            Key: '{{ Key }}'
-      - name: ReportDeliveryChannel
+          - value: '{{ value }}'
+            key: '{{ key }}'
+      - name: report_delivery_channel
         value:
-          Formats:
-            - '{{ Formats[0] }}'
-          S3BucketName: '{{ S3BucketName }}'
-          S3KeyPrefix: '{{ S3KeyPrefix }}'
-      - name: ReportSetting
+          formats:
+            - '{{ formats[0] }}'
+          s3_bucket_name: '{{ s3_bucket_name }}'
+          s3_key_prefix: '{{ s3_key_prefix }}'
+      - name: report_setting
         value:
-          ReportTemplate: '{{ ReportTemplate }}'
-          FrameworkArns:
-            - '{{ FrameworkArns[0] }}'
-          Accounts:
-            - '{{ Accounts[0] }}'
-          OrganizationUnits:
-            - '{{ OrganizationUnits[0] }}'
-          Regions:
-            - '{{ Regions[0] }}'
-
+          report_template: '{{ report_template }}'
+          framework_arns:
+            - '{{ framework_arns[0] }}'
+          accounts:
+            - '{{ accounts[0] }}'
+          organization_units:
+            - '{{ organization_units[0] }}'
+          regions:
+            - '{{ regions[0] }}'
 ```
 </TabItem>
 </Tabs>
@@ -342,7 +341,7 @@ SET PatchDocument = string('{{ {
     "ReportSetting": report_setting
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<ReportPlanArn>';
+AND Identifier = '{{ report_plan_arn }}';
 ```
 
 
@@ -351,7 +350,7 @@ AND Identifier = '<ReportPlanArn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.backup.report_plans
-WHERE Identifier = '<ReportPlanArn>'
+WHERE Identifier = '{{ report_plan_arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/backup/restore_testing_plans/index.md b/website/docs/services/backup/restore_testing_plans/index.md
index 889515c20..74c371544 100644
--- a/website/docs/services/backup/restore_testing_plans/index.md
+++ b/website/docs/services/backup/restore_testing_plans/index.md
@@ -209,7 +209,7 @@ restore_testing_plan_name,
 schedule_expression_timezone,
 tags
 FROM awscc.backup.restore_testing_plans
-WHERE region = 'us-east-1' AND Identifier = '<RestoreTestingPlanName>';
+WHERE region = 'us-east-1' AND Identifier = '{{ restore_testing_plan_name }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -247,10 +247,10 @@ INSERT INTO awscc.backup.restore_testing_plans (
  RestoreTestingPlanName,
  region
 )
-SELECT 
-'{{ ScheduleExpression }}',
- '{{ RecoveryPointSelection }}',
- '{{ RestoreTestingPlanName }}',
+SELECT
+'{{ schedule_expression }}',
+ '{{ recovery_point_selection }}',
+ '{{ restore_testing_plan_name }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -267,13 +267,13 @@ INSERT INTO awscc.backup.restore_testing_plans (
  Tags,
  region
 )
-SELECT 
- '{{ ScheduleExpression }}',
- '{{ StartWindowHours }}',
- '{{ RecoveryPointSelection }}',
- '{{ RestoreTestingPlanName }}',
- '{{ ScheduleExpressionTimezone }}',
- '{{ Tags }}',
+SELECT
+ '{{ schedule_expression }}',
+ '{{ start_window_hours }}',
+ '{{ recovery_point_selection }}',
+ '{{ restore_testing_plan_name }}',
+ '{{ schedule_expression_timezone }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -291,29 +291,28 @@ globals:
 resources:
   - name: restore_testing_plan
     props:
-      - name: ScheduleExpression
-        value: '{{ ScheduleExpression }}'
-      - name: StartWindowHours
-        value: '{{ StartWindowHours }}'
-      - name: RecoveryPointSelection
+      - name: schedule_expression
+        value: '{{ schedule_expression }}'
+      - name: start_window_hours
+        value: '{{ start_window_hours }}'
+      - name: recovery_point_selection
         value:
-          SelectionWindowDays: '{{ SelectionWindowDays }}'
-          RecoveryPointTypes:
-            - '{{ RecoveryPointTypes[0] }}'
-          IncludeVaults:
-            - '{{ IncludeVaults[0] }}'
-          ExcludeVaults:
-            - '{{ ExcludeVaults[0] }}'
-          Algorithm: '{{ Algorithm }}'
-      - name: RestoreTestingPlanName
-        value: '{{ RestoreTestingPlanName }}'
-      - name: ScheduleExpressionTimezone
-        value: '{{ ScheduleExpressionTimezone }}'
-      - name: Tags
+          selection_window_days: '{{ selection_window_days }}'
+          recovery_point_types:
+            - '{{ recovery_point_types[0] }}'
+          include_vaults:
+            - '{{ include_vaults[0] }}'
+          exclude_vaults:
+            - '{{ exclude_vaults[0] }}'
+          algorithm: '{{ algorithm }}'
+      - name: restore_testing_plan_name
+        value: '{{ restore_testing_plan_name }}'
+      - name: schedule_expression_timezone
+        value: '{{ schedule_expression_timezone }}'
+      - name: tags
         value:
-          - Value: '{{ Value }}'
-            Key: '{{ Key }}'
-
+          - value: '{{ value }}'
+            key: '{{ key }}'
 ```
 </TabItem>
 </Tabs>
@@ -333,7 +332,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<RestoreTestingPlanName>';
+AND Identifier = '{{ restore_testing_plan_name }}';
 ```
 
 
@@ -342,7 +341,7 @@ AND Identifier = '<RestoreTestingPlanName>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.backup.restore_testing_plans
-WHERE Identifier = '<RestoreTestingPlanName>'
+WHERE Identifier = '{{ restore_testing_plan_name }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/backup/restore_testing_selections/index.md b/website/docs/services/backup/restore_testing_selections/index.md
index 4730748d9..e5f1e517e 100644
--- a/website/docs/services/backup/restore_testing_selections/index.md
+++ b/website/docs/services/backup/restore_testing_selections/index.md
@@ -205,7 +205,7 @@ restore_testing_plan_name,
 restore_testing_selection_name,
 validation_window_hours
 FROM awscc.backup.restore_testing_selections
-WHERE region = 'us-east-1' AND Identifier = '<RestoreTestingPlanName>|<RestoreTestingSelectionName>';
+WHERE region = 'us-east-1' AND Identifier = '{{ restore_testing_plan_name }}|{{ restore_testing_selection_name }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -245,11 +245,11 @@ INSERT INTO awscc.backup.restore_testing_selections (
  RestoreTestingSelectionName,
  region
 )
-SELECT 
-'{{ IamRoleArn }}',
- '{{ ProtectedResourceType }}',
- '{{ RestoreTestingPlanName }}',
- '{{ RestoreTestingSelectionName }}',
+SELECT
+'{{ iam_role_arn }}',
+ '{{ protected_resource_type }}',
+ '{{ restore_testing_plan_name }}',
+ '{{ restore_testing_selection_name }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -268,15 +268,15 @@ INSERT INTO awscc.backup.restore_testing_selections (
  ValidationWindowHours,
  region
 )
-SELECT 
- '{{ IamRoleArn }}',
- '{{ ProtectedResourceArns }}',
- '{{ ProtectedResourceConditions }}',
- '{{ ProtectedResourceType }}',
- '{{ RestoreMetadataOverrides }}',
- '{{ RestoreTestingPlanName }}',
- '{{ RestoreTestingSelectionName }}',
- '{{ ValidationWindowHours }}',
+SELECT
+ '{{ iam_role_arn }}',
+ '{{ protected_resource_arns }}',
+ '{{ protected_resource_conditions }}',
+ '{{ protected_resource_type }}',
+ '{{ restore_metadata_overrides }}',
+ '{{ restore_testing_plan_name }}',
+ '{{ restore_testing_selection_name }}',
+ '{{ validation_window_hours }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -294,29 +294,28 @@ globals:
 resources:
   - name: restore_testing_selection
     props:
-      - name: IamRoleArn
-        value: '{{ IamRoleArn }}'
-      - name: ProtectedResourceArns
+      - name: iam_role_arn
+        value: '{{ iam_role_arn }}'
+      - name: protected_resource_arns
         value:
-          - '{{ ProtectedResourceArns[0] }}'
-      - name: ProtectedResourceConditions
+          - '{{ protected_resource_arns[0] }}'
+      - name: protected_resource_conditions
         value:
-          StringEquals:
-            - Key: '{{ Key }}'
-              Value: '{{ Value }}'
-          StringNotEquals:
+          string_equals:
+            - key: '{{ key }}'
+              value: '{{ value }}'
+          string_not_equals:
             - null
-      - name: ProtectedResourceType
-        value: '{{ ProtectedResourceType }}'
-      - name: RestoreMetadataOverrides
+      - name: protected_resource_type
+        value: '{{ protected_resource_type }}'
+      - name: restore_metadata_overrides
         value: {}
-      - name: RestoreTestingPlanName
-        value: '{{ RestoreTestingPlanName }}'
-      - name: RestoreTestingSelectionName
-        value: '{{ RestoreTestingSelectionName }}'
-      - name: ValidationWindowHours
-        value: '{{ ValidationWindowHours }}'
-
+      - name: restore_testing_plan_name
+        value: '{{ restore_testing_plan_name }}'
+      - name: restore_testing_selection_name
+        value: '{{ restore_testing_selection_name }}'
+      - name: validation_window_hours
+        value: '{{ validation_window_hours }}'
 ```
 </TabItem>
 </Tabs>
@@ -336,7 +335,7 @@ SET PatchDocument = string('{{ {
     "ValidationWindowHours": validation_window_hours
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<RestoreTestingPlanName>|<RestoreTestingSelectionName>';
+AND Identifier = '{{ restore_testing_plan_name }}|{{ restore_testing_selection_name }}';
 ```
 
 
@@ -345,7 +344,7 @@ AND Identifier = '<RestoreTestingPlanName>|<RestoreTestingSelectionName>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.backup.restore_testing_selections
-WHERE Identifier = '<RestoreTestingPlanName|RestoreTestingSelectionName>'
+WHERE Identifier = '{{ restore_testing_plan_name }}|{{ restore_testing_selection_name }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/backupgateway/hypervisors/index.md b/website/docs/services/backupgateway/hypervisors/index.md
index 0ea0057ae..4e9f91d8c 100644
--- a/website/docs/services/backupgateway/hypervisors/index.md
+++ b/website/docs/services/backupgateway/hypervisors/index.md
@@ -188,7 +188,7 @@ password,
 tags,
 username
 FROM awscc.backupgateway.hypervisors
-WHERE region = 'us-east-1' AND Identifier = '<HypervisorArn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ hypervisor_arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -230,14 +230,14 @@ INSERT INTO awscc.backupgateway.hypervisors (
  Username,
  region
 )
-SELECT 
-'{{ Host }}',
- '{{ KmsKeyArn }}',
- '{{ LogGroupArn }}',
- '{{ Name }}',
- '{{ Password }}',
- '{{ Tags }}',
- '{{ Username }}',
+SELECT
+'{{ host }}',
+ '{{ kms_key_arn }}',
+ '{{ log_group_arn }}',
+ '{{ name }}',
+ '{{ password }}',
+ '{{ tags }}',
+ '{{ username }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -255,14 +255,14 @@ INSERT INTO awscc.backupgateway.hypervisors (
  Username,
  region
 )
-SELECT 
- '{{ Host }}',
- '{{ KmsKeyArn }}',
- '{{ LogGroupArn }}',
- '{{ Name }}',
- '{{ Password }}',
- '{{ Tags }}',
- '{{ Username }}',
+SELECT
+ '{{ host }}',
+ '{{ kms_key_arn }}',
+ '{{ log_group_arn }}',
+ '{{ name }}',
+ '{{ password }}',
+ '{{ tags }}',
+ '{{ username }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -280,23 +280,22 @@ globals:
 resources:
   - name: hypervisor
     props:
-      - name: Host
-        value: '{{ Host }}'
-      - name: KmsKeyArn
-        value: '{{ KmsKeyArn }}'
-      - name: LogGroupArn
-        value: '{{ LogGroupArn }}'
-      - name: Name
-        value: '{{ Name }}'
-      - name: Password
-        value: '{{ Password }}'
-      - name: Tags
+      - name: host
+        value: '{{ host }}'
+      - name: kms_key_arn
+        value: '{{ kms_key_arn }}'
+      - name: log_group_arn
+        value: '{{ log_group_arn }}'
+      - name: name
+        value: '{{ name }}'
+      - name: password
+        value: '{{ password }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-      - name: Username
-        value: '{{ Username }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
+      - name: username
+        value: '{{ username }}'
 ```
 </TabItem>
 </Tabs>
@@ -316,7 +315,7 @@ SET PatchDocument = string('{{ {
     "Username": username
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<HypervisorArn>';
+AND Identifier = '{{ hypervisor_arn }}';
 ```
 
 
@@ -325,7 +324,7 @@ AND Identifier = '<HypervisorArn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.backupgateway.hypervisors
-WHERE Identifier = '<HypervisorArn>'
+WHERE Identifier = '{{ hypervisor_arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/batch/compute_environments/index.md b/website/docs/services/batch/compute_environments/index.md
index 86fc61007..6f3e71ef0 100644
--- a/website/docs/services/batch/compute_environments/index.md
+++ b/website/docs/services/batch/compute_environments/index.md
@@ -387,7 +387,7 @@ unmanagedv_cpus,
 eks_configuration,
 context
 FROM awscc.batch.compute_environments
-WHERE region = 'us-east-1' AND Identifier = '<ComputeEnvironmentArn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ compute_environment_arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -423,8 +423,8 @@ INSERT INTO awscc.batch.compute_environments (
  Type,
  region
 )
-SELECT 
-'{{ Type }}',
+SELECT
+'{{ type }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -446,18 +446,18 @@ INSERT INTO awscc.batch.compute_environments (
  Context,
  region
 )
-SELECT 
- '{{ ComputeEnvironmentName }}',
- '{{ ComputeResources }}',
- '{{ ReplaceComputeEnvironment }}',
- '{{ ServiceRole }}',
- '{{ State }}',
- '{{ Tags }}',
- '{{ Type }}',
- '{{ UpdatePolicy }}',
- '{{ UnmanagedvCpus }}',
- '{{ EksConfiguration }}',
- '{{ Context }}',
+SELECT
+ '{{ compute_environment_name }}',
+ '{{ compute_resources }}',
+ '{{ replace_compute_environment }}',
+ '{{ service_role }}',
+ '{{ state }}',
+ '{{ tags }}',
+ '{{ type }}',
+ '{{ update_policy }}',
+ '{{ unmanagedv_cpus }}',
+ '{{ eks_configuration }}',
+ '{{ context }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -475,68 +475,67 @@ globals:
 resources:
   - name: compute_environment
     props:
-      - name: ComputeEnvironmentName
-        value: '{{ ComputeEnvironmentName }}'
-      - name: ComputeResources
+      - name: compute_environment_name
+        value: '{{ compute_environment_name }}'
+      - name: compute_resources
         value:
-          AllocationStrategy: '{{ AllocationStrategy }}'
-          BidPercentage: '{{ BidPercentage }}'
-          DesiredvCpus: '{{ DesiredvCpus }}'
-          Ec2Configuration:
-            - ImageIdOverride: '{{ ImageIdOverride }}'
-              ImageType: '{{ ImageType }}'
-              ImageKubernetesVersion: '{{ ImageKubernetesVersion }}'
-          Ec2KeyPair: '{{ Ec2KeyPair }}'
-          ImageId: '{{ ImageId }}'
-          InstanceRole: '{{ InstanceRole }}'
-          InstanceTypes:
-            - '{{ InstanceTypes[0] }}'
-          LaunchTemplate:
-            LaunchTemplateId: '{{ LaunchTemplateId }}'
-            LaunchTemplateName: '{{ LaunchTemplateName }}'
-            Version: '{{ Version }}'
-            UserdataType: '{{ UserdataType }}'
-            Overrides:
-              - LaunchTemplateId: '{{ LaunchTemplateId }}'
-                LaunchTemplateName: '{{ LaunchTemplateName }}'
-                Version: '{{ Version }}'
-                UserdataType: '{{ UserdataType }}'
-                TargetInstanceTypes:
-                  - '{{ TargetInstanceTypes[0] }}'
-          MaxvCpus: '{{ MaxvCpus }}'
-          MinvCpus: '{{ MinvCpus }}'
-          PlacementGroup: '{{ PlacementGroup }}'
-          SecurityGroupIds:
-            - '{{ SecurityGroupIds[0] }}'
-          SpotIamFleetRole: '{{ SpotIamFleetRole }}'
-          Subnets:
-            - '{{ Subnets[0] }}'
-          Tags: {}
-          Type: '{{ Type }}'
-          UpdateToLatestImageVersion: '{{ UpdateToLatestImageVersion }}'
-      - name: ReplaceComputeEnvironment
-        value: '{{ ReplaceComputeEnvironment }}'
-      - name: ServiceRole
-        value: '{{ ServiceRole }}'
-      - name: State
-        value: '{{ State }}'
-      - name: Tags
+          allocation_strategy: '{{ allocation_strategy }}'
+          bid_percentage: '{{ bid_percentage }}'
+          desiredv_cpus: '{{ desiredv_cpus }}'
+          ec2_configuration:
+            - image_id_override: '{{ image_id_override }}'
+              image_type: '{{ image_type }}'
+              image_kubernetes_version: '{{ image_kubernetes_version }}'
+          ec2_key_pair: '{{ ec2_key_pair }}'
+          image_id: '{{ image_id }}'
+          instance_role: '{{ instance_role }}'
+          instance_types:
+            - '{{ instance_types[0] }}'
+          launch_template:
+            launch_template_id: '{{ launch_template_id }}'
+            launch_template_name: '{{ launch_template_name }}'
+            version: '{{ version }}'
+            userdata_type: '{{ userdata_type }}'
+            overrides:
+              - launch_template_id: '{{ launch_template_id }}'
+                launch_template_name: '{{ launch_template_name }}'
+                version: '{{ version }}'
+                userdata_type: '{{ userdata_type }}'
+                target_instance_types:
+                  - '{{ target_instance_types[0] }}'
+          maxv_cpus: '{{ maxv_cpus }}'
+          minv_cpus: '{{ minv_cpus }}'
+          placement_group: '{{ placement_group }}'
+          security_group_ids:
+            - '{{ security_group_ids[0] }}'
+          spot_iam_fleet_role: '{{ spot_iam_fleet_role }}'
+          subnets:
+            - '{{ subnets[0] }}'
+          tags: {}
+          type: '{{ type }}'
+          update_to_latest_image_version: '{{ update_to_latest_image_version }}'
+      - name: replace_compute_environment
+        value: '{{ replace_compute_environment }}'
+      - name: service_role
+        value: '{{ service_role }}'
+      - name: state
+        value: '{{ state }}'
+      - name: tags
         value: {}
-      - name: Type
-        value: '{{ Type }}'
-      - name: UpdatePolicy
+      - name: type
+        value: '{{ type }}'
+      - name: update_policy
         value:
-          TerminateJobsOnUpdate: '{{ TerminateJobsOnUpdate }}'
-          JobExecutionTimeoutMinutes: '{{ JobExecutionTimeoutMinutes }}'
-      - name: UnmanagedvCpus
-        value: '{{ UnmanagedvCpus }}'
-      - name: EksConfiguration
+          terminate_jobs_on_update: '{{ terminate_jobs_on_update }}'
+          job_execution_timeout_minutes: '{{ job_execution_timeout_minutes }}'
+      - name: unmanagedv_cpus
+        value: '{{ unmanagedv_cpus }}'
+      - name: eks_configuration
         value:
-          EksClusterArn: '{{ EksClusterArn }}'
-          KubernetesNamespace: '{{ KubernetesNamespace }}'
-      - name: Context
-        value: '{{ Context }}'
-
+          eks_cluster_arn: '{{ eks_cluster_arn }}'
+          kubernetes_namespace: '{{ kubernetes_namespace }}'
+      - name: context
+        value: '{{ context }}'
 ```
 </TabItem>
 </Tabs>
@@ -557,7 +556,7 @@ SET PatchDocument = string('{{ {
     "Context": context
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<ComputeEnvironmentArn>';
+AND Identifier = '{{ compute_environment_arn }}';
 ```
 
 
@@ -566,7 +565,7 @@ AND Identifier = '<ComputeEnvironmentArn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.batch.compute_environments
-WHERE Identifier = '<ComputeEnvironmentArn>'
+WHERE Identifier = '{{ compute_environment_arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/batch/consumable_resources/index.md b/website/docs/services/batch/consumable_resources/index.md
index ecf87ab5f..f837a365e 100644
--- a/website/docs/services/batch/consumable_resources/index.md
+++ b/website/docs/services/batch/consumable_resources/index.md
@@ -176,7 +176,7 @@ resource_type,
 created_at,
 tags
 FROM awscc.batch.consumable_resources
-WHERE region = 'us-east-1' AND Identifier = '<ConsumableResourceArn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ consumable_resource_arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -213,9 +213,9 @@ INSERT INTO awscc.batch.consumable_resources (
  ResourceType,
  region
 )
-SELECT 
-'{{ TotalQuantity }}',
- '{{ ResourceType }}',
+SELECT
+'{{ total_quantity }}',
+ '{{ resource_type }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -230,11 +230,11 @@ INSERT INTO awscc.batch.consumable_resources (
  Tags,
  region
 )
-SELECT 
- '{{ ConsumableResourceName }}',
- '{{ TotalQuantity }}',
- '{{ ResourceType }}',
- '{{ Tags }}',
+SELECT
+ '{{ consumable_resource_name }}',
+ '{{ total_quantity }}',
+ '{{ resource_type }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -252,15 +252,14 @@ globals:
 resources:
   - name: consumable_resource
     props:
-      - name: ConsumableResourceName
-        value: '{{ ConsumableResourceName }}'
-      - name: TotalQuantity
-        value: '{{ TotalQuantity }}'
-      - name: ResourceType
-        value: '{{ ResourceType }}'
-      - name: Tags
+      - name: consumable_resource_name
+        value: '{{ consumable_resource_name }}'
+      - name: total_quantity
+        value: '{{ total_quantity }}'
+      - name: resource_type
+        value: '{{ resource_type }}'
+      - name: tags
         value: {}
-
 ```
 </TabItem>
 </Tabs>
@@ -276,7 +275,7 @@ SET PatchDocument = string('{{ {
     "TotalQuantity": total_quantity
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<ConsumableResourceArn>';
+AND Identifier = '{{ consumable_resource_arn }}';
 ```
 
 
@@ -285,7 +284,7 @@ AND Identifier = '<ConsumableResourceArn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.batch.consumable_resources
-WHERE Identifier = '<ConsumableResourceArn>'
+WHERE Identifier = '{{ consumable_resource_arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/batch/job_definitions/index.md b/website/docs/services/batch/job_definitions/index.md
index 8d6d9a496..b540338a2 100644
--- a/website/docs/services/batch/job_definitions/index.md
+++ b/website/docs/services/batch/job_definitions/index.md
@@ -1179,7 +1179,7 @@ tags,
 eks_properties,
 consumable_resource_properties
 FROM awscc.batch.job_definitions
-WHERE region = 'us-east-1' AND Identifier = '<JobDefinitionName>';
+WHERE region = 'us-east-1' AND Identifier = '{{ job_definition_name }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -1215,8 +1215,8 @@ INSERT INTO awscc.batch.job_definitions (
  Type,
  region
 )
-SELECT 
-'{{ Type }}',
+SELECT
+'{{ type }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -1241,21 +1241,21 @@ INSERT INTO awscc.batch.job_definitions (
  ConsumableResourceProperties,
  region
 )
-SELECT 
- '{{ ContainerProperties }}',
- '{{ EcsProperties }}',
- '{{ NodeProperties }}',
- '{{ JobDefinitionName }}',
- '{{ SchedulingPriority }}',
- '{{ Parameters }}',
- '{{ PlatformCapabilities }}',
- '{{ PropagateTags }}',
- '{{ RetryStrategy }}',
- '{{ Timeout }}',
- '{{ Type }}',
- '{{ Tags }}',
- '{{ EksProperties }}',
- '{{ ConsumableResourceProperties }}',
+SELECT
+ '{{ container_properties }}',
+ '{{ ecs_properties }}',
+ '{{ node_properties }}',
+ '{{ job_definition_name }}',
+ '{{ scheduling_priority }}',
+ '{{ parameters }}',
+ '{{ platform_capabilities }}',
+ '{{ propagate_tags }}',
+ '{{ retry_strategy }}',
+ '{{ timeout }}',
+ '{{ type }}',
+ '{{ tags }}',
+ '{{ eks_properties }}',
+ '{{ consumable_resource_properties }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -1273,258 +1273,257 @@ globals:
 resources:
   - name: job_definition
     props:
-      - name: ContainerProperties
+      - name: container_properties
         value:
-          Command:
-            - '{{ Command[0] }}'
-          Environment:
-            - Name: '{{ Name }}'
-              Value: '{{ Value }}'
-          Image: '{{ Image }}'
-          JobRoleArn: '{{ JobRoleArn }}'
-          Memory: '{{ Memory }}'
-          MountPoints:
-            - ContainerPath: '{{ ContainerPath }}'
-              ReadOnly: '{{ ReadOnly }}'
-              SourceVolume: '{{ SourceVolume }}'
-          Privileged: '{{ Privileged }}'
-          ReadonlyRootFilesystem: '{{ ReadonlyRootFilesystem }}'
-          Ulimits:
-            - HardLimit: '{{ HardLimit }}'
-              Name: '{{ Name }}'
-              SoftLimit: '{{ SoftLimit }}'
-          User: '{{ User }}'
-          Vcpus: '{{ Vcpus }}'
-          Volumes:
-            - Host:
-                SourcePath: '{{ SourcePath }}'
-              EfsVolumeConfiguration:
-                FileSystemId: '{{ FileSystemId }}'
-                RootDirectory: '{{ RootDirectory }}'
-                TransitEncryption: '{{ TransitEncryption }}'
-                TransitEncryptionPort: '{{ TransitEncryptionPort }}'
-                AuthorizationConfig:
-                  AccessPointId: '{{ AccessPointId }}'
-                  Iam: '{{ Iam }}'
-              Name: '{{ Name }}'
-          ResourceRequirements:
-            - Type: '{{ Type }}'
-              Value: '{{ Value }}'
-          LinuxParameters:
-            Devices:
-              - HostPath: '{{ HostPath }}'
-                ContainerPath: '{{ ContainerPath }}'
-                Permissions:
-                  - '{{ Permissions[0] }}'
-            InitProcessEnabled: '{{ InitProcessEnabled }}'
-            MaxSwap: '{{ MaxSwap }}'
-            Swappiness: '{{ Swappiness }}'
-            SharedMemorySize: '{{ SharedMemorySize }}'
-            Tmpfs:
-              - ContainerPath: '{{ ContainerPath }}'
-                Size: '{{ Size }}'
-                MountOptions:
-                  - '{{ MountOptions[0] }}'
-          LogConfiguration:
-            LogDriver: '{{ LogDriver }}'
-            Options: {}
-            SecretOptions:
-              - Name: '{{ Name }}'
-                ValueFrom: '{{ ValueFrom }}'
-          ExecutionRoleArn: '{{ ExecutionRoleArn }}'
-          Secrets:
+          command:
+            - '{{ command[0] }}'
+          environment:
+            - name: '{{ name }}'
+              value: '{{ value }}'
+          image: '{{ image }}'
+          job_role_arn: '{{ job_role_arn }}'
+          memory: '{{ memory }}'
+          mount_points:
+            - container_path: '{{ container_path }}'
+              read_only: '{{ read_only }}'
+              source_volume: '{{ source_volume }}'
+          privileged: '{{ privileged }}'
+          readonly_root_filesystem: '{{ readonly_root_filesystem }}'
+          ulimits:
+            - hard_limit: '{{ hard_limit }}'
+              name: '{{ name }}'
+              soft_limit: '{{ soft_limit }}'
+          user: '{{ user }}'
+          vcpus: '{{ vcpus }}'
+          volumes:
+            - host:
+                source_path: '{{ source_path }}'
+              efs_volume_configuration:
+                file_system_id: '{{ file_system_id }}'
+                root_directory: '{{ root_directory }}'
+                transit_encryption: '{{ transit_encryption }}'
+                transit_encryption_port: '{{ transit_encryption_port }}'
+                authorization_config:
+                  access_point_id: '{{ access_point_id }}'
+                  iam: '{{ iam }}'
+              name: '{{ name }}'
+          resource_requirements:
+            - type: '{{ type }}'
+              value: '{{ value }}'
+          linux_parameters:
+            devices:
+              - host_path: '{{ host_path }}'
+                container_path: '{{ container_path }}'
+                permissions:
+                  - '{{ permissions[0] }}'
+            init_process_enabled: '{{ init_process_enabled }}'
+            max_swap: '{{ max_swap }}'
+            swappiness: '{{ swappiness }}'
+            shared_memory_size: '{{ shared_memory_size }}'
+            tmpfs:
+              - container_path: '{{ container_path }}'
+                size: '{{ size }}'
+                mount_options:
+                  - '{{ mount_options[0] }}'
+          log_configuration:
+            log_driver: '{{ log_driver }}'
+            options: {}
+            secret_options:
+              - name: '{{ name }}'
+                value_from: '{{ value_from }}'
+          execution_role_arn: '{{ execution_role_arn }}'
+          secrets:
             - null
-          NetworkConfiguration:
-            AssignPublicIp: '{{ AssignPublicIp }}'
-          FargatePlatformConfiguration:
-            PlatformVersion: '{{ PlatformVersion }}'
-          EphemeralStorage:
-            SizeInGiB: '{{ SizeInGiB }}'
-          RuntimePlatform:
-            OperatingSystemFamily: '{{ OperatingSystemFamily }}'
-            CpuArchitecture: '{{ CpuArchitecture }}'
-          RepositoryCredentials:
-            CredentialsParameter: '{{ CredentialsParameter }}'
-          EnableExecuteCommand: '{{ EnableExecuteCommand }}'
-      - name: EcsProperties
+          network_configuration:
+            assign_public_ip: '{{ assign_public_ip }}'
+          fargate_platform_configuration:
+            platform_version: '{{ platform_version }}'
+          ephemeral_storage:
+            size_in_gi_b: '{{ size_in_gi_b }}'
+          runtime_platform:
+            operating_system_family: '{{ operating_system_family }}'
+            cpu_architecture: '{{ cpu_architecture }}'
+          repository_credentials:
+            credentials_parameter: '{{ credentials_parameter }}'
+          enable_execute_command: '{{ enable_execute_command }}'
+      - name: ecs_properties
         value:
-          TaskProperties:
-            - Containers:
-                - Command:
-                    - '{{ Command[0] }}'
-                  Environment:
+          task_properties:
+            - containers:
+                - command:
+                    - '{{ command[0] }}'
+                  environment:
                     - null
-                  DependsOn:
-                    - ContainerName: '{{ ContainerName }}'
-                      Condition: '{{ Condition }}'
-                  Name: '{{ Name }}'
-                  Image: '{{ Image }}'
-                  LinuxParameters: null
-                  LogConfiguration: null
-                  MountPoints:
+                  depends_on:
+                    - container_name: '{{ container_name }}'
+                      condition: '{{ condition }}'
+                  name: '{{ name }}'
+                  image: '{{ image }}'
+                  linux_parameters: null
+                  log_configuration: null
+                  mount_points:
                     - null
-                  Essential: '{{ Essential }}'
-                  Privileged: '{{ Privileged }}'
-                  ReadonlyRootFilesystem: '{{ ReadonlyRootFilesystem }}'
-                  Ulimits:
+                  essential: '{{ essential }}'
+                  privileged: '{{ privileged }}'
+                  readonly_root_filesystem: '{{ readonly_root_filesystem }}'
+                  ulimits:
                     - null
-                  User: '{{ User }}'
-                  Secrets:
+                  user: '{{ user }}'
+                  secrets:
                     - null
-                  RepositoryCredentials: null
-                  ResourceRequirements:
+                  repository_credentials: null
+                  resource_requirements:
                     - null
-                  FirelensConfiguration:
-                    Type: '{{ Type }}'
-                    Options: {}
-              EphemeralStorage: null
-              ExecutionRoleArn: '{{ ExecutionRoleArn }}'
-              RuntimePlatform: null
-              NetworkConfiguration: null
-              Volumes:
+                  firelens_configuration:
+                    type: '{{ type }}'
+                    options: {}
+              ephemeral_storage: null
+              execution_role_arn: '{{ execution_role_arn }}'
+              runtime_platform: null
+              network_configuration: null
+              volumes:
                 - null
-              PidMode: '{{ PidMode }}'
-              IpcMode: '{{ IpcMode }}'
-              PlatformVersion: '{{ PlatformVersion }}'
-              TaskRoleArn: '{{ TaskRoleArn }}'
-              EnableExecuteCommand: '{{ EnableExecuteCommand }}'
-      - name: NodeProperties
+              pid_mode: '{{ pid_mode }}'
+              ipc_mode: '{{ ipc_mode }}'
+              platform_version: '{{ platform_version }}'
+              task_role_arn: '{{ task_role_arn }}'
+              enable_execute_command: '{{ enable_execute_command }}'
+      - name: node_properties
         value:
-          NumNodes: '{{ NumNodes }}'
-          MainNode: '{{ MainNode }}'
-          NodeRangeProperties:
-            - TargetNodes: '{{ TargetNodes }}'
-              Container:
-                Command:
-                  - '{{ Command[0] }}'
-                Environment:
+          num_nodes: '{{ num_nodes }}'
+          main_node: '{{ main_node }}'
+          node_range_properties:
+            - target_nodes: '{{ target_nodes }}'
+              container:
+                command:
+                  - '{{ command[0] }}'
+                environment:
                   - null
-                Image: '{{ Image }}'
-                JobRoleArn: '{{ JobRoleArn }}'
-                Memory: '{{ Memory }}'
-                MountPoints:
+                image: '{{ image }}'
+                job_role_arn: '{{ job_role_arn }}'
+                memory: '{{ memory }}'
+                mount_points:
                   - null
-                Privileged: '{{ Privileged }}'
-                ReadonlyRootFilesystem: '{{ ReadonlyRootFilesystem }}'
-                Ulimits:
+                privileged: '{{ privileged }}'
+                readonly_root_filesystem: '{{ readonly_root_filesystem }}'
+                ulimits:
                   - null
-                User: '{{ User }}'
-                Vcpus: '{{ Vcpus }}'
-                Volumes:
+                user: '{{ user }}'
+                vcpus: '{{ vcpus }}'
+                volumes:
                   - null
-                InstanceType: '{{ InstanceType }}'
-                ResourceRequirements:
+                instance_type: '{{ instance_type }}'
+                resource_requirements:
                   - null
-                LinuxParameters: null
-                LogConfiguration: null
-                ExecutionRoleArn: '{{ ExecutionRoleArn }}'
-                Secrets:
+                linux_parameters: null
+                log_configuration: null
+                execution_role_arn: '{{ execution_role_arn }}'
+                secrets:
                   - null
-                EphemeralStorage: null
-                RuntimePlatform: null
-                RepositoryCredentials: null
-                EnableExecuteCommand: '{{ EnableExecuteCommand }}'
-              EcsProperties:
-                TaskProperties:
-                  - Containers:
+                ephemeral_storage: null
+                runtime_platform: null
+                repository_credentials: null
+                enable_execute_command: '{{ enable_execute_command }}'
+              ecs_properties:
+                task_properties:
+                  - containers:
                       - null
-                    ExecutionRoleArn: '{{ ExecutionRoleArn }}'
-                    Volumes:
+                    execution_role_arn: '{{ execution_role_arn }}'
+                    volumes:
                       - null
-                    PidMode: '{{ PidMode }}'
-                    IpcMode: '{{ IpcMode }}'
-                    TaskRoleArn: '{{ TaskRoleArn }}'
-                    EnableExecuteCommand: '{{ EnableExecuteCommand }}'
-              EksProperties:
-                PodProperties:
-                  ServiceAccountName: '{{ ServiceAccountName }}'
-                  HostNetwork: '{{ HostNetwork }}'
-                  DnsPolicy: '{{ DnsPolicy }}'
-                  InitContainers:
-                    - Name: '{{ Name }}'
-                      Image: '{{ Image }}'
-                      ImagePullPolicy: '{{ ImagePullPolicy }}'
-                      Command:
-                        - '{{ Command[0] }}'
-                      Args:
-                        - '{{ Args[0] }}'
-                      Env:
-                        - Name: '{{ Name }}'
-                          Value: '{{ Value }}'
-                      Resources:
-                        Limits: {}
-                        Requests: {}
-                      VolumeMounts:
-                        - Name: '{{ Name }}'
-                          MountPath: '{{ MountPath }}'
-                          SubPath: '{{ SubPath }}'
-                          ReadOnly: '{{ ReadOnly }}'
-                      SecurityContext:
-                        RunAsUser: '{{ RunAsUser }}'
-                        RunAsGroup: '{{ RunAsGroup }}'
-                        Privileged: '{{ Privileged }}'
-                        AllowPrivilegeEscalation: '{{ AllowPrivilegeEscalation }}'
-                        ReadOnlyRootFilesystem: '{{ ReadOnlyRootFilesystem }}'
-                        RunAsNonRoot: '{{ RunAsNonRoot }}'
-                  Containers:
+                    pid_mode: '{{ pid_mode }}'
+                    ipc_mode: '{{ ipc_mode }}'
+                    task_role_arn: '{{ task_role_arn }}'
+                    enable_execute_command: '{{ enable_execute_command }}'
+              eks_properties:
+                pod_properties:
+                  service_account_name: '{{ service_account_name }}'
+                  host_network: '{{ host_network }}'
+                  dns_policy: '{{ dns_policy }}'
+                  init_containers:
+                    - name: '{{ name }}'
+                      image: '{{ image }}'
+                      image_pull_policy: '{{ image_pull_policy }}'
+                      command:
+                        - '{{ command[0] }}'
+                      args:
+                        - '{{ args[0] }}'
+                      env:
+                        - name: '{{ name }}'
+                          value: '{{ value }}'
+                      resources:
+                        limits: {}
+                        requests: {}
+                      volume_mounts:
+                        - name: '{{ name }}'
+                          mount_path: '{{ mount_path }}'
+                          sub_path: '{{ sub_path }}'
+                          read_only: '{{ read_only }}'
+                      security_context:
+                        run_as_user: '{{ run_as_user }}'
+                        run_as_group: '{{ run_as_group }}'
+                        privileged: '{{ privileged }}'
+                        allow_privilege_escalation: '{{ allow_privilege_escalation }}'
+                        read_only_root_filesystem: '{{ read_only_root_filesystem }}'
+                        run_as_non_root: '{{ run_as_non_root }}'
+                  containers:
                     - null
-                  Volumes:
-                    - Name: '{{ Name }}'
-                      HostPath:
-                        Path: '{{ Path }}'
-                      EmptyDir:
-                        Medium: '{{ Medium }}'
-                        SizeLimit: '{{ SizeLimit }}'
-                      Secret:
-                        SecretName: '{{ SecretName }}'
-                        Optional: '{{ Optional }}'
-                      PersistentVolumeClaim:
-                        ClaimName: '{{ ClaimName }}'
-                        ReadOnly: '{{ ReadOnly }}'
-                  ImagePullSecrets:
-                    - Name: '{{ Name }}'
-                  Metadata:
-                    Labels: {}
-                    Annotations: {}
-                    Namespace: '{{ Namespace }}'
-                  ShareProcessNamespace: '{{ ShareProcessNamespace }}'
-              ConsumableResourceProperties:
-                ConsumableResourceList:
-                  - ConsumableResource: '{{ ConsumableResource }}'
-                    Quantity: '{{ Quantity }}'
-              InstanceTypes:
-                - '{{ InstanceTypes[0] }}'
-      - name: JobDefinitionName
-        value: '{{ JobDefinitionName }}'
-      - name: SchedulingPriority
-        value: '{{ SchedulingPriority }}'
-      - name: Parameters
+                  volumes:
+                    - name: '{{ name }}'
+                      host_path:
+                        path: '{{ path }}'
+                      empty_dir:
+                        medium: '{{ medium }}'
+                        size_limit: '{{ size_limit }}'
+                      secret:
+                        secret_name: '{{ secret_name }}'
+                        optional: '{{ optional }}'
+                      persistent_volume_claim:
+                        claim_name: '{{ claim_name }}'
+                        read_only: '{{ read_only }}'
+                  image_pull_secrets:
+                    - name: '{{ name }}'
+                  metadata:
+                    labels: {}
+                    annotations: {}
+                    namespace: '{{ namespace }}'
+                  share_process_namespace: '{{ share_process_namespace }}'
+              consumable_resource_properties:
+                consumable_resource_list:
+                  - consumable_resource: '{{ consumable_resource }}'
+                    quantity: '{{ quantity }}'
+              instance_types:
+                - '{{ instance_types[0] }}'
+      - name: job_definition_name
+        value: '{{ job_definition_name }}'
+      - name: scheduling_priority
+        value: '{{ scheduling_priority }}'
+      - name: parameters
         value: {}
-      - name: PlatformCapabilities
+      - name: platform_capabilities
         value:
-          - '{{ PlatformCapabilities[0] }}'
-      - name: PropagateTags
-        value: '{{ PropagateTags }}'
-      - name: RetryStrategy
+          - '{{ platform_capabilities[0] }}'
+      - name: propagate_tags
+        value: '{{ propagate_tags }}'
+      - name: retry_strategy
         value:
-          Attempts: '{{ Attempts }}'
-          EvaluateOnExit:
-            - OnExitCode: '{{ OnExitCode }}'
-              OnStatusReason: '{{ OnStatusReason }}'
-              OnReason: '{{ OnReason }}'
-              Action: '{{ Action }}'
-      - name: Timeout
+          attempts: '{{ attempts }}'
+          evaluate_on_exit:
+            - on_exit_code: '{{ on_exit_code }}'
+              on_status_reason: '{{ on_status_reason }}'
+              on_reason: '{{ on_reason }}'
+              action: '{{ action }}'
+      - name: timeout
         value:
-          AttemptDurationSeconds: '{{ AttemptDurationSeconds }}'
-      - name: Type
-        value: '{{ Type }}'
-      - name: Tags
+          attempt_duration_seconds: '{{ attempt_duration_seconds }}'
+      - name: type
+        value: '{{ type }}'
+      - name: tags
         value: {}
-      - name: EksProperties
+      - name: eks_properties
         value: null
-      - name: ConsumableResourceProperties
+      - name: consumable_resource_properties
         value: null
-
 ```
 </TabItem>
 </Tabs>
@@ -1552,7 +1551,7 @@ SET PatchDocument = string('{{ {
     "ConsumableResourceProperties": consumable_resource_properties
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<JobDefinitionName>';
+AND Identifier = '{{ job_definition_name }}';
 ```
 
 
@@ -1561,7 +1560,7 @@ AND Identifier = '<JobDefinitionName>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.batch.job_definitions
-WHERE Identifier = '<JobDefinitionName>'
+WHERE Identifier = '{{ job_definition_name }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/batch/job_queues/index.md b/website/docs/services/batch/job_queues/index.md
index 9750311d3..91a3c7ad8 100644
--- a/website/docs/services/batch/job_queues/index.md
+++ b/website/docs/services/batch/job_queues/index.md
@@ -229,7 +229,7 @@ state,
 scheduling_policy_arn,
 tags
 FROM awscc.batch.job_queues
-WHERE region = 'us-east-1' AND Identifier = '<JobQueueArn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ job_queue_arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -265,8 +265,8 @@ INSERT INTO awscc.batch.job_queues (
  Priority,
  region
 )
-SELECT 
-'{{ Priority }}',
+SELECT
+'{{ priority }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -286,16 +286,16 @@ INSERT INTO awscc.batch.job_queues (
  Tags,
  region
 )
-SELECT 
- '{{ JobQueueName }}',
- '{{ JobQueueType }}',
- '{{ ComputeEnvironmentOrder }}',
- '{{ ServiceEnvironmentOrder }}',
- '{{ JobStateTimeLimitActions }}',
- '{{ Priority }}',
- '{{ State }}',
- '{{ SchedulingPolicyArn }}',
- '{{ Tags }}',
+SELECT
+ '{{ job_queue_name }}',
+ '{{ job_queue_type }}',
+ '{{ compute_environment_order }}',
+ '{{ service_environment_order }}',
+ '{{ job_state_time_limit_actions }}',
+ '{{ priority }}',
+ '{{ state }}',
+ '{{ scheduling_policy_arn }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -313,33 +313,32 @@ globals:
 resources:
   - name: job_queue
     props:
-      - name: JobQueueName
-        value: '{{ JobQueueName }}'
-      - name: JobQueueType
-        value: '{{ JobQueueType }}'
-      - name: ComputeEnvironmentOrder
+      - name: job_queue_name
+        value: '{{ job_queue_name }}'
+      - name: job_queue_type
+        value: '{{ job_queue_type }}'
+      - name: compute_environment_order
         value:
-          - ComputeEnvironment: '{{ ComputeEnvironment }}'
-            Order: '{{ Order }}'
-      - name: ServiceEnvironmentOrder
+          - compute_environment: '{{ compute_environment }}'
+            order: '{{ order }}'
+      - name: service_environment_order
         value:
-          - ServiceEnvironment: '{{ ServiceEnvironment }}'
-            Order: '{{ Order }}'
-      - name: JobStateTimeLimitActions
+          - service_environment: '{{ service_environment }}'
+            order: '{{ order }}'
+      - name: job_state_time_limit_actions
         value:
-          - Action: '{{ Action }}'
-            MaxTimeSeconds: '{{ MaxTimeSeconds }}'
-            Reason: '{{ Reason }}'
-            State: '{{ State }}'
-      - name: Priority
-        value: '{{ Priority }}'
-      - name: State
-        value: '{{ State }}'
-      - name: SchedulingPolicyArn
-        value: '{{ SchedulingPolicyArn }}'
-      - name: Tags
+          - action: '{{ action }}'
+            max_time_seconds: '{{ max_time_seconds }}'
+            reason: '{{ reason }}'
+            state: '{{ state }}'
+      - name: priority
+        value: '{{ priority }}'
+      - name: state
+        value: '{{ state }}'
+      - name: scheduling_policy_arn
+        value: '{{ scheduling_policy_arn }}'
+      - name: tags
         value: {}
-
 ```
 </TabItem>
 </Tabs>
@@ -360,7 +359,7 @@ SET PatchDocument = string('{{ {
     "SchedulingPolicyArn": scheduling_policy_arn
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<JobQueueArn>';
+AND Identifier = '{{ job_queue_arn }}';
 ```
 
 
@@ -369,7 +368,7 @@ AND Identifier = '<JobQueueArn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.batch.job_queues
-WHERE Identifier = '<JobQueueArn>'
+WHERE Identifier = '{{ job_queue_arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/batch/scheduling_policies/index.md b/website/docs/services/batch/scheduling_policies/index.md
index baec41d06..6bb0d215d 100644
--- a/website/docs/services/batch/scheduling_policies/index.md
+++ b/website/docs/services/batch/scheduling_policies/index.md
@@ -181,7 +181,7 @@ arn,
 fairshare_policy,
 tags
 FROM awscc.batch.scheduling_policies
-WHERE region = 'us-east-1' AND Identifier = '<Arn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -219,10 +219,10 @@ INSERT INTO awscc.batch.scheduling_policies (
  Tags,
  region
 )
-SELECT 
-'{{ Name }}',
- '{{ FairsharePolicy }}',
- '{{ Tags }}',
+SELECT
+'{{ name }}',
+ '{{ fairshare_policy }}',
+ '{{ tags }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -236,10 +236,10 @@ INSERT INTO awscc.batch.scheduling_policies (
  Tags,
  region
 )
-SELECT 
- '{{ Name }}',
- '{{ FairsharePolicy }}',
- '{{ Tags }}',
+SELECT
+ '{{ name }}',
+ '{{ fairshare_policy }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -257,18 +257,17 @@ globals:
 resources:
   - name: scheduling_policy
     props:
-      - name: Name
-        value: '{{ Name }}'
-      - name: FairsharePolicy
+      - name: name
+        value: '{{ name }}'
+      - name: fairshare_policy
         value:
-          ShareDecaySeconds: null
-          ComputeReservation: null
-          ShareDistribution:
-            - ShareIdentifier: '{{ ShareIdentifier }}'
-              WeightFactor: null
-      - name: Tags
+          share_decay_seconds: null
+          compute_reservation: null
+          share_distribution:
+            - share_identifier: '{{ share_identifier }}'
+              weight_factor: null
+      - name: tags
         value: {}
-
 ```
 </TabItem>
 </Tabs>
@@ -284,7 +283,7 @@ SET PatchDocument = string('{{ {
     "FairsharePolicy": fairshare_policy
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Arn>';
+AND Identifier = '{{ arn }}';
 ```
 
 
@@ -293,7 +292,7 @@ AND Identifier = '<Arn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.batch.scheduling_policies
-WHERE Identifier = '<Arn>'
+WHERE Identifier = '{{ arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/batch/service_environments/index.md b/website/docs/services/batch/service_environments/index.md
index 0eb5379db..6a33b2f24 100644
--- a/website/docs/services/batch/service_environments/index.md
+++ b/website/docs/services/batch/service_environments/index.md
@@ -176,7 +176,7 @@ service_environment_type,
 capacity_limits,
 tags
 FROM awscc.batch.service_environments
-WHERE region = 'us-east-1' AND Identifier = '<ServiceEnvironmentArn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ service_environment_arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -213,9 +213,9 @@ INSERT INTO awscc.batch.service_environments (
  CapacityLimits,
  region
 )
-SELECT 
-'{{ ServiceEnvironmentType }}',
- '{{ CapacityLimits }}',
+SELECT
+'{{ service_environment_type }}',
+ '{{ capacity_limits }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -231,12 +231,12 @@ INSERT INTO awscc.batch.service_environments (
  Tags,
  region
 )
-SELECT 
- '{{ ServiceEnvironmentName }}',
- '{{ State }}',
- '{{ ServiceEnvironmentType }}',
- '{{ CapacityLimits }}',
- '{{ Tags }}',
+SELECT
+ '{{ service_environment_name }}',
+ '{{ state }}',
+ '{{ service_environment_type }}',
+ '{{ capacity_limits }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -254,19 +254,18 @@ globals:
 resources:
   - name: service_environment
     props:
-      - name: ServiceEnvironmentName
-        value: '{{ ServiceEnvironmentName }}'
-      - name: State
-        value: '{{ State }}'
-      - name: ServiceEnvironmentType
-        value: '{{ ServiceEnvironmentType }}'
-      - name: CapacityLimits
+      - name: service_environment_name
+        value: '{{ service_environment_name }}'
+      - name: state
+        value: '{{ state }}'
+      - name: service_environment_type
+        value: '{{ service_environment_type }}'
+      - name: capacity_limits
         value:
-          - MaxCapacity: '{{ MaxCapacity }}'
-            CapacityUnit: '{{ CapacityUnit }}'
-      - name: Tags
+          - max_capacity: '{{ max_capacity }}'
+            capacity_unit: '{{ capacity_unit }}'
+      - name: tags
         value: {}
-
 ```
 </TabItem>
 </Tabs>
@@ -284,7 +283,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<ServiceEnvironmentArn>';
+AND Identifier = '{{ service_environment_arn }}';
 ```
 
 
@@ -293,7 +292,7 @@ AND Identifier = '<ServiceEnvironmentArn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.batch.service_environments
-WHERE Identifier = '<ServiceEnvironmentArn>'
+WHERE Identifier = '{{ service_environment_arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/bcmdataexports/exports/index.md b/website/docs/services/bcmdataexports/exports/index.md
index 8a2d67768..c5abecfc4 100644
--- a/website/docs/services/bcmdataexports/exports/index.md
+++ b/website/docs/services/bcmdataexports/exports/index.md
@@ -211,7 +211,7 @@ export,
 export_arn,
 tags
 FROM awscc.bcmdataexports.exports
-WHERE region = 'us-east-1' AND Identifier = '<ExportArn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ export_arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -247,8 +247,8 @@ INSERT INTO awscc.bcmdataexports.exports (
  Export,
  region
 )
-SELECT 
-'{{ Export }}',
+SELECT
+'{{ export }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -261,9 +261,9 @@ INSERT INTO awscc.bcmdataexports.exports (
  Tags,
  region
 )
-SELECT 
- '{{ Export }}',
- '{{ Tags }}',
+SELECT
+ '{{ export }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -281,16 +281,15 @@ globals:
 resources:
   - name: export
     props:
-      - name: Export
+      - name: export
         value:
-          Export: null
-          Tags:
-            - Key: '{{ Key }}'
-              Value: '{{ Value }}'
-      - name: Tags
+          export: null
+          tags:
+            - key: '{{ key }}'
+              value: '{{ value }}'
+      - name: tags
         value:
           - null
-
 ```
 </TabItem>
 </Tabs>
@@ -306,7 +305,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<ExportArn>';
+AND Identifier = '{{ export_arn }}';
 ```
 
 
@@ -315,7 +314,7 @@ AND Identifier = '<ExportArn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.bcmdataexports.exports
-WHERE Identifier = '<ExportArn>'
+WHERE Identifier = '{{ export_arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/bedrock/agent_aliases/index.md b/website/docs/services/bedrock/agent_aliases/index.md
index cd13bce61..b85fc1311 100644
--- a/website/docs/services/bedrock/agent_aliases/index.md
+++ b/website/docs/services/bedrock/agent_aliases/index.md
@@ -230,7 +230,7 @@ routing_configuration,
 tags,
 updated_at
 FROM awscc.bedrock.agent_aliases
-WHERE region = 'us-east-1' AND Identifier = '<AgentId>|<AgentAliasId>';
+WHERE region = 'us-east-1' AND Identifier = '{{ agent_id }}|{{ agent_alias_id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -268,9 +268,9 @@ INSERT INTO awscc.bedrock.agent_aliases (
  AgentId,
  region
 )
-SELECT 
-'{{ AgentAliasName }}',
- '{{ AgentId }}',
+SELECT
+'{{ agent_alias_name }}',
+ '{{ agent_id }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -286,12 +286,12 @@ INSERT INTO awscc.bedrock.agent_aliases (
  Tags,
  region
 )
-SELECT 
- '{{ AgentAliasName }}',
- '{{ AgentId }}',
- '{{ Description }}',
- '{{ RoutingConfiguration }}',
- '{{ Tags }}',
+SELECT
+ '{{ agent_alias_name }}',
+ '{{ agent_id }}',
+ '{{ description }}',
+ '{{ routing_configuration }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -309,18 +309,17 @@ globals:
 resources:
   - name: agent_alias
     props:
-      - name: AgentAliasName
-        value: '{{ AgentAliasName }}'
-      - name: AgentId
-        value: '{{ AgentId }}'
-      - name: Description
-        value: '{{ Description }}'
-      - name: RoutingConfiguration
+      - name: agent_alias_name
+        value: '{{ agent_alias_name }}'
+      - name: agent_id
+        value: '{{ agent_id }}'
+      - name: description
+        value: '{{ description }}'
+      - name: routing_configuration
         value:
-          - AgentVersion: '{{ AgentVersion }}'
-      - name: Tags
+          - agent_version: '{{ agent_version }}'
+      - name: tags
         value: {}
-
 ```
 </TabItem>
 </Tabs>
@@ -339,7 +338,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<AgentId>|<AgentAliasId>';
+AND Identifier = '{{ agent_id }}|{{ agent_alias_id }}';
 ```
 
 
@@ -348,7 +347,7 @@ AND Identifier = '<AgentId>|<AgentAliasId>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.bedrock.agent_aliases
-WHERE Identifier = '<AgentId|AgentAliasId>'
+WHERE Identifier = '{{ agent_id }}|{{ agent_alias_id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/bedrock/agents/index.md b/website/docs/services/bedrock/agents/index.md
index 8fc579590..e1a36ed9c 100644
--- a/website/docs/services/bedrock/agents/index.md
+++ b/website/docs/services/bedrock/agents/index.md
@@ -535,7 +535,7 @@ tags,
 test_alias_tags,
 updated_at
 FROM awscc.bedrock.agents
-WHERE region = 'us-east-1' AND Identifier = '<AgentId>';
+WHERE region = 'us-east-1' AND Identifier = '{{ agent_id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -571,8 +571,8 @@ INSERT INTO awscc.bedrock.agents (
  AgentName,
  region
 )
-SELECT 
-'{{ AgentName }}',
+SELECT
+'{{ agent_name }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -603,27 +603,27 @@ INSERT INTO awscc.bedrock.agents (
  TestAliasTags,
  region
 )
-SELECT 
- '{{ ActionGroups }}',
- '{{ AgentName }}',
- '{{ AgentResourceRoleArn }}',
- '{{ AutoPrepare }}',
- '{{ CustomOrchestration }}',
- '{{ CustomerEncryptionKeyArn }}',
- '{{ SkipResourceInUseCheckOnDelete }}',
- '{{ Description }}',
- '{{ FoundationModel }}',
- '{{ GuardrailConfiguration }}',
- '{{ MemoryConfiguration }}',
- '{{ IdleSessionTTLInSeconds }}',
- '{{ AgentCollaboration }}',
- '{{ Instruction }}',
- '{{ KnowledgeBases }}',
- '{{ AgentCollaborators }}',
- '{{ OrchestrationType }}',
- '{{ PromptOverrideConfiguration }}',
- '{{ Tags }}',
- '{{ TestAliasTags }}',
+SELECT
+ '{{ action_groups }}',
+ '{{ agent_name }}',
+ '{{ agent_resource_role_arn }}',
+ '{{ auto_prepare }}',
+ '{{ custom_orchestration }}',
+ '{{ customer_encryption_key_arn }}',
+ '{{ skip_resource_in_use_check_on_delete }}',
+ '{{ description }}',
+ '{{ foundation_model }}',
+ '{{ guardrail_configuration }}',
+ '{{ memory_configuration }}',
+ '{{ idle_session_ttl_in_seconds }}',
+ '{{ agent_collaboration }}',
+ '{{ instruction }}',
+ '{{ knowledge_bases }}',
+ '{{ agent_collaborators }}',
+ '{{ orchestration_type }}',
+ '{{ prompt_override_configuration }}',
+ '{{ tags }}',
+ '{{ test_alias_tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -641,93 +641,92 @@ globals:
 resources:
   - name: agent
     props:
-      - name: ActionGroups
+      - name: action_groups
         value:
-          - ActionGroupName: '{{ ActionGroupName }}'
-            Description: '{{ Description }}'
-            ParentActionGroupSignature: '{{ ParentActionGroupSignature }}'
-            ActionGroupExecutor: null
-            ApiSchema: null
-            ActionGroupState: '{{ ActionGroupState }}'
-            FunctionSchema:
-              Functions:
-                - Name: '{{ Name }}'
-                  Description: '{{ Description }}'
-                  Parameters: {}
-                  RequireConfirmation: '{{ RequireConfirmation }}'
-            SkipResourceInUseCheckOnDelete: '{{ SkipResourceInUseCheckOnDelete }}'
-      - name: AgentName
-        value: '{{ AgentName }}'
-      - name: AgentResourceRoleArn
-        value: '{{ AgentResourceRoleArn }}'
-      - name: AutoPrepare
-        value: '{{ AutoPrepare }}'
-      - name: CustomOrchestration
+          - action_group_name: '{{ action_group_name }}'
+            description: '{{ description }}'
+            parent_action_group_signature: '{{ parent_action_group_signature }}'
+            action_group_executor: null
+            api_schema: null
+            action_group_state: '{{ action_group_state }}'
+            function_schema:
+              functions:
+                - name: '{{ name }}'
+                  description: '{{ description }}'
+                  parameters: {}
+                  require_confirmation: '{{ require_confirmation }}'
+            skip_resource_in_use_check_on_delete: '{{ skip_resource_in_use_check_on_delete }}'
+      - name: agent_name
+        value: '{{ agent_name }}'
+      - name: agent_resource_role_arn
+        value: '{{ agent_resource_role_arn }}'
+      - name: auto_prepare
+        value: '{{ auto_prepare }}'
+      - name: custom_orchestration
         value:
-          Executor:
-            Lambda: '{{ Lambda }}'
-      - name: CustomerEncryptionKeyArn
-        value: '{{ CustomerEncryptionKeyArn }}'
-      - name: SkipResourceInUseCheckOnDelete
-        value: '{{ SkipResourceInUseCheckOnDelete }}'
-      - name: Description
-        value: '{{ Description }}'
-      - name: FoundationModel
-        value: '{{ FoundationModel }}'
-      - name: GuardrailConfiguration
+          executor:
+            lambda: '{{ lambda }}'
+      - name: customer_encryption_key_arn
+        value: '{{ customer_encryption_key_arn }}'
+      - name: skip_resource_in_use_check_on_delete
+        value: '{{ skip_resource_in_use_check_on_delete }}'
+      - name: description
+        value: '{{ description }}'
+      - name: foundation_model
+        value: '{{ foundation_model }}'
+      - name: guardrail_configuration
         value:
-          GuardrailIdentifier: '{{ GuardrailIdentifier }}'
-          GuardrailVersion: '{{ GuardrailVersion }}'
-      - name: MemoryConfiguration
+          guardrail_identifier: '{{ guardrail_identifier }}'
+          guardrail_version: '{{ guardrail_version }}'
+      - name: memory_configuration
         value:
-          EnabledMemoryTypes:
-            - '{{ EnabledMemoryTypes[0] }}'
-          StorageDays: null
-          SessionSummaryConfiguration:
-            MaxRecentSessions: null
-      - name: IdleSessionTTLInSeconds
+          enabled_memory_types:
+            - '{{ enabled_memory_types[0] }}'
+          storage_days: null
+          session_summary_configuration:
+            max_recent_sessions: null
+      - name: idle_session_ttl_in_seconds
         value: null
-      - name: AgentCollaboration
-        value: '{{ AgentCollaboration }}'
-      - name: Instruction
-        value: '{{ Instruction }}'
-      - name: KnowledgeBases
+      - name: agent_collaboration
+        value: '{{ agent_collaboration }}'
+      - name: instruction
+        value: '{{ instruction }}'
+      - name: knowledge_bases
         value:
-          - KnowledgeBaseId: '{{ KnowledgeBaseId }}'
-            Description: '{{ Description }}'
-            KnowledgeBaseState: '{{ KnowledgeBaseState }}'
-      - name: AgentCollaborators
+          - knowledge_base_id: '{{ knowledge_base_id }}'
+            description: '{{ description }}'
+            knowledge_base_state: '{{ knowledge_base_state }}'
+      - name: agent_collaborators
         value:
-          - AgentDescriptor:
-              AliasArn: '{{ AliasArn }}'
-            CollaborationInstruction: '{{ CollaborationInstruction }}'
-            CollaboratorName: '{{ CollaboratorName }}'
-            RelayConversationHistory: '{{ RelayConversationHistory }}'
-      - name: OrchestrationType
-        value: '{{ OrchestrationType }}'
-      - name: PromptOverrideConfiguration
+          - agent_descriptor:
+              alias_arn: '{{ alias_arn }}'
+            collaboration_instruction: '{{ collaboration_instruction }}'
+            collaborator_name: '{{ collaborator_name }}'
+            relay_conversation_history: '{{ relay_conversation_history }}'
+      - name: orchestration_type
+        value: '{{ orchestration_type }}'
+      - name: prompt_override_configuration
         value:
-          PromptConfigurations:
-            - PromptType: '{{ PromptType }}'
-              PromptCreationMode: '{{ PromptCreationMode }}'
-              PromptState: '{{ PromptState }}'
-              BasePromptTemplate: '{{ BasePromptTemplate }}'
-              InferenceConfiguration:
-                Temperature: null
-                TopP: null
-                TopK: null
-                MaximumLength: null
-                StopSequences:
-                  - '{{ StopSequences[0] }}'
-              ParserMode: null
-              FoundationModel: null
-              AdditionalModelRequestFields: {}
-          OverrideLambda: '{{ OverrideLambda }}'
-      - name: Tags
+          prompt_configurations:
+            - prompt_type: '{{ prompt_type }}'
+              prompt_creation_mode: '{{ prompt_creation_mode }}'
+              prompt_state: '{{ prompt_state }}'
+              base_prompt_template: '{{ base_prompt_template }}'
+              inference_configuration:
+                temperature: null
+                top_p: null
+                top_k: null
+                maximum_length: null
+                stop_sequences:
+                  - '{{ stop_sequences[0] }}'
+              parser_mode: null
+              foundation_model: null
+              additional_model_request_fields: {}
+          override_lambda: '{{ override_lambda }}'
+      - name: tags
         value: {}
-      - name: TestAliasTags
+      - name: test_alias_tags
         value: null
-
 ```
 </TabItem>
 </Tabs>
@@ -762,7 +761,7 @@ SET PatchDocument = string('{{ {
     "TestAliasTags": test_alias_tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<AgentId>';
+AND Identifier = '{{ agent_id }}';
 ```
 
 
@@ -771,7 +770,7 @@ AND Identifier = '<AgentId>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.bedrock.agents
-WHERE Identifier = '<AgentId>'
+WHERE Identifier = '{{ agent_id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/bedrock/application_inference_profiles/index.md b/website/docs/services/bedrock/application_inference_profiles/index.md
index 598b0088b..7036853f8 100644
--- a/website/docs/services/bedrock/application_inference_profiles/index.md
+++ b/website/docs/services/bedrock/application_inference_profiles/index.md
@@ -224,7 +224,7 @@ tags,
 type,
 updated_at
 FROM awscc.bedrock.application_inference_profiles
-WHERE region = 'us-east-1' AND Identifier = '<InferenceProfileIdentifier>';
+WHERE region = 'us-east-1' AND Identifier = '{{ inference_profile_identifier }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -260,8 +260,8 @@ INSERT INTO awscc.bedrock.application_inference_profiles (
  InferenceProfileName,
  region
 )
-SELECT 
-'{{ InferenceProfileName }}',
+SELECT
+'{{ inference_profile_name }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -276,11 +276,11 @@ INSERT INTO awscc.bedrock.application_inference_profiles (
  Tags,
  region
 )
-SELECT 
- '{{ Description }}',
- '{{ InferenceProfileName }}',
- '{{ ModelSource }}',
- '{{ Tags }}',
+SELECT
+ '{{ description }}',
+ '{{ inference_profile_name }}',
+ '{{ model_source }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -298,17 +298,16 @@ globals:
 resources:
   - name: application_inference_profile
     props:
-      - name: Description
-        value: '{{ Description }}'
-      - name: InferenceProfileName
-        value: '{{ InferenceProfileName }}'
-      - name: ModelSource
+      - name: description
+        value: '{{ description }}'
+      - name: inference_profile_name
+        value: '{{ inference_profile_name }}'
+      - name: model_source
         value: null
-      - name: Tags
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -324,7 +323,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<InferenceProfileIdentifier>';
+AND Identifier = '{{ inference_profile_identifier }}';
 ```
 
 
@@ -333,7 +332,7 @@ AND Identifier = '<InferenceProfileIdentifier>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.bedrock.application_inference_profiles
-WHERE Identifier = '<InferenceProfileIdentifier>'
+WHERE Identifier = '{{ inference_profile_identifier }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/bedrock/automated_reasoning_policies/index.md b/website/docs/services/bedrock/automated_reasoning_policies/index.md
index da85dd808..a18334b46 100644
--- a/website/docs/services/bedrock/automated_reasoning_policies/index.md
+++ b/website/docs/services/bedrock/automated_reasoning_policies/index.md
@@ -285,7 +285,7 @@ updated_at,
 policy_id,
 tags
 FROM awscc.bedrock.automated_reasoning_policies
-WHERE region = 'us-east-1' AND Identifier = '<PolicyArn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ policy_arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -321,8 +321,8 @@ INSERT INTO awscc.bedrock.automated_reasoning_policies (
  Name,
  region
 )
-SELECT 
-'{{ Name }}',
+SELECT
+'{{ name }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -337,11 +337,11 @@ INSERT INTO awscc.bedrock.automated_reasoning_policies (
  Tags,
  region
 )
-SELECT 
- '{{ Name }}',
- '{{ Description }}',
- '{{ PolicyDefinition }}',
- '{{ Tags }}',
+SELECT
+ '{{ name }}',
+ '{{ description }}',
+ '{{ policy_definition }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -359,32 +359,31 @@ globals:
 resources:
   - name: automated_reasoning_policy
     props:
-      - name: Name
-        value: '{{ Name }}'
-      - name: Description
-        value: '{{ Description }}'
-      - name: PolicyDefinition
+      - name: name
+        value: '{{ name }}'
+      - name: description
+        value: '{{ description }}'
+      - name: policy_definition
         value:
-          Version: '{{ Version }}'
-          Types:
-            - Name: '{{ Name }}'
-              Description: '{{ Description }}'
-              Values:
-                - Value: '{{ Value }}'
-                  Description: '{{ Description }}'
-          Rules:
-            - Id: '{{ Id }}'
-              Expression: '{{ Expression }}'
-              AlternateExpression: '{{ AlternateExpression }}'
-          Variables:
-            - Name: '{{ Name }}'
-              Type: '{{ Type }}'
-              Description: '{{ Description }}'
-      - name: Tags
+          version: '{{ version }}'
+          types:
+            - name: '{{ name }}'
+              description: '{{ description }}'
+              values:
+                - value: '{{ value }}'
+                  description: '{{ description }}'
+          rules:
+            - id: '{{ id }}'
+              expression: '{{ expression }}'
+              alternate_expression: '{{ alternate_expression }}'
+          variables:
+            - name: '{{ name }}'
+              type: '{{ type }}'
+              description: '{{ description }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -403,7 +402,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<PolicyArn>';
+AND Identifier = '{{ policy_arn }}';
 ```
 
 
@@ -412,7 +411,7 @@ AND Identifier = '<PolicyArn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.bedrock.automated_reasoning_policies
-WHERE Identifier = '<PolicyArn>'
+WHERE Identifier = '{{ policy_arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/bedrock/automated_reasoning_policy_versions/index.md b/website/docs/services/bedrock/automated_reasoning_policy_versions/index.md
index 78c45dff8..90d7e19f2 100644
--- a/website/docs/services/bedrock/automated_reasoning_policy_versions/index.md
+++ b/website/docs/services/bedrock/automated_reasoning_policy_versions/index.md
@@ -194,7 +194,7 @@ updated_at,
 policy_id,
 tags
 FROM awscc.bedrock.automated_reasoning_policy_versions
-WHERE region = 'us-east-1' AND Identifier = '<PolicyArn>|<Version>';
+WHERE region = 'us-east-1' AND Identifier = '{{ policy_arn }}|{{ version }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -231,8 +231,8 @@ INSERT INTO awscc.bedrock.automated_reasoning_policy_versions (
  PolicyArn,
  region
 )
-SELECT 
-'{{ PolicyArn }}',
+SELECT
+'{{ policy_arn }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -246,10 +246,10 @@ INSERT INTO awscc.bedrock.automated_reasoning_policy_versions (
  Tags,
  region
 )
-SELECT 
- '{{ PolicyArn }}',
- '{{ LastUpdatedDefinitionHash }}',
- '{{ Tags }}',
+SELECT
+ '{{ policy_arn }}',
+ '{{ last_updated_definition_hash }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -267,15 +267,14 @@ globals:
 resources:
   - name: automated_reasoning_policy_version
     props:
-      - name: PolicyArn
-        value: '{{ PolicyArn }}'
-      - name: LastUpdatedDefinitionHash
-        value: '{{ LastUpdatedDefinitionHash }}'
-      - name: Tags
+      - name: policy_arn
+        value: '{{ policy_arn }}'
+      - name: last_updated_definition_hash
+        value: '{{ last_updated_definition_hash }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -286,7 +285,7 @@ resources:
 ```sql
 /*+ delete */
 DELETE FROM awscc.bedrock.automated_reasoning_policy_versions
-WHERE Identifier = '<PolicyArn|Version>'
+WHERE Identifier = '{{ policy_arn }}|{{ version }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/bedrock/blueprints/index.md b/website/docs/services/bedrock/blueprints/index.md
index f9f7bc1fc..8691c6f78 100644
--- a/website/docs/services/bedrock/blueprints/index.md
+++ b/website/docs/services/bedrock/blueprints/index.md
@@ -200,7 +200,7 @@ kms_key_id,
 kms_encryption_context,
 tags
 FROM awscc.bedrock.blueprints
-WHERE region = 'us-east-1' AND Identifier = '<BlueprintArn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ blueprint_arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -238,10 +238,10 @@ INSERT INTO awscc.bedrock.blueprints (
  Type,
  region
 )
-SELECT 
-'{{ BlueprintName }}',
- '{{ Schema }}',
- '{{ Type }}',
+SELECT
+'{{ blueprint_name }}',
+ '{{ schema }}',
+ '{{ type }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -258,13 +258,13 @@ INSERT INTO awscc.bedrock.blueprints (
  Tags,
  region
 )
-SELECT 
- '{{ BlueprintName }}',
- '{{ Schema }}',
- '{{ Type }}',
- '{{ KmsKeyId }}',
- '{{ KmsEncryptionContext }}',
- '{{ Tags }}',
+SELECT
+ '{{ blueprint_name }}',
+ '{{ schema }}',
+ '{{ type }}',
+ '{{ kms_key_id }}',
+ '{{ kms_encryption_context }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -282,21 +282,20 @@ globals:
 resources:
   - name: blueprint
     props:
-      - name: BlueprintName
-        value: '{{ BlueprintName }}'
-      - name: Schema
+      - name: blueprint_name
+        value: '{{ blueprint_name }}'
+      - name: schema
         value: {}
-      - name: Type
-        value: '{{ Type }}'
-      - name: KmsKeyId
-        value: '{{ KmsKeyId }}'
-      - name: KmsEncryptionContext
+      - name: type
+        value: '{{ type }}'
+      - name: kms_key_id
+        value: '{{ kms_key_id }}'
+      - name: kms_encryption_context
         value: {}
-      - name: Tags
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -315,7 +314,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<BlueprintArn>';
+AND Identifier = '{{ blueprint_arn }}';
 ```
 
 
@@ -324,7 +323,7 @@ AND Identifier = '<BlueprintArn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.bedrock.blueprints
-WHERE Identifier = '<BlueprintArn>'
+WHERE Identifier = '{{ blueprint_arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/bedrock/data_automation_projects/index.md b/website/docs/services/bedrock/data_automation_projects/index.md
index 2e2e5ca89..583160eef 100644
--- a/website/docs/services/bedrock/data_automation_projects/index.md
+++ b/website/docs/services/bedrock/data_automation_projects/index.md
@@ -517,7 +517,7 @@ kms_key_id,
 kms_encryption_context,
 tags
 FROM awscc.bedrock.data_automation_projects
-WHERE region = 'us-east-1' AND Identifier = '<ProjectArn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ project_arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -553,8 +553,8 @@ INSERT INTO awscc.bedrock.data_automation_projects (
  ProjectName,
  region
 )
-SELECT 
-'{{ ProjectName }}',
+SELECT
+'{{ project_name }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -573,15 +573,15 @@ INSERT INTO awscc.bedrock.data_automation_projects (
  Tags,
  region
 )
-SELECT 
- '{{ CustomOutputConfiguration }}',
- '{{ OverrideConfiguration }}',
- '{{ ProjectDescription }}',
- '{{ ProjectName }}',
- '{{ StandardOutputConfiguration }}',
- '{{ KmsKeyId }}',
- '{{ KmsEncryptionContext }}',
- '{{ Tags }}',
+SELECT
+ '{{ custom_output_configuration }}',
+ '{{ override_configuration }}',
+ '{{ project_description }}',
+ '{{ project_name }}',
+ '{{ standard_output_configuration }}',
+ '{{ kms_key_id }}',
+ '{{ kms_encryption_context }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -599,94 +599,93 @@ globals:
 resources:
   - name: data_automation_project
     props:
-      - name: CustomOutputConfiguration
+      - name: custom_output_configuration
         value:
-          Blueprints:
-            - BlueprintArn: '{{ BlueprintArn }}'
-              BlueprintVersion: '{{ BlueprintVersion }}'
-              BlueprintStage: '{{ BlueprintStage }}'
-      - name: OverrideConfiguration
+          blueprints:
+            - blueprint_arn: '{{ blueprint_arn }}'
+              blueprint_version: '{{ blueprint_version }}'
+              blueprint_stage: '{{ blueprint_stage }}'
+      - name: override_configuration
         value:
-          Document:
-            Splitter:
-              State: '{{ State }}'
-            ModalityProcessing:
-              State: null
-          Audio:
-            ModalityProcessing: null
-          Video:
-            ModalityProcessing: null
-          Image:
-            ModalityProcessing: null
-          ModalityRouting:
+          document:
+            splitter:
+              state: '{{ state }}'
+            modality_processing:
+              state: null
+          audio:
+            modality_processing: null
+          video:
+            modality_processing: null
+          image:
+            modality_processing: null
+          modality_routing:
             jpeg: '{{ jpeg }}'
             png: null
             mp4: null
             mov: null
-      - name: ProjectDescription
-        value: '{{ ProjectDescription }}'
-      - name: ProjectName
-        value: '{{ ProjectName }}'
-      - name: StandardOutputConfiguration
+      - name: project_description
+        value: '{{ project_description }}'
+      - name: project_name
+        value: '{{ project_name }}'
+      - name: standard_output_configuration
         value:
-          Document:
-            Extraction:
-              Granularity:
-                Types:
-                  - '{{ Types[0] }}'
-              BoundingBox:
-                State: null
-            GenerativeField:
-              State: null
-            OutputFormat:
-              TextFormat:
-                Types:
-                  - '{{ Types[0] }}'
-              AdditionalFileFormat:
-                State: null
-          Image:
-            Extraction:
-              Category:
-                State: null
-                Types:
-                  - '{{ Types[0] }}'
-              BoundingBox:
-                State: null
-            GenerativeField:
-              State: null
-              Types:
-                - '{{ Types[0] }}'
-          Video:
-            Extraction:
-              Category:
-                State: null
-                Types:
-                  - '{{ Types[0] }}'
-              BoundingBox:
-                State: null
-            GenerativeField:
-              State: null
-              Types:
-                - '{{ Types[0] }}'
-          Audio:
-            Extraction:
-              Category:
-                State: null
-                Types:
-                  - '{{ Types[0] }}'
-            GenerativeField:
-              State: null
-              Types:
-                - '{{ Types[0] }}'
-      - name: KmsKeyId
-        value: '{{ KmsKeyId }}'
-      - name: KmsEncryptionContext
+          document:
+            extraction:
+              granularity:
+                types:
+                  - '{{ types[0] }}'
+              bounding_box:
+                state: null
+            generative_field:
+              state: null
+            output_format:
+              text_format:
+                types:
+                  - '{{ types[0] }}'
+              additional_file_format:
+                state: null
+          image:
+            extraction:
+              category:
+                state: null
+                types:
+                  - '{{ types[0] }}'
+              bounding_box:
+                state: null
+            generative_field:
+              state: null
+              types:
+                - '{{ types[0] }}'
+          video:
+            extraction:
+              category:
+                state: null
+                types:
+                  - '{{ types[0] }}'
+              bounding_box:
+                state: null
+            generative_field:
+              state: null
+              types:
+                - '{{ types[0] }}'
+          audio:
+            extraction:
+              category:
+                state: null
+                types:
+                  - '{{ types[0] }}'
+            generative_field:
+              state: null
+              types:
+                - '{{ types[0] }}'
+      - name: kms_key_id
+        value: '{{ kms_key_id }}'
+      - name: kms_encryption_context
         value: {}
-      - name: Tags
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -708,7 +707,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<ProjectArn>';
+AND Identifier = '{{ project_arn }}';
 ```
 
 
@@ -717,7 +716,7 @@ AND Identifier = '<ProjectArn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.bedrock.data_automation_projects
-WHERE Identifier = '<ProjectArn>'
+WHERE Identifier = '{{ project_arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/bedrock/data_sources/index.md b/website/docs/services/bedrock/data_sources/index.md
index cec57ccc1..04f016f31 100644
--- a/website/docs/services/bedrock/data_sources/index.md
+++ b/website/docs/services/bedrock/data_sources/index.md
@@ -616,7 +616,7 @@ created_at,
 updated_at,
 failure_reasons
 FROM awscc.bedrock.data_sources
-WHERE region = 'us-east-1' AND Identifier = '<KnowledgeBaseId>|<DataSourceId>';
+WHERE region = 'us-east-1' AND Identifier = '{{ knowledge_base_id }}|{{ data_source_id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -655,10 +655,10 @@ INSERT INTO awscc.bedrock.data_sources (
  Name,
  region
 )
-SELECT 
-'{{ DataSourceConfiguration }}',
- '{{ KnowledgeBaseId }}',
- '{{ Name }}',
+SELECT
+'{{ data_source_configuration }}',
+ '{{ knowledge_base_id }}',
+ '{{ name }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -676,14 +676,14 @@ INSERT INTO awscc.bedrock.data_sources (
  DataDeletionPolicy,
  region
 )
-SELECT 
- '{{ DataSourceConfiguration }}',
- '{{ Description }}',
- '{{ KnowledgeBaseId }}',
- '{{ Name }}',
- '{{ ServerSideEncryptionConfiguration }}',
- '{{ VectorIngestionConfiguration }}',
- '{{ DataDeletionPolicy }}',
+SELECT
+ '{{ data_source_configuration }}',
+ '{{ description }}',
+ '{{ knowledge_base_id }}',
+ '{{ name }}',
+ '{{ server_side_encryption_configuration }}',
+ '{{ vector_ingestion_configuration }}',
+ '{{ data_deletion_policy }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -701,112 +701,111 @@ globals:
 resources:
   - name: data_source
     props:
-      - name: DataSourceConfiguration
+      - name: data_source_configuration
         value:
-          Type: '{{ Type }}'
-          S3Configuration:
-            BucketArn: '{{ BucketArn }}'
-            InclusionPrefixes:
-              - '{{ InclusionPrefixes[0] }}'
-            BucketOwnerAccountId: '{{ BucketOwnerAccountId }}'
-          ConfluenceConfiguration:
-            SourceConfiguration:
-              HostUrl: '{{ HostUrl }}'
-              HostType: '{{ HostType }}'
-              AuthType: '{{ AuthType }}'
-              CredentialsSecretArn: '{{ CredentialsSecretArn }}'
-            CrawlerConfiguration:
-              FilterConfiguration:
-                Type: '{{ Type }}'
-                PatternObjectFilter:
-                  Filters:
-                    - ObjectType: '{{ ObjectType }}'
-                      InclusionFilters:
-                        - '{{ InclusionFilters[0] }}'
-                      ExclusionFilters: null
-          SalesforceConfiguration:
-            SourceConfiguration:
-              HostUrl: '{{ HostUrl }}'
-              AuthType: '{{ AuthType }}'
-              CredentialsSecretArn: '{{ CredentialsSecretArn }}'
-            CrawlerConfiguration:
-              FilterConfiguration: null
-          SharePointConfiguration:
-            SourceConfiguration:
-              SiteUrls:
-                - '{{ SiteUrls[0] }}'
-              HostType: '{{ HostType }}'
-              AuthType: '{{ AuthType }}'
-              CredentialsSecretArn: '{{ CredentialsSecretArn }}'
-              TenantId: '{{ TenantId }}'
-              Domain: '{{ Domain }}'
-            CrawlerConfiguration:
-              FilterConfiguration: null
-          WebConfiguration:
-            SourceConfiguration:
-              UrlConfiguration:
-                SeedUrls:
-                  - Url: '{{ Url }}'
-            CrawlerConfiguration:
-              CrawlerLimits:
-                RateLimit: '{{ RateLimit }}'
-                MaxPages: '{{ MaxPages }}'
-              InclusionFilters: null
-              ExclusionFilters: null
-              Scope: '{{ Scope }}'
-              UserAgent: '{{ UserAgent }}'
-              UserAgentHeader: '{{ UserAgentHeader }}'
-      - name: Description
-        value: '{{ Description }}'
-      - name: KnowledgeBaseId
-        value: '{{ KnowledgeBaseId }}'
-      - name: Name
-        value: '{{ Name }}'
-      - name: ServerSideEncryptionConfiguration
+          type: '{{ type }}'
+          s3_configuration:
+            bucket_arn: '{{ bucket_arn }}'
+            inclusion_prefixes:
+              - '{{ inclusion_prefixes[0] }}'
+            bucket_owner_account_id: '{{ bucket_owner_account_id }}'
+          confluence_configuration:
+            source_configuration:
+              host_url: '{{ host_url }}'
+              host_type: '{{ host_type }}'
+              auth_type: '{{ auth_type }}'
+              credentials_secret_arn: '{{ credentials_secret_arn }}'
+            crawler_configuration:
+              filter_configuration:
+                type: '{{ type }}'
+                pattern_object_filter:
+                  filters:
+                    - object_type: '{{ object_type }}'
+                      inclusion_filters:
+                        - '{{ inclusion_filters[0] }}'
+                      exclusion_filters: null
+          salesforce_configuration:
+            source_configuration:
+              host_url: '{{ host_url }}'
+              auth_type: '{{ auth_type }}'
+              credentials_secret_arn: '{{ credentials_secret_arn }}'
+            crawler_configuration:
+              filter_configuration: null
+          share_point_configuration:
+            source_configuration:
+              site_urls:
+                - '{{ site_urls[0] }}'
+              host_type: '{{ host_type }}'
+              auth_type: '{{ auth_type }}'
+              credentials_secret_arn: '{{ credentials_secret_arn }}'
+              tenant_id: '{{ tenant_id }}'
+              domain: '{{ domain }}'
+            crawler_configuration:
+              filter_configuration: null
+          web_configuration:
+            source_configuration:
+              url_configuration:
+                seed_urls:
+                  - url: '{{ url }}'
+            crawler_configuration:
+              crawler_limits:
+                rate_limit: '{{ rate_limit }}'
+                max_pages: '{{ max_pages }}'
+              inclusion_filters: null
+              exclusion_filters: null
+              scope: '{{ scope }}'
+              user_agent: '{{ user_agent }}'
+              user_agent_header: '{{ user_agent_header }}'
+      - name: description
+        value: '{{ description }}'
+      - name: knowledge_base_id
+        value: '{{ knowledge_base_id }}'
+      - name: name
+        value: '{{ name }}'
+      - name: server_side_encryption_configuration
         value:
-          KmsKeyArn: '{{ KmsKeyArn }}'
-      - name: VectorIngestionConfiguration
+          kms_key_arn: '{{ kms_key_arn }}'
+      - name: vector_ingestion_configuration
         value:
-          ChunkingConfiguration:
-            ChunkingStrategy: '{{ ChunkingStrategy }}'
-            FixedSizeChunkingConfiguration:
-              MaxTokens: '{{ MaxTokens }}'
-              OverlapPercentage: '{{ OverlapPercentage }}'
-            HierarchicalChunkingConfiguration:
-              LevelConfigurations:
-                - MaxTokens: '{{ MaxTokens }}'
-              OverlapTokens: '{{ OverlapTokens }}'
-            SemanticChunkingConfiguration:
-              BreakpointPercentileThreshold: '{{ BreakpointPercentileThreshold }}'
-              BufferSize: '{{ BufferSize }}'
-              MaxTokens: '{{ MaxTokens }}'
-          CustomTransformationConfiguration:
-            IntermediateStorage:
-              S3Location:
-                URI: '{{ URI }}'
-            Transformations:
-              - StepToApply: '{{ StepToApply }}'
-                TransformationFunction:
-                  TransformationLambdaConfiguration:
-                    LambdaArn: '{{ LambdaArn }}'
-          ParsingConfiguration:
-            ParsingStrategy: '{{ ParsingStrategy }}'
-            BedrockFoundationModelConfiguration:
-              ModelArn: '{{ ModelArn }}'
-              ParsingPrompt:
-                ParsingPromptText: '{{ ParsingPromptText }}'
-              ParsingModality: '{{ ParsingModality }}'
-            BedrockDataAutomationConfiguration:
-              ParsingModality: null
-          ContextEnrichmentConfiguration:
-            Type: '{{ Type }}'
-            BedrockFoundationModelConfiguration:
-              EnrichmentStrategyConfiguration:
-                Method: '{{ Method }}'
-              ModelArn: null
-      - name: DataDeletionPolicy
-        value: '{{ DataDeletionPolicy }}'
-
+          chunking_configuration:
+            chunking_strategy: '{{ chunking_strategy }}'
+            fixed_size_chunking_configuration:
+              max_tokens: '{{ max_tokens }}'
+              overlap_percentage: '{{ overlap_percentage }}'
+            hierarchical_chunking_configuration:
+              level_configurations:
+                - max_tokens: '{{ max_tokens }}'
+              overlap_tokens: '{{ overlap_tokens }}'
+            semantic_chunking_configuration:
+              breakpoint_percentile_threshold: '{{ breakpoint_percentile_threshold }}'
+              buffer_size: '{{ buffer_size }}'
+              max_tokens: '{{ max_tokens }}'
+          custom_transformation_configuration:
+            intermediate_storage:
+              s3_location:
+                uri: '{{ uri }}'
+            transformations:
+              - step_to_apply: '{{ step_to_apply }}'
+                transformation_function:
+                  transformation_lambda_configuration:
+                    lambda_arn: '{{ lambda_arn }}'
+          parsing_configuration:
+            parsing_strategy: '{{ parsing_strategy }}'
+            bedrock_foundation_model_configuration:
+              model_arn: '{{ model_arn }}'
+              parsing_prompt:
+                parsing_prompt_text: '{{ parsing_prompt_text }}'
+              parsing_modality: '{{ parsing_modality }}'
+            bedrock_data_automation_configuration:
+              parsing_modality: null
+          context_enrichment_configuration:
+            type: '{{ type }}'
+            bedrock_foundation_model_configuration:
+              enrichment_strategy_configuration:
+                method: '{{ method }}'
+              model_arn: null
+      - name: data_deletion_policy
+        value: '{{ data_deletion_policy }}'
 ```
 </TabItem>
 </Tabs>
@@ -825,7 +824,7 @@ SET PatchDocument = string('{{ {
     "DataDeletionPolicy": data_deletion_policy
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<KnowledgeBaseId>|<DataSourceId>';
+AND Identifier = '{{ knowledge_base_id }}|{{ data_source_id }}';
 ```
 
 
@@ -834,7 +833,7 @@ AND Identifier = '<KnowledgeBaseId>|<DataSourceId>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.bedrock.data_sources
-WHERE Identifier = '<KnowledgeBaseId|DataSourceId>'
+WHERE Identifier = '{{ knowledge_base_id }}|{{ data_source_id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/bedrock/flow_aliases/index.md b/website/docs/services/bedrock/flow_aliases/index.md
index f3a483bdf..3e133b081 100644
--- a/website/docs/services/bedrock/flow_aliases/index.md
+++ b/website/docs/services/bedrock/flow_aliases/index.md
@@ -218,7 +218,7 @@ routing_configuration,
 updated_at,
 tags
 FROM awscc.bedrock.flow_aliases
-WHERE region = 'us-east-1' AND Identifier = '<Arn>|<FlowArn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ arn }}|{{ flow_arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -257,10 +257,10 @@ INSERT INTO awscc.bedrock.flow_aliases (
  RoutingConfiguration,
  region
 )
-SELECT 
-'{{ FlowArn }}',
- '{{ Name }}',
- '{{ RoutingConfiguration }}',
+SELECT
+'{{ flow_arn }}',
+ '{{ name }}',
+ '{{ routing_configuration }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -277,13 +277,13 @@ INSERT INTO awscc.bedrock.flow_aliases (
  Tags,
  region
 )
-SELECT 
- '{{ FlowArn }}',
- '{{ ConcurrencyConfiguration }}',
- '{{ Description }}',
- '{{ Name }}',
- '{{ RoutingConfiguration }}',
- '{{ Tags }}',
+SELECT
+ '{{ flow_arn }}',
+ '{{ concurrency_configuration }}',
+ '{{ description }}',
+ '{{ name }}',
+ '{{ routing_configuration }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -301,22 +301,21 @@ globals:
 resources:
   - name: flow_alias
     props:
-      - name: FlowArn
-        value: '{{ FlowArn }}'
-      - name: ConcurrencyConfiguration
+      - name: flow_arn
+        value: '{{ flow_arn }}'
+      - name: concurrency_configuration
         value:
-          Type: '{{ Type }}'
-          MaxConcurrency: null
-      - name: Description
-        value: '{{ Description }}'
-      - name: Name
-        value: '{{ Name }}'
-      - name: RoutingConfiguration
+          type: '{{ type }}'
+          max_concurrency: null
+      - name: description
+        value: '{{ description }}'
+      - name: name
+        value: '{{ name }}'
+      - name: routing_configuration
         value:
-          - FlowVersion: '{{ FlowVersion }}'
-      - name: Tags
+          - flow_version: '{{ flow_version }}'
+      - name: tags
         value: {}
-
 ```
 </TabItem>
 </Tabs>
@@ -336,7 +335,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Arn>|<FlowArn>';
+AND Identifier = '{{ arn }}|{{ flow_arn }}';
 ```
 
 
@@ -345,7 +344,7 @@ AND Identifier = '<Arn>|<FlowArn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.bedrock.flow_aliases
-WHERE Identifier = '<Arn|FlowArn>'
+WHERE Identifier = '{{ arn }}|{{ flow_arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/bedrock/flow_versions/index.md b/website/docs/services/bedrock/flow_versions/index.md
index d240ac6ac..dbda4db63 100644
--- a/website/docs/services/bedrock/flow_versions/index.md
+++ b/website/docs/services/bedrock/flow_versions/index.md
@@ -288,7 +288,7 @@ status,
 version,
 customer_encryption_key_arn
 FROM awscc.bedrock.flow_versions
-WHERE region = 'us-east-1' AND Identifier = '<FlowArn>|<Version>';
+WHERE region = 'us-east-1' AND Identifier = '{{ flow_arn }}|{{ version }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -325,8 +325,8 @@ INSERT INTO awscc.bedrock.flow_versions (
  FlowArn,
  region
 )
-SELECT 
-'{{ FlowArn }}',
+SELECT
+'{{ flow_arn }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -339,9 +339,9 @@ INSERT INTO awscc.bedrock.flow_versions (
  Description,
  region
 )
-SELECT 
- '{{ FlowArn }}',
- '{{ Description }}',
+SELECT
+ '{{ flow_arn }}',
+ '{{ description }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -359,11 +359,10 @@ globals:
 resources:
   - name: flow_version
     props:
-      - name: FlowArn
-        value: '{{ FlowArn }}'
-      - name: Description
-        value: '{{ Description }}'
-
+      - name: flow_arn
+        value: '{{ flow_arn }}'
+      - name: description
+        value: '{{ description }}'
 ```
 </TabItem>
 </Tabs>
@@ -374,7 +373,7 @@ resources:
 ```sql
 /*+ delete */
 DELETE FROM awscc.bedrock.flow_versions
-WHERE Identifier = '<FlowArn|Version>'
+WHERE Identifier = '{{ flow_arn }}|{{ version }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/bedrock/flows/index.md b/website/docs/services/bedrock/flows/index.md
index 003127770..ae59818b4 100644
--- a/website/docs/services/bedrock/flows/index.md
+++ b/website/docs/services/bedrock/flows/index.md
@@ -334,7 +334,7 @@ version,
 tags,
 test_alias_tags
 FROM awscc.bedrock.flows
-WHERE region = 'us-east-1' AND Identifier = '<Arn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -371,9 +371,9 @@ INSERT INTO awscc.bedrock.flows (
  Name,
  region
 )
-SELECT 
-'{{ ExecutionRoleArn }}',
- '{{ Name }}',
+SELECT
+'{{ execution_role_arn }}',
+ '{{ name }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -394,17 +394,17 @@ INSERT INTO awscc.bedrock.flows (
  TestAliasTags,
  region
 )
-SELECT 
- '{{ Definition }}',
- '{{ DefinitionString }}',
- '{{ DefinitionS3Location }}',
- '{{ DefinitionSubstitutions }}',
- '{{ Description }}',
- '{{ ExecutionRoleArn }}',
- '{{ Name }}',
- '{{ CustomerEncryptionKeyArn }}',
- '{{ Tags }}',
- '{{ TestAliasTags }}',
+SELECT
+ '{{ definition }}',
+ '{{ definition_string }}',
+ '{{ definition_s3_location }}',
+ '{{ definition_substitutions }}',
+ '{{ description }}',
+ '{{ execution_role_arn }}',
+ '{{ name }}',
+ '{{ customer_encryption_key_arn }}',
+ '{{ tags }}',
+ '{{ test_alias_tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -422,45 +422,44 @@ globals:
 resources:
   - name: flow
     props:
-      - name: Definition
+      - name: definition
         value:
-          Nodes:
-            - Name: '{{ Name }}'
-              Type: '{{ Type }}'
-              Configuration: null
-              Inputs:
-                - Name: '{{ Name }}'
-                  Type: '{{ Type }}'
-                  Expression: '{{ Expression }}'
-              Outputs:
-                - Name: '{{ Name }}'
-                  Type: null
-          Connections:
-            - Type: '{{ Type }}'
-              Name: '{{ Name }}'
-              Source: '{{ Source }}'
-              Target: '{{ Target }}'
-              Configuration: null
-      - name: DefinitionString
-        value: '{{ DefinitionString }}'
-      - name: DefinitionS3Location
+          nodes:
+            - name: '{{ name }}'
+              type: '{{ type }}'
+              configuration: null
+              inputs:
+                - name: '{{ name }}'
+                  type: '{{ type }}'
+                  expression: '{{ expression }}'
+              outputs:
+                - name: '{{ name }}'
+                  type: null
+          connections:
+            - type: '{{ type }}'
+              name: '{{ name }}'
+              source: '{{ source }}'
+              target: '{{ target }}'
+              configuration: null
+      - name: definition_string
+        value: '{{ definition_string }}'
+      - name: definition_s3_location
         value:
-          URI: '{{ URI }}'
-      - name: DefinitionSubstitutions
+          uri: '{{ uri }}'
+      - name: definition_substitutions
         value: {}
-      - name: Description
-        value: '{{ Description }}'
-      - name: ExecutionRoleArn
-        value: '{{ ExecutionRoleArn }}'
-      - name: Name
-        value: '{{ Name }}'
-      - name: CustomerEncryptionKeyArn
-        value: '{{ CustomerEncryptionKeyArn }}'
-      - name: Tags
+      - name: description
+        value: '{{ description }}'
+      - name: execution_role_arn
+        value: '{{ execution_role_arn }}'
+      - name: name
+        value: '{{ name }}'
+      - name: customer_encryption_key_arn
+        value: '{{ customer_encryption_key_arn }}'
+      - name: tags
         value: {}
-      - name: TestAliasTags
+      - name: test_alias_tags
         value: null
-
 ```
 </TabItem>
 </Tabs>
@@ -485,7 +484,7 @@ SET PatchDocument = string('{{ {
     "TestAliasTags": test_alias_tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Arn>';
+AND Identifier = '{{ arn }}';
 ```
 
 
@@ -494,7 +493,7 @@ AND Identifier = '<Arn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.bedrock.flows
-WHERE Identifier = '<Arn>'
+WHERE Identifier = '{{ arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/bedrock/guardrail_versions/index.md b/website/docs/services/bedrock/guardrail_versions/index.md
index 336baceb0..a988c0509 100644
--- a/website/docs/services/bedrock/guardrail_versions/index.md
+++ b/website/docs/services/bedrock/guardrail_versions/index.md
@@ -107,7 +107,7 @@ guardrail_id,
 guardrail_identifier,
 version
 FROM awscc.bedrock.guardrail_versions
-WHERE region = 'us-east-1' AND Identifier = '<GuardrailId>|<Version>';
+WHERE region = 'us-east-1' AND Identifier = '{{ guardrail_id }}|{{ version }}';
 ```
 
 ## `INSERT` example
@@ -130,8 +130,8 @@ INSERT INTO awscc.bedrock.guardrail_versions (
  GuardrailIdentifier,
  region
 )
-SELECT 
-'{{ GuardrailIdentifier }}',
+SELECT
+'{{ guardrail_identifier }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -144,9 +144,9 @@ INSERT INTO awscc.bedrock.guardrail_versions (
  GuardrailIdentifier,
  region
 )
-SELECT 
- '{{ Description }}',
- '{{ GuardrailIdentifier }}',
+SELECT
+ '{{ description }}',
+ '{{ guardrail_identifier }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -164,11 +164,10 @@ globals:
 resources:
   - name: guardrail_version
     props:
-      - name: Description
-        value: '{{ Description }}'
-      - name: GuardrailIdentifier
-        value: '{{ GuardrailIdentifier }}'
-
+      - name: description
+        value: '{{ description }}'
+      - name: guardrail_identifier
+        value: '{{ guardrail_identifier }}'
 ```
 </TabItem>
 </Tabs>
@@ -179,7 +178,7 @@ resources:
 ```sql
 /*+ delete */
 DELETE FROM awscc.bedrock.guardrail_versions
-WHERE Identifier = '<GuardrailId|Version>'
+WHERE Identifier = '{{ guardrail_id }}|{{ version }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/bedrock/guardrails/index.md b/website/docs/services/bedrock/guardrails/index.md
index 9e440a998..206ca69cc 100644
--- a/website/docs/services/bedrock/guardrails/index.md
+++ b/website/docs/services/bedrock/guardrails/index.md
@@ -530,7 +530,7 @@ updated_at,
 version,
 word_policy_config
 FROM awscc.bedrock.guardrails
-WHERE region = 'us-east-1' AND Identifier = '<GuardrailArn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ guardrail_arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -568,10 +568,10 @@ INSERT INTO awscc.bedrock.guardrails (
  Name,
  region
 )
-SELECT 
-'{{ BlockedInputMessaging }}',
- '{{ BlockedOutputsMessaging }}',
- '{{ Name }}',
+SELECT
+'{{ blocked_input_messaging }}',
+ '{{ blocked_outputs_messaging }}',
+ '{{ name }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -594,19 +594,19 @@ INSERT INTO awscc.bedrock.guardrails (
  WordPolicyConfig,
  region
 )
-SELECT 
- '{{ BlockedInputMessaging }}',
- '{{ BlockedOutputsMessaging }}',
- '{{ ContentPolicyConfig }}',
- '{{ ContextualGroundingPolicyConfig }}',
- '{{ CrossRegionConfig }}',
- '{{ Description }}',
- '{{ KmsKeyArn }}',
- '{{ Name }}',
- '{{ SensitiveInformationPolicyConfig }}',
- '{{ Tags }}',
- '{{ TopicPolicyConfig }}',
- '{{ WordPolicyConfig }}',
+SELECT
+ '{{ blocked_input_messaging }}',
+ '{{ blocked_outputs_messaging }}',
+ '{{ content_policy_config }}',
+ '{{ contextual_grounding_policy_config }}',
+ '{{ cross_region_config }}',
+ '{{ description }}',
+ '{{ kms_key_arn }}',
+ '{{ name }}',
+ '{{ sensitive_information_policy_config }}',
+ '{{ tags }}',
+ '{{ topic_policy_config }}',
+ '{{ word_policy_config }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -624,93 +624,92 @@ globals:
 resources:
   - name: guardrail
     props:
-      - name: BlockedInputMessaging
-        value: '{{ BlockedInputMessaging }}'
-      - name: BlockedOutputsMessaging
-        value: '{{ BlockedOutputsMessaging }}'
-      - name: ContentPolicyConfig
+      - name: blocked_input_messaging
+        value: '{{ blocked_input_messaging }}'
+      - name: blocked_outputs_messaging
+        value: '{{ blocked_outputs_messaging }}'
+      - name: content_policy_config
         value:
-          FiltersConfig:
-            - Type: '{{ Type }}'
-              InputStrength: '{{ InputStrength }}'
-              OutputStrength: null
-              InputModalities:
-                - '{{ InputModalities[0] }}'
-              OutputModalities:
+          filters_config:
+            - type: '{{ type }}'
+              input_strength: '{{ input_strength }}'
+              output_strength: null
+              input_modalities:
+                - '{{ input_modalities[0] }}'
+              output_modalities:
                 - null
-              InputAction: '{{ InputAction }}'
-              OutputAction: null
-              InputEnabled: '{{ InputEnabled }}'
-              OutputEnabled: '{{ OutputEnabled }}'
-          ContentFiltersTierConfig:
-            TierName: '{{ TierName }}'
-      - name: ContextualGroundingPolicyConfig
+              input_action: '{{ input_action }}'
+              output_action: null
+              input_enabled: '{{ input_enabled }}'
+              output_enabled: '{{ output_enabled }}'
+          content_filters_tier_config:
+            tier_name: '{{ tier_name }}'
+      - name: contextual_grounding_policy_config
         value:
-          FiltersConfig:
-            - Type: '{{ Type }}'
-              Threshold: null
-              Action: '{{ Action }}'
-              Enabled: '{{ Enabled }}'
-      - name: CrossRegionConfig
+          filters_config:
+            - type: '{{ type }}'
+              threshold: null
+              action: '{{ action }}'
+              enabled: '{{ enabled }}'
+      - name: cross_region_config
         value:
-          GuardrailProfileArn: '{{ GuardrailProfileArn }}'
-      - name: Description
-        value: '{{ Description }}'
-      - name: KmsKeyArn
-        value: '{{ KmsKeyArn }}'
-      - name: Name
-        value: '{{ Name }}'
-      - name: SensitiveInformationPolicyConfig
+          guardrail_profile_arn: '{{ guardrail_profile_arn }}'
+      - name: description
+        value: '{{ description }}'
+      - name: kms_key_arn
+        value: '{{ kms_key_arn }}'
+      - name: name
+        value: '{{ name }}'
+      - name: sensitive_information_policy_config
         value:
-          PiiEntitiesConfig:
-            - Type: '{{ Type }}'
-              Action: '{{ Action }}'
-              InputAction: null
-              OutputAction: null
-              InputEnabled: '{{ InputEnabled }}'
-              OutputEnabled: '{{ OutputEnabled }}'
-          RegexesConfig:
-            - Name: '{{ Name }}'
-              Description: '{{ Description }}'
-              Pattern: '{{ Pattern }}'
-              Action: null
-              InputAction: null
-              OutputAction: null
-              InputEnabled: '{{ InputEnabled }}'
-              OutputEnabled: '{{ OutputEnabled }}'
-      - name: Tags
+          pii_entities_config:
+            - type: '{{ type }}'
+              action: '{{ action }}'
+              input_action: null
+              output_action: null
+              input_enabled: '{{ input_enabled }}'
+              output_enabled: '{{ output_enabled }}'
+          regexes_config:
+            - name: '{{ name }}'
+              description: '{{ description }}'
+              pattern: '{{ pattern }}'
+              action: null
+              input_action: null
+              output_action: null
+              input_enabled: '{{ input_enabled }}'
+              output_enabled: '{{ output_enabled }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-      - name: TopicPolicyConfig
+          - key: '{{ key }}'
+            value: '{{ value }}'
+      - name: topic_policy_config
         value:
-          TopicsConfig:
-            - Name: '{{ Name }}'
-              Definition: '{{ Definition }}'
-              Examples:
-                - '{{ Examples[0] }}'
-              Type: '{{ Type }}'
-              InputAction: '{{ InputAction }}'
-              OutputAction: null
-              InputEnabled: '{{ InputEnabled }}'
-              OutputEnabled: '{{ OutputEnabled }}'
-          TopicsTierConfig:
-            TierName: '{{ TierName }}'
-      - name: WordPolicyConfig
+          topics_config:
+            - name: '{{ name }}'
+              definition: '{{ definition }}'
+              examples:
+                - '{{ examples[0] }}'
+              type: '{{ type }}'
+              input_action: '{{ input_action }}'
+              output_action: null
+              input_enabled: '{{ input_enabled }}'
+              output_enabled: '{{ output_enabled }}'
+          topics_tier_config:
+            tier_name: '{{ tier_name }}'
+      - name: word_policy_config
         value:
-          WordsConfig:
-            - Text: '{{ Text }}'
-              InputAction: '{{ InputAction }}'
-              OutputAction: null
-              InputEnabled: '{{ InputEnabled }}'
-              OutputEnabled: '{{ OutputEnabled }}'
-          ManagedWordListsConfig:
-            - Type: '{{ Type }}'
-              InputAction: null
-              OutputAction: null
-              InputEnabled: '{{ InputEnabled }}'
-              OutputEnabled: '{{ OutputEnabled }}'
-
+          words_config:
+            - text: '{{ text }}'
+              input_action: '{{ input_action }}'
+              output_action: null
+              input_enabled: '{{ input_enabled }}'
+              output_enabled: '{{ output_enabled }}'
+          managed_word_lists_config:
+            - type: '{{ type }}'
+              input_action: null
+              output_action: null
+              input_enabled: '{{ input_enabled }}'
+              output_enabled: '{{ output_enabled }}'
 ```
 </TabItem>
 </Tabs>
@@ -737,7 +736,7 @@ SET PatchDocument = string('{{ {
     "WordPolicyConfig": word_policy_config
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<GuardrailArn>';
+AND Identifier = '{{ guardrail_arn }}';
 ```
 
 
@@ -746,7 +745,7 @@ AND Identifier = '<GuardrailArn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.bedrock.guardrails
-WHERE Identifier = '<GuardrailArn>'
+WHERE Identifier = '{{ guardrail_arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/bedrock/intelligent_prompt_routers/index.md b/website/docs/services/bedrock/intelligent_prompt_routers/index.md
index 57a16d800..bf7845150 100644
--- a/website/docs/services/bedrock/intelligent_prompt_routers/index.md
+++ b/website/docs/services/bedrock/intelligent_prompt_routers/index.md
@@ -220,7 +220,7 @@ tags,
 type,
 updated_at
 FROM awscc.bedrock.intelligent_prompt_routers
-WHERE region = 'us-east-1' AND Identifier = '<PromptRouterArn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ prompt_router_arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -259,11 +259,11 @@ INSERT INTO awscc.bedrock.intelligent_prompt_routers (
  RoutingCriteria,
  region
 )
-SELECT 
-'{{ FallbackModel }}',
- '{{ Models }}',
- '{{ PromptRouterName }}',
- '{{ RoutingCriteria }}',
+SELECT
+'{{ fallback_model }}',
+ '{{ models }}',
+ '{{ prompt_router_name }}',
+ '{{ routing_criteria }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -280,13 +280,13 @@ INSERT INTO awscc.bedrock.intelligent_prompt_routers (
  Tags,
  region
 )
-SELECT 
- '{{ Description }}',
- '{{ FallbackModel }}',
- '{{ Models }}',
- '{{ PromptRouterName }}',
- '{{ RoutingCriteria }}',
- '{{ Tags }}',
+SELECT
+ '{{ description }}',
+ '{{ fallback_model }}',
+ '{{ models }}',
+ '{{ prompt_router_name }}',
+ '{{ routing_criteria }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -304,24 +304,23 @@ globals:
 resources:
   - name: intelligent_prompt_router
     props:
-      - name: Description
-        value: '{{ Description }}'
-      - name: FallbackModel
+      - name: description
+        value: '{{ description }}'
+      - name: fallback_model
         value:
-          ModelArn: '{{ ModelArn }}'
-      - name: Models
+          model_arn: '{{ model_arn }}'
+      - name: models
         value:
           - null
-      - name: PromptRouterName
-        value: '{{ PromptRouterName }}'
-      - name: RoutingCriteria
+      - name: prompt_router_name
+        value: '{{ prompt_router_name }}'
+      - name: routing_criteria
         value:
-          ResponseQualityDifference: null
-      - name: Tags
+          response_quality_difference: null
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -337,7 +336,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<PromptRouterArn>';
+AND Identifier = '{{ prompt_router_arn }}';
 ```
 
 
@@ -346,7 +345,7 @@ AND Identifier = '<PromptRouterArn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.bedrock.intelligent_prompt_routers
-WHERE Identifier = '<PromptRouterArn>'
+WHERE Identifier = '{{ prompt_router_arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/bedrock/knowledge_bases/index.md b/website/docs/services/bedrock/knowledge_bases/index.md
index c6282ede4..74bcb6e12 100644
--- a/website/docs/services/bedrock/knowledge_bases/index.md
+++ b/website/docs/services/bedrock/knowledge_bases/index.md
@@ -570,7 +570,7 @@ updated_at,
 storage_configuration,
 tags
 FROM awscc.bedrock.knowledge_bases
-WHERE region = 'us-east-1' AND Identifier = '<KnowledgeBaseId>';
+WHERE region = 'us-east-1' AND Identifier = '{{ knowledge_base_id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -608,10 +608,10 @@ INSERT INTO awscc.bedrock.knowledge_bases (
  RoleArn,
  region
 )
-SELECT 
-'{{ KnowledgeBaseConfiguration }}',
- '{{ Name }}',
- '{{ RoleArn }}',
+SELECT
+'{{ knowledge_base_configuration }}',
+ '{{ name }}',
+ '{{ role_arn }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -628,13 +628,13 @@ INSERT INTO awscc.bedrock.knowledge_bases (
  Tags,
  region
 )
-SELECT 
- '{{ Description }}',
- '{{ KnowledgeBaseConfiguration }}',
- '{{ Name }}',
- '{{ RoleArn }}',
- '{{ StorageConfiguration }}',
- '{{ Tags }}',
+SELECT
+ '{{ description }}',
+ '{{ knowledge_base_configuration }}',
+ '{{ name }}',
+ '{{ role_arn }}',
+ '{{ storage_configuration }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -652,121 +652,120 @@ globals:
 resources:
   - name: knowledge_base
     props:
-      - name: Description
-        value: '{{ Description }}'
-      - name: KnowledgeBaseConfiguration
+      - name: description
+        value: '{{ description }}'
+      - name: knowledge_base_configuration
         value:
-          Type: '{{ Type }}'
-          VectorKnowledgeBaseConfiguration:
-            EmbeddingModelArn: '{{ EmbeddingModelArn }}'
-            EmbeddingModelConfiguration:
-              BedrockEmbeddingModelConfiguration:
-                Dimensions: '{{ Dimensions }}'
-                EmbeddingDataType: '{{ EmbeddingDataType }}'
-            SupplementalDataStorageConfiguration:
-              SupplementalDataStorageLocations:
-                - SupplementalDataStorageLocationType: '{{ SupplementalDataStorageLocationType }}'
-                  S3Location:
-                    URI: '{{ URI }}'
-          KendraKnowledgeBaseConfiguration:
-            KendraIndexArn: '{{ KendraIndexArn }}'
-          SqlKnowledgeBaseConfiguration:
-            Type: '{{ Type }}'
-            RedshiftConfiguration:
-              StorageConfigurations:
-                - Type: '{{ Type }}'
-                  AwsDataCatalogConfiguration:
-                    TableNames:
-                      - '{{ TableNames[0] }}'
-                  RedshiftConfiguration:
-                    DatabaseName: '{{ DatabaseName }}'
-              QueryEngineConfiguration:
-                Type: '{{ Type }}'
-                ServerlessConfiguration:
-                  WorkgroupArn: '{{ WorkgroupArn }}'
-                  AuthConfiguration:
-                    Type: '{{ Type }}'
-                    UsernamePasswordSecretArn: '{{ UsernamePasswordSecretArn }}'
-                ProvisionedConfiguration:
-                  ClusterIdentifier: '{{ ClusterIdentifier }}'
-                  AuthConfiguration:
-                    Type: '{{ Type }}'
-                    DatabaseUser: '{{ DatabaseUser }}'
-                    UsernamePasswordSecretArn: null
-              QueryGenerationConfiguration:
-                ExecutionTimeoutSeconds: '{{ ExecutionTimeoutSeconds }}'
-                GenerationContext:
-                  Tables:
-                    - Name: '{{ Name }}'
-                      Description: '{{ Description }}'
-                      Inclusion: '{{ Inclusion }}'
-                      Columns:
-                        - Name: '{{ Name }}'
-                          Description: null
-                          Inclusion: null
-                  CuratedQueries:
-                    - NaturalLanguage: '{{ NaturalLanguage }}'
-                      Sql: '{{ Sql }}'
-      - name: Name
-        value: '{{ Name }}'
-      - name: RoleArn
-        value: '{{ RoleArn }}'
-      - name: StorageConfiguration
+          type: '{{ type }}'
+          vector_knowledge_base_configuration:
+            embedding_model_arn: '{{ embedding_model_arn }}'
+            embedding_model_configuration:
+              bedrock_embedding_model_configuration:
+                dimensions: '{{ dimensions }}'
+                embedding_data_type: '{{ embedding_data_type }}'
+            supplemental_data_storage_configuration:
+              supplemental_data_storage_locations:
+                - supplemental_data_storage_location_type: '{{ supplemental_data_storage_location_type }}'
+                  s3_location:
+                    uri: '{{ uri }}'
+          kendra_knowledge_base_configuration:
+            kendra_index_arn: '{{ kendra_index_arn }}'
+          sql_knowledge_base_configuration:
+            type: '{{ type }}'
+            redshift_configuration:
+              storage_configurations:
+                - type: '{{ type }}'
+                  aws_data_catalog_configuration:
+                    table_names:
+                      - '{{ table_names[0] }}'
+                  redshift_configuration:
+                    database_name: '{{ database_name }}'
+              query_engine_configuration:
+                type: '{{ type }}'
+                serverless_configuration:
+                  workgroup_arn: '{{ workgroup_arn }}'
+                  auth_configuration:
+                    type: '{{ type }}'
+                    username_password_secret_arn: '{{ username_password_secret_arn }}'
+                provisioned_configuration:
+                  cluster_identifier: '{{ cluster_identifier }}'
+                  auth_configuration:
+                    type: '{{ type }}'
+                    database_user: '{{ database_user }}'
+                    username_password_secret_arn: null
+              query_generation_configuration:
+                execution_timeout_seconds: '{{ execution_timeout_seconds }}'
+                generation_context:
+                  tables:
+                    - name: '{{ name }}'
+                      description: '{{ description }}'
+                      inclusion: '{{ inclusion }}'
+                      columns:
+                        - name: '{{ name }}'
+                          description: null
+                          inclusion: null
+                  curated_queries:
+                    - natural_language: '{{ natural_language }}'
+                      sql: '{{ sql }}'
+      - name: name
+        value: '{{ name }}'
+      - name: role_arn
+        value: '{{ role_arn }}'
+      - name: storage_configuration
         value:
-          Type: '{{ Type }}'
-          OpensearchServerlessConfiguration:
-            CollectionArn: '{{ CollectionArn }}'
-            VectorIndexName: '{{ VectorIndexName }}'
-            FieldMapping:
-              VectorField: '{{ VectorField }}'
-              TextField: '{{ TextField }}'
-              MetadataField: '{{ MetadataField }}'
-          PineconeConfiguration:
-            ConnectionString: '{{ ConnectionString }}'
-            CredentialsSecretArn: '{{ CredentialsSecretArn }}'
-            Namespace: '{{ Namespace }}'
-            FieldMapping:
-              TextField: '{{ TextField }}'
-              MetadataField: '{{ MetadataField }}'
-          RdsConfiguration:
-            ResourceArn: '{{ ResourceArn }}'
-            CredentialsSecretArn: '{{ CredentialsSecretArn }}'
-            DatabaseName: '{{ DatabaseName }}'
-            TableName: '{{ TableName }}'
-            FieldMapping:
-              PrimaryKeyField: '{{ PrimaryKeyField }}'
-              VectorField: '{{ VectorField }}'
-              TextField: '{{ TextField }}'
-              MetadataField: '{{ MetadataField }}'
-              CustomMetadataField: '{{ CustomMetadataField }}'
-          MongoDbAtlasConfiguration:
-            Endpoint: '{{ Endpoint }}'
-            CredentialsSecretArn: '{{ CredentialsSecretArn }}'
-            DatabaseName: '{{ DatabaseName }}'
-            CollectionName: '{{ CollectionName }}'
-            VectorIndexName: '{{ VectorIndexName }}'
-            TextIndexName: '{{ TextIndexName }}'
-            EndpointServiceName: '{{ EndpointServiceName }}'
-            FieldMapping:
-              VectorField: '{{ VectorField }}'
-              TextField: '{{ TextField }}'
-              MetadataField: '{{ MetadataField }}'
-          NeptuneAnalyticsConfiguration:
-            GraphArn: '{{ GraphArn }}'
-            FieldMapping:
-              TextField: '{{ TextField }}'
-              MetadataField: '{{ MetadataField }}'
-          OpensearchManagedClusterConfiguration:
-            DomainArn: '{{ DomainArn }}'
-            DomainEndpoint: '{{ DomainEndpoint }}'
-            VectorIndexName: '{{ VectorIndexName }}'
-            FieldMapping:
-              VectorField: '{{ VectorField }}'
-              TextField: '{{ TextField }}'
-              MetadataField: '{{ MetadataField }}'
-      - name: Tags
+          type: '{{ type }}'
+          opensearch_serverless_configuration:
+            collection_arn: '{{ collection_arn }}'
+            vector_index_name: '{{ vector_index_name }}'
+            field_mapping:
+              vector_field: '{{ vector_field }}'
+              text_field: '{{ text_field }}'
+              metadata_field: '{{ metadata_field }}'
+          pinecone_configuration:
+            connection_string: '{{ connection_string }}'
+            credentials_secret_arn: '{{ credentials_secret_arn }}'
+            namespace: '{{ namespace }}'
+            field_mapping:
+              text_field: '{{ text_field }}'
+              metadata_field: '{{ metadata_field }}'
+          rds_configuration:
+            resource_arn: '{{ resource_arn }}'
+            credentials_secret_arn: '{{ credentials_secret_arn }}'
+            database_name: '{{ database_name }}'
+            table_name: '{{ table_name }}'
+            field_mapping:
+              primary_key_field: '{{ primary_key_field }}'
+              vector_field: '{{ vector_field }}'
+              text_field: '{{ text_field }}'
+              metadata_field: '{{ metadata_field }}'
+              custom_metadata_field: '{{ custom_metadata_field }}'
+          mongo_db_atlas_configuration:
+            endpoint: '{{ endpoint }}'
+            credentials_secret_arn: '{{ credentials_secret_arn }}'
+            database_name: '{{ database_name }}'
+            collection_name: '{{ collection_name }}'
+            vector_index_name: '{{ vector_index_name }}'
+            text_index_name: '{{ text_index_name }}'
+            endpoint_service_name: '{{ endpoint_service_name }}'
+            field_mapping:
+              vector_field: '{{ vector_field }}'
+              text_field: '{{ text_field }}'
+              metadata_field: '{{ metadata_field }}'
+          neptune_analytics_configuration:
+            graph_arn: '{{ graph_arn }}'
+            field_mapping:
+              text_field: '{{ text_field }}'
+              metadata_field: '{{ metadata_field }}'
+          opensearch_managed_cluster_configuration:
+            domain_arn: '{{ domain_arn }}'
+            domain_endpoint: '{{ domain_endpoint }}'
+            vector_index_name: '{{ vector_index_name }}'
+            field_mapping:
+              vector_field: '{{ vector_field }}'
+              text_field: '{{ text_field }}'
+              metadata_field: '{{ metadata_field }}'
+      - name: tags
         value: {}
-
 ```
 </TabItem>
 </Tabs>
@@ -785,7 +784,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<KnowledgeBaseId>';
+AND Identifier = '{{ knowledge_base_id }}';
 ```
 
 
@@ -794,7 +793,7 @@ AND Identifier = '<KnowledgeBaseId>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.bedrock.knowledge_bases
-WHERE Identifier = '<KnowledgeBaseId>'
+WHERE Identifier = '{{ knowledge_base_id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/bedrock/prompt_versions/index.md b/website/docs/services/bedrock/prompt_versions/index.md
index a56a028ee..681507a98 100644
--- a/website/docs/services/bedrock/prompt_versions/index.md
+++ b/website/docs/services/bedrock/prompt_versions/index.md
@@ -248,7 +248,7 @@ customer_encryption_key_arn,
 name,
 tags
 FROM awscc.bedrock.prompt_versions
-WHERE region = 'us-east-1' AND Identifier = '<Arn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -284,8 +284,8 @@ INSERT INTO awscc.bedrock.prompt_versions (
  PromptArn,
  region
 )
-SELECT 
-'{{ PromptArn }}',
+SELECT
+'{{ prompt_arn }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -299,10 +299,10 @@ INSERT INTO awscc.bedrock.prompt_versions (
  Tags,
  region
 )
-SELECT 
- '{{ PromptArn }}',
- '{{ Description }}',
- '{{ Tags }}',
+SELECT
+ '{{ prompt_arn }}',
+ '{{ description }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -320,13 +320,12 @@ globals:
 resources:
   - name: prompt_version
     props:
-      - name: PromptArn
-        value: '{{ PromptArn }}'
-      - name: Description
-        value: '{{ Description }}'
-      - name: Tags
+      - name: prompt_arn
+        value: '{{ prompt_arn }}'
+      - name: description
+        value: '{{ description }}'
+      - name: tags
         value: {}
-
 ```
 </TabItem>
 </Tabs>
@@ -337,7 +336,7 @@ resources:
 ```sql
 /*+ delete */
 DELETE FROM awscc.bedrock.prompt_versions
-WHERE Identifier = '<Arn>'
+WHERE Identifier = '{{ arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/bedrock/prompts/index.md b/website/docs/services/bedrock/prompts/index.md
index fc833fe65..e0f0f38fc 100644
--- a/website/docs/services/bedrock/prompts/index.md
+++ b/website/docs/services/bedrock/prompts/index.md
@@ -248,7 +248,7 @@ tags,
 customer_encryption_key_arn,
 version
 FROM awscc.bedrock.prompts
-WHERE region = 'us-east-1' AND Identifier = '<Arn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -284,8 +284,8 @@ INSERT INTO awscc.bedrock.prompts (
  Name,
  region
 )
-SELECT 
-'{{ Name }}',
+SELECT
+'{{ name }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -302,13 +302,13 @@ INSERT INTO awscc.bedrock.prompts (
  CustomerEncryptionKeyArn,
  region
 )
-SELECT 
- '{{ DefaultVariant }}',
- '{{ Description }}',
- '{{ Name }}',
- '{{ Variants }}',
- '{{ Tags }}',
- '{{ CustomerEncryptionKeyArn }}',
+SELECT
+ '{{ default_variant }}',
+ '{{ description }}',
+ '{{ name }}',
+ '{{ variants }}',
+ '{{ tags }}',
+ '{{ customer_encryption_key_arn }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -326,29 +326,28 @@ globals:
 resources:
   - name: prompt
     props:
-      - name: DefaultVariant
-        value: '{{ DefaultVariant }}'
-      - name: Description
-        value: '{{ Description }}'
-      - name: Name
-        value: '{{ Name }}'
-      - name: Variants
+      - name: default_variant
+        value: '{{ default_variant }}'
+      - name: description
+        value: '{{ description }}'
+      - name: name
+        value: '{{ name }}'
+      - name: variants
         value:
-          - Name: '{{ Name }}'
-            TemplateType: '{{ TemplateType }}'
-            TemplateConfiguration: null
-            ModelId: '{{ ModelId }}'
-            InferenceConfiguration: null
-            GenAiResource: null
-            AdditionalModelRequestFields: {}
-            Metadata:
-              - Key: '{{ Key }}'
-                Value: '{{ Value }}'
-      - name: Tags
+          - name: '{{ name }}'
+            template_type: '{{ template_type }}'
+            template_configuration: null
+            model_id: '{{ model_id }}'
+            inference_configuration: null
+            gen_ai_resource: null
+            additional_model_request_fields: {}
+            metadata:
+              - key: '{{ key }}'
+                value: '{{ value }}'
+      - name: tags
         value: {}
-      - name: CustomerEncryptionKeyArn
-        value: '{{ CustomerEncryptionKeyArn }}'
-
+      - name: customer_encryption_key_arn
+        value: '{{ customer_encryption_key_arn }}'
 ```
 </TabItem>
 </Tabs>
@@ -369,7 +368,7 @@ SET PatchDocument = string('{{ {
     "CustomerEncryptionKeyArn": customer_encryption_key_arn
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Arn>';
+AND Identifier = '{{ arn }}';
 ```
 
 
@@ -378,7 +377,7 @@ AND Identifier = '<Arn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.bedrock.prompts
-WHERE Identifier = '<Arn>'
+WHERE Identifier = '{{ arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/billing/billing_views/index.md b/website/docs/services/billing/billing_views/index.md
index 1ce7364da..06aa18545 100644
--- a/website/docs/services/billing/billing_views/index.md
+++ b/website/docs/services/billing/billing_views/index.md
@@ -236,7 +236,7 @@ tags,
 source_views,
 updated_at
 FROM awscc.billing.billing_views
-WHERE region = 'us-east-1' AND Identifier = '<Arn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -273,9 +273,9 @@ INSERT INTO awscc.billing.billing_views (
  SourceViews,
  region
 )
-SELECT 
-'{{ Name }}',
- '{{ SourceViews }}',
+SELECT
+'{{ name }}',
+ '{{ source_views }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -291,12 +291,12 @@ INSERT INTO awscc.billing.billing_views (
  SourceViews,
  region
 )
-SELECT 
- '{{ DataFilterExpression }}',
- '{{ Description }}',
- '{{ Name }}',
- '{{ Tags }}',
- '{{ SourceViews }}',
+SELECT
+ '{{ data_filter_expression }}',
+ '{{ description }}',
+ '{{ name }}',
+ '{{ tags }}',
+ '{{ source_views }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -314,28 +314,27 @@ globals:
 resources:
   - name: billing_view
     props:
-      - name: DataFilterExpression
+      - name: data_filter_expression
         value:
-          Dimensions:
-            Key: '{{ Key }}'
-            Values:
-              - '{{ Values[0] }}'
-          Tags:
-            Key: '{{ Key }}'
-            Values:
-              - '{{ Values[0] }}'
-      - name: Description
-        value: '{{ Description }}'
-      - name: Name
-        value: '{{ Name }}'
-      - name: Tags
+          dimensions:
+            key: '{{ key }}'
+            values:
+              - '{{ values[0] }}'
+          tags:
+            key: '{{ key }}'
+            values:
+              - '{{ values[0] }}'
+      - name: description
+        value: '{{ description }}'
+      - name: name
+        value: '{{ name }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-      - name: SourceViews
+          - key: '{{ key }}'
+            value: '{{ value }}'
+      - name: source_views
         value:
-          - '{{ SourceViews[0] }}'
-
+          - '{{ source_views[0] }}'
 ```
 </TabItem>
 </Tabs>
@@ -352,7 +351,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Arn>';
+AND Identifier = '{{ arn }}';
 ```
 
 
@@ -361,7 +360,7 @@ AND Identifier = '<Arn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.billing.billing_views
-WHERE Identifier = '<Arn>'
+WHERE Identifier = '{{ arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/billingconductor/billing_groups/index.md b/website/docs/services/billingconductor/billing_groups/index.md
index 665c37b26..088ac2962 100644
--- a/website/docs/services/billingconductor/billing_groups/index.md
+++ b/website/docs/services/billingconductor/billing_groups/index.md
@@ -231,7 +231,7 @@ creation_time,
 last_modified_time,
 tags
 FROM awscc.billingconductor.billing_groups
-WHERE region = 'us-east-1' AND Identifier = '<Arn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -270,11 +270,11 @@ INSERT INTO awscc.billingconductor.billing_groups (
  AccountGrouping,
  region
 )
-SELECT 
-'{{ Name }}',
- '{{ PrimaryAccountId }}',
- '{{ ComputationPreference }}',
- '{{ AccountGrouping }}',
+SELECT
+'{{ name }}',
+ '{{ primary_account_id }}',
+ '{{ computation_preference }}',
+ '{{ account_grouping }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -291,13 +291,13 @@ INSERT INTO awscc.billingconductor.billing_groups (
  Tags,
  region
 )
-SELECT 
- '{{ Name }}',
- '{{ Description }}',
- '{{ PrimaryAccountId }}',
- '{{ ComputationPreference }}',
- '{{ AccountGrouping }}',
- '{{ Tags }}',
+SELECT
+ '{{ name }}',
+ '{{ description }}',
+ '{{ primary_account_id }}',
+ '{{ computation_preference }}',
+ '{{ account_grouping }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -315,25 +315,24 @@ globals:
 resources:
   - name: billing_group
     props:
-      - name: Name
-        value: '{{ Name }}'
-      - name: Description
-        value: '{{ Description }}'
-      - name: PrimaryAccountId
-        value: '{{ PrimaryAccountId }}'
-      - name: ComputationPreference
+      - name: name
+        value: '{{ name }}'
+      - name: description
+        value: '{{ description }}'
+      - name: primary_account_id
+        value: '{{ primary_account_id }}'
+      - name: computation_preference
         value:
-          PricingPlanArn: '{{ PricingPlanArn }}'
-      - name: AccountGrouping
+          pricing_plan_arn: '{{ pricing_plan_arn }}'
+      - name: account_grouping
         value:
-          LinkedAccountIds:
-            - '{{ LinkedAccountIds[0] }}'
-          AutoAssociate: '{{ AutoAssociate }}'
-      - name: Tags
+          linked_account_ids:
+            - '{{ linked_account_ids[0] }}'
+          auto_associate: '{{ auto_associate }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -353,7 +352,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Arn>';
+AND Identifier = '{{ arn }}';
 ```
 
 
@@ -362,7 +361,7 @@ AND Identifier = '<Arn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.billingconductor.billing_groups
-WHERE Identifier = '<Arn>'
+WHERE Identifier = '{{ arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/billingconductor/custom_line_items/index.md b/website/docs/services/billingconductor/custom_line_items/index.md
index 44e916cb2..a912f17df 100644
--- a/website/docs/services/billingconductor/custom_line_items/index.md
+++ b/website/docs/services/billingconductor/custom_line_items/index.md
@@ -288,7 +288,7 @@ currency_code,
 account_id,
 tags
 FROM awscc.billingconductor.custom_line_items
-WHERE region = 'us-east-1' AND Identifier = '<Arn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -325,9 +325,9 @@ INSERT INTO awscc.billingconductor.custom_line_items (
  BillingGroupArn,
  region
 )
-SELECT 
-'{{ Name }}',
- '{{ BillingGroupArn }}',
+SELECT
+'{{ name }}',
+ '{{ billing_group_arn }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -345,14 +345,14 @@ INSERT INTO awscc.billingconductor.custom_line_items (
  Tags,
  region
 )
-SELECT 
- '{{ Name }}',
- '{{ Description }}',
- '{{ CustomLineItemChargeDetails }}',
- '{{ BillingGroupArn }}',
- '{{ BillingPeriodRange }}',
- '{{ AccountId }}',
- '{{ Tags }}',
+SELECT
+ '{{ name }}',
+ '{{ description }}',
+ '{{ custom_line_item_charge_details }}',
+ '{{ billing_group_arn }}',
+ '{{ billing_period_range }}',
+ '{{ account_id }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -370,37 +370,36 @@ globals:
 resources:
   - name: custom_line_item
     props:
-      - name: Name
-        value: '{{ Name }}'
-      - name: Description
-        value: '{{ Description }}'
-      - name: CustomLineItemChargeDetails
+      - name: name
+        value: '{{ name }}'
+      - name: description
+        value: '{{ description }}'
+      - name: custom_line_item_charge_details
         value:
-          Flat:
-            ChargeValue: null
-          Percentage:
-            ChildAssociatedResources:
-              - '{{ ChildAssociatedResources[0] }}'
-            PercentageValue: null
-          Type: '{{ Type }}'
-          LineItemFilters:
-            - Attribute: '{{ Attribute }}'
-              MatchOption: '{{ MatchOption }}'
-              Values:
-                - '{{ Values[0] }}'
-      - name: BillingGroupArn
-        value: '{{ BillingGroupArn }}'
-      - name: BillingPeriodRange
+          flat:
+            charge_value: null
+          percentage:
+            child_associated_resources:
+              - '{{ child_associated_resources[0] }}'
+            percentage_value: null
+          type: '{{ type }}'
+          line_item_filters:
+            - attribute: '{{ attribute }}'
+              match_option: '{{ match_option }}'
+              values:
+                - '{{ values[0] }}'
+      - name: billing_group_arn
+        value: '{{ billing_group_arn }}'
+      - name: billing_period_range
         value:
-          InclusiveStartBillingPeriod: '{{ InclusiveStartBillingPeriod }}'
-          ExclusiveEndBillingPeriod: '{{ ExclusiveEndBillingPeriod }}'
-      - name: AccountId
-        value: '{{ AccountId }}'
-      - name: Tags
+          inclusive_start_billing_period: '{{ inclusive_start_billing_period }}'
+          exclusive_end_billing_period: '{{ exclusive_end_billing_period }}'
+      - name: account_id
+        value: '{{ account_id }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -418,7 +417,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Arn>';
+AND Identifier = '{{ arn }}';
 ```
 
 
@@ -427,7 +426,7 @@ AND Identifier = '<Arn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.billingconductor.custom_line_items
-WHERE Identifier = '<Arn>'
+WHERE Identifier = '{{ arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/billingconductor/pricing_plans/index.md b/website/docs/services/billingconductor/pricing_plans/index.md
index 641627b16..bb0d77e32 100644
--- a/website/docs/services/billingconductor/pricing_plans/index.md
+++ b/website/docs/services/billingconductor/pricing_plans/index.md
@@ -188,7 +188,7 @@ creation_time,
 last_modified_time,
 tags
 FROM awscc.billingconductor.pricing_plans
-WHERE region = 'us-east-1' AND Identifier = '<Arn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -224,8 +224,8 @@ INSERT INTO awscc.billingconductor.pricing_plans (
  Name,
  region
 )
-SELECT 
-'{{ Name }}',
+SELECT
+'{{ name }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -240,11 +240,11 @@ INSERT INTO awscc.billingconductor.pricing_plans (
  Tags,
  region
 )
-SELECT 
- '{{ Name }}',
- '{{ PricingRuleArns }}',
- '{{ Description }}',
- '{{ Tags }}',
+SELECT
+ '{{ name }}',
+ '{{ pricing_rule_arns }}',
+ '{{ description }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -262,18 +262,17 @@ globals:
 resources:
   - name: pricing_plan
     props:
-      - name: Name
-        value: '{{ Name }}'
-      - name: PricingRuleArns
+      - name: name
+        value: '{{ name }}'
+      - name: pricing_rule_arns
         value:
-          - '{{ PricingRuleArns[0] }}'
-      - name: Description
-        value: '{{ Description }}'
-      - name: Tags
+          - '{{ pricing_rule_arns[0] }}'
+      - name: description
+        value: '{{ description }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -292,7 +291,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Arn>';
+AND Identifier = '{{ arn }}';
 ```
 
 
@@ -301,7 +300,7 @@ AND Identifier = '<Arn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.billingconductor.pricing_plans
-WHERE Identifier = '<Arn>'
+WHERE Identifier = '{{ arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/billingconductor/pricing_rules/index.md b/website/docs/services/billingconductor/pricing_rules/index.md
index 162e2211d..82ff564d6 100644
--- a/website/docs/services/billingconductor/pricing_rules/index.md
+++ b/website/docs/services/billingconductor/pricing_rules/index.md
@@ -244,7 +244,7 @@ creation_time,
 last_modified_time,
 tags
 FROM awscc.billingconductor.pricing_rules
-WHERE region = 'us-east-1' AND Identifier = '<Arn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -282,10 +282,10 @@ INSERT INTO awscc.billingconductor.pricing_rules (
  Type,
  region
 )
-SELECT 
-'{{ Name }}',
- '{{ Scope }}',
- '{{ Type }}',
+SELECT
+'{{ name }}',
+ '{{ scope }}',
+ '{{ type }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -307,18 +307,18 @@ INSERT INTO awscc.billingconductor.pricing_rules (
  Tags,
  region
 )
-SELECT 
- '{{ Name }}',
- '{{ Description }}',
- '{{ Scope }}',
- '{{ Type }}',
- '{{ ModifierPercentage }}',
- '{{ Service }}',
- '{{ BillingEntity }}',
- '{{ Tiering }}',
- '{{ UsageType }}',
- '{{ Operation }}',
- '{{ Tags }}',
+SELECT
+ '{{ name }}',
+ '{{ description }}',
+ '{{ scope }}',
+ '{{ type }}',
+ '{{ modifier_percentage }}',
+ '{{ service }}',
+ '{{ billing_entity }}',
+ '{{ tiering }}',
+ '{{ usage_type }}',
+ '{{ operation }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -336,33 +336,32 @@ globals:
 resources:
   - name: pricing_rule
     props:
-      - name: Name
-        value: '{{ Name }}'
-      - name: Description
-        value: '{{ Description }}'
-      - name: Scope
-        value: '{{ Scope }}'
-      - name: Type
-        value: '{{ Type }}'
-      - name: ModifierPercentage
+      - name: name
+        value: '{{ name }}'
+      - name: description
+        value: '{{ description }}'
+      - name: scope
+        value: '{{ scope }}'
+      - name: type
+        value: '{{ type }}'
+      - name: modifier_percentage
         value: null
-      - name: Service
-        value: '{{ Service }}'
-      - name: BillingEntity
-        value: '{{ BillingEntity }}'
-      - name: Tiering
+      - name: service
+        value: '{{ service }}'
+      - name: billing_entity
+        value: '{{ billing_entity }}'
+      - name: tiering
         value:
-          FreeTier:
-            Activated: '{{ Activated }}'
-      - name: UsageType
-        value: '{{ UsageType }}'
-      - name: Operation
-        value: '{{ Operation }}'
-      - name: Tags
+          free_tier:
+            activated: '{{ activated }}'
+      - name: usage_type
+        value: '{{ usage_type }}'
+      - name: operation
+        value: '{{ operation }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -383,7 +382,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Arn>';
+AND Identifier = '{{ arn }}';
 ```
 
 
@@ -392,7 +391,7 @@ AND Identifier = '<Arn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.billingconductor.pricing_rules
-WHERE Identifier = '<Arn>'
+WHERE Identifier = '{{ arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/budgets/budgets_actions/index.md b/website/docs/services/budgets/budgets_actions/index.md
index 15d86b12f..7f51b0a95 100644
--- a/website/docs/services/budgets/budgets_actions/index.md
+++ b/website/docs/services/budgets/budgets_actions/index.md
@@ -297,7 +297,7 @@ subscribers,
 definition,
 resource_tags
 FROM awscc.budgets.budgets_actions
-WHERE region = 'us-east-1' AND Identifier = '<ActionId>|<BudgetName>';
+WHERE region = 'us-east-1' AND Identifier = '{{ action_id }}|{{ budget_name }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -340,14 +340,14 @@ INSERT INTO awscc.budgets.budgets_actions (
  Definition,
  region
 )
-SELECT 
-'{{ BudgetName }}',
- '{{ NotificationType }}',
- '{{ ActionType }}',
- '{{ ActionThreshold }}',
- '{{ ExecutionRoleArn }}',
- '{{ Subscribers }}',
- '{{ Definition }}',
+SELECT
+'{{ budget_name }}',
+ '{{ notification_type }}',
+ '{{ action_type }}',
+ '{{ action_threshold }}',
+ '{{ execution_role_arn }}',
+ '{{ subscribers }}',
+ '{{ definition }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -367,16 +367,16 @@ INSERT INTO awscc.budgets.budgets_actions (
  ResourceTags,
  region
 )
-SELECT 
- '{{ BudgetName }}',
- '{{ NotificationType }}',
- '{{ ActionType }}',
- '{{ ActionThreshold }}',
- '{{ ExecutionRoleArn }}',
- '{{ ApprovalModel }}',
- '{{ Subscribers }}',
- '{{ Definition }}',
- '{{ ResourceTags }}',
+SELECT
+ '{{ budget_name }}',
+ '{{ notification_type }}',
+ '{{ action_type }}',
+ '{{ action_threshold }}',
+ '{{ execution_role_arn }}',
+ '{{ approval_model }}',
+ '{{ subscribers }}',
+ '{{ definition }}',
+ '{{ resource_tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -394,48 +394,47 @@ globals:
 resources:
   - name: budgets_action
     props:
-      - name: BudgetName
-        value: '{{ BudgetName }}'
-      - name: NotificationType
-        value: '{{ NotificationType }}'
-      - name: ActionType
-        value: '{{ ActionType }}'
-      - name: ActionThreshold
+      - name: budget_name
+        value: '{{ budget_name }}'
+      - name: notification_type
+        value: '{{ notification_type }}'
+      - name: action_type
+        value: '{{ action_type }}'
+      - name: action_threshold
         value:
-          Value: null
-          Type: '{{ Type }}'
-      - name: ExecutionRoleArn
-        value: '{{ ExecutionRoleArn }}'
-      - name: ApprovalModel
-        value: '{{ ApprovalModel }}'
-      - name: Subscribers
+          value: null
+          type: '{{ type }}'
+      - name: execution_role_arn
+        value: '{{ execution_role_arn }}'
+      - name: approval_model
+        value: '{{ approval_model }}'
+      - name: subscribers
         value:
-          - Type: '{{ Type }}'
-            Address: '{{ Address }}'
-      - name: Definition
+          - type: '{{ type }}'
+            address: '{{ address }}'
+      - name: definition
         value:
-          IamActionDefinition:
-            PolicyArn: '{{ PolicyArn }}'
-            Roles:
-              - '{{ Roles[0] }}'
-            Groups:
-              - '{{ Groups[0] }}'
-            Users:
-              - '{{ Users[0] }}'
-          ScpActionDefinition:
-            PolicyId: '{{ PolicyId }}'
-            TargetIds:
-              - '{{ TargetIds[0] }}'
-          SsmActionDefinition:
-            Subtype: '{{ Subtype }}'
-            Region: '{{ Region }}'
-            InstanceIds:
-              - '{{ InstanceIds[0] }}'
-      - name: ResourceTags
+          iam_action_definition:
+            policy_arn: '{{ policy_arn }}'
+            roles:
+              - '{{ roles[0] }}'
+            groups:
+              - '{{ groups[0] }}'
+            users:
+              - '{{ users[0] }}'
+          scp_action_definition:
+            policy_id: '{{ policy_id }}'
+            target_ids:
+              - '{{ target_ids[0] }}'
+          ssm_action_definition:
+            subtype: '{{ subtype }}'
+            region: '{{ region }}'
+            instance_ids:
+              - '{{ instance_ids[0] }}'
+      - name: resource_tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -457,7 +456,7 @@ SET PatchDocument = string('{{ {
     "ResourceTags": resource_tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<ActionId>|<BudgetName>';
+AND Identifier = '{{ action_id }}|{{ budget_name }}';
 ```
 
 
@@ -466,7 +465,7 @@ AND Identifier = '<ActionId>|<BudgetName>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.budgets.budgets_actions
-WHERE Identifier = '<ActionId|BudgetName>'
+WHERE Identifier = '{{ action_id }}|{{ budget_name }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/cassandra/keyspaces/index.md b/website/docs/services/cassandra/keyspaces/index.md
index 263b9750f..92dbb9170 100644
--- a/website/docs/services/cassandra/keyspaces/index.md
+++ b/website/docs/services/cassandra/keyspaces/index.md
@@ -176,7 +176,7 @@ tags,
 replication_specification,
 client_side_timestamps_enabled
 FROM awscc.cassandra.keyspaces
-WHERE region = 'us-east-1' AND Identifier = '<KeyspaceName>';
+WHERE region = 'us-east-1' AND Identifier = '{{ keyspace_name }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -212,7 +212,7 @@ INSERT INTO awscc.cassandra.keyspaces (
  ,
  region
 )
-SELECT 
+SELECT
 '{{  }}',
 '{{ region }}';
 ```
@@ -228,11 +228,11 @@ INSERT INTO awscc.cassandra.keyspaces (
  ClientSideTimestampsEnabled,
  region
 )
-SELECT 
- '{{ KeyspaceName }}',
- '{{ Tags }}',
- '{{ ReplicationSpecification }}',
- '{{ ClientSideTimestampsEnabled }}',
+SELECT
+ '{{ keyspace_name }}',
+ '{{ tags }}',
+ '{{ replication_specification }}',
+ '{{ client_side_timestamps_enabled }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -250,20 +250,19 @@ globals:
 resources:
   - name: keyspace
     props:
-      - name: KeyspaceName
-        value: '{{ KeyspaceName }}'
-      - name: Tags
+      - name: keyspace_name
+        value: '{{ keyspace_name }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-      - name: ReplicationSpecification
+          - key: '{{ key }}'
+            value: '{{ value }}'
+      - name: replication_specification
         value:
-          ReplicationStrategy: '{{ ReplicationStrategy }}'
-          RegionList:
-            - '{{ RegionList[0] }}'
-      - name: ClientSideTimestampsEnabled
-        value: '{{ ClientSideTimestampsEnabled }}'
-
+          replication_strategy: '{{ replication_strategy }}'
+          region_list:
+            - '{{ region_list[0] }}'
+      - name: client_side_timestamps_enabled
+        value: '{{ client_side_timestamps_enabled }}'
 ```
 </TabItem>
 </Tabs>
@@ -281,7 +280,7 @@ SET PatchDocument = string('{{ {
     "ClientSideTimestampsEnabled": client_side_timestamps_enabled
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<KeyspaceName>';
+AND Identifier = '{{ keyspace_name }}';
 ```
 
 
@@ -290,7 +289,7 @@ AND Identifier = '<KeyspaceName>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.cassandra.keyspaces
-WHERE Identifier = '<KeyspaceName>'
+WHERE Identifier = '{{ keyspace_name }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/cassandra/tables/index.md b/website/docs/services/cassandra/tables/index.md
index a7d8a9478..c5a10499c 100644
--- a/website/docs/services/cassandra/tables/index.md
+++ b/website/docs/services/cassandra/tables/index.md
@@ -383,7 +383,7 @@ auto_scaling_specifications,
 cdc_specification,
 replica_specifications
 FROM awscc.cassandra.tables
-WHERE region = 'us-east-1' AND Identifier = '<KeyspaceName>|<TableName>';
+WHERE region = 'us-east-1' AND Identifier = '{{ keyspace_name }}|{{ table_name }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -421,9 +421,9 @@ INSERT INTO awscc.cassandra.tables (
  PartitionKeyColumns,
  region
 )
-SELECT 
-'{{ KeyspaceName }}',
- '{{ PartitionKeyColumns }}',
+SELECT
+'{{ keyspace_name }}',
+ '{{ partition_key_columns }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -448,21 +448,21 @@ INSERT INTO awscc.cassandra.tables (
  ReplicaSpecifications,
  region
 )
-SELECT 
- '{{ KeyspaceName }}',
- '{{ TableName }}',
- '{{ RegularColumns }}',
- '{{ PartitionKeyColumns }}',
- '{{ ClusteringKeyColumns }}',
- '{{ BillingMode }}',
- '{{ PointInTimeRecoveryEnabled }}',
- '{{ ClientSideTimestampsEnabled }}',
- '{{ Tags }}',
- '{{ DefaultTimeToLive }}',
- '{{ EncryptionSpecification }}',
- '{{ AutoScalingSpecifications }}',
- '{{ CdcSpecification }}',
- '{{ ReplicaSpecifications }}',
+SELECT
+ '{{ keyspace_name }}',
+ '{{ table_name }}',
+ '{{ regular_columns }}',
+ '{{ partition_key_columns }}',
+ '{{ clustering_key_columns }}',
+ '{{ billing_mode }}',
+ '{{ point_in_time_recovery_enabled }}',
+ '{{ client_side_timestamps_enabled }}',
+ '{{ tags }}',
+ '{{ default_time_to_live }}',
+ '{{ encryption_specification }}',
+ '{{ auto_scaling_specifications }}',
+ '{{ cdc_specification }}',
+ '{{ replica_specifications }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -480,66 +480,65 @@ globals:
 resources:
   - name: table
     props:
-      - name: KeyspaceName
-        value: '{{ KeyspaceName }}'
-      - name: TableName
-        value: '{{ TableName }}'
-      - name: RegularColumns
+      - name: keyspace_name
+        value: '{{ keyspace_name }}'
+      - name: table_name
+        value: '{{ table_name }}'
+      - name: regular_columns
         value:
-          - ColumnName: '{{ ColumnName }}'
-            ColumnType: '{{ ColumnType }}'
-      - name: PartitionKeyColumns
+          - column_name: '{{ column_name }}'
+            column_type: '{{ column_type }}'
+      - name: partition_key_columns
         value:
           - null
-      - name: ClusteringKeyColumns
+      - name: clustering_key_columns
         value:
-          - Column: null
-            OrderBy: '{{ OrderBy }}'
-      - name: BillingMode
+          - column: null
+            order_by: '{{ order_by }}'
+      - name: billing_mode
         value:
-          Mode: '{{ Mode }}'
-          ProvisionedThroughput:
-            ReadCapacityUnits: '{{ ReadCapacityUnits }}'
-            WriteCapacityUnits: '{{ WriteCapacityUnits }}'
-      - name: PointInTimeRecoveryEnabled
-        value: '{{ PointInTimeRecoveryEnabled }}'
-      - name: ClientSideTimestampsEnabled
-        value: '{{ ClientSideTimestampsEnabled }}'
-      - name: Tags
+          mode: '{{ mode }}'
+          provisioned_throughput:
+            read_capacity_units: '{{ read_capacity_units }}'
+            write_capacity_units: '{{ write_capacity_units }}'
+      - name: point_in_time_recovery_enabled
+        value: '{{ point_in_time_recovery_enabled }}'
+      - name: client_side_timestamps_enabled
+        value: '{{ client_side_timestamps_enabled }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-      - name: DefaultTimeToLive
-        value: '{{ DefaultTimeToLive }}'
-      - name: EncryptionSpecification
+          - key: '{{ key }}'
+            value: '{{ value }}'
+      - name: default_time_to_live
+        value: '{{ default_time_to_live }}'
+      - name: encryption_specification
         value:
-          EncryptionType: '{{ EncryptionType }}'
-          KmsKeyIdentifier: '{{ KmsKeyIdentifier }}'
-      - name: AutoScalingSpecifications
+          encryption_type: '{{ encryption_type }}'
+          kms_key_identifier: '{{ kms_key_identifier }}'
+      - name: auto_scaling_specifications
         value:
-          WriteCapacityAutoScaling:
-            AutoScalingDisabled: '{{ AutoScalingDisabled }}'
-            MinimumUnits: '{{ MinimumUnits }}'
-            MaximumUnits: '{{ MaximumUnits }}'
-            ScalingPolicy:
-              TargetTrackingScalingPolicyConfiguration:
-                DisableScaleIn: '{{ DisableScaleIn }}'
-                ScaleInCooldown: '{{ ScaleInCooldown }}'
-                ScaleOutCooldown: '{{ ScaleOutCooldown }}'
-                TargetValue: '{{ TargetValue }}'
-          ReadCapacityAutoScaling: null
-      - name: CdcSpecification
+          write_capacity_auto_scaling:
+            auto_scaling_disabled: '{{ auto_scaling_disabled }}'
+            minimum_units: '{{ minimum_units }}'
+            maximum_units: '{{ maximum_units }}'
+            scaling_policy:
+              target_tracking_scaling_policy_configuration:
+                disable_scale_in: '{{ disable_scale_in }}'
+                scale_in_cooldown: '{{ scale_in_cooldown }}'
+                scale_out_cooldown: '{{ scale_out_cooldown }}'
+                target_value: '{{ target_value }}'
+          read_capacity_auto_scaling: null
+      - name: cdc_specification
         value:
-          Status: '{{ Status }}'
-          ViewType: '{{ ViewType }}'
-          Tags:
+          status: '{{ status }}'
+          view_type: '{{ view_type }}'
+          tags:
             - null
-      - name: ReplicaSpecifications
+      - name: replica_specifications
         value:
-          - Region: '{{ Region }}'
-            ReadCapacityUnits: '{{ ReadCapacityUnits }}'
-            ReadCapacityAutoScaling: null
-
+          - region: '{{ region }}'
+            read_capacity_units: '{{ read_capacity_units }}'
+            read_capacity_auto_scaling: null
 ```
 </TabItem>
 </Tabs>
@@ -563,7 +562,7 @@ SET PatchDocument = string('{{ {
     "ReplicaSpecifications": replica_specifications
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<KeyspaceName>|<TableName>';
+AND Identifier = '{{ keyspace_name }}|{{ table_name }}';
 ```
 
 
@@ -572,7 +571,7 @@ AND Identifier = '<KeyspaceName>|<TableName>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.cassandra.tables
-WHERE Identifier = '<KeyspaceName|TableName>'
+WHERE Identifier = '{{ keyspace_name }}|{{ table_name }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/cassandra/types/index.md b/website/docs/services/cassandra/types/index.md
index 468bd9533..e44f6411c 100644
--- a/website/docs/services/cassandra/types/index.md
+++ b/website/docs/services/cassandra/types/index.md
@@ -187,7 +187,7 @@ max_nesting_depth,
 last_modified_timestamp,
 keyspace_arn
 FROM awscc.cassandra.types
-WHERE region = 'us-east-1' AND Identifier = '<KeyspaceName>|<TypeName>';
+WHERE region = 'us-east-1' AND Identifier = '{{ keyspace_name }}|{{ type_name }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -226,10 +226,10 @@ INSERT INTO awscc.cassandra.types (
  Fields,
  region
 )
-SELECT 
-'{{ KeyspaceName }}',
- '{{ TypeName }}',
- '{{ Fields }}',
+SELECT
+'{{ keyspace_name }}',
+ '{{ type_name }}',
+ '{{ fields }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -243,10 +243,10 @@ INSERT INTO awscc.cassandra.types (
  Fields,
  region
 )
-SELECT 
- '{{ KeyspaceName }}',
- '{{ TypeName }}',
- '{{ Fields }}',
+SELECT
+ '{{ keyspace_name }}',
+ '{{ type_name }}',
+ '{{ fields }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -264,15 +264,14 @@ globals:
 resources:
   - name: type
     props:
-      - name: KeyspaceName
-        value: '{{ KeyspaceName }}'
-      - name: TypeName
-        value: '{{ TypeName }}'
-      - name: Fields
+      - name: keyspace_name
+        value: '{{ keyspace_name }}'
+      - name: type_name
+        value: '{{ type_name }}'
+      - name: fields
         value:
-          - FieldName: '{{ FieldName }}'
-            FieldType: '{{ FieldType }}'
-
+          - field_name: '{{ field_name }}'
+            field_type: '{{ field_type }}'
 ```
 </TabItem>
 </Tabs>
@@ -283,7 +282,7 @@ resources:
 ```sql
 /*+ delete */
 DELETE FROM awscc.cassandra.types
-WHERE Identifier = '<KeyspaceName|TypeName>'
+WHERE Identifier = '{{ keyspace_name }}|{{ type_name }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/ce/anomaly_monitors/index.md b/website/docs/services/ce/anomaly_monitors/index.md
index b9cc270e3..c68d5aa64 100644
--- a/website/docs/services/ce/anomaly_monitors/index.md
+++ b/website/docs/services/ce/anomaly_monitors/index.md
@@ -200,7 +200,7 @@ monitor_specification,
 dimensional_value_count,
 resource_tags
 FROM awscc.ce.anomaly_monitors
-WHERE region = 'us-east-1' AND Identifier = '<MonitorArn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ monitor_arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -237,9 +237,9 @@ INSERT INTO awscc.ce.anomaly_monitors (
  MonitorName,
  region
 )
-SELECT 
-'{{ MonitorType }}',
- '{{ MonitorName }}',
+SELECT
+'{{ monitor_type }}',
+ '{{ monitor_name }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -255,12 +255,12 @@ INSERT INTO awscc.ce.anomaly_monitors (
  ResourceTags,
  region
 )
-SELECT 
- '{{ MonitorType }}',
- '{{ MonitorName }}',
- '{{ MonitorDimension }}',
- '{{ MonitorSpecification }}',
- '{{ ResourceTags }}',
+SELECT
+ '{{ monitor_type }}',
+ '{{ monitor_name }}',
+ '{{ monitor_dimension }}',
+ '{{ monitor_specification }}',
+ '{{ resource_tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -278,19 +278,18 @@ globals:
 resources:
   - name: anomaly_monitor
     props:
-      - name: MonitorType
-        value: '{{ MonitorType }}'
-      - name: MonitorName
-        value: '{{ MonitorName }}'
-      - name: MonitorDimension
-        value: '{{ MonitorDimension }}'
-      - name: MonitorSpecification
-        value: '{{ MonitorSpecification }}'
-      - name: ResourceTags
+      - name: monitor_type
+        value: '{{ monitor_type }}'
+      - name: monitor_name
+        value: '{{ monitor_name }}'
+      - name: monitor_dimension
+        value: '{{ monitor_dimension }}'
+      - name: monitor_specification
+        value: '{{ monitor_specification }}'
+      - name: resource_tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -306,7 +305,7 @@ SET PatchDocument = string('{{ {
     "MonitorName": monitor_name
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<MonitorArn>';
+AND Identifier = '{{ monitor_arn }}';
 ```
 
 
@@ -315,7 +314,7 @@ AND Identifier = '<MonitorArn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.ce.anomaly_monitors
-WHERE Identifier = '<MonitorArn>'
+WHERE Identifier = '{{ monitor_arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/ce/anomaly_subscriptions/index.md b/website/docs/services/ce/anomaly_subscriptions/index.md
index f9b27ae24..8b0b348af 100644
--- a/website/docs/services/ce/anomaly_subscriptions/index.md
+++ b/website/docs/services/ce/anomaly_subscriptions/index.md
@@ -211,7 +211,7 @@ threshold_expression,
 frequency,
 resource_tags
 FROM awscc.ce.anomaly_subscriptions
-WHERE region = 'us-east-1' AND Identifier = '<SubscriptionArn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ subscription_arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -250,11 +250,11 @@ INSERT INTO awscc.ce.anomaly_subscriptions (
  Frequency,
  region
 )
-SELECT 
-'{{ SubscriptionName }}',
- '{{ MonitorArnList }}',
- '{{ Subscribers }}',
- '{{ Frequency }}',
+SELECT
+'{{ subscription_name }}',
+ '{{ monitor_arn_list }}',
+ '{{ subscribers }}',
+ '{{ frequency }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -272,14 +272,14 @@ INSERT INTO awscc.ce.anomaly_subscriptions (
  ResourceTags,
  region
 )
-SELECT 
- '{{ SubscriptionName }}',
- '{{ MonitorArnList }}',
- '{{ Subscribers }}',
- '{{ Threshold }}',
- '{{ ThresholdExpression }}',
- '{{ Frequency }}',
- '{{ ResourceTags }}',
+SELECT
+ '{{ subscription_name }}',
+ '{{ monitor_arn_list }}',
+ '{{ subscribers }}',
+ '{{ threshold }}',
+ '{{ threshold_expression }}',
+ '{{ frequency }}',
+ '{{ resource_tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -297,27 +297,26 @@ globals:
 resources:
   - name: anomaly_subscription
     props:
-      - name: SubscriptionName
-        value: '{{ SubscriptionName }}'
-      - name: MonitorArnList
+      - name: subscription_name
+        value: '{{ subscription_name }}'
+      - name: monitor_arn_list
         value:
-          - '{{ MonitorArnList[0] }}'
-      - name: Subscribers
+          - '{{ monitor_arn_list[0] }}'
+      - name: subscribers
         value:
-          - Address: '{{ Address }}'
-            Status: '{{ Status }}'
-            Type: '{{ Type }}'
-      - name: Threshold
+          - address: '{{ address }}'
+            status: '{{ status }}'
+            type: '{{ type }}'
+      - name: threshold
         value: null
-      - name: ThresholdExpression
-        value: '{{ ThresholdExpression }}'
-      - name: Frequency
-        value: '{{ Frequency }}'
-      - name: ResourceTags
+      - name: threshold_expression
+        value: '{{ threshold_expression }}'
+      - name: frequency
+        value: '{{ frequency }}'
+      - name: resource_tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -337,7 +336,7 @@ SET PatchDocument = string('{{ {
     "Frequency": frequency
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<SubscriptionArn>';
+AND Identifier = '{{ subscription_arn }}';
 ```
 
 
@@ -346,7 +345,7 @@ AND Identifier = '<SubscriptionArn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.ce.anomaly_subscriptions
-WHERE Identifier = '<SubscriptionArn>'
+WHERE Identifier = '{{ subscription_arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/ce/cost_categories/index.md b/website/docs/services/ce/cost_categories/index.md
index 847f128ea..0dfa526f8 100644
--- a/website/docs/services/ce/cost_categories/index.md
+++ b/website/docs/services/ce/cost_categories/index.md
@@ -188,7 +188,7 @@ split_charge_rules,
 default_value,
 tags
 FROM awscc.ce.cost_categories
-WHERE region = 'us-east-1' AND Identifier = '<Arn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -226,10 +226,10 @@ INSERT INTO awscc.ce.cost_categories (
  Rules,
  region
 )
-SELECT 
-'{{ Name }}',
- '{{ RuleVersion }}',
- '{{ Rules }}',
+SELECT
+'{{ name }}',
+ '{{ rule_version }}',
+ '{{ rules }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -246,13 +246,13 @@ INSERT INTO awscc.ce.cost_categories (
  Tags,
  region
 )
-SELECT 
- '{{ Name }}',
- '{{ RuleVersion }}',
- '{{ Rules }}',
- '{{ SplitChargeRules }}',
- '{{ DefaultValue }}',
- '{{ Tags }}',
+SELECT
+ '{{ name }}',
+ '{{ rule_version }}',
+ '{{ rules }}',
+ '{{ split_charge_rules }}',
+ '{{ default_value }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -270,21 +270,20 @@ globals:
 resources:
   - name: cost_category
     props:
-      - name: Name
-        value: '{{ Name }}'
-      - name: RuleVersion
-        value: '{{ RuleVersion }}'
-      - name: Rules
-        value: '{{ Rules }}'
-      - name: SplitChargeRules
-        value: '{{ SplitChargeRules }}'
-      - name: DefaultValue
-        value: '{{ DefaultValue }}'
-      - name: Tags
+      - name: name
+        value: '{{ name }}'
+      - name: rule_version
+        value: '{{ rule_version }}'
+      - name: rules
+        value: '{{ rules }}'
+      - name: split_charge_rules
+        value: '{{ split_charge_rules }}'
+      - name: default_value
+        value: '{{ default_value }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -304,7 +303,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Arn>';
+AND Identifier = '{{ arn }}';
 ```
 
 
@@ -313,7 +312,7 @@ AND Identifier = '<Arn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.ce.cost_categories
-WHERE Identifier = '<Arn>'
+WHERE Identifier = '{{ arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/certificatemanager/accounts/index.md b/website/docs/services/certificatemanager/accounts/index.md
index 94ffc8488..0225792a5 100644
--- a/website/docs/services/certificatemanager/accounts/index.md
+++ b/website/docs/services/certificatemanager/accounts/index.md
@@ -101,7 +101,7 @@ region,
 expiry_events_configuration,
 account_id
 FROM awscc.certificatemanager.accounts
-WHERE region = 'us-east-1' AND Identifier = '<AccountId>';
+WHERE region = 'us-east-1' AND Identifier = '{{ account_id }}';
 ```
 
 ## `INSERT` example
@@ -124,8 +124,8 @@ INSERT INTO awscc.certificatemanager.accounts (
  ExpiryEventsConfiguration,
  region
 )
-SELECT 
-'{{ ExpiryEventsConfiguration }}',
+SELECT
+'{{ expiry_events_configuration }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -137,8 +137,8 @@ INSERT INTO awscc.certificatemanager.accounts (
  ExpiryEventsConfiguration,
  region
 )
-SELECT 
- '{{ ExpiryEventsConfiguration }}',
+SELECT
+ '{{ expiry_events_configuration }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -156,10 +156,9 @@ globals:
 resources:
   - name: account
     props:
-      - name: ExpiryEventsConfiguration
+      - name: expiry_events_configuration
         value:
-          DaysBeforeExpiry: '{{ DaysBeforeExpiry }}'
-
+          days_before_expiry: '{{ days_before_expiry }}'
 ```
 </TabItem>
 </Tabs>
@@ -175,7 +174,7 @@ SET PatchDocument = string('{{ {
     "ExpiryEventsConfiguration": expiry_events_configuration
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<AccountId>';
+AND Identifier = '{{ account_id }}';
 ```
 
 
@@ -184,7 +183,7 @@ AND Identifier = '<AccountId>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.certificatemanager.accounts
-WHERE Identifier = '<AccountId>'
+WHERE Identifier = '{{ account_id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/chatbot/custom_actions/index.md b/website/docs/services/chatbot/custom_actions/index.md
index e16bdaf33..93b2907d5 100644
--- a/website/docs/services/chatbot/custom_actions/index.md
+++ b/website/docs/services/chatbot/custom_actions/index.md
@@ -222,7 +222,7 @@ custom_action_arn,
 definition,
 tags
 FROM awscc.chatbot.custom_actions
-WHERE region = 'us-east-1' AND Identifier = '<CustomActionArn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ custom_action_arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -259,9 +259,9 @@ INSERT INTO awscc.chatbot.custom_actions (
  Definition,
  region
 )
-SELECT 
-'{{ ActionName }}',
- '{{ Definition }}',
+SELECT
+'{{ action_name }}',
+ '{{ definition }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -277,12 +277,12 @@ INSERT INTO awscc.chatbot.custom_actions (
  Tags,
  region
 )
-SELECT 
- '{{ ActionName }}',
- '{{ AliasName }}',
- '{{ Attachments }}',
- '{{ Definition }}',
- '{{ Tags }}',
+SELECT
+ '{{ action_name }}',
+ '{{ alias_name }}',
+ '{{ attachments }}',
+ '{{ definition }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -300,27 +300,26 @@ globals:
 resources:
   - name: custom_action
     props:
-      - name: ActionName
-        value: '{{ ActionName }}'
-      - name: AliasName
-        value: '{{ AliasName }}'
-      - name: Attachments
+      - name: action_name
+        value: '{{ action_name }}'
+      - name: alias_name
+        value: '{{ alias_name }}'
+      - name: attachments
         value:
-          - NotificationType: '{{ NotificationType }}'
-            ButtonText: '{{ ButtonText }}'
-            Criteria:
-              - Operator: '{{ Operator }}'
-                VariableName: '{{ VariableName }}'
-                Value: '{{ Value }}'
-            Variables: {}
-      - name: Definition
+          - notification_type: '{{ notification_type }}'
+            button_text: '{{ button_text }}'
+            criteria:
+              - operator: '{{ operator }}'
+                variable_name: '{{ variable_name }}'
+                value: '{{ value }}'
+            variables: {}
+      - name: definition
         value:
-          CommandText: '{{ CommandText }}'
-      - name: Tags
+          command_text: '{{ command_text }}'
+      - name: tags
         value:
-          - Value: '{{ Value }}'
-            Key: '{{ Key }}'
-
+          - value: '{{ value }}'
+            key: '{{ key }}'
 ```
 </TabItem>
 </Tabs>
@@ -339,7 +338,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<CustomActionArn>';
+AND Identifier = '{{ custom_action_arn }}';
 ```
 
 
@@ -348,7 +347,7 @@ AND Identifier = '<CustomActionArn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.chatbot.custom_actions
-WHERE Identifier = '<CustomActionArn>'
+WHERE Identifier = '{{ custom_action_arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/chatbot/microsoft_teams_channel_configurations/index.md b/website/docs/services/chatbot/microsoft_teams_channel_configurations/index.md
index 8f2b3bf45..57e78d9f4 100644
--- a/website/docs/services/chatbot/microsoft_teams_channel_configurations/index.md
+++ b/website/docs/services/chatbot/microsoft_teams_channel_configurations/index.md
@@ -218,7 +218,7 @@ user_role_required,
 tags,
 customization_resource_arns
 FROM awscc.chatbot.microsoft_teams_channel_configurations
-WHERE region = 'us-east-1' AND Identifier = '<Arn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -258,12 +258,12 @@ INSERT INTO awscc.chatbot.microsoft_teams_channel_configurations (
  IamRoleArn,
  region
 )
-SELECT 
-'{{ TeamId }}',
- '{{ TeamsChannelId }}',
- '{{ TeamsTenantId }}',
- '{{ ConfigurationName }}',
- '{{ IamRoleArn }}',
+SELECT
+'{{ team_id }}',
+ '{{ teams_channel_id }}',
+ '{{ teams_tenant_id }}',
+ '{{ configuration_name }}',
+ '{{ iam_role_arn }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -286,19 +286,19 @@ INSERT INTO awscc.chatbot.microsoft_teams_channel_configurations (
  CustomizationResourceArns,
  region
 )
-SELECT 
- '{{ TeamId }}',
- '{{ TeamsChannelId }}',
- '{{ TeamsChannelName }}',
- '{{ TeamsTenantId }}',
- '{{ ConfigurationName }}',
- '{{ IamRoleArn }}',
- '{{ SnsTopicArns }}',
- '{{ LoggingLevel }}',
- '{{ GuardrailPolicies }}',
- '{{ UserRoleRequired }}',
- '{{ Tags }}',
- '{{ CustomizationResourceArns }}',
+SELECT
+ '{{ team_id }}',
+ '{{ teams_channel_id }}',
+ '{{ teams_channel_name }}',
+ '{{ teams_tenant_id }}',
+ '{{ configuration_name }}',
+ '{{ iam_role_arn }}',
+ '{{ sns_topic_arns }}',
+ '{{ logging_level }}',
+ '{{ guardrail_policies }}',
+ '{{ user_role_required }}',
+ '{{ tags }}',
+ '{{ customization_resource_arns }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -316,36 +316,35 @@ globals:
 resources:
   - name: microsoft_teams_channel_configuration
     props:
-      - name: TeamId
-        value: '{{ TeamId }}'
-      - name: TeamsChannelId
-        value: '{{ TeamsChannelId }}'
-      - name: TeamsChannelName
-        value: '{{ TeamsChannelName }}'
-      - name: TeamsTenantId
-        value: '{{ TeamsTenantId }}'
-      - name: ConfigurationName
-        value: '{{ ConfigurationName }}'
-      - name: IamRoleArn
-        value: '{{ IamRoleArn }}'
-      - name: SnsTopicArns
+      - name: team_id
+        value: '{{ team_id }}'
+      - name: teams_channel_id
+        value: '{{ teams_channel_id }}'
+      - name: teams_channel_name
+        value: '{{ teams_channel_name }}'
+      - name: teams_tenant_id
+        value: '{{ teams_tenant_id }}'
+      - name: configuration_name
+        value: '{{ configuration_name }}'
+      - name: iam_role_arn
+        value: '{{ iam_role_arn }}'
+      - name: sns_topic_arns
         value:
-          - '{{ SnsTopicArns[0] }}'
-      - name: LoggingLevel
-        value: '{{ LoggingLevel }}'
-      - name: GuardrailPolicies
+          - '{{ sns_topic_arns[0] }}'
+      - name: logging_level
+        value: '{{ logging_level }}'
+      - name: guardrail_policies
         value:
-          - '{{ GuardrailPolicies[0] }}'
-      - name: UserRoleRequired
-        value: '{{ UserRoleRequired }}'
-      - name: Tags
+          - '{{ guardrail_policies[0] }}'
+      - name: user_role_required
+        value: '{{ user_role_required }}'
+      - name: tags
         value:
-          - Value: '{{ Value }}'
-            Key: '{{ Key }}'
-      - name: CustomizationResourceArns
+          - value: '{{ value }}'
+            key: '{{ key }}'
+      - name: customization_resource_arns
         value:
-          - '{{ CustomizationResourceArns[0] }}'
-
+          - '{{ customization_resource_arns[0] }}'
 ```
 </TabItem>
 </Tabs>
@@ -369,7 +368,7 @@ SET PatchDocument = string('{{ {
     "CustomizationResourceArns": customization_resource_arns
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Arn>';
+AND Identifier = '{{ arn }}';
 ```
 
 
@@ -378,7 +377,7 @@ AND Identifier = '<Arn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.chatbot.microsoft_teams_channel_configurations
-WHERE Identifier = '<Arn>'
+WHERE Identifier = '{{ arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/chatbot/slack_channel_configurations/index.md b/website/docs/services/chatbot/slack_channel_configurations/index.md
index 0c01d0dbe..9003ae7d1 100644
--- a/website/docs/services/chatbot/slack_channel_configurations/index.md
+++ b/website/docs/services/chatbot/slack_channel_configurations/index.md
@@ -206,7 +206,7 @@ tags,
 user_role_required,
 customization_resource_arns
 FROM awscc.chatbot.slack_channel_configurations
-WHERE region = 'us-east-1' AND Identifier = '<Arn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -245,11 +245,11 @@ INSERT INTO awscc.chatbot.slack_channel_configurations (
  IamRoleArn,
  region
 )
-SELECT 
-'{{ SlackWorkspaceId }}',
- '{{ SlackChannelId }}',
- '{{ ConfigurationName }}',
- '{{ IamRoleArn }}',
+SELECT
+'{{ slack_workspace_id }}',
+ '{{ slack_channel_id }}',
+ '{{ configuration_name }}',
+ '{{ iam_role_arn }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -270,17 +270,17 @@ INSERT INTO awscc.chatbot.slack_channel_configurations (
  CustomizationResourceArns,
  region
 )
-SELECT 
- '{{ SlackWorkspaceId }}',
- '{{ SlackChannelId }}',
- '{{ ConfigurationName }}',
- '{{ IamRoleArn }}',
- '{{ SnsTopicArns }}',
- '{{ LoggingLevel }}',
- '{{ GuardrailPolicies }}',
- '{{ Tags }}',
- '{{ UserRoleRequired }}',
- '{{ CustomizationResourceArns }}',
+SELECT
+ '{{ slack_workspace_id }}',
+ '{{ slack_channel_id }}',
+ '{{ configuration_name }}',
+ '{{ iam_role_arn }}',
+ '{{ sns_topic_arns }}',
+ '{{ logging_level }}',
+ '{{ guardrail_policies }}',
+ '{{ tags }}',
+ '{{ user_role_required }}',
+ '{{ customization_resource_arns }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -298,32 +298,31 @@ globals:
 resources:
   - name: slack_channel_configuration
     props:
-      - name: SlackWorkspaceId
-        value: '{{ SlackWorkspaceId }}'
-      - name: SlackChannelId
-        value: '{{ SlackChannelId }}'
-      - name: ConfigurationName
-        value: '{{ ConfigurationName }}'
-      - name: IamRoleArn
-        value: '{{ IamRoleArn }}'
-      - name: SnsTopicArns
+      - name: slack_workspace_id
+        value: '{{ slack_workspace_id }}'
+      - name: slack_channel_id
+        value: '{{ slack_channel_id }}'
+      - name: configuration_name
+        value: '{{ configuration_name }}'
+      - name: iam_role_arn
+        value: '{{ iam_role_arn }}'
+      - name: sns_topic_arns
         value:
-          - '{{ SnsTopicArns[0] }}'
-      - name: LoggingLevel
-        value: '{{ LoggingLevel }}'
-      - name: GuardrailPolicies
+          - '{{ sns_topic_arns[0] }}'
+      - name: logging_level
+        value: '{{ logging_level }}'
+      - name: guardrail_policies
         value:
-          - '{{ GuardrailPolicies[0] }}'
-      - name: Tags
+          - '{{ guardrail_policies[0] }}'
+      - name: tags
         value:
-          - Value: '{{ Value }}'
-            Key: '{{ Key }}'
-      - name: UserRoleRequired
-        value: '{{ UserRoleRequired }}'
-      - name: CustomizationResourceArns
+          - value: '{{ value }}'
+            key: '{{ key }}'
+      - name: user_role_required
+        value: '{{ user_role_required }}'
+      - name: customization_resource_arns
         value:
-          - '{{ CustomizationResourceArns[0] }}'
-
+          - '{{ customization_resource_arns[0] }}'
 ```
 </TabItem>
 </Tabs>
@@ -346,7 +345,7 @@ SET PatchDocument = string('{{ {
     "CustomizationResourceArns": customization_resource_arns
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Arn>';
+AND Identifier = '{{ arn }}';
 ```
 
 
@@ -355,7 +354,7 @@ AND Identifier = '<Arn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.chatbot.slack_channel_configurations
-WHERE Identifier = '<Arn>'
+WHERE Identifier = '{{ arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/cleanrooms/analysis_templates/index.md b/website/docs/services/cleanrooms/analysis_templates/index.md
index 0e6844a6b..3f083f3c7 100644
--- a/website/docs/services/cleanrooms/analysis_templates/index.md
+++ b/website/docs/services/cleanrooms/analysis_templates/index.md
@@ -253,7 +253,7 @@ source,
 source_metadata,
 format
 FROM awscc.cleanrooms.analysis_templates
-WHERE region = 'us-east-1' AND Identifier = '<AnalysisTemplateIdentifier>|<MembershipIdentifier>';
+WHERE region = 'us-east-1' AND Identifier = '{{ analysis_template_identifier }}|{{ membership_identifier }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -293,11 +293,11 @@ INSERT INTO awscc.cleanrooms.analysis_templates (
  Format,
  region
 )
-SELECT 
-'{{ MembershipIdentifier }}',
- '{{ Name }}',
- '{{ Source }}',
- '{{ Format }}',
+SELECT
+'{{ membership_identifier }}',
+ '{{ name }}',
+ '{{ source }}',
+ '{{ format }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -317,16 +317,16 @@ INSERT INTO awscc.cleanrooms.analysis_templates (
  Format,
  region
 )
-SELECT 
- '{{ Tags }}',
- '{{ AnalysisParameters }}',
- '{{ Description }}',
- '{{ MembershipIdentifier }}',
- '{{ Name }}',
- '{{ Schema }}',
- '{{ Source }}',
- '{{ SourceMetadata }}',
- '{{ Format }}',
+SELECT
+ '{{ tags }}',
+ '{{ analysis_parameters }}',
+ '{{ description }}',
+ '{{ membership_identifier }}',
+ '{{ name }}',
+ '{{ schema }}',
+ '{{ source }}',
+ '{{ source_metadata }}',
+ '{{ format }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -344,32 +344,31 @@ globals:
 resources:
   - name: analysis_template
     props:
-      - name: Tags
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-      - name: AnalysisParameters
+          - key: '{{ key }}'
+            value: '{{ value }}'
+      - name: analysis_parameters
         value:
-          - DefaultValue: '{{ DefaultValue }}'
-            Name: '{{ Name }}'
-            Type: '{{ Type }}'
-      - name: Description
-        value: '{{ Description }}'
-      - name: MembershipIdentifier
-        value: '{{ MembershipIdentifier }}'
-      - name: Name
-        value: '{{ Name }}'
-      - name: Schema
+          - default_value: '{{ default_value }}'
+            name: '{{ name }}'
+            type: '{{ type }}'
+      - name: description
+        value: '{{ description }}'
+      - name: membership_identifier
+        value: '{{ membership_identifier }}'
+      - name: name
+        value: '{{ name }}'
+      - name: schema
         value:
-          ReferencedTables:
-            - '{{ ReferencedTables[0] }}'
-      - name: Source
+          referenced_tables:
+            - '{{ referenced_tables[0] }}'
+      - name: source
         value: null
-      - name: SourceMetadata
+      - name: source_metadata
         value: null
-      - name: Format
-        value: '{{ Format }}'
-
+      - name: format
+        value: '{{ format }}'
 ```
 </TabItem>
 </Tabs>
@@ -387,7 +386,7 @@ SET PatchDocument = string('{{ {
     "SourceMetadata": source_metadata
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<AnalysisTemplateIdentifier>|<MembershipIdentifier>';
+AND Identifier = '{{ analysis_template_identifier }}|{{ membership_identifier }}';
 ```
 
 
@@ -396,7 +395,7 @@ AND Identifier = '<AnalysisTemplateIdentifier>|<MembershipIdentifier>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.cleanrooms.analysis_templates
-WHERE Identifier = '<AnalysisTemplateIdentifier|MembershipIdentifier>'
+WHERE Identifier = '{{ analysis_template_identifier }}|{{ membership_identifier }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/cleanrooms/collaborations/index.md b/website/docs/services/cleanrooms/collaborations/index.md
index f75a22326..3fe4678d9 100644
--- a/website/docs/services/cleanrooms/collaborations/index.md
+++ b/website/docs/services/cleanrooms/collaborations/index.md
@@ -365,7 +365,7 @@ query_log_status,
 analytics_engine,
 creator_payment_configuration
 FROM awscc.cleanrooms.collaborations
-WHERE region = 'us-east-1' AND Identifier = '<CollaborationIdentifier>';
+WHERE region = 'us-east-1' AND Identifier = '{{ collaboration_identifier }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -404,11 +404,11 @@ INSERT INTO awscc.cleanrooms.collaborations (
  QueryLogStatus,
  region
 )
-SELECT 
-'{{ CreatorDisplayName }}',
- '{{ Description }}',
- '{{ Name }}',
- '{{ QueryLogStatus }}',
+SELECT
+'{{ creator_display_name }}',
+ '{{ description }}',
+ '{{ name }}',
+ '{{ query_log_status }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -431,19 +431,19 @@ INSERT INTO awscc.cleanrooms.collaborations (
  CreatorPaymentConfiguration,
  region
 )
-SELECT 
- '{{ Tags }}',
- '{{ CreatorDisplayName }}',
- '{{ CreatorMemberAbilities }}',
- '{{ CreatorMLMemberAbilities }}',
- '{{ DataEncryptionMetadata }}',
- '{{ Description }}',
- '{{ Members }}',
- '{{ Name }}',
- '{{ JobLogStatus }}',
- '{{ QueryLogStatus }}',
- '{{ AnalyticsEngine }}',
- '{{ CreatorPaymentConfiguration }}',
+SELECT
+ '{{ tags }}',
+ '{{ creator_display_name }}',
+ '{{ creator_member_abilities }}',
+ '{{ creator_ml_member_abilities }}',
+ '{{ data_encryption_metadata }}',
+ '{{ description }}',
+ '{{ members }}',
+ '{{ name }}',
+ '{{ job_log_status }}',
+ '{{ query_log_status }}',
+ '{{ analytics_engine }}',
+ '{{ creator_payment_configuration }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -461,54 +461,53 @@ globals:
 resources:
   - name: collaboration
     props:
-      - name: Tags
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-      - name: CreatorDisplayName
-        value: '{{ CreatorDisplayName }}'
-      - name: CreatorMemberAbilities
+          - key: '{{ key }}'
+            value: '{{ value }}'
+      - name: creator_display_name
+        value: '{{ creator_display_name }}'
+      - name: creator_member_abilities
         value:
-          - '{{ CreatorMemberAbilities[0] }}'
-      - name: CreatorMLMemberAbilities
+          - '{{ creator_member_abilities[0] }}'
+      - name: creator_ml_member_abilities
         value:
-          CustomMLMemberAbilities:
-            - '{{ CustomMLMemberAbilities[0] }}'
-      - name: DataEncryptionMetadata
+          custom_ml_member_abilities:
+            - '{{ custom_ml_member_abilities[0] }}'
+      - name: data_encryption_metadata
         value:
-          AllowCleartext: '{{ AllowCleartext }}'
-          AllowDuplicates: '{{ AllowDuplicates }}'
-          AllowJoinsOnColumnsWithDifferentNames: '{{ AllowJoinsOnColumnsWithDifferentNames }}'
-          PreserveNulls: '{{ PreserveNulls }}'
-      - name: Description
-        value: '{{ Description }}'
-      - name: Members
+          allow_cleartext: '{{ allow_cleartext }}'
+          allow_duplicates: '{{ allow_duplicates }}'
+          allow_joins_on_columns_with_different_names: '{{ allow_joins_on_columns_with_different_names }}'
+          preserve_nulls: '{{ preserve_nulls }}'
+      - name: description
+        value: '{{ description }}'
+      - name: members
         value:
-          - AccountId: '{{ AccountId }}'
-            MemberAbilities: null
-            MLMemberAbilities: null
-            DisplayName: null
-            PaymentConfiguration:
-              JobCompute:
-                IsResponsible: '{{ IsResponsible }}'
-              QueryCompute:
-                IsResponsible: '{{ IsResponsible }}'
-              MachineLearning:
-                ModelTraining:
-                  IsResponsible: '{{ IsResponsible }}'
-                ModelInference:
-                  IsResponsible: '{{ IsResponsible }}'
-      - name: Name
-        value: '{{ Name }}'
-      - name: JobLogStatus
-        value: '{{ JobLogStatus }}'
-      - name: QueryLogStatus
-        value: '{{ QueryLogStatus }}'
-      - name: AnalyticsEngine
-        value: '{{ AnalyticsEngine }}'
-      - name: CreatorPaymentConfiguration
+          - account_id: '{{ account_id }}'
+            member_abilities: null
+            ml_member_abilities: null
+            display_name: null
+            payment_configuration:
+              job_compute:
+                is_responsible: '{{ is_responsible }}'
+              query_compute:
+                is_responsible: '{{ is_responsible }}'
+              machine_learning:
+                model_training:
+                  is_responsible: '{{ is_responsible }}'
+                model_inference:
+                  is_responsible: '{{ is_responsible }}'
+      - name: name
+        value: '{{ name }}'
+      - name: job_log_status
+        value: '{{ job_log_status }}'
+      - name: query_log_status
+        value: '{{ query_log_status }}'
+      - name: analytics_engine
+        value: '{{ analytics_engine }}'
+      - name: creator_payment_configuration
         value: null
-
 ```
 </TabItem>
 </Tabs>
@@ -527,7 +526,7 @@ SET PatchDocument = string('{{ {
     "AnalyticsEngine": analytics_engine
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<CollaborationIdentifier>';
+AND Identifier = '{{ collaboration_identifier }}';
 ```
 
 
@@ -536,7 +535,7 @@ AND Identifier = '<CollaborationIdentifier>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.cleanrooms.collaborations
-WHERE Identifier = '<CollaborationIdentifier>'
+WHERE Identifier = '{{ collaboration_identifier }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/cleanrooms/configured_table_associations/index.md b/website/docs/services/cleanrooms/configured_table_associations/index.md
index c288916b2..251a9c69b 100644
--- a/website/docs/services/cleanrooms/configured_table_associations/index.md
+++ b/website/docs/services/cleanrooms/configured_table_associations/index.md
@@ -218,7 +218,7 @@ name,
 role_arn,
 configured_table_association_analysis_rules
 FROM awscc.cleanrooms.configured_table_associations
-WHERE region = 'us-east-1' AND Identifier = '<ConfiguredTableAssociationIdentifier>|<MembershipIdentifier>';
+WHERE region = 'us-east-1' AND Identifier = '{{ configured_table_association_identifier }}|{{ membership_identifier }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -258,11 +258,11 @@ INSERT INTO awscc.cleanrooms.configured_table_associations (
  RoleArn,
  region
 )
-SELECT 
-'{{ ConfiguredTableIdentifier }}',
- '{{ MembershipIdentifier }}',
- '{{ Name }}',
- '{{ RoleArn }}',
+SELECT
+'{{ configured_table_identifier }}',
+ '{{ membership_identifier }}',
+ '{{ name }}',
+ '{{ role_arn }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -280,14 +280,14 @@ INSERT INTO awscc.cleanrooms.configured_table_associations (
  ConfiguredTableAssociationAnalysisRules,
  region
 )
-SELECT 
- '{{ Tags }}',
- '{{ ConfiguredTableIdentifier }}',
- '{{ Description }}',
- '{{ MembershipIdentifier }}',
- '{{ Name }}',
- '{{ RoleArn }}',
- '{{ ConfiguredTableAssociationAnalysisRules }}',
+SELECT
+ '{{ tags }}',
+ '{{ configured_table_identifier }}',
+ '{{ description }}',
+ '{{ membership_identifier }}',
+ '{{ name }}',
+ '{{ role_arn }}',
+ '{{ configured_table_association_analysis_rules }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -305,26 +305,25 @@ globals:
 resources:
   - name: configured_table_association
     props:
-      - name: Tags
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-      - name: ConfiguredTableIdentifier
-        value: '{{ ConfiguredTableIdentifier }}'
-      - name: Description
-        value: '{{ Description }}'
-      - name: MembershipIdentifier
-        value: '{{ MembershipIdentifier }}'
-      - name: Name
-        value: '{{ Name }}'
-      - name: RoleArn
-        value: '{{ RoleArn }}'
-      - name: ConfiguredTableAssociationAnalysisRules
+          - key: '{{ key }}'
+            value: '{{ value }}'
+      - name: configured_table_identifier
+        value: '{{ configured_table_identifier }}'
+      - name: description
+        value: '{{ description }}'
+      - name: membership_identifier
+        value: '{{ membership_identifier }}'
+      - name: name
+        value: '{{ name }}'
+      - name: role_arn
+        value: '{{ role_arn }}'
+      - name: configured_table_association_analysis_rules
         value:
-          - Type: '{{ Type }}'
-            Policy:
-              V1: null
-
+          - type: '{{ type }}'
+            policy:
+              v1: null
 ```
 </TabItem>
 </Tabs>
@@ -343,7 +342,7 @@ SET PatchDocument = string('{{ {
     "ConfiguredTableAssociationAnalysisRules": configured_table_association_analysis_rules
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<ConfiguredTableAssociationIdentifier>|<MembershipIdentifier>';
+AND Identifier = '{{ configured_table_association_identifier }}|{{ membership_identifier }}';
 ```
 
 
@@ -352,7 +351,7 @@ AND Identifier = '<ConfiguredTableAssociationIdentifier>|<MembershipIdentifier>'
 ```sql
 /*+ delete */
 DELETE FROM awscc.cleanrooms.configured_table_associations
-WHERE Identifier = '<ConfiguredTableAssociationIdentifier|MembershipIdentifier>'
+WHERE Identifier = '{{ configured_table_association_identifier }}|{{ membership_identifier }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/cleanrooms/configured_tables/index.md b/website/docs/services/cleanrooms/configured_tables/index.md
index 53a1d1955..d79c5c0cc 100644
--- a/website/docs/services/cleanrooms/configured_tables/index.md
+++ b/website/docs/services/cleanrooms/configured_tables/index.md
@@ -219,7 +219,7 @@ name,
 analysis_rules,
 table_reference
 FROM awscc.cleanrooms.configured_tables
-WHERE region = 'us-east-1' AND Identifier = '<ConfiguredTableIdentifier>';
+WHERE region = 'us-east-1' AND Identifier = '{{ configured_table_identifier }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -258,11 +258,11 @@ INSERT INTO awscc.cleanrooms.configured_tables (
  TableReference,
  region
 )
-SELECT 
-'{{ AllowedColumns }}',
- '{{ AnalysisMethod }}',
- '{{ Name }}',
- '{{ TableReference }}',
+SELECT
+'{{ allowed_columns }}',
+ '{{ analysis_method }}',
+ '{{ name }}',
+ '{{ table_reference }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -281,15 +281,15 @@ INSERT INTO awscc.cleanrooms.configured_tables (
  TableReference,
  region
 )
-SELECT 
- '{{ Tags }}',
- '{{ AllowedColumns }}',
- '{{ AnalysisMethod }}',
- '{{ SelectedAnalysisMethods }}',
- '{{ Description }}',
- '{{ Name }}',
- '{{ AnalysisRules }}',
- '{{ TableReference }}',
+SELECT
+ '{{ tags }}',
+ '{{ allowed_columns }}',
+ '{{ analysis_method }}',
+ '{{ selected_analysis_methods }}',
+ '{{ description }}',
+ '{{ name }}',
+ '{{ analysis_rules }}',
+ '{{ table_reference }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -307,30 +307,29 @@ globals:
 resources:
   - name: configured_table
     props:
-      - name: Tags
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-      - name: AllowedColumns
+          - key: '{{ key }}'
+            value: '{{ value }}'
+      - name: allowed_columns
         value:
-          - '{{ AllowedColumns[0] }}'
-      - name: AnalysisMethod
-        value: '{{ AnalysisMethod }}'
-      - name: SelectedAnalysisMethods
+          - '{{ allowed_columns[0] }}'
+      - name: analysis_method
+        value: '{{ analysis_method }}'
+      - name: selected_analysis_methods
         value:
-          - '{{ SelectedAnalysisMethods[0] }}'
-      - name: Description
-        value: '{{ Description }}'
-      - name: Name
-        value: '{{ Name }}'
-      - name: AnalysisRules
+          - '{{ selected_analysis_methods[0] }}'
+      - name: description
+        value: '{{ description }}'
+      - name: name
+        value: '{{ name }}'
+      - name: analysis_rules
         value:
-          - Type: '{{ Type }}'
-            Policy:
-              V1: null
-      - name: TableReference
+          - type: '{{ type }}'
+            policy:
+              v1: null
+      - name: table_reference
         value: null
-
 ```
 </TabItem>
 </Tabs>
@@ -353,7 +352,7 @@ SET PatchDocument = string('{{ {
     "TableReference": table_reference
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<ConfiguredTableIdentifier>';
+AND Identifier = '{{ configured_table_identifier }}';
 ```
 
 
@@ -362,7 +361,7 @@ AND Identifier = '<ConfiguredTableIdentifier>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.cleanrooms.configured_tables
-WHERE Identifier = '<ConfiguredTableIdentifier>'
+WHERE Identifier = '{{ configured_table_identifier }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/cleanrooms/id_mapping_tables/index.md b/website/docs/services/cleanrooms/id_mapping_tables/index.md
index 8cd5fe7e2..3404fd350 100644
--- a/website/docs/services/cleanrooms/id_mapping_tables/index.md
+++ b/website/docs/services/cleanrooms/id_mapping_tables/index.md
@@ -233,7 +233,7 @@ input_reference_properties,
 kms_key_arn,
 tags
 FROM awscc.cleanrooms.id_mapping_tables
-WHERE region = 'us-east-1' AND Identifier = '<IdMappingTableIdentifier>|<MembershipIdentifier>';
+WHERE region = 'us-east-1' AND Identifier = '{{ id_mapping_table_identifier }}|{{ membership_identifier }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -272,10 +272,10 @@ INSERT INTO awscc.cleanrooms.id_mapping_tables (
  Name,
  region
 )
-SELECT 
-'{{ InputReferenceConfig }}',
- '{{ MembershipIdentifier }}',
- '{{ Name }}',
+SELECT
+'{{ input_reference_config }}',
+ '{{ membership_identifier }}',
+ '{{ name }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -292,13 +292,13 @@ INSERT INTO awscc.cleanrooms.id_mapping_tables (
  Tags,
  region
 )
-SELECT 
- '{{ InputReferenceConfig }}',
- '{{ MembershipIdentifier }}',
- '{{ Description }}',
- '{{ Name }}',
- '{{ KmsKeyArn }}',
- '{{ Tags }}',
+SELECT
+ '{{ input_reference_config }}',
+ '{{ membership_identifier }}',
+ '{{ description }}',
+ '{{ name }}',
+ '{{ kms_key_arn }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -316,23 +316,22 @@ globals:
 resources:
   - name: id_mapping_table
     props:
-      - name: InputReferenceConfig
+      - name: input_reference_config
         value:
-          InputReferenceArn: '{{ InputReferenceArn }}'
-          ManageResourcePolicies: '{{ ManageResourcePolicies }}'
-      - name: MembershipIdentifier
-        value: '{{ MembershipIdentifier }}'
-      - name: Description
-        value: '{{ Description }}'
-      - name: Name
-        value: '{{ Name }}'
-      - name: KmsKeyArn
-        value: '{{ KmsKeyArn }}'
-      - name: Tags
+          input_reference_arn: '{{ input_reference_arn }}'
+          manage_resource_policies: '{{ manage_resource_policies }}'
+      - name: membership_identifier
+        value: '{{ membership_identifier }}'
+      - name: description
+        value: '{{ description }}'
+      - name: name
+        value: '{{ name }}'
+      - name: kms_key_arn
+        value: '{{ kms_key_arn }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -350,7 +349,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<IdMappingTableIdentifier>|<MembershipIdentifier>';
+AND Identifier = '{{ id_mapping_table_identifier }}|{{ membership_identifier }}';
 ```
 
 
@@ -359,7 +358,7 @@ AND Identifier = '<IdMappingTableIdentifier>|<MembershipIdentifier>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.cleanrooms.id_mapping_tables
-WHERE Identifier = '<IdMappingTableIdentifier|MembershipIdentifier>'
+WHERE Identifier = '{{ id_mapping_table_identifier }}|{{ membership_identifier }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/cleanrooms/id_namespace_associations/index.md b/website/docs/services/cleanrooms/id_namespace_associations/index.md
index 7b55f0e91..6e8e507bb 100644
--- a/website/docs/services/cleanrooms/id_namespace_associations/index.md
+++ b/website/docs/services/cleanrooms/id_namespace_associations/index.md
@@ -238,7 +238,7 @@ description,
 id_mapping_config,
 input_reference_properties
 FROM awscc.cleanrooms.id_namespace_associations
-WHERE region = 'us-east-1' AND Identifier = '<IdNamespaceAssociationIdentifier>|<MembershipIdentifier>';
+WHERE region = 'us-east-1' AND Identifier = '{{ id_namespace_association_identifier }}|{{ membership_identifier }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -277,10 +277,10 @@ INSERT INTO awscc.cleanrooms.id_namespace_associations (
  Name,
  region
 )
-SELECT 
-'{{ MembershipIdentifier }}',
- '{{ InputReferenceConfig }}',
- '{{ Name }}',
+SELECT
+'{{ membership_identifier }}',
+ '{{ input_reference_config }}',
+ '{{ name }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -297,13 +297,13 @@ INSERT INTO awscc.cleanrooms.id_namespace_associations (
  IdMappingConfig,
  region
 )
-SELECT 
- '{{ MembershipIdentifier }}',
- '{{ InputReferenceConfig }}',
- '{{ Tags }}',
- '{{ Name }}',
- '{{ Description }}',
- '{{ IdMappingConfig }}',
+SELECT
+ '{{ membership_identifier }}',
+ '{{ input_reference_config }}',
+ '{{ tags }}',
+ '{{ name }}',
+ '{{ description }}',
+ '{{ id_mapping_config }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -321,24 +321,23 @@ globals:
 resources:
   - name: id_namespace_association
     props:
-      - name: MembershipIdentifier
-        value: '{{ MembershipIdentifier }}'
-      - name: InputReferenceConfig
+      - name: membership_identifier
+        value: '{{ membership_identifier }}'
+      - name: input_reference_config
         value:
-          InputReferenceArn: '{{ InputReferenceArn }}'
-          ManageResourcePolicies: '{{ ManageResourcePolicies }}'
-      - name: Tags
+          input_reference_arn: '{{ input_reference_arn }}'
+          manage_resource_policies: '{{ manage_resource_policies }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-      - name: Name
-        value: '{{ Name }}'
-      - name: Description
-        value: '{{ Description }}'
-      - name: IdMappingConfig
+          - key: '{{ key }}'
+            value: '{{ value }}'
+      - name: name
+        value: '{{ name }}'
+      - name: description
+        value: '{{ description }}'
+      - name: id_mapping_config
         value:
-          AllowUseAsDimensionColumn: '{{ AllowUseAsDimensionColumn }}'
-
+          allow_use_as_dimension_column: '{{ allow_use_as_dimension_column }}'
 ```
 </TabItem>
 </Tabs>
@@ -357,7 +356,7 @@ SET PatchDocument = string('{{ {
     "IdMappingConfig": id_mapping_config
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<IdNamespaceAssociationIdentifier>|<MembershipIdentifier>';
+AND Identifier = '{{ id_namespace_association_identifier }}|{{ membership_identifier }}';
 ```
 
 
@@ -366,7 +365,7 @@ AND Identifier = '<IdNamespaceAssociationIdentifier>|<MembershipIdentifier>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.cleanrooms.id_namespace_associations
-WHERE Identifier = '<IdNamespaceAssociationIdentifier|MembershipIdentifier>'
+WHERE Identifier = '{{ id_namespace_association_identifier }}|{{ membership_identifier }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/cleanrooms/memberships/index.md b/website/docs/services/cleanrooms/memberships/index.md
index 1f3c28be5..94940feea 100644
--- a/website/docs/services/cleanrooms/memberships/index.md
+++ b/website/docs/services/cleanrooms/memberships/index.md
@@ -335,7 +335,7 @@ default_result_configuration,
 default_job_result_configuration,
 payment_configuration
 FROM awscc.cleanrooms.memberships
-WHERE region = 'us-east-1' AND Identifier = '<MembershipIdentifier>';
+WHERE region = 'us-east-1' AND Identifier = '{{ membership_identifier }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -372,9 +372,9 @@ INSERT INTO awscc.cleanrooms.memberships (
  QueryLogStatus,
  region
 )
-SELECT 
-'{{ CollaborationIdentifier }}',
- '{{ QueryLogStatus }}',
+SELECT
+'{{ collaboration_identifier }}',
+ '{{ query_log_status }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -392,14 +392,14 @@ INSERT INTO awscc.cleanrooms.memberships (
  PaymentConfiguration,
  region
 )
-SELECT 
- '{{ Tags }}',
- '{{ CollaborationIdentifier }}',
- '{{ QueryLogStatus }}',
- '{{ JobLogStatus }}',
- '{{ DefaultResultConfiguration }}',
- '{{ DefaultJobResultConfiguration }}',
- '{{ PaymentConfiguration }}',
+SELECT
+ '{{ tags }}',
+ '{{ collaboration_identifier }}',
+ '{{ query_log_status }}',
+ '{{ job_log_status }}',
+ '{{ default_result_configuration }}',
+ '{{ default_job_result_configuration }}',
+ '{{ payment_configuration }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -417,44 +417,43 @@ globals:
 resources:
   - name: membership
     props:
-      - name: Tags
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-      - name: CollaborationIdentifier
-        value: '{{ CollaborationIdentifier }}'
-      - name: QueryLogStatus
-        value: '{{ QueryLogStatus }}'
-      - name: JobLogStatus
-        value: '{{ JobLogStatus }}'
-      - name: DefaultResultConfiguration
+          - key: '{{ key }}'
+            value: '{{ value }}'
+      - name: collaboration_identifier
+        value: '{{ collaboration_identifier }}'
+      - name: query_log_status
+        value: '{{ query_log_status }}'
+      - name: job_log_status
+        value: '{{ job_log_status }}'
+      - name: default_result_configuration
         value:
-          OutputConfiguration:
-            S3:
-              ResultFormat: '{{ ResultFormat }}'
-              Bucket: '{{ Bucket }}'
-              KeyPrefix: '{{ KeyPrefix }}'
-              SingleFileOutput: '{{ SingleFileOutput }}'
-          RoleArn: '{{ RoleArn }}'
-      - name: DefaultJobResultConfiguration
+          output_configuration:
+            s3:
+              result_format: '{{ result_format }}'
+              bucket: '{{ bucket }}'
+              key_prefix: '{{ key_prefix }}'
+              single_file_output: '{{ single_file_output }}'
+          role_arn: '{{ role_arn }}'
+      - name: default_job_result_configuration
         value:
-          OutputConfiguration:
-            S3:
-              Bucket: '{{ Bucket }}'
-              KeyPrefix: '{{ KeyPrefix }}'
-          RoleArn: '{{ RoleArn }}'
-      - name: PaymentConfiguration
+          output_configuration:
+            s3:
+              bucket: '{{ bucket }}'
+              key_prefix: '{{ key_prefix }}'
+          role_arn: '{{ role_arn }}'
+      - name: payment_configuration
         value:
-          QueryCompute:
-            IsResponsible: '{{ IsResponsible }}'
-          MachineLearning:
-            ModelTraining:
-              IsResponsible: '{{ IsResponsible }}'
-            ModelInference:
-              IsResponsible: '{{ IsResponsible }}'
-          JobCompute:
-            IsResponsible: '{{ IsResponsible }}'
-
+          query_compute:
+            is_responsible: '{{ is_responsible }}'
+          machine_learning:
+            model_training:
+              is_responsible: '{{ is_responsible }}'
+            model_inference:
+              is_responsible: '{{ is_responsible }}'
+          job_compute:
+            is_responsible: '{{ is_responsible }}'
 ```
 </TabItem>
 </Tabs>
@@ -475,7 +474,7 @@ SET PatchDocument = string('{{ {
     "PaymentConfiguration": payment_configuration
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<MembershipIdentifier>';
+AND Identifier = '{{ membership_identifier }}';
 ```
 
 
@@ -484,7 +483,7 @@ AND Identifier = '<MembershipIdentifier>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.cleanrooms.memberships
-WHERE Identifier = '<MembershipIdentifier>'
+WHERE Identifier = '{{ membership_identifier }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/cleanrooms/privacy_budget_templates/index.md b/website/docs/services/cleanrooms/privacy_budget_templates/index.md
index 9fc08f60e..8d1cfa37b 100644
--- a/website/docs/services/cleanrooms/privacy_budget_templates/index.md
+++ b/website/docs/services/cleanrooms/privacy_budget_templates/index.md
@@ -217,7 +217,7 @@ parameters,
 membership_arn,
 membership_identifier
 FROM awscc.cleanrooms.privacy_budget_templates
-WHERE region = 'us-east-1' AND Identifier = '<PrivacyBudgetTemplateIdentifier>|<MembershipIdentifier>';
+WHERE region = 'us-east-1' AND Identifier = '{{ privacy_budget_template_identifier }}|{{ membership_identifier }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -257,11 +257,11 @@ INSERT INTO awscc.cleanrooms.privacy_budget_templates (
  MembershipIdentifier,
  region
 )
-SELECT 
-'{{ AutoRefresh }}',
- '{{ PrivacyBudgetType }}',
- '{{ Parameters }}',
- '{{ MembershipIdentifier }}',
+SELECT
+'{{ auto_refresh }}',
+ '{{ privacy_budget_type }}',
+ '{{ parameters }}',
+ '{{ membership_identifier }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -277,12 +277,12 @@ INSERT INTO awscc.cleanrooms.privacy_budget_templates (
  MembershipIdentifier,
  region
 )
-SELECT 
- '{{ Tags }}',
- '{{ AutoRefresh }}',
- '{{ PrivacyBudgetType }}',
- '{{ Parameters }}',
- '{{ MembershipIdentifier }}',
+SELECT
+ '{{ tags }}',
+ '{{ auto_refresh }}',
+ '{{ privacy_budget_type }}',
+ '{{ parameters }}',
+ '{{ membership_identifier }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -300,21 +300,20 @@ globals:
 resources:
   - name: privacy_budget_template
     props:
-      - name: Tags
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-      - name: AutoRefresh
-        value: '{{ AutoRefresh }}'
-      - name: PrivacyBudgetType
-        value: '{{ PrivacyBudgetType }}'
-      - name: Parameters
+          - key: '{{ key }}'
+            value: '{{ value }}'
+      - name: auto_refresh
+        value: '{{ auto_refresh }}'
+      - name: privacy_budget_type
+        value: '{{ privacy_budget_type }}'
+      - name: parameters
         value:
-          Epsilon: '{{ Epsilon }}'
-          UsersNoisePerQuery: '{{ UsersNoisePerQuery }}'
-      - name: MembershipIdentifier
-        value: '{{ MembershipIdentifier }}'
-
+          epsilon: '{{ epsilon }}'
+          users_noise_per_query: '{{ users_noise_per_query }}'
+      - name: membership_identifier
+        value: '{{ membership_identifier }}'
 ```
 </TabItem>
 </Tabs>
@@ -331,7 +330,7 @@ SET PatchDocument = string('{{ {
     "Parameters": parameters
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<PrivacyBudgetTemplateIdentifier>|<MembershipIdentifier>';
+AND Identifier = '{{ privacy_budget_template_identifier }}|{{ membership_identifier }}';
 ```
 
 
@@ -340,7 +339,7 @@ AND Identifier = '<PrivacyBudgetTemplateIdentifier>|<MembershipIdentifier>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.cleanrooms.privacy_budget_templates
-WHERE Identifier = '<PrivacyBudgetTemplateIdentifier|MembershipIdentifier>'
+WHERE Identifier = '{{ privacy_budget_template_identifier }}|{{ membership_identifier }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/cleanroomsml/training_datasets/index.md b/website/docs/services/cleanroomsml/training_datasets/index.md
index 46824ef3f..caee1800e 100644
--- a/website/docs/services/cleanroomsml/training_datasets/index.md
+++ b/website/docs/services/cleanroomsml/training_datasets/index.md
@@ -273,7 +273,7 @@ training_data,
 training_dataset_arn,
 status
 FROM awscc.cleanroomsml.training_datasets
-WHERE region = 'us-east-1' AND Identifier = '<TrainingDatasetArn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ training_dataset_arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -311,10 +311,10 @@ INSERT INTO awscc.cleanroomsml.training_datasets (
  TrainingData,
  region
 )
-SELECT 
-'{{ Name }}',
- '{{ RoleArn }}',
- '{{ TrainingData }}',
+SELECT
+'{{ name }}',
+ '{{ role_arn }}',
+ '{{ training_data }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -330,12 +330,12 @@ INSERT INTO awscc.cleanroomsml.training_datasets (
  TrainingData,
  region
 )
-SELECT 
- '{{ Description }}',
- '{{ Name }}',
- '{{ RoleArn }}',
- '{{ Tags }}',
- '{{ TrainingData }}',
+SELECT
+ '{{ description }}',
+ '{{ name }}',
+ '{{ role_arn }}',
+ '{{ tags }}',
+ '{{ training_data }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -353,30 +353,29 @@ globals:
 resources:
   - name: training_dataset
     props:
-      - name: Description
-        value: '{{ Description }}'
-      - name: Name
-        value: '{{ Name }}'
-      - name: RoleArn
-        value: '{{ RoleArn }}'
-      - name: Tags
+      - name: description
+        value: '{{ description }}'
+      - name: name
+        value: '{{ name }}'
+      - name: role_arn
+        value: '{{ role_arn }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-      - name: TrainingData
+          - key: '{{ key }}'
+            value: '{{ value }}'
+      - name: training_data
         value:
-          - Type: '{{ Type }}'
-            InputConfig:
-              Schema:
-                - ColumnName: '{{ ColumnName }}'
-                  ColumnTypes:
-                    - '{{ ColumnTypes[0] }}'
-              DataSource:
-                GlueDataSource:
-                  TableName: '{{ TableName }}'
-                  DatabaseName: '{{ DatabaseName }}'
-                  CatalogId: '{{ CatalogId }}'
-
+          - type: '{{ type }}'
+            input_config:
+              schema:
+                - column_name: '{{ column_name }}'
+                  column_types:
+                    - '{{ column_types[0] }}'
+              data_source:
+                glue_data_source:
+                  table_name: '{{ table_name }}'
+                  database_name: '{{ database_name }}'
+                  catalog_id: '{{ catalog_id }}'
 ```
 </TabItem>
 </Tabs>
@@ -392,7 +391,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<TrainingDatasetArn>';
+AND Identifier = '{{ training_dataset_arn }}';
 ```
 
 
@@ -401,7 +400,7 @@ AND Identifier = '<TrainingDatasetArn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.cleanroomsml.training_datasets
-WHERE Identifier = '<TrainingDatasetArn>'
+WHERE Identifier = '{{ training_dataset_arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/cloudformation/guard_hooks/index.md b/website/docs/services/cloudformation/guard_hooks/index.md
index cbd356d42..dd90d7752 100644
--- a/website/docs/services/cloudformation/guard_hooks/index.md
+++ b/website/docs/services/cloudformation/guard_hooks/index.md
@@ -247,7 +247,7 @@ hook_arn,
 execution_role,
 options
 FROM awscc.cloudformation.guard_hooks
-WHERE region = 'us-east-1' AND Identifier = '<HookArn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ hook_arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -288,13 +288,13 @@ INSERT INTO awscc.cloudformation.guard_hooks (
  ExecutionRole,
  region
 )
-SELECT 
-'{{ RuleLocation }}',
- '{{ HookStatus }}',
- '{{ TargetOperations }}',
- '{{ FailureMode }}',
- '{{ Alias }}',
- '{{ ExecutionRole }}',
+SELECT
+'{{ rule_location }}',
+ '{{ hook_status }}',
+ '{{ target_operations }}',
+ '{{ failure_mode }}',
+ '{{ alias }}',
+ '{{ execution_role }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -315,17 +315,17 @@ INSERT INTO awscc.cloudformation.guard_hooks (
  Options,
  region
 )
-SELECT 
- '{{ RuleLocation }}',
- '{{ LogBucket }}',
- '{{ HookStatus }}',
- '{{ TargetOperations }}',
- '{{ FailureMode }}',
- '{{ TargetFilters }}',
- '{{ StackFilters }}',
- '{{ Alias }}',
- '{{ ExecutionRole }}',
- '{{ Options }}',
+SELECT
+ '{{ rule_location }}',
+ '{{ log_bucket }}',
+ '{{ hook_status }}',
+ '{{ target_operations }}',
+ '{{ failure_mode }}',
+ '{{ target_filters }}',
+ '{{ stack_filters }}',
+ '{{ alias }}',
+ '{{ execution_role }}',
+ '{{ options }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -343,41 +343,40 @@ globals:
 resources:
   - name: guard_hook
     props:
-      - name: RuleLocation
+      - name: rule_location
         value:
-          Uri: '{{ Uri }}'
-          VersionId: '{{ VersionId }}'
-      - name: LogBucket
-        value: '{{ LogBucket }}'
-      - name: HookStatus
-        value: '{{ HookStatus }}'
-      - name: TargetOperations
+          uri: '{{ uri }}'
+          version_id: '{{ version_id }}'
+      - name: log_bucket
+        value: '{{ log_bucket }}'
+      - name: hook_status
+        value: '{{ hook_status }}'
+      - name: target_operations
         value:
-          - '{{ TargetOperations[0] }}'
-      - name: FailureMode
-        value: '{{ FailureMode }}'
-      - name: TargetFilters
+          - '{{ target_operations[0] }}'
+      - name: failure_mode
+        value: '{{ failure_mode }}'
+      - name: target_filters
         value: {}
-      - name: StackFilters
+      - name: stack_filters
         value:
-          FilteringCriteria: '{{ FilteringCriteria }}'
-          StackNames:
-            Include:
-              - '{{ Include[0] }}'
-            Exclude:
+          filtering_criteria: '{{ filtering_criteria }}'
+          stack_names:
+            include:
+              - '{{ include[0] }}'
+            exclude:
               - null
-          StackRoles:
-            Include:
-              - '{{ Include[0] }}'
-            Exclude:
+          stack_roles:
+            include:
+              - '{{ include[0] }}'
+            exclude:
               - null
-      - name: Alias
-        value: '{{ Alias }}'
-      - name: ExecutionRole
-        value: '{{ ExecutionRole }}'
-      - name: Options
+      - name: alias
+        value: '{{ alias }}'
+      - name: execution_role
+        value: '{{ execution_role }}'
+      - name: options
         value: null
-
 ```
 </TabItem>
 </Tabs>
@@ -400,7 +399,7 @@ SET PatchDocument = string('{{ {
     "Options": options
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<HookArn>';
+AND Identifier = '{{ hook_arn }}';
 ```
 
 
@@ -409,7 +408,7 @@ AND Identifier = '<HookArn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.cloudformation.guard_hooks
-WHERE Identifier = '<HookArn>'
+WHERE Identifier = '{{ hook_arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/cloudformation/hook_default_versions/index.md b/website/docs/services/cloudformation/hook_default_versions/index.md
index b8b00bec5..245bbbaf1 100644
--- a/website/docs/services/cloudformation/hook_default_versions/index.md
+++ b/website/docs/services/cloudformation/hook_default_versions/index.md
@@ -146,7 +146,7 @@ type_name,
 arn,
 version_id
 FROM awscc.cloudformation.hook_default_versions
-WHERE region = 'us-east-1' AND Identifier = '<Arn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -184,10 +184,10 @@ INSERT INTO awscc.cloudformation.hook_default_versions (
  VersionId,
  region
 )
-SELECT 
-'{{ TypeVersionArn }}',
- '{{ TypeName }}',
- '{{ VersionId }}',
+SELECT
+'{{ type_version_arn }}',
+ '{{ type_name }}',
+ '{{ version_id }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -201,10 +201,10 @@ INSERT INTO awscc.cloudformation.hook_default_versions (
  VersionId,
  region
 )
-SELECT 
- '{{ TypeVersionArn }}',
- '{{ TypeName }}',
- '{{ VersionId }}',
+SELECT
+ '{{ type_version_arn }}',
+ '{{ type_name }}',
+ '{{ version_id }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -222,13 +222,12 @@ globals:
 resources:
   - name: hook_default_version
     props:
-      - name: TypeVersionArn
-        value: '{{ TypeVersionArn }}'
-      - name: TypeName
-        value: '{{ TypeName }}'
-      - name: VersionId
-        value: '{{ VersionId }}'
-
+      - name: type_version_arn
+        value: '{{ type_version_arn }}'
+      - name: type_name
+        value: '{{ type_name }}'
+      - name: version_id
+        value: '{{ version_id }}'
 ```
 </TabItem>
 </Tabs>
@@ -246,7 +245,7 @@ SET PatchDocument = string('{{ {
     "VersionId": version_id
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Arn>';
+AND Identifier = '{{ arn }}';
 ```
 
 
diff --git a/website/docs/services/cloudformation/hook_type_configs/index.md b/website/docs/services/cloudformation/hook_type_configs/index.md
index a1a4c3c6c..bc6c3a6cb 100644
--- a/website/docs/services/cloudformation/hook_type_configs/index.md
+++ b/website/docs/services/cloudformation/hook_type_configs/index.md
@@ -163,7 +163,7 @@ configuration_arn,
 configuration,
 configuration_alias
 FROM awscc.cloudformation.hook_type_configs
-WHERE region = 'us-east-1' AND Identifier = '<ConfigurationArn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ configuration_arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -202,11 +202,11 @@ INSERT INTO awscc.cloudformation.hook_type_configs (
  ConfigurationAlias,
  region
 )
-SELECT 
-'{{ TypeArn }}',
- '{{ TypeName }}',
- '{{ Configuration }}',
- '{{ ConfigurationAlias }}',
+SELECT
+'{{ type_arn }}',
+ '{{ type_name }}',
+ '{{ configuration }}',
+ '{{ configuration_alias }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -221,11 +221,11 @@ INSERT INTO awscc.cloudformation.hook_type_configs (
  ConfigurationAlias,
  region
 )
-SELECT 
- '{{ TypeArn }}',
- '{{ TypeName }}',
- '{{ Configuration }}',
- '{{ ConfigurationAlias }}',
+SELECT
+ '{{ type_arn }}',
+ '{{ type_name }}',
+ '{{ configuration }}',
+ '{{ configuration_alias }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -243,15 +243,14 @@ globals:
 resources:
   - name: hook_type_config
     props:
-      - name: TypeArn
-        value: '{{ TypeArn }}'
-      - name: TypeName
-        value: '{{ TypeName }}'
-      - name: Configuration
-        value: '{{ Configuration }}'
-      - name: ConfigurationAlias
-        value: '{{ ConfigurationAlias }}'
-
+      - name: type_arn
+        value: '{{ type_arn }}'
+      - name: type_name
+        value: '{{ type_name }}'
+      - name: configuration
+        value: '{{ configuration }}'
+      - name: configuration_alias
+        value: '{{ configuration_alias }}'
 ```
 </TabItem>
 </Tabs>
@@ -269,7 +268,7 @@ SET PatchDocument = string('{{ {
     "Configuration": configuration
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<ConfigurationArn>';
+AND Identifier = '{{ configuration_arn }}';
 ```
 
 
@@ -278,7 +277,7 @@ AND Identifier = '<ConfigurationArn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.cloudformation.hook_type_configs
-WHERE Identifier = '<ConfigurationArn>'
+WHERE Identifier = '{{ configuration_arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/cloudformation/hook_versions/index.md b/website/docs/services/cloudformation/hook_versions/index.md
index db84d32b9..425e85533 100644
--- a/website/docs/services/cloudformation/hook_versions/index.md
+++ b/website/docs/services/cloudformation/hook_versions/index.md
@@ -188,7 +188,7 @@ type_name,
 version_id,
 visibility
 FROM awscc.cloudformation.hook_versions
-WHERE region = 'us-east-1' AND Identifier = '<Arn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -225,9 +225,9 @@ INSERT INTO awscc.cloudformation.hook_versions (
  TypeName,
  region
 )
-SELECT 
-'{{ SchemaHandlerPackage }}',
- '{{ TypeName }}',
+SELECT
+'{{ schema_handler_package }}',
+ '{{ type_name }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -242,11 +242,11 @@ INSERT INTO awscc.cloudformation.hook_versions (
  TypeName,
  region
 )
-SELECT 
- '{{ ExecutionRoleArn }}',
- '{{ LoggingConfig }}',
- '{{ SchemaHandlerPackage }}',
- '{{ TypeName }}',
+SELECT
+ '{{ execution_role_arn }}',
+ '{{ logging_config }}',
+ '{{ schema_handler_package }}',
+ '{{ type_name }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -264,17 +264,16 @@ globals:
 resources:
   - name: hook_version
     props:
-      - name: ExecutionRoleArn
-        value: '{{ ExecutionRoleArn }}'
-      - name: LoggingConfig
+      - name: execution_role_arn
+        value: '{{ execution_role_arn }}'
+      - name: logging_config
         value:
-          LogGroupName: '{{ LogGroupName }}'
-          LogRoleArn: '{{ LogRoleArn }}'
-      - name: SchemaHandlerPackage
-        value: '{{ SchemaHandlerPackage }}'
-      - name: TypeName
-        value: '{{ TypeName }}'
-
+          log_group_name: '{{ log_group_name }}'
+          log_role_arn: '{{ log_role_arn }}'
+      - name: schema_handler_package
+        value: '{{ schema_handler_package }}'
+      - name: type_name
+        value: '{{ type_name }}'
 ```
 </TabItem>
 </Tabs>
@@ -285,7 +284,7 @@ resources:
 ```sql
 /*+ delete */
 DELETE FROM awscc.cloudformation.hook_versions
-WHERE Identifier = '<Arn>'
+WHERE Identifier = '{{ arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/cloudformation/lambda_hooks/index.md b/website/docs/services/cloudformation/lambda_hooks/index.md
index 76ddb2449..f27ec2257 100644
--- a/website/docs/services/cloudformation/lambda_hooks/index.md
+++ b/website/docs/services/cloudformation/lambda_hooks/index.md
@@ -223,7 +223,7 @@ alias,
 hook_arn,
 execution_role
 FROM awscc.cloudformation.lambda_hooks
-WHERE region = 'us-east-1' AND Identifier = '<HookArn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ hook_arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -264,13 +264,13 @@ INSERT INTO awscc.cloudformation.lambda_hooks (
  ExecutionRole,
  region
 )
-SELECT 
-'{{ LambdaFunction }}',
- '{{ HookStatus }}',
- '{{ TargetOperations }}',
- '{{ FailureMode }}',
- '{{ Alias }}',
- '{{ ExecutionRole }}',
+SELECT
+'{{ lambda_function }}',
+ '{{ hook_status }}',
+ '{{ target_operations }}',
+ '{{ failure_mode }}',
+ '{{ alias }}',
+ '{{ execution_role }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -289,15 +289,15 @@ INSERT INTO awscc.cloudformation.lambda_hooks (
  ExecutionRole,
  region
 )
-SELECT 
- '{{ LambdaFunction }}',
- '{{ HookStatus }}',
- '{{ TargetOperations }}',
- '{{ FailureMode }}',
- '{{ TargetFilters }}',
- '{{ StackFilters }}',
- '{{ Alias }}',
- '{{ ExecutionRole }}',
+SELECT
+ '{{ lambda_function }}',
+ '{{ hook_status }}',
+ '{{ target_operations }}',
+ '{{ failure_mode }}',
+ '{{ target_filters }}',
+ '{{ stack_filters }}',
+ '{{ alias }}',
+ '{{ execution_role }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -315,35 +315,34 @@ globals:
 resources:
   - name: lambda_hook
     props:
-      - name: LambdaFunction
-        value: '{{ LambdaFunction }}'
-      - name: HookStatus
-        value: '{{ HookStatus }}'
-      - name: TargetOperations
+      - name: lambda_function
+        value: '{{ lambda_function }}'
+      - name: hook_status
+        value: '{{ hook_status }}'
+      - name: target_operations
         value:
-          - '{{ TargetOperations[0] }}'
-      - name: FailureMode
-        value: '{{ FailureMode }}'
-      - name: TargetFilters
+          - '{{ target_operations[0] }}'
+      - name: failure_mode
+        value: '{{ failure_mode }}'
+      - name: target_filters
         value: {}
-      - name: StackFilters
+      - name: stack_filters
         value:
-          FilteringCriteria: '{{ FilteringCriteria }}'
-          StackNames:
-            Include:
-              - '{{ Include[0] }}'
-            Exclude:
+          filtering_criteria: '{{ filtering_criteria }}'
+          stack_names:
+            include:
+              - '{{ include[0] }}'
+            exclude:
               - null
-          StackRoles:
-            Include:
-              - '{{ Include[0] }}'
-            Exclude:
+          stack_roles:
+            include:
+              - '{{ include[0] }}'
+            exclude:
               - null
-      - name: Alias
-        value: '{{ Alias }}'
-      - name: ExecutionRole
-        value: '{{ ExecutionRole }}'
-
+      - name: alias
+        value: '{{ alias }}'
+      - name: execution_role
+        value: '{{ execution_role }}'
 ```
 </TabItem>
 </Tabs>
@@ -365,7 +364,7 @@ SET PatchDocument = string('{{ {
     "ExecutionRole": execution_role
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<HookArn>';
+AND Identifier = '{{ hook_arn }}';
 ```
 
 
@@ -374,7 +373,7 @@ AND Identifier = '<HookArn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.cloudformation.lambda_hooks
-WHERE Identifier = '<HookArn>'
+WHERE Identifier = '{{ hook_arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/cloudformation/module_default_versions/index.md b/website/docs/services/cloudformation/module_default_versions/index.md
index 754c3611d..30634b030 100644
--- a/website/docs/services/cloudformation/module_default_versions/index.md
+++ b/website/docs/services/cloudformation/module_default_versions/index.md
@@ -134,7 +134,7 @@ arn,
 module_name,
 version_id
 FROM awscc.cloudformation.module_default_versions
-WHERE region = 'us-east-1' AND Identifier = '<Arn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -172,10 +172,10 @@ INSERT INTO awscc.cloudformation.module_default_versions (
  VersionId,
  region
 )
-SELECT 
-'{{ Arn }}',
- '{{ ModuleName }}',
- '{{ VersionId }}',
+SELECT
+'{{ arn }}',
+ '{{ module_name }}',
+ '{{ version_id }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -189,10 +189,10 @@ INSERT INTO awscc.cloudformation.module_default_versions (
  VersionId,
  region
 )
-SELECT 
- '{{ Arn }}',
- '{{ ModuleName }}',
- '{{ VersionId }}',
+SELECT
+ '{{ arn }}',
+ '{{ module_name }}',
+ '{{ version_id }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -210,13 +210,12 @@ globals:
 resources:
   - name: module_default_version
     props:
-      - name: Arn
-        value: '{{ Arn }}'
-      - name: ModuleName
-        value: '{{ ModuleName }}'
-      - name: VersionId
-        value: '{{ VersionId }}'
-
+      - name: arn
+        value: '{{ arn }}'
+      - name: module_name
+        value: '{{ module_name }}'
+      - name: version_id
+        value: '{{ version_id }}'
 ```
 </TabItem>
 </Tabs>
diff --git a/website/docs/services/cloudformation/module_versions/index.md b/website/docs/services/cloudformation/module_versions/index.md
index f708d7790..d4e9e7cf5 100644
--- a/website/docs/services/cloudformation/module_versions/index.md
+++ b/website/docs/services/cloudformation/module_versions/index.md
@@ -137,7 +137,7 @@ time_created,
 version_id,
 visibility
 FROM awscc.cloudformation.module_versions
-WHERE region = 'us-east-1' AND Identifier = '<Arn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ arn }}';
 ```
 
 ## `INSERT` example
@@ -161,9 +161,9 @@ INSERT INTO awscc.cloudformation.module_versions (
  ModulePackage,
  region
 )
-SELECT 
-'{{ ModuleName }}',
- '{{ ModulePackage }}',
+SELECT
+'{{ module_name }}',
+ '{{ module_package }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -176,9 +176,9 @@ INSERT INTO awscc.cloudformation.module_versions (
  ModulePackage,
  region
 )
-SELECT 
- '{{ ModuleName }}',
- '{{ ModulePackage }}',
+SELECT
+ '{{ module_name }}',
+ '{{ module_package }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -196,11 +196,10 @@ globals:
 resources:
   - name: module_version
     props:
-      - name: ModuleName
-        value: '{{ ModuleName }}'
-      - name: ModulePackage
-        value: '{{ ModulePackage }}'
-
+      - name: module_name
+        value: '{{ module_name }}'
+      - name: module_package
+        value: '{{ module_package }}'
 ```
 </TabItem>
 </Tabs>
@@ -211,7 +210,7 @@ resources:
 ```sql
 /*+ delete */
 DELETE FROM awscc.cloudformation.module_versions
-WHERE Identifier = '<Arn>'
+WHERE Identifier = '{{ arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/cloudformation/public_type_versions/index.md b/website/docs/services/cloudformation/public_type_versions/index.md
index 3a2e9a56d..58963abd3 100644
--- a/website/docs/services/cloudformation/public_type_versions/index.md
+++ b/website/docs/services/cloudformation/public_type_versions/index.md
@@ -174,7 +174,7 @@ type_name,
 log_delivery_bucket,
 type
 FROM awscc.cloudformation.public_type_versions
-WHERE region = 'us-east-1' AND Identifier = '<PublicTypeArn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ public_type_arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -214,12 +214,12 @@ INSERT INTO awscc.cloudformation.public_type_versions (
  Type,
  region
 )
-SELECT 
-'{{ Arn }}',
- '{{ PublicVersionNumber }}',
- '{{ TypeName }}',
- '{{ LogDeliveryBucket }}',
- '{{ Type }}',
+SELECT
+'{{ arn }}',
+ '{{ public_version_number }}',
+ '{{ type_name }}',
+ '{{ log_delivery_bucket }}',
+ '{{ type }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -235,12 +235,12 @@ INSERT INTO awscc.cloudformation.public_type_versions (
  Type,
  region
 )
-SELECT 
- '{{ Arn }}',
- '{{ PublicVersionNumber }}',
- '{{ TypeName }}',
- '{{ LogDeliveryBucket }}',
- '{{ Type }}',
+SELECT
+ '{{ arn }}',
+ '{{ public_version_number }}',
+ '{{ type_name }}',
+ '{{ log_delivery_bucket }}',
+ '{{ type }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -258,17 +258,16 @@ globals:
 resources:
   - name: public_type_version
     props:
-      - name: Arn
-        value: '{{ Arn }}'
-      - name: PublicVersionNumber
-        value: '{{ PublicVersionNumber }}'
-      - name: TypeName
-        value: '{{ TypeName }}'
-      - name: LogDeliveryBucket
-        value: '{{ LogDeliveryBucket }}'
-      - name: Type
-        value: '{{ Type }}'
-
+      - name: arn
+        value: '{{ arn }}'
+      - name: public_version_number
+        value: '{{ public_version_number }}'
+      - name: type_name
+        value: '{{ type_name }}'
+      - name: log_delivery_bucket
+        value: '{{ log_delivery_bucket }}'
+      - name: type
+        value: '{{ type }}'
 ```
 </TabItem>
 </Tabs>
diff --git a/website/docs/services/cloudformation/publishers/index.md b/website/docs/services/cloudformation/publishers/index.md
index 90406a788..04f0d785e 100644
--- a/website/docs/services/cloudformation/publishers/index.md
+++ b/website/docs/services/cloudformation/publishers/index.md
@@ -152,7 +152,7 @@ publisher_status,
 publisher_profile,
 identity_provider
 FROM awscc.cloudformation.publishers
-WHERE region = 'us-east-1' AND Identifier = '<PublisherId>';
+WHERE region = 'us-east-1' AND Identifier = '{{ publisher_id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -188,8 +188,8 @@ INSERT INTO awscc.cloudformation.publishers (
  AcceptTermsAndConditions,
  region
 )
-SELECT 
-'{{ AcceptTermsAndConditions }}',
+SELECT
+'{{ accept_terms_and_conditions }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -202,9 +202,9 @@ INSERT INTO awscc.cloudformation.publishers (
  ConnectionArn,
  region
 )
-SELECT 
- '{{ AcceptTermsAndConditions }}',
- '{{ ConnectionArn }}',
+SELECT
+ '{{ accept_terms_and_conditions }}',
+ '{{ connection_arn }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -222,11 +222,10 @@ globals:
 resources:
   - name: publisher
     props:
-      - name: AcceptTermsAndConditions
-        value: '{{ AcceptTermsAndConditions }}'
-      - name: ConnectionArn
-        value: '{{ ConnectionArn }}'
-
+      - name: accept_terms_and_conditions
+        value: '{{ accept_terms_and_conditions }}'
+      - name: connection_arn
+        value: '{{ connection_arn }}'
 ```
 </TabItem>
 </Tabs>
diff --git a/website/docs/services/cloudformation/resource_default_versions/index.md b/website/docs/services/cloudformation/resource_default_versions/index.md
index 6eeb2d04a..1c2e9b643 100644
--- a/website/docs/services/cloudformation/resource_default_versions/index.md
+++ b/website/docs/services/cloudformation/resource_default_versions/index.md
@@ -152,7 +152,7 @@ type_name,
 arn,
 type_version_arn
 FROM awscc.cloudformation.resource_default_versions
-WHERE region = 'us-east-1' AND Identifier = '<Arn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -190,10 +190,10 @@ INSERT INTO awscc.cloudformation.resource_default_versions (
  TypeVersionArn,
  region
 )
-SELECT 
-'{{ VersionId }}',
- '{{ TypeName }}',
- '{{ TypeVersionArn }}',
+SELECT
+'{{ version_id }}',
+ '{{ type_name }}',
+ '{{ type_version_arn }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -207,10 +207,10 @@ INSERT INTO awscc.cloudformation.resource_default_versions (
  TypeVersionArn,
  region
 )
-SELECT 
- '{{ VersionId }}',
- '{{ TypeName }}',
- '{{ TypeVersionArn }}',
+SELECT
+ '{{ version_id }}',
+ '{{ type_name }}',
+ '{{ type_version_arn }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -228,13 +228,12 @@ globals:
 resources:
   - name: resource_default_version
     props:
-      - name: VersionId
-        value: '{{ VersionId }}'
-      - name: TypeName
-        value: '{{ TypeName }}'
-      - name: TypeVersionArn
-        value: '{{ TypeVersionArn }}'
-
+      - name: version_id
+        value: '{{ version_id }}'
+      - name: type_name
+        value: '{{ type_name }}'
+      - name: type_version_arn
+        value: '{{ type_version_arn }}'
 ```
 </TabItem>
 </Tabs>
@@ -252,7 +251,7 @@ SET PatchDocument = string('{{ {
     "TypeVersionArn": type_version_arn
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Arn>';
+AND Identifier = '{{ arn }}';
 ```
 
 
@@ -261,7 +260,7 @@ AND Identifier = '<Arn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.cloudformation.resource_default_versions
-WHERE Identifier = '<Arn>'
+WHERE Identifier = '{{ arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/cloudformation/resource_versions/index.md b/website/docs/services/cloudformation/resource_versions/index.md
index 006c61e96..50a4ac406 100644
--- a/website/docs/services/cloudformation/resource_versions/index.md
+++ b/website/docs/services/cloudformation/resource_versions/index.md
@@ -194,7 +194,7 @@ type_name,
 version_id,
 visibility
 FROM awscc.cloudformation.resource_versions
-WHERE region = 'us-east-1' AND Identifier = '<Arn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -231,9 +231,9 @@ INSERT INTO awscc.cloudformation.resource_versions (
  TypeName,
  region
 )
-SELECT 
-'{{ SchemaHandlerPackage }}',
- '{{ TypeName }}',
+SELECT
+'{{ schema_handler_package }}',
+ '{{ type_name }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -248,11 +248,11 @@ INSERT INTO awscc.cloudformation.resource_versions (
  TypeName,
  region
 )
-SELECT 
- '{{ ExecutionRoleArn }}',
- '{{ LoggingConfig }}',
- '{{ SchemaHandlerPackage }}',
- '{{ TypeName }}',
+SELECT
+ '{{ execution_role_arn }}',
+ '{{ logging_config }}',
+ '{{ schema_handler_package }}',
+ '{{ type_name }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -270,17 +270,16 @@ globals:
 resources:
   - name: resource_version
     props:
-      - name: ExecutionRoleArn
-        value: '{{ ExecutionRoleArn }}'
-      - name: LoggingConfig
+      - name: execution_role_arn
+        value: '{{ execution_role_arn }}'
+      - name: logging_config
         value:
-          LogGroupName: '{{ LogGroupName }}'
-          LogRoleArn: '{{ LogRoleArn }}'
-      - name: SchemaHandlerPackage
-        value: '{{ SchemaHandlerPackage }}'
-      - name: TypeName
-        value: '{{ TypeName }}'
-
+          log_group_name: '{{ log_group_name }}'
+          log_role_arn: '{{ log_role_arn }}'
+      - name: schema_handler_package
+        value: '{{ schema_handler_package }}'
+      - name: type_name
+        value: '{{ type_name }}'
 ```
 </TabItem>
 </Tabs>
@@ -291,7 +290,7 @@ resources:
 ```sql
 /*+ delete */
 DELETE FROM awscc.cloudformation.resource_versions
-WHERE Identifier = '<Arn>'
+WHERE Identifier = '{{ arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/cloudformation/stack_sets/index.md b/website/docs/services/cloudformation/stack_sets/index.md
index a4d6ec2d6..d1181f2d9 100644
--- a/website/docs/services/cloudformation/stack_sets/index.md
+++ b/website/docs/services/cloudformation/stack_sets/index.md
@@ -355,7 +355,7 @@ template_url,
 call_as,
 managed_execution
 FROM awscc.cloudformation.stack_sets
-WHERE region = 'us-east-1' AND Identifier = '<StackSetId>';
+WHERE region = 'us-east-1' AND Identifier = '{{ stack_set_id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -392,9 +392,9 @@ INSERT INTO awscc.cloudformation.stack_sets (
  PermissionModel,
  region
 )
-SELECT 
-'{{ StackSetName }}',
- '{{ PermissionModel }}',
+SELECT
+'{{ stack_set_name }}',
+ '{{ permission_model }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -420,22 +420,22 @@ INSERT INTO awscc.cloudformation.stack_sets (
  ManagedExecution,
  region
 )
-SELECT 
- '{{ StackSetName }}',
- '{{ AdministrationRoleARN }}',
- '{{ AutoDeployment }}',
- '{{ Capabilities }}',
- '{{ Description }}',
- '{{ ExecutionRoleName }}',
- '{{ OperationPreferences }}',
- '{{ StackInstancesGroup }}',
- '{{ Parameters }}',
- '{{ PermissionModel }}',
- '{{ Tags }}',
- '{{ TemplateBody }}',
- '{{ TemplateURL }}',
- '{{ CallAs }}',
- '{{ ManagedExecution }}',
+SELECT
+ '{{ stack_set_name }}',
+ '{{ administration_role_arn }}',
+ '{{ auto_deployment }}',
+ '{{ capabilities }}',
+ '{{ description }}',
+ '{{ execution_role_name }}',
+ '{{ operation_preferences }}',
+ '{{ stack_instances_group }}',
+ '{{ parameters }}',
+ '{{ permission_model }}',
+ '{{ tags }}',
+ '{{ template_body }}',
+ '{{ template_url }}',
+ '{{ call_as }}',
+ '{{ managed_execution }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -453,64 +453,63 @@ globals:
 resources:
   - name: stack_set
     props:
-      - name: StackSetName
-        value: '{{ StackSetName }}'
-      - name: AdministrationRoleARN
-        value: '{{ AdministrationRoleARN }}'
-      - name: AutoDeployment
+      - name: stack_set_name
+        value: '{{ stack_set_name }}'
+      - name: administration_role_arn
+        value: '{{ administration_role_arn }}'
+      - name: auto_deployment
         value:
-          Enabled: '{{ Enabled }}'
-          RetainStacksOnAccountRemoval: '{{ RetainStacksOnAccountRemoval }}'
-      - name: Capabilities
+          enabled: '{{ enabled }}'
+          retain_stacks_on_account_removal: '{{ retain_stacks_on_account_removal }}'
+      - name: capabilities
         value:
-          - '{{ Capabilities[0] }}'
-      - name: Description
-        value: '{{ Description }}'
-      - name: ExecutionRoleName
-        value: '{{ ExecutionRoleName }}'
-      - name: OperationPreferences
+          - '{{ capabilities[0] }}'
+      - name: description
+        value: '{{ description }}'
+      - name: execution_role_name
+        value: '{{ execution_role_name }}'
+      - name: operation_preferences
         value:
-          FailureToleranceCount: '{{ FailureToleranceCount }}'
-          FailureTolerancePercentage: '{{ FailureTolerancePercentage }}'
-          MaxConcurrentCount: '{{ MaxConcurrentCount }}'
-          MaxConcurrentPercentage: '{{ MaxConcurrentPercentage }}'
-          RegionOrder:
-            - '{{ RegionOrder[0] }}'
-          RegionConcurrencyType: '{{ RegionConcurrencyType }}'
-          ConcurrencyMode: '{{ ConcurrencyMode }}'
-      - name: StackInstancesGroup
+          failure_tolerance_count: '{{ failure_tolerance_count }}'
+          failure_tolerance_percentage: '{{ failure_tolerance_percentage }}'
+          max_concurrent_count: '{{ max_concurrent_count }}'
+          max_concurrent_percentage: '{{ max_concurrent_percentage }}'
+          region_order:
+            - '{{ region_order[0] }}'
+          region_concurrency_type: '{{ region_concurrency_type }}'
+          concurrency_mode: '{{ concurrency_mode }}'
+      - name: stack_instances_group
         value:
-          - DeploymentTargets:
-              Accounts:
-                - '{{ Accounts[0] }}'
-              AccountsUrl: '{{ AccountsUrl }}'
-              OrganizationalUnitIds:
-                - '{{ OrganizationalUnitIds[0] }}'
-              AccountFilterType: '{{ AccountFilterType }}'
-            Regions:
+          - deployment_targets:
+              accounts:
+                - '{{ accounts[0] }}'
+              accounts_url: '{{ accounts_url }}'
+              organizational_unit_ids:
+                - '{{ organizational_unit_ids[0] }}'
+              account_filter_type: '{{ account_filter_type }}'
+            regions:
               - null
-            ParameterOverrides:
-              - ParameterKey: '{{ ParameterKey }}'
-                ParameterValue: '{{ ParameterValue }}'
-      - name: Parameters
+            parameter_overrides:
+              - parameter_key: '{{ parameter_key }}'
+                parameter_value: '{{ parameter_value }}'
+      - name: parameters
         value:
           - null
-      - name: PermissionModel
-        value: '{{ PermissionModel }}'
-      - name: Tags
+      - name: permission_model
+        value: '{{ permission_model }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-      - name: TemplateBody
-        value: '{{ TemplateBody }}'
-      - name: TemplateURL
-        value: '{{ TemplateURL }}'
-      - name: CallAs
-        value: '{{ CallAs }}'
-      - name: ManagedExecution
+          - key: '{{ key }}'
+            value: '{{ value }}'
+      - name: template_body
+        value: '{{ template_body }}'
+      - name: template_url
+        value: '{{ template_url }}'
+      - name: call_as
+        value: '{{ call_as }}'
+      - name: managed_execution
         value:
-          Active: '{{ Active }}'
-
+          active: '{{ active }}'
 ```
 </TabItem>
 </Tabs>
@@ -538,7 +537,7 @@ SET PatchDocument = string('{{ {
     "ManagedExecution": managed_execution
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<StackSetId>';
+AND Identifier = '{{ stack_set_id }}';
 ```
 
 
@@ -547,7 +546,7 @@ AND Identifier = '<StackSetId>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.cloudformation.stack_sets
-WHERE Identifier = '<StackSetId>'
+WHERE Identifier = '{{ stack_set_id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/cloudformation/stacks/index.md b/website/docs/services/cloudformation/stacks/index.md
index 2651c5fa9..b69619e2e 100644
--- a/website/docs/services/cloudformation/stacks/index.md
+++ b/website/docs/services/cloudformation/stacks/index.md
@@ -300,7 +300,7 @@ timeout_in_minutes,
 last_update_time,
 creation_time
 FROM awscc.cloudformation.stacks
-WHERE region = 'us-east-1' AND Identifier = '<StackId>';
+WHERE region = 'us-east-1' AND Identifier = '{{ stack_id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -336,8 +336,8 @@ INSERT INTO awscc.cloudformation.stacks (
  StackName,
  region
 )
-SELECT 
-'{{ StackName }}',
+SELECT
+'{{ stack_name }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -363,22 +363,22 @@ INSERT INTO awscc.cloudformation.stacks (
  TimeoutInMinutes,
  region
 )
-SELECT 
- '{{ Capabilities }}',
- '{{ RoleARN }}',
- '{{ Description }}',
- '{{ DisableRollback }}',
- '{{ EnableTerminationProtection }}',
- '{{ NotificationARNs }}',
- '{{ Parameters }}',
- '{{ StackName }}',
- '{{ StackPolicyBody }}',
- '{{ StackPolicyURL }}',
- '{{ StackStatusReason }}',
- '{{ Tags }}',
- '{{ TemplateBody }}',
- '{{ TemplateURL }}',
- '{{ TimeoutInMinutes }}',
+SELECT
+ '{{ capabilities }}',
+ '{{ role_arn }}',
+ '{{ description }}',
+ '{{ disable_rollback }}',
+ '{{ enable_termination_protection }}',
+ '{{ notification_arns }}',
+ '{{ parameters }}',
+ '{{ stack_name }}',
+ '{{ stack_policy_body }}',
+ '{{ stack_policy_url }}',
+ '{{ stack_status_reason }}',
+ '{{ tags }}',
+ '{{ template_body }}',
+ '{{ template_url }}',
+ '{{ timeout_in_minutes }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -396,41 +396,40 @@ globals:
 resources:
   - name: stack
     props:
-      - name: Capabilities
+      - name: capabilities
         value:
-          - '{{ Capabilities[0] }}'
-      - name: RoleARN
-        value: '{{ RoleARN }}'
-      - name: Description
-        value: '{{ Description }}'
-      - name: DisableRollback
-        value: '{{ DisableRollback }}'
-      - name: EnableTerminationProtection
-        value: '{{ EnableTerminationProtection }}'
-      - name: NotificationARNs
+          - '{{ capabilities[0] }}'
+      - name: role_arn
+        value: '{{ role_arn }}'
+      - name: description
+        value: '{{ description }}'
+      - name: disable_rollback
+        value: '{{ disable_rollback }}'
+      - name: enable_termination_protection
+        value: '{{ enable_termination_protection }}'
+      - name: notification_arns
         value:
-          - '{{ NotificationARNs[0] }}'
-      - name: Parameters
+          - '{{ notification_arns[0] }}'
+      - name: parameters
         value: {}
-      - name: StackName
-        value: '{{ StackName }}'
-      - name: StackPolicyBody
+      - name: stack_name
+        value: '{{ stack_name }}'
+      - name: stack_policy_body
         value: {}
-      - name: StackPolicyURL
-        value: '{{ StackPolicyURL }}'
-      - name: StackStatusReason
-        value: '{{ StackStatusReason }}'
-      - name: Tags
+      - name: stack_policy_url
+        value: '{{ stack_policy_url }}'
+      - name: stack_status_reason
+        value: '{{ stack_status_reason }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-      - name: TemplateBody
+          - key: '{{ key }}'
+            value: '{{ value }}'
+      - name: template_body
         value: {}
-      - name: TemplateURL
-        value: '{{ TemplateURL }}'
-      - name: TimeoutInMinutes
-        value: '{{ TimeoutInMinutes }}'
-
+      - name: template_url
+        value: '{{ template_url }}'
+      - name: timeout_in_minutes
+        value: '{{ timeout_in_minutes }}'
 ```
 </TabItem>
 </Tabs>
@@ -459,7 +458,7 @@ SET PatchDocument = string('{{ {
     "TimeoutInMinutes": timeout_in_minutes
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<StackId>';
+AND Identifier = '{{ stack_id }}';
 ```
 
 
@@ -468,7 +467,7 @@ AND Identifier = '<StackId>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.cloudformation.stacks
-WHERE Identifier = '<StackId>'
+WHERE Identifier = '{{ stack_id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/cloudformation/type_activations/index.md b/website/docs/services/cloudformation/type_activations/index.md
index 9ae7e8b08..b48af8fc9 100644
--- a/website/docs/services/cloudformation/type_activations/index.md
+++ b/website/docs/services/cloudformation/type_activations/index.md
@@ -206,7 +206,7 @@ major_version,
 type_name,
 type
 FROM awscc.cloudformation.type_activations
-WHERE region = 'us-east-1' AND Identifier = '<Arn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -251,17 +251,17 @@ INSERT INTO awscc.cloudformation.type_activations (
  Type,
  region
 )
-SELECT 
-'{{ ExecutionRoleArn }}',
- '{{ PublisherId }}',
- '{{ LoggingConfig }}',
- '{{ PublicTypeArn }}',
- '{{ AutoUpdate }}',
- '{{ TypeNameAlias }}',
- '{{ VersionBump }}',
- '{{ MajorVersion }}',
- '{{ TypeName }}',
- '{{ Type }}',
+SELECT
+'{{ execution_role_arn }}',
+ '{{ publisher_id }}',
+ '{{ logging_config }}',
+ '{{ public_type_arn }}',
+ '{{ auto_update }}',
+ '{{ type_name_alias }}',
+ '{{ version_bump }}',
+ '{{ major_version }}',
+ '{{ type_name }}',
+ '{{ type }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -282,17 +282,17 @@ INSERT INTO awscc.cloudformation.type_activations (
  Type,
  region
 )
-SELECT 
- '{{ ExecutionRoleArn }}',
- '{{ PublisherId }}',
- '{{ LoggingConfig }}',
- '{{ PublicTypeArn }}',
- '{{ AutoUpdate }}',
- '{{ TypeNameAlias }}',
- '{{ VersionBump }}',
- '{{ MajorVersion }}',
- '{{ TypeName }}',
- '{{ Type }}',
+SELECT
+ '{{ execution_role_arn }}',
+ '{{ publisher_id }}',
+ '{{ logging_config }}',
+ '{{ public_type_arn }}',
+ '{{ auto_update }}',
+ '{{ type_name_alias }}',
+ '{{ version_bump }}',
+ '{{ major_version }}',
+ '{{ type_name }}',
+ '{{ type }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -310,29 +310,28 @@ globals:
 resources:
   - name: type_activation
     props:
-      - name: ExecutionRoleArn
-        value: '{{ ExecutionRoleArn }}'
-      - name: PublisherId
-        value: '{{ PublisherId }}'
-      - name: LoggingConfig
+      - name: execution_role_arn
+        value: '{{ execution_role_arn }}'
+      - name: publisher_id
+        value: '{{ publisher_id }}'
+      - name: logging_config
         value:
-          LogGroupName: '{{ LogGroupName }}'
-          LogRoleArn: '{{ LogRoleArn }}'
-      - name: PublicTypeArn
-        value: '{{ PublicTypeArn }}'
-      - name: AutoUpdate
-        value: '{{ AutoUpdate }}'
-      - name: TypeNameAlias
-        value: '{{ TypeNameAlias }}'
-      - name: VersionBump
-        value: '{{ VersionBump }}'
-      - name: MajorVersion
-        value: '{{ MajorVersion }}'
-      - name: TypeName
-        value: '{{ TypeName }}'
-      - name: Type
-        value: '{{ Type }}'
-
+          log_group_name: '{{ log_group_name }}'
+          log_role_arn: '{{ log_role_arn }}'
+      - name: public_type_arn
+        value: '{{ public_type_arn }}'
+      - name: auto_update
+        value: '{{ auto_update }}'
+      - name: type_name_alias
+        value: '{{ type_name_alias }}'
+      - name: version_bump
+        value: '{{ version_bump }}'
+      - name: major_version
+        value: '{{ major_version }}'
+      - name: type_name
+        value: '{{ type_name }}'
+      - name: type
+        value: '{{ type }}'
 ```
 </TabItem>
 </Tabs>
@@ -356,7 +355,7 @@ SET PatchDocument = string('{{ {
     "Type": type
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Arn>';
+AND Identifier = '{{ arn }}';
 ```
 
 
@@ -365,7 +364,7 @@ AND Identifier = '<Arn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.cloudformation.type_activations
-WHERE Identifier = '<Arn>'
+WHERE Identifier = '{{ arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/cloudfront/anycast_ip_lists/index.md b/website/docs/services/cloudfront/anycast_ip_lists/index.md
index 4e3eff999..e86fa6353 100644
--- a/website/docs/services/cloudfront/anycast_ip_lists/index.md
+++ b/website/docs/services/cloudfront/anycast_ip_lists/index.md
@@ -223,7 +223,7 @@ ip_count,
 name,
 tags
 FROM awscc.cloudfront.anycast_ip_lists
-WHERE Identifier = '<Id>';
+WHERE region = 'us-east-1' AND Identifier = '{{ id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -234,7 +234,7 @@ SELECT
 region,
 id
 FROM awscc.cloudfront.anycast_ip_lists_list_only
-;
+WHERE region = 'us-east-1';
 ```
 </TabItem>
 </Tabs>
@@ -260,9 +260,9 @@ INSERT INTO awscc.cloudfront.anycast_ip_lists (
  Name,
  region
 )
-SELECT 
-'{{ IpCount }}',
- '{{ Name }}',
+SELECT
+'{{ ip_count }}',
+ '{{ name }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -276,10 +276,10 @@ INSERT INTO awscc.cloudfront.anycast_ip_lists (
  Tags,
  region
 )
-SELECT 
- '{{ IpCount }}',
- '{{ Name }}',
- '{{ Tags }}',
+SELECT
+ '{{ ip_count }}',
+ '{{ name }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -297,16 +297,15 @@ globals:
 resources:
   - name: anycast_ip_list
     props:
-      - name: IpCount
-        value: '{{ IpCount }}'
-      - name: Name
-        value: '{{ Name }}'
-      - name: Tags
+      - name: ip_count
+        value: '{{ ip_count }}'
+      - name: name
+        value: '{{ name }}'
+      - name: tags
         value:
-          Items:
-            - Key: '{{ Key }}'
-              Value: '{{ Value }}'
-
+          items:
+            - key: '{{ key }}'
+              value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -317,7 +316,7 @@ resources:
 ```sql
 /*+ delete */
 DELETE FROM awscc.cloudfront.anycast_ip_lists
-WHERE Identifier = '<Id>'
+WHERE Identifier = '{{ id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/cloudfront/cache_policies/index.md b/website/docs/services/cloudfront/cache_policies/index.md
index 45b4b57ab..b9e38d368 100644
--- a/website/docs/services/cloudfront/cache_policies/index.md
+++ b/website/docs/services/cloudfront/cache_policies/index.md
@@ -241,7 +241,7 @@ cache_policy_config,
 id,
 last_modified_time
 FROM awscc.cloudfront.cache_policies
-WHERE Identifier = '<Id>';
+WHERE region = 'us-east-1' AND Identifier = '{{ id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -252,7 +252,7 @@ SELECT
 region,
 id
 FROM awscc.cloudfront.cache_policies_list_only
-;
+WHERE region = 'us-east-1';
 ```
 </TabItem>
 </Tabs>
@@ -277,8 +277,8 @@ INSERT INTO awscc.cloudfront.cache_policies (
  CachePolicyConfig,
  region
 )
-SELECT 
-'{{ CachePolicyConfig }}',
+SELECT
+'{{ cache_policy_config }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -290,8 +290,8 @@ INSERT INTO awscc.cloudfront.cache_policies (
  CachePolicyConfig,
  region
 )
-SELECT 
- '{{ CachePolicyConfig }}',
+SELECT
+ '{{ cache_policy_config }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -309,29 +309,28 @@ globals:
 resources:
   - name: cache_policy
     props:
-      - name: CachePolicyConfig
+      - name: cache_policy_config
         value:
-          Comment: '{{ Comment }}'
-          DefaultTTL: null
-          MaxTTL: null
-          MinTTL: null
-          Name: '{{ Name }}'
-          ParametersInCacheKeyAndForwardedToOrigin:
-            CookiesConfig:
-              CookieBehavior: '{{ CookieBehavior }}'
-              Cookies:
-                - '{{ Cookies[0] }}'
-            EnableAcceptEncodingBrotli: '{{ EnableAcceptEncodingBrotli }}'
-            EnableAcceptEncodingGzip: '{{ EnableAcceptEncodingGzip }}'
-            HeadersConfig:
-              HeaderBehavior: '{{ HeaderBehavior }}'
-              Headers:
-                - '{{ Headers[0] }}'
-            QueryStringsConfig:
-              QueryStringBehavior: '{{ QueryStringBehavior }}'
-              QueryStrings:
-                - '{{ QueryStrings[0] }}'
-
+          comment: '{{ comment }}'
+          default_ttl: null
+          max_ttl: null
+          min_ttl: null
+          name: '{{ name }}'
+          parameters_in_cache_key_and_forwarded_to_origin:
+            cookies_config:
+              cookie_behavior: '{{ cookie_behavior }}'
+              cookies:
+                - '{{ cookies[0] }}'
+            enable_accept_encoding_brotli: '{{ enable_accept_encoding_brotli }}'
+            enable_accept_encoding_gzip: '{{ enable_accept_encoding_gzip }}'
+            headers_config:
+              header_behavior: '{{ header_behavior }}'
+              headers:
+                - '{{ headers[0] }}'
+            query_strings_config:
+              query_string_behavior: '{{ query_string_behavior }}'
+              query_strings:
+                - '{{ query_strings[0] }}'
 ```
 </TabItem>
 </Tabs>
@@ -347,7 +346,7 @@ SET PatchDocument = string('{{ {
     "CachePolicyConfig": cache_policy_config
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Id>';
+AND Identifier = '{{ id }}';
 ```
 
 
@@ -356,7 +355,7 @@ AND Identifier = '<Id>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.cloudfront.cache_policies
-WHERE Identifier = '<Id>'
+WHERE Identifier = '{{ id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/cloudfront/cloud_front_origin_access_identities/index.md b/website/docs/services/cloudfront/cloud_front_origin_access_identities/index.md
index 797b5a701..a1e4dd9ee 100644
--- a/website/docs/services/cloudfront/cloud_front_origin_access_identities/index.md
+++ b/website/docs/services/cloudfront/cloud_front_origin_access_identities/index.md
@@ -153,7 +153,7 @@ cloud_front_origin_access_identity_config,
 id,
 s3_canonical_user_id
 FROM awscc.cloudfront.cloud_front_origin_access_identities
-WHERE Identifier = '<Id>';
+WHERE region = 'us-east-1' AND Identifier = '{{ id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -164,7 +164,7 @@ SELECT
 region,
 id
 FROM awscc.cloudfront.cloud_front_origin_access_identities_list_only
-;
+WHERE region = 'us-east-1';
 ```
 </TabItem>
 </Tabs>
@@ -189,8 +189,8 @@ INSERT INTO awscc.cloudfront.cloud_front_origin_access_identities (
  CloudFrontOriginAccessIdentityConfig,
  region
 )
-SELECT 
-'{{ CloudFrontOriginAccessIdentityConfig }}',
+SELECT
+'{{ cloud_front_origin_access_identity_config }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -202,8 +202,8 @@ INSERT INTO awscc.cloudfront.cloud_front_origin_access_identities (
  CloudFrontOriginAccessIdentityConfig,
  region
 )
-SELECT 
- '{{ CloudFrontOriginAccessIdentityConfig }}',
+SELECT
+ '{{ cloud_front_origin_access_identity_config }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -221,10 +221,9 @@ globals:
 resources:
   - name: cloud_front_origin_access_identity
     props:
-      - name: CloudFrontOriginAccessIdentityConfig
+      - name: cloud_front_origin_access_identity_config
         value:
-          Comment: '{{ Comment }}'
-
+          comment: '{{ comment }}'
 ```
 </TabItem>
 </Tabs>
@@ -240,7 +239,7 @@ SET PatchDocument = string('{{ {
     "CloudFrontOriginAccessIdentityConfig": cloud_front_origin_access_identity_config
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Id>';
+AND Identifier = '{{ id }}';
 ```
 
 
@@ -249,7 +248,7 @@ AND Identifier = '<Id>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.cloudfront.cloud_front_origin_access_identities
-WHERE Identifier = '<Id>'
+WHERE Identifier = '{{ id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/cloudfront/connection_groups/index.md b/website/docs/services/cloudfront/connection_groups/index.md
index a1d9b07c8..7af5f6b97 100644
--- a/website/docs/services/cloudfront/connection_groups/index.md
+++ b/website/docs/services/cloudfront/connection_groups/index.md
@@ -218,7 +218,7 @@ enabled,
 is_default,
 e_tag
 FROM awscc.cloudfront.connection_groups
-WHERE Identifier = '<Id>';
+WHERE region = 'us-east-1' AND Identifier = '{{ id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -229,7 +229,7 @@ SELECT
 region,
 id
 FROM awscc.cloudfront.connection_groups_list_only
-;
+WHERE region = 'us-east-1';
 ```
 </TabItem>
 </Tabs>
@@ -254,8 +254,8 @@ INSERT INTO awscc.cloudfront.connection_groups (
  Name,
  region
 )
-SELECT 
-'{{ Name }}',
+SELECT
+'{{ name }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -271,12 +271,12 @@ INSERT INTO awscc.cloudfront.connection_groups (
  Enabled,
  region
 )
-SELECT 
- '{{ Name }}',
- '{{ Tags }}',
- '{{ Ipv6Enabled }}',
- '{{ AnycastIpListId }}',
- '{{ Enabled }}',
+SELECT
+ '{{ name }}',
+ '{{ tags }}',
+ '{{ ipv6_enabled }}',
+ '{{ anycast_ip_list_id }}',
+ '{{ enabled }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -294,19 +294,18 @@ globals:
 resources:
   - name: connection_group
     props:
-      - name: Name
-        value: '{{ Name }}'
-      - name: Tags
+      - name: name
+        value: '{{ name }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-      - name: Ipv6Enabled
-        value: '{{ Ipv6Enabled }}'
-      - name: AnycastIpListId
-        value: '{{ AnycastIpListId }}'
-      - name: Enabled
-        value: '{{ Enabled }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
+      - name: ipv6_enabled
+        value: '{{ ipv6_enabled }}'
+      - name: anycast_ip_list_id
+        value: '{{ anycast_ip_list_id }}'
+      - name: enabled
+        value: '{{ enabled }}'
 ```
 </TabItem>
 </Tabs>
@@ -325,7 +324,7 @@ SET PatchDocument = string('{{ {
     "Enabled": enabled
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Id>';
+AND Identifier = '{{ id }}';
 ```
 
 
@@ -334,7 +333,7 @@ AND Identifier = '<Id>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.cloudfront.connection_groups
-WHERE Identifier = '<Id>'
+WHERE Identifier = '{{ id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/cloudfront/continuous_deployment_policies/index.md b/website/docs/services/cloudfront/continuous_deployment_policies/index.md
index 9b51cfd1c..b3381cb41 100644
--- a/website/docs/services/cloudfront/continuous_deployment_policies/index.md
+++ b/website/docs/services/cloudfront/continuous_deployment_policies/index.md
@@ -255,7 +255,7 @@ continuous_deployment_policy_config,
 id,
 last_modified_time
 FROM awscc.cloudfront.continuous_deployment_policies
-WHERE Identifier = '<Id>';
+WHERE region = 'us-east-1' AND Identifier = '{{ id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -266,7 +266,7 @@ SELECT
 region,
 id
 FROM awscc.cloudfront.continuous_deployment_policies_list_only
-;
+WHERE region = 'us-east-1';
 ```
 </TabItem>
 </Tabs>
@@ -291,8 +291,8 @@ INSERT INTO awscc.cloudfront.continuous_deployment_policies (
  ContinuousDeploymentPolicyConfig,
  region
 )
-SELECT 
-'{{ ContinuousDeploymentPolicyConfig }}',
+SELECT
+'{{ continuous_deployment_policy_config }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -304,8 +304,8 @@ INSERT INTO awscc.cloudfront.continuous_deployment_policies (
  ContinuousDeploymentPolicyConfig,
  region
 )
-SELECT 
- '{{ ContinuousDeploymentPolicyConfig }}',
+SELECT
+ '{{ continuous_deployment_policy_config }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -323,29 +323,28 @@ globals:
 resources:
   - name: continuous_deployment_policy
     props:
-      - name: ContinuousDeploymentPolicyConfig
+      - name: continuous_deployment_policy_config
         value:
-          Enabled: '{{ Enabled }}'
-          SingleHeaderPolicyConfig:
-            Header: '{{ Header }}'
-            Value: '{{ Value }}'
-          SingleWeightPolicyConfig:
-            SessionStickinessConfig:
-              IdleTTL: '{{ IdleTTL }}'
-              MaximumTTL: '{{ MaximumTTL }}'
-            Weight: null
-          StagingDistributionDnsNames:
-            - '{{ StagingDistributionDnsNames[0] }}'
-          TrafficConfig:
-            SingleHeaderConfig:
-              Header: '{{ Header }}'
-              Value: '{{ Value }}'
-            SingleWeightConfig:
-              SessionStickinessConfig: null
-              Weight: null
-            Type: '{{ Type }}'
-          Type: '{{ Type }}'
-
+          enabled: '{{ enabled }}'
+          single_header_policy_config:
+            header: '{{ header }}'
+            value: '{{ value }}'
+          single_weight_policy_config:
+            session_stickiness_config:
+              idle_ttl: '{{ idle_ttl }}'
+              maximum_ttl: '{{ maximum_ttl }}'
+            weight: null
+          staging_distribution_dns_names:
+            - '{{ staging_distribution_dns_names[0] }}'
+          traffic_config:
+            single_header_config:
+              header: '{{ header }}'
+              value: '{{ value }}'
+            single_weight_config:
+              session_stickiness_config: null
+              weight: null
+            type: '{{ type }}'
+          type: '{{ type }}'
 ```
 </TabItem>
 </Tabs>
@@ -361,7 +360,7 @@ SET PatchDocument = string('{{ {
     "ContinuousDeploymentPolicyConfig": continuous_deployment_policy_config
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Id>';
+AND Identifier = '{{ id }}';
 ```
 
 
@@ -370,7 +369,7 @@ AND Identifier = '<Id>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.cloudfront.continuous_deployment_policies
-WHERE Identifier = '<Id>'
+WHERE Identifier = '{{ id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/cloudfront/distribution_tenants/index.md b/website/docs/services/cloudfront/distribution_tenants/index.md
index cdd28762b..4ef9b90aa 100644
--- a/website/docs/services/cloudfront/distribution_tenants/index.md
+++ b/website/docs/services/cloudfront/distribution_tenants/index.md
@@ -325,7 +325,7 @@ e_tag,
 domains,
 managed_certificate_request
 FROM awscc.cloudfront.distribution_tenants
-WHERE Identifier = '<Id>';
+WHERE region = 'us-east-1' AND Identifier = '{{ id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -336,7 +336,7 @@ SELECT
 region,
 id
 FROM awscc.cloudfront.distribution_tenants_list_only
-;
+WHERE region = 'us-east-1';
 ```
 </TabItem>
 </Tabs>
@@ -363,10 +363,10 @@ INSERT INTO awscc.cloudfront.distribution_tenants (
  Domains,
  region
 )
-SELECT 
-'{{ DistributionId }}',
- '{{ Name }}',
- '{{ Domains }}',
+SELECT
+'{{ distribution_id }}',
+ '{{ name }}',
+ '{{ domains }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -386,16 +386,16 @@ INSERT INTO awscc.cloudfront.distribution_tenants (
  ManagedCertificateRequest,
  region
 )
-SELECT 
- '{{ DistributionId }}',
- '{{ Name }}',
- '{{ Tags }}',
- '{{ Customizations }}',
- '{{ Parameters }}',
- '{{ ConnectionGroupId }}',
- '{{ Enabled }}',
- '{{ Domains }}',
- '{{ ManagedCertificateRequest }}',
+SELECT
+ '{{ distribution_id }}',
+ '{{ name }}',
+ '{{ tags }}',
+ '{{ customizations }}',
+ '{{ parameters }}',
+ '{{ connection_group_id }}',
+ '{{ enabled }}',
+ '{{ domains }}',
+ '{{ managed_certificate_request }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -413,42 +413,41 @@ globals:
 resources:
   - name: distribution_tenant
     props:
-      - name: DistributionId
-        value: '{{ DistributionId }}'
-      - name: Name
-        value: '{{ Name }}'
-      - name: Tags
+      - name: distribution_id
+        value: '{{ distribution_id }}'
+      - name: name
+        value: '{{ name }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-      - name: Customizations
+          - key: '{{ key }}'
+            value: '{{ value }}'
+      - name: customizations
         value:
-          WebAcl:
-            Action: '{{ Action }}'
-            Arn: '{{ Arn }}'
-          Certificate:
-            Arn: '{{ Arn }}'
-          GeoRestrictions:
-            RestrictionType: '{{ RestrictionType }}'
-            Locations:
-              - '{{ Locations[0] }}'
-      - name: Parameters
+          web_acl:
+            action: '{{ action }}'
+            arn: '{{ arn }}'
+          certificate:
+            arn: '{{ arn }}'
+          geo_restrictions:
+            restriction_type: '{{ restriction_type }}'
+            locations:
+              - '{{ locations[0] }}'
+      - name: parameters
         value:
-          - Name: '{{ Name }}'
-            Value: '{{ Value }}'
-      - name: ConnectionGroupId
-        value: '{{ ConnectionGroupId }}'
-      - name: Enabled
-        value: '{{ Enabled }}'
-      - name: Domains
+          - name: '{{ name }}'
+            value: '{{ value }}'
+      - name: connection_group_id
+        value: '{{ connection_group_id }}'
+      - name: enabled
+        value: '{{ enabled }}'
+      - name: domains
         value:
-          - '{{ Domains[0] }}'
-      - name: ManagedCertificateRequest
+          - '{{ domains[0] }}'
+      - name: managed_certificate_request
         value:
-          ValidationTokenHost: '{{ ValidationTokenHost }}'
-          PrimaryDomainName: '{{ PrimaryDomainName }}'
-          CertificateTransparencyLoggingPreference: '{{ CertificateTransparencyLoggingPreference }}'
-
+          validation_token_host: '{{ validation_token_host }}'
+          primary_domain_name: '{{ primary_domain_name }}'
+          certificate_transparency_logging_preference: '{{ certificate_transparency_logging_preference }}'
 ```
 </TabItem>
 </Tabs>
@@ -471,7 +470,7 @@ SET PatchDocument = string('{{ {
     "ManagedCertificateRequest": managed_certificate_request
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Id>';
+AND Identifier = '{{ id }}';
 ```
 
 
@@ -480,7 +479,7 @@ AND Identifier = '<Id>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.cloudfront.distribution_tenants
-WHERE Identifier = '<Id>'
+WHERE Identifier = '{{ id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/cloudfront/distributions/index.md b/website/docs/services/cloudfront/distributions/index.md
index c12492ec7..434814dbd 100644
--- a/website/docs/services/cloudfront/distributions/index.md
+++ b/website/docs/services/cloudfront/distributions/index.md
@@ -940,7 +940,7 @@ domain_name,
 id,
 tags
 FROM awscc.cloudfront.distributions
-WHERE Identifier = '<Id>';
+WHERE region = 'us-east-1' AND Identifier = '{{ id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -951,7 +951,7 @@ SELECT
 region,
 id
 FROM awscc.cloudfront.distributions_list_only
-;
+WHERE region = 'us-east-1';
 ```
 </TabItem>
 </Tabs>
@@ -976,8 +976,8 @@ INSERT INTO awscc.cloudfront.distributions (
  DistributionConfig,
  region
 )
-SELECT 
-'{{ DistributionConfig }}',
+SELECT
+'{{ distribution_config }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -990,9 +990,9 @@ INSERT INTO awscc.cloudfront.distributions (
  Tags,
  region
 )
-SELECT 
- '{{ DistributionConfig }}',
- '{{ Tags }}',
+SELECT
+ '{{ distribution_config }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -1010,178 +1010,177 @@ globals:
 resources:
   - name: distribution
     props:
-      - name: DistributionConfig
+      - name: distribution_config
         value:
-          Aliases:
-            - '{{ Aliases[0] }}'
-          AnycastIpListId: '{{ AnycastIpListId }}'
-          CNAMEs:
-            - '{{ CNAMEs[0] }}'
-          CacheBehaviors:
-            - AllowedMethods:
-                - '{{ AllowedMethods[0] }}'
-              CachePolicyId: '{{ CachePolicyId }}'
-              CachedMethods:
-                - '{{ CachedMethods[0] }}'
-              Compress: '{{ Compress }}'
-              DefaultTTL: null
-              FieldLevelEncryptionId: '{{ FieldLevelEncryptionId }}'
-              ForwardedValues:
-                Cookies:
-                  Forward: '{{ Forward }}'
-                  WhitelistedNames:
-                    - '{{ WhitelistedNames[0] }}'
-                Headers:
-                  - '{{ Headers[0] }}'
-                QueryString: '{{ QueryString }}'
-                QueryStringCacheKeys:
-                  - '{{ QueryStringCacheKeys[0] }}'
-              FunctionAssociations:
-                - EventType: '{{ EventType }}'
-                  FunctionARN: '{{ FunctionARN }}'
-              GrpcConfig:
-                Enabled: '{{ Enabled }}'
-              LambdaFunctionAssociations:
-                - EventType: '{{ EventType }}'
-                  IncludeBody: '{{ IncludeBody }}'
-                  LambdaFunctionARN: '{{ LambdaFunctionARN }}'
-              MaxTTL: null
-              MinTTL: null
-              OriginRequestPolicyId: '{{ OriginRequestPolicyId }}'
-              PathPattern: '{{ PathPattern }}'
-              RealtimeLogConfigArn: '{{ RealtimeLogConfigArn }}'
-              ResponseHeadersPolicyId: '{{ ResponseHeadersPolicyId }}'
-              SmoothStreaming: '{{ SmoothStreaming }}'
-              TargetOriginId: '{{ TargetOriginId }}'
-              TrustedKeyGroups:
-                - '{{ TrustedKeyGroups[0] }}'
-              TrustedSigners:
-                - '{{ TrustedSigners[0] }}'
-              ViewerProtocolPolicy: '{{ ViewerProtocolPolicy }}'
-          Comment: '{{ Comment }}'
-          ConnectionMode: '{{ ConnectionMode }}'
-          ContinuousDeploymentPolicyId: '{{ ContinuousDeploymentPolicyId }}'
-          CustomErrorResponses:
-            - ErrorCachingMinTTL: null
-              ErrorCode: '{{ ErrorCode }}'
-              ResponseCode: '{{ ResponseCode }}'
-              ResponsePagePath: '{{ ResponsePagePath }}'
-          CustomOrigin:
-            DNSName: '{{ DNSName }}'
-            HTTPPort: '{{ HTTPPort }}'
-            HTTPSPort: '{{ HTTPSPort }}'
-            OriginProtocolPolicy: '{{ OriginProtocolPolicy }}'
-            OriginSSLProtocols:
-              - '{{ OriginSSLProtocols[0] }}'
-          DefaultCacheBehavior:
-            AllowedMethods:
-              - '{{ AllowedMethods[0] }}'
-            CachePolicyId: '{{ CachePolicyId }}'
-            CachedMethods:
-              - '{{ CachedMethods[0] }}'
-            Compress: '{{ Compress }}'
-            DefaultTTL: null
-            FieldLevelEncryptionId: '{{ FieldLevelEncryptionId }}'
-            ForwardedValues: null
-            FunctionAssociations:
+          aliases:
+            - '{{ aliases[0] }}'
+          anycast_ip_list_id: '{{ anycast_ip_list_id }}'
+          cnames:
+            - '{{ cnames[0] }}'
+          cache_behaviors:
+            - allowed_methods:
+                - '{{ allowed_methods[0] }}'
+              cache_policy_id: '{{ cache_policy_id }}'
+              cached_methods:
+                - '{{ cached_methods[0] }}'
+              compress: '{{ compress }}'
+              default_ttl: null
+              field_level_encryption_id: '{{ field_level_encryption_id }}'
+              forwarded_values:
+                cookies:
+                  forward: '{{ forward }}'
+                  whitelisted_names:
+                    - '{{ whitelisted_names[0] }}'
+                headers:
+                  - '{{ headers[0] }}'
+                query_string: '{{ query_string }}'
+                query_string_cache_keys:
+                  - '{{ query_string_cache_keys[0] }}'
+              function_associations:
+                - event_type: '{{ event_type }}'
+                  function_arn: '{{ function_arn }}'
+              grpc_config:
+                enabled: '{{ enabled }}'
+              lambda_function_associations:
+                - event_type: '{{ event_type }}'
+                  include_body: '{{ include_body }}'
+                  lambda_function_arn: '{{ lambda_function_arn }}'
+              max_ttl: null
+              min_ttl: null
+              origin_request_policy_id: '{{ origin_request_policy_id }}'
+              path_pattern: '{{ path_pattern }}'
+              realtime_log_config_arn: '{{ realtime_log_config_arn }}'
+              response_headers_policy_id: '{{ response_headers_policy_id }}'
+              smooth_streaming: '{{ smooth_streaming }}'
+              target_origin_id: '{{ target_origin_id }}'
+              trusted_key_groups:
+                - '{{ trusted_key_groups[0] }}'
+              trusted_signers:
+                - '{{ trusted_signers[0] }}'
+              viewer_protocol_policy: '{{ viewer_protocol_policy }}'
+          comment: '{{ comment }}'
+          connection_mode: '{{ connection_mode }}'
+          continuous_deployment_policy_id: '{{ continuous_deployment_policy_id }}'
+          custom_error_responses:
+            - error_caching_min_ttl: null
+              error_code: '{{ error_code }}'
+              response_code: '{{ response_code }}'
+              response_page_path: '{{ response_page_path }}'
+          custom_origin:
+            dns_name: '{{ dns_name }}'
+            h_tt_pport: '{{ h_tt_pport }}'
+            h_tt_ps_port: '{{ h_tt_ps_port }}'
+            origin_protocol_policy: '{{ origin_protocol_policy }}'
+            origin_ss_lprotocols:
+              - '{{ origin_ss_lprotocols[0] }}'
+          default_cache_behavior:
+            allowed_methods:
+              - '{{ allowed_methods[0] }}'
+            cache_policy_id: '{{ cache_policy_id }}'
+            cached_methods:
+              - '{{ cached_methods[0] }}'
+            compress: '{{ compress }}'
+            default_ttl: null
+            field_level_encryption_id: '{{ field_level_encryption_id }}'
+            forwarded_values: null
+            function_associations:
               - null
-            GrpcConfig: null
-            LambdaFunctionAssociations:
+            grpc_config: null
+            lambda_function_associations:
               - null
-            MaxTTL: null
-            MinTTL: null
-            OriginRequestPolicyId: '{{ OriginRequestPolicyId }}'
-            RealtimeLogConfigArn: '{{ RealtimeLogConfigArn }}'
-            ResponseHeadersPolicyId: '{{ ResponseHeadersPolicyId }}'
-            SmoothStreaming: '{{ SmoothStreaming }}'
-            TargetOriginId: '{{ TargetOriginId }}'
-            TrustedKeyGroups:
-              - '{{ TrustedKeyGroups[0] }}'
-            TrustedSigners:
-              - '{{ TrustedSigners[0] }}'
-            ViewerProtocolPolicy: '{{ ViewerProtocolPolicy }}'
-          DefaultRootObject: '{{ DefaultRootObject }}'
-          Enabled: '{{ Enabled }}'
-          HttpVersion: '{{ HttpVersion }}'
-          IPV6Enabled: '{{ IPV6Enabled }}'
-          Logging:
-            Bucket: '{{ Bucket }}'
-            IncludeCookies: '{{ IncludeCookies }}'
-            Prefix: '{{ Prefix }}'
-          OriginGroups:
-            Items:
-              - FailoverCriteria:
-                  StatusCodes:
-                    Items:
-                      - '{{ Items[0] }}'
-                    Quantity: '{{ Quantity }}'
-                Id: '{{ Id }}'
-                Members:
-                  Items:
-                    - OriginId: '{{ OriginId }}'
-                  Quantity: '{{ Quantity }}'
-                SelectionCriteria: '{{ SelectionCriteria }}'
-            Quantity: '{{ Quantity }}'
-          Origins:
-            - ConnectionAttempts: '{{ ConnectionAttempts }}'
-              ConnectionTimeout: '{{ ConnectionTimeout }}'
-              ResponseCompletionTimeout: '{{ ResponseCompletionTimeout }}'
-              CustomOriginConfig:
-                HTTPPort: '{{ HTTPPort }}'
-                HTTPSPort: '{{ HTTPSPort }}'
-                OriginKeepaliveTimeout: '{{ OriginKeepaliveTimeout }}'
-                OriginProtocolPolicy: '{{ OriginProtocolPolicy }}'
-                OriginReadTimeout: '{{ OriginReadTimeout }}'
-                OriginSSLProtocols:
-                  - '{{ OriginSSLProtocols[0] }}'
-                IpAddressType: '{{ IpAddressType }}'
-              DomainName: '{{ DomainName }}'
-              Id: '{{ Id }}'
-              OriginAccessControlId: '{{ OriginAccessControlId }}'
-              OriginCustomHeaders:
-                - HeaderName: '{{ HeaderName }}'
-                  HeaderValue: '{{ HeaderValue }}'
-              OriginPath: '{{ OriginPath }}'
-              OriginShield:
-                Enabled: '{{ Enabled }}'
-                OriginShieldRegion: '{{ OriginShieldRegion }}'
-              S3OriginConfig:
-                OriginAccessIdentity: '{{ OriginAccessIdentity }}'
-                OriginReadTimeout: '{{ OriginReadTimeout }}'
-              VpcOriginConfig:
-                OriginKeepaliveTimeout: '{{ OriginKeepaliveTimeout }}'
-                OriginReadTimeout: '{{ OriginReadTimeout }}'
-                VpcOriginId: '{{ VpcOriginId }}'
-          PriceClass: '{{ PriceClass }}'
-          Restrictions:
-            GeoRestriction:
-              Locations:
-                - '{{ Locations[0] }}'
-              RestrictionType: '{{ RestrictionType }}'
-          S3Origin:
-            DNSName: '{{ DNSName }}'
-            OriginAccessIdentity: '{{ OriginAccessIdentity }}'
-          Staging: '{{ Staging }}'
-          TenantConfig:
-            ParameterDefinitions:
-              - Name: '{{ Name }}'
-                Definition:
-                  StringSchema:
-                    Comment: '{{ Comment }}'
-                    DefaultValue: '{{ DefaultValue }}'
-                    Required: '{{ Required }}'
-          ViewerCertificate:
-            AcmCertificateArn: '{{ AcmCertificateArn }}'
-            CloudFrontDefaultCertificate: '{{ CloudFrontDefaultCertificate }}'
-            IamCertificateId: '{{ IamCertificateId }}'
-            MinimumProtocolVersion: '{{ MinimumProtocolVersion }}'
-            SslSupportMethod: '{{ SslSupportMethod }}'
-          WebACLId: '{{ WebACLId }}'
-      - name: Tags
+            max_ttl: null
+            min_ttl: null
+            origin_request_policy_id: '{{ origin_request_policy_id }}'
+            realtime_log_config_arn: '{{ realtime_log_config_arn }}'
+            response_headers_policy_id: '{{ response_headers_policy_id }}'
+            smooth_streaming: '{{ smooth_streaming }}'
+            target_origin_id: '{{ target_origin_id }}'
+            trusted_key_groups:
+              - '{{ trusted_key_groups[0] }}'
+            trusted_signers:
+              - '{{ trusted_signers[0] }}'
+            viewer_protocol_policy: '{{ viewer_protocol_policy }}'
+          default_root_object: '{{ default_root_object }}'
+          enabled: '{{ enabled }}'
+          http_version: '{{ http_version }}'
+          ip_v6_enabled: '{{ ip_v6_enabled }}'
+          logging:
+            bucket: '{{ bucket }}'
+            include_cookies: '{{ include_cookies }}'
+            prefix: '{{ prefix }}'
+          origin_groups:
+            items:
+              - failover_criteria:
+                  status_codes:
+                    items:
+                      - '{{ items[0] }}'
+                    quantity: '{{ quantity }}'
+                id: '{{ id }}'
+                members:
+                  items:
+                    - origin_id: '{{ origin_id }}'
+                  quantity: '{{ quantity }}'
+                selection_criteria: '{{ selection_criteria }}'
+            quantity: '{{ quantity }}'
+          origins:
+            - connection_attempts: '{{ connection_attempts }}'
+              connection_timeout: '{{ connection_timeout }}'
+              response_completion_timeout: '{{ response_completion_timeout }}'
+              custom_origin_config:
+                h_tt_pport: '{{ h_tt_pport }}'
+                h_tt_ps_port: '{{ h_tt_ps_port }}'
+                origin_keepalive_timeout: '{{ origin_keepalive_timeout }}'
+                origin_protocol_policy: '{{ origin_protocol_policy }}'
+                origin_read_timeout: '{{ origin_read_timeout }}'
+                origin_ss_lprotocols:
+                  - '{{ origin_ss_lprotocols[0] }}'
+                ip_address_type: '{{ ip_address_type }}'
+              domain_name: '{{ domain_name }}'
+              id: '{{ id }}'
+              origin_access_control_id: '{{ origin_access_control_id }}'
+              origin_custom_headers:
+                - header_name: '{{ header_name }}'
+                  header_value: '{{ header_value }}'
+              origin_path: '{{ origin_path }}'
+              origin_shield:
+                enabled: '{{ enabled }}'
+                origin_shield_region: '{{ origin_shield_region }}'
+              s3_origin_config:
+                origin_access_identity: '{{ origin_access_identity }}'
+                origin_read_timeout: '{{ origin_read_timeout }}'
+              vpc_origin_config:
+                origin_keepalive_timeout: '{{ origin_keepalive_timeout }}'
+                origin_read_timeout: '{{ origin_read_timeout }}'
+                vpc_origin_id: '{{ vpc_origin_id }}'
+          price_class: '{{ price_class }}'
+          restrictions:
+            geo_restriction:
+              locations:
+                - '{{ locations[0] }}'
+              restriction_type: '{{ restriction_type }}'
+          s3_origin:
+            dns_name: '{{ dns_name }}'
+            origin_access_identity: '{{ origin_access_identity }}'
+          staging: '{{ staging }}'
+          tenant_config:
+            parameter_definitions:
+              - name: '{{ name }}'
+                definition:
+                  string_schema:
+                    comment: '{{ comment }}'
+                    default_value: '{{ default_value }}'
+                    required: '{{ required }}'
+          viewer_certificate:
+            acm_certificate_arn: '{{ acm_certificate_arn }}'
+            cloud_front_default_certificate: '{{ cloud_front_default_certificate }}'
+            iam_certificate_id: '{{ iam_certificate_id }}'
+            minimum_protocol_version: '{{ minimum_protocol_version }}'
+            ssl_support_method: '{{ ssl_support_method }}'
+          web_acl_id: '{{ web_acl_id }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -1198,7 +1197,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Id>';
+AND Identifier = '{{ id }}';
 ```
 
 
@@ -1207,7 +1206,7 @@ AND Identifier = '<Id>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.cloudfront.distributions
-WHERE Identifier = '<Id>'
+WHERE Identifier = '{{ id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/cloudfront/functions/index.md b/website/docs/services/cloudfront/functions/index.md
index 3e397871c..db58073fd 100644
--- a/website/docs/services/cloudfront/functions/index.md
+++ b/website/docs/services/cloudfront/functions/index.md
@@ -201,7 +201,7 @@ function_metadata,
 name,
 stage
 FROM awscc.cloudfront.functions
-WHERE Identifier = '<FunctionARN>';
+WHERE region = 'us-east-1' AND Identifier = '{{ function_arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -212,7 +212,7 @@ SELECT
 region,
 function_arn
 FROM awscc.cloudfront.functions_list_only
-;
+WHERE region = 'us-east-1';
 ```
 </TabItem>
 </Tabs>
@@ -239,10 +239,10 @@ INSERT INTO awscc.cloudfront.functions (
  Name,
  region
 )
-SELECT 
-'{{ FunctionCode }}',
- '{{ FunctionConfig }}',
- '{{ Name }}',
+SELECT
+'{{ function_code }}',
+ '{{ function_config }}',
+ '{{ name }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -258,12 +258,12 @@ INSERT INTO awscc.cloudfront.functions (
  Name,
  region
 )
-SELECT 
- '{{ AutoPublish }}',
- '{{ FunctionCode }}',
- '{{ FunctionConfig }}',
- '{{ FunctionMetadata }}',
- '{{ Name }}',
+SELECT
+ '{{ auto_publish }}',
+ '{{ function_code }}',
+ '{{ function_config }}',
+ '{{ function_metadata }}',
+ '{{ name }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -281,22 +281,21 @@ globals:
 resources:
   - name: function
     props:
-      - name: AutoPublish
-        value: '{{ AutoPublish }}'
-      - name: FunctionCode
-        value: '{{ FunctionCode }}'
-      - name: FunctionConfig
+      - name: auto_publish
+        value: '{{ auto_publish }}'
+      - name: function_code
+        value: '{{ function_code }}'
+      - name: function_config
         value:
-          Comment: '{{ Comment }}'
-          Runtime: '{{ Runtime }}'
-          KeyValueStoreAssociations:
-            - KeyValueStoreARN: '{{ KeyValueStoreARN }}'
-      - name: FunctionMetadata
+          comment: '{{ comment }}'
+          runtime: '{{ runtime }}'
+          key_value_store_associations:
+            - key_value_store_arn: '{{ key_value_store_arn }}'
+      - name: function_metadata
         value:
-          FunctionARN: '{{ FunctionARN }}'
-      - name: Name
-        value: '{{ Name }}'
-
+          function_arn: '{{ function_arn }}'
+      - name: name
+        value: '{{ name }}'
 ```
 </TabItem>
 </Tabs>
@@ -314,7 +313,7 @@ SET PatchDocument = string('{{ {
     "FunctionConfig": function_config
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<FunctionARN>';
+AND Identifier = '{{ function_arn }}';
 ```
 
 
@@ -323,7 +322,7 @@ AND Identifier = '<FunctionARN>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.cloudfront.functions
-WHERE Identifier = '<FunctionARN>'
+WHERE Identifier = '{{ function_arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/cloudfront/key_groups/index.md b/website/docs/services/cloudfront/key_groups/index.md
index f6c2be8e9..c788baa98 100644
--- a/website/docs/services/cloudfront/key_groups/index.md
+++ b/website/docs/services/cloudfront/key_groups/index.md
@@ -163,7 +163,7 @@ id,
 key_group_config,
 last_modified_time
 FROM awscc.cloudfront.key_groups
-WHERE Identifier = '<Id>';
+WHERE region = 'us-east-1' AND Identifier = '{{ id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -174,7 +174,7 @@ SELECT
 region,
 id
 FROM awscc.cloudfront.key_groups_list_only
-;
+WHERE region = 'us-east-1';
 ```
 </TabItem>
 </Tabs>
@@ -199,8 +199,8 @@ INSERT INTO awscc.cloudfront.key_groups (
  KeyGroupConfig,
  region
 )
-SELECT 
-'{{ KeyGroupConfig }}',
+SELECT
+'{{ key_group_config }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -212,8 +212,8 @@ INSERT INTO awscc.cloudfront.key_groups (
  KeyGroupConfig,
  region
 )
-SELECT 
- '{{ KeyGroupConfig }}',
+SELECT
+ '{{ key_group_config }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -231,13 +231,12 @@ globals:
 resources:
   - name: key_group
     props:
-      - name: KeyGroupConfig
+      - name: key_group_config
         value:
-          Comment: '{{ Comment }}'
-          Items:
-            - '{{ Items[0] }}'
-          Name: '{{ Name }}'
-
+          comment: '{{ comment }}'
+          items:
+            - '{{ items[0] }}'
+          name: '{{ name }}'
 ```
 </TabItem>
 </Tabs>
@@ -253,7 +252,7 @@ SET PatchDocument = string('{{ {
     "KeyGroupConfig": key_group_config
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Id>';
+AND Identifier = '{{ id }}';
 ```
 
 
@@ -262,7 +261,7 @@ AND Identifier = '<Id>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.cloudfront.key_groups
-WHERE Identifier = '<Id>'
+WHERE Identifier = '{{ id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/cloudfront/key_value_stores/index.md b/website/docs/services/cloudfront/key_value_stores/index.md
index de1b3db5f..f777c2310 100644
--- a/website/docs/services/cloudfront/key_value_stores/index.md
+++ b/website/docs/services/cloudfront/key_value_stores/index.md
@@ -176,7 +176,7 @@ name,
 comment,
 import_source
 FROM awscc.cloudfront.key_value_stores
-WHERE Identifier = '<Name>';
+WHERE region = 'us-east-1' AND Identifier = '{{ name }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -187,7 +187,7 @@ SELECT
 region,
 name
 FROM awscc.cloudfront.key_value_stores_list_only
-;
+WHERE region = 'us-east-1';
 ```
 </TabItem>
 </Tabs>
@@ -212,8 +212,8 @@ INSERT INTO awscc.cloudfront.key_value_stores (
  Name,
  region
 )
-SELECT 
-'{{ Name }}',
+SELECT
+'{{ name }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -227,10 +227,10 @@ INSERT INTO awscc.cloudfront.key_value_stores (
  ImportSource,
  region
 )
-SELECT 
- '{{ Name }}',
- '{{ Comment }}',
- '{{ ImportSource }}',
+SELECT
+ '{{ name }}',
+ '{{ comment }}',
+ '{{ import_source }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -248,15 +248,14 @@ globals:
 resources:
   - name: key_value_store
     props:
-      - name: Name
-        value: '{{ Name }}'
-      - name: Comment
-        value: '{{ Comment }}'
-      - name: ImportSource
+      - name: name
+        value: '{{ name }}'
+      - name: comment
+        value: '{{ comment }}'
+      - name: import_source
         value:
-          SourceType: '{{ SourceType }}'
-          SourceArn: '{{ SourceArn }}'
-
+          source_type: '{{ source_type }}'
+          source_arn: '{{ source_arn }}'
 ```
 </TabItem>
 </Tabs>
@@ -273,7 +272,7 @@ SET PatchDocument = string('{{ {
     "ImportSource": import_source
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Name>';
+AND Identifier = '{{ name }}';
 ```
 
 
@@ -282,7 +281,7 @@ AND Identifier = '<Name>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.cloudfront.key_value_stores
-WHERE Identifier = '<Name>'
+WHERE Identifier = '{{ name }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/cloudfront/monitoring_subscriptions/index.md b/website/docs/services/cloudfront/monitoring_subscriptions/index.md
index 0c4f6f647..40af25c34 100644
--- a/website/docs/services/cloudfront/monitoring_subscriptions/index.md
+++ b/website/docs/services/cloudfront/monitoring_subscriptions/index.md
@@ -96,7 +96,7 @@ region,
 distribution_id,
 monitoring_subscription
 FROM awscc.cloudfront.monitoring_subscriptions
-WHERE Identifier = '<DistributionId>';
+WHERE region = 'us-east-1' AND Identifier = '{{ distribution_id }}';
 ```
 
 ## `INSERT` example
@@ -120,9 +120,9 @@ INSERT INTO awscc.cloudfront.monitoring_subscriptions (
  MonitoringSubscription,
  region
 )
-SELECT 
-'{{ DistributionId }}',
- '{{ MonitoringSubscription }}',
+SELECT
+'{{ distribution_id }}',
+ '{{ monitoring_subscription }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -135,9 +135,9 @@ INSERT INTO awscc.cloudfront.monitoring_subscriptions (
  MonitoringSubscription,
  region
 )
-SELECT 
- '{{ DistributionId }}',
- '{{ MonitoringSubscription }}',
+SELECT
+ '{{ distribution_id }}',
+ '{{ monitoring_subscription }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -155,13 +155,12 @@ globals:
 resources:
   - name: monitoring_subscription
     props:
-      - name: DistributionId
-        value: '{{ DistributionId }}'
-      - name: MonitoringSubscription
+      - name: distribution_id
+        value: '{{ distribution_id }}'
+      - name: monitoring_subscription
         value:
-          DistributionId: '{{ DistributionId }}'
-          MonitoringSubscription: null
-
+          distribution_id: '{{ distribution_id }}'
+          monitoring_subscription: null
 ```
 </TabItem>
 </Tabs>
@@ -172,7 +171,7 @@ resources:
 ```sql
 /*+ delete */
 DELETE FROM awscc.cloudfront.monitoring_subscriptions
-WHERE Identifier = '<DistributionId>'
+WHERE Identifier = '{{ distribution_id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/cloudfront/origin_access_controls/index.md b/website/docs/services/cloudfront/origin_access_controls/index.md
index deabd75ff..d0eb4c2dc 100644
--- a/website/docs/services/cloudfront/origin_access_controls/index.md
+++ b/website/docs/services/cloudfront/origin_access_controls/index.md
@@ -167,7 +167,7 @@ region,
 id,
 origin_access_control_config
 FROM awscc.cloudfront.origin_access_controls
-WHERE Identifier = '<Id>';
+WHERE region = 'us-east-1' AND Identifier = '{{ id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -178,7 +178,7 @@ SELECT
 region,
 id
 FROM awscc.cloudfront.origin_access_controls_list_only
-;
+WHERE region = 'us-east-1';
 ```
 </TabItem>
 </Tabs>
@@ -203,8 +203,8 @@ INSERT INTO awscc.cloudfront.origin_access_controls (
  OriginAccessControlConfig,
  region
 )
-SELECT 
-'{{ OriginAccessControlConfig }}',
+SELECT
+'{{ origin_access_control_config }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -216,8 +216,8 @@ INSERT INTO awscc.cloudfront.origin_access_controls (
  OriginAccessControlConfig,
  region
 )
-SELECT 
- '{{ OriginAccessControlConfig }}',
+SELECT
+ '{{ origin_access_control_config }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -235,14 +235,13 @@ globals:
 resources:
   - name: origin_access_control
     props:
-      - name: OriginAccessControlConfig
+      - name: origin_access_control_config
         value:
-          Description: '{{ Description }}'
-          Name: '{{ Name }}'
-          OriginAccessControlOriginType: '{{ OriginAccessControlOriginType }}'
-          SigningBehavior: '{{ SigningBehavior }}'
-          SigningProtocol: '{{ SigningProtocol }}'
-
+          description: '{{ description }}'
+          name: '{{ name }}'
+          origin_access_control_origin_type: '{{ origin_access_control_origin_type }}'
+          signing_behavior: '{{ signing_behavior }}'
+          signing_protocol: '{{ signing_protocol }}'
 ```
 </TabItem>
 </Tabs>
@@ -258,7 +257,7 @@ SET PatchDocument = string('{{ {
     "OriginAccessControlConfig": origin_access_control_config
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Id>';
+AND Identifier = '{{ id }}';
 ```
 
 
@@ -267,7 +266,7 @@ AND Identifier = '<Id>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.cloudfront.origin_access_controls
-WHERE Identifier = '<Id>'
+WHERE Identifier = '{{ id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/cloudfront/origin_request_policies/index.md b/website/docs/services/cloudfront/origin_request_policies/index.md
index 37663f373..14206ffd8 100644
--- a/website/docs/services/cloudfront/origin_request_policies/index.md
+++ b/website/docs/services/cloudfront/origin_request_policies/index.md
@@ -209,7 +209,7 @@ id,
 last_modified_time,
 origin_request_policy_config
 FROM awscc.cloudfront.origin_request_policies
-WHERE Identifier = '<Id>';
+WHERE region = 'us-east-1' AND Identifier = '{{ id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -220,7 +220,7 @@ SELECT
 region,
 id
 FROM awscc.cloudfront.origin_request_policies_list_only
-;
+WHERE region = 'us-east-1';
 ```
 </TabItem>
 </Tabs>
@@ -245,8 +245,8 @@ INSERT INTO awscc.cloudfront.origin_request_policies (
  OriginRequestPolicyConfig,
  region
 )
-SELECT 
-'{{ OriginRequestPolicyConfig }}',
+SELECT
+'{{ origin_request_policy_config }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -258,8 +258,8 @@ INSERT INTO awscc.cloudfront.origin_request_policies (
  OriginRequestPolicyConfig,
  region
 )
-SELECT 
- '{{ OriginRequestPolicyConfig }}',
+SELECT
+ '{{ origin_request_policy_config }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -277,23 +277,22 @@ globals:
 resources:
   - name: origin_request_policy
     props:
-      - name: OriginRequestPolicyConfig
+      - name: origin_request_policy_config
         value:
-          Comment: '{{ Comment }}'
-          CookiesConfig:
-            CookieBehavior: '{{ CookieBehavior }}'
-            Cookies:
-              - '{{ Cookies[0] }}'
-          HeadersConfig:
-            HeaderBehavior: '{{ HeaderBehavior }}'
-            Headers:
-              - '{{ Headers[0] }}'
-          Name: '{{ Name }}'
-          QueryStringsConfig:
-            QueryStringBehavior: '{{ QueryStringBehavior }}'
-            QueryStrings:
-              - '{{ QueryStrings[0] }}'
-
+          comment: '{{ comment }}'
+          cookies_config:
+            cookie_behavior: '{{ cookie_behavior }}'
+            cookies:
+              - '{{ cookies[0] }}'
+          headers_config:
+            header_behavior: '{{ header_behavior }}'
+            headers:
+              - '{{ headers[0] }}'
+          name: '{{ name }}'
+          query_strings_config:
+            query_string_behavior: '{{ query_string_behavior }}'
+            query_strings:
+              - '{{ query_strings[0] }}'
 ```
 </TabItem>
 </Tabs>
@@ -309,7 +308,7 @@ SET PatchDocument = string('{{ {
     "OriginRequestPolicyConfig": origin_request_policy_config
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Id>';
+AND Identifier = '{{ id }}';
 ```
 
 
@@ -318,7 +317,7 @@ AND Identifier = '<Id>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.cloudfront.origin_request_policies
-WHERE Identifier = '<Id>'
+WHERE Identifier = '{{ id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/cloudfront/public_keys/index.md b/website/docs/services/cloudfront/public_keys/index.md
index ea2802a2c..5822f6c1c 100644
--- a/website/docs/services/cloudfront/public_keys/index.md
+++ b/website/docs/services/cloudfront/public_keys/index.md
@@ -168,7 +168,7 @@ created_time,
 id,
 public_key_config
 FROM awscc.cloudfront.public_keys
-WHERE Identifier = '<Id>';
+WHERE region = 'us-east-1' AND Identifier = '{{ id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -179,7 +179,7 @@ SELECT
 region,
 id
 FROM awscc.cloudfront.public_keys_list_only
-;
+WHERE region = 'us-east-1';
 ```
 </TabItem>
 </Tabs>
@@ -204,8 +204,8 @@ INSERT INTO awscc.cloudfront.public_keys (
  PublicKeyConfig,
  region
 )
-SELECT 
-'{{ PublicKeyConfig }}',
+SELECT
+'{{ public_key_config }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -217,8 +217,8 @@ INSERT INTO awscc.cloudfront.public_keys (
  PublicKeyConfig,
  region
 )
-SELECT 
- '{{ PublicKeyConfig }}',
+SELECT
+ '{{ public_key_config }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -236,13 +236,12 @@ globals:
 resources:
   - name: public_key
     props:
-      - name: PublicKeyConfig
+      - name: public_key_config
         value:
-          CallerReference: '{{ CallerReference }}'
-          Comment: '{{ Comment }}'
-          EncodedKey: '{{ EncodedKey }}'
-          Name: '{{ Name }}'
-
+          caller_reference: '{{ caller_reference }}'
+          comment: '{{ comment }}'
+          encoded_key: '{{ encoded_key }}'
+          name: '{{ name }}'
 ```
 </TabItem>
 </Tabs>
@@ -258,7 +257,7 @@ SET PatchDocument = string('{{ {
     "PublicKeyConfig": public_key_config
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Id>';
+AND Identifier = '{{ id }}';
 ```
 
 
@@ -267,7 +266,7 @@ AND Identifier = '<Id>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.cloudfront.public_keys
-WHERE Identifier = '<Id>'
+WHERE Identifier = '{{ id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/cloudfront/realtime_log_configs/index.md b/website/docs/services/cloudfront/realtime_log_configs/index.md
index 7ce73cfcf..acc0d53ed 100644
--- a/website/docs/services/cloudfront/realtime_log_configs/index.md
+++ b/website/docs/services/cloudfront/realtime_log_configs/index.md
@@ -182,7 +182,7 @@ fields,
 name,
 sampling_rate
 FROM awscc.cloudfront.realtime_log_configs
-WHERE Identifier = '<Arn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -193,7 +193,7 @@ SELECT
 region,
 arn
 FROM awscc.cloudfront.realtime_log_configs_list_only
-;
+WHERE region = 'us-east-1';
 ```
 </TabItem>
 </Tabs>
@@ -221,11 +221,11 @@ INSERT INTO awscc.cloudfront.realtime_log_configs (
  SamplingRate,
  region
 )
-SELECT 
-'{{ EndPoints }}',
- '{{ Fields }}',
- '{{ Name }}',
- '{{ SamplingRate }}',
+SELECT
+'{{ end_points }}',
+ '{{ fields }}',
+ '{{ name }}',
+ '{{ sampling_rate }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -240,11 +240,11 @@ INSERT INTO awscc.cloudfront.realtime_log_configs (
  SamplingRate,
  region
 )
-SELECT 
- '{{ EndPoints }}',
- '{{ Fields }}',
- '{{ Name }}',
- '{{ SamplingRate }}',
+SELECT
+ '{{ end_points }}',
+ '{{ fields }}',
+ '{{ name }}',
+ '{{ sampling_rate }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -262,20 +262,19 @@ globals:
 resources:
   - name: realtime_log_config
     props:
-      - name: EndPoints
+      - name: end_points
         value:
-          - KinesisStreamConfig:
-              RoleArn: '{{ RoleArn }}'
-              StreamArn: '{{ StreamArn }}'
-            StreamType: '{{ StreamType }}'
-      - name: Fields
+          - kinesis_stream_config:
+              role_arn: '{{ role_arn }}'
+              stream_arn: '{{ stream_arn }}'
+            stream_type: '{{ stream_type }}'
+      - name: fields
         value:
-          - '{{ Fields[0] }}'
-      - name: Name
-        value: '{{ Name }}'
-      - name: SamplingRate
+          - '{{ fields[0] }}'
+      - name: name
+        value: '{{ name }}'
+      - name: sampling_rate
         value: null
-
 ```
 </TabItem>
 </Tabs>
@@ -293,7 +292,7 @@ SET PatchDocument = string('{{ {
     "SamplingRate": sampling_rate
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Arn>';
+AND Identifier = '{{ arn }}';
 ```
 
 
@@ -302,7 +301,7 @@ AND Identifier = '<Arn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.cloudfront.realtime_log_configs
-WHERE Identifier = '<Arn>'
+WHERE Identifier = '{{ arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/cloudfront/response_headers_policies/index.md b/website/docs/services/cloudfront/response_headers_policies/index.md
index d24d06f47..9bcc83d9e 100644
--- a/website/docs/services/cloudfront/response_headers_policies/index.md
+++ b/website/docs/services/cloudfront/response_headers_policies/index.md
@@ -417,7 +417,7 @@ id,
 last_modified_time,
 response_headers_policy_config
 FROM awscc.cloudfront.response_headers_policies
-WHERE Identifier = '<Id>';
+WHERE region = 'us-east-1' AND Identifier = '{{ id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -428,7 +428,7 @@ SELECT
 region,
 id
 FROM awscc.cloudfront.response_headers_policies_list_only
-;
+WHERE region = 'us-east-1';
 ```
 </TabItem>
 </Tabs>
@@ -453,8 +453,8 @@ INSERT INTO awscc.cloudfront.response_headers_policies (
  ResponseHeadersPolicyConfig,
  region
 )
-SELECT 
-'{{ ResponseHeadersPolicyConfig }}',
+SELECT
+'{{ response_headers_policy_config }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -466,8 +466,8 @@ INSERT INTO awscc.cloudfront.response_headers_policies (
  ResponseHeadersPolicyConfig,
  region
 )
-SELECT 
- '{{ ResponseHeadersPolicyConfig }}',
+SELECT
+ '{{ response_headers_policy_config }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -485,60 +485,59 @@ globals:
 resources:
   - name: response_headers_policy
     props:
-      - name: ResponseHeadersPolicyConfig
+      - name: response_headers_policy_config
         value:
-          Comment: '{{ Comment }}'
-          CorsConfig:
-            AccessControlAllowCredentials: '{{ AccessControlAllowCredentials }}'
-            AccessControlAllowHeaders:
-              Items:
-                - '{{ Items[0] }}'
-            AccessControlAllowMethods:
-              Items:
-                - '{{ Items[0] }}'
-            AccessControlAllowOrigins:
-              Items:
-                - '{{ Items[0] }}'
-            AccessControlExposeHeaders:
-              Items:
-                - '{{ Items[0] }}'
-            AccessControlMaxAgeSec: '{{ AccessControlMaxAgeSec }}'
-            OriginOverride: '{{ OriginOverride }}'
-          CustomHeadersConfig:
-            Items:
-              - Header: '{{ Header }}'
-                Override: '{{ Override }}'
-                Value: '{{ Value }}'
-          Name: '{{ Name }}'
-          RemoveHeadersConfig:
-            Items:
-              - Header: '{{ Header }}'
-          SecurityHeadersConfig:
-            ContentSecurityPolicy:
-              ContentSecurityPolicy: '{{ ContentSecurityPolicy }}'
-              Override: '{{ Override }}'
-            ContentTypeOptions:
-              Override: '{{ Override }}'
-            FrameOptions:
-              FrameOption: '{{ FrameOption }}'
-              Override: '{{ Override }}'
-            ReferrerPolicy:
-              Override: '{{ Override }}'
-              ReferrerPolicy: '{{ ReferrerPolicy }}'
-            StrictTransportSecurity:
-              AccessControlMaxAgeSec: '{{ AccessControlMaxAgeSec }}'
-              IncludeSubdomains: '{{ IncludeSubdomains }}'
-              Override: '{{ Override }}'
-              Preload: '{{ Preload }}'
-            XSSProtection:
-              ModeBlock: '{{ ModeBlock }}'
-              Override: '{{ Override }}'
-              Protection: '{{ Protection }}'
-              ReportUri: '{{ ReportUri }}'
-          ServerTimingHeadersConfig:
-            Enabled: '{{ Enabled }}'
-            SamplingRate: null
-
+          comment: '{{ comment }}'
+          cors_config:
+            access_control_allow_credentials: '{{ access_control_allow_credentials }}'
+            access_control_allow_headers:
+              items:
+                - '{{ items[0] }}'
+            access_control_allow_methods:
+              items:
+                - '{{ items[0] }}'
+            access_control_allow_origins:
+              items:
+                - '{{ items[0] }}'
+            access_control_expose_headers:
+              items:
+                - '{{ items[0] }}'
+            access_control_max_age_sec: '{{ access_control_max_age_sec }}'
+            origin_override: '{{ origin_override }}'
+          custom_headers_config:
+            items:
+              - header: '{{ header }}'
+                override: '{{ override }}'
+                value: '{{ value }}'
+          name: '{{ name }}'
+          remove_headers_config:
+            items:
+              - header: '{{ header }}'
+          security_headers_config:
+            content_security_policy:
+              content_security_policy: '{{ content_security_policy }}'
+              override: '{{ override }}'
+            content_type_options:
+              override: '{{ override }}'
+            frame_options:
+              frame_option: '{{ frame_option }}'
+              override: '{{ override }}'
+            referrer_policy:
+              override: '{{ override }}'
+              referrer_policy: '{{ referrer_policy }}'
+            strict_transport_security:
+              access_control_max_age_sec: '{{ access_control_max_age_sec }}'
+              include_subdomains: '{{ include_subdomains }}'
+              override: '{{ override }}'
+              preload: '{{ preload }}'
+            x_ss_protection:
+              mode_block: '{{ mode_block }}'
+              override: '{{ override }}'
+              protection: '{{ protection }}'
+              report_uri: '{{ report_uri }}'
+          server_timing_headers_config:
+            enabled: '{{ enabled }}'
+            sampling_rate: null
 ```
 </TabItem>
 </Tabs>
@@ -554,7 +553,7 @@ SET PatchDocument = string('{{ {
     "ResponseHeadersPolicyConfig": response_headers_policy_config
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Id>';
+AND Identifier = '{{ id }}';
 ```
 
 
@@ -563,7 +562,7 @@ AND Identifier = '<Id>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.cloudfront.response_headers_policies
-WHERE Identifier = '<Id>'
+WHERE Identifier = '{{ id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/cloudfront/vpc_origins/index.md b/website/docs/services/cloudfront/vpc_origins/index.md
index 17e1a8eaa..acd5f5728 100644
--- a/website/docs/services/cloudfront/vpc_origins/index.md
+++ b/website/docs/services/cloudfront/vpc_origins/index.md
@@ -214,7 +214,7 @@ status,
 tags,
 vpc_origin_endpoint_config
 FROM awscc.cloudfront.vpc_origins
-WHERE Identifier = '<Id>';
+WHERE region = 'us-east-1' AND Identifier = '{{ id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -225,7 +225,7 @@ SELECT
 region,
 id
 FROM awscc.cloudfront.vpc_origins_list_only
-;
+WHERE region = 'us-east-1';
 ```
 </TabItem>
 </Tabs>
@@ -250,8 +250,8 @@ INSERT INTO awscc.cloudfront.vpc_origins (
  VpcOriginEndpointConfig,
  region
 )
-SELECT 
-'{{ VpcOriginEndpointConfig }}',
+SELECT
+'{{ vpc_origin_endpoint_config }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -264,9 +264,9 @@ INSERT INTO awscc.cloudfront.vpc_origins (
  VpcOriginEndpointConfig,
  region
 )
-SELECT 
- '{{ Tags }}',
- '{{ VpcOriginEndpointConfig }}',
+SELECT
+ '{{ tags }}',
+ '{{ vpc_origin_endpoint_config }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -284,20 +284,19 @@ globals:
 resources:
   - name: vpc_origin
     props:
-      - name: Tags
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-      - name: VpcOriginEndpointConfig
+          - key: '{{ key }}'
+            value: '{{ value }}'
+      - name: vpc_origin_endpoint_config
         value:
-          Arn: '{{ Arn }}'
-          HTTPPort: '{{ HTTPPort }}'
-          HTTPSPort: '{{ HTTPSPort }}'
-          Name: '{{ Name }}'
-          OriginProtocolPolicy: '{{ OriginProtocolPolicy }}'
-          OriginSSLProtocols:
-            - '{{ OriginSSLProtocols[0] }}'
-
+          arn: '{{ arn }}'
+          h_tt_pport: '{{ h_tt_pport }}'
+          h_tt_ps_port: '{{ h_tt_ps_port }}'
+          name: '{{ name }}'
+          origin_protocol_policy: '{{ origin_protocol_policy }}'
+          origin_ss_lprotocols:
+            - '{{ origin_ss_lprotocols[0] }}'
 ```
 </TabItem>
 </Tabs>
@@ -314,7 +313,7 @@ SET PatchDocument = string('{{ {
     "VpcOriginEndpointConfig": vpc_origin_endpoint_config
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Id>';
+AND Identifier = '{{ id }}';
 ```
 
 
@@ -323,7 +322,7 @@ AND Identifier = '<Id>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.cloudfront.vpc_origins
-WHERE Identifier = '<Id>'
+WHERE Identifier = '{{ id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/cloudtrail/channels/index.md b/website/docs/services/cloudtrail/channels/index.md
index 2d0c752e2..43460b10c 100644
--- a/website/docs/services/cloudtrail/channels/index.md
+++ b/website/docs/services/cloudtrail/channels/index.md
@@ -182,7 +182,7 @@ destinations,
 channel_arn,
 tags
 FROM awscc.cloudtrail.channels
-WHERE region = 'us-east-1' AND Identifier = '<ChannelArn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ channel_arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -218,7 +218,7 @@ INSERT INTO awscc.cloudtrail.channels (
  ,
  region
 )
-SELECT 
+SELECT
 '{{  }}',
 '{{ region }}';
 ```
@@ -234,11 +234,11 @@ INSERT INTO awscc.cloudtrail.channels (
  Tags,
  region
 )
-SELECT 
- '{{ Name }}',
- '{{ Source }}',
- '{{ Destinations }}',
- '{{ Tags }}',
+SELECT
+ '{{ name }}',
+ '{{ source }}',
+ '{{ destinations }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -256,19 +256,18 @@ globals:
 resources:
   - name: channel
     props:
-      - name: Name
-        value: '{{ Name }}'
-      - name: Source
-        value: '{{ Source }}'
-      - name: Destinations
+      - name: name
+        value: '{{ name }}'
+      - name: source
+        value: '{{ source }}'
+      - name: destinations
         value:
-          - Type: '{{ Type }}'
-            Location: '{{ Location }}'
-      - name: Tags
+          - type: '{{ type }}'
+            location: '{{ location }}'
+      - name: tags
         value:
-          - Value: '{{ Value }}'
-            Key: '{{ Key }}'
-
+          - value: '{{ value }}'
+            key: '{{ key }}'
 ```
 </TabItem>
 </Tabs>
@@ -286,7 +285,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<ChannelArn>';
+AND Identifier = '{{ channel_arn }}';
 ```
 
 
@@ -295,7 +294,7 @@ AND Identifier = '<ChannelArn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.cloudtrail.channels
-WHERE Identifier = '<ChannelArn>'
+WHERE Identifier = '{{ channel_arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/cloudtrail/dashboards/index.md b/website/docs/services/cloudtrail/dashboards/index.md
index 221e40c71..f6536df1c 100644
--- a/website/docs/services/cloudtrail/dashboards/index.md
+++ b/website/docs/services/cloudtrail/dashboards/index.md
@@ -241,7 +241,7 @@ type,
 updated_timestamp,
 tags
 FROM awscc.cloudtrail.dashboards
-WHERE region = 'us-east-1' AND Identifier = '<DashboardArn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ dashboard_arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -277,7 +277,7 @@ INSERT INTO awscc.cloudtrail.dashboards (
  ,
  region
 )
-SELECT 
+SELECT
 '{{  }}',
 '{{ region }}';
 ```
@@ -294,12 +294,12 @@ INSERT INTO awscc.cloudtrail.dashboards (
  Tags,
  region
 )
-SELECT 
- '{{ Widgets }}',
- '{{ RefreshSchedule }}',
- '{{ Name }}',
- '{{ TerminationProtectionEnabled }}',
- '{{ Tags }}',
+SELECT
+ '{{ widgets }}',
+ '{{ refresh_schedule }}',
+ '{{ name }}',
+ '{{ termination_protection_enabled }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -317,28 +317,27 @@ globals:
 resources:
   - name: dashboard
     props:
-      - name: Widgets
+      - name: widgets
         value:
-          - QueryStatement: '{{ QueryStatement }}'
-            QueryParameters:
-              - '{{ QueryParameters[0] }}'
-            ViewProperties: {}
-      - name: RefreshSchedule
+          - query_statement: '{{ query_statement }}'
+            query_parameters:
+              - '{{ query_parameters[0] }}'
+            view_properties: {}
+      - name: refresh_schedule
         value:
-          Frequency:
-            Unit: '{{ Unit }}'
-            Value: '{{ Value }}'
-          TimeOfDay: '{{ TimeOfDay }}'
-          Status: '{{ Status }}'
-      - name: Name
-        value: '{{ Name }}'
-      - name: TerminationProtectionEnabled
-        value: '{{ TerminationProtectionEnabled }}'
-      - name: Tags
+          frequency:
+            unit: '{{ unit }}'
+            value: '{{ value }}'
+          time_of_day: '{{ time_of_day }}'
+          status: '{{ status }}'
+      - name: name
+        value: '{{ name }}'
+      - name: termination_protection_enabled
+        value: '{{ termination_protection_enabled }}'
+      - name: tags
         value:
-          - Value: '{{ Value }}'
-            Key: '{{ Key }}'
-
+          - value: '{{ value }}'
+            key: '{{ key }}'
 ```
 </TabItem>
 </Tabs>
@@ -358,7 +357,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<DashboardArn>';
+AND Identifier = '{{ dashboard_arn }}';
 ```
 
 
@@ -367,7 +366,7 @@ AND Identifier = '<DashboardArn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.cloudtrail.dashboards
-WHERE Identifier = '<DashboardArn>'
+WHERE Identifier = '{{ dashboard_arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/cloudtrail/event_data_stores/index.md b/website/docs/services/cloudtrail/event_data_stores/index.md
index f3b7f1d91..1efbca036 100644
--- a/website/docs/services/cloudtrail/event_data_stores/index.md
+++ b/website/docs/services/cloudtrail/event_data_stores/index.md
@@ -323,7 +323,7 @@ max_event_size,
 context_key_selectors,
 ingestion_enabled
 FROM awscc.cloudtrail.event_data_stores
-WHERE region = 'us-east-1' AND Identifier = '<EventDataStoreArn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ event_data_store_arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -359,7 +359,7 @@ INSERT INTO awscc.cloudtrail.event_data_stores (
  ,
  region
 )
-SELECT 
+SELECT
 '{{  }}',
 '{{ region }}';
 ```
@@ -387,23 +387,23 @@ INSERT INTO awscc.cloudtrail.event_data_stores (
  IngestionEnabled,
  region
 )
-SELECT 
- '{{ AdvancedEventSelectors }}',
- '{{ FederationEnabled }}',
- '{{ FederationRoleArn }}',
- '{{ MultiRegionEnabled }}',
- '{{ Name }}',
- '{{ OrganizationEnabled }}',
- '{{ BillingMode }}',
- '{{ RetentionPeriod }}',
- '{{ TerminationProtectionEnabled }}',
- '{{ KmsKeyId }}',
- '{{ Tags }}',
- '{{ InsightSelectors }}',
- '{{ InsightsDestination }}',
- '{{ MaxEventSize }}',
- '{{ ContextKeySelectors }}',
- '{{ IngestionEnabled }}',
+SELECT
+ '{{ advanced_event_selectors }}',
+ '{{ federation_enabled }}',
+ '{{ federation_role_arn }}',
+ '{{ multi_region_enabled }}',
+ '{{ name }}',
+ '{{ organization_enabled }}',
+ '{{ billing_mode }}',
+ '{{ retention_period }}',
+ '{{ termination_protection_enabled }}',
+ '{{ kms_key_id }}',
+ '{{ tags }}',
+ '{{ insight_selectors }}',
+ '{{ insights_destination }}',
+ '{{ max_event_size }}',
+ '{{ context_key_selectors }}',
+ '{{ ingestion_enabled }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -421,60 +421,59 @@ globals:
 resources:
   - name: event_data_store
     props:
-      - name: AdvancedEventSelectors
+      - name: advanced_event_selectors
         value:
-          - FieldSelectors:
-              - Field: '{{ Field }}'
-                Equals:
-                  - '{{ Equals[0] }}'
-                NotStartsWith:
-                  - '{{ NotStartsWith[0] }}'
-                NotEndsWith:
-                  - '{{ NotEndsWith[0] }}'
-                StartsWith:
-                  - '{{ StartsWith[0] }}'
-                EndsWith:
-                  - '{{ EndsWith[0] }}'
-                NotEquals:
-                  - '{{ NotEquals[0] }}'
-            Name: '{{ Name }}'
-      - name: FederationEnabled
-        value: '{{ FederationEnabled }}'
-      - name: FederationRoleArn
-        value: '{{ FederationRoleArn }}'
-      - name: MultiRegionEnabled
-        value: '{{ MultiRegionEnabled }}'
-      - name: Name
-        value: '{{ Name }}'
-      - name: OrganizationEnabled
-        value: '{{ OrganizationEnabled }}'
-      - name: BillingMode
-        value: '{{ BillingMode }}'
-      - name: RetentionPeriod
-        value: '{{ RetentionPeriod }}'
-      - name: TerminationProtectionEnabled
-        value: '{{ TerminationProtectionEnabled }}'
-      - name: KmsKeyId
-        value: '{{ KmsKeyId }}'
-      - name: Tags
+          - field_selectors:
+              - field: '{{ field }}'
+                equals:
+                  - '{{ equals[0] }}'
+                not_starts_with:
+                  - '{{ not_starts_with[0] }}'
+                not_ends_with:
+                  - '{{ not_ends_with[0] }}'
+                starts_with:
+                  - '{{ starts_with[0] }}'
+                ends_with:
+                  - '{{ ends_with[0] }}'
+                not_equals:
+                  - '{{ not_equals[0] }}'
+            name: '{{ name }}'
+      - name: federation_enabled
+        value: '{{ federation_enabled }}'
+      - name: federation_role_arn
+        value: '{{ federation_role_arn }}'
+      - name: multi_region_enabled
+        value: '{{ multi_region_enabled }}'
+      - name: name
+        value: '{{ name }}'
+      - name: organization_enabled
+        value: '{{ organization_enabled }}'
+      - name: billing_mode
+        value: '{{ billing_mode }}'
+      - name: retention_period
+        value: '{{ retention_period }}'
+      - name: termination_protection_enabled
+        value: '{{ termination_protection_enabled }}'
+      - name: kms_key_id
+        value: '{{ kms_key_id }}'
+      - name: tags
         value:
-          - Value: '{{ Value }}'
-            Key: '{{ Key }}'
-      - name: InsightSelectors
+          - value: '{{ value }}'
+            key: '{{ key }}'
+      - name: insight_selectors
         value:
-          - InsightType: '{{ InsightType }}'
-      - name: InsightsDestination
-        value: '{{ InsightsDestination }}'
-      - name: MaxEventSize
-        value: '{{ MaxEventSize }}'
-      - name: ContextKeySelectors
+          - insight_type: '{{ insight_type }}'
+      - name: insights_destination
+        value: '{{ insights_destination }}'
+      - name: max_event_size
+        value: '{{ max_event_size }}'
+      - name: context_key_selectors
         value:
-          - Type: '{{ Type }}'
-            Equals:
-              - '{{ Equals[0] }}'
-      - name: IngestionEnabled
-        value: '{{ IngestionEnabled }}'
-
+          - type: '{{ type }}'
+            equals:
+              - '{{ equals[0] }}'
+      - name: ingestion_enabled
+        value: '{{ ingestion_enabled }}'
 ```
 </TabItem>
 </Tabs>
@@ -505,7 +504,7 @@ SET PatchDocument = string('{{ {
     "IngestionEnabled": ingestion_enabled
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<EventDataStoreArn>';
+AND Identifier = '{{ event_data_store_arn }}';
 ```
 
 
@@ -514,7 +513,7 @@ AND Identifier = '<EventDataStoreArn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.cloudtrail.event_data_stores
-WHERE Identifier = '<EventDataStoreArn>'
+WHERE Identifier = '{{ event_data_store_arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/cloudtrail/resource_policies/index.md b/website/docs/services/cloudtrail/resource_policies/index.md
index 70b6f2729..128d9cbb8 100644
--- a/website/docs/services/cloudtrail/resource_policies/index.md
+++ b/website/docs/services/cloudtrail/resource_policies/index.md
@@ -94,7 +94,7 @@ region,
 resource_arn,
 resource_policy
 FROM awscc.cloudtrail.resource_policies
-WHERE region = 'us-east-1' AND Identifier = '<ResourceArn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ resource_arn }}';
 ```
 
 ## `INSERT` example
@@ -118,9 +118,9 @@ INSERT INTO awscc.cloudtrail.resource_policies (
  ResourcePolicy,
  region
 )
-SELECT 
-'{{ ResourceArn }}',
- '{{ ResourcePolicy }}',
+SELECT
+'{{ resource_arn }}',
+ '{{ resource_policy }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -133,9 +133,9 @@ INSERT INTO awscc.cloudtrail.resource_policies (
  ResourcePolicy,
  region
 )
-SELECT 
- '{{ ResourceArn }}',
- '{{ ResourcePolicy }}',
+SELECT
+ '{{ resource_arn }}',
+ '{{ resource_policy }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -153,11 +153,10 @@ globals:
 resources:
   - name: resource_policy
     props:
-      - name: ResourceArn
-        value: '{{ ResourceArn }}'
-      - name: ResourcePolicy
+      - name: resource_arn
+        value: '{{ resource_arn }}'
+      - name: resource_policy
         value: {}
-
 ```
 </TabItem>
 </Tabs>
@@ -173,7 +172,7 @@ SET PatchDocument = string('{{ {
     "ResourcePolicy": resource_policy
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<ResourceArn>';
+AND Identifier = '{{ resource_arn }}';
 ```
 
 
@@ -182,7 +181,7 @@ AND Identifier = '<ResourceArn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.cloudtrail.resource_policies
-WHERE Identifier = '<ResourceArn>'
+WHERE Identifier = '{{ resource_arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/cloudtrail/trails/index.md b/website/docs/services/cloudtrail/trails/index.md
index 9618de406..ef01d94c6 100644
--- a/website/docs/services/cloudtrail/trails/index.md
+++ b/website/docs/services/cloudtrail/trails/index.md
@@ -338,7 +338,7 @@ arn,
 tags,
 is_logging
 FROM awscc.cloudtrail.trails
-WHERE region = 'us-east-1' AND Identifier = '<TrailName>';
+WHERE region = 'us-east-1' AND Identifier = '{{ trail_name }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -375,9 +375,9 @@ INSERT INTO awscc.cloudtrail.trails (
  IsLogging,
  region
 )
-SELECT 
-'{{ S3BucketName }}',
- '{{ IsLogging }}',
+SELECT
+'{{ s3_bucket_name }}',
+ '{{ is_logging }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -404,23 +404,23 @@ INSERT INTO awscc.cloudtrail.trails (
  IsLogging,
  region
 )
-SELECT 
- '{{ IncludeGlobalServiceEvents }}',
- '{{ EventSelectors }}',
- '{{ KMSKeyId }}',
- '{{ CloudWatchLogsRoleArn }}',
- '{{ S3KeyPrefix }}',
- '{{ AdvancedEventSelectors }}',
- '{{ TrailName }}',
- '{{ IsOrganizationTrail }}',
- '{{ InsightSelectors }}',
- '{{ CloudWatchLogsLogGroupArn }}',
- '{{ SnsTopicName }}',
- '{{ IsMultiRegionTrail }}',
- '{{ S3BucketName }}',
- '{{ EnableLogFileValidation }}',
- '{{ Tags }}',
- '{{ IsLogging }}',
+SELECT
+ '{{ include_global_service_events }}',
+ '{{ event_selectors }}',
+ '{{ kms_key_id }}',
+ '{{ cloud_watch_logs_role_arn }}',
+ '{{ s3_key_prefix }}',
+ '{{ advanced_event_selectors }}',
+ '{{ trail_name }}',
+ '{{ is_organization_trail }}',
+ '{{ insight_selectors }}',
+ '{{ cloud_watch_logs_log_group_arn }}',
+ '{{ sns_topic_name }}',
+ '{{ is_multi_region_trail }}',
+ '{{ s3_bucket_name }}',
+ '{{ enable_log_file_validation }}',
+ '{{ tags }}',
+ '{{ is_logging }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -438,65 +438,64 @@ globals:
 resources:
   - name: trail
     props:
-      - name: IncludeGlobalServiceEvents
-        value: '{{ IncludeGlobalServiceEvents }}'
-      - name: EventSelectors
+      - name: include_global_service_events
+        value: '{{ include_global_service_events }}'
+      - name: event_selectors
         value:
-          - IncludeManagementEvents: '{{ IncludeManagementEvents }}'
-            ReadWriteType: '{{ ReadWriteType }}'
-            ExcludeManagementEventSources:
-              - '{{ ExcludeManagementEventSources[0] }}'
-            DataResources:
-              - Type: '{{ Type }}'
-                Values:
-                  - '{{ Values[0] }}'
-      - name: KMSKeyId
-        value: '{{ KMSKeyId }}'
-      - name: CloudWatchLogsRoleArn
-        value: '{{ CloudWatchLogsRoleArn }}'
-      - name: S3KeyPrefix
-        value: '{{ S3KeyPrefix }}'
-      - name: AdvancedEventSelectors
+          - include_management_events: '{{ include_management_events }}'
+            read_write_type: '{{ read_write_type }}'
+            exclude_management_event_sources:
+              - '{{ exclude_management_event_sources[0] }}'
+            data_resources:
+              - type: '{{ type }}'
+                values:
+                  - '{{ values[0] }}'
+      - name: kms_key_id
+        value: '{{ kms_key_id }}'
+      - name: cloud_watch_logs_role_arn
+        value: '{{ cloud_watch_logs_role_arn }}'
+      - name: s3_key_prefix
+        value: '{{ s3_key_prefix }}'
+      - name: advanced_event_selectors
         value:
-          - FieldSelectors:
-              - Field: '{{ Field }}'
-                Equals:
-                  - '{{ Equals[0] }}'
-                NotStartsWith:
-                  - '{{ NotStartsWith[0] }}'
-                NotEndsWith:
-                  - '{{ NotEndsWith[0] }}'
-                StartsWith:
-                  - '{{ StartsWith[0] }}'
-                EndsWith:
-                  - '{{ EndsWith[0] }}'
-                NotEquals:
-                  - '{{ NotEquals[0] }}'
-            Name: '{{ Name }}'
-      - name: TrailName
-        value: '{{ TrailName }}'
-      - name: IsOrganizationTrail
-        value: '{{ IsOrganizationTrail }}'
-      - name: InsightSelectors
+          - field_selectors:
+              - field: '{{ field }}'
+                equals:
+                  - '{{ equals[0] }}'
+                not_starts_with:
+                  - '{{ not_starts_with[0] }}'
+                not_ends_with:
+                  - '{{ not_ends_with[0] }}'
+                starts_with:
+                  - '{{ starts_with[0] }}'
+                ends_with:
+                  - '{{ ends_with[0] }}'
+                not_equals:
+                  - '{{ not_equals[0] }}'
+            name: '{{ name }}'
+      - name: trail_name
+        value: '{{ trail_name }}'
+      - name: is_organization_trail
+        value: '{{ is_organization_trail }}'
+      - name: insight_selectors
         value:
-          - InsightType: '{{ InsightType }}'
-      - name: CloudWatchLogsLogGroupArn
-        value: '{{ CloudWatchLogsLogGroupArn }}'
-      - name: SnsTopicName
-        value: '{{ SnsTopicName }}'
-      - name: IsMultiRegionTrail
-        value: '{{ IsMultiRegionTrail }}'
-      - name: S3BucketName
-        value: '{{ S3BucketName }}'
-      - name: EnableLogFileValidation
-        value: '{{ EnableLogFileValidation }}'
-      - name: Tags
+          - insight_type: '{{ insight_type }}'
+      - name: cloud_watch_logs_log_group_arn
+        value: '{{ cloud_watch_logs_log_group_arn }}'
+      - name: sns_topic_name
+        value: '{{ sns_topic_name }}'
+      - name: is_multi_region_trail
+        value: '{{ is_multi_region_trail }}'
+      - name: s3_bucket_name
+        value: '{{ s3_bucket_name }}'
+      - name: enable_log_file_validation
+        value: '{{ enable_log_file_validation }}'
+      - name: tags
         value:
-          - Value: '{{ Value }}'
-            Key: '{{ Key }}'
-      - name: IsLogging
-        value: '{{ IsLogging }}'
-
+          - value: '{{ value }}'
+            key: '{{ key }}'
+      - name: is_logging
+        value: '{{ is_logging }}'
 ```
 </TabItem>
 </Tabs>
@@ -526,7 +525,7 @@ SET PatchDocument = string('{{ {
     "IsLogging": is_logging
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<TrailName>';
+AND Identifier = '{{ trail_name }}';
 ```
 
 
@@ -535,7 +534,7 @@ AND Identifier = '<TrailName>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.cloudtrail.trails
-WHERE Identifier = '<TrailName>'
+WHERE Identifier = '{{ trail_name }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/cloudwatch/alarms/index.md b/website/docs/services/cloudwatch/alarms/index.md
index abdde9ef2..36043e86f 100644
--- a/website/docs/services/cloudwatch/alarms/index.md
+++ b/website/docs/services/cloudwatch/alarms/index.md
@@ -366,7 +366,7 @@ datapoints_to_alarm,
 threshold,
 tags
 FROM awscc.cloudwatch.alarms
-WHERE region = 'us-east-1' AND Identifier = '<AlarmName>';
+WHERE region = 'us-east-1' AND Identifier = '{{ alarm_name }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -403,9 +403,9 @@ INSERT INTO awscc.cloudwatch.alarms (
  EvaluationPeriods,
  region
 )
-SELECT 
-'{{ ComparisonOperator }}',
- '{{ EvaluationPeriods }}',
+SELECT
+'{{ comparison_operator }}',
+ '{{ evaluation_periods }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -438,29 +438,29 @@ INSERT INTO awscc.cloudwatch.alarms (
  Tags,
  region
 )
-SELECT 
- '{{ ThresholdMetricId }}',
- '{{ EvaluateLowSampleCountPercentile }}',
- '{{ ExtendedStatistic }}',
- '{{ ComparisonOperator }}',
- '{{ TreatMissingData }}',
- '{{ Dimensions }}',
- '{{ Period }}',
- '{{ EvaluationPeriods }}',
- '{{ Unit }}',
- '{{ Namespace }}',
- '{{ OKActions }}',
- '{{ AlarmActions }}',
- '{{ MetricName }}',
- '{{ ActionsEnabled }}',
- '{{ Metrics }}',
- '{{ AlarmDescription }}',
- '{{ AlarmName }}',
- '{{ Statistic }}',
- '{{ InsufficientDataActions }}',
- '{{ DatapointsToAlarm }}',
- '{{ Threshold }}',
- '{{ Tags }}',
+SELECT
+ '{{ threshold_metric_id }}',
+ '{{ evaluate_low_sample_count_percentile }}',
+ '{{ extended_statistic }}',
+ '{{ comparison_operator }}',
+ '{{ treat_missing_data }}',
+ '{{ dimensions }}',
+ '{{ period }}',
+ '{{ evaluation_periods }}',
+ '{{ unit }}',
+ '{{ namespace }}',
+ '{{ ok_actions }}',
+ '{{ alarm_actions }}',
+ '{{ metric_name }}',
+ '{{ actions_enabled }}',
+ '{{ metrics }}',
+ '{{ alarm_description }}',
+ '{{ alarm_name }}',
+ '{{ statistic }}',
+ '{{ insufficient_data_actions }}',
+ '{{ datapoints_to_alarm }}',
+ '{{ threshold }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -478,73 +478,72 @@ globals:
 resources:
   - name: alarm
     props:
-      - name: ThresholdMetricId
-        value: '{{ ThresholdMetricId }}'
-      - name: EvaluateLowSampleCountPercentile
-        value: '{{ EvaluateLowSampleCountPercentile }}'
-      - name: ExtendedStatistic
-        value: '{{ ExtendedStatistic }}'
-      - name: ComparisonOperator
-        value: '{{ ComparisonOperator }}'
-      - name: TreatMissingData
-        value: '{{ TreatMissingData }}'
-      - name: Dimensions
+      - name: threshold_metric_id
+        value: '{{ threshold_metric_id }}'
+      - name: evaluate_low_sample_count_percentile
+        value: '{{ evaluate_low_sample_count_percentile }}'
+      - name: extended_statistic
+        value: '{{ extended_statistic }}'
+      - name: comparison_operator
+        value: '{{ comparison_operator }}'
+      - name: treat_missing_data
+        value: '{{ treat_missing_data }}'
+      - name: dimensions
         value:
-          - Value: '{{ Value }}'
-            Name: '{{ Name }}'
-      - name: Period
-        value: '{{ Period }}'
-      - name: EvaluationPeriods
-        value: '{{ EvaluationPeriods }}'
-      - name: Unit
-        value: '{{ Unit }}'
-      - name: Namespace
-        value: '{{ Namespace }}'
-      - name: OKActions
+          - value: '{{ value }}'
+            name: '{{ name }}'
+      - name: period
+        value: '{{ period }}'
+      - name: evaluation_periods
+        value: '{{ evaluation_periods }}'
+      - name: unit
+        value: '{{ unit }}'
+      - name: namespace
+        value: '{{ namespace }}'
+      - name: ok_actions
         value:
-          - '{{ OKActions[0] }}'
-      - name: AlarmActions
+          - '{{ ok_actions[0] }}'
+      - name: alarm_actions
         value:
-          - '{{ AlarmActions[0] }}'
-      - name: MetricName
-        value: '{{ MetricName }}'
-      - name: ActionsEnabled
-        value: '{{ ActionsEnabled }}'
-      - name: Metrics
+          - '{{ alarm_actions[0] }}'
+      - name: metric_name
+        value: '{{ metric_name }}'
+      - name: actions_enabled
+        value: '{{ actions_enabled }}'
+      - name: metrics
         value:
-          - Label: '{{ Label }}'
-            MetricStat:
-              Period: '{{ Period }}'
-              Metric:
-                MetricName: '{{ MetricName }}'
-                Dimensions:
+          - label: '{{ label }}'
+            metric_stat:
+              period: '{{ period }}'
+              metric:
+                metric_name: '{{ metric_name }}'
+                dimensions:
                   - null
-                Namespace: '{{ Namespace }}'
-              Stat: '{{ Stat }}'
-              Unit: '{{ Unit }}'
-            Id: '{{ Id }}'
-            ReturnData: '{{ ReturnData }}'
-            Expression: '{{ Expression }}'
-            Period: '{{ Period }}'
-            AccountId: '{{ AccountId }}'
-      - name: AlarmDescription
-        value: '{{ AlarmDescription }}'
-      - name: AlarmName
-        value: '{{ AlarmName }}'
-      - name: Statistic
-        value: '{{ Statistic }}'
-      - name: InsufficientDataActions
+                namespace: '{{ namespace }}'
+              stat: '{{ stat }}'
+              unit: '{{ unit }}'
+            id: '{{ id }}'
+            return_data: '{{ return_data }}'
+            expression: '{{ expression }}'
+            period: '{{ period }}'
+            account_id: '{{ account_id }}'
+      - name: alarm_description
+        value: '{{ alarm_description }}'
+      - name: alarm_name
+        value: '{{ alarm_name }}'
+      - name: statistic
+        value: '{{ statistic }}'
+      - name: insufficient_data_actions
         value:
-          - '{{ InsufficientDataActions[0] }}'
-      - name: DatapointsToAlarm
-        value: '{{ DatapointsToAlarm }}'
-      - name: Threshold
+          - '{{ insufficient_data_actions[0] }}'
+      - name: datapoints_to_alarm
+        value: '{{ datapoints_to_alarm }}'
+      - name: threshold
         value: null
-      - name: Tags
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -580,7 +579,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<AlarmName>';
+AND Identifier = '{{ alarm_name }}';
 ```
 
 
@@ -589,7 +588,7 @@ AND Identifier = '<AlarmName>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.cloudwatch.alarms
-WHERE Identifier = '<AlarmName>'
+WHERE Identifier = '{{ alarm_name }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/cloudwatch/composite_alarms/index.md b/website/docs/services/cloudwatch/composite_alarms/index.md
index 9da2bd4e6..a6a457921 100644
--- a/website/docs/services/cloudwatch/composite_alarms/index.md
+++ b/website/docs/services/cloudwatch/composite_alarms/index.md
@@ -212,7 +212,7 @@ actions_suppressor_wait_period,
 actions_suppressor_extension_period,
 tags
 FROM awscc.cloudwatch.composite_alarms
-WHERE region = 'us-east-1' AND Identifier = '<AlarmName>';
+WHERE region = 'us-east-1' AND Identifier = '{{ alarm_name }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -248,8 +248,8 @@ INSERT INTO awscc.cloudwatch.composite_alarms (
  AlarmRule,
  region
 )
-SELECT 
-'{{ AlarmRule }}',
+SELECT
+'{{ alarm_rule }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -271,18 +271,18 @@ INSERT INTO awscc.cloudwatch.composite_alarms (
  Tags,
  region
 )
-SELECT 
- '{{ AlarmName }}',
- '{{ AlarmRule }}',
- '{{ AlarmDescription }}',
- '{{ ActionsEnabled }}',
- '{{ OKActions }}',
- '{{ AlarmActions }}',
- '{{ InsufficientDataActions }}',
- '{{ ActionsSuppressor }}',
- '{{ ActionsSuppressorWaitPeriod }}',
- '{{ ActionsSuppressorExtensionPeriod }}',
- '{{ Tags }}',
+SELECT
+ '{{ alarm_name }}',
+ '{{ alarm_rule }}',
+ '{{ alarm_description }}',
+ '{{ actions_enabled }}',
+ '{{ ok_actions }}',
+ '{{ alarm_actions }}',
+ '{{ insufficient_data_actions }}',
+ '{{ actions_suppressor }}',
+ '{{ actions_suppressor_wait_period }}',
+ '{{ actions_suppressor_extension_period }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -300,34 +300,33 @@ globals:
 resources:
   - name: composite_alarm
     props:
-      - name: AlarmName
-        value: '{{ AlarmName }}'
-      - name: AlarmRule
-        value: '{{ AlarmRule }}'
-      - name: AlarmDescription
-        value: '{{ AlarmDescription }}'
-      - name: ActionsEnabled
-        value: '{{ ActionsEnabled }}'
-      - name: OKActions
+      - name: alarm_name
+        value: '{{ alarm_name }}'
+      - name: alarm_rule
+        value: '{{ alarm_rule }}'
+      - name: alarm_description
+        value: '{{ alarm_description }}'
+      - name: actions_enabled
+        value: '{{ actions_enabled }}'
+      - name: ok_actions
         value:
-          - '{{ OKActions[0] }}'
-      - name: AlarmActions
+          - '{{ ok_actions[0] }}'
+      - name: alarm_actions
         value:
-          - '{{ AlarmActions[0] }}'
-      - name: InsufficientDataActions
+          - '{{ alarm_actions[0] }}'
+      - name: insufficient_data_actions
         value:
-          - '{{ InsufficientDataActions[0] }}'
-      - name: ActionsSuppressor
-        value: '{{ ActionsSuppressor }}'
-      - name: ActionsSuppressorWaitPeriod
-        value: '{{ ActionsSuppressorWaitPeriod }}'
-      - name: ActionsSuppressorExtensionPeriod
-        value: '{{ ActionsSuppressorExtensionPeriod }}'
-      - name: Tags
+          - '{{ insufficient_data_actions[0] }}'
+      - name: actions_suppressor
+        value: '{{ actions_suppressor }}'
+      - name: actions_suppressor_wait_period
+        value: '{{ actions_suppressor_wait_period }}'
+      - name: actions_suppressor_extension_period
+        value: '{{ actions_suppressor_extension_period }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -352,7 +351,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<AlarmName>';
+AND Identifier = '{{ alarm_name }}';
 ```
 
 
@@ -361,7 +360,7 @@ AND Identifier = '<AlarmName>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.cloudwatch.composite_alarms
-WHERE Identifier = '<AlarmName>'
+WHERE Identifier = '{{ alarm_name }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/cloudwatch/dashboards/index.md b/website/docs/services/cloudwatch/dashboards/index.md
index ab83b1e09..a2c465e31 100644
--- a/website/docs/services/cloudwatch/dashboards/index.md
+++ b/website/docs/services/cloudwatch/dashboards/index.md
@@ -140,7 +140,7 @@ region,
 dashboard_name,
 dashboard_body
 FROM awscc.cloudwatch.dashboards
-WHERE region = 'us-east-1' AND Identifier = '<DashboardName>';
+WHERE region = 'us-east-1' AND Identifier = '{{ dashboard_name }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -176,8 +176,8 @@ INSERT INTO awscc.cloudwatch.dashboards (
  DashboardBody,
  region
 )
-SELECT 
-'{{ DashboardBody }}',
+SELECT
+'{{ dashboard_body }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -190,9 +190,9 @@ INSERT INTO awscc.cloudwatch.dashboards (
  DashboardBody,
  region
 )
-SELECT 
- '{{ DashboardName }}',
- '{{ DashboardBody }}',
+SELECT
+ '{{ dashboard_name }}',
+ '{{ dashboard_body }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -210,11 +210,10 @@ globals:
 resources:
   - name: dashboard
     props:
-      - name: DashboardName
-        value: '{{ DashboardName }}'
-      - name: DashboardBody
-        value: '{{ DashboardBody }}'
-
+      - name: dashboard_name
+        value: '{{ dashboard_name }}'
+      - name: dashboard_body
+        value: '{{ dashboard_body }}'
 ```
 </TabItem>
 </Tabs>
@@ -230,7 +229,7 @@ SET PatchDocument = string('{{ {
     "DashboardBody": dashboard_body
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<DashboardName>';
+AND Identifier = '{{ dashboard_name }}';
 ```
 
 
@@ -239,7 +238,7 @@ AND Identifier = '<DashboardName>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.cloudwatch.dashboards
-WHERE Identifier = '<DashboardName>'
+WHERE Identifier = '{{ dashboard_name }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/cloudwatch/metric_streams/index.md b/website/docs/services/cloudwatch/metric_streams/index.md
index a8ea9907c..2108c4f2c 100644
--- a/website/docs/services/cloudwatch/metric_streams/index.md
+++ b/website/docs/services/cloudwatch/metric_streams/index.md
@@ -254,7 +254,7 @@ statistics_configurations,
 tags,
 include_linked_accounts_metrics
 FROM awscc.cloudwatch.metric_streams
-WHERE region = 'us-east-1' AND Identifier = '<Name>';
+WHERE region = 'us-east-1' AND Identifier = '{{ name }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -298,16 +298,16 @@ INSERT INTO awscc.cloudwatch.metric_streams (
  IncludeLinkedAccountsMetrics,
  region
 )
-SELECT 
-'{{ ExcludeFilters }}',
- '{{ FirehoseArn }}',
- '{{ IncludeFilters }}',
- '{{ Name }}',
- '{{ RoleArn }}',
- '{{ OutputFormat }}',
- '{{ StatisticsConfigurations }}',
- '{{ Tags }}',
- '{{ IncludeLinkedAccountsMetrics }}',
+SELECT
+'{{ exclude_filters }}',
+ '{{ firehose_arn }}',
+ '{{ include_filters }}',
+ '{{ name }}',
+ '{{ role_arn }}',
+ '{{ output_format }}',
+ '{{ statistics_configurations }}',
+ '{{ tags }}',
+ '{{ include_linked_accounts_metrics }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -327,16 +327,16 @@ INSERT INTO awscc.cloudwatch.metric_streams (
  IncludeLinkedAccountsMetrics,
  region
 )
-SELECT 
- '{{ ExcludeFilters }}',
- '{{ FirehoseArn }}',
- '{{ IncludeFilters }}',
- '{{ Name }}',
- '{{ RoleArn }}',
- '{{ OutputFormat }}',
- '{{ StatisticsConfigurations }}',
- '{{ Tags }}',
- '{{ IncludeLinkedAccountsMetrics }}',
+SELECT
+ '{{ exclude_filters }}',
+ '{{ firehose_arn }}',
+ '{{ include_filters }}',
+ '{{ name }}',
+ '{{ role_arn }}',
+ '{{ output_format }}',
+ '{{ statistics_configurations }}',
+ '{{ tags }}',
+ '{{ include_linked_accounts_metrics }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -354,36 +354,35 @@ globals:
 resources:
   - name: metric_stream
     props:
-      - name: ExcludeFilters
+      - name: exclude_filters
         value:
-          - Namespace: '{{ Namespace }}'
-            MetricNames:
-              - '{{ MetricNames[0] }}'
-      - name: FirehoseArn
-        value: '{{ FirehoseArn }}'
-      - name: IncludeFilters
+          - namespace: '{{ namespace }}'
+            metric_names:
+              - '{{ metric_names[0] }}'
+      - name: firehose_arn
+        value: '{{ firehose_arn }}'
+      - name: include_filters
         value:
           - null
-      - name: Name
-        value: '{{ Name }}'
-      - name: RoleArn
-        value: '{{ RoleArn }}'
-      - name: OutputFormat
-        value: '{{ OutputFormat }}'
-      - name: StatisticsConfigurations
+      - name: name
+        value: '{{ name }}'
+      - name: role_arn
+        value: '{{ role_arn }}'
+      - name: output_format
+        value: '{{ output_format }}'
+      - name: statistics_configurations
         value:
-          - AdditionalStatistics:
-              - '{{ AdditionalStatistics[0] }}'
-            IncludeMetrics:
-              - MetricName: '{{ MetricName }}'
-                Namespace: '{{ Namespace }}'
-      - name: Tags
+          - additional_statistics:
+              - '{{ additional_statistics[0] }}'
+            include_metrics:
+              - metric_name: '{{ metric_name }}'
+                namespace: '{{ namespace }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-      - name: IncludeLinkedAccountsMetrics
-        value: '{{ IncludeLinkedAccountsMetrics }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
+      - name: include_linked_accounts_metrics
+        value: '{{ include_linked_accounts_metrics }}'
 ```
 </TabItem>
 </Tabs>
@@ -406,7 +405,7 @@ SET PatchDocument = string('{{ {
     "IncludeLinkedAccountsMetrics": include_linked_accounts_metrics
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Name>';
+AND Identifier = '{{ name }}';
 ```
 
 
@@ -415,7 +414,7 @@ AND Identifier = '<Name>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.cloudwatch.metric_streams
-WHERE Identifier = '<Name>'
+WHERE Identifier = '{{ name }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/codeartifact/domains/index.md b/website/docs/services/codeartifact/domains/index.md
index 15fb4a1c0..6467ca931 100644
--- a/website/docs/services/codeartifact/domains/index.md
+++ b/website/docs/services/codeartifact/domains/index.md
@@ -182,7 +182,7 @@ permissions_policy_document,
 tags,
 arn
 FROM awscc.codeartifact.domains
-WHERE region = 'us-east-1' AND Identifier = '<Arn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -218,8 +218,8 @@ INSERT INTO awscc.codeartifact.domains (
  DomainName,
  region
 )
-SELECT 
-'{{ DomainName }}',
+SELECT
+'{{ domain_name }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -233,10 +233,10 @@ INSERT INTO awscc.codeartifact.domains (
  Tags,
  region
 )
-SELECT 
- '{{ DomainName }}',
- '{{ PermissionsPolicyDocument }}',
- '{{ Tags }}',
+SELECT
+ '{{ domain_name }}',
+ '{{ permissions_policy_document }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -254,15 +254,14 @@ globals:
 resources:
   - name: domain
     props:
-      - name: DomainName
-        value: '{{ DomainName }}'
-      - name: PermissionsPolicyDocument
+      - name: domain_name
+        value: '{{ domain_name }}'
+      - name: permissions_policy_document
         value: {}
-      - name: Tags
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -279,7 +278,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Arn>';
+AND Identifier = '{{ arn }}';
 ```
 
 
@@ -288,7 +287,7 @@ AND Identifier = '<Arn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.codeartifact.domains
-WHERE Identifier = '<Arn>'
+WHERE Identifier = '{{ arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/codeartifact/package_groups/index.md b/website/docs/services/codeartifact/package_groups/index.md
index 72c8235d6..580ac41b8 100644
--- a/website/docs/services/codeartifact/package_groups/index.md
+++ b/website/docs/services/codeartifact/package_groups/index.md
@@ -214,7 +214,7 @@ origin_configuration,
 tags,
 arn
 FROM awscc.codeartifact.package_groups
-WHERE region = 'us-east-1' AND Identifier = '<Arn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -251,9 +251,9 @@ INSERT INTO awscc.codeartifact.package_groups (
  Pattern,
  region
 )
-SELECT 
-'{{ DomainName }}',
- '{{ Pattern }}',
+SELECT
+'{{ domain_name }}',
+ '{{ pattern }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -271,14 +271,14 @@ INSERT INTO awscc.codeartifact.package_groups (
  Tags,
  region
 )
-SELECT 
- '{{ DomainName }}',
- '{{ DomainOwner }}',
- '{{ Pattern }}',
- '{{ ContactInfo }}',
- '{{ Description }}',
- '{{ OriginConfiguration }}',
- '{{ Tags }}',
+SELECT
+ '{{ domain_name }}',
+ '{{ domain_owner }}',
+ '{{ pattern }}',
+ '{{ contact_info }}',
+ '{{ description }}',
+ '{{ origin_configuration }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -296,30 +296,29 @@ globals:
 resources:
   - name: package_group
     props:
-      - name: DomainName
-        value: '{{ DomainName }}'
-      - name: DomainOwner
-        value: '{{ DomainOwner }}'
-      - name: Pattern
-        value: '{{ Pattern }}'
-      - name: ContactInfo
-        value: '{{ ContactInfo }}'
-      - name: Description
-        value: '{{ Description }}'
-      - name: OriginConfiguration
+      - name: domain_name
+        value: '{{ domain_name }}'
+      - name: domain_owner
+        value: '{{ domain_owner }}'
+      - name: pattern
+        value: '{{ pattern }}'
+      - name: contact_info
+        value: '{{ contact_info }}'
+      - name: description
+        value: '{{ description }}'
+      - name: origin_configuration
         value:
-          Restrictions:
-            Publish:
-              RestrictionMode: '{{ RestrictionMode }}'
-              Repositories:
-                - '{{ Repositories[0] }}'
-            ExternalUpstream: null
-            InternalUpstream: null
-      - name: Tags
+          restrictions:
+            publish:
+              restriction_mode: '{{ restriction_mode }}'
+              repositories:
+                - '{{ repositories[0] }}'
+            external_upstream: null
+            internal_upstream: null
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -339,7 +338,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Arn>';
+AND Identifier = '{{ arn }}';
 ```
 
 
@@ -348,7 +347,7 @@ AND Identifier = '<Arn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.codeartifact.package_groups
-WHERE Identifier = '<Arn>'
+WHERE Identifier = '{{ arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/codeartifact/repositories/index.md b/website/docs/services/codeartifact/repositories/index.md
index cdeddee77..a264e4f34 100644
--- a/website/docs/services/codeartifact/repositories/index.md
+++ b/website/docs/services/codeartifact/repositories/index.md
@@ -200,7 +200,7 @@ upstreams,
 permissions_policy_document,
 tags
 FROM awscc.codeartifact.repositories
-WHERE region = 'us-east-1' AND Identifier = '<Arn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -237,9 +237,9 @@ INSERT INTO awscc.codeartifact.repositories (
  DomainName,
  region
 )
-SELECT 
-'{{ RepositoryName }}',
- '{{ DomainName }}',
+SELECT
+'{{ repository_name }}',
+ '{{ domain_name }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -257,14 +257,14 @@ INSERT INTO awscc.codeartifact.repositories (
  Tags,
  region
 )
-SELECT 
- '{{ RepositoryName }}',
- '{{ DomainName }}',
- '{{ Description }}',
- '{{ ExternalConnections }}',
- '{{ Upstreams }}',
- '{{ PermissionsPolicyDocument }}',
- '{{ Tags }}',
+SELECT
+ '{{ repository_name }}',
+ '{{ domain_name }}',
+ '{{ description }}',
+ '{{ external_connections }}',
+ '{{ upstreams }}',
+ '{{ permissions_policy_document }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -282,25 +282,24 @@ globals:
 resources:
   - name: repository
     props:
-      - name: RepositoryName
-        value: '{{ RepositoryName }}'
-      - name: DomainName
-        value: '{{ DomainName }}'
-      - name: Description
-        value: '{{ Description }}'
-      - name: ExternalConnections
+      - name: repository_name
+        value: '{{ repository_name }}'
+      - name: domain_name
+        value: '{{ domain_name }}'
+      - name: description
+        value: '{{ description }}'
+      - name: external_connections
         value:
-          - '{{ ExternalConnections[0] }}'
-      - name: Upstreams
+          - '{{ external_connections[0] }}'
+      - name: upstreams
         value:
-          - '{{ Upstreams[0] }}'
-      - name: PermissionsPolicyDocument
+          - '{{ upstreams[0] }}'
+      - name: permissions_policy_document
         value: {}
-      - name: Tags
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -320,7 +319,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Arn>';
+AND Identifier = '{{ arn }}';
 ```
 
 
@@ -329,7 +328,7 @@ AND Identifier = '<Arn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.codeartifact.repositories
-WHERE Identifier = '<Arn>'
+WHERE Identifier = '{{ arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/codebuild/fleets/index.md b/website/docs/services/codebuild/fleets/index.md
index 7ddf50b4d..b667305c5 100644
--- a/website/docs/services/codebuild/fleets/index.md
+++ b/website/docs/services/codebuild/fleets/index.md
@@ -320,7 +320,7 @@ image_id,
 scaling_configuration,
 compute_configuration
 FROM awscc.codebuild.fleets
-WHERE region = 'us-east-1' AND Identifier = '<Arn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -367,19 +367,19 @@ INSERT INTO awscc.codebuild.fleets (
  ComputeConfiguration,
  region
 )
-SELECT 
-'{{ Name }}',
- '{{ BaseCapacity }}',
- '{{ EnvironmentType }}',
- '{{ ComputeType }}',
- '{{ OverflowBehavior }}',
- '{{ FleetServiceRole }}',
- '{{ FleetVpcConfig }}',
- '{{ FleetProxyConfiguration }}',
- '{{ Tags }}',
- '{{ ImageId }}',
- '{{ ScalingConfiguration }}',
- '{{ ComputeConfiguration }}',
+SELECT
+'{{ name }}',
+ '{{ base_capacity }}',
+ '{{ environment_type }}',
+ '{{ compute_type }}',
+ '{{ overflow_behavior }}',
+ '{{ fleet_service_role }}',
+ '{{ fleet_vpc_config }}',
+ '{{ fleet_proxy_configuration }}',
+ '{{ tags }}',
+ '{{ image_id }}',
+ '{{ scaling_configuration }}',
+ '{{ compute_configuration }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -402,19 +402,19 @@ INSERT INTO awscc.codebuild.fleets (
  ComputeConfiguration,
  region
 )
-SELECT 
- '{{ Name }}',
- '{{ BaseCapacity }}',
- '{{ EnvironmentType }}',
- '{{ ComputeType }}',
- '{{ OverflowBehavior }}',
- '{{ FleetServiceRole }}',
- '{{ FleetVpcConfig }}',
- '{{ FleetProxyConfiguration }}',
- '{{ Tags }}',
- '{{ ImageId }}',
- '{{ ScalingConfiguration }}',
- '{{ ComputeConfiguration }}',
+SELECT
+ '{{ name }}',
+ '{{ base_capacity }}',
+ '{{ environment_type }}',
+ '{{ compute_type }}',
+ '{{ overflow_behavior }}',
+ '{{ fleet_service_role }}',
+ '{{ fleet_vpc_config }}',
+ '{{ fleet_proxy_configuration }}',
+ '{{ tags }}',
+ '{{ image_id }}',
+ '{{ scaling_configuration }}',
+ '{{ compute_configuration }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -432,54 +432,53 @@ globals:
 resources:
   - name: fleet
     props:
-      - name: Name
-        value: '{{ Name }}'
-      - name: BaseCapacity
-        value: '{{ BaseCapacity }}'
-      - name: EnvironmentType
-        value: '{{ EnvironmentType }}'
-      - name: ComputeType
-        value: '{{ ComputeType }}'
-      - name: OverflowBehavior
-        value: '{{ OverflowBehavior }}'
-      - name: FleetServiceRole
-        value: '{{ FleetServiceRole }}'
-      - name: FleetVpcConfig
+      - name: name
+        value: '{{ name }}'
+      - name: base_capacity
+        value: '{{ base_capacity }}'
+      - name: environment_type
+        value: '{{ environment_type }}'
+      - name: compute_type
+        value: '{{ compute_type }}'
+      - name: overflow_behavior
+        value: '{{ overflow_behavior }}'
+      - name: fleet_service_role
+        value: '{{ fleet_service_role }}'
+      - name: fleet_vpc_config
         value:
-          VpcId: '{{ VpcId }}'
-          Subnets:
-            - '{{ Subnets[0] }}'
-          SecurityGroupIds:
-            - '{{ SecurityGroupIds[0] }}'
-      - name: FleetProxyConfiguration
+          vpc_id: '{{ vpc_id }}'
+          subnets:
+            - '{{ subnets[0] }}'
+          security_group_ids:
+            - '{{ security_group_ids[0] }}'
+      - name: fleet_proxy_configuration
         value:
-          DefaultBehavior: '{{ DefaultBehavior }}'
-          OrderedProxyRules:
-            - Type: '{{ Type }}'
-              Effect: '{{ Effect }}'
-              Entities:
-                - '{{ Entities[0] }}'
-      - name: Tags
+          default_behavior: '{{ default_behavior }}'
+          ordered_proxy_rules:
+            - type: '{{ type }}'
+              effect: '{{ effect }}'
+              entities:
+                - '{{ entities[0] }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-      - name: ImageId
-        value: '{{ ImageId }}'
-      - name: ScalingConfiguration
+          - key: '{{ key }}'
+            value: '{{ value }}'
+      - name: image_id
+        value: '{{ image_id }}'
+      - name: scaling_configuration
         value:
-          MaxCapacity: '{{ MaxCapacity }}'
-          ScalingType: '{{ ScalingType }}'
-          TargetTrackingScalingConfigs:
-            - MetricType: '{{ MetricType }}'
-              TargetValue: null
-      - name: ComputeConfiguration
+          max_capacity: '{{ max_capacity }}'
+          scaling_type: '{{ scaling_type }}'
+          target_tracking_scaling_configs:
+            - metric_type: '{{ metric_type }}'
+              target_value: null
+      - name: compute_configuration
         value:
-          vCpu: '{{ vCpu }}'
+          v_cpu: '{{ v_cpu }}'
           memory: '{{ memory }}'
           disk: '{{ disk }}'
-          machineType: '{{ machineType }}'
-          instanceType: '{{ instanceType }}'
-
+          machine_type: '{{ machine_type }}'
+          instance_type: '{{ instance_type }}'
 ```
 </TabItem>
 </Tabs>
@@ -506,7 +505,7 @@ SET PatchDocument = string('{{ {
     "ComputeConfiguration": compute_configuration
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Arn>';
+AND Identifier = '{{ arn }}';
 ```
 
 
@@ -515,7 +514,7 @@ AND Identifier = '<Arn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.codebuild.fleets
-WHERE Identifier = '<Arn>'
+WHERE Identifier = '{{ arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/codeconnections/connections/index.md b/website/docs/services/codeconnections/connections/index.md
index b544a8538..c51222541 100644
--- a/website/docs/services/codeconnections/connections/index.md
+++ b/website/docs/services/codeconnections/connections/index.md
@@ -182,7 +182,7 @@ provider_type,
 host_arn,
 tags
 FROM awscc.codeconnections.connections
-WHERE region = 'us-east-1' AND Identifier = '<ConnectionArn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ connection_arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -218,8 +218,8 @@ INSERT INTO awscc.codeconnections.connections (
  ConnectionName,
  region
 )
-SELECT 
-'{{ ConnectionName }}',
+SELECT
+'{{ connection_name }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -234,11 +234,11 @@ INSERT INTO awscc.codeconnections.connections (
  Tags,
  region
 )
-SELECT 
- '{{ ConnectionName }}',
- '{{ ProviderType }}',
- '{{ HostArn }}',
- '{{ Tags }}',
+SELECT
+ '{{ connection_name }}',
+ '{{ provider_type }}',
+ '{{ host_arn }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -256,17 +256,16 @@ globals:
 resources:
   - name: connection
     props:
-      - name: ConnectionName
-        value: '{{ ConnectionName }}'
-      - name: ProviderType
-        value: '{{ ProviderType }}'
-      - name: HostArn
-        value: '{{ HostArn }}'
-      - name: Tags
+      - name: connection_name
+        value: '{{ connection_name }}'
+      - name: provider_type
+        value: '{{ provider_type }}'
+      - name: host_arn
+        value: '{{ host_arn }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -282,7 +281,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<ConnectionArn>';
+AND Identifier = '{{ connection_arn }}';
 ```
 
 
@@ -291,7 +290,7 @@ AND Identifier = '<ConnectionArn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.codeconnections.connections
-WHERE Identifier = '<ConnectionArn>'
+WHERE Identifier = '{{ connection_arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/codedeploy/applications/index.md b/website/docs/services/codedeploy/applications/index.md
index f7fb9e5fe..cac889d97 100644
--- a/website/docs/services/codedeploy/applications/index.md
+++ b/website/docs/services/codedeploy/applications/index.md
@@ -158,7 +158,7 @@ application_name,
 compute_platform,
 tags
 FROM awscc.codedeploy.applications
-WHERE region = 'us-east-1' AND Identifier = '<ApplicationName>';
+WHERE region = 'us-east-1' AND Identifier = '{{ application_name }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -196,10 +196,10 @@ INSERT INTO awscc.codedeploy.applications (
  Tags,
  region
 )
-SELECT 
-'{{ ApplicationName }}',
- '{{ ComputePlatform }}',
- '{{ Tags }}',
+SELECT
+'{{ application_name }}',
+ '{{ compute_platform }}',
+ '{{ tags }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -213,10 +213,10 @@ INSERT INTO awscc.codedeploy.applications (
  Tags,
  region
 )
-SELECT 
- '{{ ApplicationName }}',
- '{{ ComputePlatform }}',
- '{{ Tags }}',
+SELECT
+ '{{ application_name }}',
+ '{{ compute_platform }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -234,15 +234,14 @@ globals:
 resources:
   - name: application
     props:
-      - name: ApplicationName
-        value: '{{ ApplicationName }}'
-      - name: ComputePlatform
-        value: '{{ ComputePlatform }}'
-      - name: Tags
+      - name: application_name
+        value: '{{ application_name }}'
+      - name: compute_platform
+        value: '{{ compute_platform }}'
+      - name: tags
         value:
-          - Value: '{{ Value }}'
-            Key: '{{ Key }}'
-
+          - value: '{{ value }}'
+            key: '{{ key }}'
 ```
 </TabItem>
 </Tabs>
@@ -258,7 +257,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<ApplicationName>';
+AND Identifier = '{{ application_name }}';
 ```
 
 
@@ -267,7 +266,7 @@ AND Identifier = '<ApplicationName>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.codedeploy.applications
-WHERE Identifier = '<ApplicationName>'
+WHERE Identifier = '{{ application_name }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/codedeploy/deployment_configs/index.md b/website/docs/services/codedeploy/deployment_configs/index.md
index 825123653..3b128f071 100644
--- a/website/docs/services/codedeploy/deployment_configs/index.md
+++ b/website/docs/services/codedeploy/deployment_configs/index.md
@@ -234,7 +234,7 @@ minimum_healthy_hosts,
 zonal_config,
 traffic_routing_config
 FROM awscc.codedeploy.deployment_configs
-WHERE region = 'us-east-1' AND Identifier = '<DeploymentConfigName>';
+WHERE region = 'us-east-1' AND Identifier = '{{ deployment_config_name }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -274,12 +274,12 @@ INSERT INTO awscc.codedeploy.deployment_configs (
  TrafficRoutingConfig,
  region
 )
-SELECT 
-'{{ ComputePlatform }}',
- '{{ DeploymentConfigName }}',
- '{{ MinimumHealthyHosts }}',
- '{{ ZonalConfig }}',
- '{{ TrafficRoutingConfig }}',
+SELECT
+'{{ compute_platform }}',
+ '{{ deployment_config_name }}',
+ '{{ minimum_healthy_hosts }}',
+ '{{ zonal_config }}',
+ '{{ traffic_routing_config }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -295,12 +295,12 @@ INSERT INTO awscc.codedeploy.deployment_configs (
  TrafficRoutingConfig,
  region
 )
-SELECT 
- '{{ ComputePlatform }}',
- '{{ DeploymentConfigName }}',
- '{{ MinimumHealthyHosts }}',
- '{{ ZonalConfig }}',
- '{{ TrafficRoutingConfig }}',
+SELECT
+ '{{ compute_platform }}',
+ '{{ deployment_config_name }}',
+ '{{ minimum_healthy_hosts }}',
+ '{{ zonal_config }}',
+ '{{ traffic_routing_config }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -318,31 +318,30 @@ globals:
 resources:
   - name: deployment_config
     props:
-      - name: ComputePlatform
-        value: '{{ ComputePlatform }}'
-      - name: DeploymentConfigName
-        value: '{{ DeploymentConfigName }}'
-      - name: MinimumHealthyHosts
+      - name: compute_platform
+        value: '{{ compute_platform }}'
+      - name: deployment_config_name
+        value: '{{ deployment_config_name }}'
+      - name: minimum_healthy_hosts
         value:
-          Value: '{{ Value }}'
-          Type: '{{ Type }}'
-      - name: ZonalConfig
+          value: '{{ value }}'
+          type: '{{ type }}'
+      - name: zonal_config
         value:
-          FirstZoneMonitorDurationInSeconds: '{{ FirstZoneMonitorDurationInSeconds }}'
-          MonitorDurationInSeconds: '{{ MonitorDurationInSeconds }}'
-          MinimumHealthyHostsPerZone:
-            Value: '{{ Value }}'
-            Type: '{{ Type }}'
-      - name: TrafficRoutingConfig
+          first_zone_monitor_duration_in_seconds: '{{ first_zone_monitor_duration_in_seconds }}'
+          monitor_duration_in_seconds: '{{ monitor_duration_in_seconds }}'
+          minimum_healthy_hosts_per_zone:
+            value: '{{ value }}'
+            type: '{{ type }}'
+      - name: traffic_routing_config
         value:
-          Type: '{{ Type }}'
-          TimeBasedLinear:
-            LinearInterval: '{{ LinearInterval }}'
-            LinearPercentage: '{{ LinearPercentage }}'
-          TimeBasedCanary:
-            CanaryPercentage: '{{ CanaryPercentage }}'
-            CanaryInterval: '{{ CanaryInterval }}'
-
+          type: '{{ type }}'
+          time_based_linear:
+            linear_interval: '{{ linear_interval }}'
+            linear_percentage: '{{ linear_percentage }}'
+          time_based_canary:
+            canary_percentage: '{{ canary_percentage }}'
+            canary_interval: '{{ canary_interval }}'
 ```
 </TabItem>
 </Tabs>
@@ -353,7 +352,7 @@ resources:
 ```sql
 /*+ delete */
 DELETE FROM awscc.codedeploy.deployment_configs
-WHERE Identifier = '<DeploymentConfigName>'
+WHERE Identifier = '{{ deployment_config_name }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/codeguruprofiler/profiling_groups/index.md b/website/docs/services/codeguruprofiler/profiling_groups/index.md
index 90a11799f..46f04ea77 100644
--- a/website/docs/services/codeguruprofiler/profiling_groups/index.md
+++ b/website/docs/services/codeguruprofiler/profiling_groups/index.md
@@ -195,7 +195,7 @@ anomaly_detection_notification_configuration,
 arn,
 tags
 FROM awscc.codeguruprofiler.profiling_groups
-WHERE region = 'us-east-1' AND Identifier = '<ProfilingGroupName>';
+WHERE region = 'us-east-1' AND Identifier = '{{ profiling_group_name }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -231,8 +231,8 @@ INSERT INTO awscc.codeguruprofiler.profiling_groups (
  ProfilingGroupName,
  region
 )
-SELECT 
-'{{ ProfilingGroupName }}',
+SELECT
+'{{ profiling_group_name }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -248,12 +248,12 @@ INSERT INTO awscc.codeguruprofiler.profiling_groups (
  Tags,
  region
 )
-SELECT 
- '{{ ProfilingGroupName }}',
- '{{ ComputePlatform }}',
- '{{ AgentPermissions }}',
- '{{ AnomalyDetectionNotificationConfiguration }}',
- '{{ Tags }}',
+SELECT
+ '{{ profiling_group_name }}',
+ '{{ compute_platform }}',
+ '{{ agent_permissions }}',
+ '{{ anomaly_detection_notification_configuration }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -271,23 +271,22 @@ globals:
 resources:
   - name: profiling_group
     props:
-      - name: ProfilingGroupName
-        value: '{{ ProfilingGroupName }}'
-      - name: ComputePlatform
-        value: '{{ ComputePlatform }}'
-      - name: AgentPermissions
+      - name: profiling_group_name
+        value: '{{ profiling_group_name }}'
+      - name: compute_platform
+        value: '{{ compute_platform }}'
+      - name: agent_permissions
         value:
-          Principals:
-            - '{{ Principals[0] }}'
-      - name: AnomalyDetectionNotificationConfiguration
+          principals:
+            - '{{ principals[0] }}'
+      - name: anomaly_detection_notification_configuration
         value:
-          - channelId: '{{ channelId }}'
-            channelUri: '{{ channelUri }}'
-      - name: Tags
+          - channel_id: '{{ channel_id }}'
+            channel_uri: '{{ channel_uri }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -305,7 +304,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<ProfilingGroupName>';
+AND Identifier = '{{ profiling_group_name }}';
 ```
 
 
@@ -314,7 +313,7 @@ AND Identifier = '<ProfilingGroupName>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.codeguruprofiler.profiling_groups
-WHERE Identifier = '<ProfilingGroupName>'
+WHERE Identifier = '{{ profiling_group_name }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/codegurureviewer/repository_associations/index.md b/website/docs/services/codegurureviewer/repository_associations/index.md
index 34ed8f02d..8ba1afccb 100644
--- a/website/docs/services/codegurureviewer/repository_associations/index.md
+++ b/website/docs/services/codegurureviewer/repository_associations/index.md
@@ -176,7 +176,7 @@ connection_arn,
 association_arn,
 tags
 FROM awscc.codegurureviewer.repository_associations
-WHERE region = 'us-east-1' AND Identifier = '<AssociationArn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ association_arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -213,9 +213,9 @@ INSERT INTO awscc.codegurureviewer.repository_associations (
  Type,
  region
 )
-SELECT 
-'{{ Name }}',
- '{{ Type }}',
+SELECT
+'{{ name }}',
+ '{{ type }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -232,13 +232,13 @@ INSERT INTO awscc.codegurureviewer.repository_associations (
  Tags,
  region
 )
-SELECT 
- '{{ Name }}',
- '{{ Type }}',
- '{{ Owner }}',
- '{{ BucketName }}',
- '{{ ConnectionArn }}',
- '{{ Tags }}',
+SELECT
+ '{{ name }}',
+ '{{ type }}',
+ '{{ owner }}',
+ '{{ bucket_name }}',
+ '{{ connection_arn }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -256,21 +256,20 @@ globals:
 resources:
   - name: repository_association
     props:
-      - name: Name
-        value: '{{ Name }}'
-      - name: Type
-        value: '{{ Type }}'
-      - name: Owner
-        value: '{{ Owner }}'
-      - name: BucketName
-        value: '{{ BucketName }}'
-      - name: ConnectionArn
-        value: '{{ ConnectionArn }}'
-      - name: Tags
+      - name: name
+        value: '{{ name }}'
+      - name: type
+        value: '{{ type }}'
+      - name: owner
+        value: '{{ owner }}'
+      - name: bucket_name
+        value: '{{ bucket_name }}'
+      - name: connection_arn
+        value: '{{ connection_arn }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -281,7 +280,7 @@ resources:
 ```sql
 /*+ delete */
 DELETE FROM awscc.codegurureviewer.repository_associations
-WHERE Identifier = '<AssociationArn>'
+WHERE Identifier = '{{ association_arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/codepipeline/custom_action_types/index.md b/website/docs/services/codepipeline/custom_action_types/index.md
index 45ed444d0..c1e416e8b 100644
--- a/website/docs/services/codepipeline/custom_action_types/index.md
+++ b/website/docs/services/codepipeline/custom_action_types/index.md
@@ -275,7 +275,7 @@ tags,
 version,
 id
 FROM awscc.codepipeline.custom_action_types
-WHERE region = 'us-east-1' AND Identifier = '<Category>|<Provider>|<Version>';
+WHERE region = 'us-east-1' AND Identifier = '{{ category }}|{{ provider }}|{{ version }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -317,12 +317,12 @@ INSERT INTO awscc.codepipeline.custom_action_types (
  Version,
  region
 )
-SELECT 
-'{{ Category }}',
- '{{ InputArtifactDetails }}',
- '{{ OutputArtifactDetails }}',
- '{{ Provider }}',
- '{{ Version }}',
+SELECT
+'{{ category }}',
+ '{{ input_artifact_details }}',
+ '{{ output_artifact_details }}',
+ '{{ provider }}',
+ '{{ version }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -341,15 +341,15 @@ INSERT INTO awscc.codepipeline.custom_action_types (
  Version,
  region
 )
-SELECT 
- '{{ Category }}',
- '{{ ConfigurationProperties }}',
- '{{ InputArtifactDetails }}',
- '{{ OutputArtifactDetails }}',
- '{{ Provider }}',
- '{{ Settings }}',
- '{{ Tags }}',
- '{{ Version }}',
+SELECT
+ '{{ category }}',
+ '{{ configuration_properties }}',
+ '{{ input_artifact_details }}',
+ '{{ output_artifact_details }}',
+ '{{ provider }}',
+ '{{ settings }}',
+ '{{ tags }}',
+ '{{ version }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -367,38 +367,37 @@ globals:
 resources:
   - name: custom_action_type
     props:
-      - name: Category
-        value: '{{ Category }}'
-      - name: ConfigurationProperties
+      - name: category
+        value: '{{ category }}'
+      - name: configuration_properties
         value:
-          - Description: '{{ Description }}'
-            Key: '{{ Key }}'
-            Name: '{{ Name }}'
-            Queryable: '{{ Queryable }}'
-            Required: '{{ Required }}'
-            Secret: '{{ Secret }}'
-            Type: '{{ Type }}'
-      - name: InputArtifactDetails
+          - description: '{{ description }}'
+            key: '{{ key }}'
+            name: '{{ name }}'
+            queryable: '{{ queryable }}'
+            required: '{{ required }}'
+            secret: '{{ secret }}'
+            type: '{{ type }}'
+      - name: input_artifact_details
         value:
-          MaximumCount: '{{ MaximumCount }}'
-          MinimumCount: '{{ MinimumCount }}'
-      - name: OutputArtifactDetails
+          maximum_count: '{{ maximum_count }}'
+          minimum_count: '{{ minimum_count }}'
+      - name: output_artifact_details
         value: null
-      - name: Provider
-        value: '{{ Provider }}'
-      - name: Settings
+      - name: provider
+        value: '{{ provider }}'
+      - name: settings
         value:
-          EntityUrlTemplate: '{{ EntityUrlTemplate }}'
-          ExecutionUrlTemplate: '{{ ExecutionUrlTemplate }}'
-          RevisionUrlTemplate: '{{ RevisionUrlTemplate }}'
-          ThirdPartyConfigurationUrl: '{{ ThirdPartyConfigurationUrl }}'
-      - name: Tags
+          entity_url_template: '{{ entity_url_template }}'
+          execution_url_template: '{{ execution_url_template }}'
+          revision_url_template: '{{ revision_url_template }}'
+          third_party_configuration_url: '{{ third_party_configuration_url }}'
+      - name: tags
         value:
-          - Value: '{{ Value }}'
-            Key: '{{ Key }}'
-      - name: Version
-        value: '{{ Version }}'
-
+          - value: '{{ value }}'
+            key: '{{ key }}'
+      - name: version
+        value: '{{ version }}'
 ```
 </TabItem>
 </Tabs>
@@ -414,7 +413,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Category>|<Provider>|<Version>';
+AND Identifier = '{{ category }}|{{ provider }}|{{ version }}';
 ```
 
 
@@ -423,7 +422,7 @@ AND Identifier = '<Category>|<Provider>|<Version>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.codepipeline.custom_action_types
-WHERE Identifier = '<Category|Provider|Version>'
+WHERE Identifier = '{{ category }}|{{ provider }}|{{ version }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/codepipeline/pipelines/index.md b/website/docs/services/codepipeline/pipelines/index.md
index 2a60de7c9..7240f7a95 100644
--- a/website/docs/services/codepipeline/pipelines/index.md
+++ b/website/docs/services/codepipeline/pipelines/index.md
@@ -623,7 +623,7 @@ artifact_store,
 pipeline_type,
 tags
 FROM awscc.codepipeline.pipelines
-WHERE region = 'us-east-1' AND Identifier = '<Name>';
+WHERE region = 'us-east-1' AND Identifier = '{{ name }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -660,9 +660,9 @@ INSERT INTO awscc.codepipeline.pipelines (
  RoleArn,
  region
 )
-SELECT 
-'{{ Stages }}',
- '{{ RoleArn }}',
+SELECT
+'{{ stages }}',
+ '{{ role_arn }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -685,19 +685,19 @@ INSERT INTO awscc.codepipeline.pipelines (
  Tags,
  region
 )
-SELECT 
- '{{ ArtifactStores }}',
- '{{ DisableInboundStageTransitions }}',
- '{{ Stages }}',
- '{{ ExecutionMode }}',
- '{{ RestartExecutionOnUpdate }}',
- '{{ Triggers }}',
- '{{ RoleArn }}',
- '{{ Name }}',
- '{{ Variables }}',
- '{{ ArtifactStore }}',
- '{{ PipelineType }}',
- '{{ Tags }}',
+SELECT
+ '{{ artifact_stores }}',
+ '{{ disable_inbound_stage_transitions }}',
+ '{{ stages }}',
+ '{{ execution_mode }}',
+ '{{ restart_execution_on_update }}',
+ '{{ triggers }}',
+ '{{ role_arn }}',
+ '{{ name }}',
+ '{{ variables }}',
+ '{{ artifact_store }}',
+ '{{ pipeline_type }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -715,126 +715,125 @@ globals:
 resources:
   - name: pipeline
     props:
-      - name: ArtifactStores
+      - name: artifact_stores
         value:
-          - ArtifactStore:
-              Type: '{{ Type }}'
-              EncryptionKey:
-                Type: '{{ Type }}'
-                Id: '{{ Id }}'
-              Location: '{{ Location }}'
-            Region: '{{ Region }}'
-      - name: DisableInboundStageTransitions
+          - artifact_store:
+              type: '{{ type }}'
+              encryption_key:
+                type: '{{ type }}'
+                id: '{{ id }}'
+              location: '{{ location }}'
+            region: '{{ region }}'
+      - name: disable_inbound_stage_transitions
         value:
-          - StageName: '{{ StageName }}'
-            Reason: '{{ Reason }}'
-      - name: Stages
+          - stage_name: '{{ stage_name }}'
+            reason: '{{ reason }}'
+      - name: stages
         value:
-          - Blockers:
-              - Name: '{{ Name }}'
-                Type: '{{ Type }}'
-            Actions:
-              - ActionTypeId:
-                  Owner: '{{ Owner }}'
-                  Category: '{{ Category }}'
-                  Version: '{{ Version }}'
-                  Provider: '{{ Provider }}'
-                Configuration: {}
-                InputArtifacts:
-                  - Name: '{{ Name }}'
-                OutputArtifacts:
-                  - Name: '{{ Name }}'
-                    Files:
-                      - '{{ Files[0] }}'
-                Commands:
-                  - '{{ Commands[0] }}'
-                OutputVariables:
-                  - '{{ OutputVariables[0] }}'
-                EnvironmentVariables:
-                  - Name: '{{ Name }}'
-                    Value: '{{ Value }}'
-                    Type: '{{ Type }}'
-                Region: '{{ Region }}'
-                Namespace: '{{ Namespace }}'
-                RoleArn: '{{ RoleArn }}'
-                RunOrder: '{{ RunOrder }}'
-                Name: '{{ Name }}'
-                TimeoutInMinutes: '{{ TimeoutInMinutes }}'
-            Name: '{{ Name }}'
-            OnFailure:
-              Result: '{{ Result }}'
-              RetryConfiguration:
-                RetryMode: '{{ RetryMode }}'
-              Conditions:
-                - Result: '{{ Result }}'
-                  Rules:
-                    - RuleTypeId:
-                        Owner: '{{ Owner }}'
-                        Category: '{{ Category }}'
-                        Version: '{{ Version }}'
-                        Provider: '{{ Provider }}'
-                      Configuration: {}
-                      Commands:
-                        - '{{ Commands[0] }}'
-                      InputArtifacts:
+          - blockers:
+              - name: '{{ name }}'
+                type: '{{ type }}'
+            actions:
+              - action_type_id:
+                  owner: '{{ owner }}'
+                  category: '{{ category }}'
+                  version: '{{ version }}'
+                  provider: '{{ provider }}'
+                configuration: {}
+                input_artifacts:
+                  - name: '{{ name }}'
+                output_artifacts:
+                  - name: '{{ name }}'
+                    files:
+                      - '{{ files[0] }}'
+                commands:
+                  - '{{ commands[0] }}'
+                output_variables:
+                  - '{{ output_variables[0] }}'
+                environment_variables:
+                  - name: '{{ name }}'
+                    value: '{{ value }}'
+                    type: '{{ type }}'
+                region: '{{ region }}'
+                namespace: '{{ namespace }}'
+                role_arn: '{{ role_arn }}'
+                run_order: '{{ run_order }}'
+                name: '{{ name }}'
+                timeout_in_minutes: '{{ timeout_in_minutes }}'
+            name: '{{ name }}'
+            on_failure:
+              result: '{{ result }}'
+              retry_configuration:
+                retry_mode: '{{ retry_mode }}'
+              conditions:
+                - result: '{{ result }}'
+                  rules:
+                    - rule_type_id:
+                        owner: '{{ owner }}'
+                        category: '{{ category }}'
+                        version: '{{ version }}'
+                        provider: '{{ provider }}'
+                      configuration: {}
+                      commands:
+                        - '{{ commands[0] }}'
+                      input_artifacts:
                         - null
-                      Region: '{{ Region }}'
-                      RoleArn: '{{ RoleArn }}'
-                      Name: '{{ Name }}'
-            OnSuccess:
-              Conditions:
+                      region: '{{ region }}'
+                      role_arn: '{{ role_arn }}'
+                      name: '{{ name }}'
+            on_success:
+              conditions:
                 - null
-            BeforeEntry:
-              Conditions:
+            before_entry:
+              conditions:
                 - null
-      - name: ExecutionMode
-        value: '{{ ExecutionMode }}'
-      - name: RestartExecutionOnUpdate
-        value: '{{ RestartExecutionOnUpdate }}'
-      - name: Triggers
+      - name: execution_mode
+        value: '{{ execution_mode }}'
+      - name: restart_execution_on_update
+        value: '{{ restart_execution_on_update }}'
+      - name: triggers
         value:
-          - GitConfiguration:
-              Push:
-                - FilePaths:
-                    Includes:
-                      - '{{ Includes[0] }}'
-                    Excludes:
-                      - '{{ Excludes[0] }}'
-                  Branches:
-                    Includes:
-                      - '{{ Includes[0] }}'
-                    Excludes:
-                      - '{{ Excludes[0] }}'
-                  Tags:
-                    Includes:
-                      - '{{ Includes[0] }}'
-                    Excludes:
-                      - '{{ Excludes[0] }}'
-              SourceActionName: '{{ SourceActionName }}'
-              PullRequest:
-                - FilePaths: null
-                  Events:
-                    - '{{ Events[0] }}'
-                  Branches: null
-            ProviderType: '{{ ProviderType }}'
-      - name: RoleArn
-        value: '{{ RoleArn }}'
-      - name: Name
-        value: '{{ Name }}'
-      - name: Variables
+          - git_configuration:
+              push:
+                - file_paths:
+                    includes:
+                      - '{{ includes[0] }}'
+                    excludes:
+                      - '{{ excludes[0] }}'
+                  branches:
+                    includes:
+                      - '{{ includes[0] }}'
+                    excludes:
+                      - '{{ excludes[0] }}'
+                  tags:
+                    includes:
+                      - '{{ includes[0] }}'
+                    excludes:
+                      - '{{ excludes[0] }}'
+              source_action_name: '{{ source_action_name }}'
+              pull_request:
+                - file_paths: null
+                  events:
+                    - '{{ events[0] }}'
+                  branches: null
+            provider_type: '{{ provider_type }}'
+      - name: role_arn
+        value: '{{ role_arn }}'
+      - name: name
+        value: '{{ name }}'
+      - name: variables
         value:
-          - DefaultValue: '{{ DefaultValue }}'
-            Description: '{{ Description }}'
-            Name: '{{ Name }}'
-      - name: ArtifactStore
+          - default_value: '{{ default_value }}'
+            description: '{{ description }}'
+            name: '{{ name }}'
+      - name: artifact_store
         value: null
-      - name: PipelineType
-        value: '{{ PipelineType }}'
-      - name: Tags
+      - name: pipeline_type
+        value: '{{ pipeline_type }}'
+      - name: tags
         value:
-          - Value: '{{ Value }}'
-            Key: '{{ Key }}'
-
+          - value: '{{ value }}'
+            key: '{{ key }}'
 ```
 </TabItem>
 </Tabs>
@@ -860,7 +859,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Name>';
+AND Identifier = '{{ name }}';
 ```
 
 
@@ -869,7 +868,7 @@ AND Identifier = '<Name>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.codepipeline.pipelines
-WHERE Identifier = '<Name>'
+WHERE Identifier = '{{ name }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/codepipeline/webhooks/index.md b/website/docs/services/codepipeline/webhooks/index.md
index 0153e0e87..748a90779 100644
--- a/website/docs/services/codepipeline/webhooks/index.md
+++ b/website/docs/services/codepipeline/webhooks/index.md
@@ -212,7 +212,7 @@ name,
 target_pipeline_version,
 register_with_third_party
 FROM awscc.codepipeline.webhooks
-WHERE region = 'us-east-1' AND Identifier = '<Id>';
+WHERE region = 'us-east-1' AND Identifier = '{{ id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -252,12 +252,12 @@ INSERT INTO awscc.codepipeline.webhooks (
  TargetAction,
  region
 )
-SELECT 
-'{{ AuthenticationConfiguration }}',
- '{{ Filters }}',
- '{{ Authentication }}',
- '{{ TargetPipeline }}',
- '{{ TargetAction }}',
+SELECT
+'{{ authentication_configuration }}',
+ '{{ filters }}',
+ '{{ authentication }}',
+ '{{ target_pipeline }}',
+ '{{ target_action }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -276,15 +276,15 @@ INSERT INTO awscc.codepipeline.webhooks (
  RegisterWithThirdParty,
  region
 )
-SELECT 
- '{{ AuthenticationConfiguration }}',
- '{{ Filters }}',
- '{{ Authentication }}',
- '{{ TargetPipeline }}',
- '{{ TargetAction }}',
- '{{ Name }}',
- '{{ TargetPipelineVersion }}',
- '{{ RegisterWithThirdParty }}',
+SELECT
+ '{{ authentication_configuration }}',
+ '{{ filters }}',
+ '{{ authentication }}',
+ '{{ target_pipeline }}',
+ '{{ target_action }}',
+ '{{ name }}',
+ '{{ target_pipeline_version }}',
+ '{{ register_with_third_party }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -302,27 +302,26 @@ globals:
 resources:
   - name: webhook
     props:
-      - name: AuthenticationConfiguration
+      - name: authentication_configuration
         value:
-          AllowedIPRange: '{{ AllowedIPRange }}'
-          SecretToken: '{{ SecretToken }}'
-      - name: Filters
+          allowed_ip_range: '{{ allowed_ip_range }}'
+          secret_token: '{{ secret_token }}'
+      - name: filters
         value:
-          - JsonPath: '{{ JsonPath }}'
-            MatchEquals: '{{ MatchEquals }}'
-      - name: Authentication
-        value: '{{ Authentication }}'
-      - name: TargetPipeline
-        value: '{{ TargetPipeline }}'
-      - name: TargetAction
-        value: '{{ TargetAction }}'
-      - name: Name
-        value: '{{ Name }}'
-      - name: TargetPipelineVersion
-        value: '{{ TargetPipelineVersion }}'
-      - name: RegisterWithThirdParty
-        value: '{{ RegisterWithThirdParty }}'
-
+          - json_path: '{{ json_path }}'
+            match_equals: '{{ match_equals }}'
+      - name: authentication
+        value: '{{ authentication }}'
+      - name: target_pipeline
+        value: '{{ target_pipeline }}'
+      - name: target_action
+        value: '{{ target_action }}'
+      - name: name
+        value: '{{ name }}'
+      - name: target_pipeline_version
+        value: '{{ target_pipeline_version }}'
+      - name: register_with_third_party
+        value: '{{ register_with_third_party }}'
 ```
 </TabItem>
 </Tabs>
@@ -344,7 +343,7 @@ SET PatchDocument = string('{{ {
     "RegisterWithThirdParty": register_with_third_party
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Id>';
+AND Identifier = '{{ id }}';
 ```
 
 
@@ -353,7 +352,7 @@ AND Identifier = '<Id>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.codepipeline.webhooks
-WHERE Identifier = '<Id>'
+WHERE Identifier = '{{ id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/codestarconnections/connections/index.md b/website/docs/services/codestarconnections/connections/index.md
index c01643423..6692d2ab6 100644
--- a/website/docs/services/codestarconnections/connections/index.md
+++ b/website/docs/services/codestarconnections/connections/index.md
@@ -182,7 +182,7 @@ provider_type,
 host_arn,
 tags
 FROM awscc.codestarconnections.connections
-WHERE region = 'us-east-1' AND Identifier = '<ConnectionArn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ connection_arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -218,8 +218,8 @@ INSERT INTO awscc.codestarconnections.connections (
  ConnectionName,
  region
 )
-SELECT 
-'{{ ConnectionName }}',
+SELECT
+'{{ connection_name }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -234,11 +234,11 @@ INSERT INTO awscc.codestarconnections.connections (
  Tags,
  region
 )
-SELECT 
- '{{ ConnectionName }}',
- '{{ ProviderType }}',
- '{{ HostArn }}',
- '{{ Tags }}',
+SELECT
+ '{{ connection_name }}',
+ '{{ provider_type }}',
+ '{{ host_arn }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -256,17 +256,16 @@ globals:
 resources:
   - name: connection
     props:
-      - name: ConnectionName
-        value: '{{ ConnectionName }}'
-      - name: ProviderType
-        value: '{{ ProviderType }}'
-      - name: HostArn
-        value: '{{ HostArn }}'
-      - name: Tags
+      - name: connection_name
+        value: '{{ connection_name }}'
+      - name: provider_type
+        value: '{{ provider_type }}'
+      - name: host_arn
+        value: '{{ host_arn }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -282,7 +281,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<ConnectionArn>';
+AND Identifier = '{{ connection_arn }}';
 ```
 
 
@@ -291,7 +290,7 @@ AND Identifier = '<ConnectionArn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.codestarconnections.connections
-WHERE Identifier = '<ConnectionArn>'
+WHERE Identifier = '{{ connection_arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/codestarconnections/repository_links/index.md b/website/docs/services/codestarconnections/repository_links/index.md
index 2e490bf48..2bbb1098c 100644
--- a/website/docs/services/codestarconnections/repository_links/index.md
+++ b/website/docs/services/codestarconnections/repository_links/index.md
@@ -188,7 +188,7 @@ repository_link_id,
 repository_link_arn,
 tags
 FROM awscc.codestarconnections.repository_links
-WHERE region = 'us-east-1' AND Identifier = '<RepositoryLinkArn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ repository_link_arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -226,10 +226,10 @@ INSERT INTO awscc.codestarconnections.repository_links (
  RepositoryName,
  region
 )
-SELECT 
-'{{ ConnectionArn }}',
- '{{ OwnerId }}',
- '{{ RepositoryName }}',
+SELECT
+'{{ connection_arn }}',
+ '{{ owner_id }}',
+ '{{ repository_name }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -245,12 +245,12 @@ INSERT INTO awscc.codestarconnections.repository_links (
  Tags,
  region
 )
-SELECT 
- '{{ ConnectionArn }}',
- '{{ OwnerId }}',
- '{{ RepositoryName }}',
- '{{ EncryptionKeyArn }}',
- '{{ Tags }}',
+SELECT
+ '{{ connection_arn }}',
+ '{{ owner_id }}',
+ '{{ repository_name }}',
+ '{{ encryption_key_arn }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -268,19 +268,18 @@ globals:
 resources:
   - name: repository_link
     props:
-      - name: ConnectionArn
-        value: '{{ ConnectionArn }}'
-      - name: OwnerId
-        value: '{{ OwnerId }}'
-      - name: RepositoryName
-        value: '{{ RepositoryName }}'
-      - name: EncryptionKeyArn
-        value: '{{ EncryptionKeyArn }}'
-      - name: Tags
+      - name: connection_arn
+        value: '{{ connection_arn }}'
+      - name: owner_id
+        value: '{{ owner_id }}'
+      - name: repository_name
+        value: '{{ repository_name }}'
+      - name: encryption_key_arn
+        value: '{{ encryption_key_arn }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -298,7 +297,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<RepositoryLinkArn>';
+AND Identifier = '{{ repository_link_arn }}';
 ```
 
 
@@ -307,7 +306,7 @@ AND Identifier = '<RepositoryLinkArn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.codestarconnections.repository_links
-WHERE Identifier = '<RepositoryLinkArn>'
+WHERE Identifier = '{{ repository_link_arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/codestarconnections/sync_configurations/index.md b/website/docs/services/codestarconnections/sync_configurations/index.md
index 57381370c..d861b4be7 100644
--- a/website/docs/services/codestarconnections/sync_configurations/index.md
+++ b/website/docs/services/codestarconnections/sync_configurations/index.md
@@ -199,7 +199,7 @@ publish_deployment_status,
 trigger_resource_update_on,
 repository_link_id
 FROM awscc.codestarconnections.sync_configurations
-WHERE region = 'us-east-1' AND Identifier = '<ResourceName>|<SyncType>';
+WHERE region = 'us-east-1' AND Identifier = '{{ resource_name }}|{{ sync_type }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -241,13 +241,13 @@ INSERT INTO awscc.codestarconnections.sync_configurations (
  RepositoryLinkId,
  region
 )
-SELECT 
-'{{ ResourceName }}',
- '{{ Branch }}',
- '{{ ConfigFile }}',
- '{{ SyncType }}',
- '{{ RoleArn }}',
- '{{ RepositoryLinkId }}',
+SELECT
+'{{ resource_name }}',
+ '{{ branch }}',
+ '{{ config_file }}',
+ '{{ sync_type }}',
+ '{{ role_arn }}',
+ '{{ repository_link_id }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -266,15 +266,15 @@ INSERT INTO awscc.codestarconnections.sync_configurations (
  RepositoryLinkId,
  region
 )
-SELECT 
- '{{ ResourceName }}',
- '{{ Branch }}',
- '{{ ConfigFile }}',
- '{{ SyncType }}',
- '{{ RoleArn }}',
- '{{ PublishDeploymentStatus }}',
- '{{ TriggerResourceUpdateOn }}',
- '{{ RepositoryLinkId }}',
+SELECT
+ '{{ resource_name }}',
+ '{{ branch }}',
+ '{{ config_file }}',
+ '{{ sync_type }}',
+ '{{ role_arn }}',
+ '{{ publish_deployment_status }}',
+ '{{ trigger_resource_update_on }}',
+ '{{ repository_link_id }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -292,23 +292,22 @@ globals:
 resources:
   - name: sync_configuration
     props:
-      - name: ResourceName
-        value: '{{ ResourceName }}'
-      - name: Branch
-        value: '{{ Branch }}'
-      - name: ConfigFile
-        value: '{{ ConfigFile }}'
-      - name: SyncType
-        value: '{{ SyncType }}'
-      - name: RoleArn
-        value: '{{ RoleArn }}'
-      - name: PublishDeploymentStatus
-        value: '{{ PublishDeploymentStatus }}'
-      - name: TriggerResourceUpdateOn
-        value: '{{ TriggerResourceUpdateOn }}'
-      - name: RepositoryLinkId
-        value: '{{ RepositoryLinkId }}'
-
+      - name: resource_name
+        value: '{{ resource_name }}'
+      - name: branch
+        value: '{{ branch }}'
+      - name: config_file
+        value: '{{ config_file }}'
+      - name: sync_type
+        value: '{{ sync_type }}'
+      - name: role_arn
+        value: '{{ role_arn }}'
+      - name: publish_deployment_status
+        value: '{{ publish_deployment_status }}'
+      - name: trigger_resource_update_on
+        value: '{{ trigger_resource_update_on }}'
+      - name: repository_link_id
+        value: '{{ repository_link_id }}'
 ```
 </TabItem>
 </Tabs>
@@ -329,7 +328,7 @@ SET PatchDocument = string('{{ {
     "RepositoryLinkId": repository_link_id
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<ResourceName>|<SyncType>';
+AND Identifier = '{{ resource_name }}|{{ sync_type }}';
 ```
 
 
@@ -338,7 +337,7 @@ AND Identifier = '<ResourceName>|<SyncType>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.codestarconnections.sync_configurations
-WHERE Identifier = '<ResourceName|SyncType>'
+WHERE Identifier = '{{ resource_name }}|{{ sync_type }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/codestarnotifications/notification_rules/index.md b/website/docs/services/codestarnotifications/notification_rules/index.md
index 70afe7d62..5a0cd284a 100644
--- a/website/docs/services/codestarnotifications/notification_rules/index.md
+++ b/website/docs/services/codestarnotifications/notification_rules/index.md
@@ -206,7 +206,7 @@ tags,
 name,
 arn
 FROM awscc.codestarnotifications.notification_rules
-WHERE region = 'us-east-1' AND Identifier = '<Arn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -246,12 +246,12 @@ INSERT INTO awscc.codestarnotifications.notification_rules (
  Name,
  region
 )
-SELECT 
-'{{ EventTypeIds }}',
- '{{ DetailType }}',
- '{{ Resource }}',
- '{{ Targets }}',
- '{{ Name }}',
+SELECT
+'{{ event_type_ids }}',
+ '{{ detail_type }}',
+ '{{ resource }}',
+ '{{ targets }}',
+ '{{ name }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -272,17 +272,17 @@ INSERT INTO awscc.codestarnotifications.notification_rules (
  Name,
  region
 )
-SELECT 
- '{{ EventTypeId }}',
- '{{ CreatedBy }}',
- '{{ TargetAddress }}',
- '{{ EventTypeIds }}',
- '{{ Status }}',
- '{{ DetailType }}',
- '{{ Resource }}',
- '{{ Targets }}',
- '{{ Tags }}',
- '{{ Name }}',
+SELECT
+ '{{ event_type_id }}',
+ '{{ created_by }}',
+ '{{ target_address }}',
+ '{{ event_type_ids }}',
+ '{{ status }}',
+ '{{ detail_type }}',
+ '{{ resource }}',
+ '{{ targets }}',
+ '{{ tags }}',
+ '{{ name }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -300,30 +300,29 @@ globals:
 resources:
   - name: notification_rule
     props:
-      - name: EventTypeId
-        value: '{{ EventTypeId }}'
-      - name: CreatedBy
-        value: '{{ CreatedBy }}'
-      - name: TargetAddress
-        value: '{{ TargetAddress }}'
-      - name: EventTypeIds
+      - name: event_type_id
+        value: '{{ event_type_id }}'
+      - name: created_by
+        value: '{{ created_by }}'
+      - name: target_address
+        value: '{{ target_address }}'
+      - name: event_type_ids
         value:
-          - '{{ EventTypeIds[0] }}'
-      - name: Status
-        value: '{{ Status }}'
-      - name: DetailType
-        value: '{{ DetailType }}'
-      - name: Resource
-        value: '{{ Resource }}'
-      - name: Targets
+          - '{{ event_type_ids[0] }}'
+      - name: status
+        value: '{{ status }}'
+      - name: detail_type
+        value: '{{ detail_type }}'
+      - name: resource
+        value: '{{ resource }}'
+      - name: targets
         value:
-          - TargetType: '{{ TargetType }}'
-            TargetAddress: '{{ TargetAddress }}'
-      - name: Tags
+          - target_type: '{{ target_type }}'
+            target_address: '{{ target_address }}'
+      - name: tags
         value: {}
-      - name: Name
-        value: '{{ Name }}'
-
+      - name: name
+        value: '{{ name }}'
 ```
 </TabItem>
 </Tabs>
@@ -347,7 +346,7 @@ SET PatchDocument = string('{{ {
     "Name": name
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Arn>';
+AND Identifier = '{{ arn }}';
 ```
 
 
@@ -356,7 +355,7 @@ AND Identifier = '<Arn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.codestarnotifications.notification_rules
-WHERE Identifier = '<Arn>'
+WHERE Identifier = '{{ arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/cognito/identity_pool_principal_tags/index.md b/website/docs/services/cognito/identity_pool_principal_tags/index.md
index 99c52427f..8d11f257b 100644
--- a/website/docs/services/cognito/identity_pool_principal_tags/index.md
+++ b/website/docs/services/cognito/identity_pool_principal_tags/index.md
@@ -167,7 +167,7 @@ identity_provider_name,
 use_defaults,
 principal_tags
 FROM awscc.cognito.identity_pool_principal_tags
-WHERE region = 'us-east-1' AND Identifier = '<IdentityPoolId>|<IdentityProviderName>';
+WHERE region = 'us-east-1' AND Identifier = '{{ identity_pool_id }}|{{ identity_provider_name }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -205,9 +205,9 @@ INSERT INTO awscc.cognito.identity_pool_principal_tags (
  IdentityProviderName,
  region
 )
-SELECT 
-'{{ IdentityPoolId }}',
- '{{ IdentityProviderName }}',
+SELECT
+'{{ identity_pool_id }}',
+ '{{ identity_provider_name }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -222,11 +222,11 @@ INSERT INTO awscc.cognito.identity_pool_principal_tags (
  PrincipalTags,
  region
 )
-SELECT 
- '{{ IdentityPoolId }}',
- '{{ IdentityProviderName }}',
- '{{ UseDefaults }}',
- '{{ PrincipalTags }}',
+SELECT
+ '{{ identity_pool_id }}',
+ '{{ identity_provider_name }}',
+ '{{ use_defaults }}',
+ '{{ principal_tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -244,15 +244,14 @@ globals:
 resources:
   - name: identity_pool_principal_tag
     props:
-      - name: IdentityPoolId
-        value: '{{ IdentityPoolId }}'
-      - name: IdentityProviderName
-        value: '{{ IdentityProviderName }}'
-      - name: UseDefaults
-        value: '{{ UseDefaults }}'
-      - name: PrincipalTags
+      - name: identity_pool_id
+        value: '{{ identity_pool_id }}'
+      - name: identity_provider_name
+        value: '{{ identity_provider_name }}'
+      - name: use_defaults
+        value: '{{ use_defaults }}'
+      - name: principal_tags
         value: {}
-
 ```
 </TabItem>
 </Tabs>
@@ -269,7 +268,7 @@ SET PatchDocument = string('{{ {
     "PrincipalTags": principal_tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<IdentityPoolId>|<IdentityProviderName>';
+AND Identifier = '{{ identity_pool_id }}|{{ identity_provider_name }}';
 ```
 
 
@@ -278,7 +277,7 @@ AND Identifier = '<IdentityPoolId>|<IdentityProviderName>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.cognito.identity_pool_principal_tags
-WHERE Identifier = '<IdentityPoolId|IdentityProviderName>'
+WHERE Identifier = '{{ identity_pool_id }}|{{ identity_provider_name }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/cognito/identity_pool_role_attachments/index.md b/website/docs/services/cognito/identity_pool_role_attachments/index.md
index 8ba01e90b..0f234a0d0 100644
--- a/website/docs/services/cognito/identity_pool_role_attachments/index.md
+++ b/website/docs/services/cognito/identity_pool_role_attachments/index.md
@@ -152,7 +152,7 @@ roles,
 id,
 role_mappings
 FROM awscc.cognito.identity_pool_role_attachments
-WHERE region = 'us-east-1' AND Identifier = '<Id>';
+WHERE region = 'us-east-1' AND Identifier = '{{ id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -188,8 +188,8 @@ INSERT INTO awscc.cognito.identity_pool_role_attachments (
  IdentityPoolId,
  region
 )
-SELECT 
-'{{ IdentityPoolId }}',
+SELECT
+'{{ identity_pool_id }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -203,10 +203,10 @@ INSERT INTO awscc.cognito.identity_pool_role_attachments (
  RoleMappings,
  region
 )
-SELECT 
- '{{ IdentityPoolId }}',
- '{{ Roles }}',
- '{{ RoleMappings }}',
+SELECT
+ '{{ identity_pool_id }}',
+ '{{ roles }}',
+ '{{ role_mappings }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -224,13 +224,12 @@ globals:
 resources:
   - name: identity_pool_role_attachment
     props:
-      - name: IdentityPoolId
-        value: '{{ IdentityPoolId }}'
-      - name: Roles
+      - name: identity_pool_id
+        value: '{{ identity_pool_id }}'
+      - name: roles
         value: null
-      - name: RoleMappings
+      - name: role_mappings
         value: null
-
 ```
 </TabItem>
 </Tabs>
@@ -247,7 +246,7 @@ SET PatchDocument = string('{{ {
     "RoleMappings": role_mappings
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Id>';
+AND Identifier = '{{ id }}';
 ```
 
 
@@ -256,7 +255,7 @@ AND Identifier = '<Id>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.cognito.identity_pool_role_attachments
-WHERE Identifier = '<Id>'
+WHERE Identifier = '{{ id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/cognito/identity_pools/index.md b/website/docs/services/cognito/identity_pools/index.md
index 56c678e47..fb21c48f9 100644
--- a/website/docs/services/cognito/identity_pools/index.md
+++ b/website/docs/services/cognito/identity_pools/index.md
@@ -270,7 +270,7 @@ open_id_connect_provider_arns,
 allow_classic_flow,
 identity_pool_tags
 FROM awscc.cognito.identity_pools
-WHERE region = 'us-east-1' AND Identifier = '<Id>';
+WHERE region = 'us-east-1' AND Identifier = '{{ id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -306,8 +306,8 @@ INSERT INTO awscc.cognito.identity_pools (
  AllowUnauthenticatedIdentities,
  region
 )
-SELECT 
-'{{ AllowUnauthenticatedIdentities }}',
+SELECT
+'{{ allow_unauthenticated_identities }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -330,19 +330,19 @@ INSERT INTO awscc.cognito.identity_pools (
  IdentityPoolTags,
  region
 )
-SELECT 
- '{{ PushSync }}',
- '{{ CognitoIdentityProviders }}',
- '{{ DeveloperProviderName }}',
- '{{ CognitoStreams }}',
- '{{ SupportedLoginProviders }}',
- '{{ CognitoEvents }}',
- '{{ IdentityPoolName }}',
- '{{ AllowUnauthenticatedIdentities }}',
- '{{ SamlProviderARNs }}',
- '{{ OpenIdConnectProviderARNs }}',
- '{{ AllowClassicFlow }}',
- '{{ IdentityPoolTags }}',
+SELECT
+ '{{ push_sync }}',
+ '{{ cognito_identity_providers }}',
+ '{{ developer_provider_name }}',
+ '{{ cognito_streams }}',
+ '{{ supported_login_providers }}',
+ '{{ cognito_events }}',
+ '{{ identity_pool_name }}',
+ '{{ allow_unauthenticated_identities }}',
+ '{{ saml_provider_arns }}',
+ '{{ open_id_connect_provider_arns }}',
+ '{{ allow_classic_flow }}',
+ '{{ identity_pool_tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -360,44 +360,43 @@ globals:
 resources:
   - name: identity_pool
     props:
-      - name: PushSync
+      - name: push_sync
         value:
-          ApplicationArns:
-            - '{{ ApplicationArns[0] }}'
-          RoleArn: '{{ RoleArn }}'
-      - name: CognitoIdentityProviders
+          application_arns:
+            - '{{ application_arns[0] }}'
+          role_arn: '{{ role_arn }}'
+      - name: cognito_identity_providers
         value:
-          - ServerSideTokenCheck: '{{ ServerSideTokenCheck }}'
-            ProviderName: '{{ ProviderName }}'
-            ClientId: '{{ ClientId }}'
-      - name: DeveloperProviderName
-        value: '{{ DeveloperProviderName }}'
-      - name: CognitoStreams
+          - server_side_token_check: '{{ server_side_token_check }}'
+            provider_name: '{{ provider_name }}'
+            client_id: '{{ client_id }}'
+      - name: developer_provider_name
+        value: '{{ developer_provider_name }}'
+      - name: cognito_streams
         value:
-          StreamingStatus: '{{ StreamingStatus }}'
-          StreamName: '{{ StreamName }}'
-          RoleArn: '{{ RoleArn }}'
-      - name: SupportedLoginProviders
+          streaming_status: '{{ streaming_status }}'
+          stream_name: '{{ stream_name }}'
+          role_arn: '{{ role_arn }}'
+      - name: supported_login_providers
         value: {}
-      - name: CognitoEvents
+      - name: cognito_events
         value: {}
-      - name: IdentityPoolName
-        value: '{{ IdentityPoolName }}'
-      - name: AllowUnauthenticatedIdentities
-        value: '{{ AllowUnauthenticatedIdentities }}'
-      - name: SamlProviderARNs
+      - name: identity_pool_name
+        value: '{{ identity_pool_name }}'
+      - name: allow_unauthenticated_identities
+        value: '{{ allow_unauthenticated_identities }}'
+      - name: saml_provider_arns
         value:
-          - '{{ SamlProviderARNs[0] }}'
-      - name: OpenIdConnectProviderARNs
+          - '{{ saml_provider_arns[0] }}'
+      - name: open_id_connect_provider_arns
         value:
-          - '{{ OpenIdConnectProviderARNs[0] }}'
-      - name: AllowClassicFlow
-        value: '{{ AllowClassicFlow }}'
-      - name: IdentityPoolTags
+          - '{{ open_id_connect_provider_arns[0] }}'
+      - name: allow_classic_flow
+        value: '{{ allow_classic_flow }}'
+      - name: identity_pool_tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -424,7 +423,7 @@ SET PatchDocument = string('{{ {
     "IdentityPoolTags": identity_pool_tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Id>';
+AND Identifier = '{{ id }}';
 ```
 
 
@@ -433,7 +432,7 @@ AND Identifier = '<Id>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.cognito.identity_pools
-WHERE Identifier = '<Id>'
+WHERE Identifier = '{{ id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/cognito/log_delivery_configurations/index.md b/website/docs/services/cognito/log_delivery_configurations/index.md
index 518d38aa4..8153a3204 100644
--- a/website/docs/services/cognito/log_delivery_configurations/index.md
+++ b/website/docs/services/cognito/log_delivery_configurations/index.md
@@ -148,7 +148,7 @@ id,
 user_pool_id,
 log_configurations
 FROM awscc.cognito.log_delivery_configurations
-WHERE region = 'us-east-1' AND Identifier = '<Id>';
+WHERE region = 'us-east-1' AND Identifier = '{{ id }}';
 ```
 
 ## `INSERT` example
@@ -171,8 +171,8 @@ INSERT INTO awscc.cognito.log_delivery_configurations (
  UserPoolId,
  region
 )
-SELECT 
-'{{ UserPoolId }}',
+SELECT
+'{{ user_pool_id }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -185,9 +185,9 @@ INSERT INTO awscc.cognito.log_delivery_configurations (
  LogConfigurations,
  region
 )
-SELECT 
- '{{ UserPoolId }}',
- '{{ LogConfigurations }}',
+SELECT
+ '{{ user_pool_id }}',
+ '{{ log_configurations }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -205,19 +205,18 @@ globals:
 resources:
   - name: log_delivery_configuration
     props:
-      - name: UserPoolId
-        value: '{{ UserPoolId }}'
-      - name: LogConfigurations
+      - name: user_pool_id
+        value: '{{ user_pool_id }}'
+      - name: log_configurations
         value:
-          - LogLevel: '{{ LogLevel }}'
-            EventSource: '{{ EventSource }}'
-            CloudWatchLogsConfiguration:
-              LogGroupArn: '{{ LogGroupArn }}'
-            S3Configuration:
-              BucketArn: '{{ BucketArn }}'
-            FirehoseConfiguration:
-              StreamArn: '{{ StreamArn }}'
-
+          - log_level: '{{ log_level }}'
+            event_source: '{{ event_source }}'
+            cloud_watch_logs_configuration:
+              log_group_arn: '{{ log_group_arn }}'
+            s3_configuration:
+              bucket_arn: '{{ bucket_arn }}'
+            firehose_configuration:
+              stream_arn: '{{ stream_arn }}'
 ```
 </TabItem>
 </Tabs>
@@ -233,7 +232,7 @@ SET PatchDocument = string('{{ {
     "LogConfigurations": log_configurations
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Id>';
+AND Identifier = '{{ id }}';
 ```
 
 
@@ -242,7 +241,7 @@ AND Identifier = '<Id>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.cognito.log_delivery_configurations
-WHERE Identifier = '<Id>'
+WHERE Identifier = '{{ id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/cognito/managed_login_brandings/index.md b/website/docs/services/cognito/managed_login_brandings/index.md
index c5c88f724..aae9494c3 100644
--- a/website/docs/services/cognito/managed_login_brandings/index.md
+++ b/website/docs/services/cognito/managed_login_brandings/index.md
@@ -151,7 +151,7 @@ assets,
 managed_login_branding_id,
 return_merged_resources
 FROM awscc.cognito.managed_login_brandings
-WHERE region = 'us-east-1' AND Identifier = '<UserPoolId>|<ManagedLoginBrandingId>';
+WHERE region = 'us-east-1' AND Identifier = '{{ user_pool_id }}|{{ managed_login_branding_id }}';
 ```
 
 ## `INSERT` example
@@ -174,8 +174,8 @@ INSERT INTO awscc.cognito.managed_login_brandings (
  UserPoolId,
  region
 )
-SELECT 
-'{{ UserPoolId }}',
+SELECT
+'{{ user_pool_id }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -192,13 +192,13 @@ INSERT INTO awscc.cognito.managed_login_brandings (
  ReturnMergedResources,
  region
 )
-SELECT 
- '{{ UserPoolId }}',
- '{{ ClientId }}',
- '{{ UseCognitoProvidedValues }}',
- '{{ Settings }}',
- '{{ Assets }}',
- '{{ ReturnMergedResources }}',
+SELECT
+ '{{ user_pool_id }}',
+ '{{ client_id }}',
+ '{{ use_cognito_provided_values }}',
+ '{{ settings }}',
+ '{{ assets }}',
+ '{{ return_merged_resources }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -216,24 +216,23 @@ globals:
 resources:
   - name: managed_login_branding
     props:
-      - name: UserPoolId
-        value: '{{ UserPoolId }}'
-      - name: ClientId
-        value: '{{ ClientId }}'
-      - name: UseCognitoProvidedValues
-        value: '{{ UseCognitoProvidedValues }}'
-      - name: Settings
+      - name: user_pool_id
+        value: '{{ user_pool_id }}'
+      - name: client_id
+        value: '{{ client_id }}'
+      - name: use_cognito_provided_values
+        value: '{{ use_cognito_provided_values }}'
+      - name: settings
         value: {}
-      - name: Assets
+      - name: assets
         value:
-          - Category: '{{ Category }}'
-            ColorMode: '{{ ColorMode }}'
-            Extension: '{{ Extension }}'
-            Bytes: '{{ Bytes }}'
-            ResourceId: '{{ ResourceId }}'
-      - name: ReturnMergedResources
-        value: '{{ ReturnMergedResources }}'
-
+          - category: '{{ category }}'
+            color_mode: '{{ color_mode }}'
+            extension: '{{ extension }}'
+            bytes: '{{ bytes }}'
+            resource_id: '{{ resource_id }}'
+      - name: return_merged_resources
+        value: '{{ return_merged_resources }}'
 ```
 </TabItem>
 </Tabs>
@@ -252,7 +251,7 @@ SET PatchDocument = string('{{ {
     "ReturnMergedResources": return_merged_resources
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<UserPoolId>|<ManagedLoginBrandingId>';
+AND Identifier = '{{ user_pool_id }}|{{ managed_login_branding_id }}';
 ```
 
 
@@ -261,7 +260,7 @@ AND Identifier = '<UserPoolId>|<ManagedLoginBrandingId>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.cognito.managed_login_brandings
-WHERE Identifier = '<UserPoolId|ManagedLoginBrandingId>'
+WHERE Identifier = '{{ user_pool_id }}|{{ managed_login_branding_id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/cognito/user_pool_clients/index.md b/website/docs/services/cognito/user_pool_clients/index.md
index cda4267ed..87724b7a4 100644
--- a/website/docs/services/cognito/user_pool_clients/index.md
+++ b/website/docs/services/cognito/user_pool_clients/index.md
@@ -345,7 +345,7 @@ name,
 client_secret,
 client_id
 FROM awscc.cognito.user_pool_clients
-WHERE region = 'us-east-1' AND Identifier = '<UserPoolId>|<ClientId>';
+WHERE region = 'us-east-1' AND Identifier = '{{ user_pool_id }}|{{ client_id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -382,8 +382,8 @@ INSERT INTO awscc.cognito.user_pool_clients (
  UserPoolId,
  region
 )
-SELECT 
-'{{ UserPoolId }}',
+SELECT
+'{{ user_pool_id }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -417,30 +417,30 @@ INSERT INTO awscc.cognito.user_pool_clients (
  EnablePropagateAdditionalUserContextData,
  region
 )
-SELECT 
- '{{ ClientName }}',
- '{{ ExplicitAuthFlows }}',
- '{{ GenerateSecret }}',
- '{{ ReadAttributes }}',
- '{{ AuthSessionValidity }}',
- '{{ RefreshTokenValidity }}',
- '{{ AccessTokenValidity }}',
- '{{ IdTokenValidity }}',
- '{{ TokenValidityUnits }}',
- '{{ RefreshTokenRotation }}',
- '{{ UserPoolId }}',
- '{{ WriteAttributes }}',
- '{{ AllowedOAuthFlows }}',
- '{{ AllowedOAuthFlowsUserPoolClient }}',
- '{{ AllowedOAuthScopes }}',
- '{{ CallbackURLs }}',
- '{{ DefaultRedirectURI }}',
- '{{ LogoutURLs }}',
- '{{ SupportedIdentityProviders }}',
- '{{ AnalyticsConfiguration }}',
- '{{ PreventUserExistenceErrors }}',
- '{{ EnableTokenRevocation }}',
- '{{ EnablePropagateAdditionalUserContextData }}',
+SELECT
+ '{{ client_name }}',
+ '{{ explicit_auth_flows }}',
+ '{{ generate_secret }}',
+ '{{ read_attributes }}',
+ '{{ auth_session_validity }}',
+ '{{ refresh_token_validity }}',
+ '{{ access_token_validity }}',
+ '{{ id_token_validity }}',
+ '{{ token_validity_units }}',
+ '{{ refresh_token_rotation }}',
+ '{{ user_pool_id }}',
+ '{{ write_attributes }}',
+ '{{ allowed_oauth_flows }}',
+ '{{ allowed_oauth_flows_user_pool_client }}',
+ '{{ allowed_oauth_scopes }}',
+ '{{ callback_urls }}',
+ '{{ default_redirect_uri }}',
+ '{{ logout_urls }}',
+ '{{ supported_identity_providers }}',
+ '{{ analytics_configuration }}',
+ '{{ prevent_user_existence_errors }}',
+ '{{ enable_token_revocation }}',
+ '{{ enable_propagate_additional_user_context_data }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -458,71 +458,70 @@ globals:
 resources:
   - name: user_pool_client
     props:
-      - name: ClientName
-        value: '{{ ClientName }}'
-      - name: ExplicitAuthFlows
+      - name: client_name
+        value: '{{ client_name }}'
+      - name: explicit_auth_flows
         value:
-          - '{{ ExplicitAuthFlows[0] }}'
-      - name: GenerateSecret
-        value: '{{ GenerateSecret }}'
-      - name: ReadAttributes
+          - '{{ explicit_auth_flows[0] }}'
+      - name: generate_secret
+        value: '{{ generate_secret }}'
+      - name: read_attributes
         value:
-          - '{{ ReadAttributes[0] }}'
-      - name: AuthSessionValidity
-        value: '{{ AuthSessionValidity }}'
-      - name: RefreshTokenValidity
-        value: '{{ RefreshTokenValidity }}'
-      - name: AccessTokenValidity
-        value: '{{ AccessTokenValidity }}'
-      - name: IdTokenValidity
-        value: '{{ IdTokenValidity }}'
-      - name: TokenValidityUnits
+          - '{{ read_attributes[0] }}'
+      - name: auth_session_validity
+        value: '{{ auth_session_validity }}'
+      - name: refresh_token_validity
+        value: '{{ refresh_token_validity }}'
+      - name: access_token_validity
+        value: '{{ access_token_validity }}'
+      - name: id_token_validity
+        value: '{{ id_token_validity }}'
+      - name: token_validity_units
         value:
-          AccessToken: '{{ AccessToken }}'
-          IdToken: '{{ IdToken }}'
-          RefreshToken: '{{ RefreshToken }}'
-      - name: RefreshTokenRotation
+          access_token: '{{ access_token }}'
+          id_token: '{{ id_token }}'
+          refresh_token: '{{ refresh_token }}'
+      - name: refresh_token_rotation
         value:
-          Feature: '{{ Feature }}'
-          RetryGracePeriodSeconds: '{{ RetryGracePeriodSeconds }}'
-      - name: UserPoolId
-        value: '{{ UserPoolId }}'
-      - name: WriteAttributes
+          feature: '{{ feature }}'
+          retry_grace_period_seconds: '{{ retry_grace_period_seconds }}'
+      - name: user_pool_id
+        value: '{{ user_pool_id }}'
+      - name: write_attributes
         value:
-          - '{{ WriteAttributes[0] }}'
-      - name: AllowedOAuthFlows
+          - '{{ write_attributes[0] }}'
+      - name: allowed_oauth_flows
         value:
-          - '{{ AllowedOAuthFlows[0] }}'
-      - name: AllowedOAuthFlowsUserPoolClient
-        value: '{{ AllowedOAuthFlowsUserPoolClient }}'
-      - name: AllowedOAuthScopes
+          - '{{ allowed_oauth_flows[0] }}'
+      - name: allowed_oauth_flows_user_pool_client
+        value: '{{ allowed_oauth_flows_user_pool_client }}'
+      - name: allowed_oauth_scopes
         value:
-          - '{{ AllowedOAuthScopes[0] }}'
-      - name: CallbackURLs
+          - '{{ allowed_oauth_scopes[0] }}'
+      - name: callback_urls
         value:
-          - '{{ CallbackURLs[0] }}'
-      - name: DefaultRedirectURI
-        value: '{{ DefaultRedirectURI }}'
-      - name: LogoutURLs
+          - '{{ callback_urls[0] }}'
+      - name: default_redirect_uri
+        value: '{{ default_redirect_uri }}'
+      - name: logout_urls
         value:
-          - '{{ LogoutURLs[0] }}'
-      - name: SupportedIdentityProviders
+          - '{{ logout_urls[0] }}'
+      - name: supported_identity_providers
         value:
-          - '{{ SupportedIdentityProviders[0] }}'
-      - name: AnalyticsConfiguration
+          - '{{ supported_identity_providers[0] }}'
+      - name: analytics_configuration
         value:
-          ApplicationArn: '{{ ApplicationArn }}'
-          ApplicationId: '{{ ApplicationId }}'
-          ExternalId: '{{ ExternalId }}'
-          RoleArn: '{{ RoleArn }}'
-          UserDataShared: '{{ UserDataShared }}'
-      - name: PreventUserExistenceErrors
-        value: '{{ PreventUserExistenceErrors }}'
-      - name: EnableTokenRevocation
-        value: '{{ EnableTokenRevocation }}'
-      - name: EnablePropagateAdditionalUserContextData
-        value: '{{ EnablePropagateAdditionalUserContextData }}'
-
+          application_arn: '{{ application_arn }}'
+          application_id: '{{ application_id }}'
+          external_id: '{{ external_id }}'
+          role_arn: '{{ role_arn }}'
+          user_data_shared: '{{ user_data_shared }}'
+      - name: prevent_user_existence_errors
+        value: '{{ prevent_user_existence_errors }}'
+      - name: enable_token_revocation
+        value: '{{ enable_token_revocation }}'
+      - name: enable_propagate_additional_user_context_data
+        value: '{{ enable_propagate_additional_user_context_data }}'
 ```
 </TabItem>
 </Tabs>
@@ -558,7 +557,7 @@ SET PatchDocument = string('{{ {
     "EnablePropagateAdditionalUserContextData": enable_propagate_additional_user_context_data
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<UserPoolId>|<ClientId>';
+AND Identifier = '{{ user_pool_id }}|{{ client_id }}';
 ```
 
 
@@ -567,7 +566,7 @@ AND Identifier = '<UserPoolId>|<ClientId>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.cognito.user_pool_clients
-WHERE Identifier = '<UserPoolId|ClientId>'
+WHERE Identifier = '{{ user_pool_id }}|{{ client_id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/cognito/user_pool_domains/index.md b/website/docs/services/cognito/user_pool_domains/index.md
index e7d3d9d56..cfae6e795 100644
--- a/website/docs/services/cognito/user_pool_domains/index.md
+++ b/website/docs/services/cognito/user_pool_domains/index.md
@@ -119,7 +119,7 @@ custom_domain_config,
 cloud_front_distribution,
 managed_login_version
 FROM awscc.cognito.user_pool_domains
-WHERE region = 'us-east-1' AND Identifier = '<UserPoolId>|<Domain>';
+WHERE region = 'us-east-1' AND Identifier = '{{ user_pool_id }}|{{ domain }}';
 ```
 
 ## `INSERT` example
@@ -143,9 +143,9 @@ INSERT INTO awscc.cognito.user_pool_domains (
  Domain,
  region
 )
-SELECT 
-'{{ UserPoolId }}',
- '{{ Domain }}',
+SELECT
+'{{ user_pool_id }}',
+ '{{ domain }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -160,11 +160,11 @@ INSERT INTO awscc.cognito.user_pool_domains (
  ManagedLoginVersion,
  region
 )
-SELECT 
- '{{ UserPoolId }}',
- '{{ Domain }}',
- '{{ CustomDomainConfig }}',
- '{{ ManagedLoginVersion }}',
+SELECT
+ '{{ user_pool_id }}',
+ '{{ domain }}',
+ '{{ custom_domain_config }}',
+ '{{ managed_login_version }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -182,16 +182,15 @@ globals:
 resources:
   - name: user_pool_domain
     props:
-      - name: UserPoolId
-        value: '{{ UserPoolId }}'
-      - name: Domain
-        value: '{{ Domain }}'
-      - name: CustomDomainConfig
+      - name: user_pool_id
+        value: '{{ user_pool_id }}'
+      - name: domain
+        value: '{{ domain }}'
+      - name: custom_domain_config
         value:
-          CertificateArn: '{{ CertificateArn }}'
-      - name: ManagedLoginVersion
-        value: '{{ ManagedLoginVersion }}'
-
+          certificate_arn: '{{ certificate_arn }}'
+      - name: managed_login_version
+        value: '{{ managed_login_version }}'
 ```
 </TabItem>
 </Tabs>
@@ -208,7 +207,7 @@ SET PatchDocument = string('{{ {
     "ManagedLoginVersion": managed_login_version
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<UserPoolId>|<Domain>';
+AND Identifier = '{{ user_pool_id }}|{{ domain }}';
 ```
 
 
@@ -217,7 +216,7 @@ AND Identifier = '<UserPoolId>|<Domain>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.cognito.user_pool_domains
-WHERE Identifier = '<UserPoolId|Domain>'
+WHERE Identifier = '{{ user_pool_id }}|{{ domain }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/cognito/user_pool_groups/index.md b/website/docs/services/cognito/user_pool_groups/index.md
index 5f9dd8f59..eb7c26011 100644
--- a/website/docs/services/cognito/user_pool_groups/index.md
+++ b/website/docs/services/cognito/user_pool_groups/index.md
@@ -163,7 +163,7 @@ precedence,
 role_arn,
 user_pool_id
 FROM awscc.cognito.user_pool_groups
-WHERE region = 'us-east-1' AND Identifier = '<UserPoolId>|<GroupName>';
+WHERE region = 'us-east-1' AND Identifier = '{{ user_pool_id }}|{{ group_name }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -200,8 +200,8 @@ INSERT INTO awscc.cognito.user_pool_groups (
  UserPoolId,
  region
 )
-SELECT 
-'{{ UserPoolId }}',
+SELECT
+'{{ user_pool_id }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -217,12 +217,12 @@ INSERT INTO awscc.cognito.user_pool_groups (
  UserPoolId,
  region
 )
-SELECT 
- '{{ Description }}',
- '{{ GroupName }}',
- '{{ Precedence }}',
- '{{ RoleArn }}',
- '{{ UserPoolId }}',
+SELECT
+ '{{ description }}',
+ '{{ group_name }}',
+ '{{ precedence }}',
+ '{{ role_arn }}',
+ '{{ user_pool_id }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -240,17 +240,16 @@ globals:
 resources:
   - name: user_pool_group
     props:
-      - name: Description
-        value: '{{ Description }}'
-      - name: GroupName
-        value: '{{ GroupName }}'
-      - name: Precedence
-        value: '{{ Precedence }}'
-      - name: RoleArn
-        value: '{{ RoleArn }}'
-      - name: UserPoolId
-        value: '{{ UserPoolId }}'
-
+      - name: description
+        value: '{{ description }}'
+      - name: group_name
+        value: '{{ group_name }}'
+      - name: precedence
+        value: '{{ precedence }}'
+      - name: role_arn
+        value: '{{ role_arn }}'
+      - name: user_pool_id
+        value: '{{ user_pool_id }}'
 ```
 </TabItem>
 </Tabs>
@@ -268,7 +267,7 @@ SET PatchDocument = string('{{ {
     "RoleArn": role_arn
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<UserPoolId>|<GroupName>';
+AND Identifier = '{{ user_pool_id }}|{{ group_name }}';
 ```
 
 
@@ -277,7 +276,7 @@ AND Identifier = '<UserPoolId>|<GroupName>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.cognito.user_pool_groups
-WHERE Identifier = '<UserPoolId|GroupName>'
+WHERE Identifier = '{{ user_pool_id }}|{{ group_name }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/cognito/user_pool_identity_providers/index.md b/website/docs/services/cognito/user_pool_identity_providers/index.md
index 9c13e0a5e..829032307 100644
--- a/website/docs/services/cognito/user_pool_identity_providers/index.md
+++ b/website/docs/services/cognito/user_pool_identity_providers/index.md
@@ -169,7 +169,7 @@ provider_details,
 idp_identifiers,
 attribute_mapping
 FROM awscc.cognito.user_pool_identity_providers
-WHERE region = 'us-east-1' AND Identifier = '<UserPoolId>|<ProviderName>';
+WHERE region = 'us-east-1' AND Identifier = '{{ user_pool_id }}|{{ provider_name }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -209,11 +209,11 @@ INSERT INTO awscc.cognito.user_pool_identity_providers (
  ProviderDetails,
  region
 )
-SELECT 
-'{{ UserPoolId }}',
- '{{ ProviderName }}',
- '{{ ProviderType }}',
- '{{ ProviderDetails }}',
+SELECT
+'{{ user_pool_id }}',
+ '{{ provider_name }}',
+ '{{ provider_type }}',
+ '{{ provider_details }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -230,13 +230,13 @@ INSERT INTO awscc.cognito.user_pool_identity_providers (
  AttributeMapping,
  region
 )
-SELECT 
- '{{ UserPoolId }}',
- '{{ ProviderName }}',
- '{{ ProviderType }}',
- '{{ ProviderDetails }}',
- '{{ IdpIdentifiers }}',
- '{{ AttributeMapping }}',
+SELECT
+ '{{ user_pool_id }}',
+ '{{ provider_name }}',
+ '{{ provider_type }}',
+ '{{ provider_details }}',
+ '{{ idp_identifiers }}',
+ '{{ attribute_mapping }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -254,20 +254,19 @@ globals:
 resources:
   - name: user_pool_identity_provider
     props:
-      - name: UserPoolId
-        value: '{{ UserPoolId }}'
-      - name: ProviderName
-        value: '{{ ProviderName }}'
-      - name: ProviderType
-        value: '{{ ProviderType }}'
-      - name: ProviderDetails
+      - name: user_pool_id
+        value: '{{ user_pool_id }}'
+      - name: provider_name
+        value: '{{ provider_name }}'
+      - name: provider_type
+        value: '{{ provider_type }}'
+      - name: provider_details
         value: {}
-      - name: IdpIdentifiers
+      - name: idp_identifiers
         value:
-          - '{{ IdpIdentifiers[0] }}'
-      - name: AttributeMapping
+          - '{{ idp_identifiers[0] }}'
+      - name: attribute_mapping
         value: {}
-
 ```
 </TabItem>
 </Tabs>
@@ -285,7 +284,7 @@ SET PatchDocument = string('{{ {
     "AttributeMapping": attribute_mapping
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<UserPoolId>|<ProviderName>';
+AND Identifier = '{{ user_pool_id }}|{{ provider_name }}';
 ```
 
 
@@ -294,7 +293,7 @@ AND Identifier = '<UserPoolId>|<ProviderName>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.cognito.user_pool_identity_providers
-WHERE Identifier = '<UserPoolId|ProviderName>'
+WHERE Identifier = '{{ user_pool_id }}|{{ provider_name }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/cognito/user_pool_resource_servers/index.md b/website/docs/services/cognito/user_pool_resource_servers/index.md
index 30cc1dd5d..58de731f2 100644
--- a/website/docs/services/cognito/user_pool_resource_servers/index.md
+++ b/website/docs/services/cognito/user_pool_resource_servers/index.md
@@ -169,7 +169,7 @@ identifier,
 name,
 scopes
 FROM awscc.cognito.user_pool_resource_servers
-WHERE region = 'us-east-1' AND Identifier = '<UserPoolId>|<Identifier>';
+WHERE region = 'us-east-1' AND Identifier = '{{ user_pool_id }}|{{ identifier }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -208,10 +208,10 @@ INSERT INTO awscc.cognito.user_pool_resource_servers (
  Name,
  region
 )
-SELECT 
-'{{ UserPoolId }}',
- '{{ Identifier }}',
- '{{ Name }}',
+SELECT
+'{{ user_pool_id }}',
+ '{{ identifier }}',
+ '{{ name }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -226,11 +226,11 @@ INSERT INTO awscc.cognito.user_pool_resource_servers (
  Scopes,
  region
 )
-SELECT 
- '{{ UserPoolId }}',
- '{{ Identifier }}',
- '{{ Name }}',
- '{{ Scopes }}',
+SELECT
+ '{{ user_pool_id }}',
+ '{{ identifier }}',
+ '{{ name }}',
+ '{{ scopes }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -248,17 +248,16 @@ globals:
 resources:
   - name: user_pool_resource_server
     props:
-      - name: UserPoolId
-        value: '{{ UserPoolId }}'
-      - name: Identifier
-        value: '{{ Identifier }}'
-      - name: Name
-        value: '{{ Name }}'
-      - name: Scopes
+      - name: user_pool_id
+        value: '{{ user_pool_id }}'
+      - name: identifier
+        value: '{{ identifier }}'
+      - name: name
+        value: '{{ name }}'
+      - name: scopes
         value:
-          - ScopeDescription: '{{ ScopeDescription }}'
-            ScopeName: '{{ ScopeName }}'
-
+          - scope_description: '{{ scope_description }}'
+            scope_name: '{{ scope_name }}'
 ```
 </TabItem>
 </Tabs>
@@ -275,7 +274,7 @@ SET PatchDocument = string('{{ {
     "Scopes": scopes
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<UserPoolId>|<Identifier>';
+AND Identifier = '{{ user_pool_id }}|{{ identifier }}';
 ```
 
 
@@ -284,7 +283,7 @@ AND Identifier = '<UserPoolId>|<Identifier>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.cognito.user_pool_resource_servers
-WHERE Identifier = '<UserPoolId|Identifier>'
+WHERE Identifier = '{{ user_pool_id }}|{{ identifier }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/cognito/user_pool_risk_configuration_attachments/index.md b/website/docs/services/cognito/user_pool_risk_configuration_attachments/index.md
index d27e17ec0..bd9a0ad39 100644
--- a/website/docs/services/cognito/user_pool_risk_configuration_attachments/index.md
+++ b/website/docs/services/cognito/user_pool_risk_configuration_attachments/index.md
@@ -213,7 +213,7 @@ risk_exception_configuration,
 compromised_credentials_risk_configuration,
 account_takeover_risk_configuration
 FROM awscc.cognito.user_pool_risk_configuration_attachments
-WHERE region = 'us-east-1' AND Identifier = '<UserPoolId>|<ClientId>';
+WHERE region = 'us-east-1' AND Identifier = '{{ user_pool_id }}|{{ client_id }}';
 ```
 
 ## `INSERT` example
@@ -237,9 +237,9 @@ INSERT INTO awscc.cognito.user_pool_risk_configuration_attachments (
  ClientId,
  region
 )
-SELECT 
-'{{ UserPoolId }}',
- '{{ ClientId }}',
+SELECT
+'{{ user_pool_id }}',
+ '{{ client_id }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -255,12 +255,12 @@ INSERT INTO awscc.cognito.user_pool_risk_configuration_attachments (
  AccountTakeoverRiskConfiguration,
  region
 )
-SELECT 
- '{{ UserPoolId }}',
- '{{ ClientId }}',
- '{{ RiskExceptionConfiguration }}',
- '{{ CompromisedCredentialsRiskConfiguration }}',
- '{{ AccountTakeoverRiskConfiguration }}',
+SELECT
+ '{{ user_pool_id }}',
+ '{{ client_id }}',
+ '{{ risk_exception_configuration }}',
+ '{{ compromised_credentials_risk_configuration }}',
+ '{{ account_takeover_risk_configuration }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -278,41 +278,40 @@ globals:
 resources:
   - name: user_pool_risk_configuration_attachment
     props:
-      - name: UserPoolId
-        value: '{{ UserPoolId }}'
-      - name: ClientId
-        value: '{{ ClientId }}'
-      - name: RiskExceptionConfiguration
+      - name: user_pool_id
+        value: '{{ user_pool_id }}'
+      - name: client_id
+        value: '{{ client_id }}'
+      - name: risk_exception_configuration
         value:
-          BlockedIPRangeList:
-            - '{{ BlockedIPRangeList[0] }}'
-          SkippedIPRangeList:
-            - '{{ SkippedIPRangeList[0] }}'
-      - name: CompromisedCredentialsRiskConfiguration
+          blocked_ip_range_list:
+            - '{{ blocked_ip_range_list[0] }}'
+          skipped_ip_range_list:
+            - '{{ skipped_ip_range_list[0] }}'
+      - name: compromised_credentials_risk_configuration
         value:
-          Actions:
-            EventAction: '{{ EventAction }}'
-          EventFilter:
-            - '{{ EventFilter[0] }}'
-      - name: AccountTakeoverRiskConfiguration
+          actions:
+            event_action: '{{ event_action }}'
+          event_filter:
+            - '{{ event_filter[0] }}'
+      - name: account_takeover_risk_configuration
         value:
-          Actions:
-            HighAction:
-              EventAction: '{{ EventAction }}'
-              Notify: '{{ Notify }}'
-            LowAction: null
-            MediumAction: null
-          NotifyConfiguration:
-            BlockEmail:
-              HtmlBody: '{{ HtmlBody }}'
-              Subject: '{{ Subject }}'
-              TextBody: '{{ TextBody }}'
-            MfaEmail: null
-            NoActionEmail: null
-            From: '{{ From }}'
-            ReplyTo: '{{ ReplyTo }}'
-            SourceArn: '{{ SourceArn }}'
-
+          actions:
+            high_action:
+              event_action: '{{ event_action }}'
+              notify: '{{ notify }}'
+            low_action: null
+            medium_action: null
+          notify_configuration:
+            block_email:
+              html_body: '{{ html_body }}'
+              subject: '{{ subject }}'
+              text_body: '{{ text_body }}'
+            mfa_email: null
+            no_action_email: null
+            from: '{{ from }}'
+            reply_to: '{{ reply_to }}'
+            source_arn: '{{ source_arn }}'
 ```
 </TabItem>
 </Tabs>
@@ -330,7 +329,7 @@ SET PatchDocument = string('{{ {
     "AccountTakeoverRiskConfiguration": account_takeover_risk_configuration
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<UserPoolId>|<ClientId>';
+AND Identifier = '{{ user_pool_id }}|{{ client_id }}';
 ```
 
 
@@ -339,7 +338,7 @@ AND Identifier = '<UserPoolId>|<ClientId>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.cognito.user_pool_risk_configuration_attachments
-WHERE Identifier = '<UserPoolId|ClientId>'
+WHERE Identifier = '{{ user_pool_id }}|{{ client_id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/cognito/user_pool_user_to_group_attachments/index.md b/website/docs/services/cognito/user_pool_user_to_group_attachments/index.md
index 965962133..e02c125a9 100644
--- a/website/docs/services/cognito/user_pool_user_to_group_attachments/index.md
+++ b/website/docs/services/cognito/user_pool_user_to_group_attachments/index.md
@@ -95,7 +95,7 @@ user_pool_id,
 username,
 group_name
 FROM awscc.cognito.user_pool_user_to_group_attachments
-WHERE region = 'us-east-1' AND Identifier = '<UserPoolId>|<GroupName>|<Username>';
+WHERE region = 'us-east-1' AND Identifier = '{{ user_pool_id }}|{{ group_name }}|{{ username }}';
 ```
 
 ## `INSERT` example
@@ -120,10 +120,10 @@ INSERT INTO awscc.cognito.user_pool_user_to_group_attachments (
  GroupName,
  region
 )
-SELECT 
-'{{ UserPoolId }}',
- '{{ Username }}',
- '{{ GroupName }}',
+SELECT
+'{{ user_pool_id }}',
+ '{{ username }}',
+ '{{ group_name }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -137,10 +137,10 @@ INSERT INTO awscc.cognito.user_pool_user_to_group_attachments (
  GroupName,
  region
 )
-SELECT 
- '{{ UserPoolId }}',
- '{{ Username }}',
- '{{ GroupName }}',
+SELECT
+ '{{ user_pool_id }}',
+ '{{ username }}',
+ '{{ group_name }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -158,13 +158,12 @@ globals:
 resources:
   - name: user_pool_user_to_group_attachment
     props:
-      - name: UserPoolId
-        value: '{{ UserPoolId }}'
-      - name: Username
-        value: '{{ Username }}'
-      - name: GroupName
-        value: '{{ GroupName }}'
-
+      - name: user_pool_id
+        value: '{{ user_pool_id }}'
+      - name: username
+        value: '{{ username }}'
+      - name: group_name
+        value: '{{ group_name }}'
 ```
 </TabItem>
 </Tabs>
@@ -175,7 +174,7 @@ resources:
 ```sql
 /*+ delete */
 DELETE FROM awscc.cognito.user_pool_user_to_group_attachments
-WHERE Identifier = '<UserPoolId|GroupName|Username>'
+WHERE Identifier = '{{ user_pool_id }}|{{ group_name }}|{{ username }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/cognito/user_pool_users/index.md b/website/docs/services/cognito/user_pool_users/index.md
index df49df8d3..d5fff6d5b 100644
--- a/website/docs/services/cognito/user_pool_users/index.md
+++ b/website/docs/services/cognito/user_pool_users/index.md
@@ -187,7 +187,7 @@ user_pool_id,
 validation_data,
 client_metadata
 FROM awscc.cognito.user_pool_users
-WHERE region = 'us-east-1' AND Identifier = '<UserPoolId>|<Username>';
+WHERE region = 'us-east-1' AND Identifier = '{{ user_pool_id }}|{{ username }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -224,8 +224,8 @@ INSERT INTO awscc.cognito.user_pool_users (
  UserPoolId,
  region
 )
-SELECT 
-'{{ UserPoolId }}',
+SELECT
+'{{ user_pool_id }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -244,15 +244,15 @@ INSERT INTO awscc.cognito.user_pool_users (
  ClientMetadata,
  region
 )
-SELECT 
- '{{ DesiredDeliveryMediums }}',
- '{{ ForceAliasCreation }}',
- '{{ UserAttributes }}',
- '{{ MessageAction }}',
- '{{ Username }}',
- '{{ UserPoolId }}',
- '{{ ValidationData }}',
- '{{ ClientMetadata }}',
+SELECT
+ '{{ desired_delivery_mediums }}',
+ '{{ force_alias_creation }}',
+ '{{ user_attributes }}',
+ '{{ message_action }}',
+ '{{ username }}',
+ '{{ user_pool_id }}',
+ '{{ validation_data }}',
+ '{{ client_metadata }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -270,27 +270,26 @@ globals:
 resources:
   - name: user_pool_user
     props:
-      - name: DesiredDeliveryMediums
+      - name: desired_delivery_mediums
         value:
-          - '{{ DesiredDeliveryMediums[0] }}'
-      - name: ForceAliasCreation
-        value: '{{ ForceAliasCreation }}'
-      - name: UserAttributes
+          - '{{ desired_delivery_mediums[0] }}'
+      - name: force_alias_creation
+        value: '{{ force_alias_creation }}'
+      - name: user_attributes
         value:
-          - Name: '{{ Name }}'
-            Value: '{{ Value }}'
-      - name: MessageAction
-        value: '{{ MessageAction }}'
-      - name: Username
-        value: '{{ Username }}'
-      - name: UserPoolId
-        value: '{{ UserPoolId }}'
-      - name: ValidationData
+          - name: '{{ name }}'
+            value: '{{ value }}'
+      - name: message_action
+        value: '{{ message_action }}'
+      - name: username
+        value: '{{ username }}'
+      - name: user_pool_id
+        value: '{{ user_pool_id }}'
+      - name: validation_data
         value:
           - null
-      - name: ClientMetadata
+      - name: client_metadata
         value: {}
-
 ```
 </TabItem>
 </Tabs>
@@ -301,7 +300,7 @@ resources:
 ```sql
 /*+ delete */
 DELETE FROM awscc.cognito.user_pool_users
-WHERE Identifier = '<UserPoolId|Username>'
+WHERE Identifier = '{{ user_pool_id }}|{{ username }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/cognito/user_pools/index.md b/website/docs/services/cognito/user_pools/index.md
index b62c281b3..683690453 100644
--- a/website/docs/services/cognito/user_pools/index.md
+++ b/website/docs/services/cognito/user_pools/index.md
@@ -725,7 +725,7 @@ arn,
 user_pool_id,
 user_pool_tier
 FROM awscc.cognito.user_pools
-WHERE region = 'us-east-1' AND Identifier = '<UserPoolId>';
+WHERE region = 'us-east-1' AND Identifier = '{{ user_pool_id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -789,36 +789,36 @@ INSERT INTO awscc.cognito.user_pools (
  UserPoolTier,
  region
 )
-SELECT 
-'{{ UserPoolName }}',
- '{{ Policies }}',
- '{{ AccountRecoverySetting }}',
- '{{ AdminCreateUserConfig }}',
- '{{ AliasAttributes }}',
- '{{ UsernameAttributes }}',
- '{{ AutoVerifiedAttributes }}',
- '{{ DeviceConfiguration }}',
- '{{ EmailConfiguration }}',
- '{{ EmailVerificationMessage }}',
- '{{ EmailVerificationSubject }}',
- '{{ DeletionProtection }}',
- '{{ LambdaConfig }}',
- '{{ MfaConfiguration }}',
- '{{ EnabledMfas }}',
- '{{ SmsAuthenticationMessage }}',
- '{{ EmailAuthenticationMessage }}',
- '{{ EmailAuthenticationSubject }}',
- '{{ SmsConfiguration }}',
- '{{ SmsVerificationMessage }}',
- '{{ WebAuthnRelyingPartyID }}',
- '{{ WebAuthnUserVerification }}',
- '{{ Schema }}',
- '{{ UsernameConfiguration }}',
- '{{ UserAttributeUpdateSettings }}',
- '{{ UserPoolTags }}',
- '{{ VerificationMessageTemplate }}',
- '{{ UserPoolAddOns }}',
- '{{ UserPoolTier }}',
+SELECT
+'{{ user_pool_name }}',
+ '{{ policies }}',
+ '{{ account_recovery_setting }}',
+ '{{ admin_create_user_config }}',
+ '{{ alias_attributes }}',
+ '{{ username_attributes }}',
+ '{{ auto_verified_attributes }}',
+ '{{ device_configuration }}',
+ '{{ email_configuration }}',
+ '{{ email_verification_message }}',
+ '{{ email_verification_subject }}',
+ '{{ deletion_protection }}',
+ '{{ lambda_config }}',
+ '{{ mfa_configuration }}',
+ '{{ enabled_mfas }}',
+ '{{ sms_authentication_message }}',
+ '{{ email_authentication_message }}',
+ '{{ email_authentication_subject }}',
+ '{{ sms_configuration }}',
+ '{{ sms_verification_message }}',
+ '{{ web_authn_relying_party_id }}',
+ '{{ web_authn_user_verification }}',
+ '{{ schema }}',
+ '{{ username_configuration }}',
+ '{{ user_attribute_update_settings }}',
+ '{{ user_pool_tags }}',
+ '{{ verification_message_template }}',
+ '{{ user_pool_add_ons }}',
+ '{{ user_pool_tier }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -858,36 +858,36 @@ INSERT INTO awscc.cognito.user_pools (
  UserPoolTier,
  region
 )
-SELECT 
- '{{ UserPoolName }}',
- '{{ Policies }}',
- '{{ AccountRecoverySetting }}',
- '{{ AdminCreateUserConfig }}',
- '{{ AliasAttributes }}',
- '{{ UsernameAttributes }}',
- '{{ AutoVerifiedAttributes }}',
- '{{ DeviceConfiguration }}',
- '{{ EmailConfiguration }}',
- '{{ EmailVerificationMessage }}',
- '{{ EmailVerificationSubject }}',
- '{{ DeletionProtection }}',
- '{{ LambdaConfig }}',
- '{{ MfaConfiguration }}',
- '{{ EnabledMfas }}',
- '{{ SmsAuthenticationMessage }}',
- '{{ EmailAuthenticationMessage }}',
- '{{ EmailAuthenticationSubject }}',
- '{{ SmsConfiguration }}',
- '{{ SmsVerificationMessage }}',
- '{{ WebAuthnRelyingPartyID }}',
- '{{ WebAuthnUserVerification }}',
- '{{ Schema }}',
- '{{ UsernameConfiguration }}',
- '{{ UserAttributeUpdateSettings }}',
- '{{ UserPoolTags }}',
- '{{ VerificationMessageTemplate }}',
- '{{ UserPoolAddOns }}',
- '{{ UserPoolTier }}',
+SELECT
+ '{{ user_pool_name }}',
+ '{{ policies }}',
+ '{{ account_recovery_setting }}',
+ '{{ admin_create_user_config }}',
+ '{{ alias_attributes }}',
+ '{{ username_attributes }}',
+ '{{ auto_verified_attributes }}',
+ '{{ device_configuration }}',
+ '{{ email_configuration }}',
+ '{{ email_verification_message }}',
+ '{{ email_verification_subject }}',
+ '{{ deletion_protection }}',
+ '{{ lambda_config }}',
+ '{{ mfa_configuration }}',
+ '{{ enabled_mfas }}',
+ '{{ sms_authentication_message }}',
+ '{{ email_authentication_message }}',
+ '{{ email_authentication_subject }}',
+ '{{ sms_configuration }}',
+ '{{ sms_verification_message }}',
+ '{{ web_authn_relying_party_id }}',
+ '{{ web_authn_user_verification }}',
+ '{{ schema }}',
+ '{{ username_configuration }}',
+ '{{ user_attribute_update_settings }}',
+ '{{ user_pool_tags }}',
+ '{{ verification_message_template }}',
+ '{{ user_pool_add_ons }}',
+ '{{ user_pool_tier }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -905,142 +905,141 @@ globals:
 resources:
   - name: user_pool
     props:
-      - name: UserPoolName
-        value: '{{ UserPoolName }}'
-      - name: Policies
+      - name: user_pool_name
+        value: '{{ user_pool_name }}'
+      - name: policies
         value:
-          PasswordPolicy:
-            MinimumLength: '{{ MinimumLength }}'
-            RequireLowercase: '{{ RequireLowercase }}'
-            RequireNumbers: '{{ RequireNumbers }}'
-            RequireSymbols: '{{ RequireSymbols }}'
-            RequireUppercase: '{{ RequireUppercase }}'
-            TemporaryPasswordValidityDays: '{{ TemporaryPasswordValidityDays }}'
-            PasswordHistorySize: '{{ PasswordHistorySize }}'
-          SignInPolicy:
-            AllowedFirstAuthFactors:
-              - '{{ AllowedFirstAuthFactors[0] }}'
-      - name: AccountRecoverySetting
+          password_policy:
+            minimum_length: '{{ minimum_length }}'
+            require_lowercase: '{{ require_lowercase }}'
+            require_numbers: '{{ require_numbers }}'
+            require_symbols: '{{ require_symbols }}'
+            require_uppercase: '{{ require_uppercase }}'
+            temporary_password_validity_days: '{{ temporary_password_validity_days }}'
+            password_history_size: '{{ password_history_size }}'
+          sign_in_policy:
+            allowed_first_auth_factors:
+              - '{{ allowed_first_auth_factors[0] }}'
+      - name: account_recovery_setting
         value:
-          RecoveryMechanisms:
-            - Name: '{{ Name }}'
-              Priority: '{{ Priority }}'
-      - name: AdminCreateUserConfig
+          recovery_mechanisms:
+            - name: '{{ name }}'
+              priority: '{{ priority }}'
+      - name: admin_create_user_config
         value:
-          AllowAdminCreateUserOnly: '{{ AllowAdminCreateUserOnly }}'
-          InviteMessageTemplate:
-            EmailMessage: '{{ EmailMessage }}'
-            EmailSubject: '{{ EmailSubject }}'
-            SMSMessage: '{{ SMSMessage }}'
-          UnusedAccountValidityDays: '{{ UnusedAccountValidityDays }}'
-      - name: AliasAttributes
+          allow_admin_create_user_only: '{{ allow_admin_create_user_only }}'
+          invite_message_template:
+            email_message: '{{ email_message }}'
+            email_subject: '{{ email_subject }}'
+            s_ms_message: '{{ s_ms_message }}'
+          unused_account_validity_days: '{{ unused_account_validity_days }}'
+      - name: alias_attributes
         value:
-          - '{{ AliasAttributes[0] }}'
-      - name: UsernameAttributes
+          - '{{ alias_attributes[0] }}'
+      - name: username_attributes
         value:
-          - '{{ UsernameAttributes[0] }}'
-      - name: AutoVerifiedAttributes
+          - '{{ username_attributes[0] }}'
+      - name: auto_verified_attributes
         value:
-          - '{{ AutoVerifiedAttributes[0] }}'
-      - name: DeviceConfiguration
+          - '{{ auto_verified_attributes[0] }}'
+      - name: device_configuration
         value:
-          ChallengeRequiredOnNewDevice: '{{ ChallengeRequiredOnNewDevice }}'
-          DeviceOnlyRememberedOnUserPrompt: '{{ DeviceOnlyRememberedOnUserPrompt }}'
-      - name: EmailConfiguration
+          challenge_required_on_new_device: '{{ challenge_required_on_new_device }}'
+          device_only_remembered_on_user_prompt: '{{ device_only_remembered_on_user_prompt }}'
+      - name: email_configuration
         value:
-          ReplyToEmailAddress: '{{ ReplyToEmailAddress }}'
-          SourceArn: '{{ SourceArn }}'
-          From: '{{ From }}'
-          ConfigurationSet: '{{ ConfigurationSet }}'
-          EmailSendingAccount: '{{ EmailSendingAccount }}'
-      - name: EmailVerificationMessage
-        value: '{{ EmailVerificationMessage }}'
-      - name: EmailVerificationSubject
-        value: '{{ EmailVerificationSubject }}'
-      - name: DeletionProtection
-        value: '{{ DeletionProtection }}'
-      - name: LambdaConfig
+          reply_to_email_address: '{{ reply_to_email_address }}'
+          source_arn: '{{ source_arn }}'
+          from: '{{ from }}'
+          configuration_set: '{{ configuration_set }}'
+          email_sending_account: '{{ email_sending_account }}'
+      - name: email_verification_message
+        value: '{{ email_verification_message }}'
+      - name: email_verification_subject
+        value: '{{ email_verification_subject }}'
+      - name: deletion_protection
+        value: '{{ deletion_protection }}'
+      - name: lambda_config
         value:
-          CreateAuthChallenge: '{{ CreateAuthChallenge }}'
-          CustomMessage: '{{ CustomMessage }}'
-          DefineAuthChallenge: '{{ DefineAuthChallenge }}'
-          PostAuthentication: '{{ PostAuthentication }}'
-          PostConfirmation: '{{ PostConfirmation }}'
-          PreAuthentication: '{{ PreAuthentication }}'
-          PreSignUp: '{{ PreSignUp }}'
-          VerifyAuthChallengeResponse: '{{ VerifyAuthChallengeResponse }}'
-          UserMigration: '{{ UserMigration }}'
-          PreTokenGeneration: '{{ PreTokenGeneration }}'
-          CustomEmailSender:
-            LambdaVersion: '{{ LambdaVersion }}'
-            LambdaArn: '{{ LambdaArn }}'
-          CustomSMSSender:
-            LambdaVersion: '{{ LambdaVersion }}'
-            LambdaArn: '{{ LambdaArn }}'
-          KMSKeyID: '{{ KMSKeyID }}'
-          PreTokenGenerationConfig:
-            LambdaVersion: '{{ LambdaVersion }}'
-            LambdaArn: '{{ LambdaArn }}'
-      - name: MfaConfiguration
-        value: '{{ MfaConfiguration }}'
-      - name: EnabledMfas
+          create_auth_challenge: '{{ create_auth_challenge }}'
+          custom_message: '{{ custom_message }}'
+          define_auth_challenge: '{{ define_auth_challenge }}'
+          post_authentication: '{{ post_authentication }}'
+          post_confirmation: '{{ post_confirmation }}'
+          pre_authentication: '{{ pre_authentication }}'
+          pre_sign_up: '{{ pre_sign_up }}'
+          verify_auth_challenge_response: '{{ verify_auth_challenge_response }}'
+          user_migration: '{{ user_migration }}'
+          pre_token_generation: '{{ pre_token_generation }}'
+          custom_email_sender:
+            lambda_version: '{{ lambda_version }}'
+            lambda_arn: '{{ lambda_arn }}'
+          custom_sm_ssender:
+            lambda_version: '{{ lambda_version }}'
+            lambda_arn: '{{ lambda_arn }}'
+          kms_key_id: '{{ kms_key_id }}'
+          pre_token_generation_config:
+            lambda_version: '{{ lambda_version }}'
+            lambda_arn: '{{ lambda_arn }}'
+      - name: mfa_configuration
+        value: '{{ mfa_configuration }}'
+      - name: enabled_mfas
         value:
-          - '{{ EnabledMfas[0] }}'
-      - name: SmsAuthenticationMessage
-        value: '{{ SmsAuthenticationMessage }}'
-      - name: EmailAuthenticationMessage
-        value: '{{ EmailAuthenticationMessage }}'
-      - name: EmailAuthenticationSubject
-        value: '{{ EmailAuthenticationSubject }}'
-      - name: SmsConfiguration
+          - '{{ enabled_mfas[0] }}'
+      - name: sms_authentication_message
+        value: '{{ sms_authentication_message }}'
+      - name: email_authentication_message
+        value: '{{ email_authentication_message }}'
+      - name: email_authentication_subject
+        value: '{{ email_authentication_subject }}'
+      - name: sms_configuration
         value:
-          ExternalId: '{{ ExternalId }}'
-          SnsCallerArn: '{{ SnsCallerArn }}'
-          SnsRegion: '{{ SnsRegion }}'
-      - name: SmsVerificationMessage
-        value: '{{ SmsVerificationMessage }}'
-      - name: WebAuthnRelyingPartyID
-        value: '{{ WebAuthnRelyingPartyID }}'
-      - name: WebAuthnUserVerification
-        value: '{{ WebAuthnUserVerification }}'
-      - name: Schema
+          external_id: '{{ external_id }}'
+          sns_caller_arn: '{{ sns_caller_arn }}'
+          sns_region: '{{ sns_region }}'
+      - name: sms_verification_message
+        value: '{{ sms_verification_message }}'
+      - name: web_authn_relying_party_id
+        value: '{{ web_authn_relying_party_id }}'
+      - name: web_authn_user_verification
+        value: '{{ web_authn_user_verification }}'
+      - name: schema
         value:
-          - AttributeDataType: '{{ AttributeDataType }}'
-            DeveloperOnlyAttribute: '{{ DeveloperOnlyAttribute }}'
-            Mutable: '{{ Mutable }}'
-            Name: '{{ Name }}'
-            NumberAttributeConstraints:
-              MaxValue: '{{ MaxValue }}'
-              MinValue: '{{ MinValue }}'
-            StringAttributeConstraints:
-              MaxLength: '{{ MaxLength }}'
-              MinLength: '{{ MinLength }}'
-            Required: '{{ Required }}'
-      - name: UsernameConfiguration
+          - attribute_data_type: '{{ attribute_data_type }}'
+            developer_only_attribute: '{{ developer_only_attribute }}'
+            mutable: '{{ mutable }}'
+            name: '{{ name }}'
+            number_attribute_constraints:
+              max_value: '{{ max_value }}'
+              min_value: '{{ min_value }}'
+            string_attribute_constraints:
+              max_length: '{{ max_length }}'
+              min_length: '{{ min_length }}'
+            required: '{{ required }}'
+      - name: username_configuration
         value:
-          CaseSensitive: '{{ CaseSensitive }}'
-      - name: UserAttributeUpdateSettings
+          case_sensitive: '{{ case_sensitive }}'
+      - name: user_attribute_update_settings
         value:
-          AttributesRequireVerificationBeforeUpdate:
-            - '{{ AttributesRequireVerificationBeforeUpdate[0] }}'
-      - name: UserPoolTags
+          attributes_require_verification_before_update:
+            - '{{ attributes_require_verification_before_update[0] }}'
+      - name: user_pool_tags
         value: {}
-      - name: VerificationMessageTemplate
+      - name: verification_message_template
         value:
-          DefaultEmailOption: '{{ DefaultEmailOption }}'
-          EmailMessage: '{{ EmailMessage }}'
-          EmailMessageByLink: '{{ EmailMessageByLink }}'
-          EmailSubject: '{{ EmailSubject }}'
-          EmailSubjectByLink: '{{ EmailSubjectByLink }}'
-          SmsMessage: '{{ SmsMessage }}'
-      - name: UserPoolAddOns
+          default_email_option: '{{ default_email_option }}'
+          email_message: '{{ email_message }}'
+          email_message_by_link: '{{ email_message_by_link }}'
+          email_subject: '{{ email_subject }}'
+          email_subject_by_link: '{{ email_subject_by_link }}'
+          sms_message: '{{ sms_message }}'
+      - name: user_pool_add_ons
         value:
-          AdvancedSecurityMode: '{{ AdvancedSecurityMode }}'
-          AdvancedSecurityAdditionalFlows:
-            CustomAuthMode: '{{ CustomAuthMode }}'
-      - name: UserPoolTier
-        value: '{{ UserPoolTier }}'
-
+          advanced_security_mode: '{{ advanced_security_mode }}'
+          advanced_security_additional_flows:
+            custom_auth_mode: '{{ custom_auth_mode }}'
+      - name: user_pool_tier
+        value: '{{ user_pool_tier }}'
 ```
 </TabItem>
 </Tabs>
@@ -1084,7 +1083,7 @@ SET PatchDocument = string('{{ {
     "UserPoolTier": user_pool_tier
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<UserPoolId>';
+AND Identifier = '{{ user_pool_id }}';
 ```
 
 
@@ -1093,7 +1092,7 @@ AND Identifier = '<UserPoolId>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.cognito.user_pools
-WHERE Identifier = '<UserPoolId>'
+WHERE Identifier = '{{ user_pool_id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/cognito/user_poolui_customization_attachments/index.md b/website/docs/services/cognito/user_poolui_customization_attachments/index.md
index 3ebc67a74..a9c73672c 100644
--- a/website/docs/services/cognito/user_poolui_customization_attachments/index.md
+++ b/website/docs/services/cognito/user_poolui_customization_attachments/index.md
@@ -100,7 +100,7 @@ user_pool_id,
 client_id,
 c_ss
 FROM awscc.cognito.user_poolui_customization_attachments
-WHERE region = 'us-east-1' AND Identifier = '<UserPoolId>|<ClientId>';
+WHERE region = 'us-east-1' AND Identifier = '{{ user_pool_id }}|{{ client_id }}';
 ```
 
 ## `INSERT` example
@@ -124,9 +124,9 @@ INSERT INTO awscc.cognito.user_poolui_customization_attachments (
  ClientId,
  region
 )
-SELECT 
-'{{ UserPoolId }}',
- '{{ ClientId }}',
+SELECT
+'{{ user_pool_id }}',
+ '{{ client_id }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -140,10 +140,10 @@ INSERT INTO awscc.cognito.user_poolui_customization_attachments (
  CSS,
  region
 )
-SELECT 
- '{{ UserPoolId }}',
- '{{ ClientId }}',
- '{{ CSS }}',
+SELECT
+ '{{ user_pool_id }}',
+ '{{ client_id }}',
+ '{{ c_ss }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -161,13 +161,12 @@ globals:
 resources:
   - name: user_poolui_customization_attachment
     props:
-      - name: UserPoolId
-        value: '{{ UserPoolId }}'
-      - name: ClientId
-        value: '{{ ClientId }}'
-      - name: CSS
-        value: '{{ CSS }}'
-
+      - name: user_pool_id
+        value: '{{ user_pool_id }}'
+      - name: client_id
+        value: '{{ client_id }}'
+      - name: c_ss
+        value: '{{ c_ss }}'
 ```
 </TabItem>
 </Tabs>
@@ -183,7 +182,7 @@ SET PatchDocument = string('{{ {
     "CSS": c_ss
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<UserPoolId>|<ClientId>';
+AND Identifier = '{{ user_pool_id }}|{{ client_id }}';
 ```
 
 
@@ -192,7 +191,7 @@ AND Identifier = '<UserPoolId>|<ClientId>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.cognito.user_poolui_customization_attachments
-WHERE Identifier = '<UserPoolId|ClientId>'
+WHERE Identifier = '{{ user_pool_id }}|{{ client_id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/comprehend/document_classifiers/index.md b/website/docs/services/comprehend/document_classifiers/index.md
index 1d0743a66..0b1c84422 100644
--- a/website/docs/services/comprehend/document_classifiers/index.md
+++ b/website/docs/services/comprehend/document_classifiers/index.md
@@ -315,7 +315,7 @@ volume_kms_key_id,
 vpc_config,
 arn
 FROM awscc.comprehend.document_classifiers
-WHERE region = 'us-east-1' AND Identifier = '<Arn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -354,11 +354,11 @@ INSERT INTO awscc.comprehend.document_classifiers (
  DocumentClassifierName,
  region
 )
-SELECT 
-'{{ DataAccessRoleArn }}',
- '{{ InputDataConfig }}',
- '{{ LanguageCode }}',
- '{{ DocumentClassifierName }}',
+SELECT
+'{{ data_access_role_arn }}',
+ '{{ input_data_config }}',
+ '{{ language_code }}',
+ '{{ document_classifier_name }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -381,19 +381,19 @@ INSERT INTO awscc.comprehend.document_classifiers (
  VpcConfig,
  region
 )
-SELECT 
- '{{ DataAccessRoleArn }}',
- '{{ InputDataConfig }}',
- '{{ OutputDataConfig }}',
- '{{ LanguageCode }}',
- '{{ ModelKmsKeyId }}',
- '{{ ModelPolicy }}',
- '{{ DocumentClassifierName }}',
- '{{ Mode }}',
- '{{ Tags }}',
- '{{ VersionName }}',
- '{{ VolumeKmsKeyId }}',
- '{{ VpcConfig }}',
+SELECT
+ '{{ data_access_role_arn }}',
+ '{{ input_data_config }}',
+ '{{ output_data_config }}',
+ '{{ language_code }}',
+ '{{ model_kms_key_id }}',
+ '{{ model_policy }}',
+ '{{ document_classifier_name }}',
+ '{{ mode }}',
+ '{{ tags }}',
+ '{{ version_name }}',
+ '{{ volume_kms_key_id }}',
+ '{{ vpc_config }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -411,57 +411,56 @@ globals:
 resources:
   - name: document_classifier
     props:
-      - name: DataAccessRoleArn
-        value: '{{ DataAccessRoleArn }}'
-      - name: InputDataConfig
+      - name: data_access_role_arn
+        value: '{{ data_access_role_arn }}'
+      - name: input_data_config
         value:
-          AugmentedManifests:
-            - AttributeNames:
-                - '{{ AttributeNames[0] }}'
-              S3Uri: '{{ S3Uri }}'
-              Split: '{{ Split }}'
-          DataFormat: '{{ DataFormat }}'
-          LabelDelimiter: '{{ LabelDelimiter }}'
-          DocumentType: '{{ DocumentType }}'
-          Documents:
-            S3Uri: null
-            TestS3Uri: null
-          DocumentReaderConfig:
-            DocumentReadAction: '{{ DocumentReadAction }}'
-            DocumentReadMode: '{{ DocumentReadMode }}'
-            FeatureTypes:
-              - '{{ FeatureTypes[0] }}'
-          S3Uri: null
-          TestS3Uri: null
-      - name: OutputDataConfig
+          augmented_manifests:
+            - attribute_names:
+                - '{{ attribute_names[0] }}'
+              s3_uri: '{{ s3_uri }}'
+              split: '{{ split }}'
+          data_format: '{{ data_format }}'
+          label_delimiter: '{{ label_delimiter }}'
+          document_type: '{{ document_type }}'
+          documents:
+            s3_uri: null
+            test_s3_uri: null
+          document_reader_config:
+            document_read_action: '{{ document_read_action }}'
+            document_read_mode: '{{ document_read_mode }}'
+            feature_types:
+              - '{{ feature_types[0] }}'
+          s3_uri: null
+          test_s3_uri: null
+      - name: output_data_config
         value:
-          KmsKeyId: '{{ KmsKeyId }}'
-          S3Uri: null
-      - name: LanguageCode
-        value: '{{ LanguageCode }}'
-      - name: ModelKmsKeyId
+          kms_key_id: '{{ kms_key_id }}'
+          s3_uri: null
+      - name: language_code
+        value: '{{ language_code }}'
+      - name: model_kms_key_id
         value: null
-      - name: ModelPolicy
-        value: '{{ ModelPolicy }}'
-      - name: DocumentClassifierName
-        value: '{{ DocumentClassifierName }}'
-      - name: Mode
-        value: '{{ Mode }}'
-      - name: Tags
+      - name: model_policy
+        value: '{{ model_policy }}'
+      - name: document_classifier_name
+        value: '{{ document_classifier_name }}'
+      - name: mode
+        value: '{{ mode }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-      - name: VersionName
-        value: '{{ VersionName }}'
-      - name: VolumeKmsKeyId
+          - key: '{{ key }}'
+            value: '{{ value }}'
+      - name: version_name
+        value: '{{ version_name }}'
+      - name: volume_kms_key_id
         value: null
-      - name: VpcConfig
+      - name: vpc_config
         value:
-          SecurityGroupIds:
-            - '{{ SecurityGroupIds[0] }}'
-          Subnets:
-            - '{{ Subnets[0] }}'
-
+          security_group_ids:
+            - '{{ security_group_ids[0] }}'
+          subnets:
+            - '{{ subnets[0] }}'
 ```
 </TabItem>
 </Tabs>
@@ -478,7 +477,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Arn>';
+AND Identifier = '{{ arn }}';
 ```
 
 
@@ -487,7 +486,7 @@ AND Identifier = '<Arn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.comprehend.document_classifiers
-WHERE Identifier = '<Arn>'
+WHERE Identifier = '{{ arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/comprehend/flywheels/index.md b/website/docs/services/comprehend/flywheels/index.md
index 9db56f446..f2e8a4470 100644
--- a/website/docs/services/comprehend/flywheels/index.md
+++ b/website/docs/services/comprehend/flywheels/index.md
@@ -261,7 +261,7 @@ tags,
 task_config,
 arn
 FROM awscc.comprehend.flywheels
-WHERE region = 'us-east-1' AND Identifier = '<Arn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -299,10 +299,10 @@ INSERT INTO awscc.comprehend.flywheels (
  FlywheelName,
  region
 )
-SELECT 
-'{{ DataAccessRoleArn }}',
- '{{ DataLakeS3Uri }}',
- '{{ FlywheelName }}',
+SELECT
+'{{ data_access_role_arn }}',
+ '{{ data_lake_s3_uri }}',
+ '{{ flywheel_name }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -321,15 +321,15 @@ INSERT INTO awscc.comprehend.flywheels (
  TaskConfig,
  region
 )
-SELECT 
- '{{ ActiveModelArn }}',
- '{{ DataAccessRoleArn }}',
- '{{ DataLakeS3Uri }}',
- '{{ DataSecurityConfig }}',
- '{{ FlywheelName }}',
- '{{ ModelType }}',
- '{{ Tags }}',
- '{{ TaskConfig }}',
+SELECT
+ '{{ active_model_arn }}',
+ '{{ data_access_role_arn }}',
+ '{{ data_lake_s3_uri }}',
+ '{{ data_security_config }}',
+ '{{ flywheel_name }}',
+ '{{ model_type }}',
+ '{{ tags }}',
+ '{{ task_config }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -347,41 +347,40 @@ globals:
 resources:
   - name: flywheel
     props:
-      - name: ActiveModelArn
-        value: '{{ ActiveModelArn }}'
-      - name: DataAccessRoleArn
-        value: '{{ DataAccessRoleArn }}'
-      - name: DataLakeS3Uri
-        value: '{{ DataLakeS3Uri }}'
-      - name: DataSecurityConfig
+      - name: active_model_arn
+        value: '{{ active_model_arn }}'
+      - name: data_access_role_arn
+        value: '{{ data_access_role_arn }}'
+      - name: data_lake_s3_uri
+        value: '{{ data_lake_s3_uri }}'
+      - name: data_security_config
         value:
-          ModelKmsKeyId: '{{ ModelKmsKeyId }}'
-          VolumeKmsKeyId: null
-          DataLakeKmsKeyId: null
-          VpcConfig:
-            SecurityGroupIds:
-              - '{{ SecurityGroupIds[0] }}'
-            Subnets:
-              - '{{ Subnets[0] }}'
-      - name: FlywheelName
-        value: '{{ FlywheelName }}'
-      - name: ModelType
-        value: '{{ ModelType }}'
-      - name: Tags
+          model_kms_key_id: '{{ model_kms_key_id }}'
+          volume_kms_key_id: null
+          data_lake_kms_key_id: null
+          vpc_config:
+            security_group_ids:
+              - '{{ security_group_ids[0] }}'
+            subnets:
+              - '{{ subnets[0] }}'
+      - name: flywheel_name
+        value: '{{ flywheel_name }}'
+      - name: model_type
+        value: '{{ model_type }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-      - name: TaskConfig
+          - key: '{{ key }}'
+            value: '{{ value }}'
+      - name: task_config
         value:
-          LanguageCode: '{{ LanguageCode }}'
-          DocumentClassificationConfig:
-            Mode: '{{ Mode }}'
-            Labels:
-              - '{{ Labels[0] }}'
-          EntityRecognitionConfig:
-            EntityTypes:
-              - Type: '{{ Type }}'
-
+          language_code: '{{ language_code }}'
+          document_classification_config:
+            mode: '{{ mode }}'
+            labels:
+              - '{{ labels[0] }}'
+          entity_recognition_config:
+            entity_types:
+              - type: '{{ type }}'
 ```
 </TabItem>
 </Tabs>
@@ -400,7 +399,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Arn>';
+AND Identifier = '{{ arn }}';
 ```
 
 
@@ -409,7 +408,7 @@ AND Identifier = '<Arn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.comprehend.flywheels
-WHERE Identifier = '<Arn>'
+WHERE Identifier = '{{ arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/config/aggregation_authorizations/index.md b/website/docs/services/config/aggregation_authorizations/index.md
index 4968c383b..854f1030f 100644
--- a/website/docs/services/config/aggregation_authorizations/index.md
+++ b/website/docs/services/config/aggregation_authorizations/index.md
@@ -169,7 +169,7 @@ authorized_aws_region,
 aggregation_authorization_arn,
 tags
 FROM awscc.config.aggregation_authorizations
-WHERE region = 'us-east-1' AND Identifier = '<AuthorizedAccountId>|<AuthorizedAwsRegion>';
+WHERE region = 'us-east-1' AND Identifier = '{{ authorized_account_id }}|{{ authorized_aws_region }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -207,9 +207,9 @@ INSERT INTO awscc.config.aggregation_authorizations (
  AuthorizedAwsRegion,
  region
 )
-SELECT 
-'{{ AuthorizedAccountId }}',
- '{{ AuthorizedAwsRegion }}',
+SELECT
+'{{ authorized_account_id }}',
+ '{{ authorized_aws_region }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -223,10 +223,10 @@ INSERT INTO awscc.config.aggregation_authorizations (
  Tags,
  region
 )
-SELECT 
- '{{ AuthorizedAccountId }}',
- '{{ AuthorizedAwsRegion }}',
- '{{ Tags }}',
+SELECT
+ '{{ authorized_account_id }}',
+ '{{ authorized_aws_region }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -244,15 +244,14 @@ globals:
 resources:
   - name: aggregation_authorization
     props:
-      - name: AuthorizedAccountId
-        value: '{{ AuthorizedAccountId }}'
-      - name: AuthorizedAwsRegion
-        value: '{{ AuthorizedAwsRegion }}'
-      - name: Tags
+      - name: authorized_account_id
+        value: '{{ authorized_account_id }}'
+      - name: authorized_aws_region
+        value: '{{ authorized_aws_region }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -268,7 +267,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<AuthorizedAccountId>|<AuthorizedAwsRegion>';
+AND Identifier = '{{ authorized_account_id }}|{{ authorized_aws_region }}';
 ```
 
 
@@ -277,7 +276,7 @@ AND Identifier = '<AuthorizedAccountId>|<AuthorizedAwsRegion>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.config.aggregation_authorizations
-WHERE Identifier = '<AuthorizedAccountId|AuthorizedAwsRegion>'
+WHERE Identifier = '{{ authorized_account_id }}|{{ authorized_aws_region }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/config/config_rules/index.md b/website/docs/services/config/config_rules/index.md
index 3d30ef011..db00bcd04 100644
--- a/website/docs/services/config/config_rules/index.md
+++ b/website/docs/services/config/config_rules/index.md
@@ -280,7 +280,7 @@ source,
 input_parameters,
 evaluation_modes
 FROM awscc.config.config_rules
-WHERE region = 'us-east-1' AND Identifier = '<ConfigRuleName>';
+WHERE region = 'us-east-1' AND Identifier = '{{ config_rule_name }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -316,8 +316,8 @@ INSERT INTO awscc.config.config_rules (
  Source,
  region
 )
-SELECT 
-'{{ Source }}',
+SELECT
+'{{ source }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -336,15 +336,15 @@ INSERT INTO awscc.config.config_rules (
  EvaluationModes,
  region
 )
-SELECT 
- '{{ Description }}',
- '{{ Scope }}',
- '{{ ConfigRuleName }}',
- '{{ Compliance }}',
- '{{ MaximumExecutionFrequency }}',
- '{{ Source }}',
- '{{ InputParameters }}',
- '{{ EvaluationModes }}',
+SELECT
+ '{{ description }}',
+ '{{ scope }}',
+ '{{ config_rule_name }}',
+ '{{ compliance }}',
+ '{{ maximum_execution_frequency }}',
+ '{{ source }}',
+ '{{ input_parameters }}',
+ '{{ evaluation_modes }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -362,40 +362,39 @@ globals:
 resources:
   - name: config_rule
     props:
-      - name: Description
-        value: '{{ Description }}'
-      - name: Scope
+      - name: description
+        value: '{{ description }}'
+      - name: scope
         value:
-          TagKey: '{{ TagKey }}'
-          ComplianceResourceTypes:
-            - '{{ ComplianceResourceTypes[0] }}'
-          TagValue: '{{ TagValue }}'
-          ComplianceResourceId: '{{ ComplianceResourceId }}'
-      - name: ConfigRuleName
-        value: '{{ ConfigRuleName }}'
-      - name: Compliance
+          tag_key: '{{ tag_key }}'
+          compliance_resource_types:
+            - '{{ compliance_resource_types[0] }}'
+          tag_value: '{{ tag_value }}'
+          compliance_resource_id: '{{ compliance_resource_id }}'
+      - name: config_rule_name
+        value: '{{ config_rule_name }}'
+      - name: compliance
         value:
-          Type: '{{ Type }}'
-      - name: MaximumExecutionFrequency
-        value: '{{ MaximumExecutionFrequency }}'
-      - name: Source
+          type: '{{ type }}'
+      - name: maximum_execution_frequency
+        value: '{{ maximum_execution_frequency }}'
+      - name: source
         value:
-          CustomPolicyDetails:
-            EnableDebugLogDelivery: '{{ EnableDebugLogDelivery }}'
-            PolicyText: '{{ PolicyText }}'
-            PolicyRuntime: '{{ PolicyRuntime }}'
-          SourceIdentifier: '{{ SourceIdentifier }}'
-          Owner: '{{ Owner }}'
-          SourceDetails:
-            - EventSource: '{{ EventSource }}'
-              MaximumExecutionFrequency: '{{ MaximumExecutionFrequency }}'
-              MessageType: '{{ MessageType }}'
-      - name: InputParameters
+          custom_policy_details:
+            enable_debug_log_delivery: '{{ enable_debug_log_delivery }}'
+            policy_text: '{{ policy_text }}'
+            policy_runtime: '{{ policy_runtime }}'
+          source_identifier: '{{ source_identifier }}'
+          owner: '{{ owner }}'
+          source_details:
+            - event_source: '{{ event_source }}'
+              maximum_execution_frequency: '{{ maximum_execution_frequency }}'
+              message_type: '{{ message_type }}'
+      - name: input_parameters
         value: {}
-      - name: EvaluationModes
+      - name: evaluation_modes
         value:
-          - Mode: '{{ Mode }}'
-
+          - mode: '{{ mode }}'
 ```
 </TabItem>
 </Tabs>
@@ -416,7 +415,7 @@ SET PatchDocument = string('{{ {
     "EvaluationModes": evaluation_modes
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<ConfigRuleName>';
+AND Identifier = '{{ config_rule_name }}';
 ```
 
 
@@ -425,7 +424,7 @@ AND Identifier = '<ConfigRuleName>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.config.config_rules
-WHERE Identifier = '<ConfigRuleName>'
+WHERE Identifier = '{{ config_rule_name }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/config/configuration_aggregators/index.md b/website/docs/services/config/configuration_aggregators/index.md
index cc43d21f2..d1414374d 100644
--- a/website/docs/services/config/configuration_aggregators/index.md
+++ b/website/docs/services/config/configuration_aggregators/index.md
@@ -204,7 +204,7 @@ configuration_aggregator_arn,
 organization_aggregation_source,
 tags
 FROM awscc.config.configuration_aggregators
-WHERE region = 'us-east-1' AND Identifier = '<ConfigurationAggregatorName>';
+WHERE region = 'us-east-1' AND Identifier = '{{ configuration_aggregator_name }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -243,11 +243,11 @@ INSERT INTO awscc.config.configuration_aggregators (
  Tags,
  region
 )
-SELECT 
-'{{ AccountAggregationSources }}',
- '{{ ConfigurationAggregatorName }}',
- '{{ OrganizationAggregationSource }}',
- '{{ Tags }}',
+SELECT
+'{{ account_aggregation_sources }}',
+ '{{ configuration_aggregator_name }}',
+ '{{ organization_aggregation_source }}',
+ '{{ tags }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -262,11 +262,11 @@ INSERT INTO awscc.config.configuration_aggregators (
  Tags,
  region
 )
-SELECT 
- '{{ AccountAggregationSources }}',
- '{{ ConfigurationAggregatorName }}',
- '{{ OrganizationAggregationSource }}',
- '{{ Tags }}',
+SELECT
+ '{{ account_aggregation_sources }}',
+ '{{ configuration_aggregator_name }}',
+ '{{ organization_aggregation_source }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -284,26 +284,25 @@ globals:
 resources:
   - name: configuration_aggregator
     props:
-      - name: AccountAggregationSources
+      - name: account_aggregation_sources
         value:
-          - AllAwsRegions: '{{ AllAwsRegions }}'
-            AwsRegions:
-              - '{{ AwsRegions[0] }}'
-            AccountIds:
-              - '{{ AccountIds[0] }}'
-      - name: ConfigurationAggregatorName
-        value: '{{ ConfigurationAggregatorName }}'
-      - name: OrganizationAggregationSource
+          - all_aws_regions: '{{ all_aws_regions }}'
+            aws_regions:
+              - '{{ aws_regions[0] }}'
+            account_ids:
+              - '{{ account_ids[0] }}'
+      - name: configuration_aggregator_name
+        value: '{{ configuration_aggregator_name }}'
+      - name: organization_aggregation_source
         value:
-          AllAwsRegions: '{{ AllAwsRegions }}'
-          AwsRegions:
-            - '{{ AwsRegions[0] }}'
-          RoleArn: '{{ RoleArn }}'
-      - name: Tags
+          all_aws_regions: '{{ all_aws_regions }}'
+          aws_regions:
+            - '{{ aws_regions[0] }}'
+          role_arn: '{{ role_arn }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -321,7 +320,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<ConfigurationAggregatorName>';
+AND Identifier = '{{ configuration_aggregator_name }}';
 ```
 
 
@@ -330,7 +329,7 @@ AND Identifier = '<ConfigurationAggregatorName>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.config.configuration_aggregators
-WHERE Identifier = '<ConfigurationAggregatorName>'
+WHERE Identifier = '{{ configuration_aggregator_name }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/config/conformance_packs/index.md b/website/docs/services/config/conformance_packs/index.md
index b54d2a569..1d4429c69 100644
--- a/website/docs/services/config/conformance_packs/index.md
+++ b/website/docs/services/config/conformance_packs/index.md
@@ -194,7 +194,7 @@ template_s3_uri,
 template_ssm_document_details,
 conformance_pack_input_parameters
 FROM awscc.config.conformance_packs
-WHERE region = 'us-east-1' AND Identifier = '<ConformancePackName>';
+WHERE region = 'us-east-1' AND Identifier = '{{ conformance_pack_name }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -230,8 +230,8 @@ INSERT INTO awscc.config.conformance_packs (
  ConformancePackName,
  region
 )
-SELECT 
-'{{ ConformancePackName }}',
+SELECT
+'{{ conformance_pack_name }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -249,14 +249,14 @@ INSERT INTO awscc.config.conformance_packs (
  ConformancePackInputParameters,
  region
 )
-SELECT 
- '{{ ConformancePackName }}',
- '{{ DeliveryS3Bucket }}',
- '{{ DeliveryS3KeyPrefix }}',
- '{{ TemplateBody }}',
- '{{ TemplateS3Uri }}',
- '{{ TemplateSSMDocumentDetails }}',
- '{{ ConformancePackInputParameters }}',
+SELECT
+ '{{ conformance_pack_name }}',
+ '{{ delivery_s3_bucket }}',
+ '{{ delivery_s3_key_prefix }}',
+ '{{ template_body }}',
+ '{{ template_s3_uri }}',
+ '{{ template_ssm_document_details }}',
+ '{{ conformance_pack_input_parameters }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -274,25 +274,24 @@ globals:
 resources:
   - name: conformance_pack
     props:
-      - name: ConformancePackName
-        value: '{{ ConformancePackName }}'
-      - name: DeliveryS3Bucket
-        value: '{{ DeliveryS3Bucket }}'
-      - name: DeliveryS3KeyPrefix
-        value: '{{ DeliveryS3KeyPrefix }}'
-      - name: TemplateBody
-        value: '{{ TemplateBody }}'
-      - name: TemplateS3Uri
-        value: '{{ TemplateS3Uri }}'
-      - name: TemplateSSMDocumentDetails
+      - name: conformance_pack_name
+        value: '{{ conformance_pack_name }}'
+      - name: delivery_s3_bucket
+        value: '{{ delivery_s3_bucket }}'
+      - name: delivery_s3_key_prefix
+        value: '{{ delivery_s3_key_prefix }}'
+      - name: template_body
+        value: '{{ template_body }}'
+      - name: template_s3_uri
+        value: '{{ template_s3_uri }}'
+      - name: template_ssm_document_details
         value:
-          DocumentName: '{{ DocumentName }}'
-          DocumentVersion: '{{ DocumentVersion }}'
-      - name: ConformancePackInputParameters
+          document_name: '{{ document_name }}'
+          document_version: '{{ document_version }}'
+      - name: conformance_pack_input_parameters
         value:
-          - ParameterName: '{{ ParameterName }}'
-            ParameterValue: '{{ ParameterValue }}'
-
+          - parameter_name: '{{ parameter_name }}'
+            parameter_value: '{{ parameter_value }}'
 ```
 </TabItem>
 </Tabs>
@@ -313,7 +312,7 @@ SET PatchDocument = string('{{ {
     "ConformancePackInputParameters": conformance_pack_input_parameters
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<ConformancePackName>';
+AND Identifier = '{{ conformance_pack_name }}';
 ```
 
 
@@ -322,7 +321,7 @@ AND Identifier = '<ConformancePackName>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.config.conformance_packs
-WHERE Identifier = '<ConformancePackName>'
+WHERE Identifier = '{{ conformance_pack_name }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/config/organization_conformance_packs/index.md b/website/docs/services/config/organization_conformance_packs/index.md
index 8235311a7..85a618c3c 100644
--- a/website/docs/services/config/organization_conformance_packs/index.md
+++ b/website/docs/services/config/organization_conformance_packs/index.md
@@ -182,7 +182,7 @@ delivery_s3_key_prefix,
 conformance_pack_input_parameters,
 excluded_accounts
 FROM awscc.config.organization_conformance_packs
-WHERE region = 'us-east-1' AND Identifier = '<OrganizationConformancePackName>';
+WHERE region = 'us-east-1' AND Identifier = '{{ organization_conformance_pack_name }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -218,8 +218,8 @@ INSERT INTO awscc.config.organization_conformance_packs (
  OrganizationConformancePackName,
  region
 )
-SELECT 
-'{{ OrganizationConformancePackName }}',
+SELECT
+'{{ organization_conformance_pack_name }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -237,14 +237,14 @@ INSERT INTO awscc.config.organization_conformance_packs (
  ExcludedAccounts,
  region
 )
-SELECT 
- '{{ OrganizationConformancePackName }}',
- '{{ TemplateS3Uri }}',
- '{{ TemplateBody }}',
- '{{ DeliveryS3Bucket }}',
- '{{ DeliveryS3KeyPrefix }}',
- '{{ ConformancePackInputParameters }}',
- '{{ ExcludedAccounts }}',
+SELECT
+ '{{ organization_conformance_pack_name }}',
+ '{{ template_s3_uri }}',
+ '{{ template_body }}',
+ '{{ delivery_s3_bucket }}',
+ '{{ delivery_s3_key_prefix }}',
+ '{{ conformance_pack_input_parameters }}',
+ '{{ excluded_accounts }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -262,24 +262,23 @@ globals:
 resources:
   - name: organization_conformance_pack
     props:
-      - name: OrganizationConformancePackName
-        value: '{{ OrganizationConformancePackName }}'
-      - name: TemplateS3Uri
-        value: '{{ TemplateS3Uri }}'
-      - name: TemplateBody
-        value: '{{ TemplateBody }}'
-      - name: DeliveryS3Bucket
-        value: '{{ DeliveryS3Bucket }}'
-      - name: DeliveryS3KeyPrefix
-        value: '{{ DeliveryS3KeyPrefix }}'
-      - name: ConformancePackInputParameters
+      - name: organization_conformance_pack_name
+        value: '{{ organization_conformance_pack_name }}'
+      - name: template_s3_uri
+        value: '{{ template_s3_uri }}'
+      - name: template_body
+        value: '{{ template_body }}'
+      - name: delivery_s3_bucket
+        value: '{{ delivery_s3_bucket }}'
+      - name: delivery_s3_key_prefix
+        value: '{{ delivery_s3_key_prefix }}'
+      - name: conformance_pack_input_parameters
         value:
-          - ParameterName: '{{ ParameterName }}'
-            ParameterValue: '{{ ParameterValue }}'
-      - name: ExcludedAccounts
+          - parameter_name: '{{ parameter_name }}'
+            parameter_value: '{{ parameter_value }}'
+      - name: excluded_accounts
         value:
-          - '{{ ExcludedAccounts[0] }}'
-
+          - '{{ excluded_accounts[0] }}'
 ```
 </TabItem>
 </Tabs>
@@ -300,7 +299,7 @@ SET PatchDocument = string('{{ {
     "ExcludedAccounts": excluded_accounts
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<OrganizationConformancePackName>';
+AND Identifier = '{{ organization_conformance_pack_name }}';
 ```
 
 
@@ -309,7 +308,7 @@ AND Identifier = '<OrganizationConformancePackName>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.config.organization_conformance_packs
-WHERE Identifier = '<OrganizationConformancePackName>'
+WHERE Identifier = '{{ organization_conformance_pack_name }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/config/stored_queries/index.md b/website/docs/services/config/stored_queries/index.md
index 94c55c5e1..006771cdf 100644
--- a/website/docs/services/config/stored_queries/index.md
+++ b/website/docs/services/config/stored_queries/index.md
@@ -176,7 +176,7 @@ query_description,
 query_expression,
 tags
 FROM awscc.config.stored_queries
-WHERE region = 'us-east-1' AND Identifier = '<QueryName>';
+WHERE region = 'us-east-1' AND Identifier = '{{ query_name }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -213,9 +213,9 @@ INSERT INTO awscc.config.stored_queries (
  QueryExpression,
  region
 )
-SELECT 
-'{{ QueryName }}',
- '{{ QueryExpression }}',
+SELECT
+'{{ query_name }}',
+ '{{ query_expression }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -230,11 +230,11 @@ INSERT INTO awscc.config.stored_queries (
  Tags,
  region
 )
-SELECT 
- '{{ QueryName }}',
- '{{ QueryDescription }}',
- '{{ QueryExpression }}',
- '{{ Tags }}',
+SELECT
+ '{{ query_name }}',
+ '{{ query_description }}',
+ '{{ query_expression }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -252,17 +252,16 @@ globals:
 resources:
   - name: stored_query
     props:
-      - name: QueryName
-        value: '{{ QueryName }}'
-      - name: QueryDescription
-        value: '{{ QueryDescription }}'
-      - name: QueryExpression
-        value: '{{ QueryExpression }}'
-      - name: Tags
+      - name: query_name
+        value: '{{ query_name }}'
+      - name: query_description
+        value: '{{ query_description }}'
+      - name: query_expression
+        value: '{{ query_expression }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -280,7 +279,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<QueryName>';
+AND Identifier = '{{ query_name }}';
 ```
 
 
@@ -289,7 +288,7 @@ AND Identifier = '<QueryName>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.config.stored_queries
-WHERE Identifier = '<QueryName>'
+WHERE Identifier = '{{ query_name }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/connect/agent_statuses/index.md b/website/docs/services/connect/agent_statuses/index.md
index fc71c84be..ef2c3e13b 100644
--- a/website/docs/services/connect/agent_statuses/index.md
+++ b/website/docs/services/connect/agent_statuses/index.md
@@ -200,7 +200,7 @@ tags,
 last_modified_region,
 last_modified_time
 FROM awscc.connect.agent_statuses
-WHERE region = 'us-east-1' AND Identifier = '<AgentStatusArn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ agent_status_arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -238,10 +238,10 @@ INSERT INTO awscc.connect.agent_statuses (
  State,
  region
 )
-SELECT 
-'{{ InstanceArn }}',
- '{{ Name }}',
- '{{ State }}',
+SELECT
+'{{ instance_arn }}',
+ '{{ name }}',
+ '{{ state }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -260,15 +260,15 @@ INSERT INTO awscc.connect.agent_statuses (
  Tags,
  region
 )
-SELECT 
- '{{ InstanceArn }}',
- '{{ Description }}',
- '{{ Name }}',
- '{{ DisplayOrder }}',
- '{{ State }}',
- '{{ Type }}',
- '{{ ResetOrderNumber }}',
- '{{ Tags }}',
+SELECT
+ '{{ instance_arn }}',
+ '{{ description }}',
+ '{{ name }}',
+ '{{ display_order }}',
+ '{{ state }}',
+ '{{ type }}',
+ '{{ reset_order_number }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -286,25 +286,24 @@ globals:
 resources:
   - name: agent_status
     props:
-      - name: InstanceArn
-        value: '{{ InstanceArn }}'
-      - name: Description
-        value: '{{ Description }}'
-      - name: Name
-        value: '{{ Name }}'
-      - name: DisplayOrder
-        value: '{{ DisplayOrder }}'
-      - name: State
-        value: '{{ State }}'
-      - name: Type
-        value: '{{ Type }}'
-      - name: ResetOrderNumber
-        value: '{{ ResetOrderNumber }}'
-      - name: Tags
+      - name: instance_arn
+        value: '{{ instance_arn }}'
+      - name: description
+        value: '{{ description }}'
+      - name: name
+        value: '{{ name }}'
+      - name: display_order
+        value: '{{ display_order }}'
+      - name: state
+        value: '{{ state }}'
+      - name: type
+        value: '{{ type }}'
+      - name: reset_order_number
+        value: '{{ reset_order_number }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -327,7 +326,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<AgentStatusArn>';
+AND Identifier = '{{ agent_status_arn }}';
 ```
 
 
diff --git a/website/docs/services/connect/approved_origins/index.md b/website/docs/services/connect/approved_origins/index.md
index a704e6845..d481a40d2 100644
--- a/website/docs/services/connect/approved_origins/index.md
+++ b/website/docs/services/connect/approved_origins/index.md
@@ -139,7 +139,7 @@ region,
 origin,
 instance_id
 FROM awscc.connect.approved_origins
-WHERE region = 'us-east-1' AND Identifier = '<InstanceId>|<Origin>';
+WHERE region = 'us-east-1' AND Identifier = '{{ instance_id }}|{{ origin }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -177,9 +177,9 @@ INSERT INTO awscc.connect.approved_origins (
  InstanceId,
  region
 )
-SELECT 
-'{{ Origin }}',
- '{{ InstanceId }}',
+SELECT
+'{{ origin }}',
+ '{{ instance_id }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -192,9 +192,9 @@ INSERT INTO awscc.connect.approved_origins (
  InstanceId,
  region
 )
-SELECT 
- '{{ Origin }}',
- '{{ InstanceId }}',
+SELECT
+ '{{ origin }}',
+ '{{ instance_id }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -212,11 +212,10 @@ globals:
 resources:
   - name: approved_origin
     props:
-      - name: Origin
-        value: '{{ Origin }}'
-      - name: InstanceId
-        value: '{{ InstanceId }}'
-
+      - name: origin
+        value: '{{ origin }}'
+      - name: instance_id
+        value: '{{ instance_id }}'
 ```
 </TabItem>
 </Tabs>
@@ -227,7 +226,7 @@ resources:
 ```sql
 /*+ delete */
 DELETE FROM awscc.connect.approved_origins
-WHERE Identifier = '<InstanceId|Origin>'
+WHERE Identifier = '{{ instance_id }}|{{ origin }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/connect/contact_flow_modules/index.md b/website/docs/services/connect/contact_flow_modules/index.md
index 257b51c14..5c4c4a43a 100644
--- a/website/docs/services/connect/contact_flow_modules/index.md
+++ b/website/docs/services/connect/contact_flow_modules/index.md
@@ -188,7 +188,7 @@ state,
 status,
 tags
 FROM awscc.connect.contact_flow_modules
-WHERE region = 'us-east-1' AND Identifier = '<ContactFlowModuleArn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ contact_flow_module_arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -226,10 +226,10 @@ INSERT INTO awscc.connect.contact_flow_modules (
  Content,
  region
 )
-SELECT 
-'{{ InstanceArn }}',
- '{{ Name }}',
- '{{ Content }}',
+SELECT
+'{{ instance_arn }}',
+ '{{ name }}',
+ '{{ content }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -246,13 +246,13 @@ INSERT INTO awscc.connect.contact_flow_modules (
  Tags,
  region
 )
-SELECT 
- '{{ InstanceArn }}',
- '{{ Name }}',
- '{{ Content }}',
- '{{ Description }}',
- '{{ State }}',
- '{{ Tags }}',
+SELECT
+ '{{ instance_arn }}',
+ '{{ name }}',
+ '{{ content }}',
+ '{{ description }}',
+ '{{ state }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -270,21 +270,20 @@ globals:
 resources:
   - name: contact_flow_module
     props:
-      - name: InstanceArn
-        value: '{{ InstanceArn }}'
-      - name: Name
-        value: '{{ Name }}'
-      - name: Content
-        value: '{{ Content }}'
-      - name: Description
-        value: '{{ Description }}'
-      - name: State
-        value: '{{ State }}'
-      - name: Tags
+      - name: instance_arn
+        value: '{{ instance_arn }}'
+      - name: name
+        value: '{{ name }}'
+      - name: content
+        value: '{{ content }}'
+      - name: description
+        value: '{{ description }}'
+      - name: state
+        value: '{{ state }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -305,7 +304,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<ContactFlowModuleArn>';
+AND Identifier = '{{ contact_flow_module_arn }}';
 ```
 
 
@@ -314,7 +313,7 @@ AND Identifier = '<ContactFlowModuleArn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.connect.contact_flow_modules
-WHERE Identifier = '<ContactFlowModuleArn>'
+WHERE Identifier = '{{ contact_flow_module_arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/connect/contact_flow_versions/index.md b/website/docs/services/connect/contact_flow_versions/index.md
index f0030f6b6..3ab8631a0 100644
--- a/website/docs/services/connect/contact_flow_versions/index.md
+++ b/website/docs/services/connect/contact_flow_versions/index.md
@@ -163,7 +163,7 @@ version,
 description,
 flow_content_sha256
 FROM awscc.connect.contact_flow_versions
-WHERE region = 'us-east-1' AND Identifier = '<ContactFlowVersionARN>';
+WHERE region = 'us-east-1' AND Identifier = '{{ contact_flow_version_arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -199,8 +199,8 @@ INSERT INTO awscc.connect.contact_flow_versions (
  ContactFlowId,
  region
 )
-SELECT 
-'{{ ContactFlowId }}',
+SELECT
+'{{ contact_flow_id }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -213,9 +213,9 @@ INSERT INTO awscc.connect.contact_flow_versions (
  Description,
  region
 )
-SELECT 
- '{{ ContactFlowId }}',
- '{{ Description }}',
+SELECT
+ '{{ contact_flow_id }}',
+ '{{ description }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -233,11 +233,10 @@ globals:
 resources:
   - name: contact_flow_version
     props:
-      - name: ContactFlowId
-        value: '{{ ContactFlowId }}'
-      - name: Description
-        value: '{{ Description }}'
-
+      - name: contact_flow_id
+        value: '{{ contact_flow_id }}'
+      - name: description
+        value: '{{ description }}'
 ```
 </TabItem>
 </Tabs>
@@ -248,7 +247,7 @@ resources:
 ```sql
 /*+ delete */
 DELETE FROM awscc.connect.contact_flow_versions
-WHERE Identifier = '<ContactFlowVersionARN>'
+WHERE Identifier = '{{ contact_flow_version_arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/connect/contact_flows/index.md b/website/docs/services/connect/contact_flows/index.md
index 220b3ad09..83bc47d6e 100644
--- a/website/docs/services/connect/contact_flows/index.md
+++ b/website/docs/services/connect/contact_flows/index.md
@@ -188,7 +188,7 @@ state,
 type,
 tags
 FROM awscc.connect.contact_flows
-WHERE region = 'us-east-1' AND Identifier = '<ContactFlowArn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ contact_flow_arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -227,11 +227,11 @@ INSERT INTO awscc.connect.contact_flows (
  Type,
  region
 )
-SELECT 
-'{{ InstanceArn }}',
- '{{ Name }}',
- '{{ Content }}',
- '{{ Type }}',
+SELECT
+'{{ instance_arn }}',
+ '{{ name }}',
+ '{{ content }}',
+ '{{ type }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -249,14 +249,14 @@ INSERT INTO awscc.connect.contact_flows (
  Tags,
  region
 )
-SELECT 
- '{{ InstanceArn }}',
- '{{ Name }}',
- '{{ Content }}',
- '{{ Description }}',
- '{{ State }}',
- '{{ Type }}',
- '{{ Tags }}',
+SELECT
+ '{{ instance_arn }}',
+ '{{ name }}',
+ '{{ content }}',
+ '{{ description }}',
+ '{{ state }}',
+ '{{ type }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -274,23 +274,22 @@ globals:
 resources:
   - name: contact_flow
     props:
-      - name: InstanceArn
-        value: '{{ InstanceArn }}'
-      - name: Name
-        value: '{{ Name }}'
-      - name: Content
-        value: '{{ Content }}'
-      - name: Description
-        value: '{{ Description }}'
-      - name: State
-        value: '{{ State }}'
-      - name: Type
-        value: '{{ Type }}'
-      - name: Tags
+      - name: instance_arn
+        value: '{{ instance_arn }}'
+      - name: name
+        value: '{{ name }}'
+      - name: content
+        value: '{{ content }}'
+      - name: description
+        value: '{{ description }}'
+      - name: state
+        value: '{{ state }}'
+      - name: type
+        value: '{{ type }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -311,7 +310,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<ContactFlowArn>';
+AND Identifier = '{{ contact_flow_arn }}';
 ```
 
 
@@ -320,7 +319,7 @@ AND Identifier = '<ContactFlowArn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.connect.contact_flows
-WHERE Identifier = '<ContactFlowArn>'
+WHERE Identifier = '{{ contact_flow_arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/connect/email_addresses/index.md b/website/docs/services/connect/email_addresses/index.md
index f99c01a36..4591ff7ed 100644
--- a/website/docs/services/connect/email_addresses/index.md
+++ b/website/docs/services/connect/email_addresses/index.md
@@ -181,7 +181,7 @@ email_address,
 display_name,
 tags
 FROM awscc.connect.email_addresses
-WHERE region = 'us-east-1' AND Identifier = '<EmailAddressArn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ email_address_arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -218,9 +218,9 @@ INSERT INTO awscc.connect.email_addresses (
  EmailAddress,
  region
 )
-SELECT 
-'{{ InstanceArn }}',
- '{{ EmailAddress }}',
+SELECT
+'{{ instance_arn }}',
+ '{{ email_address }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -236,12 +236,12 @@ INSERT INTO awscc.connect.email_addresses (
  Tags,
  region
 )
-SELECT 
- '{{ InstanceArn }}',
- '{{ Description }}',
- '{{ EmailAddress }}',
- '{{ DisplayName }}',
- '{{ Tags }}',
+SELECT
+ '{{ instance_arn }}',
+ '{{ description }}',
+ '{{ email_address }}',
+ '{{ display_name }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -259,19 +259,18 @@ globals:
 resources:
   - name: email_address
     props:
-      - name: InstanceArn
-        value: '{{ InstanceArn }}'
-      - name: Description
-        value: '{{ Description }}'
-      - name: EmailAddress
-        value: '{{ EmailAddress }}'
-      - name: DisplayName
-        value: '{{ DisplayName }}'
-      - name: Tags
+      - name: instance_arn
+        value: '{{ instance_arn }}'
+      - name: description
+        value: '{{ description }}'
+      - name: email_address
+        value: '{{ email_address }}'
+      - name: display_name
+        value: '{{ display_name }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -290,7 +289,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<EmailAddressArn>';
+AND Identifier = '{{ email_address_arn }}';
 ```
 
 
@@ -299,7 +298,7 @@ AND Identifier = '<EmailAddressArn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.connect.email_addresses
-WHERE Identifier = '<EmailAddressArn>'
+WHERE Identifier = '{{ email_address_arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/connect/evaluation_forms/index.md b/website/docs/services/connect/evaluation_forms/index.md
index f897f7c72..09d97e8ad 100644
--- a/website/docs/services/connect/evaluation_forms/index.md
+++ b/website/docs/services/connect/evaluation_forms/index.md
@@ -254,7 +254,7 @@ items,
 evaluation_form_arn,
 tags
 FROM awscc.connect.evaluation_forms
-WHERE region = 'us-east-1' AND Identifier = '<EvaluationFormArn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ evaluation_form_arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -293,11 +293,11 @@ INSERT INTO awscc.connect.evaluation_forms (
  Items,
  region
 )
-SELECT 
-'{{ Status }}',
- '{{ InstanceArn }}',
- '{{ Title }}',
- '{{ Items }}',
+SELECT
+'{{ status }}',
+ '{{ instance_arn }}',
+ '{{ title }}',
+ '{{ items }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -316,15 +316,15 @@ INSERT INTO awscc.connect.evaluation_forms (
  Tags,
  region
 )
-SELECT 
- '{{ ScoringStrategy }}',
- '{{ Status }}',
- '{{ AutoEvaluationConfiguration }}',
- '{{ Description }}',
- '{{ InstanceArn }}',
- '{{ Title }}',
- '{{ Items }}',
- '{{ Tags }}',
+SELECT
+ '{{ scoring_strategy }}',
+ '{{ status }}',
+ '{{ auto_evaluation_configuration }}',
+ '{{ description }}',
+ '{{ instance_arn }}',
+ '{{ title }}',
+ '{{ items }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -342,69 +342,68 @@ globals:
 resources:
   - name: evaluation_form
     props:
-      - name: ScoringStrategy
+      - name: scoring_strategy
         value:
-          Status: '{{ Status }}'
-          Mode: '{{ Mode }}'
-      - name: Status
-        value: '{{ Status }}'
-      - name: AutoEvaluationConfiguration
+          status: '{{ status }}'
+          mode: '{{ mode }}'
+      - name: status
+        value: '{{ status }}'
+      - name: auto_evaluation_configuration
         value:
-          Enabled: '{{ Enabled }}'
-      - name: Description
-        value: '{{ Description }}'
-      - name: InstanceArn
-        value: '{{ InstanceArn }}'
-      - name: Title
-        value: '{{ Title }}'
-      - name: Items
+          enabled: '{{ enabled }}'
+      - name: description
+        value: '{{ description }}'
+      - name: instance_arn
+        value: '{{ instance_arn }}'
+      - name: title
+        value: '{{ title }}'
+      - name: items
         value:
-          - Section:
-              Title: '{{ Title }}'
-              Instructions: '{{ Instructions }}'
-              Items:
-                - Question:
-                    NotApplicableEnabled: '{{ NotApplicableEnabled }}'
-                    Title: '{{ Title }}'
-                    QuestionType: '{{ QuestionType }}'
-                    Instructions: '{{ Instructions }}'
-                    RefId: '{{ RefId }}'
-                    QuestionTypeProperties:
-                      Numeric:
-                        Options:
-                          - Score: '{{ Score }}'
-                            MinValue: '{{ MinValue }}'
-                            MaxValue: '{{ MaxValue }}'
-                            AutomaticFail: '{{ AutomaticFail }}'
-                        Automation:
-                          AnswerSource: null
-                          PropertyValue:
-                            Label: '{{ Label }}'
-                        MinValue: '{{ MinValue }}'
-                        MaxValue: '{{ MaxValue }}'
-                      SingleSelect:
-                        DisplayAs: '{{ DisplayAs }}'
-                        Options:
-                          - Score: null
-                            Text: '{{ Text }}'
-                            RefId: null
-                            AutomaticFail: '{{ AutomaticFail }}'
-                        Automation:
-                          Options:
-                            - RuleCategory:
-                                Condition: '{{ Condition }}'
-                                Category: '{{ Category }}'
-                                OptionRefId: null
-                          DefaultOptionRefId: null
-                    Weight: null
-                  Section: null
-              RefId: null
-              Weight: null
-      - name: Tags
+          - section:
+              title: '{{ title }}'
+              instructions: '{{ instructions }}'
+              items:
+                - question:
+                    not_applicable_enabled: '{{ not_applicable_enabled }}'
+                    title: '{{ title }}'
+                    question_type: '{{ question_type }}'
+                    instructions: '{{ instructions }}'
+                    ref_id: '{{ ref_id }}'
+                    question_type_properties:
+                      numeric:
+                        options:
+                          - score: '{{ score }}'
+                            min_value: '{{ min_value }}'
+                            max_value: '{{ max_value }}'
+                            automatic_fail: '{{ automatic_fail }}'
+                        automation:
+                          answer_source: null
+                          property_value:
+                            label: '{{ label }}'
+                        min_value: '{{ min_value }}'
+                        max_value: '{{ max_value }}'
+                      single_select:
+                        display_as: '{{ display_as }}'
+                        options:
+                          - score: null
+                            text: '{{ text }}'
+                            ref_id: null
+                            automatic_fail: '{{ automatic_fail }}'
+                        automation:
+                          options:
+                            - rule_category:
+                                condition: '{{ condition }}'
+                                category: '{{ category }}'
+                                option_ref_id: null
+                          default_option_ref_id: null
+                    weight: null
+                  section: null
+              ref_id: null
+              weight: null
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -427,7 +426,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<EvaluationFormArn>';
+AND Identifier = '{{ evaluation_form_arn }}';
 ```
 
 
@@ -436,7 +435,7 @@ AND Identifier = '<EvaluationFormArn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.connect.evaluation_forms
-WHERE Identifier = '<EvaluationFormArn>'
+WHERE Identifier = '{{ evaluation_form_arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/connect/hours_of_operations/index.md b/website/docs/services/connect/hours_of_operations/index.md
index a7ceb0a4e..cb8c9c7ae 100644
--- a/website/docs/services/connect/hours_of_operations/index.md
+++ b/website/docs/services/connect/hours_of_operations/index.md
@@ -268,7 +268,7 @@ hours_of_operation_arn,
 tags,
 hours_of_operation_overrides
 FROM awscc.connect.hours_of_operations
-WHERE region = 'us-east-1' AND Identifier = '<HoursOfOperationArn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ hours_of_operation_arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -307,11 +307,11 @@ INSERT INTO awscc.connect.hours_of_operations (
  Config,
  region
 )
-SELECT 
-'{{ InstanceArn }}',
- '{{ Name }}',
- '{{ TimeZone }}',
- '{{ Config }}',
+SELECT
+'{{ instance_arn }}',
+ '{{ name }}',
+ '{{ time_zone }}',
+ '{{ config }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -329,14 +329,14 @@ INSERT INTO awscc.connect.hours_of_operations (
  HoursOfOperationOverrides,
  region
 )
-SELECT 
- '{{ InstanceArn }}',
- '{{ Name }}',
- '{{ Description }}',
- '{{ TimeZone }}',
- '{{ Config }}',
- '{{ Tags }}',
- '{{ HoursOfOperationOverrides }}',
+SELECT
+ '{{ instance_arn }}',
+ '{{ name }}',
+ '{{ description }}',
+ '{{ time_zone }}',
+ '{{ config }}',
+ '{{ tags }}',
+ '{{ hours_of_operation_overrides }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -354,39 +354,38 @@ globals:
 resources:
   - name: hours_of_operation
     props:
-      - name: InstanceArn
-        value: '{{ InstanceArn }}'
-      - name: Name
-        value: '{{ Name }}'
-      - name: Description
-        value: '{{ Description }}'
-      - name: TimeZone
-        value: '{{ TimeZone }}'
-      - name: Config
+      - name: instance_arn
+        value: '{{ instance_arn }}'
+      - name: name
+        value: '{{ name }}'
+      - name: description
+        value: '{{ description }}'
+      - name: time_zone
+        value: '{{ time_zone }}'
+      - name: config
         value:
-          - Day: '{{ Day }}'
-            StartTime:
-              Hours: '{{ Hours }}'
-              Minutes: '{{ Minutes }}'
-            EndTime: null
-      - name: Tags
+          - day: '{{ day }}'
+            start_time:
+              hours: '{{ hours }}'
+              minutes: '{{ minutes }}'
+            end_time: null
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-      - name: HoursOfOperationOverrides
+          - key: '{{ key }}'
+            value: '{{ value }}'
+      - name: hours_of_operation_overrides
         value:
-          - OverrideName: '{{ OverrideName }}'
-            OverrideDescription: '{{ OverrideDescription }}'
-            EffectiveFrom: '{{ EffectiveFrom }}'
-            EffectiveTill: '{{ EffectiveTill }}'
-            OverrideConfig:
-              - Day: '{{ Day }}'
-                StartTime:
-                  Hours: '{{ Hours }}'
-                  Minutes: '{{ Minutes }}'
-                EndTime: null
-            HoursOfOperationOverrideId: '{{ HoursOfOperationOverrideId }}'
-
+          - override_name: '{{ override_name }}'
+            override_description: '{{ override_description }}'
+            effective_from: '{{ effective_from }}'
+            effective_till: '{{ effective_till }}'
+            override_config:
+              - day: '{{ day }}'
+                start_time:
+                  hours: '{{ hours }}'
+                  minutes: '{{ minutes }}'
+                end_time: null
+            hours_of_operation_override_id: '{{ hours_of_operation_override_id }}'
 ```
 </TabItem>
 </Tabs>
@@ -408,7 +407,7 @@ SET PatchDocument = string('{{ {
     "HoursOfOperationOverrides": hours_of_operation_overrides
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<HoursOfOperationArn>';
+AND Identifier = '{{ hours_of_operation_arn }}';
 ```
 
 
@@ -417,7 +416,7 @@ AND Identifier = '<HoursOfOperationArn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.connect.hours_of_operations
-WHERE Identifier = '<HoursOfOperationArn>'
+WHERE Identifier = '{{ hours_of_operation_arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/connect/instance_storage_configs/index.md b/website/docs/services/connect/instance_storage_configs/index.md
index 1a0302701..1e224ae31 100644
--- a/website/docs/services/connect/instance_storage_configs/index.md
+++ b/website/docs/services/connect/instance_storage_configs/index.md
@@ -258,7 +258,7 @@ kinesis_video_stream_config,
 kinesis_stream_config,
 kinesis_firehose_config
 FROM awscc.connect.instance_storage_configs
-WHERE region = 'us-east-1' AND Identifier = '<InstanceArn>|<AssociationId>|<ResourceType>';
+WHERE region = 'us-east-1' AND Identifier = '{{ instance_arn }}|{{ association_id }}|{{ resource_type }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -298,10 +298,10 @@ INSERT INTO awscc.connect.instance_storage_configs (
  StorageType,
  region
 )
-SELECT 
-'{{ InstanceArn }}',
- '{{ ResourceType }}',
- '{{ StorageType }}',
+SELECT
+'{{ instance_arn }}',
+ '{{ resource_type }}',
+ '{{ storage_type }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -319,14 +319,14 @@ INSERT INTO awscc.connect.instance_storage_configs (
  KinesisFirehoseConfig,
  region
 )
-SELECT 
- '{{ InstanceArn }}',
- '{{ ResourceType }}',
- '{{ StorageType }}',
- '{{ S3Config }}',
- '{{ KinesisVideoStreamConfig }}',
- '{{ KinesisStreamConfig }}',
- '{{ KinesisFirehoseConfig }}',
+SELECT
+ '{{ instance_arn }}',
+ '{{ resource_type }}',
+ '{{ storage_type }}',
+ '{{ s3_config }}',
+ '{{ kinesis_video_stream_config }}',
+ '{{ kinesis_stream_config }}',
+ '{{ kinesis_firehose_config }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -344,31 +344,30 @@ globals:
 resources:
   - name: instance_storage_config
     props:
-      - name: InstanceArn
-        value: '{{ InstanceArn }}'
-      - name: ResourceType
-        value: '{{ ResourceType }}'
-      - name: StorageType
-        value: '{{ StorageType }}'
-      - name: S3Config
+      - name: instance_arn
+        value: '{{ instance_arn }}'
+      - name: resource_type
+        value: '{{ resource_type }}'
+      - name: storage_type
+        value: '{{ storage_type }}'
+      - name: s3_config
         value:
-          BucketName: '{{ BucketName }}'
-          BucketPrefix: '{{ BucketPrefix }}'
-          EncryptionConfig:
-            EncryptionType: '{{ EncryptionType }}'
-            KeyId: '{{ KeyId }}'
-      - name: KinesisVideoStreamConfig
+          bucket_name: '{{ bucket_name }}'
+          bucket_prefix: '{{ bucket_prefix }}'
+          encryption_config:
+            encryption_type: '{{ encryption_type }}'
+            key_id: '{{ key_id }}'
+      - name: kinesis_video_stream_config
         value:
-          Prefix: null
-          RetentionPeriodHours: null
-          EncryptionConfig: null
-      - name: KinesisStreamConfig
+          prefix: null
+          retention_period_hours: null
+          encryption_config: null
+      - name: kinesis_stream_config
         value:
-          StreamArn: '{{ StreamArn }}'
-      - name: KinesisFirehoseConfig
+          stream_arn: '{{ stream_arn }}'
+      - name: kinesis_firehose_config
         value:
-          FirehoseArn: '{{ FirehoseArn }}'
-
+          firehose_arn: '{{ firehose_arn }}'
 ```
 </TabItem>
 </Tabs>
@@ -388,7 +387,7 @@ SET PatchDocument = string('{{ {
     "KinesisFirehoseConfig": kinesis_firehose_config
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<InstanceArn>|<AssociationId>|<ResourceType>';
+AND Identifier = '{{ instance_arn }}|{{ association_id }}|{{ resource_type }}';
 ```
 
 
@@ -397,7 +396,7 @@ AND Identifier = '<InstanceArn>|<AssociationId>|<ResourceType>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.connect.instance_storage_configs
-WHERE Identifier = '<InstanceArn|AssociationId|ResourceType>'
+WHERE Identifier = '{{ instance_arn }}|{{ association_id }}|{{ resource_type }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/connect/instances/index.md b/website/docs/services/connect/instances/index.md
index 72921c445..dc45b67a2 100644
--- a/website/docs/services/connect/instances/index.md
+++ b/website/docs/services/connect/instances/index.md
@@ -262,7 +262,7 @@ directory_id,
 attributes,
 tags
 FROM awscc.connect.instances
-WHERE region = 'us-east-1' AND Identifier = '<Arn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -299,9 +299,9 @@ INSERT INTO awscc.connect.instances (
  Attributes,
  region
 )
-SELECT 
-'{{ IdentityManagementType }}',
- '{{ Attributes }}',
+SELECT
+'{{ identity_management_type }}',
+ '{{ attributes }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -317,12 +317,12 @@ INSERT INTO awscc.connect.instances (
  Tags,
  region
 )
-SELECT 
- '{{ IdentityManagementType }}',
- '{{ InstanceAlias }}',
- '{{ DirectoryId }}',
- '{{ Attributes }}',
- '{{ Tags }}',
+SELECT
+ '{{ identity_management_type }}',
+ '{{ instance_alias }}',
+ '{{ directory_id }}',
+ '{{ attributes }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -340,31 +340,30 @@ globals:
 resources:
   - name: instance
     props:
-      - name: IdentityManagementType
-        value: '{{ IdentityManagementType }}'
-      - name: InstanceAlias
-        value: '{{ InstanceAlias }}'
-      - name: DirectoryId
-        value: '{{ DirectoryId }}'
-      - name: Attributes
+      - name: identity_management_type
+        value: '{{ identity_management_type }}'
+      - name: instance_alias
+        value: '{{ instance_alias }}'
+      - name: directory_id
+        value: '{{ directory_id }}'
+      - name: attributes
         value:
-          InboundCalls: '{{ InboundCalls }}'
-          OutboundCalls: '{{ OutboundCalls }}'
-          ContactflowLogs: '{{ ContactflowLogs }}'
-          ContactLens: '{{ ContactLens }}'
-          AutoResolveBestVoices: '{{ AutoResolveBestVoices }}'
-          UseCustomTTSVoices: '{{ UseCustomTTSVoices }}'
-          EarlyMedia: '{{ EarlyMedia }}'
-          MultiPartyConference: '{{ MultiPartyConference }}'
-          HighVolumeOutBound: '{{ HighVolumeOutBound }}'
-          EnhancedContactMonitoring: '{{ EnhancedContactMonitoring }}'
-          EnhancedChatMonitoring: '{{ EnhancedChatMonitoring }}'
-          MultiPartyChatConference: '{{ MultiPartyChatConference }}'
-      - name: Tags
+          inbound_calls: '{{ inbound_calls }}'
+          outbound_calls: '{{ outbound_calls }}'
+          contactflow_logs: '{{ contactflow_logs }}'
+          contact_lens: '{{ contact_lens }}'
+          auto_resolve_best_voices: '{{ auto_resolve_best_voices }}'
+          use_custom_tt_svoices: '{{ use_custom_tt_svoices }}'
+          early_media: '{{ early_media }}'
+          multi_party_conference: '{{ multi_party_conference }}'
+          high_volume_out_bound: '{{ high_volume_out_bound }}'
+          enhanced_contact_monitoring: '{{ enhanced_contact_monitoring }}'
+          enhanced_chat_monitoring: '{{ enhanced_chat_monitoring }}'
+          multi_party_chat_conference: '{{ multi_party_chat_conference }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -381,7 +380,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Arn>';
+AND Identifier = '{{ arn }}';
 ```
 
 
@@ -390,7 +389,7 @@ AND Identifier = '<Arn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.connect.instances
-WHERE Identifier = '<Arn>'
+WHERE Identifier = '{{ arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/connect/integration_associations/index.md b/website/docs/services/connect/integration_associations/index.md
index d844968db..015f18a05 100644
--- a/website/docs/services/connect/integration_associations/index.md
+++ b/website/docs/services/connect/integration_associations/index.md
@@ -156,7 +156,7 @@ instance_id,
 integration_arn,
 integration_type
 FROM awscc.connect.integration_associations
-WHERE region = 'us-east-1' AND Identifier = '<InstanceId>|<IntegrationType>|<IntegrationArn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ instance_id }}|{{ integration_type }}|{{ integration_arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -196,10 +196,10 @@ INSERT INTO awscc.connect.integration_associations (
  IntegrationType,
  region
 )
-SELECT 
-'{{ InstanceId }}',
- '{{ IntegrationArn }}',
- '{{ IntegrationType }}',
+SELECT
+'{{ instance_id }}',
+ '{{ integration_arn }}',
+ '{{ integration_type }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -213,10 +213,10 @@ INSERT INTO awscc.connect.integration_associations (
  IntegrationType,
  region
 )
-SELECT 
- '{{ InstanceId }}',
- '{{ IntegrationArn }}',
- '{{ IntegrationType }}',
+SELECT
+ '{{ instance_id }}',
+ '{{ integration_arn }}',
+ '{{ integration_type }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -234,13 +234,12 @@ globals:
 resources:
   - name: integration_association
     props:
-      - name: InstanceId
-        value: '{{ InstanceId }}'
-      - name: IntegrationArn
-        value: '{{ IntegrationArn }}'
-      - name: IntegrationType
-        value: '{{ IntegrationType }}'
-
+      - name: instance_id
+        value: '{{ instance_id }}'
+      - name: integration_arn
+        value: '{{ integration_arn }}'
+      - name: integration_type
+        value: '{{ integration_type }}'
 ```
 </TabItem>
 </Tabs>
@@ -251,7 +250,7 @@ resources:
 ```sql
 /*+ delete */
 DELETE FROM awscc.connect.integration_associations
-WHERE Identifier = '<InstanceId|IntegrationType|IntegrationArn>'
+WHERE Identifier = '{{ instance_id }}|{{ integration_type }}|{{ integration_arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/connect/predefined_attributes/index.md b/website/docs/services/connect/predefined_attributes/index.md
index c9aff9221..6fa775f5d 100644
--- a/website/docs/services/connect/predefined_attributes/index.md
+++ b/website/docs/services/connect/predefined_attributes/index.md
@@ -194,7 +194,7 @@ attribute_configuration,
 last_modified_region,
 last_modified_time
 FROM awscc.connect.predefined_attributes
-WHERE region = 'us-east-1' AND Identifier = '<InstanceArn>|<Name>';
+WHERE region = 'us-east-1' AND Identifier = '{{ instance_arn }}|{{ name }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -232,9 +232,9 @@ INSERT INTO awscc.connect.predefined_attributes (
  Name,
  region
 )
-SELECT 
-'{{ InstanceArn }}',
- '{{ Name }}',
+SELECT
+'{{ instance_arn }}',
+ '{{ name }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -250,12 +250,12 @@ INSERT INTO awscc.connect.predefined_attributes (
  AttributeConfiguration,
  region
 )
-SELECT 
- '{{ InstanceArn }}',
- '{{ Name }}',
- '{{ Values }}',
- '{{ Purposes }}',
- '{{ AttributeConfiguration }}',
+SELECT
+ '{{ instance_arn }}',
+ '{{ name }}',
+ '{{ values }}',
+ '{{ purposes }}',
+ '{{ attribute_configuration }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -273,22 +273,21 @@ globals:
 resources:
   - name: predefined_attribute
     props:
-      - name: InstanceArn
-        value: '{{ InstanceArn }}'
-      - name: Name
-        value: '{{ Name }}'
-      - name: Values
+      - name: instance_arn
+        value: '{{ instance_arn }}'
+      - name: name
+        value: '{{ name }}'
+      - name: values
         value:
-          StringList:
-            - '{{ StringList[0] }}'
-      - name: Purposes
+          string_list:
+            - '{{ string_list[0] }}'
+      - name: purposes
         value:
-          - '{{ Purposes[0] }}'
-      - name: AttributeConfiguration
+          - '{{ purposes[0] }}'
+      - name: attribute_configuration
         value:
-          EnableValueValidationOnAssociation: '{{ EnableValueValidationOnAssociation }}'
-          IsReadOnly: '{{ IsReadOnly }}'
-
+          enable_value_validation_on_association: '{{ enable_value_validation_on_association }}'
+          is_read_only: '{{ is_read_only }}'
 ```
 </TabItem>
 </Tabs>
@@ -306,7 +305,7 @@ SET PatchDocument = string('{{ {
     "AttributeConfiguration": attribute_configuration
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<InstanceArn>|<Name>';
+AND Identifier = '{{ instance_arn }}|{{ name }}';
 ```
 
 
@@ -315,7 +314,7 @@ AND Identifier = '<InstanceArn>|<Name>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.connect.predefined_attributes
-WHERE Identifier = '<InstanceArn|Name>'
+WHERE Identifier = '{{ instance_arn }}|{{ name }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/connect/prompts/index.md b/website/docs/services/connect/prompts/index.md
index c825d4448..c820e3347 100644
--- a/website/docs/services/connect/prompts/index.md
+++ b/website/docs/services/connect/prompts/index.md
@@ -176,7 +176,7 @@ s3_uri,
 prompt_arn,
 tags
 FROM awscc.connect.prompts
-WHERE region = 'us-east-1' AND Identifier = '<PromptArn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ prompt_arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -213,9 +213,9 @@ INSERT INTO awscc.connect.prompts (
  Name,
  region
 )
-SELECT 
-'{{ InstanceArn }}',
- '{{ Name }}',
+SELECT
+'{{ instance_arn }}',
+ '{{ name }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -231,12 +231,12 @@ INSERT INTO awscc.connect.prompts (
  Tags,
  region
 )
-SELECT 
- '{{ InstanceArn }}',
- '{{ Name }}',
- '{{ Description }}',
- '{{ S3Uri }}',
- '{{ Tags }}',
+SELECT
+ '{{ instance_arn }}',
+ '{{ name }}',
+ '{{ description }}',
+ '{{ s3_uri }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -254,19 +254,18 @@ globals:
 resources:
   - name: prompt
     props:
-      - name: InstanceArn
-        value: '{{ InstanceArn }}'
-      - name: Name
-        value: '{{ Name }}'
-      - name: Description
-        value: '{{ Description }}'
-      - name: S3Uri
-        value: '{{ S3Uri }}'
-      - name: Tags
+      - name: instance_arn
+        value: '{{ instance_arn }}'
+      - name: name
+        value: '{{ name }}'
+      - name: description
+        value: '{{ description }}'
+      - name: s3_uri
+        value: '{{ s3_uri }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -286,7 +285,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<PromptArn>';
+AND Identifier = '{{ prompt_arn }}';
 ```
 
 
@@ -295,7 +294,7 @@ AND Identifier = '<PromptArn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.connect.prompts
-WHERE Identifier = '<PromptArn>'
+WHERE Identifier = '{{ prompt_arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/connect/queues/index.md b/website/docs/services/connect/queues/index.md
index 8744a0476..b8befde79 100644
--- a/website/docs/services/connect/queues/index.md
+++ b/website/docs/services/connect/queues/index.md
@@ -236,7 +236,7 @@ quick_connect_arns,
 tags,
 type
 FROM awscc.connect.queues
-WHERE region = 'us-east-1' AND Identifier = '<QueueArn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ queue_arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -274,10 +274,10 @@ INSERT INTO awscc.connect.queues (
  Name,
  region
 )
-SELECT 
-'{{ InstanceArn }}',
- '{{ HoursOfOperationArn }}',
- '{{ Name }}',
+SELECT
+'{{ instance_arn }}',
+ '{{ hours_of_operation_arn }}',
+ '{{ name }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -298,17 +298,17 @@ INSERT INTO awscc.connect.queues (
  Tags,
  region
 )
-SELECT 
- '{{ InstanceArn }}',
- '{{ Description }}',
- '{{ HoursOfOperationArn }}',
- '{{ MaxContacts }}',
- '{{ Name }}',
- '{{ OutboundCallerConfig }}',
- '{{ OutboundEmailConfig }}',
- '{{ Status }}',
- '{{ QuickConnectArns }}',
- '{{ Tags }}',
+SELECT
+ '{{ instance_arn }}',
+ '{{ description }}',
+ '{{ hours_of_operation_arn }}',
+ '{{ max_contacts }}',
+ '{{ name }}',
+ '{{ outbound_caller_config }}',
+ '{{ outbound_email_config }}',
+ '{{ status }}',
+ '{{ quick_connect_arns }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -326,34 +326,33 @@ globals:
 resources:
   - name: queue
     props:
-      - name: InstanceArn
-        value: '{{ InstanceArn }}'
-      - name: Description
-        value: '{{ Description }}'
-      - name: HoursOfOperationArn
-        value: '{{ HoursOfOperationArn }}'
-      - name: MaxContacts
-        value: '{{ MaxContacts }}'
-      - name: Name
-        value: '{{ Name }}'
-      - name: OutboundCallerConfig
+      - name: instance_arn
+        value: '{{ instance_arn }}'
+      - name: description
+        value: '{{ description }}'
+      - name: hours_of_operation_arn
+        value: '{{ hours_of_operation_arn }}'
+      - name: max_contacts
+        value: '{{ max_contacts }}'
+      - name: name
+        value: '{{ name }}'
+      - name: outbound_caller_config
         value:
-          OutboundCallerIdName: '{{ OutboundCallerIdName }}'
-          OutboundCallerIdNumberArn: '{{ OutboundCallerIdNumberArn }}'
-          OutboundFlowArn: '{{ OutboundFlowArn }}'
-      - name: OutboundEmailConfig
+          outbound_caller_id_name: '{{ outbound_caller_id_name }}'
+          outbound_caller_id_number_arn: '{{ outbound_caller_id_number_arn }}'
+          outbound_flow_arn: '{{ outbound_flow_arn }}'
+      - name: outbound_email_config
         value:
-          OutboundEmailAddressId: '{{ OutboundEmailAddressId }}'
-      - name: Status
-        value: '{{ Status }}'
-      - name: QuickConnectArns
+          outbound_email_address_id: '{{ outbound_email_address_id }}'
+      - name: status
+        value: '{{ status }}'
+      - name: quick_connect_arns
         value:
-          - '{{ QuickConnectArns[0] }}'
-      - name: Tags
+          - '{{ quick_connect_arns[0] }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -378,7 +377,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<QueueArn>';
+AND Identifier = '{{ queue_arn }}';
 ```
 
 
@@ -387,7 +386,7 @@ AND Identifier = '<QueueArn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.connect.queues
-WHERE Identifier = '<QueueArn>'
+WHERE Identifier = '{{ queue_arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/connect/quick_connects/index.md b/website/docs/services/connect/quick_connects/index.md
index 789a0c35e..96a4c9281 100644
--- a/website/docs/services/connect/quick_connects/index.md
+++ b/website/docs/services/connect/quick_connects/index.md
@@ -235,7 +235,7 @@ quick_connect_arn,
 tags,
 quick_connect_type
 FROM awscc.connect.quick_connects
-WHERE region = 'us-east-1' AND Identifier = '<QuickConnectArn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ quick_connect_arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -273,10 +273,10 @@ INSERT INTO awscc.connect.quick_connects (
  QuickConnectConfig,
  region
 )
-SELECT 
-'{{ InstanceArn }}',
- '{{ Name }}',
- '{{ QuickConnectConfig }}',
+SELECT
+'{{ instance_arn }}',
+ '{{ name }}',
+ '{{ quick_connect_config }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -292,12 +292,12 @@ INSERT INTO awscc.connect.quick_connects (
  Tags,
  region
 )
-SELECT 
- '{{ InstanceArn }}',
- '{{ Name }}',
- '{{ Description }}',
- '{{ QuickConnectConfig }}',
- '{{ Tags }}',
+SELECT
+ '{{ instance_arn }}',
+ '{{ name }}',
+ '{{ description }}',
+ '{{ quick_connect_config }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -315,28 +315,27 @@ globals:
 resources:
   - name: quick_connect
     props:
-      - name: InstanceArn
-        value: '{{ InstanceArn }}'
-      - name: Name
-        value: '{{ Name }}'
-      - name: Description
-        value: '{{ Description }}'
-      - name: QuickConnectConfig
+      - name: instance_arn
+        value: '{{ instance_arn }}'
+      - name: name
+        value: '{{ name }}'
+      - name: description
+        value: '{{ description }}'
+      - name: quick_connect_config
         value:
-          QuickConnectType: '{{ QuickConnectType }}'
-          PhoneConfig:
-            PhoneNumber: '{{ PhoneNumber }}'
-          QueueConfig:
-            ContactFlowArn: '{{ ContactFlowArn }}'
-            QueueArn: '{{ QueueArn }}'
-          UserConfig:
-            ContactFlowArn: null
-            UserArn: '{{ UserArn }}'
-      - name: Tags
+          quick_connect_type: '{{ quick_connect_type }}'
+          phone_config:
+            phone_number: '{{ phone_number }}'
+          queue_config:
+            contact_flow_arn: '{{ contact_flow_arn }}'
+            queue_arn: '{{ queue_arn }}'
+          user_config:
+            contact_flow_arn: null
+            user_arn: '{{ user_arn }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -356,7 +355,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<QuickConnectArn>';
+AND Identifier = '{{ quick_connect_arn }}';
 ```
 
 
@@ -365,7 +364,7 @@ AND Identifier = '<QuickConnectArn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.connect.quick_connects
-WHERE Identifier = '<QuickConnectArn>'
+WHERE Identifier = '{{ quick_connect_arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/connect/routing_profiles/index.md b/website/docs/services/connect/routing_profiles/index.md
index 8ec45feb2..52bf93498 100644
--- a/website/docs/services/connect/routing_profiles/index.md
+++ b/website/docs/services/connect/routing_profiles/index.md
@@ -247,7 +247,7 @@ queue_configs,
 tags,
 agent_availability_timer
 FROM awscc.connect.routing_profiles
-WHERE region = 'us-east-1' AND Identifier = '<RoutingProfileArn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ routing_profile_arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -287,12 +287,12 @@ INSERT INTO awscc.connect.routing_profiles (
  DefaultOutboundQueueArn,
  region
 )
-SELECT 
-'{{ InstanceArn }}',
- '{{ Name }}',
- '{{ Description }}',
- '{{ MediaConcurrencies }}',
- '{{ DefaultOutboundQueueArn }}',
+SELECT
+'{{ instance_arn }}',
+ '{{ name }}',
+ '{{ description }}',
+ '{{ media_concurrencies }}',
+ '{{ default_outbound_queue_arn }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -311,15 +311,15 @@ INSERT INTO awscc.connect.routing_profiles (
  AgentAvailabilityTimer,
  region
 )
-SELECT 
- '{{ InstanceArn }}',
- '{{ Name }}',
- '{{ Description }}',
- '{{ MediaConcurrencies }}',
- '{{ DefaultOutboundQueueArn }}',
- '{{ QueueConfigs }}',
- '{{ Tags }}',
- '{{ AgentAvailabilityTimer }}',
+SELECT
+ '{{ instance_arn }}',
+ '{{ name }}',
+ '{{ description }}',
+ '{{ media_concurrencies }}',
+ '{{ default_outbound_queue_arn }}',
+ '{{ queue_configs }}',
+ '{{ tags }}',
+ '{{ agent_availability_timer }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -337,34 +337,33 @@ globals:
 resources:
   - name: routing_profile
     props:
-      - name: InstanceArn
-        value: '{{ InstanceArn }}'
-      - name: Name
-        value: '{{ Name }}'
-      - name: Description
-        value: '{{ Description }}'
-      - name: MediaConcurrencies
+      - name: instance_arn
+        value: '{{ instance_arn }}'
+      - name: name
+        value: '{{ name }}'
+      - name: description
+        value: '{{ description }}'
+      - name: media_concurrencies
         value:
-          - Channel: '{{ Channel }}'
-            Concurrency: '{{ Concurrency }}'
-            CrossChannelBehavior:
-              BehaviorType: '{{ BehaviorType }}'
-      - name: DefaultOutboundQueueArn
-        value: '{{ DefaultOutboundQueueArn }}'
-      - name: QueueConfigs
+          - channel: '{{ channel }}'
+            concurrency: '{{ concurrency }}'
+            cross_channel_behavior:
+              behavior_type: '{{ behavior_type }}'
+      - name: default_outbound_queue_arn
+        value: '{{ default_outbound_queue_arn }}'
+      - name: queue_configs
         value:
-          - Delay: '{{ Delay }}'
-            Priority: '{{ Priority }}'
-            QueueReference:
-              Channel: null
-              QueueArn: '{{ QueueArn }}'
-      - name: Tags
+          - delay: '{{ delay }}'
+            priority: '{{ priority }}'
+            queue_reference:
+              channel: null
+              queue_arn: '{{ queue_arn }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-      - name: AgentAvailabilityTimer
-        value: '{{ AgentAvailabilityTimer }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
+      - name: agent_availability_timer
+        value: '{{ agent_availability_timer }}'
 ```
 </TabItem>
 </Tabs>
@@ -387,7 +386,7 @@ SET PatchDocument = string('{{ {
     "AgentAvailabilityTimer": agent_availability_timer
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<RoutingProfileArn>';
+AND Identifier = '{{ routing_profile_arn }}';
 ```
 
 
@@ -396,7 +395,7 @@ AND Identifier = '<RoutingProfileArn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.connect.routing_profiles
-WHERE Identifier = '<RoutingProfileArn>'
+WHERE Identifier = '{{ routing_profile_arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/connect/rules/index.md b/website/docs/services/connect/rules/index.md
index 02a7c7dfa..c3f7dc8ce 100644
--- a/website/docs/services/connect/rules/index.md
+++ b/website/docs/services/connect/rules/index.md
@@ -334,7 +334,7 @@ actions,
 publish_status,
 tags
 FROM awscc.connect.rules
-WHERE region = 'us-east-1' AND Identifier = '<RuleArn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ rule_arn }}';
 ```
 
 ## `INSERT` example
@@ -362,13 +362,13 @@ INSERT INTO awscc.connect.rules (
  PublishStatus,
  region
 )
-SELECT 
-'{{ Name }}',
- '{{ InstanceArn }}',
- '{{ TriggerEventSource }}',
- '{{ Function }}',
- '{{ Actions }}',
- '{{ PublishStatus }}',
+SELECT
+'{{ name }}',
+ '{{ instance_arn }}',
+ '{{ trigger_event_source }}',
+ '{{ function }}',
+ '{{ actions }}',
+ '{{ publish_status }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -386,14 +386,14 @@ INSERT INTO awscc.connect.rules (
  Tags,
  region
 )
-SELECT 
- '{{ Name }}',
- '{{ InstanceArn }}',
- '{{ TriggerEventSource }}',
- '{{ Function }}',
- '{{ Actions }}',
- '{{ PublishStatus }}',
- '{{ Tags }}',
+SELECT
+ '{{ name }}',
+ '{{ instance_arn }}',
+ '{{ trigger_event_source }}',
+ '{{ function }}',
+ '{{ actions }}',
+ '{{ publish_status }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -411,58 +411,57 @@ globals:
 resources:
   - name: rule
     props:
-      - name: Name
-        value: '{{ Name }}'
-      - name: InstanceArn
-        value: '{{ InstanceArn }}'
-      - name: TriggerEventSource
+      - name: name
+        value: '{{ name }}'
+      - name: instance_arn
+        value: '{{ instance_arn }}'
+      - name: trigger_event_source
         value:
-          EventSourceName: '{{ EventSourceName }}'
-          IntegrationAssociationArn: '{{ IntegrationAssociationArn }}'
-      - name: Function
-        value: '{{ Function }}'
-      - name: Actions
+          event_source_name: '{{ event_source_name }}'
+          integration_association_arn: '{{ integration_association_arn }}'
+      - name: function
+        value: '{{ function }}'
+      - name: actions
         value:
-          AssignContactCategoryActions:
+          assign_contact_category_actions:
             - {}
-          EventBridgeActions:
-            - Name: '{{ Name }}'
-          TaskActions:
-            - Name: '{{ Name }}'
-              Description: '{{ Description }}'
-              ContactFlowArn: '{{ ContactFlowArn }}'
-              References: null
-          SendNotificationActions:
-            - DeliveryMethod: '{{ DeliveryMethod }}'
-              Subject: '{{ Subject }}'
-              Content: '{{ Content }}'
-              ContentType: '{{ ContentType }}'
-              Recipient:
-                UserTags: null
-                UserArns:
-                  - '{{ UserArns[0] }}'
-          CreateCaseActions:
-            - Fields:
-                - Id:
-                    Name: '{{ Name }}'
-                  Description: '{{ Description }}'
-                  Type: '{{ Type }}'
-                  SingleSelectOptions:
-                    - '{{ SingleSelectOptions[0] }}'
-              TemplateId: '{{ TemplateId }}'
-          UpdateCaseActions:
-            - Fields: null
-          EndAssociatedTasksActions:
+          event_bridge_actions:
+            - name: '{{ name }}'
+          task_actions:
+            - name: '{{ name }}'
+              description: '{{ description }}'
+              contact_flow_arn: '{{ contact_flow_arn }}'
+              references: null
+          send_notification_actions:
+            - delivery_method: '{{ delivery_method }}'
+              subject: '{{ subject }}'
+              content: '{{ content }}'
+              content_type: '{{ content_type }}'
+              recipient:
+                user_tags: null
+                user_arns:
+                  - '{{ user_arns[0] }}'
+          create_case_actions:
+            - fields:
+                - id:
+                    name: '{{ name }}'
+                  description: '{{ description }}'
+                  type: '{{ type }}'
+                  single_select_options:
+                    - '{{ single_select_options[0] }}'
+              template_id: '{{ template_id }}'
+          update_case_actions:
+            - fields: null
+          end_associated_tasks_actions:
             - {}
-          SubmitAutoEvaluationActions:
-            - EvaluationFormArn: '{{ EvaluationFormArn }}'
-      - name: PublishStatus
-        value: '{{ PublishStatus }}'
-      - name: Tags
+          submit_auto_evaluation_actions:
+            - evaluation_form_arn: '{{ evaluation_form_arn }}'
+      - name: publish_status
+        value: '{{ publish_status }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -482,7 +481,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<RuleArn>';
+AND Identifier = '{{ rule_arn }}';
 ```
 
 
@@ -491,7 +490,7 @@ AND Identifier = '<RuleArn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.connect.rules
-WHERE Identifier = '<RuleArn>'
+WHERE Identifier = '{{ rule_arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/connect/security_keys/index.md b/website/docs/services/connect/security_keys/index.md
index 00391f0e3..da3acb993 100644
--- a/website/docs/services/connect/security_keys/index.md
+++ b/website/docs/services/connect/security_keys/index.md
@@ -145,7 +145,7 @@ key,
 instance_id,
 association_id
 FROM awscc.connect.security_keys
-WHERE region = 'us-east-1' AND Identifier = '<InstanceId>|<AssociationId>';
+WHERE region = 'us-east-1' AND Identifier = '{{ instance_id }}|{{ association_id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -183,9 +183,9 @@ INSERT INTO awscc.connect.security_keys (
  InstanceId,
  region
 )
-SELECT 
-'{{ Key }}',
- '{{ InstanceId }}',
+SELECT
+'{{ key }}',
+ '{{ instance_id }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -198,9 +198,9 @@ INSERT INTO awscc.connect.security_keys (
  InstanceId,
  region
 )
-SELECT 
- '{{ Key }}',
- '{{ InstanceId }}',
+SELECT
+ '{{ key }}',
+ '{{ instance_id }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -218,11 +218,10 @@ globals:
 resources:
   - name: security_key
     props:
-      - name: Key
-        value: '{{ Key }}'
-      - name: InstanceId
-        value: '{{ InstanceId }}'
-
+      - name: key
+        value: '{{ key }}'
+      - name: instance_id
+        value: '{{ instance_id }}'
 ```
 </TabItem>
 </Tabs>
@@ -233,7 +232,7 @@ resources:
 ```sql
 /*+ delete */
 DELETE FROM awscc.connect.security_keys
-WHERE Identifier = '<InstanceId|AssociationId>'
+WHERE Identifier = '{{ instance_id }}|{{ association_id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/connect/security_profiles/index.md b/website/docs/services/connect/security_profiles/index.md
index ce9282dfa..5bfe7ffa1 100644
--- a/website/docs/services/connect/security_profiles/index.md
+++ b/website/docs/services/connect/security_profiles/index.md
@@ -230,7 +230,7 @@ tags,
 last_modified_region,
 last_modified_time
 FROM awscc.connect.security_profiles
-WHERE region = 'us-east-1' AND Identifier = '<SecurityProfileArn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ security_profile_arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -267,9 +267,9 @@ INSERT INTO awscc.connect.security_profiles (
  SecurityProfileName,
  region
 )
-SELECT 
-'{{ InstanceArn }}',
- '{{ SecurityProfileName }}',
+SELECT
+'{{ instance_arn }}',
+ '{{ security_profile_name }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -290,17 +290,17 @@ INSERT INTO awscc.connect.security_profiles (
  Tags,
  region
 )
-SELECT 
- '{{ AllowedAccessControlTags }}',
- '{{ Description }}',
- '{{ InstanceArn }}',
- '{{ Permissions }}',
- '{{ SecurityProfileName }}',
- '{{ TagRestrictedResources }}',
- '{{ HierarchyRestrictedResources }}',
- '{{ AllowedAccessControlHierarchyGroupId }}',
- '{{ Applications }}',
- '{{ Tags }}',
+SELECT
+ '{{ allowed_access_control_tags }}',
+ '{{ description }}',
+ '{{ instance_arn }}',
+ '{{ permissions }}',
+ '{{ security_profile_name }}',
+ '{{ tag_restricted_resources }}',
+ '{{ hierarchy_restricted_resources }}',
+ '{{ allowed_access_control_hierarchy_group_id }}',
+ '{{ applications }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -318,36 +318,35 @@ globals:
 resources:
   - name: security_profile
     props:
-      - name: AllowedAccessControlTags
+      - name: allowed_access_control_tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-      - name: Description
-        value: '{{ Description }}'
-      - name: InstanceArn
-        value: '{{ InstanceArn }}'
-      - name: Permissions
+          - key: '{{ key }}'
+            value: '{{ value }}'
+      - name: description
+        value: '{{ description }}'
+      - name: instance_arn
+        value: '{{ instance_arn }}'
+      - name: permissions
         value:
-          - '{{ Permissions[0] }}'
-      - name: SecurityProfileName
-        value: '{{ SecurityProfileName }}'
-      - name: TagRestrictedResources
+          - '{{ permissions[0] }}'
+      - name: security_profile_name
+        value: '{{ security_profile_name }}'
+      - name: tag_restricted_resources
         value:
-          - '{{ TagRestrictedResources[0] }}'
-      - name: HierarchyRestrictedResources
+          - '{{ tag_restricted_resources[0] }}'
+      - name: hierarchy_restricted_resources
         value:
           - null
-      - name: AllowedAccessControlHierarchyGroupId
-        value: '{{ AllowedAccessControlHierarchyGroupId }}'
-      - name: Applications
+      - name: allowed_access_control_hierarchy_group_id
+        value: '{{ allowed_access_control_hierarchy_group_id }}'
+      - name: applications
         value:
-          - ApplicationPermissions:
-              - '{{ ApplicationPermissions[0] }}'
-            Namespace: '{{ Namespace }}'
-      - name: Tags
+          - application_permissions:
+              - '{{ application_permissions[0] }}'
+            namespace: '{{ namespace }}'
+      - name: tags
         value:
           - null
-
 ```
 </TabItem>
 </Tabs>
@@ -370,7 +369,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<SecurityProfileArn>';
+AND Identifier = '{{ security_profile_arn }}';
 ```
 
 
@@ -379,7 +378,7 @@ AND Identifier = '<SecurityProfileArn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.connect.security_profiles
-WHERE Identifier = '<SecurityProfileArn>'
+WHERE Identifier = '{{ security_profile_arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/connect/task_templates/index.md b/website/docs/services/connect/task_templates/index.md
index c35c6dd97..d6d92bcdd 100644
--- a/website/docs/services/connect/task_templates/index.md
+++ b/website/docs/services/connect/task_templates/index.md
@@ -319,7 +319,7 @@ status,
 client_token,
 tags
 FROM awscc.connect.task_templates
-WHERE region = 'us-east-1' AND Identifier = '<Arn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -355,8 +355,8 @@ INSERT INTO awscc.connect.task_templates (
  InstanceArn,
  region
 )
-SELECT 
-'{{ InstanceArn }}',
+SELECT
+'{{ instance_arn }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -378,18 +378,18 @@ INSERT INTO awscc.connect.task_templates (
  Tags,
  region
 )
-SELECT 
- '{{ InstanceArn }}',
- '{{ Name }}',
- '{{ Description }}',
- '{{ ContactFlowArn }}',
- '{{ SelfAssignContactFlowArn }}',
- '{{ Constraints }}',
- '{{ Defaults }}',
- '{{ Fields }}',
- '{{ Status }}',
- '{{ ClientToken }}',
- '{{ Tags }}',
+SELECT
+ '{{ instance_arn }}',
+ '{{ name }}',
+ '{{ description }}',
+ '{{ contact_flow_arn }}',
+ '{{ self_assign_contact_flow_arn }}',
+ '{{ constraints }}',
+ '{{ defaults }}',
+ '{{ fields }}',
+ '{{ status }}',
+ '{{ client_token }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -407,45 +407,44 @@ globals:
 resources:
   - name: task_template
     props:
-      - name: InstanceArn
-        value: '{{ InstanceArn }}'
-      - name: Name
-        value: '{{ Name }}'
-      - name: Description
-        value: '{{ Description }}'
-      - name: ContactFlowArn
-        value: '{{ ContactFlowArn }}'
-      - name: SelfAssignContactFlowArn
-        value: '{{ SelfAssignContactFlowArn }}'
-      - name: Constraints
+      - name: instance_arn
+        value: '{{ instance_arn }}'
+      - name: name
+        value: '{{ name }}'
+      - name: description
+        value: '{{ description }}'
+      - name: contact_flow_arn
+        value: '{{ contact_flow_arn }}'
+      - name: self_assign_contact_flow_arn
+        value: '{{ self_assign_contact_flow_arn }}'
+      - name: constraints
         value:
-          InvisibleFields:
-            - Id:
-                Name: '{{ Name }}'
-          RequiredFields:
-            - Id: null
-          ReadOnlyFields:
-            - Id: null
-      - name: Defaults
+          invisible_fields:
+            - id:
+                name: '{{ name }}'
+          required_fields:
+            - id: null
+          read_only_fields:
+            - id: null
+      - name: defaults
         value:
-          - Id: null
-            DefaultValue: '{{ DefaultValue }}'
-      - name: Fields
+          - id: null
+            default_value: '{{ default_value }}'
+      - name: fields
         value:
-          - Id: null
-            Description: '{{ Description }}'
-            Type: '{{ Type }}'
-            SingleSelectOptions:
-              - '{{ SingleSelectOptions[0] }}'
-      - name: Status
-        value: '{{ Status }}'
-      - name: ClientToken
-        value: '{{ ClientToken }}'
-      - name: Tags
+          - id: null
+            description: '{{ description }}'
+            type: '{{ type }}'
+            single_select_options:
+              - '{{ single_select_options[0] }}'
+      - name: status
+        value: '{{ status }}'
+      - name: client_token
+        value: '{{ client_token }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -471,7 +470,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Arn>';
+AND Identifier = '{{ arn }}';
 ```
 
 
@@ -480,7 +479,7 @@ AND Identifier = '<Arn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.connect.task_templates
-WHERE Identifier = '<Arn>'
+WHERE Identifier = '{{ arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/connect/traffic_distribution_groups/index.md b/website/docs/services/connect/traffic_distribution_groups/index.md
index b7178db58..d1342f23b 100644
--- a/website/docs/services/connect/traffic_distribution_groups/index.md
+++ b/website/docs/services/connect/traffic_distribution_groups/index.md
@@ -182,7 +182,7 @@ status,
 tags,
 is_default
 FROM awscc.connect.traffic_distribution_groups
-WHERE region = 'us-east-1' AND Identifier = '<TrafficDistributionGroupArn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ traffic_distribution_group_arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -219,9 +219,9 @@ INSERT INTO awscc.connect.traffic_distribution_groups (
  Name,
  region
 )
-SELECT 
-'{{ InstanceArn }}',
- '{{ Name }}',
+SELECT
+'{{ instance_arn }}',
+ '{{ name }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -236,11 +236,11 @@ INSERT INTO awscc.connect.traffic_distribution_groups (
  Tags,
  region
 )
-SELECT 
- '{{ InstanceArn }}',
- '{{ Description }}',
- '{{ Name }}',
- '{{ Tags }}',
+SELECT
+ '{{ instance_arn }}',
+ '{{ description }}',
+ '{{ name }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -258,17 +258,16 @@ globals:
 resources:
   - name: traffic_distribution_group
     props:
-      - name: InstanceArn
-        value: '{{ InstanceArn }}'
-      - name: Description
-        value: '{{ Description }}'
-      - name: Name
-        value: '{{ Name }}'
-      - name: Tags
+      - name: instance_arn
+        value: '{{ instance_arn }}'
+      - name: description
+        value: '{{ description }}'
+      - name: name
+        value: '{{ name }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -285,7 +284,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<TrafficDistributionGroupArn>';
+AND Identifier = '{{ traffic_distribution_group_arn }}';
 ```
 
 
@@ -294,7 +293,7 @@ AND Identifier = '<TrafficDistributionGroupArn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.connect.traffic_distribution_groups
-WHERE Identifier = '<TrafficDistributionGroupArn>'
+WHERE Identifier = '{{ traffic_distribution_group_arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/connect/user_hierarchy_groups/index.md b/website/docs/services/connect/user_hierarchy_groups/index.md
index 9915a0977..368b4d6e0 100644
--- a/website/docs/services/connect/user_hierarchy_groups/index.md
+++ b/website/docs/services/connect/user_hierarchy_groups/index.md
@@ -165,7 +165,7 @@ parent_group_arn,
 name,
 tags
 FROM awscc.connect.user_hierarchy_groups
-WHERE region = 'us-east-1' AND Identifier = '<UserHierarchyGroupArn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ user_hierarchy_group_arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -202,9 +202,9 @@ INSERT INTO awscc.connect.user_hierarchy_groups (
  Name,
  region
 )
-SELECT 
-'{{ InstanceArn }}',
- '{{ Name }}',
+SELECT
+'{{ instance_arn }}',
+ '{{ name }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -219,11 +219,11 @@ INSERT INTO awscc.connect.user_hierarchy_groups (
  Tags,
  region
 )
-SELECT 
- '{{ InstanceArn }}',
- '{{ ParentGroupArn }}',
- '{{ Name }}',
- '{{ Tags }}',
+SELECT
+ '{{ instance_arn }}',
+ '{{ parent_group_arn }}',
+ '{{ name }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -241,17 +241,16 @@ globals:
 resources:
   - name: user_hierarchy_group
     props:
-      - name: InstanceArn
-        value: '{{ InstanceArn }}'
-      - name: ParentGroupArn
-        value: '{{ ParentGroupArn }}'
-      - name: Name
-        value: '{{ Name }}'
-      - name: Tags
+      - name: instance_arn
+        value: '{{ instance_arn }}'
+      - name: parent_group_arn
+        value: '{{ parent_group_arn }}'
+      - name: name
+        value: '{{ name }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -269,7 +268,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<UserHierarchyGroupArn>';
+AND Identifier = '{{ user_hierarchy_group_arn }}';
 ```
 
 
@@ -278,7 +277,7 @@ AND Identifier = '<UserHierarchyGroupArn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.connect.user_hierarchy_groups
-WHERE Identifier = '<UserHierarchyGroupArn>'
+WHERE Identifier = '{{ user_hierarchy_group_arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/connect/user_hierarchy_structures/index.md b/website/docs/services/connect/user_hierarchy_structures/index.md
index 41d4b1bee..77d5abd18 100644
--- a/website/docs/services/connect/user_hierarchy_structures/index.md
+++ b/website/docs/services/connect/user_hierarchy_structures/index.md
@@ -212,7 +212,7 @@ instance_arn,
 user_hierarchy_structure_arn,
 user_hierarchy_structure
 FROM awscc.connect.user_hierarchy_structures
-WHERE region = 'us-east-1' AND Identifier = '<UserHierarchyStructureArn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ user_hierarchy_structure_arn }}';
 ```
 
 ## `INSERT` example
@@ -235,8 +235,8 @@ INSERT INTO awscc.connect.user_hierarchy_structures (
  InstanceArn,
  region
 )
-SELECT 
-'{{ InstanceArn }}',
+SELECT
+'{{ instance_arn }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -249,9 +249,9 @@ INSERT INTO awscc.connect.user_hierarchy_structures (
  UserHierarchyStructure,
  region
 )
-SELECT 
- '{{ InstanceArn }}',
- '{{ UserHierarchyStructure }}',
+SELECT
+ '{{ instance_arn }}',
+ '{{ user_hierarchy_structure }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -269,31 +269,30 @@ globals:
 resources:
   - name: user_hierarchy_structure
     props:
-      - name: InstanceArn
-        value: '{{ InstanceArn }}'
-      - name: UserHierarchyStructure
+      - name: instance_arn
+        value: '{{ instance_arn }}'
+      - name: user_hierarchy_structure
         value:
-          LevelOne:
-            HierarchyLevelArn: '{{ HierarchyLevelArn }}'
-            HierarchyLevelId: '{{ HierarchyLevelId }}'
-            Name: '{{ Name }}'
-          LevelTwo:
-            HierarchyLevelArn: null
-            HierarchyLevelId: null
-            Name: null
-          LevelThree:
-            HierarchyLevelArn: null
-            HierarchyLevelId: null
-            Name: null
-          LevelFour:
-            HierarchyLevelArn: null
-            HierarchyLevelId: null
-            Name: null
-          LevelFive:
-            HierarchyLevelArn: null
-            HierarchyLevelId: null
-            Name: null
-
+          level_one:
+            hierarchy_level_arn: '{{ hierarchy_level_arn }}'
+            hierarchy_level_id: '{{ hierarchy_level_id }}'
+            name: '{{ name }}'
+          level_two:
+            hierarchy_level_arn: null
+            hierarchy_level_id: null
+            name: null
+          level_three:
+            hierarchy_level_arn: null
+            hierarchy_level_id: null
+            name: null
+          level_four:
+            hierarchy_level_arn: null
+            hierarchy_level_id: null
+            name: null
+          level_five:
+            hierarchy_level_arn: null
+            hierarchy_level_id: null
+            name: null
 ```
 </TabItem>
 </Tabs>
@@ -309,7 +308,7 @@ SET PatchDocument = string('{{ {
     "UserHierarchyStructure": user_hierarchy_structure
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<UserHierarchyStructureArn>';
+AND Identifier = '{{ user_hierarchy_structure_arn }}';
 ```
 
 
@@ -318,7 +317,7 @@ AND Identifier = '<UserHierarchyStructureArn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.connect.user_hierarchy_structures
-WHERE Identifier = '<UserHierarchyStructureArn>'
+WHERE Identifier = '{{ user_hierarchy_structure_arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/connect/users/index.md b/website/docs/services/connect/users/index.md
index 0b10620d2..9149c93c2 100644
--- a/website/docs/services/connect/users/index.md
+++ b/website/docs/services/connect/users/index.md
@@ -283,7 +283,7 @@ user_arn,
 tags,
 user_proficiencies
 FROM awscc.connect.users
-WHERE region = 'us-east-1' AND Identifier = '<UserArn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ user_arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -323,12 +323,12 @@ INSERT INTO awscc.connect.users (
  SecurityProfileArns,
  region
 )
-SELECT 
-'{{ InstanceArn }}',
- '{{ Username }}',
- '{{ RoutingProfileArn }}',
- '{{ PhoneConfig }}',
- '{{ SecurityProfileArns }}',
+SELECT
+'{{ instance_arn }}',
+ '{{ username }}',
+ '{{ routing_profile_arn }}',
+ '{{ phone_config }}',
+ '{{ security_profile_arns }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -350,18 +350,18 @@ INSERT INTO awscc.connect.users (
  UserProficiencies,
  region
 )
-SELECT 
- '{{ InstanceArn }}',
- '{{ DirectoryUserId }}',
- '{{ HierarchyGroupArn }}',
- '{{ Username }}',
- '{{ Password }}',
- '{{ RoutingProfileArn }}',
- '{{ IdentityInfo }}',
- '{{ PhoneConfig }}',
- '{{ SecurityProfileArns }}',
- '{{ Tags }}',
- '{{ UserProficiencies }}',
+SELECT
+ '{{ instance_arn }}',
+ '{{ directory_user_id }}',
+ '{{ hierarchy_group_arn }}',
+ '{{ username }}',
+ '{{ password }}',
+ '{{ routing_profile_arn }}',
+ '{{ identity_info }}',
+ '{{ phone_config }}',
+ '{{ security_profile_arns }}',
+ '{{ tags }}',
+ '{{ user_proficiencies }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -379,45 +379,44 @@ globals:
 resources:
   - name: user
     props:
-      - name: InstanceArn
-        value: '{{ InstanceArn }}'
-      - name: DirectoryUserId
-        value: '{{ DirectoryUserId }}'
-      - name: HierarchyGroupArn
-        value: '{{ HierarchyGroupArn }}'
-      - name: Username
-        value: '{{ Username }}'
-      - name: Password
-        value: '{{ Password }}'
-      - name: RoutingProfileArn
-        value: '{{ RoutingProfileArn }}'
-      - name: IdentityInfo
+      - name: instance_arn
+        value: '{{ instance_arn }}'
+      - name: directory_user_id
+        value: '{{ directory_user_id }}'
+      - name: hierarchy_group_arn
+        value: '{{ hierarchy_group_arn }}'
+      - name: username
+        value: '{{ username }}'
+      - name: password
+        value: '{{ password }}'
+      - name: routing_profile_arn
+        value: '{{ routing_profile_arn }}'
+      - name: identity_info
         value:
-          FirstName: '{{ FirstName }}'
-          LastName: '{{ LastName }}'
-          Email: '{{ Email }}'
-          SecondaryEmail: '{{ SecondaryEmail }}'
-          Mobile: '{{ Mobile }}'
-      - name: PhoneConfig
+          first_name: '{{ first_name }}'
+          last_name: '{{ last_name }}'
+          email: '{{ email }}'
+          secondary_email: '{{ secondary_email }}'
+          mobile: '{{ mobile }}'
+      - name: phone_config
         value:
-          AfterContactWorkTimeLimit: '{{ AfterContactWorkTimeLimit }}'
-          AutoAccept: '{{ AutoAccept }}'
-          DeskPhoneNumber: '{{ DeskPhoneNumber }}'
-          PhoneType: '{{ PhoneType }}'
-          PersistentConnection: '{{ PersistentConnection }}'
-      - name: SecurityProfileArns
+          after_contact_work_time_limit: '{{ after_contact_work_time_limit }}'
+          auto_accept: '{{ auto_accept }}'
+          desk_phone_number: '{{ desk_phone_number }}'
+          phone_type: '{{ phone_type }}'
+          persistent_connection: '{{ persistent_connection }}'
+      - name: security_profile_arns
         value:
-          - '{{ SecurityProfileArns[0] }}'
-      - name: Tags
+          - '{{ security_profile_arns[0] }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-      - name: UserProficiencies
+          - key: '{{ key }}'
+            value: '{{ value }}'
+      - name: user_proficiencies
         value:
-          - AttributeName: '{{ AttributeName }}'
-            AttributeValue: '{{ AttributeValue }}'
-            Level: null
-
+          - attribute_name: '{{ attribute_name }}'
+            attribute_value: '{{ attribute_value }}'
+            level: null
 ```
 </TabItem>
 </Tabs>
@@ -443,7 +442,7 @@ SET PatchDocument = string('{{ {
     "UserProficiencies": user_proficiencies
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<UserArn>';
+AND Identifier = '{{ user_arn }}';
 ```
 
 
@@ -452,7 +451,7 @@ AND Identifier = '<UserArn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.connect.users
-WHERE Identifier = '<UserArn>'
+WHERE Identifier = '{{ user_arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/connect/view_versions/index.md b/website/docs/services/connect/view_versions/index.md
index f085f21a3..1b6f87de3 100644
--- a/website/docs/services/connect/view_versions/index.md
+++ b/website/docs/services/connect/view_versions/index.md
@@ -157,7 +157,7 @@ version_description,
 view_content_sha256,
 version
 FROM awscc.connect.view_versions
-WHERE region = 'us-east-1' AND Identifier = '<ViewVersionArn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ view_version_arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -193,8 +193,8 @@ INSERT INTO awscc.connect.view_versions (
  ViewArn,
  region
 )
-SELECT 
-'{{ ViewArn }}',
+SELECT
+'{{ view_arn }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -208,10 +208,10 @@ INSERT INTO awscc.connect.view_versions (
  ViewContentSha256,
  region
 )
-SELECT 
- '{{ ViewArn }}',
- '{{ VersionDescription }}',
- '{{ ViewContentSha256 }}',
+SELECT
+ '{{ view_arn }}',
+ '{{ version_description }}',
+ '{{ view_content_sha256 }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -229,13 +229,12 @@ globals:
 resources:
   - name: view_version
     props:
-      - name: ViewArn
-        value: '{{ ViewArn }}'
-      - name: VersionDescription
-        value: '{{ VersionDescription }}'
-      - name: ViewContentSha256
-        value: '{{ ViewContentSha256 }}'
-
+      - name: view_arn
+        value: '{{ view_arn }}'
+      - name: version_description
+        value: '{{ version_description }}'
+      - name: view_content_sha256
+        value: '{{ view_content_sha256 }}'
 ```
 </TabItem>
 </Tabs>
@@ -246,7 +245,7 @@ resources:
 ```sql
 /*+ delete */
 DELETE FROM awscc.connect.view_versions
-WHERE Identifier = '<ViewVersionArn>'
+WHERE Identifier = '{{ view_version_arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/connect/views/index.md b/website/docs/services/connect/views/index.md
index fbabc6e60..050e8114d 100644
--- a/website/docs/services/connect/views/index.md
+++ b/website/docs/services/connect/views/index.md
@@ -194,7 +194,7 @@ actions,
 view_content_sha256,
 tags
 FROM awscc.connect.views
-WHERE region = 'us-east-1' AND Identifier = '<ViewArn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ view_arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -233,11 +233,11 @@ INSERT INTO awscc.connect.views (
  Actions,
  region
 )
-SELECT 
-'{{ InstanceArn }}',
- '{{ Name }}',
- '{{ Template }}',
- '{{ Actions }}',
+SELECT
+'{{ instance_arn }}',
+ '{{ name }}',
+ '{{ template }}',
+ '{{ actions }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -254,13 +254,13 @@ INSERT INTO awscc.connect.views (
  Tags,
  region
 )
-SELECT 
- '{{ InstanceArn }}',
- '{{ Name }}',
- '{{ Description }}',
- '{{ Template }}',
- '{{ Actions }}',
- '{{ Tags }}',
+SELECT
+ '{{ instance_arn }}',
+ '{{ name }}',
+ '{{ description }}',
+ '{{ template }}',
+ '{{ actions }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -278,22 +278,21 @@ globals:
 resources:
   - name: view
     props:
-      - name: InstanceArn
-        value: '{{ InstanceArn }}'
-      - name: Name
-        value: '{{ Name }}'
-      - name: Description
-        value: '{{ Description }}'
-      - name: Template
+      - name: instance_arn
+        value: '{{ instance_arn }}'
+      - name: name
+        value: '{{ name }}'
+      - name: description
+        value: '{{ description }}'
+      - name: template
         value: {}
-      - name: Actions
+      - name: actions
         value:
-          - '{{ Actions[0] }}'
-      - name: Tags
+          - '{{ actions[0] }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -314,7 +313,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<ViewArn>';
+AND Identifier = '{{ view_arn }}';
 ```
 
 
@@ -323,7 +322,7 @@ AND Identifier = '<ViewArn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.connect.views
-WHERE Identifier = '<ViewArn>'
+WHERE Identifier = '{{ view_arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/connectcampaigns/campaigns/index.md b/website/docs/services/connectcampaigns/campaigns/index.md
index 7d4009225..e2709a17e 100644
--- a/website/docs/services/connectcampaigns/campaigns/index.md
+++ b/website/docs/services/connectcampaigns/campaigns/index.md
@@ -258,7 +258,7 @@ name,
 outbound_call_config,
 tags
 FROM awscc.connectcampaigns.campaigns
-WHERE region = 'us-east-1' AND Identifier = '<Arn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -297,11 +297,11 @@ INSERT INTO awscc.connectcampaigns.campaigns (
  OutboundCallConfig,
  region
 )
-SELECT 
-'{{ ConnectInstanceArn }}',
- '{{ DialerConfig }}',
- '{{ Name }}',
- '{{ OutboundCallConfig }}',
+SELECT
+'{{ connect_instance_arn }}',
+ '{{ dialer_config }}',
+ '{{ name }}',
+ '{{ outbound_call_config }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -317,12 +317,12 @@ INSERT INTO awscc.connectcampaigns.campaigns (
  Tags,
  region
 )
-SELECT 
- '{{ ConnectInstanceArn }}',
- '{{ DialerConfig }}',
- '{{ Name }}',
- '{{ OutboundCallConfig }}',
- '{{ Tags }}',
+SELECT
+ '{{ connect_instance_arn }}',
+ '{{ dialer_config }}',
+ '{{ name }}',
+ '{{ outbound_call_config }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -340,33 +340,32 @@ globals:
 resources:
   - name: campaign
     props:
-      - name: ConnectInstanceArn
-        value: '{{ ConnectInstanceArn }}'
-      - name: DialerConfig
+      - name: connect_instance_arn
+        value: '{{ connect_instance_arn }}'
+      - name: dialer_config
         value:
-          ProgressiveDialerConfig:
-            BandwidthAllocation: null
-            DialingCapacity: null
-          PredictiveDialerConfig:
-            BandwidthAllocation: null
-            DialingCapacity: null
-          AgentlessDialerConfig:
-            DialingCapacity: null
-      - name: Name
-        value: '{{ Name }}'
-      - name: OutboundCallConfig
+          progressive_dialer_config:
+            bandwidth_allocation: null
+            dialing_capacity: null
+          predictive_dialer_config:
+            bandwidth_allocation: null
+            dialing_capacity: null
+          agentless_dialer_config:
+            dialing_capacity: null
+      - name: name
+        value: '{{ name }}'
+      - name: outbound_call_config
         value:
-          ConnectContactFlowArn: '{{ ConnectContactFlowArn }}'
-          ConnectSourcePhoneNumber: '{{ ConnectSourcePhoneNumber }}'
-          ConnectQueueArn: '{{ ConnectQueueArn }}'
-          AnswerMachineDetectionConfig:
-            EnableAnswerMachineDetection: '{{ EnableAnswerMachineDetection }}'
-            AwaitAnswerMachinePrompt: '{{ AwaitAnswerMachinePrompt }}'
-      - name: Tags
+          connect_contact_flow_arn: '{{ connect_contact_flow_arn }}'
+          connect_source_phone_number: '{{ connect_source_phone_number }}'
+          connect_queue_arn: '{{ connect_queue_arn }}'
+          answer_machine_detection_config:
+            enable_answer_machine_detection: '{{ enable_answer_machine_detection }}'
+            await_answer_machine_prompt: '{{ await_answer_machine_prompt }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -385,7 +384,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Arn>';
+AND Identifier = '{{ arn }}';
 ```
 
 
@@ -394,7 +393,7 @@ AND Identifier = '<Arn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.connectcampaigns.campaigns
-WHERE Identifier = '<Arn>'
+WHERE Identifier = '{{ arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/connectcampaignsv2/campaigns/index.md b/website/docs/services/connectcampaignsv2/campaigns/index.md
index 51567e3da..fe921859e 100644
--- a/website/docs/services/connectcampaignsv2/campaigns/index.md
+++ b/website/docs/services/connectcampaignsv2/campaigns/index.md
@@ -455,7 +455,7 @@ communication_time_config,
 communication_limits_override,
 tags
 FROM awscc.connectcampaignsv2.campaigns
-WHERE region = 'us-east-1' AND Identifier = '<Arn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -493,10 +493,10 @@ INSERT INTO awscc.connectcampaignsv2.campaigns (
  ChannelSubtypeConfig,
  region
 )
-SELECT 
-'{{ Name }}',
- '{{ ConnectInstanceId }}',
- '{{ ChannelSubtypeConfig }}',
+SELECT
+'{{ name }}',
+ '{{ connect_instance_id }}',
+ '{{ channel_subtype_config }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -516,16 +516,16 @@ INSERT INTO awscc.connectcampaignsv2.campaigns (
  Tags,
  region
 )
-SELECT 
- '{{ Name }}',
- '{{ ConnectInstanceId }}',
- '{{ ChannelSubtypeConfig }}',
- '{{ Source }}',
- '{{ ConnectCampaignFlowArn }}',
- '{{ Schedule }}',
- '{{ CommunicationTimeConfig }}',
- '{{ CommunicationLimitsOverride }}',
- '{{ Tags }}',
+SELECT
+ '{{ name }}',
+ '{{ connect_instance_id }}',
+ '{{ channel_subtype_config }}',
+ '{{ source }}',
+ '{{ connect_campaign_flow_arn }}',
+ '{{ schedule }}',
+ '{{ communication_time_config }}',
+ '{{ communication_limits_override }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -543,87 +543,86 @@ globals:
 resources:
   - name: campaign
     props:
-      - name: Name
-        value: '{{ Name }}'
-      - name: ConnectInstanceId
-        value: '{{ ConnectInstanceId }}'
-      - name: ChannelSubtypeConfig
+      - name: name
+        value: '{{ name }}'
+      - name: connect_instance_id
+        value: '{{ connect_instance_id }}'
+      - name: channel_subtype_config
         value:
-          Telephony:
-            Capacity: null
-            ConnectQueueId: '{{ ConnectQueueId }}'
-            OutboundMode:
-              ProgressiveConfig:
-                BandwidthAllocation: null
-              PredictiveConfig:
-                BandwidthAllocation: null
-              AgentlessConfig: {}
-            DefaultOutboundConfig:
-              ConnectContactFlowId: '{{ ConnectContactFlowId }}'
-              ConnectSourcePhoneNumber: '{{ ConnectSourcePhoneNumber }}'
-              AnswerMachineDetectionConfig:
-                EnableAnswerMachineDetection: '{{ EnableAnswerMachineDetection }}'
-                AwaitAnswerMachinePrompt: '{{ AwaitAnswerMachinePrompt }}'
-          Sms:
-            Capacity: null
-            OutboundMode:
-              AgentlessConfig: null
-            DefaultOutboundConfig:
-              ConnectSourcePhoneNumberArn: '{{ ConnectSourcePhoneNumberArn }}'
-              WisdomTemplateArn: null
-          Email:
-            Capacity: null
-            OutboundMode:
-              AgentlessConfig: null
-            DefaultOutboundConfig:
-              ConnectSourceEmailAddress: '{{ ConnectSourceEmailAddress }}'
-              SourceEmailAddressDisplayName: '{{ SourceEmailAddressDisplayName }}'
-              WisdomTemplateArn: null
-      - name: Source
+          telephony:
+            capacity: null
+            connect_queue_id: '{{ connect_queue_id }}'
+            outbound_mode:
+              progressive_config:
+                bandwidth_allocation: null
+              predictive_config:
+                bandwidth_allocation: null
+              agentless_config: {}
+            default_outbound_config:
+              connect_contact_flow_id: '{{ connect_contact_flow_id }}'
+              connect_source_phone_number: '{{ connect_source_phone_number }}'
+              answer_machine_detection_config:
+                enable_answer_machine_detection: '{{ enable_answer_machine_detection }}'
+                await_answer_machine_prompt: '{{ await_answer_machine_prompt }}'
+          sms:
+            capacity: null
+            outbound_mode:
+              agentless_config: null
+            default_outbound_config:
+              connect_source_phone_number_arn: '{{ connect_source_phone_number_arn }}'
+              wisdom_template_arn: null
+          email:
+            capacity: null
+            outbound_mode:
+              agentless_config: null
+            default_outbound_config:
+              connect_source_email_address: '{{ connect_source_email_address }}'
+              source_email_address_display_name: '{{ source_email_address_display_name }}'
+              wisdom_template_arn: null
+      - name: source
         value:
-          CustomerProfilesSegmentArn: null
-          EventTrigger:
-            CustomerProfilesDomainArn: null
-      - name: ConnectCampaignFlowArn
+          customer_profiles_segment_arn: null
+          event_trigger:
+            customer_profiles_domain_arn: null
+      - name: connect_campaign_flow_arn
         value: null
-      - name: Schedule
+      - name: schedule
         value:
-          StartTime: '{{ StartTime }}'
-          EndTime: null
-          RefreshFrequency: '{{ RefreshFrequency }}'
-      - name: CommunicationTimeConfig
+          start_time: '{{ start_time }}'
+          end_time: null
+          refresh_frequency: '{{ refresh_frequency }}'
+      - name: communication_time_config
         value:
-          LocalTimeZoneConfig:
-            DefaultTimeZone: '{{ DefaultTimeZone }}'
-            LocalTimeZoneDetection:
-              - '{{ LocalTimeZoneDetection[0] }}'
-          Telephony:
-            OpenHours:
-              DailyHours:
-                - Key: '{{ Key }}'
-                  Value:
-                    - StartTime: '{{ StartTime }}'
-                      EndTime: null
-            RestrictedPeriods:
-              RestrictedPeriodList:
-                - Name: '{{ Name }}'
-                  StartDate: '{{ StartDate }}'
-                  EndDate: null
-          Sms: null
-          Email: null
-      - name: CommunicationLimitsOverride
+          local_time_zone_config:
+            default_time_zone: '{{ default_time_zone }}'
+            local_time_zone_detection:
+              - '{{ local_time_zone_detection[0] }}'
+          telephony:
+            open_hours:
+              daily_hours:
+                - key: '{{ key }}'
+                  value:
+                    - start_time: '{{ start_time }}'
+                      end_time: null
+            restricted_periods:
+              restricted_period_list:
+                - name: '{{ name }}'
+                  start_date: '{{ start_date }}'
+                  end_date: null
+          sms: null
+          email: null
+      - name: communication_limits_override
         value:
-          AllChannelsSubtypes:
-            CommunicationLimitList:
-              - MaxCountPerRecipient: '{{ MaxCountPerRecipient }}'
-                Frequency: '{{ Frequency }}'
-                Unit: '{{ Unit }}'
-          InstanceLimitsHandling: '{{ InstanceLimitsHandling }}'
-      - name: Tags
+          all_channels_subtypes:
+            communication_limit_list:
+              - max_count_per_recipient: '{{ max_count_per_recipient }}'
+                frequency: '{{ frequency }}'
+                unit: '{{ unit }}'
+          instance_limits_handling: '{{ instance_limits_handling }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -646,7 +645,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Arn>';
+AND Identifier = '{{ arn }}';
 ```
 
 
@@ -655,7 +654,7 @@ AND Identifier = '<Arn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.connectcampaignsv2.campaigns
-WHERE Identifier = '<Arn>'
+WHERE Identifier = '{{ arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/controltower/enabled_baselines/index.md b/website/docs/services/controltower/enabled_baselines/index.md
index d1724951b..63bbbe1d8 100644
--- a/website/docs/services/controltower/enabled_baselines/index.md
+++ b/website/docs/services/controltower/enabled_baselines/index.md
@@ -193,7 +193,7 @@ target_identifier,
 parameters,
 tags
 FROM awscc.controltower.enabled_baselines
-WHERE region = 'us-east-1' AND Identifier = '<EnabledBaselineIdentifier>';
+WHERE region = 'us-east-1' AND Identifier = '{{ enabled_baseline_identifier }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -231,10 +231,10 @@ INSERT INTO awscc.controltower.enabled_baselines (
  TargetIdentifier,
  region
 )
-SELECT 
-'{{ BaselineIdentifier }}',
- '{{ BaselineVersion }}',
- '{{ TargetIdentifier }}',
+SELECT
+'{{ baseline_identifier }}',
+ '{{ baseline_version }}',
+ '{{ target_identifier }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -250,12 +250,12 @@ INSERT INTO awscc.controltower.enabled_baselines (
  Tags,
  region
 )
-SELECT 
- '{{ BaselineIdentifier }}',
- '{{ BaselineVersion }}',
- '{{ TargetIdentifier }}',
- '{{ Parameters }}',
- '{{ Tags }}',
+SELECT
+ '{{ baseline_identifier }}',
+ '{{ baseline_version }}',
+ '{{ target_identifier }}',
+ '{{ parameters }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -273,21 +273,20 @@ globals:
 resources:
   - name: enabled_baseline
     props:
-      - name: BaselineIdentifier
-        value: '{{ BaselineIdentifier }}'
-      - name: BaselineVersion
-        value: '{{ BaselineVersion }}'
-      - name: TargetIdentifier
-        value: '{{ TargetIdentifier }}'
-      - name: Parameters
+      - name: baseline_identifier
+        value: '{{ baseline_identifier }}'
+      - name: baseline_version
+        value: '{{ baseline_version }}'
+      - name: target_identifier
+        value: '{{ target_identifier }}'
+      - name: parameters
         value:
-          - Key: '{{ Key }}'
-            Value: null
-      - name: Tags
+          - key: '{{ key }}'
+            value: null
+      - name: tags
         value:
-          - Value: '{{ Value }}'
-            Key: '{{ Key }}'
-
+          - value: '{{ value }}'
+            key: '{{ key }}'
 ```
 </TabItem>
 </Tabs>
@@ -305,7 +304,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<EnabledBaselineIdentifier>';
+AND Identifier = '{{ enabled_baseline_identifier }}';
 ```
 
 
@@ -314,7 +313,7 @@ AND Identifier = '<EnabledBaselineIdentifier>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.controltower.enabled_baselines
-WHERE Identifier = '<EnabledBaselineIdentifier>'
+WHERE Identifier = '{{ enabled_baseline_identifier }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/controltower/enabled_controls/index.md b/website/docs/services/controltower/enabled_controls/index.md
index 3610d57c4..750b21cc3 100644
--- a/website/docs/services/controltower/enabled_controls/index.md
+++ b/website/docs/services/controltower/enabled_controls/index.md
@@ -181,7 +181,7 @@ target_identifier,
 parameters,
 tags
 FROM awscc.controltower.enabled_controls
-WHERE region = 'us-east-1' AND Identifier = '<TargetIdentifier>|<ControlIdentifier>';
+WHERE region = 'us-east-1' AND Identifier = '{{ target_identifier }}|{{ control_identifier }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -219,9 +219,9 @@ INSERT INTO awscc.controltower.enabled_controls (
  TargetIdentifier,
  region
 )
-SELECT 
-'{{ ControlIdentifier }}',
- '{{ TargetIdentifier }}',
+SELECT
+'{{ control_identifier }}',
+ '{{ target_identifier }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -236,11 +236,11 @@ INSERT INTO awscc.controltower.enabled_controls (
  Tags,
  region
 )
-SELECT 
- '{{ ControlIdentifier }}',
- '{{ TargetIdentifier }}',
- '{{ Parameters }}',
- '{{ Tags }}',
+SELECT
+ '{{ control_identifier }}',
+ '{{ target_identifier }}',
+ '{{ parameters }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -258,19 +258,18 @@ globals:
 resources:
   - name: enabled_control
     props:
-      - name: ControlIdentifier
-        value: '{{ ControlIdentifier }}'
-      - name: TargetIdentifier
-        value: '{{ TargetIdentifier }}'
-      - name: Parameters
+      - name: control_identifier
+        value: '{{ control_identifier }}'
+      - name: target_identifier
+        value: '{{ target_identifier }}'
+      - name: parameters
         value:
-          - Value: null
-            Key: '{{ Key }}'
-      - name: Tags
+          - value: null
+            key: '{{ key }}'
+      - name: tags
         value:
-          - Value: '{{ Value }}'
-            Key: '{{ Key }}'
-
+          - value: '{{ value }}'
+            key: '{{ key }}'
 ```
 </TabItem>
 </Tabs>
@@ -287,7 +286,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<TargetIdentifier>|<ControlIdentifier>';
+AND Identifier = '{{ target_identifier }}|{{ control_identifier }}';
 ```
 
 
@@ -296,7 +295,7 @@ AND Identifier = '<TargetIdentifier>|<ControlIdentifier>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.controltower.enabled_controls
-WHERE Identifier = '<TargetIdentifier|ControlIdentifier>'
+WHERE Identifier = '{{ target_identifier }}|{{ control_identifier }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/controltower/landing_zones/index.md b/website/docs/services/controltower/landing_zones/index.md
index 98222f0ff..5f3a7c8aa 100644
--- a/website/docs/services/controltower/landing_zones/index.md
+++ b/website/docs/services/controltower/landing_zones/index.md
@@ -188,7 +188,7 @@ manifest,
 landing_zone_identifier,
 tags
 FROM awscc.controltower.landing_zones
-WHERE region = 'us-east-1' AND Identifier = '<LandingZoneIdentifier>';
+WHERE region = 'us-east-1' AND Identifier = '{{ landing_zone_identifier }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -225,9 +225,9 @@ INSERT INTO awscc.controltower.landing_zones (
  Manifest,
  region
 )
-SELECT 
-'{{ Version }}',
- '{{ Manifest }}',
+SELECT
+'{{ version }}',
+ '{{ manifest }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -241,10 +241,10 @@ INSERT INTO awscc.controltower.landing_zones (
  Tags,
  region
 )
-SELECT 
- '{{ Version }}',
- '{{ Manifest }}',
- '{{ Tags }}',
+SELECT
+ '{{ version }}',
+ '{{ manifest }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -262,15 +262,14 @@ globals:
 resources:
   - name: landing_zone
     props:
-      - name: Version
-        value: '{{ Version }}'
-      - name: Manifest
+      - name: version
+        value: '{{ version }}'
+      - name: manifest
         value: null
-      - name: Tags
+      - name: tags
         value:
-          - Value: '{{ Value }}'
-            Key: '{{ Key }}'
-
+          - value: '{{ value }}'
+            key: '{{ key }}'
 ```
 </TabItem>
 </Tabs>
@@ -288,7 +287,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<LandingZoneIdentifier>';
+AND Identifier = '{{ landing_zone_identifier }}';
 ```
 
 
@@ -297,7 +296,7 @@ AND Identifier = '<LandingZoneIdentifier>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.controltower.landing_zones
-WHERE Identifier = '<LandingZoneIdentifier>'
+WHERE Identifier = '{{ landing_zone_identifier }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/cur/report_definitions/index.md b/website/docs/services/cur/report_definitions/index.md
index bc1f44387..39afcc023 100644
--- a/website/docs/services/cur/report_definitions/index.md
+++ b/website/docs/services/cur/report_definitions/index.md
@@ -200,7 +200,7 @@ refresh_closed_reports,
 report_versioning,
 billing_view_arn
 FROM awscc.cur.report_definitions
-WHERE region = 'us-east-1' AND Identifier = '<ReportName>';
+WHERE region = 'us-east-1' AND Identifier = '{{ report_name }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -244,16 +244,16 @@ INSERT INTO awscc.cur.report_definitions (
  ReportVersioning,
  region
 )
-SELECT 
-'{{ ReportName }}',
- '{{ TimeUnit }}',
- '{{ Format }}',
- '{{ Compression }}',
- '{{ S3Bucket }}',
- '{{ S3Prefix }}',
- '{{ S3Region }}',
- '{{ RefreshClosedReports }}',
- '{{ ReportVersioning }}',
+SELECT
+'{{ report_name }}',
+ '{{ time_unit }}',
+ '{{ format }}',
+ '{{ compression }}',
+ '{{ s3_bucket }}',
+ '{{ s3_prefix }}',
+ '{{ s3_region }}',
+ '{{ refresh_closed_reports }}',
+ '{{ report_versioning }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -276,19 +276,19 @@ INSERT INTO awscc.cur.report_definitions (
  BillingViewArn,
  region
 )
-SELECT 
- '{{ ReportName }}',
- '{{ TimeUnit }}',
- '{{ Format }}',
- '{{ Compression }}',
- '{{ AdditionalSchemaElements }}',
- '{{ S3Bucket }}',
- '{{ S3Prefix }}',
- '{{ S3Region }}',
- '{{ AdditionalArtifacts }}',
- '{{ RefreshClosedReports }}',
- '{{ ReportVersioning }}',
- '{{ BillingViewArn }}',
+SELECT
+ '{{ report_name }}',
+ '{{ time_unit }}',
+ '{{ format }}',
+ '{{ compression }}',
+ '{{ additional_schema_elements }}',
+ '{{ s3_bucket }}',
+ '{{ s3_prefix }}',
+ '{{ s3_region }}',
+ '{{ additional_artifacts }}',
+ '{{ refresh_closed_reports }}',
+ '{{ report_versioning }}',
+ '{{ billing_view_arn }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -306,33 +306,32 @@ globals:
 resources:
   - name: report_definition
     props:
-      - name: ReportName
-        value: '{{ ReportName }}'
-      - name: TimeUnit
-        value: '{{ TimeUnit }}'
-      - name: Format
-        value: '{{ Format }}'
-      - name: Compression
-        value: '{{ Compression }}'
-      - name: AdditionalSchemaElements
+      - name: report_name
+        value: '{{ report_name }}'
+      - name: time_unit
+        value: '{{ time_unit }}'
+      - name: format
+        value: '{{ format }}'
+      - name: compression
+        value: '{{ compression }}'
+      - name: additional_schema_elements
         value:
-          - '{{ AdditionalSchemaElements[0] }}'
-      - name: S3Bucket
-        value: '{{ S3Bucket }}'
-      - name: S3Prefix
-        value: '{{ S3Prefix }}'
-      - name: S3Region
-        value: '{{ S3Region }}'
-      - name: AdditionalArtifacts
+          - '{{ additional_schema_elements[0] }}'
+      - name: s3_bucket
+        value: '{{ s3_bucket }}'
+      - name: s3_prefix
+        value: '{{ s3_prefix }}'
+      - name: s3_region
+        value: '{{ s3_region }}'
+      - name: additional_artifacts
         value:
-          - '{{ AdditionalArtifacts[0] }}'
-      - name: RefreshClosedReports
-        value: '{{ RefreshClosedReports }}'
-      - name: ReportVersioning
-        value: '{{ ReportVersioning }}'
-      - name: BillingViewArn
-        value: '{{ BillingViewArn }}'
-
+          - '{{ additional_artifacts[0] }}'
+      - name: refresh_closed_reports
+        value: '{{ refresh_closed_reports }}'
+      - name: report_versioning
+        value: '{{ report_versioning }}'
+      - name: billing_view_arn
+        value: '{{ billing_view_arn }}'
 ```
 </TabItem>
 </Tabs>
@@ -354,7 +353,7 @@ SET PatchDocument = string('{{ {
     "RefreshClosedReports": refresh_closed_reports
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<ReportName>';
+AND Identifier = '{{ report_name }}';
 ```
 
 
@@ -363,7 +362,7 @@ AND Identifier = '<ReportName>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.cur.report_definitions
-WHERE Identifier = '<ReportName>'
+WHERE Identifier = '{{ report_name }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/customerprofiles/calculated_attribute_definitions/index.md b/website/docs/services/customerprofiles/calculated_attribute_definitions/index.md
index 1da0bb99f..d409b2fdf 100644
--- a/website/docs/services/customerprofiles/calculated_attribute_definitions/index.md
+++ b/website/docs/services/customerprofiles/calculated_attribute_definitions/index.md
@@ -322,7 +322,7 @@ status,
 readiness,
 tags
 FROM awscc.customerprofiles.calculated_attribute_definitions
-WHERE region = 'us-east-1' AND Identifier = '<DomainName>|<CalculatedAttributeName>';
+WHERE region = 'us-east-1' AND Identifier = '{{ domain_name }}|{{ calculated_attribute_name }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -362,11 +362,11 @@ INSERT INTO awscc.customerprofiles.calculated_attribute_definitions (
  Statistic,
  region
 )
-SELECT 
-'{{ DomainName }}',
- '{{ CalculatedAttributeName }}',
- '{{ AttributeDetails }}',
- '{{ Statistic }}',
+SELECT
+'{{ domain_name }}',
+ '{{ calculated_attribute_name }}',
+ '{{ attribute_details }}',
+ '{{ statistic }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -386,16 +386,16 @@ INSERT INTO awscc.customerprofiles.calculated_attribute_definitions (
  Tags,
  region
 )
-SELECT 
- '{{ DomainName }}',
- '{{ CalculatedAttributeName }}',
- '{{ DisplayName }}',
- '{{ Description }}',
- '{{ AttributeDetails }}',
- '{{ Conditions }}',
- '{{ Statistic }}',
- '{{ UseHistoricalData }}',
- '{{ Tags }}',
+SELECT
+ '{{ domain_name }}',
+ '{{ calculated_attribute_name }}',
+ '{{ display_name }}',
+ '{{ description }}',
+ '{{ attribute_details }}',
+ '{{ conditions }}',
+ '{{ statistic }}',
+ '{{ use_historical_data }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -413,42 +413,41 @@ globals:
 resources:
   - name: calculated_attribute_definition
     props:
-      - name: DomainName
-        value: '{{ DomainName }}'
-      - name: CalculatedAttributeName
-        value: '{{ CalculatedAttributeName }}'
-      - name: DisplayName
-        value: '{{ DisplayName }}'
-      - name: Description
-        value: '{{ Description }}'
-      - name: AttributeDetails
+      - name: domain_name
+        value: '{{ domain_name }}'
+      - name: calculated_attribute_name
+        value: '{{ calculated_attribute_name }}'
+      - name: display_name
+        value: '{{ display_name }}'
+      - name: description
+        value: '{{ description }}'
+      - name: attribute_details
         value:
-          Attributes:
-            - Name: '{{ Name }}'
-          Expression: '{{ Expression }}'
-      - name: Conditions
+          attributes:
+            - name: '{{ name }}'
+          expression: '{{ expression }}'
+      - name: conditions
         value:
-          Range:
-            Value: '{{ Value }}'
-            Unit: '{{ Unit }}'
-            ValueRange:
-              Start: '{{ Start }}'
-              End: '{{ End }}'
-            TimestampSource: '{{ TimestampSource }}'
-            TimestampFormat: '{{ TimestampFormat }}'
-          ObjectCount: '{{ ObjectCount }}'
-          Threshold:
-            Value: '{{ Value }}'
-            Operator: '{{ Operator }}'
-      - name: Statistic
-        value: '{{ Statistic }}'
-      - name: UseHistoricalData
-        value: '{{ UseHistoricalData }}'
-      - name: Tags
+          range:
+            value: '{{ value }}'
+            unit: '{{ unit }}'
+            value_range:
+              start: '{{ start }}'
+              end: '{{ end }}'
+            timestamp_source: '{{ timestamp_source }}'
+            timestamp_format: '{{ timestamp_format }}'
+          object_count: '{{ object_count }}'
+          threshold:
+            value: '{{ value }}'
+            operator: '{{ operator }}'
+      - name: statistic
+        value: '{{ statistic }}'
+      - name: use_historical_data
+        value: '{{ use_historical_data }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -468,7 +467,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<DomainName>|<CalculatedAttributeName>';
+AND Identifier = '{{ domain_name }}|{{ calculated_attribute_name }}';
 ```
 
 
@@ -477,7 +476,7 @@ AND Identifier = '<DomainName>|<CalculatedAttributeName>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.customerprofiles.calculated_attribute_definitions
-WHERE Identifier = '<DomainName|CalculatedAttributeName>'
+WHERE Identifier = '{{ domain_name }}|{{ calculated_attribute_name }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/customerprofiles/domains/index.md b/website/docs/services/customerprofiles/domains/index.md
index e3a1b4e78..4c2342b9a 100644
--- a/website/docs/services/customerprofiles/domains/index.md
+++ b/website/docs/services/customerprofiles/domains/index.md
@@ -418,7 +418,7 @@ tags,
 created_at,
 last_updated_at
 FROM awscc.customerprofiles.domains
-WHERE region = 'us-east-1' AND Identifier = '<DomainName>';
+WHERE region = 'us-east-1' AND Identifier = '{{ domain_name }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -455,9 +455,9 @@ INSERT INTO awscc.customerprofiles.domains (
  DefaultExpirationDays,
  region
 )
-SELECT 
-'{{ DomainName }}',
- '{{ DefaultExpirationDays }}',
+SELECT
+'{{ domain_name }}',
+ '{{ default_expiration_days }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -475,14 +475,14 @@ INSERT INTO awscc.customerprofiles.domains (
  Tags,
  region
 )
-SELECT 
- '{{ DomainName }}',
- '{{ DeadLetterQueueUrl }}',
- '{{ DefaultEncryptionKey }}',
- '{{ DefaultExpirationDays }}',
- '{{ Matching }}',
- '{{ RuleBasedMatching }}',
- '{{ Tags }}',
+SELECT
+ '{{ domain_name }}',
+ '{{ dead_letter_queue_url }}',
+ '{{ default_encryption_key }}',
+ '{{ default_expiration_days }}',
+ '{{ matching }}',
+ '{{ rule_based_matching }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -500,57 +500,56 @@ globals:
 resources:
   - name: domain
     props:
-      - name: DomainName
-        value: '{{ DomainName }}'
-      - name: DeadLetterQueueUrl
-        value: '{{ DeadLetterQueueUrl }}'
-      - name: DefaultEncryptionKey
-        value: '{{ DefaultEncryptionKey }}'
-      - name: DefaultExpirationDays
-        value: '{{ DefaultExpirationDays }}'
-      - name: Matching
+      - name: domain_name
+        value: '{{ domain_name }}'
+      - name: dead_letter_queue_url
+        value: '{{ dead_letter_queue_url }}'
+      - name: default_encryption_key
+        value: '{{ default_encryption_key }}'
+      - name: default_expiration_days
+        value: '{{ default_expiration_days }}'
+      - name: matching
         value:
-          Enabled: '{{ Enabled }}'
-          AutoMerging:
-            Enabled: '{{ Enabled }}'
-            ConflictResolution:
-              ConflictResolvingModel: '{{ ConflictResolvingModel }}'
-              SourceName: '{{ SourceName }}'
-            Consolidation:
-              MatchingAttributesList:
+          enabled: '{{ enabled }}'
+          auto_merging:
+            enabled: '{{ enabled }}'
+            conflict_resolution:
+              conflict_resolving_model: '{{ conflict_resolving_model }}'
+              source_name: '{{ source_name }}'
+            consolidation:
+              matching_attributes_list:
                 - - '{{ 0[0] }}'
-            MinAllowedConfidenceScoreForMerging: null
-          ExportingConfig:
-            S3Exporting:
-              S3BucketName: '{{ S3BucketName }}'
-              S3KeyName: '{{ S3KeyName }}'
-          JobSchedule:
-            DayOfTheWeek: '{{ DayOfTheWeek }}'
-            Time: '{{ Time }}'
-      - name: RuleBasedMatching
+            min_allowed_confidence_score_for_merging: null
+          exporting_config:
+            s3_exporting:
+              s3_bucket_name: '{{ s3_bucket_name }}'
+              s3_key_name: '{{ s3_key_name }}'
+          job_schedule:
+            day_of_the_week: '{{ day_of_the_week }}'
+            time: '{{ time }}'
+      - name: rule_based_matching
         value:
-          Enabled: '{{ Enabled }}'
-          AttributeTypesSelector:
-            AttributeMatchingModel: '{{ AttributeMatchingModel }}'
-            Address:
-              - '{{ Address[0] }}'
-            EmailAddress:
-              - '{{ EmailAddress[0] }}'
-            PhoneNumber:
-              - '{{ PhoneNumber[0] }}'
-          ConflictResolution: null
-          ExportingConfig: null
-          MatchingRules:
-            - Rule:
-                - '{{ Rule[0] }}'
-          MaxAllowedRuleLevelForMatching: '{{ MaxAllowedRuleLevelForMatching }}'
-          MaxAllowedRuleLevelForMerging: '{{ MaxAllowedRuleLevelForMerging }}'
-          Status: '{{ Status }}'
-      - name: Tags
+          enabled: '{{ enabled }}'
+          attribute_types_selector:
+            attribute_matching_model: '{{ attribute_matching_model }}'
+            address:
+              - '{{ address[0] }}'
+            email_address:
+              - '{{ email_address[0] }}'
+            phone_number:
+              - '{{ phone_number[0] }}'
+          conflict_resolution: null
+          exporting_config: null
+          matching_rules:
+            - rule:
+                - '{{ rule[0] }}'
+          max_allowed_rule_level_for_matching: '{{ max_allowed_rule_level_for_matching }}'
+          max_allowed_rule_level_for_merging: '{{ max_allowed_rule_level_for_merging }}'
+          status: '{{ status }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -570,7 +569,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<DomainName>';
+AND Identifier = '{{ domain_name }}';
 ```
 
 
@@ -579,7 +578,7 @@ AND Identifier = '<DomainName>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.customerprofiles.domains
-WHERE Identifier = '<DomainName>'
+WHERE Identifier = '{{ domain_name }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/customerprofiles/event_streams/index.md b/website/docs/services/customerprofiles/event_streams/index.md
index 9da896fba..df78559ce 100644
--- a/website/docs/services/customerprofiles/event_streams/index.md
+++ b/website/docs/services/customerprofiles/event_streams/index.md
@@ -200,7 +200,7 @@ created_at,
 state,
 destination_details
 FROM awscc.customerprofiles.event_streams
-WHERE region = 'us-east-1' AND Identifier = '<DomainName>|<EventStreamName>';
+WHERE region = 'us-east-1' AND Identifier = '{{ domain_name }}|{{ event_stream_name }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -239,10 +239,10 @@ INSERT INTO awscc.customerprofiles.event_streams (
  Uri,
  region
 )
-SELECT 
-'{{ DomainName }}',
- '{{ EventStreamName }}',
- '{{ Uri }}',
+SELECT
+'{{ domain_name }}',
+ '{{ event_stream_name }}',
+ '{{ uri }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -257,11 +257,11 @@ INSERT INTO awscc.customerprofiles.event_streams (
  Tags,
  region
 )
-SELECT 
- '{{ DomainName }}',
- '{{ EventStreamName }}',
- '{{ Uri }}',
- '{{ Tags }}',
+SELECT
+ '{{ domain_name }}',
+ '{{ event_stream_name }}',
+ '{{ uri }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -279,17 +279,16 @@ globals:
 resources:
   - name: event_stream
     props:
-      - name: DomainName
-        value: '{{ DomainName }}'
-      - name: EventStreamName
-        value: '{{ EventStreamName }}'
-      - name: Uri
-        value: '{{ Uri }}'
-      - name: Tags
+      - name: domain_name
+        value: '{{ domain_name }}'
+      - name: event_stream_name
+        value: '{{ event_stream_name }}'
+      - name: uri
+        value: '{{ uri }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -305,7 +304,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<DomainName>|<EventStreamName>';
+AND Identifier = '{{ domain_name }}|{{ event_stream_name }}';
 ```
 
 
@@ -314,7 +313,7 @@ AND Identifier = '<DomainName>|<EventStreamName>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.customerprofiles.event_streams
-WHERE Identifier = '<DomainName|EventStreamName>'
+WHERE Identifier = '{{ domain_name }}|{{ event_stream_name }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/customerprofiles/event_triggers/index.md b/website/docs/services/customerprofiles/event_triggers/index.md
index 76086afa1..86238bd70 100644
--- a/website/docs/services/customerprofiles/event_triggers/index.md
+++ b/website/docs/services/customerprofiles/event_triggers/index.md
@@ -280,7 +280,7 @@ created_at,
 last_updated_at,
 tags
 FROM awscc.customerprofiles.event_triggers
-WHERE region = 'us-east-1' AND Identifier = '<DomainName>|<EventTriggerName>';
+WHERE region = 'us-east-1' AND Identifier = '{{ domain_name }}|{{ event_trigger_name }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -320,11 +320,11 @@ INSERT INTO awscc.customerprofiles.event_triggers (
  EventTriggerConditions,
  region
 )
-SELECT 
-'{{ DomainName }}',
- '{{ EventTriggerName }}',
- '{{ ObjectTypeName }}',
- '{{ EventTriggerConditions }}',
+SELECT
+'{{ domain_name }}',
+ '{{ event_trigger_name }}',
+ '{{ object_type_name }}',
+ '{{ event_trigger_conditions }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -343,15 +343,15 @@ INSERT INTO awscc.customerprofiles.event_triggers (
  Tags,
  region
 )
-SELECT 
- '{{ DomainName }}',
- '{{ EventTriggerName }}',
- '{{ ObjectTypeName }}',
- '{{ Description }}',
- '{{ EventTriggerConditions }}',
- '{{ EventTriggerLimits }}',
- '{{ SegmentFilter }}',
- '{{ Tags }}',
+SELECT
+ '{{ domain_name }}',
+ '{{ event_trigger_name }}',
+ '{{ object_type_name }}',
+ '{{ description }}',
+ '{{ event_trigger_conditions }}',
+ '{{ event_trigger_limits }}',
+ '{{ segment_filter }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -369,39 +369,38 @@ globals:
 resources:
   - name: event_trigger
     props:
-      - name: DomainName
-        value: '{{ DomainName }}'
-      - name: EventTriggerName
-        value: '{{ EventTriggerName }}'
-      - name: ObjectTypeName
-        value: '{{ ObjectTypeName }}'
-      - name: Description
-        value: '{{ Description }}'
-      - name: EventTriggerConditions
+      - name: domain_name
+        value: '{{ domain_name }}'
+      - name: event_trigger_name
+        value: '{{ event_trigger_name }}'
+      - name: object_type_name
+        value: '{{ object_type_name }}'
+      - name: description
+        value: '{{ description }}'
+      - name: event_trigger_conditions
         value:
-          - EventTriggerDimensions:
-              - ObjectAttributes:
-                  - Source: '{{ Source }}'
-                    FieldName: '{{ FieldName }}'
-                    ComparisonOperator: '{{ ComparisonOperator }}'
-                    Values:
-                      - '{{ Values[0] }}'
-            LogicalOperator: '{{ LogicalOperator }}'
-      - name: EventTriggerLimits
+          - event_trigger_dimensions:
+              - object_attributes:
+                  - source: '{{ source }}'
+                    field_name: '{{ field_name }}'
+                    comparison_operator: '{{ comparison_operator }}'
+                    values:
+                      - '{{ values[0] }}'
+            logical_operator: '{{ logical_operator }}'
+      - name: event_trigger_limits
         value:
-          EventExpiration: '{{ EventExpiration }}'
-          Periods:
-            - Unit: '{{ Unit }}'
-              Value: '{{ Value }}'
-              MaxInvocationsPerProfile: '{{ MaxInvocationsPerProfile }}'
-              Unlimited: '{{ Unlimited }}'
-      - name: SegmentFilter
-        value: '{{ SegmentFilter }}'
-      - name: Tags
+          event_expiration: '{{ event_expiration }}'
+          periods:
+            - unit: '{{ unit }}'
+              value: '{{ value }}'
+              max_invocations_per_profile: '{{ max_invocations_per_profile }}'
+              unlimited: '{{ unlimited }}'
+      - name: segment_filter
+        value: '{{ segment_filter }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -422,7 +421,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<DomainName>|<EventTriggerName>';
+AND Identifier = '{{ domain_name }}|{{ event_trigger_name }}';
 ```
 
 
@@ -431,7 +430,7 @@ AND Identifier = '<DomainName>|<EventTriggerName>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.customerprofiles.event_triggers
-WHERE Identifier = '<DomainName|EventTriggerName>'
+WHERE Identifier = '{{ domain_name }}|{{ event_trigger_name }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/customerprofiles/integrations/index.md b/website/docs/services/customerprofiles/integrations/index.md
index ac29fec0d..4376be124 100644
--- a/website/docs/services/customerprofiles/integrations/index.md
+++ b/website/docs/services/customerprofiles/integrations/index.md
@@ -384,7 +384,7 @@ tags,
 object_type_names,
 event_trigger_names
 FROM awscc.customerprofiles.integrations
-WHERE region = 'us-east-1' AND Identifier = '<DomainName>|<Uri>';
+WHERE region = 'us-east-1' AND Identifier = '{{ domain_name }}|{{ uri }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -421,8 +421,8 @@ INSERT INTO awscc.customerprofiles.integrations (
  DomainName,
  region
 )
-SELECT 
-'{{ DomainName }}',
+SELECT
+'{{ domain_name }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -440,14 +440,14 @@ INSERT INTO awscc.customerprofiles.integrations (
  EventTriggerNames,
  region
 )
-SELECT 
- '{{ DomainName }}',
- '{{ Uri }}',
- '{{ FlowDefinition }}',
- '{{ ObjectTypeName }}',
- '{{ Tags }}',
- '{{ ObjectTypeNames }}',
- '{{ EventTriggerNames }}',
+SELECT
+ '{{ domain_name }}',
+ '{{ uri }}',
+ '{{ flow_definition }}',
+ '{{ object_type_name }}',
+ '{{ tags }}',
+ '{{ object_type_names }}',
+ '{{ event_trigger_names }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -465,73 +465,72 @@ globals:
 resources:
   - name: integration
     props:
-      - name: DomainName
-        value: '{{ DomainName }}'
-      - name: Uri
-        value: '{{ Uri }}'
-      - name: FlowDefinition
+      - name: domain_name
+        value: '{{ domain_name }}'
+      - name: uri
+        value: '{{ uri }}'
+      - name: flow_definition
         value:
-          FlowName: '{{ FlowName }}'
-          Description: '{{ Description }}'
-          KmsArn: '{{ KmsArn }}'
-          Tasks:
-            - ConnectorOperator:
-                Marketo: '{{ Marketo }}'
-                S3: '{{ S3 }}'
-                Salesforce: '{{ Salesforce }}'
-                ServiceNow: '{{ ServiceNow }}'
-                Zendesk: '{{ Zendesk }}'
-              SourceFields:
-                - '{{ SourceFields[0] }}'
-              DestinationField: '{{ DestinationField }}'
-              TaskType: '{{ TaskType }}'
-              TaskProperties:
-                - OperatorPropertyKey: '{{ OperatorPropertyKey }}'
-                  Property: '{{ Property }}'
-          TriggerConfig:
-            TriggerType: '{{ TriggerType }}'
-            TriggerProperties:
-              Scheduled:
-                ScheduleExpression: '{{ ScheduleExpression }}'
-                DataPullMode: '{{ DataPullMode }}'
-                ScheduleStartTime: null
-                ScheduleEndTime: null
-                Timezone: '{{ Timezone }}'
-                ScheduleOffset: '{{ ScheduleOffset }}'
-                FirstExecutionFrom: null
-          SourceFlowConfig:
-            ConnectorType: '{{ ConnectorType }}'
-            ConnectorProfileName: '{{ ConnectorProfileName }}'
-            IncrementalPullConfig:
-              DatetimeTypeFieldName: '{{ DatetimeTypeFieldName }}'
-            SourceConnectorProperties:
-              Marketo:
-                Object: '{{ Object }}'
-              S3:
-                BucketName: '{{ BucketName }}'
-                BucketPrefix: '{{ BucketPrefix }}'
-              Salesforce:
-                Object: null
-                EnableDynamicFieldUpdate: '{{ EnableDynamicFieldUpdate }}'
-                IncludeDeletedRecords: '{{ IncludeDeletedRecords }}'
-              ServiceNow:
-                Object: null
-              Zendesk:
-                Object: null
-      - name: ObjectTypeName
-        value: '{{ ObjectTypeName }}'
-      - name: Tags
+          flow_name: '{{ flow_name }}'
+          description: '{{ description }}'
+          kms_arn: '{{ kms_arn }}'
+          tasks:
+            - connector_operator:
+                marketo: '{{ marketo }}'
+                s3: '{{ s3 }}'
+                salesforce: '{{ salesforce }}'
+                service_now: '{{ service_now }}'
+                zendesk: '{{ zendesk }}'
+              source_fields:
+                - '{{ source_fields[0] }}'
+              destination_field: '{{ destination_field }}'
+              task_type: '{{ task_type }}'
+              task_properties:
+                - operator_property_key: '{{ operator_property_key }}'
+                  property: '{{ property }}'
+          trigger_config:
+            trigger_type: '{{ trigger_type }}'
+            trigger_properties:
+              scheduled:
+                schedule_expression: '{{ schedule_expression }}'
+                data_pull_mode: '{{ data_pull_mode }}'
+                schedule_start_time: null
+                schedule_end_time: null
+                timezone: '{{ timezone }}'
+                schedule_offset: '{{ schedule_offset }}'
+                first_execution_from: null
+          source_flow_config:
+            connector_type: '{{ connector_type }}'
+            connector_profile_name: '{{ connector_profile_name }}'
+            incremental_pull_config:
+              datetime_type_field_name: '{{ datetime_type_field_name }}'
+            source_connector_properties:
+              marketo:
+                object: '{{ object }}'
+              s3:
+                bucket_name: '{{ bucket_name }}'
+                bucket_prefix: '{{ bucket_prefix }}'
+              salesforce:
+                object: null
+                enable_dynamic_field_update: '{{ enable_dynamic_field_update }}'
+                include_deleted_records: '{{ include_deleted_records }}'
+              service_now:
+                object: null
+              zendesk:
+                object: null
+      - name: object_type_name
+        value: '{{ object_type_name }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-      - name: ObjectTypeNames
+          - key: '{{ key }}'
+            value: '{{ value }}'
+      - name: object_type_names
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-      - name: EventTriggerNames
+          - key: '{{ key }}'
+            value: '{{ value }}'
+      - name: event_trigger_names
         value:
-          - '{{ EventTriggerNames[0] }}'
-
+          - '{{ event_trigger_names[0] }}'
 ```
 </TabItem>
 </Tabs>
@@ -551,7 +550,7 @@ SET PatchDocument = string('{{ {
     "EventTriggerNames": event_trigger_names
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<DomainName>|<Uri>';
+AND Identifier = '{{ domain_name }}|{{ uri }}';
 ```
 
 
@@ -560,7 +559,7 @@ AND Identifier = '<DomainName>|<Uri>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.customerprofiles.integrations
-WHERE Identifier = '<DomainName|Uri>'
+WHERE Identifier = '{{ domain_name }}|{{ uri }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/customerprofiles/object_types/index.md b/website/docs/services/customerprofiles/object_types/index.md
index 780f2f596..40de2d2b5 100644
--- a/website/docs/services/customerprofiles/object_types/index.md
+++ b/website/docs/services/customerprofiles/object_types/index.md
@@ -288,7 +288,7 @@ template_id,
 max_profile_object_count,
 max_available_profile_object_count
 FROM awscc.customerprofiles.object_types
-WHERE region = 'us-east-1' AND Identifier = '<DomainName>|<ObjectTypeName>';
+WHERE region = 'us-east-1' AND Identifier = '{{ domain_name }}|{{ object_type_name }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -327,10 +327,10 @@ INSERT INTO awscc.customerprofiles.object_types (
  Description,
  region
 )
-SELECT 
-'{{ DomainName }}',
- '{{ ObjectTypeName }}',
- '{{ Description }}',
+SELECT
+'{{ domain_name }}',
+ '{{ object_type_name }}',
+ '{{ description }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -353,19 +353,19 @@ INSERT INTO awscc.customerprofiles.object_types (
  MaxProfileObjectCount,
  region
 )
-SELECT 
- '{{ DomainName }}',
- '{{ ObjectTypeName }}',
- '{{ AllowProfileCreation }}',
- '{{ Description }}',
- '{{ EncryptionKey }}',
- '{{ ExpirationDays }}',
- '{{ Fields }}',
- '{{ Keys }}',
- '{{ SourceLastUpdatedTimestampFormat }}',
- '{{ Tags }}',
- '{{ TemplateId }}',
- '{{ MaxProfileObjectCount }}',
+SELECT
+ '{{ domain_name }}',
+ '{{ object_type_name }}',
+ '{{ allow_profile_creation }}',
+ '{{ description }}',
+ '{{ encryption_key }}',
+ '{{ expiration_days }}',
+ '{{ fields }}',
+ '{{ keys }}',
+ '{{ source_last_updated_timestamp_format }}',
+ '{{ tags }}',
+ '{{ template_id }}',
+ '{{ max_profile_object_count }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -383,44 +383,43 @@ globals:
 resources:
   - name: object_type
     props:
-      - name: DomainName
-        value: '{{ DomainName }}'
-      - name: ObjectTypeName
-        value: '{{ ObjectTypeName }}'
-      - name: AllowProfileCreation
-        value: '{{ AllowProfileCreation }}'
-      - name: Description
-        value: '{{ Description }}'
-      - name: EncryptionKey
-        value: '{{ EncryptionKey }}'
-      - name: ExpirationDays
-        value: '{{ ExpirationDays }}'
-      - name: Fields
+      - name: domain_name
+        value: '{{ domain_name }}'
+      - name: object_type_name
+        value: '{{ object_type_name }}'
+      - name: allow_profile_creation
+        value: '{{ allow_profile_creation }}'
+      - name: description
+        value: '{{ description }}'
+      - name: encryption_key
+        value: '{{ encryption_key }}'
+      - name: expiration_days
+        value: '{{ expiration_days }}'
+      - name: fields
         value:
-          - Name: '{{ Name }}'
-            ObjectTypeField:
-              Source: '{{ Source }}'
-              Target: '{{ Target }}'
-              ContentType: '{{ ContentType }}'
-      - name: Keys
+          - name: '{{ name }}'
+            object_type_field:
+              source: '{{ source }}'
+              target: '{{ target }}'
+              content_type: '{{ content_type }}'
+      - name: keys
         value:
-          - Name: '{{ Name }}'
-            ObjectTypeKeyList:
-              - FieldNames:
-                  - '{{ FieldNames[0] }}'
-                StandardIdentifiers:
-                  - '{{ StandardIdentifiers[0] }}'
-      - name: SourceLastUpdatedTimestampFormat
-        value: '{{ SourceLastUpdatedTimestampFormat }}'
-      - name: Tags
+          - name: '{{ name }}'
+            object_type_key_list:
+              - field_names:
+                  - '{{ field_names[0] }}'
+                standard_identifiers:
+                  - '{{ standard_identifiers[0] }}'
+      - name: source_last_updated_timestamp_format
+        value: '{{ source_last_updated_timestamp_format }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-      - name: TemplateId
-        value: '{{ TemplateId }}'
-      - name: MaxProfileObjectCount
-        value: '{{ MaxProfileObjectCount }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
+      - name: template_id
+        value: '{{ template_id }}'
+      - name: max_profile_object_count
+        value: '{{ max_profile_object_count }}'
 ```
 </TabItem>
 </Tabs>
@@ -445,7 +444,7 @@ SET PatchDocument = string('{{ {
     "MaxProfileObjectCount": max_profile_object_count
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<DomainName>|<ObjectTypeName>';
+AND Identifier = '{{ domain_name }}|{{ object_type_name }}';
 ```
 
 
@@ -454,7 +453,7 @@ AND Identifier = '<DomainName>|<ObjectTypeName>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.customerprofiles.object_types
-WHERE Identifier = '<DomainName|ObjectTypeName>'
+WHERE Identifier = '{{ domain_name }}|{{ object_type_name }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/customerprofiles/segment_definitions/index.md b/website/docs/services/customerprofiles/segment_definitions/index.md
index 1f3f728d4..144c22a86 100644
--- a/website/docs/services/customerprofiles/segment_definitions/index.md
+++ b/website/docs/services/customerprofiles/segment_definitions/index.md
@@ -229,7 +229,7 @@ segment_groups,
 segment_definition_arn,
 tags
 FROM awscc.customerprofiles.segment_definitions
-WHERE region = 'us-east-1' AND Identifier = '<DomainName>|<SegmentDefinitionName>';
+WHERE region = 'us-east-1' AND Identifier = '{{ domain_name }}|{{ segment_definition_name }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -269,11 +269,11 @@ INSERT INTO awscc.customerprofiles.segment_definitions (
  SegmentGroups,
  region
 )
-SELECT 
-'{{ DisplayName }}',
- '{{ DomainName }}',
- '{{ SegmentDefinitionName }}',
- '{{ SegmentGroups }}',
+SELECT
+'{{ display_name }}',
+ '{{ domain_name }}',
+ '{{ segment_definition_name }}',
+ '{{ segment_groups }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -290,13 +290,13 @@ INSERT INTO awscc.customerprofiles.segment_definitions (
  Tags,
  region
 )
-SELECT 
- '{{ Description }}',
- '{{ DisplayName }}',
- '{{ DomainName }}',
- '{{ SegmentDefinitionName }}',
- '{{ SegmentGroups }}',
- '{{ Tags }}',
+SELECT
+ '{{ description }}',
+ '{{ display_name }}',
+ '{{ domain_name }}',
+ '{{ segment_definition_name }}',
+ '{{ segment_groups }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -314,29 +314,28 @@ globals:
 resources:
   - name: segment_definition
     props:
-      - name: Description
-        value: '{{ Description }}'
-      - name: DisplayName
-        value: '{{ DisplayName }}'
-      - name: DomainName
-        value: '{{ DomainName }}'
-      - name: SegmentDefinitionName
-        value: '{{ SegmentDefinitionName }}'
-      - name: SegmentGroups
+      - name: description
+        value: '{{ description }}'
+      - name: display_name
+        value: '{{ display_name }}'
+      - name: domain_name
+        value: '{{ domain_name }}'
+      - name: segment_definition_name
+        value: '{{ segment_definition_name }}'
+      - name: segment_groups
         value:
-          Groups:
-            - Dimensions:
+          groups:
+            - dimensions:
                 - null
-              SourceSegments:
-                - SegmentDefinitionName: '{{ SegmentDefinitionName }}'
-              SourceType: '{{ SourceType }}'
-              Type: null
-          Include: null
-      - name: Tags
+              source_segments:
+                - segment_definition_name: '{{ segment_definition_name }}'
+              source_type: '{{ source_type }}'
+              type: null
+          include: null
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -353,7 +352,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<DomainName>|<SegmentDefinitionName>';
+AND Identifier = '{{ domain_name }}|{{ segment_definition_name }}';
 ```
 
 
@@ -362,7 +361,7 @@ AND Identifier = '<DomainName>|<SegmentDefinitionName>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.customerprofiles.segment_definitions
-WHERE Identifier = '<DomainName|SegmentDefinitionName>'
+WHERE Identifier = '{{ domain_name }}|{{ segment_definition_name }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/databrew/datasets/index.md b/website/docs/services/databrew/datasets/index.md
index 39b299f72..6587d5fab 100644
--- a/website/docs/services/databrew/datasets/index.md
+++ b/website/docs/services/databrew/datasets/index.md
@@ -397,7 +397,7 @@ source,
 path_options,
 tags
 FROM awscc.databrew.datasets
-WHERE region = 'us-east-1' AND Identifier = '<Name>';
+WHERE region = 'us-east-1' AND Identifier = '{{ name }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -434,9 +434,9 @@ INSERT INTO awscc.databrew.datasets (
  Input,
  region
 )
-SELECT 
-'{{ Name }}',
- '{{ Input }}',
+SELECT
+'{{ name }}',
+ '{{ input }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -454,14 +454,14 @@ INSERT INTO awscc.databrew.datasets (
  Tags,
  region
 )
-SELECT 
- '{{ Name }}',
- '{{ Format }}',
- '{{ FormatOptions }}',
- '{{ Input }}',
- '{{ Source }}',
- '{{ PathOptions }}',
- '{{ Tags }}',
+SELECT
+ '{{ name }}',
+ '{{ format }}',
+ '{{ format_options }}',
+ '{{ input }}',
+ '{{ source }}',
+ '{{ path_options }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -479,69 +479,68 @@ globals:
 resources:
   - name: dataset
     props:
-      - name: Name
-        value: '{{ Name }}'
-      - name: Format
-        value: '{{ Format }}'
-      - name: FormatOptions
+      - name: name
+        value: '{{ name }}'
+      - name: format
+        value: '{{ format }}'
+      - name: format_options
         value:
-          Json:
-            MultiLine: '{{ MultiLine }}'
-          Excel:
-            SheetNames:
-              - '{{ SheetNames[0] }}'
-            SheetIndexes:
-              - '{{ SheetIndexes[0] }}'
-            HeaderRow: '{{ HeaderRow }}'
-          Csv:
-            Delimiter: '{{ Delimiter }}'
-            HeaderRow: '{{ HeaderRow }}'
-      - name: Input
+          json:
+            multi_line: '{{ multi_line }}'
+          excel:
+            sheet_names:
+              - '{{ sheet_names[0] }}'
+            sheet_indexes:
+              - '{{ sheet_indexes[0] }}'
+            header_row: '{{ header_row }}'
+          csv:
+            delimiter: '{{ delimiter }}'
+            header_row: '{{ header_row }}'
+      - name: input
         value:
-          S3InputDefinition:
-            Bucket: '{{ Bucket }}'
-            Key: '{{ Key }}'
-          DataCatalogInputDefinition:
-            CatalogId: '{{ CatalogId }}'
-            DatabaseName: '{{ DatabaseName }}'
-            TableName: '{{ TableName }}'
-            TempDirectory: null
-          DatabaseInputDefinition:
-            GlueConnectionName: '{{ GlueConnectionName }}'
-            DatabaseTableName: '{{ DatabaseTableName }}'
-            TempDirectory: null
-            QueryString: '{{ QueryString }}'
-          Metadata:
-            SourceArn: '{{ SourceArn }}'
-      - name: Source
-        value: '{{ Source }}'
-      - name: PathOptions
+          s3_input_definition:
+            bucket: '{{ bucket }}'
+            key: '{{ key }}'
+          data_catalog_input_definition:
+            catalog_id: '{{ catalog_id }}'
+            database_name: '{{ database_name }}'
+            table_name: '{{ table_name }}'
+            temp_directory: null
+          database_input_definition:
+            glue_connection_name: '{{ glue_connection_name }}'
+            database_table_name: '{{ database_table_name }}'
+            temp_directory: null
+            query_string: '{{ query_string }}'
+          metadata:
+            source_arn: '{{ source_arn }}'
+      - name: source
+        value: '{{ source }}'
+      - name: path_options
         value:
-          FilesLimit:
-            MaxFiles: '{{ MaxFiles }}'
-            OrderedBy: '{{ OrderedBy }}'
-            Order: '{{ Order }}'
-          LastModifiedDateCondition:
-            Expression: '{{ Expression }}'
-            ValuesMap:
-              - ValueReference: '{{ ValueReference }}'
-                Value: '{{ Value }}'
-          Parameters:
-            - PathParameterName: '{{ PathParameterName }}'
-              DatasetParameter:
-                Name: null
-                Type: '{{ Type }}'
-                DatetimeOptions:
-                  Format: '{{ Format }}'
-                  TimezoneOffset: '{{ TimezoneOffset }}'
-                  LocaleCode: '{{ LocaleCode }}'
-                CreateColumn: '{{ CreateColumn }}'
-                Filter: null
-      - name: Tags
+          files_limit:
+            max_files: '{{ max_files }}'
+            ordered_by: '{{ ordered_by }}'
+            order: '{{ order }}'
+          last_modified_date_condition:
+            expression: '{{ expression }}'
+            values_map:
+              - value_reference: '{{ value_reference }}'
+                value: '{{ value }}'
+          parameters:
+            - path_parameter_name: '{{ path_parameter_name }}'
+              dataset_parameter:
+                name: null
+                type: '{{ type }}'
+                datetime_options:
+                  format: '{{ format }}'
+                  timezone_offset: '{{ timezone_offset }}'
+                  locale_code: '{{ locale_code }}'
+                create_column: '{{ create_column }}'
+                filter: null
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -562,7 +561,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Name>';
+AND Identifier = '{{ name }}';
 ```
 
 
@@ -571,7 +570,7 @@ AND Identifier = '<Name>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.databrew.datasets
-WHERE Identifier = '<Name>'
+WHERE Identifier = '{{ name }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/databrew/jobs/index.md b/website/docs/services/databrew/jobs/index.md
index f9c617a21..191b84459 100644
--- a/website/docs/services/databrew/jobs/index.md
+++ b/website/docs/services/databrew/jobs/index.md
@@ -634,7 +634,7 @@ job_sample,
 profile_configuration,
 validation_configurations
 FROM awscc.databrew.jobs
-WHERE region = 'us-east-1' AND Identifier = '<Name>';
+WHERE region = 'us-east-1' AND Identifier = '{{ name }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -672,10 +672,10 @@ INSERT INTO awscc.databrew.jobs (
  RoleArn,
  region
 )
-SELECT 
-'{{ Name }}',
- '{{ Type }}',
- '{{ RoleArn }}',
+SELECT
+'{{ name }}',
+ '{{ type }}',
+ '{{ role_arn }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -706,27 +706,27 @@ INSERT INTO awscc.databrew.jobs (
  ValidationConfigurations,
  region
 )
-SELECT 
- '{{ DatasetName }}',
- '{{ EncryptionKeyArn }}',
- '{{ EncryptionMode }}',
- '{{ Name }}',
- '{{ Type }}',
- '{{ LogSubscription }}',
- '{{ MaxCapacity }}',
- '{{ MaxRetries }}',
- '{{ Outputs }}',
- '{{ DataCatalogOutputs }}',
- '{{ DatabaseOutputs }}',
- '{{ OutputLocation }}',
- '{{ ProjectName }}',
- '{{ Recipe }}',
- '{{ RoleArn }}',
- '{{ Tags }}',
- '{{ Timeout }}',
- '{{ JobSample }}',
- '{{ ProfileConfiguration }}',
- '{{ ValidationConfigurations }}',
+SELECT
+ '{{ dataset_name }}',
+ '{{ encryption_key_arn }}',
+ '{{ encryption_mode }}',
+ '{{ name }}',
+ '{{ type }}',
+ '{{ log_subscription }}',
+ '{{ max_capacity }}',
+ '{{ max_retries }}',
+ '{{ outputs }}',
+ '{{ data_catalog_outputs }}',
+ '{{ database_outputs }}',
+ '{{ output_location }}',
+ '{{ project_name }}',
+ '{{ recipe }}',
+ '{{ role_arn }}',
+ '{{ tags }}',
+ '{{ timeout }}',
+ '{{ job_sample }}',
+ '{{ profile_configuration }}',
+ '{{ validation_configurations }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -744,111 +744,110 @@ globals:
 resources:
   - name: job
     props:
-      - name: DatasetName
-        value: '{{ DatasetName }}'
-      - name: EncryptionKeyArn
-        value: '{{ EncryptionKeyArn }}'
-      - name: EncryptionMode
-        value: '{{ EncryptionMode }}'
-      - name: Name
-        value: '{{ Name }}'
-      - name: Type
-        value: '{{ Type }}'
-      - name: LogSubscription
-        value: '{{ LogSubscription }}'
-      - name: MaxCapacity
-        value: '{{ MaxCapacity }}'
-      - name: MaxRetries
-        value: '{{ MaxRetries }}'
-      - name: Outputs
+      - name: dataset_name
+        value: '{{ dataset_name }}'
+      - name: encryption_key_arn
+        value: '{{ encryption_key_arn }}'
+      - name: encryption_mode
+        value: '{{ encryption_mode }}'
+      - name: name
+        value: '{{ name }}'
+      - name: type
+        value: '{{ type }}'
+      - name: log_subscription
+        value: '{{ log_subscription }}'
+      - name: max_capacity
+        value: '{{ max_capacity }}'
+      - name: max_retries
+        value: '{{ max_retries }}'
+      - name: outputs
         value:
-          - CompressionFormat: '{{ CompressionFormat }}'
-            Format: '{{ Format }}'
-            FormatOptions:
-              Csv:
-                Delimiter: '{{ Delimiter }}'
-            PartitionColumns:
-              - '{{ PartitionColumns[0] }}'
-            Location:
-              Bucket: '{{ Bucket }}'
-              Key: '{{ Key }}'
-            Overwrite: '{{ Overwrite }}'
-            MaxOutputFiles: '{{ MaxOutputFiles }}'
-      - name: DataCatalogOutputs
+          - compression_format: '{{ compression_format }}'
+            format: '{{ format }}'
+            format_options:
+              csv:
+                delimiter: '{{ delimiter }}'
+            partition_columns:
+              - '{{ partition_columns[0] }}'
+            location:
+              bucket: '{{ bucket }}'
+              key: '{{ key }}'
+            overwrite: '{{ overwrite }}'
+            max_output_files: '{{ max_output_files }}'
+      - name: data_catalog_outputs
         value:
-          - CatalogId: '{{ CatalogId }}'
-            DatabaseName: '{{ DatabaseName }}'
-            TableName: '{{ TableName }}'
-            S3Options:
-              Location: null
-            DatabaseOptions:
-              TempDirectory: null
-              TableName: '{{ TableName }}'
-            Overwrite: '{{ Overwrite }}'
-      - name: DatabaseOutputs
+          - catalog_id: '{{ catalog_id }}'
+            database_name: '{{ database_name }}'
+            table_name: '{{ table_name }}'
+            s3_options:
+              location: null
+            database_options:
+              temp_directory: null
+              table_name: '{{ table_name }}'
+            overwrite: '{{ overwrite }}'
+      - name: database_outputs
         value:
-          - GlueConnectionName: '{{ GlueConnectionName }}'
-            DatabaseOutputMode: '{{ DatabaseOutputMode }}'
-            DatabaseOptions: null
-      - name: OutputLocation
+          - glue_connection_name: '{{ glue_connection_name }}'
+            database_output_mode: '{{ database_output_mode }}'
+            database_options: null
+      - name: output_location
         value:
-          Bucket: '{{ Bucket }}'
-          Key: '{{ Key }}'
-          BucketOwner: '{{ BucketOwner }}'
-      - name: ProjectName
-        value: '{{ ProjectName }}'
-      - name: Recipe
+          bucket: '{{ bucket }}'
+          key: '{{ key }}'
+          bucket_owner: '{{ bucket_owner }}'
+      - name: project_name
+        value: '{{ project_name }}'
+      - name: recipe
         value:
-          Description: '{{ Description }}'
-          Name: '{{ Name }}'
-          Steps:
-            - Action:
-                Operation: '{{ Operation }}'
-                Parameters: null
-              ConditionExpressions:
-                - Condition: '{{ Condition }}'
-                  Value: '{{ Value }}'
-                  TargetColumn: '{{ TargetColumn }}'
-          Tags:
-            - Key: '{{ Key }}'
-              Value: '{{ Value }}'
-      - name: RoleArn
-        value: '{{ RoleArn }}'
-      - name: Tags
+          description: '{{ description }}'
+          name: '{{ name }}'
+          steps:
+            - action:
+                operation: '{{ operation }}'
+                parameters: null
+              condition_expressions:
+                - condition: '{{ condition }}'
+                  value: '{{ value }}'
+                  target_column: '{{ target_column }}'
+          tags:
+            - key: '{{ key }}'
+              value: '{{ value }}'
+      - name: role_arn
+        value: '{{ role_arn }}'
+      - name: tags
         value:
           - null
-      - name: Timeout
-        value: '{{ Timeout }}'
-      - name: JobSample
+      - name: timeout
+        value: '{{ timeout }}'
+      - name: job_sample
         value:
-          Mode: '{{ Mode }}'
-          Size: '{{ Size }}'
-      - name: ProfileConfiguration
+          mode: '{{ mode }}'
+          size: '{{ size }}'
+      - name: profile_configuration
         value:
-          DatasetStatisticsConfiguration:
-            IncludedStatistics:
-              - '{{ IncludedStatistics[0] }}'
-            Overrides:
-              - Statistic: null
-                Parameters: {}
-          ProfileColumns:
-            - Regex: '{{ Regex }}'
-              Name: '{{ Name }}'
-          ColumnStatisticsConfigurations:
-            - Selectors:
+          dataset_statistics_configuration:
+            included_statistics:
+              - '{{ included_statistics[0] }}'
+            overrides:
+              - statistic: null
+                parameters: {}
+          profile_columns:
+            - regex: '{{ regex }}'
+              name: '{{ name }}'
+          column_statistics_configurations:
+            - selectors:
                 - null
-              Statistics: null
-          EntityDetectorConfiguration:
-            EntityTypes:
-              - '{{ EntityTypes[0] }}'
-            AllowedStatistics:
-              Statistics:
+              statistics: null
+          entity_detector_configuration:
+            entity_types:
+              - '{{ entity_types[0] }}'
+            allowed_statistics:
+              statistics:
                 - null
-      - name: ValidationConfigurations
+      - name: validation_configurations
         value:
-          - RulesetArn: '{{ RulesetArn }}'
-            ValidationMode: '{{ ValidationMode }}'
-
+          - ruleset_arn: '{{ ruleset_arn }}'
+            validation_mode: '{{ validation_mode }}'
 ```
 </TabItem>
 </Tabs>
@@ -881,7 +880,7 @@ SET PatchDocument = string('{{ {
     "ValidationConfigurations": validation_configurations
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Name>';
+AND Identifier = '{{ name }}';
 ```
 
 
@@ -890,7 +889,7 @@ AND Identifier = '<Name>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.databrew.jobs
-WHERE Identifier = '<Name>'
+WHERE Identifier = '{{ name }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/databrew/projects/index.md b/website/docs/services/databrew/projects/index.md
index 64ebd2d3d..7da6fa286 100644
--- a/website/docs/services/databrew/projects/index.md
+++ b/website/docs/services/databrew/projects/index.md
@@ -188,7 +188,7 @@ role_arn,
 sample,
 tags
 FROM awscc.databrew.projects
-WHERE region = 'us-east-1' AND Identifier = '<Name>';
+WHERE region = 'us-east-1' AND Identifier = '{{ name }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -227,11 +227,11 @@ INSERT INTO awscc.databrew.projects (
  RoleArn,
  region
 )
-SELECT 
-'{{ DatasetName }}',
- '{{ Name }}',
- '{{ RecipeName }}',
- '{{ RoleArn }}',
+SELECT
+'{{ dataset_name }}',
+ '{{ name }}',
+ '{{ recipe_name }}',
+ '{{ role_arn }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -248,13 +248,13 @@ INSERT INTO awscc.databrew.projects (
  Tags,
  region
 )
-SELECT 
- '{{ DatasetName }}',
- '{{ Name }}',
- '{{ RecipeName }}',
- '{{ RoleArn }}',
- '{{ Sample }}',
- '{{ Tags }}',
+SELECT
+ '{{ dataset_name }}',
+ '{{ name }}',
+ '{{ recipe_name }}',
+ '{{ role_arn }}',
+ '{{ sample }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -272,23 +272,22 @@ globals:
 resources:
   - name: project
     props:
-      - name: DatasetName
-        value: '{{ DatasetName }}'
-      - name: Name
-        value: '{{ Name }}'
-      - name: RecipeName
-        value: '{{ RecipeName }}'
-      - name: RoleArn
-        value: '{{ RoleArn }}'
-      - name: Sample
+      - name: dataset_name
+        value: '{{ dataset_name }}'
+      - name: name
+        value: '{{ name }}'
+      - name: recipe_name
+        value: '{{ recipe_name }}'
+      - name: role_arn
+        value: '{{ role_arn }}'
+      - name: sample
         value:
-          Size: '{{ Size }}'
-          Type: '{{ Type }}'
-      - name: Tags
+          size: '{{ size }}'
+          type: '{{ type }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -308,7 +307,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Name>';
+AND Identifier = '{{ name }}';
 ```
 
 
@@ -317,7 +316,7 @@ AND Identifier = '<Name>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.databrew.projects
-WHERE Identifier = '<Name>'
+WHERE Identifier = '{{ name }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/databrew/recipes/index.md b/website/docs/services/databrew/recipes/index.md
index b14aac7dc..82add2255 100644
--- a/website/docs/services/databrew/recipes/index.md
+++ b/website/docs/services/databrew/recipes/index.md
@@ -205,7 +205,7 @@ name,
 steps,
 tags
 FROM awscc.databrew.recipes
-WHERE region = 'us-east-1' AND Identifier = '<Name>';
+WHERE region = 'us-east-1' AND Identifier = '{{ name }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -242,9 +242,9 @@ INSERT INTO awscc.databrew.recipes (
  Steps,
  region
 )
-SELECT 
-'{{ Name }}',
- '{{ Steps }}',
+SELECT
+'{{ name }}',
+ '{{ steps }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -259,11 +259,11 @@ INSERT INTO awscc.databrew.recipes (
  Tags,
  region
 )
-SELECT 
- '{{ Description }}',
- '{{ Name }}',
- '{{ Steps }}',
- '{{ Tags }}',
+SELECT
+ '{{ description }}',
+ '{{ name }}',
+ '{{ steps }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -281,24 +281,23 @@ globals:
 resources:
   - name: recipe
     props:
-      - name: Description
-        value: '{{ Description }}'
-      - name: Name
-        value: '{{ Name }}'
-      - name: Steps
+      - name: description
+        value: '{{ description }}'
+      - name: name
+        value: '{{ name }}'
+      - name: steps
         value:
-          - Action:
-              Operation: '{{ Operation }}'
-              Parameters: null
-            ConditionExpressions:
-              - Condition: '{{ Condition }}'
-                Value: '{{ Value }}'
-                TargetColumn: '{{ TargetColumn }}'
-      - name: Tags
+          - action:
+              operation: '{{ operation }}'
+              parameters: null
+            condition_expressions:
+              - condition: '{{ condition }}'
+                value: '{{ value }}'
+                target_column: '{{ target_column }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -316,7 +315,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Name>';
+AND Identifier = '{{ name }}';
 ```
 
 
@@ -325,7 +324,7 @@ AND Identifier = '<Name>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.databrew.recipes
-WHERE Identifier = '<Name>'
+WHERE Identifier = '{{ name }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/databrew/rulesets/index.md b/website/docs/services/databrew/rulesets/index.md
index 4dd4f7be0..20ce0485e 100644
--- a/website/docs/services/databrew/rulesets/index.md
+++ b/website/docs/services/databrew/rulesets/index.md
@@ -243,7 +243,7 @@ target_arn,
 rules,
 tags
 FROM awscc.databrew.rulesets
-WHERE region = 'us-east-1' AND Identifier = '<Name>';
+WHERE region = 'us-east-1' AND Identifier = '{{ name }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -281,10 +281,10 @@ INSERT INTO awscc.databrew.rulesets (
  Rules,
  region
 )
-SELECT 
-'{{ Name }}',
- '{{ TargetArn }}',
- '{{ Rules }}',
+SELECT
+'{{ name }}',
+ '{{ target_arn }}',
+ '{{ rules }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -300,12 +300,12 @@ INSERT INTO awscc.databrew.rulesets (
  Tags,
  region
 )
-SELECT 
- '{{ Name }}',
- '{{ Description }}',
- '{{ TargetArn }}',
- '{{ Rules }}',
- '{{ Tags }}',
+SELECT
+ '{{ name }}',
+ '{{ description }}',
+ '{{ target_arn }}',
+ '{{ rules }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -323,32 +323,31 @@ globals:
 resources:
   - name: ruleset
     props:
-      - name: Name
-        value: '{{ Name }}'
-      - name: Description
-        value: '{{ Description }}'
-      - name: TargetArn
-        value: '{{ TargetArn }}'
-      - name: Rules
+      - name: name
+        value: '{{ name }}'
+      - name: description
+        value: '{{ description }}'
+      - name: target_arn
+        value: '{{ target_arn }}'
+      - name: rules
         value:
-          - Name: '{{ Name }}'
-            Disabled: '{{ Disabled }}'
-            CheckExpression: '{{ CheckExpression }}'
-            SubstitutionMap:
-              - ValueReference: '{{ ValueReference }}'
-                Value: '{{ Value }}'
-            Threshold:
-              Value: null
-              Type: '{{ Type }}'
-              Unit: '{{ Unit }}'
-            ColumnSelectors:
-              - Regex: '{{ Regex }}'
-                Name: '{{ Name }}'
-      - name: Tags
+          - name: '{{ name }}'
+            disabled: '{{ disabled }}'
+            check_expression: '{{ check_expression }}'
+            substitution_map:
+              - value_reference: '{{ value_reference }}'
+                value: '{{ value }}'
+            threshold:
+              value: null
+              type: '{{ type }}'
+              unit: '{{ unit }}'
+            column_selectors:
+              - regex: '{{ regex }}'
+                name: '{{ name }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -366,7 +365,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Name>';
+AND Identifier = '{{ name }}';
 ```
 
 
@@ -375,7 +374,7 @@ AND Identifier = '<Name>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.databrew.rulesets
-WHERE Identifier = '<Name>'
+WHERE Identifier = '{{ name }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/databrew/schedules/index.md b/website/docs/services/databrew/schedules/index.md
index aa3588653..d634b1766 100644
--- a/website/docs/services/databrew/schedules/index.md
+++ b/website/docs/services/databrew/schedules/index.md
@@ -164,7 +164,7 @@ cron_expression,
 name,
 tags
 FROM awscc.databrew.schedules
-WHERE region = 'us-east-1' AND Identifier = '<Name>';
+WHERE region = 'us-east-1' AND Identifier = '{{ name }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -201,9 +201,9 @@ INSERT INTO awscc.databrew.schedules (
  Name,
  region
 )
-SELECT 
-'{{ CronExpression }}',
- '{{ Name }}',
+SELECT
+'{{ cron_expression }}',
+ '{{ name }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -218,11 +218,11 @@ INSERT INTO awscc.databrew.schedules (
  Tags,
  region
 )
-SELECT 
- '{{ JobNames }}',
- '{{ CronExpression }}',
- '{{ Name }}',
- '{{ Tags }}',
+SELECT
+ '{{ job_names }}',
+ '{{ cron_expression }}',
+ '{{ name }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -240,18 +240,17 @@ globals:
 resources:
   - name: schedule
     props:
-      - name: JobNames
+      - name: job_names
         value:
-          - '{{ JobNames[0] }}'
-      - name: CronExpression
-        value: '{{ CronExpression }}'
-      - name: Name
-        value: '{{ Name }}'
-      - name: Tags
+          - '{{ job_names[0] }}'
+      - name: cron_expression
+        value: '{{ cron_expression }}'
+      - name: name
+        value: '{{ name }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -269,7 +268,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Name>';
+AND Identifier = '{{ name }}';
 ```
 
 
@@ -278,7 +277,7 @@ AND Identifier = '<Name>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.databrew.schedules
-WHERE Identifier = '<Name>'
+WHERE Identifier = '{{ name }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/datapipeline/pipelines/index.md b/website/docs/services/datapipeline/pipelines/index.md
index d204b2fbc..cb1729dae 100644
--- a/website/docs/services/datapipeline/pipelines/index.md
+++ b/website/docs/services/datapipeline/pipelines/index.md
@@ -258,7 +258,7 @@ pipeline_objects,
 pipeline_tags,
 pipeline_id
 FROM awscc.datapipeline.pipelines
-WHERE region = 'us-east-1' AND Identifier = '<PipelineId>';
+WHERE region = 'us-east-1' AND Identifier = '{{ pipeline_id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -294,8 +294,8 @@ INSERT INTO awscc.datapipeline.pipelines (
  Name,
  region
 )
-SELECT 
-'{{ Name }}',
+SELECT
+'{{ name }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -313,14 +313,14 @@ INSERT INTO awscc.datapipeline.pipelines (
  PipelineTags,
  region
 )
-SELECT 
- '{{ Activate }}',
- '{{ Description }}',
- '{{ Name }}',
- '{{ ParameterObjects }}',
- '{{ ParameterValues }}',
- '{{ PipelineObjects }}',
- '{{ PipelineTags }}',
+SELECT
+ '{{ activate }}',
+ '{{ description }}',
+ '{{ name }}',
+ '{{ parameter_objects }}',
+ '{{ parameter_values }}',
+ '{{ pipeline_objects }}',
+ '{{ pipeline_tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -338,35 +338,34 @@ globals:
 resources:
   - name: pipeline
     props:
-      - name: Activate
-        value: '{{ Activate }}'
-      - name: Description
-        value: '{{ Description }}'
-      - name: Name
-        value: '{{ Name }}'
-      - name: ParameterObjects
+      - name: activate
+        value: '{{ activate }}'
+      - name: description
+        value: '{{ description }}'
+      - name: name
+        value: '{{ name }}'
+      - name: parameter_objects
         value:
-          - Attributes:
-              - Key: '{{ Key }}'
-                StringValue: '{{ StringValue }}'
-            Id: '{{ Id }}'
-      - name: ParameterValues
+          - attributes:
+              - key: '{{ key }}'
+                string_value: '{{ string_value }}'
+            id: '{{ id }}'
+      - name: parameter_values
         value:
-          - Id: '{{ Id }}'
-            StringValue: '{{ StringValue }}'
-      - name: PipelineObjects
+          - id: '{{ id }}'
+            string_value: '{{ string_value }}'
+      - name: pipeline_objects
         value:
-          - Fields:
-              - Key: '{{ Key }}'
-                RefValue: '{{ RefValue }}'
-                StringValue: '{{ StringValue }}'
-            Id: '{{ Id }}'
-            Name: '{{ Name }}'
-      - name: PipelineTags
+          - fields:
+              - key: '{{ key }}'
+                ref_value: '{{ ref_value }}'
+                string_value: '{{ string_value }}'
+            id: '{{ id }}'
+            name: '{{ name }}'
+      - name: pipeline_tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -386,7 +385,7 @@ SET PatchDocument = string('{{ {
     "PipelineTags": pipeline_tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<PipelineId>';
+AND Identifier = '{{ pipeline_id }}';
 ```
 
 
@@ -395,7 +394,7 @@ AND Identifier = '<PipelineId>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.datapipeline.pipelines
-WHERE Identifier = '<PipelineId>'
+WHERE Identifier = '{{ pipeline_id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/datasync/agents/index.md b/website/docs/services/datasync/agents/index.md
index 4f17c7917..81d7e0792 100644
--- a/website/docs/services/datasync/agents/index.md
+++ b/website/docs/services/datasync/agents/index.md
@@ -188,7 +188,7 @@ endpoint_type,
 tags,
 agent_arn
 FROM awscc.datasync.agents
-WHERE region = 'us-east-1' AND Identifier = '<AgentArn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ agent_arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -224,7 +224,7 @@ INSERT INTO awscc.datasync.agents (
  ,
  region
 )
-SELECT 
+SELECT
 '{{  }}',
 '{{ region }}';
 ```
@@ -242,13 +242,13 @@ INSERT INTO awscc.datasync.agents (
  Tags,
  region
 )
-SELECT 
- '{{ AgentName }}',
- '{{ ActivationKey }}',
- '{{ SecurityGroupArns }}',
- '{{ SubnetArns }}',
- '{{ VpcEndpointId }}',
- '{{ Tags }}',
+SELECT
+ '{{ agent_name }}',
+ '{{ activation_key }}',
+ '{{ security_group_arns }}',
+ '{{ subnet_arns }}',
+ '{{ vpc_endpoint_id }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -266,23 +266,22 @@ globals:
 resources:
   - name: agent
     props:
-      - name: AgentName
-        value: '{{ AgentName }}'
-      - name: ActivationKey
-        value: '{{ ActivationKey }}'
-      - name: SecurityGroupArns
+      - name: agent_name
+        value: '{{ agent_name }}'
+      - name: activation_key
+        value: '{{ activation_key }}'
+      - name: security_group_arns
         value:
-          - '{{ SecurityGroupArns[0] }}'
-      - name: SubnetArns
+          - '{{ security_group_arns[0] }}'
+      - name: subnet_arns
         value:
-          - '{{ SubnetArns[0] }}'
-      - name: VpcEndpointId
-        value: '{{ VpcEndpointId }}'
-      - name: Tags
+          - '{{ subnet_arns[0] }}'
+      - name: vpc_endpoint_id
+        value: '{{ vpc_endpoint_id }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -299,7 +298,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<AgentArn>';
+AND Identifier = '{{ agent_arn }}';
 ```
 
 
@@ -308,7 +307,7 @@ AND Identifier = '<AgentArn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.datasync.agents
-WHERE Identifier = '<AgentArn>'
+WHERE Identifier = '{{ agent_arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/datasync/location_azure_blobs/index.md b/website/docs/services/datasync/location_azure_blobs/index.md
index 0f8afdbee..4ea772ff8 100644
--- a/website/docs/services/datasync/location_azure_blobs/index.md
+++ b/website/docs/services/datasync/location_azure_blobs/index.md
@@ -256,7 +256,7 @@ cmk_secret_config,
 custom_secret_config,
 managed_secret_config
 FROM awscc.datasync.location_azure_blobs
-WHERE region = 'us-east-1' AND Identifier = '<LocationArn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ location_arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -292,8 +292,8 @@ INSERT INTO awscc.datasync.location_azure_blobs (
  AzureBlobAuthenticationType,
  region
 )
-SELECT 
-'{{ AzureBlobAuthenticationType }}',
+SELECT
+'{{ azure_blob_authentication_type }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -314,17 +314,17 @@ INSERT INTO awscc.datasync.location_azure_blobs (
  CustomSecretConfig,
  region
 )
-SELECT 
- '{{ AgentArns }}',
- '{{ AzureBlobAuthenticationType }}',
- '{{ AzureBlobSasConfiguration }}',
- '{{ AzureBlobContainerUrl }}',
- '{{ AzureBlobType }}',
- '{{ AzureAccessTier }}',
- '{{ Subdirectory }}',
- '{{ Tags }}',
- '{{ CmkSecretConfig }}',
- '{{ CustomSecretConfig }}',
+SELECT
+ '{{ agent_arns }}',
+ '{{ azure_blob_authentication_type }}',
+ '{{ azure_blob_sas_configuration }}',
+ '{{ azure_blob_container_url }}',
+ '{{ azure_blob_type }}',
+ '{{ azure_access_tier }}',
+ '{{ subdirectory }}',
+ '{{ tags }}',
+ '{{ cmk_secret_config }}',
+ '{{ custom_secret_config }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -342,35 +342,34 @@ globals:
 resources:
   - name: location_azure_blob
     props:
-      - name: AgentArns
+      - name: agent_arns
         value:
-          - '{{ AgentArns[0] }}'
-      - name: AzureBlobAuthenticationType
-        value: '{{ AzureBlobAuthenticationType }}'
-      - name: AzureBlobSasConfiguration
+          - '{{ agent_arns[0] }}'
+      - name: azure_blob_authentication_type
+        value: '{{ azure_blob_authentication_type }}'
+      - name: azure_blob_sas_configuration
         value:
-          AzureBlobSasToken: '{{ AzureBlobSasToken }}'
-      - name: AzureBlobContainerUrl
-        value: '{{ AzureBlobContainerUrl }}'
-      - name: AzureBlobType
-        value: '{{ AzureBlobType }}'
-      - name: AzureAccessTier
-        value: '{{ AzureAccessTier }}'
-      - name: Subdirectory
-        value: '{{ Subdirectory }}'
-      - name: Tags
+          azure_blob_sas_token: '{{ azure_blob_sas_token }}'
+      - name: azure_blob_container_url
+        value: '{{ azure_blob_container_url }}'
+      - name: azure_blob_type
+        value: '{{ azure_blob_type }}'
+      - name: azure_access_tier
+        value: '{{ azure_access_tier }}'
+      - name: subdirectory
+        value: '{{ subdirectory }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-      - name: CmkSecretConfig
+          - key: '{{ key }}'
+            value: '{{ value }}'
+      - name: cmk_secret_config
         value:
-          SecretArn: '{{ SecretArn }}'
-          KmsKeyArn: '{{ KmsKeyArn }}'
-      - name: CustomSecretConfig
+          secret_arn: '{{ secret_arn }}'
+          kms_key_arn: '{{ kms_key_arn }}'
+      - name: custom_secret_config
         value:
-          SecretArn: '{{ SecretArn }}'
-          SecretAccessRoleArn: '{{ SecretAccessRoleArn }}'
-
+          secret_arn: '{{ secret_arn }}'
+          secret_access_role_arn: '{{ secret_access_role_arn }}'
 ```
 </TabItem>
 </Tabs>
@@ -393,7 +392,7 @@ SET PatchDocument = string('{{ {
     "CustomSecretConfig": custom_secret_config
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<LocationArn>';
+AND Identifier = '{{ location_arn }}';
 ```
 
 
@@ -402,7 +401,7 @@ AND Identifier = '<LocationArn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.datasync.location_azure_blobs
-WHERE Identifier = '<LocationArn>'
+WHERE Identifier = '{{ location_arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/datasync/location_efs/index.md b/website/docs/services/datasync/location_efs/index.md
index 3e8bcc702..e0b279874 100644
--- a/website/docs/services/datasync/location_efs/index.md
+++ b/website/docs/services/datasync/location_efs/index.md
@@ -206,7 +206,7 @@ tags,
 location_arn,
 location_uri
 FROM awscc.datasync.location_efs
-WHERE region = 'us-east-1' AND Identifier = '<LocationArn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ location_arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -242,8 +242,8 @@ INSERT INTO awscc.datasync.location_efs (
  Ec2Config,
  region
 )
-SELECT 
-'{{ Ec2Config }}',
+SELECT
+'{{ ec2_config }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -261,14 +261,14 @@ INSERT INTO awscc.datasync.location_efs (
  Tags,
  region
 )
-SELECT 
- '{{ Ec2Config }}',
- '{{ EfsFilesystemArn }}',
- '{{ AccessPointArn }}',
- '{{ FileSystemAccessRoleArn }}',
- '{{ InTransitEncryption }}',
- '{{ Subdirectory }}',
- '{{ Tags }}',
+SELECT
+ '{{ ec2_config }}',
+ '{{ efs_filesystem_arn }}',
+ '{{ access_point_arn }}',
+ '{{ file_system_access_role_arn }}',
+ '{{ in_transit_encryption }}',
+ '{{ subdirectory }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -286,26 +286,25 @@ globals:
 resources:
   - name: location_ef
     props:
-      - name: Ec2Config
+      - name: ec2_config
         value:
-          SecurityGroupArns:
-            - '{{ SecurityGroupArns[0] }}'
-          SubnetArn: '{{ SubnetArn }}'
-      - name: EfsFilesystemArn
-        value: '{{ EfsFilesystemArn }}'
-      - name: AccessPointArn
-        value: '{{ AccessPointArn }}'
-      - name: FileSystemAccessRoleArn
-        value: '{{ FileSystemAccessRoleArn }}'
-      - name: InTransitEncryption
-        value: '{{ InTransitEncryption }}'
-      - name: Subdirectory
-        value: '{{ Subdirectory }}'
-      - name: Tags
+          security_group_arns:
+            - '{{ security_group_arns[0] }}'
+          subnet_arn: '{{ subnet_arn }}'
+      - name: efs_filesystem_arn
+        value: '{{ efs_filesystem_arn }}'
+      - name: access_point_arn
+        value: '{{ access_point_arn }}'
+      - name: file_system_access_role_arn
+        value: '{{ file_system_access_role_arn }}'
+      - name: in_transit_encryption
+        value: '{{ in_transit_encryption }}'
+      - name: subdirectory
+        value: '{{ subdirectory }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -325,7 +324,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<LocationArn>';
+AND Identifier = '{{ location_arn }}';
 ```
 
 
@@ -334,7 +333,7 @@ AND Identifier = '<LocationArn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.datasync.location_efs
-WHERE Identifier = '<LocationArn>'
+WHERE Identifier = '{{ location_arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/datasync/location_hdfs/index.md b/website/docs/services/datasync/location_hdfs/index.md
index 0a9e3dbfc..8bfe9cd4e 100644
--- a/website/docs/services/datasync/location_hdfs/index.md
+++ b/website/docs/services/datasync/location_hdfs/index.md
@@ -254,7 +254,7 @@ subdirectory,
 location_arn,
 location_uri
 FROM awscc.datasync.location_hdfs
-WHERE region = 'us-east-1' AND Identifier = '<LocationArn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ location_arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -292,10 +292,10 @@ INSERT INTO awscc.datasync.location_hdfs (
  AgentArns,
  region
 )
-SELECT 
-'{{ NameNodes }}',
- '{{ AuthenticationType }}',
- '{{ AgentArns }}',
+SELECT
+'{{ name_nodes }}',
+ '{{ authentication_type }}',
+ '{{ agent_arns }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -319,20 +319,20 @@ INSERT INTO awscc.datasync.location_hdfs (
  Subdirectory,
  region
 )
-SELECT 
- '{{ NameNodes }}',
- '{{ BlockSize }}',
- '{{ ReplicationFactor }}',
- '{{ KmsKeyProviderUri }}',
- '{{ QopConfiguration }}',
- '{{ AuthenticationType }}',
- '{{ SimpleUser }}',
- '{{ KerberosPrincipal }}',
- '{{ KerberosKeytab }}',
- '{{ KerberosKrb5Conf }}',
- '{{ Tags }}',
- '{{ AgentArns }}',
- '{{ Subdirectory }}',
+SELECT
+ '{{ name_nodes }}',
+ '{{ block_size }}',
+ '{{ replication_factor }}',
+ '{{ kms_key_provider_uri }}',
+ '{{ qop_configuration }}',
+ '{{ authentication_type }}',
+ '{{ simple_user }}',
+ '{{ kerberos_principal }}',
+ '{{ kerberos_keytab }}',
+ '{{ kerberos_krb5_conf }}',
+ '{{ tags }}',
+ '{{ agent_arns }}',
+ '{{ subdirectory }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -350,40 +350,39 @@ globals:
 resources:
   - name: location_hdf
     props:
-      - name: NameNodes
+      - name: name_nodes
         value:
-          - Hostname: '{{ Hostname }}'
-            Port: '{{ Port }}'
-      - name: BlockSize
-        value: '{{ BlockSize }}'
-      - name: ReplicationFactor
-        value: '{{ ReplicationFactor }}'
-      - name: KmsKeyProviderUri
-        value: '{{ KmsKeyProviderUri }}'
-      - name: QopConfiguration
+          - hostname: '{{ hostname }}'
+            port: '{{ port }}'
+      - name: block_size
+        value: '{{ block_size }}'
+      - name: replication_factor
+        value: '{{ replication_factor }}'
+      - name: kms_key_provider_uri
+        value: '{{ kms_key_provider_uri }}'
+      - name: qop_configuration
         value:
-          RpcProtection: '{{ RpcProtection }}'
-          DataTransferProtection: '{{ DataTransferProtection }}'
-      - name: AuthenticationType
-        value: '{{ AuthenticationType }}'
-      - name: SimpleUser
-        value: '{{ SimpleUser }}'
-      - name: KerberosPrincipal
-        value: '{{ KerberosPrincipal }}'
-      - name: KerberosKeytab
-        value: '{{ KerberosKeytab }}'
-      - name: KerberosKrb5Conf
-        value: '{{ KerberosKrb5Conf }}'
-      - name: Tags
+          rpc_protection: '{{ rpc_protection }}'
+          data_transfer_protection: '{{ data_transfer_protection }}'
+      - name: authentication_type
+        value: '{{ authentication_type }}'
+      - name: simple_user
+        value: '{{ simple_user }}'
+      - name: kerberos_principal
+        value: '{{ kerberos_principal }}'
+      - name: kerberos_keytab
+        value: '{{ kerberos_keytab }}'
+      - name: kerberos_krb5_conf
+        value: '{{ kerberos_krb5_conf }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-      - name: AgentArns
+          - key: '{{ key }}'
+            value: '{{ value }}'
+      - name: agent_arns
         value:
-          - '{{ AgentArns[0] }}'
-      - name: Subdirectory
-        value: '{{ Subdirectory }}'
-
+          - '{{ agent_arns[0] }}'
+      - name: subdirectory
+        value: '{{ subdirectory }}'
 ```
 </TabItem>
 </Tabs>
@@ -411,7 +410,7 @@ SET PatchDocument = string('{{ {
     "Subdirectory": subdirectory
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<LocationArn>';
+AND Identifier = '{{ location_arn }}';
 ```
 
 
@@ -420,7 +419,7 @@ AND Identifier = '<LocationArn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.datasync.location_hdfs
-WHERE Identifier = '<LocationArn>'
+WHERE Identifier = '{{ location_arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/datasync/location_nfs/index.md b/website/docs/services/datasync/location_nfs/index.md
index 07ad782a9..674127400 100644
--- a/website/docs/services/datasync/location_nfs/index.md
+++ b/website/docs/services/datasync/location_nfs/index.md
@@ -196,7 +196,7 @@ tags,
 location_arn,
 location_uri
 FROM awscc.datasync.location_nfs
-WHERE region = 'us-east-1' AND Identifier = '<LocationArn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ location_arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -232,8 +232,8 @@ INSERT INTO awscc.datasync.location_nfs (
  OnPremConfig,
  region
 )
-SELECT 
-'{{ OnPremConfig }}',
+SELECT
+'{{ on_prem_config }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -249,12 +249,12 @@ INSERT INTO awscc.datasync.location_nfs (
  Tags,
  region
 )
-SELECT 
- '{{ MountOptions }}',
- '{{ OnPremConfig }}',
- '{{ ServerHostname }}',
- '{{ Subdirectory }}',
- '{{ Tags }}',
+SELECT
+ '{{ mount_options }}',
+ '{{ on_prem_config }}',
+ '{{ server_hostname }}',
+ '{{ subdirectory }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -272,22 +272,21 @@ globals:
 resources:
   - name: location_nf
     props:
-      - name: MountOptions
+      - name: mount_options
         value:
-          Version: '{{ Version }}'
-      - name: OnPremConfig
+          version: '{{ version }}'
+      - name: on_prem_config
         value:
-          AgentArns:
-            - '{{ AgentArns[0] }}'
-      - name: ServerHostname
-        value: '{{ ServerHostname }}'
-      - name: Subdirectory
-        value: '{{ Subdirectory }}'
-      - name: Tags
+          agent_arns:
+            - '{{ agent_arns[0] }}'
+      - name: server_hostname
+        value: '{{ server_hostname }}'
+      - name: subdirectory
+        value: '{{ subdirectory }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -307,7 +306,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<LocationArn>';
+AND Identifier = '{{ location_arn }}';
 ```
 
 
@@ -316,7 +315,7 @@ AND Identifier = '<LocationArn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.datasync.location_nfs
-WHERE Identifier = '<LocationArn>'
+WHERE Identifier = '{{ location_arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/datasync/location_object_storages/index.md b/website/docs/services/datasync/location_object_storages/index.md
index 5d10584a0..98bc0b66b 100644
--- a/website/docs/services/datasync/location_object_storages/index.md
+++ b/website/docs/services/datasync/location_object_storages/index.md
@@ -261,7 +261,7 @@ cmk_secret_config,
 custom_secret_config,
 managed_secret_config
 FROM awscc.datasync.location_object_storages
-WHERE region = 'us-east-1' AND Identifier = '<LocationArn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ location_arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -308,19 +308,19 @@ INSERT INTO awscc.datasync.location_object_storages (
  CustomSecretConfig,
  region
 )
-SELECT 
-'{{ AccessKey }}',
- '{{ AgentArns }}',
- '{{ BucketName }}',
- '{{ SecretKey }}',
- '{{ ServerCertificate }}',
- '{{ ServerHostname }}',
- '{{ ServerPort }}',
- '{{ ServerProtocol }}',
- '{{ Subdirectory }}',
- '{{ Tags }}',
- '{{ CmkSecretConfig }}',
- '{{ CustomSecretConfig }}',
+SELECT
+'{{ access_key }}',
+ '{{ agent_arns }}',
+ '{{ bucket_name }}',
+ '{{ secret_key }}',
+ '{{ server_certificate }}',
+ '{{ server_hostname }}',
+ '{{ server_port }}',
+ '{{ server_protocol }}',
+ '{{ subdirectory }}',
+ '{{ tags }}',
+ '{{ cmk_secret_config }}',
+ '{{ custom_secret_config }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -343,19 +343,19 @@ INSERT INTO awscc.datasync.location_object_storages (
  CustomSecretConfig,
  region
 )
-SELECT 
- '{{ AccessKey }}',
- '{{ AgentArns }}',
- '{{ BucketName }}',
- '{{ SecretKey }}',
- '{{ ServerCertificate }}',
- '{{ ServerHostname }}',
- '{{ ServerPort }}',
- '{{ ServerProtocol }}',
- '{{ Subdirectory }}',
- '{{ Tags }}',
- '{{ CmkSecretConfig }}',
- '{{ CustomSecretConfig }}',
+SELECT
+ '{{ access_key }}',
+ '{{ agent_arns }}',
+ '{{ bucket_name }}',
+ '{{ secret_key }}',
+ '{{ server_certificate }}',
+ '{{ server_hostname }}',
+ '{{ server_port }}',
+ '{{ server_protocol }}',
+ '{{ subdirectory }}',
+ '{{ tags }}',
+ '{{ cmk_secret_config }}',
+ '{{ custom_secret_config }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -373,38 +373,37 @@ globals:
 resources:
   - name: location_object_storage
     props:
-      - name: AccessKey
-        value: '{{ AccessKey }}'
-      - name: AgentArns
+      - name: access_key
+        value: '{{ access_key }}'
+      - name: agent_arns
         value:
-          - '{{ AgentArns[0] }}'
-      - name: BucketName
-        value: '{{ BucketName }}'
-      - name: SecretKey
-        value: '{{ SecretKey }}'
-      - name: ServerCertificate
-        value: '{{ ServerCertificate }}'
-      - name: ServerHostname
-        value: '{{ ServerHostname }}'
-      - name: ServerPort
-        value: '{{ ServerPort }}'
-      - name: ServerProtocol
-        value: '{{ ServerProtocol }}'
-      - name: Subdirectory
-        value: '{{ Subdirectory }}'
-      - name: Tags
+          - '{{ agent_arns[0] }}'
+      - name: bucket_name
+        value: '{{ bucket_name }}'
+      - name: secret_key
+        value: '{{ secret_key }}'
+      - name: server_certificate
+        value: '{{ server_certificate }}'
+      - name: server_hostname
+        value: '{{ server_hostname }}'
+      - name: server_port
+        value: '{{ server_port }}'
+      - name: server_protocol
+        value: '{{ server_protocol }}'
+      - name: subdirectory
+        value: '{{ subdirectory }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-      - name: CmkSecretConfig
+          - key: '{{ key }}'
+            value: '{{ value }}'
+      - name: cmk_secret_config
         value:
-          SecretArn: '{{ SecretArn }}'
-          KmsKeyArn: '{{ KmsKeyArn }}'
-      - name: CustomSecretConfig
+          secret_arn: '{{ secret_arn }}'
+          kms_key_arn: '{{ kms_key_arn }}'
+      - name: custom_secret_config
         value:
-          SecretArn: '{{ SecretArn }}'
-          SecretAccessRoleArn: '{{ SecretAccessRoleArn }}'
-
+          secret_arn: '{{ secret_arn }}'
+          secret_access_role_arn: '{{ secret_access_role_arn }}'
 ```
 </TabItem>
 </Tabs>
@@ -429,7 +428,7 @@ SET PatchDocument = string('{{ {
     "CustomSecretConfig": custom_secret_config
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<LocationArn>';
+AND Identifier = '{{ location_arn }}';
 ```
 
 
@@ -438,7 +437,7 @@ AND Identifier = '<LocationArn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.datasync.location_object_storages
-WHERE Identifier = '<LocationArn>'
+WHERE Identifier = '{{ location_arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/datasync/location_s3s/index.md b/website/docs/services/datasync/location_s3s/index.md
index 49b3f6daf..dcf9dd3aa 100644
--- a/website/docs/services/datasync/location_s3s/index.md
+++ b/website/docs/services/datasync/location_s3s/index.md
@@ -189,7 +189,7 @@ tags,
 location_arn,
 location_uri
 FROM awscc.datasync.location_s3s
-WHERE region = 'us-east-1' AND Identifier = '<LocationArn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ location_arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -225,8 +225,8 @@ INSERT INTO awscc.datasync.location_s3s (
  S3Config,
  region
 )
-SELECT 
-'{{ S3Config }}',
+SELECT
+'{{ s3_config }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -242,12 +242,12 @@ INSERT INTO awscc.datasync.location_s3s (
  Tags,
  region
 )
-SELECT 
- '{{ S3Config }}',
- '{{ S3BucketArn }}',
- '{{ Subdirectory }}',
- '{{ S3StorageClass }}',
- '{{ Tags }}',
+SELECT
+ '{{ s3_config }}',
+ '{{ s3_bucket_arn }}',
+ '{{ subdirectory }}',
+ '{{ s3_storage_class }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -265,20 +265,19 @@ globals:
 resources:
   - name: location_s3
     props:
-      - name: S3Config
+      - name: s3_config
         value:
-          BucketAccessRoleArn: '{{ BucketAccessRoleArn }}'
-      - name: S3BucketArn
-        value: '{{ S3BucketArn }}'
-      - name: Subdirectory
-        value: '{{ Subdirectory }}'
-      - name: S3StorageClass
-        value: '{{ S3StorageClass }}'
-      - name: Tags
+          bucket_access_role_arn: '{{ bucket_access_role_arn }}'
+      - name: s3_bucket_arn
+        value: '{{ s3_bucket_arn }}'
+      - name: subdirectory
+        value: '{{ subdirectory }}'
+      - name: s3_storage_class
+        value: '{{ s3_storage_class }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -297,7 +296,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<LocationArn>';
+AND Identifier = '{{ location_arn }}';
 ```
 
 
@@ -306,7 +305,7 @@ AND Identifier = '<LocationArn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.datasync.location_s3s
-WHERE Identifier = '<LocationArn>'
+WHERE Identifier = '{{ location_arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/datasync/location_smbs/index.md b/website/docs/services/datasync/location_smbs/index.md
index cf2ad4590..7ae5d1508 100644
--- a/website/docs/services/datasync/location_smbs/index.md
+++ b/website/docs/services/datasync/location_smbs/index.md
@@ -237,7 +237,7 @@ kerberos_principal,
 kerberos_keytab,
 kerberos_krb5_conf
 FROM awscc.datasync.location_smbs
-WHERE region = 'us-east-1' AND Identifier = '<LocationArn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ location_arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -273,8 +273,8 @@ INSERT INTO awscc.datasync.location_smbs (
  AgentArns,
  region
 )
-SELECT 
-'{{ AgentArns }}',
+SELECT
+'{{ agent_arns }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -298,20 +298,20 @@ INSERT INTO awscc.datasync.location_smbs (
  KerberosKrb5Conf,
  region
 )
-SELECT 
- '{{ AgentArns }}',
- '{{ Domain }}',
- '{{ MountOptions }}',
- '{{ Password }}',
- '{{ ServerHostname }}',
- '{{ Subdirectory }}',
- '{{ User }}',
- '{{ Tags }}',
- '{{ AuthenticationType }}',
- '{{ DnsIpAddresses }}',
- '{{ KerberosPrincipal }}',
- '{{ KerberosKeytab }}',
- '{{ KerberosKrb5Conf }}',
+SELECT
+ '{{ agent_arns }}',
+ '{{ domain }}',
+ '{{ mount_options }}',
+ '{{ password }}',
+ '{{ server_hostname }}',
+ '{{ subdirectory }}',
+ '{{ user }}',
+ '{{ tags }}',
+ '{{ authentication_type }}',
+ '{{ dns_ip_addresses }}',
+ '{{ kerberos_principal }}',
+ '{{ kerberos_keytab }}',
+ '{{ kerberos_krb5_conf }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -329,38 +329,37 @@ globals:
 resources:
   - name: location_smb
     props:
-      - name: AgentArns
+      - name: agent_arns
         value:
-          - '{{ AgentArns[0] }}'
-      - name: Domain
-        value: '{{ Domain }}'
-      - name: MountOptions
+          - '{{ agent_arns[0] }}'
+      - name: domain
+        value: '{{ domain }}'
+      - name: mount_options
         value:
-          Version: '{{ Version }}'
-      - name: Password
-        value: '{{ Password }}'
-      - name: ServerHostname
-        value: '{{ ServerHostname }}'
-      - name: Subdirectory
-        value: '{{ Subdirectory }}'
-      - name: User
-        value: '{{ User }}'
-      - name: Tags
+          version: '{{ version }}'
+      - name: password
+        value: '{{ password }}'
+      - name: server_hostname
+        value: '{{ server_hostname }}'
+      - name: subdirectory
+        value: '{{ subdirectory }}'
+      - name: user
+        value: '{{ user }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-      - name: AuthenticationType
-        value: '{{ AuthenticationType }}'
-      - name: DnsIpAddresses
+          - key: '{{ key }}'
+            value: '{{ value }}'
+      - name: authentication_type
+        value: '{{ authentication_type }}'
+      - name: dns_ip_addresses
         value:
-          - '{{ DnsIpAddresses[0] }}'
-      - name: KerberosPrincipal
-        value: '{{ KerberosPrincipal }}'
-      - name: KerberosKeytab
-        value: '{{ KerberosKeytab }}'
-      - name: KerberosKrb5Conf
-        value: '{{ KerberosKrb5Conf }}'
-
+          - '{{ dns_ip_addresses[0] }}'
+      - name: kerberos_principal
+        value: '{{ kerberos_principal }}'
+      - name: kerberos_keytab
+        value: '{{ kerberos_keytab }}'
+      - name: kerberos_krb5_conf
+        value: '{{ kerberos_krb5_conf }}'
 ```
 </TabItem>
 </Tabs>
@@ -388,7 +387,7 @@ SET PatchDocument = string('{{ {
     "KerberosKrb5Conf": kerberos_krb5_conf
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<LocationArn>';
+AND Identifier = '{{ location_arn }}';
 ```
 
 
@@ -397,7 +396,7 @@ AND Identifier = '<LocationArn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.datasync.location_smbs
-WHERE Identifier = '<LocationArn>'
+WHERE Identifier = '{{ location_arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/datasync/locationf_sx_lustres/index.md b/website/docs/services/datasync/locationf_sx_lustres/index.md
index b0cfe177c..e7e831800 100644
--- a/website/docs/services/datasync/locationf_sx_lustres/index.md
+++ b/website/docs/services/datasync/locationf_sx_lustres/index.md
@@ -176,7 +176,7 @@ tags,
 location_arn,
 location_uri
 FROM awscc.datasync.locationf_sx_lustres
-WHERE region = 'us-east-1' AND Identifier = '<LocationArn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ location_arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -212,8 +212,8 @@ INSERT INTO awscc.datasync.locationf_sx_lustres (
  SecurityGroupArns,
  region
 )
-SELECT 
-'{{ SecurityGroupArns }}',
+SELECT
+'{{ security_group_arns }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -228,11 +228,11 @@ INSERT INTO awscc.datasync.locationf_sx_lustres (
  Tags,
  region
 )
-SELECT 
- '{{ FsxFilesystemArn }}',
- '{{ SecurityGroupArns }}',
- '{{ Subdirectory }}',
- '{{ Tags }}',
+SELECT
+ '{{ fsx_filesystem_arn }}',
+ '{{ security_group_arns }}',
+ '{{ subdirectory }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -250,18 +250,17 @@ globals:
 resources:
   - name: locationf_sx_lustre
     props:
-      - name: FsxFilesystemArn
-        value: '{{ FsxFilesystemArn }}'
-      - name: SecurityGroupArns
+      - name: fsx_filesystem_arn
+        value: '{{ fsx_filesystem_arn }}'
+      - name: security_group_arns
         value:
-          - '{{ SecurityGroupArns[0] }}'
-      - name: Subdirectory
-        value: '{{ Subdirectory }}'
-      - name: Tags
+          - '{{ security_group_arns[0] }}'
+      - name: subdirectory
+        value: '{{ subdirectory }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -278,7 +277,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<LocationArn>';
+AND Identifier = '{{ location_arn }}';
 ```
 
 
@@ -287,7 +286,7 @@ AND Identifier = '<LocationArn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.datasync.locationf_sx_lustres
-WHERE Identifier = '<LocationArn>'
+WHERE Identifier = '{{ location_arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/datasync/locationf_sx_ontaps/index.md b/website/docs/services/datasync/locationf_sx_ontaps/index.md
index ed26dd1a1..fc3ce5e04 100644
--- a/website/docs/services/datasync/locationf_sx_ontaps/index.md
+++ b/website/docs/services/datasync/locationf_sx_ontaps/index.md
@@ -209,7 +209,7 @@ tags,
 location_arn,
 location_uri
 FROM awscc.datasync.locationf_sx_ontaps
-WHERE region = 'us-east-1' AND Identifier = '<LocationArn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ location_arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -246,9 +246,9 @@ INSERT INTO awscc.datasync.locationf_sx_ontaps (
  SecurityGroupArns,
  region
 )
-SELECT 
-'{{ StorageVirtualMachineArn }}',
- '{{ SecurityGroupArns }}',
+SELECT
+'{{ storage_virtual_machine_arn }}',
+ '{{ security_group_arns }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -264,12 +264,12 @@ INSERT INTO awscc.datasync.locationf_sx_ontaps (
  Tags,
  region
 )
-SELECT 
- '{{ StorageVirtualMachineArn }}',
- '{{ SecurityGroupArns }}',
- '{{ Protocol }}',
- '{{ Subdirectory }}',
- '{{ Tags }}',
+SELECT
+ '{{ storage_virtual_machine_arn }}',
+ '{{ security_group_arns }}',
+ '{{ protocol }}',
+ '{{ subdirectory }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -287,23 +287,22 @@ globals:
 resources:
   - name: locationf_sx_ontap
     props:
-      - name: StorageVirtualMachineArn
-        value: '{{ StorageVirtualMachineArn }}'
-      - name: SecurityGroupArns
+      - name: storage_virtual_machine_arn
+        value: '{{ storage_virtual_machine_arn }}'
+      - name: security_group_arns
         value:
-          - '{{ SecurityGroupArns[0] }}'
-      - name: Protocol
+          - '{{ security_group_arns[0] }}'
+      - name: protocol
         value:
-          NFS:
-            MountOptions:
-              Version: '{{ Version }}'
-      - name: Subdirectory
-        value: '{{ Subdirectory }}'
-      - name: Tags
+          n_fs:
+            mount_options:
+              version: '{{ version }}'
+      - name: subdirectory
+        value: '{{ subdirectory }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -321,7 +320,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<LocationArn>';
+AND Identifier = '{{ location_arn }}';
 ```
 
 
@@ -330,7 +329,7 @@ AND Identifier = '<LocationArn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.datasync.locationf_sx_ontaps
-WHERE Identifier = '<LocationArn>'
+WHERE Identifier = '{{ location_arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/datasync/locationf_sx_open_zfs/index.md b/website/docs/services/datasync/locationf_sx_open_zfs/index.md
index 179c66b0d..1266a3707 100644
--- a/website/docs/services/datasync/locationf_sx_open_zfs/index.md
+++ b/website/docs/services/datasync/locationf_sx_open_zfs/index.md
@@ -203,7 +203,7 @@ tags,
 location_arn,
 location_uri
 FROM awscc.datasync.locationf_sx_open_zfs
-WHERE region = 'us-east-1' AND Identifier = '<LocationArn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ location_arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -240,9 +240,9 @@ INSERT INTO awscc.datasync.locationf_sx_open_zfs (
  Protocol,
  region
 )
-SELECT 
-'{{ SecurityGroupArns }}',
- '{{ Protocol }}',
+SELECT
+'{{ security_group_arns }}',
+ '{{ protocol }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -258,12 +258,12 @@ INSERT INTO awscc.datasync.locationf_sx_open_zfs (
  Tags,
  region
 )
-SELECT 
- '{{ FsxFilesystemArn }}',
- '{{ SecurityGroupArns }}',
- '{{ Protocol }}',
- '{{ Subdirectory }}',
- '{{ Tags }}',
+SELECT
+ '{{ fsx_filesystem_arn }}',
+ '{{ security_group_arns }}',
+ '{{ protocol }}',
+ '{{ subdirectory }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -281,23 +281,22 @@ globals:
 resources:
   - name: locationf_sx_open_zf
     props:
-      - name: FsxFilesystemArn
-        value: '{{ FsxFilesystemArn }}'
-      - name: SecurityGroupArns
+      - name: fsx_filesystem_arn
+        value: '{{ fsx_filesystem_arn }}'
+      - name: security_group_arns
         value:
-          - '{{ SecurityGroupArns[0] }}'
-      - name: Protocol
+          - '{{ security_group_arns[0] }}'
+      - name: protocol
         value:
-          NFS:
-            MountOptions:
-              Version: '{{ Version }}'
-      - name: Subdirectory
-        value: '{{ Subdirectory }}'
-      - name: Tags
+          n_fs:
+            mount_options:
+              version: '{{ version }}'
+      - name: subdirectory
+        value: '{{ subdirectory }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -315,7 +314,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<LocationArn>';
+AND Identifier = '{{ location_arn }}';
 ```
 
 
@@ -324,7 +323,7 @@ AND Identifier = '<LocationArn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.datasync.locationf_sx_open_zfs
-WHERE Identifier = '<LocationArn>'
+WHERE Identifier = '{{ location_arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/datasync/locationf_sx_windows/index.md b/website/docs/services/datasync/locationf_sx_windows/index.md
index f6b2c2ec6..6aed4653a 100644
--- a/website/docs/services/datasync/locationf_sx_windows/index.md
+++ b/website/docs/services/datasync/locationf_sx_windows/index.md
@@ -194,7 +194,7 @@ tags,
 location_arn,
 location_uri
 FROM awscc.datasync.locationf_sx_windows
-WHERE region = 'us-east-1' AND Identifier = '<LocationArn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ location_arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -231,9 +231,9 @@ INSERT INTO awscc.datasync.locationf_sx_windows (
  User,
  region
 )
-SELECT 
-'{{ SecurityGroupArns }}',
- '{{ User }}',
+SELECT
+'{{ security_group_arns }}',
+ '{{ user }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -251,14 +251,14 @@ INSERT INTO awscc.datasync.locationf_sx_windows (
  Tags,
  region
 )
-SELECT 
- '{{ Domain }}',
- '{{ FsxFilesystemArn }}',
- '{{ Password }}',
- '{{ SecurityGroupArns }}',
- '{{ Subdirectory }}',
- '{{ User }}',
- '{{ Tags }}',
+SELECT
+ '{{ domain }}',
+ '{{ fsx_filesystem_arn }}',
+ '{{ password }}',
+ '{{ security_group_arns }}',
+ '{{ subdirectory }}',
+ '{{ user }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -276,24 +276,23 @@ globals:
 resources:
   - name: locationf_sx_window
     props:
-      - name: Domain
-        value: '{{ Domain }}'
-      - name: FsxFilesystemArn
-        value: '{{ FsxFilesystemArn }}'
-      - name: Password
-        value: '{{ Password }}'
-      - name: SecurityGroupArns
+      - name: domain
+        value: '{{ domain }}'
+      - name: fsx_filesystem_arn
+        value: '{{ fsx_filesystem_arn }}'
+      - name: password
+        value: '{{ password }}'
+      - name: security_group_arns
         value:
-          - '{{ SecurityGroupArns[0] }}'
-      - name: Subdirectory
-        value: '{{ Subdirectory }}'
-      - name: User
-        value: '{{ User }}'
-      - name: Tags
+          - '{{ security_group_arns[0] }}'
+      - name: subdirectory
+        value: '{{ subdirectory }}'
+      - name: user
+        value: '{{ user }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -313,7 +312,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<LocationArn>';
+AND Identifier = '{{ location_arn }}';
 ```
 
 
@@ -322,7 +321,7 @@ AND Identifier = '<LocationArn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.datasync.locationf_sx_windows
-WHERE Identifier = '<LocationArn>'
+WHERE Identifier = '{{ location_arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/datasync/tasks/index.md b/website/docs/services/datasync/tasks/index.md
index a87ab8a28..334be9581 100644
--- a/website/docs/services/datasync/tasks/index.md
+++ b/website/docs/services/datasync/tasks/index.md
@@ -484,7 +484,7 @@ status,
 source_network_interface_arns,
 destination_network_interface_arns
 FROM awscc.datasync.tasks
-WHERE region = 'us-east-1' AND Identifier = '<TaskArn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ task_arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -521,9 +521,9 @@ INSERT INTO awscc.datasync.tasks (
  SourceLocationArn,
  region
 )
-SELECT 
-'{{ DestinationLocationArn }}',
- '{{ SourceLocationArn }}',
+SELECT
+'{{ destination_location_arn }}',
+ '{{ source_location_arn }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -546,19 +546,19 @@ INSERT INTO awscc.datasync.tasks (
  TaskMode,
  region
 )
-SELECT 
- '{{ Excludes }}',
- '{{ Includes }}',
- '{{ Tags }}',
- '{{ CloudWatchLogGroupArn }}',
- '{{ DestinationLocationArn }}',
- '{{ Name }}',
- '{{ Options }}',
- '{{ TaskReportConfig }}',
- '{{ ManifestConfig }}',
- '{{ Schedule }}',
- '{{ SourceLocationArn }}',
- '{{ TaskMode }}',
+SELECT
+ '{{ excludes }}',
+ '{{ includes }}',
+ '{{ tags }}',
+ '{{ cloud_watch_log_group_arn }}',
+ '{{ destination_location_arn }}',
+ '{{ name }}',
+ '{{ options }}',
+ '{{ task_report_config }}',
+ '{{ manifest_config }}',
+ '{{ schedule }}',
+ '{{ source_location_arn }}',
+ '{{ task_mode }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -576,78 +576,77 @@ globals:
 resources:
   - name: task
     props:
-      - name: Excludes
+      - name: excludes
         value:
-          - FilterType: '{{ FilterType }}'
-            Value: '{{ Value }}'
-      - name: Includes
+          - filter_type: '{{ filter_type }}'
+            value: '{{ value }}'
+      - name: includes
         value:
           - null
-      - name: Tags
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-      - name: CloudWatchLogGroupArn
-        value: '{{ CloudWatchLogGroupArn }}'
-      - name: DestinationLocationArn
-        value: '{{ DestinationLocationArn }}'
-      - name: Name
-        value: '{{ Name }}'
-      - name: Options
+          - key: '{{ key }}'
+            value: '{{ value }}'
+      - name: cloud_watch_log_group_arn
+        value: '{{ cloud_watch_log_group_arn }}'
+      - name: destination_location_arn
+        value: '{{ destination_location_arn }}'
+      - name: name
+        value: '{{ name }}'
+      - name: options
         value:
-          Atime: '{{ Atime }}'
-          BytesPerSecond: '{{ BytesPerSecond }}'
-          Gid: '{{ Gid }}'
-          LogLevel: '{{ LogLevel }}'
-          Mtime: '{{ Mtime }}'
-          OverwriteMode: '{{ OverwriteMode }}'
-          PosixPermissions: '{{ PosixPermissions }}'
-          PreserveDeletedFiles: '{{ PreserveDeletedFiles }}'
-          PreserveDevices: '{{ PreserveDevices }}'
-          SecurityDescriptorCopyFlags: '{{ SecurityDescriptorCopyFlags }}'
-          TaskQueueing: '{{ TaskQueueing }}'
-          TransferMode: '{{ TransferMode }}'
-          Uid: '{{ Uid }}'
-          VerifyMode: '{{ VerifyMode }}'
-          ObjectTags: '{{ ObjectTags }}'
-      - name: TaskReportConfig
+          atime: '{{ atime }}'
+          bytes_per_second: '{{ bytes_per_second }}'
+          gid: '{{ gid }}'
+          log_level: '{{ log_level }}'
+          mtime: '{{ mtime }}'
+          overwrite_mode: '{{ overwrite_mode }}'
+          posix_permissions: '{{ posix_permissions }}'
+          preserve_deleted_files: '{{ preserve_deleted_files }}'
+          preserve_devices: '{{ preserve_devices }}'
+          security_descriptor_copy_flags: '{{ security_descriptor_copy_flags }}'
+          task_queueing: '{{ task_queueing }}'
+          transfer_mode: '{{ transfer_mode }}'
+          uid: '{{ uid }}'
+          verify_mode: '{{ verify_mode }}'
+          object_tags: '{{ object_tags }}'
+      - name: task_report_config
         value:
-          Destination:
-            S3:
-              Subdirectory: '{{ Subdirectory }}'
-              BucketAccessRoleArn: '{{ BucketAccessRoleArn }}'
-              S3BucketArn: '{{ S3BucketArn }}'
-          OutputType: '{{ OutputType }}'
-          ReportLevel: '{{ ReportLevel }}'
-          ObjectVersionIds: '{{ ObjectVersionIds }}'
-          Overrides:
-            Transferred:
-              ReportLevel: '{{ ReportLevel }}'
-            Verified:
-              ReportLevel: '{{ ReportLevel }}'
-            Deleted:
-              ReportLevel: '{{ ReportLevel }}'
-            Skipped:
-              ReportLevel: '{{ ReportLevel }}'
-      - name: ManifestConfig
+          destination:
+            s3:
+              subdirectory: '{{ subdirectory }}'
+              bucket_access_role_arn: '{{ bucket_access_role_arn }}'
+              s3_bucket_arn: '{{ s3_bucket_arn }}'
+          output_type: '{{ output_type }}'
+          report_level: '{{ report_level }}'
+          object_version_ids: '{{ object_version_ids }}'
+          overrides:
+            transferred:
+              report_level: '{{ report_level }}'
+            verified:
+              report_level: '{{ report_level }}'
+            deleted:
+              report_level: '{{ report_level }}'
+            skipped:
+              report_level: '{{ report_level }}'
+      - name: manifest_config
         value:
-          Action: '{{ Action }}'
-          Format: '{{ Format }}'
-          Source:
-            S3:
-              ManifestObjectPath: '{{ ManifestObjectPath }}'
-              BucketAccessRoleArn: '{{ BucketAccessRoleArn }}'
-              S3BucketArn: '{{ S3BucketArn }}'
-              ManifestObjectVersionId: '{{ ManifestObjectVersionId }}'
-      - name: Schedule
+          action: '{{ action }}'
+          format: '{{ format }}'
+          source:
+            s3:
+              manifest_object_path: '{{ manifest_object_path }}'
+              bucket_access_role_arn: '{{ bucket_access_role_arn }}'
+              s3_bucket_arn: '{{ s3_bucket_arn }}'
+              manifest_object_version_id: '{{ manifest_object_version_id }}'
+      - name: schedule
         value:
-          ScheduleExpression: '{{ ScheduleExpression }}'
-          Status: '{{ Status }}'
-      - name: SourceLocationArn
-        value: '{{ SourceLocationArn }}'
-      - name: TaskMode
-        value: '{{ TaskMode }}'
-
+          schedule_expression: '{{ schedule_expression }}'
+          status: '{{ status }}'
+      - name: source_location_arn
+        value: '{{ source_location_arn }}'
+      - name: task_mode
+        value: '{{ task_mode }}'
 ```
 </TabItem>
 </Tabs>
@@ -671,7 +670,7 @@ SET PatchDocument = string('{{ {
     "Schedule": schedule
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<TaskArn>';
+AND Identifier = '{{ task_arn }}';
 ```
 
 
@@ -680,7 +679,7 @@ AND Identifier = '<TaskArn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.datasync.tasks
-WHERE Identifier = '<TaskArn>'
+WHERE Identifier = '{{ task_arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/datazone/connections/index.md b/website/docs/services/datazone/connections/index.md
index fc99ca2a4..dcc4fe0d1 100644
--- a/website/docs/services/datazone/connections/index.md
+++ b/website/docs/services/datazone/connections/index.md
@@ -233,7 +233,7 @@ project_id,
 props,
 type
 FROM awscc.datazone.connections
-WHERE region = 'us-east-1' AND Identifier = '<DomainId>|<ConnectionId>';
+WHERE region = 'us-east-1' AND Identifier = '{{ domain_id }}|{{ connection_id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -272,10 +272,10 @@ INSERT INTO awscc.datazone.connections (
  Name,
  region
 )
-SELECT 
-'{{ DomainIdentifier }}',
- '{{ EnvironmentIdentifier }}',
- '{{ Name }}',
+SELECT
+'{{ domain_identifier }}',
+ '{{ environment_identifier }}',
+ '{{ name }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -292,13 +292,13 @@ INSERT INTO awscc.datazone.connections (
  Props,
  region
 )
-SELECT 
- '{{ AwsLocation }}',
- '{{ Description }}',
- '{{ DomainIdentifier }}',
- '{{ EnvironmentIdentifier }}',
- '{{ Name }}',
- '{{ Props }}',
+SELECT
+ '{{ aws_location }}',
+ '{{ description }}',
+ '{{ domain_identifier }}',
+ '{{ environment_identifier }}',
+ '{{ name }}',
+ '{{ props }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -316,23 +316,22 @@ globals:
 resources:
   - name: connection
     props:
-      - name: AwsLocation
+      - name: aws_location
         value:
-          AccessRole: '{{ AccessRole }}'
-          AwsAccountId: '{{ AwsAccountId }}'
-          AwsRegion: '{{ AwsRegion }}'
-          IamConnectionId: '{{ IamConnectionId }}'
-      - name: Description
-        value: '{{ Description }}'
-      - name: DomainIdentifier
-        value: '{{ DomainIdentifier }}'
-      - name: EnvironmentIdentifier
-        value: '{{ EnvironmentIdentifier }}'
-      - name: Name
-        value: '{{ Name }}'
-      - name: Props
+          access_role: '{{ access_role }}'
+          aws_account_id: '{{ aws_account_id }}'
+          aws_region: '{{ aws_region }}'
+          iam_connection_id: '{{ iam_connection_id }}'
+      - name: description
+        value: '{{ description }}'
+      - name: domain_identifier
+        value: '{{ domain_identifier }}'
+      - name: environment_identifier
+        value: '{{ environment_identifier }}'
+      - name: name
+        value: '{{ name }}'
+      - name: props
         value: null
-
 ```
 </TabItem>
 </Tabs>
@@ -350,7 +349,7 @@ SET PatchDocument = string('{{ {
     "Props": props
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<DomainId>|<ConnectionId>';
+AND Identifier = '{{ domain_id }}|{{ connection_id }}';
 ```
 
 
@@ -359,7 +358,7 @@ AND Identifier = '<DomainId>|<ConnectionId>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.datazone.connections
-WHERE Identifier = '<DomainId|ConnectionId>'
+WHERE Identifier = '{{ domain_id }}|{{ connection_id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/datazone/data_sources/index.md b/website/docs/services/datazone/data_sources/index.md
index 7c2d22dfd..bc8403384 100644
--- a/website/docs/services/datazone/data_sources/index.md
+++ b/website/docs/services/datazone/data_sources/index.md
@@ -318,7 +318,7 @@ status,
 type,
 updated_at
 FROM awscc.datazone.data_sources
-WHERE region = 'us-east-1' AND Identifier = '<DomainId>|<Id>';
+WHERE region = 'us-east-1' AND Identifier = '{{ domain_id }}|{{ id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -358,11 +358,11 @@ INSERT INTO awscc.datazone.data_sources (
  Type,
  region
 )
-SELECT 
-'{{ DomainIdentifier }}',
- '{{ Name }}',
- '{{ ProjectIdentifier }}',
- '{{ Type }}',
+SELECT
+'{{ domain_identifier }}',
+ '{{ name }}',
+ '{{ project_identifier }}',
+ '{{ type }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -386,20 +386,20 @@ INSERT INTO awscc.datazone.data_sources (
  Type,
  region
 )
-SELECT 
- '{{ AssetFormsInput }}',
- '{{ ConnectionIdentifier }}',
- '{{ Description }}',
- '{{ DomainIdentifier }}',
- '{{ EnableSetting }}',
- '{{ EnvironmentIdentifier }}',
- '{{ Configuration }}',
- '{{ Name }}',
- '{{ ProjectIdentifier }}',
- '{{ PublishOnImport }}',
- '{{ Recommendation }}',
- '{{ Schedule }}',
- '{{ Type }}',
+SELECT
+ '{{ asset_forms_input }}',
+ '{{ connection_identifier }}',
+ '{{ description }}',
+ '{{ domain_identifier }}',
+ '{{ enable_setting }}',
+ '{{ environment_identifier }}',
+ '{{ configuration }}',
+ '{{ name }}',
+ '{{ project_identifier }}',
+ '{{ publish_on_import }}',
+ '{{ recommendation }}',
+ '{{ schedule }}',
+ '{{ type }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -417,40 +417,39 @@ globals:
 resources:
   - name: data_source
     props:
-      - name: AssetFormsInput
+      - name: asset_forms_input
         value:
-          - FormName: '{{ FormName }}'
-            TypeIdentifier: '{{ TypeIdentifier }}'
-            TypeRevision: '{{ TypeRevision }}'
-            Content: '{{ Content }}'
-      - name: ConnectionIdentifier
-        value: '{{ ConnectionIdentifier }}'
-      - name: Description
-        value: '{{ Description }}'
-      - name: DomainIdentifier
-        value: '{{ DomainIdentifier }}'
-      - name: EnableSetting
-        value: '{{ EnableSetting }}'
-      - name: EnvironmentIdentifier
-        value: '{{ EnvironmentIdentifier }}'
-      - name: Configuration
+          - form_name: '{{ form_name }}'
+            type_identifier: '{{ type_identifier }}'
+            type_revision: '{{ type_revision }}'
+            content: '{{ content }}'
+      - name: connection_identifier
+        value: '{{ connection_identifier }}'
+      - name: description
+        value: '{{ description }}'
+      - name: domain_identifier
+        value: '{{ domain_identifier }}'
+      - name: enable_setting
+        value: '{{ enable_setting }}'
+      - name: environment_identifier
+        value: '{{ environment_identifier }}'
+      - name: configuration
         value: null
-      - name: Name
-        value: '{{ Name }}'
-      - name: ProjectIdentifier
-        value: '{{ ProjectIdentifier }}'
-      - name: PublishOnImport
-        value: '{{ PublishOnImport }}'
-      - name: Recommendation
+      - name: name
+        value: '{{ name }}'
+      - name: project_identifier
+        value: '{{ project_identifier }}'
+      - name: publish_on_import
+        value: '{{ publish_on_import }}'
+      - name: recommendation
         value:
-          EnableBusinessNameGeneration: '{{ EnableBusinessNameGeneration }}'
-      - name: Schedule
+          enable_business_name_generation: '{{ enable_business_name_generation }}'
+      - name: schedule
         value:
-          Timezone: '{{ Timezone }}'
-          Schedule: '{{ Schedule }}'
-      - name: Type
-        value: '{{ Type }}'
-
+          timezone: '{{ timezone }}'
+          schedule: '{{ schedule }}'
+      - name: type
+        value: '{{ type }}'
 ```
 </TabItem>
 </Tabs>
@@ -473,7 +472,7 @@ SET PatchDocument = string('{{ {
     "Schedule": schedule
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<DomainId>|<Id>';
+AND Identifier = '{{ domain_id }}|{{ id }}';
 ```
 
 
@@ -482,7 +481,7 @@ AND Identifier = '<DomainId>|<Id>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.datazone.data_sources
-WHERE Identifier = '<DomainId|Id>'
+WHERE Identifier = '{{ domain_id }}|{{ id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/datazone/domain_units/index.md b/website/docs/services/datazone/domain_units/index.md
index f8742d2ef..9738f52dd 100644
--- a/website/docs/services/datazone/domain_units/index.md
+++ b/website/docs/services/datazone/domain_units/index.md
@@ -193,7 +193,7 @@ parent_domain_unit_id,
 identifier,
 last_updated_at
 FROM awscc.datazone.domain_units
-WHERE region = 'us-east-1' AND Identifier = '<DomainId>|<Id>';
+WHERE region = 'us-east-1' AND Identifier = '{{ domain_id }}|{{ id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -232,10 +232,10 @@ INSERT INTO awscc.datazone.domain_units (
  ParentDomainUnitIdentifier,
  region
 )
-SELECT 
-'{{ DomainIdentifier }}',
- '{{ Name }}',
- '{{ ParentDomainUnitIdentifier }}',
+SELECT
+'{{ domain_identifier }}',
+ '{{ name }}',
+ '{{ parent_domain_unit_identifier }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -250,11 +250,11 @@ INSERT INTO awscc.datazone.domain_units (
  ParentDomainUnitIdentifier,
  region
 )
-SELECT 
- '{{ DomainIdentifier }}',
- '{{ Description }}',
- '{{ Name }}',
- '{{ ParentDomainUnitIdentifier }}',
+SELECT
+ '{{ domain_identifier }}',
+ '{{ description }}',
+ '{{ name }}',
+ '{{ parent_domain_unit_identifier }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -272,15 +272,14 @@ globals:
 resources:
   - name: domain_unit
     props:
-      - name: DomainIdentifier
-        value: '{{ DomainIdentifier }}'
-      - name: Description
-        value: '{{ Description }}'
-      - name: Name
-        value: '{{ Name }}'
-      - name: ParentDomainUnitIdentifier
-        value: '{{ ParentDomainUnitIdentifier }}'
-
+      - name: domain_identifier
+        value: '{{ domain_identifier }}'
+      - name: description
+        value: '{{ description }}'
+      - name: name
+        value: '{{ name }}'
+      - name: parent_domain_unit_identifier
+        value: '{{ parent_domain_unit_identifier }}'
 ```
 </TabItem>
 </Tabs>
@@ -297,7 +296,7 @@ SET PatchDocument = string('{{ {
     "Name": name
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<DomainId>|<Id>';
+AND Identifier = '{{ domain_id }}|{{ id }}';
 ```
 
 
@@ -306,7 +305,7 @@ AND Identifier = '<DomainId>|<Id>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.datazone.domain_units
-WHERE Identifier = '<DomainId|Id>'
+WHERE Identifier = '{{ domain_id }}|{{ id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/datazone/domains/index.md b/website/docs/services/datazone/domains/index.md
index 45e8e9795..e67d79d96 100644
--- a/website/docs/services/datazone/domains/index.md
+++ b/website/docs/services/datazone/domains/index.md
@@ -253,7 +253,7 @@ single_sign_on,
 status,
 tags
 FROM awscc.datazone.domains
-WHERE region = 'us-east-1' AND Identifier = '<Id>';
+WHERE region = 'us-east-1' AND Identifier = '{{ id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -290,9 +290,9 @@ INSERT INTO awscc.datazone.domains (
  Name,
  region
 )
-SELECT 
-'{{ DomainExecutionRole }}',
- '{{ Name }}',
+SELECT
+'{{ domain_execution_role }}',
+ '{{ name }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -311,15 +311,15 @@ INSERT INTO awscc.datazone.domains (
  Tags,
  region
 )
-SELECT 
- '{{ Description }}',
- '{{ DomainExecutionRole }}',
- '{{ ServiceRole }}',
- '{{ DomainVersion }}',
- '{{ KmsKeyIdentifier }}',
- '{{ Name }}',
- '{{ SingleSignOn }}',
- '{{ Tags }}',
+SELECT
+ '{{ description }}',
+ '{{ domain_execution_role }}',
+ '{{ service_role }}',
+ '{{ domain_version }}',
+ '{{ kms_key_identifier }}',
+ '{{ name }}',
+ '{{ single_sign_on }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -337,28 +337,27 @@ globals:
 resources:
   - name: domain
     props:
-      - name: Description
-        value: '{{ Description }}'
-      - name: DomainExecutionRole
-        value: '{{ DomainExecutionRole }}'
-      - name: ServiceRole
-        value: '{{ ServiceRole }}'
-      - name: DomainVersion
-        value: '{{ DomainVersion }}'
-      - name: KmsKeyIdentifier
-        value: '{{ KmsKeyIdentifier }}'
-      - name: Name
-        value: '{{ Name }}'
-      - name: SingleSignOn
+      - name: description
+        value: '{{ description }}'
+      - name: domain_execution_role
+        value: '{{ domain_execution_role }}'
+      - name: service_role
+        value: '{{ service_role }}'
+      - name: domain_version
+        value: '{{ domain_version }}'
+      - name: kms_key_identifier
+        value: '{{ kms_key_identifier }}'
+      - name: name
+        value: '{{ name }}'
+      - name: single_sign_on
         value:
-          Type: '{{ Type }}'
-          UserAssignment: '{{ UserAssignment }}'
-          IdcInstanceArn: '{{ IdcInstanceArn }}'
-      - name: Tags
+          type: '{{ type }}'
+          user_assignment: '{{ user_assignment }}'
+          idc_instance_arn: '{{ idc_instance_arn }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -379,7 +378,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Id>';
+AND Identifier = '{{ id }}';
 ```
 
 
@@ -388,7 +387,7 @@ AND Identifier = '<Id>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.datazone.domains
-WHERE Identifier = '<Id>'
+WHERE Identifier = '{{ id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/datazone/environment_actions/index.md b/website/docs/services/datazone/environment_actions/index.md
index 2dc874167..d44c8281b 100644
--- a/website/docs/services/datazone/environment_actions/index.md
+++ b/website/docs/services/datazone/environment_actions/index.md
@@ -199,7 +199,7 @@ identifier,
 name,
 parameters
 FROM awscc.datazone.environment_actions
-WHERE region = 'us-east-1' AND Identifier = '<DomainId>|<EnvironmentId>|<Id>';
+WHERE region = 'us-east-1' AND Identifier = '{{ domain_id }}|{{ environment_id }}|{{ id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -237,8 +237,8 @@ INSERT INTO awscc.datazone.environment_actions (
  Name,
  region
 )
-SELECT 
-'{{ Name }}',
+SELECT
+'{{ name }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -255,13 +255,13 @@ INSERT INTO awscc.datazone.environment_actions (
  Parameters,
  region
 )
-SELECT 
- '{{ Description }}',
- '{{ DomainIdentifier }}',
- '{{ EnvironmentIdentifier }}',
- '{{ Identifier }}',
- '{{ Name }}',
- '{{ Parameters }}',
+SELECT
+ '{{ description }}',
+ '{{ domain_identifier }}',
+ '{{ environment_identifier }}',
+ '{{ identifier }}',
+ '{{ name }}',
+ '{{ parameters }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -279,20 +279,19 @@ globals:
 resources:
   - name: environment_action
     props:
-      - name: Description
-        value: '{{ Description }}'
-      - name: DomainIdentifier
-        value: '{{ DomainIdentifier }}'
-      - name: EnvironmentIdentifier
-        value: '{{ EnvironmentIdentifier }}'
-      - name: Identifier
-        value: '{{ Identifier }}'
-      - name: Name
-        value: '{{ Name }}'
-      - name: Parameters
+      - name: description
+        value: '{{ description }}'
+      - name: domain_identifier
+        value: '{{ domain_identifier }}'
+      - name: environment_identifier
+        value: '{{ environment_identifier }}'
+      - name: identifier
+        value: '{{ identifier }}'
+      - name: name
+        value: '{{ name }}'
+      - name: parameters
         value:
-          Uri: '{{ Uri }}'
-
+          uri: '{{ uri }}'
 ```
 </TabItem>
 </Tabs>
@@ -311,7 +310,7 @@ SET PatchDocument = string('{{ {
     "Parameters": parameters
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<DomainId>|<EnvironmentId>|<Id>';
+AND Identifier = '{{ domain_id }}|{{ environment_id }}|{{ id }}';
 ```
 
 
@@ -320,7 +319,7 @@ AND Identifier = '<DomainId>|<EnvironmentId>|<Id>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.datazone.environment_actions
-WHERE Identifier = '<DomainId|EnvironmentId|Id>'
+WHERE Identifier = '{{ domain_id }}|{{ environment_id }}|{{ id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/datazone/environment_blueprint_configurations/index.md b/website/docs/services/datazone/environment_blueprint_configurations/index.md
index 79be827c6..0d212d150 100644
--- a/website/docs/services/datazone/environment_blueprint_configurations/index.md
+++ b/website/docs/services/datazone/environment_blueprint_configurations/index.md
@@ -217,7 +217,7 @@ domain_identifier,
 environment_role_permission_boundary,
 manage_access_role_arn
 FROM awscc.datazone.environment_blueprint_configurations
-WHERE region = 'us-east-1' AND Identifier = '<DomainId>|<EnvironmentBlueprintId>';
+WHERE region = 'us-east-1' AND Identifier = '{{ domain_id }}|{{ environment_blueprint_id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -256,10 +256,10 @@ INSERT INTO awscc.datazone.environment_blueprint_configurations (
  DomainIdentifier,
  region
 )
-SELECT 
-'{{ EnabledRegions }}',
- '{{ EnvironmentBlueprintIdentifier }}',
- '{{ DomainIdentifier }}',
+SELECT
+'{{ enabled_regions }}',
+ '{{ environment_blueprint_identifier }}',
+ '{{ domain_identifier }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -278,15 +278,15 @@ INSERT INTO awscc.datazone.environment_blueprint_configurations (
  ManageAccessRoleArn,
  region
 )
-SELECT 
- '{{ EnabledRegions }}',
- '{{ EnvironmentBlueprintIdentifier }}',
- '{{ RegionalParameters }}',
- '{{ ProvisioningRoleArn }}',
- '{{ ProvisioningConfigurations }}',
- '{{ DomainIdentifier }}',
- '{{ EnvironmentRolePermissionBoundary }}',
- '{{ ManageAccessRoleArn }}',
+SELECT
+ '{{ enabled_regions }}',
+ '{{ environment_blueprint_identifier }}',
+ '{{ regional_parameters }}',
+ '{{ provisioning_role_arn }}',
+ '{{ provisioning_configurations }}',
+ '{{ domain_identifier }}',
+ '{{ environment_role_permission_boundary }}',
+ '{{ manage_access_role_arn }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -304,27 +304,26 @@ globals:
 resources:
   - name: environment_blueprint_configuration
     props:
-      - name: EnabledRegions
+      - name: enabled_regions
         value:
-          - '{{ EnabledRegions[0] }}'
-      - name: EnvironmentBlueprintIdentifier
-        value: '{{ EnvironmentBlueprintIdentifier }}'
-      - name: RegionalParameters
+          - '{{ enabled_regions[0] }}'
+      - name: environment_blueprint_identifier
+        value: '{{ environment_blueprint_identifier }}'
+      - name: regional_parameters
         value:
-          - Parameters: {}
-            Region: '{{ Region }}'
-      - name: ProvisioningRoleArn
-        value: '{{ ProvisioningRoleArn }}'
-      - name: ProvisioningConfigurations
+          - parameters: {}
+            region: '{{ region }}'
+      - name: provisioning_role_arn
+        value: '{{ provisioning_role_arn }}'
+      - name: provisioning_configurations
         value:
           - null
-      - name: DomainIdentifier
-        value: '{{ DomainIdentifier }}'
-      - name: EnvironmentRolePermissionBoundary
-        value: '{{ EnvironmentRolePermissionBoundary }}'
-      - name: ManageAccessRoleArn
-        value: '{{ ManageAccessRoleArn }}'
-
+      - name: domain_identifier
+        value: '{{ domain_identifier }}'
+      - name: environment_role_permission_boundary
+        value: '{{ environment_role_permission_boundary }}'
+      - name: manage_access_role_arn
+        value: '{{ manage_access_role_arn }}'
 ```
 </TabItem>
 </Tabs>
@@ -345,7 +344,7 @@ SET PatchDocument = string('{{ {
     "ManageAccessRoleArn": manage_access_role_arn
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<DomainId>|<EnvironmentBlueprintId>';
+AND Identifier = '{{ domain_id }}|{{ environment_blueprint_id }}';
 ```
 
 
@@ -354,7 +353,7 @@ AND Identifier = '<DomainId>|<EnvironmentBlueprintId>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.datazone.environment_blueprint_configurations
-WHERE Identifier = '<DomainId|EnvironmentBlueprintId>'
+WHERE Identifier = '{{ domain_id }}|{{ environment_blueprint_id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/datazone/environment_profiles/index.md b/website/docs/services/datazone/environment_profiles/index.md
index 67991db1e..adafa8bba 100644
--- a/website/docs/services/datazone/environment_profiles/index.md
+++ b/website/docs/services/datazone/environment_profiles/index.md
@@ -235,7 +235,7 @@ project_identifier,
 updated_at,
 user_parameters
 FROM awscc.datazone.environment_profiles
-WHERE region = 'us-east-1' AND Identifier = '<DomainId>|<Id>';
+WHERE region = 'us-east-1' AND Identifier = '{{ domain_id }}|{{ id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -277,13 +277,13 @@ INSERT INTO awscc.datazone.environment_profiles (
  ProjectIdentifier,
  region
 )
-SELECT 
-'{{ AwsAccountId }}',
- '{{ AwsAccountRegion }}',
- '{{ DomainIdentifier }}',
- '{{ EnvironmentBlueprintIdentifier }}',
- '{{ Name }}',
- '{{ ProjectIdentifier }}',
+SELECT
+'{{ aws_account_id }}',
+ '{{ aws_account_region }}',
+ '{{ domain_identifier }}',
+ '{{ environment_blueprint_identifier }}',
+ '{{ name }}',
+ '{{ project_identifier }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -302,15 +302,15 @@ INSERT INTO awscc.datazone.environment_profiles (
  UserParameters,
  region
 )
-SELECT 
- '{{ AwsAccountId }}',
- '{{ AwsAccountRegion }}',
- '{{ Description }}',
- '{{ DomainIdentifier }}',
- '{{ EnvironmentBlueprintIdentifier }}',
- '{{ Name }}',
- '{{ ProjectIdentifier }}',
- '{{ UserParameters }}',
+SELECT
+ '{{ aws_account_id }}',
+ '{{ aws_account_region }}',
+ '{{ description }}',
+ '{{ domain_identifier }}',
+ '{{ environment_blueprint_identifier }}',
+ '{{ name }}',
+ '{{ project_identifier }}',
+ '{{ user_parameters }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -328,25 +328,24 @@ globals:
 resources:
   - name: environment_profile
     props:
-      - name: AwsAccountId
-        value: '{{ AwsAccountId }}'
-      - name: AwsAccountRegion
-        value: '{{ AwsAccountRegion }}'
-      - name: Description
-        value: '{{ Description }}'
-      - name: DomainIdentifier
-        value: '{{ DomainIdentifier }}'
-      - name: EnvironmentBlueprintIdentifier
-        value: '{{ EnvironmentBlueprintIdentifier }}'
-      - name: Name
-        value: '{{ Name }}'
-      - name: ProjectIdentifier
-        value: '{{ ProjectIdentifier }}'
-      - name: UserParameters
+      - name: aws_account_id
+        value: '{{ aws_account_id }}'
+      - name: aws_account_region
+        value: '{{ aws_account_region }}'
+      - name: description
+        value: '{{ description }}'
+      - name: domain_identifier
+        value: '{{ domain_identifier }}'
+      - name: environment_blueprint_identifier
+        value: '{{ environment_blueprint_identifier }}'
+      - name: name
+        value: '{{ name }}'
+      - name: project_identifier
+        value: '{{ project_identifier }}'
+      - name: user_parameters
         value:
-          - Name: '{{ Name }}'
-            Value: '{{ Value }}'
-
+          - name: '{{ name }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -366,7 +365,7 @@ SET PatchDocument = string('{{ {
     "UserParameters": user_parameters
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<DomainId>|<Id>';
+AND Identifier = '{{ domain_id }}|{{ id }}';
 ```
 
 
@@ -375,7 +374,7 @@ AND Identifier = '<DomainId>|<Id>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.datazone.environment_profiles
-WHERE Identifier = '<DomainId|Id>'
+WHERE Identifier = '{{ domain_id }}|{{ id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/datazone/environments/index.md b/website/docs/services/datazone/environments/index.md
index 51d3de682..dedef3814 100644
--- a/website/docs/services/datazone/environments/index.md
+++ b/website/docs/services/datazone/environments/index.md
@@ -277,7 +277,7 @@ status,
 updated_at,
 user_parameters
 FROM awscc.datazone.environments
-WHERE region = 'us-east-1' AND Identifier = '<DomainId>|<Id>';
+WHERE region = 'us-east-1' AND Identifier = '{{ domain_id }}|{{ id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -316,10 +316,10 @@ INSERT INTO awscc.datazone.environments (
  ProjectIdentifier,
  region
 )
-SELECT 
-'{{ DomainIdentifier }}',
- '{{ Name }}',
- '{{ ProjectIdentifier }}',
+SELECT
+'{{ domain_identifier }}',
+ '{{ name }}',
+ '{{ project_identifier }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -340,17 +340,17 @@ INSERT INTO awscc.datazone.environments (
  UserParameters,
  region
 )
-SELECT 
- '{{ EnvironmentAccountIdentifier }}',
- '{{ EnvironmentAccountRegion }}',
- '{{ Description }}',
- '{{ DomainIdentifier }}',
- '{{ EnvironmentProfileIdentifier }}',
- '{{ GlossaryTerms }}',
- '{{ EnvironmentRoleArn }}',
- '{{ Name }}',
- '{{ ProjectIdentifier }}',
- '{{ UserParameters }}',
+SELECT
+ '{{ environment_account_identifier }}',
+ '{{ environment_account_region }}',
+ '{{ description }}',
+ '{{ domain_identifier }}',
+ '{{ environment_profile_identifier }}',
+ '{{ glossary_terms }}',
+ '{{ environment_role_arn }}',
+ '{{ name }}',
+ '{{ project_identifier }}',
+ '{{ user_parameters }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -368,30 +368,29 @@ globals:
 resources:
   - name: environment
     props:
-      - name: EnvironmentAccountIdentifier
-        value: '{{ EnvironmentAccountIdentifier }}'
-      - name: EnvironmentAccountRegion
-        value: '{{ EnvironmentAccountRegion }}'
-      - name: Description
-        value: '{{ Description }}'
-      - name: DomainIdentifier
-        value: '{{ DomainIdentifier }}'
-      - name: EnvironmentProfileIdentifier
-        value: '{{ EnvironmentProfileIdentifier }}'
-      - name: GlossaryTerms
+      - name: environment_account_identifier
+        value: '{{ environment_account_identifier }}'
+      - name: environment_account_region
+        value: '{{ environment_account_region }}'
+      - name: description
+        value: '{{ description }}'
+      - name: domain_identifier
+        value: '{{ domain_identifier }}'
+      - name: environment_profile_identifier
+        value: '{{ environment_profile_identifier }}'
+      - name: glossary_terms
         value:
-          - '{{ GlossaryTerms[0] }}'
-      - name: EnvironmentRoleArn
-        value: '{{ EnvironmentRoleArn }}'
-      - name: Name
-        value: '{{ Name }}'
-      - name: ProjectIdentifier
-        value: '{{ ProjectIdentifier }}'
-      - name: UserParameters
+          - '{{ glossary_terms[0] }}'
+      - name: environment_role_arn
+        value: '{{ environment_role_arn }}'
+      - name: name
+        value: '{{ name }}'
+      - name: project_identifier
+        value: '{{ project_identifier }}'
+      - name: user_parameters
         value:
-          - Name: '{{ Name }}'
-            Value: '{{ Value }}'
-
+          - name: '{{ name }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -410,7 +409,7 @@ SET PatchDocument = string('{{ {
     "Name": name
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<DomainId>|<Id>';
+AND Identifier = '{{ domain_id }}|{{ id }}';
 ```
 
 
@@ -419,7 +418,7 @@ AND Identifier = '<DomainId>|<Id>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.datazone.environments
-WHERE Identifier = '<DomainId|Id>'
+WHERE Identifier = '{{ domain_id }}|{{ id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/datazone/group_profiles/index.md b/website/docs/services/datazone/group_profiles/index.md
index c70429a5f..bf5fb7135 100644
--- a/website/docs/services/datazone/group_profiles/index.md
+++ b/website/docs/services/datazone/group_profiles/index.md
@@ -169,7 +169,7 @@ group_name,
 id,
 status
 FROM awscc.datazone.group_profiles
-WHERE region = 'us-east-1' AND Identifier = '<DomainId>|<Id>';
+WHERE region = 'us-east-1' AND Identifier = '{{ domain_id }}|{{ id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -207,9 +207,9 @@ INSERT INTO awscc.datazone.group_profiles (
  GroupIdentifier,
  region
 )
-SELECT 
-'{{ DomainIdentifier }}',
- '{{ GroupIdentifier }}',
+SELECT
+'{{ domain_identifier }}',
+ '{{ group_identifier }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -223,10 +223,10 @@ INSERT INTO awscc.datazone.group_profiles (
  Status,
  region
 )
-SELECT 
- '{{ DomainIdentifier }}',
- '{{ GroupIdentifier }}',
- '{{ Status }}',
+SELECT
+ '{{ domain_identifier }}',
+ '{{ group_identifier }}',
+ '{{ status }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -244,13 +244,12 @@ globals:
 resources:
   - name: group_profile
     props:
-      - name: DomainIdentifier
-        value: '{{ DomainIdentifier }}'
-      - name: GroupIdentifier
-        value: '{{ GroupIdentifier }}'
-      - name: Status
-        value: '{{ Status }}'
-
+      - name: domain_identifier
+        value: '{{ domain_identifier }}'
+      - name: group_identifier
+        value: '{{ group_identifier }}'
+      - name: status
+        value: '{{ status }}'
 ```
 </TabItem>
 </Tabs>
@@ -266,7 +265,7 @@ SET PatchDocument = string('{{ {
     "Status": status
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<DomainId>|<Id>';
+AND Identifier = '{{ domain_id }}|{{ id }}';
 ```
 
 
@@ -275,7 +274,7 @@ AND Identifier = '<DomainId>|<Id>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.datazone.group_profiles
-WHERE Identifier = '<DomainId|Id>'
+WHERE Identifier = '{{ domain_id }}|{{ id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/datazone/owners/index.md b/website/docs/services/datazone/owners/index.md
index b542b9b4f..6642a028c 100644
--- a/website/docs/services/datazone/owners/index.md
+++ b/website/docs/services/datazone/owners/index.md
@@ -161,7 +161,7 @@ owner,
 entity_identifier,
 domain_identifier
 FROM awscc.datazone.owners
-WHERE region = 'us-east-1' AND Identifier = '<DomainIdentifier>|<EntityType>|<EntityIdentifier>|<OwnerType>|<OwnerIdentifier>';
+WHERE region = 'us-east-1' AND Identifier = '{{ domain_identifier }}|{{ entity_type }}|{{ entity_identifier }}|{{ owner_type }}|{{ owner_identifier }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -204,11 +204,11 @@ INSERT INTO awscc.datazone.owners (
  DomainIdentifier,
  region
 )
-SELECT 
-'{{ EntityType }}',
- '{{ Owner }}',
- '{{ EntityIdentifier }}',
- '{{ DomainIdentifier }}',
+SELECT
+'{{ entity_type }}',
+ '{{ owner }}',
+ '{{ entity_identifier }}',
+ '{{ domain_identifier }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -223,11 +223,11 @@ INSERT INTO awscc.datazone.owners (
  DomainIdentifier,
  region
 )
-SELECT 
- '{{ EntityType }}',
- '{{ Owner }}',
- '{{ EntityIdentifier }}',
- '{{ DomainIdentifier }}',
+SELECT
+ '{{ entity_type }}',
+ '{{ owner }}',
+ '{{ entity_identifier }}',
+ '{{ domain_identifier }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -245,15 +245,14 @@ globals:
 resources:
   - name: owner
     props:
-      - name: EntityType
-        value: '{{ EntityType }}'
-      - name: Owner
+      - name: entity_type
+        value: '{{ entity_type }}'
+      - name: owner
         value: {}
-      - name: EntityIdentifier
-        value: '{{ EntityIdentifier }}'
-      - name: DomainIdentifier
-        value: '{{ DomainIdentifier }}'
-
+      - name: entity_identifier
+        value: '{{ entity_identifier }}'
+      - name: domain_identifier
+        value: '{{ domain_identifier }}'
 ```
 </TabItem>
 </Tabs>
@@ -264,7 +263,7 @@ resources:
 ```sql
 /*+ delete */
 DELETE FROM awscc.datazone.owners
-WHERE Identifier = '<DomainIdentifier|EntityType|EntityIdentifier|OwnerType|OwnerIdentifier>'
+WHERE Identifier = '{{ domain_identifier }}|{{ entity_type }}|{{ entity_identifier }}|{{ owner_type }}|{{ owner_identifier }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/datazone/policy_grants/index.md b/website/docs/services/datazone/policy_grants/index.md
index 67bbce2d6..ee0b824be 100644
--- a/website/docs/services/datazone/policy_grants/index.md
+++ b/website/docs/services/datazone/policy_grants/index.md
@@ -196,7 +196,7 @@ detail,
 principal,
 domain_identifier
 FROM awscc.datazone.policy_grants
-WHERE region = 'us-east-1' AND Identifier = '<DomainIdentifier>|<GrantId>|<EntityIdentifier>|<EntityType>|<PolicyType>';
+WHERE region = 'us-east-1' AND Identifier = '{{ domain_identifier }}|{{ grant_id }}|{{ entity_identifier }}|{{ entity_type }}|{{ policy_type }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -239,11 +239,11 @@ INSERT INTO awscc.datazone.policy_grants (
  DomainIdentifier,
  region
 )
-SELECT 
-'{{ EntityType }}',
- '{{ PolicyType }}',
- '{{ EntityIdentifier }}',
- '{{ DomainIdentifier }}',
+SELECT
+'{{ entity_type }}',
+ '{{ policy_type }}',
+ '{{ entity_identifier }}',
+ '{{ domain_identifier }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -260,13 +260,13 @@ INSERT INTO awscc.datazone.policy_grants (
  DomainIdentifier,
  region
 )
-SELECT 
- '{{ EntityType }}',
- '{{ PolicyType }}',
- '{{ EntityIdentifier }}',
- '{{ Detail }}',
- '{{ Principal }}',
- '{{ DomainIdentifier }}',
+SELECT
+ '{{ entity_type }}',
+ '{{ policy_type }}',
+ '{{ entity_identifier }}',
+ '{{ detail }}',
+ '{{ principal }}',
+ '{{ domain_identifier }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -284,19 +284,18 @@ globals:
 resources:
   - name: policy_grant
     props:
-      - name: EntityType
-        value: '{{ EntityType }}'
-      - name: PolicyType
-        value: '{{ PolicyType }}'
-      - name: EntityIdentifier
-        value: '{{ EntityIdentifier }}'
-      - name: Detail
+      - name: entity_type
+        value: '{{ entity_type }}'
+      - name: policy_type
+        value: '{{ policy_type }}'
+      - name: entity_identifier
+        value: '{{ entity_identifier }}'
+      - name: detail
         value: null
-      - name: Principal
+      - name: principal
         value: null
-      - name: DomainIdentifier
-        value: '{{ DomainIdentifier }}'
-
+      - name: domain_identifier
+        value: '{{ domain_identifier }}'
 ```
 </TabItem>
 </Tabs>
@@ -307,7 +306,7 @@ resources:
 ```sql
 /*+ delete */
 DELETE FROM awscc.datazone.policy_grants
-WHERE Identifier = '<DomainIdentifier|GrantId|EntityIdentifier|EntityType|PolicyType>'
+WHERE Identifier = '{{ domain_identifier }}|{{ grant_id }}|{{ entity_identifier }}|{{ entity_type }}|{{ policy_type }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/datazone/project_memberships/index.md b/website/docs/services/datazone/project_memberships/index.md
index 1a0164511..515411729 100644
--- a/website/docs/services/datazone/project_memberships/index.md
+++ b/website/docs/services/datazone/project_memberships/index.md
@@ -162,7 +162,7 @@ designation,
 member,
 domain_identifier
 FROM awscc.datazone.project_memberships
-WHERE region = 'us-east-1' AND Identifier = '<DomainIdentifier>|<MemberIdentifier>|<MemberIdentifierType>|<ProjectIdentifier>';
+WHERE region = 'us-east-1' AND Identifier = '{{ domain_identifier }}|{{ member_identifier }}|{{ member_identifier_type }}|{{ project_identifier }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -204,11 +204,11 @@ INSERT INTO awscc.datazone.project_memberships (
  DomainIdentifier,
  region
 )
-SELECT 
-'{{ ProjectIdentifier }}',
- '{{ Designation }}',
- '{{ Member }}',
- '{{ DomainIdentifier }}',
+SELECT
+'{{ project_identifier }}',
+ '{{ designation }}',
+ '{{ member }}',
+ '{{ domain_identifier }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -223,11 +223,11 @@ INSERT INTO awscc.datazone.project_memberships (
  DomainIdentifier,
  region
 )
-SELECT 
- '{{ ProjectIdentifier }}',
- '{{ Designation }}',
- '{{ Member }}',
- '{{ DomainIdentifier }}',
+SELECT
+ '{{ project_identifier }}',
+ '{{ designation }}',
+ '{{ member }}',
+ '{{ domain_identifier }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -245,15 +245,14 @@ globals:
 resources:
   - name: project_membership
     props:
-      - name: ProjectIdentifier
-        value: '{{ ProjectIdentifier }}'
-      - name: Designation
-        value: '{{ Designation }}'
-      - name: Member
+      - name: project_identifier
+        value: '{{ project_identifier }}'
+      - name: designation
+        value: '{{ designation }}'
+      - name: member
         value: null
-      - name: DomainIdentifier
-        value: '{{ DomainIdentifier }}'
-
+      - name: domain_identifier
+        value: '{{ domain_identifier }}'
 ```
 </TabItem>
 </Tabs>
@@ -269,7 +268,7 @@ SET PatchDocument = string('{{ {
     "Designation": designation
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<DomainIdentifier>|<MemberIdentifier>|<MemberIdentifierType>|<ProjectIdentifier>';
+AND Identifier = '{{ domain_identifier }}|{{ member_identifier }}|{{ member_identifier_type }}|{{ project_identifier }}';
 ```
 
 
@@ -278,7 +277,7 @@ AND Identifier = '<DomainIdentifier>|<MemberIdentifier>|<MemberIdentifierType>|<
 ```sql
 /*+ delete */
 DELETE FROM awscc.datazone.project_memberships
-WHERE Identifier = '<DomainIdentifier|MemberIdentifier|MemberIdentifierType|ProjectIdentifier>'
+WHERE Identifier = '{{ domain_identifier }}|{{ member_identifier }}|{{ member_identifier_type }}|{{ project_identifier }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/datazone/project_profiles/index.md b/website/docs/services/datazone/project_profiles/index.md
index 4f345adc9..60d5923fd 100644
--- a/website/docs/services/datazone/project_profiles/index.md
+++ b/website/docs/services/datazone/project_profiles/index.md
@@ -316,7 +316,7 @@ last_updated_at,
 name,
 status
 FROM awscc.datazone.project_profiles
-WHERE region = 'us-east-1' AND Identifier = '<DomainIdentifier>|<Identifier>';
+WHERE region = 'us-east-1' AND Identifier = '{{ domain_identifier }}|{{ identifier }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -353,8 +353,8 @@ INSERT INTO awscc.datazone.project_profiles (
  Name,
  region
 )
-SELECT 
-'{{ Name }}',
+SELECT
+'{{ name }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -371,13 +371,13 @@ INSERT INTO awscc.datazone.project_profiles (
  Status,
  region
 )
-SELECT 
- '{{ Description }}',
- '{{ DomainIdentifier }}',
- '{{ DomainUnitIdentifier }}',
- '{{ EnvironmentConfigurations }}',
- '{{ Name }}',
- '{{ Status }}',
+SELECT
+ '{{ description }}',
+ '{{ domain_identifier }}',
+ '{{ domain_unit_identifier }}',
+ '{{ environment_configurations }}',
+ '{{ name }}',
+ '{{ status }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -395,37 +395,36 @@ globals:
 resources:
   - name: project_profile
     props:
-      - name: Description
-        value: '{{ Description }}'
-      - name: DomainIdentifier
-        value: '{{ DomainIdentifier }}'
-      - name: DomainUnitIdentifier
-        value: '{{ DomainUnitIdentifier }}'
-      - name: EnvironmentConfigurations
+      - name: description
+        value: '{{ description }}'
+      - name: domain_identifier
+        value: '{{ domain_identifier }}'
+      - name: domain_unit_identifier
+        value: '{{ domain_unit_identifier }}'
+      - name: environment_configurations
         value:
-          - Name: '{{ Name }}'
-            Id: '{{ Id }}'
-            EnvironmentBlueprintId: '{{ EnvironmentBlueprintId }}'
-            Description: '{{ Description }}'
-            DeploymentMode: '{{ DeploymentMode }}'
-            ConfigurationParameters:
-              SsmPath: '{{ SsmPath }}'
-              ParameterOverrides:
-                - Name: '{{ Name }}'
-                  Value: '{{ Value }}'
-                  IsEditable: '{{ IsEditable }}'
-              ResolvedParameters:
+          - name: '{{ name }}'
+            id: '{{ id }}'
+            environment_blueprint_id: '{{ environment_blueprint_id }}'
+            description: '{{ description }}'
+            deployment_mode: '{{ deployment_mode }}'
+            configuration_parameters:
+              ssm_path: '{{ ssm_path }}'
+              parameter_overrides:
+                - name: '{{ name }}'
+                  value: '{{ value }}'
+                  is_editable: '{{ is_editable }}'
+              resolved_parameters:
                 - null
-            AwsAccount:
-              AwsAccountId: '{{ AwsAccountId }}'
-            AwsRegion:
-              RegionName: '{{ RegionName }}'
-            DeploymentOrder: null
-      - name: Name
-        value: '{{ Name }}'
-      - name: Status
-        value: '{{ Status }}'
-
+            aws_account:
+              aws_account_id: '{{ aws_account_id }}'
+            aws_region:
+              region_name: '{{ region_name }}'
+            deployment_order: null
+      - name: name
+        value: '{{ name }}'
+      - name: status
+        value: '{{ status }}'
 ```
 </TabItem>
 </Tabs>
@@ -444,7 +443,7 @@ SET PatchDocument = string('{{ {
     "Status": status
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<DomainIdentifier>|<Identifier>';
+AND Identifier = '{{ domain_identifier }}|{{ identifier }}';
 ```
 
 
@@ -453,7 +452,7 @@ AND Identifier = '<DomainIdentifier>|<Identifier>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.datazone.project_profiles
-WHERE Identifier = '<DomainIdentifier|Identifier>'
+WHERE Identifier = '{{ domain_identifier }}|{{ identifier }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/datazone/projects/index.md b/website/docs/services/datazone/projects/index.md
index 51c4e2104..5b4d2c5d3 100644
--- a/website/docs/services/datazone/projects/index.md
+++ b/website/docs/services/datazone/projects/index.md
@@ -246,7 +246,7 @@ project_profile_version,
 project_status,
 user_parameters
 FROM awscc.datazone.projects
-WHERE region = 'us-east-1' AND Identifier = '<DomainId>|<Id>';
+WHERE region = 'us-east-1' AND Identifier = '{{ domain_id }}|{{ id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -284,9 +284,9 @@ INSERT INTO awscc.datazone.projects (
  Name,
  region
 )
-SELECT 
-'{{ DomainIdentifier }}',
- '{{ Name }}',
+SELECT
+'{{ domain_identifier }}',
+ '{{ name }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -305,15 +305,15 @@ INSERT INTO awscc.datazone.projects (
  UserParameters,
  region
 )
-SELECT 
- '{{ Description }}',
- '{{ DomainIdentifier }}',
- '{{ DomainUnitId }}',
- '{{ GlossaryTerms }}',
- '{{ Name }}',
- '{{ ProjectProfileId }}',
- '{{ ProjectProfileVersion }}',
- '{{ UserParameters }}',
+SELECT
+ '{{ description }}',
+ '{{ domain_identifier }}',
+ '{{ domain_unit_id }}',
+ '{{ glossary_terms }}',
+ '{{ name }}',
+ '{{ project_profile_id }}',
+ '{{ project_profile_version }}',
+ '{{ user_parameters }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -331,29 +331,28 @@ globals:
 resources:
   - name: project
     props:
-      - name: Description
-        value: '{{ Description }}'
-      - name: DomainIdentifier
-        value: '{{ DomainIdentifier }}'
-      - name: DomainUnitId
-        value: '{{ DomainUnitId }}'
-      - name: GlossaryTerms
+      - name: description
+        value: '{{ description }}'
+      - name: domain_identifier
+        value: '{{ domain_identifier }}'
+      - name: domain_unit_id
+        value: '{{ domain_unit_id }}'
+      - name: glossary_terms
         value:
-          - '{{ GlossaryTerms[0] }}'
-      - name: Name
-        value: '{{ Name }}'
-      - name: ProjectProfileId
-        value: '{{ ProjectProfileId }}'
-      - name: ProjectProfileVersion
-        value: '{{ ProjectProfileVersion }}'
-      - name: UserParameters
+          - '{{ glossary_terms[0] }}'
+      - name: name
+        value: '{{ name }}'
+      - name: project_profile_id
+        value: '{{ project_profile_id }}'
+      - name: project_profile_version
+        value: '{{ project_profile_version }}'
+      - name: user_parameters
         value:
-          - EnvironmentId: '{{ EnvironmentId }}'
-            EnvironmentConfigurationName: '{{ EnvironmentConfigurationName }}'
-            EnvironmentParameters:
-              - Name: '{{ Name }}'
-                Value: '{{ Value }}'
-
+          - environment_id: '{{ environment_id }}'
+            environment_configuration_name: '{{ environment_configuration_name }}'
+            environment_parameters:
+              - name: '{{ name }}'
+                value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -374,7 +373,7 @@ SET PatchDocument = string('{{ {
     "UserParameters": user_parameters
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<DomainId>|<Id>';
+AND Identifier = '{{ domain_id }}|{{ id }}';
 ```
 
 
@@ -383,7 +382,7 @@ AND Identifier = '<DomainId>|<Id>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.datazone.projects
-WHERE Identifier = '<DomainId|Id>'
+WHERE Identifier = '{{ domain_id }}|{{ id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/datazone/subscription_targets/index.md b/website/docs/services/datazone/subscription_targets/index.md
index 074ab26a7..224afc428 100644
--- a/website/docs/services/datazone/subscription_targets/index.md
+++ b/website/docs/services/datazone/subscription_targets/index.md
@@ -252,7 +252,7 @@ type,
 updated_at,
 updated_by
 FROM awscc.datazone.subscription_targets
-WHERE region = 'us-east-1' AND Identifier = '<DomainId>|<EnvironmentId>|<Id>';
+WHERE region = 'us-east-1' AND Identifier = '{{ domain_id }}|{{ environment_id }}|{{ id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -296,14 +296,14 @@ INSERT INTO awscc.datazone.subscription_targets (
  Type,
  region
 )
-SELECT 
-'{{ ApplicableAssetTypes }}',
- '{{ AuthorizedPrincipals }}',
- '{{ DomainIdentifier }}',
- '{{ EnvironmentIdentifier }}',
- '{{ Name }}',
- '{{ SubscriptionTargetConfig }}',
- '{{ Type }}',
+SELECT
+'{{ applicable_asset_types }}',
+ '{{ authorized_principals }}',
+ '{{ domain_identifier }}',
+ '{{ environment_identifier }}',
+ '{{ name }}',
+ '{{ subscription_target_config }}',
+ '{{ type }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -323,16 +323,16 @@ INSERT INTO awscc.datazone.subscription_targets (
  Type,
  region
 )
-SELECT 
- '{{ ApplicableAssetTypes }}',
- '{{ AuthorizedPrincipals }}',
- '{{ DomainIdentifier }}',
- '{{ EnvironmentIdentifier }}',
- '{{ ManageAccessRole }}',
- '{{ Name }}',
- '{{ Provider }}',
- '{{ SubscriptionTargetConfig }}',
- '{{ Type }}',
+SELECT
+ '{{ applicable_asset_types }}',
+ '{{ authorized_principals }}',
+ '{{ domain_identifier }}',
+ '{{ environment_identifier }}',
+ '{{ manage_access_role }}',
+ '{{ name }}',
+ '{{ provider }}',
+ '{{ subscription_target_config }}',
+ '{{ type }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -350,29 +350,28 @@ globals:
 resources:
   - name: subscription_target
     props:
-      - name: ApplicableAssetTypes
+      - name: applicable_asset_types
         value:
-          - '{{ ApplicableAssetTypes[0] }}'
-      - name: AuthorizedPrincipals
+          - '{{ applicable_asset_types[0] }}'
+      - name: authorized_principals
         value:
-          - '{{ AuthorizedPrincipals[0] }}'
-      - name: DomainIdentifier
-        value: '{{ DomainIdentifier }}'
-      - name: EnvironmentIdentifier
-        value: '{{ EnvironmentIdentifier }}'
-      - name: ManageAccessRole
-        value: '{{ ManageAccessRole }}'
-      - name: Name
-        value: '{{ Name }}'
-      - name: Provider
-        value: '{{ Provider }}'
-      - name: SubscriptionTargetConfig
+          - '{{ authorized_principals[0] }}'
+      - name: domain_identifier
+        value: '{{ domain_identifier }}'
+      - name: environment_identifier
+        value: '{{ environment_identifier }}'
+      - name: manage_access_role
+        value: '{{ manage_access_role }}'
+      - name: name
+        value: '{{ name }}'
+      - name: provider
+        value: '{{ provider }}'
+      - name: subscription_target_config
         value:
-          - FormName: '{{ FormName }}'
-            Content: '{{ Content }}'
-      - name: Type
-        value: '{{ Type }}'
-
+          - form_name: '{{ form_name }}'
+            content: '{{ content }}'
+      - name: type
+        value: '{{ type }}'
 ```
 </TabItem>
 </Tabs>
@@ -393,7 +392,7 @@ SET PatchDocument = string('{{ {
     "SubscriptionTargetConfig": subscription_target_config
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<DomainId>|<EnvironmentId>|<Id>';
+AND Identifier = '{{ domain_id }}|{{ environment_id }}|{{ id }}';
 ```
 
 
@@ -402,7 +401,7 @@ AND Identifier = '<DomainId>|<EnvironmentId>|<Id>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.datazone.subscription_targets
-WHERE Identifier = '<DomainId|EnvironmentId|Id>'
+WHERE Identifier = '{{ domain_id }}|{{ environment_id }}|{{ id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/datazone/user_profiles/index.md b/website/docs/services/datazone/user_profiles/index.md
index 91d0b1034..8bffd45b3 100644
--- a/website/docs/services/datazone/user_profiles/index.md
+++ b/website/docs/services/datazone/user_profiles/index.md
@@ -181,7 +181,7 @@ type,
 user_identifier,
 user_type
 FROM awscc.datazone.user_profiles
-WHERE region = 'us-east-1' AND Identifier = '<DomainId>|<Id>';
+WHERE region = 'us-east-1' AND Identifier = '{{ domain_id }}|{{ id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -219,9 +219,9 @@ INSERT INTO awscc.datazone.user_profiles (
  UserIdentifier,
  region
 )
-SELECT 
-'{{ DomainIdentifier }}',
- '{{ UserIdentifier }}',
+SELECT
+'{{ domain_identifier }}',
+ '{{ user_identifier }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -236,11 +236,11 @@ INSERT INTO awscc.datazone.user_profiles (
  UserType,
  region
 )
-SELECT 
- '{{ DomainIdentifier }}',
- '{{ Status }}',
- '{{ UserIdentifier }}',
- '{{ UserType }}',
+SELECT
+ '{{ domain_identifier }}',
+ '{{ status }}',
+ '{{ user_identifier }}',
+ '{{ user_type }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -258,15 +258,14 @@ globals:
 resources:
   - name: user_profile
     props:
-      - name: DomainIdentifier
-        value: '{{ DomainIdentifier }}'
-      - name: Status
-        value: '{{ Status }}'
-      - name: UserIdentifier
-        value: '{{ UserIdentifier }}'
-      - name: UserType
-        value: '{{ UserType }}'
-
+      - name: domain_identifier
+        value: '{{ domain_identifier }}'
+      - name: status
+        value: '{{ status }}'
+      - name: user_identifier
+        value: '{{ user_identifier }}'
+      - name: user_type
+        value: '{{ user_type }}'
 ```
 </TabItem>
 </Tabs>
@@ -282,7 +281,7 @@ SET PatchDocument = string('{{ {
     "Status": status
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<DomainId>|<Id>';
+AND Identifier = '{{ domain_id }}|{{ id }}';
 ```
 
 
@@ -291,7 +290,7 @@ AND Identifier = '<DomainId>|<Id>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.datazone.user_profiles
-WHERE Identifier = '<DomainId|Id>'
+WHERE Identifier = '{{ domain_id }}|{{ id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/deadline/farms/index.md b/website/docs/services/deadline/farms/index.md
index cf99943ad..dbf997255 100644
--- a/website/docs/services/deadline/farms/index.md
+++ b/website/docs/services/deadline/farms/index.md
@@ -176,7 +176,7 @@ kms_key_arn,
 arn,
 tags
 FROM awscc.deadline.farms
-WHERE region = 'us-east-1' AND Identifier = '<Arn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -212,8 +212,8 @@ INSERT INTO awscc.deadline.farms (
  DisplayName,
  region
 )
-SELECT 
-'{{ DisplayName }}',
+SELECT
+'{{ display_name }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -228,11 +228,11 @@ INSERT INTO awscc.deadline.farms (
  Tags,
  region
 )
-SELECT 
- '{{ Description }}',
- '{{ DisplayName }}',
- '{{ KmsKeyArn }}',
- '{{ Tags }}',
+SELECT
+ '{{ description }}',
+ '{{ display_name }}',
+ '{{ kms_key_arn }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -250,17 +250,16 @@ globals:
 resources:
   - name: farm
     props:
-      - name: Description
-        value: '{{ Description }}'
-      - name: DisplayName
-        value: '{{ DisplayName }}'
-      - name: KmsKeyArn
-        value: '{{ KmsKeyArn }}'
-      - name: Tags
+      - name: description
+        value: '{{ description }}'
+      - name: display_name
+        value: '{{ display_name }}'
+      - name: kms_key_arn
+        value: '{{ kms_key_arn }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -278,7 +277,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Arn>';
+AND Identifier = '{{ arn }}';
 ```
 
 
@@ -287,7 +286,7 @@ AND Identifier = '<Arn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.deadline.farms
-WHERE Identifier = '<Arn>'
+WHERE Identifier = '{{ arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/deadline/fleets/index.md b/website/docs/services/deadline/fleets/index.md
index 0a4fb502b..6009949c3 100644
--- a/website/docs/services/deadline/fleets/index.md
+++ b/website/docs/services/deadline/fleets/index.md
@@ -283,7 +283,7 @@ worker_count,
 arn,
 tags
 FROM awscc.deadline.fleets
-WHERE region = 'us-east-1' AND Identifier = '<Arn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -323,12 +323,12 @@ INSERT INTO awscc.deadline.fleets (
  RoleArn,
  region
 )
-SELECT 
-'{{ Configuration }}',
- '{{ DisplayName }}',
- '{{ FarmId }}',
- '{{ MaxWorkerCount }}',
- '{{ RoleArn }}',
+SELECT
+'{{ configuration }}',
+ '{{ display_name }}',
+ '{{ farm_id }}',
+ '{{ max_worker_count }}',
+ '{{ role_arn }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -348,16 +348,16 @@ INSERT INTO awscc.deadline.fleets (
  Tags,
  region
 )
-SELECT 
- '{{ Configuration }}',
- '{{ Description }}',
- '{{ DisplayName }}',
- '{{ FarmId }}',
- '{{ HostConfiguration }}',
- '{{ MaxWorkerCount }}',
- '{{ MinWorkerCount }}',
- '{{ RoleArn }}',
- '{{ Tags }}',
+SELECT
+ '{{ configuration }}',
+ '{{ description }}',
+ '{{ display_name }}',
+ '{{ farm_id }}',
+ '{{ host_configuration }}',
+ '{{ max_worker_count }}',
+ '{{ min_worker_count }}',
+ '{{ role_arn }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -375,29 +375,28 @@ globals:
 resources:
   - name: fleet
     props:
-      - name: Configuration
+      - name: configuration
         value: null
-      - name: Description
-        value: '{{ Description }}'
-      - name: DisplayName
-        value: '{{ DisplayName }}'
-      - name: FarmId
-        value: '{{ FarmId }}'
-      - name: HostConfiguration
+      - name: description
+        value: '{{ description }}'
+      - name: display_name
+        value: '{{ display_name }}'
+      - name: farm_id
+        value: '{{ farm_id }}'
+      - name: host_configuration
         value:
-          ScriptBody: '{{ ScriptBody }}'
-          ScriptTimeoutSeconds: '{{ ScriptTimeoutSeconds }}'
-      - name: MaxWorkerCount
-        value: '{{ MaxWorkerCount }}'
-      - name: MinWorkerCount
-        value: '{{ MinWorkerCount }}'
-      - name: RoleArn
-        value: '{{ RoleArn }}'
-      - name: Tags
+          script_body: '{{ script_body }}'
+          script_timeout_seconds: '{{ script_timeout_seconds }}'
+      - name: max_worker_count
+        value: '{{ max_worker_count }}'
+      - name: min_worker_count
+        value: '{{ min_worker_count }}'
+      - name: role_arn
+        value: '{{ role_arn }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -420,7 +419,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Arn>';
+AND Identifier = '{{ arn }}';
 ```
 
 
@@ -429,7 +428,7 @@ AND Identifier = '<Arn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.deadline.fleets
-WHERE Identifier = '<Arn>'
+WHERE Identifier = '{{ arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/deadline/license_endpoints/index.md b/website/docs/services/deadline/license_endpoints/index.md
index b2a0bd924..7e4bb477c 100644
--- a/website/docs/services/deadline/license_endpoints/index.md
+++ b/website/docs/services/deadline/license_endpoints/index.md
@@ -194,7 +194,7 @@ vpc_id,
 arn,
 tags
 FROM awscc.deadline.license_endpoints
-WHERE region = 'us-east-1' AND Identifier = '<Arn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -232,10 +232,10 @@ INSERT INTO awscc.deadline.license_endpoints (
  VpcId,
  region
 )
-SELECT 
-'{{ SecurityGroupIds }}',
- '{{ SubnetIds }}',
- '{{ VpcId }}',
+SELECT
+'{{ security_group_ids }}',
+ '{{ subnet_ids }}',
+ '{{ vpc_id }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -250,11 +250,11 @@ INSERT INTO awscc.deadline.license_endpoints (
  Tags,
  region
 )
-SELECT 
- '{{ SecurityGroupIds }}',
- '{{ SubnetIds }}',
- '{{ VpcId }}',
- '{{ Tags }}',
+SELECT
+ '{{ security_group_ids }}',
+ '{{ subnet_ids }}',
+ '{{ vpc_id }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -272,19 +272,18 @@ globals:
 resources:
   - name: license_endpoint
     props:
-      - name: SecurityGroupIds
+      - name: security_group_ids
         value:
-          - '{{ SecurityGroupIds[0] }}'
-      - name: SubnetIds
+          - '{{ security_group_ids[0] }}'
+      - name: subnet_ids
         value:
-          - '{{ SubnetIds[0] }}'
-      - name: VpcId
-        value: '{{ VpcId }}'
-      - name: Tags
+          - '{{ subnet_ids[0] }}'
+      - name: vpc_id
+        value: '{{ vpc_id }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -300,7 +299,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Arn>';
+AND Identifier = '{{ arn }}';
 ```
 
 
@@ -309,7 +308,7 @@ AND Identifier = '<Arn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.deadline.license_endpoints
-WHERE Identifier = '<Arn>'
+WHERE Identifier = '{{ arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/deadline/limits/index.md b/website/docs/services/deadline/limits/index.md
index e42fbe662..d574a50ae 100644
--- a/website/docs/services/deadline/limits/index.md
+++ b/website/docs/services/deadline/limits/index.md
@@ -175,7 +175,7 @@ farm_id,
 limit_id,
 max_count
 FROM awscc.deadline.limits
-WHERE region = 'us-east-1' AND Identifier = '<FarmId>|<LimitId>';
+WHERE region = 'us-east-1' AND Identifier = '{{ farm_id }}|{{ limit_id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -215,11 +215,11 @@ INSERT INTO awscc.deadline.limits (
  MaxCount,
  region
 )
-SELECT 
-'{{ AmountRequirementName }}',
- '{{ DisplayName }}',
- '{{ FarmId }}',
- '{{ MaxCount }}',
+SELECT
+'{{ amount_requirement_name }}',
+ '{{ display_name }}',
+ '{{ farm_id }}',
+ '{{ max_count }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -235,12 +235,12 @@ INSERT INTO awscc.deadline.limits (
  MaxCount,
  region
 )
-SELECT 
- '{{ AmountRequirementName }}',
- '{{ Description }}',
- '{{ DisplayName }}',
- '{{ FarmId }}',
- '{{ MaxCount }}',
+SELECT
+ '{{ amount_requirement_name }}',
+ '{{ description }}',
+ '{{ display_name }}',
+ '{{ farm_id }}',
+ '{{ max_count }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -258,17 +258,16 @@ globals:
 resources:
   - name: limit
     props:
-      - name: AmountRequirementName
-        value: '{{ AmountRequirementName }}'
-      - name: Description
-        value: '{{ Description }}'
-      - name: DisplayName
-        value: '{{ DisplayName }}'
-      - name: FarmId
-        value: '{{ FarmId }}'
-      - name: MaxCount
-        value: '{{ MaxCount }}'
-
+      - name: amount_requirement_name
+        value: '{{ amount_requirement_name }}'
+      - name: description
+        value: '{{ description }}'
+      - name: display_name
+        value: '{{ display_name }}'
+      - name: farm_id
+        value: '{{ farm_id }}'
+      - name: max_count
+        value: '{{ max_count }}'
 ```
 </TabItem>
 </Tabs>
@@ -286,7 +285,7 @@ SET PatchDocument = string('{{ {
     "MaxCount": max_count
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<FarmId>|<LimitId>';
+AND Identifier = '{{ farm_id }}|{{ limit_id }}';
 ```
 
 
@@ -295,7 +294,7 @@ AND Identifier = '<FarmId>|<LimitId>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.deadline.limits
-WHERE Identifier = '<FarmId|LimitId>'
+WHERE Identifier = '{{ farm_id }}|{{ limit_id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/deadline/metered_products/index.md b/website/docs/services/deadline/metered_products/index.md
index 29a038df3..321a585f8 100644
--- a/website/docs/services/deadline/metered_products/index.md
+++ b/website/docs/services/deadline/metered_products/index.md
@@ -158,7 +158,7 @@ family,
 vendor,
 arn
 FROM awscc.deadline.metered_products
-WHERE region = 'us-east-1' AND Identifier = '<Arn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -195,9 +195,9 @@ INSERT INTO awscc.deadline.metered_products (
  ProductId,
  region
 )
-SELECT 
-'{{ LicenseEndpointId }}',
- '{{ ProductId }}',
+SELECT
+'{{ license_endpoint_id }}',
+ '{{ product_id }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -210,9 +210,9 @@ INSERT INTO awscc.deadline.metered_products (
  ProductId,
  region
 )
-SELECT 
- '{{ LicenseEndpointId }}',
- '{{ ProductId }}',
+SELECT
+ '{{ license_endpoint_id }}',
+ '{{ product_id }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -230,11 +230,10 @@ globals:
 resources:
   - name: metered_product
     props:
-      - name: LicenseEndpointId
-        value: '{{ LicenseEndpointId }}'
-      - name: ProductId
-        value: '{{ ProductId }}'
-
+      - name: license_endpoint_id
+        value: '{{ license_endpoint_id }}'
+      - name: product_id
+        value: '{{ product_id }}'
 ```
 </TabItem>
 </Tabs>
@@ -245,7 +244,7 @@ resources:
 ```sql
 /*+ delete */
 DELETE FROM awscc.deadline.metered_products
-WHERE Identifier = '<Arn>'
+WHERE Identifier = '{{ arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/deadline/monitors/index.md b/website/docs/services/deadline/monitors/index.md
index 5df06b8d6..f03596ff6 100644
--- a/website/docs/services/deadline/monitors/index.md
+++ b/website/docs/services/deadline/monitors/index.md
@@ -194,7 +194,7 @@ tags,
 url,
 arn
 FROM awscc.deadline.monitors
-WHERE region = 'us-east-1' AND Identifier = '<Arn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -233,11 +233,11 @@ INSERT INTO awscc.deadline.monitors (
  Subdomain,
  region
 )
-SELECT 
-'{{ DisplayName }}',
- '{{ IdentityCenterInstanceArn }}',
- '{{ RoleArn }}',
- '{{ Subdomain }}',
+SELECT
+'{{ display_name }}',
+ '{{ identity_center_instance_arn }}',
+ '{{ role_arn }}',
+ '{{ subdomain }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -253,12 +253,12 @@ INSERT INTO awscc.deadline.monitors (
  Tags,
  region
 )
-SELECT 
- '{{ DisplayName }}',
- '{{ IdentityCenterInstanceArn }}',
- '{{ RoleArn }}',
- '{{ Subdomain }}',
- '{{ Tags }}',
+SELECT
+ '{{ display_name }}',
+ '{{ identity_center_instance_arn }}',
+ '{{ role_arn }}',
+ '{{ subdomain }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -276,19 +276,18 @@ globals:
 resources:
   - name: monitor
     props:
-      - name: DisplayName
-        value: '{{ DisplayName }}'
-      - name: IdentityCenterInstanceArn
-        value: '{{ IdentityCenterInstanceArn }}'
-      - name: RoleArn
-        value: '{{ RoleArn }}'
-      - name: Subdomain
-        value: '{{ Subdomain }}'
-      - name: Tags
+      - name: display_name
+        value: '{{ display_name }}'
+      - name: identity_center_instance_arn
+        value: '{{ identity_center_instance_arn }}'
+      - name: role_arn
+        value: '{{ role_arn }}'
+      - name: subdomain
+        value: '{{ subdomain }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -307,7 +306,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Arn>';
+AND Identifier = '{{ arn }}';
 ```
 
 
@@ -316,7 +315,7 @@ AND Identifier = '<Arn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.deadline.monitors
-WHERE Identifier = '<Arn>'
+WHERE Identifier = '{{ arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/deadline/queue_environments/index.md b/website/docs/services/deadline/queue_environments/index.md
index 98fa2cd12..98f5a41fd 100644
--- a/website/docs/services/deadline/queue_environments/index.md
+++ b/website/docs/services/deadline/queue_environments/index.md
@@ -180,7 +180,7 @@ queue_id,
 template,
 template_type
 FROM awscc.deadline.queue_environments
-WHERE region = 'us-east-1' AND Identifier = '<FarmId>|<QueueId>|<QueueEnvironmentId>';
+WHERE region = 'us-east-1' AND Identifier = '{{ farm_id }}|{{ queue_id }}|{{ queue_environment_id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -222,12 +222,12 @@ INSERT INTO awscc.deadline.queue_environments (
  TemplateType,
  region
 )
-SELECT 
-'{{ FarmId }}',
- '{{ Priority }}',
- '{{ QueueId }}',
- '{{ Template }}',
- '{{ TemplateType }}',
+SELECT
+'{{ farm_id }}',
+ '{{ priority }}',
+ '{{ queue_id }}',
+ '{{ template }}',
+ '{{ template_type }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -243,12 +243,12 @@ INSERT INTO awscc.deadline.queue_environments (
  TemplateType,
  region
 )
-SELECT 
- '{{ FarmId }}',
- '{{ Priority }}',
- '{{ QueueId }}',
- '{{ Template }}',
- '{{ TemplateType }}',
+SELECT
+ '{{ farm_id }}',
+ '{{ priority }}',
+ '{{ queue_id }}',
+ '{{ template }}',
+ '{{ template_type }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -266,17 +266,16 @@ globals:
 resources:
   - name: queue_environment
     props:
-      - name: FarmId
-        value: '{{ FarmId }}'
-      - name: Priority
-        value: '{{ Priority }}'
-      - name: QueueId
-        value: '{{ QueueId }}'
-      - name: Template
-        value: '{{ Template }}'
-      - name: TemplateType
-        value: '{{ TemplateType }}'
-
+      - name: farm_id
+        value: '{{ farm_id }}'
+      - name: priority
+        value: '{{ priority }}'
+      - name: queue_id
+        value: '{{ queue_id }}'
+      - name: template
+        value: '{{ template }}'
+      - name: template_type
+        value: '{{ template_type }}'
 ```
 </TabItem>
 </Tabs>
@@ -294,7 +293,7 @@ SET PatchDocument = string('{{ {
     "TemplateType": template_type
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<FarmId>|<QueueId>|<QueueEnvironmentId>';
+AND Identifier = '{{ farm_id }}|{{ queue_id }}|{{ queue_environment_id }}';
 ```
 
 
@@ -303,7 +302,7 @@ AND Identifier = '<FarmId>|<QueueId>|<QueueEnvironmentId>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.deadline.queue_environments
-WHERE Identifier = '<FarmId|QueueId|QueueEnvironmentId>'
+WHERE Identifier = '{{ farm_id }}|{{ queue_id }}|{{ queue_environment_id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/deadline/queue_fleet_associations/index.md b/website/docs/services/deadline/queue_fleet_associations/index.md
index 54c85c242..d3c0f0d58 100644
--- a/website/docs/services/deadline/queue_fleet_associations/index.md
+++ b/website/docs/services/deadline/queue_fleet_associations/index.md
@@ -150,7 +150,7 @@ farm_id,
 fleet_id,
 queue_id
 FROM awscc.deadline.queue_fleet_associations
-WHERE region = 'us-east-1' AND Identifier = '<FarmId>|<FleetId>|<QueueId>';
+WHERE region = 'us-east-1' AND Identifier = '{{ farm_id }}|{{ fleet_id }}|{{ queue_id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -190,10 +190,10 @@ INSERT INTO awscc.deadline.queue_fleet_associations (
  QueueId,
  region
 )
-SELECT 
-'{{ FarmId }}',
- '{{ FleetId }}',
- '{{ QueueId }}',
+SELECT
+'{{ farm_id }}',
+ '{{ fleet_id }}',
+ '{{ queue_id }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -207,10 +207,10 @@ INSERT INTO awscc.deadline.queue_fleet_associations (
  QueueId,
  region
 )
-SELECT 
- '{{ FarmId }}',
- '{{ FleetId }}',
- '{{ QueueId }}',
+SELECT
+ '{{ farm_id }}',
+ '{{ fleet_id }}',
+ '{{ queue_id }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -228,13 +228,12 @@ globals:
 resources:
   - name: queue_fleet_association
     props:
-      - name: FarmId
-        value: '{{ FarmId }}'
-      - name: FleetId
-        value: '{{ FleetId }}'
-      - name: QueueId
-        value: '{{ QueueId }}'
-
+      - name: farm_id
+        value: '{{ farm_id }}'
+      - name: fleet_id
+        value: '{{ fleet_id }}'
+      - name: queue_id
+        value: '{{ queue_id }}'
 ```
 </TabItem>
 </Tabs>
@@ -245,7 +244,7 @@ resources:
 ```sql
 /*+ delete */
 DELETE FROM awscc.deadline.queue_fleet_associations
-WHERE Identifier = '<FarmId|FleetId|QueueId>'
+WHERE Identifier = '{{ farm_id }}|{{ fleet_id }}|{{ queue_id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/deadline/queue_limit_associations/index.md b/website/docs/services/deadline/queue_limit_associations/index.md
index 9f0fb2208..8daab1311 100644
--- a/website/docs/services/deadline/queue_limit_associations/index.md
+++ b/website/docs/services/deadline/queue_limit_associations/index.md
@@ -150,7 +150,7 @@ farm_id,
 limit_id,
 queue_id
 FROM awscc.deadline.queue_limit_associations
-WHERE region = 'us-east-1' AND Identifier = '<FarmId>|<LimitId>|<QueueId>';
+WHERE region = 'us-east-1' AND Identifier = '{{ farm_id }}|{{ limit_id }}|{{ queue_id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -190,10 +190,10 @@ INSERT INTO awscc.deadline.queue_limit_associations (
  QueueId,
  region
 )
-SELECT 
-'{{ FarmId }}',
- '{{ LimitId }}',
- '{{ QueueId }}',
+SELECT
+'{{ farm_id }}',
+ '{{ limit_id }}',
+ '{{ queue_id }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -207,10 +207,10 @@ INSERT INTO awscc.deadline.queue_limit_associations (
  QueueId,
  region
 )
-SELECT 
- '{{ FarmId }}',
- '{{ LimitId }}',
- '{{ QueueId }}',
+SELECT
+ '{{ farm_id }}',
+ '{{ limit_id }}',
+ '{{ queue_id }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -228,13 +228,12 @@ globals:
 resources:
   - name: queue_limit_association
     props:
-      - name: FarmId
-        value: '{{ FarmId }}'
-      - name: LimitId
-        value: '{{ LimitId }}'
-      - name: QueueId
-        value: '{{ QueueId }}'
-
+      - name: farm_id
+        value: '{{ farm_id }}'
+      - name: limit_id
+        value: '{{ limit_id }}'
+      - name: queue_id
+        value: '{{ queue_id }}'
 ```
 </TabItem>
 </Tabs>
@@ -245,7 +244,7 @@ resources:
 ```sql
 /*+ delete */
 DELETE FROM awscc.deadline.queue_limit_associations
-WHERE Identifier = '<FarmId|LimitId|QueueId>'
+WHERE Identifier = '{{ farm_id }}|{{ limit_id }}|{{ queue_id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/deadline/queues/index.md b/website/docs/services/deadline/queues/index.md
index 4ddc8f0fe..fb7c61039 100644
--- a/website/docs/services/deadline/queues/index.md
+++ b/website/docs/services/deadline/queues/index.md
@@ -265,7 +265,7 @@ role_arn,
 arn,
 tags
 FROM awscc.deadline.queues
-WHERE region = 'us-east-1' AND Identifier = '<Arn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -302,9 +302,9 @@ INSERT INTO awscc.deadline.queues (
  FarmId,
  region
 )
-SELECT 
-'{{ DisplayName }}',
- '{{ FarmId }}',
+SELECT
+'{{ display_name }}',
+ '{{ farm_id }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -325,17 +325,17 @@ INSERT INTO awscc.deadline.queues (
  Tags,
  region
 )
-SELECT 
- '{{ AllowedStorageProfileIds }}',
- '{{ DefaultBudgetAction }}',
- '{{ Description }}',
- '{{ DisplayName }}',
- '{{ FarmId }}',
- '{{ JobAttachmentSettings }}',
- '{{ JobRunAsUser }}',
- '{{ RequiredFileSystemLocationNames }}',
- '{{ RoleArn }}',
- '{{ Tags }}',
+SELECT
+ '{{ allowed_storage_profile_ids }}',
+ '{{ default_budget_action }}',
+ '{{ description }}',
+ '{{ display_name }}',
+ '{{ farm_id }}',
+ '{{ job_attachment_settings }}',
+ '{{ job_run_as_user }}',
+ '{{ required_file_system_location_names }}',
+ '{{ role_arn }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -353,40 +353,39 @@ globals:
 resources:
   - name: queue
     props:
-      - name: AllowedStorageProfileIds
+      - name: allowed_storage_profile_ids
         value:
-          - '{{ AllowedStorageProfileIds[0] }}'
-      - name: DefaultBudgetAction
-        value: '{{ DefaultBudgetAction }}'
-      - name: Description
-        value: '{{ Description }}'
-      - name: DisplayName
-        value: '{{ DisplayName }}'
-      - name: FarmId
-        value: '{{ FarmId }}'
-      - name: JobAttachmentSettings
+          - '{{ allowed_storage_profile_ids[0] }}'
+      - name: default_budget_action
+        value: '{{ default_budget_action }}'
+      - name: description
+        value: '{{ description }}'
+      - name: display_name
+        value: '{{ display_name }}'
+      - name: farm_id
+        value: '{{ farm_id }}'
+      - name: job_attachment_settings
         value:
-          S3BucketName: '{{ S3BucketName }}'
-          RootPrefix: '{{ RootPrefix }}'
-      - name: JobRunAsUser
+          s3_bucket_name: '{{ s3_bucket_name }}'
+          root_prefix: '{{ root_prefix }}'
+      - name: job_run_as_user
         value:
-          Posix:
-            User: '{{ User }}'
-            Group: '{{ Group }}'
-          Windows:
-            User: '{{ User }}'
-            PasswordArn: '{{ PasswordArn }}'
-          RunAs: '{{ RunAs }}'
-      - name: RequiredFileSystemLocationNames
+          posix:
+            user: '{{ user }}'
+            group: '{{ group }}'
+          windows:
+            user: '{{ user }}'
+            password_arn: '{{ password_arn }}'
+          run_as: '{{ run_as }}'
+      - name: required_file_system_location_names
         value:
-          - '{{ RequiredFileSystemLocationNames[0] }}'
-      - name: RoleArn
-        value: '{{ RoleArn }}'
-      - name: Tags
+          - '{{ required_file_system_location_names[0] }}'
+      - name: role_arn
+        value: '{{ role_arn }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -410,7 +409,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Arn>';
+AND Identifier = '{{ arn }}';
 ```
 
 
@@ -419,7 +418,7 @@ AND Identifier = '<Arn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.deadline.queues
-WHERE Identifier = '<Arn>'
+WHERE Identifier = '{{ arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/deadline/storage_profiles/index.md b/website/docs/services/deadline/storage_profiles/index.md
index 7ac35a51c..fda533f11 100644
--- a/website/docs/services/deadline/storage_profiles/index.md
+++ b/website/docs/services/deadline/storage_profiles/index.md
@@ -180,7 +180,7 @@ file_system_locations,
 os_family,
 storage_profile_id
 FROM awscc.deadline.storage_profiles
-WHERE region = 'us-east-1' AND Identifier = '<FarmId>|<StorageProfileId>';
+WHERE region = 'us-east-1' AND Identifier = '{{ farm_id }}|{{ storage_profile_id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -219,10 +219,10 @@ INSERT INTO awscc.deadline.storage_profiles (
  OsFamily,
  region
 )
-SELECT 
-'{{ DisplayName }}',
- '{{ FarmId }}',
- '{{ OsFamily }}',
+SELECT
+'{{ display_name }}',
+ '{{ farm_id }}',
+ '{{ os_family }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -237,11 +237,11 @@ INSERT INTO awscc.deadline.storage_profiles (
  OsFamily,
  region
 )
-SELECT 
- '{{ DisplayName }}',
- '{{ FarmId }}',
- '{{ FileSystemLocations }}',
- '{{ OsFamily }}',
+SELECT
+ '{{ display_name }}',
+ '{{ farm_id }}',
+ '{{ file_system_locations }}',
+ '{{ os_family }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -259,18 +259,17 @@ globals:
 resources:
   - name: storage_profile
     props:
-      - name: DisplayName
-        value: '{{ DisplayName }}'
-      - name: FarmId
-        value: '{{ FarmId }}'
-      - name: FileSystemLocations
+      - name: display_name
+        value: '{{ display_name }}'
+      - name: farm_id
+        value: '{{ farm_id }}'
+      - name: file_system_locations
         value:
-          - Name: '{{ Name }}'
-            Path: '{{ Path }}'
-            Type: '{{ Type }}'
-      - name: OsFamily
-        value: '{{ OsFamily }}'
-
+          - name: '{{ name }}'
+            path: '{{ path }}'
+            type: '{{ type }}'
+      - name: os_family
+        value: '{{ os_family }}'
 ```
 </TabItem>
 </Tabs>
@@ -288,7 +287,7 @@ SET PatchDocument = string('{{ {
     "OsFamily": os_family
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<FarmId>|<StorageProfileId>';
+AND Identifier = '{{ farm_id }}|{{ storage_profile_id }}';
 ```
 
 
@@ -297,7 +296,7 @@ AND Identifier = '<FarmId>|<StorageProfileId>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.deadline.storage_profiles
-WHERE Identifier = '<FarmId|StorageProfileId>'
+WHERE Identifier = '{{ farm_id }}|{{ storage_profile_id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/detective/graphs/index.md b/website/docs/services/detective/graphs/index.md
index 675b25925..3f344b1e9 100644
--- a/website/docs/services/detective/graphs/index.md
+++ b/website/docs/services/detective/graphs/index.md
@@ -158,7 +158,7 @@ arn,
 tags,
 auto_enable_members
 FROM awscc.detective.graphs
-WHERE region = 'us-east-1' AND Identifier = '<Arn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -195,9 +195,9 @@ INSERT INTO awscc.detective.graphs (
  AutoEnableMembers,
  region
 )
-SELECT 
-'{{ Tags }}',
- '{{ AutoEnableMembers }}',
+SELECT
+'{{ tags }}',
+ '{{ auto_enable_members }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -210,9 +210,9 @@ INSERT INTO awscc.detective.graphs (
  AutoEnableMembers,
  region
 )
-SELECT 
- '{{ Tags }}',
- '{{ AutoEnableMembers }}',
+SELECT
+ '{{ tags }}',
+ '{{ auto_enable_members }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -230,13 +230,12 @@ globals:
 resources:
   - name: graph
     props:
-      - name: Tags
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-      - name: AutoEnableMembers
-        value: '{{ AutoEnableMembers }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
+      - name: auto_enable_members
+        value: '{{ auto_enable_members }}'
 ```
 </TabItem>
 </Tabs>
@@ -253,7 +252,7 @@ SET PatchDocument = string('{{ {
     "AutoEnableMembers": auto_enable_members
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Arn>';
+AND Identifier = '{{ arn }}';
 ```
 
 
@@ -262,7 +261,7 @@ AND Identifier = '<Arn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.detective.graphs
-WHERE Identifier = '<Arn>'
+WHERE Identifier = '{{ arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/detective/member_invitations/index.md b/website/docs/services/detective/member_invitations/index.md
index b32adae4e..3aaef5cf3 100644
--- a/website/docs/services/detective/member_invitations/index.md
+++ b/website/docs/services/detective/member_invitations/index.md
@@ -157,7 +157,7 @@ member_email_address,
 disable_email_notification,
 message
 FROM awscc.detective.member_invitations
-WHERE region = 'us-east-1' AND Identifier = '<GraphArn>|<MemberId>';
+WHERE region = 'us-east-1' AND Identifier = '{{ graph_arn }}|{{ member_id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -196,10 +196,10 @@ INSERT INTO awscc.detective.member_invitations (
  MemberEmailAddress,
  region
 )
-SELECT 
-'{{ GraphArn }}',
- '{{ MemberId }}',
- '{{ MemberEmailAddress }}',
+SELECT
+'{{ graph_arn }}',
+ '{{ member_id }}',
+ '{{ member_email_address }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -215,12 +215,12 @@ INSERT INTO awscc.detective.member_invitations (
  Message,
  region
 )
-SELECT 
- '{{ GraphArn }}',
- '{{ MemberId }}',
- '{{ MemberEmailAddress }}',
- '{{ DisableEmailNotification }}',
- '{{ Message }}',
+SELECT
+ '{{ graph_arn }}',
+ '{{ member_id }}',
+ '{{ member_email_address }}',
+ '{{ disable_email_notification }}',
+ '{{ message }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -238,17 +238,16 @@ globals:
 resources:
   - name: member_invitation
     props:
-      - name: GraphArn
-        value: '{{ GraphArn }}'
-      - name: MemberId
-        value: '{{ MemberId }}'
-      - name: MemberEmailAddress
-        value: '{{ MemberEmailAddress }}'
-      - name: DisableEmailNotification
-        value: '{{ DisableEmailNotification }}'
-      - name: Message
-        value: '{{ Message }}'
-
+      - name: graph_arn
+        value: '{{ graph_arn }}'
+      - name: member_id
+        value: '{{ member_id }}'
+      - name: member_email_address
+        value: '{{ member_email_address }}'
+      - name: disable_email_notification
+        value: '{{ disable_email_notification }}'
+      - name: message
+        value: '{{ message }}'
 ```
 </TabItem>
 </Tabs>
@@ -259,7 +258,7 @@ resources:
 ```sql
 /*+ delete */
 DELETE FROM awscc.detective.member_invitations
-WHERE Identifier = '<GraphArn|MemberId>'
+WHERE Identifier = '{{ graph_arn }}|{{ member_id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/detective/organization_admins/index.md b/website/docs/services/detective/organization_admins/index.md
index 434c88923..67358f82d 100644
--- a/website/docs/services/detective/organization_admins/index.md
+++ b/website/docs/services/detective/organization_admins/index.md
@@ -134,7 +134,7 @@ region,
 account_id,
 graph_arn
 FROM awscc.detective.organization_admins
-WHERE region = 'us-east-1' AND Identifier = '<AccountId>';
+WHERE region = 'us-east-1' AND Identifier = '{{ account_id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -170,8 +170,8 @@ INSERT INTO awscc.detective.organization_admins (
  AccountId,
  region
 )
-SELECT 
-'{{ AccountId }}',
+SELECT
+'{{ account_id }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -183,8 +183,8 @@ INSERT INTO awscc.detective.organization_admins (
  AccountId,
  region
 )
-SELECT 
- '{{ AccountId }}',
+SELECT
+ '{{ account_id }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -202,9 +202,8 @@ globals:
 resources:
   - name: organization_admin
     props:
-      - name: AccountId
-        value: '{{ AccountId }}'
-
+      - name: account_id
+        value: '{{ account_id }}'
 ```
 </TabItem>
 </Tabs>
@@ -215,7 +214,7 @@ resources:
 ```sql
 /*+ delete */
 DELETE FROM awscc.detective.organization_admins
-WHERE Identifier = '<AccountId>'
+WHERE Identifier = '{{ account_id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/devopsguru/log_anomaly_detection_integrations/index.md b/website/docs/services/devopsguru/log_anomaly_detection_integrations/index.md
index 0397df308..1fa50a4e5 100644
--- a/website/docs/services/devopsguru/log_anomaly_detection_integrations/index.md
+++ b/website/docs/services/devopsguru/log_anomaly_detection_integrations/index.md
@@ -134,7 +134,7 @@ SELECT
 region,
 account_id
 FROM awscc.devopsguru.log_anomaly_detection_integrations
-WHERE region = 'us-east-1' AND Identifier = '<AccountId>';
+WHERE region = 'us-east-1' AND Identifier = '{{ account_id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -170,7 +170,7 @@ INSERT INTO awscc.devopsguru.log_anomaly_detection_integrations (
  ,
  region
 )
-SELECT 
+SELECT
 '{{  }}',
 '{{ region }}';
 ```
@@ -183,7 +183,7 @@ INSERT INTO awscc.devopsguru.log_anomaly_detection_integrations (
  ,
  region
 )
-SELECT 
+SELECT
  '{{  }}',
  '{{ region }}';
 ```
@@ -202,7 +202,6 @@ globals:
 resources:
   - name: log_anomaly_detection_integration
     props: []
-
 ```
 </TabItem>
 </Tabs>
@@ -213,7 +212,7 @@ resources:
 ```sql
 /*+ delete */
 DELETE FROM awscc.devopsguru.log_anomaly_detection_integrations
-WHERE Identifier = '<AccountId>'
+WHERE Identifier = '{{ account_id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/devopsguru/notification_channels/index.md b/website/docs/services/devopsguru/notification_channels/index.md
index 914cf1cc1..a933a5d0c 100644
--- a/website/docs/services/devopsguru/notification_channels/index.md
+++ b/website/docs/services/devopsguru/notification_channels/index.md
@@ -165,7 +165,7 @@ region,
 config,
 id
 FROM awscc.devopsguru.notification_channels
-WHERE region = 'us-east-1' AND Identifier = '<Id>';
+WHERE region = 'us-east-1' AND Identifier = '{{ id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -201,8 +201,8 @@ INSERT INTO awscc.devopsguru.notification_channels (
  Config,
  region
 )
-SELECT 
-'{{ Config }}',
+SELECT
+'{{ config }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -214,8 +214,8 @@ INSERT INTO awscc.devopsguru.notification_channels (
  Config,
  region
 )
-SELECT 
- '{{ Config }}',
+SELECT
+ '{{ config }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -233,16 +233,15 @@ globals:
 resources:
   - name: notification_channel
     props:
-      - name: Config
+      - name: config
         value:
-          Sns:
-            TopicArn: '{{ TopicArn }}'
-          Filters:
-            Severities:
-              - '{{ Severities[0] }}'
-            MessageTypes:
-              - '{{ MessageTypes[0] }}'
-
+          sns:
+            topic_arn: '{{ topic_arn }}'
+          filters:
+            severities:
+              - '{{ severities[0] }}'
+            message_types:
+              - '{{ message_types[0] }}'
 ```
 </TabItem>
 </Tabs>
@@ -253,7 +252,7 @@ resources:
 ```sql
 /*+ delete */
 DELETE FROM awscc.devopsguru.notification_channels
-WHERE Identifier = '<Id>'
+WHERE Identifier = '{{ id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/devopsguru/resource_collections/index.md b/website/docs/services/devopsguru/resource_collections/index.md
index 5262658fd..564bd5f76 100644
--- a/website/docs/services/devopsguru/resource_collections/index.md
+++ b/website/docs/services/devopsguru/resource_collections/index.md
@@ -171,7 +171,7 @@ region,
 resource_collection_filter,
 resource_collection_type
 FROM awscc.devopsguru.resource_collections
-WHERE region = 'us-east-1' AND Identifier = '<ResourceCollectionType>';
+WHERE region = 'us-east-1' AND Identifier = '{{ resource_collection_type }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -207,8 +207,8 @@ INSERT INTO awscc.devopsguru.resource_collections (
  ResourceCollectionFilter,
  region
 )
-SELECT 
-'{{ ResourceCollectionFilter }}',
+SELECT
+'{{ resource_collection_filter }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -220,8 +220,8 @@ INSERT INTO awscc.devopsguru.resource_collections (
  ResourceCollectionFilter,
  region
 )
-SELECT 
- '{{ ResourceCollectionFilter }}',
+SELECT
+ '{{ resource_collection_filter }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -239,16 +239,15 @@ globals:
 resources:
   - name: resource_collection
     props:
-      - name: ResourceCollectionFilter
+      - name: resource_collection_filter
         value:
-          CloudFormation:
-            StackNames:
-              - '{{ StackNames[0] }}'
-          Tags:
-            - AppBoundaryKey: '{{ AppBoundaryKey }}'
-              TagValues:
-                - '{{ TagValues[0] }}'
-
+          cloud_formation:
+            stack_names:
+              - '{{ stack_names[0] }}'
+          tags:
+            - app_boundary_key: '{{ app_boundary_key }}'
+              tag_values:
+                - '{{ tag_values[0] }}'
 ```
 </TabItem>
 </Tabs>
@@ -264,7 +263,7 @@ SET PatchDocument = string('{{ {
     "ResourceCollectionFilter": resource_collection_filter
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<ResourceCollectionType>';
+AND Identifier = '{{ resource_collection_type }}';
 ```
 
 
@@ -273,7 +272,7 @@ AND Identifier = '<ResourceCollectionType>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.devopsguru.resource_collections
-WHERE Identifier = '<ResourceCollectionType>'
+WHERE Identifier = '{{ resource_collection_type }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/directoryservice/simple_ads/index.md b/website/docs/services/directoryservice/simple_ads/index.md
index 12da51d6f..7a74b591d 100644
--- a/website/docs/services/directoryservice/simple_ads/index.md
+++ b/website/docs/services/directoryservice/simple_ads/index.md
@@ -206,7 +206,7 @@ short_name,
 size,
 vpc_settings
 FROM awscc.directoryservice.simple_ads
-WHERE region = 'us-east-1' AND Identifier = '<DirectoryId>';
+WHERE region = 'us-east-1' AND Identifier = '{{ directory_id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -244,10 +244,10 @@ INSERT INTO awscc.directoryservice.simple_ads (
  VpcSettings,
  region
 )
-SELECT 
-'{{ Name }}',
- '{{ Size }}',
- '{{ VpcSettings }}',
+SELECT
+'{{ name }}',
+ '{{ size }}',
+ '{{ vpc_settings }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -266,15 +266,15 @@ INSERT INTO awscc.directoryservice.simple_ads (
  VpcSettings,
  region
 )
-SELECT 
- '{{ CreateAlias }}',
- '{{ Description }}',
- '{{ EnableSso }}',
- '{{ Name }}',
- '{{ Password }}',
- '{{ ShortName }}',
- '{{ Size }}',
- '{{ VpcSettings }}',
+SELECT
+ '{{ create_alias }}',
+ '{{ description }}',
+ '{{ enable_sso }}',
+ '{{ name }}',
+ '{{ password }}',
+ '{{ short_name }}',
+ '{{ size }}',
+ '{{ vpc_settings }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -292,26 +292,25 @@ globals:
 resources:
   - name: simple_ad
     props:
-      - name: CreateAlias
-        value: '{{ CreateAlias }}'
-      - name: Description
-        value: '{{ Description }}'
-      - name: EnableSso
-        value: '{{ EnableSso }}'
-      - name: Name
-        value: '{{ Name }}'
-      - name: Password
-        value: '{{ Password }}'
-      - name: ShortName
-        value: '{{ ShortName }}'
-      - name: Size
-        value: '{{ Size }}'
-      - name: VpcSettings
+      - name: create_alias
+        value: '{{ create_alias }}'
+      - name: description
+        value: '{{ description }}'
+      - name: enable_sso
+        value: '{{ enable_sso }}'
+      - name: name
+        value: '{{ name }}'
+      - name: password
+        value: '{{ password }}'
+      - name: short_name
+        value: '{{ short_name }}'
+      - name: size
+        value: '{{ size }}'
+      - name: vpc_settings
         value:
-          SubnetIds:
-            - '{{ SubnetIds[0] }}'
-          VpcId: '{{ VpcId }}'
-
+          subnet_ids:
+            - '{{ subnet_ids[0] }}'
+          vpc_id: '{{ vpc_id }}'
 ```
 </TabItem>
 </Tabs>
@@ -327,7 +326,7 @@ SET PatchDocument = string('{{ {
     "EnableSso": enable_sso
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<DirectoryId>';
+AND Identifier = '{{ directory_id }}';
 ```
 
 
@@ -336,7 +335,7 @@ AND Identifier = '<DirectoryId>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.directoryservice.simple_ads
-WHERE Identifier = '<DirectoryId>'
+WHERE Identifier = '{{ directory_id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/dms/data_migrations/index.md b/website/docs/services/dms/data_migrations/index.md
index d1dbceb07..139abbd54 100644
--- a/website/docs/services/dms/data_migrations/index.md
+++ b/website/docs/services/dms/data_migrations/index.md
@@ -239,7 +239,7 @@ data_migration_settings,
 source_data_settings,
 tags
 FROM awscc.dms.data_migrations
-WHERE region = 'us-east-1' AND Identifier = '<DataMigrationArn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ data_migration_arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -277,10 +277,10 @@ INSERT INTO awscc.dms.data_migrations (
  DataMigrationType,
  region
 )
-SELECT 
-'{{ ServiceAccessRoleArn }}',
- '{{ MigrationProjectIdentifier }}',
- '{{ DataMigrationType }}',
+SELECT
+'{{ service_access_role_arn }}',
+ '{{ migration_project_identifier }}',
+ '{{ data_migration_type }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -299,15 +299,15 @@ INSERT INTO awscc.dms.data_migrations (
  Tags,
  region
 )
-SELECT 
- '{{ DataMigrationName }}',
- '{{ DataMigrationIdentifier }}',
- '{{ ServiceAccessRoleArn }}',
- '{{ MigrationProjectIdentifier }}',
- '{{ DataMigrationType }}',
- '{{ DataMigrationSettings }}',
- '{{ SourceDataSettings }}',
- '{{ Tags }}',
+SELECT
+ '{{ data_migration_name }}',
+ '{{ data_migration_identifier }}',
+ '{{ service_access_role_arn }}',
+ '{{ migration_project_identifier }}',
+ '{{ data_migration_type }}',
+ '{{ data_migration_settings }}',
+ '{{ source_data_settings }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -325,32 +325,31 @@ globals:
 resources:
   - name: data_migration
     props:
-      - name: DataMigrationName
-        value: '{{ DataMigrationName }}'
-      - name: DataMigrationIdentifier
-        value: '{{ DataMigrationIdentifier }}'
-      - name: ServiceAccessRoleArn
-        value: '{{ ServiceAccessRoleArn }}'
-      - name: MigrationProjectIdentifier
-        value: '{{ MigrationProjectIdentifier }}'
-      - name: DataMigrationType
-        value: '{{ DataMigrationType }}'
-      - name: DataMigrationSettings
+      - name: data_migration_name
+        value: '{{ data_migration_name }}'
+      - name: data_migration_identifier
+        value: '{{ data_migration_identifier }}'
+      - name: service_access_role_arn
+        value: '{{ service_access_role_arn }}'
+      - name: migration_project_identifier
+        value: '{{ migration_project_identifier }}'
+      - name: data_migration_type
+        value: '{{ data_migration_type }}'
+      - name: data_migration_settings
         value:
-          CloudwatchLogsEnabled: '{{ CloudwatchLogsEnabled }}'
-          NumberOfJobs: '{{ NumberOfJobs }}'
-          SelectionRules: '{{ SelectionRules }}'
-      - name: SourceDataSettings
+          cloudwatch_logs_enabled: '{{ cloudwatch_logs_enabled }}'
+          number_of_jobs: '{{ number_of_jobs }}'
+          selection_rules: '{{ selection_rules }}'
+      - name: source_data_settings
         value:
-          - CDCStartPosition: '{{ CDCStartPosition }}'
-            CDCStartTime: '{{ CDCStartTime }}'
-            CDCStopTime: '{{ CDCStopTime }}'
-            SlotName: '{{ SlotName }}'
-      - name: Tags
+          - c_dc_start_position: '{{ c_dc_start_position }}'
+            c_dc_start_time: '{{ c_dc_start_time }}'
+            c_dc_stop_time: '{{ c_dc_stop_time }}'
+            slot_name: '{{ slot_name }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -373,7 +372,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<DataMigrationArn>';
+AND Identifier = '{{ data_migration_arn }}';
 ```
 
 
@@ -382,7 +381,7 @@ AND Identifier = '<DataMigrationArn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.dms.data_migrations
-WHERE Identifier = '<DataMigrationArn>'
+WHERE Identifier = '{{ data_migration_arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/dms/data_providers/index.md b/website/docs/services/dms/data_providers/index.md
index 215966694..ee0e5da64 100644
--- a/website/docs/services/dms/data_providers/index.md
+++ b/website/docs/services/dms/data_providers/index.md
@@ -536,7 +536,7 @@ exact_settings,
 settings,
 tags
 FROM awscc.dms.data_providers
-WHERE region = 'us-east-1' AND Identifier = '<DataProviderArn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ data_provider_arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -572,8 +572,8 @@ INSERT INTO awscc.dms.data_providers (
  Engine,
  region
 )
-SELECT 
-'{{ Engine }}',
+SELECT
+'{{ engine }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -591,14 +591,14 @@ INSERT INTO awscc.dms.data_providers (
  Tags,
  region
 )
-SELECT 
- '{{ DataProviderName }}',
- '{{ DataProviderIdentifier }}',
- '{{ Description }}',
- '{{ Engine }}',
- '{{ ExactSettings }}',
- '{{ Settings }}',
- '{{ Tags }}',
+SELECT
+ '{{ data_provider_name }}',
+ '{{ data_provider_identifier }}',
+ '{{ description }}',
+ '{{ engine }}',
+ '{{ exact_settings }}',
+ '{{ settings }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -616,87 +616,86 @@ globals:
 resources:
   - name: data_provider
     props:
-      - name: DataProviderName
-        value: '{{ DataProviderName }}'
-      - name: DataProviderIdentifier
-        value: '{{ DataProviderIdentifier }}'
-      - name: Description
-        value: '{{ Description }}'
-      - name: Engine
-        value: '{{ Engine }}'
-      - name: ExactSettings
-        value: '{{ ExactSettings }}'
-      - name: Settings
+      - name: data_provider_name
+        value: '{{ data_provider_name }}'
+      - name: data_provider_identifier
+        value: '{{ data_provider_identifier }}'
+      - name: description
+        value: '{{ description }}'
+      - name: engine
+        value: '{{ engine }}'
+      - name: exact_settings
+        value: '{{ exact_settings }}'
+      - name: settings
         value:
-          PostgreSqlSettings:
-            ServerName: '{{ ServerName }}'
-            Port: '{{ Port }}'
-            DatabaseName: '{{ DatabaseName }}'
-            SslMode: '{{ SslMode }}'
-            CertificateArn: '{{ CertificateArn }}'
-          MySqlSettings:
-            ServerName: '{{ ServerName }}'
-            Port: '{{ Port }}'
-            SslMode: null
-            CertificateArn: '{{ CertificateArn }}'
-          OracleSettings:
-            ServerName: '{{ ServerName }}'
-            Port: '{{ Port }}'
-            DatabaseName: '{{ DatabaseName }}'
-            SslMode: null
-            CertificateArn: '{{ CertificateArn }}'
-            AsmServer: '{{ AsmServer }}'
-            SecretsManagerOracleAsmSecretId: '{{ SecretsManagerOracleAsmSecretId }}'
-            SecretsManagerOracleAsmAccessRoleArn: '{{ SecretsManagerOracleAsmAccessRoleArn }}'
-            SecretsManagerSecurityDbEncryptionSecretId: '{{ SecretsManagerSecurityDbEncryptionSecretId }}'
-            SecretsManagerSecurityDbEncryptionAccessRoleArn: '{{ SecretsManagerSecurityDbEncryptionAccessRoleArn }}'
-          MicrosoftSqlServerSettings:
-            ServerName: '{{ ServerName }}'
-            Port: '{{ Port }}'
-            DatabaseName: '{{ DatabaseName }}'
-            SslMode: null
-            CertificateArn: '{{ CertificateArn }}'
-          RedshiftSettings:
-            ServerName: '{{ ServerName }}'
-            Port: '{{ Port }}'
-            DatabaseName: '{{ DatabaseName }}'
-          MariaDbSettings:
-            ServerName: '{{ ServerName }}'
-            Port: '{{ Port }}'
-            SslMode: null
-            CertificateArn: '{{ CertificateArn }}'
-          DocDbSettings:
-            ServerName: '{{ ServerName }}'
-            Port: '{{ Port }}'
-            DatabaseName: '{{ DatabaseName }}'
-            SslMode: '{{ SslMode }}'
-            CertificateArn: '{{ CertificateArn }}'
-          MongoDbSettings:
-            ServerName: '{{ ServerName }}'
-            Port: '{{ Port }}'
-            DatabaseName: '{{ DatabaseName }}'
-            SslMode: null
-            CertificateArn: '{{ CertificateArn }}'
-            AuthType: '{{ AuthType }}'
-            AuthSource: '{{ AuthSource }}'
-            AuthMechanism: '{{ AuthMechanism }}'
-          IbmDb2LuwSettings:
-            ServerName: '{{ ServerName }}'
-            Port: '{{ Port }}'
-            DatabaseName: '{{ DatabaseName }}'
-            SslMode: '{{ SslMode }}'
-            CertificateArn: '{{ CertificateArn }}'
-          IbmDb2zOsSettings:
-            ServerName: '{{ ServerName }}'
-            Port: '{{ Port }}'
-            DatabaseName: '{{ DatabaseName }}'
-            SslMode: null
-            CertificateArn: '{{ CertificateArn }}'
-      - name: Tags
+          postgre_sql_settings:
+            server_name: '{{ server_name }}'
+            port: '{{ port }}'
+            database_name: '{{ database_name }}'
+            ssl_mode: '{{ ssl_mode }}'
+            certificate_arn: '{{ certificate_arn }}'
+          my_sql_settings:
+            server_name: '{{ server_name }}'
+            port: '{{ port }}'
+            ssl_mode: null
+            certificate_arn: '{{ certificate_arn }}'
+          oracle_settings:
+            server_name: '{{ server_name }}'
+            port: '{{ port }}'
+            database_name: '{{ database_name }}'
+            ssl_mode: null
+            certificate_arn: '{{ certificate_arn }}'
+            asm_server: '{{ asm_server }}'
+            secrets_manager_oracle_asm_secret_id: '{{ secrets_manager_oracle_asm_secret_id }}'
+            secrets_manager_oracle_asm_access_role_arn: '{{ secrets_manager_oracle_asm_access_role_arn }}'
+            secrets_manager_security_db_encryption_secret_id: '{{ secrets_manager_security_db_encryption_secret_id }}'
+            secrets_manager_security_db_encryption_access_role_arn: '{{ secrets_manager_security_db_encryption_access_role_arn }}'
+          microsoft_sql_server_settings:
+            server_name: '{{ server_name }}'
+            port: '{{ port }}'
+            database_name: '{{ database_name }}'
+            ssl_mode: null
+            certificate_arn: '{{ certificate_arn }}'
+          redshift_settings:
+            server_name: '{{ server_name }}'
+            port: '{{ port }}'
+            database_name: '{{ database_name }}'
+          maria_db_settings:
+            server_name: '{{ server_name }}'
+            port: '{{ port }}'
+            ssl_mode: null
+            certificate_arn: '{{ certificate_arn }}'
+          doc_db_settings:
+            server_name: '{{ server_name }}'
+            port: '{{ port }}'
+            database_name: '{{ database_name }}'
+            ssl_mode: '{{ ssl_mode }}'
+            certificate_arn: '{{ certificate_arn }}'
+          mongo_db_settings:
+            server_name: '{{ server_name }}'
+            port: '{{ port }}'
+            database_name: '{{ database_name }}'
+            ssl_mode: null
+            certificate_arn: '{{ certificate_arn }}'
+            auth_type: '{{ auth_type }}'
+            auth_source: '{{ auth_source }}'
+            auth_mechanism: '{{ auth_mechanism }}'
+          ibm_db2_luw_settings:
+            server_name: '{{ server_name }}'
+            port: '{{ port }}'
+            database_name: '{{ database_name }}'
+            ssl_mode: '{{ ssl_mode }}'
+            certificate_arn: '{{ certificate_arn }}'
+          ibm_db2z_os_settings:
+            server_name: '{{ server_name }}'
+            port: '{{ port }}'
+            database_name: '{{ database_name }}'
+            ssl_mode: null
+            certificate_arn: '{{ certificate_arn }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -718,7 +717,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<DataProviderArn>';
+AND Identifier = '{{ data_provider_arn }}';
 ```
 
 
@@ -727,7 +726,7 @@ AND Identifier = '<DataProviderArn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.dms.data_providers
-WHERE Identifier = '<DataProviderArn>'
+WHERE Identifier = '{{ data_provider_arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/dms/instance_profiles/index.md b/website/docs/services/dms/instance_profiles/index.md
index ff44eebf2..0b8927e7a 100644
--- a/website/docs/services/dms/instance_profiles/index.md
+++ b/website/docs/services/dms/instance_profiles/index.md
@@ -212,7 +212,7 @@ subnet_group_identifier,
 vpc_security_groups,
 tags
 FROM awscc.dms.instance_profiles
-WHERE region = 'us-east-1' AND Identifier = '<InstanceProfileArn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ instance_profile_arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -257,17 +257,17 @@ INSERT INTO awscc.dms.instance_profiles (
  Tags,
  region
 )
-SELECT 
-'{{ InstanceProfileIdentifier }}',
- '{{ AvailabilityZone }}',
- '{{ Description }}',
- '{{ KmsKeyArn }}',
- '{{ PubliclyAccessible }}',
- '{{ NetworkType }}',
- '{{ InstanceProfileName }}',
- '{{ SubnetGroupIdentifier }}',
- '{{ VpcSecurityGroups }}',
- '{{ Tags }}',
+SELECT
+'{{ instance_profile_identifier }}',
+ '{{ availability_zone }}',
+ '{{ description }}',
+ '{{ kms_key_arn }}',
+ '{{ publicly_accessible }}',
+ '{{ network_type }}',
+ '{{ instance_profile_name }}',
+ '{{ subnet_group_identifier }}',
+ '{{ vpc_security_groups }}',
+ '{{ tags }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -288,17 +288,17 @@ INSERT INTO awscc.dms.instance_profiles (
  Tags,
  region
 )
-SELECT 
- '{{ InstanceProfileIdentifier }}',
- '{{ AvailabilityZone }}',
- '{{ Description }}',
- '{{ KmsKeyArn }}',
- '{{ PubliclyAccessible }}',
- '{{ NetworkType }}',
- '{{ InstanceProfileName }}',
- '{{ SubnetGroupIdentifier }}',
- '{{ VpcSecurityGroups }}',
- '{{ Tags }}',
+SELECT
+ '{{ instance_profile_identifier }}',
+ '{{ availability_zone }}',
+ '{{ description }}',
+ '{{ kms_key_arn }}',
+ '{{ publicly_accessible }}',
+ '{{ network_type }}',
+ '{{ instance_profile_name }}',
+ '{{ subnet_group_identifier }}',
+ '{{ vpc_security_groups }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -316,30 +316,29 @@ globals:
 resources:
   - name: instance_profile
     props:
-      - name: InstanceProfileIdentifier
-        value: '{{ InstanceProfileIdentifier }}'
-      - name: AvailabilityZone
-        value: '{{ AvailabilityZone }}'
-      - name: Description
-        value: '{{ Description }}'
-      - name: KmsKeyArn
-        value: '{{ KmsKeyArn }}'
-      - name: PubliclyAccessible
-        value: '{{ PubliclyAccessible }}'
-      - name: NetworkType
-        value: '{{ NetworkType }}'
-      - name: InstanceProfileName
-        value: '{{ InstanceProfileName }}'
-      - name: SubnetGroupIdentifier
-        value: '{{ SubnetGroupIdentifier }}'
-      - name: VpcSecurityGroups
+      - name: instance_profile_identifier
+        value: '{{ instance_profile_identifier }}'
+      - name: availability_zone
+        value: '{{ availability_zone }}'
+      - name: description
+        value: '{{ description }}'
+      - name: kms_key_arn
+        value: '{{ kms_key_arn }}'
+      - name: publicly_accessible
+        value: '{{ publicly_accessible }}'
+      - name: network_type
+        value: '{{ network_type }}'
+      - name: instance_profile_name
+        value: '{{ instance_profile_name }}'
+      - name: subnet_group_identifier
+        value: '{{ subnet_group_identifier }}'
+      - name: vpc_security_groups
         value:
-          - '{{ VpcSecurityGroups[0] }}'
-      - name: Tags
+          - '{{ vpc_security_groups[0] }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -364,7 +363,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<InstanceProfileArn>';
+AND Identifier = '{{ instance_profile_arn }}';
 ```
 
 
@@ -373,7 +372,7 @@ AND Identifier = '<InstanceProfileArn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.dms.instance_profiles
-WHERE Identifier = '<InstanceProfileArn>'
+WHERE Identifier = '{{ instance_profile_arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/dms/migration_projects/index.md b/website/docs/services/dms/migration_projects/index.md
index f27f23bc3..d906b5dac 100644
--- a/website/docs/services/dms/migration_projects/index.md
+++ b/website/docs/services/dms/migration_projects/index.md
@@ -257,7 +257,7 @@ source_data_provider_descriptors,
 target_data_provider_descriptors,
 tags
 FROM awscc.dms.migration_projects
-WHERE region = 'us-east-1' AND Identifier = '<MigrationProjectArn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ migration_project_arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -304,19 +304,19 @@ INSERT INTO awscc.dms.migration_projects (
  Tags,
  region
 )
-SELECT 
-'{{ MigrationProjectName }}',
- '{{ MigrationProjectIdentifier }}',
- '{{ MigrationProjectCreationTime }}',
- '{{ InstanceProfileIdentifier }}',
- '{{ InstanceProfileName }}',
- '{{ InstanceProfileArn }}',
- '{{ TransformationRules }}',
- '{{ Description }}',
- '{{ SchemaConversionApplicationAttributes }}',
- '{{ SourceDataProviderDescriptors }}',
- '{{ TargetDataProviderDescriptors }}',
- '{{ Tags }}',
+SELECT
+'{{ migration_project_name }}',
+ '{{ migration_project_identifier }}',
+ '{{ migration_project_creation_time }}',
+ '{{ instance_profile_identifier }}',
+ '{{ instance_profile_name }}',
+ '{{ instance_profile_arn }}',
+ '{{ transformation_rules }}',
+ '{{ description }}',
+ '{{ schema_conversion_application_attributes }}',
+ '{{ source_data_provider_descriptors }}',
+ '{{ target_data_provider_descriptors }}',
+ '{{ tags }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -339,19 +339,19 @@ INSERT INTO awscc.dms.migration_projects (
  Tags,
  region
 )
-SELECT 
- '{{ MigrationProjectName }}',
- '{{ MigrationProjectIdentifier }}',
- '{{ MigrationProjectCreationTime }}',
- '{{ InstanceProfileIdentifier }}',
- '{{ InstanceProfileName }}',
- '{{ InstanceProfileArn }}',
- '{{ TransformationRules }}',
- '{{ Description }}',
- '{{ SchemaConversionApplicationAttributes }}',
- '{{ SourceDataProviderDescriptors }}',
- '{{ TargetDataProviderDescriptors }}',
- '{{ Tags }}',
+SELECT
+ '{{ migration_project_name }}',
+ '{{ migration_project_identifier }}',
+ '{{ migration_project_creation_time }}',
+ '{{ instance_profile_identifier }}',
+ '{{ instance_profile_name }}',
+ '{{ instance_profile_arn }}',
+ '{{ transformation_rules }}',
+ '{{ description }}',
+ '{{ schema_conversion_application_attributes }}',
+ '{{ source_data_provider_descriptors }}',
+ '{{ target_data_provider_descriptors }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -369,41 +369,40 @@ globals:
 resources:
   - name: migration_project
     props:
-      - name: MigrationProjectName
-        value: '{{ MigrationProjectName }}'
-      - name: MigrationProjectIdentifier
-        value: '{{ MigrationProjectIdentifier }}'
-      - name: MigrationProjectCreationTime
-        value: '{{ MigrationProjectCreationTime }}'
-      - name: InstanceProfileIdentifier
-        value: '{{ InstanceProfileIdentifier }}'
-      - name: InstanceProfileName
-        value: '{{ InstanceProfileName }}'
-      - name: InstanceProfileArn
-        value: '{{ InstanceProfileArn }}'
-      - name: TransformationRules
-        value: '{{ TransformationRules }}'
-      - name: Description
-        value: '{{ Description }}'
-      - name: SchemaConversionApplicationAttributes
+      - name: migration_project_name
+        value: '{{ migration_project_name }}'
+      - name: migration_project_identifier
+        value: '{{ migration_project_identifier }}'
+      - name: migration_project_creation_time
+        value: '{{ migration_project_creation_time }}'
+      - name: instance_profile_identifier
+        value: '{{ instance_profile_identifier }}'
+      - name: instance_profile_name
+        value: '{{ instance_profile_name }}'
+      - name: instance_profile_arn
+        value: '{{ instance_profile_arn }}'
+      - name: transformation_rules
+        value: '{{ transformation_rules }}'
+      - name: description
+        value: '{{ description }}'
+      - name: schema_conversion_application_attributes
         value:
-          S3BucketPath: '{{ S3BucketPath }}'
-          S3BucketRoleArn: '{{ S3BucketRoleArn }}'
-      - name: SourceDataProviderDescriptors
+          s3_bucket_path: '{{ s3_bucket_path }}'
+          s3_bucket_role_arn: '{{ s3_bucket_role_arn }}'
+      - name: source_data_provider_descriptors
         value:
-          - DataProviderIdentifier: '{{ DataProviderIdentifier }}'
-            DataProviderName: '{{ DataProviderName }}'
-            DataProviderArn: '{{ DataProviderArn }}'
-            SecretsManagerSecretId: '{{ SecretsManagerSecretId }}'
-            SecretsManagerAccessRoleArn: '{{ SecretsManagerAccessRoleArn }}'
-      - name: TargetDataProviderDescriptors
+          - data_provider_identifier: '{{ data_provider_identifier }}'
+            data_provider_name: '{{ data_provider_name }}'
+            data_provider_arn: '{{ data_provider_arn }}'
+            secrets_manager_secret_id: '{{ secrets_manager_secret_id }}'
+            secrets_manager_access_role_arn: '{{ secrets_manager_access_role_arn }}'
+      - name: target_data_provider_descriptors
         value:
           - null
-      - name: Tags
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -430,7 +429,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<MigrationProjectArn>';
+AND Identifier = '{{ migration_project_arn }}';
 ```
 
 
@@ -439,7 +438,7 @@ AND Identifier = '<MigrationProjectArn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.dms.migration_projects
-WHERE Identifier = '<MigrationProjectArn>'
+WHERE Identifier = '{{ migration_project_arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/dms/replication_configs/index.md b/website/docs/services/dms/replication_configs/index.md
index 6342a5e18..31e83cc68 100644
--- a/website/docs/services/dms/replication_configs/index.md
+++ b/website/docs/services/dms/replication_configs/index.md
@@ -253,7 +253,7 @@ resource_identifier,
 table_mappings,
 tags
 FROM awscc.dms.replication_configs
-WHERE region = 'us-east-1' AND Identifier = '<ReplicationConfigArn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ replication_config_arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -294,13 +294,13 @@ INSERT INTO awscc.dms.replication_configs (
  TableMappings,
  region
 )
-SELECT 
-'{{ ReplicationConfigIdentifier }}',
- '{{ SourceEndpointArn }}',
- '{{ TargetEndpointArn }}',
- '{{ ReplicationType }}',
- '{{ ComputeConfig }}',
- '{{ TableMappings }}',
+SELECT
+'{{ replication_config_identifier }}',
+ '{{ source_endpoint_arn }}',
+ '{{ target_endpoint_arn }}',
+ '{{ replication_type }}',
+ '{{ compute_config }}',
+ '{{ table_mappings }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -321,17 +321,17 @@ INSERT INTO awscc.dms.replication_configs (
  Tags,
  region
 )
-SELECT 
- '{{ ReplicationConfigIdentifier }}',
- '{{ SourceEndpointArn }}',
- '{{ TargetEndpointArn }}',
- '{{ ReplicationType }}',
- '{{ ComputeConfig }}',
- '{{ ReplicationSettings }}',
- '{{ SupplementalSettings }}',
- '{{ ResourceIdentifier }}',
- '{{ TableMappings }}',
- '{{ Tags }}',
+SELECT
+ '{{ replication_config_identifier }}',
+ '{{ source_endpoint_arn }}',
+ '{{ target_endpoint_arn }}',
+ '{{ replication_type }}',
+ '{{ compute_config }}',
+ '{{ replication_settings }}',
+ '{{ supplemental_settings }}',
+ '{{ resource_identifier }}',
+ '{{ table_mappings }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -349,39 +349,38 @@ globals:
 resources:
   - name: replication_config
     props:
-      - name: ReplicationConfigIdentifier
-        value: '{{ ReplicationConfigIdentifier }}'
-      - name: SourceEndpointArn
-        value: '{{ SourceEndpointArn }}'
-      - name: TargetEndpointArn
-        value: '{{ TargetEndpointArn }}'
-      - name: ReplicationType
-        value: '{{ ReplicationType }}'
-      - name: ComputeConfig
+      - name: replication_config_identifier
+        value: '{{ replication_config_identifier }}'
+      - name: source_endpoint_arn
+        value: '{{ source_endpoint_arn }}'
+      - name: target_endpoint_arn
+        value: '{{ target_endpoint_arn }}'
+      - name: replication_type
+        value: '{{ replication_type }}'
+      - name: compute_config
         value:
-          AvailabilityZone: '{{ AvailabilityZone }}'
-          DnsNameServers: '{{ DnsNameServers }}'
-          KmsKeyId: '{{ KmsKeyId }}'
-          MaxCapacityUnits: '{{ MaxCapacityUnits }}'
-          MinCapacityUnits: '{{ MinCapacityUnits }}'
-          MultiAZ: '{{ MultiAZ }}'
-          PreferredMaintenanceWindow: '{{ PreferredMaintenanceWindow }}'
-          ReplicationSubnetGroupId: '{{ ReplicationSubnetGroupId }}'
-          VpcSecurityGroupIds:
-            - '{{ VpcSecurityGroupIds[0] }}'
-      - name: ReplicationSettings
+          availability_zone: '{{ availability_zone }}'
+          dns_name_servers: '{{ dns_name_servers }}'
+          kms_key_id: '{{ kms_key_id }}'
+          max_capacity_units: '{{ max_capacity_units }}'
+          min_capacity_units: '{{ min_capacity_units }}'
+          multi_az: '{{ multi_az }}'
+          preferred_maintenance_window: '{{ preferred_maintenance_window }}'
+          replication_subnet_group_id: '{{ replication_subnet_group_id }}'
+          vpc_security_group_ids:
+            - '{{ vpc_security_group_ids[0] }}'
+      - name: replication_settings
         value: {}
-      - name: SupplementalSettings
+      - name: supplemental_settings
         value: {}
-      - name: ResourceIdentifier
-        value: '{{ ResourceIdentifier }}'
-      - name: TableMappings
+      - name: resource_identifier
+        value: '{{ resource_identifier }}'
+      - name: table_mappings
         value: {}
-      - name: Tags
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -405,7 +404,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<ReplicationConfigArn>';
+AND Identifier = '{{ replication_config_arn }}';
 ```
 
 
@@ -414,7 +413,7 @@ AND Identifier = '<ReplicationConfigArn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.dms.replication_configs
-WHERE Identifier = '<ReplicationConfigArn>'
+WHERE Identifier = '{{ replication_config_arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/docdbelastic/clusters/index.md b/website/docs/services/docdbelastic/clusters/index.md
index 30bd0b2a3..9acbc43d9 100644
--- a/website/docs/services/docdbelastic/clusters/index.md
+++ b/website/docs/services/docdbelastic/clusters/index.md
@@ -236,7 +236,7 @@ kms_key_id,
 tags,
 auth_type
 FROM awscc.docdbelastic.clusters
-WHERE region = 'us-east-1' AND Identifier = '<ClusterArn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ cluster_arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -276,12 +276,12 @@ INSERT INTO awscc.docdbelastic.clusters (
  AuthType,
  region
 )
-SELECT 
-'{{ ClusterName }}',
- '{{ AdminUserName }}',
- '{{ ShardCapacity }}',
- '{{ ShardCount }}',
- '{{ AuthType }}',
+SELECT
+'{{ cluster_name }}',
+ '{{ admin_user_name }}',
+ '{{ shard_capacity }}',
+ '{{ shard_count }}',
+ '{{ auth_type }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -306,21 +306,21 @@ INSERT INTO awscc.docdbelastic.clusters (
  AuthType,
  region
 )
-SELECT 
- '{{ ClusterName }}',
- '{{ AdminUserName }}',
- '{{ AdminUserPassword }}',
- '{{ ShardCapacity }}',
- '{{ ShardCount }}',
- '{{ VpcSecurityGroupIds }}',
- '{{ SubnetIds }}',
- '{{ PreferredMaintenanceWindow }}',
- '{{ PreferredBackupWindow }}',
- '{{ BackupRetentionPeriod }}',
- '{{ ShardInstanceCount }}',
- '{{ KmsKeyId }}',
- '{{ Tags }}',
- '{{ AuthType }}',
+SELECT
+ '{{ cluster_name }}',
+ '{{ admin_user_name }}',
+ '{{ admin_user_password }}',
+ '{{ shard_capacity }}',
+ '{{ shard_count }}',
+ '{{ vpc_security_group_ids }}',
+ '{{ subnet_ids }}',
+ '{{ preferred_maintenance_window }}',
+ '{{ preferred_backup_window }}',
+ '{{ backup_retention_period }}',
+ '{{ shard_instance_count }}',
+ '{{ kms_key_id }}',
+ '{{ tags }}',
+ '{{ auth_type }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -338,39 +338,38 @@ globals:
 resources:
   - name: cluster
     props:
-      - name: ClusterName
-        value: '{{ ClusterName }}'
-      - name: AdminUserName
-        value: '{{ AdminUserName }}'
-      - name: AdminUserPassword
-        value: '{{ AdminUserPassword }}'
-      - name: ShardCapacity
-        value: '{{ ShardCapacity }}'
-      - name: ShardCount
-        value: '{{ ShardCount }}'
-      - name: VpcSecurityGroupIds
+      - name: cluster_name
+        value: '{{ cluster_name }}'
+      - name: admin_user_name
+        value: '{{ admin_user_name }}'
+      - name: admin_user_password
+        value: '{{ admin_user_password }}'
+      - name: shard_capacity
+        value: '{{ shard_capacity }}'
+      - name: shard_count
+        value: '{{ shard_count }}'
+      - name: vpc_security_group_ids
         value:
-          - '{{ VpcSecurityGroupIds[0] }}'
-      - name: SubnetIds
+          - '{{ vpc_security_group_ids[0] }}'
+      - name: subnet_ids
         value:
-          - '{{ SubnetIds[0] }}'
-      - name: PreferredMaintenanceWindow
-        value: '{{ PreferredMaintenanceWindow }}'
-      - name: PreferredBackupWindow
-        value: '{{ PreferredBackupWindow }}'
-      - name: BackupRetentionPeriod
-        value: '{{ BackupRetentionPeriod }}'
-      - name: ShardInstanceCount
-        value: '{{ ShardInstanceCount }}'
-      - name: KmsKeyId
-        value: '{{ KmsKeyId }}'
-      - name: Tags
+          - '{{ subnet_ids[0] }}'
+      - name: preferred_maintenance_window
+        value: '{{ preferred_maintenance_window }}'
+      - name: preferred_backup_window
+        value: '{{ preferred_backup_window }}'
+      - name: backup_retention_period
+        value: '{{ backup_retention_period }}'
+      - name: shard_instance_count
+        value: '{{ shard_instance_count }}'
+      - name: kms_key_id
+        value: '{{ kms_key_id }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-      - name: AuthType
-        value: '{{ AuthType }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
+      - name: auth_type
+        value: '{{ auth_type }}'
 ```
 </TabItem>
 </Tabs>
@@ -395,7 +394,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<ClusterArn>';
+AND Identifier = '{{ cluster_arn }}';
 ```
 
 
@@ -404,7 +403,7 @@ AND Identifier = '<ClusterArn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.docdbelastic.clusters
-WHERE Identifier = '<ClusterArn>'
+WHERE Identifier = '{{ cluster_arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/dsql/clusters/index.md b/website/docs/services/dsql/clusters/index.md
index 97ebe61c6..f9d692fb6 100644
--- a/website/docs/services/dsql/clusters/index.md
+++ b/website/docs/services/dsql/clusters/index.md
@@ -229,7 +229,7 @@ multi_region_properties,
 kms_encryption_key,
 encryption_details
 FROM awscc.dsql.clusters
-WHERE region = 'us-east-1' AND Identifier = '<Identifier>';
+WHERE region = 'us-east-1' AND Identifier = '{{ identifier }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -265,7 +265,7 @@ INSERT INTO awscc.dsql.clusters (
  ,
  region
 )
-SELECT 
+SELECT
 '{{  }}',
 '{{ region }}';
 ```
@@ -281,11 +281,11 @@ INSERT INTO awscc.dsql.clusters (
  KmsEncryptionKey,
  region
 )
-SELECT 
- '{{ DeletionProtectionEnabled }}',
- '{{ Tags }}',
- '{{ MultiRegionProperties }}',
- '{{ KmsEncryptionKey }}',
+SELECT
+ '{{ deletion_protection_enabled }}',
+ '{{ tags }}',
+ '{{ multi_region_properties }}',
+ '{{ kms_encryption_key }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -303,20 +303,19 @@ globals:
 resources:
   - name: cluster
     props:
-      - name: DeletionProtectionEnabled
-        value: '{{ DeletionProtectionEnabled }}'
-      - name: Tags
+      - name: deletion_protection_enabled
+        value: '{{ deletion_protection_enabled }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-      - name: MultiRegionProperties
+          - key: '{{ key }}'
+            value: '{{ value }}'
+      - name: multi_region_properties
         value:
-          WitnessRegion: '{{ WitnessRegion }}'
-          Clusters:
-            - '{{ Clusters[0] }}'
-      - name: KmsEncryptionKey
-        value: '{{ KmsEncryptionKey }}'
-
+          witness_region: '{{ witness_region }}'
+          clusters:
+            - '{{ clusters[0] }}'
+      - name: kms_encryption_key
+        value: '{{ kms_encryption_key }}'
 ```
 </TabItem>
 </Tabs>
@@ -335,7 +334,7 @@ SET PatchDocument = string('{{ {
     "KmsEncryptionKey": kms_encryption_key
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Identifier>';
+AND Identifier = '{{ identifier }}';
 ```
 
 
@@ -344,7 +343,7 @@ AND Identifier = '<Identifier>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.dsql.clusters
-WHERE Identifier = '<Identifier>'
+WHERE Identifier = '{{ identifier }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/dynamodb/global_tables/index.md b/website/docs/services/dynamodb/global_tables/index.md
index d81aeafac..22de54cc5 100644
--- a/website/docs/services/dynamodb/global_tables/index.md
+++ b/website/docs/services/dynamodb/global_tables/index.md
@@ -726,7 +726,7 @@ arn,
 stream_arn,
 time_to_live_specification
 FROM awscc.dynamodb.global_tables
-WHERE region = 'us-east-1' AND Identifier = '<TableName>';
+WHERE region = 'us-east-1' AND Identifier = '{{ table_name }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -764,10 +764,10 @@ INSERT INTO awscc.dynamodb.global_tables (
  KeySchema,
  region
 )
-SELECT 
-'{{ Replicas }}',
- '{{ AttributeDefinitions }}',
- '{{ KeySchema }}',
+SELECT
+'{{ replicas }}',
+ '{{ attribute_definitions }}',
+ '{{ key_schema }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -793,22 +793,22 @@ INSERT INTO awscc.dynamodb.global_tables (
  TimeToLiveSpecification,
  region
 )
-SELECT 
- '{{ MultiRegionConsistency }}',
- '{{ SSESpecification }}',
- '{{ StreamSpecification }}',
- '{{ WarmThroughput }}',
- '{{ Replicas }}',
- '{{ WriteProvisionedThroughputSettings }}',
- '{{ WriteOnDemandThroughputSettings }}',
- '{{ GlobalTableWitnesses }}',
- '{{ TableName }}',
- '{{ AttributeDefinitions }}',
- '{{ BillingMode }}',
- '{{ GlobalSecondaryIndexes }}',
- '{{ KeySchema }}',
- '{{ LocalSecondaryIndexes }}',
- '{{ TimeToLiveSpecification }}',
+SELECT
+ '{{ multi_region_consistency }}',
+ '{{ sse_specification }}',
+ '{{ stream_specification }}',
+ '{{ warm_throughput }}',
+ '{{ replicas }}',
+ '{{ write_provisioned_throughput_settings }}',
+ '{{ write_on_demand_throughput_settings }}',
+ '{{ global_table_witnesses }}',
+ '{{ table_name }}',
+ '{{ attribute_definitions }}',
+ '{{ billing_mode }}',
+ '{{ global_secondary_indexes }}',
+ '{{ key_schema }}',
+ '{{ local_secondary_indexes }}',
+ '{{ time_to_live_specification }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -826,111 +826,110 @@ globals:
 resources:
   - name: global_table
     props:
-      - name: MultiRegionConsistency
-        value: '{{ MultiRegionConsistency }}'
-      - name: SSESpecification
+      - name: multi_region_consistency
+        value: '{{ multi_region_consistency }}'
+      - name: sse_specification
         value:
-          SSEEnabled: '{{ SSEEnabled }}'
-          SSEType: '{{ SSEType }}'
-          KMSMasterKeyId: '{{ KMSMasterKeyId }}'
-      - name: StreamSpecification
+          sse_enabled: '{{ sse_enabled }}'
+          sse_type: '{{ sse_type }}'
+          kms_master_key_id: '{{ kms_master_key_id }}'
+      - name: stream_specification
         value:
-          StreamViewType: '{{ StreamViewType }}'
-          ResourcePolicy:
-            PolicyDocument: {}
-      - name: WarmThroughput
+          stream_view_type: '{{ stream_view_type }}'
+          resource_policy:
+            policy_document: {}
+      - name: warm_throughput
         value:
-          ReadUnitsPerSecond: '{{ ReadUnitsPerSecond }}'
-          WriteUnitsPerSecond: '{{ WriteUnitsPerSecond }}'
-      - name: Replicas
+          read_units_per_second: '{{ read_units_per_second }}'
+          write_units_per_second: '{{ write_units_per_second }}'
+      - name: replicas
         value:
-          - SSESpecification:
-              KMSMasterKeyId: '{{ KMSMasterKeyId }}'
-            KinesisStreamSpecification:
-              ApproximateCreationDateTimePrecision: '{{ ApproximateCreationDateTimePrecision }}'
-              StreamArn: '{{ StreamArn }}'
-            ContributorInsightsSpecification:
-              Mode: '{{ Mode }}'
-              Enabled: '{{ Enabled }}'
-            PointInTimeRecoverySpecification:
-              PointInTimeRecoveryEnabled: '{{ PointInTimeRecoveryEnabled }}'
-              RecoveryPeriodInDays: '{{ RecoveryPeriodInDays }}'
-            ReplicaStreamSpecification:
-              ResourcePolicy: null
-            GlobalSecondaryIndexes:
-              - IndexName: '{{ IndexName }}'
-                ContributorInsightsSpecification: null
-                ReadProvisionedThroughputSettings:
-                  ReadCapacityUnits: '{{ ReadCapacityUnits }}'
-                  ReadCapacityAutoScalingSettings:
-                    MinCapacity: '{{ MinCapacity }}'
-                    SeedCapacity: '{{ SeedCapacity }}'
-                    TargetTrackingScalingPolicyConfiguration:
-                      ScaleOutCooldown: '{{ ScaleOutCooldown }}'
-                      TargetValue: null
-                      DisableScaleIn: '{{ DisableScaleIn }}'
-                      ScaleInCooldown: '{{ ScaleInCooldown }}'
-                    MaxCapacity: '{{ MaxCapacity }}'
-                ReadOnDemandThroughputSettings:
-                  MaxReadRequestUnits: '{{ MaxReadRequestUnits }}'
-            Region: '{{ Region }}'
-            ResourcePolicy: null
-            ReadProvisionedThroughputSettings: null
-            TableClass: '{{ TableClass }}'
-            DeletionProtectionEnabled: '{{ DeletionProtectionEnabled }}'
-            Tags:
-              - Value: '{{ Value }}'
-                Key: '{{ Key }}'
-            ReadOnDemandThroughputSettings: null
-      - name: WriteProvisionedThroughputSettings
+          - sse_specification:
+              kms_master_key_id: '{{ kms_master_key_id }}'
+            kinesis_stream_specification:
+              approximate_creation_date_time_precision: '{{ approximate_creation_date_time_precision }}'
+              stream_arn: '{{ stream_arn }}'
+            contributor_insights_specification:
+              mode: '{{ mode }}'
+              enabled: '{{ enabled }}'
+            point_in_time_recovery_specification:
+              point_in_time_recovery_enabled: '{{ point_in_time_recovery_enabled }}'
+              recovery_period_in_days: '{{ recovery_period_in_days }}'
+            replica_stream_specification:
+              resource_policy: null
+            global_secondary_indexes:
+              - index_name: '{{ index_name }}'
+                contributor_insights_specification: null
+                read_provisioned_throughput_settings:
+                  read_capacity_units: '{{ read_capacity_units }}'
+                  read_capacity_auto_scaling_settings:
+                    min_capacity: '{{ min_capacity }}'
+                    seed_capacity: '{{ seed_capacity }}'
+                    target_tracking_scaling_policy_configuration:
+                      scale_out_cooldown: '{{ scale_out_cooldown }}'
+                      target_value: null
+                      disable_scale_in: '{{ disable_scale_in }}'
+                      scale_in_cooldown: '{{ scale_in_cooldown }}'
+                    max_capacity: '{{ max_capacity }}'
+                read_on_demand_throughput_settings:
+                  max_read_request_units: '{{ max_read_request_units }}'
+            region: '{{ region }}'
+            resource_policy: null
+            read_provisioned_throughput_settings: null
+            table_class: '{{ table_class }}'
+            deletion_protection_enabled: '{{ deletion_protection_enabled }}'
+            tags:
+              - value: '{{ value }}'
+                key: '{{ key }}'
+            read_on_demand_throughput_settings: null
+      - name: write_provisioned_throughput_settings
         value:
-          WriteCapacityAutoScalingSettings: null
-      - name: WriteOnDemandThroughputSettings
+          write_capacity_auto_scaling_settings: null
+      - name: write_on_demand_throughput_settings
         value:
-          MaxWriteRequestUnits: '{{ MaxWriteRequestUnits }}'
-      - name: GlobalTableWitnesses
+          max_write_request_units: '{{ max_write_request_units }}'
+      - name: global_table_witnesses
         value:
-          - Region: '{{ Region }}'
-      - name: TableName
-        value: '{{ TableName }}'
-      - name: AttributeDefinitions
+          - region: '{{ region }}'
+      - name: table_name
+        value: '{{ table_name }}'
+      - name: attribute_definitions
         value:
-          - AttributeType: '{{ AttributeType }}'
-            AttributeName: '{{ AttributeName }}'
-      - name: BillingMode
-        value: '{{ BillingMode }}'
-      - name: GlobalSecondaryIndexes
+          - attribute_type: '{{ attribute_type }}'
+            attribute_name: '{{ attribute_name }}'
+      - name: billing_mode
+        value: '{{ billing_mode }}'
+      - name: global_secondary_indexes
         value:
-          - IndexName: '{{ IndexName }}'
-            OnDemandThroughput:
-              MaxReadRequestUnits: '{{ MaxReadRequestUnits }}'
-              MaxWriteRequestUnits: '{{ MaxWriteRequestUnits }}'
-            ContributorInsightsSpecification: null
-            Projection:
-              NonKeyAttributes:
-                - '{{ NonKeyAttributes[0] }}'
-              ProjectionType: '{{ ProjectionType }}'
-            ProvisionedThroughput:
-              WriteCapacityUnits: '{{ WriteCapacityUnits }}'
-              ReadCapacityUnits: '{{ ReadCapacityUnits }}'
-            KeySchema:
-              - KeyType: '{{ KeyType }}'
-                AttributeName: '{{ AttributeName }}'
-            WarmThroughput: null
-      - name: KeySchema
+          - index_name: '{{ index_name }}'
+            on_demand_throughput:
+              max_read_request_units: '{{ max_read_request_units }}'
+              max_write_request_units: '{{ max_write_request_units }}'
+            contributor_insights_specification: null
+            projection:
+              non_key_attributes:
+                - '{{ non_key_attributes[0] }}'
+              projection_type: '{{ projection_type }}'
+            provisioned_throughput:
+              write_capacity_units: '{{ write_capacity_units }}'
+              read_capacity_units: '{{ read_capacity_units }}'
+            key_schema:
+              - key_type: '{{ key_type }}'
+                attribute_name: '{{ attribute_name }}'
+            warm_throughput: null
+      - name: key_schema
         value:
           - null
-      - name: LocalSecondaryIndexes
+      - name: local_secondary_indexes
         value:
-          - IndexName: '{{ IndexName }}'
-            Projection: null
-            KeySchema:
+          - index_name: '{{ index_name }}'
+            projection: null
+            key_schema:
               - null
-      - name: TimeToLiveSpecification
+      - name: time_to_live_specification
         value:
-          Enabled: '{{ Enabled }}'
-          AttributeName: '{{ AttributeName }}'
-
+          enabled: '{{ enabled }}'
+          attribute_name: '{{ attribute_name }}'
 ```
 </TabItem>
 </Tabs>
@@ -957,7 +956,7 @@ SET PatchDocument = string('{{ {
     "TimeToLiveSpecification": time_to_live_specification
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<TableName>';
+AND Identifier = '{{ table_name }}';
 ```
 
 
@@ -966,7 +965,7 @@ AND Identifier = '<TableName>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.dynamodb.global_tables
-WHERE Identifier = '<TableName>'
+WHERE Identifier = '{{ table_name }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/dynamodb/tables/index.md b/website/docs/services/dynamodb/tables/index.md
index 13e974361..a3cfc79e2 100644
--- a/website/docs/services/dynamodb/tables/index.md
+++ b/website/docs/services/dynamodb/tables/index.md
@@ -551,7 +551,7 @@ table_class,
 tags,
 time_to_live_specification
 FROM awscc.dynamodb.tables
-WHERE region = 'us-east-1' AND Identifier = '<TableName>';
+WHERE region = 'us-east-1' AND Identifier = '{{ table_name }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -587,8 +587,8 @@ INSERT INTO awscc.dynamodb.tables (
  KeySchema,
  region
 )
-SELECT 
-'{{ KeySchema }}',
+SELECT
+'{{ key_schema }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -619,27 +619,27 @@ INSERT INTO awscc.dynamodb.tables (
  TimeToLiveSpecification,
  region
 )
-SELECT 
- '{{ OnDemandThroughput }}',
- '{{ SSESpecification }}',
- '{{ KinesisStreamSpecification }}',
- '{{ StreamSpecification }}',
- '{{ ContributorInsightsSpecification }}',
- '{{ ImportSourceSpecification }}',
- '{{ PointInTimeRecoverySpecification }}',
- '{{ ProvisionedThroughput }}',
- '{{ WarmThroughput }}',
- '{{ TableName }}',
- '{{ AttributeDefinitions }}',
- '{{ BillingMode }}',
- '{{ GlobalSecondaryIndexes }}',
- '{{ ResourcePolicy }}',
- '{{ KeySchema }}',
- '{{ LocalSecondaryIndexes }}',
- '{{ DeletionProtectionEnabled }}',
- '{{ TableClass }}',
- '{{ Tags }}',
- '{{ TimeToLiveSpecification }}',
+SELECT
+ '{{ on_demand_throughput }}',
+ '{{ sse_specification }}',
+ '{{ kinesis_stream_specification }}',
+ '{{ stream_specification }}',
+ '{{ contributor_insights_specification }}',
+ '{{ import_source_specification }}',
+ '{{ point_in_time_recovery_specification }}',
+ '{{ provisioned_throughput }}',
+ '{{ warm_throughput }}',
+ '{{ table_name }}',
+ '{{ attribute_definitions }}',
+ '{{ billing_mode }}',
+ '{{ global_secondary_indexes }}',
+ '{{ resource_policy }}',
+ '{{ key_schema }}',
+ '{{ local_secondary_indexes }}',
+ '{{ deletion_protection_enabled }}',
+ '{{ table_class }}',
+ '{{ tags }}',
+ '{{ time_to_live_specification }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -657,98 +657,97 @@ globals:
 resources:
   - name: table
     props:
-      - name: OnDemandThroughput
+      - name: on_demand_throughput
         value:
-          MaxReadRequestUnits: '{{ MaxReadRequestUnits }}'
-          MaxWriteRequestUnits: '{{ MaxWriteRequestUnits }}'
-      - name: SSESpecification
+          max_read_request_units: '{{ max_read_request_units }}'
+          max_write_request_units: '{{ max_write_request_units }}'
+      - name: sse_specification
         value:
-          SSEEnabled: '{{ SSEEnabled }}'
-          SSEType: '{{ SSEType }}'
-          KMSMasterKeyId: '{{ KMSMasterKeyId }}'
-      - name: KinesisStreamSpecification
+          sse_enabled: '{{ sse_enabled }}'
+          sse_type: '{{ sse_type }}'
+          kms_master_key_id: '{{ kms_master_key_id }}'
+      - name: kinesis_stream_specification
         value:
-          ApproximateCreationDateTimePrecision: '{{ ApproximateCreationDateTimePrecision }}'
-          StreamArn: '{{ StreamArn }}'
-      - name: StreamSpecification
+          approximate_creation_date_time_precision: '{{ approximate_creation_date_time_precision }}'
+          stream_arn: '{{ stream_arn }}'
+      - name: stream_specification
         value:
-          StreamViewType: '{{ StreamViewType }}'
-          ResourcePolicy:
-            PolicyDocument: {}
-      - name: ContributorInsightsSpecification
+          stream_view_type: '{{ stream_view_type }}'
+          resource_policy:
+            policy_document: {}
+      - name: contributor_insights_specification
         value:
-          Mode: '{{ Mode }}'
-          Enabled: '{{ Enabled }}'
-      - name: ImportSourceSpecification
+          mode: '{{ mode }}'
+          enabled: '{{ enabled }}'
+      - name: import_source_specification
         value:
-          S3BucketSource:
-            S3Bucket: '{{ S3Bucket }}'
-            S3KeyPrefix: '{{ S3KeyPrefix }}'
-            S3BucketOwner: '{{ S3BucketOwner }}'
-          InputFormat: '{{ InputFormat }}'
-          InputFormatOptions:
-            Csv:
-              Delimiter: '{{ Delimiter }}'
-              HeaderList:
-                - '{{ HeaderList[0] }}'
-          InputCompressionType: '{{ InputCompressionType }}'
-      - name: PointInTimeRecoverySpecification
+          s3_bucket_source:
+            s3_bucket: '{{ s3_bucket }}'
+            s3_key_prefix: '{{ s3_key_prefix }}'
+            s3_bucket_owner: '{{ s3_bucket_owner }}'
+          input_format: '{{ input_format }}'
+          input_format_options:
+            csv:
+              delimiter: '{{ delimiter }}'
+              header_list:
+                - '{{ header_list[0] }}'
+          input_compression_type: '{{ input_compression_type }}'
+      - name: point_in_time_recovery_specification
         value:
-          PointInTimeRecoveryEnabled: '{{ PointInTimeRecoveryEnabled }}'
-          RecoveryPeriodInDays: '{{ RecoveryPeriodInDays }}'
-      - name: ProvisionedThroughput
+          point_in_time_recovery_enabled: '{{ point_in_time_recovery_enabled }}'
+          recovery_period_in_days: '{{ recovery_period_in_days }}'
+      - name: provisioned_throughput
         value:
-          WriteCapacityUnits: '{{ WriteCapacityUnits }}'
-          ReadCapacityUnits: '{{ ReadCapacityUnits }}'
-      - name: WarmThroughput
+          write_capacity_units: '{{ write_capacity_units }}'
+          read_capacity_units: '{{ read_capacity_units }}'
+      - name: warm_throughput
         value:
-          ReadUnitsPerSecond: '{{ ReadUnitsPerSecond }}'
-          WriteUnitsPerSecond: '{{ WriteUnitsPerSecond }}'
-      - name: TableName
-        value: '{{ TableName }}'
-      - name: AttributeDefinitions
+          read_units_per_second: '{{ read_units_per_second }}'
+          write_units_per_second: '{{ write_units_per_second }}'
+      - name: table_name
+        value: '{{ table_name }}'
+      - name: attribute_definitions
         value:
-          - AttributeType: '{{ AttributeType }}'
-            AttributeName: '{{ AttributeName }}'
-      - name: BillingMode
-        value: '{{ BillingMode }}'
-      - name: GlobalSecondaryIndexes
+          - attribute_type: '{{ attribute_type }}'
+            attribute_name: '{{ attribute_name }}'
+      - name: billing_mode
+        value: '{{ billing_mode }}'
+      - name: global_secondary_indexes
         value:
-          - IndexName: '{{ IndexName }}'
-            OnDemandThroughput: null
-            ContributorInsightsSpecification: null
-            Projection:
-              NonKeyAttributes:
-                - '{{ NonKeyAttributes[0] }}'
-              ProjectionType: '{{ ProjectionType }}'
-            ProvisionedThroughput: null
-            KeySchema:
-              - KeyType: '{{ KeyType }}'
-                AttributeName: '{{ AttributeName }}'
-            WarmThroughput: null
-      - name: ResourcePolicy
+          - index_name: '{{ index_name }}'
+            on_demand_throughput: null
+            contributor_insights_specification: null
+            projection:
+              non_key_attributes:
+                - '{{ non_key_attributes[0] }}'
+              projection_type: '{{ projection_type }}'
+            provisioned_throughput: null
+            key_schema:
+              - key_type: '{{ key_type }}'
+                attribute_name: '{{ attribute_name }}'
+            warm_throughput: null
+      - name: resource_policy
         value: null
-      - name: KeySchema
+      - name: key_schema
         value: null
-      - name: LocalSecondaryIndexes
+      - name: local_secondary_indexes
         value:
-          - IndexName: '{{ IndexName }}'
-            Projection: null
-            KeySchema:
+          - index_name: '{{ index_name }}'
+            projection: null
+            key_schema:
               - null
-      - name: DeletionProtectionEnabled
-        value: '{{ DeletionProtectionEnabled }}'
-      - name: TableClass
-        value: '{{ TableClass }}'
-      - name: Tags
+      - name: deletion_protection_enabled
+        value: '{{ deletion_protection_enabled }}'
+      - name: table_class
+        value: '{{ table_class }}'
+      - name: tags
         value:
-          - Value: '{{ Value }}'
-            Key: '{{ Key }}'
-      - name: TimeToLiveSpecification
+          - value: '{{ value }}'
+            key: '{{ key }}'
+      - name: time_to_live_specification
         value:
-          Enabled: '{{ Enabled }}'
-          AttributeName: '{{ AttributeName }}'
-
+          enabled: '{{ enabled }}'
+          attribute_name: '{{ attribute_name }}'
 ```
 </TabItem>
 </Tabs>
@@ -781,7 +780,7 @@ SET PatchDocument = string('{{ {
     "TimeToLiveSpecification": time_to_live_specification
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<TableName>';
+AND Identifier = '{{ table_name }}';
 ```
 
 
@@ -790,7 +789,7 @@ AND Identifier = '<TableName>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.dynamodb.tables
-WHERE Identifier = '<TableName>'
+WHERE Identifier = '{{ table_name }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/ec2/capacity_reservation_fleets/index.md b/website/docs/services/ec2/capacity_reservation_fleets/index.md
index b3a4ebabc..dad8d238c 100644
--- a/website/docs/services/ec2/capacity_reservation_fleets/index.md
+++ b/website/docs/services/ec2/capacity_reservation_fleets/index.md
@@ -249,7 +249,7 @@ tenancy,
 remove_end_date,
 no_remove_end_date
 FROM awscc.ec2.capacity_reservation_fleets
-WHERE region = 'us-east-1' AND Identifier = '<CapacityReservationFleetId>';
+WHERE region = 'us-east-1' AND Identifier = '{{ capacity_reservation_fleet_id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -293,16 +293,16 @@ INSERT INTO awscc.ec2.capacity_reservation_fleets (
  NoRemoveEndDate,
  region
 )
-SELECT 
-'{{ AllocationStrategy }}',
- '{{ TagSpecifications }}',
- '{{ InstanceTypeSpecifications }}',
- '{{ TotalTargetCapacity }}',
- '{{ EndDate }}',
- '{{ InstanceMatchCriteria }}',
- '{{ Tenancy }}',
- '{{ RemoveEndDate }}',
- '{{ NoRemoveEndDate }}',
+SELECT
+'{{ allocation_strategy }}',
+ '{{ tag_specifications }}',
+ '{{ instance_type_specifications }}',
+ '{{ total_target_capacity }}',
+ '{{ end_date }}',
+ '{{ instance_match_criteria }}',
+ '{{ tenancy }}',
+ '{{ remove_end_date }}',
+ '{{ no_remove_end_date }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -322,16 +322,16 @@ INSERT INTO awscc.ec2.capacity_reservation_fleets (
  NoRemoveEndDate,
  region
 )
-SELECT 
- '{{ AllocationStrategy }}',
- '{{ TagSpecifications }}',
- '{{ InstanceTypeSpecifications }}',
- '{{ TotalTargetCapacity }}',
- '{{ EndDate }}',
- '{{ InstanceMatchCriteria }}',
- '{{ Tenancy }}',
- '{{ RemoveEndDate }}',
- '{{ NoRemoveEndDate }}',
+SELECT
+ '{{ allocation_strategy }}',
+ '{{ tag_specifications }}',
+ '{{ instance_type_specifications }}',
+ '{{ total_target_capacity }}',
+ '{{ end_date }}',
+ '{{ instance_match_criteria }}',
+ '{{ tenancy }}',
+ '{{ remove_end_date }}',
+ '{{ no_remove_end_date }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -349,36 +349,35 @@ globals:
 resources:
   - name: capacity_reservation_fleet
     props:
-      - name: AllocationStrategy
-        value: '{{ AllocationStrategy }}'
-      - name: TagSpecifications
+      - name: allocation_strategy
+        value: '{{ allocation_strategy }}'
+      - name: tag_specifications
         value:
-          - ResourceType: '{{ ResourceType }}'
-            Tags:
-              - Key: '{{ Key }}'
-                Value: '{{ Value }}'
-      - name: InstanceTypeSpecifications
+          - resource_type: '{{ resource_type }}'
+            tags:
+              - key: '{{ key }}'
+                value: '{{ value }}'
+      - name: instance_type_specifications
         value:
-          - InstanceType: '{{ InstanceType }}'
-            InstancePlatform: '{{ InstancePlatform }}'
-            Weight: null
-            AvailabilityZone: '{{ AvailabilityZone }}'
-            AvailabilityZoneId: '{{ AvailabilityZoneId }}'
-            EbsOptimized: '{{ EbsOptimized }}'
-            Priority: '{{ Priority }}'
-      - name: TotalTargetCapacity
-        value: '{{ TotalTargetCapacity }}'
-      - name: EndDate
-        value: '{{ EndDate }}'
-      - name: InstanceMatchCriteria
-        value: '{{ InstanceMatchCriteria }}'
-      - name: Tenancy
-        value: '{{ Tenancy }}'
-      - name: RemoveEndDate
-        value: '{{ RemoveEndDate }}'
-      - name: NoRemoveEndDate
-        value: '{{ NoRemoveEndDate }}'
-
+          - instance_type: '{{ instance_type }}'
+            instance_platform: '{{ instance_platform }}'
+            weight: null
+            availability_zone: '{{ availability_zone }}'
+            availability_zone_id: '{{ availability_zone_id }}'
+            ebs_optimized: '{{ ebs_optimized }}'
+            priority: '{{ priority }}'
+      - name: total_target_capacity
+        value: '{{ total_target_capacity }}'
+      - name: end_date
+        value: '{{ end_date }}'
+      - name: instance_match_criteria
+        value: '{{ instance_match_criteria }}'
+      - name: tenancy
+        value: '{{ tenancy }}'
+      - name: remove_end_date
+        value: '{{ remove_end_date }}'
+      - name: no_remove_end_date
+        value: '{{ no_remove_end_date }}'
 ```
 </TabItem>
 </Tabs>
@@ -396,7 +395,7 @@ SET PatchDocument = string('{{ {
     "NoRemoveEndDate": no_remove_end_date
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<CapacityReservationFleetId>';
+AND Identifier = '{{ capacity_reservation_fleet_id }}';
 ```
 
 
@@ -405,7 +404,7 @@ AND Identifier = '<CapacityReservationFleetId>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.ec2.capacity_reservation_fleets
-WHERE Identifier = '<CapacityReservationFleetId>'
+WHERE Identifier = '{{ capacity_reservation_fleet_id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/ec2/capacity_reservations/index.md b/website/docs/services/ec2/capacity_reservations/index.md
index 4c13713b9..d1d8d2d99 100644
--- a/website/docs/services/ec2/capacity_reservations/index.md
+++ b/website/docs/services/ec2/capacity_reservations/index.md
@@ -344,7 +344,7 @@ reservation_type,
 capacity_allocation_set,
 commitment_info
 FROM awscc.ec2.capacity_reservations
-WHERE region = 'us-east-1' AND Identifier = '<Id>';
+WHERE region = 'us-east-1' AND Identifier = '{{ id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -382,10 +382,10 @@ INSERT INTO awscc.ec2.capacity_reservations (
  InstanceType,
  region
 )
-SELECT 
-'{{ InstanceCount }}',
- '{{ InstancePlatform }}',
- '{{ InstanceType }}',
+SELECT
+'{{ instance_count }}',
+ '{{ instance_platform }}',
+ '{{ instance_type }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -411,22 +411,22 @@ INSERT INTO awscc.ec2.capacity_reservations (
  AvailabilityZoneId,
  region
 )
-SELECT 
- '{{ Tenancy }}',
- '{{ EndDateType }}',
- '{{ TagSpecifications }}',
- '{{ AvailabilityZone }}',
- '{{ EndDate }}',
- '{{ EbsOptimized }}',
- '{{ OutPostArn }}',
- '{{ InstanceCount }}',
- '{{ PlacementGroupArn }}',
- '{{ InstancePlatform }}',
- '{{ InstanceType }}',
- '{{ EphemeralStorage }}',
- '{{ InstanceMatchCriteria }}',
- '{{ UnusedReservationBillingOwnerId }}',
- '{{ AvailabilityZoneId }}',
+SELECT
+ '{{ tenancy }}',
+ '{{ end_date_type }}',
+ '{{ tag_specifications }}',
+ '{{ availability_zone }}',
+ '{{ end_date }}',
+ '{{ ebs_optimized }}',
+ '{{ out_post_arn }}',
+ '{{ instance_count }}',
+ '{{ placement_group_arn }}',
+ '{{ instance_platform }}',
+ '{{ instance_type }}',
+ '{{ ephemeral_storage }}',
+ '{{ instance_match_criteria }}',
+ '{{ unused_reservation_billing_owner_id }}',
+ '{{ availability_zone_id }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -444,41 +444,40 @@ globals:
 resources:
   - name: capacity_reservation
     props:
-      - name: Tenancy
-        value: '{{ Tenancy }}'
-      - name: EndDateType
-        value: '{{ EndDateType }}'
-      - name: TagSpecifications
+      - name: tenancy
+        value: '{{ tenancy }}'
+      - name: end_date_type
+        value: '{{ end_date_type }}'
+      - name: tag_specifications
         value:
-          - ResourceType: '{{ ResourceType }}'
-            Tags:
-              - Key: '{{ Key }}'
-                Value: '{{ Value }}'
-      - name: AvailabilityZone
-        value: '{{ AvailabilityZone }}'
-      - name: EndDate
-        value: '{{ EndDate }}'
-      - name: EbsOptimized
-        value: '{{ EbsOptimized }}'
-      - name: OutPostArn
-        value: '{{ OutPostArn }}'
-      - name: InstanceCount
-        value: '{{ InstanceCount }}'
-      - name: PlacementGroupArn
-        value: '{{ PlacementGroupArn }}'
-      - name: InstancePlatform
-        value: '{{ InstancePlatform }}'
-      - name: InstanceType
-        value: '{{ InstanceType }}'
-      - name: EphemeralStorage
-        value: '{{ EphemeralStorage }}'
-      - name: InstanceMatchCriteria
-        value: '{{ InstanceMatchCriteria }}'
-      - name: UnusedReservationBillingOwnerId
-        value: '{{ UnusedReservationBillingOwnerId }}'
-      - name: AvailabilityZoneId
-        value: '{{ AvailabilityZoneId }}'
-
+          - resource_type: '{{ resource_type }}'
+            tags:
+              - key: '{{ key }}'
+                value: '{{ value }}'
+      - name: availability_zone
+        value: '{{ availability_zone }}'
+      - name: end_date
+        value: '{{ end_date }}'
+      - name: ebs_optimized
+        value: '{{ ebs_optimized }}'
+      - name: out_post_arn
+        value: '{{ out_post_arn }}'
+      - name: instance_count
+        value: '{{ instance_count }}'
+      - name: placement_group_arn
+        value: '{{ placement_group_arn }}'
+      - name: instance_platform
+        value: '{{ instance_platform }}'
+      - name: instance_type
+        value: '{{ instance_type }}'
+      - name: ephemeral_storage
+        value: '{{ ephemeral_storage }}'
+      - name: instance_match_criteria
+        value: '{{ instance_match_criteria }}'
+      - name: unused_reservation_billing_owner_id
+        value: '{{ unused_reservation_billing_owner_id }}'
+      - name: availability_zone_id
+        value: '{{ availability_zone_id }}'
 ```
 </TabItem>
 </Tabs>
@@ -498,7 +497,7 @@ SET PatchDocument = string('{{ {
     "UnusedReservationBillingOwnerId": unused_reservation_billing_owner_id
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Id>';
+AND Identifier = '{{ id }}';
 ```
 
 
@@ -507,7 +506,7 @@ AND Identifier = '<Id>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.ec2.capacity_reservations
-WHERE Identifier = '<Id>'
+WHERE Identifier = '{{ id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/ec2/carrier_gateways/index.md b/website/docs/services/ec2/carrier_gateways/index.md
index a5ffd284a..289cffcc4 100644
--- a/website/docs/services/ec2/carrier_gateways/index.md
+++ b/website/docs/services/ec2/carrier_gateways/index.md
@@ -170,7 +170,7 @@ vpc_id,
 owner_id,
 tags
 FROM awscc.ec2.carrier_gateways
-WHERE region = 'us-east-1' AND Identifier = '<CarrierGatewayId>';
+WHERE region = 'us-east-1' AND Identifier = '{{ carrier_gateway_id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -206,8 +206,8 @@ INSERT INTO awscc.ec2.carrier_gateways (
  VpcId,
  region
 )
-SELECT 
-'{{ VpcId }}',
+SELECT
+'{{ vpc_id }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -220,9 +220,9 @@ INSERT INTO awscc.ec2.carrier_gateways (
  Tags,
  region
 )
-SELECT 
- '{{ VpcId }}',
- '{{ Tags }}',
+SELECT
+ '{{ vpc_id }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -240,13 +240,12 @@ globals:
 resources:
   - name: carrier_gateway
     props:
-      - name: VpcId
-        value: '{{ VpcId }}'
-      - name: Tags
+      - name: vpc_id
+        value: '{{ vpc_id }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -262,7 +261,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<CarrierGatewayId>';
+AND Identifier = '{{ carrier_gateway_id }}';
 ```
 
 
@@ -271,7 +270,7 @@ AND Identifier = '<CarrierGatewayId>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.ec2.carrier_gateways
-WHERE Identifier = '<CarrierGatewayId>'
+WHERE Identifier = '{{ carrier_gateway_id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/ec2/customer_gateways/index.md b/website/docs/services/ec2/customer_gateways/index.md
index 2d98edaa2..694646f1a 100644
--- a/website/docs/services/ec2/customer_gateways/index.md
+++ b/website/docs/services/ec2/customer_gateways/index.md
@@ -188,7 +188,7 @@ tags,
 certificate_arn,
 device_name
 FROM awscc.ec2.customer_gateways
-WHERE region = 'us-east-1' AND Identifier = '<CustomerGatewayId>';
+WHERE region = 'us-east-1' AND Identifier = '{{ customer_gateway_id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -225,9 +225,9 @@ INSERT INTO awscc.ec2.customer_gateways (
  IpAddress,
  region
 )
-SELECT 
-'{{ Type }}',
- '{{ IpAddress }}',
+SELECT
+'{{ type }}',
+ '{{ ip_address }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -245,14 +245,14 @@ INSERT INTO awscc.ec2.customer_gateways (
  DeviceName,
  region
 )
-SELECT 
- '{{ Type }}',
- '{{ IpAddress }}',
- '{{ BgpAsnExtended }}',
- '{{ BgpAsn }}',
- '{{ Tags }}',
- '{{ CertificateArn }}',
- '{{ DeviceName }}',
+SELECT
+ '{{ type }}',
+ '{{ ip_address }}',
+ '{{ bgp_asn_extended }}',
+ '{{ bgp_asn }}',
+ '{{ tags }}',
+ '{{ certificate_arn }}',
+ '{{ device_name }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -270,23 +270,22 @@ globals:
 resources:
   - name: customer_gateway
     props:
-      - name: Type
-        value: '{{ Type }}'
-      - name: IpAddress
-        value: '{{ IpAddress }}'
-      - name: BgpAsnExtended
+      - name: type
+        value: '{{ type }}'
+      - name: ip_address
+        value: '{{ ip_address }}'
+      - name: bgp_asn_extended
         value: null
-      - name: BgpAsn
-        value: '{{ BgpAsn }}'
-      - name: Tags
+      - name: bgp_asn
+        value: '{{ bgp_asn }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-      - name: CertificateArn
-        value: '{{ CertificateArn }}'
-      - name: DeviceName
-        value: '{{ DeviceName }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
+      - name: certificate_arn
+        value: '{{ certificate_arn }}'
+      - name: device_name
+        value: '{{ device_name }}'
 ```
 </TabItem>
 </Tabs>
@@ -302,7 +301,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<CustomerGatewayId>';
+AND Identifier = '{{ customer_gateway_id }}';
 ```
 
 
@@ -311,7 +310,7 @@ AND Identifier = '<CustomerGatewayId>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.ec2.customer_gateways
-WHERE Identifier = '<CustomerGatewayId>'
+WHERE Identifier = '{{ customer_gateway_id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/ec2/dhcp_options/index.md b/website/docs/services/ec2/dhcp_options/index.md
index 2700d9d4f..fdecccfbe 100644
--- a/website/docs/services/ec2/dhcp_options/index.md
+++ b/website/docs/services/ec2/dhcp_options/index.md
@@ -188,7 +188,7 @@ ntp_servers,
 ipv6_address_preferred_lease_time,
 tags
 FROM awscc.ec2.dhcp_options
-WHERE region = 'us-east-1' AND Identifier = '<DhcpOptionsId>';
+WHERE region = 'us-east-1' AND Identifier = '{{ dhcp_options_id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -230,14 +230,14 @@ INSERT INTO awscc.ec2.dhcp_options (
  Tags,
  region
 )
-SELECT 
-'{{ DomainName }}',
- '{{ DomainNameServers }}',
- '{{ NetbiosNameServers }}',
- '{{ NetbiosNodeType }}',
- '{{ NtpServers }}',
- '{{ Ipv6AddressPreferredLeaseTime }}',
- '{{ Tags }}',
+SELECT
+'{{ domain_name }}',
+ '{{ domain_name_servers }}',
+ '{{ netbios_name_servers }}',
+ '{{ netbios_node_type }}',
+ '{{ ntp_servers }}',
+ '{{ ipv6_address_preferred_lease_time }}',
+ '{{ tags }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -255,14 +255,14 @@ INSERT INTO awscc.ec2.dhcp_options (
  Tags,
  region
 )
-SELECT 
- '{{ DomainName }}',
- '{{ DomainNameServers }}',
- '{{ NetbiosNameServers }}',
- '{{ NetbiosNodeType }}',
- '{{ NtpServers }}',
- '{{ Ipv6AddressPreferredLeaseTime }}',
- '{{ Tags }}',
+SELECT
+ '{{ domain_name }}',
+ '{{ domain_name_servers }}',
+ '{{ netbios_name_servers }}',
+ '{{ netbios_node_type }}',
+ '{{ ntp_servers }}',
+ '{{ ipv6_address_preferred_lease_time }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -280,26 +280,25 @@ globals:
 resources:
   - name: dhcp_option
     props:
-      - name: DomainName
-        value: '{{ DomainName }}'
-      - name: DomainNameServers
+      - name: domain_name
+        value: '{{ domain_name }}'
+      - name: domain_name_servers
         value:
-          - '{{ DomainNameServers[0] }}'
-      - name: NetbiosNameServers
+          - '{{ domain_name_servers[0] }}'
+      - name: netbios_name_servers
         value:
-          - '{{ NetbiosNameServers[0] }}'
-      - name: NetbiosNodeType
-        value: '{{ NetbiosNodeType }}'
-      - name: NtpServers
+          - '{{ netbios_name_servers[0] }}'
+      - name: netbios_node_type
+        value: '{{ netbios_node_type }}'
+      - name: ntp_servers
         value:
-          - '{{ NtpServers[0] }}'
-      - name: Ipv6AddressPreferredLeaseTime
-        value: '{{ Ipv6AddressPreferredLeaseTime }}'
-      - name: Tags
+          - '{{ ntp_servers[0] }}'
+      - name: ipv6_address_preferred_lease_time
+        value: '{{ ipv6_address_preferred_lease_time }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -315,7 +314,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<DhcpOptionsId>';
+AND Identifier = '{{ dhcp_options_id }}';
 ```
 
 
@@ -324,7 +323,7 @@ AND Identifier = '<DhcpOptionsId>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.ec2.dhcp_options
-WHERE Identifier = '<DhcpOptionsId>'
+WHERE Identifier = '{{ dhcp_options_id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/ec2/ec2fleets/index.md b/website/docs/services/ec2/ec2fleets/index.md
index be5de8c13..f041ce18e 100644
--- a/website/docs/services/ec2/ec2fleets/index.md
+++ b/website/docs/services/ec2/ec2fleets/index.md
@@ -629,7 +629,7 @@ terminate_instances_with_expiration,
 valid_until,
 context
 FROM awscc.ec2.ec2fleets
-WHERE region = 'us-east-1' AND Identifier = '<FleetId>';
+WHERE region = 'us-east-1' AND Identifier = '{{ fleet_id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -666,9 +666,9 @@ INSERT INTO awscc.ec2.ec2fleets (
  LaunchTemplateConfigs,
  region
 )
-SELECT 
-'{{ TargetCapacitySpecification }}',
- '{{ LaunchTemplateConfigs }}',
+SELECT
+'{{ target_capacity_specification }}',
+ '{{ launch_template_configs }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -691,19 +691,19 @@ INSERT INTO awscc.ec2.ec2fleets (
  Context,
  region
 )
-SELECT 
- '{{ TargetCapacitySpecification }}',
- '{{ OnDemandOptions }}',
- '{{ Type }}',
- '{{ ExcessCapacityTerminationPolicy }}',
- '{{ TagSpecifications }}',
- '{{ SpotOptions }}',
- '{{ ValidFrom }}',
- '{{ ReplaceUnhealthyInstances }}',
- '{{ LaunchTemplateConfigs }}',
- '{{ TerminateInstancesWithExpiration }}',
- '{{ ValidUntil }}',
- '{{ Context }}',
+SELECT
+ '{{ target_capacity_specification }}',
+ '{{ on_demand_options }}',
+ '{{ type }}',
+ '{{ excess_capacity_termination_policy }}',
+ '{{ tag_specifications }}',
+ '{{ spot_options }}',
+ '{{ valid_from }}',
+ '{{ replace_unhealthy_instances }}',
+ '{{ launch_template_configs }}',
+ '{{ terminate_instances_with_expiration }}',
+ '{{ valid_until }}',
+ '{{ context }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -721,145 +721,144 @@ globals:
 resources:
   - name: ec2fleet
     props:
-      - name: TargetCapacitySpecification
+      - name: target_capacity_specification
         value:
-          DefaultTargetCapacityType: '{{ DefaultTargetCapacityType }}'
-          TargetCapacityUnitType: '{{ TargetCapacityUnitType }}'
-          TotalTargetCapacity: '{{ TotalTargetCapacity }}'
-          OnDemandTargetCapacity: '{{ OnDemandTargetCapacity }}'
-          SpotTargetCapacity: '{{ SpotTargetCapacity }}'
-      - name: OnDemandOptions
+          default_target_capacity_type: '{{ default_target_capacity_type }}'
+          target_capacity_unit_type: '{{ target_capacity_unit_type }}'
+          total_target_capacity: '{{ total_target_capacity }}'
+          on_demand_target_capacity: '{{ on_demand_target_capacity }}'
+          spot_target_capacity: '{{ spot_target_capacity }}'
+      - name: on_demand_options
         value:
-          SingleAvailabilityZone: '{{ SingleAvailabilityZone }}'
-          AllocationStrategy: '{{ AllocationStrategy }}'
-          SingleInstanceType: '{{ SingleInstanceType }}'
-          MinTargetCapacity: '{{ MinTargetCapacity }}'
-          MaxTotalPrice: '{{ MaxTotalPrice }}'
-          CapacityReservationOptions:
-            UsageStrategy: '{{ UsageStrategy }}'
-      - name: Type
-        value: '{{ Type }}'
-      - name: ExcessCapacityTerminationPolicy
-        value: '{{ ExcessCapacityTerminationPolicy }}'
-      - name: TagSpecifications
+          single_availability_zone: '{{ single_availability_zone }}'
+          allocation_strategy: '{{ allocation_strategy }}'
+          single_instance_type: '{{ single_instance_type }}'
+          min_target_capacity: '{{ min_target_capacity }}'
+          max_total_price: '{{ max_total_price }}'
+          capacity_reservation_options:
+            usage_strategy: '{{ usage_strategy }}'
+      - name: type
+        value: '{{ type }}'
+      - name: excess_capacity_termination_policy
+        value: '{{ excess_capacity_termination_policy }}'
+      - name: tag_specifications
         value:
-          - ResourceType: '{{ ResourceType }}'
-            Tags:
-              - Key: '{{ Key }}'
-                Value: '{{ Value }}'
-      - name: SpotOptions
+          - resource_type: '{{ resource_type }}'
+            tags:
+              - key: '{{ key }}'
+                value: '{{ value }}'
+      - name: spot_options
         value:
-          MaintenanceStrategies:
-            CapacityRebalance:
-              ReplacementStrategy: '{{ ReplacementStrategy }}'
-              TerminationDelay: '{{ TerminationDelay }}'
-          SingleAvailabilityZone: '{{ SingleAvailabilityZone }}'
-          AllocationStrategy: '{{ AllocationStrategy }}'
-          SingleInstanceType: '{{ SingleInstanceType }}'
-          MinTargetCapacity: '{{ MinTargetCapacity }}'
-          MaxTotalPrice: '{{ MaxTotalPrice }}'
-          InstanceInterruptionBehavior: '{{ InstanceInterruptionBehavior }}'
-          InstancePoolsToUseCount: '{{ InstancePoolsToUseCount }}'
-      - name: ValidFrom
-        value: '{{ ValidFrom }}'
-      - name: ReplaceUnhealthyInstances
-        value: '{{ ReplaceUnhealthyInstances }}'
-      - name: LaunchTemplateConfigs
+          maintenance_strategies:
+            capacity_rebalance:
+              replacement_strategy: '{{ replacement_strategy }}'
+              termination_delay: '{{ termination_delay }}'
+          single_availability_zone: '{{ single_availability_zone }}'
+          allocation_strategy: '{{ allocation_strategy }}'
+          single_instance_type: '{{ single_instance_type }}'
+          min_target_capacity: '{{ min_target_capacity }}'
+          max_total_price: '{{ max_total_price }}'
+          instance_interruption_behavior: '{{ instance_interruption_behavior }}'
+          instance_pools_to_use_count: '{{ instance_pools_to_use_count }}'
+      - name: valid_from
+        value: '{{ valid_from }}'
+      - name: replace_unhealthy_instances
+        value: '{{ replace_unhealthy_instances }}'
+      - name: launch_template_configs
         value:
-          - LaunchTemplateSpecification:
-              LaunchTemplateName: '{{ LaunchTemplateName }}'
-              LaunchTemplateId: '{{ LaunchTemplateId }}'
-              Version: '{{ Version }}'
-            Overrides:
-              - WeightedCapacity: null
-                Placement:
-                  GroupName: '{{ GroupName }}'
-                  Tenancy: '{{ Tenancy }}'
-                  SpreadDomain: '{{ SpreadDomain }}'
-                  PartitionNumber: '{{ PartitionNumber }}'
-                  AvailabilityZone: '{{ AvailabilityZone }}'
-                  Affinity: '{{ Affinity }}'
-                  HostId: '{{ HostId }}'
-                  HostResourceGroupArn: '{{ HostResourceGroupArn }}'
-                  GroupId: '{{ GroupId }}'
-                Priority: null
-                AvailabilityZone: '{{ AvailabilityZone }}'
-                SubnetId: '{{ SubnetId }}'
-                InstanceType: '{{ InstanceType }}'
-                InstanceRequirements:
-                  VCpuCount:
-                    Min: '{{ Min }}'
-                    Max: '{{ Max }}'
-                  MemoryMiB:
-                    Min: '{{ Min }}'
-                    Max: '{{ Max }}'
-                  CpuManufacturers:
-                    - '{{ CpuManufacturers[0] }}'
-                  MemoryGiBPerVCpu:
-                    Min: null
-                    Max: null
-                  AllowedInstanceTypes:
-                    - '{{ AllowedInstanceTypes[0] }}'
-                  ExcludedInstanceTypes:
-                    - '{{ ExcludedInstanceTypes[0] }}'
-                  InstanceGenerations:
-                    - '{{ InstanceGenerations[0] }}'
-                  SpotMaxPricePercentageOverLowestPrice: '{{ SpotMaxPricePercentageOverLowestPrice }}'
-                  OnDemandMaxPricePercentageOverLowestPrice: '{{ OnDemandMaxPricePercentageOverLowestPrice }}'
-                  MaxSpotPriceAsPercentageOfOptimalOnDemandPrice: '{{ MaxSpotPriceAsPercentageOfOptimalOnDemandPrice }}'
-                  BareMetal: '{{ BareMetal }}'
-                  BurstablePerformance: '{{ BurstablePerformance }}'
-                  RequireHibernateSupport: '{{ RequireHibernateSupport }}'
-                  NetworkBandwidthGbps:
-                    Min: null
-                    Max: null
-                  NetworkInterfaceCount:
-                    Min: '{{ Min }}'
-                    Max: '{{ Max }}'
-                  LocalStorage: '{{ LocalStorage }}'
-                  LocalStorageTypes:
-                    - '{{ LocalStorageTypes[0] }}'
-                  TotalLocalStorageGB:
-                    Min: null
-                    Max: null
-                  BaselineEbsBandwidthMbps:
-                    Min: '{{ Min }}'
-                    Max: '{{ Max }}'
-                  AcceleratorTypes:
-                    - '{{ AcceleratorTypes[0] }}'
-                  AcceleratorCount:
-                    Min: '{{ Min }}'
-                    Max: '{{ Max }}'
-                  AcceleratorManufacturers:
-                    - '{{ AcceleratorManufacturers[0] }}'
-                  AcceleratorNames:
-                    - '{{ AcceleratorNames[0] }}'
-                  AcceleratorTotalMemoryMiB:
-                    Min: '{{ Min }}'
-                    Max: '{{ Max }}'
-                  BaselinePerformanceFactors:
-                    Cpu:
-                      References:
-                        - InstanceFamily: '{{ InstanceFamily }}'
-                MaxPrice: '{{ MaxPrice }}'
-                BlockDeviceMappings:
-                  - DeviceName: '{{ DeviceName }}'
-                    Ebs:
-                      DeleteOnTermination: '{{ DeleteOnTermination }}'
-                      Encrypted: '{{ Encrypted }}'
-                      Iops: '{{ Iops }}'
-                      SnapshotId: '{{ SnapshotId }}'
-                      VolumeSize: '{{ VolumeSize }}'
-                      VolumeType: '{{ VolumeType }}'
-                    NoDevice: '{{ NoDevice }}'
-                    VirtualName: '{{ VirtualName }}'
-      - name: TerminateInstancesWithExpiration
-        value: '{{ TerminateInstancesWithExpiration }}'
-      - name: ValidUntil
-        value: '{{ ValidUntil }}'
-      - name: Context
-        value: '{{ Context }}'
-
+          - launch_template_specification:
+              launch_template_name: '{{ launch_template_name }}'
+              launch_template_id: '{{ launch_template_id }}'
+              version: '{{ version }}'
+            overrides:
+              - weighted_capacity: null
+                placement:
+                  group_name: '{{ group_name }}'
+                  tenancy: '{{ tenancy }}'
+                  spread_domain: '{{ spread_domain }}'
+                  partition_number: '{{ partition_number }}'
+                  availability_zone: '{{ availability_zone }}'
+                  affinity: '{{ affinity }}'
+                  host_id: '{{ host_id }}'
+                  host_resource_group_arn: '{{ host_resource_group_arn }}'
+                  group_id: '{{ group_id }}'
+                priority: null
+                availability_zone: '{{ availability_zone }}'
+                subnet_id: '{{ subnet_id }}'
+                instance_type: '{{ instance_type }}'
+                instance_requirements:
+                  v_cpu_count:
+                    min: '{{ min }}'
+                    max: '{{ max }}'
+                  memory_mi_b:
+                    min: '{{ min }}'
+                    max: '{{ max }}'
+                  cpu_manufacturers:
+                    - '{{ cpu_manufacturers[0] }}'
+                  memory_gi_bper_vcpu:
+                    min: null
+                    max: null
+                  allowed_instance_types:
+                    - '{{ allowed_instance_types[0] }}'
+                  excluded_instance_types:
+                    - '{{ excluded_instance_types[0] }}'
+                  instance_generations:
+                    - '{{ instance_generations[0] }}'
+                  spot_max_price_percentage_over_lowest_price: '{{ spot_max_price_percentage_over_lowest_price }}'
+                  on_demand_max_price_percentage_over_lowest_price: '{{ on_demand_max_price_percentage_over_lowest_price }}'
+                  max_spot_price_as_percentage_of_optimal_on_demand_price: '{{ max_spot_price_as_percentage_of_optimal_on_demand_price }}'
+                  bare_metal: '{{ bare_metal }}'
+                  burstable_performance: '{{ burstable_performance }}'
+                  require_hibernate_support: '{{ require_hibernate_support }}'
+                  network_bandwidth_gbps:
+                    min: null
+                    max: null
+                  network_interface_count:
+                    min: '{{ min }}'
+                    max: '{{ max }}'
+                  local_storage: '{{ local_storage }}'
+                  local_storage_types:
+                    - '{{ local_storage_types[0] }}'
+                  total_local_storage_gb:
+                    min: null
+                    max: null
+                  baseline_ebs_bandwidth_mbps:
+                    min: '{{ min }}'
+                    max: '{{ max }}'
+                  accelerator_types:
+                    - '{{ accelerator_types[0] }}'
+                  accelerator_count:
+                    min: '{{ min }}'
+                    max: '{{ max }}'
+                  accelerator_manufacturers:
+                    - '{{ accelerator_manufacturers[0] }}'
+                  accelerator_names:
+                    - '{{ accelerator_names[0] }}'
+                  accelerator_total_memory_mi_b:
+                    min: '{{ min }}'
+                    max: '{{ max }}'
+                  baseline_performance_factors:
+                    cpu:
+                      references:
+                        - instance_family: '{{ instance_family }}'
+                max_price: '{{ max_price }}'
+                block_device_mappings:
+                  - device_name: '{{ device_name }}'
+                    ebs:
+                      delete_on_termination: '{{ delete_on_termination }}'
+                      encrypted: '{{ encrypted }}'
+                      iops: '{{ iops }}'
+                      snapshot_id: '{{ snapshot_id }}'
+                      volume_size: '{{ volume_size }}'
+                      volume_type: '{{ volume_type }}'
+                    no_device: '{{ no_device }}'
+                    virtual_name: '{{ virtual_name }}'
+      - name: terminate_instances_with_expiration
+        value: '{{ terminate_instances_with_expiration }}'
+      - name: valid_until
+        value: '{{ valid_until }}'
+      - name: context
+        value: '{{ context }}'
 ```
 </TabItem>
 </Tabs>
@@ -877,7 +876,7 @@ SET PatchDocument = string('{{ {
     "Context": context
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<FleetId>';
+AND Identifier = '{{ fleet_id }}';
 ```
 
 
@@ -886,7 +885,7 @@ AND Identifier = '<FleetId>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.ec2.ec2fleets
-WHERE Identifier = '<FleetId>'
+WHERE Identifier = '{{ fleet_id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/ec2/egress_only_internet_gateways/index.md b/website/docs/services/ec2/egress_only_internet_gateways/index.md
index df88e38a0..80ff314d1 100644
--- a/website/docs/services/ec2/egress_only_internet_gateways/index.md
+++ b/website/docs/services/ec2/egress_only_internet_gateways/index.md
@@ -158,7 +158,7 @@ id,
 vpc_id,
 tags
 FROM awscc.ec2.egress_only_internet_gateways
-WHERE region = 'us-east-1' AND Identifier = '<Id>';
+WHERE region = 'us-east-1' AND Identifier = '{{ id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -194,8 +194,8 @@ INSERT INTO awscc.ec2.egress_only_internet_gateways (
  VpcId,
  region
 )
-SELECT 
-'{{ VpcId }}',
+SELECT
+'{{ vpc_id }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -208,9 +208,9 @@ INSERT INTO awscc.ec2.egress_only_internet_gateways (
  Tags,
  region
 )
-SELECT 
- '{{ VpcId }}',
- '{{ Tags }}',
+SELECT
+ '{{ vpc_id }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -228,13 +228,12 @@ globals:
 resources:
   - name: egress_only_internet_gateway
     props:
-      - name: VpcId
-        value: '{{ VpcId }}'
-      - name: Tags
+      - name: vpc_id
+        value: '{{ vpc_id }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -250,7 +249,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Id>';
+AND Identifier = '{{ id }}';
 ```
 
 
@@ -259,7 +258,7 @@ AND Identifier = '<Id>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.ec2.egress_only_internet_gateways
-WHERE Identifier = '<Id>'
+WHERE Identifier = '{{ id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/ec2/eip_associations/index.md b/website/docs/services/ec2/eip_associations/index.md
index 5d15635f1..fab7deb56 100644
--- a/website/docs/services/ec2/eip_associations/index.md
+++ b/website/docs/services/ec2/eip_associations/index.md
@@ -158,7 +158,7 @@ id,
 network_interface_id,
 e_ip
 FROM awscc.ec2.eip_associations
-WHERE region = 'us-east-1' AND Identifier = '<Id>';
+WHERE region = 'us-east-1' AND Identifier = '{{ id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -198,12 +198,12 @@ INSERT INTO awscc.ec2.eip_associations (
  EIP,
  region
 )
-SELECT 
-'{{ PrivateIpAddress }}',
- '{{ InstanceId }}',
- '{{ AllocationId }}',
- '{{ NetworkInterfaceId }}',
- '{{ EIP }}',
+SELECT
+'{{ private_ip_address }}',
+ '{{ instance_id }}',
+ '{{ allocation_id }}',
+ '{{ network_interface_id }}',
+ '{{ e_ip }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -219,12 +219,12 @@ INSERT INTO awscc.ec2.eip_associations (
  EIP,
  region
 )
-SELECT 
- '{{ PrivateIpAddress }}',
- '{{ InstanceId }}',
- '{{ AllocationId }}',
- '{{ NetworkInterfaceId }}',
- '{{ EIP }}',
+SELECT
+ '{{ private_ip_address }}',
+ '{{ instance_id }}',
+ '{{ allocation_id }}',
+ '{{ network_interface_id }}',
+ '{{ e_ip }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -242,17 +242,16 @@ globals:
 resources:
   - name: eip_association
     props:
-      - name: PrivateIpAddress
-        value: '{{ PrivateIpAddress }}'
-      - name: InstanceId
-        value: '{{ InstanceId }}'
-      - name: AllocationId
-        value: '{{ AllocationId }}'
-      - name: NetworkInterfaceId
-        value: '{{ NetworkInterfaceId }}'
-      - name: EIP
-        value: '{{ EIP }}'
-
+      - name: private_ip_address
+        value: '{{ private_ip_address }}'
+      - name: instance_id
+        value: '{{ instance_id }}'
+      - name: allocation_id
+        value: '{{ allocation_id }}'
+      - name: network_interface_id
+        value: '{{ network_interface_id }}'
+      - name: e_ip
+        value: '{{ e_ip }}'
 ```
 </TabItem>
 </Tabs>
@@ -263,7 +262,7 @@ resources:
 ```sql
 /*+ delete */
 DELETE FROM awscc.ec2.eip_associations
-WHERE Identifier = '<Id>'
+WHERE Identifier = '{{ id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/ec2/eips/index.md b/website/docs/services/ec2/eips/index.md
index 01cd3a3e4..7de81b388 100644
--- a/website/docs/services/ec2/eips/index.md
+++ b/website/docs/services/ec2/eips/index.md
@@ -205,7 +205,7 @@ ipam_pool_id,
 address,
 tags
 FROM awscc.ec2.eips
-WHERE region = 'us-east-1' AND Identifier = '<PublicIp>|<AllocationId>';
+WHERE region = 'us-east-1' AND Identifier = '{{ public_ip }}|{{ allocation_id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -249,15 +249,15 @@ INSERT INTO awscc.ec2.eips (
  Tags,
  region
 )
-SELECT 
-'{{ Domain }}',
- '{{ NetworkBorderGroup }}',
- '{{ TransferAddress }}',
- '{{ InstanceId }}',
- '{{ PublicIpv4Pool }}',
- '{{ IpamPoolId }}',
- '{{ Address }}',
- '{{ Tags }}',
+SELECT
+'{{ domain }}',
+ '{{ network_border_group }}',
+ '{{ transfer_address }}',
+ '{{ instance_id }}',
+ '{{ public_ipv4_pool }}',
+ '{{ ipam_pool_id }}',
+ '{{ address }}',
+ '{{ tags }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -276,15 +276,15 @@ INSERT INTO awscc.ec2.eips (
  Tags,
  region
 )
-SELECT 
- '{{ Domain }}',
- '{{ NetworkBorderGroup }}',
- '{{ TransferAddress }}',
- '{{ InstanceId }}',
- '{{ PublicIpv4Pool }}',
- '{{ IpamPoolId }}',
- '{{ Address }}',
- '{{ Tags }}',
+SELECT
+ '{{ domain }}',
+ '{{ network_border_group }}',
+ '{{ transfer_address }}',
+ '{{ instance_id }}',
+ '{{ public_ipv4_pool }}',
+ '{{ ipam_pool_id }}',
+ '{{ address }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -302,25 +302,24 @@ globals:
 resources:
   - name: eip
     props:
-      - name: Domain
-        value: '{{ Domain }}'
-      - name: NetworkBorderGroup
-        value: '{{ NetworkBorderGroup }}'
-      - name: TransferAddress
-        value: '{{ TransferAddress }}'
-      - name: InstanceId
-        value: '{{ InstanceId }}'
-      - name: PublicIpv4Pool
-        value: '{{ PublicIpv4Pool }}'
-      - name: IpamPoolId
-        value: '{{ IpamPoolId }}'
-      - name: Address
-        value: '{{ Address }}'
-      - name: Tags
+      - name: domain
+        value: '{{ domain }}'
+      - name: network_border_group
+        value: '{{ network_border_group }}'
+      - name: transfer_address
+        value: '{{ transfer_address }}'
+      - name: instance_id
+        value: '{{ instance_id }}'
+      - name: public_ipv4_pool
+        value: '{{ public_ipv4_pool }}'
+      - name: ipam_pool_id
+        value: '{{ ipam_pool_id }}'
+      - name: address
+        value: '{{ address }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -339,7 +338,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<PublicIp>|<AllocationId>';
+AND Identifier = '{{ public_ip }}|{{ allocation_id }}';
 ```
 
 
@@ -348,7 +347,7 @@ AND Identifier = '<PublicIp>|<AllocationId>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.ec2.eips
-WHERE Identifier = '<PublicIp|AllocationId>'
+WHERE Identifier = '{{ public_ip }}|{{ allocation_id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/ec2/enclave_certificate_iam_role_associations/index.md b/website/docs/services/ec2/enclave_certificate_iam_role_associations/index.md
index 31c9a30d9..cdd503e6f 100644
--- a/website/docs/services/ec2/enclave_certificate_iam_role_associations/index.md
+++ b/website/docs/services/ec2/enclave_certificate_iam_role_associations/index.md
@@ -157,7 +157,7 @@ certificate_s3_bucket_name,
 certificate_s3_object_key,
 encryption_kms_key_id
 FROM awscc.ec2.enclave_certificate_iam_role_associations
-WHERE region = 'us-east-1' AND Identifier = '<CertificateArn>|<RoleArn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ certificate_arn }}|{{ role_arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -195,9 +195,9 @@ INSERT INTO awscc.ec2.enclave_certificate_iam_role_associations (
  RoleArn,
  region
 )
-SELECT 
-'{{ CertificateArn }}',
- '{{ RoleArn }}',
+SELECT
+'{{ certificate_arn }}',
+ '{{ role_arn }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -210,9 +210,9 @@ INSERT INTO awscc.ec2.enclave_certificate_iam_role_associations (
  RoleArn,
  region
 )
-SELECT 
- '{{ CertificateArn }}',
- '{{ RoleArn }}',
+SELECT
+ '{{ certificate_arn }}',
+ '{{ role_arn }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -230,11 +230,10 @@ globals:
 resources:
   - name: enclave_certificate_iam_role_association
     props:
-      - name: CertificateArn
-        value: '{{ CertificateArn }}'
-      - name: RoleArn
-        value: '{{ RoleArn }}'
-
+      - name: certificate_arn
+        value: '{{ certificate_arn }}'
+      - name: role_arn
+        value: '{{ role_arn }}'
 ```
 </TabItem>
 </Tabs>
@@ -245,7 +244,7 @@ resources:
 ```sql
 /*+ delete */
 DELETE FROM awscc.ec2.enclave_certificate_iam_role_associations
-WHERE Identifier = '<CertificateArn|RoleArn>'
+WHERE Identifier = '{{ certificate_arn }}|{{ role_arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/ec2/flow_logs/index.md b/website/docs/services/ec2/flow_logs/index.md
index 266c2b108..eca3ad572 100644
--- a/website/docs/services/ec2/flow_logs/index.md
+++ b/website/docs/services/ec2/flow_logs/index.md
@@ -235,7 +235,7 @@ tags,
 traffic_type,
 destination_options
 FROM awscc.ec2.flow_logs
-WHERE region = 'us-east-1' AND Identifier = '<Id>';
+WHERE region = 'us-east-1' AND Identifier = '{{ id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -272,9 +272,9 @@ INSERT INTO awscc.ec2.flow_logs (
  ResourceType,
  region
 )
-SELECT 
-'{{ ResourceId }}',
- '{{ ResourceType }}',
+SELECT
+'{{ resource_id }}',
+ '{{ resource_type }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -297,19 +297,19 @@ INSERT INTO awscc.ec2.flow_logs (
  DestinationOptions,
  region
 )
-SELECT 
- '{{ DeliverCrossAccountRole }}',
- '{{ DeliverLogsPermissionArn }}',
- '{{ LogDestination }}',
- '{{ LogDestinationType }}',
- '{{ LogFormat }}',
- '{{ LogGroupName }}',
- '{{ MaxAggregationInterval }}',
- '{{ ResourceId }}',
- '{{ ResourceType }}',
- '{{ Tags }}',
- '{{ TrafficType }}',
- '{{ DestinationOptions }}',
+SELECT
+ '{{ deliver_cross_account_role }}',
+ '{{ deliver_logs_permission_arn }}',
+ '{{ log_destination }}',
+ '{{ log_destination_type }}',
+ '{{ log_format }}',
+ '{{ log_group_name }}',
+ '{{ max_aggregation_interval }}',
+ '{{ resource_id }}',
+ '{{ resource_type }}',
+ '{{ tags }}',
+ '{{ traffic_type }}',
+ '{{ destination_options }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -327,36 +327,35 @@ globals:
 resources:
   - name: flow_log
     props:
-      - name: DeliverCrossAccountRole
-        value: '{{ DeliverCrossAccountRole }}'
-      - name: DeliverLogsPermissionArn
-        value: '{{ DeliverLogsPermissionArn }}'
-      - name: LogDestination
-        value: '{{ LogDestination }}'
-      - name: LogDestinationType
-        value: '{{ LogDestinationType }}'
-      - name: LogFormat
-        value: '{{ LogFormat }}'
-      - name: LogGroupName
-        value: '{{ LogGroupName }}'
-      - name: MaxAggregationInterval
-        value: '{{ MaxAggregationInterval }}'
-      - name: ResourceId
-        value: '{{ ResourceId }}'
-      - name: ResourceType
-        value: '{{ ResourceType }}'
-      - name: Tags
+      - name: deliver_cross_account_role
+        value: '{{ deliver_cross_account_role }}'
+      - name: deliver_logs_permission_arn
+        value: '{{ deliver_logs_permission_arn }}'
+      - name: log_destination
+        value: '{{ log_destination }}'
+      - name: log_destination_type
+        value: '{{ log_destination_type }}'
+      - name: log_format
+        value: '{{ log_format }}'
+      - name: log_group_name
+        value: '{{ log_group_name }}'
+      - name: max_aggregation_interval
+        value: '{{ max_aggregation_interval }}'
+      - name: resource_id
+        value: '{{ resource_id }}'
+      - name: resource_type
+        value: '{{ resource_type }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-      - name: TrafficType
-        value: '{{ TrafficType }}'
-      - name: DestinationOptions
+          - key: '{{ key }}'
+            value: '{{ value }}'
+      - name: traffic_type
+        value: '{{ traffic_type }}'
+      - name: destination_options
         value:
-          FileFormat: '{{ FileFormat }}'
-          HiveCompatiblePartitions: '{{ HiveCompatiblePartitions }}'
-          PerHourPartition: '{{ PerHourPartition }}'
-
+          file_format: '{{ file_format }}'
+          hive_compatible_partitions: '{{ hive_compatible_partitions }}'
+          per_hour_partition: '{{ per_hour_partition }}'
 ```
 </TabItem>
 </Tabs>
@@ -372,7 +371,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Id>';
+AND Identifier = '{{ id }}';
 ```
 
 
@@ -381,7 +380,7 @@ AND Identifier = '<Id>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.ec2.flow_logs
-WHERE Identifier = '<Id>'
+WHERE Identifier = '{{ id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/ec2/gateway_route_table_associations/index.md b/website/docs/services/ec2/gateway_route_table_associations/index.md
index cb3d81abc..c8b4b72a2 100644
--- a/website/docs/services/ec2/gateway_route_table_associations/index.md
+++ b/website/docs/services/ec2/gateway_route_table_associations/index.md
@@ -100,7 +100,7 @@ route_table_id,
 gateway_id,
 association_id
 FROM awscc.ec2.gateway_route_table_associations
-WHERE region = 'us-east-1' AND Identifier = '<GatewayId>';
+WHERE region = 'us-east-1' AND Identifier = '{{ gateway_id }}';
 ```
 
 ## `INSERT` example
@@ -124,9 +124,9 @@ INSERT INTO awscc.ec2.gateway_route_table_associations (
  GatewayId,
  region
 )
-SELECT 
-'{{ RouteTableId }}',
- '{{ GatewayId }}',
+SELECT
+'{{ route_table_id }}',
+ '{{ gateway_id }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -139,9 +139,9 @@ INSERT INTO awscc.ec2.gateway_route_table_associations (
  GatewayId,
  region
 )
-SELECT 
- '{{ RouteTableId }}',
- '{{ GatewayId }}',
+SELECT
+ '{{ route_table_id }}',
+ '{{ gateway_id }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -159,11 +159,10 @@ globals:
 resources:
   - name: gateway_route_table_association
     props:
-      - name: RouteTableId
-        value: '{{ RouteTableId }}'
-      - name: GatewayId
-        value: '{{ GatewayId }}'
-
+      - name: route_table_id
+        value: '{{ route_table_id }}'
+      - name: gateway_id
+        value: '{{ gateway_id }}'
 ```
 </TabItem>
 </Tabs>
@@ -179,7 +178,7 @@ SET PatchDocument = string('{{ {
     "RouteTableId": route_table_id
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<GatewayId>';
+AND Identifier = '{{ gateway_id }}';
 ```
 
 
@@ -188,7 +187,7 @@ AND Identifier = '<GatewayId>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.ec2.gateway_route_table_associations
-WHERE Identifier = '<GatewayId>'
+WHERE Identifier = '{{ gateway_id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/ec2/hosts/index.md b/website/docs/services/ec2/hosts/index.md
index c939828a2..4c792bd9b 100644
--- a/website/docs/services/ec2/hosts/index.md
+++ b/website/docs/services/ec2/hosts/index.md
@@ -200,7 +200,7 @@ host_maintenance,
 asset_id,
 tags
 FROM awscc.ec2.hosts
-WHERE region = 'us-east-1' AND Identifier = '<HostId>';
+WHERE region = 'us-east-1' AND Identifier = '{{ host_id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -236,8 +236,8 @@ INSERT INTO awscc.ec2.hosts (
  AvailabilityZone,
  region
 )
-SELECT 
-'{{ AvailabilityZone }}',
+SELECT
+'{{ availability_zone }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -257,16 +257,16 @@ INSERT INTO awscc.ec2.hosts (
  Tags,
  region
 )
-SELECT 
- '{{ AutoPlacement }}',
- '{{ AvailabilityZone }}',
- '{{ HostRecovery }}',
- '{{ InstanceType }}',
- '{{ InstanceFamily }}',
- '{{ OutpostArn }}',
- '{{ HostMaintenance }}',
- '{{ AssetId }}',
- '{{ Tags }}',
+SELECT
+ '{{ auto_placement }}',
+ '{{ availability_zone }}',
+ '{{ host_recovery }}',
+ '{{ instance_type }}',
+ '{{ instance_family }}',
+ '{{ outpost_arn }}',
+ '{{ host_maintenance }}',
+ '{{ asset_id }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -284,27 +284,26 @@ globals:
 resources:
   - name: host
     props:
-      - name: AutoPlacement
-        value: '{{ AutoPlacement }}'
-      - name: AvailabilityZone
-        value: '{{ AvailabilityZone }}'
-      - name: HostRecovery
-        value: '{{ HostRecovery }}'
-      - name: InstanceType
-        value: '{{ InstanceType }}'
-      - name: InstanceFamily
-        value: '{{ InstanceFamily }}'
-      - name: OutpostArn
-        value: '{{ OutpostArn }}'
-      - name: HostMaintenance
-        value: '{{ HostMaintenance }}'
-      - name: AssetId
-        value: '{{ AssetId }}'
-      - name: Tags
+      - name: auto_placement
+        value: '{{ auto_placement }}'
+      - name: availability_zone
+        value: '{{ availability_zone }}'
+      - name: host_recovery
+        value: '{{ host_recovery }}'
+      - name: instance_type
+        value: '{{ instance_type }}'
+      - name: instance_family
+        value: '{{ instance_family }}'
+      - name: outpost_arn
+        value: '{{ outpost_arn }}'
+      - name: host_maintenance
+        value: '{{ host_maintenance }}'
+      - name: asset_id
+        value: '{{ asset_id }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -323,7 +322,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<HostId>';
+AND Identifier = '{{ host_id }}';
 ```
 
 
@@ -332,7 +331,7 @@ AND Identifier = '<HostId>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.ec2.hosts
-WHERE Identifier = '<HostId>'
+WHERE Identifier = '{{ host_id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/ec2/instance_connect_endpoints/index.md b/website/docs/services/ec2/instance_connect_endpoints/index.md
index b25aab0cc..cdd3630f1 100644
--- a/website/docs/services/ec2/instance_connect_endpoints/index.md
+++ b/website/docs/services/ec2/instance_connect_endpoints/index.md
@@ -176,7 +176,7 @@ preserve_client_ip,
 tags,
 security_group_ids
 FROM awscc.ec2.instance_connect_endpoints
-WHERE region = 'us-east-1' AND Identifier = '<Id>';
+WHERE region = 'us-east-1' AND Identifier = '{{ id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -212,8 +212,8 @@ INSERT INTO awscc.ec2.instance_connect_endpoints (
  SubnetId,
  region
 )
-SELECT 
-'{{ SubnetId }}',
+SELECT
+'{{ subnet_id }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -229,12 +229,12 @@ INSERT INTO awscc.ec2.instance_connect_endpoints (
  SecurityGroupIds,
  region
 )
-SELECT 
- '{{ SubnetId }}',
- '{{ ClientToken }}',
- '{{ PreserveClientIp }}',
- '{{ Tags }}',
- '{{ SecurityGroupIds }}',
+SELECT
+ '{{ subnet_id }}',
+ '{{ client_token }}',
+ '{{ preserve_client_ip }}',
+ '{{ tags }}',
+ '{{ security_group_ids }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -252,20 +252,19 @@ globals:
 resources:
   - name: instance_connect_endpoint
     props:
-      - name: SubnetId
-        value: '{{ SubnetId }}'
-      - name: ClientToken
-        value: '{{ ClientToken }}'
-      - name: PreserveClientIp
-        value: '{{ PreserveClientIp }}'
-      - name: Tags
+      - name: subnet_id
+        value: '{{ subnet_id }}'
+      - name: client_token
+        value: '{{ client_token }}'
+      - name: preserve_client_ip
+        value: '{{ preserve_client_ip }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-      - name: SecurityGroupIds
+          - key: '{{ key }}'
+            value: '{{ value }}'
+      - name: security_group_ids
         value:
-          - '{{ SecurityGroupIds[0] }}'
-
+          - '{{ security_group_ids[0] }}'
 ```
 </TabItem>
 </Tabs>
@@ -281,7 +280,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Id>';
+AND Identifier = '{{ id }}';
 ```
 
 
@@ -290,7 +289,7 @@ AND Identifier = '<Id>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.ec2.instance_connect_endpoints
-WHERE Identifier = '<Id>'
+WHERE Identifier = '{{ id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/ec2/instances/index.md b/website/docs/services/ec2/instances/index.md
index ce43d575c..db930e6a4 100644
--- a/website/docs/services/ec2/instances/index.md
+++ b/website/docs/services/ec2/instances/index.md
@@ -884,7 +884,7 @@ ramdisk_id,
 source_dest_check,
 credit_specification
 FROM awscc.ec2.instances
-WHERE region = 'us-east-1' AND Identifier = '<InstanceId>';
+WHERE region = 'us-east-1' AND Identifier = '{{ instance_id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -960,48 +960,48 @@ INSERT INTO awscc.ec2.instances (
  CreditSpecification,
  region
 )
-SELECT 
-'{{ Volumes }}',
- '{{ EnclaveOptions }}',
- '{{ ImageId }}',
- '{{ Tags }}',
- '{{ AdditionalInfo }}',
- '{{ HibernationOptions }}',
- '{{ LicenseSpecifications }}',
- '{{ MetadataOptions }}',
- '{{ CpuOptions }}',
- '{{ AvailabilityZone }}',
- '{{ PrivateDnsNameOptions }}',
- '{{ HostId }}',
- '{{ SecurityGroupIds }}',
- '{{ PlacementGroupName }}',
- '{{ SsmAssociations }}',
- '{{ Affinity }}',
- '{{ Tenancy }}',
- '{{ SecurityGroups }}',
- '{{ PrivateIpAddress }}',
- '{{ UserData }}',
- '{{ BlockDeviceMappings }}',
- '{{ IamInstanceProfile }}',
- '{{ Ipv6Addresses }}',
- '{{ KernelId }}',
- '{{ SubnetId }}',
- '{{ EbsOptimized }}',
- '{{ PropagateTagsToVolumeOnCreation }}',
- '{{ ElasticGpuSpecifications }}',
- '{{ ElasticInferenceAccelerators }}',
- '{{ Ipv6AddressCount }}',
- '{{ LaunchTemplate }}',
- '{{ NetworkInterfaces }}',
- '{{ InstanceType }}',
- '{{ Monitoring }}',
- '{{ InstanceInitiatedShutdownBehavior }}',
- '{{ HostResourceGroupArn }}',
- '{{ DisableApiTermination }}',
- '{{ KeyName }}',
- '{{ RamdiskId }}',
- '{{ SourceDestCheck }}',
- '{{ CreditSpecification }}',
+SELECT
+'{{ volumes }}',
+ '{{ enclave_options }}',
+ '{{ image_id }}',
+ '{{ tags }}',
+ '{{ additional_info }}',
+ '{{ hibernation_options }}',
+ '{{ license_specifications }}',
+ '{{ metadata_options }}',
+ '{{ cpu_options }}',
+ '{{ availability_zone }}',
+ '{{ private_dns_name_options }}',
+ '{{ host_id }}',
+ '{{ security_group_ids }}',
+ '{{ placement_group_name }}',
+ '{{ ssm_associations }}',
+ '{{ affinity }}',
+ '{{ tenancy }}',
+ '{{ security_groups }}',
+ '{{ private_ip_address }}',
+ '{{ user_data }}',
+ '{{ block_device_mappings }}',
+ '{{ iam_instance_profile }}',
+ '{{ ipv6_addresses }}',
+ '{{ kernel_id }}',
+ '{{ subnet_id }}',
+ '{{ ebs_optimized }}',
+ '{{ propagate_tags_to_volume_on_creation }}',
+ '{{ elastic_gpu_specifications }}',
+ '{{ elastic_inference_accelerators }}',
+ '{{ ipv6_address_count }}',
+ '{{ launch_template }}',
+ '{{ network_interfaces }}',
+ '{{ instance_type }}',
+ '{{ monitoring }}',
+ '{{ instance_initiated_shutdown_behavior }}',
+ '{{ host_resource_group_arn }}',
+ '{{ disable_api_termination }}',
+ '{{ key_name }}',
+ '{{ ramdisk_id }}',
+ '{{ source_dest_check }}',
+ '{{ credit_specification }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -1053,48 +1053,48 @@ INSERT INTO awscc.ec2.instances (
  CreditSpecification,
  region
 )
-SELECT 
- '{{ Volumes }}',
- '{{ EnclaveOptions }}',
- '{{ ImageId }}',
- '{{ Tags }}',
- '{{ AdditionalInfo }}',
- '{{ HibernationOptions }}',
- '{{ LicenseSpecifications }}',
- '{{ MetadataOptions }}',
- '{{ CpuOptions }}',
- '{{ AvailabilityZone }}',
- '{{ PrivateDnsNameOptions }}',
- '{{ HostId }}',
- '{{ SecurityGroupIds }}',
- '{{ PlacementGroupName }}',
- '{{ SsmAssociations }}',
- '{{ Affinity }}',
- '{{ Tenancy }}',
- '{{ SecurityGroups }}',
- '{{ PrivateIpAddress }}',
- '{{ UserData }}',
- '{{ BlockDeviceMappings }}',
- '{{ IamInstanceProfile }}',
- '{{ Ipv6Addresses }}',
- '{{ KernelId }}',
- '{{ SubnetId }}',
- '{{ EbsOptimized }}',
- '{{ PropagateTagsToVolumeOnCreation }}',
- '{{ ElasticGpuSpecifications }}',
- '{{ ElasticInferenceAccelerators }}',
- '{{ Ipv6AddressCount }}',
- '{{ LaunchTemplate }}',
- '{{ NetworkInterfaces }}',
- '{{ InstanceType }}',
- '{{ Monitoring }}',
- '{{ InstanceInitiatedShutdownBehavior }}',
- '{{ HostResourceGroupArn }}',
- '{{ DisableApiTermination }}',
- '{{ KeyName }}',
- '{{ RamdiskId }}',
- '{{ SourceDestCheck }}',
- '{{ CreditSpecification }}',
+SELECT
+ '{{ volumes }}',
+ '{{ enclave_options }}',
+ '{{ image_id }}',
+ '{{ tags }}',
+ '{{ additional_info }}',
+ '{{ hibernation_options }}',
+ '{{ license_specifications }}',
+ '{{ metadata_options }}',
+ '{{ cpu_options }}',
+ '{{ availability_zone }}',
+ '{{ private_dns_name_options }}',
+ '{{ host_id }}',
+ '{{ security_group_ids }}',
+ '{{ placement_group_name }}',
+ '{{ ssm_associations }}',
+ '{{ affinity }}',
+ '{{ tenancy }}',
+ '{{ security_groups }}',
+ '{{ private_ip_address }}',
+ '{{ user_data }}',
+ '{{ block_device_mappings }}',
+ '{{ iam_instance_profile }}',
+ '{{ ipv6_addresses }}',
+ '{{ kernel_id }}',
+ '{{ subnet_id }}',
+ '{{ ebs_optimized }}',
+ '{{ propagate_tags_to_volume_on_creation }}',
+ '{{ elastic_gpu_specifications }}',
+ '{{ elastic_inference_accelerators }}',
+ '{{ ipv6_address_count }}',
+ '{{ launch_template }}',
+ '{{ network_interfaces }}',
+ '{{ instance_type }}',
+ '{{ monitoring }}',
+ '{{ instance_initiated_shutdown_behavior }}',
+ '{{ host_resource_group_arn }}',
+ '{{ disable_api_termination }}',
+ '{{ key_name }}',
+ '{{ ramdisk_id }}',
+ '{{ source_dest_check }}',
+ '{{ credit_specification }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -1112,170 +1112,169 @@ globals:
 resources:
   - name: instance
     props:
-      - name: Volumes
+      - name: volumes
         value:
-          - MultiAttachEnabled: '{{ MultiAttachEnabled }}'
-            KmsKeyId: '{{ KmsKeyId }}'
-            Encrypted: '{{ Encrypted }}'
-            Size: '{{ Size }}'
-            AutoEnableIO: '{{ AutoEnableIO }}'
-            OutpostArn: '{{ OutpostArn }}'
-            AvailabilityZone: '{{ AvailabilityZone }}'
-            Throughput: '{{ Throughput }}'
-            Iops: '{{ Iops }}'
-            VolumeInitializationRate: '{{ VolumeInitializationRate }}'
-            SnapshotId: '{{ SnapshotId }}'
-            VolumeType: '{{ VolumeType }}'
-            Tags:
-              - Key: '{{ Key }}'
-                Value: '{{ Value }}'
-      - name: EnclaveOptions
+          - multi_attach_enabled: '{{ multi_attach_enabled }}'
+            kms_key_id: '{{ kms_key_id }}'
+            encrypted: '{{ encrypted }}'
+            size: '{{ size }}'
+            auto_enable_io: '{{ auto_enable_io }}'
+            outpost_arn: '{{ outpost_arn }}'
+            availability_zone: '{{ availability_zone }}'
+            throughput: '{{ throughput }}'
+            iops: '{{ iops }}'
+            volume_initialization_rate: '{{ volume_initialization_rate }}'
+            snapshot_id: '{{ snapshot_id }}'
+            volume_type: '{{ volume_type }}'
+            tags:
+              - key: '{{ key }}'
+                value: '{{ value }}'
+      - name: enclave_options
         value:
-          Enabled: '{{ Enabled }}'
-      - name: ImageId
-        value: '{{ ImageId }}'
-      - name: Tags
+          enabled: '{{ enabled }}'
+      - name: image_id
+        value: '{{ image_id }}'
+      - name: tags
         value:
           - null
-      - name: AdditionalInfo
-        value: '{{ AdditionalInfo }}'
-      - name: HibernationOptions
+      - name: additional_info
+        value: '{{ additional_info }}'
+      - name: hibernation_options
         value:
-          Configured: '{{ Configured }}'
-      - name: LicenseSpecifications
+          configured: '{{ configured }}'
+      - name: license_specifications
         value:
-          - LicenseConfigurationArn: '{{ LicenseConfigurationArn }}'
-      - name: MetadataOptions
+          - license_configuration_arn: '{{ license_configuration_arn }}'
+      - name: metadata_options
         value:
-          HttpPutResponseHopLimit: '{{ HttpPutResponseHopLimit }}'
-          HttpTokens: '{{ HttpTokens }}'
-          HttpProtocolIpv6: '{{ HttpProtocolIpv6 }}'
-          InstanceMetadataTags: '{{ InstanceMetadataTags }}'
-          HttpEndpoint: '{{ HttpEndpoint }}'
-      - name: CpuOptions
+          http_put_response_hop_limit: '{{ http_put_response_hop_limit }}'
+          http_tokens: '{{ http_tokens }}'
+          http_protocol_ipv6: '{{ http_protocol_ipv6 }}'
+          instance_metadata_tags: '{{ instance_metadata_tags }}'
+          http_endpoint: '{{ http_endpoint }}'
+      - name: cpu_options
         value:
-          ThreadsPerCore: '{{ ThreadsPerCore }}'
-          CoreCount: '{{ CoreCount }}'
-      - name: AvailabilityZone
-        value: '{{ AvailabilityZone }}'
-      - name: PrivateDnsNameOptions
+          threads_per_core: '{{ threads_per_core }}'
+          core_count: '{{ core_count }}'
+      - name: availability_zone
+        value: '{{ availability_zone }}'
+      - name: private_dns_name_options
         value:
-          EnableResourceNameDnsARecord: '{{ EnableResourceNameDnsARecord }}'
-          HostnameType: '{{ HostnameType }}'
-          EnableResourceNameDnsAAAARecord: '{{ EnableResourceNameDnsAAAARecord }}'
-      - name: HostId
-        value: '{{ HostId }}'
-      - name: SecurityGroupIds
+          enable_resource_name_dns_arecord: '{{ enable_resource_name_dns_arecord }}'
+          hostname_type: '{{ hostname_type }}'
+          enable_resource_name_dns_aa_aa_record: '{{ enable_resource_name_dns_aa_aa_record }}'
+      - name: host_id
+        value: '{{ host_id }}'
+      - name: security_group_ids
         value:
-          - '{{ SecurityGroupIds[0] }}'
-      - name: PlacementGroupName
-        value: '{{ PlacementGroupName }}'
-      - name: SsmAssociations
+          - '{{ security_group_ids[0] }}'
+      - name: placement_group_name
+        value: '{{ placement_group_name }}'
+      - name: ssm_associations
         value:
-          - AssociationParameters:
-              - Value:
-                  - '{{ Value[0] }}'
-                Key: '{{ Key }}'
-            DocumentName: '{{ DocumentName }}'
-      - name: Affinity
-        value: '{{ Affinity }}'
-      - name: Tenancy
-        value: '{{ Tenancy }}'
-      - name: SecurityGroups
+          - association_parameters:
+              - value:
+                  - '{{ value[0] }}'
+                key: '{{ key }}'
+            document_name: '{{ document_name }}'
+      - name: affinity
+        value: '{{ affinity }}'
+      - name: tenancy
+        value: '{{ tenancy }}'
+      - name: security_groups
         value:
-          - '{{ SecurityGroups[0] }}'
-      - name: PrivateIpAddress
-        value: '{{ PrivateIpAddress }}'
-      - name: UserData
-        value: '{{ UserData }}'
-      - name: BlockDeviceMappings
+          - '{{ security_groups[0] }}'
+      - name: private_ip_address
+        value: '{{ private_ip_address }}'
+      - name: user_data
+        value: '{{ user_data }}'
+      - name: block_device_mappings
         value:
-          - DeviceName: '{{ DeviceName }}'
-            Ebs:
-              DeleteOnTermination: '{{ DeleteOnTermination }}'
-              Encrypted: '{{ Encrypted }}'
-              Iops: '{{ Iops }}'
-              SnapshotId: '{{ SnapshotId }}'
-              VolumeSize: '{{ VolumeSize }}'
-              VolumeType: '{{ VolumeType }}'
-            NoDevice: '{{ NoDevice }}'
-            VirtualName: '{{ VirtualName }}'
-      - name: IamInstanceProfile
-        value: '{{ IamInstanceProfile }}'
-      - name: Ipv6Addresses
+          - device_name: '{{ device_name }}'
+            ebs:
+              delete_on_termination: '{{ delete_on_termination }}'
+              encrypted: '{{ encrypted }}'
+              iops: '{{ iops }}'
+              snapshot_id: '{{ snapshot_id }}'
+              volume_size: '{{ volume_size }}'
+              volume_type: '{{ volume_type }}'
+            no_device: '{{ no_device }}'
+            virtual_name: '{{ virtual_name }}'
+      - name: iam_instance_profile
+        value: '{{ iam_instance_profile }}'
+      - name: ipv6_addresses
         value:
-          - Ipv6Address: '{{ Ipv6Address }}'
-      - name: KernelId
-        value: '{{ KernelId }}'
-      - name: SubnetId
-        value: '{{ SubnetId }}'
-      - name: EbsOptimized
-        value: '{{ EbsOptimized }}'
-      - name: PropagateTagsToVolumeOnCreation
-        value: '{{ PropagateTagsToVolumeOnCreation }}'
-      - name: ElasticGpuSpecifications
+          - ipv6_address: '{{ ipv6_address }}'
+      - name: kernel_id
+        value: '{{ kernel_id }}'
+      - name: subnet_id
+        value: '{{ subnet_id }}'
+      - name: ebs_optimized
+        value: '{{ ebs_optimized }}'
+      - name: propagate_tags_to_volume_on_creation
+        value: '{{ propagate_tags_to_volume_on_creation }}'
+      - name: elastic_gpu_specifications
         value:
-          - Type: '{{ Type }}'
-      - name: ElasticInferenceAccelerators
+          - type: '{{ type }}'
+      - name: elastic_inference_accelerators
         value:
-          - Type: '{{ Type }}'
-            Count: '{{ Count }}'
-      - name: Ipv6AddressCount
-        value: '{{ Ipv6AddressCount }}'
-      - name: LaunchTemplate
+          - type: '{{ type }}'
+            count: '{{ count }}'
+      - name: ipv6_address_count
+        value: '{{ ipv6_address_count }}'
+      - name: launch_template
         value:
-          LaunchTemplateName: '{{ LaunchTemplateName }}'
-          Version: '{{ Version }}'
-          LaunchTemplateId: '{{ LaunchTemplateId }}'
-      - name: NetworkInterfaces
+          launch_template_name: '{{ launch_template_name }}'
+          version: '{{ version }}'
+          launch_template_id: '{{ launch_template_id }}'
+      - name: network_interfaces
         value:
-          - Description: '{{ Description }}'
-            PrivateIpAddress: '{{ PrivateIpAddress }}'
-            PrivateIpAddresses:
-              - Primary: '{{ Primary }}'
-                PrivateIpAddress: '{{ PrivateIpAddress }}'
-            SecondaryPrivateIpAddressCount: '{{ SecondaryPrivateIpAddressCount }}'
-            Ipv6PrefixCount: '{{ Ipv6PrefixCount }}'
-            Ipv4Prefixes:
-              - Ipv4Prefix: '{{ Ipv4Prefix }}'
-            Ipv4PrefixCount: '{{ Ipv4PrefixCount }}'
-            EnablePrimaryIpv6: '{{ EnablePrimaryIpv6 }}'
-            GroupSet:
-              - '{{ GroupSet[0] }}'
-            Ipv6Addresses:
+          - description: '{{ description }}'
+            private_ip_address: '{{ private_ip_address }}'
+            private_ip_addresses:
+              - primary: '{{ primary }}'
+                private_ip_address: '{{ private_ip_address }}'
+            secondary_private_ip_address_count: '{{ secondary_private_ip_address_count }}'
+            ipv6_prefix_count: '{{ ipv6_prefix_count }}'
+            ipv4_prefixes:
+              - ipv4_prefix: '{{ ipv4_prefix }}'
+            ipv4_prefix_count: '{{ ipv4_prefix_count }}'
+            enable_primary_ipv6: '{{ enable_primary_ipv6 }}'
+            group_set:
+              - '{{ group_set[0] }}'
+            ipv6_addresses:
               - null
-            Ipv6Prefixes:
-              - Ipv6Prefix: '{{ Ipv6Prefix }}'
-            SubnetId: '{{ SubnetId }}'
-            SourceDestCheck: '{{ SourceDestCheck }}'
-            InterfaceType: '{{ InterfaceType }}'
-            Ipv6AddressCount: '{{ Ipv6AddressCount }}'
-            Tags:
+            ipv6_prefixes:
+              - ipv6_prefix: '{{ ipv6_prefix }}'
+            subnet_id: '{{ subnet_id }}'
+            source_dest_check: '{{ source_dest_check }}'
+            interface_type: '{{ interface_type }}'
+            ipv6_address_count: '{{ ipv6_address_count }}'
+            tags:
               - null
-            ConnectionTrackingSpecification:
-              UdpTimeout: '{{ UdpTimeout }}'
-              TcpEstablishedTimeout: '{{ TcpEstablishedTimeout }}'
-              UdpStreamTimeout: '{{ UdpStreamTimeout }}'
-      - name: InstanceType
-        value: '{{ InstanceType }}'
-      - name: Monitoring
-        value: '{{ Monitoring }}'
-      - name: InstanceInitiatedShutdownBehavior
-        value: '{{ InstanceInitiatedShutdownBehavior }}'
-      - name: HostResourceGroupArn
-        value: '{{ HostResourceGroupArn }}'
-      - name: DisableApiTermination
-        value: '{{ DisableApiTermination }}'
-      - name: KeyName
-        value: '{{ KeyName }}'
-      - name: RamdiskId
-        value: '{{ RamdiskId }}'
-      - name: SourceDestCheck
-        value: '{{ SourceDestCheck }}'
-      - name: CreditSpecification
+            connection_tracking_specification:
+              udp_timeout: '{{ udp_timeout }}'
+              tcp_established_timeout: '{{ tcp_established_timeout }}'
+              udp_stream_timeout: '{{ udp_stream_timeout }}'
+      - name: instance_type
+        value: '{{ instance_type }}'
+      - name: monitoring
+        value: '{{ monitoring }}'
+      - name: instance_initiated_shutdown_behavior
+        value: '{{ instance_initiated_shutdown_behavior }}'
+      - name: host_resource_group_arn
+        value: '{{ host_resource_group_arn }}'
+      - name: disable_api_termination
+        value: '{{ disable_api_termination }}'
+      - name: key_name
+        value: '{{ key_name }}'
+      - name: ramdisk_id
+        value: '{{ ramdisk_id }}'
+      - name: source_dest_check
+        value: '{{ source_dest_check }}'
+      - name: credit_specification
         value:
-          CPUCredits: '{{ CPUCredits }}'
-
+          c_pu_credits: '{{ c_pu_credits }}'
 ```
 </TabItem>
 </Tabs>
@@ -1313,7 +1312,7 @@ SET PatchDocument = string('{{ {
     "CreditSpecification": credit_specification
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<InstanceId>';
+AND Identifier = '{{ instance_id }}';
 ```
 
 
@@ -1322,7 +1321,7 @@ AND Identifier = '<InstanceId>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.ec2.instances
-WHERE Identifier = '<InstanceId>'
+WHERE Identifier = '{{ instance_id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/ec2/internet_gateways/index.md b/website/docs/services/ec2/internet_gateways/index.md
index 259d695fe..03e0b16e1 100644
--- a/website/docs/services/ec2/internet_gateways/index.md
+++ b/website/docs/services/ec2/internet_gateways/index.md
@@ -152,7 +152,7 @@ region,
 internet_gateway_id,
 tags
 FROM awscc.ec2.internet_gateways
-WHERE region = 'us-east-1' AND Identifier = '<InternetGatewayId>';
+WHERE region = 'us-east-1' AND Identifier = '{{ internet_gateway_id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -188,8 +188,8 @@ INSERT INTO awscc.ec2.internet_gateways (
  Tags,
  region
 )
-SELECT 
-'{{ Tags }}',
+SELECT
+'{{ tags }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -201,8 +201,8 @@ INSERT INTO awscc.ec2.internet_gateways (
  Tags,
  region
 )
-SELECT 
- '{{ Tags }}',
+SELECT
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -220,11 +220,10 @@ globals:
 resources:
   - name: internet_gateway
     props:
-      - name: Tags
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -240,7 +239,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<InternetGatewayId>';
+AND Identifier = '{{ internet_gateway_id }}';
 ```
 
 
@@ -249,7 +248,7 @@ AND Identifier = '<InternetGatewayId>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.ec2.internet_gateways
-WHERE Identifier = '<InternetGatewayId>'
+WHERE Identifier = '{{ internet_gateway_id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/ec2/ip_pool_route_table_associations/index.md b/website/docs/services/ec2/ip_pool_route_table_associations/index.md
index b2196c28d..a70fa22b2 100644
--- a/website/docs/services/ec2/ip_pool_route_table_associations/index.md
+++ b/website/docs/services/ec2/ip_pool_route_table_associations/index.md
@@ -140,7 +140,7 @@ association_id,
 public_ipv4_pool,
 route_table_id
 FROM awscc.ec2.ip_pool_route_table_associations
-WHERE region = 'us-east-1' AND Identifier = '<AssociationId>';
+WHERE region = 'us-east-1' AND Identifier = '{{ association_id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -177,9 +177,9 @@ INSERT INTO awscc.ec2.ip_pool_route_table_associations (
  RouteTableId,
  region
 )
-SELECT 
-'{{ PublicIpv4Pool }}',
- '{{ RouteTableId }}',
+SELECT
+'{{ public_ipv4_pool }}',
+ '{{ route_table_id }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -192,9 +192,9 @@ INSERT INTO awscc.ec2.ip_pool_route_table_associations (
  RouteTableId,
  region
 )
-SELECT 
- '{{ PublicIpv4Pool }}',
- '{{ RouteTableId }}',
+SELECT
+ '{{ public_ipv4_pool }}',
+ '{{ route_table_id }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -212,11 +212,10 @@ globals:
 resources:
   - name: ip_pool_route_table_association
     props:
-      - name: PublicIpv4Pool
-        value: '{{ PublicIpv4Pool }}'
-      - name: RouteTableId
-        value: '{{ RouteTableId }}'
-
+      - name: public_ipv4_pool
+        value: '{{ public_ipv4_pool }}'
+      - name: route_table_id
+        value: '{{ route_table_id }}'
 ```
 </TabItem>
 </Tabs>
@@ -227,7 +226,7 @@ resources:
 ```sql
 /*+ delete */
 DELETE FROM awscc.ec2.ip_pool_route_table_associations
-WHERE Identifier = '<AssociationId>'
+WHERE Identifier = '{{ association_id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/ec2/ipam_allocations/index.md b/website/docs/services/ec2/ipam_allocations/index.md
index 77f0b19ff..d09c78d9b 100644
--- a/website/docs/services/ec2/ipam_allocations/index.md
+++ b/website/docs/services/ec2/ipam_allocations/index.md
@@ -162,7 +162,7 @@ cidr,
 netmask_length,
 description
 FROM awscc.ec2.ipam_allocations
-WHERE region = 'us-east-1' AND Identifier = '<IpamPoolId>|<IpamPoolAllocationId>|<Cidr>';
+WHERE region = 'us-east-1' AND Identifier = '{{ ipam_pool_id }}|{{ ipam_pool_allocation_id }}|{{ cidr }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -200,8 +200,8 @@ INSERT INTO awscc.ec2.ipam_allocations (
  IpamPoolId,
  region
 )
-SELECT 
-'{{ IpamPoolId }}',
+SELECT
+'{{ ipam_pool_id }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -216,11 +216,11 @@ INSERT INTO awscc.ec2.ipam_allocations (
  Description,
  region
 )
-SELECT 
- '{{ IpamPoolId }}',
- '{{ Cidr }}',
- '{{ NetmaskLength }}',
- '{{ Description }}',
+SELECT
+ '{{ ipam_pool_id }}',
+ '{{ cidr }}',
+ '{{ netmask_length }}',
+ '{{ description }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -238,15 +238,14 @@ globals:
 resources:
   - name: ipam_allocation
     props:
-      - name: IpamPoolId
-        value: '{{ IpamPoolId }}'
-      - name: Cidr
-        value: '{{ Cidr }}'
-      - name: NetmaskLength
-        value: '{{ NetmaskLength }}'
-      - name: Description
-        value: '{{ Description }}'
-
+      - name: ipam_pool_id
+        value: '{{ ipam_pool_id }}'
+      - name: cidr
+        value: '{{ cidr }}'
+      - name: netmask_length
+        value: '{{ netmask_length }}'
+      - name: description
+        value: '{{ description }}'
 ```
 </TabItem>
 </Tabs>
@@ -257,7 +256,7 @@ resources:
 ```sql
 /*+ delete */
 DELETE FROM awscc.ec2.ipam_allocations
-WHERE Identifier = '<IpamPoolId|IpamPoolAllocationId|Cidr>'
+WHERE Identifier = '{{ ipam_pool_id }}|{{ ipam_pool_allocation_id }}|{{ cidr }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/ec2/ipam_pool_cidrs/index.md b/website/docs/services/ec2/ipam_pool_cidrs/index.md
index f849247fc..814d8bbba 100644
--- a/website/docs/services/ec2/ipam_pool_cidrs/index.md
+++ b/website/docs/services/ec2/ipam_pool_cidrs/index.md
@@ -162,7 +162,7 @@ cidr,
 netmask_length,
 state
 FROM awscc.ec2.ipam_pool_cidrs
-WHERE region = 'us-east-1' AND Identifier = '<IpamPoolId>|<IpamPoolCidrId>';
+WHERE region = 'us-east-1' AND Identifier = '{{ ipam_pool_id }}|{{ ipam_pool_cidr_id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -199,8 +199,8 @@ INSERT INTO awscc.ec2.ipam_pool_cidrs (
  IpamPoolId,
  region
 )
-SELECT 
-'{{ IpamPoolId }}',
+SELECT
+'{{ ipam_pool_id }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -214,10 +214,10 @@ INSERT INTO awscc.ec2.ipam_pool_cidrs (
  NetmaskLength,
  region
 )
-SELECT 
- '{{ IpamPoolId }}',
- '{{ Cidr }}',
- '{{ NetmaskLength }}',
+SELECT
+ '{{ ipam_pool_id }}',
+ '{{ cidr }}',
+ '{{ netmask_length }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -235,13 +235,12 @@ globals:
 resources:
   - name: ipam_pool_cidr
     props:
-      - name: IpamPoolId
-        value: '{{ IpamPoolId }}'
-      - name: Cidr
-        value: '{{ Cidr }}'
-      - name: NetmaskLength
-        value: '{{ NetmaskLength }}'
-
+      - name: ipam_pool_id
+        value: '{{ ipam_pool_id }}'
+      - name: cidr
+        value: '{{ cidr }}'
+      - name: netmask_length
+        value: '{{ netmask_length }}'
 ```
 </TabItem>
 </Tabs>
@@ -252,7 +251,7 @@ resources:
 ```sql
 /*+ delete */
 DELETE FROM awscc.ec2.ipam_pool_cidrs
-WHERE Identifier = '<IpamPoolId|IpamPoolCidrId>'
+WHERE Identifier = '{{ ipam_pool_id }}|{{ ipam_pool_cidr_id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/ec2/ipam_pools/index.md b/website/docs/services/ec2/ipam_pools/index.md
index 11bc79db5..574ff1e7d 100644
--- a/website/docs/services/ec2/ipam_pools/index.md
+++ b/website/docs/services/ec2/ipam_pools/index.md
@@ -313,7 +313,7 @@ state,
 state_message,
 tags
 FROM awscc.ec2.ipam_pools
-WHERE region = 'us-east-1' AND Identifier = '<IpamPoolId>';
+WHERE region = 'us-east-1' AND Identifier = '{{ ipam_pool_id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -350,9 +350,9 @@ INSERT INTO awscc.ec2.ipam_pools (
  IpamScopeId,
  region
 )
-SELECT 
-'{{ AddressFamily }}',
- '{{ IpamScopeId }}',
+SELECT
+'{{ address_family }}',
+ '{{ ipam_scope_id }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -379,23 +379,23 @@ INSERT INTO awscc.ec2.ipam_pools (
  Tags,
  region
 )
-SELECT 
- '{{ AddressFamily }}',
- '{{ AllocationMinNetmaskLength }}',
- '{{ AllocationDefaultNetmaskLength }}',
- '{{ AllocationMaxNetmaskLength }}',
- '{{ AllocationResourceTags }}',
- '{{ AutoImport }}',
- '{{ AwsService }}',
- '{{ Description }}',
- '{{ IpamScopeId }}',
- '{{ Locale }}',
- '{{ ProvisionedCidrs }}',
- '{{ PublicIpSource }}',
- '{{ PubliclyAdvertisable }}',
- '{{ SourceIpamPoolId }}',
- '{{ SourceResource }}',
- '{{ Tags }}',
+SELECT
+ '{{ address_family }}',
+ '{{ allocation_min_netmask_length }}',
+ '{{ allocation_default_netmask_length }}',
+ '{{ allocation_max_netmask_length }}',
+ '{{ allocation_resource_tags }}',
+ '{{ auto_import }}',
+ '{{ aws_service }}',
+ '{{ description }}',
+ '{{ ipam_scope_id }}',
+ '{{ locale }}',
+ '{{ provisioned_cidrs }}',
+ '{{ public_ip_source }}',
+ '{{ publicly_advertisable }}',
+ '{{ source_ipam_pool_id }}',
+ '{{ source_resource }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -413,47 +413,46 @@ globals:
 resources:
   - name: ipam_pool
     props:
-      - name: AddressFamily
-        value: '{{ AddressFamily }}'
-      - name: AllocationMinNetmaskLength
-        value: '{{ AllocationMinNetmaskLength }}'
-      - name: AllocationDefaultNetmaskLength
-        value: '{{ AllocationDefaultNetmaskLength }}'
-      - name: AllocationMaxNetmaskLength
-        value: '{{ AllocationMaxNetmaskLength }}'
-      - name: AllocationResourceTags
+      - name: address_family
+        value: '{{ address_family }}'
+      - name: allocation_min_netmask_length
+        value: '{{ allocation_min_netmask_length }}'
+      - name: allocation_default_netmask_length
+        value: '{{ allocation_default_netmask_length }}'
+      - name: allocation_max_netmask_length
+        value: '{{ allocation_max_netmask_length }}'
+      - name: allocation_resource_tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-      - name: AutoImport
-        value: '{{ AutoImport }}'
-      - name: AwsService
-        value: '{{ AwsService }}'
-      - name: Description
-        value: '{{ Description }}'
-      - name: IpamScopeId
-        value: '{{ IpamScopeId }}'
-      - name: Locale
-        value: '{{ Locale }}'
-      - name: ProvisionedCidrs
+          - key: '{{ key }}'
+            value: '{{ value }}'
+      - name: auto_import
+        value: '{{ auto_import }}'
+      - name: aws_service
+        value: '{{ aws_service }}'
+      - name: description
+        value: '{{ description }}'
+      - name: ipam_scope_id
+        value: '{{ ipam_scope_id }}'
+      - name: locale
+        value: '{{ locale }}'
+      - name: provisioned_cidrs
         value:
-          - Cidr: '{{ Cidr }}'
-      - name: PublicIpSource
-        value: '{{ PublicIpSource }}'
-      - name: PubliclyAdvertisable
-        value: '{{ PubliclyAdvertisable }}'
-      - name: SourceIpamPoolId
-        value: '{{ SourceIpamPoolId }}'
-      - name: SourceResource
+          - cidr: '{{ cidr }}'
+      - name: public_ip_source
+        value: '{{ public_ip_source }}'
+      - name: publicly_advertisable
+        value: '{{ publicly_advertisable }}'
+      - name: source_ipam_pool_id
+        value: '{{ source_ipam_pool_id }}'
+      - name: source_resource
         value:
-          ResourceId: '{{ ResourceId }}'
-          ResourceType: '{{ ResourceType }}'
-          ResourceRegion: '{{ ResourceRegion }}'
-          ResourceOwner: '{{ ResourceOwner }}'
-      - name: Tags
+          resource_id: '{{ resource_id }}'
+          resource_type: '{{ resource_type }}'
+          resource_region: '{{ resource_region }}'
+          resource_owner: '{{ resource_owner }}'
+      - name: tags
         value:
           - null
-
 ```
 </TabItem>
 </Tabs>
@@ -476,7 +475,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<IpamPoolId>';
+AND Identifier = '{{ ipam_pool_id }}';
 ```
 
 
@@ -485,7 +484,7 @@ AND Identifier = '<IpamPoolId>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.ec2.ipam_pools
-WHERE Identifier = '<IpamPoolId>'
+WHERE Identifier = '{{ ipam_pool_id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/ec2/ipam_resource_discoveries/index.md b/website/docs/services/ec2/ipam_resource_discoveries/index.md
index e954fc173..0f3dd6e4f 100644
--- a/website/docs/services/ec2/ipam_resource_discoveries/index.md
+++ b/website/docs/services/ec2/ipam_resource_discoveries/index.md
@@ -214,7 +214,7 @@ ipam_resource_discovery_arn,
 state,
 tags
 FROM awscc.ec2.ipam_resource_discoveries
-WHERE region = 'us-east-1' AND Identifier = '<IpamResourceDiscoveryId>';
+WHERE region = 'us-east-1' AND Identifier = '{{ ipam_resource_discovery_id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -250,7 +250,7 @@ INSERT INTO awscc.ec2.ipam_resource_discoveries (
  ,
  region
 )
-SELECT 
+SELECT
 '{{  }}',
 '{{ region }}';
 ```
@@ -266,11 +266,11 @@ INSERT INTO awscc.ec2.ipam_resource_discoveries (
  Tags,
  region
 )
-SELECT 
- '{{ OperatingRegions }}',
- '{{ Description }}',
- '{{ OrganizationalUnitExclusions }}',
- '{{ Tags }}',
+SELECT
+ '{{ operating_regions }}',
+ '{{ description }}',
+ '{{ organizational_unit_exclusions }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -288,19 +288,18 @@ globals:
 resources:
   - name: ipam_resource_discovery
     props:
-      - name: OperatingRegions
+      - name: operating_regions
         value:
-          - RegionName: '{{ RegionName }}'
-      - name: Description
-        value: '{{ Description }}'
-      - name: OrganizationalUnitExclusions
+          - region_name: '{{ region_name }}'
+      - name: description
+        value: '{{ description }}'
+      - name: organizational_unit_exclusions
         value:
-          - OrganizationsEntityPath: '{{ OrganizationsEntityPath }}'
-      - name: Tags
+          - organizations_entity_path: '{{ organizations_entity_path }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -319,7 +318,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<IpamResourceDiscoveryId>';
+AND Identifier = '{{ ipam_resource_discovery_id }}';
 ```
 
 
@@ -328,7 +327,7 @@ AND Identifier = '<IpamResourceDiscoveryId>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.ec2.ipam_resource_discoveries
-WHERE Identifier = '<IpamResourceDiscoveryId>'
+WHERE Identifier = '{{ ipam_resource_discovery_id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/ec2/ipam_resource_discovery_associations/index.md b/website/docs/services/ec2/ipam_resource_discovery_associations/index.md
index 9800c9040..7fbe4e961 100644
--- a/website/docs/services/ec2/ipam_resource_discovery_associations/index.md
+++ b/website/docs/services/ec2/ipam_resource_discovery_associations/index.md
@@ -206,7 +206,7 @@ state,
 resource_discovery_status,
 tags
 FROM awscc.ec2.ipam_resource_discovery_associations
-WHERE region = 'us-east-1' AND Identifier = '<IpamResourceDiscoveryAssociationId>';
+WHERE region = 'us-east-1' AND Identifier = '{{ ipam_resource_discovery_association_id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -243,9 +243,9 @@ INSERT INTO awscc.ec2.ipam_resource_discovery_associations (
  IpamId,
  region
 )
-SELECT 
-'{{ IpamResourceDiscoveryId }}',
- '{{ IpamId }}',
+SELECT
+'{{ ipam_resource_discovery_id }}',
+ '{{ ipam_id }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -259,10 +259,10 @@ INSERT INTO awscc.ec2.ipam_resource_discovery_associations (
  Tags,
  region
 )
-SELECT 
- '{{ IpamResourceDiscoveryId }}',
- '{{ IpamId }}',
- '{{ Tags }}',
+SELECT
+ '{{ ipam_resource_discovery_id }}',
+ '{{ ipam_id }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -280,15 +280,14 @@ globals:
 resources:
   - name: ipam_resource_discovery_association
     props:
-      - name: IpamResourceDiscoveryId
-        value: '{{ IpamResourceDiscoveryId }}'
-      - name: IpamId
-        value: '{{ IpamId }}'
-      - name: Tags
+      - name: ipam_resource_discovery_id
+        value: '{{ ipam_resource_discovery_id }}'
+      - name: ipam_id
+        value: '{{ ipam_id }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -304,7 +303,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<IpamResourceDiscoveryAssociationId>';
+AND Identifier = '{{ ipam_resource_discovery_association_id }}';
 ```
 
 
@@ -313,7 +312,7 @@ AND Identifier = '<IpamResourceDiscoveryAssociationId>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.ec2.ipam_resource_discovery_associations
-WHERE Identifier = '<IpamResourceDiscoveryAssociationId>'
+WHERE Identifier = '{{ ipam_resource_discovery_association_id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/ec2/ipam_scopes/index.md b/website/docs/services/ec2/ipam_scopes/index.md
index bc76e9ad6..11b3debbe 100644
--- a/website/docs/services/ec2/ipam_scopes/index.md
+++ b/website/docs/services/ec2/ipam_scopes/index.md
@@ -194,7 +194,7 @@ description,
 pool_count,
 tags
 FROM awscc.ec2.ipam_scopes
-WHERE region = 'us-east-1' AND Identifier = '<IpamScopeId>';
+WHERE region = 'us-east-1' AND Identifier = '{{ ipam_scope_id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -230,8 +230,8 @@ INSERT INTO awscc.ec2.ipam_scopes (
  IpamId,
  region
 )
-SELECT 
-'{{ IpamId }}',
+SELECT
+'{{ ipam_id }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -245,10 +245,10 @@ INSERT INTO awscc.ec2.ipam_scopes (
  Tags,
  region
 )
-SELECT 
- '{{ IpamId }}',
- '{{ Description }}',
- '{{ Tags }}',
+SELECT
+ '{{ ipam_id }}',
+ '{{ description }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -266,15 +266,14 @@ globals:
 resources:
   - name: ipam_scope
     props:
-      - name: IpamId
-        value: '{{ IpamId }}'
-      - name: Description
-        value: '{{ Description }}'
-      - name: Tags
+      - name: ipam_id
+        value: '{{ ipam_id }}'
+      - name: description
+        value: '{{ description }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -291,7 +290,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<IpamScopeId>';
+AND Identifier = '{{ ipam_scope_id }}';
 ```
 
 
@@ -300,7 +299,7 @@ AND Identifier = '<IpamScopeId>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.ec2.ipam_scopes
-WHERE Identifier = '<IpamScopeId>'
+WHERE Identifier = '{{ ipam_scope_id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/ec2/ipams/index.md b/website/docs/services/ec2/ipams/index.md
index 3b323026a..f9379e1ce 100644
--- a/website/docs/services/ec2/ipams/index.md
+++ b/website/docs/services/ec2/ipams/index.md
@@ -244,7 +244,7 @@ metered_account,
 default_resource_discovery_organizational_unit_exclusions,
 tags
 FROM awscc.ec2.ipams
-WHERE region = 'us-east-1' AND Identifier = '<IpamId>';
+WHERE region = 'us-east-1' AND Identifier = '{{ ipam_id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -280,7 +280,7 @@ INSERT INTO awscc.ec2.ipams (
  ,
  region
 )
-SELECT 
+SELECT
 '{{  }}',
 '{{ region }}';
 ```
@@ -299,14 +299,14 @@ INSERT INTO awscc.ec2.ipams (
  Tags,
  region
 )
-SELECT 
- '{{ Description }}',
- '{{ OperatingRegions }}',
- '{{ Tier }}',
- '{{ EnablePrivateGua }}',
- '{{ MeteredAccount }}',
- '{{ DefaultResourceDiscoveryOrganizationalUnitExclusions }}',
- '{{ Tags }}',
+SELECT
+ '{{ description }}',
+ '{{ operating_regions }}',
+ '{{ tier }}',
+ '{{ enable_private_gua }}',
+ '{{ metered_account }}',
+ '{{ default_resource_discovery_organizational_unit_exclusions }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -324,25 +324,24 @@ globals:
 resources:
   - name: ipam
     props:
-      - name: Description
-        value: '{{ Description }}'
-      - name: OperatingRegions
+      - name: description
+        value: '{{ description }}'
+      - name: operating_regions
         value:
-          - RegionName: '{{ RegionName }}'
-      - name: Tier
-        value: '{{ Tier }}'
-      - name: EnablePrivateGua
-        value: '{{ EnablePrivateGua }}'
-      - name: MeteredAccount
-        value: '{{ MeteredAccount }}'
-      - name: DefaultResourceDiscoveryOrganizationalUnitExclusions
+          - region_name: '{{ region_name }}'
+      - name: tier
+        value: '{{ tier }}'
+      - name: enable_private_gua
+        value: '{{ enable_private_gua }}'
+      - name: metered_account
+        value: '{{ metered_account }}'
+      - name: default_resource_discovery_organizational_unit_exclusions
         value:
-          - OrganizationsEntityPath: '{{ OrganizationsEntityPath }}'
-      - name: Tags
+          - organizations_entity_path: '{{ organizations_entity_path }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -364,7 +363,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<IpamId>';
+AND Identifier = '{{ ipam_id }}';
 ```
 
 
@@ -373,7 +372,7 @@ AND Identifier = '<IpamId>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.ec2.ipams
-WHERE Identifier = '<IpamId>'
+WHERE Identifier = '{{ ipam_id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/ec2/key_pairs/index.md b/website/docs/services/ec2/key_pairs/index.md
index 7ccb40a25..5a4c9783a 100644
--- a/website/docs/services/ec2/key_pairs/index.md
+++ b/website/docs/services/ec2/key_pairs/index.md
@@ -176,7 +176,7 @@ key_fingerprint,
 key_pair_id,
 tags
 FROM awscc.ec2.key_pairs
-WHERE region = 'us-east-1' AND Identifier = '<KeyName>';
+WHERE region = 'us-east-1' AND Identifier = '{{ key_name }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -212,8 +212,8 @@ INSERT INTO awscc.ec2.key_pairs (
  KeyName,
  region
 )
-SELECT 
-'{{ KeyName }}',
+SELECT
+'{{ key_name }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -229,12 +229,12 @@ INSERT INTO awscc.ec2.key_pairs (
  Tags,
  region
 )
-SELECT 
- '{{ KeyName }}',
- '{{ KeyType }}',
- '{{ KeyFormat }}',
- '{{ PublicKeyMaterial }}',
- '{{ Tags }}',
+SELECT
+ '{{ key_name }}',
+ '{{ key_type }}',
+ '{{ key_format }}',
+ '{{ public_key_material }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -252,19 +252,18 @@ globals:
 resources:
   - name: key_pair
     props:
-      - name: KeyName
-        value: '{{ KeyName }}'
-      - name: KeyType
-        value: '{{ KeyType }}'
-      - name: KeyFormat
-        value: '{{ KeyFormat }}'
-      - name: PublicKeyMaterial
-        value: '{{ PublicKeyMaterial }}'
-      - name: Tags
+      - name: key_name
+        value: '{{ key_name }}'
+      - name: key_type
+        value: '{{ key_type }}'
+      - name: key_format
+        value: '{{ key_format }}'
+      - name: public_key_material
+        value: '{{ public_key_material }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -275,7 +274,7 @@ resources:
 ```sql
 /*+ delete */
 DELETE FROM awscc.ec2.key_pairs
-WHERE Identifier = '<KeyName>'
+WHERE Identifier = '{{ key_name }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/ec2/launch_templates/index.md b/website/docs/services/ec2/launch_templates/index.md
index 80f58ddcb..103619f8c 100644
--- a/website/docs/services/ec2/launch_templates/index.md
+++ b/website/docs/services/ec2/launch_templates/index.md
@@ -1072,7 +1072,7 @@ latest_version_number,
 launch_template_id,
 default_version_number
 FROM awscc.ec2.launch_templates
-WHERE region = 'us-east-1' AND Identifier = '<LaunchTemplateId>';
+WHERE region = 'us-east-1' AND Identifier = '{{ launch_template_id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -1108,8 +1108,8 @@ INSERT INTO awscc.ec2.launch_templates (
  LaunchTemplateData,
  region
 )
-SELECT 
-'{{ LaunchTemplateData }}',
+SELECT
+'{{ launch_template_data }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -1124,11 +1124,11 @@ INSERT INTO awscc.ec2.launch_templates (
  TagSpecifications,
  region
 )
-SELECT 
- '{{ LaunchTemplateName }}',
- '{{ LaunchTemplateData }}',
- '{{ VersionDescription }}',
- '{{ TagSpecifications }}',
+SELECT
+ '{{ launch_template_name }}',
+ '{{ launch_template_data }}',
+ '{{ version_description }}',
+ '{{ tag_specifications }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -1146,185 +1146,184 @@ globals:
 resources:
   - name: launch_template
     props:
-      - name: LaunchTemplateName
-        value: '{{ LaunchTemplateName }}'
-      - name: LaunchTemplateData
+      - name: launch_template_name
+        value: '{{ launch_template_name }}'
+      - name: launch_template_data
         value:
-          SecurityGroups:
-            - '{{ SecurityGroups[0] }}'
-          TagSpecifications:
-            - ResourceType: '{{ ResourceType }}'
-              Tags:
-                - Key: '{{ Key }}'
-                  Value: '{{ Value }}'
-          NetworkPerformanceOptions:
-            BandwidthWeighting: '{{ BandwidthWeighting }}'
-          UserData: '{{ UserData }}'
-          BlockDeviceMappings:
-            - DeviceName: '{{ DeviceName }}'
-              Ebs:
-                DeleteOnTermination: '{{ DeleteOnTermination }}'
-                Encrypted: '{{ Encrypted }}'
-                Iops: '{{ Iops }}'
-                SnapshotId: '{{ SnapshotId }}'
-                VolumeSize: '{{ VolumeSize }}'
-                VolumeType: '{{ VolumeType }}'
-              NoDevice: '{{ NoDevice }}'
-              VirtualName: '{{ VirtualName }}'
-          MaintenanceOptions:
-            AutoRecovery: '{{ AutoRecovery }}'
-          IamInstanceProfile:
-            Arn: '{{ Arn }}'
-            Name: '{{ Name }}'
-          KernelId: '{{ KernelId }}'
-          EbsOptimized: '{{ EbsOptimized }}'
-          Placement:
-            GroupName: '{{ GroupName }}'
-            Tenancy: '{{ Tenancy }}'
-            SpreadDomain: '{{ SpreadDomain }}'
-            PartitionNumber: '{{ PartitionNumber }}'
-            AvailabilityZone: '{{ AvailabilityZone }}'
-            Affinity: '{{ Affinity }}'
-            HostId: '{{ HostId }}'
-            HostResourceGroupArn: '{{ HostResourceGroupArn }}'
-            GroupId: '{{ GroupId }}'
-          NetworkInterfaces:
-            - Description: '{{ Description }}'
-              PrivateIpAddress: '{{ PrivateIpAddress }}'
-              PrivateIpAddresses:
-                - Primary: '{{ Primary }}'
-                  PrivateIpAddress: '{{ PrivateIpAddress }}'
-              SecondaryPrivateIpAddressCount: '{{ SecondaryPrivateIpAddressCount }}'
-              Ipv6PrefixCount: '{{ Ipv6PrefixCount }}'
-              Ipv4Prefixes:
-                - Ipv4Prefix: '{{ Ipv4Prefix }}'
-              Ipv4PrefixCount: '{{ Ipv4PrefixCount }}'
-              EnablePrimaryIpv6: '{{ EnablePrimaryIpv6 }}'
-              GroupSet:
-                - '{{ GroupSet[0] }}'
-              Ipv6Addresses:
-                - Ipv6Address: '{{ Ipv6Address }}'
-              Ipv6Prefixes:
-                - Ipv6Prefix: '{{ Ipv6Prefix }}'
-              SubnetId: '{{ SubnetId }}'
-              SourceDestCheck: '{{ SourceDestCheck }}'
-              InterfaceType: '{{ InterfaceType }}'
-              Ipv6AddressCount: '{{ Ipv6AddressCount }}'
-              Tags:
+          security_groups:
+            - '{{ security_groups[0] }}'
+          tag_specifications:
+            - resource_type: '{{ resource_type }}'
+              tags:
+                - key: '{{ key }}'
+                  value: '{{ value }}'
+          network_performance_options:
+            bandwidth_weighting: '{{ bandwidth_weighting }}'
+          user_data: '{{ user_data }}'
+          block_device_mappings:
+            - device_name: '{{ device_name }}'
+              ebs:
+                delete_on_termination: '{{ delete_on_termination }}'
+                encrypted: '{{ encrypted }}'
+                iops: '{{ iops }}'
+                snapshot_id: '{{ snapshot_id }}'
+                volume_size: '{{ volume_size }}'
+                volume_type: '{{ volume_type }}'
+              no_device: '{{ no_device }}'
+              virtual_name: '{{ virtual_name }}'
+          maintenance_options:
+            auto_recovery: '{{ auto_recovery }}'
+          iam_instance_profile:
+            arn: '{{ arn }}'
+            name: '{{ name }}'
+          kernel_id: '{{ kernel_id }}'
+          ebs_optimized: '{{ ebs_optimized }}'
+          placement:
+            group_name: '{{ group_name }}'
+            tenancy: '{{ tenancy }}'
+            spread_domain: '{{ spread_domain }}'
+            partition_number: '{{ partition_number }}'
+            availability_zone: '{{ availability_zone }}'
+            affinity: '{{ affinity }}'
+            host_id: '{{ host_id }}'
+            host_resource_group_arn: '{{ host_resource_group_arn }}'
+            group_id: '{{ group_id }}'
+          network_interfaces:
+            - description: '{{ description }}'
+              private_ip_address: '{{ private_ip_address }}'
+              private_ip_addresses:
+                - primary: '{{ primary }}'
+                  private_ip_address: '{{ private_ip_address }}'
+              secondary_private_ip_address_count: '{{ secondary_private_ip_address_count }}'
+              ipv6_prefix_count: '{{ ipv6_prefix_count }}'
+              ipv4_prefixes:
+                - ipv4_prefix: '{{ ipv4_prefix }}'
+              ipv4_prefix_count: '{{ ipv4_prefix_count }}'
+              enable_primary_ipv6: '{{ enable_primary_ipv6 }}'
+              group_set:
+                - '{{ group_set[0] }}'
+              ipv6_addresses:
+                - ipv6_address: '{{ ipv6_address }}'
+              ipv6_prefixes:
+                - ipv6_prefix: '{{ ipv6_prefix }}'
+              subnet_id: '{{ subnet_id }}'
+              source_dest_check: '{{ source_dest_check }}'
+              interface_type: '{{ interface_type }}'
+              ipv6_address_count: '{{ ipv6_address_count }}'
+              tags:
                 - null
-              ConnectionTrackingSpecification:
-                UdpTimeout: '{{ UdpTimeout }}'
-                TcpEstablishedTimeout: '{{ TcpEstablishedTimeout }}'
-                UdpStreamTimeout: '{{ UdpStreamTimeout }}'
-          EnclaveOptions:
-            Enabled: '{{ Enabled }}'
-          ImageId: '{{ ImageId }}'
-          InstanceType: '{{ InstanceType }}'
-          Monitoring:
-            Enabled: '{{ Enabled }}'
-          HibernationOptions:
-            Configured: '{{ Configured }}'
-          MetadataOptions:
-            HttpPutResponseHopLimit: '{{ HttpPutResponseHopLimit }}'
-            HttpTokens: '{{ HttpTokens }}'
-            HttpProtocolIpv6: '{{ HttpProtocolIpv6 }}'
-            InstanceMetadataTags: '{{ InstanceMetadataTags }}'
-            HttpEndpoint: '{{ HttpEndpoint }}'
-          LicenseSpecifications:
-            - LicenseConfigurationArn: '{{ LicenseConfigurationArn }}'
-          InstanceInitiatedShutdownBehavior: '{{ InstanceInitiatedShutdownBehavior }}'
-          DisableApiStop: '{{ DisableApiStop }}'
-          CpuOptions:
-            ThreadsPerCore: '{{ ThreadsPerCore }}'
-            AmdSevSnp: '{{ AmdSevSnp }}'
-            CoreCount: '{{ CoreCount }}'
-          PrivateDnsNameOptions:
-            EnableResourceNameDnsARecord: '{{ EnableResourceNameDnsARecord }}'
-            HostnameType: '{{ HostnameType }}'
-            EnableResourceNameDnsAAAARecord: '{{ EnableResourceNameDnsAAAARecord }}'
-          SecurityGroupIds:
-            - '{{ SecurityGroupIds[0] }}'
-          KeyName: '{{ KeyName }}'
-          DisableApiTermination: '{{ DisableApiTermination }}'
-          InstanceMarketOptions:
-            SpotOptions:
-              SpotInstanceType: '{{ SpotInstanceType }}'
-              InstanceInterruptionBehavior: '{{ InstanceInterruptionBehavior }}'
-              MaxPrice: '{{ MaxPrice }}'
-              BlockDurationMinutes: '{{ BlockDurationMinutes }}'
-              ValidUntil: '{{ ValidUntil }}'
-            MarketType: '{{ MarketType }}'
-          InstanceRequirements:
-            InstanceGenerations:
-              - '{{ InstanceGenerations[0] }}'
-            MemoryGiBPerVCpu:
-              Min: null
-              Max: null
-            AcceleratorTypes:
-              - '{{ AcceleratorTypes[0] }}'
-            VCpuCount:
-              Min: '{{ Min }}'
-              Max: '{{ Max }}'
-            AcceleratorManufacturers:
-              - '{{ AcceleratorManufacturers[0] }}'
-            LocalStorage: '{{ LocalStorage }}'
-            CpuManufacturers:
-              - '{{ CpuManufacturers[0] }}'
-            BareMetal: '{{ BareMetal }}'
-            RequireHibernateSupport: '{{ RequireHibernateSupport }}'
-            MaxSpotPriceAsPercentageOfOptimalOnDemandPrice: '{{ MaxSpotPriceAsPercentageOfOptimalOnDemandPrice }}'
-            OnDemandMaxPricePercentageOverLowestPrice: '{{ OnDemandMaxPricePercentageOverLowestPrice }}'
-            MemoryMiB:
-              Min: '{{ Min }}'
-              Max: '{{ Max }}'
-            LocalStorageTypes:
-              - '{{ LocalStorageTypes[0] }}'
-            NetworkInterfaceCount:
-              Min: '{{ Min }}'
-              Max: '{{ Max }}'
-            ExcludedInstanceTypes:
-              - '{{ ExcludedInstanceTypes[0] }}'
-            AllowedInstanceTypes:
-              - '{{ AllowedInstanceTypes[0] }}'
-            AcceleratorCount:
-              Min: '{{ Min }}'
-              Max: '{{ Max }}'
-            NetworkBandwidthGbps:
-              Min: null
-              Max: null
-            BaselinePerformanceFactors:
-              Cpu:
-                References:
-                  - InstanceFamily: '{{ InstanceFamily }}'
-            SpotMaxPricePercentageOverLowestPrice: '{{ SpotMaxPricePercentageOverLowestPrice }}'
-            BaselineEbsBandwidthMbps:
-              Min: '{{ Min }}'
-              Max: '{{ Max }}'
-            AcceleratorNames:
-              - '{{ AcceleratorNames[0] }}'
-            AcceleratorTotalMemoryMiB:
-              Min: '{{ Min }}'
-              Max: '{{ Max }}'
-            BurstablePerformance: '{{ BurstablePerformance }}'
-            TotalLocalStorageGB:
-              Min: null
-              Max: null
-          RamDiskId: '{{ RamDiskId }}'
-          CapacityReservationSpecification:
-            CapacityReservationPreference: '{{ CapacityReservationPreference }}'
-            CapacityReservationTarget:
-              CapacityReservationResourceGroupArn: '{{ CapacityReservationResourceGroupArn }}'
-              CapacityReservationId: '{{ CapacityReservationId }}'
-          CreditSpecification:
-            CpuCredits: '{{ CpuCredits }}'
-      - name: VersionDescription
-        value: '{{ VersionDescription }}'
-      - name: TagSpecifications
+              connection_tracking_specification:
+                udp_timeout: '{{ udp_timeout }}'
+                tcp_established_timeout: '{{ tcp_established_timeout }}'
+                udp_stream_timeout: '{{ udp_stream_timeout }}'
+          enclave_options:
+            enabled: '{{ enabled }}'
+          image_id: '{{ image_id }}'
+          instance_type: '{{ instance_type }}'
+          monitoring:
+            enabled: '{{ enabled }}'
+          hibernation_options:
+            configured: '{{ configured }}'
+          metadata_options:
+            http_put_response_hop_limit: '{{ http_put_response_hop_limit }}'
+            http_tokens: '{{ http_tokens }}'
+            http_protocol_ipv6: '{{ http_protocol_ipv6 }}'
+            instance_metadata_tags: '{{ instance_metadata_tags }}'
+            http_endpoint: '{{ http_endpoint }}'
+          license_specifications:
+            - license_configuration_arn: '{{ license_configuration_arn }}'
+          instance_initiated_shutdown_behavior: '{{ instance_initiated_shutdown_behavior }}'
+          disable_api_stop: '{{ disable_api_stop }}'
+          cpu_options:
+            threads_per_core: '{{ threads_per_core }}'
+            amd_sev_snp: '{{ amd_sev_snp }}'
+            core_count: '{{ core_count }}'
+          private_dns_name_options:
+            enable_resource_name_dns_arecord: '{{ enable_resource_name_dns_arecord }}'
+            hostname_type: '{{ hostname_type }}'
+            enable_resource_name_dns_aa_aa_record: '{{ enable_resource_name_dns_aa_aa_record }}'
+          security_group_ids:
+            - '{{ security_group_ids[0] }}'
+          key_name: '{{ key_name }}'
+          disable_api_termination: '{{ disable_api_termination }}'
+          instance_market_options:
+            spot_options:
+              spot_instance_type: '{{ spot_instance_type }}'
+              instance_interruption_behavior: '{{ instance_interruption_behavior }}'
+              max_price: '{{ max_price }}'
+              block_duration_minutes: '{{ block_duration_minutes }}'
+              valid_until: '{{ valid_until }}'
+            market_type: '{{ market_type }}'
+          instance_requirements:
+            instance_generations:
+              - '{{ instance_generations[0] }}'
+            memory_gi_bper_vcpu:
+              min: null
+              max: null
+            accelerator_types:
+              - '{{ accelerator_types[0] }}'
+            v_cpu_count:
+              min: '{{ min }}'
+              max: '{{ max }}'
+            accelerator_manufacturers:
+              - '{{ accelerator_manufacturers[0] }}'
+            local_storage: '{{ local_storage }}'
+            cpu_manufacturers:
+              - '{{ cpu_manufacturers[0] }}'
+            bare_metal: '{{ bare_metal }}'
+            require_hibernate_support: '{{ require_hibernate_support }}'
+            max_spot_price_as_percentage_of_optimal_on_demand_price: '{{ max_spot_price_as_percentage_of_optimal_on_demand_price }}'
+            on_demand_max_price_percentage_over_lowest_price: '{{ on_demand_max_price_percentage_over_lowest_price }}'
+            memory_mi_b:
+              min: '{{ min }}'
+              max: '{{ max }}'
+            local_storage_types:
+              - '{{ local_storage_types[0] }}'
+            network_interface_count:
+              min: '{{ min }}'
+              max: '{{ max }}'
+            excluded_instance_types:
+              - '{{ excluded_instance_types[0] }}'
+            allowed_instance_types:
+              - '{{ allowed_instance_types[0] }}'
+            accelerator_count:
+              min: '{{ min }}'
+              max: '{{ max }}'
+            network_bandwidth_gbps:
+              min: null
+              max: null
+            baseline_performance_factors:
+              cpu:
+                references:
+                  - instance_family: '{{ instance_family }}'
+            spot_max_price_percentage_over_lowest_price: '{{ spot_max_price_percentage_over_lowest_price }}'
+            baseline_ebs_bandwidth_mbps:
+              min: '{{ min }}'
+              max: '{{ max }}'
+            accelerator_names:
+              - '{{ accelerator_names[0] }}'
+            accelerator_total_memory_mi_b:
+              min: '{{ min }}'
+              max: '{{ max }}'
+            burstable_performance: '{{ burstable_performance }}'
+            total_local_storage_gb:
+              min: null
+              max: null
+          ram_disk_id: '{{ ram_disk_id }}'
+          capacity_reservation_specification:
+            capacity_reservation_preference: '{{ capacity_reservation_preference }}'
+            capacity_reservation_target:
+              capacity_reservation_resource_group_arn: '{{ capacity_reservation_resource_group_arn }}'
+              capacity_reservation_id: '{{ capacity_reservation_id }}'
+          credit_specification:
+            cpu_credits: '{{ cpu_credits }}'
+      - name: version_description
+        value: '{{ version_description }}'
+      - name: tag_specifications
         value:
-          - ResourceType: '{{ ResourceType }}'
-            Tags:
+          - resource_type: '{{ resource_type }}'
+            tags:
               - null
-
 ```
 </TabItem>
 </Tabs>
@@ -1342,7 +1341,7 @@ SET PatchDocument = string('{{ {
     "TagSpecifications": tag_specifications
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<LaunchTemplateId>';
+AND Identifier = '{{ launch_template_id }}';
 ```
 
 
@@ -1351,7 +1350,7 @@ AND Identifier = '<LaunchTemplateId>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.ec2.launch_templates
-WHERE Identifier = '<LaunchTemplateId>'
+WHERE Identifier = '{{ launch_template_id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/ec2/local_gateway_route_table_virtual_interface_group_associations/index.md b/website/docs/services/ec2/local_gateway_route_table_virtual_interface_group_associations/index.md
index 00a4718a0..e035e4d63 100644
--- a/website/docs/services/ec2/local_gateway_route_table_virtual_interface_group_associations/index.md
+++ b/website/docs/services/ec2/local_gateway_route_table_virtual_interface_group_associations/index.md
@@ -188,7 +188,7 @@ owner_id,
 state,
 tags
 FROM awscc.ec2.local_gateway_route_table_virtual_interface_group_associations
-WHERE region = 'us-east-1' AND Identifier = '<LocalGatewayRouteTableVirtualInterfaceGroupAssociationId>';
+WHERE region = 'us-east-1' AND Identifier = '{{ local_gateway_route_table_virtual_interface_group_association_id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -225,9 +225,9 @@ INSERT INTO awscc.ec2.local_gateway_route_table_virtual_interface_group_associat
  LocalGatewayVirtualInterfaceGroupId,
  region
 )
-SELECT 
-'{{ LocalGatewayRouteTableId }}',
- '{{ LocalGatewayVirtualInterfaceGroupId }}',
+SELECT
+'{{ local_gateway_route_table_id }}',
+ '{{ local_gateway_virtual_interface_group_id }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -241,10 +241,10 @@ INSERT INTO awscc.ec2.local_gateway_route_table_virtual_interface_group_associat
  Tags,
  region
 )
-SELECT 
- '{{ LocalGatewayRouteTableId }}',
- '{{ LocalGatewayVirtualInterfaceGroupId }}',
- '{{ Tags }}',
+SELECT
+ '{{ local_gateway_route_table_id }}',
+ '{{ local_gateway_virtual_interface_group_id }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -262,15 +262,14 @@ globals:
 resources:
   - name: local_gateway_route_table_virtual_interface_group_association
     props:
-      - name: LocalGatewayRouteTableId
-        value: '{{ LocalGatewayRouteTableId }}'
-      - name: LocalGatewayVirtualInterfaceGroupId
-        value: '{{ LocalGatewayVirtualInterfaceGroupId }}'
-      - name: Tags
+      - name: local_gateway_route_table_id
+        value: '{{ local_gateway_route_table_id }}'
+      - name: local_gateway_virtual_interface_group_id
+        value: '{{ local_gateway_virtual_interface_group_id }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -286,7 +285,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<LocalGatewayRouteTableVirtualInterfaceGroupAssociationId>';
+AND Identifier = '{{ local_gateway_route_table_virtual_interface_group_association_id }}';
 ```
 
 
@@ -295,7 +294,7 @@ AND Identifier = '<LocalGatewayRouteTableVirtualInterfaceGroupAssociationId>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.ec2.local_gateway_route_table_virtual_interface_group_associations
-WHERE Identifier = '<LocalGatewayRouteTableVirtualInterfaceGroupAssociationId>'
+WHERE Identifier = '{{ local_gateway_route_table_virtual_interface_group_association_id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/ec2/local_gateway_route_tables/index.md b/website/docs/services/ec2/local_gateway_route_tables/index.md
index fe8b88ff5..6a00497c5 100644
--- a/website/docs/services/ec2/local_gateway_route_tables/index.md
+++ b/website/docs/services/ec2/local_gateway_route_tables/index.md
@@ -188,7 +188,7 @@ state,
 mode,
 tags
 FROM awscc.ec2.local_gateway_route_tables
-WHERE region = 'us-east-1' AND Identifier = '<LocalGatewayRouteTableId>';
+WHERE region = 'us-east-1' AND Identifier = '{{ local_gateway_route_table_id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -224,8 +224,8 @@ INSERT INTO awscc.ec2.local_gateway_route_tables (
  LocalGatewayId,
  region
 )
-SELECT 
-'{{ LocalGatewayId }}',
+SELECT
+'{{ local_gateway_id }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -239,10 +239,10 @@ INSERT INTO awscc.ec2.local_gateway_route_tables (
  Tags,
  region
 )
-SELECT 
- '{{ LocalGatewayId }}',
- '{{ Mode }}',
- '{{ Tags }}',
+SELECT
+ '{{ local_gateway_id }}',
+ '{{ mode }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -260,15 +260,14 @@ globals:
 resources:
   - name: local_gateway_route_table
     props:
-      - name: LocalGatewayId
-        value: '{{ LocalGatewayId }}'
-      - name: Mode
-        value: '{{ Mode }}'
-      - name: Tags
+      - name: local_gateway_id
+        value: '{{ local_gateway_id }}'
+      - name: mode
+        value: '{{ mode }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -284,7 +283,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<LocalGatewayRouteTableId>';
+AND Identifier = '{{ local_gateway_route_table_id }}';
 ```
 
 
@@ -293,7 +292,7 @@ AND Identifier = '<LocalGatewayRouteTableId>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.ec2.local_gateway_route_tables
-WHERE Identifier = '<LocalGatewayRouteTableId>'
+WHERE Identifier = '{{ local_gateway_route_table_id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/ec2/local_gateway_route_tablevpc_associations/index.md b/website/docs/services/ec2/local_gateway_route_tablevpc_associations/index.md
index 1cf11a1bb..66a59a3a1 100644
--- a/website/docs/services/ec2/local_gateway_route_tablevpc_associations/index.md
+++ b/website/docs/services/ec2/local_gateway_route_tablevpc_associations/index.md
@@ -176,7 +176,7 @@ state,
 vpc_id,
 tags
 FROM awscc.ec2.local_gateway_route_tablevpc_associations
-WHERE region = 'us-east-1' AND Identifier = '<LocalGatewayRouteTableVpcAssociationId>';
+WHERE region = 'us-east-1' AND Identifier = '{{ local_gateway_route_table_vpc_association_id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -213,9 +213,9 @@ INSERT INTO awscc.ec2.local_gateway_route_tablevpc_associations (
  VpcId,
  region
 )
-SELECT 
-'{{ LocalGatewayRouteTableId }}',
- '{{ VpcId }}',
+SELECT
+'{{ local_gateway_route_table_id }}',
+ '{{ vpc_id }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -229,10 +229,10 @@ INSERT INTO awscc.ec2.local_gateway_route_tablevpc_associations (
  Tags,
  region
 )
-SELECT 
- '{{ LocalGatewayRouteTableId }}',
- '{{ VpcId }}',
- '{{ Tags }}',
+SELECT
+ '{{ local_gateway_route_table_id }}',
+ '{{ vpc_id }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -250,15 +250,14 @@ globals:
 resources:
   - name: local_gateway_route_tablevpc_association
     props:
-      - name: LocalGatewayRouteTableId
-        value: '{{ LocalGatewayRouteTableId }}'
-      - name: VpcId
-        value: '{{ VpcId }}'
-      - name: Tags
+      - name: local_gateway_route_table_id
+        value: '{{ local_gateway_route_table_id }}'
+      - name: vpc_id
+        value: '{{ vpc_id }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -274,7 +273,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<LocalGatewayRouteTableVpcAssociationId>';
+AND Identifier = '{{ local_gateway_route_table_vpc_association_id }}';
 ```
 
 
@@ -283,7 +282,7 @@ AND Identifier = '<LocalGatewayRouteTableVpcAssociationId>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.ec2.local_gateway_route_tablevpc_associations
-WHERE Identifier = '<LocalGatewayRouteTableVpcAssociationId>'
+WHERE Identifier = '{{ local_gateway_route_table_vpc_association_id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/ec2/local_gateway_routes/index.md b/website/docs/services/ec2/local_gateway_routes/index.md
index 85c32c43e..bed97800b 100644
--- a/website/docs/services/ec2/local_gateway_routes/index.md
+++ b/website/docs/services/ec2/local_gateway_routes/index.md
@@ -169,7 +169,7 @@ network_interface_id,
 state,
 type
 FROM awscc.ec2.local_gateway_routes
-WHERE region = 'us-east-1' AND Identifier = '<DestinationCidrBlock>|<LocalGatewayRouteTableId>';
+WHERE region = 'us-east-1' AND Identifier = '{{ destination_cidr_block }}|{{ local_gateway_route_table_id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -209,11 +209,11 @@ INSERT INTO awscc.ec2.local_gateway_routes (
  NetworkInterfaceId,
  region
 )
-SELECT 
-'{{ DestinationCidrBlock }}',
- '{{ LocalGatewayRouteTableId }}',
- '{{ LocalGatewayVirtualInterfaceGroupId }}',
- '{{ NetworkInterfaceId }}',
+SELECT
+'{{ destination_cidr_block }}',
+ '{{ local_gateway_route_table_id }}',
+ '{{ local_gateway_virtual_interface_group_id }}',
+ '{{ network_interface_id }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -228,11 +228,11 @@ INSERT INTO awscc.ec2.local_gateway_routes (
  NetworkInterfaceId,
  region
 )
-SELECT 
- '{{ DestinationCidrBlock }}',
- '{{ LocalGatewayRouteTableId }}',
- '{{ LocalGatewayVirtualInterfaceGroupId }}',
- '{{ NetworkInterfaceId }}',
+SELECT
+ '{{ destination_cidr_block }}',
+ '{{ local_gateway_route_table_id }}',
+ '{{ local_gateway_virtual_interface_group_id }}',
+ '{{ network_interface_id }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -250,15 +250,14 @@ globals:
 resources:
   - name: local_gateway_route
     props:
-      - name: DestinationCidrBlock
-        value: '{{ DestinationCidrBlock }}'
-      - name: LocalGatewayRouteTableId
-        value: '{{ LocalGatewayRouteTableId }}'
-      - name: LocalGatewayVirtualInterfaceGroupId
-        value: '{{ LocalGatewayVirtualInterfaceGroupId }}'
-      - name: NetworkInterfaceId
-        value: '{{ NetworkInterfaceId }}'
-
+      - name: destination_cidr_block
+        value: '{{ destination_cidr_block }}'
+      - name: local_gateway_route_table_id
+        value: '{{ local_gateway_route_table_id }}'
+      - name: local_gateway_virtual_interface_group_id
+        value: '{{ local_gateway_virtual_interface_group_id }}'
+      - name: network_interface_id
+        value: '{{ network_interface_id }}'
 ```
 </TabItem>
 </Tabs>
@@ -275,7 +274,7 @@ SET PatchDocument = string('{{ {
     "NetworkInterfaceId": network_interface_id
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<DestinationCidrBlock>|<LocalGatewayRouteTableId>';
+AND Identifier = '{{ destination_cidr_block }}|{{ local_gateway_route_table_id }}';
 ```
 
 
@@ -284,7 +283,7 @@ AND Identifier = '<DestinationCidrBlock>|<LocalGatewayRouteTableId>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.ec2.local_gateway_routes
-WHERE Identifier = '<DestinationCidrBlock|LocalGatewayRouteTableId>'
+WHERE Identifier = '{{ destination_cidr_block }}|{{ local_gateway_route_table_id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/ec2/nat_gateways/index.md b/website/docs/services/ec2/nat_gateways/index.md
index 72b8b39f0..a0622fe1f 100644
--- a/website/docs/services/ec2/nat_gateways/index.md
+++ b/website/docs/services/ec2/nat_gateways/index.md
@@ -200,7 +200,7 @@ nat_gateway_id,
 tags,
 max_drain_duration_seconds
 FROM awscc.ec2.nat_gateways
-WHERE region = 'us-east-1' AND Identifier = '<NatGatewayId>';
+WHERE region = 'us-east-1' AND Identifier = '{{ nat_gateway_id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -244,16 +244,16 @@ INSERT INTO awscc.ec2.nat_gateways (
  MaxDrainDurationSeconds,
  region
 )
-SELECT 
-'{{ SecondaryAllocationIds }}',
- '{{ PrivateIpAddress }}',
- '{{ SecondaryPrivateIpAddressCount }}',
- '{{ AllocationId }}',
- '{{ SubnetId }}',
- '{{ ConnectivityType }}',
- '{{ SecondaryPrivateIpAddresses }}',
- '{{ Tags }}',
- '{{ MaxDrainDurationSeconds }}',
+SELECT
+'{{ secondary_allocation_ids }}',
+ '{{ private_ip_address }}',
+ '{{ secondary_private_ip_address_count }}',
+ '{{ allocation_id }}',
+ '{{ subnet_id }}',
+ '{{ connectivity_type }}',
+ '{{ secondary_private_ip_addresses }}',
+ '{{ tags }}',
+ '{{ max_drain_duration_seconds }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -273,16 +273,16 @@ INSERT INTO awscc.ec2.nat_gateways (
  MaxDrainDurationSeconds,
  region
 )
-SELECT 
- '{{ SecondaryAllocationIds }}',
- '{{ PrivateIpAddress }}',
- '{{ SecondaryPrivateIpAddressCount }}',
- '{{ AllocationId }}',
- '{{ SubnetId }}',
- '{{ ConnectivityType }}',
- '{{ SecondaryPrivateIpAddresses }}',
- '{{ Tags }}',
- '{{ MaxDrainDurationSeconds }}',
+SELECT
+ '{{ secondary_allocation_ids }}',
+ '{{ private_ip_address }}',
+ '{{ secondary_private_ip_address_count }}',
+ '{{ allocation_id }}',
+ '{{ subnet_id }}',
+ '{{ connectivity_type }}',
+ '{{ secondary_private_ip_addresses }}',
+ '{{ tags }}',
+ '{{ max_drain_duration_seconds }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -300,29 +300,28 @@ globals:
 resources:
   - name: nat_gateway
     props:
-      - name: SecondaryAllocationIds
+      - name: secondary_allocation_ids
         value:
-          - '{{ SecondaryAllocationIds[0] }}'
-      - name: PrivateIpAddress
-        value: '{{ PrivateIpAddress }}'
-      - name: SecondaryPrivateIpAddressCount
-        value: '{{ SecondaryPrivateIpAddressCount }}'
-      - name: AllocationId
-        value: '{{ AllocationId }}'
-      - name: SubnetId
-        value: '{{ SubnetId }}'
-      - name: ConnectivityType
-        value: '{{ ConnectivityType }}'
-      - name: SecondaryPrivateIpAddresses
+          - '{{ secondary_allocation_ids[0] }}'
+      - name: private_ip_address
+        value: '{{ private_ip_address }}'
+      - name: secondary_private_ip_address_count
+        value: '{{ secondary_private_ip_address_count }}'
+      - name: allocation_id
+        value: '{{ allocation_id }}'
+      - name: subnet_id
+        value: '{{ subnet_id }}'
+      - name: connectivity_type
+        value: '{{ connectivity_type }}'
+      - name: secondary_private_ip_addresses
         value:
-          - '{{ SecondaryPrivateIpAddresses[0] }}'
-      - name: Tags
+          - '{{ secondary_private_ip_addresses[0] }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-      - name: MaxDrainDurationSeconds
-        value: '{{ MaxDrainDurationSeconds }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
+      - name: max_drain_duration_seconds
+        value: '{{ max_drain_duration_seconds }}'
 ```
 </TabItem>
 </Tabs>
@@ -342,7 +341,7 @@ SET PatchDocument = string('{{ {
     "MaxDrainDurationSeconds": max_drain_duration_seconds
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<NatGatewayId>';
+AND Identifier = '{{ nat_gateway_id }}';
 ```
 
 
@@ -351,7 +350,7 @@ AND Identifier = '<NatGatewayId>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.ec2.nat_gateways
-WHERE Identifier = '<NatGatewayId>'
+WHERE Identifier = '{{ nat_gateway_id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/ec2/network_acls/index.md b/website/docs/services/ec2/network_acls/index.md
index e47e6532c..64ebbb4ba 100644
--- a/website/docs/services/ec2/network_acls/index.md
+++ b/website/docs/services/ec2/network_acls/index.md
@@ -158,7 +158,7 @@ vpc_id,
 id,
 tags
 FROM awscc.ec2.network_acls
-WHERE region = 'us-east-1' AND Identifier = '<Id>';
+WHERE region = 'us-east-1' AND Identifier = '{{ id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -194,8 +194,8 @@ INSERT INTO awscc.ec2.network_acls (
  VpcId,
  region
 )
-SELECT 
-'{{ VpcId }}',
+SELECT
+'{{ vpc_id }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -208,9 +208,9 @@ INSERT INTO awscc.ec2.network_acls (
  Tags,
  region
 )
-SELECT 
- '{{ VpcId }}',
- '{{ Tags }}',
+SELECT
+ '{{ vpc_id }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -228,13 +228,12 @@ globals:
 resources:
   - name: network_acl
     props:
-      - name: VpcId
-        value: '{{ VpcId }}'
-      - name: Tags
+      - name: vpc_id
+        value: '{{ vpc_id }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -250,7 +249,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Id>';
+AND Identifier = '{{ id }}';
 ```
 
 
@@ -259,7 +258,7 @@ AND Identifier = '<Id>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.ec2.network_acls
-WHERE Identifier = '<Id>'
+WHERE Identifier = '{{ id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/ec2/network_insights_access_scope_analyses/index.md b/website/docs/services/ec2/network_insights_access_scope_analyses/index.md
index 91d149ced..fab7742cc 100644
--- a/website/docs/services/ec2/network_insights_access_scope_analyses/index.md
+++ b/website/docs/services/ec2/network_insights_access_scope_analyses/index.md
@@ -200,7 +200,7 @@ findings_found,
 analyzed_eni_count,
 tags
 FROM awscc.ec2.network_insights_access_scope_analyses
-WHERE region = 'us-east-1' AND Identifier = '<NetworkInsightsAccessScopeAnalysisId>';
+WHERE region = 'us-east-1' AND Identifier = '{{ network_insights_access_scope_analysis_id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -236,8 +236,8 @@ INSERT INTO awscc.ec2.network_insights_access_scope_analyses (
  NetworkInsightsAccessScopeId,
  region
 )
-SELECT 
-'{{ NetworkInsightsAccessScopeId }}',
+SELECT
+'{{ network_insights_access_scope_id }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -250,9 +250,9 @@ INSERT INTO awscc.ec2.network_insights_access_scope_analyses (
  Tags,
  region
 )
-SELECT 
- '{{ NetworkInsightsAccessScopeId }}',
- '{{ Tags }}',
+SELECT
+ '{{ network_insights_access_scope_id }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -270,13 +270,12 @@ globals:
 resources:
   - name: network_insights_access_scope_analysis
     props:
-      - name: NetworkInsightsAccessScopeId
-        value: '{{ NetworkInsightsAccessScopeId }}'
-      - name: Tags
+      - name: network_insights_access_scope_id
+        value: '{{ network_insights_access_scope_id }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -292,7 +291,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<NetworkInsightsAccessScopeAnalysisId>';
+AND Identifier = '{{ network_insights_access_scope_analysis_id }}';
 ```
 
 
@@ -301,7 +300,7 @@ AND Identifier = '<NetworkInsightsAccessScopeAnalysisId>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.ec2.network_insights_access_scope_analyses
-WHERE Identifier = '<NetworkInsightsAccessScopeAnalysisId>'
+WHERE Identifier = '{{ network_insights_access_scope_analysis_id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/ec2/network_insights_access_scopes/index.md b/website/docs/services/ec2/network_insights_access_scopes/index.md
index 43df82c66..6f3716bf7 100644
--- a/website/docs/services/ec2/network_insights_access_scopes/index.md
+++ b/website/docs/services/ec2/network_insights_access_scopes/index.md
@@ -274,7 +274,7 @@ tags,
 match_paths,
 exclude_paths
 FROM awscc.ec2.network_insights_access_scopes
-WHERE region = 'us-east-1' AND Identifier = '<NetworkInsightsAccessScopeId>';
+WHERE region = 'us-east-1' AND Identifier = '{{ network_insights_access_scope_id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -312,10 +312,10 @@ INSERT INTO awscc.ec2.network_insights_access_scopes (
  ExcludePaths,
  region
 )
-SELECT 
-'{{ Tags }}',
- '{{ MatchPaths }}',
- '{{ ExcludePaths }}',
+SELECT
+'{{ tags }}',
+ '{{ match_paths }}',
+ '{{ exclude_paths }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -329,10 +329,10 @@ INSERT INTO awscc.ec2.network_insights_access_scopes (
  ExcludePaths,
  region
 )
-SELECT 
- '{{ Tags }}',
- '{{ MatchPaths }}',
- '{{ ExcludePaths }}',
+SELECT
+ '{{ tags }}',
+ '{{ match_paths }}',
+ '{{ exclude_paths }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -350,40 +350,39 @@ globals:
 resources:
   - name: network_insights_access_scope
     props:
-      - name: Tags
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-      - name: MatchPaths
+          - key: '{{ key }}'
+            value: '{{ value }}'
+      - name: match_paths
         value:
-          - Source:
-              PacketHeaderStatement:
-                SourceAddresses:
-                  - '{{ SourceAddresses[0] }}'
-                DestinationAddresses:
-                  - '{{ DestinationAddresses[0] }}'
-                SourcePorts:
-                  - '{{ SourcePorts[0] }}'
-                DestinationPorts:
-                  - '{{ DestinationPorts[0] }}'
-                SourcePrefixLists:
-                  - '{{ SourcePrefixLists[0] }}'
-                DestinationPrefixLists:
-                  - '{{ DestinationPrefixLists[0] }}'
-                Protocols:
-                  - '{{ Protocols[0] }}'
-              ResourceStatement:
-                Resources:
-                  - '{{ Resources[0] }}'
-                ResourceTypes:
-                  - '{{ ResourceTypes[0] }}'
-            Destination: null
-            ThroughResources:
-              - ResourceStatement: null
-      - name: ExcludePaths
+          - source:
+              packet_header_statement:
+                source_addresses:
+                  - '{{ source_addresses[0] }}'
+                destination_addresses:
+                  - '{{ destination_addresses[0] }}'
+                source_ports:
+                  - '{{ source_ports[0] }}'
+                destination_ports:
+                  - '{{ destination_ports[0] }}'
+                source_prefix_lists:
+                  - '{{ source_prefix_lists[0] }}'
+                destination_prefix_lists:
+                  - '{{ destination_prefix_lists[0] }}'
+                protocols:
+                  - '{{ protocols[0] }}'
+              resource_statement:
+                resources:
+                  - '{{ resources[0] }}'
+                resource_types:
+                  - '{{ resource_types[0] }}'
+            destination: null
+            through_resources:
+              - resource_statement: null
+      - name: exclude_paths
         value:
           - null
-
 ```
 </TabItem>
 </Tabs>
@@ -399,7 +398,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<NetworkInsightsAccessScopeId>';
+AND Identifier = '{{ network_insights_access_scope_id }}';
 ```
 
 
@@ -408,7 +407,7 @@ AND Identifier = '<NetworkInsightsAccessScopeId>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.ec2.network_insights_access_scopes
-WHERE Identifier = '<NetworkInsightsAccessScopeId>'
+WHERE Identifier = '{{ network_insights_access_scope_id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/ec2/network_insights_analyses/index.md b/website/docs/services/ec2/network_insights_analyses/index.md
index fd3e283b1..ece5852ed 100644
--- a/website/docs/services/ec2/network_insights_analyses/index.md
+++ b/website/docs/services/ec2/network_insights_analyses/index.md
@@ -1109,7 +1109,7 @@ forward_path_components,
 additional_accounts,
 tags
 FROM awscc.ec2.network_insights_analyses
-WHERE region = 'us-east-1' AND Identifier = '<NetworkInsightsAnalysisId>';
+WHERE region = 'us-east-1' AND Identifier = '{{ network_insights_analysis_id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -1145,8 +1145,8 @@ INSERT INTO awscc.ec2.network_insights_analyses (
  NetworkInsightsPathId,
  region
 )
-SELECT 
-'{{ NetworkInsightsPathId }}',
+SELECT
+'{{ network_insights_path_id }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -1162,12 +1162,12 @@ INSERT INTO awscc.ec2.network_insights_analyses (
  Tags,
  region
 )
-SELECT 
- '{{ FilterOutArns }}',
- '{{ NetworkInsightsPathId }}',
- '{{ FilterInArns }}',
- '{{ AdditionalAccounts }}',
- '{{ Tags }}',
+SELECT
+ '{{ filter_out_arns }}',
+ '{{ network_insights_path_id }}',
+ '{{ filter_in_arns }}',
+ '{{ additional_accounts }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -1185,22 +1185,21 @@ globals:
 resources:
   - name: network_insights_analysis
     props:
-      - name: FilterOutArns
+      - name: filter_out_arns
         value:
-          - '{{ FilterOutArns[0] }}'
-      - name: NetworkInsightsPathId
-        value: '{{ NetworkInsightsPathId }}'
-      - name: FilterInArns
+          - '{{ filter_out_arns[0] }}'
+      - name: network_insights_path_id
+        value: '{{ network_insights_path_id }}'
+      - name: filter_in_arns
         value:
           - null
-      - name: AdditionalAccounts
+      - name: additional_accounts
         value:
-          - '{{ AdditionalAccounts[0] }}'
-      - name: Tags
+          - '{{ additional_accounts[0] }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -1217,7 +1216,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<NetworkInsightsAnalysisId>';
+AND Identifier = '{{ network_insights_analysis_id }}';
 ```
 
 
@@ -1226,7 +1225,7 @@ AND Identifier = '<NetworkInsightsAnalysisId>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.ec2.network_insights_analyses
-WHERE Identifier = '<NetworkInsightsAnalysisId>'
+WHERE Identifier = '{{ network_insights_analysis_id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/ec2/network_insights_paths/index.md b/website/docs/services/ec2/network_insights_paths/index.md
index f9ae5aabc..fede92c08 100644
--- a/website/docs/services/ec2/network_insights_paths/index.md
+++ b/website/docs/services/ec2/network_insights_paths/index.md
@@ -233,7 +233,7 @@ protocol,
 destination_port,
 tags
 FROM awscc.ec2.network_insights_paths
-WHERE region = 'us-east-1' AND Identifier = '<NetworkInsightsPathId>';
+WHERE region = 'us-east-1' AND Identifier = '{{ network_insights_path_id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -270,9 +270,9 @@ INSERT INTO awscc.ec2.network_insights_paths (
  Protocol,
  region
 )
-SELECT 
-'{{ Source }}',
- '{{ Protocol }}',
+SELECT
+'{{ source }}',
+ '{{ protocol }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -292,16 +292,16 @@ INSERT INTO awscc.ec2.network_insights_paths (
  Tags,
  region
 )
-SELECT 
- '{{ SourceIp }}',
- '{{ FilterAtSource }}',
- '{{ FilterAtDestination }}',
- '{{ DestinationIp }}',
- '{{ Source }}',
- '{{ Destination }}',
- '{{ Protocol }}',
- '{{ DestinationPort }}',
- '{{ Tags }}',
+SELECT
+ '{{ source_ip }}',
+ '{{ filter_at_source }}',
+ '{{ filter_at_destination }}',
+ '{{ destination_ip }}',
+ '{{ source }}',
+ '{{ destination }}',
+ '{{ protocol }}',
+ '{{ destination_port }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -319,33 +319,32 @@ globals:
 resources:
   - name: network_insights_path
     props:
-      - name: SourceIp
-        value: '{{ SourceIp }}'
-      - name: FilterAtSource
+      - name: source_ip
+        value: '{{ source_ip }}'
+      - name: filter_at_source
         value:
-          SourceAddress: null
-          SourcePortRange:
-            FromPort: '{{ FromPort }}'
-            ToPort: '{{ ToPort }}'
-          DestinationAddress: null
-          DestinationPortRange: null
-      - name: FilterAtDestination
+          source_address: null
+          source_port_range:
+            from_port: '{{ from_port }}'
+            to_port: '{{ to_port }}'
+          destination_address: null
+          destination_port_range: null
+      - name: filter_at_destination
         value: null
-      - name: DestinationIp
+      - name: destination_ip
         value: null
-      - name: Source
-        value: '{{ Source }}'
-      - name: Destination
-        value: '{{ Destination }}'
-      - name: Protocol
-        value: '{{ Protocol }}'
-      - name: DestinationPort
-        value: '{{ DestinationPort }}'
-      - name: Tags
+      - name: source
+        value: '{{ source }}'
+      - name: destination
+        value: '{{ destination }}'
+      - name: protocol
+        value: '{{ protocol }}'
+      - name: destination_port
+        value: '{{ destination_port }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -361,7 +360,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<NetworkInsightsPathId>';
+AND Identifier = '{{ network_insights_path_id }}';
 ```
 
 
@@ -370,7 +369,7 @@ AND Identifier = '<NetworkInsightsPathId>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.ec2.network_insights_paths
-WHERE Identifier = '<NetworkInsightsPathId>'
+WHERE Identifier = '{{ network_insights_path_id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/ec2/network_interface_attachments/index.md b/website/docs/services/ec2/network_interface_attachments/index.md
index a49f4d029..9c059f837 100644
--- a/website/docs/services/ec2/network_interface_attachments/index.md
+++ b/website/docs/services/ec2/network_interface_attachments/index.md
@@ -183,7 +183,7 @@ instance_id,
 network_interface_id,
 ena_srd_specification
 FROM awscc.ec2.network_interface_attachments
-WHERE region = 'us-east-1' AND Identifier = '<AttachmentId>';
+WHERE region = 'us-east-1' AND Identifier = '{{ attachment_id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -221,10 +221,10 @@ INSERT INTO awscc.ec2.network_interface_attachments (
  NetworkInterfaceId,
  region
 )
-SELECT 
-'{{ DeviceIndex }}',
- '{{ InstanceId }}',
- '{{ NetworkInterfaceId }}',
+SELECT
+'{{ device_index }}',
+ '{{ instance_id }}',
+ '{{ network_interface_id }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -240,12 +240,12 @@ INSERT INTO awscc.ec2.network_interface_attachments (
  EnaSrdSpecification,
  region
 )
-SELECT 
- '{{ DeleteOnTermination }}',
- '{{ DeviceIndex }}',
- '{{ InstanceId }}',
- '{{ NetworkInterfaceId }}',
- '{{ EnaSrdSpecification }}',
+SELECT
+ '{{ delete_on_termination }}',
+ '{{ device_index }}',
+ '{{ instance_id }}',
+ '{{ network_interface_id }}',
+ '{{ ena_srd_specification }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -263,20 +263,19 @@ globals:
 resources:
   - name: network_interface_attachment
     props:
-      - name: DeleteOnTermination
-        value: '{{ DeleteOnTermination }}'
-      - name: DeviceIndex
-        value: '{{ DeviceIndex }}'
-      - name: InstanceId
-        value: '{{ InstanceId }}'
-      - name: NetworkInterfaceId
-        value: '{{ NetworkInterfaceId }}'
-      - name: EnaSrdSpecification
+      - name: delete_on_termination
+        value: '{{ delete_on_termination }}'
+      - name: device_index
+        value: '{{ device_index }}'
+      - name: instance_id
+        value: '{{ instance_id }}'
+      - name: network_interface_id
+        value: '{{ network_interface_id }}'
+      - name: ena_srd_specification
         value:
-          EnaSrdEnabled: '{{ EnaSrdEnabled }}'
-          EnaSrdUdpSpecification:
-            EnaSrdUdpEnabled: '{{ EnaSrdUdpEnabled }}'
-
+          ena_srd_enabled: '{{ ena_srd_enabled }}'
+          ena_srd_udp_specification:
+            ena_srd_udp_enabled: '{{ ena_srd_udp_enabled }}'
 ```
 </TabItem>
 </Tabs>
@@ -293,7 +292,7 @@ SET PatchDocument = string('{{ {
     "EnaSrdSpecification": ena_srd_specification
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<AttachmentId>';
+AND Identifier = '{{ attachment_id }}';
 ```
 
 
@@ -302,7 +301,7 @@ AND Identifier = '<AttachmentId>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.ec2.network_interface_attachments
-WHERE Identifier = '<AttachmentId>'
+WHERE Identifier = '{{ attachment_id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/ec2/network_interfaces/index.md b/website/docs/services/ec2/network_interfaces/index.md
index 8feda3104..0bd03d19d 100644
--- a/website/docs/services/ec2/network_interfaces/index.md
+++ b/website/docs/services/ec2/network_interfaces/index.md
@@ -322,7 +322,7 @@ id,
 tags,
 connection_tracking_specification
 FROM awscc.ec2.network_interfaces
-WHERE region = 'us-east-1' AND Identifier = '<Id>';
+WHERE region = 'us-east-1' AND Identifier = '{{ id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -358,8 +358,8 @@ INSERT INTO awscc.ec2.network_interfaces (
  SubnetId,
  region
 )
-SELECT 
-'{{ SubnetId }}',
+SELECT
+'{{ subnet_id }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -387,24 +387,24 @@ INSERT INTO awscc.ec2.network_interfaces (
  ConnectionTrackingSpecification,
  region
 )
-SELECT 
- '{{ Description }}',
- '{{ PrivateIpAddress }}',
- '{{ PrivateIpAddresses }}',
- '{{ SecondaryPrivateIpAddressCount }}',
- '{{ Ipv6PrefixCount }}',
- '{{ Ipv4Prefixes }}',
- '{{ Ipv4PrefixCount }}',
- '{{ EnablePrimaryIpv6 }}',
- '{{ GroupSet }}',
- '{{ Ipv6Addresses }}',
- '{{ Ipv6Prefixes }}',
- '{{ SubnetId }}',
- '{{ SourceDestCheck }}',
- '{{ InterfaceType }}',
- '{{ Ipv6AddressCount }}',
- '{{ Tags }}',
- '{{ ConnectionTrackingSpecification }}',
+SELECT
+ '{{ description }}',
+ '{{ private_ip_address }}',
+ '{{ private_ip_addresses }}',
+ '{{ secondary_private_ip_address_count }}',
+ '{{ ipv6_prefix_count }}',
+ '{{ ipv4_prefixes }}',
+ '{{ ipv4_prefix_count }}',
+ '{{ enable_primary_ipv6 }}',
+ '{{ group_set }}',
+ '{{ ipv6_addresses }}',
+ '{{ ipv6_prefixes }}',
+ '{{ subnet_id }}',
+ '{{ source_dest_check }}',
+ '{{ interface_type }}',
+ '{{ ipv6_address_count }}',
+ '{{ tags }}',
+ '{{ connection_tracking_specification }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -422,52 +422,51 @@ globals:
 resources:
   - name: network_interface
     props:
-      - name: Description
-        value: '{{ Description }}'
-      - name: PrivateIpAddress
-        value: '{{ PrivateIpAddress }}'
-      - name: PrivateIpAddresses
+      - name: description
+        value: '{{ description }}'
+      - name: private_ip_address
+        value: '{{ private_ip_address }}'
+      - name: private_ip_addresses
         value:
-          - Primary: '{{ Primary }}'
-            PrivateIpAddress: '{{ PrivateIpAddress }}'
-      - name: SecondaryPrivateIpAddressCount
-        value: '{{ SecondaryPrivateIpAddressCount }}'
-      - name: Ipv6PrefixCount
-        value: '{{ Ipv6PrefixCount }}'
-      - name: Ipv4Prefixes
+          - primary: '{{ primary }}'
+            private_ip_address: '{{ private_ip_address }}'
+      - name: secondary_private_ip_address_count
+        value: '{{ secondary_private_ip_address_count }}'
+      - name: ipv6_prefix_count
+        value: '{{ ipv6_prefix_count }}'
+      - name: ipv4_prefixes
         value:
-          - Ipv4Prefix: '{{ Ipv4Prefix }}'
-      - name: Ipv4PrefixCount
-        value: '{{ Ipv4PrefixCount }}'
-      - name: EnablePrimaryIpv6
-        value: '{{ EnablePrimaryIpv6 }}'
-      - name: GroupSet
+          - ipv4_prefix: '{{ ipv4_prefix }}'
+      - name: ipv4_prefix_count
+        value: '{{ ipv4_prefix_count }}'
+      - name: enable_primary_ipv6
+        value: '{{ enable_primary_ipv6 }}'
+      - name: group_set
         value:
-          - '{{ GroupSet[0] }}'
-      - name: Ipv6Addresses
+          - '{{ group_set[0] }}'
+      - name: ipv6_addresses
         value:
-          - Ipv6Address: '{{ Ipv6Address }}'
-      - name: Ipv6Prefixes
+          - ipv6_address: '{{ ipv6_address }}'
+      - name: ipv6_prefixes
         value:
-          - Ipv6Prefix: '{{ Ipv6Prefix }}'
-      - name: SubnetId
-        value: '{{ SubnetId }}'
-      - name: SourceDestCheck
-        value: '{{ SourceDestCheck }}'
-      - name: InterfaceType
-        value: '{{ InterfaceType }}'
-      - name: Ipv6AddressCount
-        value: '{{ Ipv6AddressCount }}'
-      - name: Tags
+          - ipv6_prefix: '{{ ipv6_prefix }}'
+      - name: subnet_id
+        value: '{{ subnet_id }}'
+      - name: source_dest_check
+        value: '{{ source_dest_check }}'
+      - name: interface_type
+        value: '{{ interface_type }}'
+      - name: ipv6_address_count
+        value: '{{ ipv6_address_count }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-      - name: ConnectionTrackingSpecification
+          - key: '{{ key }}'
+            value: '{{ value }}'
+      - name: connection_tracking_specification
         value:
-          UdpTimeout: '{{ UdpTimeout }}'
-          TcpEstablishedTimeout: '{{ TcpEstablishedTimeout }}'
-          UdpStreamTimeout: '{{ UdpStreamTimeout }}'
-
+          udp_timeout: '{{ udp_timeout }}'
+          tcp_established_timeout: '{{ tcp_established_timeout }}'
+          udp_stream_timeout: '{{ udp_stream_timeout }}'
 ```
 </TabItem>
 </Tabs>
@@ -496,7 +495,7 @@ SET PatchDocument = string('{{ {
     "ConnectionTrackingSpecification": connection_tracking_specification
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Id>';
+AND Identifier = '{{ id }}';
 ```
 
 
@@ -505,7 +504,7 @@ AND Identifier = '<Id>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.ec2.network_interfaces
-WHERE Identifier = '<Id>'
+WHERE Identifier = '{{ id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/ec2/network_performance_metric_subscriptions/index.md b/website/docs/services/ec2/network_performance_metric_subscriptions/index.md
index db9985577..02832ba27 100644
--- a/website/docs/services/ec2/network_performance_metric_subscriptions/index.md
+++ b/website/docs/services/ec2/network_performance_metric_subscriptions/index.md
@@ -161,7 +161,7 @@ destination,
 metric,
 statistic
 FROM awscc.ec2.network_performance_metric_subscriptions
-WHERE region = 'us-east-1' AND Identifier = '<Source>|<Destination>|<Metric>|<Statistic>';
+WHERE region = 'us-east-1' AND Identifier = '{{ source }}|{{ destination }}|{{ metric }}|{{ statistic }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -203,11 +203,11 @@ INSERT INTO awscc.ec2.network_performance_metric_subscriptions (
  Statistic,
  region
 )
-SELECT 
-'{{ Source }}',
- '{{ Destination }}',
- '{{ Metric }}',
- '{{ Statistic }}',
+SELECT
+'{{ source }}',
+ '{{ destination }}',
+ '{{ metric }}',
+ '{{ statistic }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -222,11 +222,11 @@ INSERT INTO awscc.ec2.network_performance_metric_subscriptions (
  Statistic,
  region
 )
-SELECT 
- '{{ Source }}',
- '{{ Destination }}',
- '{{ Metric }}',
- '{{ Statistic }}',
+SELECT
+ '{{ source }}',
+ '{{ destination }}',
+ '{{ metric }}',
+ '{{ statistic }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -244,15 +244,14 @@ globals:
 resources:
   - name: network_performance_metric_subscription
     props:
-      - name: Source
-        value: '{{ Source }}'
-      - name: Destination
-        value: '{{ Destination }}'
-      - name: Metric
-        value: '{{ Metric }}'
-      - name: Statistic
-        value: '{{ Statistic }}'
-
+      - name: source
+        value: '{{ source }}'
+      - name: destination
+        value: '{{ destination }}'
+      - name: metric
+        value: '{{ metric }}'
+      - name: statistic
+        value: '{{ statistic }}'
 ```
 </TabItem>
 </Tabs>
@@ -263,7 +262,7 @@ resources:
 ```sql
 /*+ delete */
 DELETE FROM awscc.ec2.network_performance_metric_subscriptions
-WHERE Identifier = '<Source|Destination|Metric|Statistic>'
+WHERE Identifier = '{{ source }}|{{ destination }}|{{ metric }}|{{ statistic }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/ec2/placement_groups/index.md b/website/docs/services/ec2/placement_groups/index.md
index 49680eb8d..562f04538 100644
--- a/website/docs/services/ec2/placement_groups/index.md
+++ b/website/docs/services/ec2/placement_groups/index.md
@@ -164,7 +164,7 @@ spread_level,
 partition_count,
 tags
 FROM awscc.ec2.placement_groups
-WHERE region = 'us-east-1' AND Identifier = '<GroupName>';
+WHERE region = 'us-east-1' AND Identifier = '{{ group_name }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -203,11 +203,11 @@ INSERT INTO awscc.ec2.placement_groups (
  Tags,
  region
 )
-SELECT 
-'{{ Strategy }}',
- '{{ SpreadLevel }}',
- '{{ PartitionCount }}',
- '{{ Tags }}',
+SELECT
+'{{ strategy }}',
+ '{{ spread_level }}',
+ '{{ partition_count }}',
+ '{{ tags }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -222,11 +222,11 @@ INSERT INTO awscc.ec2.placement_groups (
  Tags,
  region
 )
-SELECT 
- '{{ Strategy }}',
- '{{ SpreadLevel }}',
- '{{ PartitionCount }}',
- '{{ Tags }}',
+SELECT
+ '{{ strategy }}',
+ '{{ spread_level }}',
+ '{{ partition_count }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -244,17 +244,16 @@ globals:
 resources:
   - name: placement_group
     props:
-      - name: Strategy
-        value: '{{ Strategy }}'
-      - name: SpreadLevel
-        value: '{{ SpreadLevel }}'
-      - name: PartitionCount
-        value: '{{ PartitionCount }}'
-      - name: Tags
+      - name: strategy
+        value: '{{ strategy }}'
+      - name: spread_level
+        value: '{{ spread_level }}'
+      - name: partition_count
+        value: '{{ partition_count }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -265,7 +264,7 @@ resources:
 ```sql
 /*+ delete */
 DELETE FROM awscc.ec2.placement_groups
-WHERE Identifier = '<GroupName>'
+WHERE Identifier = '{{ group_name }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/ec2/prefix_lists/index.md b/website/docs/services/ec2/prefix_lists/index.md
index 1ae54328e..1f0cf5801 100644
--- a/website/docs/services/ec2/prefix_lists/index.md
+++ b/website/docs/services/ec2/prefix_lists/index.md
@@ -206,7 +206,7 @@ tags,
 entries,
 arn
 FROM awscc.ec2.prefix_lists
-WHERE region = 'us-east-1' AND Identifier = '<PrefixListId>';
+WHERE region = 'us-east-1' AND Identifier = '{{ prefix_list_id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -243,9 +243,9 @@ INSERT INTO awscc.ec2.prefix_lists (
  AddressFamily,
  region
 )
-SELECT 
-'{{ PrefixListName }}',
- '{{ AddressFamily }}',
+SELECT
+'{{ prefix_list_name }}',
+ '{{ address_family }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -261,12 +261,12 @@ INSERT INTO awscc.ec2.prefix_lists (
  Entries,
  region
 )
-SELECT 
- '{{ PrefixListName }}',
- '{{ AddressFamily }}',
- '{{ MaxEntries }}',
- '{{ Tags }}',
- '{{ Entries }}',
+SELECT
+ '{{ prefix_list_name }}',
+ '{{ address_family }}',
+ '{{ max_entries }}',
+ '{{ tags }}',
+ '{{ entries }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -284,21 +284,20 @@ globals:
 resources:
   - name: prefix_list
     props:
-      - name: PrefixListName
-        value: '{{ PrefixListName }}'
-      - name: AddressFamily
-        value: '{{ AddressFamily }}'
-      - name: MaxEntries
-        value: '{{ MaxEntries }}'
-      - name: Tags
+      - name: prefix_list_name
+        value: '{{ prefix_list_name }}'
+      - name: address_family
+        value: '{{ address_family }}'
+      - name: max_entries
+        value: '{{ max_entries }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-      - name: Entries
+          - key: '{{ key }}'
+            value: '{{ value }}'
+      - name: entries
         value:
-          - Cidr: '{{ Cidr }}'
-            Description: '{{ Description }}'
-
+          - cidr: '{{ cidr }}'
+            description: '{{ description }}'
 ```
 </TabItem>
 </Tabs>
@@ -318,7 +317,7 @@ SET PatchDocument = string('{{ {
     "Entries": entries
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<PrefixListId>';
+AND Identifier = '{{ prefix_list_id }}';
 ```
 
 
@@ -327,7 +326,7 @@ AND Identifier = '<PrefixListId>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.ec2.prefix_lists
-WHERE Identifier = '<PrefixListId>'
+WHERE Identifier = '{{ prefix_list_id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/ec2/route_server_associations/index.md b/website/docs/services/ec2/route_server_associations/index.md
index 512f83d04..6630fb5dd 100644
--- a/website/docs/services/ec2/route_server_associations/index.md
+++ b/website/docs/services/ec2/route_server_associations/index.md
@@ -139,7 +139,7 @@ region,
 route_server_id,
 vpc_id
 FROM awscc.ec2.route_server_associations
-WHERE region = 'us-east-1' AND Identifier = '<RouteServerId>|<VpcId>';
+WHERE region = 'us-east-1' AND Identifier = '{{ route_server_id }}|{{ vpc_id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -177,9 +177,9 @@ INSERT INTO awscc.ec2.route_server_associations (
  VpcId,
  region
 )
-SELECT 
-'{{ RouteServerId }}',
- '{{ VpcId }}',
+SELECT
+'{{ route_server_id }}',
+ '{{ vpc_id }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -192,9 +192,9 @@ INSERT INTO awscc.ec2.route_server_associations (
  VpcId,
  region
 )
-SELECT 
- '{{ RouteServerId }}',
- '{{ VpcId }}',
+SELECT
+ '{{ route_server_id }}',
+ '{{ vpc_id }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -212,11 +212,10 @@ globals:
 resources:
   - name: route_server_association
     props:
-      - name: RouteServerId
-        value: '{{ RouteServerId }}'
-      - name: VpcId
-        value: '{{ VpcId }}'
-
+      - name: route_server_id
+        value: '{{ route_server_id }}'
+      - name: vpc_id
+        value: '{{ vpc_id }}'
 ```
 </TabItem>
 </Tabs>
@@ -227,7 +226,7 @@ resources:
 ```sql
 /*+ delete */
 DELETE FROM awscc.ec2.route_server_associations
-WHERE Identifier = '<RouteServerId|VpcId>'
+WHERE Identifier = '{{ route_server_id }}|{{ vpc_id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/ec2/route_server_endpoints/index.md b/website/docs/services/ec2/route_server_endpoints/index.md
index 73f324074..d3ffb2b7d 100644
--- a/website/docs/services/ec2/route_server_endpoints/index.md
+++ b/website/docs/services/ec2/route_server_endpoints/index.md
@@ -188,7 +188,7 @@ eni_id,
 eni_address,
 tags
 FROM awscc.ec2.route_server_endpoints
-WHERE region = 'us-east-1' AND Identifier = '<Id>';
+WHERE region = 'us-east-1' AND Identifier = '{{ id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -225,9 +225,9 @@ INSERT INTO awscc.ec2.route_server_endpoints (
  SubnetId,
  region
 )
-SELECT 
-'{{ RouteServerId }}',
- '{{ SubnetId }}',
+SELECT
+'{{ route_server_id }}',
+ '{{ subnet_id }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -241,10 +241,10 @@ INSERT INTO awscc.ec2.route_server_endpoints (
  Tags,
  region
 )
-SELECT 
- '{{ RouteServerId }}',
- '{{ SubnetId }}',
- '{{ Tags }}',
+SELECT
+ '{{ route_server_id }}',
+ '{{ subnet_id }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -262,15 +262,14 @@ globals:
 resources:
   - name: route_server_endpoint
     props:
-      - name: RouteServerId
-        value: '{{ RouteServerId }}'
-      - name: SubnetId
-        value: '{{ SubnetId }}'
-      - name: Tags
+      - name: route_server_id
+        value: '{{ route_server_id }}'
+      - name: subnet_id
+        value: '{{ subnet_id }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -286,7 +285,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Id>';
+AND Identifier = '{{ id }}';
 ```
 
 
@@ -295,7 +294,7 @@ AND Identifier = '<Id>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.ec2.route_server_endpoints
-WHERE Identifier = '<Id>'
+WHERE Identifier = '{{ id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/ec2/route_server_peers/index.md b/website/docs/services/ec2/route_server_peers/index.md
index d01adf1c3..00209bd50 100644
--- a/website/docs/services/ec2/route_server_peers/index.md
+++ b/website/docs/services/ec2/route_server_peers/index.md
@@ -218,7 +218,7 @@ peer_address,
 bgp_options,
 tags
 FROM awscc.ec2.route_server_peers
-WHERE region = 'us-east-1' AND Identifier = '<Id>';
+WHERE region = 'us-east-1' AND Identifier = '{{ id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -256,10 +256,10 @@ INSERT INTO awscc.ec2.route_server_peers (
  BgpOptions,
  region
 )
-SELECT 
-'{{ RouteServerEndpointId }}',
- '{{ PeerAddress }}',
- '{{ BgpOptions }}',
+SELECT
+'{{ route_server_endpoint_id }}',
+ '{{ peer_address }}',
+ '{{ bgp_options }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -274,11 +274,11 @@ INSERT INTO awscc.ec2.route_server_peers (
  Tags,
  region
 )
-SELECT 
- '{{ RouteServerEndpointId }}',
- '{{ PeerAddress }}',
- '{{ BgpOptions }}',
- '{{ Tags }}',
+SELECT
+ '{{ route_server_endpoint_id }}',
+ '{{ peer_address }}',
+ '{{ bgp_options }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -296,19 +296,18 @@ globals:
 resources:
   - name: route_server_peer
     props:
-      - name: RouteServerEndpointId
-        value: '{{ RouteServerEndpointId }}'
-      - name: PeerAddress
-        value: '{{ PeerAddress }}'
-      - name: BgpOptions
+      - name: route_server_endpoint_id
+        value: '{{ route_server_endpoint_id }}'
+      - name: peer_address
+        value: '{{ peer_address }}'
+      - name: bgp_options
         value:
-          PeerAsn: '{{ PeerAsn }}'
-          PeerLivenessDetection: '{{ PeerLivenessDetection }}'
-      - name: Tags
+          peer_asn: '{{ peer_asn }}'
+          peer_liveness_detection: '{{ peer_liveness_detection }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -324,7 +323,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Id>';
+AND Identifier = '{{ id }}';
 ```
 
 
@@ -333,7 +332,7 @@ AND Identifier = '<Id>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.ec2.route_server_peers
-WHERE Identifier = '<Id>'
+WHERE Identifier = '{{ id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/ec2/route_server_propagations/index.md b/website/docs/services/ec2/route_server_propagations/index.md
index 0bacf9019..92a881f8e 100644
--- a/website/docs/services/ec2/route_server_propagations/index.md
+++ b/website/docs/services/ec2/route_server_propagations/index.md
@@ -139,7 +139,7 @@ region,
 route_server_id,
 route_table_id
 FROM awscc.ec2.route_server_propagations
-WHERE region = 'us-east-1' AND Identifier = '<RouteServerId>|<RouteTableId>';
+WHERE region = 'us-east-1' AND Identifier = '{{ route_server_id }}|{{ route_table_id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -177,9 +177,9 @@ INSERT INTO awscc.ec2.route_server_propagations (
  RouteTableId,
  region
 )
-SELECT 
-'{{ RouteServerId }}',
- '{{ RouteTableId }}',
+SELECT
+'{{ route_server_id }}',
+ '{{ route_table_id }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -192,9 +192,9 @@ INSERT INTO awscc.ec2.route_server_propagations (
  RouteTableId,
  region
 )
-SELECT 
- '{{ RouteServerId }}',
- '{{ RouteTableId }}',
+SELECT
+ '{{ route_server_id }}',
+ '{{ route_table_id }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -212,11 +212,10 @@ globals:
 resources:
   - name: route_server_propagation
     props:
-      - name: RouteServerId
-        value: '{{ RouteServerId }}'
-      - name: RouteTableId
-        value: '{{ RouteTableId }}'
-
+      - name: route_server_id
+        value: '{{ route_server_id }}'
+      - name: route_table_id
+        value: '{{ route_table_id }}'
 ```
 </TabItem>
 </Tabs>
@@ -227,7 +226,7 @@ resources:
 ```sql
 /*+ delete */
 DELETE FROM awscc.ec2.route_server_propagations
-WHERE Identifier = '<RouteServerId|RouteTableId>'
+WHERE Identifier = '{{ route_server_id }}|{{ route_table_id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/ec2/route_servers/index.md b/website/docs/services/ec2/route_servers/index.md
index 305e454b8..f651f8abf 100644
--- a/website/docs/services/ec2/route_servers/index.md
+++ b/website/docs/services/ec2/route_servers/index.md
@@ -182,7 +182,7 @@ persist_routes_duration,
 sns_notifications_enabled,
 tags
 FROM awscc.ec2.route_servers
-WHERE region = 'us-east-1' AND Identifier = '<Id>';
+WHERE region = 'us-east-1' AND Identifier = '{{ id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -218,8 +218,8 @@ INSERT INTO awscc.ec2.route_servers (
  AmazonSideAsn,
  region
 )
-SELECT 
-'{{ AmazonSideAsn }}',
+SELECT
+'{{ amazon_side_asn }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -235,12 +235,12 @@ INSERT INTO awscc.ec2.route_servers (
  Tags,
  region
 )
-SELECT 
- '{{ AmazonSideAsn }}',
- '{{ PersistRoutes }}',
- '{{ PersistRoutesDuration }}',
- '{{ SnsNotificationsEnabled }}',
- '{{ Tags }}',
+SELECT
+ '{{ amazon_side_asn }}',
+ '{{ persist_routes }}',
+ '{{ persist_routes_duration }}',
+ '{{ sns_notifications_enabled }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -258,19 +258,18 @@ globals:
 resources:
   - name: route_server
     props:
-      - name: AmazonSideAsn
-        value: '{{ AmazonSideAsn }}'
-      - name: PersistRoutes
-        value: '{{ PersistRoutes }}'
-      - name: PersistRoutesDuration
-        value: '{{ PersistRoutesDuration }}'
-      - name: SnsNotificationsEnabled
-        value: '{{ SnsNotificationsEnabled }}'
-      - name: Tags
+      - name: amazon_side_asn
+        value: '{{ amazon_side_asn }}'
+      - name: persist_routes
+        value: '{{ persist_routes }}'
+      - name: persist_routes_duration
+        value: '{{ persist_routes_duration }}'
+      - name: sns_notifications_enabled
+        value: '{{ sns_notifications_enabled }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -289,7 +288,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Id>';
+AND Identifier = '{{ id }}';
 ```
 
 
@@ -298,7 +297,7 @@ AND Identifier = '<Id>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.ec2.route_servers
-WHERE Identifier = '<Id>'
+WHERE Identifier = '{{ id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/ec2/route_tables/index.md b/website/docs/services/ec2/route_tables/index.md
index b5512aaec..5366f82a7 100644
--- a/website/docs/services/ec2/route_tables/index.md
+++ b/website/docs/services/ec2/route_tables/index.md
@@ -158,7 +158,7 @@ route_table_id,
 vpc_id,
 tags
 FROM awscc.ec2.route_tables
-WHERE region = 'us-east-1' AND Identifier = '<RouteTableId>';
+WHERE region = 'us-east-1' AND Identifier = '{{ route_table_id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -194,8 +194,8 @@ INSERT INTO awscc.ec2.route_tables (
  VpcId,
  region
 )
-SELECT 
-'{{ VpcId }}',
+SELECT
+'{{ vpc_id }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -208,9 +208,9 @@ INSERT INTO awscc.ec2.route_tables (
  Tags,
  region
 )
-SELECT 
- '{{ VpcId }}',
- '{{ Tags }}',
+SELECT
+ '{{ vpc_id }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -228,13 +228,12 @@ globals:
 resources:
   - name: route_table
     props:
-      - name: VpcId
-        value: '{{ VpcId }}'
-      - name: Tags
+      - name: vpc_id
+        value: '{{ vpc_id }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -250,7 +249,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<RouteTableId>';
+AND Identifier = '{{ route_table_id }}';
 ```
 
 
@@ -259,7 +258,7 @@ AND Identifier = '<RouteTableId>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.ec2.route_tables
-WHERE Identifier = '<RouteTableId>'
+WHERE Identifier = '{{ route_table_id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/ec2/routes/index.md b/website/docs/services/ec2/routes/index.md
index 9871ad3e2..2d2174741 100644
--- a/website/docs/services/ec2/routes/index.md
+++ b/website/docs/services/ec2/routes/index.md
@@ -229,7 +229,7 @@ transit_gateway_id,
 vpc_endpoint_id,
 vpc_peering_connection_id
 FROM awscc.ec2.routes
-WHERE region = 'us-east-1' AND Identifier = '<RouteTableId>|<CidrBlock>';
+WHERE region = 'us-east-1' AND Identifier = '{{ route_table_id }}|{{ cidr_block }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -266,8 +266,8 @@ INSERT INTO awscc.ec2.routes (
  RouteTableId,
  region
 )
-SELECT 
-'{{ RouteTableId }}',
+SELECT
+'{{ route_table_id }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -293,22 +293,22 @@ INSERT INTO awscc.ec2.routes (
  VpcPeeringConnectionId,
  region
 )
-SELECT 
- '{{ CarrierGatewayId }}',
- '{{ CoreNetworkArn }}',
- '{{ DestinationCidrBlock }}',
- '{{ DestinationIpv6CidrBlock }}',
- '{{ DestinationPrefixListId }}',
- '{{ EgressOnlyInternetGatewayId }}',
- '{{ GatewayId }}',
- '{{ InstanceId }}',
- '{{ LocalGatewayId }}',
- '{{ NatGatewayId }}',
- '{{ NetworkInterfaceId }}',
- '{{ RouteTableId }}',
- '{{ TransitGatewayId }}',
- '{{ VpcEndpointId }}',
- '{{ VpcPeeringConnectionId }}',
+SELECT
+ '{{ carrier_gateway_id }}',
+ '{{ core_network_arn }}',
+ '{{ destination_cidr_block }}',
+ '{{ destination_ipv6_cidr_block }}',
+ '{{ destination_prefix_list_id }}',
+ '{{ egress_only_internet_gateway_id }}',
+ '{{ gateway_id }}',
+ '{{ instance_id }}',
+ '{{ local_gateway_id }}',
+ '{{ nat_gateway_id }}',
+ '{{ network_interface_id }}',
+ '{{ route_table_id }}',
+ '{{ transit_gateway_id }}',
+ '{{ vpc_endpoint_id }}',
+ '{{ vpc_peering_connection_id }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -326,37 +326,36 @@ globals:
 resources:
   - name: route
     props:
-      - name: CarrierGatewayId
-        value: '{{ CarrierGatewayId }}'
-      - name: CoreNetworkArn
-        value: '{{ CoreNetworkArn }}'
-      - name: DestinationCidrBlock
-        value: '{{ DestinationCidrBlock }}'
-      - name: DestinationIpv6CidrBlock
-        value: '{{ DestinationIpv6CidrBlock }}'
-      - name: DestinationPrefixListId
-        value: '{{ DestinationPrefixListId }}'
-      - name: EgressOnlyInternetGatewayId
-        value: '{{ EgressOnlyInternetGatewayId }}'
-      - name: GatewayId
-        value: '{{ GatewayId }}'
-      - name: InstanceId
-        value: '{{ InstanceId }}'
-      - name: LocalGatewayId
-        value: '{{ LocalGatewayId }}'
-      - name: NatGatewayId
-        value: '{{ NatGatewayId }}'
-      - name: NetworkInterfaceId
-        value: '{{ NetworkInterfaceId }}'
-      - name: RouteTableId
-        value: '{{ RouteTableId }}'
-      - name: TransitGatewayId
-        value: '{{ TransitGatewayId }}'
-      - name: VpcEndpointId
-        value: '{{ VpcEndpointId }}'
-      - name: VpcPeeringConnectionId
-        value: '{{ VpcPeeringConnectionId }}'
-
+      - name: carrier_gateway_id
+        value: '{{ carrier_gateway_id }}'
+      - name: core_network_arn
+        value: '{{ core_network_arn }}'
+      - name: destination_cidr_block
+        value: '{{ destination_cidr_block }}'
+      - name: destination_ipv6_cidr_block
+        value: '{{ destination_ipv6_cidr_block }}'
+      - name: destination_prefix_list_id
+        value: '{{ destination_prefix_list_id }}'
+      - name: egress_only_internet_gateway_id
+        value: '{{ egress_only_internet_gateway_id }}'
+      - name: gateway_id
+        value: '{{ gateway_id }}'
+      - name: instance_id
+        value: '{{ instance_id }}'
+      - name: local_gateway_id
+        value: '{{ local_gateway_id }}'
+      - name: nat_gateway_id
+        value: '{{ nat_gateway_id }}'
+      - name: network_interface_id
+        value: '{{ network_interface_id }}'
+      - name: route_table_id
+        value: '{{ route_table_id }}'
+      - name: transit_gateway_id
+        value: '{{ transit_gateway_id }}'
+      - name: vpc_endpoint_id
+        value: '{{ vpc_endpoint_id }}'
+      - name: vpc_peering_connection_id
+        value: '{{ vpc_peering_connection_id }}'
 ```
 </TabItem>
 </Tabs>
@@ -382,7 +381,7 @@ SET PatchDocument = string('{{ {
     "VpcPeeringConnectionId": vpc_peering_connection_id
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<RouteTableId>|<CidrBlock>';
+AND Identifier = '{{ route_table_id }}|{{ cidr_block }}';
 ```
 
 
@@ -391,7 +390,7 @@ AND Identifier = '<RouteTableId>|<CidrBlock>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.ec2.routes
-WHERE Identifier = '<RouteTableId|CidrBlock>'
+WHERE Identifier = '{{ route_table_id }}|{{ cidr_block }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/ec2/security_group_egresses/index.md b/website/docs/services/ec2/security_group_egresses/index.md
index f94e03c56..a1532fe7a 100644
--- a/website/docs/services/ec2/security_group_egresses/index.md
+++ b/website/docs/services/ec2/security_group_egresses/index.md
@@ -188,7 +188,7 @@ id,
 destination_prefix_list_id,
 group_id
 FROM awscc.ec2.security_group_egresses
-WHERE region = 'us-east-1' AND Identifier = '<Id>';
+WHERE region = 'us-east-1' AND Identifier = '{{ id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -225,9 +225,9 @@ INSERT INTO awscc.ec2.security_group_egresses (
  GroupId,
  region
 )
-SELECT 
-'{{ IpProtocol }}',
- '{{ GroupId }}',
+SELECT
+'{{ ip_protocol }}',
+ '{{ group_id }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -247,16 +247,16 @@ INSERT INTO awscc.ec2.security_group_egresses (
  GroupId,
  region
 )
-SELECT 
- '{{ CidrIp }}',
- '{{ CidrIpv6 }}',
- '{{ Description }}',
- '{{ FromPort }}',
- '{{ ToPort }}',
- '{{ IpProtocol }}',
- '{{ DestinationSecurityGroupId }}',
- '{{ DestinationPrefixListId }}',
- '{{ GroupId }}',
+SELECT
+ '{{ cidr_ip }}',
+ '{{ cidr_ipv6 }}',
+ '{{ description }}',
+ '{{ from_port }}',
+ '{{ to_port }}',
+ '{{ ip_protocol }}',
+ '{{ destination_security_group_id }}',
+ '{{ destination_prefix_list_id }}',
+ '{{ group_id }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -274,25 +274,24 @@ globals:
 resources:
   - name: security_group_egress
     props:
-      - name: CidrIp
-        value: '{{ CidrIp }}'
-      - name: CidrIpv6
-        value: '{{ CidrIpv6 }}'
-      - name: Description
-        value: '{{ Description }}'
-      - name: FromPort
-        value: '{{ FromPort }}'
-      - name: ToPort
-        value: '{{ ToPort }}'
-      - name: IpProtocol
-        value: '{{ IpProtocol }}'
-      - name: DestinationSecurityGroupId
-        value: '{{ DestinationSecurityGroupId }}'
-      - name: DestinationPrefixListId
-        value: '{{ DestinationPrefixListId }}'
-      - name: GroupId
-        value: '{{ GroupId }}'
-
+      - name: cidr_ip
+        value: '{{ cidr_ip }}'
+      - name: cidr_ipv6
+        value: '{{ cidr_ipv6 }}'
+      - name: description
+        value: '{{ description }}'
+      - name: from_port
+        value: '{{ from_port }}'
+      - name: to_port
+        value: '{{ to_port }}'
+      - name: ip_protocol
+        value: '{{ ip_protocol }}'
+      - name: destination_security_group_id
+        value: '{{ destination_security_group_id }}'
+      - name: destination_prefix_list_id
+        value: '{{ destination_prefix_list_id }}'
+      - name: group_id
+        value: '{{ group_id }}'
 ```
 </TabItem>
 </Tabs>
@@ -308,7 +307,7 @@ SET PatchDocument = string('{{ {
     "Description": description
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Id>';
+AND Identifier = '{{ id }}';
 ```
 
 
@@ -317,7 +316,7 @@ AND Identifier = '<Id>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.ec2.security_group_egresses
-WHERE Identifier = '<Id>'
+WHERE Identifier = '{{ id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/ec2/security_group_ingresses/index.md b/website/docs/services/ec2/security_group_ingresses/index.md
index f3e144687..8f480da4f 100644
--- a/website/docs/services/ec2/security_group_ingresses/index.md
+++ b/website/docs/services/ec2/security_group_ingresses/index.md
@@ -206,7 +206,7 @@ source_security_group_name,
 source_security_group_owner_id,
 to_port
 FROM awscc.ec2.security_group_ingresses
-WHERE region = 'us-east-1' AND Identifier = '<Id>';
+WHERE region = 'us-east-1' AND Identifier = '{{ id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -242,8 +242,8 @@ INSERT INTO awscc.ec2.security_group_ingresses (
  IpProtocol,
  region
 )
-SELECT 
-'{{ IpProtocol }}',
+SELECT
+'{{ ip_protocol }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -266,19 +266,19 @@ INSERT INTO awscc.ec2.security_group_ingresses (
  ToPort,
  region
 )
-SELECT 
- '{{ CidrIp }}',
- '{{ CidrIpv6 }}',
- '{{ Description }}',
- '{{ FromPort }}',
- '{{ GroupId }}',
- '{{ GroupName }}',
- '{{ IpProtocol }}',
- '{{ SourcePrefixListId }}',
- '{{ SourceSecurityGroupId }}',
- '{{ SourceSecurityGroupName }}',
- '{{ SourceSecurityGroupOwnerId }}',
- '{{ ToPort }}',
+SELECT
+ '{{ cidr_ip }}',
+ '{{ cidr_ipv6 }}',
+ '{{ description }}',
+ '{{ from_port }}',
+ '{{ group_id }}',
+ '{{ group_name }}',
+ '{{ ip_protocol }}',
+ '{{ source_prefix_list_id }}',
+ '{{ source_security_group_id }}',
+ '{{ source_security_group_name }}',
+ '{{ source_security_group_owner_id }}',
+ '{{ to_port }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -296,31 +296,30 @@ globals:
 resources:
   - name: security_group_ingress
     props:
-      - name: CidrIp
-        value: '{{ CidrIp }}'
-      - name: CidrIpv6
-        value: '{{ CidrIpv6 }}'
-      - name: Description
-        value: '{{ Description }}'
-      - name: FromPort
-        value: '{{ FromPort }}'
-      - name: GroupId
-        value: '{{ GroupId }}'
-      - name: GroupName
-        value: '{{ GroupName }}'
-      - name: IpProtocol
-        value: '{{ IpProtocol }}'
-      - name: SourcePrefixListId
-        value: '{{ SourcePrefixListId }}'
-      - name: SourceSecurityGroupId
-        value: '{{ SourceSecurityGroupId }}'
-      - name: SourceSecurityGroupName
-        value: '{{ SourceSecurityGroupName }}'
-      - name: SourceSecurityGroupOwnerId
-        value: '{{ SourceSecurityGroupOwnerId }}'
-      - name: ToPort
-        value: '{{ ToPort }}'
-
+      - name: cidr_ip
+        value: '{{ cidr_ip }}'
+      - name: cidr_ipv6
+        value: '{{ cidr_ipv6 }}'
+      - name: description
+        value: '{{ description }}'
+      - name: from_port
+        value: '{{ from_port }}'
+      - name: group_id
+        value: '{{ group_id }}'
+      - name: group_name
+        value: '{{ group_name }}'
+      - name: ip_protocol
+        value: '{{ ip_protocol }}'
+      - name: source_prefix_list_id
+        value: '{{ source_prefix_list_id }}'
+      - name: source_security_group_id
+        value: '{{ source_security_group_id }}'
+      - name: source_security_group_name
+        value: '{{ source_security_group_name }}'
+      - name: source_security_group_owner_id
+        value: '{{ source_security_group_owner_id }}'
+      - name: to_port
+        value: '{{ to_port }}'
 ```
 </TabItem>
 </Tabs>
@@ -336,7 +335,7 @@ SET PatchDocument = string('{{ {
     "Description": description
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Id>';
+AND Identifier = '{{ id }}';
 ```
 
 
@@ -345,7 +344,7 @@ AND Identifier = '<Id>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.ec2.security_group_ingresses
-WHERE Identifier = '<Id>'
+WHERE Identifier = '{{ id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/ec2/security_group_vpc_associations/index.md b/website/docs/services/ec2/security_group_vpc_associations/index.md
index ac36031bd..195410448 100644
--- a/website/docs/services/ec2/security_group_vpc_associations/index.md
+++ b/website/docs/services/ec2/security_group_vpc_associations/index.md
@@ -157,7 +157,7 @@ vpc_owner_id,
 state,
 state_reason
 FROM awscc.ec2.security_group_vpc_associations
-WHERE region = 'us-east-1' AND Identifier = '<GroupId>|<VpcId>';
+WHERE region = 'us-east-1' AND Identifier = '{{ group_id }}|{{ vpc_id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -195,9 +195,9 @@ INSERT INTO awscc.ec2.security_group_vpc_associations (
  VpcId,
  region
 )
-SELECT 
-'{{ GroupId }}',
- '{{ VpcId }}',
+SELECT
+'{{ group_id }}',
+ '{{ vpc_id }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -210,9 +210,9 @@ INSERT INTO awscc.ec2.security_group_vpc_associations (
  VpcId,
  region
 )
-SELECT 
- '{{ GroupId }}',
- '{{ VpcId }}',
+SELECT
+ '{{ group_id }}',
+ '{{ vpc_id }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -230,11 +230,10 @@ globals:
 resources:
   - name: security_group_vpc_association
     props:
-      - name: GroupId
-        value: '{{ GroupId }}'
-      - name: VpcId
-        value: '{{ VpcId }}'
-
+      - name: group_id
+        value: '{{ group_id }}'
+      - name: vpc_id
+        value: '{{ vpc_id }}'
 ```
 </TabItem>
 </Tabs>
@@ -245,7 +244,7 @@ resources:
 ```sql
 /*+ delete */
 DELETE FROM awscc.ec2.security_group_vpc_associations
-WHERE Identifier = '<GroupId|VpcId>'
+WHERE Identifier = '{{ group_id }}|{{ vpc_id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/ec2/security_groups/index.md b/website/docs/services/ec2/security_groups/index.md
index 8b2f9da46..6d4e1798a 100644
--- a/website/docs/services/ec2/security_groups/index.md
+++ b/website/docs/services/ec2/security_groups/index.md
@@ -282,7 +282,7 @@ security_group_egress,
 tags,
 group_id
 FROM awscc.ec2.security_groups
-WHERE region = 'us-east-1' AND Identifier = '<Id>';
+WHERE region = 'us-east-1' AND Identifier = '{{ id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -318,8 +318,8 @@ INSERT INTO awscc.ec2.security_groups (
  GroupDescription,
  region
 )
-SELECT 
-'{{ GroupDescription }}',
+SELECT
+'{{ group_description }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -336,13 +336,13 @@ INSERT INTO awscc.ec2.security_groups (
  Tags,
  region
 )
-SELECT 
- '{{ GroupDescription }}',
- '{{ GroupName }}',
- '{{ VpcId }}',
- '{{ SecurityGroupIngress }}',
- '{{ SecurityGroupEgress }}',
- '{{ Tags }}',
+SELECT
+ '{{ group_description }}',
+ '{{ group_name }}',
+ '{{ vpc_id }}',
+ '{{ security_group_ingress }}',
+ '{{ security_group_egress }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -360,39 +360,38 @@ globals:
 resources:
   - name: security_group
     props:
-      - name: GroupDescription
-        value: '{{ GroupDescription }}'
-      - name: GroupName
-        value: '{{ GroupName }}'
-      - name: VpcId
-        value: '{{ VpcId }}'
-      - name: SecurityGroupIngress
+      - name: group_description
+        value: '{{ group_description }}'
+      - name: group_name
+        value: '{{ group_name }}'
+      - name: vpc_id
+        value: '{{ vpc_id }}'
+      - name: security_group_ingress
         value:
-          - CidrIp: '{{ CidrIp }}'
-            CidrIpv6: '{{ CidrIpv6 }}'
-            Description: '{{ Description }}'
-            FromPort: '{{ FromPort }}'
-            SourceSecurityGroupName: '{{ SourceSecurityGroupName }}'
-            ToPort: '{{ ToPort }}'
-            SourceSecurityGroupOwnerId: '{{ SourceSecurityGroupOwnerId }}'
-            IpProtocol: '{{ IpProtocol }}'
-            SourceSecurityGroupId: '{{ SourceSecurityGroupId }}'
-            SourcePrefixListId: '{{ SourcePrefixListId }}'
-      - name: SecurityGroupEgress
+          - cidr_ip: '{{ cidr_ip }}'
+            cidr_ipv6: '{{ cidr_ipv6 }}'
+            description: '{{ description }}'
+            from_port: '{{ from_port }}'
+            source_security_group_name: '{{ source_security_group_name }}'
+            to_port: '{{ to_port }}'
+            source_security_group_owner_id: '{{ source_security_group_owner_id }}'
+            ip_protocol: '{{ ip_protocol }}'
+            source_security_group_id: '{{ source_security_group_id }}'
+            source_prefix_list_id: '{{ source_prefix_list_id }}'
+      - name: security_group_egress
         value:
-          - CidrIp: '{{ CidrIp }}'
-            CidrIpv6: '{{ CidrIpv6 }}'
-            Description: '{{ Description }}'
-            FromPort: '{{ FromPort }}'
-            ToPort: '{{ ToPort }}'
-            IpProtocol: '{{ IpProtocol }}'
-            DestinationSecurityGroupId: '{{ DestinationSecurityGroupId }}'
-            DestinationPrefixListId: '{{ DestinationPrefixListId }}'
-      - name: Tags
+          - cidr_ip: '{{ cidr_ip }}'
+            cidr_ipv6: '{{ cidr_ipv6 }}'
+            description: '{{ description }}'
+            from_port: '{{ from_port }}'
+            to_port: '{{ to_port }}'
+            ip_protocol: '{{ ip_protocol }}'
+            destination_security_group_id: '{{ destination_security_group_id }}'
+            destination_prefix_list_id: '{{ destination_prefix_list_id }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -410,7 +409,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Id>';
+AND Identifier = '{{ id }}';
 ```
 
 
@@ -419,7 +418,7 @@ AND Identifier = '<Id>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.ec2.security_groups
-WHERE Identifier = '<Id>'
+WHERE Identifier = '{{ id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/ec2/snapshot_block_public_accesses/index.md b/website/docs/services/ec2/snapshot_block_public_accesses/index.md
index 886711bc5..eadd216bc 100644
--- a/website/docs/services/ec2/snapshot_block_public_accesses/index.md
+++ b/website/docs/services/ec2/snapshot_block_public_accesses/index.md
@@ -140,7 +140,7 @@ region,
 state,
 account_id
 FROM awscc.ec2.snapshot_block_public_accesses
-WHERE region = 'us-east-1' AND Identifier = '<AccountId>';
+WHERE region = 'us-east-1' AND Identifier = '{{ account_id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -176,8 +176,8 @@ INSERT INTO awscc.ec2.snapshot_block_public_accesses (
  State,
  region
 )
-SELECT 
-'{{ State }}',
+SELECT
+'{{ state }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -189,8 +189,8 @@ INSERT INTO awscc.ec2.snapshot_block_public_accesses (
  State,
  region
 )
-SELECT 
- '{{ State }}',
+SELECT
+ '{{ state }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -208,9 +208,8 @@ globals:
 resources:
   - name: snapshot_block_public_access
     props:
-      - name: State
-        value: '{{ State }}'
-
+      - name: state
+        value: '{{ state }}'
 ```
 </TabItem>
 </Tabs>
@@ -226,7 +225,7 @@ SET PatchDocument = string('{{ {
     "State": state
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<AccountId>';
+AND Identifier = '{{ account_id }}';
 ```
 
 
@@ -235,7 +234,7 @@ AND Identifier = '<AccountId>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.ec2.snapshot_block_public_accesses
-WHERE Identifier = '<AccountId>'
+WHERE Identifier = '{{ account_id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/ec2/spot_fleets/index.md b/website/docs/services/ec2/spot_fleets/index.md
index 2f9133fad..2a1570120 100644
--- a/website/docs/services/ec2/spot_fleets/index.md
+++ b/website/docs/services/ec2/spot_fleets/index.md
@@ -740,7 +740,7 @@ region,
 id,
 spot_fleet_request_config_data
 FROM awscc.ec2.spot_fleets
-WHERE region = 'us-east-1' AND Identifier = '<Id>';
+WHERE region = 'us-east-1' AND Identifier = '{{ id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -776,8 +776,8 @@ INSERT INTO awscc.ec2.spot_fleets (
  SpotFleetRequestConfigData,
  region
 )
-SELECT 
-'{{ SpotFleetRequestConfigData }}',
+SELECT
+'{{ spot_fleet_request_config_data }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -789,8 +789,8 @@ INSERT INTO awscc.ec2.spot_fleets (
  SpotFleetRequestConfigData,
  region
 )
-SELECT 
- '{{ SpotFleetRequestConfigData }}',
+SELECT
+ '{{ spot_fleet_request_config_data }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -808,161 +808,160 @@ globals:
 resources:
   - name: spot_fleet
     props:
-      - name: SpotFleetRequestConfigData
+      - name: spot_fleet_request_config_data
         value:
-          AllocationStrategy: '{{ AllocationStrategy }}'
-          Context: '{{ Context }}'
-          ExcessCapacityTerminationPolicy: '{{ ExcessCapacityTerminationPolicy }}'
-          IamFleetRole: '{{ IamFleetRole }}'
-          InstanceInterruptionBehavior: '{{ InstanceInterruptionBehavior }}'
-          InstancePoolsToUseCount: '{{ InstancePoolsToUseCount }}'
-          LaunchSpecifications:
-            - BlockDeviceMappings:
-                - DeviceName: '{{ DeviceName }}'
-                  Ebs:
-                    DeleteOnTermination: '{{ DeleteOnTermination }}'
-                    Encrypted: '{{ Encrypted }}'
-                    Iops: '{{ Iops }}'
-                    SnapshotId: '{{ SnapshotId }}'
-                    VolumeSize: '{{ VolumeSize }}'
-                    VolumeType: '{{ VolumeType }}'
-                  NoDevice: '{{ NoDevice }}'
-                  VirtualName: '{{ VirtualName }}'
-              EbsOptimized: '{{ EbsOptimized }}'
-              IamInstanceProfile:
-                Arn: '{{ Arn }}'
-              ImageId: '{{ ImageId }}'
-              InstanceType: '{{ InstanceType }}'
-              KernelId: '{{ KernelId }}'
-              KeyName: '{{ KeyName }}'
-              Monitoring:
-                Enabled: '{{ Enabled }}'
-              NetworkInterfaces:
-                - AssociatePublicIpAddress: '{{ AssociatePublicIpAddress }}'
-                  DeleteOnTermination: '{{ DeleteOnTermination }}'
-                  Description: '{{ Description }}'
-                  DeviceIndex: '{{ DeviceIndex }}'
-                  Groups:
-                    - '{{ Groups[0] }}'
-                  Ipv6AddressCount: '{{ Ipv6AddressCount }}'
-                  Ipv6Addresses:
-                    - Ipv6Address: '{{ Ipv6Address }}'
-                  NetworkInterfaceId: '{{ NetworkInterfaceId }}'
-                  PrivateIpAddresses:
-                    - Primary: '{{ Primary }}'
-                      PrivateIpAddress: '{{ PrivateIpAddress }}'
-                  SecondaryPrivateIpAddressCount: '{{ SecondaryPrivateIpAddressCount }}'
-                  SubnetId: '{{ SubnetId }}'
-              Placement:
-                AvailabilityZone: '{{ AvailabilityZone }}'
-                GroupName: '{{ GroupName }}'
-                Tenancy: '{{ Tenancy }}'
-              RamdiskId: '{{ RamdiskId }}'
-              SecurityGroups:
-                - GroupId: '{{ GroupId }}'
-              SpotPrice: '{{ SpotPrice }}'
-              SubnetId: '{{ SubnetId }}'
-              TagSpecifications:
-                - ResourceType: '{{ ResourceType }}'
-                  Tags:
-                    - Key: '{{ Key }}'
-                      Value: '{{ Value }}'
-              UserData: '{{ UserData }}'
-              WeightedCapacity: null
-              InstanceRequirements:
-                VCpuCount:
-                  Min: '{{ Min }}'
-                  Max: '{{ Max }}'
-                MemoryMiB:
-                  Min: '{{ Min }}'
-                  Max: '{{ Max }}'
-                CpuManufacturers:
-                  - '{{ CpuManufacturers[0] }}'
-                MemoryGiBPerVCpu:
-                  Min: null
-                  Max: null
-                AllowedInstanceTypes:
-                  - '{{ AllowedInstanceTypes[0] }}'
-                ExcludedInstanceTypes:
-                  - '{{ ExcludedInstanceTypes[0] }}'
-                InstanceGenerations:
-                  - '{{ InstanceGenerations[0] }}'
-                SpotMaxPricePercentageOverLowestPrice: '{{ SpotMaxPricePercentageOverLowestPrice }}'
-                OnDemandMaxPricePercentageOverLowestPrice: '{{ OnDemandMaxPricePercentageOverLowestPrice }}'
-                MaxSpotPriceAsPercentageOfOptimalOnDemandPrice: '{{ MaxSpotPriceAsPercentageOfOptimalOnDemandPrice }}'
-                BareMetal: '{{ BareMetal }}'
-                BurstablePerformance: '{{ BurstablePerformance }}'
-                RequireHibernateSupport: '{{ RequireHibernateSupport }}'
-                NetworkBandwidthGbps:
-                  Min: null
-                  Max: null
-                NetworkInterfaceCount:
-                  Min: '{{ Min }}'
-                  Max: '{{ Max }}'
-                LocalStorage: '{{ LocalStorage }}'
-                LocalStorageTypes:
-                  - '{{ LocalStorageTypes[0] }}'
-                TotalLocalStorageGB:
-                  Min: null
-                  Max: null
-                BaselineEbsBandwidthMbps:
-                  Min: '{{ Min }}'
-                  Max: '{{ Max }}'
-                AcceleratorTypes:
-                  - '{{ AcceleratorTypes[0] }}'
-                AcceleratorCount:
-                  Min: '{{ Min }}'
-                  Max: '{{ Max }}'
-                AcceleratorManufacturers:
-                  - '{{ AcceleratorManufacturers[0] }}'
-                AcceleratorNames:
-                  - '{{ AcceleratorNames[0] }}'
-                AcceleratorTotalMemoryMiB:
-                  Min: '{{ Min }}'
-                  Max: '{{ Max }}'
-                BaselinePerformanceFactors:
-                  Cpu:
-                    References:
-                      - InstanceFamily: '{{ InstanceFamily }}'
-          LaunchTemplateConfigs:
-            - LaunchTemplateSpecification:
-                LaunchTemplateId: '{{ LaunchTemplateId }}'
-                LaunchTemplateName: '{{ LaunchTemplateName }}'
-                Version: '{{ Version }}'
-              Overrides:
-                - AvailabilityZone: '{{ AvailabilityZone }}'
-                  InstanceType: '{{ InstanceType }}'
-                  SpotPrice: '{{ SpotPrice }}'
-                  SubnetId: '{{ SubnetId }}'
-                  WeightedCapacity: null
-                  InstanceRequirements: null
-                  Priority: null
-          LoadBalancersConfig:
-            ClassicLoadBalancersConfig:
-              ClassicLoadBalancers:
-                - Name: '{{ Name }}'
-            TargetGroupsConfig:
-              TargetGroups:
-                - Arn: '{{ Arn }}'
-          OnDemandAllocationStrategy: '{{ OnDemandAllocationStrategy }}'
-          OnDemandMaxTotalPrice: '{{ OnDemandMaxTotalPrice }}'
-          OnDemandTargetCapacity: '{{ OnDemandTargetCapacity }}'
-          ReplaceUnhealthyInstances: '{{ ReplaceUnhealthyInstances }}'
-          SpotMaintenanceStrategies:
-            CapacityRebalance:
-              ReplacementStrategy: '{{ ReplacementStrategy }}'
-              TerminationDelay: '{{ TerminationDelay }}'
-          SpotMaxTotalPrice: '{{ SpotMaxTotalPrice }}'
-          SpotPrice: '{{ SpotPrice }}'
-          TargetCapacity: '{{ TargetCapacity }}'
-          TerminateInstancesWithExpiration: '{{ TerminateInstancesWithExpiration }}'
-          Type: '{{ Type }}'
-          ValidFrom: '{{ ValidFrom }}'
-          ValidUntil: '{{ ValidUntil }}'
-          TagSpecifications:
+          allocation_strategy: '{{ allocation_strategy }}'
+          context: '{{ context }}'
+          excess_capacity_termination_policy: '{{ excess_capacity_termination_policy }}'
+          iam_fleet_role: '{{ iam_fleet_role }}'
+          instance_interruption_behavior: '{{ instance_interruption_behavior }}'
+          instance_pools_to_use_count: '{{ instance_pools_to_use_count }}'
+          launch_specifications:
+            - block_device_mappings:
+                - device_name: '{{ device_name }}'
+                  ebs:
+                    delete_on_termination: '{{ delete_on_termination }}'
+                    encrypted: '{{ encrypted }}'
+                    iops: '{{ iops }}'
+                    snapshot_id: '{{ snapshot_id }}'
+                    volume_size: '{{ volume_size }}'
+                    volume_type: '{{ volume_type }}'
+                  no_device: '{{ no_device }}'
+                  virtual_name: '{{ virtual_name }}'
+              ebs_optimized: '{{ ebs_optimized }}'
+              iam_instance_profile:
+                arn: '{{ arn }}'
+              image_id: '{{ image_id }}'
+              instance_type: '{{ instance_type }}'
+              kernel_id: '{{ kernel_id }}'
+              key_name: '{{ key_name }}'
+              monitoring:
+                enabled: '{{ enabled }}'
+              network_interfaces:
+                - associate_public_ip_address: '{{ associate_public_ip_address }}'
+                  delete_on_termination: '{{ delete_on_termination }}'
+                  description: '{{ description }}'
+                  device_index: '{{ device_index }}'
+                  groups:
+                    - '{{ groups[0] }}'
+                  ipv6_address_count: '{{ ipv6_address_count }}'
+                  ipv6_addresses:
+                    - ipv6_address: '{{ ipv6_address }}'
+                  network_interface_id: '{{ network_interface_id }}'
+                  private_ip_addresses:
+                    - primary: '{{ primary }}'
+                      private_ip_address: '{{ private_ip_address }}'
+                  secondary_private_ip_address_count: '{{ secondary_private_ip_address_count }}'
+                  subnet_id: '{{ subnet_id }}'
+              placement:
+                availability_zone: '{{ availability_zone }}'
+                group_name: '{{ group_name }}'
+                tenancy: '{{ tenancy }}'
+              ramdisk_id: '{{ ramdisk_id }}'
+              security_groups:
+                - group_id: '{{ group_id }}'
+              spot_price: '{{ spot_price }}'
+              subnet_id: '{{ subnet_id }}'
+              tag_specifications:
+                - resource_type: '{{ resource_type }}'
+                  tags:
+                    - key: '{{ key }}'
+                      value: '{{ value }}'
+              user_data: '{{ user_data }}'
+              weighted_capacity: null
+              instance_requirements:
+                v_cpu_count:
+                  min: '{{ min }}'
+                  max: '{{ max }}'
+                memory_mi_b:
+                  min: '{{ min }}'
+                  max: '{{ max }}'
+                cpu_manufacturers:
+                  - '{{ cpu_manufacturers[0] }}'
+                memory_gi_bper_vcpu:
+                  min: null
+                  max: null
+                allowed_instance_types:
+                  - '{{ allowed_instance_types[0] }}'
+                excluded_instance_types:
+                  - '{{ excluded_instance_types[0] }}'
+                instance_generations:
+                  - '{{ instance_generations[0] }}'
+                spot_max_price_percentage_over_lowest_price: '{{ spot_max_price_percentage_over_lowest_price }}'
+                on_demand_max_price_percentage_over_lowest_price: '{{ on_demand_max_price_percentage_over_lowest_price }}'
+                max_spot_price_as_percentage_of_optimal_on_demand_price: '{{ max_spot_price_as_percentage_of_optimal_on_demand_price }}'
+                bare_metal: '{{ bare_metal }}'
+                burstable_performance: '{{ burstable_performance }}'
+                require_hibernate_support: '{{ require_hibernate_support }}'
+                network_bandwidth_gbps:
+                  min: null
+                  max: null
+                network_interface_count:
+                  min: '{{ min }}'
+                  max: '{{ max }}'
+                local_storage: '{{ local_storage }}'
+                local_storage_types:
+                  - '{{ local_storage_types[0] }}'
+                total_local_storage_gb:
+                  min: null
+                  max: null
+                baseline_ebs_bandwidth_mbps:
+                  min: '{{ min }}'
+                  max: '{{ max }}'
+                accelerator_types:
+                  - '{{ accelerator_types[0] }}'
+                accelerator_count:
+                  min: '{{ min }}'
+                  max: '{{ max }}'
+                accelerator_manufacturers:
+                  - '{{ accelerator_manufacturers[0] }}'
+                accelerator_names:
+                  - '{{ accelerator_names[0] }}'
+                accelerator_total_memory_mi_b:
+                  min: '{{ min }}'
+                  max: '{{ max }}'
+                baseline_performance_factors:
+                  cpu:
+                    references:
+                      - instance_family: '{{ instance_family }}'
+          launch_template_configs:
+            - launch_template_specification:
+                launch_template_id: '{{ launch_template_id }}'
+                launch_template_name: '{{ launch_template_name }}'
+                version: '{{ version }}'
+              overrides:
+                - availability_zone: '{{ availability_zone }}'
+                  instance_type: '{{ instance_type }}'
+                  spot_price: '{{ spot_price }}'
+                  subnet_id: '{{ subnet_id }}'
+                  weighted_capacity: null
+                  instance_requirements: null
+                  priority: null
+          load_balancers_config:
+            classic_load_balancers_config:
+              classic_load_balancers:
+                - name: '{{ name }}'
+            target_groups_config:
+              target_groups:
+                - arn: '{{ arn }}'
+          on_demand_allocation_strategy: '{{ on_demand_allocation_strategy }}'
+          on_demand_max_total_price: '{{ on_demand_max_total_price }}'
+          on_demand_target_capacity: '{{ on_demand_target_capacity }}'
+          replace_unhealthy_instances: '{{ replace_unhealthy_instances }}'
+          spot_maintenance_strategies:
+            capacity_rebalance:
+              replacement_strategy: '{{ replacement_strategy }}'
+              termination_delay: '{{ termination_delay }}'
+          spot_max_total_price: '{{ spot_max_total_price }}'
+          spot_price: '{{ spot_price }}'
+          target_capacity: '{{ target_capacity }}'
+          terminate_instances_with_expiration: '{{ terminate_instances_with_expiration }}'
+          type: '{{ type }}'
+          valid_from: '{{ valid_from }}'
+          valid_until: '{{ valid_until }}'
+          tag_specifications:
             - null
-          TargetCapacityUnitType: '{{ TargetCapacityUnitType }}'
-
+          target_capacity_unit_type: '{{ target_capacity_unit_type }}'
 ```
 </TabItem>
 </Tabs>
@@ -973,7 +972,7 @@ resources:
 ```sql
 /*+ delete */
 DELETE FROM awscc.ec2.spot_fleets
-WHERE Identifier = '<Id>'
+WHERE Identifier = '{{ id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/ec2/subnet_cidr_blocks/index.md b/website/docs/services/ec2/subnet_cidr_blocks/index.md
index 545febb60..afec1647c 100644
--- a/website/docs/services/ec2/subnet_cidr_blocks/index.md
+++ b/website/docs/services/ec2/subnet_cidr_blocks/index.md
@@ -164,7 +164,7 @@ subnet_id,
 ipv6_address_attribute,
 ip_source
 FROM awscc.ec2.subnet_cidr_blocks
-WHERE region = 'us-east-1' AND Identifier = '<Id>';
+WHERE region = 'us-east-1' AND Identifier = '{{ id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -200,8 +200,8 @@ INSERT INTO awscc.ec2.subnet_cidr_blocks (
  SubnetId,
  region
 )
-SELECT 
-'{{ SubnetId }}',
+SELECT
+'{{ subnet_id }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -216,11 +216,11 @@ INSERT INTO awscc.ec2.subnet_cidr_blocks (
  SubnetId,
  region
 )
-SELECT 
- '{{ Ipv6CidrBlock }}',
- '{{ Ipv6IpamPoolId }}',
- '{{ Ipv6NetmaskLength }}',
- '{{ SubnetId }}',
+SELECT
+ '{{ ipv6_cidr_block }}',
+ '{{ ipv6_ipam_pool_id }}',
+ '{{ ipv6_netmask_length }}',
+ '{{ subnet_id }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -238,15 +238,14 @@ globals:
 resources:
   - name: subnet_cidr_block
     props:
-      - name: Ipv6CidrBlock
-        value: '{{ Ipv6CidrBlock }}'
-      - name: Ipv6IpamPoolId
-        value: '{{ Ipv6IpamPoolId }}'
-      - name: Ipv6NetmaskLength
-        value: '{{ Ipv6NetmaskLength }}'
-      - name: SubnetId
-        value: '{{ SubnetId }}'
-
+      - name: ipv6_cidr_block
+        value: '{{ ipv6_cidr_block }}'
+      - name: ipv6_ipam_pool_id
+        value: '{{ ipv6_ipam_pool_id }}'
+      - name: ipv6_netmask_length
+        value: '{{ ipv6_netmask_length }}'
+      - name: subnet_id
+        value: '{{ subnet_id }}'
 ```
 </TabItem>
 </Tabs>
@@ -257,7 +256,7 @@ resources:
 ```sql
 /*+ delete */
 DELETE FROM awscc.ec2.subnet_cidr_blocks
-WHERE Identifier = '<Id>'
+WHERE Identifier = '{{ id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/ec2/subnet_network_acl_associations/index.md b/website/docs/services/ec2/subnet_network_acl_associations/index.md
index 50d87383b..26f697fdd 100644
--- a/website/docs/services/ec2/subnet_network_acl_associations/index.md
+++ b/website/docs/services/ec2/subnet_network_acl_associations/index.md
@@ -140,7 +140,7 @@ subnet_id,
 network_acl_id,
 association_id
 FROM awscc.ec2.subnet_network_acl_associations
-WHERE region = 'us-east-1' AND Identifier = '<AssociationId>';
+WHERE region = 'us-east-1' AND Identifier = '{{ association_id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -177,9 +177,9 @@ INSERT INTO awscc.ec2.subnet_network_acl_associations (
  NetworkAclId,
  region
 )
-SELECT 
-'{{ SubnetId }}',
- '{{ NetworkAclId }}',
+SELECT
+'{{ subnet_id }}',
+ '{{ network_acl_id }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -192,9 +192,9 @@ INSERT INTO awscc.ec2.subnet_network_acl_associations (
  NetworkAclId,
  region
 )
-SELECT 
- '{{ SubnetId }}',
- '{{ NetworkAclId }}',
+SELECT
+ '{{ subnet_id }}',
+ '{{ network_acl_id }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -212,11 +212,10 @@ globals:
 resources:
   - name: subnet_network_acl_association
     props:
-      - name: SubnetId
-        value: '{{ SubnetId }}'
-      - name: NetworkAclId
-        value: '{{ NetworkAclId }}'
-
+      - name: subnet_id
+        value: '{{ subnet_id }}'
+      - name: network_acl_id
+        value: '{{ network_acl_id }}'
 ```
 </TabItem>
 </Tabs>
@@ -227,7 +226,7 @@ resources:
 ```sql
 /*+ delete */
 DELETE FROM awscc.ec2.subnet_network_acl_associations
-WHERE Identifier = '<AssociationId>'
+WHERE Identifier = '{{ association_id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/ec2/subnet_route_table_associations/index.md b/website/docs/services/ec2/subnet_route_table_associations/index.md
index 474cf9f5a..f4d5b3ebf 100644
--- a/website/docs/services/ec2/subnet_route_table_associations/index.md
+++ b/website/docs/services/ec2/subnet_route_table_associations/index.md
@@ -140,7 +140,7 @@ route_table_id,
 id,
 subnet_id
 FROM awscc.ec2.subnet_route_table_associations
-WHERE region = 'us-east-1' AND Identifier = '<Id>';
+WHERE region = 'us-east-1' AND Identifier = '{{ id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -177,9 +177,9 @@ INSERT INTO awscc.ec2.subnet_route_table_associations (
  SubnetId,
  region
 )
-SELECT 
-'{{ RouteTableId }}',
- '{{ SubnetId }}',
+SELECT
+'{{ route_table_id }}',
+ '{{ subnet_id }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -192,9 +192,9 @@ INSERT INTO awscc.ec2.subnet_route_table_associations (
  SubnetId,
  region
 )
-SELECT 
- '{{ RouteTableId }}',
- '{{ SubnetId }}',
+SELECT
+ '{{ route_table_id }}',
+ '{{ subnet_id }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -212,11 +212,10 @@ globals:
 resources:
   - name: subnet_route_table_association
     props:
-      - name: RouteTableId
-        value: '{{ RouteTableId }}'
-      - name: SubnetId
-        value: '{{ SubnetId }}'
-
+      - name: route_table_id
+        value: '{{ route_table_id }}'
+      - name: subnet_id
+        value: '{{ subnet_id }}'
 ```
 </TabItem>
 </Tabs>
@@ -227,7 +226,7 @@ resources:
 ```sql
 /*+ delete */
 DELETE FROM awscc.ec2.subnet_route_table_associations
-WHERE Identifier = '<Id>'
+WHERE Identifier = '{{ id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/ec2/subnets/index.md b/website/docs/services/ec2/subnets/index.md
index 25f889091..8682bec37 100644
--- a/website/docs/services/ec2/subnets/index.md
+++ b/website/docs/services/ec2/subnets/index.md
@@ -290,7 +290,7 @@ ipv6_ipam_pool_id,
 ipv6_netmask_length,
 block_public_access_states
 FROM awscc.ec2.subnets
-WHERE region = 'us-east-1' AND Identifier = '<SubnetId>';
+WHERE region = 'us-east-1' AND Identifier = '{{ subnet_id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -326,8 +326,8 @@ INSERT INTO awscc.ec2.subnets (
  VpcId,
  region
 )
-SELECT 
-'{{ VpcId }}',
+SELECT
+'{{ vpc_id }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -355,24 +355,24 @@ INSERT INTO awscc.ec2.subnets (
  Ipv6NetmaskLength,
  region
 )
-SELECT 
- '{{ AssignIpv6AddressOnCreation }}',
- '{{ VpcId }}',
- '{{ MapPublicIpOnLaunch }}',
- '{{ EnableLniAtDeviceIndex }}',
- '{{ AvailabilityZone }}',
- '{{ AvailabilityZoneId }}',
- '{{ CidrBlock }}',
- '{{ Ipv6CidrBlock }}',
- '{{ OutpostArn }}',
- '{{ Ipv6Native }}',
- '{{ EnableDns64 }}',
- '{{ PrivateDnsNameOptionsOnLaunch }}',
- '{{ Tags }}',
- '{{ Ipv4IpamPoolId }}',
- '{{ Ipv4NetmaskLength }}',
- '{{ Ipv6IpamPoolId }}',
- '{{ Ipv6NetmaskLength }}',
+SELECT
+ '{{ assign_ipv6_address_on_creation }}',
+ '{{ vpc_id }}',
+ '{{ map_public_ip_on_launch }}',
+ '{{ enable_lni_at_device_index }}',
+ '{{ availability_zone }}',
+ '{{ availability_zone_id }}',
+ '{{ cidr_block }}',
+ '{{ ipv6_cidr_block }}',
+ '{{ outpost_arn }}',
+ '{{ ipv6_native }}',
+ '{{ enable_dns64 }}',
+ '{{ private_dns_name_options_on_launch }}',
+ '{{ tags }}',
+ '{{ ipv4_ipam_pool_id }}',
+ '{{ ipv4_netmask_length }}',
+ '{{ ipv6_ipam_pool_id }}',
+ '{{ ipv6_netmask_length }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -390,46 +390,45 @@ globals:
 resources:
   - name: subnet
     props:
-      - name: AssignIpv6AddressOnCreation
-        value: '{{ AssignIpv6AddressOnCreation }}'
-      - name: VpcId
-        value: '{{ VpcId }}'
-      - name: MapPublicIpOnLaunch
-        value: '{{ MapPublicIpOnLaunch }}'
-      - name: EnableLniAtDeviceIndex
-        value: '{{ EnableLniAtDeviceIndex }}'
-      - name: AvailabilityZone
-        value: '{{ AvailabilityZone }}'
-      - name: AvailabilityZoneId
-        value: '{{ AvailabilityZoneId }}'
-      - name: CidrBlock
-        value: '{{ CidrBlock }}'
-      - name: Ipv6CidrBlock
-        value: '{{ Ipv6CidrBlock }}'
-      - name: OutpostArn
-        value: '{{ OutpostArn }}'
-      - name: Ipv6Native
-        value: '{{ Ipv6Native }}'
-      - name: EnableDns64
-        value: '{{ EnableDns64 }}'
-      - name: PrivateDnsNameOptionsOnLaunch
+      - name: assign_ipv6_address_on_creation
+        value: '{{ assign_ipv6_address_on_creation }}'
+      - name: vpc_id
+        value: '{{ vpc_id }}'
+      - name: map_public_ip_on_launch
+        value: '{{ map_public_ip_on_launch }}'
+      - name: enable_lni_at_device_index
+        value: '{{ enable_lni_at_device_index }}'
+      - name: availability_zone
+        value: '{{ availability_zone }}'
+      - name: availability_zone_id
+        value: '{{ availability_zone_id }}'
+      - name: cidr_block
+        value: '{{ cidr_block }}'
+      - name: ipv6_cidr_block
+        value: '{{ ipv6_cidr_block }}'
+      - name: outpost_arn
+        value: '{{ outpost_arn }}'
+      - name: ipv6_native
+        value: '{{ ipv6_native }}'
+      - name: enable_dns64
+        value: '{{ enable_dns64 }}'
+      - name: private_dns_name_options_on_launch
         value:
-          HostnameType: '{{ HostnameType }}'
-          EnableResourceNameDnsARecord: '{{ EnableResourceNameDnsARecord }}'
-          EnableResourceNameDnsAAAARecord: '{{ EnableResourceNameDnsAAAARecord }}'
-      - name: Tags
+          hostname_type: '{{ hostname_type }}'
+          enable_resource_name_dns_arecord: '{{ enable_resource_name_dns_arecord }}'
+          enable_resource_name_dns_aa_aa_record: '{{ enable_resource_name_dns_aa_aa_record }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-      - name: Ipv4IpamPoolId
-        value: '{{ Ipv4IpamPoolId }}'
-      - name: Ipv4NetmaskLength
-        value: '{{ Ipv4NetmaskLength }}'
-      - name: Ipv6IpamPoolId
-        value: '{{ Ipv6IpamPoolId }}'
-      - name: Ipv6NetmaskLength
-        value: '{{ Ipv6NetmaskLength }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
+      - name: ipv4_ipam_pool_id
+        value: '{{ ipv4_ipam_pool_id }}'
+      - name: ipv4_netmask_length
+        value: '{{ ipv4_netmask_length }}'
+      - name: ipv6_ipam_pool_id
+        value: '{{ ipv6_ipam_pool_id }}'
+      - name: ipv6_netmask_length
+        value: '{{ ipv6_netmask_length }}'
 ```
 </TabItem>
 </Tabs>
@@ -451,7 +450,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<SubnetId>';
+AND Identifier = '{{ subnet_id }}';
 ```
 
 
@@ -460,7 +459,7 @@ AND Identifier = '<SubnetId>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.ec2.subnets
-WHERE Identifier = '<SubnetId>'
+WHERE Identifier = '{{ subnet_id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/ec2/traffic_mirror_filter_rules/index.md b/website/docs/services/ec2/traffic_mirror_filter_rules/index.md
index 889d75466..405e99314 100644
--- a/website/docs/services/ec2/traffic_mirror_filter_rules/index.md
+++ b/website/docs/services/ec2/traffic_mirror_filter_rules/index.md
@@ -219,7 +219,7 @@ traffic_direction,
 protocol,
 tags
 FROM awscc.ec2.traffic_mirror_filter_rules
-WHERE region = 'us-east-1' AND Identifier = '<TrafficMirrorFilterRuleId>';
+WHERE region = 'us-east-1' AND Identifier = '{{ traffic_mirror_filter_rule_id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -260,13 +260,13 @@ INSERT INTO awscc.ec2.traffic_mirror_filter_rules (
  TrafficDirection,
  region
 )
-SELECT 
-'{{ RuleAction }}',
- '{{ SourceCidrBlock }}',
- '{{ RuleNumber }}',
- '{{ DestinationCidrBlock }}',
- '{{ TrafficMirrorFilterId }}',
- '{{ TrafficDirection }}',
+SELECT
+'{{ rule_action }}',
+ '{{ source_cidr_block }}',
+ '{{ rule_number }}',
+ '{{ destination_cidr_block }}',
+ '{{ traffic_mirror_filter_id }}',
+ '{{ traffic_direction }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -288,18 +288,18 @@ INSERT INTO awscc.ec2.traffic_mirror_filter_rules (
  Tags,
  region
 )
-SELECT 
- '{{ DestinationPortRange }}',
- '{{ Description }}',
- '{{ SourcePortRange }}',
- '{{ RuleAction }}',
- '{{ SourceCidrBlock }}',
- '{{ RuleNumber }}',
- '{{ DestinationCidrBlock }}',
- '{{ TrafficMirrorFilterId }}',
- '{{ TrafficDirection }}',
- '{{ Protocol }}',
- '{{ Tags }}',
+SELECT
+ '{{ destination_port_range }}',
+ '{{ description }}',
+ '{{ source_port_range }}',
+ '{{ rule_action }}',
+ '{{ source_cidr_block }}',
+ '{{ rule_number }}',
+ '{{ destination_cidr_block }}',
+ '{{ traffic_mirror_filter_id }}',
+ '{{ traffic_direction }}',
+ '{{ protocol }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -317,33 +317,32 @@ globals:
 resources:
   - name: traffic_mirror_filter_rule
     props:
-      - name: DestinationPortRange
+      - name: destination_port_range
         value:
-          FromPort: '{{ FromPort }}'
-          ToPort: '{{ ToPort }}'
-      - name: Description
-        value: '{{ Description }}'
-      - name: SourcePortRange
+          from_port: '{{ from_port }}'
+          to_port: '{{ to_port }}'
+      - name: description
+        value: '{{ description }}'
+      - name: source_port_range
         value: null
-      - name: RuleAction
-        value: '{{ RuleAction }}'
-      - name: SourceCidrBlock
-        value: '{{ SourceCidrBlock }}'
-      - name: RuleNumber
-        value: '{{ RuleNumber }}'
-      - name: DestinationCidrBlock
-        value: '{{ DestinationCidrBlock }}'
-      - name: TrafficMirrorFilterId
-        value: '{{ TrafficMirrorFilterId }}'
-      - name: TrafficDirection
-        value: '{{ TrafficDirection }}'
-      - name: Protocol
-        value: '{{ Protocol }}'
-      - name: Tags
+      - name: rule_action
+        value: '{{ rule_action }}'
+      - name: source_cidr_block
+        value: '{{ source_cidr_block }}'
+      - name: rule_number
+        value: '{{ rule_number }}'
+      - name: destination_cidr_block
+        value: '{{ destination_cidr_block }}'
+      - name: traffic_mirror_filter_id
+        value: '{{ traffic_mirror_filter_id }}'
+      - name: traffic_direction
+        value: '{{ traffic_direction }}'
+      - name: protocol
+        value: '{{ protocol }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -368,7 +367,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<TrafficMirrorFilterRuleId>';
+AND Identifier = '{{ traffic_mirror_filter_rule_id }}';
 ```
 
 
@@ -377,7 +376,7 @@ AND Identifier = '<TrafficMirrorFilterRuleId>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.ec2.traffic_mirror_filter_rules
-WHERE Identifier = '<TrafficMirrorFilterRuleId>'
+WHERE Identifier = '{{ traffic_mirror_filter_rule_id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/ec2/traffic_mirror_filters/index.md b/website/docs/services/ec2/traffic_mirror_filters/index.md
index c3bff7996..5be54af19 100644
--- a/website/docs/services/ec2/traffic_mirror_filters/index.md
+++ b/website/docs/services/ec2/traffic_mirror_filters/index.md
@@ -164,7 +164,7 @@ network_services,
 description,
 tags
 FROM awscc.ec2.traffic_mirror_filters
-WHERE region = 'us-east-1' AND Identifier = '<Id>';
+WHERE region = 'us-east-1' AND Identifier = '{{ id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -202,10 +202,10 @@ INSERT INTO awscc.ec2.traffic_mirror_filters (
  Tags,
  region
 )
-SELECT 
-'{{ NetworkServices }}',
- '{{ Description }}',
- '{{ Tags }}',
+SELECT
+'{{ network_services }}',
+ '{{ description }}',
+ '{{ tags }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -219,10 +219,10 @@ INSERT INTO awscc.ec2.traffic_mirror_filters (
  Tags,
  region
 )
-SELECT 
- '{{ NetworkServices }}',
- '{{ Description }}',
- '{{ Tags }}',
+SELECT
+ '{{ network_services }}',
+ '{{ description }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -240,16 +240,15 @@ globals:
 resources:
   - name: traffic_mirror_filter
     props:
-      - name: NetworkServices
+      - name: network_services
         value:
-          - '{{ NetworkServices[0] }}'
-      - name: Description
-        value: '{{ Description }}'
-      - name: Tags
+          - '{{ network_services[0] }}'
+      - name: description
+        value: '{{ description }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -266,7 +265,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Id>';
+AND Identifier = '{{ id }}';
 ```
 
 
@@ -275,7 +274,7 @@ AND Identifier = '<Id>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.ec2.traffic_mirror_filters
-WHERE Identifier = '<Id>'
+WHERE Identifier = '{{ id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/ec2/traffic_mirror_sessions/index.md b/website/docs/services/ec2/traffic_mirror_sessions/index.md
index 4b02abd7d..cb492446b 100644
--- a/website/docs/services/ec2/traffic_mirror_sessions/index.md
+++ b/website/docs/services/ec2/traffic_mirror_sessions/index.md
@@ -200,7 +200,7 @@ description,
 owner_id,
 tags
 FROM awscc.ec2.traffic_mirror_sessions
-WHERE region = 'us-east-1' AND Identifier = '<Id>';
+WHERE region = 'us-east-1' AND Identifier = '{{ id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -239,11 +239,11 @@ INSERT INTO awscc.ec2.traffic_mirror_sessions (
  SessionNumber,
  region
 )
-SELECT 
-'{{ NetworkInterfaceId }}',
- '{{ TrafficMirrorTargetId }}',
- '{{ TrafficMirrorFilterId }}',
- '{{ SessionNumber }}',
+SELECT
+'{{ network_interface_id }}',
+ '{{ traffic_mirror_target_id }}',
+ '{{ traffic_mirror_filter_id }}',
+ '{{ session_number }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -263,16 +263,16 @@ INSERT INTO awscc.ec2.traffic_mirror_sessions (
  Tags,
  region
 )
-SELECT 
- '{{ NetworkInterfaceId }}',
- '{{ TrafficMirrorTargetId }}',
- '{{ TrafficMirrorFilterId }}',
- '{{ PacketLength }}',
- '{{ SessionNumber }}',
- '{{ VirtualNetworkId }}',
- '{{ Description }}',
- '{{ OwnerId }}',
- '{{ Tags }}',
+SELECT
+ '{{ network_interface_id }}',
+ '{{ traffic_mirror_target_id }}',
+ '{{ traffic_mirror_filter_id }}',
+ '{{ packet_length }}',
+ '{{ session_number }}',
+ '{{ virtual_network_id }}',
+ '{{ description }}',
+ '{{ owner_id }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -290,27 +290,26 @@ globals:
 resources:
   - name: traffic_mirror_session
     props:
-      - name: NetworkInterfaceId
-        value: '{{ NetworkInterfaceId }}'
-      - name: TrafficMirrorTargetId
-        value: '{{ TrafficMirrorTargetId }}'
-      - name: TrafficMirrorFilterId
-        value: '{{ TrafficMirrorFilterId }}'
-      - name: PacketLength
-        value: '{{ PacketLength }}'
-      - name: SessionNumber
-        value: '{{ SessionNumber }}'
-      - name: VirtualNetworkId
-        value: '{{ VirtualNetworkId }}'
-      - name: Description
-        value: '{{ Description }}'
-      - name: OwnerId
-        value: '{{ OwnerId }}'
-      - name: Tags
+      - name: network_interface_id
+        value: '{{ network_interface_id }}'
+      - name: traffic_mirror_target_id
+        value: '{{ traffic_mirror_target_id }}'
+      - name: traffic_mirror_filter_id
+        value: '{{ traffic_mirror_filter_id }}'
+      - name: packet_length
+        value: '{{ packet_length }}'
+      - name: session_number
+        value: '{{ session_number }}'
+      - name: virtual_network_id
+        value: '{{ virtual_network_id }}'
+      - name: description
+        value: '{{ description }}'
+      - name: owner_id
+        value: '{{ owner_id }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -334,7 +333,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Id>';
+AND Identifier = '{{ id }}';
 ```
 
 
@@ -343,7 +342,7 @@ AND Identifier = '<Id>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.ec2.traffic_mirror_sessions
-WHERE Identifier = '<Id>'
+WHERE Identifier = '{{ id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/ec2/traffic_mirror_targets/index.md b/website/docs/services/ec2/traffic_mirror_targets/index.md
index 062cc7eac..f1abc036d 100644
--- a/website/docs/services/ec2/traffic_mirror_targets/index.md
+++ b/website/docs/services/ec2/traffic_mirror_targets/index.md
@@ -176,7 +176,7 @@ network_interface_id,
 gateway_load_balancer_endpoint_id,
 tags
 FROM awscc.ec2.traffic_mirror_targets
-WHERE region = 'us-east-1' AND Identifier = '<Id>';
+WHERE region = 'us-east-1' AND Identifier = '{{ id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -216,12 +216,12 @@ INSERT INTO awscc.ec2.traffic_mirror_targets (
  Tags,
  region
 )
-SELECT 
-'{{ NetworkLoadBalancerArn }}',
- '{{ Description }}',
- '{{ NetworkInterfaceId }}',
- '{{ GatewayLoadBalancerEndpointId }}',
- '{{ Tags }}',
+SELECT
+'{{ network_load_balancer_arn }}',
+ '{{ description }}',
+ '{{ network_interface_id }}',
+ '{{ gateway_load_balancer_endpoint_id }}',
+ '{{ tags }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -237,12 +237,12 @@ INSERT INTO awscc.ec2.traffic_mirror_targets (
  Tags,
  region
 )
-SELECT 
- '{{ NetworkLoadBalancerArn }}',
- '{{ Description }}',
- '{{ NetworkInterfaceId }}',
- '{{ GatewayLoadBalancerEndpointId }}',
- '{{ Tags }}',
+SELECT
+ '{{ network_load_balancer_arn }}',
+ '{{ description }}',
+ '{{ network_interface_id }}',
+ '{{ gateway_load_balancer_endpoint_id }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -260,19 +260,18 @@ globals:
 resources:
   - name: traffic_mirror_target
     props:
-      - name: NetworkLoadBalancerArn
-        value: '{{ NetworkLoadBalancerArn }}'
-      - name: Description
-        value: '{{ Description }}'
-      - name: NetworkInterfaceId
-        value: '{{ NetworkInterfaceId }}'
-      - name: GatewayLoadBalancerEndpointId
-        value: '{{ GatewayLoadBalancerEndpointId }}'
-      - name: Tags
+      - name: network_load_balancer_arn
+        value: '{{ network_load_balancer_arn }}'
+      - name: description
+        value: '{{ description }}'
+      - name: network_interface_id
+        value: '{{ network_interface_id }}'
+      - name: gateway_load_balancer_endpoint_id
+        value: '{{ gateway_load_balancer_endpoint_id }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -288,7 +287,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Id>';
+AND Identifier = '{{ id }}';
 ```
 
 
@@ -297,7 +296,7 @@ AND Identifier = '<Id>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.ec2.traffic_mirror_targets
-WHERE Identifier = '<Id>'
+WHERE Identifier = '{{ id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/ec2/transit_gateway_attachments/index.md b/website/docs/services/ec2/transit_gateway_attachments/index.md
index 7b471b2a4..7ef19cff5 100644
--- a/website/docs/services/ec2/transit_gateway_attachments/index.md
+++ b/website/docs/services/ec2/transit_gateway_attachments/index.md
@@ -198,7 +198,7 @@ id,
 subnet_ids,
 tags
 FROM awscc.ec2.transit_gateway_attachments
-WHERE region = 'us-east-1' AND Identifier = '<Id>';
+WHERE region = 'us-east-1' AND Identifier = '{{ id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -236,10 +236,10 @@ INSERT INTO awscc.ec2.transit_gateway_attachments (
  SubnetIds,
  region
 )
-SELECT 
-'{{ TransitGatewayId }}',
- '{{ VpcId }}',
- '{{ SubnetIds }}',
+SELECT
+'{{ transit_gateway_id }}',
+ '{{ vpc_id }}',
+ '{{ subnet_ids }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -255,12 +255,12 @@ INSERT INTO awscc.ec2.transit_gateway_attachments (
  Tags,
  region
 )
-SELECT 
- '{{ Options }}',
- '{{ TransitGatewayId }}',
- '{{ VpcId }}',
- '{{ SubnetIds }}',
- '{{ Tags }}',
+SELECT
+ '{{ options }}',
+ '{{ transit_gateway_id }}',
+ '{{ vpc_id }}',
+ '{{ subnet_ids }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -278,24 +278,23 @@ globals:
 resources:
   - name: transit_gateway_attachment
     props:
-      - name: Options
+      - name: options
         value:
-          Ipv6Support: '{{ Ipv6Support }}'
-          ApplianceModeSupport: '{{ ApplianceModeSupport }}'
-          SecurityGroupReferencingSupport: '{{ SecurityGroupReferencingSupport }}'
-          DnsSupport: '{{ DnsSupport }}'
-      - name: TransitGatewayId
-        value: '{{ TransitGatewayId }}'
-      - name: VpcId
-        value: '{{ VpcId }}'
-      - name: SubnetIds
+          ipv6_support: '{{ ipv6_support }}'
+          appliance_mode_support: '{{ appliance_mode_support }}'
+          security_group_referencing_support: '{{ security_group_referencing_support }}'
+          dns_support: '{{ dns_support }}'
+      - name: transit_gateway_id
+        value: '{{ transit_gateway_id }}'
+      - name: vpc_id
+        value: '{{ vpc_id }}'
+      - name: subnet_ids
         value:
-          - '{{ SubnetIds[0] }}'
-      - name: Tags
+          - '{{ subnet_ids[0] }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -313,7 +312,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Id>';
+AND Identifier = '{{ id }}';
 ```
 
 
@@ -322,7 +321,7 @@ AND Identifier = '<Id>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.ec2.transit_gateway_attachments
-WHERE Identifier = '<Id>'
+WHERE Identifier = '{{ id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/ec2/transit_gateway_connect_peers/index.md b/website/docs/services/ec2/transit_gateway_connect_peers/index.md
index 12983bdd1..d9ff08d30 100644
--- a/website/docs/services/ec2/transit_gateway_connect_peers/index.md
+++ b/website/docs/services/ec2/transit_gateway_connect_peers/index.md
@@ -230,7 +230,7 @@ creation_time,
 connect_peer_configuration,
 tags
 FROM awscc.ec2.transit_gateway_connect_peers
-WHERE region = 'us-east-1' AND Identifier = '<TransitGatewayConnectPeerId>';
+WHERE region = 'us-east-1' AND Identifier = '{{ transit_gateway_connect_peer_id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -267,9 +267,9 @@ INSERT INTO awscc.ec2.transit_gateway_connect_peers (
  ConnectPeerConfiguration,
  region
 )
-SELECT 
-'{{ TransitGatewayAttachmentId }}',
- '{{ ConnectPeerConfiguration }}',
+SELECT
+'{{ transit_gateway_attachment_id }}',
+ '{{ connect_peer_configuration }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -283,10 +283,10 @@ INSERT INTO awscc.ec2.transit_gateway_connect_peers (
  Tags,
  region
 )
-SELECT 
- '{{ TransitGatewayAttachmentId }}',
- '{{ ConnectPeerConfiguration }}',
- '{{ Tags }}',
+SELECT
+ '{{ transit_gateway_attachment_id }}',
+ '{{ connect_peer_configuration }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -304,26 +304,25 @@ globals:
 resources:
   - name: transit_gateway_connect_peer
     props:
-      - name: TransitGatewayAttachmentId
-        value: '{{ TransitGatewayAttachmentId }}'
-      - name: ConnectPeerConfiguration
+      - name: transit_gateway_attachment_id
+        value: '{{ transit_gateway_attachment_id }}'
+      - name: connect_peer_configuration
         value:
-          TransitGatewayAddress: '{{ TransitGatewayAddress }}'
-          PeerAddress: '{{ PeerAddress }}'
-          InsideCidrBlocks:
-            - '{{ InsideCidrBlocks[0] }}'
-          Protocol: '{{ Protocol }}'
-          BgpConfigurations:
-            - TransitGatewayAsn: null
-              PeerAsn: null
-              TransitGatewayAddress: '{{ TransitGatewayAddress }}'
-              PeerAddress: '{{ PeerAddress }}'
-              BgpStatus: '{{ BgpStatus }}'
-      - name: Tags
+          transit_gateway_address: '{{ transit_gateway_address }}'
+          peer_address: '{{ peer_address }}'
+          inside_cidr_blocks:
+            - '{{ inside_cidr_blocks[0] }}'
+          protocol: '{{ protocol }}'
+          bgp_configurations:
+            - transit_gateway_asn: null
+              peer_asn: null
+              transit_gateway_address: '{{ transit_gateway_address }}'
+              peer_address: '{{ peer_address }}'
+              bgp_status: '{{ bgp_status }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -339,7 +338,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<TransitGatewayConnectPeerId>';
+AND Identifier = '{{ transit_gateway_connect_peer_id }}';
 ```
 
 
@@ -348,7 +347,7 @@ AND Identifier = '<TransitGatewayConnectPeerId>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.ec2.transit_gateway_connect_peers
-WHERE Identifier = '<TransitGatewayConnectPeerId>'
+WHERE Identifier = '{{ transit_gateway_connect_peer_id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/ec2/transit_gateway_connects/index.md b/website/docs/services/ec2/transit_gateway_connects/index.md
index b316ff49f..53ed08dbc 100644
--- a/website/docs/services/ec2/transit_gateway_connects/index.md
+++ b/website/docs/services/ec2/transit_gateway_connects/index.md
@@ -189,7 +189,7 @@ creation_time,
 tags,
 options
 FROM awscc.ec2.transit_gateway_connects
-WHERE region = 'us-east-1' AND Identifier = '<TransitGatewayAttachmentId>';
+WHERE region = 'us-east-1' AND Identifier = '{{ transit_gateway_attachment_id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -226,9 +226,9 @@ INSERT INTO awscc.ec2.transit_gateway_connects (
  Options,
  region
 )
-SELECT 
-'{{ TransportTransitGatewayAttachmentId }}',
- '{{ Options }}',
+SELECT
+'{{ transport_transit_gateway_attachment_id }}',
+ '{{ options }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -242,10 +242,10 @@ INSERT INTO awscc.ec2.transit_gateway_connects (
  Options,
  region
 )
-SELECT 
- '{{ TransportTransitGatewayAttachmentId }}',
- '{{ Tags }}',
- '{{ Options }}',
+SELECT
+ '{{ transport_transit_gateway_attachment_id }}',
+ '{{ tags }}',
+ '{{ options }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -263,16 +263,15 @@ globals:
 resources:
   - name: transit_gateway_connect
     props:
-      - name: TransportTransitGatewayAttachmentId
-        value: '{{ TransportTransitGatewayAttachmentId }}'
-      - name: Tags
+      - name: transport_transit_gateway_attachment_id
+        value: '{{ transport_transit_gateway_attachment_id }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-      - name: Options
+          - key: '{{ key }}'
+            value: '{{ value }}'
+      - name: options
         value:
-          Protocol: '{{ Protocol }}'
-
+          protocol: '{{ protocol }}'
 ```
 </TabItem>
 </Tabs>
@@ -288,7 +287,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<TransitGatewayAttachmentId>';
+AND Identifier = '{{ transit_gateway_attachment_id }}';
 ```
 
 
@@ -297,7 +296,7 @@ AND Identifier = '<TransitGatewayAttachmentId>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.ec2.transit_gateway_connects
-WHERE Identifier = '<TransitGatewayAttachmentId>'
+WHERE Identifier = '{{ transit_gateway_attachment_id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/ec2/transit_gateway_multicast_domain_associations/index.md b/website/docs/services/ec2/transit_gateway_multicast_domain_associations/index.md
index 72db86926..b47f31f56 100644
--- a/website/docs/services/ec2/transit_gateway_multicast_domain_associations/index.md
+++ b/website/docs/services/ec2/transit_gateway_multicast_domain_associations/index.md
@@ -168,7 +168,7 @@ resource_type,
 state,
 subnet_id
 FROM awscc.ec2.transit_gateway_multicast_domain_associations
-WHERE region = 'us-east-1' AND Identifier = '<TransitGatewayMulticastDomainId>|<TransitGatewayAttachmentId>|<SubnetId>';
+WHERE region = 'us-east-1' AND Identifier = '{{ transit_gateway_multicast_domain_id }}|{{ transit_gateway_attachment_id }}|{{ subnet_id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -208,10 +208,10 @@ INSERT INTO awscc.ec2.transit_gateway_multicast_domain_associations (
  SubnetId,
  region
 )
-SELECT 
-'{{ TransitGatewayMulticastDomainId }}',
- '{{ TransitGatewayAttachmentId }}',
- '{{ SubnetId }}',
+SELECT
+'{{ transit_gateway_multicast_domain_id }}',
+ '{{ transit_gateway_attachment_id }}',
+ '{{ subnet_id }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -225,10 +225,10 @@ INSERT INTO awscc.ec2.transit_gateway_multicast_domain_associations (
  SubnetId,
  region
 )
-SELECT 
- '{{ TransitGatewayMulticastDomainId }}',
- '{{ TransitGatewayAttachmentId }}',
- '{{ SubnetId }}',
+SELECT
+ '{{ transit_gateway_multicast_domain_id }}',
+ '{{ transit_gateway_attachment_id }}',
+ '{{ subnet_id }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -246,13 +246,12 @@ globals:
 resources:
   - name: transit_gateway_multicast_domain_association
     props:
-      - name: TransitGatewayMulticastDomainId
-        value: '{{ TransitGatewayMulticastDomainId }}'
-      - name: TransitGatewayAttachmentId
-        value: '{{ TransitGatewayAttachmentId }}'
-      - name: SubnetId
-        value: '{{ SubnetId }}'
-
+      - name: transit_gateway_multicast_domain_id
+        value: '{{ transit_gateway_multicast_domain_id }}'
+      - name: transit_gateway_attachment_id
+        value: '{{ transit_gateway_attachment_id }}'
+      - name: subnet_id
+        value: '{{ subnet_id }}'
 ```
 </TabItem>
 </Tabs>
@@ -263,7 +262,7 @@ resources:
 ```sql
 /*+ delete */
 DELETE FROM awscc.ec2.transit_gateway_multicast_domain_associations
-WHERE Identifier = '<TransitGatewayMulticastDomainId|TransitGatewayAttachmentId|SubnetId>'
+WHERE Identifier = '{{ transit_gateway_multicast_domain_id }}|{{ transit_gateway_attachment_id }}|{{ subnet_id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/ec2/transit_gateway_multicast_domains/index.md b/website/docs/services/ec2/transit_gateway_multicast_domains/index.md
index d82c041ab..b9e54fb56 100644
--- a/website/docs/services/ec2/transit_gateway_multicast_domains/index.md
+++ b/website/docs/services/ec2/transit_gateway_multicast_domains/index.md
@@ -199,7 +199,7 @@ creation_time,
 tags,
 options
 FROM awscc.ec2.transit_gateway_multicast_domains
-WHERE region = 'us-east-1' AND Identifier = '<TransitGatewayMulticastDomainId>';
+WHERE region = 'us-east-1' AND Identifier = '{{ transit_gateway_multicast_domain_id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -235,8 +235,8 @@ INSERT INTO awscc.ec2.transit_gateway_multicast_domains (
  TransitGatewayId,
  region
 )
-SELECT 
-'{{ TransitGatewayId }}',
+SELECT
+'{{ transit_gateway_id }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -250,10 +250,10 @@ INSERT INTO awscc.ec2.transit_gateway_multicast_domains (
  Options,
  region
 )
-SELECT 
- '{{ TransitGatewayId }}',
- '{{ Tags }}',
- '{{ Options }}',
+SELECT
+ '{{ transit_gateway_id }}',
+ '{{ tags }}',
+ '{{ options }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -271,18 +271,17 @@ globals:
 resources:
   - name: transit_gateway_multicast_domain
     props:
-      - name: TransitGatewayId
-        value: '{{ TransitGatewayId }}'
-      - name: Tags
+      - name: transit_gateway_id
+        value: '{{ transit_gateway_id }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-      - name: Options
+          - key: '{{ key }}'
+            value: '{{ value }}'
+      - name: options
         value:
-          AutoAcceptSharedAssociations: '{{ AutoAcceptSharedAssociations }}'
-          Igmpv2Support: '{{ Igmpv2Support }}'
-          StaticSourcesSupport: '{{ StaticSourcesSupport }}'
-
+          auto_accept_shared_associations: '{{ auto_accept_shared_associations }}'
+          igmpv2_support: '{{ igmpv2_support }}'
+          static_sources_support: '{{ static_sources_support }}'
 ```
 </TabItem>
 </Tabs>
@@ -299,7 +298,7 @@ SET PatchDocument = string('{{ {
     "Options": options
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<TransitGatewayMulticastDomainId>';
+AND Identifier = '{{ transit_gateway_multicast_domain_id }}';
 ```
 
 
@@ -308,7 +307,7 @@ AND Identifier = '<TransitGatewayMulticastDomainId>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.ec2.transit_gateway_multicast_domains
-WHERE Identifier = '<TransitGatewayMulticastDomainId>'
+WHERE Identifier = '{{ transit_gateway_multicast_domain_id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/ec2/transit_gateway_multicast_group_members/index.md b/website/docs/services/ec2/transit_gateway_multicast_group_members/index.md
index e79b42438..552ca5b61 100644
--- a/website/docs/services/ec2/transit_gateway_multicast_group_members/index.md
+++ b/website/docs/services/ec2/transit_gateway_multicast_group_members/index.md
@@ -192,7 +192,7 @@ group_member,
 group_source,
 member_type
 FROM awscc.ec2.transit_gateway_multicast_group_members
-WHERE region = 'us-east-1' AND Identifier = '<TransitGatewayMulticastDomainId>|<GroupIpAddress>|<NetworkInterfaceId>';
+WHERE region = 'us-east-1' AND Identifier = '{{ transit_gateway_multicast_domain_id }}|{{ group_ip_address }}|{{ network_interface_id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -232,10 +232,10 @@ INSERT INTO awscc.ec2.transit_gateway_multicast_group_members (
  NetworkInterfaceId,
  region
 )
-SELECT 
-'{{ GroupIpAddress }}',
- '{{ TransitGatewayMulticastDomainId }}',
- '{{ NetworkInterfaceId }}',
+SELECT
+'{{ group_ip_address }}',
+ '{{ transit_gateway_multicast_domain_id }}',
+ '{{ network_interface_id }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -249,10 +249,10 @@ INSERT INTO awscc.ec2.transit_gateway_multicast_group_members (
  NetworkInterfaceId,
  region
 )
-SELECT 
- '{{ GroupIpAddress }}',
- '{{ TransitGatewayMulticastDomainId }}',
- '{{ NetworkInterfaceId }}',
+SELECT
+ '{{ group_ip_address }}',
+ '{{ transit_gateway_multicast_domain_id }}',
+ '{{ network_interface_id }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -270,13 +270,12 @@ globals:
 resources:
   - name: transit_gateway_multicast_group_member
     props:
-      - name: GroupIpAddress
-        value: '{{ GroupIpAddress }}'
-      - name: TransitGatewayMulticastDomainId
-        value: '{{ TransitGatewayMulticastDomainId }}'
-      - name: NetworkInterfaceId
-        value: '{{ NetworkInterfaceId }}'
-
+      - name: group_ip_address
+        value: '{{ group_ip_address }}'
+      - name: transit_gateway_multicast_domain_id
+        value: '{{ transit_gateway_multicast_domain_id }}'
+      - name: network_interface_id
+        value: '{{ network_interface_id }}'
 ```
 </TabItem>
 </Tabs>
@@ -287,7 +286,7 @@ resources:
 ```sql
 /*+ delete */
 DELETE FROM awscc.ec2.transit_gateway_multicast_group_members
-WHERE Identifier = '<TransitGatewayMulticastDomainId|GroupIpAddress|NetworkInterfaceId>'
+WHERE Identifier = '{{ transit_gateway_multicast_domain_id }}|{{ group_ip_address }}|{{ network_interface_id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/ec2/transit_gateway_multicast_group_sources/index.md b/website/docs/services/ec2/transit_gateway_multicast_group_sources/index.md
index 2dbdb0c71..594f43f62 100644
--- a/website/docs/services/ec2/transit_gateway_multicast_group_sources/index.md
+++ b/website/docs/services/ec2/transit_gateway_multicast_group_sources/index.md
@@ -192,7 +192,7 @@ group_member,
 group_source,
 source_type
 FROM awscc.ec2.transit_gateway_multicast_group_sources
-WHERE region = 'us-east-1' AND Identifier = '<TransitGatewayMulticastDomainId>|<GroupIpAddress>|<NetworkInterfaceId>';
+WHERE region = 'us-east-1' AND Identifier = '{{ transit_gateway_multicast_domain_id }}|{{ group_ip_address }}|{{ network_interface_id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -232,10 +232,10 @@ INSERT INTO awscc.ec2.transit_gateway_multicast_group_sources (
  NetworkInterfaceId,
  region
 )
-SELECT 
-'{{ GroupIpAddress }}',
- '{{ TransitGatewayMulticastDomainId }}',
- '{{ NetworkInterfaceId }}',
+SELECT
+'{{ group_ip_address }}',
+ '{{ transit_gateway_multicast_domain_id }}',
+ '{{ network_interface_id }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -249,10 +249,10 @@ INSERT INTO awscc.ec2.transit_gateway_multicast_group_sources (
  NetworkInterfaceId,
  region
 )
-SELECT 
- '{{ GroupIpAddress }}',
- '{{ TransitGatewayMulticastDomainId }}',
- '{{ NetworkInterfaceId }}',
+SELECT
+ '{{ group_ip_address }}',
+ '{{ transit_gateway_multicast_domain_id }}',
+ '{{ network_interface_id }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -270,13 +270,12 @@ globals:
 resources:
   - name: transit_gateway_multicast_group_source
     props:
-      - name: GroupIpAddress
-        value: '{{ GroupIpAddress }}'
-      - name: TransitGatewayMulticastDomainId
-        value: '{{ TransitGatewayMulticastDomainId }}'
-      - name: NetworkInterfaceId
-        value: '{{ NetworkInterfaceId }}'
-
+      - name: group_ip_address
+        value: '{{ group_ip_address }}'
+      - name: transit_gateway_multicast_domain_id
+        value: '{{ transit_gateway_multicast_domain_id }}'
+      - name: network_interface_id
+        value: '{{ network_interface_id }}'
 ```
 </TabItem>
 </Tabs>
@@ -287,7 +286,7 @@ resources:
 ```sql
 /*+ delete */
 DELETE FROM awscc.ec2.transit_gateway_multicast_group_sources
-WHERE Identifier = '<TransitGatewayMulticastDomainId|GroupIpAddress|NetworkInterfaceId>'
+WHERE Identifier = '{{ transit_gateway_multicast_domain_id }}|{{ group_ip_address }}|{{ network_interface_id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/ec2/transit_gateway_peering_attachments/index.md b/website/docs/services/ec2/transit_gateway_peering_attachments/index.md
index c890adc85..a401362ee 100644
--- a/website/docs/services/ec2/transit_gateway_peering_attachments/index.md
+++ b/website/docs/services/ec2/transit_gateway_peering_attachments/index.md
@@ -206,7 +206,7 @@ peer_region,
 tags,
 transit_gateway_attachment_id
 FROM awscc.ec2.transit_gateway_peering_attachments
-WHERE region = 'us-east-1' AND Identifier = '<TransitGatewayAttachmentId>';
+WHERE region = 'us-east-1' AND Identifier = '{{ transit_gateway_attachment_id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -245,11 +245,11 @@ INSERT INTO awscc.ec2.transit_gateway_peering_attachments (
  PeerRegion,
  region
 )
-SELECT 
-'{{ TransitGatewayId }}',
- '{{ PeerTransitGatewayId }}',
- '{{ PeerAccountId }}',
- '{{ PeerRegion }}',
+SELECT
+'{{ transit_gateway_id }}',
+ '{{ peer_transit_gateway_id }}',
+ '{{ peer_account_id }}',
+ '{{ peer_region }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -265,12 +265,12 @@ INSERT INTO awscc.ec2.transit_gateway_peering_attachments (
  Tags,
  region
 )
-SELECT 
- '{{ TransitGatewayId }}',
- '{{ PeerTransitGatewayId }}',
- '{{ PeerAccountId }}',
- '{{ PeerRegion }}',
- '{{ Tags }}',
+SELECT
+ '{{ transit_gateway_id }}',
+ '{{ peer_transit_gateway_id }}',
+ '{{ peer_account_id }}',
+ '{{ peer_region }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -288,19 +288,18 @@ globals:
 resources:
   - name: transit_gateway_peering_attachment
     props:
-      - name: TransitGatewayId
-        value: '{{ TransitGatewayId }}'
-      - name: PeerTransitGatewayId
-        value: '{{ PeerTransitGatewayId }}'
-      - name: PeerAccountId
-        value: '{{ PeerAccountId }}'
-      - name: PeerRegion
-        value: '{{ PeerRegion }}'
-      - name: Tags
+      - name: transit_gateway_id
+        value: '{{ transit_gateway_id }}'
+      - name: peer_transit_gateway_id
+        value: '{{ peer_transit_gateway_id }}'
+      - name: peer_account_id
+        value: '{{ peer_account_id }}'
+      - name: peer_region
+        value: '{{ peer_region }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -316,7 +315,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<TransitGatewayAttachmentId>';
+AND Identifier = '{{ transit_gateway_attachment_id }}';
 ```
 
 
@@ -325,7 +324,7 @@ AND Identifier = '<TransitGatewayAttachmentId>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.ec2.transit_gateway_peering_attachments
-WHERE Identifier = '<TransitGatewayAttachmentId>'
+WHERE Identifier = '{{ transit_gateway_attachment_id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/ec2/transit_gateway_route_table_associations/index.md b/website/docs/services/ec2/transit_gateway_route_table_associations/index.md
index c96bd1862..66a903a7a 100644
--- a/website/docs/services/ec2/transit_gateway_route_table_associations/index.md
+++ b/website/docs/services/ec2/transit_gateway_route_table_associations/index.md
@@ -139,7 +139,7 @@ region,
 transit_gateway_route_table_id,
 transit_gateway_attachment_id
 FROM awscc.ec2.transit_gateway_route_table_associations
-WHERE region = 'us-east-1' AND Identifier = '<TransitGatewayRouteTableId>|<TransitGatewayAttachmentId>';
+WHERE region = 'us-east-1' AND Identifier = '{{ transit_gateway_route_table_id }}|{{ transit_gateway_attachment_id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -177,9 +177,9 @@ INSERT INTO awscc.ec2.transit_gateway_route_table_associations (
  TransitGatewayAttachmentId,
  region
 )
-SELECT 
-'{{ TransitGatewayRouteTableId }}',
- '{{ TransitGatewayAttachmentId }}',
+SELECT
+'{{ transit_gateway_route_table_id }}',
+ '{{ transit_gateway_attachment_id }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -192,9 +192,9 @@ INSERT INTO awscc.ec2.transit_gateway_route_table_associations (
  TransitGatewayAttachmentId,
  region
 )
-SELECT 
- '{{ TransitGatewayRouteTableId }}',
- '{{ TransitGatewayAttachmentId }}',
+SELECT
+ '{{ transit_gateway_route_table_id }}',
+ '{{ transit_gateway_attachment_id }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -212,11 +212,10 @@ globals:
 resources:
   - name: transit_gateway_route_table_association
     props:
-      - name: TransitGatewayRouteTableId
-        value: '{{ TransitGatewayRouteTableId }}'
-      - name: TransitGatewayAttachmentId
-        value: '{{ TransitGatewayAttachmentId }}'
-
+      - name: transit_gateway_route_table_id
+        value: '{{ transit_gateway_route_table_id }}'
+      - name: transit_gateway_attachment_id
+        value: '{{ transit_gateway_attachment_id }}'
 ```
 </TabItem>
 </Tabs>
@@ -227,7 +226,7 @@ resources:
 ```sql
 /*+ delete */
 DELETE FROM awscc.ec2.transit_gateway_route_table_associations
-WHERE Identifier = '<TransitGatewayRouteTableId|TransitGatewayAttachmentId>'
+WHERE Identifier = '{{ transit_gateway_route_table_id }}|{{ transit_gateway_attachment_id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/ec2/transit_gateway_route_table_propagations/index.md b/website/docs/services/ec2/transit_gateway_route_table_propagations/index.md
index 7f4bcb32e..54801bc96 100644
--- a/website/docs/services/ec2/transit_gateway_route_table_propagations/index.md
+++ b/website/docs/services/ec2/transit_gateway_route_table_propagations/index.md
@@ -139,7 +139,7 @@ region,
 transit_gateway_route_table_id,
 transit_gateway_attachment_id
 FROM awscc.ec2.transit_gateway_route_table_propagations
-WHERE region = 'us-east-1' AND Identifier = '<TransitGatewayRouteTableId>|<TransitGatewayAttachmentId>';
+WHERE region = 'us-east-1' AND Identifier = '{{ transit_gateway_route_table_id }}|{{ transit_gateway_attachment_id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -177,9 +177,9 @@ INSERT INTO awscc.ec2.transit_gateway_route_table_propagations (
  TransitGatewayAttachmentId,
  region
 )
-SELECT 
-'{{ TransitGatewayRouteTableId }}',
- '{{ TransitGatewayAttachmentId }}',
+SELECT
+'{{ transit_gateway_route_table_id }}',
+ '{{ transit_gateway_attachment_id }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -192,9 +192,9 @@ INSERT INTO awscc.ec2.transit_gateway_route_table_propagations (
  TransitGatewayAttachmentId,
  region
 )
-SELECT 
- '{{ TransitGatewayRouteTableId }}',
- '{{ TransitGatewayAttachmentId }}',
+SELECT
+ '{{ transit_gateway_route_table_id }}',
+ '{{ transit_gateway_attachment_id }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -212,11 +212,10 @@ globals:
 resources:
   - name: transit_gateway_route_table_propagation
     props:
-      - name: TransitGatewayRouteTableId
-        value: '{{ TransitGatewayRouteTableId }}'
-      - name: TransitGatewayAttachmentId
-        value: '{{ TransitGatewayAttachmentId }}'
-
+      - name: transit_gateway_route_table_id
+        value: '{{ transit_gateway_route_table_id }}'
+      - name: transit_gateway_attachment_id
+        value: '{{ transit_gateway_attachment_id }}'
 ```
 </TabItem>
 </Tabs>
@@ -227,7 +226,7 @@ resources:
 ```sql
 /*+ delete */
 DELETE FROM awscc.ec2.transit_gateway_route_table_propagations
-WHERE Identifier = '<TransitGatewayRouteTableId|TransitGatewayAttachmentId>'
+WHERE Identifier = '{{ transit_gateway_route_table_id }}|{{ transit_gateway_attachment_id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/ec2/transit_gateway_route_tables/index.md b/website/docs/services/ec2/transit_gateway_route_tables/index.md
index 62a955fb9..feada374c 100644
--- a/website/docs/services/ec2/transit_gateway_route_tables/index.md
+++ b/website/docs/services/ec2/transit_gateway_route_tables/index.md
@@ -158,7 +158,7 @@ transit_gateway_route_table_id,
 transit_gateway_id,
 tags
 FROM awscc.ec2.transit_gateway_route_tables
-WHERE region = 'us-east-1' AND Identifier = '<TransitGatewayRouteTableId>';
+WHERE region = 'us-east-1' AND Identifier = '{{ transit_gateway_route_table_id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -194,8 +194,8 @@ INSERT INTO awscc.ec2.transit_gateway_route_tables (
  TransitGatewayId,
  region
 )
-SELECT 
-'{{ TransitGatewayId }}',
+SELECT
+'{{ transit_gateway_id }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -208,9 +208,9 @@ INSERT INTO awscc.ec2.transit_gateway_route_tables (
  Tags,
  region
 )
-SELECT 
- '{{ TransitGatewayId }}',
- '{{ Tags }}',
+SELECT
+ '{{ transit_gateway_id }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -228,13 +228,12 @@ globals:
 resources:
   - name: transit_gateway_route_table
     props:
-      - name: TransitGatewayId
-        value: '{{ TransitGatewayId }}'
-      - name: Tags
+      - name: transit_gateway_id
+        value: '{{ transit_gateway_id }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -250,7 +249,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<TransitGatewayRouteTableId>';
+AND Identifier = '{{ transit_gateway_route_table_id }}';
 ```
 
 
@@ -259,7 +258,7 @@ AND Identifier = '<TransitGatewayRouteTableId>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.ec2.transit_gateway_route_tables
-WHERE Identifier = '<TransitGatewayRouteTableId>'
+WHERE Identifier = '{{ transit_gateway_route_table_id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/ec2/transit_gateway_routes/index.md b/website/docs/services/ec2/transit_gateway_routes/index.md
index 13bc58e59..53b9f1d11 100644
--- a/website/docs/services/ec2/transit_gateway_routes/index.md
+++ b/website/docs/services/ec2/transit_gateway_routes/index.md
@@ -151,7 +151,7 @@ destination_cidr_block,
 blackhole,
 transit_gateway_attachment_id
 FROM awscc.ec2.transit_gateway_routes
-WHERE region = 'us-east-1' AND Identifier = '<TransitGatewayRouteTableId>|<DestinationCidrBlock>';
+WHERE region = 'us-east-1' AND Identifier = '{{ transit_gateway_route_table_id }}|{{ destination_cidr_block }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -189,9 +189,9 @@ INSERT INTO awscc.ec2.transit_gateway_routes (
  DestinationCidrBlock,
  region
 )
-SELECT 
-'{{ TransitGatewayRouteTableId }}',
- '{{ DestinationCidrBlock }}',
+SELECT
+'{{ transit_gateway_route_table_id }}',
+ '{{ destination_cidr_block }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -206,11 +206,11 @@ INSERT INTO awscc.ec2.transit_gateway_routes (
  TransitGatewayAttachmentId,
  region
 )
-SELECT 
- '{{ TransitGatewayRouteTableId }}',
- '{{ DestinationCidrBlock }}',
- '{{ Blackhole }}',
- '{{ TransitGatewayAttachmentId }}',
+SELECT
+ '{{ transit_gateway_route_table_id }}',
+ '{{ destination_cidr_block }}',
+ '{{ blackhole }}',
+ '{{ transit_gateway_attachment_id }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -228,15 +228,14 @@ globals:
 resources:
   - name: transit_gateway_route
     props:
-      - name: TransitGatewayRouteTableId
-        value: '{{ TransitGatewayRouteTableId }}'
-      - name: DestinationCidrBlock
-        value: '{{ DestinationCidrBlock }}'
-      - name: Blackhole
-        value: '{{ Blackhole }}'
-      - name: TransitGatewayAttachmentId
-        value: '{{ TransitGatewayAttachmentId }}'
-
+      - name: transit_gateway_route_table_id
+        value: '{{ transit_gateway_route_table_id }}'
+      - name: destination_cidr_block
+        value: '{{ destination_cidr_block }}'
+      - name: blackhole
+        value: '{{ blackhole }}'
+      - name: transit_gateway_attachment_id
+        value: '{{ transit_gateway_attachment_id }}'
 ```
 </TabItem>
 </Tabs>
@@ -247,7 +246,7 @@ resources:
 ```sql
 /*+ delete */
 DELETE FROM awscc.ec2.transit_gateway_routes
-WHERE Identifier = '<TransitGatewayRouteTableId|DestinationCidrBlock>'
+WHERE Identifier = '{{ transit_gateway_route_table_id }}|{{ destination_cidr_block }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/ec2/transit_gateway_vpc_attachments/index.md b/website/docs/services/ec2/transit_gateway_vpc_attachments/index.md
index 8dbb400a5..26b5cdfbc 100644
--- a/website/docs/services/ec2/transit_gateway_vpc_attachments/index.md
+++ b/website/docs/services/ec2/transit_gateway_vpc_attachments/index.md
@@ -210,7 +210,7 @@ remove_subnet_ids,
 tags,
 options
 FROM awscc.ec2.transit_gateway_vpc_attachments
-WHERE region = 'us-east-1' AND Identifier = '<Id>';
+WHERE region = 'us-east-1' AND Identifier = '{{ id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -248,10 +248,10 @@ INSERT INTO awscc.ec2.transit_gateway_vpc_attachments (
  SubnetIds,
  region
 )
-SELECT 
-'{{ TransitGatewayId }}',
- '{{ VpcId }}',
- '{{ SubnetIds }}',
+SELECT
+'{{ transit_gateway_id }}',
+ '{{ vpc_id }}',
+ '{{ subnet_ids }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -269,14 +269,14 @@ INSERT INTO awscc.ec2.transit_gateway_vpc_attachments (
  Options,
  region
 )
-SELECT 
- '{{ TransitGatewayId }}',
- '{{ VpcId }}',
- '{{ SubnetIds }}',
- '{{ AddSubnetIds }}',
- '{{ RemoveSubnetIds }}',
- '{{ Tags }}',
- '{{ Options }}',
+SELECT
+ '{{ transit_gateway_id }}',
+ '{{ vpc_id }}',
+ '{{ subnet_ids }}',
+ '{{ add_subnet_ids }}',
+ '{{ remove_subnet_ids }}',
+ '{{ tags }}',
+ '{{ options }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -294,30 +294,29 @@ globals:
 resources:
   - name: transit_gateway_vpc_attachment
     props:
-      - name: TransitGatewayId
-        value: '{{ TransitGatewayId }}'
-      - name: VpcId
-        value: '{{ VpcId }}'
-      - name: SubnetIds
+      - name: transit_gateway_id
+        value: '{{ transit_gateway_id }}'
+      - name: vpc_id
+        value: '{{ vpc_id }}'
+      - name: subnet_ids
         value:
-          - '{{ SubnetIds[0] }}'
-      - name: AddSubnetIds
+          - '{{ subnet_ids[0] }}'
+      - name: add_subnet_ids
         value:
-          - '{{ AddSubnetIds[0] }}'
-      - name: RemoveSubnetIds
+          - '{{ add_subnet_ids[0] }}'
+      - name: remove_subnet_ids
         value:
-          - '{{ RemoveSubnetIds[0] }}'
-      - name: Tags
+          - '{{ remove_subnet_ids[0] }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-      - name: Options
+          - key: '{{ key }}'
+            value: '{{ value }}'
+      - name: options
         value:
-          DnsSupport: '{{ DnsSupport }}'
-          Ipv6Support: '{{ Ipv6Support }}'
-          ApplianceModeSupport: '{{ ApplianceModeSupport }}'
-          SecurityGroupReferencingSupport: '{{ SecurityGroupReferencingSupport }}'
-
+          dns_support: '{{ dns_support }}'
+          ipv6_support: '{{ ipv6_support }}'
+          appliance_mode_support: '{{ appliance_mode_support }}'
+          security_group_referencing_support: '{{ security_group_referencing_support }}'
 ```
 </TabItem>
 </Tabs>
@@ -336,7 +335,7 @@ SET PatchDocument = string('{{ {
     "Options": options
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Id>';
+AND Identifier = '{{ id }}';
 ```
 
 
@@ -345,7 +344,7 @@ AND Identifier = '<Id>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.ec2.transit_gateway_vpc_attachments
-WHERE Identifier = '<Id>'
+WHERE Identifier = '{{ id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/ec2/transit_gateways/index.md b/website/docs/services/ec2/transit_gateways/index.md
index 7ce8041c6..e50e047c2 100644
--- a/website/docs/services/ec2/transit_gateways/index.md
+++ b/website/docs/services/ec2/transit_gateways/index.md
@@ -230,7 +230,7 @@ tags,
 association_default_route_table_id,
 propagation_default_route_table_id
 FROM awscc.ec2.transit_gateways
-WHERE region = 'us-east-1' AND Identifier = '<Id>';
+WHERE region = 'us-east-1' AND Identifier = '{{ id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -278,20 +278,20 @@ INSERT INTO awscc.ec2.transit_gateways (
  PropagationDefaultRouteTableId,
  region
 )
-SELECT 
-'{{ DefaultRouteTablePropagation }}',
- '{{ Description }}',
- '{{ AutoAcceptSharedAttachments }}',
- '{{ DefaultRouteTableAssociation }}',
- '{{ VpnEcmpSupport }}',
- '{{ DnsSupport }}',
- '{{ SecurityGroupReferencingSupport }}',
- '{{ MulticastSupport }}',
- '{{ AmazonSideAsn }}',
- '{{ TransitGatewayCidrBlocks }}',
- '{{ Tags }}',
- '{{ AssociationDefaultRouteTableId }}',
- '{{ PropagationDefaultRouteTableId }}',
+SELECT
+'{{ default_route_table_propagation }}',
+ '{{ description }}',
+ '{{ auto_accept_shared_attachments }}',
+ '{{ default_route_table_association }}',
+ '{{ vpn_ecmp_support }}',
+ '{{ dns_support }}',
+ '{{ security_group_referencing_support }}',
+ '{{ multicast_support }}',
+ '{{ amazon_side_asn }}',
+ '{{ transit_gateway_cidr_blocks }}',
+ '{{ tags }}',
+ '{{ association_default_route_table_id }}',
+ '{{ propagation_default_route_table_id }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -315,20 +315,20 @@ INSERT INTO awscc.ec2.transit_gateways (
  PropagationDefaultRouteTableId,
  region
 )
-SELECT 
- '{{ DefaultRouteTablePropagation }}',
- '{{ Description }}',
- '{{ AutoAcceptSharedAttachments }}',
- '{{ DefaultRouteTableAssociation }}',
- '{{ VpnEcmpSupport }}',
- '{{ DnsSupport }}',
- '{{ SecurityGroupReferencingSupport }}',
- '{{ MulticastSupport }}',
- '{{ AmazonSideAsn }}',
- '{{ TransitGatewayCidrBlocks }}',
- '{{ Tags }}',
- '{{ AssociationDefaultRouteTableId }}',
- '{{ PropagationDefaultRouteTableId }}',
+SELECT
+ '{{ default_route_table_propagation }}',
+ '{{ description }}',
+ '{{ auto_accept_shared_attachments }}',
+ '{{ default_route_table_association }}',
+ '{{ vpn_ecmp_support }}',
+ '{{ dns_support }}',
+ '{{ security_group_referencing_support }}',
+ '{{ multicast_support }}',
+ '{{ amazon_side_asn }}',
+ '{{ transit_gateway_cidr_blocks }}',
+ '{{ tags }}',
+ '{{ association_default_route_table_id }}',
+ '{{ propagation_default_route_table_id }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -346,36 +346,35 @@ globals:
 resources:
   - name: transit_gateway
     props:
-      - name: DefaultRouteTablePropagation
-        value: '{{ DefaultRouteTablePropagation }}'
-      - name: Description
-        value: '{{ Description }}'
-      - name: AutoAcceptSharedAttachments
-        value: '{{ AutoAcceptSharedAttachments }}'
-      - name: DefaultRouteTableAssociation
-        value: '{{ DefaultRouteTableAssociation }}'
-      - name: VpnEcmpSupport
-        value: '{{ VpnEcmpSupport }}'
-      - name: DnsSupport
-        value: '{{ DnsSupport }}'
-      - name: SecurityGroupReferencingSupport
-        value: '{{ SecurityGroupReferencingSupport }}'
-      - name: MulticastSupport
-        value: '{{ MulticastSupport }}'
-      - name: AmazonSideAsn
-        value: '{{ AmazonSideAsn }}'
-      - name: TransitGatewayCidrBlocks
+      - name: default_route_table_propagation
+        value: '{{ default_route_table_propagation }}'
+      - name: description
+        value: '{{ description }}'
+      - name: auto_accept_shared_attachments
+        value: '{{ auto_accept_shared_attachments }}'
+      - name: default_route_table_association
+        value: '{{ default_route_table_association }}'
+      - name: vpn_ecmp_support
+        value: '{{ vpn_ecmp_support }}'
+      - name: dns_support
+        value: '{{ dns_support }}'
+      - name: security_group_referencing_support
+        value: '{{ security_group_referencing_support }}'
+      - name: multicast_support
+        value: '{{ multicast_support }}'
+      - name: amazon_side_asn
+        value: '{{ amazon_side_asn }}'
+      - name: transit_gateway_cidr_blocks
         value:
-          - '{{ TransitGatewayCidrBlocks[0] }}'
-      - name: Tags
+          - '{{ transit_gateway_cidr_blocks[0] }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-      - name: AssociationDefaultRouteTableId
-        value: '{{ AssociationDefaultRouteTableId }}'
-      - name: PropagationDefaultRouteTableId
-        value: '{{ PropagationDefaultRouteTableId }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
+      - name: association_default_route_table_id
+        value: '{{ association_default_route_table_id }}'
+      - name: propagation_default_route_table_id
+        value: '{{ propagation_default_route_table_id }}'
 ```
 </TabItem>
 </Tabs>
@@ -401,7 +400,7 @@ SET PatchDocument = string('{{ {
     "PropagationDefaultRouteTableId": propagation_default_route_table_id
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Id>';
+AND Identifier = '{{ id }}';
 ```
 
 
@@ -410,7 +409,7 @@ AND Identifier = '<Id>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.ec2.transit_gateways
-WHERE Identifier = '<Id>'
+WHERE Identifier = '{{ id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/ec2/verified_access_endpoints/index.md b/website/docs/services/ec2/verified_access_endpoints/index.md
index 86ba3f087..71137e018 100644
--- a/website/docs/services/ec2/verified_access_endpoints/index.md
+++ b/website/docs/services/ec2/verified_access_endpoints/index.md
@@ -434,7 +434,7 @@ policy_enabled,
 tags,
 sse_specification
 FROM awscc.ec2.verified_access_endpoints
-WHERE region = 'us-east-1' AND Identifier = '<VerifiedAccessEndpointId>';
+WHERE region = 'us-east-1' AND Identifier = '{{ verified_access_endpoint_id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -472,10 +472,10 @@ INSERT INTO awscc.ec2.verified_access_endpoints (
  AttachmentType,
  region
 )
-SELECT 
-'{{ VerifiedAccessGroupId }}',
- '{{ EndpointType }}',
- '{{ AttachmentType }}',
+SELECT
+'{{ verified_access_group_id }}',
+ '{{ endpoint_type }}',
+ '{{ attachment_type }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -502,23 +502,23 @@ INSERT INTO awscc.ec2.verified_access_endpoints (
  SseSpecification,
  region
 )
-SELECT 
- '{{ VerifiedAccessGroupId }}',
- '{{ SecurityGroupIds }}',
- '{{ NetworkInterfaceOptions }}',
- '{{ LoadBalancerOptions }}',
- '{{ RdsOptions }}',
- '{{ CidrOptions }}',
- '{{ EndpointType }}',
- '{{ EndpointDomainPrefix }}',
- '{{ DomainCertificateArn }}',
- '{{ AttachmentType }}',
- '{{ ApplicationDomain }}',
- '{{ Description }}',
- '{{ PolicyDocument }}',
- '{{ PolicyEnabled }}',
- '{{ Tags }}',
- '{{ SseSpecification }}',
+SELECT
+ '{{ verified_access_group_id }}',
+ '{{ security_group_ids }}',
+ '{{ network_interface_options }}',
+ '{{ load_balancer_options }}',
+ '{{ rds_options }}',
+ '{{ cidr_options }}',
+ '{{ endpoint_type }}',
+ '{{ endpoint_domain_prefix }}',
+ '{{ domain_certificate_arn }}',
+ '{{ attachment_type }}',
+ '{{ application_domain }}',
+ '{{ description }}',
+ '{{ policy_document }}',
+ '{{ policy_enabled }}',
+ '{{ tags }}',
+ '{{ sse_specification }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -536,71 +536,70 @@ globals:
 resources:
   - name: verified_access_endpoint
     props:
-      - name: VerifiedAccessGroupId
-        value: '{{ VerifiedAccessGroupId }}'
-      - name: SecurityGroupIds
+      - name: verified_access_group_id
+        value: '{{ verified_access_group_id }}'
+      - name: security_group_ids
         value:
-          - '{{ SecurityGroupIds[0] }}'
-      - name: NetworkInterfaceOptions
+          - '{{ security_group_ids[0] }}'
+      - name: network_interface_options
         value:
-          NetworkInterfaceId: '{{ NetworkInterfaceId }}'
-          Port: '{{ Port }}'
-          PortRanges:
-            - FromPort: '{{ FromPort }}'
-              ToPort: '{{ ToPort }}'
-          Protocol: '{{ Protocol }}'
-      - name: LoadBalancerOptions
+          network_interface_id: '{{ network_interface_id }}'
+          port: '{{ port }}'
+          port_ranges:
+            - from_port: '{{ from_port }}'
+              to_port: '{{ to_port }}'
+          protocol: '{{ protocol }}'
+      - name: load_balancer_options
         value:
-          LoadBalancerArn: '{{ LoadBalancerArn }}'
-          Port: '{{ Port }}'
-          PortRanges:
+          load_balancer_arn: '{{ load_balancer_arn }}'
+          port: '{{ port }}'
+          port_ranges:
             - null
-          Protocol: '{{ Protocol }}'
-          SubnetIds:
-            - '{{ SubnetIds[0] }}'
-      - name: RdsOptions
+          protocol: '{{ protocol }}'
+          subnet_ids:
+            - '{{ subnet_ids[0] }}'
+      - name: rds_options
         value:
-          Protocol: '{{ Protocol }}'
-          Port: '{{ Port }}'
-          RdsDbInstanceArn: '{{ RdsDbInstanceArn }}'
-          RdsDbClusterArn: '{{ RdsDbClusterArn }}'
-          RdsDbProxyArn: '{{ RdsDbProxyArn }}'
-          RdsEndpoint: '{{ RdsEndpoint }}'
-          SubnetIds:
+          protocol: '{{ protocol }}'
+          port: '{{ port }}'
+          rds_db_instance_arn: '{{ rds_db_instance_arn }}'
+          rds_db_cluster_arn: '{{ rds_db_cluster_arn }}'
+          rds_db_proxy_arn: '{{ rds_db_proxy_arn }}'
+          rds_endpoint: '{{ rds_endpoint }}'
+          subnet_ids:
             - null
-      - name: CidrOptions
+      - name: cidr_options
         value:
-          Cidr: '{{ Cidr }}'
-          PortRanges:
+          cidr: '{{ cidr }}'
+          port_ranges:
             - null
-          Protocol: '{{ Protocol }}'
-          SubnetIds:
+          protocol: '{{ protocol }}'
+          subnet_ids:
             - null
-      - name: EndpointType
-        value: '{{ EndpointType }}'
-      - name: EndpointDomainPrefix
-        value: '{{ EndpointDomainPrefix }}'
-      - name: DomainCertificateArn
-        value: '{{ DomainCertificateArn }}'
-      - name: AttachmentType
-        value: '{{ AttachmentType }}'
-      - name: ApplicationDomain
-        value: '{{ ApplicationDomain }}'
-      - name: Description
-        value: '{{ Description }}'
-      - name: PolicyDocument
-        value: '{{ PolicyDocument }}'
-      - name: PolicyEnabled
-        value: '{{ PolicyEnabled }}'
-      - name: Tags
+      - name: endpoint_type
+        value: '{{ endpoint_type }}'
+      - name: endpoint_domain_prefix
+        value: '{{ endpoint_domain_prefix }}'
+      - name: domain_certificate_arn
+        value: '{{ domain_certificate_arn }}'
+      - name: attachment_type
+        value: '{{ attachment_type }}'
+      - name: application_domain
+        value: '{{ application_domain }}'
+      - name: description
+        value: '{{ description }}'
+      - name: policy_document
+        value: '{{ policy_document }}'
+      - name: policy_enabled
+        value: '{{ policy_enabled }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-      - name: SseSpecification
+          - key: '{{ key }}'
+            value: '{{ value }}'
+      - name: sse_specification
         value:
-          KmsKeyArn: '{{ KmsKeyArn }}'
-          CustomerManagedKeyEnabled: '{{ CustomerManagedKeyEnabled }}'
-
+          kms_key_arn: '{{ kms_key_arn }}'
+          customer_managed_key_enabled: '{{ customer_managed_key_enabled }}'
 ```
 </TabItem>
 </Tabs>
@@ -621,7 +620,7 @@ SET PatchDocument = string('{{ {
     "SseSpecification": sse_specification
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<VerifiedAccessEndpointId>';
+AND Identifier = '{{ verified_access_endpoint_id }}';
 ```
 
 
@@ -630,7 +629,7 @@ AND Identifier = '<VerifiedAccessEndpointId>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.ec2.verified_access_endpoints
-WHERE Identifier = '<VerifiedAccessEndpointId>'
+WHERE Identifier = '{{ verified_access_endpoint_id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/ec2/verified_access_groups/index.md b/website/docs/services/ec2/verified_access_groups/index.md
index bf474f5c2..4758db56a 100644
--- a/website/docs/services/ec2/verified_access_groups/index.md
+++ b/website/docs/services/ec2/verified_access_groups/index.md
@@ -218,7 +218,7 @@ policy_enabled,
 tags,
 sse_specification
 FROM awscc.ec2.verified_access_groups
-WHERE region = 'us-east-1' AND Identifier = '<VerifiedAccessGroupId>';
+WHERE region = 'us-east-1' AND Identifier = '{{ verified_access_group_id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -254,8 +254,8 @@ INSERT INTO awscc.ec2.verified_access_groups (
  VerifiedAccessInstanceId,
  region
 )
-SELECT 
-'{{ VerifiedAccessInstanceId }}',
+SELECT
+'{{ verified_access_instance_id }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -272,13 +272,13 @@ INSERT INTO awscc.ec2.verified_access_groups (
  SseSpecification,
  region
 )
-SELECT 
- '{{ VerifiedAccessInstanceId }}',
- '{{ Description }}',
- '{{ PolicyDocument }}',
- '{{ PolicyEnabled }}',
- '{{ Tags }}',
- '{{ SseSpecification }}',
+SELECT
+ '{{ verified_access_instance_id }}',
+ '{{ description }}',
+ '{{ policy_document }}',
+ '{{ policy_enabled }}',
+ '{{ tags }}',
+ '{{ sse_specification }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -296,23 +296,22 @@ globals:
 resources:
   - name: verified_access_group
     props:
-      - name: VerifiedAccessInstanceId
-        value: '{{ VerifiedAccessInstanceId }}'
-      - name: Description
-        value: '{{ Description }}'
-      - name: PolicyDocument
-        value: '{{ PolicyDocument }}'
-      - name: PolicyEnabled
-        value: '{{ PolicyEnabled }}'
-      - name: Tags
+      - name: verified_access_instance_id
+        value: '{{ verified_access_instance_id }}'
+      - name: description
+        value: '{{ description }}'
+      - name: policy_document
+        value: '{{ policy_document }}'
+      - name: policy_enabled
+        value: '{{ policy_enabled }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-      - name: SseSpecification
+          - key: '{{ key }}'
+            value: '{{ value }}'
+      - name: sse_specification
         value:
-          KmsKeyArn: '{{ KmsKeyArn }}'
-          CustomerManagedKeyEnabled: '{{ CustomerManagedKeyEnabled }}'
-
+          kms_key_arn: '{{ kms_key_arn }}'
+          customer_managed_key_enabled: '{{ customer_managed_key_enabled }}'
 ```
 </TabItem>
 </Tabs>
@@ -333,7 +332,7 @@ SET PatchDocument = string('{{ {
     "SseSpecification": sse_specification
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<VerifiedAccessGroupId>';
+AND Identifier = '{{ verified_access_group_id }}';
 ```
 
 
@@ -342,7 +341,7 @@ AND Identifier = '<VerifiedAccessGroupId>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.ec2.verified_access_groups
-WHERE Identifier = '<VerifiedAccessGroupId>'
+WHERE Identifier = '{{ verified_access_group_id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/ec2/verified_access_instances/index.md b/website/docs/services/ec2/verified_access_instances/index.md
index b22ed4245..3c0199378 100644
--- a/website/docs/services/ec2/verified_access_instances/index.md
+++ b/website/docs/services/ec2/verified_access_instances/index.md
@@ -461,7 +461,7 @@ fips_enabled,
 cidr_endpoints_custom_sub_domain,
 cidr_endpoints_custom_sub_domain_name_servers
 FROM awscc.ec2.verified_access_instances
-WHERE region = 'us-east-1' AND Identifier = '<VerifiedAccessInstanceId>';
+WHERE region = 'us-east-1' AND Identifier = '{{ verified_access_instance_id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -503,14 +503,14 @@ INSERT INTO awscc.ec2.verified_access_instances (
  CidrEndpointsCustomSubDomain,
  region
 )
-SELECT 
-'{{ VerifiedAccessTrustProviders }}',
- '{{ VerifiedAccessTrustProviderIds }}',
- '{{ Description }}',
- '{{ LoggingConfigurations }}',
- '{{ Tags }}',
- '{{ FipsEnabled }}',
- '{{ CidrEndpointsCustomSubDomain }}',
+SELECT
+'{{ verified_access_trust_providers }}',
+ '{{ verified_access_trust_provider_ids }}',
+ '{{ description }}',
+ '{{ logging_configurations }}',
+ '{{ tags }}',
+ '{{ fips_enabled }}',
+ '{{ cidr_endpoints_custom_sub_domain }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -528,14 +528,14 @@ INSERT INTO awscc.ec2.verified_access_instances (
  CidrEndpointsCustomSubDomain,
  region
 )
-SELECT 
- '{{ VerifiedAccessTrustProviders }}',
- '{{ VerifiedAccessTrustProviderIds }}',
- '{{ Description }}',
- '{{ LoggingConfigurations }}',
- '{{ Tags }}',
- '{{ FipsEnabled }}',
- '{{ CidrEndpointsCustomSubDomain }}',
+SELECT
+ '{{ verified_access_trust_providers }}',
+ '{{ verified_access_trust_provider_ids }}',
+ '{{ description }}',
+ '{{ logging_configurations }}',
+ '{{ tags }}',
+ '{{ fips_enabled }}',
+ '{{ cidr_endpoints_custom_sub_domain }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -553,67 +553,66 @@ globals:
 resources:
   - name: verified_access_instance
     props:
-      - name: VerifiedAccessTrustProviders
+      - name: verified_access_trust_providers
         value:
-          - TrustProviderType: '{{ TrustProviderType }}'
-            DeviceTrustProviderType: '{{ DeviceTrustProviderType }}'
-            UserTrustProviderType: '{{ UserTrustProviderType }}'
-            OidcOptions:
-              Issuer: '{{ Issuer }}'
-              AuthorizationEndpoint: '{{ AuthorizationEndpoint }}'
-              TokenEndpoint: '{{ TokenEndpoint }}'
-              UserInfoEndpoint: '{{ UserInfoEndpoint }}'
-              ClientId: '{{ ClientId }}'
-              ClientSecret: '{{ ClientSecret }}'
-              Scope: '{{ Scope }}'
-            DeviceOptions:
-              TenantId: '{{ TenantId }}'
-              PublicSigningKeyUrl: '{{ PublicSigningKeyUrl }}'
-            PolicyReferenceName: '{{ PolicyReferenceName }}'
-            Description: '{{ Description }}'
-            Tags:
-              - Key: '{{ Key }}'
-                Value: '{{ Value }}'
-            SseSpecification:
-              KmsKeyArn: '{{ KmsKeyArn }}'
-              CustomerManagedKeyEnabled: '{{ CustomerManagedKeyEnabled }}'
-            NativeApplicationOidcOptions:
-              Issuer: '{{ Issuer }}'
-              AuthorizationEndpoint: '{{ AuthorizationEndpoint }}'
-              TokenEndpoint: '{{ TokenEndpoint }}'
-              UserInfoEndpoint: '{{ UserInfoEndpoint }}'
-              ClientId: '{{ ClientId }}'
-              ClientSecret: '{{ ClientSecret }}'
-              Scope: '{{ Scope }}'
-              PublicSigningKeyEndpoint: '{{ PublicSigningKeyEndpoint }}'
-      - name: VerifiedAccessTrustProviderIds
+          - trust_provider_type: '{{ trust_provider_type }}'
+            device_trust_provider_type: '{{ device_trust_provider_type }}'
+            user_trust_provider_type: '{{ user_trust_provider_type }}'
+            oidc_options:
+              issuer: '{{ issuer }}'
+              authorization_endpoint: '{{ authorization_endpoint }}'
+              token_endpoint: '{{ token_endpoint }}'
+              user_info_endpoint: '{{ user_info_endpoint }}'
+              client_id: '{{ client_id }}'
+              client_secret: '{{ client_secret }}'
+              scope: '{{ scope }}'
+            device_options:
+              tenant_id: '{{ tenant_id }}'
+              public_signing_key_url: '{{ public_signing_key_url }}'
+            policy_reference_name: '{{ policy_reference_name }}'
+            description: '{{ description }}'
+            tags:
+              - key: '{{ key }}'
+                value: '{{ value }}'
+            sse_specification:
+              kms_key_arn: '{{ kms_key_arn }}'
+              customer_managed_key_enabled: '{{ customer_managed_key_enabled }}'
+            native_application_oidc_options:
+              issuer: '{{ issuer }}'
+              authorization_endpoint: '{{ authorization_endpoint }}'
+              token_endpoint: '{{ token_endpoint }}'
+              user_info_endpoint: '{{ user_info_endpoint }}'
+              client_id: '{{ client_id }}'
+              client_secret: '{{ client_secret }}'
+              scope: '{{ scope }}'
+              public_signing_key_endpoint: '{{ public_signing_key_endpoint }}'
+      - name: verified_access_trust_provider_ids
         value:
-          - '{{ VerifiedAccessTrustProviderIds[0] }}'
-      - name: Description
-        value: '{{ Description }}'
-      - name: LoggingConfigurations
+          - '{{ verified_access_trust_provider_ids[0] }}'
+      - name: description
+        value: '{{ description }}'
+      - name: logging_configurations
         value:
-          LogVersion: '{{ LogVersion }}'
-          IncludeTrustContext: '{{ IncludeTrustContext }}'
-          CloudWatchLogs:
-            Enabled: '{{ Enabled }}'
-            LogGroup: '{{ LogGroup }}'
-          KinesisDataFirehose:
-            Enabled: '{{ Enabled }}'
-            DeliveryStream: '{{ DeliveryStream }}'
-          S3:
-            Enabled: '{{ Enabled }}'
-            BucketName: '{{ BucketName }}'
-            BucketOwner: '{{ BucketOwner }}'
-            Prefix: '{{ Prefix }}'
-      - name: Tags
+          log_version: '{{ log_version }}'
+          include_trust_context: '{{ include_trust_context }}'
+          cloud_watch_logs:
+            enabled: '{{ enabled }}'
+            log_group: '{{ log_group }}'
+          kinesis_data_firehose:
+            enabled: '{{ enabled }}'
+            delivery_stream: '{{ delivery_stream }}'
+          s3:
+            enabled: '{{ enabled }}'
+            bucket_name: '{{ bucket_name }}'
+            bucket_owner: '{{ bucket_owner }}'
+            prefix: '{{ prefix }}'
+      - name: tags
         value:
           - null
-      - name: FipsEnabled
-        value: '{{ FipsEnabled }}'
-      - name: CidrEndpointsCustomSubDomain
-        value: '{{ CidrEndpointsCustomSubDomain }}'
-
+      - name: fips_enabled
+        value: '{{ fips_enabled }}'
+      - name: cidr_endpoints_custom_sub_domain
+        value: '{{ cidr_endpoints_custom_sub_domain }}'
 ```
 </TabItem>
 </Tabs>
@@ -635,7 +634,7 @@ SET PatchDocument = string('{{ {
     "CidrEndpointsCustomSubDomain": cidr_endpoints_custom_sub_domain
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<VerifiedAccessInstanceId>';
+AND Identifier = '{{ verified_access_instance_id }}';
 ```
 
 
@@ -644,7 +643,7 @@ AND Identifier = '<VerifiedAccessInstanceId>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.ec2.verified_access_instances
-WHERE Identifier = '<VerifiedAccessInstanceId>'
+WHERE Identifier = '{{ verified_access_instance_id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/ec2/verified_access_trust_providers/index.md b/website/docs/services/ec2/verified_access_trust_providers/index.md
index 0bcc2e436..8c1b60330 100644
--- a/website/docs/services/ec2/verified_access_trust_providers/index.md
+++ b/website/docs/services/ec2/verified_access_trust_providers/index.md
@@ -321,7 +321,7 @@ tags,
 sse_specification,
 native_application_oidc_options
 FROM awscc.ec2.verified_access_trust_providers
-WHERE region = 'us-east-1' AND Identifier = '<VerifiedAccessTrustProviderId>';
+WHERE region = 'us-east-1' AND Identifier = '{{ verified_access_trust_provider_id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -358,9 +358,9 @@ INSERT INTO awscc.ec2.verified_access_trust_providers (
  PolicyReferenceName,
  region
 )
-SELECT 
-'{{ TrustProviderType }}',
- '{{ PolicyReferenceName }}',
+SELECT
+'{{ trust_provider_type }}',
+ '{{ policy_reference_name }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -381,17 +381,17 @@ INSERT INTO awscc.ec2.verified_access_trust_providers (
  NativeApplicationOidcOptions,
  region
 )
-SELECT 
- '{{ TrustProviderType }}',
- '{{ DeviceTrustProviderType }}',
- '{{ UserTrustProviderType }}',
- '{{ OidcOptions }}',
- '{{ DeviceOptions }}',
- '{{ PolicyReferenceName }}',
- '{{ Description }}',
- '{{ Tags }}',
- '{{ SseSpecification }}',
- '{{ NativeApplicationOidcOptions }}',
+SELECT
+ '{{ trust_provider_type }}',
+ '{{ device_trust_provider_type }}',
+ '{{ user_trust_provider_type }}',
+ '{{ oidc_options }}',
+ '{{ device_options }}',
+ '{{ policy_reference_name }}',
+ '{{ description }}',
+ '{{ tags }}',
+ '{{ sse_specification }}',
+ '{{ native_application_oidc_options }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -409,48 +409,47 @@ globals:
 resources:
   - name: verified_access_trust_provider
     props:
-      - name: TrustProviderType
-        value: '{{ TrustProviderType }}'
-      - name: DeviceTrustProviderType
-        value: '{{ DeviceTrustProviderType }}'
-      - name: UserTrustProviderType
-        value: '{{ UserTrustProviderType }}'
-      - name: OidcOptions
+      - name: trust_provider_type
+        value: '{{ trust_provider_type }}'
+      - name: device_trust_provider_type
+        value: '{{ device_trust_provider_type }}'
+      - name: user_trust_provider_type
+        value: '{{ user_trust_provider_type }}'
+      - name: oidc_options
         value:
-          Issuer: '{{ Issuer }}'
-          AuthorizationEndpoint: '{{ AuthorizationEndpoint }}'
-          TokenEndpoint: '{{ TokenEndpoint }}'
-          UserInfoEndpoint: '{{ UserInfoEndpoint }}'
-          ClientId: '{{ ClientId }}'
-          ClientSecret: '{{ ClientSecret }}'
-          Scope: '{{ Scope }}'
-      - name: DeviceOptions
+          issuer: '{{ issuer }}'
+          authorization_endpoint: '{{ authorization_endpoint }}'
+          token_endpoint: '{{ token_endpoint }}'
+          user_info_endpoint: '{{ user_info_endpoint }}'
+          client_id: '{{ client_id }}'
+          client_secret: '{{ client_secret }}'
+          scope: '{{ scope }}'
+      - name: device_options
         value:
-          TenantId: '{{ TenantId }}'
-          PublicSigningKeyUrl: '{{ PublicSigningKeyUrl }}'
-      - name: PolicyReferenceName
-        value: '{{ PolicyReferenceName }}'
-      - name: Description
-        value: '{{ Description }}'
-      - name: Tags
+          tenant_id: '{{ tenant_id }}'
+          public_signing_key_url: '{{ public_signing_key_url }}'
+      - name: policy_reference_name
+        value: '{{ policy_reference_name }}'
+      - name: description
+        value: '{{ description }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-      - name: SseSpecification
+          - key: '{{ key }}'
+            value: '{{ value }}'
+      - name: sse_specification
         value:
-          KmsKeyArn: '{{ KmsKeyArn }}'
-          CustomerManagedKeyEnabled: '{{ CustomerManagedKeyEnabled }}'
-      - name: NativeApplicationOidcOptions
+          kms_key_arn: '{{ kms_key_arn }}'
+          customer_managed_key_enabled: '{{ customer_managed_key_enabled }}'
+      - name: native_application_oidc_options
         value:
-          Issuer: '{{ Issuer }}'
-          AuthorizationEndpoint: '{{ AuthorizationEndpoint }}'
-          TokenEndpoint: '{{ TokenEndpoint }}'
-          UserInfoEndpoint: '{{ UserInfoEndpoint }}'
-          ClientId: '{{ ClientId }}'
-          ClientSecret: '{{ ClientSecret }}'
-          Scope: '{{ Scope }}'
-          PublicSigningKeyEndpoint: '{{ PublicSigningKeyEndpoint }}'
-
+          issuer: '{{ issuer }}'
+          authorization_endpoint: '{{ authorization_endpoint }}'
+          token_endpoint: '{{ token_endpoint }}'
+          user_info_endpoint: '{{ user_info_endpoint }}'
+          client_id: '{{ client_id }}'
+          client_secret: '{{ client_secret }}'
+          scope: '{{ scope }}'
+          public_signing_key_endpoint: '{{ public_signing_key_endpoint }}'
 ```
 </TabItem>
 </Tabs>
@@ -470,7 +469,7 @@ SET PatchDocument = string('{{ {
     "NativeApplicationOidcOptions": native_application_oidc_options
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<VerifiedAccessTrustProviderId>';
+AND Identifier = '{{ verified_access_trust_provider_id }}';
 ```
 
 
@@ -479,7 +478,7 @@ AND Identifier = '<VerifiedAccessTrustProviderId>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.ec2.verified_access_trust_providers
-WHERE Identifier = '<VerifiedAccessTrustProviderId>'
+WHERE Identifier = '{{ verified_access_trust_provider_id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/ec2/volume_attachments/index.md b/website/docs/services/ec2/volume_attachments/index.md
index 61ce2b939..51181a5d7 100644
--- a/website/docs/services/ec2/volume_attachments/index.md
+++ b/website/docs/services/ec2/volume_attachments/index.md
@@ -145,7 +145,7 @@ volume_id,
 instance_id,
 device
 FROM awscc.ec2.volume_attachments
-WHERE region = 'us-east-1' AND Identifier = '<VolumeId>|<InstanceId>';
+WHERE region = 'us-east-1' AND Identifier = '{{ volume_id }}|{{ instance_id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -183,9 +183,9 @@ INSERT INTO awscc.ec2.volume_attachments (
  InstanceId,
  region
 )
-SELECT 
-'{{ VolumeId }}',
- '{{ InstanceId }}',
+SELECT
+'{{ volume_id }}',
+ '{{ instance_id }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -199,10 +199,10 @@ INSERT INTO awscc.ec2.volume_attachments (
  Device,
  region
 )
-SELECT 
- '{{ VolumeId }}',
- '{{ InstanceId }}',
- '{{ Device }}',
+SELECT
+ '{{ volume_id }}',
+ '{{ instance_id }}',
+ '{{ device }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -220,13 +220,12 @@ globals:
 resources:
   - name: volume_attachment
     props:
-      - name: VolumeId
-        value: '{{ VolumeId }}'
-      - name: InstanceId
-        value: '{{ InstanceId }}'
-      - name: Device
-        value: '{{ Device }}'
-
+      - name: volume_id
+        value: '{{ volume_id }}'
+      - name: instance_id
+        value: '{{ instance_id }}'
+      - name: device
+        value: '{{ device }}'
 ```
 </TabItem>
 </Tabs>
@@ -237,7 +236,7 @@ resources:
 ```sql
 /*+ delete */
 DELETE FROM awscc.ec2.volume_attachments
-WHERE Identifier = '<VolumeId|InstanceId>'
+WHERE Identifier = '{{ volume_id }}|{{ instance_id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/ec2/volumes/index.md b/website/docs/services/ec2/volumes/index.md
index 2130942f6..e229fb18e 100644
--- a/website/docs/services/ec2/volumes/index.md
+++ b/website/docs/services/ec2/volumes/index.md
@@ -224,7 +224,7 @@ volume_id,
 volume_type,
 tags
 FROM awscc.ec2.volumes
-WHERE region = 'us-east-1' AND Identifier = '<VolumeId>';
+WHERE region = 'us-east-1' AND Identifier = '{{ volume_id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -260,8 +260,8 @@ INSERT INTO awscc.ec2.volumes (
  AvailabilityZone,
  region
 )
-SELECT 
-'{{ AvailabilityZone }}',
+SELECT
+'{{ availability_zone }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -285,20 +285,20 @@ INSERT INTO awscc.ec2.volumes (
  Tags,
  region
 )
-SELECT 
- '{{ MultiAttachEnabled }}',
- '{{ KmsKeyId }}',
- '{{ Encrypted }}',
- '{{ Size }}',
- '{{ AutoEnableIO }}',
- '{{ OutpostArn }}',
- '{{ AvailabilityZone }}',
- '{{ Throughput }}',
- '{{ Iops }}',
- '{{ VolumeInitializationRate }}',
- '{{ SnapshotId }}',
- '{{ VolumeType }}',
- '{{ Tags }}',
+SELECT
+ '{{ multi_attach_enabled }}',
+ '{{ kms_key_id }}',
+ '{{ encrypted }}',
+ '{{ size }}',
+ '{{ auto_enable_io }}',
+ '{{ outpost_arn }}',
+ '{{ availability_zone }}',
+ '{{ throughput }}',
+ '{{ iops }}',
+ '{{ volume_initialization_rate }}',
+ '{{ snapshot_id }}',
+ '{{ volume_type }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -316,35 +316,34 @@ globals:
 resources:
   - name: volume
     props:
-      - name: MultiAttachEnabled
-        value: '{{ MultiAttachEnabled }}'
-      - name: KmsKeyId
-        value: '{{ KmsKeyId }}'
-      - name: Encrypted
-        value: '{{ Encrypted }}'
-      - name: Size
-        value: '{{ Size }}'
-      - name: AutoEnableIO
-        value: '{{ AutoEnableIO }}'
-      - name: OutpostArn
-        value: '{{ OutpostArn }}'
-      - name: AvailabilityZone
-        value: '{{ AvailabilityZone }}'
-      - name: Throughput
-        value: '{{ Throughput }}'
-      - name: Iops
-        value: '{{ Iops }}'
-      - name: VolumeInitializationRate
-        value: '{{ VolumeInitializationRate }}'
-      - name: SnapshotId
-        value: '{{ SnapshotId }}'
-      - name: VolumeType
-        value: '{{ VolumeType }}'
-      - name: Tags
+      - name: multi_attach_enabled
+        value: '{{ multi_attach_enabled }}'
+      - name: kms_key_id
+        value: '{{ kms_key_id }}'
+      - name: encrypted
+        value: '{{ encrypted }}'
+      - name: size
+        value: '{{ size }}'
+      - name: auto_enable_io
+        value: '{{ auto_enable_io }}'
+      - name: outpost_arn
+        value: '{{ outpost_arn }}'
+      - name: availability_zone
+        value: '{{ availability_zone }}'
+      - name: throughput
+        value: '{{ throughput }}'
+      - name: iops
+        value: '{{ iops }}'
+      - name: volume_initialization_rate
+        value: '{{ volume_initialization_rate }}'
+      - name: snapshot_id
+        value: '{{ snapshot_id }}'
+      - name: volume_type
+        value: '{{ volume_type }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -372,7 +371,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<VolumeId>';
+AND Identifier = '{{ volume_id }}';
 ```
 
 
@@ -381,7 +380,7 @@ AND Identifier = '<VolumeId>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.ec2.volumes
-WHERE Identifier = '<VolumeId>'
+WHERE Identifier = '{{ volume_id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/ec2/vpc_block_public_access_exclusions/index.md b/website/docs/services/ec2/vpc_block_public_access_exclusions/index.md
index a3a74c568..a3f643ab6 100644
--- a/website/docs/services/ec2/vpc_block_public_access_exclusions/index.md
+++ b/website/docs/services/ec2/vpc_block_public_access_exclusions/index.md
@@ -170,7 +170,7 @@ vpc_id,
 subnet_id,
 tags
 FROM awscc.ec2.vpc_block_public_access_exclusions
-WHERE region = 'us-east-1' AND Identifier = '<ExclusionId>';
+WHERE region = 'us-east-1' AND Identifier = '{{ exclusion_id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -206,8 +206,8 @@ INSERT INTO awscc.ec2.vpc_block_public_access_exclusions (
  InternetGatewayExclusionMode,
  region
 )
-SELECT 
-'{{ InternetGatewayExclusionMode }}',
+SELECT
+'{{ internet_gateway_exclusion_mode }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -222,11 +222,11 @@ INSERT INTO awscc.ec2.vpc_block_public_access_exclusions (
  Tags,
  region
 )
-SELECT 
- '{{ InternetGatewayExclusionMode }}',
- '{{ VpcId }}',
- '{{ SubnetId }}',
- '{{ Tags }}',
+SELECT
+ '{{ internet_gateway_exclusion_mode }}',
+ '{{ vpc_id }}',
+ '{{ subnet_id }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -244,17 +244,16 @@ globals:
 resources:
   - name: vpc_block_public_access_exclusion
     props:
-      - name: InternetGatewayExclusionMode
-        value: '{{ InternetGatewayExclusionMode }}'
-      - name: VpcId
-        value: '{{ VpcId }}'
-      - name: SubnetId
-        value: '{{ SubnetId }}'
-      - name: Tags
+      - name: internet_gateway_exclusion_mode
+        value: '{{ internet_gateway_exclusion_mode }}'
+      - name: vpc_id
+        value: '{{ vpc_id }}'
+      - name: subnet_id
+        value: '{{ subnet_id }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -271,7 +270,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<ExclusionId>';
+AND Identifier = '{{ exclusion_id }}';
 ```
 
 
@@ -280,7 +279,7 @@ AND Identifier = '<ExclusionId>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.ec2.vpc_block_public_access_exclusions
-WHERE Identifier = '<ExclusionId>'
+WHERE Identifier = '{{ exclusion_id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/ec2/vpc_block_public_access_options/index.md b/website/docs/services/ec2/vpc_block_public_access_options/index.md
index 18aa0b011..6b20a1dfb 100644
--- a/website/docs/services/ec2/vpc_block_public_access_options/index.md
+++ b/website/docs/services/ec2/vpc_block_public_access_options/index.md
@@ -100,7 +100,7 @@ internet_gateway_block_mode,
 account_id,
 exclusions_allowed
 FROM awscc.ec2.vpc_block_public_access_options
-WHERE region = 'us-east-1' AND Identifier = '<AccountId>';
+WHERE region = 'us-east-1' AND Identifier = '{{ account_id }}';
 ```
 
 ## `INSERT` example
@@ -123,8 +123,8 @@ INSERT INTO awscc.ec2.vpc_block_public_access_options (
  InternetGatewayBlockMode,
  region
 )
-SELECT 
-'{{ InternetGatewayBlockMode }}',
+SELECT
+'{{ internet_gateway_block_mode }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -136,8 +136,8 @@ INSERT INTO awscc.ec2.vpc_block_public_access_options (
  InternetGatewayBlockMode,
  region
 )
-SELECT 
- '{{ InternetGatewayBlockMode }}',
+SELECT
+ '{{ internet_gateway_block_mode }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -155,9 +155,8 @@ globals:
 resources:
   - name: vpc_block_public_access_option
     props:
-      - name: InternetGatewayBlockMode
-        value: '{{ InternetGatewayBlockMode }}'
-
+      - name: internet_gateway_block_mode
+        value: '{{ internet_gateway_block_mode }}'
 ```
 </TabItem>
 </Tabs>
@@ -173,7 +172,7 @@ SET PatchDocument = string('{{ {
     "InternetGatewayBlockMode": internet_gateway_block_mode
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<AccountId>';
+AND Identifier = '{{ account_id }}';
 ```
 
 
@@ -182,7 +181,7 @@ AND Identifier = '<AccountId>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.ec2.vpc_block_public_access_options
-WHERE Identifier = '<AccountId>'
+WHERE Identifier = '{{ account_id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/ec2/vpc_cidr_blocks/index.md b/website/docs/services/ec2/vpc_cidr_blocks/index.md
index 36d5e149b..dabec6d69 100644
--- a/website/docs/services/ec2/vpc_cidr_blocks/index.md
+++ b/website/docs/services/ec2/vpc_cidr_blocks/index.md
@@ -205,7 +205,7 @@ ipv6_address_attribute,
 ip_source,
 ipv6_cidr_block_network_border_group
 FROM awscc.ec2.vpc_cidr_blocks
-WHERE region = 'us-east-1' AND Identifier = '<Id>|<VpcId>';
+WHERE region = 'us-east-1' AND Identifier = '{{ id }}|{{ vpc_id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -242,8 +242,8 @@ INSERT INTO awscc.ec2.vpc_cidr_blocks (
  VpcId,
  region
 )
-SELECT 
-'{{ VpcId }}',
+SELECT
+'{{ vpc_id }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -264,17 +264,17 @@ INSERT INTO awscc.ec2.vpc_cidr_blocks (
  Ipv6CidrBlockNetworkBorderGroup,
  region
 )
-SELECT 
- '{{ CidrBlock }}',
- '{{ Ipv6Pool }}',
- '{{ VpcId }}',
- '{{ Ipv6CidrBlock }}',
- '{{ Ipv4IpamPoolId }}',
- '{{ Ipv4NetmaskLength }}',
- '{{ Ipv6IpamPoolId }}',
- '{{ Ipv6NetmaskLength }}',
- '{{ AmazonProvidedIpv6CidrBlock }}',
- '{{ Ipv6CidrBlockNetworkBorderGroup }}',
+SELECT
+ '{{ cidr_block }}',
+ '{{ ipv6_pool }}',
+ '{{ vpc_id }}',
+ '{{ ipv6_cidr_block }}',
+ '{{ ipv4_ipam_pool_id }}',
+ '{{ ipv4_netmask_length }}',
+ '{{ ipv6_ipam_pool_id }}',
+ '{{ ipv6_netmask_length }}',
+ '{{ amazon_provided_ipv6_cidr_block }}',
+ '{{ ipv6_cidr_block_network_border_group }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -292,27 +292,26 @@ globals:
 resources:
   - name: vpc_cidr_block
     props:
-      - name: CidrBlock
-        value: '{{ CidrBlock }}'
-      - name: Ipv6Pool
-        value: '{{ Ipv6Pool }}'
-      - name: VpcId
-        value: '{{ VpcId }}'
-      - name: Ipv6CidrBlock
-        value: '{{ Ipv6CidrBlock }}'
-      - name: Ipv4IpamPoolId
-        value: '{{ Ipv4IpamPoolId }}'
-      - name: Ipv4NetmaskLength
-        value: '{{ Ipv4NetmaskLength }}'
-      - name: Ipv6IpamPoolId
-        value: '{{ Ipv6IpamPoolId }}'
-      - name: Ipv6NetmaskLength
-        value: '{{ Ipv6NetmaskLength }}'
-      - name: AmazonProvidedIpv6CidrBlock
-        value: '{{ AmazonProvidedIpv6CidrBlock }}'
-      - name: Ipv6CidrBlockNetworkBorderGroup
-        value: '{{ Ipv6CidrBlockNetworkBorderGroup }}'
-
+      - name: cidr_block
+        value: '{{ cidr_block }}'
+      - name: ipv6_pool
+        value: '{{ ipv6_pool }}'
+      - name: vpc_id
+        value: '{{ vpc_id }}'
+      - name: ipv6_cidr_block
+        value: '{{ ipv6_cidr_block }}'
+      - name: ipv4_ipam_pool_id
+        value: '{{ ipv4_ipam_pool_id }}'
+      - name: ipv4_netmask_length
+        value: '{{ ipv4_netmask_length }}'
+      - name: ipv6_ipam_pool_id
+        value: '{{ ipv6_ipam_pool_id }}'
+      - name: ipv6_netmask_length
+        value: '{{ ipv6_netmask_length }}'
+      - name: amazon_provided_ipv6_cidr_block
+        value: '{{ amazon_provided_ipv6_cidr_block }}'
+      - name: ipv6_cidr_block_network_border_group
+        value: '{{ ipv6_cidr_block_network_border_group }}'
 ```
 </TabItem>
 </Tabs>
@@ -323,7 +322,7 @@ resources:
 ```sql
 /*+ delete */
 DELETE FROM awscc.ec2.vpc_cidr_blocks
-WHERE Identifier = '<Id|VpcId>'
+WHERE Identifier = '{{ id }}|{{ vpc_id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/ec2/vpc_endpoint_connection_notifications/index.md b/website/docs/services/ec2/vpc_endpoint_connection_notifications/index.md
index f9a5eb580..06e23f442 100644
--- a/website/docs/services/ec2/vpc_endpoint_connection_notifications/index.md
+++ b/website/docs/services/ec2/vpc_endpoint_connection_notifications/index.md
@@ -158,7 +158,7 @@ vpc_endpoint_connection_notification_id,
 connection_notification_arn,
 service_id
 FROM awscc.ec2.vpc_endpoint_connection_notifications
-WHERE region = 'us-east-1' AND Identifier = '<VPCEndpointConnectionNotificationId>';
+WHERE region = 'us-east-1' AND Identifier = '{{ vpc_endpoint_connection_notification_id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -195,9 +195,9 @@ INSERT INTO awscc.ec2.vpc_endpoint_connection_notifications (
  ConnectionNotificationArn,
  region
 )
-SELECT 
-'{{ ConnectionEvents }}',
- '{{ ConnectionNotificationArn }}',
+SELECT
+'{{ connection_events }}',
+ '{{ connection_notification_arn }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -212,11 +212,11 @@ INSERT INTO awscc.ec2.vpc_endpoint_connection_notifications (
  ServiceId,
  region
 )
-SELECT 
- '{{ ConnectionEvents }}',
- '{{ VPCEndpointId }}',
- '{{ ConnectionNotificationArn }}',
- '{{ ServiceId }}',
+SELECT
+ '{{ connection_events }}',
+ '{{ vpc_endpoint_id }}',
+ '{{ connection_notification_arn }}',
+ '{{ service_id }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -234,16 +234,15 @@ globals:
 resources:
   - name: vpc_endpoint_connection_notification
     props:
-      - name: ConnectionEvents
+      - name: connection_events
         value:
-          - '{{ ConnectionEvents[0] }}'
-      - name: VPCEndpointId
-        value: '{{ VPCEndpointId }}'
-      - name: ConnectionNotificationArn
-        value: '{{ ConnectionNotificationArn }}'
-      - name: ServiceId
-        value: '{{ ServiceId }}'
-
+          - '{{ connection_events[0] }}'
+      - name: vpc_endpoint_id
+        value: '{{ vpc_endpoint_id }}'
+      - name: connection_notification_arn
+        value: '{{ connection_notification_arn }}'
+      - name: service_id
+        value: '{{ service_id }}'
 ```
 </TabItem>
 </Tabs>
@@ -260,7 +259,7 @@ SET PatchDocument = string('{{ {
     "ConnectionNotificationArn": connection_notification_arn
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<VPCEndpointConnectionNotificationId>';
+AND Identifier = '{{ vpc_endpoint_connection_notification_id }}';
 ```
 
 
@@ -269,7 +268,7 @@ AND Identifier = '<VPCEndpointConnectionNotificationId>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.ec2.vpc_endpoint_connection_notifications
-WHERE Identifier = '<VPCEndpointConnectionNotificationId>'
+WHERE Identifier = '{{ vpc_endpoint_connection_notification_id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/ec2/vpc_endpoint_service_permissions/index.md b/website/docs/services/ec2/vpc_endpoint_service_permissions/index.md
index 0e12fe6f0..564d4f1d2 100644
--- a/website/docs/services/ec2/vpc_endpoint_service_permissions/index.md
+++ b/website/docs/services/ec2/vpc_endpoint_service_permissions/index.md
@@ -140,7 +140,7 @@ region,
 allowed_principals,
 service_id
 FROM awscc.ec2.vpc_endpoint_service_permissions
-WHERE region = 'us-east-1' AND Identifier = '<ServiceId>';
+WHERE region = 'us-east-1' AND Identifier = '{{ service_id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -176,8 +176,8 @@ INSERT INTO awscc.ec2.vpc_endpoint_service_permissions (
  ServiceId,
  region
 )
-SELECT 
-'{{ ServiceId }}',
+SELECT
+'{{ service_id }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -190,9 +190,9 @@ INSERT INTO awscc.ec2.vpc_endpoint_service_permissions (
  ServiceId,
  region
 )
-SELECT 
- '{{ AllowedPrincipals }}',
- '{{ ServiceId }}',
+SELECT
+ '{{ allowed_principals }}',
+ '{{ service_id }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -210,12 +210,11 @@ globals:
 resources:
   - name: vpc_endpoint_service_permission
     props:
-      - name: AllowedPrincipals
+      - name: allowed_principals
         value:
-          - '{{ AllowedPrincipals[0] }}'
-      - name: ServiceId
-        value: '{{ ServiceId }}'
-
+          - '{{ allowed_principals[0] }}'
+      - name: service_id
+        value: '{{ service_id }}'
 ```
 </TabItem>
 </Tabs>
@@ -231,7 +230,7 @@ SET PatchDocument = string('{{ {
     "AllowedPrincipals": allowed_principals
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<ServiceId>';
+AND Identifier = '{{ service_id }}';
 ```
 
 
@@ -240,7 +239,7 @@ AND Identifier = '<ServiceId>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.ec2.vpc_endpoint_service_permissions
-WHERE Identifier = '<ServiceId>'
+WHERE Identifier = '{{ service_id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/ec2/vpc_endpoint_services/index.md b/website/docs/services/ec2/vpc_endpoint_services/index.md
index 51d9abfba..aa0d93195 100644
--- a/website/docs/services/ec2/vpc_endpoint_services/index.md
+++ b/website/docs/services/ec2/vpc_endpoint_services/index.md
@@ -194,7 +194,7 @@ tags,
 supported_ip_address_types,
 supported_regions
 FROM awscc.ec2.vpc_endpoint_services
-WHERE region = 'us-east-1' AND Identifier = '<ServiceId>';
+WHERE region = 'us-east-1' AND Identifier = '{{ service_id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -237,15 +237,15 @@ INSERT INTO awscc.ec2.vpc_endpoint_services (
  SupportedRegions,
  region
 )
-SELECT 
-'{{ NetworkLoadBalancerArns }}',
- '{{ ContributorInsightsEnabled }}',
- '{{ PayerResponsibility }}',
- '{{ AcceptanceRequired }}',
- '{{ GatewayLoadBalancerArns }}',
- '{{ Tags }}',
- '{{ SupportedIpAddressTypes }}',
- '{{ SupportedRegions }}',
+SELECT
+'{{ network_load_balancer_arns }}',
+ '{{ contributor_insights_enabled }}',
+ '{{ payer_responsibility }}',
+ '{{ acceptance_required }}',
+ '{{ gateway_load_balancer_arns }}',
+ '{{ tags }}',
+ '{{ supported_ip_address_types }}',
+ '{{ supported_regions }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -264,15 +264,15 @@ INSERT INTO awscc.ec2.vpc_endpoint_services (
  SupportedRegions,
  region
 )
-SELECT 
- '{{ NetworkLoadBalancerArns }}',
- '{{ ContributorInsightsEnabled }}',
- '{{ PayerResponsibility }}',
- '{{ AcceptanceRequired }}',
- '{{ GatewayLoadBalancerArns }}',
- '{{ Tags }}',
- '{{ SupportedIpAddressTypes }}',
- '{{ SupportedRegions }}',
+SELECT
+ '{{ network_load_balancer_arns }}',
+ '{{ contributor_insights_enabled }}',
+ '{{ payer_responsibility }}',
+ '{{ acceptance_required }}',
+ '{{ gateway_load_balancer_arns }}',
+ '{{ tags }}',
+ '{{ supported_ip_address_types }}',
+ '{{ supported_regions }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -290,29 +290,28 @@ globals:
 resources:
   - name: vpc_endpoint_service
     props:
-      - name: NetworkLoadBalancerArns
+      - name: network_load_balancer_arns
         value:
-          - '{{ NetworkLoadBalancerArns[0] }}'
-      - name: ContributorInsightsEnabled
-        value: '{{ ContributorInsightsEnabled }}'
-      - name: PayerResponsibility
-        value: '{{ PayerResponsibility }}'
-      - name: AcceptanceRequired
-        value: '{{ AcceptanceRequired }}'
-      - name: GatewayLoadBalancerArns
+          - '{{ network_load_balancer_arns[0] }}'
+      - name: contributor_insights_enabled
+        value: '{{ contributor_insights_enabled }}'
+      - name: payer_responsibility
+        value: '{{ payer_responsibility }}'
+      - name: acceptance_required
+        value: '{{ acceptance_required }}'
+      - name: gateway_load_balancer_arns
         value:
-          - '{{ GatewayLoadBalancerArns[0] }}'
-      - name: Tags
+          - '{{ gateway_load_balancer_arns[0] }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-      - name: SupportedIpAddressTypes
+          - key: '{{ key }}'
+            value: '{{ value }}'
+      - name: supported_ip_address_types
         value:
-          - '{{ SupportedIpAddressTypes[0] }}'
-      - name: SupportedRegions
+          - '{{ supported_ip_address_types[0] }}'
+      - name: supported_regions
         value:
-          - '{{ SupportedRegions[0] }}'
-
+          - '{{ supported_regions[0] }}'
 ```
 </TabItem>
 </Tabs>
@@ -335,7 +334,7 @@ SET PatchDocument = string('{{ {
     "SupportedRegions": supported_regions
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<ServiceId>';
+AND Identifier = '{{ service_id }}';
 ```
 
 
@@ -344,7 +343,7 @@ AND Identifier = '<ServiceId>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.ec2.vpc_endpoint_services
-WHERE Identifier = '<ServiceId>'
+WHERE Identifier = '{{ service_id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/ec2/vpc_endpoints/index.md b/website/docs/services/ec2/vpc_endpoints/index.md
index 72b5c8f88..d810c6816 100644
--- a/website/docs/services/ec2/vpc_endpoints/index.md
+++ b/website/docs/services/ec2/vpc_endpoints/index.md
@@ -260,7 +260,7 @@ vpc_endpoint_type,
 id,
 tags
 FROM awscc.ec2.vpc_endpoints
-WHERE region = 'us-east-1' AND Identifier = '<Id>';
+WHERE region = 'us-east-1' AND Identifier = '{{ id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -296,8 +296,8 @@ INSERT INTO awscc.ec2.vpc_endpoints (
  VpcId,
  region
 )
-SELECT 
-'{{ VpcId }}',
+SELECT
+'{{ vpc_id }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -322,21 +322,21 @@ INSERT INTO awscc.ec2.vpc_endpoints (
  Tags,
  region
 )
-SELECT 
- '{{ PrivateDnsEnabled }}',
- '{{ IpAddressType }}',
- '{{ ServiceRegion }}',
- '{{ DnsOptions }}',
- '{{ ResourceConfigurationArn }}',
- '{{ SecurityGroupIds }}',
- '{{ SubnetIds }}',
- '{{ ServiceNetworkArn }}',
- '{{ VpcId }}',
- '{{ RouteTableIds }}',
- '{{ ServiceName }}',
- '{{ PolicyDocument }}',
- '{{ VpcEndpointType }}',
- '{{ Tags }}',
+SELECT
+ '{{ private_dns_enabled }}',
+ '{{ ip_address_type }}',
+ '{{ service_region }}',
+ '{{ dns_options }}',
+ '{{ resource_configuration_arn }}',
+ '{{ security_group_ids }}',
+ '{{ subnet_ids }}',
+ '{{ service_network_arn }}',
+ '{{ vpc_id }}',
+ '{{ route_table_ids }}',
+ '{{ service_name }}',
+ '{{ policy_document }}',
+ '{{ vpc_endpoint_type }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -354,42 +354,41 @@ globals:
 resources:
   - name: vpc_endpoint
     props:
-      - name: PrivateDnsEnabled
-        value: '{{ PrivateDnsEnabled }}'
-      - name: IpAddressType
-        value: '{{ IpAddressType }}'
-      - name: ServiceRegion
-        value: '{{ ServiceRegion }}'
-      - name: DnsOptions
+      - name: private_dns_enabled
+        value: '{{ private_dns_enabled }}'
+      - name: ip_address_type
+        value: '{{ ip_address_type }}'
+      - name: service_region
+        value: '{{ service_region }}'
+      - name: dns_options
         value:
-          PrivateDnsOnlyForInboundResolverEndpoint: '{{ PrivateDnsOnlyForInboundResolverEndpoint }}'
-          DnsRecordIpType: '{{ DnsRecordIpType }}'
-      - name: ResourceConfigurationArn
-        value: '{{ ResourceConfigurationArn }}'
-      - name: SecurityGroupIds
+          private_dns_only_for_inbound_resolver_endpoint: '{{ private_dns_only_for_inbound_resolver_endpoint }}'
+          dns_record_ip_type: '{{ dns_record_ip_type }}'
+      - name: resource_configuration_arn
+        value: '{{ resource_configuration_arn }}'
+      - name: security_group_ids
         value:
-          - '{{ SecurityGroupIds[0] }}'
-      - name: SubnetIds
+          - '{{ security_group_ids[0] }}'
+      - name: subnet_ids
         value:
-          - '{{ SubnetIds[0] }}'
-      - name: ServiceNetworkArn
-        value: '{{ ServiceNetworkArn }}'
-      - name: VpcId
-        value: '{{ VpcId }}'
-      - name: RouteTableIds
+          - '{{ subnet_ids[0] }}'
+      - name: service_network_arn
+        value: '{{ service_network_arn }}'
+      - name: vpc_id
+        value: '{{ vpc_id }}'
+      - name: route_table_ids
         value:
-          - '{{ RouteTableIds[0] }}'
-      - name: ServiceName
-        value: '{{ ServiceName }}'
-      - name: PolicyDocument
+          - '{{ route_table_ids[0] }}'
+      - name: service_name
+        value: '{{ service_name }}'
+      - name: policy_document
         value: {}
-      - name: VpcEndpointType
-        value: '{{ VpcEndpointType }}'
-      - name: Tags
+      - name: vpc_endpoint_type
+        value: '{{ vpc_endpoint_type }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -412,7 +411,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Id>';
+AND Identifier = '{{ id }}';
 ```
 
 
@@ -421,7 +420,7 @@ AND Identifier = '<Id>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.ec2.vpc_endpoints
-WHERE Identifier = '<Id>'
+WHERE Identifier = '{{ id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/ec2/vpc_gateway_attachments/index.md b/website/docs/services/ec2/vpc_gateway_attachments/index.md
index 53ce1aeea..ea8e6ed49 100644
--- a/website/docs/services/ec2/vpc_gateway_attachments/index.md
+++ b/website/docs/services/ec2/vpc_gateway_attachments/index.md
@@ -157,7 +157,7 @@ internet_gateway_id,
 vpc_id,
 vpn_gateway_id
 FROM awscc.ec2.vpc_gateway_attachments
-WHERE region = 'us-east-1' AND Identifier = '<AttachmentType>|<VpcId>';
+WHERE region = 'us-east-1' AND Identifier = '{{ attachment_type }}|{{ vpc_id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -194,8 +194,8 @@ INSERT INTO awscc.ec2.vpc_gateway_attachments (
  VpcId,
  region
 )
-SELECT 
-'{{ VpcId }}',
+SELECT
+'{{ vpc_id }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -209,10 +209,10 @@ INSERT INTO awscc.ec2.vpc_gateway_attachments (
  VpnGatewayId,
  region
 )
-SELECT 
- '{{ InternetGatewayId }}',
- '{{ VpcId }}',
- '{{ VpnGatewayId }}',
+SELECT
+ '{{ internet_gateway_id }}',
+ '{{ vpc_id }}',
+ '{{ vpn_gateway_id }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -230,13 +230,12 @@ globals:
 resources:
   - name: vpc_gateway_attachment
     props:
-      - name: InternetGatewayId
-        value: '{{ InternetGatewayId }}'
-      - name: VpcId
-        value: '{{ VpcId }}'
-      - name: VpnGatewayId
-        value: '{{ VpnGatewayId }}'
-
+      - name: internet_gateway_id
+        value: '{{ internet_gateway_id }}'
+      - name: vpc_id
+        value: '{{ vpc_id }}'
+      - name: vpn_gateway_id
+        value: '{{ vpn_gateway_id }}'
 ```
 </TabItem>
 </Tabs>
@@ -253,7 +252,7 @@ SET PatchDocument = string('{{ {
     "VpnGatewayId": vpn_gateway_id
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<AttachmentType>|<VpcId>';
+AND Identifier = '{{ attachment_type }}|{{ vpc_id }}';
 ```
 
 
@@ -262,7 +261,7 @@ AND Identifier = '<AttachmentType>|<VpcId>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.ec2.vpc_gateway_attachments
-WHERE Identifier = '<AttachmentType|VpcId>'
+WHERE Identifier = '{{ attachment_type }}|{{ vpc_id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/ec2/vpc_peering_connections/index.md b/website/docs/services/ec2/vpc_peering_connections/index.md
index 67164efd4..8c0c97bf7 100644
--- a/website/docs/services/ec2/vpc_peering_connections/index.md
+++ b/website/docs/services/ec2/vpc_peering_connections/index.md
@@ -182,7 +182,7 @@ peer_region,
 peer_owner_id,
 tags
 FROM awscc.ec2.vpc_peering_connections
-WHERE region = 'us-east-1' AND Identifier = '<Id>';
+WHERE region = 'us-east-1' AND Identifier = '{{ id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -219,9 +219,9 @@ INSERT INTO awscc.ec2.vpc_peering_connections (
  PeerVpcId,
  region
 )
-SELECT 
-'{{ VpcId }}',
- '{{ PeerVpcId }}',
+SELECT
+'{{ vpc_id }}',
+ '{{ peer_vpc_id }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -238,13 +238,13 @@ INSERT INTO awscc.ec2.vpc_peering_connections (
  Tags,
  region
 )
-SELECT 
- '{{ PeerRoleArn }}',
- '{{ VpcId }}',
- '{{ PeerVpcId }}',
- '{{ PeerRegion }}',
- '{{ PeerOwnerId }}',
- '{{ Tags }}',
+SELECT
+ '{{ peer_role_arn }}',
+ '{{ vpc_id }}',
+ '{{ peer_vpc_id }}',
+ '{{ peer_region }}',
+ '{{ peer_owner_id }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -262,21 +262,20 @@ globals:
 resources:
   - name: vpc_peering_connection
     props:
-      - name: PeerRoleArn
-        value: '{{ PeerRoleArn }}'
-      - name: VpcId
-        value: '{{ VpcId }}'
-      - name: PeerVpcId
-        value: '{{ PeerVpcId }}'
-      - name: PeerRegion
-        value: '{{ PeerRegion }}'
-      - name: PeerOwnerId
-        value: '{{ PeerOwnerId }}'
-      - name: Tags
+      - name: peer_role_arn
+        value: '{{ peer_role_arn }}'
+      - name: vpc_id
+        value: '{{ vpc_id }}'
+      - name: peer_vpc_id
+        value: '{{ peer_vpc_id }}'
+      - name: peer_region
+        value: '{{ peer_region }}'
+      - name: peer_owner_id
+        value: '{{ peer_owner_id }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -292,7 +291,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Id>';
+AND Identifier = '{{ id }}';
 ```
 
 
@@ -301,7 +300,7 @@ AND Identifier = '<Id>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.ec2.vpc_peering_connections
-WHERE Identifier = '<Id>'
+WHERE Identifier = '{{ id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/ec2/vpcdhcp_options_associations/index.md b/website/docs/services/ec2/vpcdhcp_options_associations/index.md
index a81336dd5..a35be6ec7 100644
--- a/website/docs/services/ec2/vpcdhcp_options_associations/index.md
+++ b/website/docs/services/ec2/vpcdhcp_options_associations/index.md
@@ -145,7 +145,7 @@ region,
 dhcp_options_id,
 vpc_id
 FROM awscc.ec2.vpcdhcp_options_associations
-WHERE region = 'us-east-1' AND Identifier = '<DhcpOptionsId>|<VpcId>';
+WHERE region = 'us-east-1' AND Identifier = '{{ dhcp_options_id }}|{{ vpc_id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -183,9 +183,9 @@ INSERT INTO awscc.ec2.vpcdhcp_options_associations (
  VpcId,
  region
 )
-SELECT 
-'{{ DhcpOptionsId }}',
- '{{ VpcId }}',
+SELECT
+'{{ dhcp_options_id }}',
+ '{{ vpc_id }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -198,9 +198,9 @@ INSERT INTO awscc.ec2.vpcdhcp_options_associations (
  VpcId,
  region
 )
-SELECT 
- '{{ DhcpOptionsId }}',
- '{{ VpcId }}',
+SELECT
+ '{{ dhcp_options_id }}',
+ '{{ vpc_id }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -218,11 +218,10 @@ globals:
 resources:
   - name: vpcdhcp_options_association
     props:
-      - name: DhcpOptionsId
-        value: '{{ DhcpOptionsId }}'
-      - name: VpcId
-        value: '{{ VpcId }}'
-
+      - name: dhcp_options_id
+        value: '{{ dhcp_options_id }}'
+      - name: vpc_id
+        value: '{{ vpc_id }}'
 ```
 </TabItem>
 </Tabs>
@@ -233,7 +232,7 @@ resources:
 ```sql
 /*+ delete */
 DELETE FROM awscc.ec2.vpcdhcp_options_associations
-WHERE Identifier = '<DhcpOptionsId|VpcId>'
+WHERE Identifier = '{{ dhcp_options_id }}|{{ vpc_id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/ec2/vpcs/index.md b/website/docs/services/ec2/vpcs/index.md
index c000fb62c..d6e366481 100644
--- a/website/docs/services/ec2/vpcs/index.md
+++ b/website/docs/services/ec2/vpcs/index.md
@@ -212,7 +212,7 @@ default_security_group,
 enable_dns_hostnames,
 tags
 FROM awscc.ec2.vpcs
-WHERE region = 'us-east-1' AND Identifier = '<VpcId>';
+WHERE region = 'us-east-1' AND Identifier = '{{ vpc_id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -254,14 +254,14 @@ INSERT INTO awscc.ec2.vpcs (
  Tags,
  region
 )
-SELECT 
-'{{ InstanceTenancy }}',
- '{{ Ipv4NetmaskLength }}',
- '{{ CidrBlock }}',
- '{{ Ipv4IpamPoolId }}',
- '{{ EnableDnsSupport }}',
- '{{ EnableDnsHostnames }}',
- '{{ Tags }}',
+SELECT
+'{{ instance_tenancy }}',
+ '{{ ipv4_netmask_length }}',
+ '{{ cidr_block }}',
+ '{{ ipv4_ipam_pool_id }}',
+ '{{ enable_dns_support }}',
+ '{{ enable_dns_hostnames }}',
+ '{{ tags }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -279,14 +279,14 @@ INSERT INTO awscc.ec2.vpcs (
  Tags,
  region
 )
-SELECT 
- '{{ InstanceTenancy }}',
- '{{ Ipv4NetmaskLength }}',
- '{{ CidrBlock }}',
- '{{ Ipv4IpamPoolId }}',
- '{{ EnableDnsSupport }}',
- '{{ EnableDnsHostnames }}',
- '{{ Tags }}',
+SELECT
+ '{{ instance_tenancy }}',
+ '{{ ipv4_netmask_length }}',
+ '{{ cidr_block }}',
+ '{{ ipv4_ipam_pool_id }}',
+ '{{ enable_dns_support }}',
+ '{{ enable_dns_hostnames }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -304,23 +304,22 @@ globals:
 resources:
   - name: vpc
     props:
-      - name: InstanceTenancy
-        value: '{{ InstanceTenancy }}'
-      - name: Ipv4NetmaskLength
-        value: '{{ Ipv4NetmaskLength }}'
-      - name: CidrBlock
-        value: '{{ CidrBlock }}'
-      - name: Ipv4IpamPoolId
-        value: '{{ Ipv4IpamPoolId }}'
-      - name: EnableDnsSupport
-        value: '{{ EnableDnsSupport }}'
-      - name: EnableDnsHostnames
-        value: '{{ EnableDnsHostnames }}'
-      - name: Tags
+      - name: instance_tenancy
+        value: '{{ instance_tenancy }}'
+      - name: ipv4_netmask_length
+        value: '{{ ipv4_netmask_length }}'
+      - name: cidr_block
+        value: '{{ cidr_block }}'
+      - name: ipv4_ipam_pool_id
+        value: '{{ ipv4_ipam_pool_id }}'
+      - name: enable_dns_support
+        value: '{{ enable_dns_support }}'
+      - name: enable_dns_hostnames
+        value: '{{ enable_dns_hostnames }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -339,7 +338,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<VpcId>';
+AND Identifier = '{{ vpc_id }}';
 ```
 
 
@@ -348,7 +347,7 @@ AND Identifier = '<VpcId>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.ec2.vpcs
-WHERE Identifier = '<VpcId>'
+WHERE Identifier = '{{ vpc_id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/ec2/vpn_connection_routes/index.md b/website/docs/services/ec2/vpn_connection_routes/index.md
index 307f570a6..5251acb74 100644
--- a/website/docs/services/ec2/vpn_connection_routes/index.md
+++ b/website/docs/services/ec2/vpn_connection_routes/index.md
@@ -139,7 +139,7 @@ region,
 destination_cidr_block,
 vpn_connection_id
 FROM awscc.ec2.vpn_connection_routes
-WHERE region = 'us-east-1' AND Identifier = '<DestinationCidrBlock>|<VpnConnectionId>';
+WHERE region = 'us-east-1' AND Identifier = '{{ destination_cidr_block }}|{{ vpn_connection_id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -177,9 +177,9 @@ INSERT INTO awscc.ec2.vpn_connection_routes (
  VpnConnectionId,
  region
 )
-SELECT 
-'{{ DestinationCidrBlock }}',
- '{{ VpnConnectionId }}',
+SELECT
+'{{ destination_cidr_block }}',
+ '{{ vpn_connection_id }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -192,9 +192,9 @@ INSERT INTO awscc.ec2.vpn_connection_routes (
  VpnConnectionId,
  region
 )
-SELECT 
- '{{ DestinationCidrBlock }}',
- '{{ VpnConnectionId }}',
+SELECT
+ '{{ destination_cidr_block }}',
+ '{{ vpn_connection_id }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -212,11 +212,10 @@ globals:
 resources:
   - name: vpn_connection_route
     props:
-      - name: DestinationCidrBlock
-        value: '{{ DestinationCidrBlock }}'
-      - name: VpnConnectionId
-        value: '{{ VpnConnectionId }}'
-
+      - name: destination_cidr_block
+        value: '{{ destination_cidr_block }}'
+      - name: vpn_connection_id
+        value: '{{ vpn_connection_id }}'
 ```
 </TabItem>
 </Tabs>
@@ -227,7 +226,7 @@ resources:
 ```sql
 /*+ delete */
 DELETE FROM awscc.ec2.vpn_connection_routes
-WHERE Identifier = '<DestinationCidrBlock|VpnConnectionId>'
+WHERE Identifier = '{{ destination_cidr_block }}|{{ vpn_connection_id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/ec2/vpn_connections/index.md b/website/docs/services/ec2/vpn_connections/index.md
index 1a6e5817d..d1ac60593 100644
--- a/website/docs/services/ec2/vpn_connections/index.md
+++ b/website/docs/services/ec2/vpn_connections/index.md
@@ -417,7 +417,7 @@ vpn_connection_id,
 tunnel_inside_ip_version,
 tags
 FROM awscc.ec2.vpn_connections
-WHERE region = 'us-east-1' AND Identifier = '<VpnConnectionId>';
+WHERE region = 'us-east-1' AND Identifier = '{{ vpn_connection_id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -454,9 +454,9 @@ INSERT INTO awscc.ec2.vpn_connections (
  Type,
  region
 )
-SELECT 
-'{{ CustomerGatewayId }}',
- '{{ Type }}',
+SELECT
+'{{ customer_gateway_id }}',
+ '{{ type }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -483,23 +483,23 @@ INSERT INTO awscc.ec2.vpn_connections (
  Tags,
  region
 )
-SELECT 
- '{{ RemoteIpv6NetworkCidr }}',
- '{{ RemoteIpv4NetworkCidr }}',
- '{{ VpnTunnelOptionsSpecifications }}',
- '{{ CustomerGatewayId }}',
- '{{ OutsideIpAddressType }}',
- '{{ StaticRoutesOnly }}',
- '{{ EnableAcceleration }}',
- '{{ TransitGatewayId }}',
- '{{ Type }}',
- '{{ LocalIpv4NetworkCidr }}',
- '{{ VpnGatewayId }}',
- '{{ PreSharedKeyStorage }}',
- '{{ TransportTransitGatewayAttachmentId }}',
- '{{ LocalIpv6NetworkCidr }}',
- '{{ TunnelInsideIpVersion }}',
- '{{ Tags }}',
+SELECT
+ '{{ remote_ipv6_network_cidr }}',
+ '{{ remote_ipv4_network_cidr }}',
+ '{{ vpn_tunnel_options_specifications }}',
+ '{{ customer_gateway_id }}',
+ '{{ outside_ip_address_type }}',
+ '{{ static_routes_only }}',
+ '{{ enable_acceleration }}',
+ '{{ transit_gateway_id }}',
+ '{{ type }}',
+ '{{ local_ipv4_network_cidr }}',
+ '{{ vpn_gateway_id }}',
+ '{{ pre_shared_key_storage }}',
+ '{{ transport_transit_gateway_attachment_id }}',
+ '{{ local_ipv6_network_cidr }}',
+ '{{ tunnel_inside_ip_version }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -517,72 +517,71 @@ globals:
 resources:
   - name: vpn_connection
     props:
-      - name: RemoteIpv6NetworkCidr
-        value: '{{ RemoteIpv6NetworkCidr }}'
-      - name: RemoteIpv4NetworkCidr
-        value: '{{ RemoteIpv4NetworkCidr }}'
-      - name: VpnTunnelOptionsSpecifications
+      - name: remote_ipv6_network_cidr
+        value: '{{ remote_ipv6_network_cidr }}'
+      - name: remote_ipv4_network_cidr
+        value: '{{ remote_ipv4_network_cidr }}'
+      - name: vpn_tunnel_options_specifications
         value:
-          - Phase2EncryptionAlgorithms:
-              - Value: '{{ Value }}'
-            Phase2DHGroupNumbers:
-              - Value: '{{ Value }}'
-            TunnelInsideIpv6Cidr: '{{ TunnelInsideIpv6Cidr }}'
-            StartupAction: '{{ StartupAction }}'
-            TunnelInsideCidr: '{{ TunnelInsideCidr }}'
-            IKEVersions:
-              - Value: '{{ Value }}'
-            LogOptions:
-              CloudwatchLogOptions:
-                LogEnabled: '{{ LogEnabled }}'
-                LogOutputFormat: '{{ LogOutputFormat }}'
-                LogGroupArn: '{{ LogGroupArn }}'
-            Phase1DHGroupNumbers:
-              - Value: '{{ Value }}'
-            ReplayWindowSize: '{{ ReplayWindowSize }}'
-            EnableTunnelLifecycleControl: '{{ EnableTunnelLifecycleControl }}'
-            RekeyMarginTimeSeconds: '{{ RekeyMarginTimeSeconds }}'
-            DPDTimeoutAction: '{{ DPDTimeoutAction }}'
-            Phase2LifetimeSeconds: '{{ Phase2LifetimeSeconds }}'
-            Phase2IntegrityAlgorithms:
-              - Value: '{{ Value }}'
-            Phase1IntegrityAlgorithms:
-              - Value: '{{ Value }}'
-            PreSharedKey: '{{ PreSharedKey }}'
-            Phase1LifetimeSeconds: '{{ Phase1LifetimeSeconds }}'
-            RekeyFuzzPercentage: '{{ RekeyFuzzPercentage }}'
-            Phase1EncryptionAlgorithms:
-              - Value: '{{ Value }}'
-            DPDTimeoutSeconds: '{{ DPDTimeoutSeconds }}'
-      - name: CustomerGatewayId
-        value: '{{ CustomerGatewayId }}'
-      - name: OutsideIpAddressType
-        value: '{{ OutsideIpAddressType }}'
-      - name: StaticRoutesOnly
-        value: '{{ StaticRoutesOnly }}'
-      - name: EnableAcceleration
-        value: '{{ EnableAcceleration }}'
-      - name: TransitGatewayId
-        value: '{{ TransitGatewayId }}'
-      - name: Type
-        value: '{{ Type }}'
-      - name: LocalIpv4NetworkCidr
-        value: '{{ LocalIpv4NetworkCidr }}'
-      - name: VpnGatewayId
-        value: '{{ VpnGatewayId }}'
-      - name: PreSharedKeyStorage
-        value: '{{ PreSharedKeyStorage }}'
-      - name: TransportTransitGatewayAttachmentId
-        value: '{{ TransportTransitGatewayAttachmentId }}'
-      - name: LocalIpv6NetworkCidr
-        value: '{{ LocalIpv6NetworkCidr }}'
-      - name: TunnelInsideIpVersion
-        value: '{{ TunnelInsideIpVersion }}'
-      - name: Tags
+          - phase2_encryption_algorithms:
+              - value: '{{ value }}'
+            phase2_dh_group_numbers:
+              - value: '{{ value }}'
+            tunnel_inside_ipv6_cidr: '{{ tunnel_inside_ipv6_cidr }}'
+            startup_action: '{{ startup_action }}'
+            tunnel_inside_cidr: '{{ tunnel_inside_cidr }}'
+            i_ke_versions:
+              - value: '{{ value }}'
+            log_options:
+              cloudwatch_log_options:
+                log_enabled: '{{ log_enabled }}'
+                log_output_format: '{{ log_output_format }}'
+                log_group_arn: '{{ log_group_arn }}'
+            phase1_dh_group_numbers:
+              - value: '{{ value }}'
+            replay_window_size: '{{ replay_window_size }}'
+            enable_tunnel_lifecycle_control: '{{ enable_tunnel_lifecycle_control }}'
+            rekey_margin_time_seconds: '{{ rekey_margin_time_seconds }}'
+            d_pd_timeout_action: '{{ d_pd_timeout_action }}'
+            phase2_lifetime_seconds: '{{ phase2_lifetime_seconds }}'
+            phase2_integrity_algorithms:
+              - value: '{{ value }}'
+            phase1_integrity_algorithms:
+              - value: '{{ value }}'
+            pre_shared_key: '{{ pre_shared_key }}'
+            phase1_lifetime_seconds: '{{ phase1_lifetime_seconds }}'
+            rekey_fuzz_percentage: '{{ rekey_fuzz_percentage }}'
+            phase1_encryption_algorithms:
+              - value: '{{ value }}'
+            d_pd_timeout_seconds: '{{ d_pd_timeout_seconds }}'
+      - name: customer_gateway_id
+        value: '{{ customer_gateway_id }}'
+      - name: outside_ip_address_type
+        value: '{{ outside_ip_address_type }}'
+      - name: static_routes_only
+        value: '{{ static_routes_only }}'
+      - name: enable_acceleration
+        value: '{{ enable_acceleration }}'
+      - name: transit_gateway_id
+        value: '{{ transit_gateway_id }}'
+      - name: type
+        value: '{{ type }}'
+      - name: local_ipv4_network_cidr
+        value: '{{ local_ipv4_network_cidr }}'
+      - name: vpn_gateway_id
+        value: '{{ vpn_gateway_id }}'
+      - name: pre_shared_key_storage
+        value: '{{ pre_shared_key_storage }}'
+      - name: transport_transit_gateway_attachment_id
+        value: '{{ transport_transit_gateway_attachment_id }}'
+      - name: local_ipv6_network_cidr
+        value: '{{ local_ipv6_network_cidr }}'
+      - name: tunnel_inside_ip_version
+        value: '{{ tunnel_inside_ip_version }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -598,7 +597,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<VpnConnectionId>';
+AND Identifier = '{{ vpn_connection_id }}';
 ```
 
 
@@ -607,7 +606,7 @@ AND Identifier = '<VpnConnectionId>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.ec2.vpn_connections
-WHERE Identifier = '<VpnConnectionId>'
+WHERE Identifier = '{{ vpn_connection_id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/ec2/vpn_gateways/index.md b/website/docs/services/ec2/vpn_gateways/index.md
index 8450a23ba..4c0d996d8 100644
--- a/website/docs/services/ec2/vpn_gateways/index.md
+++ b/website/docs/services/ec2/vpn_gateways/index.md
@@ -164,7 +164,7 @@ amazon_side_asn,
 tags,
 type
 FROM awscc.ec2.vpn_gateways
-WHERE region = 'us-east-1' AND Identifier = '<VPNGatewayId>';
+WHERE region = 'us-east-1' AND Identifier = '{{ v_pn_gateway_id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -200,8 +200,8 @@ INSERT INTO awscc.ec2.vpn_gateways (
  Type,
  region
 )
-SELECT 
-'{{ Type }}',
+SELECT
+'{{ type }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -215,10 +215,10 @@ INSERT INTO awscc.ec2.vpn_gateways (
  Type,
  region
 )
-SELECT 
- '{{ AmazonSideAsn }}',
- '{{ Tags }}',
- '{{ Type }}',
+SELECT
+ '{{ amazon_side_asn }}',
+ '{{ tags }}',
+ '{{ type }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -236,15 +236,14 @@ globals:
 resources:
   - name: vpn_gateway
     props:
-      - name: AmazonSideAsn
-        value: '{{ AmazonSideAsn }}'
-      - name: Tags
+      - name: amazon_side_asn
+        value: '{{ amazon_side_asn }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-      - name: Type
-        value: '{{ Type }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
+      - name: type
+        value: '{{ type }}'
 ```
 </TabItem>
 </Tabs>
@@ -260,7 +259,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<VPNGatewayId>';
+AND Identifier = '{{ v_pn_gateway_id }}';
 ```
 
 
@@ -269,7 +268,7 @@ AND Identifier = '<VPNGatewayId>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.ec2.vpn_gateways
-WHERE Identifier = '<VPNGatewayId>'
+WHERE Identifier = '{{ v_pn_gateway_id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/ecr/public_repositories/index.md b/website/docs/services/ecr/public_repositories/index.md
index 711f15b07..6a86ac852 100644
--- a/website/docs/services/ecr/public_repositories/index.md
+++ b/website/docs/services/ecr/public_repositories/index.md
@@ -197,7 +197,7 @@ arn,
 repository_catalog_data,
 tags
 FROM awscc.ecr.public_repositories
-WHERE region = 'us-east-1' AND Identifier = '<RepositoryName>';
+WHERE region = 'us-east-1' AND Identifier = '{{ repository_name }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -236,11 +236,11 @@ INSERT INTO awscc.ecr.public_repositories (
  Tags,
  region
 )
-SELECT 
-'{{ RepositoryName }}',
- '{{ RepositoryPolicyText }}',
- '{{ RepositoryCatalogData }}',
- '{{ Tags }}',
+SELECT
+'{{ repository_name }}',
+ '{{ repository_policy_text }}',
+ '{{ repository_catalog_data }}',
+ '{{ tags }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -255,11 +255,11 @@ INSERT INTO awscc.ecr.public_repositories (
  Tags,
  region
 )
-SELECT 
- '{{ RepositoryName }}',
- '{{ RepositoryPolicyText }}',
- '{{ RepositoryCatalogData }}',
- '{{ Tags }}',
+SELECT
+ '{{ repository_name }}',
+ '{{ repository_policy_text }}',
+ '{{ repository_catalog_data }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -277,24 +277,23 @@ globals:
 resources:
   - name: public_repository
     props:
-      - name: RepositoryName
-        value: '{{ RepositoryName }}'
-      - name: RepositoryPolicyText
+      - name: repository_name
+        value: '{{ repository_name }}'
+      - name: repository_policy_text
         value: {}
-      - name: RepositoryCatalogData
+      - name: repository_catalog_data
         value:
-          RepositoryDescription: '{{ RepositoryDescription }}'
-          Architectures:
-            - '{{ Architectures[0] }}'
-          OperatingSystems:
-            - '{{ OperatingSystems[0] }}'
-          AboutText: '{{ AboutText }}'
-          UsageText: '{{ UsageText }}'
-      - name: Tags
+          repository_description: '{{ repository_description }}'
+          architectures:
+            - '{{ architectures[0] }}'
+          operating_systems:
+            - '{{ operating_systems[0] }}'
+          about_text: '{{ about_text }}'
+          usage_text: '{{ usage_text }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -312,7 +311,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<RepositoryName>';
+AND Identifier = '{{ repository_name }}';
 ```
 
 
@@ -321,7 +320,7 @@ AND Identifier = '<RepositoryName>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.ecr.public_repositories
-WHERE Identifier = '<RepositoryName>'
+WHERE Identifier = '{{ repository_name }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/ecr/pull_through_cache_rules/index.md b/website/docs/services/ecr/pull_through_cache_rules/index.md
index 27944c55b..4e7952dfe 100644
--- a/website/docs/services/ecr/pull_through_cache_rules/index.md
+++ b/website/docs/services/ecr/pull_through_cache_rules/index.md
@@ -164,7 +164,7 @@ upstream_registry,
 custom_role_arn,
 upstream_repository_prefix
 FROM awscc.ecr.pull_through_cache_rules
-WHERE region = 'us-east-1' AND Identifier = '<EcrRepositoryPrefix>';
+WHERE region = 'us-east-1' AND Identifier = '{{ ecr_repository_prefix }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -205,13 +205,13 @@ INSERT INTO awscc.ecr.pull_through_cache_rules (
  UpstreamRepositoryPrefix,
  region
 )
-SELECT 
-'{{ EcrRepositoryPrefix }}',
- '{{ UpstreamRegistryUrl }}',
- '{{ CredentialArn }}',
- '{{ UpstreamRegistry }}',
- '{{ CustomRoleArn }}',
- '{{ UpstreamRepositoryPrefix }}',
+SELECT
+'{{ ecr_repository_prefix }}',
+ '{{ upstream_registry_url }}',
+ '{{ credential_arn }}',
+ '{{ upstream_registry }}',
+ '{{ custom_role_arn }}',
+ '{{ upstream_repository_prefix }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -228,13 +228,13 @@ INSERT INTO awscc.ecr.pull_through_cache_rules (
  UpstreamRepositoryPrefix,
  region
 )
-SELECT 
- '{{ EcrRepositoryPrefix }}',
- '{{ UpstreamRegistryUrl }}',
- '{{ CredentialArn }}',
- '{{ UpstreamRegistry }}',
- '{{ CustomRoleArn }}',
- '{{ UpstreamRepositoryPrefix }}',
+SELECT
+ '{{ ecr_repository_prefix }}',
+ '{{ upstream_registry_url }}',
+ '{{ credential_arn }}',
+ '{{ upstream_registry }}',
+ '{{ custom_role_arn }}',
+ '{{ upstream_repository_prefix }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -252,19 +252,18 @@ globals:
 resources:
   - name: pull_through_cache_rule
     props:
-      - name: EcrRepositoryPrefix
-        value: '{{ EcrRepositoryPrefix }}'
-      - name: UpstreamRegistryUrl
-        value: '{{ UpstreamRegistryUrl }}'
-      - name: CredentialArn
-        value: '{{ CredentialArn }}'
-      - name: UpstreamRegistry
-        value: '{{ UpstreamRegistry }}'
-      - name: CustomRoleArn
-        value: '{{ CustomRoleArn }}'
-      - name: UpstreamRepositoryPrefix
-        value: '{{ UpstreamRepositoryPrefix }}'
-
+      - name: ecr_repository_prefix
+        value: '{{ ecr_repository_prefix }}'
+      - name: upstream_registry_url
+        value: '{{ upstream_registry_url }}'
+      - name: credential_arn
+        value: '{{ credential_arn }}'
+      - name: upstream_registry
+        value: '{{ upstream_registry }}'
+      - name: custom_role_arn
+        value: '{{ custom_role_arn }}'
+      - name: upstream_repository_prefix
+        value: '{{ upstream_repository_prefix }}'
 ```
 </TabItem>
 </Tabs>
@@ -275,7 +274,7 @@ resources:
 ```sql
 /*+ delete */
 DELETE FROM awscc.ecr.pull_through_cache_rules
-WHERE Identifier = '<EcrRepositoryPrefix>'
+WHERE Identifier = '{{ ecr_repository_prefix }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/ecr/registry_policies/index.md b/website/docs/services/ecr/registry_policies/index.md
index 5be0fca64..c43ccb5e5 100644
--- a/website/docs/services/ecr/registry_policies/index.md
+++ b/website/docs/services/ecr/registry_policies/index.md
@@ -140,7 +140,7 @@ region,
 registry_id,
 policy_text
 FROM awscc.ecr.registry_policies
-WHERE region = 'us-east-1' AND Identifier = '<RegistryId>';
+WHERE region = 'us-east-1' AND Identifier = '{{ registry_id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -176,8 +176,8 @@ INSERT INTO awscc.ecr.registry_policies (
  PolicyText,
  region
 )
-SELECT 
-'{{ PolicyText }}',
+SELECT
+'{{ policy_text }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -189,8 +189,8 @@ INSERT INTO awscc.ecr.registry_policies (
  PolicyText,
  region
 )
-SELECT 
- '{{ PolicyText }}',
+SELECT
+ '{{ policy_text }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -208,9 +208,8 @@ globals:
 resources:
   - name: registry_policy
     props:
-      - name: PolicyText
+      - name: policy_text
         value: {}
-
 ```
 </TabItem>
 </Tabs>
@@ -226,7 +225,7 @@ SET PatchDocument = string('{{ {
     "PolicyText": policy_text
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<RegistryId>';
+AND Identifier = '{{ registry_id }}';
 ```
 
 
@@ -235,7 +234,7 @@ AND Identifier = '<RegistryId>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.ecr.registry_policies
-WHERE Identifier = '<RegistryId>'
+WHERE Identifier = '{{ registry_id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/ecr/registry_scanning_configurations/index.md b/website/docs/services/ecr/registry_scanning_configurations/index.md
index 4755d715f..0b8cae40e 100644
--- a/website/docs/services/ecr/registry_scanning_configurations/index.md
+++ b/website/docs/services/ecr/registry_scanning_configurations/index.md
@@ -170,7 +170,7 @@ rules,
 scan_type,
 registry_id
 FROM awscc.ecr.registry_scanning_configurations
-WHERE region = 'us-east-1' AND Identifier = '<RegistryId>';
+WHERE region = 'us-east-1' AND Identifier = '{{ registry_id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -207,9 +207,9 @@ INSERT INTO awscc.ecr.registry_scanning_configurations (
  ScanType,
  region
 )
-SELECT 
-'{{ Rules }}',
- '{{ ScanType }}',
+SELECT
+'{{ rules }}',
+ '{{ scan_type }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -222,9 +222,9 @@ INSERT INTO awscc.ecr.registry_scanning_configurations (
  ScanType,
  region
 )
-SELECT 
- '{{ Rules }}',
- '{{ ScanType }}',
+SELECT
+ '{{ rules }}',
+ '{{ scan_type }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -242,15 +242,14 @@ globals:
 resources:
   - name: registry_scanning_configuration
     props:
-      - name: Rules
+      - name: rules
         value:
-          - RepositoryFilters:
-              - Filter: '{{ Filter }}'
-                FilterType: '{{ FilterType }}'
-            ScanFrequency: '{{ ScanFrequency }}'
-      - name: ScanType
-        value: '{{ ScanType }}'
-
+          - repository_filters:
+              - filter: '{{ filter }}'
+                filter_type: '{{ filter_type }}'
+            scan_frequency: '{{ scan_frequency }}'
+      - name: scan_type
+        value: '{{ scan_type }}'
 ```
 </TabItem>
 </Tabs>
@@ -267,7 +266,7 @@ SET PatchDocument = string('{{ {
     "ScanType": scan_type
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<RegistryId>';
+AND Identifier = '{{ registry_id }}';
 ```
 
 
@@ -276,7 +275,7 @@ AND Identifier = '<RegistryId>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.ecr.registry_scanning_configurations
-WHERE Identifier = '<RegistryId>'
+WHERE Identifier = '{{ registry_id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/ecr/replication_configurations/index.md b/website/docs/services/ecr/replication_configurations/index.md
index 27f93aa49..53d23f2a5 100644
--- a/website/docs/services/ecr/replication_configurations/index.md
+++ b/website/docs/services/ecr/replication_configurations/index.md
@@ -147,7 +147,7 @@ region,
 replication_configuration,
 registry_id
 FROM awscc.ecr.replication_configurations
-WHERE region = 'us-east-1' AND Identifier = '<RegistryId>';
+WHERE region = 'us-east-1' AND Identifier = '{{ registry_id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -183,8 +183,8 @@ INSERT INTO awscc.ecr.replication_configurations (
  ReplicationConfiguration,
  region
 )
-SELECT 
-'{{ ReplicationConfiguration }}',
+SELECT
+'{{ replication_configuration }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -196,8 +196,8 @@ INSERT INTO awscc.ecr.replication_configurations (
  ReplicationConfiguration,
  region
 )
-SELECT 
- '{{ ReplicationConfiguration }}',
+SELECT
+ '{{ replication_configuration }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -215,10 +215,9 @@ globals:
 resources:
   - name: replication_configuration
     props:
-      - name: ReplicationConfiguration
+      - name: replication_configuration
         value:
-          ReplicationConfiguration: null
-
+          replication_configuration: null
 ```
 </TabItem>
 </Tabs>
@@ -234,7 +233,7 @@ SET PatchDocument = string('{{ {
     "ReplicationConfiguration": replication_configuration
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<RegistryId>';
+AND Identifier = '{{ registry_id }}';
 ```
 
 
@@ -243,7 +242,7 @@ AND Identifier = '<RegistryId>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.ecr.replication_configurations
-WHERE Identifier = '<RegistryId>'
+WHERE Identifier = '{{ registry_id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/ecr/repositories/index.md b/website/docs/services/ecr/repositories/index.md
index 305e2194e..edf60dadc 100644
--- a/website/docs/services/ecr/repositories/index.md
+++ b/website/docs/services/ecr/repositories/index.md
@@ -249,7 +249,7 @@ image_tag_mutability_exclusion_filters,
 image_scanning_configuration,
 encryption_configuration
 FROM awscc.ecr.repositories
-WHERE region = 'us-east-1' AND Identifier = '<RepositoryName>';
+WHERE region = 'us-east-1' AND Identifier = '{{ repository_name }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -293,16 +293,16 @@ INSERT INTO awscc.ecr.repositories (
  EncryptionConfiguration,
  region
 )
-SELECT 
-'{{ EmptyOnDelete }}',
- '{{ LifecyclePolicy }}',
- '{{ RepositoryName }}',
- '{{ RepositoryPolicyText }}',
- '{{ Tags }}',
- '{{ ImageTagMutability }}',
- '{{ ImageTagMutabilityExclusionFilters }}',
- '{{ ImageScanningConfiguration }}',
- '{{ EncryptionConfiguration }}',
+SELECT
+'{{ empty_on_delete }}',
+ '{{ lifecycle_policy }}',
+ '{{ repository_name }}',
+ '{{ repository_policy_text }}',
+ '{{ tags }}',
+ '{{ image_tag_mutability }}',
+ '{{ image_tag_mutability_exclusion_filters }}',
+ '{{ image_scanning_configuration }}',
+ '{{ encryption_configuration }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -322,16 +322,16 @@ INSERT INTO awscc.ecr.repositories (
  EncryptionConfiguration,
  region
 )
-SELECT 
- '{{ EmptyOnDelete }}',
- '{{ LifecyclePolicy }}',
- '{{ RepositoryName }}',
- '{{ RepositoryPolicyText }}',
- '{{ Tags }}',
- '{{ ImageTagMutability }}',
- '{{ ImageTagMutabilityExclusionFilters }}',
- '{{ ImageScanningConfiguration }}',
- '{{ EncryptionConfiguration }}',
+SELECT
+ '{{ empty_on_delete }}',
+ '{{ lifecycle_policy }}',
+ '{{ repository_name }}',
+ '{{ repository_policy_text }}',
+ '{{ tags }}',
+ '{{ image_tag_mutability }}',
+ '{{ image_tag_mutability_exclusion_filters }}',
+ '{{ image_scanning_configuration }}',
+ '{{ encryption_configuration }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -349,34 +349,33 @@ globals:
 resources:
   - name: repository
     props:
-      - name: EmptyOnDelete
-        value: '{{ EmptyOnDelete }}'
-      - name: LifecyclePolicy
+      - name: empty_on_delete
+        value: '{{ empty_on_delete }}'
+      - name: lifecycle_policy
         value:
-          LifecyclePolicyText: '{{ LifecyclePolicyText }}'
-          RegistryId: '{{ RegistryId }}'
-      - name: RepositoryName
-        value: '{{ RepositoryName }}'
-      - name: RepositoryPolicyText
+          lifecycle_policy_text: '{{ lifecycle_policy_text }}'
+          registry_id: '{{ registry_id }}'
+      - name: repository_name
+        value: '{{ repository_name }}'
+      - name: repository_policy_text
         value: {}
-      - name: Tags
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-      - name: ImageTagMutability
-        value: '{{ ImageTagMutability }}'
-      - name: ImageTagMutabilityExclusionFilters
+          - key: '{{ key }}'
+            value: '{{ value }}'
+      - name: image_tag_mutability
+        value: '{{ image_tag_mutability }}'
+      - name: image_tag_mutability_exclusion_filters
         value:
-          - ImageTagMutabilityExclusionFilterType: '{{ ImageTagMutabilityExclusionFilterType }}'
-            ImageTagMutabilityExclusionFilterValue: '{{ ImageTagMutabilityExclusionFilterValue }}'
-      - name: ImageScanningConfiguration
+          - image_tag_mutability_exclusion_filter_type: '{{ image_tag_mutability_exclusion_filter_type }}'
+            image_tag_mutability_exclusion_filter_value: '{{ image_tag_mutability_exclusion_filter_value }}'
+      - name: image_scanning_configuration
         value:
-          ScanOnPush: '{{ ScanOnPush }}'
-      - name: EncryptionConfiguration
+          scan_on_push: '{{ scan_on_push }}'
+      - name: encryption_configuration
         value:
-          EncryptionType: '{{ EncryptionType }}'
-          KmsKey: '{{ KmsKey }}'
-
+          encryption_type: '{{ encryption_type }}'
+          kms_key: '{{ kms_key }}'
 ```
 </TabItem>
 </Tabs>
@@ -398,7 +397,7 @@ SET PatchDocument = string('{{ {
     "ImageScanningConfiguration": image_scanning_configuration
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<RepositoryName>';
+AND Identifier = '{{ repository_name }}';
 ```
 
 
@@ -407,7 +406,7 @@ AND Identifier = '<RepositoryName>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.ecr.repositories
-WHERE Identifier = '<RepositoryName>'
+WHERE Identifier = '{{ repository_name }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/ecr/repository_creation_templates/index.md b/website/docs/services/ecr/repository_creation_templates/index.md
index 8742b22a8..48d2a26b1 100644
--- a/website/docs/services/ecr/repository_creation_templates/index.md
+++ b/website/docs/services/ecr/repository_creation_templates/index.md
@@ -236,7 +236,7 @@ custom_role_arn,
 created_at,
 updated_at
 FROM awscc.ecr.repository_creation_templates
-WHERE region = 'us-east-1' AND Identifier = '<Prefix>';
+WHERE region = 'us-east-1' AND Identifier = '{{ prefix }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -273,9 +273,9 @@ INSERT INTO awscc.ecr.repository_creation_templates (
  AppliedFor,
  region
 )
-SELECT 
-'{{ Prefix }}',
- '{{ AppliedFor }}',
+SELECT
+'{{ prefix }}',
+ '{{ applied_for }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -296,17 +296,17 @@ INSERT INTO awscc.ecr.repository_creation_templates (
  CustomRoleArn,
  region
 )
-SELECT 
- '{{ Prefix }}',
- '{{ Description }}',
- '{{ ImageTagMutability }}',
- '{{ ImageTagMutabilityExclusionFilters }}',
- '{{ RepositoryPolicy }}',
- '{{ LifecyclePolicy }}',
- '{{ EncryptionConfiguration }}',
- '{{ ResourceTags }}',
- '{{ AppliedFor }}',
- '{{ CustomRoleArn }}',
+SELECT
+ '{{ prefix }}',
+ '{{ description }}',
+ '{{ image_tag_mutability }}',
+ '{{ image_tag_mutability_exclusion_filters }}',
+ '{{ repository_policy }}',
+ '{{ lifecycle_policy }}',
+ '{{ encryption_configuration }}',
+ '{{ resource_tags }}',
+ '{{ applied_for }}',
+ '{{ custom_role_arn }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -324,34 +324,33 @@ globals:
 resources:
   - name: repository_creation_template
     props:
-      - name: Prefix
-        value: '{{ Prefix }}'
-      - name: Description
-        value: '{{ Description }}'
-      - name: ImageTagMutability
-        value: '{{ ImageTagMutability }}'
-      - name: ImageTagMutabilityExclusionFilters
+      - name: prefix
+        value: '{{ prefix }}'
+      - name: description
+        value: '{{ description }}'
+      - name: image_tag_mutability
+        value: '{{ image_tag_mutability }}'
+      - name: image_tag_mutability_exclusion_filters
         value:
-          - ImageTagMutabilityExclusionFilterType: '{{ ImageTagMutabilityExclusionFilterType }}'
-            ImageTagMutabilityExclusionFilterValue: '{{ ImageTagMutabilityExclusionFilterValue }}'
-      - name: RepositoryPolicy
-        value: '{{ RepositoryPolicy }}'
-      - name: LifecyclePolicy
-        value: '{{ LifecyclePolicy }}'
-      - name: EncryptionConfiguration
+          - image_tag_mutability_exclusion_filter_type: '{{ image_tag_mutability_exclusion_filter_type }}'
+            image_tag_mutability_exclusion_filter_value: '{{ image_tag_mutability_exclusion_filter_value }}'
+      - name: repository_policy
+        value: '{{ repository_policy }}'
+      - name: lifecycle_policy
+        value: '{{ lifecycle_policy }}'
+      - name: encryption_configuration
         value:
-          EncryptionType: '{{ EncryptionType }}'
-          KmsKey: '{{ KmsKey }}'
-      - name: ResourceTags
+          encryption_type: '{{ encryption_type }}'
+          kms_key: '{{ kms_key }}'
+      - name: resource_tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-      - name: AppliedFor
+          - key: '{{ key }}'
+            value: '{{ value }}'
+      - name: applied_for
         value:
-          - '{{ AppliedFor[0] }}'
-      - name: CustomRoleArn
-        value: '{{ CustomRoleArn }}'
-
+          - '{{ applied_for[0] }}'
+      - name: custom_role_arn
+        value: '{{ custom_role_arn }}'
 ```
 </TabItem>
 </Tabs>
@@ -375,7 +374,7 @@ SET PatchDocument = string('{{ {
     "CustomRoleArn": custom_role_arn
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Prefix>';
+AND Identifier = '{{ prefix }}';
 ```
 
 
@@ -384,7 +383,7 @@ AND Identifier = '<Prefix>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.ecr.repository_creation_templates
-WHERE Identifier = '<Prefix>'
+WHERE Identifier = '{{ prefix }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/ecs/cluster_capacity_provider_associations/index.md b/website/docs/services/ecs/cluster_capacity_provider_associations/index.md
index ef32d5bcf..4563a9922 100644
--- a/website/docs/services/ecs/cluster_capacity_provider_associations/index.md
+++ b/website/docs/services/ecs/cluster_capacity_provider_associations/index.md
@@ -163,7 +163,7 @@ default_capacity_provider_strategy,
 capacity_providers,
 cluster
 FROM awscc.ecs.cluster_capacity_provider_associations
-WHERE region = 'us-east-1' AND Identifier = '<Cluster>';
+WHERE region = 'us-east-1' AND Identifier = '{{ cluster }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -201,10 +201,10 @@ INSERT INTO awscc.ecs.cluster_capacity_provider_associations (
  Cluster,
  region
 )
-SELECT 
-'{{ DefaultCapacityProviderStrategy }}',
- '{{ CapacityProviders }}',
- '{{ Cluster }}',
+SELECT
+'{{ default_capacity_provider_strategy }}',
+ '{{ capacity_providers }}',
+ '{{ cluster }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -218,10 +218,10 @@ INSERT INTO awscc.ecs.cluster_capacity_provider_associations (
  Cluster,
  region
 )
-SELECT 
- '{{ DefaultCapacityProviderStrategy }}',
- '{{ CapacityProviders }}',
- '{{ Cluster }}',
+SELECT
+ '{{ default_capacity_provider_strategy }}',
+ '{{ capacity_providers }}',
+ '{{ cluster }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -239,17 +239,16 @@ globals:
 resources:
   - name: cluster_capacity_provider_association
     props:
-      - name: DefaultCapacityProviderStrategy
+      - name: default_capacity_provider_strategy
         value:
-          - CapacityProvider: '{{ CapacityProvider }}'
-            Base: '{{ Base }}'
-            Weight: '{{ Weight }}'
-      - name: CapacityProviders
+          - capacity_provider: '{{ capacity_provider }}'
+            base: '{{ base }}'
+            weight: '{{ weight }}'
+      - name: capacity_providers
         value:
           - null
-      - name: Cluster
-        value: '{{ Cluster }}'
-
+      - name: cluster
+        value: '{{ cluster }}'
 ```
 </TabItem>
 </Tabs>
@@ -266,7 +265,7 @@ SET PatchDocument = string('{{ {
     "CapacityProviders": capacity_providers
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Cluster>';
+AND Identifier = '{{ cluster }}';
 ```
 
 
@@ -275,7 +274,7 @@ AND Identifier = '<Cluster>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.ecs.cluster_capacity_provider_associations
-WHERE Identifier = '<Cluster>'
+WHERE Identifier = '{{ cluster }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/ecs/primary_task_sets/index.md b/website/docs/services/ecs/primary_task_sets/index.md
index 0a178a4eb..05e630e6e 100644
--- a/website/docs/services/ecs/primary_task_sets/index.md
+++ b/website/docs/services/ecs/primary_task_sets/index.md
@@ -95,7 +95,7 @@ task_set_id,
 cluster,
 service
 FROM awscc.ecs.primary_task_sets
-WHERE region = 'us-east-1' AND Identifier = '<Cluster>|<Service>';
+WHERE region = 'us-east-1' AND Identifier = '{{ cluster }}|{{ service }}';
 ```
 
 ## `INSERT` example
@@ -120,10 +120,10 @@ INSERT INTO awscc.ecs.primary_task_sets (
  Service,
  region
 )
-SELECT 
-'{{ TaskSetId }}',
- '{{ Cluster }}',
- '{{ Service }}',
+SELECT
+'{{ task_set_id }}',
+ '{{ cluster }}',
+ '{{ service }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -137,10 +137,10 @@ INSERT INTO awscc.ecs.primary_task_sets (
  Service,
  region
 )
-SELECT 
- '{{ TaskSetId }}',
- '{{ Cluster }}',
- '{{ Service }}',
+SELECT
+ '{{ task_set_id }}',
+ '{{ cluster }}',
+ '{{ service }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -158,13 +158,12 @@ globals:
 resources:
   - name: primary_task_set
     props:
-      - name: TaskSetId
-        value: '{{ TaskSetId }}'
-      - name: Cluster
-        value: '{{ Cluster }}'
-      - name: Service
-        value: '{{ Service }}'
-
+      - name: task_set_id
+        value: '{{ task_set_id }}'
+      - name: cluster
+        value: '{{ cluster }}'
+      - name: service
+        value: '{{ service }}'
 ```
 </TabItem>
 </Tabs>
@@ -180,7 +179,7 @@ SET PatchDocument = string('{{ {
     "TaskSetId": task_set_id
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Cluster>|<Service>';
+AND Identifier = '{{ cluster }}|{{ service }}';
 ```
 
 
diff --git a/website/docs/services/ecs/services/index.md b/website/docs/services/ecs/services/index.md
index b0a7255e4..6bfea5a8e 100644
--- a/website/docs/services/ecs/services/index.md
+++ b/website/docs/services/ecs/services/index.md
@@ -751,7 +751,7 @@ task_definition,
 service_name,
 deployment_configuration
 FROM awscc.ecs.services
-WHERE region = 'us-east-1' AND Identifier = '<ServiceArn>|<Cluster>';
+WHERE region = 'us-east-1' AND Identifier = '{{ service_arn }}|{{ cluster }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -813,33 +813,33 @@ INSERT INTO awscc.ecs.services (
  DeploymentConfiguration,
  region
 )
-SELECT 
-'{{ PlatformVersion }}',
- '{{ PropagateTags }}',
- '{{ PlacementStrategies }}',
- '{{ ServiceRegistries }}',
- '{{ VolumeConfigurations }}',
- '{{ CapacityProviderStrategy }}',
- '{{ LaunchType }}',
- '{{ AvailabilityZoneRebalancing }}',
- '{{ SchedulingStrategy }}',
- '{{ NetworkConfiguration }}',
- '{{ Tags }}',
- '{{ ForceNewDeployment }}',
- '{{ HealthCheckGracePeriodSeconds }}',
- '{{ EnableECSManagedTags }}',
- '{{ EnableExecuteCommand }}',
- '{{ PlacementConstraints }}',
- '{{ Cluster }}',
- '{{ LoadBalancers }}',
- '{{ ServiceConnectConfiguration }}',
- '{{ DesiredCount }}',
- '{{ VpcLatticeConfigurations }}',
- '{{ DeploymentController }}',
- '{{ Role }}',
- '{{ TaskDefinition }}',
- '{{ ServiceName }}',
- '{{ DeploymentConfiguration }}',
+SELECT
+'{{ platform_version }}',
+ '{{ propagate_tags }}',
+ '{{ placement_strategies }}',
+ '{{ service_registries }}',
+ '{{ volume_configurations }}',
+ '{{ capacity_provider_strategy }}',
+ '{{ launch_type }}',
+ '{{ availability_zone_rebalancing }}',
+ '{{ scheduling_strategy }}',
+ '{{ network_configuration }}',
+ '{{ tags }}',
+ '{{ force_new_deployment }}',
+ '{{ health_check_grace_period_seconds }}',
+ '{{ enable_ecs_managed_tags }}',
+ '{{ enable_execute_command }}',
+ '{{ placement_constraints }}',
+ '{{ cluster }}',
+ '{{ load_balancers }}',
+ '{{ service_connect_configuration }}',
+ '{{ desired_count }}',
+ '{{ vpc_lattice_configurations }}',
+ '{{ deployment_controller }}',
+ '{{ role }}',
+ '{{ task_definition }}',
+ '{{ service_name }}',
+ '{{ deployment_configuration }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -876,33 +876,33 @@ INSERT INTO awscc.ecs.services (
  DeploymentConfiguration,
  region
 )
-SELECT 
- '{{ PlatformVersion }}',
- '{{ PropagateTags }}',
- '{{ PlacementStrategies }}',
- '{{ ServiceRegistries }}',
- '{{ VolumeConfigurations }}',
- '{{ CapacityProviderStrategy }}',
- '{{ LaunchType }}',
- '{{ AvailabilityZoneRebalancing }}',
- '{{ SchedulingStrategy }}',
- '{{ NetworkConfiguration }}',
- '{{ Tags }}',
- '{{ ForceNewDeployment }}',
- '{{ HealthCheckGracePeriodSeconds }}',
- '{{ EnableECSManagedTags }}',
- '{{ EnableExecuteCommand }}',
- '{{ PlacementConstraints }}',
- '{{ Cluster }}',
- '{{ LoadBalancers }}',
- '{{ ServiceConnectConfiguration }}',
- '{{ DesiredCount }}',
- '{{ VpcLatticeConfigurations }}',
- '{{ DeploymentController }}',
- '{{ Role }}',
- '{{ TaskDefinition }}',
- '{{ ServiceName }}',
- '{{ DeploymentConfiguration }}',
+SELECT
+ '{{ platform_version }}',
+ '{{ propagate_tags }}',
+ '{{ placement_strategies }}',
+ '{{ service_registries }}',
+ '{{ volume_configurations }}',
+ '{{ capacity_provider_strategy }}',
+ '{{ launch_type }}',
+ '{{ availability_zone_rebalancing }}',
+ '{{ scheduling_strategy }}',
+ '{{ network_configuration }}',
+ '{{ tags }}',
+ '{{ force_new_deployment }}',
+ '{{ health_check_grace_period_seconds }}',
+ '{{ enable_ecs_managed_tags }}',
+ '{{ enable_execute_command }}',
+ '{{ placement_constraints }}',
+ '{{ cluster }}',
+ '{{ load_balancers }}',
+ '{{ service_connect_configuration }}',
+ '{{ desired_count }}',
+ '{{ vpc_lattice_configurations }}',
+ '{{ deployment_controller }}',
+ '{{ role }}',
+ '{{ task_definition }}',
+ '{{ service_name }}',
+ '{{ deployment_configuration }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -920,149 +920,148 @@ globals:
 resources:
   - name: service
     props:
-      - name: PlatformVersion
-        value: '{{ PlatformVersion }}'
-      - name: PropagateTags
-        value: '{{ PropagateTags }}'
-      - name: PlacementStrategies
+      - name: platform_version
+        value: '{{ platform_version }}'
+      - name: propagate_tags
+        value: '{{ propagate_tags }}'
+      - name: placement_strategies
         value:
-          - Field: '{{ Field }}'
-            Type: '{{ Type }}'
-      - name: ServiceRegistries
+          - field: '{{ field }}'
+            type: '{{ type }}'
+      - name: service_registries
         value:
-          - ContainerName: '{{ ContainerName }}'
-            Port: '{{ Port }}'
-            ContainerPort: '{{ ContainerPort }}'
-            RegistryArn: '{{ RegistryArn }}'
-      - name: VolumeConfigurations
+          - container_name: '{{ container_name }}'
+            port: '{{ port }}'
+            container_port: '{{ container_port }}'
+            registry_arn: '{{ registry_arn }}'
+      - name: volume_configurations
         value:
-          - ManagedEBSVolume:
-              SnapshotId: '{{ SnapshotId }}'
-              VolumeType: '{{ VolumeType }}'
-              KmsKeyId: '{{ KmsKeyId }}'
-              TagSpecifications:
-                - PropagateTags: '{{ PropagateTags }}'
-                  ResourceType: '{{ ResourceType }}'
-                  Tags:
-                    - Value: '{{ Value }}'
-                      Key: '{{ Key }}'
-              FilesystemType: '{{ FilesystemType }}'
-              Encrypted: '{{ Encrypted }}'
-              Throughput: '{{ Throughput }}'
-              VolumeInitializationRate: '{{ VolumeInitializationRate }}'
-              Iops: '{{ Iops }}'
-              SizeInGiB: '{{ SizeInGiB }}'
-              RoleArn: '{{ RoleArn }}'
-            Name: '{{ Name }}'
-      - name: CapacityProviderStrategy
+          - managed_ebs_volume:
+              snapshot_id: '{{ snapshot_id }}'
+              volume_type: '{{ volume_type }}'
+              kms_key_id: '{{ kms_key_id }}'
+              tag_specifications:
+                - propagate_tags: '{{ propagate_tags }}'
+                  resource_type: '{{ resource_type }}'
+                  tags:
+                    - value: '{{ value }}'
+                      key: '{{ key }}'
+              filesystem_type: '{{ filesystem_type }}'
+              encrypted: '{{ encrypted }}'
+              throughput: '{{ throughput }}'
+              volume_initialization_rate: '{{ volume_initialization_rate }}'
+              iops: '{{ iops }}'
+              size_in_gi_b: '{{ size_in_gi_b }}'
+              role_arn: '{{ role_arn }}'
+            name: '{{ name }}'
+      - name: capacity_provider_strategy
         value:
-          - CapacityProvider: '{{ CapacityProvider }}'
-            Base: '{{ Base }}'
-            Weight: '{{ Weight }}'
-      - name: LaunchType
-        value: '{{ LaunchType }}'
-      - name: AvailabilityZoneRebalancing
-        value: '{{ AvailabilityZoneRebalancing }}'
-      - name: SchedulingStrategy
-        value: '{{ SchedulingStrategy }}'
-      - name: NetworkConfiguration
+          - capacity_provider: '{{ capacity_provider }}'
+            base: '{{ base }}'
+            weight: '{{ weight }}'
+      - name: launch_type
+        value: '{{ launch_type }}'
+      - name: availability_zone_rebalancing
+        value: '{{ availability_zone_rebalancing }}'
+      - name: scheduling_strategy
+        value: '{{ scheduling_strategy }}'
+      - name: network_configuration
         value:
-          AwsVpcConfiguration:
-            SecurityGroups:
-              - '{{ SecurityGroups[0] }}'
-            Subnets:
-              - '{{ Subnets[0] }}'
-            AssignPublicIp: '{{ AssignPublicIp }}'
-      - name: Tags
+          aws_vpc_configuration:
+            security_groups:
+              - '{{ security_groups[0] }}'
+            subnets:
+              - '{{ subnets[0] }}'
+            assign_public_ip: '{{ assign_public_ip }}'
+      - name: tags
         value:
           - null
-      - name: ForceNewDeployment
+      - name: force_new_deployment
         value:
-          EnableForceNewDeployment: '{{ EnableForceNewDeployment }}'
-          ForceNewDeploymentNonce: '{{ ForceNewDeploymentNonce }}'
-      - name: HealthCheckGracePeriodSeconds
-        value: '{{ HealthCheckGracePeriodSeconds }}'
-      - name: EnableECSManagedTags
-        value: '{{ EnableECSManagedTags }}'
-      - name: EnableExecuteCommand
-        value: '{{ EnableExecuteCommand }}'
-      - name: PlacementConstraints
+          enable_force_new_deployment: '{{ enable_force_new_deployment }}'
+          force_new_deployment_nonce: '{{ force_new_deployment_nonce }}'
+      - name: health_check_grace_period_seconds
+        value: '{{ health_check_grace_period_seconds }}'
+      - name: enable_ecs_managed_tags
+        value: '{{ enable_ecs_managed_tags }}'
+      - name: enable_execute_command
+        value: '{{ enable_execute_command }}'
+      - name: placement_constraints
         value:
-          - Type: '{{ Type }}'
-            Expression: '{{ Expression }}'
-      - name: Cluster
-        value: '{{ Cluster }}'
-      - name: LoadBalancers
+          - type: '{{ type }}'
+            expression: '{{ expression }}'
+      - name: cluster
+        value: '{{ cluster }}'
+      - name: load_balancers
         value:
-          - TargetGroupArn: '{{ TargetGroupArn }}'
-            ContainerName: '{{ ContainerName }}'
-            ContainerPort: '{{ ContainerPort }}'
-      - name: ServiceConnectConfiguration
+          - target_group_arn: '{{ target_group_arn }}'
+            container_name: '{{ container_name }}'
+            container_port: '{{ container_port }}'
+      - name: service_connect_configuration
         value:
-          Services:
-            - Timeout:
-                PerRequestTimeoutSeconds: '{{ PerRequestTimeoutSeconds }}'
-                IdleTimeoutSeconds: '{{ IdleTimeoutSeconds }}'
-              IngressPortOverride: '{{ IngressPortOverride }}'
-              ClientAliases:
-                - DnsName: '{{ DnsName }}'
-                  TestTrafficRules:
-                    Header:
-                      Value:
-                        Exact: '{{ Exact }}'
-                      Name: '{{ Name }}'
-                  Port: '{{ Port }}'
-              Tls:
-                IssuerCertificateAuthority:
-                  AwsPcaAuthorityArn: '{{ AwsPcaAuthorityArn }}'
-                KmsKey: '{{ KmsKey }}'
-                RoleArn: '{{ RoleArn }}'
-              DiscoveryName: '{{ DiscoveryName }}'
-              PortName: '{{ PortName }}'
-          Enabled: '{{ Enabled }}'
-          LogConfiguration:
-            SecretOptions:
-              - ValueFrom: '{{ ValueFrom }}'
-                Name: '{{ Name }}'
-            Options: {}
-            LogDriver: '{{ LogDriver }}'
-          Namespace: '{{ Namespace }}'
-      - name: DesiredCount
-        value: '{{ DesiredCount }}'
-      - name: VpcLatticeConfigurations
+          services:
+            - timeout:
+                per_request_timeout_seconds: '{{ per_request_timeout_seconds }}'
+                idle_timeout_seconds: '{{ idle_timeout_seconds }}'
+              ingress_port_override: '{{ ingress_port_override }}'
+              client_aliases:
+                - dns_name: '{{ dns_name }}'
+                  test_traffic_rules:
+                    header:
+                      value:
+                        exact: '{{ exact }}'
+                      name: '{{ name }}'
+                  port: '{{ port }}'
+              tls:
+                issuer_certificate_authority:
+                  aws_pca_authority_arn: '{{ aws_pca_authority_arn }}'
+                kms_key: '{{ kms_key }}'
+                role_arn: '{{ role_arn }}'
+              discovery_name: '{{ discovery_name }}'
+              port_name: '{{ port_name }}'
+          enabled: '{{ enabled }}'
+          log_configuration:
+            secret_options:
+              - value_from: '{{ value_from }}'
+                name: '{{ name }}'
+            options: {}
+            log_driver: '{{ log_driver }}'
+          namespace: '{{ namespace }}'
+      - name: desired_count
+        value: '{{ desired_count }}'
+      - name: vpc_lattice_configurations
         value:
-          - TargetGroupArn: '{{ TargetGroupArn }}'
-            PortName: '{{ PortName }}'
-            RoleArn: '{{ RoleArn }}'
-      - name: DeploymentController
+          - target_group_arn: '{{ target_group_arn }}'
+            port_name: '{{ port_name }}'
+            role_arn: '{{ role_arn }}'
+      - name: deployment_controller
         value:
-          Type: '{{ Type }}'
-      - name: Role
-        value: '{{ Role }}'
-      - name: TaskDefinition
-        value: '{{ TaskDefinition }}'
-      - name: ServiceName
-        value: '{{ ServiceName }}'
-      - name: DeploymentConfiguration
+          type: '{{ type }}'
+      - name: role
+        value: '{{ role }}'
+      - name: task_definition
+        value: '{{ task_definition }}'
+      - name: service_name
+        value: '{{ service_name }}'
+      - name: deployment_configuration
         value:
-          BakeTimeInMinutes: '{{ BakeTimeInMinutes }}'
-          LifecycleHooks:
-            - LifecycleStages:
-                - '{{ LifecycleStages[0] }}'
-              HookTargetArn: '{{ HookTargetArn }}'
-              RoleArn: '{{ RoleArn }}'
-          Alarms:
-            AlarmNames:
-              - '{{ AlarmNames[0] }}'
-            Enable: '{{ Enable }}'
-            Rollback: '{{ Rollback }}'
-          Strategy: '{{ Strategy }}'
-          DeploymentCircuitBreaker:
-            Enable: '{{ Enable }}'
-            Rollback: '{{ Rollback }}'
-          MaximumPercent: '{{ MaximumPercent }}'
-          MinimumHealthyPercent: '{{ MinimumHealthyPercent }}'
-
+          bake_time_in_minutes: '{{ bake_time_in_minutes }}'
+          lifecycle_hooks:
+            - lifecycle_stages:
+                - '{{ lifecycle_stages[0] }}'
+              hook_target_arn: '{{ hook_target_arn }}'
+              role_arn: '{{ role_arn }}'
+          alarms:
+            alarm_names:
+              - '{{ alarm_names[0] }}'
+            enable: '{{ enable }}'
+            rollback: '{{ rollback }}'
+          strategy: '{{ strategy }}'
+          deployment_circuit_breaker:
+            enable: '{{ enable }}'
+            rollback: '{{ rollback }}'
+          maximum_percent: '{{ maximum_percent }}'
+          minimum_healthy_percent: '{{ minimum_healthy_percent }}'
 ```
 </TabItem>
 </Tabs>
@@ -1098,7 +1097,7 @@ SET PatchDocument = string('{{ {
     "DeploymentConfiguration": deployment_configuration
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<ServiceArn>|<Cluster>';
+AND Identifier = '{{ service_arn }}|{{ cluster }}';
 ```
 
 
@@ -1107,7 +1106,7 @@ AND Identifier = '<ServiceArn>|<Cluster>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.ecs.services
-WHERE Identifier = '<ServiceArn|Cluster>'
+WHERE Identifier = '{{ service_arn }}|{{ cluster }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/ecs/task_definitions/index.md b/website/docs/services/ecs/task_definitions/index.md
index 132f74a01..f207cd758 100644
--- a/website/docs/services/ecs/task_definitions/index.md
+++ b/website/docs/services/ecs/task_definitions/index.md
@@ -997,7 +997,7 @@ ephemeral_storage,
 tags,
 task_definition_arn
 FROM awscc.ecs.task_definitions
-WHERE region = 'us-east-1' AND Identifier = '<TaskDefinitionArn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ task_definition_arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -1050,25 +1050,25 @@ INSERT INTO awscc.ecs.task_definitions (
  Tags,
  region
 )
-SELECT 
-'{{ TaskRoleArn }}',
- '{{ IpcMode }}',
- '{{ InferenceAccelerators }}',
- '{{ Memory }}',
- '{{ PlacementConstraints }}',
- '{{ Cpu }}',
- '{{ RequiresCompatibilities }}',
- '{{ NetworkMode }}',
- '{{ PidMode }}',
- '{{ EnableFaultInjection }}',
- '{{ ExecutionRoleArn }}',
- '{{ RuntimePlatform }}',
- '{{ ProxyConfiguration }}',
- '{{ Volumes }}',
- '{{ ContainerDefinitions }}',
- '{{ Family }}',
- '{{ EphemeralStorage }}',
- '{{ Tags }}',
+SELECT
+'{{ task_role_arn }}',
+ '{{ ipc_mode }}',
+ '{{ inference_accelerators }}',
+ '{{ memory }}',
+ '{{ placement_constraints }}',
+ '{{ cpu }}',
+ '{{ requires_compatibilities }}',
+ '{{ network_mode }}',
+ '{{ pid_mode }}',
+ '{{ enable_fault_injection }}',
+ '{{ execution_role_arn }}',
+ '{{ runtime_platform }}',
+ '{{ proxy_configuration }}',
+ '{{ volumes }}',
+ '{{ container_definitions }}',
+ '{{ family }}',
+ '{{ ephemeral_storage }}',
+ '{{ tags }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -1097,25 +1097,25 @@ INSERT INTO awscc.ecs.task_definitions (
  Tags,
  region
 )
-SELECT 
- '{{ TaskRoleArn }}',
- '{{ IpcMode }}',
- '{{ InferenceAccelerators }}',
- '{{ Memory }}',
- '{{ PlacementConstraints }}',
- '{{ Cpu }}',
- '{{ RequiresCompatibilities }}',
- '{{ NetworkMode }}',
- '{{ PidMode }}',
- '{{ EnableFaultInjection }}',
- '{{ ExecutionRoleArn }}',
- '{{ RuntimePlatform }}',
- '{{ ProxyConfiguration }}',
- '{{ Volumes }}',
- '{{ ContainerDefinitions }}',
- '{{ Family }}',
- '{{ EphemeralStorage }}',
- '{{ Tags }}',
+SELECT
+ '{{ task_role_arn }}',
+ '{{ ipc_mode }}',
+ '{{ inference_accelerators }}',
+ '{{ memory }}',
+ '{{ placement_constraints }}',
+ '{{ cpu }}',
+ '{{ requires_compatibilities }}',
+ '{{ network_mode }}',
+ '{{ pid_mode }}',
+ '{{ enable_fault_injection }}',
+ '{{ execution_role_arn }}',
+ '{{ runtime_platform }}',
+ '{{ proxy_configuration }}',
+ '{{ volumes }}',
+ '{{ container_definitions }}',
+ '{{ family }}',
+ '{{ ephemeral_storage }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -1133,194 +1133,193 @@ globals:
 resources:
   - name: task_definition
     props:
-      - name: TaskRoleArn
-        value: '{{ TaskRoleArn }}'
-      - name: IpcMode
-        value: '{{ IpcMode }}'
-      - name: InferenceAccelerators
+      - name: task_role_arn
+        value: '{{ task_role_arn }}'
+      - name: ipc_mode
+        value: '{{ ipc_mode }}'
+      - name: inference_accelerators
         value:
-          - DeviceType: '{{ DeviceType }}'
-            DeviceName: '{{ DeviceName }}'
-      - name: Memory
-        value: '{{ Memory }}'
-      - name: PlacementConstraints
+          - device_type: '{{ device_type }}'
+            device_name: '{{ device_name }}'
+      - name: memory
+        value: '{{ memory }}'
+      - name: placement_constraints
         value:
-          - Type: '{{ Type }}'
-            Expression: '{{ Expression }}'
-      - name: Cpu
-        value: '{{ Cpu }}'
-      - name: RequiresCompatibilities
+          - type: '{{ type }}'
+            expression: '{{ expression }}'
+      - name: cpu
+        value: '{{ cpu }}'
+      - name: requires_compatibilities
         value:
-          - '{{ RequiresCompatibilities[0] }}'
-      - name: NetworkMode
-        value: '{{ NetworkMode }}'
-      - name: PidMode
-        value: '{{ PidMode }}'
-      - name: EnableFaultInjection
-        value: '{{ EnableFaultInjection }}'
-      - name: ExecutionRoleArn
-        value: '{{ ExecutionRoleArn }}'
-      - name: RuntimePlatform
+          - '{{ requires_compatibilities[0] }}'
+      - name: network_mode
+        value: '{{ network_mode }}'
+      - name: pid_mode
+        value: '{{ pid_mode }}'
+      - name: enable_fault_injection
+        value: '{{ enable_fault_injection }}'
+      - name: execution_role_arn
+        value: '{{ execution_role_arn }}'
+      - name: runtime_platform
         value:
-          OperatingSystemFamily: '{{ OperatingSystemFamily }}'
-          CpuArchitecture: '{{ CpuArchitecture }}'
-      - name: ProxyConfiguration
+          operating_system_family: '{{ operating_system_family }}'
+          cpu_architecture: '{{ cpu_architecture }}'
+      - name: proxy_configuration
         value:
-          ProxyConfigurationProperties:
-            - Value: '{{ Value }}'
-              Name: '{{ Name }}'
-          Type: '{{ Type }}'
-          ContainerName: '{{ ContainerName }}'
-      - name: Volumes
+          proxy_configuration_properties:
+            - value: '{{ value }}'
+              name: '{{ name }}'
+          type: '{{ type }}'
+          container_name: '{{ container_name }}'
+      - name: volumes
         value:
-          - EFSVolumeConfiguration:
-              FilesystemId: '{{ FilesystemId }}'
-              TransitEncryption: '{{ TransitEncryption }}'
-              AuthorizationConfig:
-                IAM: '{{ IAM }}'
-                AccessPointId: '{{ AccessPointId }}'
-              RootDirectory: '{{ RootDirectory }}'
-              TransitEncryptionPort: '{{ TransitEncryptionPort }}'
-            Host:
-              SourcePath: '{{ SourcePath }}'
-            ConfiguredAtLaunch: '{{ ConfiguredAtLaunch }}'
-            DockerVolumeConfiguration:
-              DriverOpts: {}
-              Scope: '{{ Scope }}'
-              Autoprovision: '{{ Autoprovision }}'
-              Driver: '{{ Driver }}'
-              Labels: {}
-            FSxWindowsFileServerVolumeConfiguration:
-              AuthorizationConfig:
-                CredentialsParameter: '{{ CredentialsParameter }}'
-                Domain: '{{ Domain }}'
-              FileSystemId: '{{ FileSystemId }}'
-              RootDirectory: '{{ RootDirectory }}'
-            Name: '{{ Name }}'
-      - name: ContainerDefinitions
+          - e_fs_volume_configuration:
+              filesystem_id: '{{ filesystem_id }}'
+              transit_encryption: '{{ transit_encryption }}'
+              authorization_config:
+                iam: '{{ iam }}'
+                access_point_id: '{{ access_point_id }}'
+              root_directory: '{{ root_directory }}'
+              transit_encryption_port: '{{ transit_encryption_port }}'
+            host:
+              source_path: '{{ source_path }}'
+            configured_at_launch: '{{ configured_at_launch }}'
+            docker_volume_configuration:
+              driver_opts: {}
+              scope: '{{ scope }}'
+              autoprovision: '{{ autoprovision }}'
+              driver: '{{ driver }}'
+              labels: {}
+            f_sx_windows_file_server_volume_configuration:
+              authorization_config:
+                credentials_parameter: '{{ credentials_parameter }}'
+                domain: '{{ domain }}'
+              file_system_id: '{{ file_system_id }}'
+              root_directory: '{{ root_directory }}'
+            name: '{{ name }}'
+      - name: container_definitions
         value:
-          - User: '{{ User }}'
-            Secrets:
-              - ValueFrom: '{{ ValueFrom }}'
-                Name: '{{ Name }}'
-            Memory: '{{ Memory }}'
-            Privileged: '{{ Privileged }}'
-            HealthCheck:
-              Command:
-                - '{{ Command[0] }}'
-              Timeout: '{{ Timeout }}'
-              Retries: '{{ Retries }}'
-              Interval: '{{ Interval }}'
-              StartPeriod: '{{ StartPeriod }}'
-            StartTimeout: '{{ StartTimeout }}'
-            VolumesFrom:
-              - ReadOnly: '{{ ReadOnly }}'
-                SourceContainer: '{{ SourceContainer }}'
-            Cpu: '{{ Cpu }}'
-            EntryPoint:
-              - '{{ EntryPoint[0] }}'
-            DnsServers:
-              - '{{ DnsServers[0] }}'
-            ReadonlyRootFilesystem: '{{ ReadonlyRootFilesystem }}'
-            Image: '{{ Image }}'
-            Essential: '{{ Essential }}'
-            LogConfiguration:
-              SecretOptions:
+          - user: '{{ user }}'
+            secrets:
+              - value_from: '{{ value_from }}'
+                name: '{{ name }}'
+            memory: '{{ memory }}'
+            privileged: '{{ privileged }}'
+            health_check:
+              command:
+                - '{{ command[0] }}'
+              timeout: '{{ timeout }}'
+              retries: '{{ retries }}'
+              interval: '{{ interval }}'
+              start_period: '{{ start_period }}'
+            start_timeout: '{{ start_timeout }}'
+            volumes_from:
+              - read_only: '{{ read_only }}'
+                source_container: '{{ source_container }}'
+            cpu: '{{ cpu }}'
+            entry_point:
+              - '{{ entry_point[0] }}'
+            dns_servers:
+              - '{{ dns_servers[0] }}'
+            readonly_root_filesystem: '{{ readonly_root_filesystem }}'
+            image: '{{ image }}'
+            essential: '{{ essential }}'
+            log_configuration:
+              secret_options:
                 - null
-              Options: {}
-              LogDriver: '{{ LogDriver }}'
-            ResourceRequirements:
-              - Type: '{{ Type }}'
-                Value: '{{ Value }}'
-            EnvironmentFiles:
-              - Type: '{{ Type }}'
-                Value: '{{ Value }}'
-            Name: '{{ Name }}'
-            FirelensConfiguration:
-              Options: {}
-              Type: '{{ Type }}'
-            DockerSecurityOptions:
-              - '{{ DockerSecurityOptions[0] }}'
-            SystemControls:
-              - Value: '{{ Value }}'
-                Namespace: '{{ Namespace }}'
-            Interactive: '{{ Interactive }}'
-            DnsSearchDomains:
-              - '{{ DnsSearchDomains[0] }}'
-            CredentialSpecs:
-              - '{{ CredentialSpecs[0] }}'
-            Ulimits:
-              - SoftLimit: '{{ SoftLimit }}'
-                HardLimit: '{{ HardLimit }}'
-                Name: '{{ Name }}'
-            StopTimeout: '{{ StopTimeout }}'
-            WorkingDirectory: '{{ WorkingDirectory }}'
-            MemoryReservation: '{{ MemoryReservation }}'
-            RepositoryCredentials:
-              CredentialsParameter: '{{ CredentialsParameter }}'
-            ExtraHosts:
-              - Hostname: '{{ Hostname }}'
-                IpAddress: '{{ IpAddress }}'
-            Hostname: '{{ Hostname }}'
-            LinuxParameters:
-              Capabilities:
-                Add:
-                  - '{{ Add[0] }}'
-                Drop:
-                  - '{{ Drop[0] }}'
-              Swappiness: '{{ Swappiness }}'
-              Tmpfs:
-                - Size: '{{ Size }}'
-                  ContainerPath: '{{ ContainerPath }}'
-                  MountOptions:
-                    - '{{ MountOptions[0] }}'
-              SharedMemorySize: '{{ SharedMemorySize }}'
-              Devices:
-                - HostPath: '{{ HostPath }}'
-                  Permissions:
-                    - '{{ Permissions[0] }}'
-                  ContainerPath: '{{ ContainerPath }}'
-              InitProcessEnabled: '{{ InitProcessEnabled }}'
-              MaxSwap: '{{ MaxSwap }}'
-            VersionConsistency: '{{ VersionConsistency }}'
-            RestartPolicy:
-              IgnoredExitCodes:
-                - '{{ IgnoredExitCodes[0] }}'
-              RestartAttemptPeriod: '{{ RestartAttemptPeriod }}'
-              Enabled: '{{ Enabled }}'
-            DisableNetworking: '{{ DisableNetworking }}'
-            PseudoTerminal: '{{ PseudoTerminal }}'
-            MountPoints:
-              - ReadOnly: '{{ ReadOnly }}'
-                SourceVolume: '{{ SourceVolume }}'
-                ContainerPath: '{{ ContainerPath }}'
-            DependsOn:
-              - Condition: '{{ Condition }}'
-                ContainerName: '{{ ContainerName }}'
-            DockerLabels: {}
-            PortMappings:
-              - AppProtocol: '{{ AppProtocol }}'
-                ContainerPortRange: '{{ ContainerPortRange }}'
-                HostPort: '{{ HostPort }}'
-                ContainerPort: '{{ ContainerPort }}'
-                Protocol: '{{ Protocol }}'
-                Name: '{{ Name }}'
-            Command:
-              - '{{ Command[0] }}'
-            Environment:
+              options: {}
+              log_driver: '{{ log_driver }}'
+            resource_requirements:
+              - type: '{{ type }}'
+                value: '{{ value }}'
+            environment_files:
+              - type: '{{ type }}'
+                value: '{{ value }}'
+            name: '{{ name }}'
+            firelens_configuration:
+              options: {}
+              type: '{{ type }}'
+            docker_security_options:
+              - '{{ docker_security_options[0] }}'
+            system_controls:
+              - value: '{{ value }}'
+                namespace: '{{ namespace }}'
+            interactive: '{{ interactive }}'
+            dns_search_domains:
+              - '{{ dns_search_domains[0] }}'
+            credential_specs:
+              - '{{ credential_specs[0] }}'
+            ulimits:
+              - soft_limit: '{{ soft_limit }}'
+                hard_limit: '{{ hard_limit }}'
+                name: '{{ name }}'
+            stop_timeout: '{{ stop_timeout }}'
+            working_directory: '{{ working_directory }}'
+            memory_reservation: '{{ memory_reservation }}'
+            repository_credentials:
+              credentials_parameter: '{{ credentials_parameter }}'
+            extra_hosts:
+              - hostname: '{{ hostname }}'
+                ip_address: '{{ ip_address }}'
+            hostname: '{{ hostname }}'
+            linux_parameters:
+              capabilities:
+                add:
+                  - '{{ add[0] }}'
+                drop:
+                  - '{{ drop[0] }}'
+              swappiness: '{{ swappiness }}'
+              tmpfs:
+                - size: '{{ size }}'
+                  container_path: '{{ container_path }}'
+                  mount_options:
+                    - '{{ mount_options[0] }}'
+              shared_memory_size: '{{ shared_memory_size }}'
+              devices:
+                - host_path: '{{ host_path }}'
+                  permissions:
+                    - '{{ permissions[0] }}'
+                  container_path: '{{ container_path }}'
+              init_process_enabled: '{{ init_process_enabled }}'
+              max_swap: '{{ max_swap }}'
+            version_consistency: '{{ version_consistency }}'
+            restart_policy:
+              ignored_exit_codes:
+                - '{{ ignored_exit_codes[0] }}'
+              restart_attempt_period: '{{ restart_attempt_period }}'
+              enabled: '{{ enabled }}'
+            disable_networking: '{{ disable_networking }}'
+            pseudo_terminal: '{{ pseudo_terminal }}'
+            mount_points:
+              - read_only: '{{ read_only }}'
+                source_volume: '{{ source_volume }}'
+                container_path: '{{ container_path }}'
+            depends_on:
+              - condition: '{{ condition }}'
+                container_name: '{{ container_name }}'
+            docker_labels: {}
+            port_mappings:
+              - app_protocol: '{{ app_protocol }}'
+                container_port_range: '{{ container_port_range }}'
+                host_port: '{{ host_port }}'
+                container_port: '{{ container_port }}'
+                protocol: '{{ protocol }}'
+                name: '{{ name }}'
+            command:
+              - '{{ command[0] }}'
+            environment:
               - null
-            Links:
-              - '{{ Links[0] }}'
-      - name: Family
-        value: '{{ Family }}'
-      - name: EphemeralStorage
+            links:
+              - '{{ links[0] }}'
+      - name: family
+        value: '{{ family }}'
+      - name: ephemeral_storage
         value:
-          SizeInGiB: '{{ SizeInGiB }}'
-      - name: Tags
+          size_in_gi_b: '{{ size_in_gi_b }}'
+      - name: tags
         value:
-          - Value: '{{ Value }}'
-            Key: '{{ Key }}'
-
+          - value: '{{ value }}'
+            key: '{{ key }}'
 ```
 </TabItem>
 </Tabs>
@@ -1336,7 +1335,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<TaskDefinitionArn>';
+AND Identifier = '{{ task_definition_arn }}';
 ```
 
 
@@ -1345,7 +1344,7 @@ AND Identifier = '<TaskDefinitionArn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.ecs.task_definitions
-WHERE Identifier = '<TaskDefinitionArn>'
+WHERE Identifier = '{{ task_definition_arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/ecs/task_sets/index.md b/website/docs/services/ecs/task_sets/index.md
index b4c810f31..77c7fbf0b 100644
--- a/website/docs/services/ecs/task_sets/index.md
+++ b/website/docs/services/ecs/task_sets/index.md
@@ -264,7 +264,7 @@ network_configuration,
 id,
 tags
 FROM awscc.ecs.task_sets
-WHERE region = 'us-east-1' AND Identifier = '<Cluster>|<Service>|<Id>';
+WHERE region = 'us-east-1' AND Identifier = '{{ cluster }}|{{ service }}|{{ id }}';
 ```
 
 ## `INSERT` example
@@ -289,10 +289,10 @@ INSERT INTO awscc.ecs.task_sets (
  TaskDefinition,
  region
 )
-SELECT 
-'{{ Cluster }}',
- '{{ Service }}',
- '{{ TaskDefinition }}',
+SELECT
+'{{ cluster }}',
+ '{{ service }}',
+ '{{ task_definition }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -315,19 +315,19 @@ INSERT INTO awscc.ecs.task_sets (
  Tags,
  region
 )
-SELECT 
- '{{ PlatformVersion }}',
- '{{ ExternalId }}',
- '{{ Cluster }}',
- '{{ LoadBalancers }}',
- '{{ Service }}',
- '{{ Scale }}',
- '{{ ServiceRegistries }}',
- '{{ CapacityProviderStrategy }}',
- '{{ LaunchType }}',
- '{{ TaskDefinition }}',
- '{{ NetworkConfiguration }}',
- '{{ Tags }}',
+SELECT
+ '{{ platform_version }}',
+ '{{ external_id }}',
+ '{{ cluster }}',
+ '{{ load_balancers }}',
+ '{{ service }}',
+ '{{ scale }}',
+ '{{ service_registries }}',
+ '{{ capacity_provider_strategy }}',
+ '{{ launch_type }}',
+ '{{ task_definition }}',
+ '{{ network_configuration }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -345,51 +345,50 @@ globals:
 resources:
   - name: task_set
     props:
-      - name: PlatformVersion
-        value: '{{ PlatformVersion }}'
-      - name: ExternalId
-        value: '{{ ExternalId }}'
-      - name: Cluster
-        value: '{{ Cluster }}'
-      - name: LoadBalancers
+      - name: platform_version
+        value: '{{ platform_version }}'
+      - name: external_id
+        value: '{{ external_id }}'
+      - name: cluster
+        value: '{{ cluster }}'
+      - name: load_balancers
         value:
-          - TargetGroupArn: '{{ TargetGroupArn }}'
-            ContainerName: '{{ ContainerName }}'
-            ContainerPort: '{{ ContainerPort }}'
-      - name: Service
-        value: '{{ Service }}'
-      - name: Scale
+          - target_group_arn: '{{ target_group_arn }}'
+            container_name: '{{ container_name }}'
+            container_port: '{{ container_port }}'
+      - name: service
+        value: '{{ service }}'
+      - name: scale
         value:
-          Value: null
-          Unit: '{{ Unit }}'
-      - name: ServiceRegistries
+          value: null
+          unit: '{{ unit }}'
+      - name: service_registries
         value:
-          - ContainerName: '{{ ContainerName }}'
-            Port: '{{ Port }}'
-            ContainerPort: '{{ ContainerPort }}'
-            RegistryArn: '{{ RegistryArn }}'
-      - name: CapacityProviderStrategy
+          - container_name: '{{ container_name }}'
+            port: '{{ port }}'
+            container_port: '{{ container_port }}'
+            registry_arn: '{{ registry_arn }}'
+      - name: capacity_provider_strategy
         value:
-          - CapacityProvider: '{{ CapacityProvider }}'
-            Base: '{{ Base }}'
-            Weight: '{{ Weight }}'
-      - name: LaunchType
-        value: '{{ LaunchType }}'
-      - name: TaskDefinition
-        value: '{{ TaskDefinition }}'
-      - name: NetworkConfiguration
+          - capacity_provider: '{{ capacity_provider }}'
+            base: '{{ base }}'
+            weight: '{{ weight }}'
+      - name: launch_type
+        value: '{{ launch_type }}'
+      - name: task_definition
+        value: '{{ task_definition }}'
+      - name: network_configuration
         value:
-          AwsVpcConfiguration:
-            SecurityGroups:
-              - '{{ SecurityGroups[0] }}'
-            Subnets:
-              - '{{ Subnets[0] }}'
-            AssignPublicIp: '{{ AssignPublicIp }}'
-      - name: Tags
+          aws_vpc_configuration:
+            security_groups:
+              - '{{ security_groups[0] }}'
+            subnets:
+              - '{{ subnets[0] }}'
+            assign_public_ip: '{{ assign_public_ip }}'
+      - name: tags
         value:
-          - Value: '{{ Value }}'
-            Key: '{{ Key }}'
-
+          - value: '{{ value }}'
+            key: '{{ key }}'
 ```
 </TabItem>
 </Tabs>
@@ -406,7 +405,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Cluster>|<Service>|<Id>';
+AND Identifier = '{{ cluster }}|{{ service }}|{{ id }}';
 ```
 
 
@@ -415,7 +414,7 @@ AND Identifier = '<Cluster>|<Service>|<Id>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.ecs.task_sets
-WHERE Identifier = '<Cluster|Service|Id>'
+WHERE Identifier = '{{ cluster }}|{{ service }}|{{ id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/efs/access_points/index.md b/website/docs/services/efs/access_points/index.md
index 34a0dec00..51c4d4d54 100644
--- a/website/docs/services/efs/access_points/index.md
+++ b/website/docs/services/efs/access_points/index.md
@@ -228,7 +228,7 @@ file_system_id,
 posix_user,
 root_directory
 FROM awscc.efs.access_points
-WHERE region = 'us-east-1' AND Identifier = '<AccessPointId>';
+WHERE region = 'us-east-1' AND Identifier = '{{ access_point_id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -264,8 +264,8 @@ INSERT INTO awscc.efs.access_points (
  FileSystemId,
  region
 )
-SELECT 
-'{{ FileSystemId }}',
+SELECT
+'{{ file_system_id }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -281,12 +281,12 @@ INSERT INTO awscc.efs.access_points (
  RootDirectory,
  region
 )
-SELECT 
- '{{ ClientToken }}',
- '{{ AccessPointTags }}',
- '{{ FileSystemId }}',
- '{{ PosixUser }}',
- '{{ RootDirectory }}',
+SELECT
+ '{{ client_token }}',
+ '{{ access_point_tags }}',
+ '{{ file_system_id }}',
+ '{{ posix_user }}',
+ '{{ root_directory }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -304,28 +304,27 @@ globals:
 resources:
   - name: access_point
     props:
-      - name: ClientToken
-        value: '{{ ClientToken }}'
-      - name: AccessPointTags
+      - name: client_token
+        value: '{{ client_token }}'
+      - name: access_point_tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-      - name: FileSystemId
-        value: '{{ FileSystemId }}'
-      - name: PosixUser
+          - key: '{{ key }}'
+            value: '{{ value }}'
+      - name: file_system_id
+        value: '{{ file_system_id }}'
+      - name: posix_user
         value:
-          Uid: '{{ Uid }}'
-          Gid: '{{ Gid }}'
-          SecondaryGids:
-            - '{{ SecondaryGids[0] }}'
-      - name: RootDirectory
+          uid: '{{ uid }}'
+          gid: '{{ gid }}'
+          secondary_gids:
+            - '{{ secondary_gids[0] }}'
+      - name: root_directory
         value:
-          Path: '{{ Path }}'
-          CreationInfo:
-            OwnerUid: '{{ OwnerUid }}'
-            OwnerGid: '{{ OwnerGid }}'
-            Permissions: '{{ Permissions }}'
-
+          path: '{{ path }}'
+          creation_info:
+            owner_uid: '{{ owner_uid }}'
+            owner_gid: '{{ owner_gid }}'
+            permissions: '{{ permissions }}'
 ```
 </TabItem>
 </Tabs>
@@ -341,7 +340,7 @@ SET PatchDocument = string('{{ {
     "AccessPointTags": access_point_tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<AccessPointId>';
+AND Identifier = '{{ access_point_id }}';
 ```
 
 
@@ -350,7 +349,7 @@ AND Identifier = '<AccessPointId>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.efs.access_points
-WHERE Identifier = '<AccessPointId>'
+WHERE Identifier = '{{ access_point_id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/efs/file_systems/index.md b/website/docs/services/efs/file_systems/index.md
index 3389ae77e..bbb7bb4aa 100644
--- a/website/docs/services/efs/file_systems/index.md
+++ b/website/docs/services/efs/file_systems/index.md
@@ -305,7 +305,7 @@ backup_policy,
 availability_zone_name,
 replication_configuration
 FROM awscc.efs.file_systems
-WHERE region = 'us-east-1' AND Identifier = '<FileSystemId>';
+WHERE region = 'us-east-1' AND Identifier = '{{ file_system_id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -353,20 +353,20 @@ INSERT INTO awscc.efs.file_systems (
  ReplicationConfiguration,
  region
 )
-SELECT 
-'{{ Encrypted }}',
- '{{ FileSystemTags }}',
- '{{ KmsKeyId }}',
- '{{ LifecyclePolicies }}',
- '{{ FileSystemProtection }}',
- '{{ PerformanceMode }}',
- '{{ ProvisionedThroughputInMibps }}',
- '{{ ThroughputMode }}',
- '{{ FileSystemPolicy }}',
- '{{ BypassPolicyLockoutSafetyCheck }}',
- '{{ BackupPolicy }}',
- '{{ AvailabilityZoneName }}',
- '{{ ReplicationConfiguration }}',
+SELECT
+'{{ encrypted }}',
+ '{{ file_system_tags }}',
+ '{{ kms_key_id }}',
+ '{{ lifecycle_policies }}',
+ '{{ file_system_protection }}',
+ '{{ performance_mode }}',
+ '{{ provisioned_throughput_in_mibps }}',
+ '{{ throughput_mode }}',
+ '{{ file_system_policy }}',
+ '{{ bypass_policy_lockout_safety_check }}',
+ '{{ backup_policy }}',
+ '{{ availability_zone_name }}',
+ '{{ replication_configuration }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -390,20 +390,20 @@ INSERT INTO awscc.efs.file_systems (
  ReplicationConfiguration,
  region
 )
-SELECT 
- '{{ Encrypted }}',
- '{{ FileSystemTags }}',
- '{{ KmsKeyId }}',
- '{{ LifecyclePolicies }}',
- '{{ FileSystemProtection }}',
- '{{ PerformanceMode }}',
- '{{ ProvisionedThroughputInMibps }}',
- '{{ ThroughputMode }}',
- '{{ FileSystemPolicy }}',
- '{{ BypassPolicyLockoutSafetyCheck }}',
- '{{ BackupPolicy }}',
- '{{ AvailabilityZoneName }}',
- '{{ ReplicationConfiguration }}',
+SELECT
+ '{{ encrypted }}',
+ '{{ file_system_tags }}',
+ '{{ kms_key_id }}',
+ '{{ lifecycle_policies }}',
+ '{{ file_system_protection }}',
+ '{{ performance_mode }}',
+ '{{ provisioned_throughput_in_mibps }}',
+ '{{ throughput_mode }}',
+ '{{ file_system_policy }}',
+ '{{ bypass_policy_lockout_safety_check }}',
+ '{{ backup_policy }}',
+ '{{ availability_zone_name }}',
+ '{{ replication_configuration }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -421,48 +421,47 @@ globals:
 resources:
   - name: file_system
     props:
-      - name: Encrypted
-        value: '{{ Encrypted }}'
-      - name: FileSystemTags
+      - name: encrypted
+        value: '{{ encrypted }}'
+      - name: file_system_tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-      - name: KmsKeyId
-        value: '{{ KmsKeyId }}'
-      - name: LifecyclePolicies
+          - key: '{{ key }}'
+            value: '{{ value }}'
+      - name: kms_key_id
+        value: '{{ kms_key_id }}'
+      - name: lifecycle_policies
         value:
-          - TransitionToIA: '{{ TransitionToIA }}'
-            TransitionToPrimaryStorageClass: '{{ TransitionToPrimaryStorageClass }}'
-            TransitionToArchive: '{{ TransitionToArchive }}'
-      - name: FileSystemProtection
+          - transition_to_ia: '{{ transition_to_ia }}'
+            transition_to_primary_storage_class: '{{ transition_to_primary_storage_class }}'
+            transition_to_archive: '{{ transition_to_archive }}'
+      - name: file_system_protection
         value:
-          ReplicationOverwriteProtection: '{{ ReplicationOverwriteProtection }}'
-      - name: PerformanceMode
-        value: '{{ PerformanceMode }}'
-      - name: ProvisionedThroughputInMibps
+          replication_overwrite_protection: '{{ replication_overwrite_protection }}'
+      - name: performance_mode
+        value: '{{ performance_mode }}'
+      - name: provisioned_throughput_in_mibps
         value: null
-      - name: ThroughputMode
-        value: '{{ ThroughputMode }}'
-      - name: FileSystemPolicy
+      - name: throughput_mode
+        value: '{{ throughput_mode }}'
+      - name: file_system_policy
         value: {}
-      - name: BypassPolicyLockoutSafetyCheck
-        value: '{{ BypassPolicyLockoutSafetyCheck }}'
-      - name: BackupPolicy
+      - name: bypass_policy_lockout_safety_check
+        value: '{{ bypass_policy_lockout_safety_check }}'
+      - name: backup_policy
         value:
-          Status: '{{ Status }}'
-      - name: AvailabilityZoneName
-        value: '{{ AvailabilityZoneName }}'
-      - name: ReplicationConfiguration
+          status: '{{ status }}'
+      - name: availability_zone_name
+        value: '{{ availability_zone_name }}'
+      - name: replication_configuration
         value:
-          Destinations:
-            - Status: '{{ Status }}'
-              StatusMessage: '{{ StatusMessage }}'
-              FileSystemId: '{{ FileSystemId }}'
-              Region: '{{ Region }}'
-              RoleArn: '{{ RoleArn }}'
-              AvailabilityZoneName: '{{ AvailabilityZoneName }}'
-              KmsKeyId: '{{ KmsKeyId }}'
-
+          destinations:
+            - status: '{{ status }}'
+              status_message: '{{ status_message }}'
+              file_system_id: '{{ file_system_id }}'
+              region: '{{ region }}'
+              role_arn: '{{ role_arn }}'
+              availability_zone_name: '{{ availability_zone_name }}'
+              kms_key_id: '{{ kms_key_id }}'
 ```
 </TabItem>
 </Tabs>
@@ -485,7 +484,7 @@ SET PatchDocument = string('{{ {
     "BackupPolicy": backup_policy
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<FileSystemId>';
+AND Identifier = '{{ file_system_id }}';
 ```
 
 
@@ -494,7 +493,7 @@ AND Identifier = '<FileSystemId>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.efs.file_systems
-WHERE Identifier = '<FileSystemId>'
+WHERE Identifier = '{{ file_system_id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/efs/mount_targets/index.md b/website/docs/services/efs/mount_targets/index.md
index 1d74fdb13..630846b2f 100644
--- a/website/docs/services/efs/mount_targets/index.md
+++ b/website/docs/services/efs/mount_targets/index.md
@@ -170,7 +170,7 @@ file_system_id,
 security_groups,
 subnet_id
 FROM awscc.efs.mount_targets
-WHERE region = 'us-east-1' AND Identifier = '<Id>';
+WHERE region = 'us-east-1' AND Identifier = '{{ id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -208,10 +208,10 @@ INSERT INTO awscc.efs.mount_targets (
  SubnetId,
  region
 )
-SELECT 
-'{{ FileSystemId }}',
- '{{ SecurityGroups }}',
- '{{ SubnetId }}',
+SELECT
+'{{ file_system_id }}',
+ '{{ security_groups }}',
+ '{{ subnet_id }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -228,13 +228,13 @@ INSERT INTO awscc.efs.mount_targets (
  SubnetId,
  region
 )
-SELECT 
- '{{ IpAddress }}',
- '{{ Ipv6Address }}',
- '{{ IpAddressType }}',
- '{{ FileSystemId }}',
- '{{ SecurityGroups }}',
- '{{ SubnetId }}',
+SELECT
+ '{{ ip_address }}',
+ '{{ ipv6_address }}',
+ '{{ ip_address_type }}',
+ '{{ file_system_id }}',
+ '{{ security_groups }}',
+ '{{ subnet_id }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -252,20 +252,19 @@ globals:
 resources:
   - name: mount_target
     props:
-      - name: IpAddress
-        value: '{{ IpAddress }}'
-      - name: Ipv6Address
-        value: '{{ Ipv6Address }}'
-      - name: IpAddressType
-        value: '{{ IpAddressType }}'
-      - name: FileSystemId
-        value: '{{ FileSystemId }}'
-      - name: SecurityGroups
+      - name: ip_address
+        value: '{{ ip_address }}'
+      - name: ipv6_address
+        value: '{{ ipv6_address }}'
+      - name: ip_address_type
+        value: '{{ ip_address_type }}'
+      - name: file_system_id
+        value: '{{ file_system_id }}'
+      - name: security_groups
         value:
-          - '{{ SecurityGroups[0] }}'
-      - name: SubnetId
-        value: '{{ SubnetId }}'
-
+          - '{{ security_groups[0] }}'
+      - name: subnet_id
+        value: '{{ subnet_id }}'
 ```
 </TabItem>
 </Tabs>
@@ -281,7 +280,7 @@ SET PatchDocument = string('{{ {
     "SecurityGroups": security_groups
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Id>';
+AND Identifier = '{{ id }}';
 ```
 
 
@@ -290,7 +289,7 @@ AND Identifier = '<Id>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.efs.mount_targets
-WHERE Identifier = '<Id>'
+WHERE Identifier = '{{ id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/eks/access_entries/index.md b/website/docs/services/eks/access_entries/index.md
index 39600cf5b..de52f949c 100644
--- a/website/docs/services/eks/access_entries/index.md
+++ b/website/docs/services/eks/access_entries/index.md
@@ -217,7 +217,7 @@ kubernetes_groups,
 access_policies,
 type
 FROM awscc.eks.access_entries
-WHERE region = 'us-east-1' AND Identifier = '<PrincipalArn>|<ClusterName>';
+WHERE region = 'us-east-1' AND Identifier = '{{ principal_arn }}|{{ cluster_name }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -255,9 +255,9 @@ INSERT INTO awscc.eks.access_entries (
  PrincipalArn,
  region
 )
-SELECT 
-'{{ ClusterName }}',
- '{{ PrincipalArn }}',
+SELECT
+'{{ cluster_name }}',
+ '{{ principal_arn }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -275,14 +275,14 @@ INSERT INTO awscc.eks.access_entries (
  Type,
  region
 )
-SELECT 
- '{{ ClusterName }}',
- '{{ PrincipalArn }}',
- '{{ Username }}',
- '{{ Tags }}',
- '{{ KubernetesGroups }}',
- '{{ AccessPolicies }}',
- '{{ Type }}',
+SELECT
+ '{{ cluster_name }}',
+ '{{ principal_arn }}',
+ '{{ username }}',
+ '{{ tags }}',
+ '{{ kubernetes_groups }}',
+ '{{ access_policies }}',
+ '{{ type }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -300,29 +300,28 @@ globals:
 resources:
   - name: access_entry
     props:
-      - name: ClusterName
-        value: '{{ ClusterName }}'
-      - name: PrincipalArn
-        value: '{{ PrincipalArn }}'
-      - name: Username
-        value: '{{ Username }}'
-      - name: Tags
+      - name: cluster_name
+        value: '{{ cluster_name }}'
+      - name: principal_arn
+        value: '{{ principal_arn }}'
+      - name: username
+        value: '{{ username }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-      - name: KubernetesGroups
+          - key: '{{ key }}'
+            value: '{{ value }}'
+      - name: kubernetes_groups
         value:
-          - '{{ KubernetesGroups[0] }}'
-      - name: AccessPolicies
+          - '{{ kubernetes_groups[0] }}'
+      - name: access_policies
         value:
-          - PolicyArn: '{{ PolicyArn }}'
-            AccessScope:
-              Type: '{{ Type }}'
-              Namespaces:
-                - '{{ Namespaces[0] }}'
-      - name: Type
-        value: '{{ Type }}'
-
+          - policy_arn: '{{ policy_arn }}'
+            access_scope:
+              type: '{{ type }}'
+              namespaces:
+                - '{{ namespaces[0] }}'
+      - name: type
+        value: '{{ type }}'
 ```
 </TabItem>
 </Tabs>
@@ -341,7 +340,7 @@ SET PatchDocument = string('{{ {
     "AccessPolicies": access_policies
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<PrincipalArn>|<ClusterName>';
+AND Identifier = '{{ principal_arn }}|{{ cluster_name }}';
 ```
 
 
@@ -350,7 +349,7 @@ AND Identifier = '<PrincipalArn>|<ClusterName>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.eks.access_entries
-WHERE Identifier = '<PrincipalArn|ClusterName>'
+WHERE Identifier = '{{ principal_arn }}|{{ cluster_name }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/eks/addons/index.md b/website/docs/services/eks/addons/index.md
index 5fbc8687f..0f3a3c1e3 100644
--- a/website/docs/services/eks/addons/index.md
+++ b/website/docs/services/eks/addons/index.md
@@ -282,7 +282,7 @@ arn,
 namespace_config,
 tags
 FROM awscc.eks.addons
-WHERE region = 'us-east-1' AND Identifier = '<ClusterName>|<AddonName>';
+WHERE region = 'us-east-1' AND Identifier = '{{ cluster_name }}|{{ addon_name }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -320,9 +320,9 @@ INSERT INTO awscc.eks.addons (
  AddonName,
  region
 )
-SELECT 
-'{{ ClusterName }}',
- '{{ AddonName }}',
+SELECT
+'{{ cluster_name }}',
+ '{{ addon_name }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -343,17 +343,17 @@ INSERT INTO awscc.eks.addons (
  Tags,
  region
 )
-SELECT 
- '{{ ClusterName }}',
- '{{ AddonName }}',
- '{{ AddonVersion }}',
- '{{ PreserveOnDelete }}',
- '{{ ResolveConflicts }}',
- '{{ ServiceAccountRoleArn }}',
- '{{ PodIdentityAssociations }}',
- '{{ ConfigurationValues }}',
- '{{ NamespaceConfig }}',
- '{{ Tags }}',
+SELECT
+ '{{ cluster_name }}',
+ '{{ addon_name }}',
+ '{{ addon_version }}',
+ '{{ preserve_on_delete }}',
+ '{{ resolve_conflicts }}',
+ '{{ service_account_role_arn }}',
+ '{{ pod_identity_associations }}',
+ '{{ configuration_values }}',
+ '{{ namespace_config }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -371,38 +371,37 @@ globals:
 resources:
   - name: addon
     props:
-      - name: ClusterName
-        value: '{{ ClusterName }}'
-      - name: AddonName
-        value: '{{ AddonName }}'
-      - name: AddonVersion
-        value: '{{ AddonVersion }}'
-      - name: PreserveOnDelete
-        value: '{{ PreserveOnDelete }}'
-      - name: ResolveConflicts
-        value: '{{ ResolveConflicts }}'
-      - name: ServiceAccountRoleArn
-        value: '{{ ServiceAccountRoleArn }}'
-      - name: PodIdentityAssociations
+      - name: cluster_name
+        value: '{{ cluster_name }}'
+      - name: addon_name
+        value: '{{ addon_name }}'
+      - name: addon_version
+        value: '{{ addon_version }}'
+      - name: preserve_on_delete
+        value: '{{ preserve_on_delete }}'
+      - name: resolve_conflicts
+        value: '{{ resolve_conflicts }}'
+      - name: service_account_role_arn
+        value: '{{ service_account_role_arn }}'
+      - name: pod_identity_associations
         value:
-          - ClusterName: '{{ ClusterName }}'
-            RoleArn: '{{ RoleArn }}'
-            Namespace: '{{ Namespace }}'
-            ServiceAccount: '{{ ServiceAccount }}'
-            TargetRoleArn: '{{ TargetRoleArn }}'
-            DisableSessionTags: '{{ DisableSessionTags }}'
-            Tags:
-              - Key: '{{ Key }}'
-                Value: '{{ Value }}'
-      - name: ConfigurationValues
-        value: '{{ ConfigurationValues }}'
-      - name: NamespaceConfig
+          - cluster_name: '{{ cluster_name }}'
+            role_arn: '{{ role_arn }}'
+            namespace: '{{ namespace }}'
+            service_account: '{{ service_account }}'
+            target_role_arn: '{{ target_role_arn }}'
+            disable_session_tags: '{{ disable_session_tags }}'
+            tags:
+              - key: '{{ key }}'
+                value: '{{ value }}'
+      - name: configuration_values
+        value: '{{ configuration_values }}'
+      - name: namespace_config
         value:
-          Namespace: '{{ Namespace }}'
-      - name: Tags
+          namespace: '{{ namespace }}'
+      - name: tags
         value:
           - null
-
 ```
 </TabItem>
 </Tabs>
@@ -424,7 +423,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<ClusterName>|<AddonName>';
+AND Identifier = '{{ cluster_name }}|{{ addon_name }}';
 ```
 
 
@@ -433,7 +432,7 @@ AND Identifier = '<ClusterName>|<AddonName>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.eks.addons
-WHERE Identifier = '<ClusterName|AddonName>'
+WHERE Identifier = '{{ cluster_name }}|{{ addon_name }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/eks/clusters/index.md b/website/docs/services/eks/clusters/index.md
index c0a99d4f8..32c0b9134 100644
--- a/website/docs/services/eks/clusters/index.md
+++ b/website/docs/services/eks/clusters/index.md
@@ -493,7 +493,7 @@ bootstrap_self_managed_addons,
 deletion_protection,
 zonal_shift_config
 FROM awscc.eks.clusters
-WHERE region = 'us-east-1' AND Identifier = '<Name>';
+WHERE region = 'us-east-1' AND Identifier = '{{ name }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -530,9 +530,9 @@ INSERT INTO awscc.eks.clusters (
  RoleArn,
  region
 )
-SELECT 
-'{{ ResourcesVpcConfig }}',
- '{{ RoleArn }}',
+SELECT
+'{{ resources_vpc_config }}',
+ '{{ role_arn }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -561,25 +561,25 @@ INSERT INTO awscc.eks.clusters (
  ZonalShiftConfig,
  region
 )
-SELECT 
- '{{ EncryptionConfig }}',
- '{{ KubernetesNetworkConfig }}',
- '{{ Logging }}',
- '{{ Name }}',
- '{{ ResourcesVpcConfig }}',
- '{{ OutpostConfig }}',
- '{{ AccessConfig }}',
- '{{ UpgradePolicy }}',
- '{{ RemoteNetworkConfig }}',
- '{{ ComputeConfig }}',
- '{{ StorageConfig }}',
- '{{ RoleArn }}',
- '{{ Version }}',
- '{{ Force }}',
- '{{ Tags }}',
- '{{ BootstrapSelfManagedAddons }}',
- '{{ DeletionProtection }}',
- '{{ ZonalShiftConfig }}',
+SELECT
+ '{{ encryption_config }}',
+ '{{ kubernetes_network_config }}',
+ '{{ logging }}',
+ '{{ name }}',
+ '{{ resources_vpc_config }}',
+ '{{ outpost_config }}',
+ '{{ access_config }}',
+ '{{ upgrade_policy }}',
+ '{{ remote_network_config }}',
+ '{{ compute_config }}',
+ '{{ storage_config }}',
+ '{{ role_arn }}',
+ '{{ version }}',
+ '{{ force }}',
+ '{{ tags }}',
+ '{{ bootstrap_self_managed_addons }}',
+ '{{ deletion_protection }}',
+ '{{ zonal_shift_config }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -597,86 +597,85 @@ globals:
 resources:
   - name: cluster
     props:
-      - name: EncryptionConfig
+      - name: encryption_config
         value:
-          - Provider:
-              KeyArn: '{{ KeyArn }}'
-            Resources:
-              - '{{ Resources[0] }}'
-      - name: KubernetesNetworkConfig
+          - provider:
+              key_arn: '{{ key_arn }}'
+            resources:
+              - '{{ resources[0] }}'
+      - name: kubernetes_network_config
         value:
-          ServiceIpv4Cidr: '{{ ServiceIpv4Cidr }}'
-          ServiceIpv6Cidr: '{{ ServiceIpv6Cidr }}'
-          IpFamily: '{{ IpFamily }}'
-          ElasticLoadBalancing:
-            Enabled: '{{ Enabled }}'
-      - name: Logging
+          service_ipv4_cidr: '{{ service_ipv4_cidr }}'
+          service_ipv6_cidr: '{{ service_ipv6_cidr }}'
+          ip_family: '{{ ip_family }}'
+          elastic_load_balancing:
+            enabled: '{{ enabled }}'
+      - name: logging
         value:
-          ClusterLogging:
-            EnabledTypes:
-              - Type: '{{ Type }}'
-      - name: Name
-        value: '{{ Name }}'
-      - name: ResourcesVpcConfig
+          cluster_logging:
+            enabled_types:
+              - type: '{{ type }}'
+      - name: name
+        value: '{{ name }}'
+      - name: resources_vpc_config
         value:
-          EndpointPrivateAccess: '{{ EndpointPrivateAccess }}'
-          EndpointPublicAccess: '{{ EndpointPublicAccess }}'
-          PublicAccessCidrs:
-            - '{{ PublicAccessCidrs[0] }}'
-          SecurityGroupIds:
-            - '{{ SecurityGroupIds[0] }}'
-          SubnetIds:
-            - '{{ SubnetIds[0] }}'
-      - name: OutpostConfig
+          endpoint_private_access: '{{ endpoint_private_access }}'
+          endpoint_public_access: '{{ endpoint_public_access }}'
+          public_access_cidrs:
+            - '{{ public_access_cidrs[0] }}'
+          security_group_ids:
+            - '{{ security_group_ids[0] }}'
+          subnet_ids:
+            - '{{ subnet_ids[0] }}'
+      - name: outpost_config
         value:
-          OutpostArns:
-            - '{{ OutpostArns[0] }}'
-          ControlPlaneInstanceType: '{{ ControlPlaneInstanceType }}'
-          ControlPlanePlacement:
-            GroupName: '{{ GroupName }}'
-      - name: AccessConfig
+          outpost_arns:
+            - '{{ outpost_arns[0] }}'
+          control_plane_instance_type: '{{ control_plane_instance_type }}'
+          control_plane_placement:
+            group_name: '{{ group_name }}'
+      - name: access_config
         value:
-          BootstrapClusterCreatorAdminPermissions: '{{ BootstrapClusterCreatorAdminPermissions }}'
-          AuthenticationMode: '{{ AuthenticationMode }}'
-      - name: UpgradePolicy
+          bootstrap_cluster_creator_admin_permissions: '{{ bootstrap_cluster_creator_admin_permissions }}'
+          authentication_mode: '{{ authentication_mode }}'
+      - name: upgrade_policy
         value:
-          SupportType: '{{ SupportType }}'
-      - name: RemoteNetworkConfig
+          support_type: '{{ support_type }}'
+      - name: remote_network_config
         value:
-          RemoteNodeNetworks:
-            - Cidrs:
-                - '{{ Cidrs[0] }}'
-          RemotePodNetworks:
-            - Cidrs:
-                - '{{ Cidrs[0] }}'
-      - name: ComputeConfig
+          remote_node_networks:
+            - cidrs:
+                - '{{ cidrs[0] }}'
+          remote_pod_networks:
+            - cidrs:
+                - '{{ cidrs[0] }}'
+      - name: compute_config
         value:
-          Enabled: '{{ Enabled }}'
-          NodeRoleArn: '{{ NodeRoleArn }}'
-          NodePools:
-            - '{{ NodePools[0] }}'
-      - name: StorageConfig
+          enabled: '{{ enabled }}'
+          node_role_arn: '{{ node_role_arn }}'
+          node_pools:
+            - '{{ node_pools[0] }}'
+      - name: storage_config
         value:
-          BlockStorage:
-            Enabled: '{{ Enabled }}'
-      - name: RoleArn
-        value: '{{ RoleArn }}'
-      - name: Version
-        value: '{{ Version }}'
-      - name: Force
-        value: '{{ Force }}'
-      - name: Tags
+          block_storage:
+            enabled: '{{ enabled }}'
+      - name: role_arn
+        value: '{{ role_arn }}'
+      - name: version
+        value: '{{ version }}'
+      - name: force
+        value: '{{ force }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-      - name: BootstrapSelfManagedAddons
-        value: '{{ BootstrapSelfManagedAddons }}'
-      - name: DeletionProtection
-        value: '{{ DeletionProtection }}'
-      - name: ZonalShiftConfig
+          - key: '{{ key }}'
+            value: '{{ value }}'
+      - name: bootstrap_self_managed_addons
+        value: '{{ bootstrap_self_managed_addons }}'
+      - name: deletion_protection
+        value: '{{ deletion_protection }}'
+      - name: zonal_shift_config
         value:
-          Enabled: '{{ Enabled }}'
-
+          enabled: '{{ enabled }}'
 ```
 </TabItem>
 </Tabs>
@@ -702,7 +701,7 @@ SET PatchDocument = string('{{ {
     "ZonalShiftConfig": zonal_shift_config
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Name>';
+AND Identifier = '{{ name }}';
 ```
 
 
@@ -711,7 +710,7 @@ AND Identifier = '<Name>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.eks.clusters
-WHERE Identifier = '<Name>'
+WHERE Identifier = '{{ name }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/eks/fargate_profiles/index.md b/website/docs/services/eks/fargate_profiles/index.md
index 655459dc9..4cdfaf9ac 100644
--- a/website/docs/services/eks/fargate_profiles/index.md
+++ b/website/docs/services/eks/fargate_profiles/index.md
@@ -211,7 +211,7 @@ subnets,
 selectors,
 tags
 FROM awscc.eks.fargate_profiles
-WHERE region = 'us-east-1' AND Identifier = '<ClusterName>|<FargateProfileName>';
+WHERE region = 'us-east-1' AND Identifier = '{{ cluster_name }}|{{ fargate_profile_name }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -250,10 +250,10 @@ INSERT INTO awscc.eks.fargate_profiles (
  Selectors,
  region
 )
-SELECT 
-'{{ ClusterName }}',
- '{{ PodExecutionRoleArn }}',
- '{{ Selectors }}',
+SELECT
+'{{ cluster_name }}',
+ '{{ pod_execution_role_arn }}',
+ '{{ selectors }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -270,13 +270,13 @@ INSERT INTO awscc.eks.fargate_profiles (
  Tags,
  region
 )
-SELECT 
- '{{ ClusterName }}',
- '{{ FargateProfileName }}',
- '{{ PodExecutionRoleArn }}',
- '{{ Subnets }}',
- '{{ Selectors }}',
- '{{ Tags }}',
+SELECT
+ '{{ cluster_name }}',
+ '{{ fargate_profile_name }}',
+ '{{ pod_execution_role_arn }}',
+ '{{ subnets }}',
+ '{{ selectors }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -294,26 +294,25 @@ globals:
 resources:
   - name: fargate_profile
     props:
-      - name: ClusterName
-        value: '{{ ClusterName }}'
-      - name: FargateProfileName
-        value: '{{ FargateProfileName }}'
-      - name: PodExecutionRoleArn
-        value: '{{ PodExecutionRoleArn }}'
-      - name: Subnets
+      - name: cluster_name
+        value: '{{ cluster_name }}'
+      - name: fargate_profile_name
+        value: '{{ fargate_profile_name }}'
+      - name: pod_execution_role_arn
+        value: '{{ pod_execution_role_arn }}'
+      - name: subnets
         value:
-          - '{{ Subnets[0] }}'
-      - name: Selectors
+          - '{{ subnets[0] }}'
+      - name: selectors
         value:
-          - Namespace: '{{ Namespace }}'
-            Labels:
-              - Key: '{{ Key }}'
-                Value: '{{ Value }}'
-      - name: Tags
+          - namespace: '{{ namespace }}'
+            labels:
+              - key: '{{ key }}'
+                value: '{{ value }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -329,7 +328,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<ClusterName>|<FargateProfileName>';
+AND Identifier = '{{ cluster_name }}|{{ fargate_profile_name }}';
 ```
 
 
@@ -338,7 +337,7 @@ AND Identifier = '<ClusterName>|<FargateProfileName>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.eks.fargate_profiles
-WHERE Identifier = '<ClusterName|FargateProfileName>'
+WHERE Identifier = '{{ cluster_name }}|{{ fargate_profile_name }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/eks/identity_provider_configs/index.md b/website/docs/services/eks/identity_provider_configs/index.md
index 76f7ecf6c..4e13b488d 100644
--- a/website/docs/services/eks/identity_provider_configs/index.md
+++ b/website/docs/services/eks/identity_provider_configs/index.md
@@ -235,7 +235,7 @@ oidc,
 tags,
 identity_provider_config_arn
 FROM awscc.eks.identity_provider_configs
-WHERE region = 'us-east-1' AND Identifier = '<IdentityProviderConfigName>|<ClusterName>|<Type>';
+WHERE region = 'us-east-1' AND Identifier = '{{ identity_provider_config_name }}|{{ cluster_name }}|{{ type }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -274,9 +274,9 @@ INSERT INTO awscc.eks.identity_provider_configs (
  Type,
  region
 )
-SELECT 
-'{{ ClusterName }}',
- '{{ Type }}',
+SELECT
+'{{ cluster_name }}',
+ '{{ type }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -292,12 +292,12 @@ INSERT INTO awscc.eks.identity_provider_configs (
  Tags,
  region
 )
-SELECT 
- '{{ ClusterName }}',
- '{{ Type }}',
- '{{ IdentityProviderConfigName }}',
- '{{ Oidc }}',
- '{{ Tags }}',
+SELECT
+ '{{ cluster_name }}',
+ '{{ type }}',
+ '{{ identity_provider_config_name }}',
+ '{{ oidc }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -315,28 +315,27 @@ globals:
 resources:
   - name: identity_provider_config
     props:
-      - name: ClusterName
-        value: '{{ ClusterName }}'
-      - name: Type
-        value: '{{ Type }}'
-      - name: IdentityProviderConfigName
-        value: '{{ IdentityProviderConfigName }}'
-      - name: Oidc
+      - name: cluster_name
+        value: '{{ cluster_name }}'
+      - name: type
+        value: '{{ type }}'
+      - name: identity_provider_config_name
+        value: '{{ identity_provider_config_name }}'
+      - name: oidc
         value:
-          ClientId: '{{ ClientId }}'
-          GroupsClaim: '{{ GroupsClaim }}'
-          GroupsPrefix: '{{ GroupsPrefix }}'
-          IssuerUrl: '{{ IssuerUrl }}'
-          RequiredClaims:
-            - Key: '{{ Key }}'
-              Value: '{{ Value }}'
-          UsernameClaim: '{{ UsernameClaim }}'
-          UsernamePrefix: '{{ UsernamePrefix }}'
-      - name: Tags
+          client_id: '{{ client_id }}'
+          groups_claim: '{{ groups_claim }}'
+          groups_prefix: '{{ groups_prefix }}'
+          issuer_url: '{{ issuer_url }}'
+          required_claims:
+            - key: '{{ key }}'
+              value: '{{ value }}'
+          username_claim: '{{ username_claim }}'
+          username_prefix: '{{ username_prefix }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -352,7 +351,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<IdentityProviderConfigName>|<ClusterName>|<Type>';
+AND Identifier = '{{ identity_provider_config_name }}|{{ cluster_name }}|{{ type }}';
 ```
 
 
@@ -361,7 +360,7 @@ AND Identifier = '<IdentityProviderConfigName>|<ClusterName>|<Type>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.eks.identity_provider_configs
-WHERE Identifier = '<IdentityProviderConfigName|ClusterName|Type>'
+WHERE Identifier = '{{ identity_provider_config_name }}|{{ cluster_name }}|{{ type }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/eks/nodegroups/index.md b/website/docs/services/eks/nodegroups/index.md
index 9ece059b4..72e00c5d0 100644
--- a/website/docs/services/eks/nodegroups/index.md
+++ b/website/docs/services/eks/nodegroups/index.md
@@ -341,7 +341,7 @@ version,
 id,
 arn
 FROM awscc.eks.nodegroups
-WHERE region = 'us-east-1' AND Identifier = '<Id>';
+WHERE region = 'us-east-1' AND Identifier = '{{ id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -379,10 +379,10 @@ INSERT INTO awscc.eks.nodegroups (
  Subnets,
  region
 )
-SELECT 
-'{{ ClusterName }}',
- '{{ NodeRole }}',
- '{{ Subnets }}',
+SELECT
+'{{ cluster_name }}',
+ '{{ node_role }}',
+ '{{ subnets }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -412,26 +412,26 @@ INSERT INTO awscc.eks.nodegroups (
  Version,
  region
 )
-SELECT 
- '{{ AmiType }}',
- '{{ CapacityType }}',
- '{{ ClusterName }}',
- '{{ DiskSize }}',
- '{{ ForceUpdateEnabled }}',
- '{{ InstanceTypes }}',
- '{{ Labels }}',
- '{{ LaunchTemplate }}',
- '{{ NodegroupName }}',
- '{{ NodeRole }}',
- '{{ ReleaseVersion }}',
- '{{ RemoteAccess }}',
- '{{ ScalingConfig }}',
- '{{ Subnets }}',
- '{{ Tags }}',
- '{{ Taints }}',
- '{{ UpdateConfig }}',
- '{{ NodeRepairConfig }}',
- '{{ Version }}',
+SELECT
+ '{{ ami_type }}',
+ '{{ capacity_type }}',
+ '{{ cluster_name }}',
+ '{{ disk_size }}',
+ '{{ force_update_enabled }}',
+ '{{ instance_types }}',
+ '{{ labels }}',
+ '{{ launch_template }}',
+ '{{ nodegroup_name }}',
+ '{{ node_role }}',
+ '{{ release_version }}',
+ '{{ remote_access }}',
+ '{{ scaling_config }}',
+ '{{ subnets }}',
+ '{{ tags }}',
+ '{{ taints }}',
+ '{{ update_config }}',
+ '{{ node_repair_config }}',
+ '{{ version }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -449,63 +449,62 @@ globals:
 resources:
   - name: nodegroup
     props:
-      - name: AmiType
-        value: '{{ AmiType }}'
-      - name: CapacityType
-        value: '{{ CapacityType }}'
-      - name: ClusterName
-        value: '{{ ClusterName }}'
-      - name: DiskSize
-        value: '{{ DiskSize }}'
-      - name: ForceUpdateEnabled
-        value: '{{ ForceUpdateEnabled }}'
-      - name: InstanceTypes
+      - name: ami_type
+        value: '{{ ami_type }}'
+      - name: capacity_type
+        value: '{{ capacity_type }}'
+      - name: cluster_name
+        value: '{{ cluster_name }}'
+      - name: disk_size
+        value: '{{ disk_size }}'
+      - name: force_update_enabled
+        value: '{{ force_update_enabled }}'
+      - name: instance_types
         value:
-          - '{{ InstanceTypes[0] }}'
-      - name: Labels
+          - '{{ instance_types[0] }}'
+      - name: labels
         value: {}
-      - name: LaunchTemplate
+      - name: launch_template
         value:
-          Id: '{{ Id }}'
-          Version: '{{ Version }}'
-          Name: '{{ Name }}'
-      - name: NodegroupName
-        value: '{{ NodegroupName }}'
-      - name: NodeRole
-        value: '{{ NodeRole }}'
-      - name: ReleaseVersion
-        value: '{{ ReleaseVersion }}'
-      - name: RemoteAccess
+          id: '{{ id }}'
+          version: '{{ version }}'
+          name: '{{ name }}'
+      - name: nodegroup_name
+        value: '{{ nodegroup_name }}'
+      - name: node_role
+        value: '{{ node_role }}'
+      - name: release_version
+        value: '{{ release_version }}'
+      - name: remote_access
         value:
-          SourceSecurityGroups:
-            - '{{ SourceSecurityGroups[0] }}'
-          Ec2SshKey: '{{ Ec2SshKey }}'
-      - name: ScalingConfig
+          source_security_groups:
+            - '{{ source_security_groups[0] }}'
+          ec2_ssh_key: '{{ ec2_ssh_key }}'
+      - name: scaling_config
         value:
-          MinSize: '{{ MinSize }}'
-          DesiredSize: '{{ DesiredSize }}'
-          MaxSize: '{{ MaxSize }}'
-      - name: Subnets
+          min_size: '{{ min_size }}'
+          desired_size: '{{ desired_size }}'
+          max_size: '{{ max_size }}'
+      - name: subnets
         value:
-          - '{{ Subnets[0] }}'
-      - name: Tags
+          - '{{ subnets[0] }}'
+      - name: tags
         value: {}
-      - name: Taints
+      - name: taints
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-            Effect: '{{ Effect }}'
-      - name: UpdateConfig
+          - key: '{{ key }}'
+            value: '{{ value }}'
+            effect: '{{ effect }}'
+      - name: update_config
         value:
-          MaxUnavailable: null
-          MaxUnavailablePercentage: null
-          UpdateStrategy: '{{ UpdateStrategy }}'
-      - name: NodeRepairConfig
+          max_unavailable: null
+          max_unavailable_percentage: null
+          update_strategy: '{{ update_strategy }}'
+      - name: node_repair_config
         value:
-          Enabled: '{{ Enabled }}'
-      - name: Version
-        value: '{{ Version }}'
-
+          enabled: '{{ enabled }}'
+      - name: version
+        value: '{{ version }}'
 ```
 </TabItem>
 </Tabs>
@@ -530,7 +529,7 @@ SET PatchDocument = string('{{ {
     "Version": version
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Id>';
+AND Identifier = '{{ id }}';
 ```
 
 
@@ -539,7 +538,7 @@ AND Identifier = '<Id>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.eks.nodegroups
-WHERE Identifier = '<Id>'
+WHERE Identifier = '{{ id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/eks/pod_identity_associations/index.md b/website/docs/services/eks/pod_identity_associations/index.md
index 19aa94fc6..b1f820b6e 100644
--- a/website/docs/services/eks/pod_identity_associations/index.md
+++ b/website/docs/services/eks/pod_identity_associations/index.md
@@ -200,7 +200,7 @@ external_id,
 disable_session_tags,
 tags
 FROM awscc.eks.pod_identity_associations
-WHERE region = 'us-east-1' AND Identifier = '<AssociationArn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ association_arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -239,11 +239,11 @@ INSERT INTO awscc.eks.pod_identity_associations (
  ServiceAccount,
  region
 )
-SELECT 
-'{{ ClusterName }}',
- '{{ RoleArn }}',
- '{{ Namespace }}',
- '{{ ServiceAccount }}',
+SELECT
+'{{ cluster_name }}',
+ '{{ role_arn }}',
+ '{{ namespace }}',
+ '{{ service_account }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -261,14 +261,14 @@ INSERT INTO awscc.eks.pod_identity_associations (
  Tags,
  region
 )
-SELECT 
- '{{ ClusterName }}',
- '{{ RoleArn }}',
- '{{ Namespace }}',
- '{{ ServiceAccount }}',
- '{{ TargetRoleArn }}',
- '{{ DisableSessionTags }}',
- '{{ Tags }}',
+SELECT
+ '{{ cluster_name }}',
+ '{{ role_arn }}',
+ '{{ namespace }}',
+ '{{ service_account }}',
+ '{{ target_role_arn }}',
+ '{{ disable_session_tags }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -286,23 +286,22 @@ globals:
 resources:
   - name: pod_identity_association
     props:
-      - name: ClusterName
-        value: '{{ ClusterName }}'
-      - name: RoleArn
-        value: '{{ RoleArn }}'
-      - name: Namespace
-        value: '{{ Namespace }}'
-      - name: ServiceAccount
-        value: '{{ ServiceAccount }}'
-      - name: TargetRoleArn
-        value: '{{ TargetRoleArn }}'
-      - name: DisableSessionTags
-        value: '{{ DisableSessionTags }}'
-      - name: Tags
+      - name: cluster_name
+        value: '{{ cluster_name }}'
+      - name: role_arn
+        value: '{{ role_arn }}'
+      - name: namespace
+        value: '{{ namespace }}'
+      - name: service_account
+        value: '{{ service_account }}'
+      - name: target_role_arn
+        value: '{{ target_role_arn }}'
+      - name: disable_session_tags
+        value: '{{ disable_session_tags }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -321,7 +320,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<AssociationArn>';
+AND Identifier = '{{ association_arn }}';
 ```
 
 
@@ -330,7 +329,7 @@ AND Identifier = '<AssociationArn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.eks.pod_identity_associations
-WHERE Identifier = '<AssociationArn>'
+WHERE Identifier = '{{ association_arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/elasticache/global_replication_groups/index.md b/website/docs/services/elasticache/global_replication_groups/index.md
index 0ce8d0953..accb4a7a3 100644
--- a/website/docs/services/elasticache/global_replication_groups/index.md
+++ b/website/docs/services/elasticache/global_replication_groups/index.md
@@ -246,7 +246,7 @@ members,
 status,
 regional_configurations
 FROM awscc.elasticache.global_replication_groups
-WHERE region = 'us-east-1' AND Identifier = '<GlobalReplicationGroupId>';
+WHERE region = 'us-east-1' AND Identifier = '{{ global_replication_group_id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -282,8 +282,8 @@ INSERT INTO awscc.elasticache.global_replication_groups (
  Members,
  region
 )
-SELECT 
-'{{ Members }}',
+SELECT
+'{{ members }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -304,17 +304,17 @@ INSERT INTO awscc.elasticache.global_replication_groups (
  RegionalConfigurations,
  region
 )
-SELECT 
- '{{ GlobalReplicationGroupIdSuffix }}',
- '{{ AutomaticFailoverEnabled }}',
- '{{ CacheNodeType }}',
- '{{ EngineVersion }}',
- '{{ Engine }}',
- '{{ CacheParameterGroupName }}',
- '{{ GlobalNodeGroupCount }}',
- '{{ GlobalReplicationGroupDescription }}',
- '{{ Members }}',
- '{{ RegionalConfigurations }}',
+SELECT
+ '{{ global_replication_group_id_suffix }}',
+ '{{ automatic_failover_enabled }}',
+ '{{ cache_node_type }}',
+ '{{ engine_version }}',
+ '{{ engine }}',
+ '{{ cache_parameter_group_name }}',
+ '{{ global_node_group_count }}',
+ '{{ global_replication_group_description }}',
+ '{{ members }}',
+ '{{ regional_configurations }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -332,36 +332,35 @@ globals:
 resources:
   - name: global_replication_group
     props:
-      - name: GlobalReplicationGroupIdSuffix
-        value: '{{ GlobalReplicationGroupIdSuffix }}'
-      - name: AutomaticFailoverEnabled
-        value: '{{ AutomaticFailoverEnabled }}'
-      - name: CacheNodeType
-        value: '{{ CacheNodeType }}'
-      - name: EngineVersion
-        value: '{{ EngineVersion }}'
-      - name: Engine
-        value: '{{ Engine }}'
-      - name: CacheParameterGroupName
-        value: '{{ CacheParameterGroupName }}'
-      - name: GlobalNodeGroupCount
-        value: '{{ GlobalNodeGroupCount }}'
-      - name: GlobalReplicationGroupDescription
-        value: '{{ GlobalReplicationGroupDescription }}'
-      - name: Members
+      - name: global_replication_group_id_suffix
+        value: '{{ global_replication_group_id_suffix }}'
+      - name: automatic_failover_enabled
+        value: '{{ automatic_failover_enabled }}'
+      - name: cache_node_type
+        value: '{{ cache_node_type }}'
+      - name: engine_version
+        value: '{{ engine_version }}'
+      - name: engine
+        value: '{{ engine }}'
+      - name: cache_parameter_group_name
+        value: '{{ cache_parameter_group_name }}'
+      - name: global_node_group_count
+        value: '{{ global_node_group_count }}'
+      - name: global_replication_group_description
+        value: '{{ global_replication_group_description }}'
+      - name: members
         value:
-          - ReplicationGroupId: '{{ ReplicationGroupId }}'
-            ReplicationGroupRegion: '{{ ReplicationGroupRegion }}'
-            Role: '{{ Role }}'
-      - name: RegionalConfigurations
+          - replication_group_id: '{{ replication_group_id }}'
+            replication_group_region: '{{ replication_group_region }}'
+            role: '{{ role }}'
+      - name: regional_configurations
         value:
-          - ReplicationGroupId: '{{ ReplicationGroupId }}'
-            ReplicationGroupRegion: '{{ ReplicationGroupRegion }}'
-            ReshardingConfigurations:
-              - NodeGroupId: '{{ NodeGroupId }}'
-                PreferredAvailabilityZones:
-                  - '{{ PreferredAvailabilityZones[0] }}'
-
+          - replication_group_id: '{{ replication_group_id }}'
+            replication_group_region: '{{ replication_group_region }}'
+            resharding_configurations:
+              - node_group_id: '{{ node_group_id }}'
+                preferred_availability_zones:
+                  - '{{ preferred_availability_zones[0] }}'
 ```
 </TabItem>
 </Tabs>
@@ -386,7 +385,7 @@ SET PatchDocument = string('{{ {
     "RegionalConfigurations": regional_configurations
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<GlobalReplicationGroupId>';
+AND Identifier = '{{ global_replication_group_id }}';
 ```
 
 
@@ -395,7 +394,7 @@ AND Identifier = '<GlobalReplicationGroupId>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.elasticache.global_replication_groups
-WHERE Identifier = '<GlobalReplicationGroupId>'
+WHERE Identifier = '{{ global_replication_group_id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/elasticache/parameter_groups/index.md b/website/docs/services/elasticache/parameter_groups/index.md
index 3d66033c5..a7521c499 100644
--- a/website/docs/services/elasticache/parameter_groups/index.md
+++ b/website/docs/services/elasticache/parameter_groups/index.md
@@ -170,7 +170,7 @@ tags,
 cache_parameter_group_name,
 cache_parameter_group_family
 FROM awscc.elasticache.parameter_groups
-WHERE region = 'us-east-1' AND Identifier = '<CacheParameterGroupName>';
+WHERE region = 'us-east-1' AND Identifier = '{{ cache_parameter_group_name }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -207,9 +207,9 @@ INSERT INTO awscc.elasticache.parameter_groups (
  CacheParameterGroupFamily,
  region
 )
-SELECT 
-'{{ Description }}',
- '{{ CacheParameterGroupFamily }}',
+SELECT
+'{{ description }}',
+ '{{ cache_parameter_group_family }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -224,11 +224,11 @@ INSERT INTO awscc.elasticache.parameter_groups (
  CacheParameterGroupFamily,
  region
 )
-SELECT 
- '{{ Description }}',
- '{{ Properties }}',
- '{{ Tags }}',
- '{{ CacheParameterGroupFamily }}',
+SELECT
+ '{{ description }}',
+ '{{ properties }}',
+ '{{ tags }}',
+ '{{ cache_parameter_group_family }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -246,17 +246,16 @@ globals:
 resources:
   - name: parameter_group
     props:
-      - name: Description
-        value: '{{ Description }}'
-      - name: Properties
+      - name: description
+        value: '{{ description }}'
+      - name: properties
         value: {}
-      - name: Tags
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-      - name: CacheParameterGroupFamily
-        value: '{{ CacheParameterGroupFamily }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
+      - name: cache_parameter_group_family
+        value: '{{ cache_parameter_group_family }}'
 ```
 </TabItem>
 </Tabs>
@@ -274,7 +273,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<CacheParameterGroupName>';
+AND Identifier = '{{ cache_parameter_group_name }}';
 ```
 
 
@@ -283,7 +282,7 @@ AND Identifier = '<CacheParameterGroupName>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.elasticache.parameter_groups
-WHERE Identifier = '<CacheParameterGroupName>'
+WHERE Identifier = '{{ cache_parameter_group_name }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/elasticache/serverless_caches/index.md b/website/docs/services/elasticache/serverless_caches/index.md
index b4dfaf0ce..4154730b1 100644
--- a/website/docs/services/elasticache/serverless_caches/index.md
+++ b/website/docs/services/elasticache/serverless_caches/index.md
@@ -308,7 +308,7 @@ reader_endpoint,
 arn,
 final_snapshot_name
 FROM awscc.elasticache.serverless_caches
-WHERE region = 'us-east-1' AND Identifier = '<ServerlessCacheName>';
+WHERE region = 'us-east-1' AND Identifier = '{{ serverless_cache_name }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -345,9 +345,9 @@ INSERT INTO awscc.elasticache.serverless_caches (
  Engine,
  region
 )
-SELECT 
-'{{ ServerlessCacheName }}',
- '{{ Engine }}',
+SELECT
+'{{ serverless_cache_name }}',
+ '{{ engine }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -374,23 +374,23 @@ INSERT INTO awscc.elasticache.serverless_caches (
  FinalSnapshotName,
  region
 )
-SELECT 
- '{{ ServerlessCacheName }}',
- '{{ Description }}',
- '{{ Engine }}',
- '{{ MajorEngineVersion }}',
- '{{ CacheUsageLimits }}',
- '{{ KmsKeyId }}',
- '{{ SecurityGroupIds }}',
- '{{ SnapshotArnsToRestore }}',
- '{{ Tags }}',
- '{{ UserGroupId }}',
- '{{ SubnetIds }}',
- '{{ SnapshotRetentionLimit }}',
- '{{ DailySnapshotTime }}',
- '{{ Endpoint }}',
- '{{ ReaderEndpoint }}',
- '{{ FinalSnapshotName }}',
+SELECT
+ '{{ serverless_cache_name }}',
+ '{{ description }}',
+ '{{ engine }}',
+ '{{ major_engine_version }}',
+ '{{ cache_usage_limits }}',
+ '{{ kms_key_id }}',
+ '{{ security_group_ids }}',
+ '{{ snapshot_arns_to_restore }}',
+ '{{ tags }}',
+ '{{ user_group_id }}',
+ '{{ subnet_ids }}',
+ '{{ snapshot_retention_limit }}',
+ '{{ daily_snapshot_time }}',
+ '{{ endpoint }}',
+ '{{ reader_endpoint }}',
+ '{{ final_snapshot_name }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -408,53 +408,52 @@ globals:
 resources:
   - name: serverless_cach
     props:
-      - name: ServerlessCacheName
-        value: '{{ ServerlessCacheName }}'
-      - name: Description
-        value: '{{ Description }}'
-      - name: Engine
-        value: '{{ Engine }}'
-      - name: MajorEngineVersion
-        value: '{{ MajorEngineVersion }}'
-      - name: CacheUsageLimits
+      - name: serverless_cache_name
+        value: '{{ serverless_cache_name }}'
+      - name: description
+        value: '{{ description }}'
+      - name: engine
+        value: '{{ engine }}'
+      - name: major_engine_version
+        value: '{{ major_engine_version }}'
+      - name: cache_usage_limits
         value:
-          DataStorage:
-            Minimum: '{{ Minimum }}'
-            Maximum: '{{ Maximum }}'
-            Unit: '{{ Unit }}'
-          ECPUPerSecond:
-            Minimum: '{{ Minimum }}'
-            Maximum: '{{ Maximum }}'
-      - name: KmsKeyId
-        value: '{{ KmsKeyId }}'
-      - name: SecurityGroupIds
+          data_storage:
+            minimum: '{{ minimum }}'
+            maximum: '{{ maximum }}'
+            unit: '{{ unit }}'
+          e_cp_uper_second:
+            minimum: '{{ minimum }}'
+            maximum: '{{ maximum }}'
+      - name: kms_key_id
+        value: '{{ kms_key_id }}'
+      - name: security_group_ids
         value:
-          - '{{ SecurityGroupIds[0] }}'
-      - name: SnapshotArnsToRestore
+          - '{{ security_group_ids[0] }}'
+      - name: snapshot_arns_to_restore
         value:
-          - '{{ SnapshotArnsToRestore[0] }}'
-      - name: Tags
+          - '{{ snapshot_arns_to_restore[0] }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-      - name: UserGroupId
-        value: '{{ UserGroupId }}'
-      - name: SubnetIds
+          - key: '{{ key }}'
+            value: '{{ value }}'
+      - name: user_group_id
+        value: '{{ user_group_id }}'
+      - name: subnet_ids
         value:
-          - '{{ SubnetIds[0] }}'
-      - name: SnapshotRetentionLimit
-        value: '{{ SnapshotRetentionLimit }}'
-      - name: DailySnapshotTime
-        value: '{{ DailySnapshotTime }}'
-      - name: Endpoint
+          - '{{ subnet_ids[0] }}'
+      - name: snapshot_retention_limit
+        value: '{{ snapshot_retention_limit }}'
+      - name: daily_snapshot_time
+        value: '{{ daily_snapshot_time }}'
+      - name: endpoint
         value:
-          Address: '{{ Address }}'
-          Port: '{{ Port }}'
-      - name: ReaderEndpoint
+          address: '{{ address }}'
+          port: '{{ port }}'
+      - name: reader_endpoint
         value: null
-      - name: FinalSnapshotName
-        value: '{{ FinalSnapshotName }}'
-
+      - name: final_snapshot_name
+        value: '{{ final_snapshot_name }}'
 ```
 </TabItem>
 </Tabs>
@@ -479,7 +478,7 @@ SET PatchDocument = string('{{ {
     "FinalSnapshotName": final_snapshot_name
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<ServerlessCacheName>';
+AND Identifier = '{{ serverless_cache_name }}';
 ```
 
 
@@ -488,7 +487,7 @@ AND Identifier = '<ServerlessCacheName>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.elasticache.serverless_caches
-WHERE Identifier = '<ServerlessCacheName>'
+WHERE Identifier = '{{ serverless_cache_name }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/elasticache/subnet_groups/index.md b/website/docs/services/elasticache/subnet_groups/index.md
index 3b3dc0b8e..7a2876bd4 100644
--- a/website/docs/services/elasticache/subnet_groups/index.md
+++ b/website/docs/services/elasticache/subnet_groups/index.md
@@ -164,7 +164,7 @@ subnet_ids,
 cache_subnet_group_name,
 tags
 FROM awscc.elasticache.subnet_groups
-WHERE region = 'us-east-1' AND Identifier = '<CacheSubnetGroupName>';
+WHERE region = 'us-east-1' AND Identifier = '{{ cache_subnet_group_name }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -201,9 +201,9 @@ INSERT INTO awscc.elasticache.subnet_groups (
  SubnetIds,
  region
 )
-SELECT 
-'{{ Description }}',
- '{{ SubnetIds }}',
+SELECT
+'{{ description }}',
+ '{{ subnet_ids }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -218,11 +218,11 @@ INSERT INTO awscc.elasticache.subnet_groups (
  Tags,
  region
 )
-SELECT 
- '{{ Description }}',
- '{{ SubnetIds }}',
- '{{ CacheSubnetGroupName }}',
- '{{ Tags }}',
+SELECT
+ '{{ description }}',
+ '{{ subnet_ids }}',
+ '{{ cache_subnet_group_name }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -240,18 +240,17 @@ globals:
 resources:
   - name: subnet_group
     props:
-      - name: Description
-        value: '{{ Description }}'
-      - name: SubnetIds
+      - name: description
+        value: '{{ description }}'
+      - name: subnet_ids
         value:
-          - '{{ SubnetIds[0] }}'
-      - name: CacheSubnetGroupName
-        value: '{{ CacheSubnetGroupName }}'
-      - name: Tags
+          - '{{ subnet_ids[0] }}'
+      - name: cache_subnet_group_name
+        value: '{{ cache_subnet_group_name }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -269,7 +268,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<CacheSubnetGroupName>';
+AND Identifier = '{{ cache_subnet_group_name }}';
 ```
 
 
@@ -278,7 +277,7 @@ AND Identifier = '<CacheSubnetGroupName>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.elasticache.subnet_groups
-WHERE Identifier = '<CacheSubnetGroupName>'
+WHERE Identifier = '{{ cache_subnet_group_name }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/elasticache/user_groups/index.md b/website/docs/services/elasticache/user_groups/index.md
index 866c8ed60..3908e9a0f 100644
--- a/website/docs/services/elasticache/user_groups/index.md
+++ b/website/docs/services/elasticache/user_groups/index.md
@@ -176,7 +176,7 @@ user_ids,
 arn,
 tags
 FROM awscc.elasticache.user_groups
-WHERE region = 'us-east-1' AND Identifier = '<UserGroupId>';
+WHERE region = 'us-east-1' AND Identifier = '{{ user_group_id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -214,10 +214,10 @@ INSERT INTO awscc.elasticache.user_groups (
  UserIds,
  region
 )
-SELECT 
-'{{ UserGroupId }}',
- '{{ Engine }}',
- '{{ UserIds }}',
+SELECT
+'{{ user_group_id }}',
+ '{{ engine }}',
+ '{{ user_ids }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -232,11 +232,11 @@ INSERT INTO awscc.elasticache.user_groups (
  Tags,
  region
 )
-SELECT 
- '{{ UserGroupId }}',
- '{{ Engine }}',
- '{{ UserIds }}',
- '{{ Tags }}',
+SELECT
+ '{{ user_group_id }}',
+ '{{ engine }}',
+ '{{ user_ids }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -254,18 +254,17 @@ globals:
 resources:
   - name: user_group
     props:
-      - name: UserGroupId
-        value: '{{ UserGroupId }}'
-      - name: Engine
-        value: '{{ Engine }}'
-      - name: UserIds
+      - name: user_group_id
+        value: '{{ user_group_id }}'
+      - name: engine
+        value: '{{ engine }}'
+      - name: user_ids
         value:
-          - '{{ UserIds[0] }}'
-      - name: Tags
+          - '{{ user_ids[0] }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -283,7 +282,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<UserGroupId>';
+AND Identifier = '{{ user_group_id }}';
 ```
 
 
@@ -292,7 +291,7 @@ AND Identifier = '<UserGroupId>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.elasticache.user_groups
-WHERE Identifier = '<UserGroupId>'
+WHERE Identifier = '{{ user_group_id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/elasticache/users/index.md b/website/docs/services/elasticache/users/index.md
index 6c385b78a..da63fda26 100644
--- a/website/docs/services/elasticache/users/index.md
+++ b/website/docs/services/elasticache/users/index.md
@@ -212,7 +212,7 @@ arn,
 authentication_mode,
 tags
 FROM awscc.elasticache.users
-WHERE region = 'us-east-1' AND Identifier = '<UserId>';
+WHERE region = 'us-east-1' AND Identifier = '{{ user_id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -250,10 +250,10 @@ INSERT INTO awscc.elasticache.users (
  Engine,
  region
 )
-SELECT 
-'{{ UserId }}',
- '{{ UserName }}',
- '{{ Engine }}',
+SELECT
+'{{ user_id }}',
+ '{{ user_name }}',
+ '{{ engine }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -272,15 +272,15 @@ INSERT INTO awscc.elasticache.users (
  Tags,
  region
 )
-SELECT 
- '{{ UserId }}',
- '{{ UserName }}',
- '{{ Engine }}',
- '{{ AccessString }}',
- '{{ NoPasswordRequired }}',
- '{{ Passwords }}',
- '{{ AuthenticationMode }}',
- '{{ Tags }}',
+SELECT
+ '{{ user_id }}',
+ '{{ user_name }}',
+ '{{ engine }}',
+ '{{ access_string }}',
+ '{{ no_password_required }}',
+ '{{ passwords }}',
+ '{{ authentication_mode }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -298,29 +298,28 @@ globals:
 resources:
   - name: user
     props:
-      - name: UserId
-        value: '{{ UserId }}'
-      - name: UserName
-        value: '{{ UserName }}'
-      - name: Engine
-        value: '{{ Engine }}'
-      - name: AccessString
-        value: '{{ AccessString }}'
-      - name: NoPasswordRequired
-        value: '{{ NoPasswordRequired }}'
-      - name: Passwords
+      - name: user_id
+        value: '{{ user_id }}'
+      - name: user_name
+        value: '{{ user_name }}'
+      - name: engine
+        value: '{{ engine }}'
+      - name: access_string
+        value: '{{ access_string }}'
+      - name: no_password_required
+        value: '{{ no_password_required }}'
+      - name: passwords
         value:
-          - '{{ Passwords[0] }}'
-      - name: AuthenticationMode
+          - '{{ passwords[0] }}'
+      - name: authentication_mode
         value:
-          Type: '{{ Type }}'
-          Passwords:
-            - '{{ Passwords[0] }}'
-      - name: Tags
+          type: '{{ type }}'
+          passwords:
+            - '{{ passwords[0] }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -341,7 +340,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<UserId>';
+AND Identifier = '{{ user_id }}';
 ```
 
 
@@ -350,7 +349,7 @@ AND Identifier = '<UserId>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.elasticache.users
-WHERE Identifier = '<UserId>'
+WHERE Identifier = '{{ user_id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/elasticbeanstalk/application_versions/index.md b/website/docs/services/elasticbeanstalk/application_versions/index.md
index 89ccbfa87..14779093d 100644
--- a/website/docs/services/elasticbeanstalk/application_versions/index.md
+++ b/website/docs/services/elasticbeanstalk/application_versions/index.md
@@ -169,7 +169,7 @@ application_name,
 description,
 source_bundle
 FROM awscc.elasticbeanstalk.application_versions
-WHERE region = 'us-east-1' AND Identifier = '<ApplicationName>|<Id>';
+WHERE region = 'us-east-1' AND Identifier = '{{ application_name }}|{{ id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -207,9 +207,9 @@ INSERT INTO awscc.elasticbeanstalk.application_versions (
  SourceBundle,
  region
 )
-SELECT 
-'{{ ApplicationName }}',
- '{{ SourceBundle }}',
+SELECT
+'{{ application_name }}',
+ '{{ source_bundle }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -223,10 +223,10 @@ INSERT INTO awscc.elasticbeanstalk.application_versions (
  SourceBundle,
  region
 )
-SELECT 
- '{{ ApplicationName }}',
- '{{ Description }}',
- '{{ SourceBundle }}',
+SELECT
+ '{{ application_name }}',
+ '{{ description }}',
+ '{{ source_bundle }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -244,15 +244,14 @@ globals:
 resources:
   - name: application_version
     props:
-      - name: ApplicationName
-        value: '{{ ApplicationName }}'
-      - name: Description
-        value: '{{ Description }}'
-      - name: SourceBundle
+      - name: application_name
+        value: '{{ application_name }}'
+      - name: description
+        value: '{{ description }}'
+      - name: source_bundle
         value:
-          S3Bucket: '{{ S3Bucket }}'
-          S3Key: '{{ S3Key }}'
-
+          s3_bucket: '{{ s3_bucket }}'
+          s3_key: '{{ s3_key }}'
 ```
 </TabItem>
 </Tabs>
@@ -268,7 +267,7 @@ SET PatchDocument = string('{{ {
     "Description": description
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<ApplicationName>|<Id>';
+AND Identifier = '{{ application_name }}|{{ id }}';
 ```
 
 
@@ -277,7 +276,7 @@ AND Identifier = '<ApplicationName>|<Id>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.elasticbeanstalk.application_versions
-WHERE Identifier = '<ApplicationName|Id>'
+WHERE Identifier = '{{ application_name }}|{{ id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/elasticbeanstalk/applications/index.md b/website/docs/services/elasticbeanstalk/applications/index.md
index 7a7ec078a..965482397 100644
--- a/website/docs/services/elasticbeanstalk/applications/index.md
+++ b/website/docs/services/elasticbeanstalk/applications/index.md
@@ -204,7 +204,7 @@ application_name,
 description,
 resource_lifecycle_config
 FROM awscc.elasticbeanstalk.applications
-WHERE region = 'us-east-1' AND Identifier = '<ApplicationName>';
+WHERE region = 'us-east-1' AND Identifier = '{{ application_name }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -242,10 +242,10 @@ INSERT INTO awscc.elasticbeanstalk.applications (
  ResourceLifecycleConfig,
  region
 )
-SELECT 
-'{{ ApplicationName }}',
- '{{ Description }}',
- '{{ ResourceLifecycleConfig }}',
+SELECT
+'{{ application_name }}',
+ '{{ description }}',
+ '{{ resource_lifecycle_config }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -259,10 +259,10 @@ INSERT INTO awscc.elasticbeanstalk.applications (
  ResourceLifecycleConfig,
  region
 )
-SELECT 
- '{{ ApplicationName }}',
- '{{ Description }}',
- '{{ ResourceLifecycleConfig }}',
+SELECT
+ '{{ application_name }}',
+ '{{ description }}',
+ '{{ resource_lifecycle_config }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -280,23 +280,22 @@ globals:
 resources:
   - name: application
     props:
-      - name: ApplicationName
-        value: '{{ ApplicationName }}'
-      - name: Description
-        value: '{{ Description }}'
-      - name: ResourceLifecycleConfig
+      - name: application_name
+        value: '{{ application_name }}'
+      - name: description
+        value: '{{ description }}'
+      - name: resource_lifecycle_config
         value:
-          ServiceRole: '{{ ServiceRole }}'
-          VersionLifecycleConfig:
-            MaxAgeRule:
-              DeleteSourceFromS3: '{{ DeleteSourceFromS3 }}'
-              Enabled: '{{ Enabled }}'
-              MaxAgeInDays: '{{ MaxAgeInDays }}'
-            MaxCountRule:
-              DeleteSourceFromS3: '{{ DeleteSourceFromS3 }}'
-              Enabled: '{{ Enabled }}'
-              MaxCount: '{{ MaxCount }}'
-
+          service_role: '{{ service_role }}'
+          version_lifecycle_config:
+            max_age_rule:
+              delete_source_from_s3: '{{ delete_source_from_s3 }}'
+              enabled: '{{ enabled }}'
+              max_age_in_days: '{{ max_age_in_days }}'
+            max_count_rule:
+              delete_source_from_s3: '{{ delete_source_from_s3 }}'
+              enabled: '{{ enabled }}'
+              max_count: '{{ max_count }}'
 ```
 </TabItem>
 </Tabs>
@@ -313,7 +312,7 @@ SET PatchDocument = string('{{ {
     "ResourceLifecycleConfig": resource_lifecycle_config
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<ApplicationName>';
+AND Identifier = '{{ application_name }}';
 ```
 
 
@@ -322,7 +321,7 @@ AND Identifier = '<ApplicationName>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.elasticbeanstalk.applications
-WHERE Identifier = '<ApplicationName>'
+WHERE Identifier = '{{ application_name }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/elasticbeanstalk/configuration_templates/index.md b/website/docs/services/elasticbeanstalk/configuration_templates/index.md
index 1401b214e..16040d1cf 100644
--- a/website/docs/services/elasticbeanstalk/configuration_templates/index.md
+++ b/website/docs/services/elasticbeanstalk/configuration_templates/index.md
@@ -215,7 +215,7 @@ solution_stack_name,
 source_configuration,
 template_name
 FROM awscc.elasticbeanstalk.configuration_templates
-WHERE region = 'us-east-1' AND Identifier = '<ApplicationName>|<TemplateName>';
+WHERE region = 'us-east-1' AND Identifier = '{{ application_name }}|{{ template_name }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -252,8 +252,8 @@ INSERT INTO awscc.elasticbeanstalk.configuration_templates (
  ApplicationName,
  region
 )
-SELECT 
-'{{ ApplicationName }}',
+SELECT
+'{{ application_name }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -271,14 +271,14 @@ INSERT INTO awscc.elasticbeanstalk.configuration_templates (
  SourceConfiguration,
  region
 )
-SELECT 
- '{{ ApplicationName }}',
- '{{ Description }}',
- '{{ EnvironmentId }}',
- '{{ OptionSettings }}',
- '{{ PlatformArn }}',
- '{{ SolutionStackName }}',
- '{{ SourceConfiguration }}',
+SELECT
+ '{{ application_name }}',
+ '{{ description }}',
+ '{{ environment_id }}',
+ '{{ option_settings }}',
+ '{{ platform_arn }}',
+ '{{ solution_stack_name }}',
+ '{{ source_configuration }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -296,27 +296,26 @@ globals:
 resources:
   - name: configuration_template
     props:
-      - name: ApplicationName
-        value: '{{ ApplicationName }}'
-      - name: Description
-        value: '{{ Description }}'
-      - name: EnvironmentId
-        value: '{{ EnvironmentId }}'
-      - name: OptionSettings
+      - name: application_name
+        value: '{{ application_name }}'
+      - name: description
+        value: '{{ description }}'
+      - name: environment_id
+        value: '{{ environment_id }}'
+      - name: option_settings
         value:
-          - Namespace: '{{ Namespace }}'
-            OptionName: '{{ OptionName }}'
-            ResourceName: '{{ ResourceName }}'
-            Value: '{{ Value }}'
-      - name: PlatformArn
-        value: '{{ PlatformArn }}'
-      - name: SolutionStackName
-        value: '{{ SolutionStackName }}'
-      - name: SourceConfiguration
+          - namespace: '{{ namespace }}'
+            option_name: '{{ option_name }}'
+            resource_name: '{{ resource_name }}'
+            value: '{{ value }}'
+      - name: platform_arn
+        value: '{{ platform_arn }}'
+      - name: solution_stack_name
+        value: '{{ solution_stack_name }}'
+      - name: source_configuration
         value:
-          ApplicationName: '{{ ApplicationName }}'
-          TemplateName: '{{ TemplateName }}'
-
+          application_name: '{{ application_name }}'
+          template_name: '{{ template_name }}'
 ```
 </TabItem>
 </Tabs>
@@ -333,7 +332,7 @@ SET PatchDocument = string('{{ {
     "OptionSettings": option_settings
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<ApplicationName>|<TemplateName>';
+AND Identifier = '{{ application_name }}|{{ template_name }}';
 ```
 
 
@@ -342,7 +341,7 @@ AND Identifier = '<ApplicationName>|<TemplateName>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.elasticbeanstalk.configuration_templates
-WHERE Identifier = '<ApplicationName|TemplateName>'
+WHERE Identifier = '{{ application_name }}|{{ template_name }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/elasticbeanstalk/environments/index.md b/website/docs/services/elasticbeanstalk/environments/index.md
index f4b3794d1..42e69a180 100644
--- a/website/docs/services/elasticbeanstalk/environments/index.md
+++ b/website/docs/services/elasticbeanstalk/environments/index.md
@@ -257,7 +257,7 @@ solution_stack_name,
 cname_prefix,
 tags
 FROM awscc.elasticbeanstalk.environments
-WHERE region = 'us-east-1' AND Identifier = '<EnvironmentName>';
+WHERE region = 'us-east-1' AND Identifier = '{{ environment_name }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -293,8 +293,8 @@ INSERT INTO awscc.elasticbeanstalk.environments (
  ApplicationName,
  region
 )
-SELECT 
-'{{ ApplicationName }}',
+SELECT
+'{{ application_name }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -317,19 +317,19 @@ INSERT INTO awscc.elasticbeanstalk.environments (
  Tags,
  region
 )
-SELECT 
- '{{ PlatformArn }}',
- '{{ ApplicationName }}',
- '{{ Description }}',
- '{{ EnvironmentName }}',
- '{{ OperationsRole }}',
- '{{ Tier }}',
- '{{ VersionLabel }}',
- '{{ OptionSettings }}',
- '{{ TemplateName }}',
- '{{ SolutionStackName }}',
- '{{ CNAMEPrefix }}',
- '{{ Tags }}',
+SELECT
+ '{{ platform_arn }}',
+ '{{ application_name }}',
+ '{{ description }}',
+ '{{ environment_name }}',
+ '{{ operations_role }}',
+ '{{ tier }}',
+ '{{ version_label }}',
+ '{{ option_settings }}',
+ '{{ template_name }}',
+ '{{ solution_stack_name }}',
+ '{{ cname_prefix }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -347,40 +347,39 @@ globals:
 resources:
   - name: environment
     props:
-      - name: PlatformArn
-        value: '{{ PlatformArn }}'
-      - name: ApplicationName
-        value: '{{ ApplicationName }}'
-      - name: Description
-        value: '{{ Description }}'
-      - name: EnvironmentName
-        value: '{{ EnvironmentName }}'
-      - name: OperationsRole
-        value: '{{ OperationsRole }}'
-      - name: Tier
+      - name: platform_arn
+        value: '{{ platform_arn }}'
+      - name: application_name
+        value: '{{ application_name }}'
+      - name: description
+        value: '{{ description }}'
+      - name: environment_name
+        value: '{{ environment_name }}'
+      - name: operations_role
+        value: '{{ operations_role }}'
+      - name: tier
         value:
-          Type: '{{ Type }}'
-          Version: '{{ Version }}'
-          Name: '{{ Name }}'
-      - name: VersionLabel
-        value: '{{ VersionLabel }}'
-      - name: OptionSettings
+          type: '{{ type }}'
+          version: '{{ version }}'
+          name: '{{ name }}'
+      - name: version_label
+        value: '{{ version_label }}'
+      - name: option_settings
         value:
-          - ResourceName: '{{ ResourceName }}'
-            Value: '{{ Value }}'
-            Namespace: '{{ Namespace }}'
-            OptionName: '{{ OptionName }}'
-      - name: TemplateName
-        value: '{{ TemplateName }}'
-      - name: SolutionStackName
-        value: '{{ SolutionStackName }}'
-      - name: CNAMEPrefix
-        value: '{{ CNAMEPrefix }}'
-      - name: Tags
+          - resource_name: '{{ resource_name }}'
+            value: '{{ value }}'
+            namespace: '{{ namespace }}'
+            option_name: '{{ option_name }}'
+      - name: template_name
+        value: '{{ template_name }}'
+      - name: solution_stack_name
+        value: '{{ solution_stack_name }}'
+      - name: cname_prefix
+        value: '{{ cname_prefix }}'
+      - name: tags
         value:
-          - Value: '{{ Value }}'
-            Key: '{{ Key }}'
-
+          - value: '{{ value }}'
+            key: '{{ key }}'
 ```
 </TabItem>
 </Tabs>
@@ -402,7 +401,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<EnvironmentName>';
+AND Identifier = '{{ environment_name }}';
 ```
 
 
@@ -411,7 +410,7 @@ AND Identifier = '<EnvironmentName>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.elasticbeanstalk.environments
-WHERE Identifier = '<EnvironmentName>'
+WHERE Identifier = '{{ environment_name }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/elasticloadbalancingv2/listener_rules/index.md b/website/docs/services/elasticloadbalancingv2/listener_rules/index.md
index d4072d6a5..2c21cbbf8 100644
--- a/website/docs/services/elasticloadbalancingv2/listener_rules/index.md
+++ b/website/docs/services/elasticloadbalancingv2/listener_rules/index.md
@@ -475,7 +475,7 @@ priority,
 rule_arn,
 conditions
 FROM awscc.elasticloadbalancingv2.listener_rules
-WHERE region = 'us-east-1' AND Identifier = '<RuleArn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ rule_arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -513,10 +513,10 @@ INSERT INTO awscc.elasticloadbalancingv2.listener_rules (
  Conditions,
  region
 )
-SELECT 
-'{{ Actions }}',
- '{{ Priority }}',
- '{{ Conditions }}',
+SELECT
+'{{ actions }}',
+ '{{ priority }}',
+ '{{ conditions }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -531,11 +531,11 @@ INSERT INTO awscc.elasticloadbalancingv2.listener_rules (
  Conditions,
  region
 )
-SELECT 
- '{{ ListenerArn }}',
- '{{ Actions }}',
- '{{ Priority }}',
- '{{ Conditions }}',
+SELECT
+ '{{ listener_arn }}',
+ '{{ actions }}',
+ '{{ priority }}',
+ '{{ conditions }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -553,77 +553,76 @@ globals:
 resources:
   - name: listener_rule
     props:
-      - name: ListenerArn
-        value: '{{ ListenerArn }}'
-      - name: Actions
+      - name: listener_arn
+        value: '{{ listener_arn }}'
+      - name: actions
         value:
-          - Order: '{{ Order }}'
-            TargetGroupArn: '{{ TargetGroupArn }}'
-            FixedResponseConfig:
-              ContentType: '{{ ContentType }}'
-              StatusCode: '{{ StatusCode }}'
-              MessageBody: '{{ MessageBody }}'
-            AuthenticateCognitoConfig:
-              OnUnauthenticatedRequest: '{{ OnUnauthenticatedRequest }}'
-              UserPoolClientId: '{{ UserPoolClientId }}'
-              UserPoolDomain: '{{ UserPoolDomain }}'
-              SessionTimeout: '{{ SessionTimeout }}'
-              Scope: '{{ Scope }}'
-              SessionCookieName: '{{ SessionCookieName }}'
-              UserPoolArn: '{{ UserPoolArn }}'
-              AuthenticationRequestExtraParams: {}
-            Type: '{{ Type }}'
-            RedirectConfig:
-              Path: '{{ Path }}'
-              Query: '{{ Query }}'
-              Port: '{{ Port }}'
-              Host: '{{ Host }}'
-              Protocol: '{{ Protocol }}'
-              StatusCode: '{{ StatusCode }}'
-            ForwardConfig:
-              TargetGroupStickinessConfig:
-                Enabled: '{{ Enabled }}'
-                DurationSeconds: '{{ DurationSeconds }}'
-              TargetGroups:
-                - TargetGroupArn: '{{ TargetGroupArn }}'
-                  Weight: '{{ Weight }}'
-            AuthenticateOidcConfig:
-              OnUnauthenticatedRequest: '{{ OnUnauthenticatedRequest }}'
-              TokenEndpoint: '{{ TokenEndpoint }}'
-              UseExistingClientSecret: '{{ UseExistingClientSecret }}'
-              SessionTimeout: '{{ SessionTimeout }}'
-              Scope: '{{ Scope }}'
-              Issuer: '{{ Issuer }}'
-              ClientSecret: '{{ ClientSecret }}'
-              UserInfoEndpoint: '{{ UserInfoEndpoint }}'
-              ClientId: '{{ ClientId }}'
-              AuthorizationEndpoint: '{{ AuthorizationEndpoint }}'
-              SessionCookieName: '{{ SessionCookieName }}'
-              AuthenticationRequestExtraParams: {}
-      - name: Priority
-        value: '{{ Priority }}'
-      - name: Conditions
+          - order: '{{ order }}'
+            target_group_arn: '{{ target_group_arn }}'
+            fixed_response_config:
+              content_type: '{{ content_type }}'
+              status_code: '{{ status_code }}'
+              message_body: '{{ message_body }}'
+            authenticate_cognito_config:
+              on_unauthenticated_request: '{{ on_unauthenticated_request }}'
+              user_pool_client_id: '{{ user_pool_client_id }}'
+              user_pool_domain: '{{ user_pool_domain }}'
+              session_timeout: '{{ session_timeout }}'
+              scope: '{{ scope }}'
+              session_cookie_name: '{{ session_cookie_name }}'
+              user_pool_arn: '{{ user_pool_arn }}'
+              authentication_request_extra_params: {}
+            type: '{{ type }}'
+            redirect_config:
+              path: '{{ path }}'
+              query: '{{ query }}'
+              port: '{{ port }}'
+              host: '{{ host }}'
+              protocol: '{{ protocol }}'
+              status_code: '{{ status_code }}'
+            forward_config:
+              target_group_stickiness_config:
+                enabled: '{{ enabled }}'
+                duration_seconds: '{{ duration_seconds }}'
+              target_groups:
+                - target_group_arn: '{{ target_group_arn }}'
+                  weight: '{{ weight }}'
+            authenticate_oidc_config:
+              on_unauthenticated_request: '{{ on_unauthenticated_request }}'
+              token_endpoint: '{{ token_endpoint }}'
+              use_existing_client_secret: '{{ use_existing_client_secret }}'
+              session_timeout: '{{ session_timeout }}'
+              scope: '{{ scope }}'
+              issuer: '{{ issuer }}'
+              client_secret: '{{ client_secret }}'
+              user_info_endpoint: '{{ user_info_endpoint }}'
+              client_id: '{{ client_id }}'
+              authorization_endpoint: '{{ authorization_endpoint }}'
+              session_cookie_name: '{{ session_cookie_name }}'
+              authentication_request_extra_params: {}
+      - name: priority
+        value: '{{ priority }}'
+      - name: conditions
         value:
-          - Field: '{{ Field }}'
-            HttpHeaderConfig:
-              Values:
-                - '{{ Values[0] }}'
-              HttpHeaderName: '{{ HttpHeaderName }}'
-            Values: null
-            QueryStringConfig:
-              Values:
-                - Value: '{{ Value }}'
-                  Key: '{{ Key }}'
-            HostHeaderConfig:
-              Values: null
-            HttpRequestMethodConfig:
-              Values: null
-            PathPatternConfig:
-              Values: null
-            SourceIpConfig:
-              Values:
-                - '{{ Values[0] }}'
-
+          - field: '{{ field }}'
+            http_header_config:
+              values:
+                - '{{ values[0] }}'
+              http_header_name: '{{ http_header_name }}'
+            values: null
+            query_string_config:
+              values:
+                - value: '{{ value }}'
+                  key: '{{ key }}'
+            host_header_config:
+              values: null
+            http_request_method_config:
+              values: null
+            path_pattern_config:
+              values: null
+            source_ip_config:
+              values:
+                - '{{ values[0] }}'
 ```
 </TabItem>
 </Tabs>
@@ -641,7 +640,7 @@ SET PatchDocument = string('{{ {
     "Conditions": conditions
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<RuleArn>';
+AND Identifier = '{{ rule_arn }}';
 ```
 
 
@@ -650,7 +649,7 @@ AND Identifier = '<RuleArn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.elasticloadbalancingv2.listener_rules
-WHERE Identifier = '<RuleArn>'
+WHERE Identifier = '{{ rule_arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/elasticloadbalancingv2/listeners/index.md b/website/docs/services/elasticloadbalancingv2/listeners/index.md
index d36561346..a0da6d519 100644
--- a/website/docs/services/elasticloadbalancingv2/listeners/index.md
+++ b/website/docs/services/elasticloadbalancingv2/listeners/index.md
@@ -460,7 +460,7 @@ port,
 certificates,
 protocol
 FROM awscc.elasticloadbalancingv2.listeners
-WHERE region = 'us-east-1' AND Identifier = '<ListenerArn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ listener_arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -497,9 +497,9 @@ INSERT INTO awscc.elasticloadbalancingv2.listeners (
  DefaultActions,
  region
 )
-SELECT 
-'{{ LoadBalancerArn }}',
- '{{ DefaultActions }}',
+SELECT
+'{{ load_balancer_arn }}',
+ '{{ default_actions }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -519,16 +519,16 @@ INSERT INTO awscc.elasticloadbalancingv2.listeners (
  Protocol,
  region
 )
-SELECT 
- '{{ MutualAuthentication }}',
- '{{ ListenerAttributes }}',
- '{{ AlpnPolicy }}',
- '{{ SslPolicy }}',
- '{{ LoadBalancerArn }}',
- '{{ DefaultActions }}',
- '{{ Port }}',
- '{{ Certificates }}',
- '{{ Protocol }}',
+SELECT
+ '{{ mutual_authentication }}',
+ '{{ listener_attributes }}',
+ '{{ alpn_policy }}',
+ '{{ ssl_policy }}',
+ '{{ load_balancer_arn }}',
+ '{{ default_actions }}',
+ '{{ port }}',
+ '{{ certificates }}',
+ '{{ protocol }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -546,76 +546,75 @@ globals:
 resources:
   - name: listener
     props:
-      - name: MutualAuthentication
+      - name: mutual_authentication
         value:
-          IgnoreClientCertificateExpiry: '{{ IgnoreClientCertificateExpiry }}'
-          Mode: '{{ Mode }}'
-          TrustStoreArn: '{{ TrustStoreArn }}'
-          AdvertiseTrustStoreCaNames: '{{ AdvertiseTrustStoreCaNames }}'
-      - name: ListenerAttributes
+          ignore_client_certificate_expiry: '{{ ignore_client_certificate_expiry }}'
+          mode: '{{ mode }}'
+          trust_store_arn: '{{ trust_store_arn }}'
+          advertise_trust_store_ca_names: '{{ advertise_trust_store_ca_names }}'
+      - name: listener_attributes
         value:
-          - Value: '{{ Value }}'
-            Key: '{{ Key }}'
-      - name: AlpnPolicy
+          - value: '{{ value }}'
+            key: '{{ key }}'
+      - name: alpn_policy
         value:
-          - '{{ AlpnPolicy[0] }}'
-      - name: SslPolicy
-        value: '{{ SslPolicy }}'
-      - name: LoadBalancerArn
-        value: '{{ LoadBalancerArn }}'
-      - name: DefaultActions
+          - '{{ alpn_policy[0] }}'
+      - name: ssl_policy
+        value: '{{ ssl_policy }}'
+      - name: load_balancer_arn
+        value: '{{ load_balancer_arn }}'
+      - name: default_actions
         value:
-          - Order: '{{ Order }}'
-            TargetGroupArn: '{{ TargetGroupArn }}'
-            FixedResponseConfig:
-              ContentType: '{{ ContentType }}'
-              StatusCode: '{{ StatusCode }}'
-              MessageBody: '{{ MessageBody }}'
-            AuthenticateCognitoConfig:
-              OnUnauthenticatedRequest: '{{ OnUnauthenticatedRequest }}'
-              UserPoolClientId: '{{ UserPoolClientId }}'
-              UserPoolDomain: '{{ UserPoolDomain }}'
-              SessionTimeout: '{{ SessionTimeout }}'
-              Scope: '{{ Scope }}'
-              SessionCookieName: '{{ SessionCookieName }}'
-              UserPoolArn: '{{ UserPoolArn }}'
-              AuthenticationRequestExtraParams: {}
-            Type: '{{ Type }}'
-            RedirectConfig:
-              Path: '{{ Path }}'
-              Query: '{{ Query }}'
-              Port: '{{ Port }}'
-              Host: '{{ Host }}'
-              Protocol: '{{ Protocol }}'
-              StatusCode: '{{ StatusCode }}'
-            ForwardConfig:
-              TargetGroupStickinessConfig:
-                Enabled: '{{ Enabled }}'
-                DurationSeconds: '{{ DurationSeconds }}'
-              TargetGroups:
-                - TargetGroupArn: '{{ TargetGroupArn }}'
-                  Weight: '{{ Weight }}'
-            AuthenticateOidcConfig:
-              OnUnauthenticatedRequest: '{{ OnUnauthenticatedRequest }}'
-              TokenEndpoint: '{{ TokenEndpoint }}'
-              UseExistingClientSecret: '{{ UseExistingClientSecret }}'
-              SessionTimeout: '{{ SessionTimeout }}'
-              Scope: '{{ Scope }}'
-              Issuer: '{{ Issuer }}'
-              ClientSecret: '{{ ClientSecret }}'
-              UserInfoEndpoint: '{{ UserInfoEndpoint }}'
-              ClientId: '{{ ClientId }}'
-              AuthorizationEndpoint: '{{ AuthorizationEndpoint }}'
-              SessionCookieName: '{{ SessionCookieName }}'
-              AuthenticationRequestExtraParams: {}
-      - name: Port
-        value: '{{ Port }}'
-      - name: Certificates
+          - order: '{{ order }}'
+            target_group_arn: '{{ target_group_arn }}'
+            fixed_response_config:
+              content_type: '{{ content_type }}'
+              status_code: '{{ status_code }}'
+              message_body: '{{ message_body }}'
+            authenticate_cognito_config:
+              on_unauthenticated_request: '{{ on_unauthenticated_request }}'
+              user_pool_client_id: '{{ user_pool_client_id }}'
+              user_pool_domain: '{{ user_pool_domain }}'
+              session_timeout: '{{ session_timeout }}'
+              scope: '{{ scope }}'
+              session_cookie_name: '{{ session_cookie_name }}'
+              user_pool_arn: '{{ user_pool_arn }}'
+              authentication_request_extra_params: {}
+            type: '{{ type }}'
+            redirect_config:
+              path: '{{ path }}'
+              query: '{{ query }}'
+              port: '{{ port }}'
+              host: '{{ host }}'
+              protocol: '{{ protocol }}'
+              status_code: '{{ status_code }}'
+            forward_config:
+              target_group_stickiness_config:
+                enabled: '{{ enabled }}'
+                duration_seconds: '{{ duration_seconds }}'
+              target_groups:
+                - target_group_arn: '{{ target_group_arn }}'
+                  weight: '{{ weight }}'
+            authenticate_oidc_config:
+              on_unauthenticated_request: '{{ on_unauthenticated_request }}'
+              token_endpoint: '{{ token_endpoint }}'
+              use_existing_client_secret: '{{ use_existing_client_secret }}'
+              session_timeout: '{{ session_timeout }}'
+              scope: '{{ scope }}'
+              issuer: '{{ issuer }}'
+              client_secret: '{{ client_secret }}'
+              user_info_endpoint: '{{ user_info_endpoint }}'
+              client_id: '{{ client_id }}'
+              authorization_endpoint: '{{ authorization_endpoint }}'
+              session_cookie_name: '{{ session_cookie_name }}'
+              authentication_request_extra_params: {}
+      - name: port
+        value: '{{ port }}'
+      - name: certificates
         value:
-          - CertificateArn: '{{ CertificateArn }}'
-      - name: Protocol
-        value: '{{ Protocol }}'
-
+          - certificate_arn: '{{ certificate_arn }}'
+      - name: protocol
+        value: '{{ protocol }}'
 ```
 </TabItem>
 </Tabs>
@@ -638,7 +637,7 @@ SET PatchDocument = string('{{ {
     "Protocol": protocol
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<ListenerArn>';
+AND Identifier = '{{ listener_arn }}';
 ```
 
 
@@ -647,7 +646,7 @@ AND Identifier = '<ListenerArn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.elasticloadbalancingv2.listeners
-WHERE Identifier = '<ListenerArn>'
+WHERE Identifier = '{{ listener_arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/elasticloadbalancingv2/load_balancers/index.md b/website/docs/services/elasticloadbalancingv2/load_balancers/index.md
index 26be36c95..fb427f2f0 100644
--- a/website/docs/services/elasticloadbalancingv2/load_balancers/index.md
+++ b/website/docs/services/elasticloadbalancingv2/load_balancers/index.md
@@ -294,7 +294,7 @@ subnet_mappings,
 enforce_security_group_inbound_rules_on_private_link_traffic,
 ipv4_ipam_pool_id
 FROM awscc.elasticloadbalancingv2.load_balancers
-WHERE region = 'us-east-1' AND Identifier = '<LoadBalancerArn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ load_balancer_arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -342,20 +342,20 @@ INSERT INTO awscc.elasticloadbalancingv2.load_balancers (
  Ipv4IpamPoolId,
  region
 )
-SELECT 
-'{{ IpAddressType }}',
- '{{ EnablePrefixForIpv6SourceNat }}',
- '{{ SecurityGroups }}',
- '{{ LoadBalancerAttributes }}',
- '{{ MinimumLoadBalancerCapacity }}',
- '{{ Scheme }}',
- '{{ Name }}',
- '{{ Subnets }}',
- '{{ Type }}',
- '{{ Tags }}',
- '{{ SubnetMappings }}',
- '{{ EnforceSecurityGroupInboundRulesOnPrivateLinkTraffic }}',
- '{{ Ipv4IpamPoolId }}',
+SELECT
+'{{ ip_address_type }}',
+ '{{ enable_prefix_for_ipv6_source_nat }}',
+ '{{ security_groups }}',
+ '{{ load_balancer_attributes }}',
+ '{{ minimum_load_balancer_capacity }}',
+ '{{ scheme }}',
+ '{{ name }}',
+ '{{ subnets }}',
+ '{{ type }}',
+ '{{ tags }}',
+ '{{ subnet_mappings }}',
+ '{{ enforce_security_group_inbound_rules_on_private_link_traffic }}',
+ '{{ ipv4_ipam_pool_id }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -379,20 +379,20 @@ INSERT INTO awscc.elasticloadbalancingv2.load_balancers (
  Ipv4IpamPoolId,
  region
 )
-SELECT 
- '{{ IpAddressType }}',
- '{{ EnablePrefixForIpv6SourceNat }}',
- '{{ SecurityGroups }}',
- '{{ LoadBalancerAttributes }}',
- '{{ MinimumLoadBalancerCapacity }}',
- '{{ Scheme }}',
- '{{ Name }}',
- '{{ Subnets }}',
- '{{ Type }}',
- '{{ Tags }}',
- '{{ SubnetMappings }}',
- '{{ EnforceSecurityGroupInboundRulesOnPrivateLinkTraffic }}',
- '{{ Ipv4IpamPoolId }}',
+SELECT
+ '{{ ip_address_type }}',
+ '{{ enable_prefix_for_ipv6_source_nat }}',
+ '{{ security_groups }}',
+ '{{ load_balancer_attributes }}',
+ '{{ minimum_load_balancer_capacity }}',
+ '{{ scheme }}',
+ '{{ name }}',
+ '{{ subnets }}',
+ '{{ type }}',
+ '{{ tags }}',
+ '{{ subnet_mappings }}',
+ '{{ enforce_security_group_inbound_rules_on_private_link_traffic }}',
+ '{{ ipv4_ipam_pool_id }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -410,45 +410,44 @@ globals:
 resources:
   - name: load_balancer
     props:
-      - name: IpAddressType
-        value: '{{ IpAddressType }}'
-      - name: EnablePrefixForIpv6SourceNat
-        value: '{{ EnablePrefixForIpv6SourceNat }}'
-      - name: SecurityGroups
+      - name: ip_address_type
+        value: '{{ ip_address_type }}'
+      - name: enable_prefix_for_ipv6_source_nat
+        value: '{{ enable_prefix_for_ipv6_source_nat }}'
+      - name: security_groups
         value:
-          - '{{ SecurityGroups[0] }}'
-      - name: LoadBalancerAttributes
+          - '{{ security_groups[0] }}'
+      - name: load_balancer_attributes
         value:
-          - Value: '{{ Value }}'
-            Key: '{{ Key }}'
-      - name: MinimumLoadBalancerCapacity
+          - value: '{{ value }}'
+            key: '{{ key }}'
+      - name: minimum_load_balancer_capacity
         value:
-          CapacityUnits: '{{ CapacityUnits }}'
-      - name: Scheme
-        value: '{{ Scheme }}'
-      - name: Name
-        value: '{{ Name }}'
-      - name: Subnets
+          capacity_units: '{{ capacity_units }}'
+      - name: scheme
+        value: '{{ scheme }}'
+      - name: name
+        value: '{{ name }}'
+      - name: subnets
         value:
-          - '{{ Subnets[0] }}'
-      - name: Type
-        value: '{{ Type }}'
-      - name: Tags
+          - '{{ subnets[0] }}'
+      - name: type
+        value: '{{ type }}'
+      - name: tags
         value:
-          - Value: '{{ Value }}'
-            Key: '{{ Key }}'
-      - name: SubnetMappings
+          - value: '{{ value }}'
+            key: '{{ key }}'
+      - name: subnet_mappings
         value:
-          - SubnetId: '{{ SubnetId }}'
-            AllocationId: '{{ AllocationId }}'
-            PrivateIPv4Address: '{{ PrivateIPv4Address }}'
-            IPv6Address: '{{ IPv6Address }}'
-            SourceNatIpv6Prefix: '{{ SourceNatIpv6Prefix }}'
-      - name: EnforceSecurityGroupInboundRulesOnPrivateLinkTraffic
-        value: '{{ EnforceSecurityGroupInboundRulesOnPrivateLinkTraffic }}'
-      - name: Ipv4IpamPoolId
-        value: '{{ Ipv4IpamPoolId }}'
-
+          - subnet_id: '{{ subnet_id }}'
+            allocation_id: '{{ allocation_id }}'
+            private_ipv4_address: '{{ private_ipv4_address }}'
+            ipv6_address: '{{ ipv6_address }}'
+            source_nat_ipv6_prefix: '{{ source_nat_ipv6_prefix }}'
+      - name: enforce_security_group_inbound_rules_on_private_link_traffic
+        value: '{{ enforce_security_group_inbound_rules_on_private_link_traffic }}'
+      - name: ipv4_ipam_pool_id
+        value: '{{ ipv4_ipam_pool_id }}'
 ```
 </TabItem>
 </Tabs>
@@ -473,7 +472,7 @@ SET PatchDocument = string('{{ {
     "Ipv4IpamPoolId": ipv4_ipam_pool_id
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<LoadBalancerArn>';
+AND Identifier = '{{ load_balancer_arn }}';
 ```
 
 
@@ -482,7 +481,7 @@ AND Identifier = '<LoadBalancerArn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.elasticloadbalancingv2.load_balancers
-WHERE Identifier = '<LoadBalancerArn>'
+WHERE Identifier = '{{ load_balancer_arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/elasticloadbalancingv2/target_groups/index.md b/website/docs/services/elasticloadbalancingv2/target_groups/index.md
index dc3b44a74..520626b1f 100644
--- a/website/docs/services/elasticloadbalancingv2/target_groups/index.md
+++ b/website/docs/services/elasticloadbalancingv2/target_groups/index.md
@@ -319,7 +319,7 @@ protocol,
 target_group_name,
 tags
 FROM awscc.elasticloadbalancingv2.target_groups
-WHERE region = 'us-east-1' AND Identifier = '<TargetGroupArn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ target_group_arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -373,26 +373,26 @@ INSERT INTO awscc.elasticloadbalancingv2.target_groups (
  Tags,
  region
 )
-SELECT 
-'{{ IpAddressType }}',
- '{{ HealthCheckIntervalSeconds }}',
- '{{ Matcher }}',
- '{{ HealthCheckPath }}',
- '{{ Port }}',
- '{{ Targets }}',
- '{{ HealthCheckEnabled }}',
- '{{ ProtocolVersion }}',
- '{{ UnhealthyThresholdCount }}',
- '{{ HealthCheckTimeoutSeconds }}',
- '{{ Name }}',
- '{{ VpcId }}',
- '{{ HealthyThresholdCount }}',
- '{{ HealthCheckProtocol }}',
- '{{ TargetGroupAttributes }}',
- '{{ TargetType }}',
- '{{ HealthCheckPort }}',
- '{{ Protocol }}',
- '{{ Tags }}',
+SELECT
+'{{ ip_address_type }}',
+ '{{ health_check_interval_seconds }}',
+ '{{ matcher }}',
+ '{{ health_check_path }}',
+ '{{ port }}',
+ '{{ targets }}',
+ '{{ health_check_enabled }}',
+ '{{ protocol_version }}',
+ '{{ unhealthy_threshold_count }}',
+ '{{ health_check_timeout_seconds }}',
+ '{{ name }}',
+ '{{ vpc_id }}',
+ '{{ healthy_threshold_count }}',
+ '{{ health_check_protocol }}',
+ '{{ target_group_attributes }}',
+ '{{ target_type }}',
+ '{{ health_check_port }}',
+ '{{ protocol }}',
+ '{{ tags }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -422,26 +422,26 @@ INSERT INTO awscc.elasticloadbalancingv2.target_groups (
  Tags,
  region
 )
-SELECT 
- '{{ IpAddressType }}',
- '{{ HealthCheckIntervalSeconds }}',
- '{{ Matcher }}',
- '{{ HealthCheckPath }}',
- '{{ Port }}',
- '{{ Targets }}',
- '{{ HealthCheckEnabled }}',
- '{{ ProtocolVersion }}',
- '{{ UnhealthyThresholdCount }}',
- '{{ HealthCheckTimeoutSeconds }}',
- '{{ Name }}',
- '{{ VpcId }}',
- '{{ HealthyThresholdCount }}',
- '{{ HealthCheckProtocol }}',
- '{{ TargetGroupAttributes }}',
- '{{ TargetType }}',
- '{{ HealthCheckPort }}',
- '{{ Protocol }}',
- '{{ Tags }}',
+SELECT
+ '{{ ip_address_type }}',
+ '{{ health_check_interval_seconds }}',
+ '{{ matcher }}',
+ '{{ health_check_path }}',
+ '{{ port }}',
+ '{{ targets }}',
+ '{{ health_check_enabled }}',
+ '{{ protocol_version }}',
+ '{{ unhealthy_threshold_count }}',
+ '{{ health_check_timeout_seconds }}',
+ '{{ name }}',
+ '{{ vpc_id }}',
+ '{{ healthy_threshold_count }}',
+ '{{ health_check_protocol }}',
+ '{{ target_group_attributes }}',
+ '{{ target_type }}',
+ '{{ health_check_port }}',
+ '{{ protocol }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -459,54 +459,53 @@ globals:
 resources:
   - name: target_group
     props:
-      - name: IpAddressType
-        value: '{{ IpAddressType }}'
-      - name: HealthCheckIntervalSeconds
-        value: '{{ HealthCheckIntervalSeconds }}'
-      - name: Matcher
+      - name: ip_address_type
+        value: '{{ ip_address_type }}'
+      - name: health_check_interval_seconds
+        value: '{{ health_check_interval_seconds }}'
+      - name: matcher
         value:
-          GrpcCode: '{{ GrpcCode }}'
-          HttpCode: '{{ HttpCode }}'
-      - name: HealthCheckPath
-        value: '{{ HealthCheckPath }}'
-      - name: Port
-        value: '{{ Port }}'
-      - name: Targets
+          grpc_code: '{{ grpc_code }}'
+          http_code: '{{ http_code }}'
+      - name: health_check_path
+        value: '{{ health_check_path }}'
+      - name: port
+        value: '{{ port }}'
+      - name: targets
         value:
-          - Port: '{{ Port }}'
-            AvailabilityZone: '{{ AvailabilityZone }}'
-            Id: '{{ Id }}'
-      - name: HealthCheckEnabled
-        value: '{{ HealthCheckEnabled }}'
-      - name: ProtocolVersion
-        value: '{{ ProtocolVersion }}'
-      - name: UnhealthyThresholdCount
-        value: '{{ UnhealthyThresholdCount }}'
-      - name: HealthCheckTimeoutSeconds
-        value: '{{ HealthCheckTimeoutSeconds }}'
-      - name: Name
-        value: '{{ Name }}'
-      - name: VpcId
-        value: '{{ VpcId }}'
-      - name: HealthyThresholdCount
-        value: '{{ HealthyThresholdCount }}'
-      - name: HealthCheckProtocol
-        value: '{{ HealthCheckProtocol }}'
-      - name: TargetGroupAttributes
+          - port: '{{ port }}'
+            availability_zone: '{{ availability_zone }}'
+            id: '{{ id }}'
+      - name: health_check_enabled
+        value: '{{ health_check_enabled }}'
+      - name: protocol_version
+        value: '{{ protocol_version }}'
+      - name: unhealthy_threshold_count
+        value: '{{ unhealthy_threshold_count }}'
+      - name: health_check_timeout_seconds
+        value: '{{ health_check_timeout_seconds }}'
+      - name: name
+        value: '{{ name }}'
+      - name: vpc_id
+        value: '{{ vpc_id }}'
+      - name: healthy_threshold_count
+        value: '{{ healthy_threshold_count }}'
+      - name: health_check_protocol
+        value: '{{ health_check_protocol }}'
+      - name: target_group_attributes
         value:
-          - Value: '{{ Value }}'
-            Key: '{{ Key }}'
-      - name: TargetType
-        value: '{{ TargetType }}'
-      - name: HealthCheckPort
-        value: '{{ HealthCheckPort }}'
-      - name: Protocol
-        value: '{{ Protocol }}'
-      - name: Tags
+          - value: '{{ value }}'
+            key: '{{ key }}'
+      - name: target_type
+        value: '{{ target_type }}'
+      - name: health_check_port
+        value: '{{ health_check_port }}'
+      - name: protocol
+        value: '{{ protocol }}'
+      - name: tags
         value:
-          - Value: '{{ Value }}'
-            Key: '{{ Key }}'
-
+          - value: '{{ value }}'
+            key: '{{ key }}'
 ```
 </TabItem>
 </Tabs>
@@ -533,7 +532,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<TargetGroupArn>';
+AND Identifier = '{{ target_group_arn }}';
 ```
 
 
@@ -542,7 +541,7 @@ AND Identifier = '<TargetGroupArn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.elasticloadbalancingv2.target_groups
-WHERE Identifier = '<TargetGroupArn>'
+WHERE Identifier = '{{ target_group_arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/elasticloadbalancingv2/trust_store_revocations/index.md b/website/docs/services/elasticloadbalancingv2/trust_store_revocations/index.md
index 17982d5e4..a095a8487 100644
--- a/website/docs/services/elasticloadbalancingv2/trust_store_revocations/index.md
+++ b/website/docs/services/elasticloadbalancingv2/trust_store_revocations/index.md
@@ -195,7 +195,7 @@ trust_store_arn,
 revocation_id,
 trust_store_revocations
 FROM awscc.elasticloadbalancingv2.trust_store_revocations
-WHERE region = 'us-east-1' AND Identifier = '<RevocationId>|<TrustStoreArn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ revocation_id }}|{{ trust_store_arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -233,9 +233,9 @@ INSERT INTO awscc.elasticloadbalancingv2.trust_store_revocations (
  TrustStoreArn,
  region
 )
-SELECT 
-'{{ RevocationContents }}',
- '{{ TrustStoreArn }}',
+SELECT
+'{{ revocation_contents }}',
+ '{{ trust_store_arn }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -248,9 +248,9 @@ INSERT INTO awscc.elasticloadbalancingv2.trust_store_revocations (
  TrustStoreArn,
  region
 )
-SELECT 
- '{{ RevocationContents }}',
- '{{ TrustStoreArn }}',
+SELECT
+ '{{ revocation_contents }}',
+ '{{ trust_store_arn }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -268,15 +268,14 @@ globals:
 resources:
   - name: trust_store_revocation
     props:
-      - name: RevocationContents
+      - name: revocation_contents
         value:
-          - S3Bucket: '{{ S3Bucket }}'
-            S3Key: '{{ S3Key }}'
-            S3ObjectVersion: '{{ S3ObjectVersion }}'
-            RevocationType: '{{ RevocationType }}'
-      - name: TrustStoreArn
-        value: '{{ TrustStoreArn }}'
-
+          - s3_bucket: '{{ s3_bucket }}'
+            s3_key: '{{ s3_key }}'
+            s3_object_version: '{{ s3_object_version }}'
+            revocation_type: '{{ revocation_type }}'
+      - name: trust_store_arn
+        value: '{{ trust_store_arn }}'
 ```
 </TabItem>
 </Tabs>
@@ -287,7 +286,7 @@ resources:
 ```sql
 /*+ delete */
 DELETE FROM awscc.elasticloadbalancingv2.trust_store_revocations
-WHERE Identifier = '<RevocationId|TrustStoreArn>'
+WHERE Identifier = '{{ revocation_id }}|{{ trust_store_arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/elasticloadbalancingv2/trust_stores/index.md b/website/docs/services/elasticloadbalancingv2/trust_stores/index.md
index 935e276b9..a7904bec9 100644
--- a/website/docs/services/elasticloadbalancingv2/trust_stores/index.md
+++ b/website/docs/services/elasticloadbalancingv2/trust_stores/index.md
@@ -188,7 +188,7 @@ number_of_ca_certificates,
 tags,
 trust_store_arn
 FROM awscc.elasticloadbalancingv2.trust_stores
-WHERE region = 'us-east-1' AND Identifier = '<TrustStoreArn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ trust_store_arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -228,12 +228,12 @@ INSERT INTO awscc.elasticloadbalancingv2.trust_stores (
  Tags,
  region
 )
-SELECT 
-'{{ Name }}',
- '{{ CaCertificatesBundleS3Bucket }}',
- '{{ CaCertificatesBundleS3Key }}',
- '{{ CaCertificatesBundleS3ObjectVersion }}',
- '{{ Tags }}',
+SELECT
+'{{ name }}',
+ '{{ ca_certificates_bundle_s3_bucket }}',
+ '{{ ca_certificates_bundle_s3_key }}',
+ '{{ ca_certificates_bundle_s3_object_version }}',
+ '{{ tags }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -249,12 +249,12 @@ INSERT INTO awscc.elasticloadbalancingv2.trust_stores (
  Tags,
  region
 )
-SELECT 
- '{{ Name }}',
- '{{ CaCertificatesBundleS3Bucket }}',
- '{{ CaCertificatesBundleS3Key }}',
- '{{ CaCertificatesBundleS3ObjectVersion }}',
- '{{ Tags }}',
+SELECT
+ '{{ name }}',
+ '{{ ca_certificates_bundle_s3_bucket }}',
+ '{{ ca_certificates_bundle_s3_key }}',
+ '{{ ca_certificates_bundle_s3_object_version }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -272,19 +272,18 @@ globals:
 resources:
   - name: trust_store
     props:
-      - name: Name
-        value: '{{ Name }}'
-      - name: CaCertificatesBundleS3Bucket
-        value: '{{ CaCertificatesBundleS3Bucket }}'
-      - name: CaCertificatesBundleS3Key
-        value: '{{ CaCertificatesBundleS3Key }}'
-      - name: CaCertificatesBundleS3ObjectVersion
-        value: '{{ CaCertificatesBundleS3ObjectVersion }}'
-      - name: Tags
+      - name: name
+        value: '{{ name }}'
+      - name: ca_certificates_bundle_s3_bucket
+        value: '{{ ca_certificates_bundle_s3_bucket }}'
+      - name: ca_certificates_bundle_s3_key
+        value: '{{ ca_certificates_bundle_s3_key }}'
+      - name: ca_certificates_bundle_s3_object_version
+        value: '{{ ca_certificates_bundle_s3_object_version }}'
+      - name: tags
         value:
-          - Value: '{{ Value }}'
-            Key: '{{ Key }}'
-
+          - value: '{{ value }}'
+            key: '{{ key }}'
 ```
 </TabItem>
 </Tabs>
@@ -303,7 +302,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<TrustStoreArn>';
+AND Identifier = '{{ trust_store_arn }}';
 ```
 
 
@@ -312,7 +311,7 @@ AND Identifier = '<TrustStoreArn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.elasticloadbalancingv2.trust_stores
-WHERE Identifier = '<TrustStoreArn>'
+WHERE Identifier = '{{ trust_store_arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/emr/security_configurations/index.md b/website/docs/services/emr/security_configurations/index.md
index 4b43b9363..c6af96e8c 100644
--- a/website/docs/services/emr/security_configurations/index.md
+++ b/website/docs/services/emr/security_configurations/index.md
@@ -134,7 +134,7 @@ region,
 name,
 security_configuration
 FROM awscc.emr.security_configurations
-WHERE region = 'us-east-1' AND Identifier = '<Name>';
+WHERE region = 'us-east-1' AND Identifier = '{{ name }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -170,8 +170,8 @@ INSERT INTO awscc.emr.security_configurations (
  SecurityConfiguration,
  region
 )
-SELECT 
-'{{ SecurityConfiguration }}',
+SELECT
+'{{ security_configuration }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -184,9 +184,9 @@ INSERT INTO awscc.emr.security_configurations (
  SecurityConfiguration,
  region
 )
-SELECT 
- '{{ Name }}',
- '{{ SecurityConfiguration }}',
+SELECT
+ '{{ name }}',
+ '{{ security_configuration }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -204,11 +204,10 @@ globals:
 resources:
   - name: security_configuration
     props:
-      - name: Name
-        value: '{{ Name }}'
-      - name: SecurityConfiguration
+      - name: name
+        value: '{{ name }}'
+      - name: security_configuration
         value: {}
-
 ```
 </TabItem>
 </Tabs>
@@ -219,7 +218,7 @@ resources:
 ```sql
 /*+ delete */
 DELETE FROM awscc.emr.security_configurations
-WHERE Identifier = '<Name>'
+WHERE Identifier = '{{ name }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/emr/steps/index.md b/website/docs/services/emr/steps/index.md
index 908462d70..69ab14787 100644
--- a/website/docs/services/emr/steps/index.md
+++ b/website/docs/services/emr/steps/index.md
@@ -136,7 +136,7 @@ hadoop_jar_step,
 job_flow_id,
 name
 FROM awscc.emr.steps
-WHERE region = 'us-east-1' AND Identifier = '<Id>';
+WHERE region = 'us-east-1' AND Identifier = '{{ id }}';
 ```
 
 ## `INSERT` example
@@ -162,11 +162,11 @@ INSERT INTO awscc.emr.steps (
  Name,
  region
 )
-SELECT 
-'{{ ActionOnFailure }}',
- '{{ HadoopJarStep }}',
- '{{ JobFlowId }}',
- '{{ Name }}',
+SELECT
+'{{ action_on_failure }}',
+ '{{ hadoop_jar_step }}',
+ '{{ job_flow_id }}',
+ '{{ name }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -181,11 +181,11 @@ INSERT INTO awscc.emr.steps (
  Name,
  region
 )
-SELECT 
- '{{ ActionOnFailure }}',
- '{{ HadoopJarStep }}',
- '{{ JobFlowId }}',
- '{{ Name }}',
+SELECT
+ '{{ action_on_failure }}',
+ '{{ hadoop_jar_step }}',
+ '{{ job_flow_id }}',
+ '{{ name }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -203,22 +203,21 @@ globals:
 resources:
   - name: step
     props:
-      - name: ActionOnFailure
-        value: '{{ ActionOnFailure }}'
-      - name: HadoopJarStep
+      - name: action_on_failure
+        value: '{{ action_on_failure }}'
+      - name: hadoop_jar_step
         value:
-          Args:
-            - '{{ Args[0] }}'
-          Jar: '{{ Jar }}'
-          MainClass: '{{ MainClass }}'
-          StepProperties:
-            - Key: '{{ Key }}'
-              Value: '{{ Value }}'
-      - name: JobFlowId
-        value: '{{ JobFlowId }}'
-      - name: Name
-        value: '{{ Name }}'
-
+          args:
+            - '{{ args[0] }}'
+          jar: '{{ jar }}'
+          main_class: '{{ main_class }}'
+          step_properties:
+            - key: '{{ key }}'
+              value: '{{ value }}'
+      - name: job_flow_id
+        value: '{{ job_flow_id }}'
+      - name: name
+        value: '{{ name }}'
 ```
 </TabItem>
 </Tabs>
diff --git a/website/docs/services/emr/studio_session_mappings/index.md b/website/docs/services/emr/studio_session_mappings/index.md
index 5f10d7d6d..d600ea570 100644
--- a/website/docs/services/emr/studio_session_mappings/index.md
+++ b/website/docs/services/emr/studio_session_mappings/index.md
@@ -162,7 +162,7 @@ identity_type,
 session_policy_arn,
 studio_id
 FROM awscc.emr.studio_session_mappings
-WHERE region = 'us-east-1' AND Identifier = '<StudioId>|<IdentityType>|<IdentityName>';
+WHERE region = 'us-east-1' AND Identifier = '{{ studio_id }}|{{ identity_type }}|{{ identity_name }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -203,11 +203,11 @@ INSERT INTO awscc.emr.studio_session_mappings (
  StudioId,
  region
 )
-SELECT 
-'{{ IdentityName }}',
- '{{ IdentityType }}',
- '{{ SessionPolicyArn }}',
- '{{ StudioId }}',
+SELECT
+'{{ identity_name }}',
+ '{{ identity_type }}',
+ '{{ session_policy_arn }}',
+ '{{ studio_id }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -222,11 +222,11 @@ INSERT INTO awscc.emr.studio_session_mappings (
  StudioId,
  region
 )
-SELECT 
- '{{ IdentityName }}',
- '{{ IdentityType }}',
- '{{ SessionPolicyArn }}',
- '{{ StudioId }}',
+SELECT
+ '{{ identity_name }}',
+ '{{ identity_type }}',
+ '{{ session_policy_arn }}',
+ '{{ studio_id }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -244,15 +244,14 @@ globals:
 resources:
   - name: studio_session_mapping
     props:
-      - name: IdentityName
-        value: '{{ IdentityName }}'
-      - name: IdentityType
-        value: '{{ IdentityType }}'
-      - name: SessionPolicyArn
-        value: '{{ SessionPolicyArn }}'
-      - name: StudioId
-        value: '{{ StudioId }}'
-
+      - name: identity_name
+        value: '{{ identity_name }}'
+      - name: identity_type
+        value: '{{ identity_type }}'
+      - name: session_policy_arn
+        value: '{{ session_policy_arn }}'
+      - name: studio_id
+        value: '{{ studio_id }}'
 ```
 </TabItem>
 </Tabs>
@@ -268,7 +267,7 @@ SET PatchDocument = string('{{ {
     "SessionPolicyArn": session_policy_arn
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<StudioId>|<IdentityType>|<IdentityName>';
+AND Identifier = '{{ studio_id }}|{{ identity_type }}|{{ identity_name }}';
 ```
 
 
@@ -277,7 +276,7 @@ AND Identifier = '<StudioId>|<IdentityType>|<IdentityName>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.emr.studio_session_mappings
-WHERE Identifier = '<StudioId|IdentityType|IdentityName>'
+WHERE Identifier = '{{ studio_id }}|{{ identity_type }}|{{ identity_name }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/emr/studios/index.md b/website/docs/services/emr/studios/index.md
index 4358119f1..d57252e2b 100644
--- a/website/docs/services/emr/studios/index.md
+++ b/website/docs/services/emr/studios/index.md
@@ -245,7 +245,7 @@ idc_user_assignment,
 idc_instance_arn,
 encryption_key_arn
 FROM awscc.emr.studios
-WHERE region = 'us-east-1' AND Identifier = '<StudioId>';
+WHERE region = 'us-east-1' AND Identifier = '{{ studio_id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -288,15 +288,15 @@ INSERT INTO awscc.emr.studios (
  WorkspaceSecurityGroupId,
  region
 )
-SELECT 
-'{{ AuthMode }}',
- '{{ DefaultS3Location }}',
- '{{ EngineSecurityGroupId }}',
- '{{ Name }}',
- '{{ ServiceRole }}',
- '{{ SubnetIds }}',
- '{{ VpcId }}',
- '{{ WorkspaceSecurityGroupId }}',
+SELECT
+'{{ auth_mode }}',
+ '{{ default_s3_location }}',
+ '{{ engine_security_group_id }}',
+ '{{ name }}',
+ '{{ service_role }}',
+ '{{ subnet_ids }}',
+ '{{ vpc_id }}',
+ '{{ workspace_security_group_id }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -324,24 +324,24 @@ INSERT INTO awscc.emr.studios (
  EncryptionKeyArn,
  region
 )
-SELECT 
- '{{ AuthMode }}',
- '{{ DefaultS3Location }}',
- '{{ Description }}',
- '{{ EngineSecurityGroupId }}',
- '{{ Name }}',
- '{{ ServiceRole }}',
- '{{ SubnetIds }}',
- '{{ Tags }}',
- '{{ UserRole }}',
- '{{ VpcId }}',
- '{{ WorkspaceSecurityGroupId }}',
- '{{ IdpAuthUrl }}',
- '{{ IdpRelayStateParameterName }}',
- '{{ TrustedIdentityPropagationEnabled }}',
- '{{ IdcUserAssignment }}',
- '{{ IdcInstanceArn }}',
- '{{ EncryptionKeyArn }}',
+SELECT
+ '{{ auth_mode }}',
+ '{{ default_s3_location }}',
+ '{{ description }}',
+ '{{ engine_security_group_id }}',
+ '{{ name }}',
+ '{{ service_role }}',
+ '{{ subnet_ids }}',
+ '{{ tags }}',
+ '{{ user_role }}',
+ '{{ vpc_id }}',
+ '{{ workspace_security_group_id }}',
+ '{{ idp_auth_url }}',
+ '{{ idp_relay_state_parameter_name }}',
+ '{{ trusted_identity_propagation_enabled }}',
+ '{{ idc_user_assignment }}',
+ '{{ idc_instance_arn }}',
+ '{{ encryption_key_arn }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -359,44 +359,43 @@ globals:
 resources:
   - name: studio
     props:
-      - name: AuthMode
-        value: '{{ AuthMode }}'
-      - name: DefaultS3Location
-        value: '{{ DefaultS3Location }}'
-      - name: Description
-        value: '{{ Description }}'
-      - name: EngineSecurityGroupId
-        value: '{{ EngineSecurityGroupId }}'
-      - name: Name
-        value: '{{ Name }}'
-      - name: ServiceRole
-        value: '{{ ServiceRole }}'
-      - name: SubnetIds
+      - name: auth_mode
+        value: '{{ auth_mode }}'
+      - name: default_s3_location
+        value: '{{ default_s3_location }}'
+      - name: description
+        value: '{{ description }}'
+      - name: engine_security_group_id
+        value: '{{ engine_security_group_id }}'
+      - name: name
+        value: '{{ name }}'
+      - name: service_role
+        value: '{{ service_role }}'
+      - name: subnet_ids
         value:
-          - '{{ SubnetIds[0] }}'
-      - name: Tags
+          - '{{ subnet_ids[0] }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-      - name: UserRole
+          - key: '{{ key }}'
+            value: '{{ value }}'
+      - name: user_role
         value: null
-      - name: VpcId
-        value: '{{ VpcId }}'
-      - name: WorkspaceSecurityGroupId
-        value: '{{ WorkspaceSecurityGroupId }}'
-      - name: IdpAuthUrl
-        value: '{{ IdpAuthUrl }}'
-      - name: IdpRelayStateParameterName
-        value: '{{ IdpRelayStateParameterName }}'
-      - name: TrustedIdentityPropagationEnabled
-        value: '{{ TrustedIdentityPropagationEnabled }}'
-      - name: IdcUserAssignment
-        value: '{{ IdcUserAssignment }}'
-      - name: IdcInstanceArn
-        value: '{{ IdcInstanceArn }}'
-      - name: EncryptionKeyArn
+      - name: vpc_id
+        value: '{{ vpc_id }}'
+      - name: workspace_security_group_id
+        value: '{{ workspace_security_group_id }}'
+      - name: idp_auth_url
+        value: '{{ idp_auth_url }}'
+      - name: idp_relay_state_parameter_name
+        value: '{{ idp_relay_state_parameter_name }}'
+      - name: trusted_identity_propagation_enabled
+        value: '{{ trusted_identity_propagation_enabled }}'
+      - name: idc_user_assignment
+        value: '{{ idc_user_assignment }}'
+      - name: idc_instance_arn
+        value: '{{ idc_instance_arn }}'
+      - name: encryption_key_arn
         value: null
-
 ```
 </TabItem>
 </Tabs>
@@ -418,7 +417,7 @@ SET PatchDocument = string('{{ {
     "IdpRelayStateParameterName": idp_relay_state_parameter_name
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<StudioId>';
+AND Identifier = '{{ studio_id }}';
 ```
 
 
@@ -427,7 +426,7 @@ AND Identifier = '<StudioId>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.emr.studios
-WHERE Identifier = '<StudioId>'
+WHERE Identifier = '{{ studio_id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/emr/wal_workspaces/index.md b/website/docs/services/emr/wal_workspaces/index.md
index cf3ad6b7b..d72c08c55 100644
--- a/website/docs/services/emr/wal_workspaces/index.md
+++ b/website/docs/services/emr/wal_workspaces/index.md
@@ -152,7 +152,7 @@ region,
 wal_workspace_name,
 tags
 FROM awscc.emr.wal_workspaces
-WHERE region = 'us-east-1' AND Identifier = '<WALWorkspaceName>';
+WHERE region = 'us-east-1' AND Identifier = '{{ wal_workspace_name }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -189,9 +189,9 @@ INSERT INTO awscc.emr.wal_workspaces (
  Tags,
  region
 )
-SELECT 
-'{{ WALWorkspaceName }}',
- '{{ Tags }}',
+SELECT
+'{{ wal_workspace_name }}',
+ '{{ tags }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -204,9 +204,9 @@ INSERT INTO awscc.emr.wal_workspaces (
  Tags,
  region
 )
-SELECT 
- '{{ WALWorkspaceName }}',
- '{{ Tags }}',
+SELECT
+ '{{ wal_workspace_name }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -224,13 +224,12 @@ globals:
 resources:
   - name: wal_workspace
     props:
-      - name: WALWorkspaceName
-        value: '{{ WALWorkspaceName }}'
-      - name: Tags
+      - name: wal_workspace_name
+        value: '{{ wal_workspace_name }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -246,7 +245,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<WALWorkspaceName>';
+AND Identifier = '{{ wal_workspace_name }}';
 ```
 
 
@@ -255,7 +254,7 @@ AND Identifier = '<WALWorkspaceName>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.emr.wal_workspaces
-WHERE Identifier = '<WALWorkspaceName>'
+WHERE Identifier = '{{ wal_workspace_name }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/emrcontainers/virtual_clusters/index.md b/website/docs/services/emrcontainers/virtual_clusters/index.md
index 13dbef1a9..e68c4dd11 100644
--- a/website/docs/services/emrcontainers/virtual_clusters/index.md
+++ b/website/docs/services/emrcontainers/virtual_clusters/index.md
@@ -207,7 +207,7 @@ name,
 tags,
 security_configuration_id
 FROM awscc.emrcontainers.virtual_clusters
-WHERE region = 'us-east-1' AND Identifier = '<Id>';
+WHERE region = 'us-east-1' AND Identifier = '{{ id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -244,9 +244,9 @@ INSERT INTO awscc.emrcontainers.virtual_clusters (
  Name,
  region
 )
-SELECT 
-'{{ ContainerProvider }}',
- '{{ Name }}',
+SELECT
+'{{ container_provider }}',
+ '{{ name }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -261,11 +261,11 @@ INSERT INTO awscc.emrcontainers.virtual_clusters (
  SecurityConfigurationId,
  region
 )
-SELECT 
- '{{ ContainerProvider }}',
- '{{ Name }}',
- '{{ Tags }}',
- '{{ SecurityConfigurationId }}',
+SELECT
+ '{{ container_provider }}',
+ '{{ name }}',
+ '{{ tags }}',
+ '{{ security_configuration_id }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -283,22 +283,21 @@ globals:
 resources:
   - name: virtual_cluster
     props:
-      - name: ContainerProvider
+      - name: container_provider
         value:
-          Type: '{{ Type }}'
-          Id: '{{ Id }}'
-          Info:
-            EksInfo:
-              Namespace: '{{ Namespace }}'
-      - name: Name
-        value: '{{ Name }}'
-      - name: Tags
+          type: '{{ type }}'
+          id: '{{ id }}'
+          info:
+            eks_info:
+              namespace: '{{ namespace }}'
+      - name: name
+        value: '{{ name }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-      - name: SecurityConfigurationId
-        value: '{{ SecurityConfigurationId }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
+      - name: security_configuration_id
+        value: '{{ security_configuration_id }}'
 ```
 </TabItem>
 </Tabs>
@@ -315,7 +314,7 @@ SET PatchDocument = string('{{ {
     "SecurityConfigurationId": security_configuration_id
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Id>';
+AND Identifier = '{{ id }}';
 ```
 
 
@@ -324,7 +323,7 @@ AND Identifier = '<Id>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.emrcontainers.virtual_clusters
-WHERE Identifier = '<Id>'
+WHERE Identifier = '{{ id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/emrserverless/applications/index.md b/website/docs/services/emrserverless/applications/index.md
index 7024c5e1d..1ad540563 100644
--- a/website/docs/services/emrserverless/applications/index.md
+++ b/website/docs/services/emrserverless/applications/index.md
@@ -495,7 +495,7 @@ worker_type_specifications,
 scheduler_configuration,
 identity_center_configuration
 FROM awscc.emrserverless.applications
-WHERE region = 'us-east-1' AND Identifier = '<ApplicationId>';
+WHERE region = 'us-east-1' AND Identifier = '{{ application_id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -532,9 +532,9 @@ INSERT INTO awscc.emrserverless.applications (
  Type,
  region
 )
-SELECT 
-'{{ ReleaseLabel }}',
- '{{ Type }}',
+SELECT
+'{{ release_label }}',
+ '{{ type }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -562,24 +562,24 @@ INSERT INTO awscc.emrserverless.applications (
  IdentityCenterConfiguration,
  region
 )
-SELECT 
- '{{ Architecture }}',
- '{{ Name }}',
- '{{ ReleaseLabel }}',
- '{{ Type }}',
- '{{ InitialCapacity }}',
- '{{ MaximumCapacity }}',
- '{{ Tags }}',
- '{{ AutoStartConfiguration }}',
- '{{ AutoStopConfiguration }}',
- '{{ ImageConfiguration }}',
- '{{ MonitoringConfiguration }}',
- '{{ RuntimeConfiguration }}',
- '{{ InteractiveConfiguration }}',
- '{{ NetworkConfiguration }}',
- '{{ WorkerTypeSpecifications }}',
- '{{ SchedulerConfiguration }}',
- '{{ IdentityCenterConfiguration }}',
+SELECT
+ '{{ architecture }}',
+ '{{ name }}',
+ '{{ release_label }}',
+ '{{ type }}',
+ '{{ initial_capacity }}',
+ '{{ maximum_capacity }}',
+ '{{ tags }}',
+ '{{ auto_start_configuration }}',
+ '{{ auto_stop_configuration }}',
+ '{{ image_configuration }}',
+ '{{ monitoring_configuration }}',
+ '{{ runtime_configuration }}',
+ '{{ interactive_configuration }}',
+ '{{ network_configuration }}',
+ '{{ worker_type_specifications }}',
+ '{{ scheduler_configuration }}',
+ '{{ identity_center_configuration }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -597,75 +597,74 @@ globals:
 resources:
   - name: application
     props:
-      - name: Architecture
-        value: '{{ Architecture }}'
-      - name: Name
-        value: '{{ Name }}'
-      - name: ReleaseLabel
-        value: '{{ ReleaseLabel }}'
-      - name: Type
-        value: '{{ Type }}'
-      - name: InitialCapacity
+      - name: architecture
+        value: '{{ architecture }}'
+      - name: name
+        value: '{{ name }}'
+      - name: release_label
+        value: '{{ release_label }}'
+      - name: type
+        value: '{{ type }}'
+      - name: initial_capacity
         value:
-          - Key: '{{ Key }}'
-            Value:
-              WorkerCount: '{{ WorkerCount }}'
-              WorkerConfiguration:
-                Cpu: '{{ Cpu }}'
-                Memory: '{{ Memory }}'
-                Disk: '{{ Disk }}'
-                DiskType: '{{ DiskType }}'
-      - name: MaximumCapacity
+          - key: '{{ key }}'
+            value:
+              worker_count: '{{ worker_count }}'
+              worker_configuration:
+                cpu: '{{ cpu }}'
+                memory: '{{ memory }}'
+                disk: '{{ disk }}'
+                disk_type: '{{ disk_type }}'
+      - name: maximum_capacity
         value:
-          Cpu: null
-          Memory: null
-          Disk: null
-      - name: Tags
+          cpu: null
+          memory: null
+          disk: null
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-      - name: AutoStartConfiguration
+          - key: '{{ key }}'
+            value: '{{ value }}'
+      - name: auto_start_configuration
         value:
-          Enabled: '{{ Enabled }}'
-      - name: AutoStopConfiguration
+          enabled: '{{ enabled }}'
+      - name: auto_stop_configuration
         value:
-          Enabled: '{{ Enabled }}'
-          IdleTimeoutMinutes: '{{ IdleTimeoutMinutes }}'
-      - name: ImageConfiguration
+          enabled: '{{ enabled }}'
+          idle_timeout_minutes: '{{ idle_timeout_minutes }}'
+      - name: image_configuration
         value:
-          ImageUri: '{{ ImageUri }}'
-      - name: MonitoringConfiguration
+          image_uri: '{{ image_uri }}'
+      - name: monitoring_configuration
         value:
-          S3MonitoringConfiguration: null
-          ManagedPersistenceMonitoringConfiguration: null
-          CloudWatchLoggingConfiguration: null
-          PrometheusMonitoringConfiguration: null
-      - name: RuntimeConfiguration
+          s3_monitoring_configuration: null
+          managed_persistence_monitoring_configuration: null
+          cloud_watch_logging_configuration: null
+          prometheus_monitoring_configuration: null
+      - name: runtime_configuration
         value:
-          - Classification: '{{ Classification }}'
-            Properties: {}
-            Configurations:
+          - classification: '{{ classification }}'
+            properties: {}
+            configurations:
               - null
-      - name: InteractiveConfiguration
+      - name: interactive_configuration
         value:
-          LivyEndpointEnabled: '{{ LivyEndpointEnabled }}'
-          StudioEnabled: '{{ StudioEnabled }}'
-      - name: NetworkConfiguration
+          livy_endpoint_enabled: '{{ livy_endpoint_enabled }}'
+          studio_enabled: '{{ studio_enabled }}'
+      - name: network_configuration
         value:
-          SubnetIds:
-            - '{{ SubnetIds[0] }}'
-          SecurityGroupIds:
-            - '{{ SecurityGroupIds[0] }}'
-      - name: WorkerTypeSpecifications
+          subnet_ids:
+            - '{{ subnet_ids[0] }}'
+          security_group_ids:
+            - '{{ security_group_ids[0] }}'
+      - name: worker_type_specifications
         value: {}
-      - name: SchedulerConfiguration
+      - name: scheduler_configuration
         value:
-          QueueTimeoutMinutes: '{{ QueueTimeoutMinutes }}'
-          MaxConcurrentRuns: '{{ MaxConcurrentRuns }}'
-      - name: IdentityCenterConfiguration
+          queue_timeout_minutes: '{{ queue_timeout_minutes }}'
+          max_concurrent_runs: '{{ max_concurrent_runs }}'
+      - name: identity_center_configuration
         value:
-          IdentityCenterInstanceArn: '{{ IdentityCenterInstanceArn }}'
-
+          identity_center_instance_arn: '{{ identity_center_instance_arn }}'
 ```
 </TabItem>
 </Tabs>
@@ -695,7 +694,7 @@ SET PatchDocument = string('{{ {
     "IdentityCenterConfiguration": identity_center_configuration
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<ApplicationId>';
+AND Identifier = '{{ application_id }}';
 ```
 
 
@@ -704,7 +703,7 @@ AND Identifier = '<ApplicationId>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.emrserverless.applications
-WHERE Identifier = '<ApplicationId>'
+WHERE Identifier = '{{ application_id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/entityresolution/id_mapping_workflows/index.md b/website/docs/services/entityresolution/id_mapping_workflows/index.md
index 3cd04b3d2..f1f9e6d34 100644
--- a/website/docs/services/entityresolution/id_mapping_workflows/index.md
+++ b/website/docs/services/entityresolution/id_mapping_workflows/index.md
@@ -317,7 +317,7 @@ updated_at,
 role_arn,
 tags
 FROM awscc.entityresolution.id_mapping_workflows
-WHERE region = 'us-east-1' AND Identifier = '<WorkflowName>';
+WHERE region = 'us-east-1' AND Identifier = '{{ workflow_name }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -356,11 +356,11 @@ INSERT INTO awscc.entityresolution.id_mapping_workflows (
  RoleArn,
  region
 )
-SELECT 
-'{{ InputSourceConfig }}',
- '{{ IdMappingTechniques }}',
- '{{ WorkflowName }}',
- '{{ RoleArn }}',
+SELECT
+'{{ input_source_config }}',
+ '{{ id_mapping_techniques }}',
+ '{{ workflow_name }}',
+ '{{ role_arn }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -379,15 +379,15 @@ INSERT INTO awscc.entityresolution.id_mapping_workflows (
  Tags,
  region
 )
-SELECT 
- '{{ Description }}',
- '{{ InputSourceConfig }}',
- '{{ IdMappingTechniques }}',
- '{{ WorkflowName }}',
- '{{ OutputSourceConfig }}',
- '{{ IdMappingIncrementalRunConfig }}',
- '{{ RoleArn }}',
- '{{ Tags }}',
+SELECT
+ '{{ description }}',
+ '{{ input_source_config }}',
+ '{{ id_mapping_techniques }}',
+ '{{ workflow_name }}',
+ '{{ output_source_config }}',
+ '{{ id_mapping_incremental_run_config }}',
+ '{{ role_arn }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -405,45 +405,44 @@ globals:
 resources:
   - name: id_mapping_workflow
     props:
-      - name: Description
-        value: '{{ Description }}'
-      - name: InputSourceConfig
+      - name: description
+        value: '{{ description }}'
+      - name: input_source_config
         value:
-          - Type: '{{ Type }}'
-            InputSourceARN: '{{ InputSourceARN }}'
-            SchemaArn: '{{ SchemaArn }}'
-      - name: IdMappingTechniques
+          - type: '{{ type }}'
+            input_source_arn: '{{ input_source_arn }}'
+            schema_arn: '{{ schema_arn }}'
+      - name: id_mapping_techniques
         value:
-          RuleBasedProperties:
-            AttributeMatchingModel: '{{ AttributeMatchingModel }}'
-            RuleDefinitionType: '{{ RuleDefinitionType }}'
-            Rules:
-              - RuleName: '{{ RuleName }}'
-                MatchingKeys:
-                  - '{{ MatchingKeys[0] }}'
-            RecordMatchingModel: '{{ RecordMatchingModel }}'
-          ProviderProperties:
-            ProviderServiceArn: '{{ ProviderServiceArn }}'
-            ProviderConfiguration: {}
-            IntermediateSourceConfiguration:
-              IntermediateS3Path: '{{ IntermediateS3Path }}'
-          IdMappingType: '{{ IdMappingType }}'
-      - name: WorkflowName
-        value: '{{ WorkflowName }}'
-      - name: OutputSourceConfig
+          rule_based_properties:
+            attribute_matching_model: '{{ attribute_matching_model }}'
+            rule_definition_type: '{{ rule_definition_type }}'
+            rules:
+              - rule_name: '{{ rule_name }}'
+                matching_keys:
+                  - '{{ matching_keys[0] }}'
+            record_matching_model: '{{ record_matching_model }}'
+          provider_properties:
+            provider_service_arn: '{{ provider_service_arn }}'
+            provider_configuration: {}
+            intermediate_source_configuration:
+              intermediate_s3_path: '{{ intermediate_s3_path }}'
+          id_mapping_type: '{{ id_mapping_type }}'
+      - name: workflow_name
+        value: '{{ workflow_name }}'
+      - name: output_source_config
         value:
-          - KMSArn: '{{ KMSArn }}'
-            OutputS3Path: '{{ OutputS3Path }}'
-      - name: IdMappingIncrementalRunConfig
+          - kms_arn: '{{ kms_arn }}'
+            output_s3_path: '{{ output_s3_path }}'
+      - name: id_mapping_incremental_run_config
         value:
-          IncrementalRunType: '{{ IncrementalRunType }}'
-      - name: RoleArn
-        value: '{{ RoleArn }}'
-      - name: Tags
+          incremental_run_type: '{{ incremental_run_type }}'
+      - name: role_arn
+        value: '{{ role_arn }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -465,7 +464,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<WorkflowName>';
+AND Identifier = '{{ workflow_name }}';
 ```
 
 
@@ -474,7 +473,7 @@ AND Identifier = '<WorkflowName>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.entityresolution.id_mapping_workflows
-WHERE Identifier = '<WorkflowName>'
+WHERE Identifier = '{{ workflow_name }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/entityresolution/id_namespaces/index.md b/website/docs/services/entityresolution/id_namespaces/index.md
index fce6caa46..3ad311c52 100644
--- a/website/docs/services/entityresolution/id_namespaces/index.md
+++ b/website/docs/services/entityresolution/id_namespaces/index.md
@@ -270,7 +270,7 @@ created_at,
 updated_at,
 tags
 FROM awscc.entityresolution.id_namespaces
-WHERE region = 'us-east-1' AND Identifier = '<IdNamespaceName>';
+WHERE region = 'us-east-1' AND Identifier = '{{ id_namespace_name }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -307,9 +307,9 @@ INSERT INTO awscc.entityresolution.id_namespaces (
  Type,
  region
 )
-SELECT 
-'{{ IdNamespaceName }}',
- '{{ Type }}',
+SELECT
+'{{ id_namespace_name }}',
+ '{{ type }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -327,14 +327,14 @@ INSERT INTO awscc.entityresolution.id_namespaces (
  Tags,
  region
 )
-SELECT 
- '{{ IdNamespaceName }}',
- '{{ Description }}',
- '{{ InputSourceConfig }}',
- '{{ IdMappingWorkflowProperties }}',
- '{{ Type }}',
- '{{ RoleArn }}',
- '{{ Tags }}',
+SELECT
+ '{{ id_namespace_name }}',
+ '{{ description }}',
+ '{{ input_source_config }}',
+ '{{ id_mapping_workflow_properties }}',
+ '{{ type }}',
+ '{{ role_arn }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -352,39 +352,38 @@ globals:
 resources:
   - name: id_namespace
     props:
-      - name: IdNamespaceName
-        value: '{{ IdNamespaceName }}'
-      - name: Description
-        value: '{{ Description }}'
-      - name: InputSourceConfig
+      - name: id_namespace_name
+        value: '{{ id_namespace_name }}'
+      - name: description
+        value: '{{ description }}'
+      - name: input_source_config
         value:
-          - InputSourceARN: '{{ InputSourceARN }}'
-            SchemaName: null
-      - name: IdMappingWorkflowProperties
+          - input_source_arn: '{{ input_source_arn }}'
+            schema_name: null
+      - name: id_mapping_workflow_properties
         value:
-          - IdMappingType: '{{ IdMappingType }}'
-            RuleBasedProperties:
-              Rules:
-                - RuleName: '{{ RuleName }}'
-                  MatchingKeys:
-                    - '{{ MatchingKeys[0] }}'
-              RuleDefinitionTypes:
-                - '{{ RuleDefinitionTypes[0] }}'
-              AttributeMatchingModel: '{{ AttributeMatchingModel }}'
-              RecordMatchingModels:
-                - '{{ RecordMatchingModels[0] }}'
-            ProviderProperties:
-              ProviderServiceArn: '{{ ProviderServiceArn }}'
-              ProviderConfiguration: {}
-      - name: Type
-        value: '{{ Type }}'
-      - name: RoleArn
-        value: '{{ RoleArn }}'
-      - name: Tags
+          - id_mapping_type: '{{ id_mapping_type }}'
+            rule_based_properties:
+              rules:
+                - rule_name: '{{ rule_name }}'
+                  matching_keys:
+                    - '{{ matching_keys[0] }}'
+              rule_definition_types:
+                - '{{ rule_definition_types[0] }}'
+              attribute_matching_model: '{{ attribute_matching_model }}'
+              record_matching_models:
+                - '{{ record_matching_models[0] }}'
+            provider_properties:
+              provider_service_arn: '{{ provider_service_arn }}'
+              provider_configuration: {}
+      - name: type
+        value: '{{ type }}'
+      - name: role_arn
+        value: '{{ role_arn }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -405,7 +404,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<IdNamespaceName>';
+AND Identifier = '{{ id_namespace_name }}';
 ```
 
 
@@ -414,7 +413,7 @@ AND Identifier = '<IdNamespaceName>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.entityresolution.id_namespaces
-WHERE Identifier = '<IdNamespaceName>'
+WHERE Identifier = '{{ id_namespace_name }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/entityresolution/matching_workflows/index.md b/website/docs/services/entityresolution/matching_workflows/index.md
index ef7d55488..686892962 100644
--- a/website/docs/services/entityresolution/matching_workflows/index.md
+++ b/website/docs/services/entityresolution/matching_workflows/index.md
@@ -358,7 +358,7 @@ created_at,
 updated_at,
 incremental_run_config
 FROM awscc.entityresolution.matching_workflows
-WHERE region = 'us-east-1' AND Identifier = '<WorkflowName>';
+WHERE region = 'us-east-1' AND Identifier = '{{ workflow_name }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -398,12 +398,12 @@ INSERT INTO awscc.entityresolution.matching_workflows (
  RoleArn,
  region
 )
-SELECT 
-'{{ WorkflowName }}',
- '{{ InputSourceConfig }}',
- '{{ OutputSourceConfig }}',
- '{{ ResolutionTechniques }}',
- '{{ RoleArn }}',
+SELECT
+'{{ workflow_name }}',
+ '{{ input_source_config }}',
+ '{{ output_source_config }}',
+ '{{ resolution_techniques }}',
+ '{{ role_arn }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -422,15 +422,15 @@ INSERT INTO awscc.entityresolution.matching_workflows (
  IncrementalRunConfig,
  region
 )
-SELECT 
- '{{ WorkflowName }}',
- '{{ Description }}',
- '{{ InputSourceConfig }}',
- '{{ OutputSourceConfig }}',
- '{{ ResolutionTechniques }}',
- '{{ RoleArn }}',
- '{{ Tags }}',
- '{{ IncrementalRunConfig }}',
+SELECT
+ '{{ workflow_name }}',
+ '{{ description }}',
+ '{{ input_source_config }}',
+ '{{ output_source_config }}',
+ '{{ resolution_techniques }}',
+ '{{ role_arn }}',
+ '{{ tags }}',
+ '{{ incremental_run_config }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -448,52 +448,51 @@ globals:
 resources:
   - name: matching_workflow
     props:
-      - name: WorkflowName
-        value: '{{ WorkflowName }}'
-      - name: Description
-        value: '{{ Description }}'
-      - name: InputSourceConfig
+      - name: workflow_name
+        value: '{{ workflow_name }}'
+      - name: description
+        value: '{{ description }}'
+      - name: input_source_config
         value:
-          - InputSourceARN: '{{ InputSourceARN }}'
-            SchemaArn: '{{ SchemaArn }}'
-            ApplyNormalization: '{{ ApplyNormalization }}'
-      - name: OutputSourceConfig
+          - input_source_arn: '{{ input_source_arn }}'
+            schema_arn: '{{ schema_arn }}'
+            apply_normalization: '{{ apply_normalization }}'
+      - name: output_source_config
         value:
-          - OutputS3Path: '{{ OutputS3Path }}'
-            Output:
-              - Name: '{{ Name }}'
-                Hashed: '{{ Hashed }}'
-            KMSArn: '{{ KMSArn }}'
-            ApplyNormalization: '{{ ApplyNormalization }}'
-      - name: ResolutionTechniques
+          - output_s3_path: '{{ output_s3_path }}'
+            output:
+              - name: '{{ name }}'
+                hashed: '{{ hashed }}'
+            kms_arn: '{{ kms_arn }}'
+            apply_normalization: '{{ apply_normalization }}'
+      - name: resolution_techniques
         value:
-          ResolutionType: '{{ ResolutionType }}'
-          RuleBasedProperties:
-            Rules:
-              - RuleName: '{{ RuleName }}'
-                MatchingKeys:
+          resolution_type: '{{ resolution_type }}'
+          rule_based_properties:
+            rules:
+              - rule_name: '{{ rule_name }}'
+                matching_keys:
                   - null
-            AttributeMatchingModel: '{{ AttributeMatchingModel }}'
-            MatchPurpose: '{{ MatchPurpose }}'
-          RuleConditionProperties:
-            Rules:
-              - RuleName: null
-                Condition: '{{ Condition }}'
-          ProviderProperties:
-            ProviderServiceArn: '{{ ProviderServiceArn }}'
-            ProviderConfiguration: {}
-            IntermediateSourceConfiguration:
-              IntermediateS3Path: '{{ IntermediateS3Path }}'
-      - name: RoleArn
-        value: '{{ RoleArn }}'
-      - name: Tags
+            attribute_matching_model: '{{ attribute_matching_model }}'
+            match_purpose: '{{ match_purpose }}'
+          rule_condition_properties:
+            rules:
+              - rule_name: null
+                condition: '{{ condition }}'
+          provider_properties:
+            provider_service_arn: '{{ provider_service_arn }}'
+            provider_configuration: {}
+            intermediate_source_configuration:
+              intermediate_s3_path: '{{ intermediate_s3_path }}'
+      - name: role_arn
+        value: '{{ role_arn }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-      - name: IncrementalRunConfig
+          - key: '{{ key }}'
+            value: '{{ value }}'
+      - name: incremental_run_config
         value:
-          IncrementalRunType: '{{ IncrementalRunType }}'
-
+          incremental_run_type: '{{ incremental_run_type }}'
 ```
 </TabItem>
 </Tabs>
@@ -515,7 +514,7 @@ SET PatchDocument = string('{{ {
     "IncrementalRunConfig": incremental_run_config
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<WorkflowName>';
+AND Identifier = '{{ workflow_name }}';
 ```
 
 
@@ -524,7 +523,7 @@ AND Identifier = '<WorkflowName>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.entityresolution.matching_workflows
-WHERE Identifier = '<WorkflowName>'
+WHERE Identifier = '{{ workflow_name }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/entityresolution/policy_statements/index.md b/website/docs/services/entityresolution/policy_statements/index.md
index 550008b8c..2591c67ef 100644
--- a/website/docs/services/entityresolution/policy_statements/index.md
+++ b/website/docs/services/entityresolution/policy_statements/index.md
@@ -169,7 +169,7 @@ action,
 principal,
 condition
 FROM awscc.entityresolution.policy_statements
-WHERE region = 'us-east-1' AND Identifier = '<Arn>|<StatementId>';
+WHERE region = 'us-east-1' AND Identifier = '{{ arn }}|{{ statement_id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -207,9 +207,9 @@ INSERT INTO awscc.entityresolution.policy_statements (
  StatementId,
  region
 )
-SELECT 
-'{{ Arn }}',
- '{{ StatementId }}',
+SELECT
+'{{ arn }}',
+ '{{ statement_id }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -226,13 +226,13 @@ INSERT INTO awscc.entityresolution.policy_statements (
  Condition,
  region
 )
-SELECT 
- '{{ Arn }}',
- '{{ StatementId }}',
- '{{ Effect }}',
- '{{ Action }}',
- '{{ Principal }}',
- '{{ Condition }}',
+SELECT
+ '{{ arn }}',
+ '{{ statement_id }}',
+ '{{ effect }}',
+ '{{ action }}',
+ '{{ principal }}',
+ '{{ condition }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -250,21 +250,20 @@ globals:
 resources:
   - name: policy_statement
     props:
-      - name: Arn
-        value: '{{ Arn }}'
-      - name: StatementId
-        value: '{{ StatementId }}'
-      - name: Effect
-        value: '{{ Effect }}'
-      - name: Action
+      - name: arn
+        value: '{{ arn }}'
+      - name: statement_id
+        value: '{{ statement_id }}'
+      - name: effect
+        value: '{{ effect }}'
+      - name: action
         value:
-          - '{{ Action[0] }}'
-      - name: Principal
+          - '{{ action[0] }}'
+      - name: principal
         value:
-          - '{{ Principal[0] }}'
-      - name: Condition
-        value: '{{ Condition }}'
-
+          - '{{ principal[0] }}'
+      - name: condition
+        value: '{{ condition }}'
 ```
 </TabItem>
 </Tabs>
@@ -283,7 +282,7 @@ SET PatchDocument = string('{{ {
     "Condition": condition
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Arn>|<StatementId>';
+AND Identifier = '{{ arn }}|{{ statement_id }}';
 ```
 
 
@@ -292,7 +291,7 @@ AND Identifier = '<Arn>|<StatementId>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.entityresolution.policy_statements
-WHERE Identifier = '<Arn|StatementId>'
+WHERE Identifier = '{{ arn }}|{{ statement_id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/entityresolution/schema_mappings/index.md b/website/docs/services/entityresolution/schema_mappings/index.md
index 530d928ab..179eeaf1d 100644
--- a/website/docs/services/entityresolution/schema_mappings/index.md
+++ b/website/docs/services/entityresolution/schema_mappings/index.md
@@ -210,7 +210,7 @@ created_at,
 updated_at,
 has_workflows
 FROM awscc.entityresolution.schema_mappings
-WHERE region = 'us-east-1' AND Identifier = '<SchemaName>';
+WHERE region = 'us-east-1' AND Identifier = '{{ schema_name }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -247,9 +247,9 @@ INSERT INTO awscc.entityresolution.schema_mappings (
  MappedInputFields,
  region
 )
-SELECT 
-'{{ SchemaName }}',
- '{{ MappedInputFields }}',
+SELECT
+'{{ schema_name }}',
+ '{{ mapped_input_fields }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -264,11 +264,11 @@ INSERT INTO awscc.entityresolution.schema_mappings (
  Tags,
  region
 )
-SELECT 
- '{{ SchemaName }}',
- '{{ Description }}',
- '{{ MappedInputFields }}',
- '{{ Tags }}',
+SELECT
+ '{{ schema_name }}',
+ '{{ description }}',
+ '{{ mapped_input_fields }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -286,23 +286,22 @@ globals:
 resources:
   - name: schema_mapping
     props:
-      - name: SchemaName
-        value: '{{ SchemaName }}'
-      - name: Description
-        value: '{{ Description }}'
-      - name: MappedInputFields
+      - name: schema_name
+        value: '{{ schema_name }}'
+      - name: description
+        value: '{{ description }}'
+      - name: mapped_input_fields
         value:
-          - FieldName: '{{ FieldName }}'
-            Type: '{{ Type }}'
-            SubType: '{{ SubType }}'
-            GroupName: null
-            MatchKey: null
-            Hashed: '{{ Hashed }}'
-      - name: Tags
+          - field_name: '{{ field_name }}'
+            type: '{{ type }}'
+            sub_type: '{{ sub_type }}'
+            group_name: null
+            match_key: null
+            hashed: '{{ hashed }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -320,7 +319,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<SchemaName>';
+AND Identifier = '{{ schema_name }}';
 ```
 
 
@@ -329,7 +328,7 @@ AND Identifier = '<SchemaName>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.entityresolution.schema_mappings
-WHERE Identifier = '<SchemaName>'
+WHERE Identifier = '{{ schema_name }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/events/api_destinations/index.md b/website/docs/services/events/api_destinations/index.md
index 13b90a622..d0a1dc4e0 100644
--- a/website/docs/services/events/api_destinations/index.md
+++ b/website/docs/services/events/api_destinations/index.md
@@ -176,7 +176,7 @@ invocation_rate_limit_per_second,
 invocation_endpoint,
 http_method
 FROM awscc.events.api_destinations
-WHERE region = 'us-east-1' AND Identifier = '<Name>';
+WHERE region = 'us-east-1' AND Identifier = '{{ name }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -214,10 +214,10 @@ INSERT INTO awscc.events.api_destinations (
  HttpMethod,
  region
 )
-SELECT 
-'{{ ConnectionArn }}',
- '{{ InvocationEndpoint }}',
- '{{ HttpMethod }}',
+SELECT
+'{{ connection_arn }}',
+ '{{ invocation_endpoint }}',
+ '{{ http_method }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -234,13 +234,13 @@ INSERT INTO awscc.events.api_destinations (
  HttpMethod,
  region
 )
-SELECT 
- '{{ Name }}',
- '{{ Description }}',
- '{{ ConnectionArn }}',
- '{{ InvocationRateLimitPerSecond }}',
- '{{ InvocationEndpoint }}',
- '{{ HttpMethod }}',
+SELECT
+ '{{ name }}',
+ '{{ description }}',
+ '{{ connection_arn }}',
+ '{{ invocation_rate_limit_per_second }}',
+ '{{ invocation_endpoint }}',
+ '{{ http_method }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -258,19 +258,18 @@ globals:
 resources:
   - name: api_destination
     props:
-      - name: Name
-        value: '{{ Name }}'
-      - name: Description
-        value: '{{ Description }}'
-      - name: ConnectionArn
-        value: '{{ ConnectionArn }}'
-      - name: InvocationRateLimitPerSecond
-        value: '{{ InvocationRateLimitPerSecond }}'
-      - name: InvocationEndpoint
-        value: '{{ InvocationEndpoint }}'
-      - name: HttpMethod
-        value: '{{ HttpMethod }}'
-
+      - name: name
+        value: '{{ name }}'
+      - name: description
+        value: '{{ description }}'
+      - name: connection_arn
+        value: '{{ connection_arn }}'
+      - name: invocation_rate_limit_per_second
+        value: '{{ invocation_rate_limit_per_second }}'
+      - name: invocation_endpoint
+        value: '{{ invocation_endpoint }}'
+      - name: http_method
+        value: '{{ http_method }}'
 ```
 </TabItem>
 </Tabs>
@@ -290,7 +289,7 @@ SET PatchDocument = string('{{ {
     "HttpMethod": http_method
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Name>';
+AND Identifier = '{{ name }}';
 ```
 
 
@@ -299,7 +298,7 @@ AND Identifier = '<Name>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.events.api_destinations
-WHERE Identifier = '<Name>'
+WHERE Identifier = '{{ name }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/events/archives/index.md b/website/docs/services/events/archives/index.md
index bc809e277..bf3e10c7d 100644
--- a/website/docs/services/events/archives/index.md
+++ b/website/docs/services/events/archives/index.md
@@ -170,7 +170,7 @@ arn,
 retention_days,
 kms_key_identifier
 FROM awscc.events.archives
-WHERE region = 'us-east-1' AND Identifier = '<ArchiveName>';
+WHERE region = 'us-east-1' AND Identifier = '{{ archive_name }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -206,8 +206,8 @@ INSERT INTO awscc.events.archives (
  SourceArn,
  region
 )
-SELECT 
-'{{ SourceArn }}',
+SELECT
+'{{ source_arn }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -224,13 +224,13 @@ INSERT INTO awscc.events.archives (
  KmsKeyIdentifier,
  region
 )
-SELECT 
- '{{ ArchiveName }}',
- '{{ SourceArn }}',
- '{{ Description }}',
- '{{ EventPattern }}',
- '{{ RetentionDays }}',
- '{{ KmsKeyIdentifier }}',
+SELECT
+ '{{ archive_name }}',
+ '{{ source_arn }}',
+ '{{ description }}',
+ '{{ event_pattern }}',
+ '{{ retention_days }}',
+ '{{ kms_key_identifier }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -248,19 +248,18 @@ globals:
 resources:
   - name: archive
     props:
-      - name: ArchiveName
-        value: '{{ ArchiveName }}'
-      - name: SourceArn
-        value: '{{ SourceArn }}'
-      - name: Description
-        value: '{{ Description }}'
-      - name: EventPattern
+      - name: archive_name
+        value: '{{ archive_name }}'
+      - name: source_arn
+        value: '{{ source_arn }}'
+      - name: description
+        value: '{{ description }}'
+      - name: event_pattern
         value: {}
-      - name: RetentionDays
-        value: '{{ RetentionDays }}'
-      - name: KmsKeyIdentifier
-        value: '{{ KmsKeyIdentifier }}'
-
+      - name: retention_days
+        value: '{{ retention_days }}'
+      - name: kms_key_identifier
+        value: '{{ kms_key_identifier }}'
 ```
 </TabItem>
 </Tabs>
@@ -279,7 +278,7 @@ SET PatchDocument = string('{{ {
     "KmsKeyIdentifier": kms_key_identifier
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<ArchiveName>';
+AND Identifier = '{{ archive_name }}';
 ```
 
 
@@ -288,7 +287,7 @@ AND Identifier = '<ArchiveName>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.events.archives
-WHERE Identifier = '<ArchiveName>'
+WHERE Identifier = '{{ archive_name }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/events/connections/index.md b/website/docs/services/events/connections/index.md
index c05862c10..3c9d131c2 100644
--- a/website/docs/services/events/connections/index.md
+++ b/website/docs/services/events/connections/index.md
@@ -356,7 +356,7 @@ auth_parameters,
 invocation_connectivity_parameters,
 kms_key_identifier
 FROM awscc.events.connections
-WHERE region = 'us-east-1' AND Identifier = '<Name>';
+WHERE region = 'us-east-1' AND Identifier = '{{ name }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -397,13 +397,13 @@ INSERT INTO awscc.events.connections (
  KmsKeyIdentifier,
  region
 )
-SELECT 
-'{{ Name }}',
- '{{ Description }}',
- '{{ AuthorizationType }}',
- '{{ AuthParameters }}',
- '{{ InvocationConnectivityParameters }}',
- '{{ KmsKeyIdentifier }}',
+SELECT
+'{{ name }}',
+ '{{ description }}',
+ '{{ authorization_type }}',
+ '{{ auth_parameters }}',
+ '{{ invocation_connectivity_parameters }}',
+ '{{ kms_key_identifier }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -420,13 +420,13 @@ INSERT INTO awscc.events.connections (
  KmsKeyIdentifier,
  region
 )
-SELECT 
- '{{ Name }}',
- '{{ Description }}',
- '{{ AuthorizationType }}',
- '{{ AuthParameters }}',
- '{{ InvocationConnectivityParameters }}',
- '{{ KmsKeyIdentifier }}',
+SELECT
+ '{{ name }}',
+ '{{ description }}',
+ '{{ authorization_type }}',
+ '{{ auth_parameters }}',
+ '{{ invocation_connectivity_parameters }}',
+ '{{ kms_key_identifier }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -444,46 +444,45 @@ globals:
 resources:
   - name: connection
     props:
-      - name: Name
-        value: '{{ Name }}'
-      - name: Description
-        value: '{{ Description }}'
-      - name: AuthorizationType
-        value: '{{ AuthorizationType }}'
-      - name: AuthParameters
+      - name: name
+        value: '{{ name }}'
+      - name: description
+        value: '{{ description }}'
+      - name: authorization_type
+        value: '{{ authorization_type }}'
+      - name: auth_parameters
         value:
-          ApiKeyAuthParameters:
-            ApiKeyName: '{{ ApiKeyName }}'
-            ApiKeyValue: '{{ ApiKeyValue }}'
-          BasicAuthParameters:
-            Username: '{{ Username }}'
-            Password: '{{ Password }}'
-          OAuthParameters:
-            ClientParameters:
-              ClientID: '{{ ClientID }}'
-              ClientSecret: '{{ ClientSecret }}'
-            AuthorizationEndpoint: '{{ AuthorizationEndpoint }}'
-            HttpMethod: '{{ HttpMethod }}'
-            OAuthHttpParameters:
-              HeaderParameters:
-                - Key: '{{ Key }}'
-                  Value: '{{ Value }}'
-                  IsValueSecret: '{{ IsValueSecret }}'
-              QueryStringParameters:
+          api_key_auth_parameters:
+            api_key_name: '{{ api_key_name }}'
+            api_key_value: '{{ api_key_value }}'
+          basic_auth_parameters:
+            username: '{{ username }}'
+            password: '{{ password }}'
+          oauth_parameters:
+            client_parameters:
+              client_id: '{{ client_id }}'
+              client_secret: '{{ client_secret }}'
+            authorization_endpoint: '{{ authorization_endpoint }}'
+            http_method: '{{ http_method }}'
+            oauth_http_parameters:
+              header_parameters:
+                - key: '{{ key }}'
+                  value: '{{ value }}'
+                  is_value_secret: '{{ is_value_secret }}'
+              query_string_parameters:
                 - null
-              BodyParameters:
+              body_parameters:
                 - null
-          InvocationHttpParameters: null
-          ConnectivityParameters:
-            ResourceParameters:
-              ResourceConfigurationArn: '{{ ResourceConfigurationArn }}'
-              ResourceAssociationArn: '{{ ResourceAssociationArn }}'
-      - name: InvocationConnectivityParameters
+          invocation_http_parameters: null
+          connectivity_parameters:
+            resource_parameters:
+              resource_configuration_arn: '{{ resource_configuration_arn }}'
+              resource_association_arn: '{{ resource_association_arn }}'
+      - name: invocation_connectivity_parameters
         value:
-          ResourceParameters: null
-      - name: KmsKeyIdentifier
-        value: '{{ KmsKeyIdentifier }}'
-
+          resource_parameters: null
+      - name: kms_key_identifier
+        value: '{{ kms_key_identifier }}'
 ```
 </TabItem>
 </Tabs>
@@ -501,7 +500,7 @@ SET PatchDocument = string('{{ {
     "KmsKeyIdentifier": kms_key_identifier
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Name>';
+AND Identifier = '{{ name }}';
 ```
 
 
@@ -510,7 +509,7 @@ AND Identifier = '<Name>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.events.connections
-WHERE Identifier = '<Name>'
+WHERE Identifier = '{{ name }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/events/endpoints/index.md b/website/docs/services/events/endpoints/index.md
index 6786805cf..e3d221490 100644
--- a/website/docs/services/events/endpoints/index.md
+++ b/website/docs/services/events/endpoints/index.md
@@ -241,7 +241,7 @@ endpoint_url,
 state,
 state_reason
 FROM awscc.events.endpoints
-WHERE region = 'us-east-1' AND Identifier = '<Name>';
+WHERE region = 'us-east-1' AND Identifier = '{{ name }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -278,9 +278,9 @@ INSERT INTO awscc.events.endpoints (
  EventBuses,
  region
 )
-SELECT 
-'{{ RoutingConfig }}',
- '{{ EventBuses }}',
+SELECT
+'{{ routing_config }}',
+ '{{ event_buses }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -297,13 +297,13 @@ INSERT INTO awscc.events.endpoints (
  EventBuses,
  region
 )
-SELECT 
- '{{ Name }}',
- '{{ RoleArn }}',
- '{{ Description }}',
- '{{ RoutingConfig }}',
- '{{ ReplicationConfig }}',
- '{{ EventBuses }}',
+SELECT
+ '{{ name }}',
+ '{{ role_arn }}',
+ '{{ description }}',
+ '{{ routing_config }}',
+ '{{ replication_config }}',
+ '{{ event_buses }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -321,26 +321,25 @@ globals:
 resources:
   - name: endpoint
     props:
-      - name: Name
-        value: '{{ Name }}'
-      - name: RoleArn
-        value: '{{ RoleArn }}'
-      - name: Description
-        value: '{{ Description }}'
-      - name: RoutingConfig
+      - name: name
+        value: '{{ name }}'
+      - name: role_arn
+        value: '{{ role_arn }}'
+      - name: description
+        value: '{{ description }}'
+      - name: routing_config
         value:
-          FailoverConfig:
-            Primary:
-              HealthCheck: '{{ HealthCheck }}'
-            Secondary:
-              Route: '{{ Route }}'
-      - name: ReplicationConfig
+          failover_config:
+            primary:
+              health_check: '{{ health_check }}'
+            secondary:
+              route: '{{ route }}'
+      - name: replication_config
         value:
-          State: '{{ State }}'
-      - name: EventBuses
+          state: '{{ state }}'
+      - name: event_buses
         value:
-          - EventBusArn: '{{ EventBusArn }}'
-
+          - event_bus_arn: '{{ event_bus_arn }}'
 ```
 </TabItem>
 </Tabs>
@@ -360,7 +359,7 @@ SET PatchDocument = string('{{ {
     "EventBuses": event_buses
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Name>';
+AND Identifier = '{{ name }}';
 ```
 
 
@@ -369,7 +368,7 @@ AND Identifier = '<Name>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.events.endpoints
-WHERE Identifier = '<Name>'
+WHERE Identifier = '{{ name }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/events/event_buses/index.md b/website/docs/services/events/event_buses/index.md
index 5e06430c2..b3355e774 100644
--- a/website/docs/services/events/event_buses/index.md
+++ b/website/docs/services/events/event_buses/index.md
@@ -213,7 +213,7 @@ arn,
 dead_letter_config,
 log_config
 FROM awscc.events.event_buses
-WHERE region = 'us-east-1' AND Identifier = '<Name>';
+WHERE region = 'us-east-1' AND Identifier = '{{ name }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -249,8 +249,8 @@ INSERT INTO awscc.events.event_buses (
  Name,
  region
 )
-SELECT 
-'{{ Name }}',
+SELECT
+'{{ name }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -269,15 +269,15 @@ INSERT INTO awscc.events.event_buses (
  LogConfig,
  region
 )
-SELECT 
- '{{ EventSourceName }}',
- '{{ Name }}',
- '{{ Tags }}',
- '{{ Description }}',
- '{{ KmsKeyIdentifier }}',
- '{{ Policy }}',
- '{{ DeadLetterConfig }}',
- '{{ LogConfig }}',
+SELECT
+ '{{ event_source_name }}',
+ '{{ name }}',
+ '{{ tags }}',
+ '{{ description }}',
+ '{{ kms_key_identifier }}',
+ '{{ policy }}',
+ '{{ dead_letter_config }}',
+ '{{ log_config }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -295,28 +295,27 @@ globals:
 resources:
   - name: event_bus
     props:
-      - name: EventSourceName
-        value: '{{ EventSourceName }}'
-      - name: Name
-        value: '{{ Name }}'
-      - name: Tags
+      - name: event_source_name
+        value: '{{ event_source_name }}'
+      - name: name
+        value: '{{ name }}'
+      - name: tags
         value:
-          - Value: '{{ Value }}'
-            Key: '{{ Key }}'
-      - name: Description
-        value: '{{ Description }}'
-      - name: KmsKeyIdentifier
-        value: '{{ KmsKeyIdentifier }}'
-      - name: Policy
+          - value: '{{ value }}'
+            key: '{{ key }}'
+      - name: description
+        value: '{{ description }}'
+      - name: kms_key_identifier
+        value: '{{ kms_key_identifier }}'
+      - name: policy
         value: {}
-      - name: DeadLetterConfig
+      - name: dead_letter_config
         value:
-          Arn: '{{ Arn }}'
-      - name: LogConfig
+          arn: '{{ arn }}'
+      - name: log_config
         value:
-          IncludeDetail: '{{ IncludeDetail }}'
-          Level: '{{ Level }}'
-
+          include_detail: '{{ include_detail }}'
+          level: '{{ level }}'
 ```
 </TabItem>
 </Tabs>
@@ -338,7 +337,7 @@ SET PatchDocument = string('{{ {
     "LogConfig": log_config
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Name>';
+AND Identifier = '{{ name }}';
 ```
 
 
@@ -347,7 +346,7 @@ AND Identifier = '<Name>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.events.event_buses
-WHERE Identifier = '<Name>'
+WHERE Identifier = '{{ name }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/events/rules/index.md b/website/docs/services/events/rules/index.md
index 14db097b0..c87c942fe 100644
--- a/website/docs/services/events/rules/index.md
+++ b/website/docs/services/events/rules/index.md
@@ -599,7 +599,7 @@ role_arn,
 tags,
 name
 FROM awscc.events.rules
-WHERE region = 'us-east-1' AND Identifier = '<Arn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -643,16 +643,16 @@ INSERT INTO awscc.events.rules (
  Name,
  region
 )
-SELECT 
-'{{ EventBusName }}',
- '{{ EventPattern }}',
- '{{ ScheduleExpression }}',
- '{{ Description }}',
- '{{ State }}',
- '{{ Targets }}',
- '{{ RoleArn }}',
- '{{ Tags }}',
- '{{ Name }}',
+SELECT
+'{{ event_bus_name }}',
+ '{{ event_pattern }}',
+ '{{ schedule_expression }}',
+ '{{ description }}',
+ '{{ state }}',
+ '{{ targets }}',
+ '{{ role_arn }}',
+ '{{ tags }}',
+ '{{ name }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -672,16 +672,16 @@ INSERT INTO awscc.events.rules (
  Name,
  region
 )
-SELECT 
- '{{ EventBusName }}',
- '{{ EventPattern }}',
- '{{ ScheduleExpression }}',
- '{{ Description }}',
- '{{ State }}',
- '{{ Targets }}',
- '{{ RoleArn }}',
- '{{ Tags }}',
- '{{ Name }}',
+SELECT
+ '{{ event_bus_name }}',
+ '{{ event_pattern }}',
+ '{{ schedule_expression }}',
+ '{{ description }}',
+ '{{ state }}',
+ '{{ targets }}',
+ '{{ role_arn }}',
+ '{{ tags }}',
+ '{{ name }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -699,105 +699,104 @@ globals:
 resources:
   - name: rule
     props:
-      - name: EventBusName
-        value: '{{ EventBusName }}'
-      - name: EventPattern
+      - name: event_bus_name
+        value: '{{ event_bus_name }}'
+      - name: event_pattern
         value: {}
-      - name: ScheduleExpression
-        value: '{{ ScheduleExpression }}'
-      - name: Description
-        value: '{{ Description }}'
-      - name: State
-        value: '{{ State }}'
-      - name: Targets
+      - name: schedule_expression
+        value: '{{ schedule_expression }}'
+      - name: description
+        value: '{{ description }}'
+      - name: state
+        value: '{{ state }}'
+      - name: targets
         value:
-          - InputPath: '{{ InputPath }}'
-            HttpParameters:
-              PathParameterValues:
-                - '{{ PathParameterValues[0] }}'
-              HeaderParameters: {}
-              QueryStringParameters: {}
-            DeadLetterConfig:
-              Arn: '{{ Arn }}'
-            RunCommandParameters:
-              RunCommandTargets:
-                - Values:
-                    - '{{ Values[0] }}'
-                  Key: '{{ Key }}'
-            InputTransformer:
-              InputPathsMap: {}
-              InputTemplate: '{{ InputTemplate }}'
-            KinesisParameters:
-              PartitionKeyPath: '{{ PartitionKeyPath }}'
-            RoleArn: '{{ RoleArn }}'
-            RedshiftDataParameters:
-              StatementName: '{{ StatementName }}'
-              Sqls:
-                - '{{ Sqls[0] }}'
-              Database: '{{ Database }}'
-              SecretManagerArn: '{{ SecretManagerArn }}'
-              DbUser: '{{ DbUser }}'
-              Sql: '{{ Sql }}'
-              WithEvent: '{{ WithEvent }}'
-            AppSyncParameters:
-              GraphQLOperation: '{{ GraphQLOperation }}'
-            Input: '{{ Input }}'
-            SqsParameters:
-              MessageGroupId: '{{ MessageGroupId }}'
-            EcsParameters:
-              PlatformVersion: '{{ PlatformVersion }}'
-              Group: '{{ Group }}'
-              EnableECSManagedTags: '{{ EnableECSManagedTags }}'
-              EnableExecuteCommand: '{{ EnableExecuteCommand }}'
-              PlacementConstraints:
-                - Type: '{{ Type }}'
-                  Expression: '{{ Expression }}'
-              PropagateTags: '{{ PropagateTags }}'
-              TaskCount: '{{ TaskCount }}'
-              PlacementStrategies:
-                - Field: '{{ Field }}'
-                  Type: '{{ Type }}'
-              CapacityProviderStrategy:
-                - CapacityProvider: '{{ CapacityProvider }}'
-                  Base: '{{ Base }}'
-                  Weight: '{{ Weight }}'
-              LaunchType: '{{ LaunchType }}'
-              ReferenceId: '{{ ReferenceId }}'
-              TagList:
-                - Value: '{{ Value }}'
-                  Key: '{{ Key }}'
-              NetworkConfiguration:
-                AwsVpcConfiguration:
-                  SecurityGroups:
-                    - '{{ SecurityGroups[0] }}'
-                  Subnets:
-                    - '{{ Subnets[0] }}'
-                  AssignPublicIp: '{{ AssignPublicIp }}'
-              TaskDefinitionArn: '{{ TaskDefinitionArn }}'
-            BatchParameters:
-              ArrayProperties:
-                Size: '{{ Size }}'
-              JobName: '{{ JobName }}'
-              RetryStrategy:
-                Attempts: '{{ Attempts }}'
-              JobDefinition: '{{ JobDefinition }}'
-            Id: '{{ Id }}'
-            Arn: '{{ Arn }}'
-            SageMakerPipelineParameters:
-              PipelineParameterList:
-                - Value: '{{ Value }}'
-                  Name: '{{ Name }}'
-            RetryPolicy:
-              MaximumRetryAttempts: '{{ MaximumRetryAttempts }}'
-              MaximumEventAgeInSeconds: '{{ MaximumEventAgeInSeconds }}'
-      - name: RoleArn
-        value: '{{ RoleArn }}'
-      - name: Tags
+          - input_path: '{{ input_path }}'
+            http_parameters:
+              path_parameter_values:
+                - '{{ path_parameter_values[0] }}'
+              header_parameters: {}
+              query_string_parameters: {}
+            dead_letter_config:
+              arn: '{{ arn }}'
+            run_command_parameters:
+              run_command_targets:
+                - values:
+                    - '{{ values[0] }}'
+                  key: '{{ key }}'
+            input_transformer:
+              input_paths_map: {}
+              input_template: '{{ input_template }}'
+            kinesis_parameters:
+              partition_key_path: '{{ partition_key_path }}'
+            role_arn: '{{ role_arn }}'
+            redshift_data_parameters:
+              statement_name: '{{ statement_name }}'
+              sqls:
+                - '{{ sqls[0] }}'
+              database: '{{ database }}'
+              secret_manager_arn: '{{ secret_manager_arn }}'
+              db_user: '{{ db_user }}'
+              sql: '{{ sql }}'
+              with_event: '{{ with_event }}'
+            app_sync_parameters:
+              graph_ql_operation: '{{ graph_ql_operation }}'
+            input: '{{ input }}'
+            sqs_parameters:
+              message_group_id: '{{ message_group_id }}'
+            ecs_parameters:
+              platform_version: '{{ platform_version }}'
+              group: '{{ group }}'
+              enable_ecs_managed_tags: '{{ enable_ecs_managed_tags }}'
+              enable_execute_command: '{{ enable_execute_command }}'
+              placement_constraints:
+                - type: '{{ type }}'
+                  expression: '{{ expression }}'
+              propagate_tags: '{{ propagate_tags }}'
+              task_count: '{{ task_count }}'
+              placement_strategies:
+                - field: '{{ field }}'
+                  type: '{{ type }}'
+              capacity_provider_strategy:
+                - capacity_provider: '{{ capacity_provider }}'
+                  base: '{{ base }}'
+                  weight: '{{ weight }}'
+              launch_type: '{{ launch_type }}'
+              reference_id: '{{ reference_id }}'
+              tag_list:
+                - value: '{{ value }}'
+                  key: '{{ key }}'
+              network_configuration:
+                aws_vpc_configuration:
+                  security_groups:
+                    - '{{ security_groups[0] }}'
+                  subnets:
+                    - '{{ subnets[0] }}'
+                  assign_public_ip: '{{ assign_public_ip }}'
+              task_definition_arn: '{{ task_definition_arn }}'
+            batch_parameters:
+              array_properties:
+                size: '{{ size }}'
+              job_name: '{{ job_name }}'
+              retry_strategy:
+                attempts: '{{ attempts }}'
+              job_definition: '{{ job_definition }}'
+            id: '{{ id }}'
+            arn: '{{ arn }}'
+            sage_maker_pipeline_parameters:
+              pipeline_parameter_list:
+                - value: '{{ value }}'
+                  name: '{{ name }}'
+            retry_policy:
+              maximum_retry_attempts: '{{ maximum_retry_attempts }}'
+              maximum_event_age_in_seconds: '{{ maximum_event_age_in_seconds }}'
+      - name: role_arn
+        value: '{{ role_arn }}'
+      - name: tags
         value:
           - null
-      - name: Name
-        value: '{{ Name }}'
-
+      - name: name
+        value: '{{ name }}'
 ```
 </TabItem>
 </Tabs>
@@ -820,7 +819,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Arn>';
+AND Identifier = '{{ arn }}';
 ```
 
 
@@ -829,7 +828,7 @@ AND Identifier = '<Arn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.events.rules
-WHERE Identifier = '<Arn>'
+WHERE Identifier = '{{ arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/eventschemas/discoverers/index.md b/website/docs/services/eventschemas/discoverers/index.md
index 79f360e98..ff29c17c5 100644
--- a/website/docs/services/eventschemas/discoverers/index.md
+++ b/website/docs/services/eventschemas/discoverers/index.md
@@ -182,7 +182,7 @@ cross_account,
 state,
 tags
 FROM awscc.eventschemas.discoverers
-WHERE region = 'us-east-1' AND Identifier = '<DiscovererArn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ discoverer_arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -218,8 +218,8 @@ INSERT INTO awscc.eventschemas.discoverers (
  SourceArn,
  region
 )
-SELECT 
-'{{ SourceArn }}',
+SELECT
+'{{ source_arn }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -234,11 +234,11 @@ INSERT INTO awscc.eventschemas.discoverers (
  Tags,
  region
 )
-SELECT 
- '{{ Description }}',
- '{{ SourceArn }}',
- '{{ CrossAccount }}',
- '{{ Tags }}',
+SELECT
+ '{{ description }}',
+ '{{ source_arn }}',
+ '{{ cross_account }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -256,17 +256,16 @@ globals:
 resources:
   - name: discoverer
     props:
-      - name: Description
-        value: '{{ Description }}'
-      - name: SourceArn
-        value: '{{ SourceArn }}'
-      - name: CrossAccount
-        value: '{{ CrossAccount }}'
-      - name: Tags
+      - name: description
+        value: '{{ description }}'
+      - name: source_arn
+        value: '{{ source_arn }}'
+      - name: cross_account
+        value: '{{ cross_account }}'
+      - name: tags
         value:
-          - Value: '{{ Value }}'
-            Key: '{{ Key }}'
-
+          - value: '{{ value }}'
+            key: '{{ key }}'
 ```
 </TabItem>
 </Tabs>
@@ -284,7 +283,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<DiscovererArn>';
+AND Identifier = '{{ discoverer_arn }}';
 ```
 
 
@@ -293,7 +292,7 @@ AND Identifier = '<DiscovererArn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.eventschemas.discoverers
-WHERE Identifier = '<DiscovererArn>'
+WHERE Identifier = '{{ discoverer_arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/eventschemas/registries/index.md b/website/docs/services/eventschemas/registries/index.md
index 5fa7010c0..ddcb1c565 100644
--- a/website/docs/services/eventschemas/registries/index.md
+++ b/website/docs/services/eventschemas/registries/index.md
@@ -164,7 +164,7 @@ description,
 registry_arn,
 tags
 FROM awscc.eventschemas.registries
-WHERE region = 'us-east-1' AND Identifier = '<RegistryArn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ registry_arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -202,10 +202,10 @@ INSERT INTO awscc.eventschemas.registries (
  Tags,
  region
 )
-SELECT 
-'{{ RegistryName }}',
- '{{ Description }}',
- '{{ Tags }}',
+SELECT
+'{{ registry_name }}',
+ '{{ description }}',
+ '{{ tags }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -219,10 +219,10 @@ INSERT INTO awscc.eventschemas.registries (
  Tags,
  region
 )
-SELECT 
- '{{ RegistryName }}',
- '{{ Description }}',
- '{{ Tags }}',
+SELECT
+ '{{ registry_name }}',
+ '{{ description }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -240,15 +240,14 @@ globals:
 resources:
   - name: registry
     props:
-      - name: RegistryName
-        value: '{{ RegistryName }}'
-      - name: Description
-        value: '{{ Description }}'
-      - name: Tags
+      - name: registry_name
+        value: '{{ registry_name }}'
+      - name: description
+        value: '{{ description }}'
+      - name: tags
         value:
-          - Value: '{{ Value }}'
-            Key: '{{ Key }}'
-
+          - value: '{{ value }}'
+            key: '{{ key }}'
 ```
 </TabItem>
 </Tabs>
@@ -265,7 +264,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<RegistryArn>';
+AND Identifier = '{{ registry_arn }}';
 ```
 
 
@@ -274,7 +273,7 @@ AND Identifier = '<RegistryArn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.eventschemas.registries
-WHERE Identifier = '<RegistryArn>'
+WHERE Identifier = '{{ registry_arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/eventschemas/registry_policies/index.md b/website/docs/services/eventschemas/registry_policies/index.md
index c2d15565c..4757d5870 100644
--- a/website/docs/services/eventschemas/registry_policies/index.md
+++ b/website/docs/services/eventschemas/registry_policies/index.md
@@ -106,7 +106,7 @@ policy,
 registry_name,
 revision_id
 FROM awscc.eventschemas.registry_policies
-WHERE region = 'us-east-1' AND Identifier = '<Id>';
+WHERE region = 'us-east-1' AND Identifier = '{{ id }}';
 ```
 
 ## `INSERT` example
@@ -130,9 +130,9 @@ INSERT INTO awscc.eventschemas.registry_policies (
  RegistryName,
  region
 )
-SELECT 
-'{{ Policy }}',
- '{{ RegistryName }}',
+SELECT
+'{{ policy }}',
+ '{{ registry_name }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -146,10 +146,10 @@ INSERT INTO awscc.eventschemas.registry_policies (
  RevisionId,
  region
 )
-SELECT 
- '{{ Policy }}',
- '{{ RegistryName }}',
- '{{ RevisionId }}',
+SELECT
+ '{{ policy }}',
+ '{{ registry_name }}',
+ '{{ revision_id }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -167,13 +167,12 @@ globals:
 resources:
   - name: registry_policy
     props:
-      - name: Policy
+      - name: policy
         value: {}
-      - name: RegistryName
-        value: '{{ RegistryName }}'
-      - name: RevisionId
-        value: '{{ RevisionId }}'
-
+      - name: registry_name
+        value: '{{ registry_name }}'
+      - name: revision_id
+        value: '{{ revision_id }}'
 ```
 </TabItem>
 </Tabs>
@@ -191,7 +190,7 @@ SET PatchDocument = string('{{ {
     "RevisionId": revision_id
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Id>';
+AND Identifier = '{{ id }}';
 ```
 
 
@@ -200,7 +199,7 @@ AND Identifier = '<Id>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.eventschemas.registry_policies
-WHERE Identifier = '<Id>'
+WHERE Identifier = '{{ id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/eventschemas/schemata/index.md b/website/docs/services/eventschemas/schemata/index.md
index 79b1b90b6..0b5badfaa 100644
--- a/website/docs/services/eventschemas/schemata/index.md
+++ b/website/docs/services/eventschemas/schemata/index.md
@@ -200,7 +200,7 @@ last_modified,
 version_created_date,
 tags
 FROM awscc.eventschemas.schemata
-WHERE region = 'us-east-1' AND Identifier = '<SchemaArn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ schema_arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -238,10 +238,10 @@ INSERT INTO awscc.eventschemas.schemata (
  RegistryName,
  region
 )
-SELECT 
-'{{ Type }}',
- '{{ Content }}',
- '{{ RegistryName }}',
+SELECT
+'{{ type }}',
+ '{{ content }}',
+ '{{ registry_name }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -258,13 +258,13 @@ INSERT INTO awscc.eventschemas.schemata (
  Tags,
  region
 )
-SELECT 
- '{{ Type }}',
- '{{ Description }}',
- '{{ Content }}',
- '{{ RegistryName }}',
- '{{ SchemaName }}',
- '{{ Tags }}',
+SELECT
+ '{{ type }}',
+ '{{ description }}',
+ '{{ content }}',
+ '{{ registry_name }}',
+ '{{ schema_name }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -282,21 +282,20 @@ globals:
 resources:
   - name: schema
     props:
-      - name: Type
-        value: '{{ Type }}'
-      - name: Description
-        value: '{{ Description }}'
-      - name: Content
-        value: '{{ Content }}'
-      - name: RegistryName
-        value: '{{ RegistryName }}'
-      - name: SchemaName
-        value: '{{ SchemaName }}'
-      - name: Tags
+      - name: type
+        value: '{{ type }}'
+      - name: description
+        value: '{{ description }}'
+      - name: content
+        value: '{{ content }}'
+      - name: registry_name
+        value: '{{ registry_name }}'
+      - name: schema_name
+        value: '{{ schema_name }}'
+      - name: tags
         value:
-          - Value: '{{ Value }}'
-            Key: '{{ Key }}'
-
+          - value: '{{ value }}'
+            key: '{{ key }}'
 ```
 </TabItem>
 </Tabs>
@@ -315,7 +314,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<SchemaArn>';
+AND Identifier = '{{ schema_arn }}';
 ```
 
 
@@ -324,7 +323,7 @@ AND Identifier = '<SchemaArn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.eventschemas.schemata
-WHERE Identifier = '<SchemaArn>'
+WHERE Identifier = '{{ schema_arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/evidently/experiments/index.md b/website/docs/services/evidently/experiments/index.md
index 01645afc4..a34042e47 100644
--- a/website/docs/services/evidently/experiments/index.md
+++ b/website/docs/services/evidently/experiments/index.md
@@ -272,7 +272,7 @@ segment,
 remove_segment,
 tags
 FROM awscc.evidently.experiments
-WHERE region = 'us-east-1' AND Identifier = '<Arn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ arn }}';
 ```
 
 ## `INSERT` example
@@ -299,12 +299,12 @@ INSERT INTO awscc.evidently.experiments (
  OnlineAbConfig,
  region
 )
-SELECT 
-'{{ Name }}',
- '{{ Project }}',
- '{{ Treatments }}',
- '{{ MetricGoals }}',
- '{{ OnlineAbConfig }}',
+SELECT
+'{{ name }}',
+ '{{ project }}',
+ '{{ treatments }}',
+ '{{ metric_goals }}',
+ '{{ online_ab_config }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -327,19 +327,19 @@ INSERT INTO awscc.evidently.experiments (
  Tags,
  region
 )
-SELECT 
- '{{ Name }}',
- '{{ Project }}',
- '{{ Description }}',
- '{{ RunningStatus }}',
- '{{ RandomizationSalt }}',
- '{{ Treatments }}',
- '{{ MetricGoals }}',
- '{{ SamplingRate }}',
- '{{ OnlineAbConfig }}',
- '{{ Segment }}',
- '{{ RemoveSegment }}',
- '{{ Tags }}',
+SELECT
+ '{{ name }}',
+ '{{ project }}',
+ '{{ description }}',
+ '{{ running_status }}',
+ '{{ randomization_salt }}',
+ '{{ treatments }}',
+ '{{ metric_goals }}',
+ '{{ sampling_rate }}',
+ '{{ online_ab_config }}',
+ '{{ segment }}',
+ '{{ remove_segment }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -357,51 +357,50 @@ globals:
 resources:
   - name: experiment
     props:
-      - name: Name
-        value: '{{ Name }}'
-      - name: Project
-        value: '{{ Project }}'
-      - name: Description
-        value: '{{ Description }}'
-      - name: RunningStatus
+      - name: name
+        value: '{{ name }}'
+      - name: project
+        value: '{{ project }}'
+      - name: description
+        value: '{{ description }}'
+      - name: running_status
         value:
-          Status: '{{ Status }}'
-          AnalysisCompleteTime: '{{ AnalysisCompleteTime }}'
-          Reason: '{{ Reason }}'
-          DesiredState: '{{ DesiredState }}'
-      - name: RandomizationSalt
-        value: '{{ RandomizationSalt }}'
-      - name: Treatments
+          status: '{{ status }}'
+          analysis_complete_time: '{{ analysis_complete_time }}'
+          reason: '{{ reason }}'
+          desired_state: '{{ desired_state }}'
+      - name: randomization_salt
+        value: '{{ randomization_salt }}'
+      - name: treatments
         value:
-          - TreatmentName: '{{ TreatmentName }}'
-            Description: '{{ Description }}'
-            Feature: '{{ Feature }}'
-            Variation: '{{ Variation }}'
-      - name: MetricGoals
+          - treatment_name: '{{ treatment_name }}'
+            description: '{{ description }}'
+            feature: '{{ feature }}'
+            variation: '{{ variation }}'
+      - name: metric_goals
         value:
-          - MetricName: '{{ MetricName }}'
-            EntityIdKey: '{{ EntityIdKey }}'
-            ValueKey: '{{ ValueKey }}'
-            EventPattern: '{{ EventPattern }}'
-            UnitLabel: '{{ UnitLabel }}'
-            DesiredChange: '{{ DesiredChange }}'
-      - name: SamplingRate
-        value: '{{ SamplingRate }}'
-      - name: OnlineAbConfig
+          - metric_name: '{{ metric_name }}'
+            entity_id_key: '{{ entity_id_key }}'
+            value_key: '{{ value_key }}'
+            event_pattern: '{{ event_pattern }}'
+            unit_label: '{{ unit_label }}'
+            desired_change: '{{ desired_change }}'
+      - name: sampling_rate
+        value: '{{ sampling_rate }}'
+      - name: online_ab_config
         value:
-          ControlTreatmentName: '{{ ControlTreatmentName }}'
-          TreatmentWeights:
-            - Treatment: '{{ Treatment }}'
-              SplitWeight: '{{ SplitWeight }}'
-      - name: Segment
-        value: '{{ Segment }}'
-      - name: RemoveSegment
-        value: '{{ RemoveSegment }}'
-      - name: Tags
+          control_treatment_name: '{{ control_treatment_name }}'
+          treatment_weights:
+            - treatment: '{{ treatment }}'
+              split_weight: '{{ split_weight }}'
+      - name: segment
+        value: '{{ segment }}'
+      - name: remove_segment
+        value: '{{ remove_segment }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -426,7 +425,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Arn>';
+AND Identifier = '{{ arn }}';
 ```
 
 
@@ -435,7 +434,7 @@ AND Identifier = '<Arn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.evidently.experiments
-WHERE Identifier = '<Arn>'
+WHERE Identifier = '{{ arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/evidently/features/index.md b/website/docs/services/evidently/features/index.md
index 059ec6045..95db02d36 100644
--- a/website/docs/services/evidently/features/index.md
+++ b/website/docs/services/evidently/features/index.md
@@ -187,7 +187,7 @@ default_variation,
 entity_overrides,
 tags
 FROM awscc.evidently.features
-WHERE region = 'us-east-1' AND Identifier = '<Arn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ arn }}';
 ```
 
 ## `INSERT` example
@@ -212,10 +212,10 @@ INSERT INTO awscc.evidently.features (
  Variations,
  region
 )
-SELECT 
-'{{ Project }}',
- '{{ Name }}',
- '{{ Variations }}',
+SELECT
+'{{ project }}',
+ '{{ name }}',
+ '{{ variations }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -234,15 +234,15 @@ INSERT INTO awscc.evidently.features (
  Tags,
  region
 )
-SELECT 
- '{{ Project }}',
- '{{ Name }}',
- '{{ Description }}',
- '{{ EvaluationStrategy }}',
- '{{ Variations }}',
- '{{ DefaultVariation }}',
- '{{ EntityOverrides }}',
- '{{ Tags }}',
+SELECT
+ '{{ project }}',
+ '{{ name }}',
+ '{{ description }}',
+ '{{ evaluation_strategy }}',
+ '{{ variations }}',
+ '{{ default_variation }}',
+ '{{ entity_overrides }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -260,32 +260,31 @@ globals:
 resources:
   - name: feature
     props:
-      - name: Project
-        value: '{{ Project }}'
-      - name: Name
-        value: '{{ Name }}'
-      - name: Description
-        value: '{{ Description }}'
-      - name: EvaluationStrategy
-        value: '{{ EvaluationStrategy }}'
-      - name: Variations
+      - name: project
+        value: '{{ project }}'
+      - name: name
+        value: '{{ name }}'
+      - name: description
+        value: '{{ description }}'
+      - name: evaluation_strategy
+        value: '{{ evaluation_strategy }}'
+      - name: variations
         value:
-          - VariationName: '{{ VariationName }}'
-            BooleanValue: '{{ BooleanValue }}'
-            StringValue: '{{ StringValue }}'
-            LongValue: null
-            DoubleValue: null
-      - name: DefaultVariation
-        value: '{{ DefaultVariation }}'
-      - name: EntityOverrides
+          - variation_name: '{{ variation_name }}'
+            boolean_value: '{{ boolean_value }}'
+            string_value: '{{ string_value }}'
+            long_value: null
+            double_value: null
+      - name: default_variation
+        value: '{{ default_variation }}'
+      - name: entity_overrides
         value:
-          - EntityId: '{{ EntityId }}'
-            Variation: '{{ Variation }}'
-      - name: Tags
+          - entity_id: '{{ entity_id }}'
+            variation: '{{ variation }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -306,7 +305,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Arn>';
+AND Identifier = '{{ arn }}';
 ```
 
 
@@ -315,7 +314,7 @@ AND Identifier = '<Arn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.evidently.features
-WHERE Identifier = '<Arn>'
+WHERE Identifier = '{{ arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/evidently/launches/index.md b/website/docs/services/evidently/launches/index.md
index 6f2963172..e1dac62d9 100644
--- a/website/docs/services/evidently/launches/index.md
+++ b/website/docs/services/evidently/launches/index.md
@@ -266,7 +266,7 @@ metric_monitors,
 tags,
 execution_status
 FROM awscc.evidently.launches
-WHERE region = 'us-east-1' AND Identifier = '<Arn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ arn }}';
 ```
 
 ## `INSERT` example
@@ -292,11 +292,11 @@ INSERT INTO awscc.evidently.launches (
  Groups,
  region
 )
-SELECT 
-'{{ Name }}',
- '{{ Project }}',
- '{{ ScheduledSplitsConfig }}',
- '{{ Groups }}',
+SELECT
+'{{ name }}',
+ '{{ project }}',
+ '{{ scheduled_splits_config }}',
+ '{{ groups }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -316,16 +316,16 @@ INSERT INTO awscc.evidently.launches (
  ExecutionStatus,
  region
 )
-SELECT 
- '{{ Name }}',
- '{{ Project }}',
- '{{ Description }}',
- '{{ RandomizationSalt }}',
- '{{ ScheduledSplitsConfig }}',
- '{{ Groups }}',
- '{{ MetricMonitors }}',
- '{{ Tags }}',
- '{{ ExecutionStatus }}',
+SELECT
+ '{{ name }}',
+ '{{ project }}',
+ '{{ description }}',
+ '{{ randomization_salt }}',
+ '{{ scheduled_splits_config }}',
+ '{{ groups }}',
+ '{{ metric_monitors }}',
+ '{{ tags }}',
+ '{{ execution_status }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -343,48 +343,47 @@ globals:
 resources:
   - name: launch
     props:
-      - name: Name
-        value: '{{ Name }}'
-      - name: Project
-        value: '{{ Project }}'
-      - name: Description
-        value: '{{ Description }}'
-      - name: RandomizationSalt
-        value: '{{ RandomizationSalt }}'
-      - name: ScheduledSplitsConfig
+      - name: name
+        value: '{{ name }}'
+      - name: project
+        value: '{{ project }}'
+      - name: description
+        value: '{{ description }}'
+      - name: randomization_salt
+        value: '{{ randomization_salt }}'
+      - name: scheduled_splits_config
         value:
-          - StartTime: '{{ StartTime }}'
-            GroupWeights:
-              - GroupName: '{{ GroupName }}'
-                SplitWeight: '{{ SplitWeight }}'
-            SegmentOverrides:
-              - Segment: '{{ Segment }}'
-                EvaluationOrder: '{{ EvaluationOrder }}'
-                Weights:
+          - start_time: '{{ start_time }}'
+            group_weights:
+              - group_name: '{{ group_name }}'
+                split_weight: '{{ split_weight }}'
+            segment_overrides:
+              - segment: '{{ segment }}'
+                evaluation_order: '{{ evaluation_order }}'
+                weights:
                   - null
-      - name: Groups
+      - name: groups
         value:
-          - GroupName: '{{ GroupName }}'
-            Description: '{{ Description }}'
-            Feature: '{{ Feature }}'
-            Variation: '{{ Variation }}'
-      - name: MetricMonitors
+          - group_name: '{{ group_name }}'
+            description: '{{ description }}'
+            feature: '{{ feature }}'
+            variation: '{{ variation }}'
+      - name: metric_monitors
         value:
-          - MetricName: '{{ MetricName }}'
-            EntityIdKey: '{{ EntityIdKey }}'
-            ValueKey: '{{ ValueKey }}'
-            EventPattern: '{{ EventPattern }}'
-            UnitLabel: '{{ UnitLabel }}'
-      - name: Tags
+          - metric_name: '{{ metric_name }}'
+            entity_id_key: '{{ entity_id_key }}'
+            value_key: '{{ value_key }}'
+            event_pattern: '{{ event_pattern }}'
+            unit_label: '{{ unit_label }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-      - name: ExecutionStatus
+          - key: '{{ key }}'
+            value: '{{ value }}'
+      - name: execution_status
         value:
-          Status: '{{ Status }}'
-          DesiredState: '{{ DesiredState }}'
-          Reason: '{{ Reason }}'
-
+          status: '{{ status }}'
+          desired_state: '{{ desired_state }}'
+          reason: '{{ reason }}'
 ```
 </TabItem>
 </Tabs>
@@ -406,7 +405,7 @@ SET PatchDocument = string('{{ {
     "ExecutionStatus": execution_status
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Arn>';
+AND Identifier = '{{ arn }}';
 ```
 
 
@@ -415,7 +414,7 @@ AND Identifier = '<Arn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.evidently.launches
-WHERE Identifier = '<Arn>'
+WHERE Identifier = '{{ arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/evidently/projects/index.md b/website/docs/services/evidently/projects/index.md
index 5a539b793..26f899cb0 100644
--- a/website/docs/services/evidently/projects/index.md
+++ b/website/docs/services/evidently/projects/index.md
@@ -166,7 +166,7 @@ data_delivery,
 app_config_resource,
 tags
 FROM awscc.evidently.projects
-WHERE region = 'us-east-1' AND Identifier = '<Arn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ arn }}';
 ```
 
 ## `INSERT` example
@@ -189,8 +189,8 @@ INSERT INTO awscc.evidently.projects (
  Name,
  region
 )
-SELECT 
-'{{ Name }}',
+SELECT
+'{{ name }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -206,12 +206,12 @@ INSERT INTO awscc.evidently.projects (
  Tags,
  region
 )
-SELECT 
- '{{ Name }}',
- '{{ Description }}',
- '{{ DataDelivery }}',
- '{{ AppConfigResource }}',
- '{{ Tags }}',
+SELECT
+ '{{ name }}',
+ '{{ description }}',
+ '{{ data_delivery }}',
+ '{{ app_config_resource }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -229,25 +229,24 @@ globals:
 resources:
   - name: project
     props:
-      - name: Name
-        value: '{{ Name }}'
-      - name: Description
-        value: '{{ Description }}'
-      - name: DataDelivery
+      - name: name
+        value: '{{ name }}'
+      - name: description
+        value: '{{ description }}'
+      - name: data_delivery
         value:
-          S3:
-            BucketName: '{{ BucketName }}'
-            Prefix: '{{ Prefix }}'
-          LogGroup: '{{ LogGroup }}'
-      - name: AppConfigResource
+          s3:
+            bucket_name: '{{ bucket_name }}'
+            prefix: '{{ prefix }}'
+          log_group: '{{ log_group }}'
+      - name: app_config_resource
         value:
-          ApplicationId: '{{ ApplicationId }}'
-          EnvironmentId: '{{ EnvironmentId }}'
-      - name: Tags
+          application_id: '{{ application_id }}'
+          environment_id: '{{ environment_id }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -266,7 +265,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Arn>';
+AND Identifier = '{{ arn }}';
 ```
 
 
@@ -275,7 +274,7 @@ AND Identifier = '<Arn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.evidently.projects
-WHERE Identifier = '<Arn>'
+WHERE Identifier = '{{ arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/evidently/segments/index.md b/website/docs/services/evidently/segments/index.md
index 9f2deaaf5..d84f0cc61 100644
--- a/website/docs/services/evidently/segments/index.md
+++ b/website/docs/services/evidently/segments/index.md
@@ -164,7 +164,7 @@ description,
 pattern,
 tags
 FROM awscc.evidently.segments
-WHERE region = 'us-east-1' AND Identifier = '<Arn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -200,8 +200,8 @@ INSERT INTO awscc.evidently.segments (
  Name,
  region
 )
-SELECT 
-'{{ Name }}',
+SELECT
+'{{ name }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -216,11 +216,11 @@ INSERT INTO awscc.evidently.segments (
  Tags,
  region
 )
-SELECT 
- '{{ Name }}',
- '{{ Description }}',
- '{{ Pattern }}',
- '{{ Tags }}',
+SELECT
+ '{{ name }}',
+ '{{ description }}',
+ '{{ pattern }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -238,17 +238,16 @@ globals:
 resources:
   - name: segment
     props:
-      - name: Name
-        value: '{{ Name }}'
-      - name: Description
-        value: '{{ Description }}'
-      - name: Pattern
-        value: '{{ Pattern }}'
-      - name: Tags
+      - name: name
+        value: '{{ name }}'
+      - name: description
+        value: '{{ description }}'
+      - name: pattern
+        value: '{{ pattern }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -259,7 +258,7 @@ resources:
 ```sql
 /*+ delete */
 DELETE FROM awscc.evidently.segments
-WHERE Identifier = '<Arn>'
+WHERE Identifier = '{{ arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/evs/environments/index.md b/website/docs/services/evs/environments/index.md
index 18354f165..e154bbb99 100644
--- a/website/docs/services/evs/environments/index.md
+++ b/website/docs/services/evs/environments/index.md
@@ -365,7 +365,7 @@ tags,
 created_at,
 modified_at
 FROM awscc.evs.environments
-WHERE region = 'us-east-1' AND Identifier = '<EnvironmentId>';
+WHERE region = 'us-east-1' AND Identifier = '{{ environment_id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -408,15 +408,15 @@ INSERT INTO awscc.evs.environments (
  SiteId,
  region
 )
-SELECT 
-'{{ VpcId }}',
- '{{ ServiceAccessSubnetId }}',
- '{{ VcfVersion }}',
- '{{ TermsAccepted }}',
- '{{ LicenseInfo }}',
- '{{ ConnectivityInfo }}',
- '{{ VcfHostnames }}',
- '{{ SiteId }}',
+SELECT
+'{{ vpc_id }}',
+ '{{ service_access_subnet_id }}',
+ '{{ vcf_version }}',
+ '{{ terms_accepted }}',
+ '{{ license_info }}',
+ '{{ connectivity_info }}',
+ '{{ vcf_hostnames }}',
+ '{{ site_id }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -441,21 +441,21 @@ INSERT INTO awscc.evs.environments (
  Tags,
  region
 )
-SELECT 
- '{{ EnvironmentName }}',
- '{{ KmsKeyId }}',
- '{{ VpcId }}',
- '{{ ServiceAccessSubnetId }}',
- '{{ VcfVersion }}',
- '{{ TermsAccepted }}',
- '{{ LicenseInfo }}',
- '{{ InitialVlans }}',
- '{{ Hosts }}',
- '{{ ConnectivityInfo }}',
- '{{ VcfHostnames }}',
- '{{ SiteId }}',
- '{{ ServiceAccessSecurityGroups }}',
- '{{ Tags }}',
+SELECT
+ '{{ environment_name }}',
+ '{{ kms_key_id }}',
+ '{{ vpc_id }}',
+ '{{ service_access_subnet_id }}',
+ '{{ vcf_version }}',
+ '{{ terms_accepted }}',
+ '{{ license_info }}',
+ '{{ initial_vlans }}',
+ '{{ hosts }}',
+ '{{ connectivity_info }}',
+ '{{ vcf_hostnames }}',
+ '{{ site_id }}',
+ '{{ service_access_security_groups }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -473,68 +473,67 @@ globals:
 resources:
   - name: environment
     props:
-      - name: EnvironmentName
-        value: '{{ EnvironmentName }}'
-      - name: KmsKeyId
-        value: '{{ KmsKeyId }}'
-      - name: VpcId
-        value: '{{ VpcId }}'
-      - name: ServiceAccessSubnetId
-        value: '{{ ServiceAccessSubnetId }}'
-      - name: VcfVersion
-        value: '{{ VcfVersion }}'
-      - name: TermsAccepted
-        value: '{{ TermsAccepted }}'
-      - name: LicenseInfo
+      - name: environment_name
+        value: '{{ environment_name }}'
+      - name: kms_key_id
+        value: '{{ kms_key_id }}'
+      - name: vpc_id
+        value: '{{ vpc_id }}'
+      - name: service_access_subnet_id
+        value: '{{ service_access_subnet_id }}'
+      - name: vcf_version
+        value: '{{ vcf_version }}'
+      - name: terms_accepted
+        value: '{{ terms_accepted }}'
+      - name: license_info
         value:
-          SolutionKey: '{{ SolutionKey }}'
-          VsanKey: '{{ VsanKey }}'
-      - name: InitialVlans
+          solution_key: '{{ solution_key }}'
+          vsan_key: '{{ vsan_key }}'
+      - name: initial_vlans
         value:
-          VmkManagement:
-            Cidr: '{{ Cidr }}'
-          VmManagement: null
-          VMotion: null
-          VSan: null
-          VTep: null
-          EdgeVTep: null
-          NsxUpLink: null
-          Hcx: null
-          ExpansionVlan1: null
-          ExpansionVlan2: null
-      - name: Hosts
+          vmk_management:
+            cidr: '{{ cidr }}'
+          vm_management: null
+          v_motion: null
+          v_san: null
+          v_tep: null
+          edge_vtep: null
+          nsx_up_link: null
+          hcx: null
+          expansion_vlan1: null
+          expansion_vlan2: null
+      - name: hosts
         value:
-          - HostName: '{{ HostName }}'
-            KeyName: '{{ KeyName }}'
-            InstanceType: '{{ InstanceType }}'
-            PlacementGroupId: '{{ PlacementGroupId }}'
-            DedicatedHostId: '{{ DedicatedHostId }}'
-      - name: ConnectivityInfo
+          - host_name: '{{ host_name }}'
+            key_name: '{{ key_name }}'
+            instance_type: '{{ instance_type }}'
+            placement_group_id: '{{ placement_group_id }}'
+            dedicated_host_id: '{{ dedicated_host_id }}'
+      - name: connectivity_info
         value:
-          PrivateRouteServerPeerings:
-            - '{{ PrivateRouteServerPeerings[0] }}'
-      - name: VcfHostnames
+          private_route_server_peerings:
+            - '{{ private_route_server_peerings[0] }}'
+      - name: vcf_hostnames
         value:
-          VCenter: null
-          Nsx: null
-          NsxManager1: null
-          NsxManager2: null
-          NsxManager3: null
-          NsxEdge1: null
-          NsxEdge2: null
-          SddcManager: null
-          CloudBuilder: null
-      - name: SiteId
-        value: '{{ SiteId }}'
-      - name: ServiceAccessSecurityGroups
+          v_center: null
+          nsx: null
+          nsx_manager1: null
+          nsx_manager2: null
+          nsx_manager3: null
+          nsx_edge1: null
+          nsx_edge2: null
+          sddc_manager: null
+          cloud_builder: null
+      - name: site_id
+        value: '{{ site_id }}'
+      - name: service_access_security_groups
         value:
-          SecurityGroups:
-            - '{{ SecurityGroups[0] }}'
-      - name: Tags
+          security_groups:
+            - '{{ security_groups[0] }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -552,7 +551,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<EnvironmentId>';
+AND Identifier = '{{ environment_id }}';
 ```
 
 
@@ -561,7 +560,7 @@ AND Identifier = '<EnvironmentId>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.evs.environments
-WHERE Identifier = '<EnvironmentId>'
+WHERE Identifier = '{{ environment_id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/finspace/environments/index.md b/website/docs/services/finspace/environments/index.md
index 1c12316a9..f30c121fc 100644
--- a/website/docs/services/finspace/environments/index.md
+++ b/website/docs/services/finspace/environments/index.md
@@ -291,7 +291,7 @@ superuser_parameters,
 data_bundles,
 tags
 FROM awscc.finspace.environments
-WHERE region = 'us-east-1' AND Identifier = '<EnvironmentId>';
+WHERE region = 'us-east-1' AND Identifier = '{{ environment_id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -327,8 +327,8 @@ INSERT INTO awscc.finspace.environments (
  Name,
  region
 )
-SELECT 
-'{{ Name }}',
+SELECT
+'{{ name }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -347,15 +347,15 @@ INSERT INTO awscc.finspace.environments (
  Tags,
  region
 )
-SELECT 
- '{{ Name }}',
- '{{ Description }}',
- '{{ KmsKeyId }}',
- '{{ FederationMode }}',
- '{{ FederationParameters }}',
- '{{ SuperuserParameters }}',
- '{{ DataBundles }}',
- '{{ Tags }}',
+SELECT
+ '{{ name }}',
+ '{{ description }}',
+ '{{ kms_key_id }}',
+ '{{ federation_mode }}',
+ '{{ federation_parameters }}',
+ '{{ superuser_parameters }}',
+ '{{ data_bundles }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -373,37 +373,36 @@ globals:
 resources:
   - name: environment
     props:
-      - name: Name
-        value: '{{ Name }}'
-      - name: Description
-        value: '{{ Description }}'
-      - name: KmsKeyId
-        value: '{{ KmsKeyId }}'
-      - name: FederationMode
-        value: '{{ FederationMode }}'
-      - name: FederationParameters
+      - name: name
+        value: '{{ name }}'
+      - name: description
+        value: '{{ description }}'
+      - name: kms_key_id
+        value: '{{ kms_key_id }}'
+      - name: federation_mode
+        value: '{{ federation_mode }}'
+      - name: federation_parameters
         value:
-          SamlMetadataURL: '{{ SamlMetadataURL }}'
-          FederationProviderName: '{{ FederationProviderName }}'
-          SamlMetadataDocument: '{{ SamlMetadataDocument }}'
-          ApplicationCallBackURL: '{{ ApplicationCallBackURL }}'
-          FederationURN: '{{ FederationURN }}'
-          AttributeMap:
-            - Key: '{{ Key }}'
-              Value: '{{ Value }}'
-      - name: SuperuserParameters
+          saml_metadata_url: '{{ saml_metadata_url }}'
+          federation_provider_name: '{{ federation_provider_name }}'
+          saml_metadata_document: '{{ saml_metadata_document }}'
+          application_call_back_url: '{{ application_call_back_url }}'
+          federation_ur_n: '{{ federation_ur_n }}'
+          attribute_map:
+            - key: '{{ key }}'
+              value: '{{ value }}'
+      - name: superuser_parameters
         value:
-          FirstName: '{{ FirstName }}'
-          LastName: '{{ LastName }}'
-          EmailAddress: '{{ EmailAddress }}'
-      - name: DataBundles
+          first_name: '{{ first_name }}'
+          last_name: '{{ last_name }}'
+          email_address: '{{ email_address }}'
+      - name: data_bundles
         value:
-          - '{{ DataBundles[0] }}'
-      - name: Tags
+          - '{{ data_bundles[0] }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -421,7 +420,7 @@ SET PatchDocument = string('{{ {
     "FederationMode": federation_mode
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<EnvironmentId>';
+AND Identifier = '{{ environment_id }}';
 ```
 
 
@@ -430,7 +429,7 @@ AND Identifier = '<EnvironmentId>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.finspace.environments
-WHERE Identifier = '<EnvironmentId>'
+WHERE Identifier = '{{ environment_id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/fis/experiment_templates/index.md b/website/docs/services/fis/experiment_templates/index.md
index ec803c670..4f029f80e 100644
--- a/website/docs/services/fis/experiment_templates/index.md
+++ b/website/docs/services/fis/experiment_templates/index.md
@@ -303,7 +303,7 @@ tags,
 experiment_options,
 experiment_report_configuration
 FROM awscc.fis.experiment_templates
-WHERE region = 'us-east-1' AND Identifier = '<Id>';
+WHERE region = 'us-east-1' AND Identifier = '{{ id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -342,11 +342,11 @@ INSERT INTO awscc.fis.experiment_templates (
  RoleArn,
  region
 )
-SELECT 
-'{{ Description }}',
- '{{ Targets }}',
- '{{ StopConditions }}',
- '{{ RoleArn }}',
+SELECT
+'{{ description }}',
+ '{{ targets }}',
+ '{{ stop_conditions }}',
+ '{{ role_arn }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -366,16 +366,16 @@ INSERT INTO awscc.fis.experiment_templates (
  ExperimentReportConfiguration,
  region
 )
-SELECT 
- '{{ Description }}',
- '{{ Targets }}',
- '{{ Actions }}',
- '{{ StopConditions }}',
- '{{ LogConfiguration }}',
- '{{ RoleArn }}',
- '{{ Tags }}',
- '{{ ExperimentOptions }}',
- '{{ ExperimentReportConfiguration }}',
+SELECT
+ '{{ description }}',
+ '{{ targets }}',
+ '{{ actions }}',
+ '{{ stop_conditions }}',
+ '{{ log_configuration }}',
+ '{{ role_arn }}',
+ '{{ tags }}',
+ '{{ experiment_options }}',
+ '{{ experiment_report_configuration }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -393,44 +393,43 @@ globals:
 resources:
   - name: experiment_template
     props:
-      - name: Description
-        value: '{{ Description }}'
-      - name: Targets
+      - name: description
+        value: '{{ description }}'
+      - name: targets
         value: {}
-      - name: Actions
+      - name: actions
         value: {}
-      - name: StopConditions
+      - name: stop_conditions
         value:
-          - Source: '{{ Source }}'
-            Value: '{{ Value }}'
-      - name: LogConfiguration
+          - source: '{{ source }}'
+            value: '{{ value }}'
+      - name: log_configuration
         value:
-          CloudWatchLogsConfiguration:
-            LogGroupArn: '{{ LogGroupArn }}'
-          S3Configuration:
-            BucketName: '{{ BucketName }}'
-            Prefix: '{{ Prefix }}'
-          LogSchemaVersion: '{{ LogSchemaVersion }}'
-      - name: RoleArn
-        value: '{{ RoleArn }}'
-      - name: Tags
+          cloud_watch_logs_configuration:
+            log_group_arn: '{{ log_group_arn }}'
+          s3_configuration:
+            bucket_name: '{{ bucket_name }}'
+            prefix: '{{ prefix }}'
+          log_schema_version: '{{ log_schema_version }}'
+      - name: role_arn
+        value: '{{ role_arn }}'
+      - name: tags
         value: {}
-      - name: ExperimentOptions
+      - name: experiment_options
         value:
-          AccountTargeting: '{{ AccountTargeting }}'
-          EmptyTargetResolutionMode: '{{ EmptyTargetResolutionMode }}'
-      - name: ExperimentReportConfiguration
+          account_targeting: '{{ account_targeting }}'
+          empty_target_resolution_mode: '{{ empty_target_resolution_mode }}'
+      - name: experiment_report_configuration
         value:
-          Outputs:
-            ExperimentReportS3Configuration:
-              BucketName: '{{ BucketName }}'
-              Prefix: '{{ Prefix }}'
-          DataSources:
-            CloudWatchDashboards:
-              - DashboardIdentifier: '{{ DashboardIdentifier }}'
-          PreExperimentDuration: '{{ PreExperimentDuration }}'
-          PostExperimentDuration: '{{ PostExperimentDuration }}'
-
+          outputs:
+            experiment_report_s3_configuration:
+              bucket_name: '{{ bucket_name }}'
+              prefix: '{{ prefix }}'
+          data_sources:
+            cloud_watch_dashboards:
+              - dashboard_identifier: '{{ dashboard_identifier }}'
+          pre_experiment_duration: '{{ pre_experiment_duration }}'
+          post_experiment_duration: '{{ post_experiment_duration }}'
 ```
 </TabItem>
 </Tabs>
@@ -453,7 +452,7 @@ SET PatchDocument = string('{{ {
     "ExperimentReportConfiguration": experiment_report_configuration
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Id>';
+AND Identifier = '{{ id }}';
 ```
 
 
@@ -462,7 +461,7 @@ AND Identifier = '<Id>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.fis.experiment_templates
-WHERE Identifier = '<Id>'
+WHERE Identifier = '{{ id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/fis/target_account_configurations/index.md b/website/docs/services/fis/target_account_configurations/index.md
index 9150ce204..a1fab1e52 100644
--- a/website/docs/services/fis/target_account_configurations/index.md
+++ b/website/docs/services/fis/target_account_configurations/index.md
@@ -157,7 +157,7 @@ account_id,
 role_arn,
 description
 FROM awscc.fis.target_account_configurations
-WHERE region = 'us-east-1' AND Identifier = '<ExperimentTemplateId>|<AccountId>';
+WHERE region = 'us-east-1' AND Identifier = '{{ experiment_template_id }}|{{ account_id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -196,10 +196,10 @@ INSERT INTO awscc.fis.target_account_configurations (
  RoleArn,
  region
 )
-SELECT 
-'{{ ExperimentTemplateId }}',
- '{{ AccountId }}',
- '{{ RoleArn }}',
+SELECT
+'{{ experiment_template_id }}',
+ '{{ account_id }}',
+ '{{ role_arn }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -214,11 +214,11 @@ INSERT INTO awscc.fis.target_account_configurations (
  Description,
  region
 )
-SELECT 
- '{{ ExperimentTemplateId }}',
- '{{ AccountId }}',
- '{{ RoleArn }}',
- '{{ Description }}',
+SELECT
+ '{{ experiment_template_id }}',
+ '{{ account_id }}',
+ '{{ role_arn }}',
+ '{{ description }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -236,15 +236,14 @@ globals:
 resources:
   - name: target_account_configuration
     props:
-      - name: ExperimentTemplateId
-        value: '{{ ExperimentTemplateId }}'
-      - name: AccountId
-        value: '{{ AccountId }}'
-      - name: RoleArn
-        value: '{{ RoleArn }}'
-      - name: Description
-        value: '{{ Description }}'
-
+      - name: experiment_template_id
+        value: '{{ experiment_template_id }}'
+      - name: account_id
+        value: '{{ account_id }}'
+      - name: role_arn
+        value: '{{ role_arn }}'
+      - name: description
+        value: '{{ description }}'
 ```
 </TabItem>
 </Tabs>
@@ -261,7 +260,7 @@ SET PatchDocument = string('{{ {
     "Description": description
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<ExperimentTemplateId>|<AccountId>';
+AND Identifier = '{{ experiment_template_id }}|{{ account_id }}';
 ```
 
 
@@ -270,7 +269,7 @@ AND Identifier = '<ExperimentTemplateId>|<AccountId>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.fis.target_account_configurations
-WHERE Identifier = '<ExperimentTemplateId|AccountId>'
+WHERE Identifier = '{{ experiment_template_id }}|{{ account_id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/fms/notification_channels/index.md b/website/docs/services/fms/notification_channels/index.md
index 14b184588..8f7020e48 100644
--- a/website/docs/services/fms/notification_channels/index.md
+++ b/website/docs/services/fms/notification_channels/index.md
@@ -130,7 +130,7 @@ region,
 sns_role_name,
 sns_topic_arn
 FROM awscc.fms.notification_channels
-WHERE region = 'us-east-1' AND Identifier = '<SnsTopicArn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ sns_topic_arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -167,9 +167,9 @@ INSERT INTO awscc.fms.notification_channels (
  SnsTopicArn,
  region
 )
-SELECT 
-'{{ SnsRoleName }}',
- '{{ SnsTopicArn }}',
+SELECT
+'{{ sns_role_name }}',
+ '{{ sns_topic_arn }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -182,9 +182,9 @@ INSERT INTO awscc.fms.notification_channels (
  SnsTopicArn,
  region
 )
-SELECT 
- '{{ SnsRoleName }}',
- '{{ SnsTopicArn }}',
+SELECT
+ '{{ sns_role_name }}',
+ '{{ sns_topic_arn }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -202,11 +202,10 @@ globals:
 resources:
   - name: notification_channel
     props:
-      - name: SnsRoleName
-        value: '{{ SnsRoleName }}'
-      - name: SnsTopicArn
+      - name: sns_role_name
+        value: '{{ sns_role_name }}'
+      - name: sns_topic_arn
         value: null
-
 ```
 </TabItem>
 </Tabs>
@@ -223,7 +222,7 @@ SET PatchDocument = string('{{ {
     "SnsTopicArn": sns_topic_arn
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<SnsTopicArn>';
+AND Identifier = '{{ sns_topic_arn }}';
 ```
 
 
@@ -232,7 +231,7 @@ AND Identifier = '<SnsTopicArn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.fms.notification_channels
-WHERE Identifier = '<SnsTopicArn>'
+WHERE Identifier = '{{ sns_topic_arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/fms/policies/index.md b/website/docs/services/fms/policies/index.md
index 574d26422..6ea695c9c 100644
--- a/website/docs/services/fms/policies/index.md
+++ b/website/docs/services/fms/policies/index.md
@@ -316,7 +316,7 @@ delete_all_policy_resources,
 resources_clean_up,
 tags
 FROM awscc.fms.policies
-WHERE region = 'us-east-1' AND Identifier = '<Id>';
+WHERE region = 'us-east-1' AND Identifier = '{{ id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -355,11 +355,11 @@ INSERT INTO awscc.fms.policies (
  SecurityServicePolicyData,
  region
 )
-SELECT 
-'{{ ExcludeResourceTags }}',
- '{{ PolicyName }}',
- '{{ RemediationEnabled }}',
- '{{ SecurityServicePolicyData }}',
+SELECT
+'{{ exclude_resource_tags }}',
+ '{{ policy_name }}',
+ '{{ remediation_enabled }}',
+ '{{ security_service_policy_data }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -385,22 +385,22 @@ INSERT INTO awscc.fms.policies (
  Tags,
  region
 )
-SELECT 
- '{{ ExcludeMap }}',
- '{{ ExcludeResourceTags }}',
- '{{ IncludeMap }}',
- '{{ PolicyName }}',
- '{{ PolicyDescription }}',
- '{{ RemediationEnabled }}',
- '{{ ResourceTags }}',
- '{{ ResourceTagLogicalOperator }}',
- '{{ ResourceType }}',
- '{{ ResourceTypeList }}',
- '{{ ResourceSetIds }}',
- '{{ SecurityServicePolicyData }}',
- '{{ DeleteAllPolicyResources }}',
- '{{ ResourcesCleanUp }}',
- '{{ Tags }}',
+SELECT
+ '{{ exclude_map }}',
+ '{{ exclude_resource_tags }}',
+ '{{ include_map }}',
+ '{{ policy_name }}',
+ '{{ policy_description }}',
+ '{{ remediation_enabled }}',
+ '{{ resource_tags }}',
+ '{{ resource_tag_logical_operator }}',
+ '{{ resource_type }}',
+ '{{ resource_type_list }}',
+ '{{ resource_set_ids }}',
+ '{{ security_service_policy_data }}',
+ '{{ delete_all_policy_resources }}',
+ '{{ resources_clean_up }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -418,71 +418,70 @@ globals:
 resources:
   - name: policy
     props:
-      - name: ExcludeMap
+      - name: exclude_map
         value:
-          ACCOUNT:
-            - '{{ ACCOUNT[0] }}'
-          ORGUNIT:
-            - '{{ ORGUNIT[0] }}'
-      - name: ExcludeResourceTags
-        value: '{{ ExcludeResourceTags }}'
-      - name: IncludeMap
+          a_cc_ou_nt:
+            - '{{ a_cc_ou_nt[0] }}'
+          o_rg_un_it:
+            - '{{ o_rg_un_it[0] }}'
+      - name: exclude_resource_tags
+        value: '{{ exclude_resource_tags }}'
+      - name: include_map
         value: null
-      - name: PolicyName
-        value: '{{ PolicyName }}'
-      - name: PolicyDescription
-        value: '{{ PolicyDescription }}'
-      - name: RemediationEnabled
-        value: '{{ RemediationEnabled }}'
-      - name: ResourceTags
+      - name: policy_name
+        value: '{{ policy_name }}'
+      - name: policy_description
+        value: '{{ policy_description }}'
+      - name: remediation_enabled
+        value: '{{ remediation_enabled }}'
+      - name: resource_tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-      - name: ResourceTagLogicalOperator
-        value: '{{ ResourceTagLogicalOperator }}'
-      - name: ResourceType
-        value: '{{ ResourceType }}'
-      - name: ResourceTypeList
+          - key: '{{ key }}'
+            value: '{{ value }}'
+      - name: resource_tag_logical_operator
+        value: '{{ resource_tag_logical_operator }}'
+      - name: resource_type
+        value: '{{ resource_type }}'
+      - name: resource_type_list
         value:
           - null
-      - name: ResourceSetIds
+      - name: resource_set_ids
         value:
-          - '{{ ResourceSetIds[0] }}'
-      - name: SecurityServicePolicyData
+          - '{{ resource_set_ids[0] }}'
+      - name: security_service_policy_data
         value:
-          ManagedServiceData: '{{ ManagedServiceData }}'
-          Type: '{{ Type }}'
-          PolicyOption:
-            NetworkFirewallPolicy:
-              FirewallDeploymentModel: '{{ FirewallDeploymentModel }}'
-            ThirdPartyFirewallPolicy:
-              FirewallDeploymentModel: null
-            NetworkAclCommonPolicy:
-              NetworkAclEntrySet:
-                FirstEntries:
-                  - CidrBlock: '{{ CidrBlock }}'
-                    Egress: '{{ Egress }}'
-                    IcmpTypeCode:
-                      Code: '{{ Code }}'
-                      Type: '{{ Type }}'
-                    Ipv6CidrBlock: '{{ Ipv6CidrBlock }}'
-                    PortRange:
-                      From: '{{ From }}'
-                      To: '{{ To }}'
-                    Protocol: '{{ Protocol }}'
-                    RuleAction: '{{ RuleAction }}'
-                ForceRemediateForFirstEntries: '{{ ForceRemediateForFirstEntries }}'
-                LastEntries: null
-                ForceRemediateForLastEntries: '{{ ForceRemediateForLastEntries }}'
-      - name: DeleteAllPolicyResources
-        value: '{{ DeleteAllPolicyResources }}'
-      - name: ResourcesCleanUp
-        value: '{{ ResourcesCleanUp }}'
-      - name: Tags
+          managed_service_data: '{{ managed_service_data }}'
+          type: '{{ type }}'
+          policy_option:
+            network_firewall_policy:
+              firewall_deployment_model: '{{ firewall_deployment_model }}'
+            third_party_firewall_policy:
+              firewall_deployment_model: null
+            network_acl_common_policy:
+              network_acl_entry_set:
+                first_entries:
+                  - cidr_block: '{{ cidr_block }}'
+                    egress: '{{ egress }}'
+                    icmp_type_code:
+                      code: '{{ code }}'
+                      type: '{{ type }}'
+                    ipv6_cidr_block: '{{ ipv6_cidr_block }}'
+                    port_range:
+                      from: '{{ from }}'
+                      to: '{{ to }}'
+                    protocol: '{{ protocol }}'
+                    rule_action: '{{ rule_action }}'
+                force_remediate_for_first_entries: '{{ force_remediate_for_first_entries }}'
+                last_entries: null
+                force_remediate_for_last_entries: '{{ force_remediate_for_last_entries }}'
+      - name: delete_all_policy_resources
+        value: '{{ delete_all_policy_resources }}'
+      - name: resources_clean_up
+        value: '{{ resources_clean_up }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -512,7 +511,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Id>';
+AND Identifier = '{{ id }}';
 ```
 
 
@@ -521,7 +520,7 @@ AND Identifier = '<Id>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.fms.policies
-WHERE Identifier = '<Id>'
+WHERE Identifier = '{{ id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/fms/resource_sets/index.md b/website/docs/services/fms/resource_sets/index.md
index 20e7673e9..16647a9b8 100644
--- a/website/docs/services/fms/resource_sets/index.md
+++ b/website/docs/services/fms/resource_sets/index.md
@@ -176,7 +176,7 @@ resource_type_list,
 resources,
 tags
 FROM awscc.fms.resource_sets
-WHERE region = 'us-east-1' AND Identifier = '<Id>';
+WHERE region = 'us-east-1' AND Identifier = '{{ id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -213,9 +213,9 @@ INSERT INTO awscc.fms.resource_sets (
  ResourceTypeList,
  region
 )
-SELECT 
-'{{ Name }}',
- '{{ ResourceTypeList }}',
+SELECT
+'{{ name }}',
+ '{{ resource_type_list }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -231,12 +231,12 @@ INSERT INTO awscc.fms.resource_sets (
  Tags,
  region
 )
-SELECT 
- '{{ Name }}',
- '{{ Description }}',
- '{{ ResourceTypeList }}',
- '{{ Resources }}',
- '{{ Tags }}',
+SELECT
+ '{{ name }}',
+ '{{ description }}',
+ '{{ resource_type_list }}',
+ '{{ resources }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -254,21 +254,20 @@ globals:
 resources:
   - name: resource_set
     props:
-      - name: Name
-        value: '{{ Name }}'
-      - name: Description
-        value: '{{ Description }}'
-      - name: ResourceTypeList
+      - name: name
+        value: '{{ name }}'
+      - name: description
+        value: '{{ description }}'
+      - name: resource_type_list
         value:
-          - '{{ ResourceTypeList[0] }}'
-      - name: Resources
+          - '{{ resource_type_list[0] }}'
+      - name: resources
         value:
-          - '{{ Resources[0] }}'
-      - name: Tags
+          - '{{ resources[0] }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -288,7 +287,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Id>';
+AND Identifier = '{{ id }}';
 ```
 
 
@@ -297,7 +296,7 @@ AND Identifier = '<Id>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.fms.resource_sets
-WHERE Identifier = '<Id>'
+WHERE Identifier = '{{ id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/forecast/dataset_groups/index.md b/website/docs/services/forecast/dataset_groups/index.md
index 998eaeca6..8f9d584fb 100644
--- a/website/docs/services/forecast/dataset_groups/index.md
+++ b/website/docs/services/forecast/dataset_groups/index.md
@@ -170,7 +170,7 @@ domain,
 tags,
 dataset_group_arn
 FROM awscc.forecast.dataset_groups
-WHERE region = 'us-east-1' AND Identifier = '<DatasetGroupArn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ dataset_group_arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -207,9 +207,9 @@ INSERT INTO awscc.forecast.dataset_groups (
  Domain,
  region
 )
-SELECT 
-'{{ DatasetGroupName }}',
- '{{ Domain }}',
+SELECT
+'{{ dataset_group_name }}',
+ '{{ domain }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -224,11 +224,11 @@ INSERT INTO awscc.forecast.dataset_groups (
  Tags,
  region
 )
-SELECT 
- '{{ DatasetArns }}',
- '{{ DatasetGroupName }}',
- '{{ Domain }}',
- '{{ Tags }}',
+SELECT
+ '{{ dataset_arns }}',
+ '{{ dataset_group_name }}',
+ '{{ domain }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -246,18 +246,17 @@ globals:
 resources:
   - name: dataset_group
     props:
-      - name: DatasetArns
+      - name: dataset_arns
         value:
-          - '{{ DatasetArns[0] }}'
-      - name: DatasetGroupName
-        value: '{{ DatasetGroupName }}'
-      - name: Domain
-        value: '{{ Domain }}'
-      - name: Tags
+          - '{{ dataset_arns[0] }}'
+      - name: dataset_group_name
+        value: '{{ dataset_group_name }}'
+      - name: domain
+        value: '{{ domain }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -275,7 +274,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<DatasetGroupArn>';
+AND Identifier = '{{ dataset_group_arn }}';
 ```
 
 
@@ -284,7 +283,7 @@ AND Identifier = '<DatasetGroupArn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.forecast.dataset_groups
-WHERE Identifier = '<DatasetGroupArn>'
+WHERE Identifier = '{{ dataset_group_arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/forecast/datasets/index.md b/website/docs/services/forecast/datasets/index.md
index 94fe62b62..caf1c57ab 100644
--- a/website/docs/services/forecast/datasets/index.md
+++ b/website/docs/services/forecast/datasets/index.md
@@ -213,7 +213,7 @@ encryption_config,
 schema,
 tags
 FROM awscc.forecast.datasets
-WHERE region = 'us-east-1' AND Identifier = '<Arn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -252,11 +252,11 @@ INSERT INTO awscc.forecast.datasets (
  Schema,
  region
 )
-SELECT 
-'{{ DatasetName }}',
- '{{ DatasetType }}',
- '{{ Domain }}',
- '{{ Schema }}',
+SELECT
+'{{ dataset_name }}',
+ '{{ dataset_type }}',
+ '{{ domain }}',
+ '{{ schema }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -274,14 +274,14 @@ INSERT INTO awscc.forecast.datasets (
  Tags,
  region
 )
-SELECT 
- '{{ DatasetName }}',
- '{{ DatasetType }}',
- '{{ DataFrequency }}',
- '{{ Domain }}',
- '{{ EncryptionConfig }}',
- '{{ Schema }}',
- '{{ Tags }}',
+SELECT
+ '{{ dataset_name }}',
+ '{{ dataset_type }}',
+ '{{ data_frequency }}',
+ '{{ domain }}',
+ '{{ encryption_config }}',
+ '{{ schema }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -299,28 +299,27 @@ globals:
 resources:
   - name: dataset
     props:
-      - name: DatasetName
-        value: '{{ DatasetName }}'
-      - name: DatasetType
-        value: '{{ DatasetType }}'
-      - name: DataFrequency
-        value: '{{ DataFrequency }}'
-      - name: Domain
-        value: '{{ Domain }}'
-      - name: EncryptionConfig
+      - name: dataset_name
+        value: '{{ dataset_name }}'
+      - name: dataset_type
+        value: '{{ dataset_type }}'
+      - name: data_frequency
+        value: '{{ data_frequency }}'
+      - name: domain
+        value: '{{ domain }}'
+      - name: encryption_config
         value:
-          KmsKeyArn: '{{ KmsKeyArn }}'
-          RoleArn: '{{ RoleArn }}'
-      - name: Schema
+          kms_key_arn: '{{ kms_key_arn }}'
+          role_arn: '{{ role_arn }}'
+      - name: schema
         value:
-          Attributes:
-            - AttributeName: '{{ AttributeName }}'
-              AttributeType: '{{ AttributeType }}'
-      - name: Tags
+          attributes:
+            - attribute_name: '{{ attribute_name }}'
+              attribute_type: '{{ attribute_type }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -331,7 +330,7 @@ resources:
 ```sql
 /*+ delete */
 DELETE FROM awscc.forecast.datasets
-WHERE Identifier = '<Arn>'
+WHERE Identifier = '{{ arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/frauddetector/detectors/index.md b/website/docs/services/frauddetector/detectors/index.md
index a55126906..b0db15cab 100644
--- a/website/docs/services/frauddetector/detectors/index.md
+++ b/website/docs/services/frauddetector/detectors/index.md
@@ -481,7 +481,7 @@ created_time,
 last_updated_time,
 associated_models
 FROM awscc.frauddetector.detectors
-WHERE region = 'us-east-1' AND Identifier = '<Arn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -519,10 +519,10 @@ INSERT INTO awscc.frauddetector.detectors (
  EventType,
  region
 )
-SELECT 
-'{{ DetectorId }}',
- '{{ Rules }}',
- '{{ EventType }}',
+SELECT
+'{{ detector_id }}',
+ '{{ rules }}',
+ '{{ event_type }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -541,15 +541,15 @@ INSERT INTO awscc.frauddetector.detectors (
  AssociatedModels,
  region
 )
-SELECT 
- '{{ DetectorId }}',
- '{{ DetectorVersionStatus }}',
- '{{ RuleExecutionMode }}',
- '{{ Tags }}',
- '{{ Description }}',
- '{{ Rules }}',
- '{{ EventType }}',
- '{{ AssociatedModels }}',
+SELECT
+ '{{ detector_id }}',
+ '{{ detector_version_status }}',
+ '{{ rule_execution_mode }}',
+ '{{ tags }}',
+ '{{ description }}',
+ '{{ rules }}',
+ '{{ event_type }}',
+ '{{ associated_models }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -567,73 +567,72 @@ globals:
 resources:
   - name: detector
     props:
-      - name: DetectorId
-        value: '{{ DetectorId }}'
-      - name: DetectorVersionStatus
-        value: '{{ DetectorVersionStatus }}'
-      - name: RuleExecutionMode
-        value: '{{ RuleExecutionMode }}'
-      - name: Tags
+      - name: detector_id
+        value: '{{ detector_id }}'
+      - name: detector_version_status
+        value: '{{ detector_version_status }}'
+      - name: rule_execution_mode
+        value: '{{ rule_execution_mode }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-      - name: Description
-        value: '{{ Description }}'
-      - name: Rules
+          - key: '{{ key }}'
+            value: '{{ value }}'
+      - name: description
+        value: '{{ description }}'
+      - name: rules
         value:
-          - RuleId: '{{ RuleId }}'
-            RuleVersion: '{{ RuleVersion }}'
-            DetectorId: '{{ DetectorId }}'
-            Expression: '{{ Expression }}'
-            Language: '{{ Language }}'
-            Outcomes:
-              - Name: '{{ Name }}'
-                Tags:
+          - rule_id: '{{ rule_id }}'
+            rule_version: '{{ rule_version }}'
+            detector_id: '{{ detector_id }}'
+            expression: '{{ expression }}'
+            language: '{{ language }}'
+            outcomes:
+              - name: '{{ name }}'
+                tags:
                   - null
-                Description: '{{ Description }}'
-            Arn: '{{ Arn }}'
-            Description: '{{ Description }}'
-            Tags:
+                description: '{{ description }}'
+            arn: '{{ arn }}'
+            description: '{{ description }}'
+            tags:
               - null
-            CreatedTime: '{{ CreatedTime }}'
-            LastUpdatedTime: '{{ LastUpdatedTime }}'
-      - name: EventType
+            created_time: '{{ created_time }}'
+            last_updated_time: '{{ last_updated_time }}'
+      - name: event_type
         value:
-          Name: '{{ Name }}'
-          Tags:
+          name: '{{ name }}'
+          tags:
             - null
-          Description: '{{ Description }}'
-          EventVariables:
-            - Arn: '{{ Arn }}'
-              Inline: '{{ Inline }}'
-              Name: '{{ Name }}'
-              DataSource: '{{ DataSource }}'
-              DataType: '{{ DataType }}'
-              DefaultValue: '{{ DefaultValue }}'
-              VariableType: '{{ VariableType }}'
-              Description: '{{ Description }}'
-              Tags:
+          description: '{{ description }}'
+          event_variables:
+            - arn: '{{ arn }}'
+              inline: '{{ inline }}'
+              name: '{{ name }}'
+              data_source: '{{ data_source }}'
+              data_type: '{{ data_type }}'
+              default_value: '{{ default_value }}'
+              variable_type: '{{ variable_type }}'
+              description: '{{ description }}'
+              tags:
                 - null
-              CreatedTime: '{{ CreatedTime }}'
-              LastUpdatedTime: '{{ LastUpdatedTime }}'
-          Labels:
-            - Name: '{{ Name }}'
-              Tags:
+              created_time: '{{ created_time }}'
+              last_updated_time: '{{ last_updated_time }}'
+          labels:
+            - name: '{{ name }}'
+              tags:
                 - null
-              Description: '{{ Description }}'
-          EntityTypes:
-            - Arn: '{{ Arn }}'
-              Inline: '{{ Inline }}'
-              Name: '{{ Name }}'
-              Description: '{{ Description }}'
-              Tags:
+              description: '{{ description }}'
+          entity_types:
+            - arn: '{{ arn }}'
+              inline: '{{ inline }}'
+              name: '{{ name }}'
+              description: '{{ description }}'
+              tags:
                 - null
-              CreatedTime: '{{ CreatedTime }}'
-              LastUpdatedTime: '{{ LastUpdatedTime }}'
-      - name: AssociatedModels
+              created_time: '{{ created_time }}'
+              last_updated_time: '{{ last_updated_time }}'
+      - name: associated_models
         value:
-          - Arn: '{{ Arn }}'
-
+          - arn: '{{ arn }}'
 ```
 </TabItem>
 </Tabs>
@@ -652,7 +651,7 @@ SET PatchDocument = string('{{ {
     "Description": description
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Arn>';
+AND Identifier = '{{ arn }}';
 ```
 
 
@@ -661,7 +660,7 @@ AND Identifier = '<Arn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.frauddetector.detectors
-WHERE Identifier = '<Arn>'
+WHERE Identifier = '{{ arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/frauddetector/event_types/index.md b/website/docs/services/frauddetector/event_types/index.md
index c5509fb34..7441027a5 100644
--- a/website/docs/services/frauddetector/event_types/index.md
+++ b/website/docs/services/frauddetector/event_types/index.md
@@ -320,7 +320,7 @@ arn,
 created_time,
 last_updated_time
 FROM awscc.frauddetector.event_types
-WHERE region = 'us-east-1' AND Identifier = '<Arn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -359,11 +359,11 @@ INSERT INTO awscc.frauddetector.event_types (
  EntityTypes,
  region
 )
-SELECT 
-'{{ Name }}',
- '{{ EventVariables }}',
- '{{ Labels }}',
- '{{ EntityTypes }}',
+SELECT
+'{{ name }}',
+ '{{ event_variables }}',
+ '{{ labels }}',
+ '{{ entity_types }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -380,13 +380,13 @@ INSERT INTO awscc.frauddetector.event_types (
  EntityTypes,
  region
 )
-SELECT 
- '{{ Name }}',
- '{{ Tags }}',
- '{{ Description }}',
- '{{ EventVariables }}',
- '{{ Labels }}',
- '{{ EntityTypes }}',
+SELECT
+ '{{ name }}',
+ '{{ tags }}',
+ '{{ description }}',
+ '{{ event_variables }}',
+ '{{ labels }}',
+ '{{ entity_types }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -404,45 +404,44 @@ globals:
 resources:
   - name: event_type
     props:
-      - name: Name
-        value: '{{ Name }}'
-      - name: Tags
+      - name: name
+        value: '{{ name }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-      - name: Description
-        value: '{{ Description }}'
-      - name: EventVariables
+          - key: '{{ key }}'
+            value: '{{ value }}'
+      - name: description
+        value: '{{ description }}'
+      - name: event_variables
         value:
-          - Arn: '{{ Arn }}'
-            Inline: '{{ Inline }}'
-            Name: '{{ Name }}'
-            DataSource: '{{ DataSource }}'
-            DataType: '{{ DataType }}'
-            DefaultValue: '{{ DefaultValue }}'
-            VariableType: '{{ VariableType }}'
-            Description: '{{ Description }}'
-            Tags:
+          - arn: '{{ arn }}'
+            inline: '{{ inline }}'
+            name: '{{ name }}'
+            data_source: '{{ data_source }}'
+            data_type: '{{ data_type }}'
+            default_value: '{{ default_value }}'
+            variable_type: '{{ variable_type }}'
+            description: '{{ description }}'
+            tags:
               - null
-            CreatedTime: '{{ CreatedTime }}'
-            LastUpdatedTime: '{{ LastUpdatedTime }}'
-      - name: Labels
+            created_time: '{{ created_time }}'
+            last_updated_time: '{{ last_updated_time }}'
+      - name: labels
         value:
-          - Name: '{{ Name }}'
-            Tags:
+          - name: '{{ name }}'
+            tags:
               - null
-            Description: '{{ Description }}'
-      - name: EntityTypes
+            description: '{{ description }}'
+      - name: entity_types
         value:
-          - Arn: '{{ Arn }}'
-            Inline: '{{ Inline }}'
-            Name: '{{ Name }}'
-            Description: '{{ Description }}'
-            Tags:
+          - arn: '{{ arn }}'
+            inline: '{{ inline }}'
+            name: '{{ name }}'
+            description: '{{ description }}'
+            tags:
               - null
-            CreatedTime: '{{ CreatedTime }}'
-            LastUpdatedTime: '{{ LastUpdatedTime }}'
-
+            created_time: '{{ created_time }}'
+            last_updated_time: '{{ last_updated_time }}'
 ```
 </TabItem>
 </Tabs>
@@ -459,7 +458,7 @@ SET PatchDocument = string('{{ {
     "Description": description
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Arn>';
+AND Identifier = '{{ arn }}';
 ```
 
 
@@ -468,7 +467,7 @@ AND Identifier = '<Arn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.frauddetector.event_types
-WHERE Identifier = '<Arn>'
+WHERE Identifier = '{{ arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/frauddetector/labels/index.md b/website/docs/services/frauddetector/labels/index.md
index ad4997cc9..72bdac55d 100644
--- a/website/docs/services/frauddetector/labels/index.md
+++ b/website/docs/services/frauddetector/labels/index.md
@@ -176,7 +176,7 @@ arn,
 created_time,
 last_updated_time
 FROM awscc.frauddetector.labels
-WHERE region = 'us-east-1' AND Identifier = '<Arn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -212,8 +212,8 @@ INSERT INTO awscc.frauddetector.labels (
  Name,
  region
 )
-SELECT 
-'{{ Name }}',
+SELECT
+'{{ name }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -227,10 +227,10 @@ INSERT INTO awscc.frauddetector.labels (
  Description,
  region
 )
-SELECT 
- '{{ Name }}',
- '{{ Tags }}',
- '{{ Description }}',
+SELECT
+ '{{ name }}',
+ '{{ tags }}',
+ '{{ description }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -248,15 +248,14 @@ globals:
 resources:
   - name: label
     props:
-      - name: Name
-        value: '{{ Name }}'
-      - name: Tags
+      - name: name
+        value: '{{ name }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-      - name: Description
-        value: '{{ Description }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
+      - name: description
+        value: '{{ description }}'
 ```
 </TabItem>
 </Tabs>
@@ -273,7 +272,7 @@ SET PatchDocument = string('{{ {
     "Description": description
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Arn>';
+AND Identifier = '{{ arn }}';
 ```
 
 
@@ -282,7 +281,7 @@ AND Identifier = '<Arn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.frauddetector.labels
-WHERE Identifier = '<Arn>'
+WHERE Identifier = '{{ arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/frauddetector/lists/index.md b/website/docs/services/frauddetector/lists/index.md
index e05cd56f2..c944ca9a7 100644
--- a/website/docs/services/frauddetector/lists/index.md
+++ b/website/docs/services/frauddetector/lists/index.md
@@ -188,7 +188,7 @@ last_updated_time,
 tags,
 elements
 FROM awscc.frauddetector.lists
-WHERE region = 'us-east-1' AND Identifier = '<Arn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -224,8 +224,8 @@ INSERT INTO awscc.frauddetector.lists (
  Name,
  region
 )
-SELECT 
-'{{ Name }}',
+SELECT
+'{{ name }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -241,12 +241,12 @@ INSERT INTO awscc.frauddetector.lists (
  Elements,
  region
 )
-SELECT 
- '{{ Name }}',
- '{{ Description }}',
- '{{ VariableType }}',
- '{{ Tags }}',
- '{{ Elements }}',
+SELECT
+ '{{ name }}',
+ '{{ description }}',
+ '{{ variable_type }}',
+ '{{ tags }}',
+ '{{ elements }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -264,20 +264,19 @@ globals:
 resources:
   - name: list
     props:
-      - name: Name
-        value: '{{ Name }}'
-      - name: Description
-        value: '{{ Description }}'
-      - name: VariableType
-        value: '{{ VariableType }}'
-      - name: Tags
+      - name: name
+        value: '{{ name }}'
+      - name: description
+        value: '{{ description }}'
+      - name: variable_type
+        value: '{{ variable_type }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-      - name: Elements
+          - key: '{{ key }}'
+            value: '{{ value }}'
+      - name: elements
         value:
-          - '{{ Elements[0] }}'
-
+          - '{{ elements[0] }}'
 ```
 </TabItem>
 </Tabs>
@@ -296,7 +295,7 @@ SET PatchDocument = string('{{ {
     "Elements": elements
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Arn>';
+AND Identifier = '{{ arn }}';
 ```
 
 
@@ -305,7 +304,7 @@ AND Identifier = '<Arn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.frauddetector.lists
-WHERE Identifier = '<Arn>'
+WHERE Identifier = '{{ arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/frauddetector/outcomes/index.md b/website/docs/services/frauddetector/outcomes/index.md
index d621b06d3..5fb3aa8d0 100644
--- a/website/docs/services/frauddetector/outcomes/index.md
+++ b/website/docs/services/frauddetector/outcomes/index.md
@@ -176,7 +176,7 @@ arn,
 created_time,
 last_updated_time
 FROM awscc.frauddetector.outcomes
-WHERE region = 'us-east-1' AND Identifier = '<Arn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -212,8 +212,8 @@ INSERT INTO awscc.frauddetector.outcomes (
  Name,
  region
 )
-SELECT 
-'{{ Name }}',
+SELECT
+'{{ name }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -227,10 +227,10 @@ INSERT INTO awscc.frauddetector.outcomes (
  Description,
  region
 )
-SELECT 
- '{{ Name }}',
- '{{ Tags }}',
- '{{ Description }}',
+SELECT
+ '{{ name }}',
+ '{{ tags }}',
+ '{{ description }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -248,15 +248,14 @@ globals:
 resources:
   - name: outcome
     props:
-      - name: Name
-        value: '{{ Name }}'
-      - name: Tags
+      - name: name
+        value: '{{ name }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-      - name: Description
-        value: '{{ Description }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
+      - name: description
+        value: '{{ description }}'
 ```
 </TabItem>
 </Tabs>
@@ -273,7 +272,7 @@ SET PatchDocument = string('{{ {
     "Description": description
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Arn>';
+AND Identifier = '{{ arn }}';
 ```
 
 
@@ -282,7 +281,7 @@ AND Identifier = '<Arn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.frauddetector.outcomes
-WHERE Identifier = '<Arn>'
+WHERE Identifier = '{{ arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/frauddetector/variables/index.md b/website/docs/services/frauddetector/variables/index.md
index f81d799cb..cc6848f3d 100644
--- a/website/docs/services/frauddetector/variables/index.md
+++ b/website/docs/services/frauddetector/variables/index.md
@@ -200,7 +200,7 @@ arn,
 created_time,
 last_updated_time
 FROM awscc.frauddetector.variables
-WHERE region = 'us-east-1' AND Identifier = '<Arn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -239,11 +239,11 @@ INSERT INTO awscc.frauddetector.variables (
  DefaultValue,
  region
 )
-SELECT 
-'{{ Name }}',
- '{{ DataSource }}',
- '{{ DataType }}',
- '{{ DefaultValue }}',
+SELECT
+'{{ name }}',
+ '{{ data_source }}',
+ '{{ data_type }}',
+ '{{ default_value }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -261,14 +261,14 @@ INSERT INTO awscc.frauddetector.variables (
  VariableType,
  region
 )
-SELECT 
- '{{ Name }}',
- '{{ DataSource }}',
- '{{ DataType }}',
- '{{ DefaultValue }}',
- '{{ Description }}',
- '{{ Tags }}',
- '{{ VariableType }}',
+SELECT
+ '{{ name }}',
+ '{{ data_source }}',
+ '{{ data_type }}',
+ '{{ default_value }}',
+ '{{ description }}',
+ '{{ tags }}',
+ '{{ variable_type }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -286,23 +286,22 @@ globals:
 resources:
   - name: variable
     props:
-      - name: Name
-        value: '{{ Name }}'
-      - name: DataSource
-        value: '{{ DataSource }}'
-      - name: DataType
-        value: '{{ DataType }}'
-      - name: DefaultValue
-        value: '{{ DefaultValue }}'
-      - name: Description
-        value: '{{ Description }}'
-      - name: Tags
+      - name: name
+        value: '{{ name }}'
+      - name: data_source
+        value: '{{ data_source }}'
+      - name: data_type
+        value: '{{ data_type }}'
+      - name: default_value
+        value: '{{ default_value }}'
+      - name: description
+        value: '{{ description }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-      - name: VariableType
-        value: '{{ VariableType }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
+      - name: variable_type
+        value: '{{ variable_type }}'
 ```
 </TabItem>
 </Tabs>
@@ -323,7 +322,7 @@ SET PatchDocument = string('{{ {
     "VariableType": variable_type
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Arn>';
+AND Identifier = '{{ arn }}';
 ```
 
 
@@ -332,7 +331,7 @@ AND Identifier = '<Arn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.frauddetector.variables
-WHERE Identifier = '<Arn>'
+WHERE Identifier = '{{ arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/fsx/data_repository_associations/index.md b/website/docs/services/fsx/data_repository_associations/index.md
index 8294297e5..d5e1c45fb 100644
--- a/website/docs/services/fsx/data_repository_associations/index.md
+++ b/website/docs/services/fsx/data_repository_associations/index.md
@@ -220,7 +220,7 @@ imported_file_chunk_size,
 s3,
 tags
 FROM awscc.fsx.data_repository_associations
-WHERE region = 'us-east-1' AND Identifier = '<AssociationId>';
+WHERE region = 'us-east-1' AND Identifier = '{{ association_id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -258,10 +258,10 @@ INSERT INTO awscc.fsx.data_repository_associations (
  DataRepositoryPath,
  region
 )
-SELECT 
-'{{ FileSystemId }}',
- '{{ FileSystemPath }}',
- '{{ DataRepositoryPath }}',
+SELECT
+'{{ file_system_id }}',
+ '{{ file_system_path }}',
+ '{{ data_repository_path }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -279,14 +279,14 @@ INSERT INTO awscc.fsx.data_repository_associations (
  Tags,
  region
 )
-SELECT 
- '{{ FileSystemId }}',
- '{{ FileSystemPath }}',
- '{{ DataRepositoryPath }}',
- '{{ BatchImportMetaDataOnCreate }}',
- '{{ ImportedFileChunkSize }}',
- '{{ S3 }}',
- '{{ Tags }}',
+SELECT
+ '{{ file_system_id }}',
+ '{{ file_system_path }}',
+ '{{ data_repository_path }}',
+ '{{ batch_import_meta_data_on_create }}',
+ '{{ imported_file_chunk_size }}',
+ '{{ s3 }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -304,28 +304,27 @@ globals:
 resources:
   - name: data_repository_association
     props:
-      - name: FileSystemId
-        value: '{{ FileSystemId }}'
-      - name: FileSystemPath
-        value: '{{ FileSystemPath }}'
-      - name: DataRepositoryPath
-        value: '{{ DataRepositoryPath }}'
-      - name: BatchImportMetaDataOnCreate
-        value: '{{ BatchImportMetaDataOnCreate }}'
-      - name: ImportedFileChunkSize
-        value: '{{ ImportedFileChunkSize }}'
-      - name: S3
+      - name: file_system_id
+        value: '{{ file_system_id }}'
+      - name: file_system_path
+        value: '{{ file_system_path }}'
+      - name: data_repository_path
+        value: '{{ data_repository_path }}'
+      - name: batch_import_meta_data_on_create
+        value: '{{ batch_import_meta_data_on_create }}'
+      - name: imported_file_chunk_size
+        value: '{{ imported_file_chunk_size }}'
+      - name: s3
         value:
-          AutoImportPolicy:
-            Events:
-              - '{{ Events[0] }}'
-          AutoExportPolicy:
-            Events: null
-      - name: Tags
+          auto_import_policy:
+            events:
+              - '{{ events[0] }}'
+          auto_export_policy:
+            events: null
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -343,7 +342,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<AssociationId>';
+AND Identifier = '{{ association_id }}';
 ```
 
 
@@ -352,7 +351,7 @@ AND Identifier = '<AssociationId>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.fsx.data_repository_associations
-WHERE Identifier = '<AssociationId>'
+WHERE Identifier = '{{ association_id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/fsx/s3access_point_attachments/index.md b/website/docs/services/fsx/s3access_point_attachments/index.md
index 22aad7ccd..73933a060 100644
--- a/website/docs/services/fsx/s3access_point_attachments/index.md
+++ b/website/docs/services/fsx/s3access_point_attachments/index.md
@@ -216,7 +216,7 @@ type,
 open_zf_sconfiguration,
 s3_access_point
 FROM awscc.fsx.s3access_point_attachments
-WHERE region = 'us-east-1' AND Identifier = '<Name>';
+WHERE region = 'us-east-1' AND Identifier = '{{ name }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -254,10 +254,10 @@ INSERT INTO awscc.fsx.s3access_point_attachments (
  OpenZFSConfiguration,
  region
 )
-SELECT 
-'{{ Name }}',
- '{{ Type }}',
- '{{ OpenZFSConfiguration }}',
+SELECT
+'{{ name }}',
+ '{{ type }}',
+ '{{ open_zf_sconfiguration }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -272,11 +272,11 @@ INSERT INTO awscc.fsx.s3access_point_attachments (
  S3AccessPoint,
  region
 )
-SELECT 
- '{{ Name }}',
- '{{ Type }}',
- '{{ OpenZFSConfiguration }}',
- '{{ S3AccessPoint }}',
+SELECT
+ '{{ name }}',
+ '{{ type }}',
+ '{{ open_zf_sconfiguration }}',
+ '{{ s3_access_point }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -294,28 +294,27 @@ globals:
 resources:
   - name: s3access_point_attachment
     props:
-      - name: Name
-        value: '{{ Name }}'
-      - name: Type
-        value: '{{ Type }}'
-      - name: OpenZFSConfiguration
+      - name: name
+        value: '{{ name }}'
+      - name: type
+        value: '{{ type }}'
+      - name: open_zf_sconfiguration
         value:
-          VolumeId: '{{ VolumeId }}'
-          FileSystemIdentity:
-            Type: '{{ Type }}'
-            PosixUser:
-              Uid: null
-              Gid: null
-              SecondaryGids:
-                - Gid: null
-      - name: S3AccessPoint
+          volume_id: '{{ volume_id }}'
+          file_system_identity:
+            type: '{{ type }}'
+            posix_user:
+              uid: null
+              gid: null
+              secondary_gids:
+                - gid: null
+      - name: s3_access_point
         value:
-          ResourceARN: '{{ ResourceARN }}'
-          Alias: '{{ Alias }}'
-          VpcConfiguration:
-            VpcId: '{{ VpcId }}'
-          Policy: {}
-
+          resource_arn: '{{ resource_arn }}'
+          alias: '{{ alias }}'
+          vpc_configuration:
+            vpc_id: '{{ vpc_id }}'
+          policy: {}
 ```
 </TabItem>
 </Tabs>
@@ -326,7 +325,7 @@ resources:
 ```sql
 /*+ delete */
 DELETE FROM awscc.fsx.s3access_point_attachments
-WHERE Identifier = '<Name>'
+WHERE Identifier = '{{ name }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/gamelift/aliases/index.md b/website/docs/services/gamelift/aliases/index.md
index 9bfa6423c..9cd2cfe0d 100644
--- a/website/docs/services/gamelift/aliases/index.md
+++ b/website/docs/services/gamelift/aliases/index.md
@@ -193,7 +193,7 @@ alias_id,
 alias_arn,
 tags
 FROM awscc.gamelift.aliases
-WHERE region = 'us-east-1' AND Identifier = '<AliasId>';
+WHERE region = 'us-east-1' AND Identifier = '{{ alias_id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -230,9 +230,9 @@ INSERT INTO awscc.gamelift.aliases (
  RoutingStrategy,
  region
 )
-SELECT 
-'{{ Name }}',
- '{{ RoutingStrategy }}',
+SELECT
+'{{ name }}',
+ '{{ routing_strategy }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -247,11 +247,11 @@ INSERT INTO awscc.gamelift.aliases (
  Tags,
  region
 )
-SELECT 
- '{{ Description }}',
- '{{ Name }}',
- '{{ RoutingStrategy }}',
- '{{ Tags }}',
+SELECT
+ '{{ description }}',
+ '{{ name }}',
+ '{{ routing_strategy }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -269,20 +269,19 @@ globals:
 resources:
   - name: alias
     props:
-      - name: Description
-        value: '{{ Description }}'
-      - name: Name
-        value: '{{ Name }}'
-      - name: RoutingStrategy
+      - name: description
+        value: '{{ description }}'
+      - name: name
+        value: '{{ name }}'
+      - name: routing_strategy
         value:
-          Message: '{{ Message }}'
-          FleetId: '{{ FleetId }}'
-          Type: '{{ Type }}'
-      - name: Tags
+          message: '{{ message }}'
+          fleet_id: '{{ fleet_id }}'
+          type: '{{ type }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -301,7 +300,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<AliasId>';
+AND Identifier = '{{ alias_id }}';
 ```
 
 
@@ -310,7 +309,7 @@ AND Identifier = '<AliasId>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.gamelift.aliases
-WHERE Identifier = '<AliasId>'
+WHERE Identifier = '{{ alias_id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/gamelift/builds/index.md b/website/docs/services/gamelift/builds/index.md
index 673704fc1..990fd7fa3 100644
--- a/website/docs/services/gamelift/builds/index.md
+++ b/website/docs/services/gamelift/builds/index.md
@@ -210,7 +210,7 @@ server_sdk_version,
 tags,
 build_arn
 FROM awscc.gamelift.builds
-WHERE region = 'us-east-1' AND Identifier = '<BuildId>';
+WHERE region = 'us-east-1' AND Identifier = '{{ build_id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -246,7 +246,7 @@ INSERT INTO awscc.gamelift.builds (
  ,
  region
 )
-SELECT 
+SELECT
 '{{  }}',
 '{{ region }}';
 ```
@@ -264,13 +264,13 @@ INSERT INTO awscc.gamelift.builds (
  Tags,
  region
 )
-SELECT 
- '{{ Name }}',
- '{{ OperatingSystem }}',
- '{{ StorageLocation }}',
- '{{ Version }}',
- '{{ ServerSdkVersion }}',
- '{{ Tags }}',
+SELECT
+ '{{ name }}',
+ '{{ operating_system }}',
+ '{{ storage_location }}',
+ '{{ version }}',
+ '{{ server_sdk_version }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -288,25 +288,24 @@ globals:
 resources:
   - name: build
     props:
-      - name: Name
-        value: '{{ Name }}'
-      - name: OperatingSystem
-        value: '{{ OperatingSystem }}'
-      - name: StorageLocation
+      - name: name
+        value: '{{ name }}'
+      - name: operating_system
+        value: '{{ operating_system }}'
+      - name: storage_location
         value:
-          Bucket: '{{ Bucket }}'
-          Key: '{{ Key }}'
-          ObjectVersion: '{{ ObjectVersion }}'
-          RoleArn: '{{ RoleArn }}'
-      - name: Version
-        value: '{{ Version }}'
-      - name: ServerSdkVersion
-        value: '{{ ServerSdkVersion }}'
-      - name: Tags
+          bucket: '{{ bucket }}'
+          key: '{{ key }}'
+          object_version: '{{ object_version }}'
+          role_arn: '{{ role_arn }}'
+      - name: version
+        value: '{{ version }}'
+      - name: server_sdk_version
+        value: '{{ server_sdk_version }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -324,7 +323,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<BuildId>';
+AND Identifier = '{{ build_id }}';
 ```
 
 
@@ -333,7 +332,7 @@ AND Identifier = '<BuildId>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.gamelift.builds
-WHERE Identifier = '<BuildId>'
+WHERE Identifier = '{{ build_id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/gamelift/container_fleets/index.md b/website/docs/services/gamelift/container_fleets/index.md
index c3b7185f1..e94126b71 100644
--- a/website/docs/services/gamelift/container_fleets/index.md
+++ b/website/docs/services/gamelift/container_fleets/index.md
@@ -533,7 +533,7 @@ log_configuration,
 tags,
 fleet_arn
 FROM awscc.gamelift.container_fleets
-WHERE region = 'us-east-1' AND Identifier = '<FleetId>';
+WHERE region = 'us-east-1' AND Identifier = '{{ fleet_id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -569,8 +569,8 @@ INSERT INTO awscc.gamelift.container_fleets (
  FleetRoleArn,
  region
 )
-SELECT 
-'{{ FleetRoleArn }}',
+SELECT
+'{{ fleet_role_arn }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -598,24 +598,24 @@ INSERT INTO awscc.gamelift.container_fleets (
  Tags,
  region
 )
-SELECT 
- '{{ FleetRoleArn }}',
- '{{ Description }}',
- '{{ GameServerContainerGroupDefinitionName }}',
- '{{ PerInstanceContainerGroupDefinitionName }}',
- '{{ InstanceConnectionPortRange }}',
- '{{ InstanceInboundPermissions }}',
- '{{ GameServerContainerGroupsPerInstance }}',
- '{{ DeploymentConfiguration }}',
- '{{ InstanceType }}',
- '{{ BillingType }}',
- '{{ Locations }}',
- '{{ ScalingPolicies }}',
- '{{ MetricGroups }}',
- '{{ NewGameSessionProtectionPolicy }}',
- '{{ GameSessionCreationLimitPolicy }}',
- '{{ LogConfiguration }}',
- '{{ Tags }}',
+SELECT
+ '{{ fleet_role_arn }}',
+ '{{ description }}',
+ '{{ game_server_container_group_definition_name }}',
+ '{{ per_instance_container_group_definition_name }}',
+ '{{ instance_connection_port_range }}',
+ '{{ instance_inbound_permissions }}',
+ '{{ game_server_container_groups_per_instance }}',
+ '{{ deployment_configuration }}',
+ '{{ instance_type }}',
+ '{{ billing_type }}',
+ '{{ locations }}',
+ '{{ scaling_policies }}',
+ '{{ metric_groups }}',
+ '{{ new_game_session_protection_policy }}',
+ '{{ game_session_creation_limit_policy }}',
+ '{{ log_configuration }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -633,79 +633,78 @@ globals:
 resources:
   - name: container_fleet
     props:
-      - name: FleetRoleArn
-        value: '{{ FleetRoleArn }}'
-      - name: Description
-        value: '{{ Description }}'
-      - name: GameServerContainerGroupDefinitionName
-        value: '{{ GameServerContainerGroupDefinitionName }}'
-      - name: PerInstanceContainerGroupDefinitionName
-        value: '{{ PerInstanceContainerGroupDefinitionName }}'
-      - name: InstanceConnectionPortRange
+      - name: fleet_role_arn
+        value: '{{ fleet_role_arn }}'
+      - name: description
+        value: '{{ description }}'
+      - name: game_server_container_group_definition_name
+        value: '{{ game_server_container_group_definition_name }}'
+      - name: per_instance_container_group_definition_name
+        value: '{{ per_instance_container_group_definition_name }}'
+      - name: instance_connection_port_range
         value:
-          FromPort: '{{ FromPort }}'
-          ToPort: '{{ ToPort }}'
-      - name: InstanceInboundPermissions
+          from_port: '{{ from_port }}'
+          to_port: '{{ to_port }}'
+      - name: instance_inbound_permissions
         value:
-          - FromPort: '{{ FromPort }}'
-            IpRange: '{{ IpRange }}'
-            Protocol: '{{ Protocol }}'
-            ToPort: '{{ ToPort }}'
-      - name: GameServerContainerGroupsPerInstance
-        value: '{{ GameServerContainerGroupsPerInstance }}'
-      - name: DeploymentConfiguration
+          - from_port: '{{ from_port }}'
+            ip_range: '{{ ip_range }}'
+            protocol: '{{ protocol }}'
+            to_port: '{{ to_port }}'
+      - name: game_server_container_groups_per_instance
+        value: '{{ game_server_container_groups_per_instance }}'
+      - name: deployment_configuration
         value:
-          ProtectionStrategy: '{{ ProtectionStrategy }}'
-          MinimumHealthyPercentage: '{{ MinimumHealthyPercentage }}'
-          ImpairmentStrategy: '{{ ImpairmentStrategy }}'
-      - name: InstanceType
-        value: '{{ InstanceType }}'
-      - name: BillingType
-        value: '{{ BillingType }}'
-      - name: Locations
+          protection_strategy: '{{ protection_strategy }}'
+          minimum_healthy_percentage: '{{ minimum_healthy_percentage }}'
+          impairment_strategy: '{{ impairment_strategy }}'
+      - name: instance_type
+        value: '{{ instance_type }}'
+      - name: billing_type
+        value: '{{ billing_type }}'
+      - name: locations
         value:
-          - Location:
-              LocationName: '{{ LocationName }}'
-              Tags:
-                - Key: '{{ Key }}'
-                  Value: '{{ Value }}'
-            LocationCapacity:
-              DesiredEC2Instances: '{{ DesiredEC2Instances }}'
-              MinSize: '{{ MinSize }}'
-              MaxSize: '{{ MaxSize }}'
-      - name: ScalingPolicies
+          - location:
+              location_name: '{{ location_name }}'
+              tags:
+                - key: '{{ key }}'
+                  value: '{{ value }}'
+            location_capacity:
+              desired_ec2_instances: '{{ desired_ec2_instances }}'
+              min_size: '{{ min_size }}'
+              max_size: '{{ max_size }}'
+      - name: scaling_policies
         value:
-          - ComparisonOperator: '{{ ComparisonOperator }}'
-            EvaluationPeriods: '{{ EvaluationPeriods }}'
-            Location: null
-            MetricName: '{{ MetricName }}'
-            Name: '{{ Name }}'
-            PolicyType: '{{ PolicyType }}'
-            ScalingAdjustment: '{{ ScalingAdjustment }}'
-            ScalingAdjustmentType: '{{ ScalingAdjustmentType }}'
-            Status: '{{ Status }}'
-            TargetConfiguration:
-              TargetValue: null
-            Threshold: null
-            UpdateStatus: '{{ UpdateStatus }}'
-      - name: MetricGroups
+          - comparison_operator: '{{ comparison_operator }}'
+            evaluation_periods: '{{ evaluation_periods }}'
+            location: null
+            metric_name: '{{ metric_name }}'
+            name: '{{ name }}'
+            policy_type: '{{ policy_type }}'
+            scaling_adjustment: '{{ scaling_adjustment }}'
+            scaling_adjustment_type: '{{ scaling_adjustment_type }}'
+            status: '{{ status }}'
+            target_configuration:
+              target_value: null
+            threshold: null
+            update_status: '{{ update_status }}'
+      - name: metric_groups
         value:
-          - '{{ MetricGroups[0] }}'
-      - name: NewGameSessionProtectionPolicy
-        value: '{{ NewGameSessionProtectionPolicy }}'
-      - name: GameSessionCreationLimitPolicy
+          - '{{ metric_groups[0] }}'
+      - name: new_game_session_protection_policy
+        value: '{{ new_game_session_protection_policy }}'
+      - name: game_session_creation_limit_policy
         value:
-          NewGameSessionsPerCreator: '{{ NewGameSessionsPerCreator }}'
-          PolicyPeriodInMinutes: '{{ PolicyPeriodInMinutes }}'
-      - name: LogConfiguration
+          new_game_sessions_per_creator: '{{ new_game_sessions_per_creator }}'
+          policy_period_in_minutes: '{{ policy_period_in_minutes }}'
+      - name: log_configuration
         value:
-          LogDestination: '{{ LogDestination }}'
-          LogGroupArn: '{{ LogGroupArn }}'
-          S3BucketName: '{{ S3BucketName }}'
-      - name: Tags
+          log_destination: '{{ log_destination }}'
+          log_group_arn: '{{ log_group_arn }}'
+          s3_bucket_name: '{{ s3_bucket_name }}'
+      - name: tags
         value:
           - null
-
 ```
 </TabItem>
 </Tabs>
@@ -735,7 +734,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<FleetId>';
+AND Identifier = '{{ fleet_id }}';
 ```
 
 
@@ -744,7 +743,7 @@ AND Identifier = '<FleetId>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.gamelift.container_fleets
-WHERE Identifier = '<FleetId>'
+WHERE Identifier = '{{ fleet_id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/gamelift/container_group_definitions/index.md b/website/docs/services/gamelift/container_group_definitions/index.md
index 1e963a1bd..bdb8dc164 100644
--- a/website/docs/services/gamelift/container_group_definitions/index.md
+++ b/website/docs/services/gamelift/container_group_definitions/index.md
@@ -486,7 +486,7 @@ status,
 status_reason,
 tags
 FROM awscc.gamelift.container_group_definitions
-WHERE region = 'us-east-1' AND Identifier = '<Name>';
+WHERE region = 'us-east-1' AND Identifier = '{{ name }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -525,11 +525,11 @@ INSERT INTO awscc.gamelift.container_group_definitions (
  TotalVcpuLimit,
  region
 )
-SELECT 
-'{{ OperatingSystem }}',
- '{{ Name }}',
- '{{ TotalMemoryLimitMebibytes }}',
- '{{ TotalVcpuLimit }}',
+SELECT
+'{{ operating_system }}',
+ '{{ name }}',
+ '{{ total_memory_limit_mebibytes }}',
+ '{{ total_vcpu_limit }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -550,17 +550,17 @@ INSERT INTO awscc.gamelift.container_group_definitions (
  Tags,
  region
 )
-SELECT 
- '{{ OperatingSystem }}',
- '{{ Name }}',
- '{{ ContainerGroupType }}',
- '{{ TotalMemoryLimitMebibytes }}',
- '{{ TotalVcpuLimit }}',
- '{{ GameServerContainerDefinition }}',
- '{{ SupportContainerDefinitions }}',
- '{{ SourceVersionNumber }}',
- '{{ VersionDescription }}',
- '{{ Tags }}',
+SELECT
+ '{{ operating_system }}',
+ '{{ name }}',
+ '{{ container_group_type }}',
+ '{{ total_memory_limit_mebibytes }}',
+ '{{ total_vcpu_limit }}',
+ '{{ game_server_container_definition }}',
+ '{{ support_container_definitions }}',
+ '{{ source_version_number }}',
+ '{{ version_description }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -578,68 +578,67 @@ globals:
 resources:
   - name: container_group_definition
     props:
-      - name: OperatingSystem
-        value: '{{ OperatingSystem }}'
-      - name: Name
-        value: '{{ Name }}'
-      - name: ContainerGroupType
-        value: '{{ ContainerGroupType }}'
-      - name: TotalMemoryLimitMebibytes
-        value: '{{ TotalMemoryLimitMebibytes }}'
-      - name: TotalVcpuLimit
+      - name: operating_system
+        value: '{{ operating_system }}'
+      - name: name
+        value: '{{ name }}'
+      - name: container_group_type
+        value: '{{ container_group_type }}'
+      - name: total_memory_limit_mebibytes
+        value: '{{ total_memory_limit_mebibytes }}'
+      - name: total_vcpu_limit
         value: null
-      - name: GameServerContainerDefinition
+      - name: game_server_container_definition
         value:
-          ContainerName: '{{ ContainerName }}'
-          DependsOn:
-            - ContainerName: '{{ ContainerName }}'
-              Condition: '{{ Condition }}'
-          ServerSdkVersion: '{{ ServerSdkVersion }}'
-          ImageUri: '{{ ImageUri }}'
-          ResolvedImageDigest: '{{ ResolvedImageDigest }}'
-          EnvironmentOverride:
-            - Name: '{{ Name }}'
-              Value: '{{ Value }}'
-          PortConfiguration:
-            ContainerPortRanges:
-              - FromPort: '{{ FromPort }}'
-                Protocol: '{{ Protocol }}'
-                ToPort: '{{ ToPort }}'
-          MountPoints:
-            - InstancePath: '{{ InstancePath }}'
-              ContainerPath: '{{ ContainerPath }}'
-              AccessLevel: '{{ AccessLevel }}'
-      - name: SupportContainerDefinitions
+          container_name: '{{ container_name }}'
+          depends_on:
+            - container_name: '{{ container_name }}'
+              condition: '{{ condition }}'
+          server_sdk_version: '{{ server_sdk_version }}'
+          image_uri: '{{ image_uri }}'
+          resolved_image_digest: '{{ resolved_image_digest }}'
+          environment_override:
+            - name: '{{ name }}'
+              value: '{{ value }}'
+          port_configuration:
+            container_port_ranges:
+              - from_port: '{{ from_port }}'
+                protocol: '{{ protocol }}'
+                to_port: '{{ to_port }}'
+          mount_points:
+            - instance_path: '{{ instance_path }}'
+              container_path: '{{ container_path }}'
+              access_level: '{{ access_level }}'
+      - name: support_container_definitions
         value:
-          - ContainerName: '{{ ContainerName }}'
-            Vcpu: null
-            DependsOn:
+          - container_name: '{{ container_name }}'
+            vcpu: null
+            depends_on:
               - null
-            Essential: '{{ Essential }}'
-            ImageUri: '{{ ImageUri }}'
-            ResolvedImageDigest: '{{ ResolvedImageDigest }}'
-            MemoryHardLimitMebibytes: '{{ MemoryHardLimitMebibytes }}'
-            EnvironmentOverride:
+            essential: '{{ essential }}'
+            image_uri: '{{ image_uri }}'
+            resolved_image_digest: '{{ resolved_image_digest }}'
+            memory_hard_limit_mebibytes: '{{ memory_hard_limit_mebibytes }}'
+            environment_override:
               - null
-            PortConfiguration: null
-            HealthCheck:
-              Command:
-                - '{{ Command[0] }}'
-              Interval: '{{ Interval }}'
-              Timeout: '{{ Timeout }}'
-              Retries: '{{ Retries }}'
-              StartPeriod: '{{ StartPeriod }}'
-            MountPoints:
+            port_configuration: null
+            health_check:
+              command:
+                - '{{ command[0] }}'
+              interval: '{{ interval }}'
+              timeout: '{{ timeout }}'
+              retries: '{{ retries }}'
+              start_period: '{{ start_period }}'
+            mount_points:
               - null
-      - name: SourceVersionNumber
-        value: '{{ SourceVersionNumber }}'
-      - name: VersionDescription
-        value: '{{ VersionDescription }}'
-      - name: Tags
+      - name: source_version_number
+        value: '{{ source_version_number }}'
+      - name: version_description
+        value: '{{ version_description }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -662,7 +661,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Name>';
+AND Identifier = '{{ name }}';
 ```
 
 
@@ -671,7 +670,7 @@ AND Identifier = '<Name>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.gamelift.container_group_definitions
-WHERE Identifier = '<Name>'
+WHERE Identifier = '{{ name }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/gamelift/fleets/index.md b/website/docs/services/gamelift/fleets/index.md
index 0addf0983..d628e6119 100644
--- a/website/docs/services/gamelift/fleets/index.md
+++ b/website/docs/services/gamelift/fleets/index.md
@@ -558,7 +558,7 @@ server_launch_path,
 tags,
 fleet_arn
 FROM awscc.gamelift.fleets
-WHERE region = 'us-east-1' AND Identifier = '<FleetId>';
+WHERE region = 'us-east-1' AND Identifier = '{{ fleet_id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -594,8 +594,8 @@ INSERT INTO awscc.gamelift.fleets (
  Name,
  region
 )
-SELECT 
-'{{ Name }}',
+SELECT
+'{{ name }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -634,35 +634,35 @@ INSERT INTO awscc.gamelift.fleets (
  Tags,
  region
 )
-SELECT 
- '{{ ScalingPolicies }}',
- '{{ AnywhereConfiguration }}',
- '{{ ApplyCapacity }}',
- '{{ CertificateConfiguration }}',
- '{{ ComputeType }}',
- '{{ Description }}',
- '{{ DesiredEC2Instances }}',
- '{{ EC2InboundPermissions }}',
- '{{ EC2InstanceType }}',
- '{{ FleetType }}',
- '{{ InstanceRoleARN }}',
- '{{ InstanceRoleCredentialsProvider }}',
- '{{ Locations }}',
- '{{ LogPaths }}',
- '{{ MaxSize }}',
- '{{ MetricGroups }}',
- '{{ MinSize }}',
- '{{ Name }}',
- '{{ NewGameSessionProtectionPolicy }}',
- '{{ PeerVpcAwsAccountId }}',
- '{{ PeerVpcId }}',
- '{{ ResourceCreationLimitPolicy }}',
- '{{ BuildId }}',
- '{{ ScriptId }}',
- '{{ RuntimeConfiguration }}',
- '{{ ServerLaunchParameters }}',
- '{{ ServerLaunchPath }}',
- '{{ Tags }}',
+SELECT
+ '{{ scaling_policies }}',
+ '{{ anywhere_configuration }}',
+ '{{ apply_capacity }}',
+ '{{ certificate_configuration }}',
+ '{{ compute_type }}',
+ '{{ description }}',
+ '{{ desired_ec2_instances }}',
+ '{{ e_c2_inbound_permissions }}',
+ '{{ e_c2_instance_type }}',
+ '{{ fleet_type }}',
+ '{{ instance_role_arn }}',
+ '{{ instance_role_credentials_provider }}',
+ '{{ locations }}',
+ '{{ log_paths }}',
+ '{{ max_size }}',
+ '{{ metric_groups }}',
+ '{{ min_size }}',
+ '{{ name }}',
+ '{{ new_game_session_protection_policy }}',
+ '{{ peer_vpc_aws_account_id }}',
+ '{{ peer_vpc_id }}',
+ '{{ resource_creation_limit_policy }}',
+ '{{ build_id }}',
+ '{{ script_id }}',
+ '{{ runtime_configuration }}',
+ '{{ server_launch_parameters }}',
+ '{{ server_launch_path }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -680,101 +680,100 @@ globals:
 resources:
   - name: fleet
     props:
-      - name: ScalingPolicies
+      - name: scaling_policies
         value:
-          - ComparisonOperator: '{{ ComparisonOperator }}'
-            EvaluationPeriods: '{{ EvaluationPeriods }}'
-            Location:
-              LocationName: '{{ LocationName }}'
-              Tags:
-                - Key: '{{ Key }}'
-                  Value: '{{ Value }}'
-            MetricName: '{{ MetricName }}'
-            Name: '{{ Name }}'
-            PolicyType: '{{ PolicyType }}'
-            ScalingAdjustment: '{{ ScalingAdjustment }}'
-            ScalingAdjustmentType: '{{ ScalingAdjustmentType }}'
-            Status: '{{ Status }}'
-            TargetConfiguration:
-              TargetValue: null
-            Threshold: null
-            UpdateStatus: '{{ UpdateStatus }}'
-      - name: AnywhereConfiguration
+          - comparison_operator: '{{ comparison_operator }}'
+            evaluation_periods: '{{ evaluation_periods }}'
+            location:
+              location_name: '{{ location_name }}'
+              tags:
+                - key: '{{ key }}'
+                  value: '{{ value }}'
+            metric_name: '{{ metric_name }}'
+            name: '{{ name }}'
+            policy_type: '{{ policy_type }}'
+            scaling_adjustment: '{{ scaling_adjustment }}'
+            scaling_adjustment_type: '{{ scaling_adjustment_type }}'
+            status: '{{ status }}'
+            target_configuration:
+              target_value: null
+            threshold: null
+            update_status: '{{ update_status }}'
+      - name: anywhere_configuration
         value: null
-      - name: ApplyCapacity
-        value: '{{ ApplyCapacity }}'
-      - name: CertificateConfiguration
+      - name: apply_capacity
+        value: '{{ apply_capacity }}'
+      - name: certificate_configuration
         value:
-          CertificateType: '{{ CertificateType }}'
-      - name: ComputeType
-        value: '{{ ComputeType }}'
-      - name: Description
-        value: '{{ Description }}'
-      - name: DesiredEC2Instances
-        value: '{{ DesiredEC2Instances }}'
-      - name: EC2InboundPermissions
+          certificate_type: '{{ certificate_type }}'
+      - name: compute_type
+        value: '{{ compute_type }}'
+      - name: description
+        value: '{{ description }}'
+      - name: desired_ec2_instances
+        value: '{{ desired_ec2_instances }}'
+      - name: e_c2_inbound_permissions
         value:
-          - FromPort: '{{ FromPort }}'
-            IpRange: '{{ IpRange }}'
-            Protocol: '{{ Protocol }}'
-            ToPort: '{{ ToPort }}'
-      - name: EC2InstanceType
-        value: '{{ EC2InstanceType }}'
-      - name: FleetType
-        value: '{{ FleetType }}'
-      - name: InstanceRoleARN
-        value: '{{ InstanceRoleARN }}'
-      - name: InstanceRoleCredentialsProvider
-        value: '{{ InstanceRoleCredentialsProvider }}'
-      - name: Locations
+          - from_port: '{{ from_port }}'
+            ip_range: '{{ ip_range }}'
+            protocol: '{{ protocol }}'
+            to_port: '{{ to_port }}'
+      - name: e_c2_instance_type
+        value: '{{ e_c2_instance_type }}'
+      - name: fleet_type
+        value: '{{ fleet_type }}'
+      - name: instance_role_arn
+        value: '{{ instance_role_arn }}'
+      - name: instance_role_credentials_provider
+        value: '{{ instance_role_credentials_provider }}'
+      - name: locations
         value:
-          - Location: null
-            LocationCapacity:
-              DesiredEC2Instances: '{{ DesiredEC2Instances }}'
-              MinSize: '{{ MinSize }}'
-              MaxSize: '{{ MaxSize }}'
-      - name: LogPaths
+          - location: null
+            location_capacity:
+              desired_ec2_instances: '{{ desired_ec2_instances }}'
+              min_size: '{{ min_size }}'
+              max_size: '{{ max_size }}'
+      - name: log_paths
         value:
-          - '{{ LogPaths[0] }}'
-      - name: MaxSize
-        value: '{{ MaxSize }}'
-      - name: MetricGroups
+          - '{{ log_paths[0] }}'
+      - name: max_size
+        value: '{{ max_size }}'
+      - name: metric_groups
         value:
-          - '{{ MetricGroups[0] }}'
-      - name: MinSize
-        value: '{{ MinSize }}'
-      - name: Name
-        value: '{{ Name }}'
-      - name: NewGameSessionProtectionPolicy
-        value: '{{ NewGameSessionProtectionPolicy }}'
-      - name: PeerVpcAwsAccountId
-        value: '{{ PeerVpcAwsAccountId }}'
-      - name: PeerVpcId
-        value: '{{ PeerVpcId }}'
-      - name: ResourceCreationLimitPolicy
+          - '{{ metric_groups[0] }}'
+      - name: min_size
+        value: '{{ min_size }}'
+      - name: name
+        value: '{{ name }}'
+      - name: new_game_session_protection_policy
+        value: '{{ new_game_session_protection_policy }}'
+      - name: peer_vpc_aws_account_id
+        value: '{{ peer_vpc_aws_account_id }}'
+      - name: peer_vpc_id
+        value: '{{ peer_vpc_id }}'
+      - name: resource_creation_limit_policy
         value:
-          NewGameSessionsPerCreator: '{{ NewGameSessionsPerCreator }}'
-          PolicyPeriodInMinutes: '{{ PolicyPeriodInMinutes }}'
-      - name: BuildId
-        value: '{{ BuildId }}'
-      - name: ScriptId
-        value: '{{ ScriptId }}'
-      - name: RuntimeConfiguration
+          new_game_sessions_per_creator: '{{ new_game_sessions_per_creator }}'
+          policy_period_in_minutes: '{{ policy_period_in_minutes }}'
+      - name: build_id
+        value: '{{ build_id }}'
+      - name: script_id
+        value: '{{ script_id }}'
+      - name: runtime_configuration
         value:
-          GameSessionActivationTimeoutSeconds: '{{ GameSessionActivationTimeoutSeconds }}'
-          MaxConcurrentGameSessionActivations: '{{ MaxConcurrentGameSessionActivations }}'
-          ServerProcesses:
-            - ConcurrentExecutions: '{{ ConcurrentExecutions }}'
-              LaunchPath: '{{ LaunchPath }}'
-              Parameters: '{{ Parameters }}'
-      - name: ServerLaunchParameters
-        value: '{{ ServerLaunchParameters }}'
-      - name: ServerLaunchPath
-        value: '{{ ServerLaunchPath }}'
-      - name: Tags
+          game_session_activation_timeout_seconds: '{{ game_session_activation_timeout_seconds }}'
+          max_concurrent_game_session_activations: '{{ max_concurrent_game_session_activations }}'
+          server_processes:
+            - concurrent_executions: '{{ concurrent_executions }}'
+              launch_path: '{{ launch_path }}'
+              parameters: '{{ parameters }}'
+      - name: server_launch_parameters
+        value: '{{ server_launch_parameters }}'
+      - name: server_launch_path
+        value: '{{ server_launch_path }}'
+      - name: tags
         value:
           - null
-
 ```
 </TabItem>
 </Tabs>
@@ -804,7 +803,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<FleetId>';
+AND Identifier = '{{ fleet_id }}';
 ```
 
 
@@ -813,7 +812,7 @@ AND Identifier = '<FleetId>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.gamelift.fleets
-WHERE Identifier = '<FleetId>'
+WHERE Identifier = '{{ fleet_id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/gamelift/game_server_groups/index.md b/website/docs/services/gamelift/game_server_groups/index.md
index fc9583c3c..2507b8f93 100644
--- a/website/docs/services/gamelift/game_server_groups/index.md
+++ b/website/docs/services/gamelift/game_server_groups/index.md
@@ -272,7 +272,7 @@ role_arn,
 tags,
 vpc_subnets
 FROM awscc.gamelift.game_server_groups
-WHERE region = 'us-east-1' AND Identifier = '<GameServerGroupArn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ game_server_group_arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -310,10 +310,10 @@ INSERT INTO awscc.gamelift.game_server_groups (
  RoleArn,
  region
 )
-SELECT 
-'{{ GameServerGroupName }}',
- '{{ InstanceDefinitions }}',
- '{{ RoleArn }}',
+SELECT
+'{{ game_server_group_name }}',
+ '{{ instance_definitions }}',
+ '{{ role_arn }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -336,19 +336,19 @@ INSERT INTO awscc.gamelift.game_server_groups (
  VpcSubnets,
  region
 )
-SELECT 
- '{{ AutoScalingPolicy }}',
- '{{ BalancingStrategy }}',
- '{{ DeleteOption }}',
- '{{ GameServerGroupName }}',
- '{{ GameServerProtectionPolicy }}',
- '{{ InstanceDefinitions }}',
- '{{ LaunchTemplate }}',
- '{{ MaxSize }}',
- '{{ MinSize }}',
- '{{ RoleArn }}',
- '{{ Tags }}',
- '{{ VpcSubnets }}',
+SELECT
+ '{{ auto_scaling_policy }}',
+ '{{ balancing_strategy }}',
+ '{{ delete_option }}',
+ '{{ game_server_group_name }}',
+ '{{ game_server_protection_policy }}',
+ '{{ instance_definitions }}',
+ '{{ launch_template }}',
+ '{{ max_size }}',
+ '{{ min_size }}',
+ '{{ role_arn }}',
+ '{{ tags }}',
+ '{{ vpc_subnets }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -366,42 +366,41 @@ globals:
 resources:
   - name: game_server_group
     props:
-      - name: AutoScalingPolicy
+      - name: auto_scaling_policy
         value:
-          EstimatedInstanceWarmup: null
-          TargetTrackingConfiguration:
-            TargetValue: null
-      - name: BalancingStrategy
-        value: '{{ BalancingStrategy }}'
-      - name: DeleteOption
-        value: '{{ DeleteOption }}'
-      - name: GameServerGroupName
-        value: '{{ GameServerGroupName }}'
-      - name: GameServerProtectionPolicy
-        value: '{{ GameServerProtectionPolicy }}'
-      - name: InstanceDefinitions
+          estimated_instance_warmup: null
+          target_tracking_configuration:
+            target_value: null
+      - name: balancing_strategy
+        value: '{{ balancing_strategy }}'
+      - name: delete_option
+        value: '{{ delete_option }}'
+      - name: game_server_group_name
+        value: '{{ game_server_group_name }}'
+      - name: game_server_protection_policy
+        value: '{{ game_server_protection_policy }}'
+      - name: instance_definitions
         value:
-          - InstanceType: '{{ InstanceType }}'
-            WeightedCapacity: '{{ WeightedCapacity }}'
-      - name: LaunchTemplate
+          - instance_type: '{{ instance_type }}'
+            weighted_capacity: '{{ weighted_capacity }}'
+      - name: launch_template
         value:
-          LaunchTemplateId: '{{ LaunchTemplateId }}'
-          LaunchTemplateName: '{{ LaunchTemplateName }}'
-          Version: '{{ Version }}'
-      - name: MaxSize
+          launch_template_id: '{{ launch_template_id }}'
+          launch_template_name: '{{ launch_template_name }}'
+          version: '{{ version }}'
+      - name: max_size
         value: null
-      - name: MinSize
+      - name: min_size
         value: null
-      - name: RoleArn
-        value: '{{ RoleArn }}'
-      - name: Tags
+      - name: role_arn
+        value: '{{ role_arn }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-      - name: VpcSubnets
+          - key: '{{ key }}'
+            value: '{{ value }}'
+      - name: vpc_subnets
         value:
-          - '{{ VpcSubnets[0] }}'
-
+          - '{{ vpc_subnets[0] }}'
 ```
 </TabItem>
 </Tabs>
@@ -428,7 +427,7 @@ SET PatchDocument = string('{{ {
     "VpcSubnets": vpc_subnets
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<GameServerGroupArn>';
+AND Identifier = '{{ game_server_group_arn }}';
 ```
 
 
@@ -437,7 +436,7 @@ AND Identifier = '<GameServerGroupArn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.gamelift.game_server_groups
-WHERE Identifier = '<GameServerGroupArn>'
+WHERE Identifier = '{{ game_server_group_arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/gamelift/game_session_queues/index.md b/website/docs/services/gamelift/game_session_queues/index.md
index 2d26984ed..26e373530 100644
--- a/website/docs/services/gamelift/game_session_queues/index.md
+++ b/website/docs/services/gamelift/game_session_queues/index.md
@@ -238,7 +238,7 @@ priority_configuration,
 arn,
 tags
 FROM awscc.gamelift.game_session_queues
-WHERE region = 'us-east-1' AND Identifier = '<Name>';
+WHERE region = 'us-east-1' AND Identifier = '{{ name }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -274,8 +274,8 @@ INSERT INTO awscc.gamelift.game_session_queues (
  Name,
  region
 )
-SELECT 
-'{{ Name }}',
+SELECT
+'{{ name }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -295,16 +295,16 @@ INSERT INTO awscc.gamelift.game_session_queues (
  Tags,
  region
 )
-SELECT 
- '{{ Name }}',
- '{{ TimeoutInSeconds }}',
- '{{ Destinations }}',
- '{{ PlayerLatencyPolicies }}',
- '{{ CustomEventData }}',
- '{{ NotificationTarget }}',
- '{{ FilterConfiguration }}',
- '{{ PriorityConfiguration }}',
- '{{ Tags }}',
+SELECT
+ '{{ name }}',
+ '{{ timeout_in_seconds }}',
+ '{{ destinations }}',
+ '{{ player_latency_policies }}',
+ '{{ custom_event_data }}',
+ '{{ notification_target }}',
+ '{{ filter_configuration }}',
+ '{{ priority_configuration }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -322,36 +322,35 @@ globals:
 resources:
   - name: game_session_queue
     props:
-      - name: Name
-        value: '{{ Name }}'
-      - name: TimeoutInSeconds
-        value: '{{ TimeoutInSeconds }}'
-      - name: Destinations
+      - name: name
+        value: '{{ name }}'
+      - name: timeout_in_seconds
+        value: '{{ timeout_in_seconds }}'
+      - name: destinations
         value:
-          - DestinationArn: '{{ DestinationArn }}'
-      - name: PlayerLatencyPolicies
+          - destination_arn: '{{ destination_arn }}'
+      - name: player_latency_policies
         value:
-          - MaximumIndividualPlayerLatencyMilliseconds: '{{ MaximumIndividualPlayerLatencyMilliseconds }}'
-            PolicyDurationSeconds: '{{ PolicyDurationSeconds }}'
-      - name: CustomEventData
-        value: '{{ CustomEventData }}'
-      - name: NotificationTarget
-        value: '{{ NotificationTarget }}'
-      - name: FilterConfiguration
+          - maximum_individual_player_latency_milliseconds: '{{ maximum_individual_player_latency_milliseconds }}'
+            policy_duration_seconds: '{{ policy_duration_seconds }}'
+      - name: custom_event_data
+        value: '{{ custom_event_data }}'
+      - name: notification_target
+        value: '{{ notification_target }}'
+      - name: filter_configuration
         value:
-          AllowedLocations:
-            - '{{ AllowedLocations[0] }}'
-      - name: PriorityConfiguration
+          allowed_locations:
+            - '{{ allowed_locations[0] }}'
+      - name: priority_configuration
         value:
-          LocationOrder:
-            - '{{ LocationOrder[0] }}'
-          PriorityOrder:
-            - '{{ PriorityOrder[0] }}'
-      - name: Tags
+          location_order:
+            - '{{ location_order[0] }}'
+          priority_order:
+            - '{{ priority_order[0] }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -374,7 +373,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Name>';
+AND Identifier = '{{ name }}';
 ```
 
 
@@ -383,7 +382,7 @@ AND Identifier = '<Name>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.gamelift.game_session_queues
-WHERE Identifier = '<Name>'
+WHERE Identifier = '{{ name }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/gamelift/locations/index.md b/website/docs/services/gamelift/locations/index.md
index ecabe58df..a68b10c75 100644
--- a/website/docs/services/gamelift/locations/index.md
+++ b/website/docs/services/gamelift/locations/index.md
@@ -158,7 +158,7 @@ location_name,
 location_arn,
 tags
 FROM awscc.gamelift.locations
-WHERE region = 'us-east-1' AND Identifier = '<LocationName>';
+WHERE region = 'us-east-1' AND Identifier = '{{ location_name }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -194,8 +194,8 @@ INSERT INTO awscc.gamelift.locations (
  LocationName,
  region
 )
-SELECT 
-'{{ LocationName }}',
+SELECT
+'{{ location_name }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -208,9 +208,9 @@ INSERT INTO awscc.gamelift.locations (
  Tags,
  region
 )
-SELECT 
- '{{ LocationName }}',
- '{{ Tags }}',
+SELECT
+ '{{ location_name }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -228,13 +228,12 @@ globals:
 resources:
   - name: location
     props:
-      - name: LocationName
-        value: '{{ LocationName }}'
-      - name: Tags
+      - name: location_name
+        value: '{{ location_name }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -250,7 +249,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<LocationName>';
+AND Identifier = '{{ location_name }}';
 ```
 
 
@@ -259,7 +258,7 @@ AND Identifier = '<LocationName>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.gamelift.locations
-WHERE Identifier = '<LocationName>'
+WHERE Identifier = '{{ location_name }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/gamelift/matchmaking_configurations/index.md b/website/docs/services/gamelift/matchmaking_configurations/index.md
index 509d7c228..ba670d16f 100644
--- a/website/docs/services/gamelift/matchmaking_configurations/index.md
+++ b/website/docs/services/gamelift/matchmaking_configurations/index.md
@@ -260,7 +260,7 @@ rule_set_arn,
 rule_set_name,
 tags
 FROM awscc.gamelift.matchmaking_configurations
-WHERE region = 'us-east-1' AND Identifier = '<Name>';
+WHERE region = 'us-east-1' AND Identifier = '{{ name }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -299,11 +299,11 @@ INSERT INTO awscc.gamelift.matchmaking_configurations (
  RuleSetName,
  region
 )
-SELECT 
-'{{ AcceptanceRequired }}',
- '{{ Name }}',
- '{{ RequestTimeoutSeconds }}',
- '{{ RuleSetName }}',
+SELECT
+'{{ acceptance_required }}',
+ '{{ name }}',
+ '{{ request_timeout_seconds }}',
+ '{{ rule_set_name }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -331,24 +331,24 @@ INSERT INTO awscc.gamelift.matchmaking_configurations (
  Tags,
  region
 )
-SELECT 
- '{{ AcceptanceRequired }}',
- '{{ AcceptanceTimeoutSeconds }}',
- '{{ AdditionalPlayerCount }}',
- '{{ BackfillMode }}',
- '{{ CreationTime }}',
- '{{ CustomEventData }}',
- '{{ Description }}',
- '{{ FlexMatchMode }}',
- '{{ GameProperties }}',
- '{{ GameSessionData }}',
- '{{ GameSessionQueueArns }}',
- '{{ Name }}',
- '{{ NotificationTarget }}',
- '{{ RequestTimeoutSeconds }}',
- '{{ RuleSetArn }}',
- '{{ RuleSetName }}',
- '{{ Tags }}',
+SELECT
+ '{{ acceptance_required }}',
+ '{{ acceptance_timeout_seconds }}',
+ '{{ additional_player_count }}',
+ '{{ backfill_mode }}',
+ '{{ creation_time }}',
+ '{{ custom_event_data }}',
+ '{{ description }}',
+ '{{ flex_match_mode }}',
+ '{{ game_properties }}',
+ '{{ game_session_data }}',
+ '{{ game_session_queue_arns }}',
+ '{{ name }}',
+ '{{ notification_target }}',
+ '{{ request_timeout_seconds }}',
+ '{{ rule_set_arn }}',
+ '{{ rule_set_name }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -366,46 +366,45 @@ globals:
 resources:
   - name: matchmaking_configuration
     props:
-      - name: AcceptanceRequired
-        value: '{{ AcceptanceRequired }}'
-      - name: AcceptanceTimeoutSeconds
-        value: '{{ AcceptanceTimeoutSeconds }}'
-      - name: AdditionalPlayerCount
-        value: '{{ AdditionalPlayerCount }}'
-      - name: BackfillMode
-        value: '{{ BackfillMode }}'
-      - name: CreationTime
-        value: '{{ CreationTime }}'
-      - name: CustomEventData
-        value: '{{ CustomEventData }}'
-      - name: Description
-        value: '{{ Description }}'
-      - name: FlexMatchMode
-        value: '{{ FlexMatchMode }}'
-      - name: GameProperties
+      - name: acceptance_required
+        value: '{{ acceptance_required }}'
+      - name: acceptance_timeout_seconds
+        value: '{{ acceptance_timeout_seconds }}'
+      - name: additional_player_count
+        value: '{{ additional_player_count }}'
+      - name: backfill_mode
+        value: '{{ backfill_mode }}'
+      - name: creation_time
+        value: '{{ creation_time }}'
+      - name: custom_event_data
+        value: '{{ custom_event_data }}'
+      - name: description
+        value: '{{ description }}'
+      - name: flex_match_mode
+        value: '{{ flex_match_mode }}'
+      - name: game_properties
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-      - name: GameSessionData
-        value: '{{ GameSessionData }}'
-      - name: GameSessionQueueArns
+          - key: '{{ key }}'
+            value: '{{ value }}'
+      - name: game_session_data
+        value: '{{ game_session_data }}'
+      - name: game_session_queue_arns
         value:
-          - '{{ GameSessionQueueArns[0] }}'
-      - name: Name
-        value: '{{ Name }}'
-      - name: NotificationTarget
-        value: '{{ NotificationTarget }}'
-      - name: RequestTimeoutSeconds
-        value: '{{ RequestTimeoutSeconds }}'
-      - name: RuleSetArn
-        value: '{{ RuleSetArn }}'
-      - name: RuleSetName
-        value: '{{ RuleSetName }}'
-      - name: Tags
+          - '{{ game_session_queue_arns[0] }}'
+      - name: name
+        value: '{{ name }}'
+      - name: notification_target
+        value: '{{ notification_target }}'
+      - name: request_timeout_seconds
+        value: '{{ request_timeout_seconds }}'
+      - name: rule_set_arn
+        value: '{{ rule_set_arn }}'
+      - name: rule_set_name
+        value: '{{ rule_set_name }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -436,7 +435,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Name>';
+AND Identifier = '{{ name }}';
 ```
 
 
@@ -445,7 +444,7 @@ AND Identifier = '<Name>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.gamelift.matchmaking_configurations
-WHERE Identifier = '<Name>'
+WHERE Identifier = '{{ name }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/gamelift/matchmaking_rule_sets/index.md b/website/docs/services/gamelift/matchmaking_rule_sets/index.md
index 6f9c92bcb..885c33985 100644
--- a/website/docs/services/gamelift/matchmaking_rule_sets/index.md
+++ b/website/docs/services/gamelift/matchmaking_rule_sets/index.md
@@ -170,7 +170,7 @@ creation_time,
 arn,
 tags
 FROM awscc.gamelift.matchmaking_rule_sets
-WHERE region = 'us-east-1' AND Identifier = '<Name>';
+WHERE region = 'us-east-1' AND Identifier = '{{ name }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -207,9 +207,9 @@ INSERT INTO awscc.gamelift.matchmaking_rule_sets (
  RuleSetBody,
  region
 )
-SELECT 
-'{{ Name }}',
- '{{ RuleSetBody }}',
+SELECT
+'{{ name }}',
+ '{{ rule_set_body }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -223,10 +223,10 @@ INSERT INTO awscc.gamelift.matchmaking_rule_sets (
  Tags,
  region
 )
-SELECT 
- '{{ Name }}',
- '{{ RuleSetBody }}',
- '{{ Tags }}',
+SELECT
+ '{{ name }}',
+ '{{ rule_set_body }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -244,15 +244,14 @@ globals:
 resources:
   - name: matchmaking_rule_set
     props:
-      - name: Name
-        value: '{{ Name }}'
-      - name: RuleSetBody
-        value: '{{ RuleSetBody }}'
-      - name: Tags
+      - name: name
+        value: '{{ name }}'
+      - name: rule_set_body
+        value: '{{ rule_set_body }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -268,7 +267,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Name>';
+AND Identifier = '{{ name }}';
 ```
 
 
@@ -277,7 +276,7 @@ AND Identifier = '<Name>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.gamelift.matchmaking_rule_sets
-WHERE Identifier = '<Name>'
+WHERE Identifier = '{{ name }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/gamelift/scripts/index.md b/website/docs/services/gamelift/scripts/index.md
index 1abeb61a1..603e8a27a 100644
--- a/website/docs/services/gamelift/scripts/index.md
+++ b/website/docs/services/gamelift/scripts/index.md
@@ -210,7 +210,7 @@ arn,
 id,
 size_on_disk
 FROM awscc.gamelift.scripts
-WHERE region = 'us-east-1' AND Identifier = '<Id>';
+WHERE region = 'us-east-1' AND Identifier = '{{ id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -246,8 +246,8 @@ INSERT INTO awscc.gamelift.scripts (
  StorageLocation,
  region
 )
-SELECT 
-'{{ StorageLocation }}',
+SELECT
+'{{ storage_location }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -262,11 +262,11 @@ INSERT INTO awscc.gamelift.scripts (
  Tags,
  region
 )
-SELECT 
- '{{ Name }}',
- '{{ StorageLocation }}',
- '{{ Version }}',
- '{{ Tags }}',
+SELECT
+ '{{ name }}',
+ '{{ storage_location }}',
+ '{{ version }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -284,21 +284,20 @@ globals:
 resources:
   - name: script
     props:
-      - name: Name
-        value: '{{ Name }}'
-      - name: StorageLocation
+      - name: name
+        value: '{{ name }}'
+      - name: storage_location
         value:
-          Bucket: '{{ Bucket }}'
-          Key: '{{ Key }}'
-          ObjectVersion: '{{ ObjectVersion }}'
-          RoleArn: '{{ RoleArn }}'
-      - name: Version
-        value: '{{ Version }}'
-      - name: Tags
+          bucket: '{{ bucket }}'
+          key: '{{ key }}'
+          object_version: '{{ object_version }}'
+          role_arn: '{{ role_arn }}'
+      - name: version
+        value: '{{ version }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -317,7 +316,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Id>';
+AND Identifier = '{{ id }}';
 ```
 
 
@@ -326,7 +325,7 @@ AND Identifier = '<Id>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.gamelift.scripts
-WHERE Identifier = '<Id>'
+WHERE Identifier = '{{ id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/globalaccelerator/accelerators/index.md b/website/docs/services/globalaccelerator/accelerators/index.md
index a3855e795..30b4474f7 100644
--- a/website/docs/services/globalaccelerator/accelerators/index.md
+++ b/website/docs/services/globalaccelerator/accelerators/index.md
@@ -200,7 +200,7 @@ dual_stack_dns_name,
 accelerator_arn,
 tags
 FROM awscc.globalaccelerator.accelerators
-WHERE Identifier = '<AcceleratorArn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ accelerator_arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -211,7 +211,7 @@ SELECT
 region,
 accelerator_arn
 FROM awscc.globalaccelerator.accelerators_list_only
-;
+WHERE region = 'us-east-1';
 ```
 </TabItem>
 </Tabs>
@@ -236,8 +236,8 @@ INSERT INTO awscc.globalaccelerator.accelerators (
  Name,
  region
 )
-SELECT 
-'{{ Name }}',
+SELECT
+'{{ name }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -253,12 +253,12 @@ INSERT INTO awscc.globalaccelerator.accelerators (
  Tags,
  region
 )
-SELECT 
- '{{ Name }}',
- '{{ IpAddressType }}',
- '{{ IpAddresses }}',
- '{{ Enabled }}',
- '{{ Tags }}',
+SELECT
+ '{{ name }}',
+ '{{ ip_address_type }}',
+ '{{ ip_addresses }}',
+ '{{ enabled }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -276,20 +276,19 @@ globals:
 resources:
   - name: accelerator
     props:
-      - name: Name
-        value: '{{ Name }}'
-      - name: IpAddressType
-        value: '{{ IpAddressType }}'
-      - name: IpAddresses
+      - name: name
+        value: '{{ name }}'
+      - name: ip_address_type
+        value: '{{ ip_address_type }}'
+      - name: ip_addresses
         value:
-          - '{{ IpAddresses[0] }}'
-      - name: Enabled
-        value: '{{ Enabled }}'
-      - name: Tags
+          - '{{ ip_addresses[0] }}'
+      - name: enabled
+        value: '{{ enabled }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -309,7 +308,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<AcceleratorArn>';
+AND Identifier = '{{ accelerator_arn }}';
 ```
 
 
@@ -318,7 +317,7 @@ AND Identifier = '<AcceleratorArn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.globalaccelerator.accelerators
-WHERE Identifier = '<AcceleratorArn>'
+WHERE Identifier = '{{ accelerator_arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/globalaccelerator/cross_account_attachments/index.md b/website/docs/services/globalaccelerator/cross_account_attachments/index.md
index c28dadcbc..165c8f67e 100644
--- a/website/docs/services/globalaccelerator/cross_account_attachments/index.md
+++ b/website/docs/services/globalaccelerator/cross_account_attachments/index.md
@@ -187,7 +187,7 @@ principals,
 resources,
 tags
 FROM awscc.globalaccelerator.cross_account_attachments
-WHERE Identifier = '<AttachmentArn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ attachment_arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -198,7 +198,7 @@ SELECT
 region,
 attachment_arn
 FROM awscc.globalaccelerator.cross_account_attachments_list_only
-;
+WHERE region = 'us-east-1';
 ```
 </TabItem>
 </Tabs>
@@ -223,8 +223,8 @@ INSERT INTO awscc.globalaccelerator.cross_account_attachments (
  Name,
  region
 )
-SELECT 
-'{{ Name }}',
+SELECT
+'{{ name }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -239,11 +239,11 @@ INSERT INTO awscc.globalaccelerator.cross_account_attachments (
  Tags,
  region
 )
-SELECT 
- '{{ Name }}',
- '{{ Principals }}',
- '{{ Resources }}',
- '{{ Tags }}',
+SELECT
+ '{{ name }}',
+ '{{ principals }}',
+ '{{ resources }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -261,21 +261,20 @@ globals:
 resources:
   - name: cross_account_attachment
     props:
-      - name: Name
-        value: '{{ Name }}'
-      - name: Principals
+      - name: name
+        value: '{{ name }}'
+      - name: principals
         value:
-          - '{{ Principals[0] }}'
-      - name: Resources
+          - '{{ principals[0] }}'
+      - name: resources
         value:
-          - EndpointId: '{{ EndpointId }}'
-            Cidr: '{{ Cidr }}'
-            Region: '{{ Region }}'
-      - name: Tags
+          - endpoint_id: '{{ endpoint_id }}'
+            cidr: '{{ cidr }}'
+            region: '{{ region }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -294,7 +293,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<AttachmentArn>';
+AND Identifier = '{{ attachment_arn }}';
 ```
 
 
@@ -303,7 +302,7 @@ AND Identifier = '<AttachmentArn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.globalaccelerator.cross_account_attachments
-WHERE Identifier = '<AttachmentArn>'
+WHERE Identifier = '{{ attachment_arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/globalaccelerator/endpoint_groups/index.md b/website/docs/services/globalaccelerator/endpoint_groups/index.md
index 684981a92..1b826812a 100644
--- a/website/docs/services/globalaccelerator/endpoint_groups/index.md
+++ b/website/docs/services/globalaccelerator/endpoint_groups/index.md
@@ -223,7 +223,7 @@ threshold_count,
 endpoint_group_arn,
 port_overrides
 FROM awscc.globalaccelerator.endpoint_groups
-WHERE Identifier = '<EndpointGroupArn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ endpoint_group_arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -234,7 +234,7 @@ SELECT
 region,
 endpoint_group_arn
 FROM awscc.globalaccelerator.endpoint_groups_list_only
-;
+WHERE region = 'us-east-1';
 ```
 </TabItem>
 </Tabs>
@@ -260,9 +260,9 @@ INSERT INTO awscc.globalaccelerator.endpoint_groups (
  EndpointGroupRegion,
  region
 )
-SELECT 
-'{{ ListenerArn }}',
- '{{ EndpointGroupRegion }}',
+SELECT
+'{{ listener_arn }}',
+ '{{ endpoint_group_region }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -283,17 +283,17 @@ INSERT INTO awscc.globalaccelerator.endpoint_groups (
  PortOverrides,
  region
 )
-SELECT 
- '{{ ListenerArn }}',
- '{{ EndpointGroupRegion }}',
- '{{ EndpointConfigurations }}',
- '{{ TrafficDialPercentage }}',
- '{{ HealthCheckPort }}',
- '{{ HealthCheckProtocol }}',
- '{{ HealthCheckPath }}',
- '{{ HealthCheckIntervalSeconds }}',
- '{{ ThresholdCount }}',
- '{{ PortOverrides }}',
+SELECT
+ '{{ listener_arn }}',
+ '{{ endpoint_group_region }}',
+ '{{ endpoint_configurations }}',
+ '{{ traffic_dial_percentage }}',
+ '{{ health_check_port }}',
+ '{{ health_check_protocol }}',
+ '{{ health_check_path }}',
+ '{{ health_check_interval_seconds }}',
+ '{{ threshold_count }}',
+ '{{ port_overrides }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -311,33 +311,32 @@ globals:
 resources:
   - name: endpoint_group
     props:
-      - name: ListenerArn
-        value: '{{ ListenerArn }}'
-      - name: EndpointGroupRegion
-        value: '{{ EndpointGroupRegion }}'
-      - name: EndpointConfigurations
+      - name: listener_arn
+        value: '{{ listener_arn }}'
+      - name: endpoint_group_region
+        value: '{{ endpoint_group_region }}'
+      - name: endpoint_configurations
         value:
-          - EndpointId: '{{ EndpointId }}'
-            AttachmentArn: '{{ AttachmentArn }}'
-            Weight: '{{ Weight }}'
-            ClientIPPreservationEnabled: '{{ ClientIPPreservationEnabled }}'
-      - name: TrafficDialPercentage
+          - endpoint_id: '{{ endpoint_id }}'
+            attachment_arn: '{{ attachment_arn }}'
+            weight: '{{ weight }}'
+            client_ip_preservation_enabled: '{{ client_ip_preservation_enabled }}'
+      - name: traffic_dial_percentage
         value: null
-      - name: HealthCheckPort
-        value: '{{ HealthCheckPort }}'
-      - name: HealthCheckProtocol
-        value: '{{ HealthCheckProtocol }}'
-      - name: HealthCheckPath
-        value: '{{ HealthCheckPath }}'
-      - name: HealthCheckIntervalSeconds
-        value: '{{ HealthCheckIntervalSeconds }}'
-      - name: ThresholdCount
-        value: '{{ ThresholdCount }}'
-      - name: PortOverrides
+      - name: health_check_port
+        value: '{{ health_check_port }}'
+      - name: health_check_protocol
+        value: '{{ health_check_protocol }}'
+      - name: health_check_path
+        value: '{{ health_check_path }}'
+      - name: health_check_interval_seconds
+        value: '{{ health_check_interval_seconds }}'
+      - name: threshold_count
+        value: '{{ threshold_count }}'
+      - name: port_overrides
         value:
-          - ListenerPort: '{{ ListenerPort }}'
-            EndpointPort: null
-
+          - listener_port: '{{ listener_port }}'
+            endpoint_port: null
 ```
 </TabItem>
 </Tabs>
@@ -360,7 +359,7 @@ SET PatchDocument = string('{{ {
     "PortOverrides": port_overrides
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<EndpointGroupArn>';
+AND Identifier = '{{ endpoint_group_arn }}';
 ```
 
 
@@ -369,7 +368,7 @@ AND Identifier = '<EndpointGroupArn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.globalaccelerator.endpoint_groups
-WHERE Identifier = '<EndpointGroupArn>'
+WHERE Identifier = '{{ endpoint_group_arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/globalaccelerator/listeners/index.md b/website/docs/services/globalaccelerator/listeners/index.md
index 951b7b411..6965143b7 100644
--- a/website/docs/services/globalaccelerator/listeners/index.md
+++ b/website/docs/services/globalaccelerator/listeners/index.md
@@ -165,7 +165,7 @@ port_ranges,
 protocol,
 client_affinity
 FROM awscc.globalaccelerator.listeners
-WHERE Identifier = '<ListenerArn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ listener_arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -176,7 +176,7 @@ SELECT
 region,
 listener_arn
 FROM awscc.globalaccelerator.listeners_list_only
-;
+WHERE region = 'us-east-1';
 ```
 </TabItem>
 </Tabs>
@@ -203,10 +203,10 @@ INSERT INTO awscc.globalaccelerator.listeners (
  Protocol,
  region
 )
-SELECT 
-'{{ AcceleratorArn }}',
- '{{ PortRanges }}',
- '{{ Protocol }}',
+SELECT
+'{{ accelerator_arn }}',
+ '{{ port_ranges }}',
+ '{{ protocol }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -221,11 +221,11 @@ INSERT INTO awscc.globalaccelerator.listeners (
  ClientAffinity,
  region
 )
-SELECT 
- '{{ AcceleratorArn }}',
- '{{ PortRanges }}',
- '{{ Protocol }}',
- '{{ ClientAffinity }}',
+SELECT
+ '{{ accelerator_arn }}',
+ '{{ port_ranges }}',
+ '{{ protocol }}',
+ '{{ client_affinity }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -243,17 +243,16 @@ globals:
 resources:
   - name: listener
     props:
-      - name: AcceleratorArn
-        value: '{{ AcceleratorArn }}'
-      - name: PortRanges
+      - name: accelerator_arn
+        value: '{{ accelerator_arn }}'
+      - name: port_ranges
         value:
-          - FromPort: '{{ FromPort }}'
-            ToPort: null
-      - name: Protocol
-        value: '{{ Protocol }}'
-      - name: ClientAffinity
-        value: '{{ ClientAffinity }}'
-
+          - from_port: '{{ from_port }}'
+            to_port: null
+      - name: protocol
+        value: '{{ protocol }}'
+      - name: client_affinity
+        value: '{{ client_affinity }}'
 ```
 </TabItem>
 </Tabs>
@@ -271,7 +270,7 @@ SET PatchDocument = string('{{ {
     "ClientAffinity": client_affinity
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<ListenerArn>';
+AND Identifier = '{{ listener_arn }}';
 ```
 
 
@@ -280,7 +279,7 @@ AND Identifier = '<ListenerArn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.globalaccelerator.listeners
-WHERE Identifier = '<ListenerArn>'
+WHERE Identifier = '{{ listener_arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/glue/crawlers/index.md b/website/docs/services/glue/crawlers/index.md
index 40836de03..466ff7072 100644
--- a/website/docs/services/glue/crawlers/index.md
+++ b/website/docs/services/glue/crawlers/index.md
@@ -468,7 +468,7 @@ schedule,
 table_prefix,
 tags
 FROM awscc.glue.crawlers
-WHERE region = 'us-east-1' AND Identifier = '<Name>';
+WHERE region = 'us-east-1' AND Identifier = '{{ name }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -505,9 +505,9 @@ INSERT INTO awscc.glue.crawlers (
  Role,
  region
 )
-SELECT 
-'{{ Targets }}',
- '{{ Role }}',
+SELECT
+'{{ targets }}',
+ '{{ role }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -532,21 +532,21 @@ INSERT INTO awscc.glue.crawlers (
  Tags,
  region
 )
-SELECT 
- '{{ Classifiers }}',
- '{{ Description }}',
- '{{ SchemaChangePolicy }}',
- '{{ Configuration }}',
- '{{ RecrawlPolicy }}',
- '{{ DatabaseName }}',
- '{{ Targets }}',
- '{{ CrawlerSecurityConfiguration }}',
- '{{ Name }}',
- '{{ Role }}',
- '{{ LakeFormationConfiguration }}',
- '{{ Schedule }}',
- '{{ TablePrefix }}',
- '{{ Tags }}',
+SELECT
+ '{{ classifiers }}',
+ '{{ description }}',
+ '{{ schema_change_policy }}',
+ '{{ configuration }}',
+ '{{ recrawl_policy }}',
+ '{{ database_name }}',
+ '{{ targets }}',
+ '{{ crawler_security_configuration }}',
+ '{{ name }}',
+ '{{ role }}',
+ '{{ lake_formation_configuration }}',
+ '{{ schedule }}',
+ '{{ table_prefix }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -564,91 +564,90 @@ globals:
 resources:
   - name: crawler
     props:
-      - name: Classifiers
+      - name: classifiers
         value:
-          - '{{ Classifiers[0] }}'
-      - name: Description
-        value: '{{ Description }}'
-      - name: SchemaChangePolicy
+          - '{{ classifiers[0] }}'
+      - name: description
+        value: '{{ description }}'
+      - name: schema_change_policy
         value:
-          UpdateBehavior: '{{ UpdateBehavior }}'
-          DeleteBehavior: '{{ DeleteBehavior }}'
-      - name: Configuration
-        value: '{{ Configuration }}'
-      - name: RecrawlPolicy
+          update_behavior: '{{ update_behavior }}'
+          delete_behavior: '{{ delete_behavior }}'
+      - name: configuration
+        value: '{{ configuration }}'
+      - name: recrawl_policy
         value:
-          RecrawlBehavior: '{{ RecrawlBehavior }}'
-      - name: DatabaseName
-        value: '{{ DatabaseName }}'
-      - name: Targets
+          recrawl_behavior: '{{ recrawl_behavior }}'
+      - name: database_name
+        value: '{{ database_name }}'
+      - name: targets
         value:
-          S3Targets:
-            - ConnectionName: '{{ ConnectionName }}'
-              Path: '{{ Path }}'
-              SampleSize: '{{ SampleSize }}'
-              Exclusions:
-                - '{{ Exclusions[0] }}'
-              DlqEventQueueArn: '{{ DlqEventQueueArn }}'
-              EventQueueArn: '{{ EventQueueArn }}'
-          CatalogTargets:
-            - ConnectionName: '{{ ConnectionName }}'
-              DatabaseName: '{{ DatabaseName }}'
-              DlqEventQueueArn: '{{ DlqEventQueueArn }}'
-              Tables:
-                - '{{ Tables[0] }}'
-              EventQueueArn: '{{ EventQueueArn }}'
-          DeltaTargets:
-            - ConnectionName: '{{ ConnectionName }}'
-              CreateNativeDeltaTable: '{{ CreateNativeDeltaTable }}'
-              WriteManifest: '{{ WriteManifest }}'
-              DeltaTables:
-                - '{{ DeltaTables[0] }}'
-          MongoDBTargets:
-            - ConnectionName: '{{ ConnectionName }}'
-              Path: '{{ Path }}'
-          JdbcTargets:
-            - ConnectionName: '{{ ConnectionName }}'
-              Path: '{{ Path }}'
-              Exclusions:
-                - '{{ Exclusions[0] }}'
-              EnableAdditionalMetadata:
-                - '{{ EnableAdditionalMetadata[0] }}'
-          DynamoDBTargets:
-            - Path: '{{ Path }}'
-              ScanAll: '{{ ScanAll }}'
-              ScanRate: null
-          IcebergTargets:
-            - ConnectionName: '{{ ConnectionName }}'
-              Paths:
-                - '{{ Paths[0] }}'
-              Exclusions:
-                - '{{ Exclusions[0] }}'
-              MaximumTraversalDepth: '{{ MaximumTraversalDepth }}'
-          HudiTargets:
-            - ConnectionName: '{{ ConnectionName }}'
-              Paths:
-                - '{{ Paths[0] }}'
-              Exclusions:
-                - '{{ Exclusions[0] }}'
-              MaximumTraversalDepth: '{{ MaximumTraversalDepth }}'
-      - name: CrawlerSecurityConfiguration
-        value: '{{ CrawlerSecurityConfiguration }}'
-      - name: Name
-        value: '{{ Name }}'
-      - name: Role
-        value: '{{ Role }}'
-      - name: LakeFormationConfiguration
+          s3_targets:
+            - connection_name: '{{ connection_name }}'
+              path: '{{ path }}'
+              sample_size: '{{ sample_size }}'
+              exclusions:
+                - '{{ exclusions[0] }}'
+              dlq_event_queue_arn: '{{ dlq_event_queue_arn }}'
+              event_queue_arn: '{{ event_queue_arn }}'
+          catalog_targets:
+            - connection_name: '{{ connection_name }}'
+              database_name: '{{ database_name }}'
+              dlq_event_queue_arn: '{{ dlq_event_queue_arn }}'
+              tables:
+                - '{{ tables[0] }}'
+              event_queue_arn: '{{ event_queue_arn }}'
+          delta_targets:
+            - connection_name: '{{ connection_name }}'
+              create_native_delta_table: '{{ create_native_delta_table }}'
+              write_manifest: '{{ write_manifest }}'
+              delta_tables:
+                - '{{ delta_tables[0] }}'
+          mongo_db_targets:
+            - connection_name: '{{ connection_name }}'
+              path: '{{ path }}'
+          jdbc_targets:
+            - connection_name: '{{ connection_name }}'
+              path: '{{ path }}'
+              exclusions:
+                - '{{ exclusions[0] }}'
+              enable_additional_metadata:
+                - '{{ enable_additional_metadata[0] }}'
+          dynamo_db_targets:
+            - path: '{{ path }}'
+              scan_all: '{{ scan_all }}'
+              scan_rate: null
+          iceberg_targets:
+            - connection_name: '{{ connection_name }}'
+              paths:
+                - '{{ paths[0] }}'
+              exclusions:
+                - '{{ exclusions[0] }}'
+              maximum_traversal_depth: '{{ maximum_traversal_depth }}'
+          hudi_targets:
+            - connection_name: '{{ connection_name }}'
+              paths:
+                - '{{ paths[0] }}'
+              exclusions:
+                - '{{ exclusions[0] }}'
+              maximum_traversal_depth: '{{ maximum_traversal_depth }}'
+      - name: crawler_security_configuration
+        value: '{{ crawler_security_configuration }}'
+      - name: name
+        value: '{{ name }}'
+      - name: role
+        value: '{{ role }}'
+      - name: lake_formation_configuration
         value:
-          UseLakeFormationCredentials: '{{ UseLakeFormationCredentials }}'
-          AccountId: '{{ AccountId }}'
-      - name: Schedule
+          use_lake_formation_credentials: '{{ use_lake_formation_credentials }}'
+          account_id: '{{ account_id }}'
+      - name: schedule
         value:
-          ScheduleExpression: '{{ ScheduleExpression }}'
-      - name: TablePrefix
-        value: '{{ TablePrefix }}'
-      - name: Tags
+          schedule_expression: '{{ schedule_expression }}'
+      - name: table_prefix
+        value: '{{ table_prefix }}'
+      - name: tags
         value: {}
-
 ```
 </TabItem>
 </Tabs>
@@ -676,7 +675,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Name>';
+AND Identifier = '{{ name }}';
 ```
 
 
@@ -685,7 +684,7 @@ AND Identifier = '<Name>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.glue.crawlers
-WHERE Identifier = '<Name>'
+WHERE Identifier = '{{ name }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/glue/databases/index.md b/website/docs/services/glue/databases/index.md
index 342f0495d..9ad947a08 100644
--- a/website/docs/services/glue/databases/index.md
+++ b/website/docs/services/glue/databases/index.md
@@ -231,7 +231,7 @@ catalog_id,
 database_input,
 database_name
 FROM awscc.glue.databases
-WHERE region = 'us-east-1' AND Identifier = '<DatabaseName>';
+WHERE region = 'us-east-1' AND Identifier = '{{ database_name }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -268,9 +268,9 @@ INSERT INTO awscc.glue.databases (
  DatabaseInput,
  region
 )
-SELECT 
-'{{ CatalogId }}',
- '{{ DatabaseInput }}',
+SELECT
+'{{ catalog_id }}',
+ '{{ database_input }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -284,10 +284,10 @@ INSERT INTO awscc.glue.databases (
  DatabaseName,
  region
 )
-SELECT 
- '{{ CatalogId }}',
- '{{ DatabaseInput }}',
- '{{ DatabaseName }}',
+SELECT
+ '{{ catalog_id }}',
+ '{{ database_input }}',
+ '{{ database_name }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -305,29 +305,28 @@ globals:
 resources:
   - name: database
     props:
-      - name: CatalogId
-        value: '{{ CatalogId }}'
-      - name: DatabaseInput
+      - name: catalog_id
+        value: '{{ catalog_id }}'
+      - name: database_input
         value:
-          LocationUri: '{{ LocationUri }}'
-          CreateTableDefaultPermissions:
-            - Permissions:
-                - '{{ Permissions[0] }}'
-              Principal:
-                DataLakePrincipalIdentifier: '{{ DataLakePrincipalIdentifier }}'
-          Description: '{{ Description }}'
-          Parameters: {}
-          TargetDatabase:
-            DatabaseName: '{{ DatabaseName }}'
-            Region: '{{ Region }}'
-            CatalogId: '{{ CatalogId }}'
-          FederatedDatabase:
-            ConnectionName: '{{ ConnectionName }}'
-            Identifier: '{{ Identifier }}'
-          Name: '{{ Name }}'
-      - name: DatabaseName
-        value: '{{ DatabaseName }}'
-
+          location_uri: '{{ location_uri }}'
+          create_table_default_permissions:
+            - permissions:
+                - '{{ permissions[0] }}'
+              principal:
+                data_lake_principal_identifier: '{{ data_lake_principal_identifier }}'
+          description: '{{ description }}'
+          parameters: {}
+          target_database:
+            database_name: '{{ database_name }}'
+            region: '{{ region }}'
+            catalog_id: '{{ catalog_id }}'
+          federated_database:
+            connection_name: '{{ connection_name }}'
+            identifier: '{{ identifier }}'
+          name: '{{ name }}'
+      - name: database_name
+        value: '{{ database_name }}'
 ```
 </TabItem>
 </Tabs>
@@ -344,7 +343,7 @@ SET PatchDocument = string('{{ {
     "DatabaseInput": database_input
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<DatabaseName>';
+AND Identifier = '{{ database_name }}';
 ```
 
 
@@ -353,7 +352,7 @@ AND Identifier = '<DatabaseName>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.glue.databases
-WHERE Identifier = '<DatabaseName>'
+WHERE Identifier = '{{ database_name }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/glue/jobs/index.md b/website/docs/services/glue/jobs/index.md
index da739c1e9..0079a954d 100644
--- a/website/docs/services/glue/jobs/index.md
+++ b/website/docs/services/glue/jobs/index.md
@@ -309,7 +309,7 @@ maintenance_window,
 job_mode,
 job_run_queuing_enabled
 FROM awscc.glue.jobs
-WHERE region = 'us-east-1' AND Identifier = '<Name>';
+WHERE region = 'us-east-1' AND Identifier = '{{ name }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -346,9 +346,9 @@ INSERT INTO awscc.glue.jobs (
  Command,
  region
 )
-SELECT 
-'{{ Role }}',
- '{{ Command }}',
+SELECT
+'{{ role }}',
+ '{{ command }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -382,30 +382,30 @@ INSERT INTO awscc.glue.jobs (
  JobRunQueuingEnabled,
  region
 )
-SELECT 
- '{{ Connections }}',
- '{{ MaxRetries }}',
- '{{ Description }}',
- '{{ Timeout }}',
- '{{ AllocatedCapacity }}',
- '{{ Name }}',
- '{{ Role }}',
- '{{ DefaultArguments }}',
- '{{ NotificationProperty }}',
- '{{ WorkerType }}',
- '{{ ExecutionClass }}',
- '{{ LogUri }}',
- '{{ Command }}',
- '{{ GlueVersion }}',
- '{{ ExecutionProperty }}',
- '{{ SecurityConfiguration }}',
- '{{ NumberOfWorkers }}',
- '{{ Tags }}',
- '{{ MaxCapacity }}',
- '{{ NonOverridableArguments }}',
- '{{ MaintenanceWindow }}',
- '{{ JobMode }}',
- '{{ JobRunQueuingEnabled }}',
+SELECT
+ '{{ connections }}',
+ '{{ max_retries }}',
+ '{{ description }}',
+ '{{ timeout }}',
+ '{{ allocated_capacity }}',
+ '{{ name }}',
+ '{{ role }}',
+ '{{ default_arguments }}',
+ '{{ notification_property }}',
+ '{{ worker_type }}',
+ '{{ execution_class }}',
+ '{{ log_uri }}',
+ '{{ command }}',
+ '{{ glue_version }}',
+ '{{ execution_property }}',
+ '{{ security_configuration }}',
+ '{{ number_of_workers }}',
+ '{{ tags }}',
+ '{{ max_capacity }}',
+ '{{ non_overridable_arguments }}',
+ '{{ maintenance_window }}',
+ '{{ job_mode }}',
+ '{{ job_run_queuing_enabled }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -423,61 +423,60 @@ globals:
 resources:
   - name: job
     props:
-      - name: Connections
+      - name: connections
         value:
-          Connections:
-            - '{{ Connections[0] }}'
-      - name: MaxRetries
+          connections:
+            - '{{ connections[0] }}'
+      - name: max_retries
         value: null
-      - name: Description
-        value: '{{ Description }}'
-      - name: Timeout
-        value: '{{ Timeout }}'
-      - name: AllocatedCapacity
+      - name: description
+        value: '{{ description }}'
+      - name: timeout
+        value: '{{ timeout }}'
+      - name: allocated_capacity
         value: null
-      - name: Name
-        value: '{{ Name }}'
-      - name: Role
-        value: '{{ Role }}'
-      - name: DefaultArguments
+      - name: name
+        value: '{{ name }}'
+      - name: role
+        value: '{{ role }}'
+      - name: default_arguments
         value: {}
-      - name: NotificationProperty
+      - name: notification_property
         value:
-          NotifyDelayAfter: '{{ NotifyDelayAfter }}'
-      - name: WorkerType
-        value: '{{ WorkerType }}'
-      - name: ExecutionClass
-        value: '{{ ExecutionClass }}'
-      - name: LogUri
-        value: '{{ LogUri }}'
-      - name: Command
+          notify_delay_after: '{{ notify_delay_after }}'
+      - name: worker_type
+        value: '{{ worker_type }}'
+      - name: execution_class
+        value: '{{ execution_class }}'
+      - name: log_uri
+        value: '{{ log_uri }}'
+      - name: command
         value:
-          Name: '{{ Name }}'
-          PythonVersion: '{{ PythonVersion }}'
-          Runtime: '{{ Runtime }}'
-          ScriptLocation: '{{ ScriptLocation }}'
-      - name: GlueVersion
-        value: '{{ GlueVersion }}'
-      - name: ExecutionProperty
+          name: '{{ name }}'
+          python_version: '{{ python_version }}'
+          runtime: '{{ runtime }}'
+          script_location: '{{ script_location }}'
+      - name: glue_version
+        value: '{{ glue_version }}'
+      - name: execution_property
         value:
-          MaxConcurrentRuns: null
-      - name: SecurityConfiguration
-        value: '{{ SecurityConfiguration }}'
-      - name: NumberOfWorkers
-        value: '{{ NumberOfWorkers }}'
-      - name: Tags
+          max_concurrent_runs: null
+      - name: security_configuration
+        value: '{{ security_configuration }}'
+      - name: number_of_workers
+        value: '{{ number_of_workers }}'
+      - name: tags
         value: {}
-      - name: MaxCapacity
+      - name: max_capacity
         value: null
-      - name: NonOverridableArguments
+      - name: non_overridable_arguments
         value: {}
-      - name: MaintenanceWindow
-        value: '{{ MaintenanceWindow }}'
-      - name: JobMode
-        value: '{{ JobMode }}'
-      - name: JobRunQueuingEnabled
-        value: '{{ JobRunQueuingEnabled }}'
-
+      - name: maintenance_window
+        value: '{{ maintenance_window }}'
+      - name: job_mode
+        value: '{{ job_mode }}'
+      - name: job_run_queuing_enabled
+        value: '{{ job_run_queuing_enabled }}'
 ```
 </TabItem>
 </Tabs>
@@ -514,7 +513,7 @@ SET PatchDocument = string('{{ {
     "JobRunQueuingEnabled": job_run_queuing_enabled
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Name>';
+AND Identifier = '{{ name }}';
 ```
 
 
@@ -523,7 +522,7 @@ AND Identifier = '<Name>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.glue.jobs
-WHERE Identifier = '<Name>'
+WHERE Identifier = '{{ name }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/glue/schema_version_metadata/index.md b/website/docs/services/glue/schema_version_metadata/index.md
index a7bbb2754..6814d58a0 100644
--- a/website/docs/services/glue/schema_version_metadata/index.md
+++ b/website/docs/services/glue/schema_version_metadata/index.md
@@ -150,7 +150,7 @@ schema_version_id,
 key,
 value
 FROM awscc.glue.schema_version_metadata
-WHERE region = 'us-east-1' AND Identifier = '<SchemaVersionId>|<Key>|<Value>';
+WHERE region = 'us-east-1' AND Identifier = '{{ schema_version_id }}|{{ key }}|{{ value }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -190,10 +190,10 @@ INSERT INTO awscc.glue.schema_version_metadata (
  Value,
  region
 )
-SELECT 
-'{{ SchemaVersionId }}',
- '{{ Key }}',
- '{{ Value }}',
+SELECT
+'{{ schema_version_id }}',
+ '{{ key }}',
+ '{{ value }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -207,10 +207,10 @@ INSERT INTO awscc.glue.schema_version_metadata (
  Value,
  region
 )
-SELECT 
- '{{ SchemaVersionId }}',
- '{{ Key }}',
- '{{ Value }}',
+SELECT
+ '{{ schema_version_id }}',
+ '{{ key }}',
+ '{{ value }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -228,13 +228,12 @@ globals:
 resources:
   - name: schema_version_metadatum
     props:
-      - name: SchemaVersionId
-        value: '{{ SchemaVersionId }}'
-      - name: Key
-        value: '{{ Key }}'
-      - name: Value
-        value: '{{ Value }}'
-
+      - name: schema_version_id
+        value: '{{ schema_version_id }}'
+      - name: key
+        value: '{{ key }}'
+      - name: value
+        value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -245,7 +244,7 @@ resources:
 ```sql
 /*+ delete */
 DELETE FROM awscc.glue.schema_version_metadata
-WHERE Identifier = '<SchemaVersionId|Key|Value>'
+WHERE Identifier = '{{ schema_version_id }}|{{ key }}|{{ value }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/glue/schema_versions/index.md b/website/docs/services/glue/schema_versions/index.md
index c3485005a..bda6b8409 100644
--- a/website/docs/services/glue/schema_versions/index.md
+++ b/website/docs/services/glue/schema_versions/index.md
@@ -157,7 +157,7 @@ schema,
 schema_definition,
 version_id
 FROM awscc.glue.schema_versions
-WHERE region = 'us-east-1' AND Identifier = '<VersionId>';
+WHERE region = 'us-east-1' AND Identifier = '{{ version_id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -194,9 +194,9 @@ INSERT INTO awscc.glue.schema_versions (
  SchemaDefinition,
  region
 )
-SELECT 
-'{{ Schema }}',
- '{{ SchemaDefinition }}',
+SELECT
+'{{ schema }}',
+ '{{ schema_definition }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -209,9 +209,9 @@ INSERT INTO awscc.glue.schema_versions (
  SchemaDefinition,
  region
 )
-SELECT 
- '{{ Schema }}',
- '{{ SchemaDefinition }}',
+SELECT
+ '{{ schema }}',
+ '{{ schema_definition }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -229,14 +229,13 @@ globals:
 resources:
   - name: schema_version
     props:
-      - name: Schema
+      - name: schema
         value:
-          SchemaArn: '{{ SchemaArn }}'
-          SchemaName: '{{ SchemaName }}'
-          RegistryName: '{{ RegistryName }}'
-      - name: SchemaDefinition
-        value: '{{ SchemaDefinition }}'
-
+          schema_arn: '{{ schema_arn }}'
+          schema_name: '{{ schema_name }}'
+          registry_name: '{{ registry_name }}'
+      - name: schema_definition
+        value: '{{ schema_definition }}'
 ```
 </TabItem>
 </Tabs>
@@ -247,7 +246,7 @@ resources:
 ```sql
 /*+ delete */
 DELETE FROM awscc.glue.schema_versions
-WHERE Identifier = '<VersionId>'
+WHERE Identifier = '{{ version_id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/glue/triggers/index.md b/website/docs/services/glue/triggers/index.md
index 74066fab6..5b6f4014d 100644
--- a/website/docs/services/glue/triggers/index.md
+++ b/website/docs/services/glue/triggers/index.md
@@ -278,7 +278,7 @@ tags,
 name,
 predicate
 FROM awscc.glue.triggers
-WHERE region = 'us-east-1' AND Identifier = '<Name>';
+WHERE region = 'us-east-1' AND Identifier = '{{ name }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -315,9 +315,9 @@ INSERT INTO awscc.glue.triggers (
  Actions,
  region
 )
-SELECT 
-'{{ Type }}',
- '{{ Actions }}',
+SELECT
+'{{ type }}',
+ '{{ actions }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -338,17 +338,17 @@ INSERT INTO awscc.glue.triggers (
  Predicate,
  region
 )
-SELECT 
- '{{ Type }}',
- '{{ StartOnCreation }}',
- '{{ Description }}',
- '{{ Actions }}',
- '{{ EventBatchingCondition }}',
- '{{ WorkflowName }}',
- '{{ Schedule }}',
- '{{ Tags }}',
- '{{ Name }}',
- '{{ Predicate }}',
+SELECT
+ '{{ type }}',
+ '{{ start_on_creation }}',
+ '{{ description }}',
+ '{{ actions }}',
+ '{{ event_batching_condition }}',
+ '{{ workflow_name }}',
+ '{{ schedule }}',
+ '{{ tags }}',
+ '{{ name }}',
+ '{{ predicate }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -366,43 +366,42 @@ globals:
 resources:
   - name: trigger
     props:
-      - name: Type
-        value: '{{ Type }}'
-      - name: StartOnCreation
-        value: '{{ StartOnCreation }}'
-      - name: Description
-        value: '{{ Description }}'
-      - name: Actions
+      - name: type
+        value: '{{ type }}'
+      - name: start_on_creation
+        value: '{{ start_on_creation }}'
+      - name: description
+        value: '{{ description }}'
+      - name: actions
         value:
-          - NotificationProperty:
-              NotifyDelayAfter: '{{ NotifyDelayAfter }}'
-            CrawlerName: '{{ CrawlerName }}'
-            Timeout: '{{ Timeout }}'
-            JobName: '{{ JobName }}'
-            Arguments: {}
-            SecurityConfiguration: '{{ SecurityConfiguration }}'
-      - name: EventBatchingCondition
+          - notification_property:
+              notify_delay_after: '{{ notify_delay_after }}'
+            crawler_name: '{{ crawler_name }}'
+            timeout: '{{ timeout }}'
+            job_name: '{{ job_name }}'
+            arguments: {}
+            security_configuration: '{{ security_configuration }}'
+      - name: event_batching_condition
         value:
-          BatchSize: '{{ BatchSize }}'
-          BatchWindow: '{{ BatchWindow }}'
-      - name: WorkflowName
-        value: '{{ WorkflowName }}'
-      - name: Schedule
-        value: '{{ Schedule }}'
-      - name: Tags
+          batch_size: '{{ batch_size }}'
+          batch_window: '{{ batch_window }}'
+      - name: workflow_name
+        value: '{{ workflow_name }}'
+      - name: schedule
+        value: '{{ schedule }}'
+      - name: tags
         value: {}
-      - name: Name
-        value: '{{ Name }}'
-      - name: Predicate
+      - name: name
+        value: '{{ name }}'
+      - name: predicate
         value:
-          Logical: '{{ Logical }}'
-          Conditions:
-            - JobName: '{{ JobName }}'
-              CrawlerName: '{{ CrawlerName }}'
-              State: '{{ State }}'
-              CrawlState: '{{ CrawlState }}'
-              LogicalOperator: '{{ LogicalOperator }}'
-
+          logical: '{{ logical }}'
+          conditions:
+            - job_name: '{{ job_name }}'
+              crawler_name: '{{ crawler_name }}'
+              state: '{{ state }}'
+              crawl_state: '{{ crawl_state }}'
+              logical_operator: '{{ logical_operator }}'
 ```
 </TabItem>
 </Tabs>
@@ -424,7 +423,7 @@ SET PatchDocument = string('{{ {
     "Predicate": predicate
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Name>';
+AND Identifier = '{{ name }}';
 ```
 
 
@@ -433,7 +432,7 @@ AND Identifier = '<Name>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.glue.triggers
-WHERE Identifier = '<Name>'
+WHERE Identifier = '{{ name }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/glue/usage_profiles/index.md b/website/docs/services/glue/usage_profiles/index.md
index 492d30505..9d17fdb43 100644
--- a/website/docs/services/glue/usage_profiles/index.md
+++ b/website/docs/services/glue/usage_profiles/index.md
@@ -182,7 +182,7 @@ configuration,
 tags,
 created_on
 FROM awscc.glue.usage_profiles
-WHERE region = 'us-east-1' AND Identifier = '<Name>';
+WHERE region = 'us-east-1' AND Identifier = '{{ name }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -218,8 +218,8 @@ INSERT INTO awscc.glue.usage_profiles (
  Name,
  region
 )
-SELECT 
-'{{ Name }}',
+SELECT
+'{{ name }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -234,11 +234,11 @@ INSERT INTO awscc.glue.usage_profiles (
  Tags,
  region
 )
-SELECT 
- '{{ Name }}',
- '{{ Description }}',
- '{{ Configuration }}',
- '{{ Tags }}',
+SELECT
+ '{{ name }}',
+ '{{ description }}',
+ '{{ configuration }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -256,17 +256,16 @@ globals:
 resources:
   - name: usage_profile
     props:
-      - name: Name
-        value: '{{ Name }}'
-      - name: Description
-        value: '{{ Description }}'
-      - name: Configuration
+      - name: name
+        value: '{{ name }}'
+      - name: description
+        value: '{{ description }}'
+      - name: configuration
         value: null
-      - name: Tags
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -284,7 +283,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Name>';
+AND Identifier = '{{ name }}';
 ```
 
 
@@ -293,7 +292,7 @@ AND Identifier = '<Name>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.glue.usage_profiles
-WHERE Identifier = '<Name>'
+WHERE Identifier = '{{ name }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/grafana/workspaces/index.md b/website/docs/services/grafana/workspaces/index.md
index 00f75d152..07ae82ddd 100644
--- a/website/docs/services/grafana/workspaces/index.md
+++ b/website/docs/services/grafana/workspaces/index.md
@@ -379,7 +379,7 @@ organizational_units,
 role_arn,
 plugin_admin_enabled
 FROM awscc.grafana.workspaces
-WHERE region = 'us-east-1' AND Identifier = '<Id>';
+WHERE region = 'us-east-1' AND Identifier = '{{ id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -417,10 +417,10 @@ INSERT INTO awscc.grafana.workspaces (
  PermissionType,
  region
 )
-SELECT 
-'{{ AuthenticationProviders }}',
- '{{ AccountAccessType }}',
- '{{ PermissionType }}',
+SELECT
+'{{ authentication_providers }}',
+ '{{ account_access_type }}',
+ '{{ permission_type }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -448,24 +448,24 @@ INSERT INTO awscc.grafana.workspaces (
  PluginAdminEnabled,
  region
 )
-SELECT 
- '{{ AuthenticationProviders }}',
- '{{ SamlConfiguration }}',
- '{{ NetworkAccessControl }}',
- '{{ VpcConfiguration }}',
- '{{ ClientToken }}',
- '{{ GrafanaVersion }}',
- '{{ AccountAccessType }}',
- '{{ OrganizationRoleName }}',
- '{{ PermissionType }}',
- '{{ StackSetName }}',
- '{{ DataSources }}',
- '{{ Description }}',
- '{{ Name }}',
- '{{ NotificationDestinations }}',
- '{{ OrganizationalUnits }}',
- '{{ RoleArn }}',
- '{{ PluginAdminEnabled }}',
+SELECT
+ '{{ authentication_providers }}',
+ '{{ saml_configuration }}',
+ '{{ network_access_control }}',
+ '{{ vpc_configuration }}',
+ '{{ client_token }}',
+ '{{ grafana_version }}',
+ '{{ account_access_type }}',
+ '{{ organization_role_name }}',
+ '{{ permission_type }}',
+ '{{ stack_set_name }}',
+ '{{ data_sources }}',
+ '{{ description }}',
+ '{{ name }}',
+ '{{ notification_destinations }}',
+ '{{ organizational_units }}',
+ '{{ role_arn }}',
+ '{{ plugin_admin_enabled }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -483,71 +483,70 @@ globals:
 resources:
   - name: workspace
     props:
-      - name: AuthenticationProviders
+      - name: authentication_providers
         value:
-          - '{{ AuthenticationProviders[0] }}'
-      - name: SamlConfiguration
+          - '{{ authentication_providers[0] }}'
+      - name: saml_configuration
         value:
-          IdpMetadata:
-            Url: '{{ Url }}'
-            Xml: '{{ Xml }}'
-          AssertionAttributes:
-            Name: '{{ Name }}'
-            Login: '{{ Login }}'
-            Email: '{{ Email }}'
-            Groups: '{{ Groups }}'
-            Role: '{{ Role }}'
-            Org: '{{ Org }}'
-          RoleValues:
-            Editor:
-              - '{{ Editor[0] }}'
-            Admin:
-              - '{{ Admin[0] }}'
-          AllowedOrganizations:
-            - '{{ AllowedOrganizations[0] }}'
-          LoginValidityDuration: null
-      - name: NetworkAccessControl
+          idp_metadata:
+            url: '{{ url }}'
+            xml: '{{ xml }}'
+          assertion_attributes:
+            name: '{{ name }}'
+            login: '{{ login }}'
+            email: '{{ email }}'
+            groups: '{{ groups }}'
+            role: '{{ role }}'
+            org: '{{ org }}'
+          role_values:
+            editor:
+              - '{{ editor[0] }}'
+            admin:
+              - '{{ admin[0] }}'
+          allowed_organizations:
+            - '{{ allowed_organizations[0] }}'
+          login_validity_duration: null
+      - name: network_access_control
         value:
-          PrefixListIds:
-            - '{{ PrefixListIds[0] }}'
-          VpceIds:
-            - '{{ VpceIds[0] }}'
-      - name: VpcConfiguration
+          prefix_list_ids:
+            - '{{ prefix_list_ids[0] }}'
+          vpce_ids:
+            - '{{ vpce_ids[0] }}'
+      - name: vpc_configuration
         value:
-          SecurityGroupIds:
-            - '{{ SecurityGroupIds[0] }}'
-          SubnetIds:
-            - '{{ SubnetIds[0] }}'
-      - name: ClientToken
-        value: '{{ ClientToken }}'
-      - name: GrafanaVersion
-        value: '{{ GrafanaVersion }}'
-      - name: AccountAccessType
-        value: '{{ AccountAccessType }}'
-      - name: OrganizationRoleName
-        value: '{{ OrganizationRoleName }}'
-      - name: PermissionType
-        value: '{{ PermissionType }}'
-      - name: StackSetName
-        value: '{{ StackSetName }}'
-      - name: DataSources
+          security_group_ids:
+            - '{{ security_group_ids[0] }}'
+          subnet_ids:
+            - '{{ subnet_ids[0] }}'
+      - name: client_token
+        value: '{{ client_token }}'
+      - name: grafana_version
+        value: '{{ grafana_version }}'
+      - name: account_access_type
+        value: '{{ account_access_type }}'
+      - name: organization_role_name
+        value: '{{ organization_role_name }}'
+      - name: permission_type
+        value: '{{ permission_type }}'
+      - name: stack_set_name
+        value: '{{ stack_set_name }}'
+      - name: data_sources
         value:
-          - '{{ DataSources[0] }}'
-      - name: Description
-        value: '{{ Description }}'
-      - name: Name
-        value: '{{ Name }}'
-      - name: NotificationDestinations
+          - '{{ data_sources[0] }}'
+      - name: description
+        value: '{{ description }}'
+      - name: name
+        value: '{{ name }}'
+      - name: notification_destinations
         value:
-          - '{{ NotificationDestinations[0] }}'
-      - name: OrganizationalUnits
+          - '{{ notification_destinations[0] }}'
+      - name: organizational_units
         value:
-          - '{{ OrganizationalUnits[0] }}'
-      - name: RoleArn
-        value: '{{ RoleArn }}'
-      - name: PluginAdminEnabled
-        value: '{{ PluginAdminEnabled }}'
-
+          - '{{ organizational_units[0] }}'
+      - name: role_arn
+        value: '{{ role_arn }}'
+      - name: plugin_admin_enabled
+        value: '{{ plugin_admin_enabled }}'
 ```
 </TabItem>
 </Tabs>
@@ -578,7 +577,7 @@ SET PatchDocument = string('{{ {
     "PluginAdminEnabled": plugin_admin_enabled
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Id>';
+AND Identifier = '{{ id }}';
 ```
 
 
@@ -587,7 +586,7 @@ AND Identifier = '<Id>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.grafana.workspaces
-WHERE Identifier = '<Id>'
+WHERE Identifier = '{{ id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/greengrassv2/component_versions/index.md b/website/docs/services/greengrassv2/component_versions/index.md
index 60d1dac4f..beecead38 100644
--- a/website/docs/services/greengrassv2/component_versions/index.md
+++ b/website/docs/services/greengrassv2/component_versions/index.md
@@ -289,7 +289,7 @@ inline_recipe,
 lambda_function,
 tags
 FROM awscc.greengrassv2.component_versions
-WHERE region = 'us-east-1' AND Identifier = '<Arn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -327,10 +327,10 @@ INSERT INTO awscc.greengrassv2.component_versions (
  Tags,
  region
 )
-SELECT 
-'{{ InlineRecipe }}',
- '{{ LambdaFunction }}',
- '{{ Tags }}',
+SELECT
+'{{ inline_recipe }}',
+ '{{ lambda_function }}',
+ '{{ tags }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -344,10 +344,10 @@ INSERT INTO awscc.greengrassv2.component_versions (
  Tags,
  region
 )
-SELECT 
- '{{ InlineRecipe }}',
- '{{ LambdaFunction }}',
- '{{ Tags }}',
+SELECT
+ '{{ inline_recipe }}',
+ '{{ lambda_function }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -365,48 +365,47 @@ globals:
 resources:
   - name: component_version
     props:
-      - name: InlineRecipe
-        value: '{{ InlineRecipe }}'
-      - name: LambdaFunction
+      - name: inline_recipe
+        value: '{{ inline_recipe }}'
+      - name: lambda_function
         value:
-          LambdaArn: '{{ LambdaArn }}'
-          ComponentName: '{{ ComponentName }}'
-          ComponentVersion: '{{ ComponentVersion }}'
-          ComponentPlatforms:
-            - Name: '{{ Name }}'
-              Attributes: {}
-          ComponentDependencies: {}
-          ComponentLambdaParameters:
-            EventSources:
-              - Topic: '{{ Topic }}'
-                Type: '{{ Type }}'
-            MaxQueueSize: '{{ MaxQueueSize }}'
-            MaxInstancesCount: '{{ MaxInstancesCount }}'
-            MaxIdleTimeInSeconds: '{{ MaxIdleTimeInSeconds }}'
-            TimeoutInSeconds: '{{ TimeoutInSeconds }}'
-            StatusTimeoutInSeconds: '{{ StatusTimeoutInSeconds }}'
-            Pinned: '{{ Pinned }}'
-            InputPayloadEncodingType: '{{ InputPayloadEncodingType }}'
-            ExecArgs:
-              - '{{ ExecArgs[0] }}'
-            EnvironmentVariables: {}
-            LinuxProcessParams:
-              IsolationMode: '{{ IsolationMode }}'
-              ContainerParams:
-                MemorySizeInKB: '{{ MemorySizeInKB }}'
-                MountROSysfs: '{{ MountROSysfs }}'
-                Volumes:
-                  - SourcePath: '{{ SourcePath }}'
-                    DestinationPath: null
-                    Permission: '{{ Permission }}'
-                    AddGroupOwner: '{{ AddGroupOwner }}'
-                Devices:
-                  - Path: null
-                    Permission: null
-                    AddGroupOwner: null
-      - name: Tags
+          lambda_arn: '{{ lambda_arn }}'
+          component_name: '{{ component_name }}'
+          component_version: '{{ component_version }}'
+          component_platforms:
+            - name: '{{ name }}'
+              attributes: {}
+          component_dependencies: {}
+          component_lambda_parameters:
+            event_sources:
+              - topic: '{{ topic }}'
+                type: '{{ type }}'
+            max_queue_size: '{{ max_queue_size }}'
+            max_instances_count: '{{ max_instances_count }}'
+            max_idle_time_in_seconds: '{{ max_idle_time_in_seconds }}'
+            timeout_in_seconds: '{{ timeout_in_seconds }}'
+            status_timeout_in_seconds: '{{ status_timeout_in_seconds }}'
+            pinned: '{{ pinned }}'
+            input_payload_encoding_type: '{{ input_payload_encoding_type }}'
+            exec_args:
+              - '{{ exec_args[0] }}'
+            environment_variables: {}
+            linux_process_params:
+              isolation_mode: '{{ isolation_mode }}'
+              container_params:
+                memory_size_in_kb: '{{ memory_size_in_kb }}'
+                mount_ro_sysfs: '{{ mount_ro_sysfs }}'
+                volumes:
+                  - source_path: '{{ source_path }}'
+                    destination_path: null
+                    permission: '{{ permission }}'
+                    add_group_owner: '{{ add_group_owner }}'
+                devices:
+                  - path: null
+                    permission: null
+                    add_group_owner: null
+      - name: tags
         value: {}
-
 ```
 </TabItem>
 </Tabs>
@@ -422,7 +421,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Arn>';
+AND Identifier = '{{ arn }}';
 ```
 
 
@@ -431,7 +430,7 @@ AND Identifier = '<Arn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.greengrassv2.component_versions
-WHERE Identifier = '<Arn>'
+WHERE Identifier = '{{ arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/greengrassv2/deployments/index.md b/website/docs/services/greengrassv2/deployments/index.md
index 757139bbd..3917f4c51 100644
--- a/website/docs/services/greengrassv2/deployments/index.md
+++ b/website/docs/services/greengrassv2/deployments/index.md
@@ -294,7 +294,7 @@ iot_job_configuration,
 deployment_policies,
 tags
 FROM awscc.greengrassv2.deployments
-WHERE region = 'us-east-1' AND Identifier = '<DeploymentId>';
+WHERE region = 'us-east-1' AND Identifier = '{{ deployment_id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -330,8 +330,8 @@ INSERT INTO awscc.greengrassv2.deployments (
  TargetArn,
  region
 )
-SELECT 
-'{{ TargetArn }}',
+SELECT
+'{{ target_arn }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -349,14 +349,14 @@ INSERT INTO awscc.greengrassv2.deployments (
  Tags,
  region
 )
-SELECT 
- '{{ TargetArn }}',
- '{{ ParentTargetArn }}',
- '{{ DeploymentName }}',
- '{{ Components }}',
- '{{ IotJobConfiguration }}',
- '{{ DeploymentPolicies }}',
- '{{ Tags }}',
+SELECT
+ '{{ target_arn }}',
+ '{{ parent_target_arn }}',
+ '{{ deployment_name }}',
+ '{{ components }}',
+ '{{ iot_job_configuration }}',
+ '{{ deployment_policies }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -374,41 +374,40 @@ globals:
 resources:
   - name: deployment
     props:
-      - name: TargetArn
-        value: '{{ TargetArn }}'
-      - name: ParentTargetArn
-        value: '{{ ParentTargetArn }}'
-      - name: DeploymentName
-        value: '{{ DeploymentName }}'
-      - name: Components
+      - name: target_arn
+        value: '{{ target_arn }}'
+      - name: parent_target_arn
+        value: '{{ parent_target_arn }}'
+      - name: deployment_name
+        value: '{{ deployment_name }}'
+      - name: components
         value: {}
-      - name: IotJobConfiguration
+      - name: iot_job_configuration
         value:
-          JobExecutionsRolloutConfig:
-            ExponentialRate:
-              BaseRatePerMinute: '{{ BaseRatePerMinute }}'
-              IncrementFactor: null
-              RateIncreaseCriteria: {}
-            MaximumPerMinute: '{{ MaximumPerMinute }}'
-          AbortConfig:
-            CriteriaList:
-              - FailureType: '{{ FailureType }}'
-                Action: '{{ Action }}'
-                ThresholdPercentage: null
-                MinNumberOfExecutedThings: '{{ MinNumberOfExecutedThings }}'
-          TimeoutConfig:
-            InProgressTimeoutInMinutes: '{{ InProgressTimeoutInMinutes }}'
-      - name: DeploymentPolicies
+          job_executions_rollout_config:
+            exponential_rate:
+              base_rate_per_minute: '{{ base_rate_per_minute }}'
+              increment_factor: null
+              rate_increase_criteria: {}
+            maximum_per_minute: '{{ maximum_per_minute }}'
+          abort_config:
+            criteria_list:
+              - failure_type: '{{ failure_type }}'
+                action: '{{ action }}'
+                threshold_percentage: null
+                min_number_of_executed_things: '{{ min_number_of_executed_things }}'
+          timeout_config:
+            in_progress_timeout_in_minutes: '{{ in_progress_timeout_in_minutes }}'
+      - name: deployment_policies
         value:
-          FailureHandlingPolicy: '{{ FailureHandlingPolicy }}'
-          ComponentUpdatePolicy:
-            TimeoutInSeconds: '{{ TimeoutInSeconds }}'
-            Action: '{{ Action }}'
-          ConfigurationValidationPolicy:
-            TimeoutInSeconds: '{{ TimeoutInSeconds }}'
-      - name: Tags
+          failure_handling_policy: '{{ failure_handling_policy }}'
+          component_update_policy:
+            timeout_in_seconds: '{{ timeout_in_seconds }}'
+            action: '{{ action }}'
+          configuration_validation_policy:
+            timeout_in_seconds: '{{ timeout_in_seconds }}'
+      - name: tags
         value: {}
-
 ```
 </TabItem>
 </Tabs>
@@ -424,7 +423,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<DeploymentId>';
+AND Identifier = '{{ deployment_id }}';
 ```
 
 
@@ -433,7 +432,7 @@ AND Identifier = '<DeploymentId>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.greengrassv2.deployments
-WHERE Identifier = '<DeploymentId>'
+WHERE Identifier = '{{ deployment_id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/groundstation/configs/index.md b/website/docs/services/groundstation/configs/index.md
index 24f5ee270..2a23a27ee 100644
--- a/website/docs/services/groundstation/configs/index.md
+++ b/website/docs/services/groundstation/configs/index.md
@@ -374,7 +374,7 @@ config_data,
 arn,
 id
 FROM awscc.groundstation.configs
-WHERE region = 'us-east-1' AND Identifier = '<Arn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -411,9 +411,9 @@ INSERT INTO awscc.groundstation.configs (
  ConfigData,
  region
 )
-SELECT 
-'{{ Name }}',
- '{{ ConfigData }}',
+SELECT
+'{{ name }}',
+ '{{ config_data }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -427,10 +427,10 @@ INSERT INTO awscc.groundstation.configs (
  ConfigData,
  region
 )
-SELECT 
- '{{ Name }}',
- '{{ Tags }}',
- '{{ ConfigData }}',
+SELECT
+ '{{ name }}',
+ '{{ tags }}',
+ '{{ config_data }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -448,50 +448,49 @@ globals:
 resources:
   - name: config
     props:
-      - name: Name
-        value: '{{ Name }}'
-      - name: Tags
+      - name: name
+        value: '{{ name }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-      - name: ConfigData
+          - key: '{{ key }}'
+            value: '{{ value }}'
+      - name: config_data
         value:
-          AntennaDownlinkConfig:
-            SpectrumConfig:
-              CenterFrequency:
-                Value: null
-                Units: '{{ Units }}'
-              Bandwidth:
-                Value: null
-                Units: '{{ Units }}'
-              Polarization: '{{ Polarization }}'
-          TrackingConfig:
-            Autotrack: '{{ Autotrack }}'
-          DataflowEndpointConfig:
-            DataflowEndpointName: '{{ DataflowEndpointName }}'
-            DataflowEndpointRegion: '{{ DataflowEndpointRegion }}'
-          AntennaDownlinkDemodDecodeConfig:
-            SpectrumConfig: null
-            DemodulationConfig:
-              UnvalidatedJSON: '{{ UnvalidatedJSON }}'
-            DecodeConfig:
-              UnvalidatedJSON: null
-          AntennaUplinkConfig:
-            SpectrumConfig:
-              CenterFrequency: null
-              Polarization: null
-            TargetEirp:
-              Value: null
-              Units: '{{ Units }}'
-            TransmitDisabled: '{{ TransmitDisabled }}'
-          UplinkEchoConfig:
-            Enabled: '{{ Enabled }}'
-            AntennaUplinkConfigArn: '{{ AntennaUplinkConfigArn }}'
-          S3RecordingConfig:
-            BucketArn: '{{ BucketArn }}'
-            RoleArn: '{{ RoleArn }}'
-            Prefix: '{{ Prefix }}'
-
+          antenna_downlink_config:
+            spectrum_config:
+              center_frequency:
+                value: null
+                units: '{{ units }}'
+              bandwidth:
+                value: null
+                units: '{{ units }}'
+              polarization: '{{ polarization }}'
+          tracking_config:
+            autotrack: '{{ autotrack }}'
+          dataflow_endpoint_config:
+            dataflow_endpoint_name: '{{ dataflow_endpoint_name }}'
+            dataflow_endpoint_region: '{{ dataflow_endpoint_region }}'
+          antenna_downlink_demod_decode_config:
+            spectrum_config: null
+            demodulation_config:
+              unvalidated_js_on: '{{ unvalidated_js_on }}'
+            decode_config:
+              unvalidated_js_on: null
+          antenna_uplink_config:
+            spectrum_config:
+              center_frequency: null
+              polarization: null
+            target_eirp:
+              value: null
+              units: '{{ units }}'
+            transmit_disabled: '{{ transmit_disabled }}'
+          uplink_echo_config:
+            enabled: '{{ enabled }}'
+            antenna_uplink_config_arn: '{{ antenna_uplink_config_arn }}'
+          s3_recording_config:
+            bucket_arn: '{{ bucket_arn }}'
+            role_arn: '{{ role_arn }}'
+            prefix: '{{ prefix }}'
 ```
 </TabItem>
 </Tabs>
@@ -509,7 +508,7 @@ SET PatchDocument = string('{{ {
     "ConfigData": config_data
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Arn>';
+AND Identifier = '{{ arn }}';
 ```
 
 
@@ -518,7 +517,7 @@ AND Identifier = '<Arn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.groundstation.configs
-WHERE Identifier = '<Arn>'
+WHERE Identifier = '{{ arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/groundstation/dataflow_endpoint_groups/index.md b/website/docs/services/groundstation/dataflow_endpoint_groups/index.md
index 054517f0e..fc6b5da7d 100644
--- a/website/docs/services/groundstation/dataflow_endpoint_groups/index.md
+++ b/website/docs/services/groundstation/dataflow_endpoint_groups/index.md
@@ -290,7 +290,7 @@ contact_pre_pass_duration_seconds,
 contact_post_pass_duration_seconds,
 tags
 FROM awscc.groundstation.dataflow_endpoint_groups
-WHERE region = 'us-east-1' AND Identifier = '<Id>';
+WHERE region = 'us-east-1' AND Identifier = '{{ id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -326,8 +326,8 @@ INSERT INTO awscc.groundstation.dataflow_endpoint_groups (
  EndpointDetails,
  region
 )
-SELECT 
-'{{ EndpointDetails }}',
+SELECT
+'{{ endpoint_details }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -342,11 +342,11 @@ INSERT INTO awscc.groundstation.dataflow_endpoint_groups (
  Tags,
  region
 )
-SELECT 
- '{{ EndpointDetails }}',
- '{{ ContactPrePassDurationSeconds }}',
- '{{ ContactPostPassDurationSeconds }}',
- '{{ Tags }}',
+SELECT
+ '{{ endpoint_details }}',
+ '{{ contact_pre_pass_duration_seconds }}',
+ '{{ contact_post_pass_duration_seconds }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -364,43 +364,42 @@ globals:
 resources:
   - name: dataflow_endpoint_group
     props:
-      - name: EndpointDetails
+      - name: endpoint_details
         value:
-          - SecurityDetails:
-              SubnetIds:
-                - '{{ SubnetIds[0] }}'
-              SecurityGroupIds:
-                - '{{ SecurityGroupIds[0] }}'
-              RoleArn: '{{ RoleArn }}'
-            Endpoint:
-              Name: '{{ Name }}'
-              Address:
-                Name: '{{ Name }}'
-                Port: '{{ Port }}'
-              Mtu: '{{ Mtu }}'
-            AwsGroundStationAgentEndpoint:
-              Name: '{{ Name }}'
-              EgressAddress:
-                SocketAddress: null
-                Mtu: '{{ Mtu }}'
-              IngressAddress:
-                SocketAddress:
-                  Name: '{{ Name }}'
-                  PortRange:
-                    Minimum: '{{ Minimum }}'
-                    Maximum: '{{ Maximum }}'
-                Mtu: '{{ Mtu }}'
-              AgentStatus: '{{ AgentStatus }}'
-              AuditResults: '{{ AuditResults }}'
-      - name: ContactPrePassDurationSeconds
-        value: '{{ ContactPrePassDurationSeconds }}'
-      - name: ContactPostPassDurationSeconds
-        value: '{{ ContactPostPassDurationSeconds }}'
-      - name: Tags
+          - security_details:
+              subnet_ids:
+                - '{{ subnet_ids[0] }}'
+              security_group_ids:
+                - '{{ security_group_ids[0] }}'
+              role_arn: '{{ role_arn }}'
+            endpoint:
+              name: '{{ name }}'
+              address:
+                name: '{{ name }}'
+                port: '{{ port }}'
+              mtu: '{{ mtu }}'
+            aws_ground_station_agent_endpoint:
+              name: '{{ name }}'
+              egress_address:
+                socket_address: null
+                mtu: '{{ mtu }}'
+              ingress_address:
+                socket_address:
+                  name: '{{ name }}'
+                  port_range:
+                    minimum: '{{ minimum }}'
+                    maximum: '{{ maximum }}'
+                mtu: '{{ mtu }}'
+              agent_status: '{{ agent_status }}'
+              audit_results: '{{ audit_results }}'
+      - name: contact_pre_pass_duration_seconds
+        value: '{{ contact_pre_pass_duration_seconds }}'
+      - name: contact_post_pass_duration_seconds
+        value: '{{ contact_post_pass_duration_seconds }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -416,7 +415,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Id>';
+AND Identifier = '{{ id }}';
 ```
 
 
@@ -425,7 +424,7 @@ AND Identifier = '<Id>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.groundstation.dataflow_endpoint_groups
-WHERE Identifier = '<Id>'
+WHERE Identifier = '{{ id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/groundstation/mission_profiles/index.md b/website/docs/services/groundstation/mission_profiles/index.md
index d2aa283c8..5cca90065 100644
--- a/website/docs/services/groundstation/mission_profiles/index.md
+++ b/website/docs/services/groundstation/mission_profiles/index.md
@@ -251,7 +251,7 @@ id,
 arn,
 region
 FROM awscc.groundstation.mission_profiles
-WHERE region = 'us-east-1' AND Identifier = '<Id>|<Arn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ id }}|{{ arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -291,11 +291,11 @@ INSERT INTO awscc.groundstation.mission_profiles (
  TrackingConfigArn,
  region
 )
-SELECT 
-'{{ Name }}',
- '{{ MinimumViableContactDurationSeconds }}',
- '{{ DataflowEdges }}',
- '{{ TrackingConfigArn }}',
+SELECT
+'{{ name }}',
+ '{{ minimum_viable_contact_duration_seconds }}',
+ '{{ dataflow_edges }}',
+ '{{ tracking_config_arn }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -315,16 +315,16 @@ INSERT INTO awscc.groundstation.mission_profiles (
  Tags,
  region
 )
-SELECT 
- '{{ Name }}',
- '{{ ContactPrePassDurationSeconds }}',
- '{{ ContactPostPassDurationSeconds }}',
- '{{ MinimumViableContactDurationSeconds }}',
- '{{ StreamsKmsKey }}',
- '{{ StreamsKmsRole }}',
- '{{ DataflowEdges }}',
- '{{ TrackingConfigArn }}',
- '{{ Tags }}',
+SELECT
+ '{{ name }}',
+ '{{ contact_pre_pass_duration_seconds }}',
+ '{{ contact_post_pass_duration_seconds }}',
+ '{{ minimum_viable_contact_duration_seconds }}',
+ '{{ streams_kms_key }}',
+ '{{ streams_kms_role }}',
+ '{{ dataflow_edges }}',
+ '{{ tracking_config_arn }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -342,32 +342,31 @@ globals:
 resources:
   - name: mission_profile
     props:
-      - name: Name
-        value: '{{ Name }}'
-      - name: ContactPrePassDurationSeconds
-        value: '{{ ContactPrePassDurationSeconds }}'
-      - name: ContactPostPassDurationSeconds
-        value: '{{ ContactPostPassDurationSeconds }}'
-      - name: MinimumViableContactDurationSeconds
-        value: '{{ MinimumViableContactDurationSeconds }}'
-      - name: StreamsKmsKey
+      - name: name
+        value: '{{ name }}'
+      - name: contact_pre_pass_duration_seconds
+        value: '{{ contact_pre_pass_duration_seconds }}'
+      - name: contact_post_pass_duration_seconds
+        value: '{{ contact_post_pass_duration_seconds }}'
+      - name: minimum_viable_contact_duration_seconds
+        value: '{{ minimum_viable_contact_duration_seconds }}'
+      - name: streams_kms_key
         value:
-          KmsKeyArn: '{{ KmsKeyArn }}'
-          KmsAliasArn: '{{ KmsAliasArn }}'
-          KmsAliasName: '{{ KmsAliasName }}'
-      - name: StreamsKmsRole
-        value: '{{ StreamsKmsRole }}'
-      - name: DataflowEdges
+          kms_key_arn: '{{ kms_key_arn }}'
+          kms_alias_arn: '{{ kms_alias_arn }}'
+          kms_alias_name: '{{ kms_alias_name }}'
+      - name: streams_kms_role
+        value: '{{ streams_kms_role }}'
+      - name: dataflow_edges
         value:
-          - Source: '{{ Source }}'
-            Destination: '{{ Destination }}'
-      - name: TrackingConfigArn
-        value: '{{ TrackingConfigArn }}'
-      - name: Tags
+          - source: '{{ source }}'
+            destination: '{{ destination }}'
+      - name: tracking_config_arn
+        value: '{{ tracking_config_arn }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -391,7 +390,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Id>|<Arn>';
+AND Identifier = '{{ id }}|{{ arn }}';
 ```
 
 
@@ -400,7 +399,7 @@ AND Identifier = '<Id>|<Arn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.groundstation.mission_profiles
-WHERE Identifier = '<Id|Arn>'
+WHERE Identifier = '{{ id }}|{{ arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/guardduty/detectors/index.md b/website/docs/services/guardduty/detectors/index.md
index fed8e41ad..277de42c6 100644
--- a/website/docs/services/guardduty/detectors/index.md
+++ b/website/docs/services/guardduty/detectors/index.md
@@ -257,7 +257,7 @@ features,
 id,
 tags
 FROM awscc.guardduty.detectors
-WHERE region = 'us-east-1' AND Identifier = '<Id>';
+WHERE region = 'us-east-1' AND Identifier = '{{ id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -293,8 +293,8 @@ INSERT INTO awscc.guardduty.detectors (
  Enable,
  region
 )
-SELECT 
-'{{ Enable }}',
+SELECT
+'{{ enable }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -310,12 +310,12 @@ INSERT INTO awscc.guardduty.detectors (
  Tags,
  region
 )
-SELECT 
- '{{ FindingPublishingFrequency }}',
- '{{ Enable }}',
- '{{ DataSources }}',
- '{{ Features }}',
- '{{ Tags }}',
+SELECT
+ '{{ finding_publishing_frequency }}',
+ '{{ enable }}',
+ '{{ data_sources }}',
+ '{{ features }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -333,32 +333,31 @@ globals:
 resources:
   - name: detector
     props:
-      - name: FindingPublishingFrequency
-        value: '{{ FindingPublishingFrequency }}'
-      - name: Enable
-        value: '{{ Enable }}'
-      - name: DataSources
+      - name: finding_publishing_frequency
+        value: '{{ finding_publishing_frequency }}'
+      - name: enable
+        value: '{{ enable }}'
+      - name: data_sources
         value:
-          S3Logs:
-            Enable: '{{ Enable }}'
-          Kubernetes:
-            AuditLogs:
-              Enable: '{{ Enable }}'
-          MalwareProtection:
-            ScanEc2InstanceWithFindings:
-              EbsVolumes: '{{ EbsVolumes }}'
-      - name: Features
+          s3_logs:
+            enable: '{{ enable }}'
+          kubernetes:
+            audit_logs:
+              enable: '{{ enable }}'
+          malware_protection:
+            scan_ec2_instance_with_findings:
+              ebs_volumes: '{{ ebs_volumes }}'
+      - name: features
         value:
-          - Name: '{{ Name }}'
-            Status: '{{ Status }}'
-            AdditionalConfiguration:
-              - Name: '{{ Name }}'
-                Status: '{{ Status }}'
-      - name: Tags
+          - name: '{{ name }}'
+            status: '{{ status }}'
+            additional_configuration:
+              - name: '{{ name }}'
+                status: '{{ status }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -378,7 +377,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Id>';
+AND Identifier = '{{ id }}';
 ```
 
 
@@ -387,7 +386,7 @@ AND Identifier = '<Id>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.guardduty.detectors
-WHERE Identifier = '<Id>'
+WHERE Identifier = '{{ id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/guardduty/filters/index.md b/website/docs/services/guardduty/filters/index.md
index 37ce203d1..df2cac784 100644
--- a/website/docs/services/guardduty/filters/index.md
+++ b/website/docs/services/guardduty/filters/index.md
@@ -194,7 +194,7 @@ rank,
 name,
 tags
 FROM awscc.guardduty.filters
-WHERE region = 'us-east-1' AND Identifier = '<DetectorId>|<Name>';
+WHERE region = 'us-east-1' AND Identifier = '{{ detector_id }}|{{ name }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -233,10 +233,10 @@ INSERT INTO awscc.guardduty.filters (
  Name,
  region
 )
-SELECT 
-'{{ DetectorId }}',
- '{{ FindingCriteria }}',
- '{{ Name }}',
+SELECT
+'{{ detector_id }}',
+ '{{ finding_criteria }}',
+ '{{ name }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -254,14 +254,14 @@ INSERT INTO awscc.guardduty.filters (
  Tags,
  region
 )
-SELECT 
- '{{ Action }}',
- '{{ Description }}',
- '{{ DetectorId }}',
- '{{ FindingCriteria }}',
- '{{ Rank }}',
- '{{ Name }}',
- '{{ Tags }}',
+SELECT
+ '{{ action }}',
+ '{{ description }}',
+ '{{ detector_id }}',
+ '{{ finding_criteria }}',
+ '{{ rank }}',
+ '{{ name }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -279,24 +279,23 @@ globals:
 resources:
   - name: filter
     props:
-      - name: Action
-        value: '{{ Action }}'
-      - name: Description
-        value: '{{ Description }}'
-      - name: DetectorId
-        value: '{{ DetectorId }}'
-      - name: FindingCriteria
+      - name: action
+        value: '{{ action }}'
+      - name: description
+        value: '{{ description }}'
+      - name: detector_id
+        value: '{{ detector_id }}'
+      - name: finding_criteria
         value:
-          Criterion: {}
-      - name: Rank
-        value: '{{ Rank }}'
-      - name: Name
-        value: '{{ Name }}'
-      - name: Tags
+          criterion: {}
+      - name: rank
+        value: '{{ rank }}'
+      - name: name
+        value: '{{ name }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -316,7 +315,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<DetectorId>|<Name>';
+AND Identifier = '{{ detector_id }}|{{ name }}';
 ```
 
 
@@ -325,7 +324,7 @@ AND Identifier = '<DetectorId>|<Name>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.guardduty.filters
-WHERE Identifier = '<DetectorId|Name>'
+WHERE Identifier = '{{ detector_id }}|{{ name }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/guardduty/ip_sets/index.md b/website/docs/services/guardduty/ip_sets/index.md
index 4da713e17..ae6ad6699 100644
--- a/website/docs/services/guardduty/ip_sets/index.md
+++ b/website/docs/services/guardduty/ip_sets/index.md
@@ -193,7 +193,7 @@ location,
 expected_bucket_owner,
 tags
 FROM awscc.guardduty.ip_sets
-WHERE region = 'us-east-1' AND Identifier = '<Id>|<DetectorId>';
+WHERE region = 'us-east-1' AND Identifier = '{{ id }}|{{ detector_id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -231,9 +231,9 @@ INSERT INTO awscc.guardduty.ip_sets (
  Location,
  region
 )
-SELECT 
-'{{ Format }}',
- '{{ Location }}',
+SELECT
+'{{ format }}',
+ '{{ location }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -251,14 +251,14 @@ INSERT INTO awscc.guardduty.ip_sets (
  Tags,
  region
 )
-SELECT 
- '{{ Format }}',
- '{{ Activate }}',
- '{{ DetectorId }}',
- '{{ Name }}',
- '{{ Location }}',
- '{{ ExpectedBucketOwner }}',
- '{{ Tags }}',
+SELECT
+ '{{ format }}',
+ '{{ activate }}',
+ '{{ detector_id }}',
+ '{{ name }}',
+ '{{ location }}',
+ '{{ expected_bucket_owner }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -276,23 +276,22 @@ globals:
 resources:
   - name: ip_set
     props:
-      - name: Format
-        value: '{{ Format }}'
-      - name: Activate
-        value: '{{ Activate }}'
-      - name: DetectorId
-        value: '{{ DetectorId }}'
-      - name: Name
-        value: '{{ Name }}'
-      - name: Location
-        value: '{{ Location }}'
-      - name: ExpectedBucketOwner
-        value: '{{ ExpectedBucketOwner }}'
-      - name: Tags
+      - name: format
+        value: '{{ format }}'
+      - name: activate
+        value: '{{ activate }}'
+      - name: detector_id
+        value: '{{ detector_id }}'
+      - name: name
+        value: '{{ name }}'
+      - name: location
+        value: '{{ location }}'
+      - name: expected_bucket_owner
+        value: '{{ expected_bucket_owner }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -312,7 +311,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Id>|<DetectorId>';
+AND Identifier = '{{ id }}|{{ detector_id }}';
 ```
 
 
@@ -321,7 +320,7 @@ AND Identifier = '<Id>|<DetectorId>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.guardduty.ip_sets
-WHERE Identifier = '<Id|DetectorId>'
+WHERE Identifier = '{{ id }}|{{ detector_id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/guardduty/malware_protection_plans/index.md b/website/docs/services/guardduty/malware_protection_plans/index.md
index a65b42072..f7c6b65f1 100644
--- a/website/docs/services/guardduty/malware_protection_plans/index.md
+++ b/website/docs/services/guardduty/malware_protection_plans/index.md
@@ -239,7 +239,7 @@ status,
 status_reasons,
 tags
 FROM awscc.guardduty.malware_protection_plans
-WHERE region = 'us-east-1' AND Identifier = '<MalwareProtectionPlanId>';
+WHERE region = 'us-east-1' AND Identifier = '{{ malware_protection_plan_id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -276,9 +276,9 @@ INSERT INTO awscc.guardduty.malware_protection_plans (
  ProtectedResource,
  region
 )
-SELECT 
-'{{ Role }}',
- '{{ ProtectedResource }}',
+SELECT
+'{{ role }}',
+ '{{ protected_resource }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -293,11 +293,11 @@ INSERT INTO awscc.guardduty.malware_protection_plans (
  Tags,
  region
 )
-SELECT 
- '{{ Role }}',
- '{{ ProtectedResource }}',
- '{{ Actions }}',
- '{{ Tags }}',
+SELECT
+ '{{ role }}',
+ '{{ protected_resource }}',
+ '{{ actions }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -315,23 +315,22 @@ globals:
 resources:
   - name: malware_protection_plan
     props:
-      - name: Role
-        value: '{{ Role }}'
-      - name: ProtectedResource
+      - name: role
+        value: '{{ role }}'
+      - name: protected_resource
         value:
-          S3Bucket:
-            BucketName: '{{ BucketName }}'
-            ObjectPrefixes:
-              - '{{ ObjectPrefixes[0] }}'
-      - name: Actions
+          s3_bucket:
+            bucket_name: '{{ bucket_name }}'
+            object_prefixes:
+              - '{{ object_prefixes[0] }}'
+      - name: actions
         value:
-          Tagging:
-            Status: '{{ Status }}'
-      - name: Tags
+          tagging:
+            status: '{{ status }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -350,7 +349,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<MalwareProtectionPlanId>';
+AND Identifier = '{{ malware_protection_plan_id }}';
 ```
 
 
@@ -359,7 +358,7 @@ AND Identifier = '<MalwareProtectionPlanId>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.guardduty.malware_protection_plans
-WHERE Identifier = '<MalwareProtectionPlanId>'
+WHERE Identifier = '{{ malware_protection_plan_id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/guardduty/masters/index.md b/website/docs/services/guardduty/masters/index.md
index c0ea90571..c81022061 100644
--- a/website/docs/services/guardduty/masters/index.md
+++ b/website/docs/services/guardduty/masters/index.md
@@ -145,7 +145,7 @@ master_id,
 invitation_id,
 detector_id
 FROM awscc.guardduty.masters
-WHERE region = 'us-east-1' AND Identifier = '<DetectorId>|<MasterId>';
+WHERE region = 'us-east-1' AND Identifier = '{{ detector_id }}|{{ master_id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -183,9 +183,9 @@ INSERT INTO awscc.guardduty.masters (
  DetectorId,
  region
 )
-SELECT 
-'{{ MasterId }}',
- '{{ DetectorId }}',
+SELECT
+'{{ master_id }}',
+ '{{ detector_id }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -199,10 +199,10 @@ INSERT INTO awscc.guardduty.masters (
  DetectorId,
  region
 )
-SELECT 
- '{{ MasterId }}',
- '{{ InvitationId }}',
- '{{ DetectorId }}',
+SELECT
+ '{{ master_id }}',
+ '{{ invitation_id }}',
+ '{{ detector_id }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -220,13 +220,12 @@ globals:
 resources:
   - name: master
     props:
-      - name: MasterId
-        value: '{{ MasterId }}'
-      - name: InvitationId
-        value: '{{ InvitationId }}'
-      - name: DetectorId
-        value: '{{ DetectorId }}'
-
+      - name: master_id
+        value: '{{ master_id }}'
+      - name: invitation_id
+        value: '{{ invitation_id }}'
+      - name: detector_id
+        value: '{{ detector_id }}'
 ```
 </TabItem>
 </Tabs>
@@ -237,7 +236,7 @@ resources:
 ```sql
 /*+ delete */
 DELETE FROM awscc.guardduty.masters
-WHERE Identifier = '<DetectorId|MasterId>'
+WHERE Identifier = '{{ detector_id }}|{{ master_id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/guardduty/members/index.md b/website/docs/services/guardduty/members/index.md
index e507847b1..e94019c66 100644
--- a/website/docs/services/guardduty/members/index.md
+++ b/website/docs/services/guardduty/members/index.md
@@ -169,7 +169,7 @@ message,
 disable_email_notification,
 detector_id
 FROM awscc.guardduty.members
-WHERE region = 'us-east-1' AND Identifier = '<DetectorId>|<MemberId>';
+WHERE region = 'us-east-1' AND Identifier = '{{ detector_id }}|{{ member_id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -206,8 +206,8 @@ INSERT INTO awscc.guardduty.members (
  Email,
  region
 )
-SELECT 
-'{{ Email }}',
+SELECT
+'{{ email }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -224,13 +224,13 @@ INSERT INTO awscc.guardduty.members (
  DetectorId,
  region
 )
-SELECT 
- '{{ Status }}',
- '{{ MemberId }}',
- '{{ Email }}',
- '{{ Message }}',
- '{{ DisableEmailNotification }}',
- '{{ DetectorId }}',
+SELECT
+ '{{ status }}',
+ '{{ member_id }}',
+ '{{ email }}',
+ '{{ message }}',
+ '{{ disable_email_notification }}',
+ '{{ detector_id }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -248,19 +248,18 @@ globals:
 resources:
   - name: member
     props:
-      - name: Status
-        value: '{{ Status }}'
-      - name: MemberId
-        value: '{{ MemberId }}'
-      - name: Email
-        value: '{{ Email }}'
-      - name: Message
-        value: '{{ Message }}'
-      - name: DisableEmailNotification
-        value: '{{ DisableEmailNotification }}'
-      - name: DetectorId
-        value: '{{ DetectorId }}'
-
+      - name: status
+        value: '{{ status }}'
+      - name: member_id
+        value: '{{ member_id }}'
+      - name: email
+        value: '{{ email }}'
+      - name: message
+        value: '{{ message }}'
+      - name: disable_email_notification
+        value: '{{ disable_email_notification }}'
+      - name: detector_id
+        value: '{{ detector_id }}'
 ```
 </TabItem>
 </Tabs>
@@ -279,7 +278,7 @@ SET PatchDocument = string('{{ {
     "DisableEmailNotification": disable_email_notification
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<DetectorId>|<MemberId>';
+AND Identifier = '{{ detector_id }}|{{ member_id }}';
 ```
 
 
@@ -288,7 +287,7 @@ AND Identifier = '<DetectorId>|<MemberId>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.guardduty.members
-WHERE Identifier = '<DetectorId|MemberId>'
+WHERE Identifier = '{{ detector_id }}|{{ member_id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/guardduty/publishing_destinations/index.md b/website/docs/services/guardduty/publishing_destinations/index.md
index f85730b8c..4a00f7d16 100644
--- a/website/docs/services/guardduty/publishing_destinations/index.md
+++ b/website/docs/services/guardduty/publishing_destinations/index.md
@@ -199,7 +199,7 @@ status,
 publishing_failure_start_timestamp,
 tags
 FROM awscc.guardduty.publishing_destinations
-WHERE region = 'us-east-1' AND Identifier = '<DetectorId>|<Id>';
+WHERE region = 'us-east-1' AND Identifier = '{{ detector_id }}|{{ id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -238,10 +238,10 @@ INSERT INTO awscc.guardduty.publishing_destinations (
  DestinationProperties,
  region
 )
-SELECT 
-'{{ DetectorId }}',
- '{{ DestinationType }}',
- '{{ DestinationProperties }}',
+SELECT
+'{{ detector_id }}',
+ '{{ destination_type }}',
+ '{{ destination_properties }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -256,11 +256,11 @@ INSERT INTO awscc.guardduty.publishing_destinations (
  Tags,
  region
 )
-SELECT 
- '{{ DetectorId }}',
- '{{ DestinationType }}',
- '{{ DestinationProperties }}',
- '{{ Tags }}',
+SELECT
+ '{{ detector_id }}',
+ '{{ destination_type }}',
+ '{{ destination_properties }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -278,19 +278,18 @@ globals:
 resources:
   - name: publishing_destination
     props:
-      - name: DetectorId
-        value: '{{ DetectorId }}'
-      - name: DestinationType
-        value: '{{ DestinationType }}'
-      - name: DestinationProperties
+      - name: detector_id
+        value: '{{ detector_id }}'
+      - name: destination_type
+        value: '{{ destination_type }}'
+      - name: destination_properties
         value:
-          DestinationArn: '{{ DestinationArn }}'
-          KmsKeyArn: '{{ KmsKeyArn }}'
-      - name: Tags
+          destination_arn: '{{ destination_arn }}'
+          kms_key_arn: '{{ kms_key_arn }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -308,7 +307,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<DetectorId>|<Id>';
+AND Identifier = '{{ detector_id }}|{{ id }}';
 ```
 
 
@@ -317,7 +316,7 @@ AND Identifier = '<DetectorId>|<Id>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.guardduty.publishing_destinations
-WHERE Identifier = '<DetectorId|Id>'
+WHERE Identifier = '{{ detector_id }}|{{ id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/guardduty/threat_entity_sets/index.md b/website/docs/services/guardduty/threat_entity_sets/index.md
index 5d3f3c9ea..c3fc9df8c 100644
--- a/website/docs/services/guardduty/threat_entity_sets/index.md
+++ b/website/docs/services/guardduty/threat_entity_sets/index.md
@@ -217,7 +217,7 @@ location,
 expected_bucket_owner,
 tags
 FROM awscc.guardduty.threat_entity_sets
-WHERE region = 'us-east-1' AND Identifier = '<Id>|<DetectorId>';
+WHERE region = 'us-east-1' AND Identifier = '{{ id }}|{{ detector_id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -255,9 +255,9 @@ INSERT INTO awscc.guardduty.threat_entity_sets (
  Location,
  region
 )
-SELECT 
-'{{ Format }}',
- '{{ Location }}',
+SELECT
+'{{ format }}',
+ '{{ location }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -275,14 +275,14 @@ INSERT INTO awscc.guardduty.threat_entity_sets (
  Tags,
  region
 )
-SELECT 
- '{{ Format }}',
- '{{ Activate }}',
- '{{ DetectorId }}',
- '{{ Name }}',
- '{{ Location }}',
- '{{ ExpectedBucketOwner }}',
- '{{ Tags }}',
+SELECT
+ '{{ format }}',
+ '{{ activate }}',
+ '{{ detector_id }}',
+ '{{ name }}',
+ '{{ location }}',
+ '{{ expected_bucket_owner }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -300,23 +300,22 @@ globals:
 resources:
   - name: threat_entity_set
     props:
-      - name: Format
-        value: '{{ Format }}'
-      - name: Activate
-        value: '{{ Activate }}'
-      - name: DetectorId
-        value: '{{ DetectorId }}'
-      - name: Name
-        value: '{{ Name }}'
-      - name: Location
-        value: '{{ Location }}'
-      - name: ExpectedBucketOwner
-        value: '{{ ExpectedBucketOwner }}'
-      - name: Tags
+      - name: format
+        value: '{{ format }}'
+      - name: activate
+        value: '{{ activate }}'
+      - name: detector_id
+        value: '{{ detector_id }}'
+      - name: name
+        value: '{{ name }}'
+      - name: location
+        value: '{{ location }}'
+      - name: expected_bucket_owner
+        value: '{{ expected_bucket_owner }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -336,7 +335,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Id>|<DetectorId>';
+AND Identifier = '{{ id }}|{{ detector_id }}';
 ```
 
 
@@ -345,7 +344,7 @@ AND Identifier = '<Id>|<DetectorId>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.guardduty.threat_entity_sets
-WHERE Identifier = '<Id|DetectorId>'
+WHERE Identifier = '{{ id }}|{{ detector_id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/guardduty/threat_intel_sets/index.md b/website/docs/services/guardduty/threat_intel_sets/index.md
index 1c48c1605..544194624 100644
--- a/website/docs/services/guardduty/threat_intel_sets/index.md
+++ b/website/docs/services/guardduty/threat_intel_sets/index.md
@@ -193,7 +193,7 @@ location,
 expected_bucket_owner,
 tags
 FROM awscc.guardduty.threat_intel_sets
-WHERE region = 'us-east-1' AND Identifier = '<Id>|<DetectorId>';
+WHERE region = 'us-east-1' AND Identifier = '{{ id }}|{{ detector_id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -231,9 +231,9 @@ INSERT INTO awscc.guardduty.threat_intel_sets (
  Location,
  region
 )
-SELECT 
-'{{ Format }}',
- '{{ Location }}',
+SELECT
+'{{ format }}',
+ '{{ location }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -251,14 +251,14 @@ INSERT INTO awscc.guardduty.threat_intel_sets (
  Tags,
  region
 )
-SELECT 
- '{{ Format }}',
- '{{ Activate }}',
- '{{ DetectorId }}',
- '{{ Name }}',
- '{{ Location }}',
- '{{ ExpectedBucketOwner }}',
- '{{ Tags }}',
+SELECT
+ '{{ format }}',
+ '{{ activate }}',
+ '{{ detector_id }}',
+ '{{ name }}',
+ '{{ location }}',
+ '{{ expected_bucket_owner }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -276,23 +276,22 @@ globals:
 resources:
   - name: threat_intel_set
     props:
-      - name: Format
-        value: '{{ Format }}'
-      - name: Activate
-        value: '{{ Activate }}'
-      - name: DetectorId
-        value: '{{ DetectorId }}'
-      - name: Name
-        value: '{{ Name }}'
-      - name: Location
-        value: '{{ Location }}'
-      - name: ExpectedBucketOwner
-        value: '{{ ExpectedBucketOwner }}'
-      - name: Tags
+      - name: format
+        value: '{{ format }}'
+      - name: activate
+        value: '{{ activate }}'
+      - name: detector_id
+        value: '{{ detector_id }}'
+      - name: name
+        value: '{{ name }}'
+      - name: location
+        value: '{{ location }}'
+      - name: expected_bucket_owner
+        value: '{{ expected_bucket_owner }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -312,7 +311,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Id>|<DetectorId>';
+AND Identifier = '{{ id }}|{{ detector_id }}';
 ```
 
 
@@ -321,7 +320,7 @@ AND Identifier = '<Id>|<DetectorId>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.guardduty.threat_intel_sets
-WHERE Identifier = '<Id|DetectorId>'
+WHERE Identifier = '{{ id }}|{{ detector_id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/guardduty/trusted_entity_sets/index.md b/website/docs/services/guardduty/trusted_entity_sets/index.md
index 663faf94e..b5e71e8f8 100644
--- a/website/docs/services/guardduty/trusted_entity_sets/index.md
+++ b/website/docs/services/guardduty/trusted_entity_sets/index.md
@@ -217,7 +217,7 @@ location,
 expected_bucket_owner,
 tags
 FROM awscc.guardduty.trusted_entity_sets
-WHERE region = 'us-east-1' AND Identifier = '<Id>|<DetectorId>';
+WHERE region = 'us-east-1' AND Identifier = '{{ id }}|{{ detector_id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -255,9 +255,9 @@ INSERT INTO awscc.guardduty.trusted_entity_sets (
  Location,
  region
 )
-SELECT 
-'{{ Format }}',
- '{{ Location }}',
+SELECT
+'{{ format }}',
+ '{{ location }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -275,14 +275,14 @@ INSERT INTO awscc.guardduty.trusted_entity_sets (
  Tags,
  region
 )
-SELECT 
- '{{ Format }}',
- '{{ Activate }}',
- '{{ DetectorId }}',
- '{{ Name }}',
- '{{ Location }}',
- '{{ ExpectedBucketOwner }}',
- '{{ Tags }}',
+SELECT
+ '{{ format }}',
+ '{{ activate }}',
+ '{{ detector_id }}',
+ '{{ name }}',
+ '{{ location }}',
+ '{{ expected_bucket_owner }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -300,23 +300,22 @@ globals:
 resources:
   - name: trusted_entity_set
     props:
-      - name: Format
-        value: '{{ Format }}'
-      - name: Activate
-        value: '{{ Activate }}'
-      - name: DetectorId
-        value: '{{ DetectorId }}'
-      - name: Name
-        value: '{{ Name }}'
-      - name: Location
-        value: '{{ Location }}'
-      - name: ExpectedBucketOwner
-        value: '{{ ExpectedBucketOwner }}'
-      - name: Tags
+      - name: format
+        value: '{{ format }}'
+      - name: activate
+        value: '{{ activate }}'
+      - name: detector_id
+        value: '{{ detector_id }}'
+      - name: name
+        value: '{{ name }}'
+      - name: location
+        value: '{{ location }}'
+      - name: expected_bucket_owner
+        value: '{{ expected_bucket_owner }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -336,7 +335,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Id>|<DetectorId>';
+AND Identifier = '{{ id }}|{{ detector_id }}';
 ```
 
 
@@ -345,7 +344,7 @@ AND Identifier = '<Id>|<DetectorId>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.guardduty.trusted_entity_sets
-WHERE Identifier = '<Id|DetectorId>'
+WHERE Identifier = '{{ id }}|{{ detector_id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/healthimaging/datastores/index.md b/website/docs/services/healthimaging/datastores/index.md
index be8b8fa2f..e8a2d5b5d 100644
--- a/website/docs/services/healthimaging/datastores/index.md
+++ b/website/docs/services/healthimaging/datastores/index.md
@@ -170,7 +170,7 @@ created_at,
 updated_at,
 tags
 FROM awscc.healthimaging.datastores
-WHERE region = 'us-east-1' AND Identifier = '<DatastoreId>';
+WHERE region = 'us-east-1' AND Identifier = '{{ datastore_id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -206,7 +206,7 @@ INSERT INTO awscc.healthimaging.datastores (
  ,
  region
 )
-SELECT 
+SELECT
 '{{  }}',
 '{{ region }}';
 ```
@@ -221,10 +221,10 @@ INSERT INTO awscc.healthimaging.datastores (
  Tags,
  region
 )
-SELECT 
- '{{ DatastoreName }}',
- '{{ KmsKeyArn }}',
- '{{ Tags }}',
+SELECT
+ '{{ datastore_name }}',
+ '{{ kms_key_arn }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -242,13 +242,12 @@ globals:
 resources:
   - name: datastore
     props:
-      - name: DatastoreName
-        value: '{{ DatastoreName }}'
-      - name: KmsKeyArn
-        value: '{{ KmsKeyArn }}'
-      - name: Tags
+      - name: datastore_name
+        value: '{{ datastore_name }}'
+      - name: kms_key_arn
+        value: '{{ kms_key_arn }}'
+      - name: tags
         value: {}
-
 ```
 </TabItem>
 </Tabs>
@@ -259,7 +258,7 @@ resources:
 ```sql
 /*+ delete */
 DELETE FROM awscc.healthimaging.datastores
-WHERE Identifier = '<DatastoreId>'
+WHERE Identifier = '{{ datastore_id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/healthlake/fhir_datastores/index.md b/website/docs/services/healthlake/fhir_datastores/index.md
index 2481a33ba..452c31b7b 100644
--- a/website/docs/services/healthlake/fhir_datastores/index.md
+++ b/website/docs/services/healthlake/fhir_datastores/index.md
@@ -266,7 +266,7 @@ sse_configuration,
 identity_provider_configuration,
 tags
 FROM awscc.healthlake.fhir_datastores
-WHERE region = 'us-east-1' AND Identifier = '<DatastoreId>';
+WHERE region = 'us-east-1' AND Identifier = '{{ datastore_id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -302,8 +302,8 @@ INSERT INTO awscc.healthlake.fhir_datastores (
  DatastoreTypeVersion,
  region
 )
-SELECT 
-'{{ DatastoreTypeVersion }}',
+SELECT
+'{{ datastore_type_version }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -320,13 +320,13 @@ INSERT INTO awscc.healthlake.fhir_datastores (
  Tags,
  region
 )
-SELECT 
- '{{ DatastoreName }}',
- '{{ DatastoreTypeVersion }}',
- '{{ PreloadDataConfig }}',
- '{{ SseConfiguration }}',
- '{{ IdentityProviderConfiguration }}',
- '{{ Tags }}',
+SELECT
+ '{{ datastore_name }}',
+ '{{ datastore_type_version }}',
+ '{{ preload_data_config }}',
+ '{{ sse_configuration }}',
+ '{{ identity_provider_configuration }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -344,29 +344,28 @@ globals:
 resources:
   - name: fhir_datastore
     props:
-      - name: DatastoreName
-        value: '{{ DatastoreName }}'
-      - name: DatastoreTypeVersion
-        value: '{{ DatastoreTypeVersion }}'
-      - name: PreloadDataConfig
+      - name: datastore_name
+        value: '{{ datastore_name }}'
+      - name: datastore_type_version
+        value: '{{ datastore_type_version }}'
+      - name: preload_data_config
         value:
-          PreloadDataType: '{{ PreloadDataType }}'
-      - name: SseConfiguration
+          preload_data_type: '{{ preload_data_type }}'
+      - name: sse_configuration
         value:
-          KmsEncryptionConfig:
-            CmkType: '{{ CmkType }}'
-            KmsKeyId: '{{ KmsKeyId }}'
-      - name: IdentityProviderConfiguration
+          kms_encryption_config:
+            cmk_type: '{{ cmk_type }}'
+            kms_key_id: '{{ kms_key_id }}'
+      - name: identity_provider_configuration
         value:
-          AuthorizationStrategy: '{{ AuthorizationStrategy }}'
-          FineGrainedAuthorizationEnabled: '{{ FineGrainedAuthorizationEnabled }}'
-          Metadata: '{{ Metadata }}'
-          IdpLambdaArn: '{{ IdpLambdaArn }}'
-      - name: Tags
+          authorization_strategy: '{{ authorization_strategy }}'
+          fine_grained_authorization_enabled: '{{ fine_grained_authorization_enabled }}'
+          metadata: '{{ metadata }}'
+          idp_lambda_arn: '{{ idp_lambda_arn }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -382,7 +381,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<DatastoreId>';
+AND Identifier = '{{ datastore_id }}';
 ```
 
 
@@ -391,7 +390,7 @@ AND Identifier = '<DatastoreId>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.healthlake.fhir_datastores
-WHERE Identifier = '<DatastoreId>'
+WHERE Identifier = '{{ datastore_id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/iam/group_policies/index.md b/website/docs/services/iam/group_policies/index.md
index 6c8f1f38f..3776a8678 100644
--- a/website/docs/services/iam/group_policies/index.md
+++ b/website/docs/services/iam/group_policies/index.md
@@ -100,7 +100,7 @@ policy_document,
 policy_name,
 group_name
 FROM awscc.iam.group_policies
-WHERE Identifier = '<PolicyName>|<GroupName>';
+WHERE region = 'us-east-1' AND Identifier = '{{ policy_name }}|{{ group_name }}';
 ```
 
 ## `INSERT` example
@@ -124,9 +124,9 @@ INSERT INTO awscc.iam.group_policies (
  GroupName,
  region
 )
-SELECT 
-'{{ PolicyName }}',
- '{{ GroupName }}',
+SELECT
+'{{ policy_name }}',
+ '{{ group_name }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -140,10 +140,10 @@ INSERT INTO awscc.iam.group_policies (
  GroupName,
  region
 )
-SELECT 
- '{{ PolicyDocument }}',
- '{{ PolicyName }}',
- '{{ GroupName }}',
+SELECT
+ '{{ policy_document }}',
+ '{{ policy_name }}',
+ '{{ group_name }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -161,13 +161,12 @@ globals:
 resources:
   - name: group_policy
     props:
-      - name: PolicyDocument
+      - name: policy_document
         value: {}
-      - name: PolicyName
-        value: '{{ PolicyName }}'
-      - name: GroupName
-        value: '{{ GroupName }}'
-
+      - name: policy_name
+        value: '{{ policy_name }}'
+      - name: group_name
+        value: '{{ group_name }}'
 ```
 </TabItem>
 </Tabs>
@@ -183,7 +182,7 @@ SET PatchDocument = string('{{ {
     "PolicyDocument": policy_document
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<PolicyName>|<GroupName>';
+AND Identifier = '{{ policy_name }}|{{ group_name }}';
 ```
 
 
@@ -192,7 +191,7 @@ AND Identifier = '<PolicyName>|<GroupName>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.iam.group_policies
-WHERE Identifier = '<PolicyName|GroupName>'
+WHERE Identifier = '{{ policy_name }}|{{ group_name }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/iam/groups/index.md b/website/docs/services/iam/groups/index.md
index 86b2b3e97..ceaa35e80 100644
--- a/website/docs/services/iam/groups/index.md
+++ b/website/docs/services/iam/groups/index.md
@@ -170,7 +170,7 @@ managed_policy_arns,
 path,
 policies
 FROM awscc.iam.groups
-WHERE Identifier = '<GroupName>';
+WHERE region = 'us-east-1' AND Identifier = '{{ group_name }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -181,7 +181,7 @@ SELECT
 region,
 group_name
 FROM awscc.iam.groups_list_only
-;
+WHERE region = 'us-east-1';
 ```
 </TabItem>
 </Tabs>
@@ -209,11 +209,11 @@ INSERT INTO awscc.iam.groups (
  Policies,
  region
 )
-SELECT 
-'{{ GroupName }}',
- '{{ ManagedPolicyArns }}',
- '{{ Path }}',
- '{{ Policies }}',
+SELECT
+'{{ group_name }}',
+ '{{ managed_policy_arns }}',
+ '{{ path }}',
+ '{{ policies }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -228,11 +228,11 @@ INSERT INTO awscc.iam.groups (
  Policies,
  region
 )
-SELECT 
- '{{ GroupName }}',
- '{{ ManagedPolicyArns }}',
- '{{ Path }}',
- '{{ Policies }}',
+SELECT
+ '{{ group_name }}',
+ '{{ managed_policy_arns }}',
+ '{{ path }}',
+ '{{ policies }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -250,18 +250,17 @@ globals:
 resources:
   - name: group
     props:
-      - name: GroupName
-        value: '{{ GroupName }}'
-      - name: ManagedPolicyArns
+      - name: group_name
+        value: '{{ group_name }}'
+      - name: managed_policy_arns
         value:
-          - '{{ ManagedPolicyArns[0] }}'
-      - name: Path
-        value: '{{ Path }}'
-      - name: Policies
+          - '{{ managed_policy_arns[0] }}'
+      - name: path
+        value: '{{ path }}'
+      - name: policies
         value:
-          - PolicyDocument: {}
-            PolicyName: '{{ PolicyName }}'
-
+          - policy_document: {}
+            policy_name: '{{ policy_name }}'
 ```
 </TabItem>
 </Tabs>
@@ -279,7 +278,7 @@ SET PatchDocument = string('{{ {
     "Policies": policies
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<GroupName>';
+AND Identifier = '{{ group_name }}';
 ```
 
 
@@ -288,7 +287,7 @@ AND Identifier = '<GroupName>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.iam.groups
-WHERE Identifier = '<GroupName>'
+WHERE Identifier = '{{ group_name }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/iam/instance_profiles/index.md b/website/docs/services/iam/instance_profiles/index.md
index 96e98c5cd..f38adb13f 100644
--- a/website/docs/services/iam/instance_profiles/index.md
+++ b/website/docs/services/iam/instance_profiles/index.md
@@ -152,7 +152,7 @@ roles,
 instance_profile_name,
 arn
 FROM awscc.iam.instance_profiles
-WHERE Identifier = '<InstanceProfileName>';
+WHERE region = 'us-east-1' AND Identifier = '{{ instance_profile_name }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -163,7 +163,7 @@ SELECT
 region,
 instance_profile_name
 FROM awscc.iam.instance_profiles_list_only
-;
+WHERE region = 'us-east-1';
 ```
 </TabItem>
 </Tabs>
@@ -188,8 +188,8 @@ INSERT INTO awscc.iam.instance_profiles (
  Roles,
  region
 )
-SELECT 
-'{{ Roles }}',
+SELECT
+'{{ roles }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -203,10 +203,10 @@ INSERT INTO awscc.iam.instance_profiles (
  InstanceProfileName,
  region
 )
-SELECT 
- '{{ Path }}',
- '{{ Roles }}',
- '{{ InstanceProfileName }}',
+SELECT
+ '{{ path }}',
+ '{{ roles }}',
+ '{{ instance_profile_name }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -224,14 +224,13 @@ globals:
 resources:
   - name: instance_profile
     props:
-      - name: Path
-        value: '{{ Path }}'
-      - name: Roles
+      - name: path
+        value: '{{ path }}'
+      - name: roles
         value:
-          - '{{ Roles[0] }}'
-      - name: InstanceProfileName
-        value: '{{ InstanceProfileName }}'
-
+          - '{{ roles[0] }}'
+      - name: instance_profile_name
+        value: '{{ instance_profile_name }}'
 ```
 </TabItem>
 </Tabs>
@@ -247,7 +246,7 @@ SET PatchDocument = string('{{ {
     "Roles": roles
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<InstanceProfileName>';
+AND Identifier = '{{ instance_profile_name }}';
 ```
 
 
@@ -256,7 +255,7 @@ AND Identifier = '<InstanceProfileName>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.iam.instance_profiles
-WHERE Identifier = '<InstanceProfileName>'
+WHERE Identifier = '{{ instance_profile_name }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/iam/managed_policies/index.md b/website/docs/services/iam/managed_policies/index.md
index c9eb9df15..079b3fe83 100644
--- a/website/docs/services/iam/managed_policies/index.md
+++ b/website/docs/services/iam/managed_policies/index.md
@@ -218,7 +218,7 @@ is_attachable,
 permissions_boundary_usage_count,
 policy_id
 FROM awscc.iam.managed_policies
-WHERE Identifier = '<PolicyArn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ policy_arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -229,7 +229,7 @@ SELECT
 region,
 policy_arn
 FROM awscc.iam.managed_policies_list_only
-;
+WHERE region = 'us-east-1';
 ```
 </TabItem>
 </Tabs>
@@ -254,8 +254,8 @@ INSERT INTO awscc.iam.managed_policies (
  PolicyDocument,
  region
 )
-SELECT 
-'{{ PolicyDocument }}',
+SELECT
+'{{ policy_document }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -273,14 +273,14 @@ INSERT INTO awscc.iam.managed_policies (
  Users,
  region
 )
-SELECT 
- '{{ Description }}',
- '{{ Groups }}',
- '{{ ManagedPolicyName }}',
- '{{ Path }}',
- '{{ PolicyDocument }}',
- '{{ Roles }}',
- '{{ Users }}',
+SELECT
+ '{{ description }}',
+ '{{ groups }}',
+ '{{ managed_policy_name }}',
+ '{{ path }}',
+ '{{ policy_document }}',
+ '{{ roles }}',
+ '{{ users }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -298,24 +298,23 @@ globals:
 resources:
   - name: managed_policy
     props:
-      - name: Description
-        value: '{{ Description }}'
-      - name: Groups
+      - name: description
+        value: '{{ description }}'
+      - name: groups
         value:
-          - '{{ Groups[0] }}'
-      - name: ManagedPolicyName
-        value: '{{ ManagedPolicyName }}'
-      - name: Path
-        value: '{{ Path }}'
-      - name: PolicyDocument
+          - '{{ groups[0] }}'
+      - name: managed_policy_name
+        value: '{{ managed_policy_name }}'
+      - name: path
+        value: '{{ path }}'
+      - name: policy_document
         value: {}
-      - name: Roles
+      - name: roles
         value:
-          - '{{ Roles[0] }}'
-      - name: Users
+          - '{{ roles[0] }}'
+      - name: users
         value:
-          - '{{ Users[0] }}'
-
+          - '{{ users[0] }}'
 ```
 </TabItem>
 </Tabs>
@@ -334,7 +333,7 @@ SET PatchDocument = string('{{ {
     "Users": users
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<PolicyArn>';
+AND Identifier = '{{ policy_arn }}';
 ```
 
 
@@ -343,7 +342,7 @@ AND Identifier = '<PolicyArn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.iam.managed_policies
-WHERE Identifier = '<PolicyArn>'
+WHERE Identifier = '{{ policy_arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/iam/oidc_providers/index.md b/website/docs/services/iam/oidc_providers/index.md
index 1090c82b7..237129b50 100644
--- a/website/docs/services/iam/oidc_providers/index.md
+++ b/website/docs/services/iam/oidc_providers/index.md
@@ -170,7 +170,7 @@ thumbprint_list,
 arn,
 tags
 FROM awscc.iam.oidc_providers
-WHERE Identifier = '<Arn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -181,7 +181,7 @@ SELECT
 region,
 arn
 FROM awscc.iam.oidc_providers_list_only
-;
+WHERE region = 'us-east-1';
 ```
 </TabItem>
 </Tabs>
@@ -209,11 +209,11 @@ INSERT INTO awscc.iam.oidc_providers (
  Tags,
  region
 )
-SELECT 
-'{{ ClientIdList }}',
- '{{ Url }}',
- '{{ ThumbprintList }}',
- '{{ Tags }}',
+SELECT
+'{{ client_id_list }}',
+ '{{ url }}',
+ '{{ thumbprint_list }}',
+ '{{ tags }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -228,11 +228,11 @@ INSERT INTO awscc.iam.oidc_providers (
  Tags,
  region
 )
-SELECT 
- '{{ ClientIdList }}',
- '{{ Url }}',
- '{{ ThumbprintList }}',
- '{{ Tags }}',
+SELECT
+ '{{ client_id_list }}',
+ '{{ url }}',
+ '{{ thumbprint_list }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -250,19 +250,18 @@ globals:
 resources:
   - name: oidc_provider
     props:
-      - name: ClientIdList
+      - name: client_id_list
         value:
-          - '{{ ClientIdList[0] }}'
-      - name: Url
-        value: '{{ Url }}'
-      - name: ThumbprintList
+          - '{{ client_id_list[0] }}'
+      - name: url
+        value: '{{ url }}'
+      - name: thumbprint_list
         value:
-          - '{{ ThumbprintList[0] }}'
-      - name: Tags
+          - '{{ thumbprint_list[0] }}'
+      - name: tags
         value:
-          - Value: '{{ Value }}'
-            Key: '{{ Key }}'
-
+          - value: '{{ value }}'
+            key: '{{ key }}'
 ```
 </TabItem>
 </Tabs>
@@ -280,7 +279,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Arn>';
+AND Identifier = '{{ arn }}';
 ```
 
 
@@ -289,7 +288,7 @@ AND Identifier = '<Arn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.iam.oidc_providers
-WHERE Identifier = '<Arn>'
+WHERE Identifier = '{{ arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/iam/role_policies/index.md b/website/docs/services/iam/role_policies/index.md
index 3fb2ca73a..5e2d5d1fd 100644
--- a/website/docs/services/iam/role_policies/index.md
+++ b/website/docs/services/iam/role_policies/index.md
@@ -100,7 +100,7 @@ policy_document,
 policy_name,
 role_name
 FROM awscc.iam.role_policies
-WHERE Identifier = '<PolicyName>|<RoleName>';
+WHERE region = 'us-east-1' AND Identifier = '{{ policy_name }}|{{ role_name }}';
 ```
 
 ## `INSERT` example
@@ -124,9 +124,9 @@ INSERT INTO awscc.iam.role_policies (
  RoleName,
  region
 )
-SELECT 
-'{{ PolicyName }}',
- '{{ RoleName }}',
+SELECT
+'{{ policy_name }}',
+ '{{ role_name }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -140,10 +140,10 @@ INSERT INTO awscc.iam.role_policies (
  RoleName,
  region
 )
-SELECT 
- '{{ PolicyDocument }}',
- '{{ PolicyName }}',
- '{{ RoleName }}',
+SELECT
+ '{{ policy_document }}',
+ '{{ policy_name }}',
+ '{{ role_name }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -161,13 +161,12 @@ globals:
 resources:
   - name: role_policy
     props:
-      - name: PolicyDocument
+      - name: policy_document
         value: {}
-      - name: PolicyName
-        value: '{{ PolicyName }}'
-      - name: RoleName
-        value: '{{ RoleName }}'
-
+      - name: policy_name
+        value: '{{ policy_name }}'
+      - name: role_name
+        value: '{{ role_name }}'
 ```
 </TabItem>
 </Tabs>
@@ -183,7 +182,7 @@ SET PatchDocument = string('{{ {
     "PolicyDocument": policy_document
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<PolicyName>|<RoleName>';
+AND Identifier = '{{ policy_name }}|{{ role_name }}';
 ```
 
 
@@ -192,7 +191,7 @@ AND Identifier = '<PolicyName>|<RoleName>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.iam.role_policies
-WHERE Identifier = '<PolicyName|RoleName>'
+WHERE Identifier = '{{ policy_name }}|{{ role_name }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/iam/roles/index.md b/website/docs/services/iam/roles/index.md
index 3dd3d102d..867a2b1ea 100644
--- a/website/docs/services/iam/roles/index.md
+++ b/website/docs/services/iam/roles/index.md
@@ -218,7 +218,7 @@ role_id,
 role_name,
 tags
 FROM awscc.iam.roles
-WHERE Identifier = '<RoleName>';
+WHERE region = 'us-east-1' AND Identifier = '{{ role_name }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -229,7 +229,7 @@ SELECT
 region,
 role_name
 FROM awscc.iam.roles_list_only
-;
+WHERE region = 'us-east-1';
 ```
 </TabItem>
 </Tabs>
@@ -254,8 +254,8 @@ INSERT INTO awscc.iam.roles (
  AssumeRolePolicyDocument,
  region
 )
-SELECT 
-'{{ AssumeRolePolicyDocument }}',
+SELECT
+'{{ assume_role_policy_document }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -275,16 +275,16 @@ INSERT INTO awscc.iam.roles (
  Tags,
  region
 )
-SELECT 
- '{{ AssumeRolePolicyDocument }}',
- '{{ Description }}',
- '{{ ManagedPolicyArns }}',
- '{{ MaxSessionDuration }}',
- '{{ Path }}',
- '{{ PermissionsBoundary }}',
- '{{ Policies }}',
- '{{ RoleName }}',
- '{{ Tags }}',
+SELECT
+ '{{ assume_role_policy_document }}',
+ '{{ description }}',
+ '{{ managed_policy_arns }}',
+ '{{ max_session_duration }}',
+ '{{ path }}',
+ '{{ permissions_boundary }}',
+ '{{ policies }}',
+ '{{ role_name }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -302,30 +302,29 @@ globals:
 resources:
   - name: role
     props:
-      - name: AssumeRolePolicyDocument
+      - name: assume_role_policy_document
         value: {}
-      - name: Description
-        value: '{{ Description }}'
-      - name: ManagedPolicyArns
+      - name: description
+        value: '{{ description }}'
+      - name: managed_policy_arns
         value:
-          - '{{ ManagedPolicyArns[0] }}'
-      - name: MaxSessionDuration
-        value: '{{ MaxSessionDuration }}'
-      - name: Path
-        value: '{{ Path }}'
-      - name: PermissionsBoundary
-        value: '{{ PermissionsBoundary }}'
-      - name: Policies
+          - '{{ managed_policy_arns[0] }}'
+      - name: max_session_duration
+        value: '{{ max_session_duration }}'
+      - name: path
+        value: '{{ path }}'
+      - name: permissions_boundary
+        value: '{{ permissions_boundary }}'
+      - name: policies
         value:
-          - PolicyDocument: {}
-            PolicyName: '{{ PolicyName }}'
-      - name: RoleName
-        value: '{{ RoleName }}'
-      - name: Tags
+          - policy_document: {}
+            policy_name: '{{ policy_name }}'
+      - name: role_name
+        value: '{{ role_name }}'
+      - name: tags
         value:
-          - Value: '{{ Value }}'
-            Key: '{{ Key }}'
-
+          - value: '{{ value }}'
+            key: '{{ key }}'
 ```
 </TabItem>
 </Tabs>
@@ -347,7 +346,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<RoleName>';
+AND Identifier = '{{ role_name }}';
 ```
 
 
@@ -356,7 +355,7 @@ AND Identifier = '<RoleName>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.iam.roles
-WHERE Identifier = '<RoleName>'
+WHERE Identifier = '{{ role_name }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/iam/saml_providers/index.md b/website/docs/services/iam/saml_providers/index.md
index df1d41678..387f073e0 100644
--- a/website/docs/services/iam/saml_providers/index.md
+++ b/website/docs/services/iam/saml_providers/index.md
@@ -206,7 +206,7 @@ remove_private_key,
 private_key_list,
 saml_provider_uu_id
 FROM awscc.iam.saml_providers
-WHERE Identifier = '<Arn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -217,7 +217,7 @@ SELECT
 region,
 arn
 FROM awscc.iam.saml_providers_list_only
-;
+WHERE region = 'us-east-1';
 ```
 </TabItem>
 </Tabs>
@@ -248,14 +248,14 @@ INSERT INTO awscc.iam.saml_providers (
  PrivateKeyList,
  region
 )
-SELECT 
-'{{ Name }}',
- '{{ SamlMetadataDocument }}',
- '{{ Tags }}',
- '{{ AssertionEncryptionMode }}',
- '{{ AddPrivateKey }}',
- '{{ RemovePrivateKey }}',
- '{{ PrivateKeyList }}',
+SELECT
+'{{ name }}',
+ '{{ saml_metadata_document }}',
+ '{{ tags }}',
+ '{{ assertion_encryption_mode }}',
+ '{{ add_private_key }}',
+ '{{ remove_private_key }}',
+ '{{ private_key_list }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -273,14 +273,14 @@ INSERT INTO awscc.iam.saml_providers (
  PrivateKeyList,
  region
 )
-SELECT 
- '{{ Name }}',
- '{{ SamlMetadataDocument }}',
- '{{ Tags }}',
- '{{ AssertionEncryptionMode }}',
- '{{ AddPrivateKey }}',
- '{{ RemovePrivateKey }}',
- '{{ PrivateKeyList }}',
+SELECT
+ '{{ name }}',
+ '{{ saml_metadata_document }}',
+ '{{ tags }}',
+ '{{ assertion_encryption_mode }}',
+ '{{ add_private_key }}',
+ '{{ remove_private_key }}',
+ '{{ private_key_list }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -298,25 +298,24 @@ globals:
 resources:
   - name: saml_provider
     props:
-      - name: Name
-        value: '{{ Name }}'
-      - name: SamlMetadataDocument
-        value: '{{ SamlMetadataDocument }}'
-      - name: Tags
+      - name: name
+        value: '{{ name }}'
+      - name: saml_metadata_document
+        value: '{{ saml_metadata_document }}'
+      - name: tags
         value:
-          - Value: '{{ Value }}'
-            Key: '{{ Key }}'
-      - name: AssertionEncryptionMode
-        value: '{{ AssertionEncryptionMode }}'
-      - name: AddPrivateKey
-        value: '{{ AddPrivateKey }}'
-      - name: RemovePrivateKey
-        value: '{{ RemovePrivateKey }}'
-      - name: PrivateKeyList
+          - value: '{{ value }}'
+            key: '{{ key }}'
+      - name: assertion_encryption_mode
+        value: '{{ assertion_encryption_mode }}'
+      - name: add_private_key
+        value: '{{ add_private_key }}'
+      - name: remove_private_key
+        value: '{{ remove_private_key }}'
+      - name: private_key_list
         value:
-          - KeyId: '{{ KeyId }}'
-            Timestamp: '{{ Timestamp }}'
-
+          - key_id: '{{ key_id }}'
+            timestamp: '{{ timestamp }}'
 ```
 </TabItem>
 </Tabs>
@@ -335,7 +334,7 @@ SET PatchDocument = string('{{ {
     "PrivateKeyList": private_key_list
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Arn>';
+AND Identifier = '{{ arn }}';
 ```
 
 
@@ -344,7 +343,7 @@ AND Identifier = '<Arn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.iam.saml_providers
-WHERE Identifier = '<Arn>'
+WHERE Identifier = '{{ arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/iam/server_certificates/index.md b/website/docs/services/iam/server_certificates/index.md
index 73c2a4311..5808c3eea 100644
--- a/website/docs/services/iam/server_certificates/index.md
+++ b/website/docs/services/iam/server_certificates/index.md
@@ -182,7 +182,7 @@ private_key,
 arn,
 tags
 FROM awscc.iam.server_certificates
-WHERE Identifier = '<ServerCertificateName>';
+WHERE region = 'us-east-1' AND Identifier = '{{ server_certificate_name }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -193,7 +193,7 @@ SELECT
 region,
 server_certificate_name
 FROM awscc.iam.server_certificates_list_only
-;
+WHERE region = 'us-east-1';
 ```
 </TabItem>
 </Tabs>
@@ -223,13 +223,13 @@ INSERT INTO awscc.iam.server_certificates (
  Tags,
  region
 )
-SELECT 
-'{{ CertificateBody }}',
- '{{ CertificateChain }}',
- '{{ ServerCertificateName }}',
- '{{ Path }}',
- '{{ PrivateKey }}',
- '{{ Tags }}',
+SELECT
+'{{ certificate_body }}',
+ '{{ certificate_chain }}',
+ '{{ server_certificate_name }}',
+ '{{ path }}',
+ '{{ private_key }}',
+ '{{ tags }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -246,13 +246,13 @@ INSERT INTO awscc.iam.server_certificates (
  Tags,
  region
 )
-SELECT 
- '{{ CertificateBody }}',
- '{{ CertificateChain }}',
- '{{ ServerCertificateName }}',
- '{{ Path }}',
- '{{ PrivateKey }}',
- '{{ Tags }}',
+SELECT
+ '{{ certificate_body }}',
+ '{{ certificate_chain }}',
+ '{{ server_certificate_name }}',
+ '{{ path }}',
+ '{{ private_key }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -270,21 +270,20 @@ globals:
 resources:
   - name: server_certificate
     props:
-      - name: CertificateBody
-        value: '{{ CertificateBody }}'
-      - name: CertificateChain
-        value: '{{ CertificateChain }}'
-      - name: ServerCertificateName
-        value: '{{ ServerCertificateName }}'
-      - name: Path
-        value: '{{ Path }}'
-      - name: PrivateKey
-        value: '{{ PrivateKey }}'
-      - name: Tags
+      - name: certificate_body
+        value: '{{ certificate_body }}'
+      - name: certificate_chain
+        value: '{{ certificate_chain }}'
+      - name: server_certificate_name
+        value: '{{ server_certificate_name }}'
+      - name: path
+        value: '{{ path }}'
+      - name: private_key
+        value: '{{ private_key }}'
+      - name: tags
         value:
-          - Value: '{{ Value }}'
-            Key: '{{ Key }}'
-
+          - value: '{{ value }}'
+            key: '{{ key }}'
 ```
 </TabItem>
 </Tabs>
@@ -301,7 +300,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<ServerCertificateName>';
+AND Identifier = '{{ server_certificate_name }}';
 ```
 
 
@@ -310,7 +309,7 @@ AND Identifier = '<ServerCertificateName>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.iam.server_certificates
-WHERE Identifier = '<ServerCertificateName>'
+WHERE Identifier = '{{ server_certificate_name }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/iam/service_linked_roles/index.md b/website/docs/services/iam/service_linked_roles/index.md
index 0971eac29..cebd709ca 100644
--- a/website/docs/services/iam/service_linked_roles/index.md
+++ b/website/docs/services/iam/service_linked_roles/index.md
@@ -106,7 +106,7 @@ custom_suffix,
 description,
 aws_service_name
 FROM awscc.iam.service_linked_roles
-WHERE Identifier = '<RoleName>';
+WHERE region = 'us-east-1' AND Identifier = '{{ role_name }}';
 ```
 
 ## `INSERT` example
@@ -129,7 +129,7 @@ INSERT INTO awscc.iam.service_linked_roles (
  ,
  region
 )
-SELECT 
+SELECT
 '{{  }}',
 '{{ region }}';
 ```
@@ -144,10 +144,10 @@ INSERT INTO awscc.iam.service_linked_roles (
  AWSServiceName,
  region
 )
-SELECT 
- '{{ CustomSuffix }}',
- '{{ Description }}',
- '{{ AWSServiceName }}',
+SELECT
+ '{{ custom_suffix }}',
+ '{{ description }}',
+ '{{ aws_service_name }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -165,13 +165,12 @@ globals:
 resources:
   - name: service_linked_role
     props:
-      - name: CustomSuffix
-        value: '{{ CustomSuffix }}'
-      - name: Description
-        value: '{{ Description }}'
-      - name: AWSServiceName
-        value: '{{ AWSServiceName }}'
-
+      - name: custom_suffix
+        value: '{{ custom_suffix }}'
+      - name: description
+        value: '{{ description }}'
+      - name: aws_service_name
+        value: '{{ aws_service_name }}'
 ```
 </TabItem>
 </Tabs>
@@ -187,7 +186,7 @@ SET PatchDocument = string('{{ {
     "Description": description
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<RoleName>';
+AND Identifier = '{{ role_name }}';
 ```
 
 
@@ -196,7 +195,7 @@ AND Identifier = '<RoleName>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.iam.service_linked_roles
-WHERE Identifier = '<RoleName>'
+WHERE Identifier = '{{ role_name }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/iam/user_policies/index.md b/website/docs/services/iam/user_policies/index.md
index f0d7c5dee..9847380fa 100644
--- a/website/docs/services/iam/user_policies/index.md
+++ b/website/docs/services/iam/user_policies/index.md
@@ -100,7 +100,7 @@ policy_document,
 policy_name,
 user_name
 FROM awscc.iam.user_policies
-WHERE Identifier = '<PolicyName>|<UserName>';
+WHERE region = 'us-east-1' AND Identifier = '{{ policy_name }}|{{ user_name }}';
 ```
 
 ## `INSERT` example
@@ -124,9 +124,9 @@ INSERT INTO awscc.iam.user_policies (
  UserName,
  region
 )
-SELECT 
-'{{ PolicyName }}',
- '{{ UserName }}',
+SELECT
+'{{ policy_name }}',
+ '{{ user_name }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -140,10 +140,10 @@ INSERT INTO awscc.iam.user_policies (
  UserName,
  region
 )
-SELECT 
- '{{ PolicyDocument }}',
- '{{ PolicyName }}',
- '{{ UserName }}',
+SELECT
+ '{{ policy_document }}',
+ '{{ policy_name }}',
+ '{{ user_name }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -161,13 +161,12 @@ globals:
 resources:
   - name: user_policy
     props:
-      - name: PolicyDocument
+      - name: policy_document
         value: {}
-      - name: PolicyName
-        value: '{{ PolicyName }}'
-      - name: UserName
-        value: '{{ UserName }}'
-
+      - name: policy_name
+        value: '{{ policy_name }}'
+      - name: user_name
+        value: '{{ user_name }}'
 ```
 </TabItem>
 </Tabs>
@@ -183,7 +182,7 @@ SET PatchDocument = string('{{ {
     "PolicyDocument": policy_document
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<PolicyName>|<UserName>';
+AND Identifier = '{{ policy_name }}|{{ user_name }}';
 ```
 
 
@@ -192,7 +191,7 @@ AND Identifier = '<PolicyName>|<UserName>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.iam.user_policies
-WHERE Identifier = '<PolicyName|UserName>'
+WHERE Identifier = '{{ policy_name }}|{{ user_name }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/iam/users/index.md b/website/docs/services/iam/users/index.md
index e5c8c004a..206b19233 100644
--- a/website/docs/services/iam/users/index.md
+++ b/website/docs/services/iam/users/index.md
@@ -218,7 +218,7 @@ login_profile,
 tags,
 permissions_boundary
 FROM awscc.iam.users
-WHERE Identifier = '<UserName>';
+WHERE region = 'us-east-1' AND Identifier = '{{ user_name }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -229,7 +229,7 @@ SELECT
 region,
 user_name
 FROM awscc.iam.users_list_only
-;
+WHERE region = 'us-east-1';
 ```
 </TabItem>
 </Tabs>
@@ -261,15 +261,15 @@ INSERT INTO awscc.iam.users (
  PermissionsBoundary,
  region
 )
-SELECT 
-'{{ Path }}',
- '{{ ManagedPolicyArns }}',
- '{{ Policies }}',
- '{{ UserName }}',
- '{{ Groups }}',
- '{{ LoginProfile }}',
- '{{ Tags }}',
- '{{ PermissionsBoundary }}',
+SELECT
+'{{ path }}',
+ '{{ managed_policy_arns }}',
+ '{{ policies }}',
+ '{{ user_name }}',
+ '{{ groups }}',
+ '{{ login_profile }}',
+ '{{ tags }}',
+ '{{ permissions_boundary }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -288,15 +288,15 @@ INSERT INTO awscc.iam.users (
  PermissionsBoundary,
  region
 )
-SELECT 
- '{{ Path }}',
- '{{ ManagedPolicyArns }}',
- '{{ Policies }}',
- '{{ UserName }}',
- '{{ Groups }}',
- '{{ LoginProfile }}',
- '{{ Tags }}',
- '{{ PermissionsBoundary }}',
+SELECT
+ '{{ path }}',
+ '{{ managed_policy_arns }}',
+ '{{ policies }}',
+ '{{ user_name }}',
+ '{{ groups }}',
+ '{{ login_profile }}',
+ '{{ tags }}',
+ '{{ permissions_boundary }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -314,31 +314,30 @@ globals:
 resources:
   - name: user
     props:
-      - name: Path
-        value: '{{ Path }}'
-      - name: ManagedPolicyArns
+      - name: path
+        value: '{{ path }}'
+      - name: managed_policy_arns
         value:
-          - '{{ ManagedPolicyArns[0] }}'
-      - name: Policies
+          - '{{ managed_policy_arns[0] }}'
+      - name: policies
         value:
-          - PolicyDocument: {}
-            PolicyName: '{{ PolicyName }}'
-      - name: UserName
-        value: '{{ UserName }}'
-      - name: Groups
+          - policy_document: {}
+            policy_name: '{{ policy_name }}'
+      - name: user_name
+        value: '{{ user_name }}'
+      - name: groups
         value:
-          - '{{ Groups[0] }}'
-      - name: LoginProfile
+          - '{{ groups[0] }}'
+      - name: login_profile
         value:
-          PasswordResetRequired: '{{ PasswordResetRequired }}'
-          Password: '{{ Password }}'
-      - name: Tags
+          password_reset_required: '{{ password_reset_required }}'
+          password: '{{ password }}'
+      - name: tags
         value:
-          - Value: '{{ Value }}'
-            Key: '{{ Key }}'
-      - name: PermissionsBoundary
-        value: '{{ PermissionsBoundary }}'
-
+          - value: '{{ value }}'
+            key: '{{ key }}'
+      - name: permissions_boundary
+        value: '{{ permissions_boundary }}'
 ```
 </TabItem>
 </Tabs>
@@ -360,7 +359,7 @@ SET PatchDocument = string('{{ {
     "PermissionsBoundary": permissions_boundary
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<UserName>';
+AND Identifier = '{{ user_name }}';
 ```
 
 
@@ -369,7 +368,7 @@ AND Identifier = '<UserName>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.iam.users
-WHERE Identifier = '<UserName>'
+WHERE Identifier = '{{ user_name }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/iam/virtualmfa_devices/index.md b/website/docs/services/iam/virtualmfa_devices/index.md
index 0de8fa98f..54bafa345 100644
--- a/website/docs/services/iam/virtualmfa_devices/index.md
+++ b/website/docs/services/iam/virtualmfa_devices/index.md
@@ -170,7 +170,7 @@ serial_number,
 users,
 tags
 FROM awscc.iam.virtualmfa_devices
-WHERE Identifier = '<SerialNumber>';
+WHERE region = 'us-east-1' AND Identifier = '{{ serial_number }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -181,7 +181,7 @@ SELECT
 region,
 serial_number
 FROM awscc.iam.virtualmfa_devices_list_only
-;
+WHERE region = 'us-east-1';
 ```
 </TabItem>
 </Tabs>
@@ -206,8 +206,8 @@ INSERT INTO awscc.iam.virtualmfa_devices (
  Users,
  region
 )
-SELECT 
-'{{ Users }}',
+SELECT
+'{{ users }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -222,11 +222,11 @@ INSERT INTO awscc.iam.virtualmfa_devices (
  Tags,
  region
 )
-SELECT 
- '{{ VirtualMfaDeviceName }}',
- '{{ Path }}',
- '{{ Users }}',
- '{{ Tags }}',
+SELECT
+ '{{ virtual_mfa_device_name }}',
+ '{{ path }}',
+ '{{ users }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -244,18 +244,17 @@ globals:
 resources:
   - name: virtualmfa_device
     props:
-      - name: VirtualMfaDeviceName
-        value: '{{ VirtualMfaDeviceName }}'
-      - name: Path
-        value: '{{ Path }}'
-      - name: Users
+      - name: virtual_mfa_device_name
+        value: '{{ virtual_mfa_device_name }}'
+      - name: path
+        value: '{{ path }}'
+      - name: users
         value:
-          - '{{ Users[0] }}'
-      - name: Tags
+          - '{{ users[0] }}'
+      - name: tags
         value:
-          - Value: '{{ Value }}'
-            Key: '{{ Key }}'
-
+          - value: '{{ value }}'
+            key: '{{ key }}'
 ```
 </TabItem>
 </Tabs>
@@ -272,7 +271,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<SerialNumber>';
+AND Identifier = '{{ serial_number }}';
 ```
 
 
@@ -281,7 +280,7 @@ AND Identifier = '<SerialNumber>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.iam.virtualmfa_devices
-WHERE Identifier = '<SerialNumber>'
+WHERE Identifier = '{{ serial_number }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/identitystore/group_memberships/index.md b/website/docs/services/identitystore/group_memberships/index.md
index e5d188c07..780995f78 100644
--- a/website/docs/services/identitystore/group_memberships/index.md
+++ b/website/docs/services/identitystore/group_memberships/index.md
@@ -158,7 +158,7 @@ identity_store_id,
 member_id,
 membership_id
 FROM awscc.identitystore.group_memberships
-WHERE region = 'us-east-1' AND Identifier = '<MembershipId>|<IdentityStoreId>';
+WHERE region = 'us-east-1' AND Identifier = '{{ membership_id }}|{{ identity_store_id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -197,10 +197,10 @@ INSERT INTO awscc.identitystore.group_memberships (
  MemberId,
  region
 )
-SELECT 
-'{{ GroupId }}',
- '{{ IdentityStoreId }}',
- '{{ MemberId }}',
+SELECT
+'{{ group_id }}',
+ '{{ identity_store_id }}',
+ '{{ member_id }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -214,10 +214,10 @@ INSERT INTO awscc.identitystore.group_memberships (
  MemberId,
  region
 )
-SELECT 
- '{{ GroupId }}',
- '{{ IdentityStoreId }}',
- '{{ MemberId }}',
+SELECT
+ '{{ group_id }}',
+ '{{ identity_store_id }}',
+ '{{ member_id }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -235,14 +235,13 @@ globals:
 resources:
   - name: group_membership
     props:
-      - name: GroupId
-        value: '{{ GroupId }}'
-      - name: IdentityStoreId
-        value: '{{ IdentityStoreId }}'
-      - name: MemberId
+      - name: group_id
+        value: '{{ group_id }}'
+      - name: identity_store_id
+        value: '{{ identity_store_id }}'
+      - name: member_id
         value:
-          UserId: '{{ UserId }}'
-
+          user_id: '{{ user_id }}'
 ```
 </TabItem>
 </Tabs>
@@ -253,7 +252,7 @@ resources:
 ```sql
 /*+ delete */
 DELETE FROM awscc.identitystore.group_memberships
-WHERE Identifier = '<MembershipId|IdentityStoreId>'
+WHERE Identifier = '{{ membership_id }}|{{ identity_store_id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/identitystore/groups/index.md b/website/docs/services/identitystore/groups/index.md
index 0a92dafa8..2bd3be86c 100644
--- a/website/docs/services/identitystore/groups/index.md
+++ b/website/docs/services/identitystore/groups/index.md
@@ -157,7 +157,7 @@ display_name,
 group_id,
 identity_store_id
 FROM awscc.identitystore.groups
-WHERE region = 'us-east-1' AND Identifier = '<GroupId>|<IdentityStoreId>';
+WHERE region = 'us-east-1' AND Identifier = '{{ group_id }}|{{ identity_store_id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -195,9 +195,9 @@ INSERT INTO awscc.identitystore.groups (
  IdentityStoreId,
  region
 )
-SELECT 
-'{{ DisplayName }}',
- '{{ IdentityStoreId }}',
+SELECT
+'{{ display_name }}',
+ '{{ identity_store_id }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -211,10 +211,10 @@ INSERT INTO awscc.identitystore.groups (
  IdentityStoreId,
  region
 )
-SELECT 
- '{{ Description }}',
- '{{ DisplayName }}',
- '{{ IdentityStoreId }}',
+SELECT
+ '{{ description }}',
+ '{{ display_name }}',
+ '{{ identity_store_id }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -232,13 +232,12 @@ globals:
 resources:
   - name: group
     props:
-      - name: Description
-        value: '{{ Description }}'
-      - name: DisplayName
-        value: '{{ DisplayName }}'
-      - name: IdentityStoreId
-        value: '{{ IdentityStoreId }}'
-
+      - name: description
+        value: '{{ description }}'
+      - name: display_name
+        value: '{{ display_name }}'
+      - name: identity_store_id
+        value: '{{ identity_store_id }}'
 ```
 </TabItem>
 </Tabs>
@@ -255,7 +254,7 @@ SET PatchDocument = string('{{ {
     "DisplayName": display_name
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<GroupId>|<IdentityStoreId>';
+AND Identifier = '{{ group_id }}|{{ identity_store_id }}';
 ```
 
 
@@ -264,7 +263,7 @@ AND Identifier = '<GroupId>|<IdentityStoreId>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.identitystore.groups
-WHERE Identifier = '<GroupId|IdentityStoreId>'
+WHERE Identifier = '{{ group_id }}|{{ identity_store_id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/imagebuilder/components/index.md b/website/docs/services/imagebuilder/components/index.md
index 34c92b471..f854d3839 100644
--- a/website/docs/services/imagebuilder/components/index.md
+++ b/website/docs/services/imagebuilder/components/index.md
@@ -206,7 +206,7 @@ tags,
 uri,
 supported_os_versions
 FROM awscc.imagebuilder.components
-WHERE region = 'us-east-1' AND Identifier = '<Arn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -244,10 +244,10 @@ INSERT INTO awscc.imagebuilder.components (
  Platform,
  region
 )
-SELECT 
-'{{ Name }}',
- '{{ Version }}',
- '{{ Platform }}',
+SELECT
+'{{ name }}',
+ '{{ version }}',
+ '{{ platform }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -268,17 +268,17 @@ INSERT INTO awscc.imagebuilder.components (
  SupportedOsVersions,
  region
 )
-SELECT 
- '{{ Name }}',
- '{{ Version }}',
- '{{ Description }}',
- '{{ ChangeDescription }}',
- '{{ Platform }}',
- '{{ Data }}',
- '{{ KmsKeyId }}',
- '{{ Tags }}',
- '{{ Uri }}',
- '{{ SupportedOsVersions }}',
+SELECT
+ '{{ name }}',
+ '{{ version }}',
+ '{{ description }}',
+ '{{ change_description }}',
+ '{{ platform }}',
+ '{{ data }}',
+ '{{ kms_key_id }}',
+ '{{ tags }}',
+ '{{ uri }}',
+ '{{ supported_os_versions }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -296,28 +296,27 @@ globals:
 resources:
   - name: component
     props:
-      - name: Name
-        value: '{{ Name }}'
-      - name: Version
-        value: '{{ Version }}'
-      - name: Description
-        value: '{{ Description }}'
-      - name: ChangeDescription
-        value: '{{ ChangeDescription }}'
-      - name: Platform
-        value: '{{ Platform }}'
-      - name: Data
-        value: '{{ Data }}'
-      - name: KmsKeyId
-        value: '{{ KmsKeyId }}'
-      - name: Tags
+      - name: name
+        value: '{{ name }}'
+      - name: version
+        value: '{{ version }}'
+      - name: description
+        value: '{{ description }}'
+      - name: change_description
+        value: '{{ change_description }}'
+      - name: platform
+        value: '{{ platform }}'
+      - name: data
+        value: '{{ data }}'
+      - name: kms_key_id
+        value: '{{ kms_key_id }}'
+      - name: tags
         value: {}
-      - name: Uri
-        value: '{{ Uri }}'
-      - name: SupportedOsVersions
+      - name: uri
+        value: '{{ uri }}'
+      - name: supported_os_versions
         value:
-          - '{{ SupportedOsVersions[0] }}'
-
+          - '{{ supported_os_versions[0] }}'
 ```
 </TabItem>
 </Tabs>
@@ -333,7 +332,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Arn>';
+AND Identifier = '{{ arn }}';
 ```
 
 
@@ -342,7 +341,7 @@ AND Identifier = '<Arn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.imagebuilder.components
-WHERE Identifier = '<Arn>'
+WHERE Identifier = '{{ arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/imagebuilder/container_recipes/index.md b/website/docs/services/imagebuilder/container_recipes/index.md
index 6537d418a..e184b68f1 100644
--- a/website/docs/services/imagebuilder/container_recipes/index.md
+++ b/website/docs/services/imagebuilder/container_recipes/index.md
@@ -336,7 +336,7 @@ parent_image,
 working_directory,
 tags
 FROM awscc.imagebuilder.container_recipes
-WHERE region = 'us-east-1' AND Identifier = '<Arn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -386,22 +386,22 @@ INSERT INTO awscc.imagebuilder.container_recipes (
  Tags,
  region
 )
-SELECT 
-'{{ Name }}',
- '{{ Description }}',
- '{{ Version }}',
- '{{ Components }}',
- '{{ InstanceConfiguration }}',
- '{{ DockerfileTemplateData }}',
- '{{ DockerfileTemplateUri }}',
- '{{ PlatformOverride }}',
- '{{ ContainerType }}',
- '{{ ImageOsVersionOverride }}',
- '{{ TargetRepository }}',
- '{{ KmsKeyId }}',
- '{{ ParentImage }}',
- '{{ WorkingDirectory }}',
- '{{ Tags }}',
+SELECT
+'{{ name }}',
+ '{{ description }}',
+ '{{ version }}',
+ '{{ components }}',
+ '{{ instance_configuration }}',
+ '{{ dockerfile_template_data }}',
+ '{{ dockerfile_template_uri }}',
+ '{{ platform_override }}',
+ '{{ container_type }}',
+ '{{ image_os_version_override }}',
+ '{{ target_repository }}',
+ '{{ kms_key_id }}',
+ '{{ parent_image }}',
+ '{{ working_directory }}',
+ '{{ tags }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -427,22 +427,22 @@ INSERT INTO awscc.imagebuilder.container_recipes (
  Tags,
  region
 )
-SELECT 
- '{{ Name }}',
- '{{ Description }}',
- '{{ Version }}',
- '{{ Components }}',
- '{{ InstanceConfiguration }}',
- '{{ DockerfileTemplateData }}',
- '{{ DockerfileTemplateUri }}',
- '{{ PlatformOverride }}',
- '{{ ContainerType }}',
- '{{ ImageOsVersionOverride }}',
- '{{ TargetRepository }}',
- '{{ KmsKeyId }}',
- '{{ ParentImage }}',
- '{{ WorkingDirectory }}',
- '{{ Tags }}',
+SELECT
+ '{{ name }}',
+ '{{ description }}',
+ '{{ version }}',
+ '{{ components }}',
+ '{{ instance_configuration }}',
+ '{{ dockerfile_template_data }}',
+ '{{ dockerfile_template_uri }}',
+ '{{ platform_override }}',
+ '{{ container_type }}',
+ '{{ image_os_version_override }}',
+ '{{ target_repository }}',
+ '{{ kms_key_id }}',
+ '{{ parent_image }}',
+ '{{ working_directory }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -460,58 +460,57 @@ globals:
 resources:
   - name: container_recipe
     props:
-      - name: Name
-        value: '{{ Name }}'
-      - name: Description
-        value: '{{ Description }}'
-      - name: Version
-        value: '{{ Version }}'
-      - name: Components
+      - name: name
+        value: '{{ name }}'
+      - name: description
+        value: '{{ description }}'
+      - name: version
+        value: '{{ version }}'
+      - name: components
         value:
-          - ComponentArn: '{{ ComponentArn }}'
-            Parameters:
-              - Name: '{{ Name }}'
-                Value:
-                  - '{{ Value[0] }}'
-      - name: InstanceConfiguration
+          - component_arn: '{{ component_arn }}'
+            parameters:
+              - name: '{{ name }}'
+                value:
+                  - '{{ value[0] }}'
+      - name: instance_configuration
         value:
-          Image: '{{ Image }}'
-          BlockDeviceMappings:
-            - DeviceName: '{{ DeviceName }}'
-              VirtualName: '{{ VirtualName }}'
-              NoDevice: '{{ NoDevice }}'
-              Ebs:
-                Encrypted: '{{ Encrypted }}'
-                DeleteOnTermination: '{{ DeleteOnTermination }}'
-                Iops: '{{ Iops }}'
-                KmsKeyId: '{{ KmsKeyId }}'
-                SnapshotId: '{{ SnapshotId }}'
-                Throughput: '{{ Throughput }}'
-                VolumeSize: '{{ VolumeSize }}'
-                VolumeType: '{{ VolumeType }}'
-      - name: DockerfileTemplateData
-        value: '{{ DockerfileTemplateData }}'
-      - name: DockerfileTemplateUri
-        value: '{{ DockerfileTemplateUri }}'
-      - name: PlatformOverride
-        value: '{{ PlatformOverride }}'
-      - name: ContainerType
-        value: '{{ ContainerType }}'
-      - name: ImageOsVersionOverride
-        value: '{{ ImageOsVersionOverride }}'
-      - name: TargetRepository
+          image: '{{ image }}'
+          block_device_mappings:
+            - device_name: '{{ device_name }}'
+              virtual_name: '{{ virtual_name }}'
+              no_device: '{{ no_device }}'
+              ebs:
+                encrypted: '{{ encrypted }}'
+                delete_on_termination: '{{ delete_on_termination }}'
+                iops: '{{ iops }}'
+                kms_key_id: '{{ kms_key_id }}'
+                snapshot_id: '{{ snapshot_id }}'
+                throughput: '{{ throughput }}'
+                volume_size: '{{ volume_size }}'
+                volume_type: '{{ volume_type }}'
+      - name: dockerfile_template_data
+        value: '{{ dockerfile_template_data }}'
+      - name: dockerfile_template_uri
+        value: '{{ dockerfile_template_uri }}'
+      - name: platform_override
+        value: '{{ platform_override }}'
+      - name: container_type
+        value: '{{ container_type }}'
+      - name: image_os_version_override
+        value: '{{ image_os_version_override }}'
+      - name: target_repository
         value:
-          Service: '{{ Service }}'
-          RepositoryName: '{{ RepositoryName }}'
-      - name: KmsKeyId
-        value: '{{ KmsKeyId }}'
-      - name: ParentImage
-        value: '{{ ParentImage }}'
-      - name: WorkingDirectory
-        value: '{{ WorkingDirectory }}'
-      - name: Tags
+          service: '{{ service }}'
+          repository_name: '{{ repository_name }}'
+      - name: kms_key_id
+        value: '{{ kms_key_id }}'
+      - name: parent_image
+        value: '{{ parent_image }}'
+      - name: working_directory
+        value: '{{ working_directory }}'
+      - name: tags
         value: {}
-
 ```
 </TabItem>
 </Tabs>
@@ -527,7 +526,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Arn>';
+AND Identifier = '{{ arn }}';
 ```
 
 
@@ -536,7 +535,7 @@ AND Identifier = '<Arn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.imagebuilder.container_recipes
-WHERE Identifier = '<Arn>'
+WHERE Identifier = '{{ arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/imagebuilder/distribution_configurations/index.md b/website/docs/services/imagebuilder/distribution_configurations/index.md
index 0874a61a1..3fad39de4 100644
--- a/website/docs/services/imagebuilder/distribution_configurations/index.md
+++ b/website/docs/services/imagebuilder/distribution_configurations/index.md
@@ -363,7 +363,7 @@ description,
 distributions,
 tags
 FROM awscc.imagebuilder.distribution_configurations
-WHERE region = 'us-east-1' AND Identifier = '<Arn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -400,9 +400,9 @@ INSERT INTO awscc.imagebuilder.distribution_configurations (
  Distributions,
  region
 )
-SELECT 
-'{{ Name }}',
- '{{ Distributions }}',
+SELECT
+'{{ name }}',
+ '{{ distributions }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -417,11 +417,11 @@ INSERT INTO awscc.imagebuilder.distribution_configurations (
  Tags,
  region
 )
-SELECT 
- '{{ Name }}',
- '{{ Description }}',
- '{{ Distributions }}',
- '{{ Tags }}',
+SELECT
+ '{{ name }}',
+ '{{ description }}',
+ '{{ distributions }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -439,59 +439,58 @@ globals:
 resources:
   - name: distribution_configuration
     props:
-      - name: Name
-        value: '{{ Name }}'
-      - name: Description
-        value: '{{ Description }}'
-      - name: Distributions
+      - name: name
+        value: '{{ name }}'
+      - name: description
+        value: '{{ description }}'
+      - name: distributions
         value:
-          - Region: '{{ Region }}'
-            AmiDistributionConfiguration:
-              Name: '{{ Name }}'
-              KmsKeyId: '{{ KmsKeyId }}'
-              Description: '{{ Description }}'
-              AmiTags: {}
-              TargetAccountIds:
-                - '{{ TargetAccountIds[0] }}'
-              LaunchPermissionConfiguration:
-                UserIds:
-                  - '{{ UserIds[0] }}'
-                UserGroups:
-                  - '{{ UserGroups[0] }}'
-                OrganizationArns:
-                  - '{{ OrganizationArns[0] }}'
-                OrganizationalUnitArns:
-                  - '{{ OrganizationalUnitArns[0] }}'
-            ContainerDistributionConfiguration:
-              Description: '{{ Description }}'
-              ContainerTags:
-                - '{{ ContainerTags[0] }}'
-              TargetRepository:
-                Service: '{{ Service }}'
-                RepositoryName: '{{ RepositoryName }}'
-            LicenseConfigurationArns:
-              - '{{ LicenseConfigurationArns[0] }}'
-            LaunchTemplateConfigurations:
-              - LaunchTemplateId: '{{ LaunchTemplateId }}'
-                AccountId: '{{ AccountId }}'
-                SetDefaultVersion: '{{ SetDefaultVersion }}'
-            FastLaunchConfigurations:
-              - AccountId: '{{ AccountId }}'
-                Enabled: '{{ Enabled }}'
-                LaunchTemplate:
-                  LaunchTemplateId: '{{ LaunchTemplateId }}'
-                  LaunchTemplateName: '{{ LaunchTemplateName }}'
-                  LaunchTemplateVersion: '{{ LaunchTemplateVersion }}'
-                MaxParallelLaunches: '{{ MaxParallelLaunches }}'
-                SnapshotConfiguration:
-                  TargetResourceCount: '{{ TargetResourceCount }}'
-            SsmParameterConfigurations:
-              - AmiAccountId: '{{ AmiAccountId }}'
-                ParameterName: '{{ ParameterName }}'
-                DataType: '{{ DataType }}'
-      - name: Tags
+          - region: '{{ region }}'
+            ami_distribution_configuration:
+              name: '{{ name }}'
+              kms_key_id: '{{ kms_key_id }}'
+              description: '{{ description }}'
+              ami_tags: {}
+              target_account_ids:
+                - '{{ target_account_ids[0] }}'
+              launch_permission_configuration:
+                user_ids:
+                  - '{{ user_ids[0] }}'
+                user_groups:
+                  - '{{ user_groups[0] }}'
+                organization_arns:
+                  - '{{ organization_arns[0] }}'
+                organizational_unit_arns:
+                  - '{{ organizational_unit_arns[0] }}'
+            container_distribution_configuration:
+              description: '{{ description }}'
+              container_tags:
+                - '{{ container_tags[0] }}'
+              target_repository:
+                service: '{{ service }}'
+                repository_name: '{{ repository_name }}'
+            license_configuration_arns:
+              - '{{ license_configuration_arns[0] }}'
+            launch_template_configurations:
+              - launch_template_id: '{{ launch_template_id }}'
+                account_id: '{{ account_id }}'
+                set_default_version: '{{ set_default_version }}'
+            fast_launch_configurations:
+              - account_id: '{{ account_id }}'
+                enabled: '{{ enabled }}'
+                launch_template:
+                  launch_template_id: '{{ launch_template_id }}'
+                  launch_template_name: '{{ launch_template_name }}'
+                  launch_template_version: '{{ launch_template_version }}'
+                max_parallel_launches: '{{ max_parallel_launches }}'
+                snapshot_configuration:
+                  target_resource_count: '{{ target_resource_count }}'
+            ssm_parameter_configurations:
+              - ami_account_id: '{{ ami_account_id }}'
+                parameter_name: '{{ parameter_name }}'
+                data_type: '{{ data_type }}'
+      - name: tags
         value: {}
-
 ```
 </TabItem>
 </Tabs>
@@ -509,7 +508,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Arn>';
+AND Identifier = '{{ arn }}';
 ```
 
 
@@ -518,7 +517,7 @@ AND Identifier = '<Arn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.imagebuilder.distribution_configurations
-WHERE Identifier = '<Arn>'
+WHERE Identifier = '{{ arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/imagebuilder/image_pipelines/index.md b/website/docs/services/imagebuilder/image_pipelines/index.md
index 15c7f4780..798bf8c32 100644
--- a/website/docs/services/imagebuilder/image_pipelines/index.md
+++ b/website/docs/services/imagebuilder/image_pipelines/index.md
@@ -300,7 +300,7 @@ image_scanning_configuration,
 execution_role,
 tags
 FROM awscc.imagebuilder.image_pipelines
-WHERE region = 'us-east-1' AND Identifier = '<Arn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -349,21 +349,21 @@ INSERT INTO awscc.imagebuilder.image_pipelines (
  Tags,
  region
 )
-SELECT 
-'{{ Name }}',
- '{{ Description }}',
- '{{ ImageTestsConfiguration }}',
- '{{ Status }}',
- '{{ Schedule }}',
- '{{ ImageRecipeArn }}',
- '{{ ContainerRecipeArn }}',
- '{{ DistributionConfigurationArn }}',
- '{{ InfrastructureConfigurationArn }}',
- '{{ Workflows }}',
- '{{ EnhancedImageMetadataEnabled }}',
- '{{ ImageScanningConfiguration }}',
- '{{ ExecutionRole }}',
- '{{ Tags }}',
+SELECT
+'{{ name }}',
+ '{{ description }}',
+ '{{ image_tests_configuration }}',
+ '{{ status }}',
+ '{{ schedule }}',
+ '{{ image_recipe_arn }}',
+ '{{ container_recipe_arn }}',
+ '{{ distribution_configuration_arn }}',
+ '{{ infrastructure_configuration_arn }}',
+ '{{ workflows }}',
+ '{{ enhanced_image_metadata_enabled }}',
+ '{{ image_scanning_configuration }}',
+ '{{ execution_role }}',
+ '{{ tags }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -388,21 +388,21 @@ INSERT INTO awscc.imagebuilder.image_pipelines (
  Tags,
  region
 )
-SELECT 
- '{{ Name }}',
- '{{ Description }}',
- '{{ ImageTestsConfiguration }}',
- '{{ Status }}',
- '{{ Schedule }}',
- '{{ ImageRecipeArn }}',
- '{{ ContainerRecipeArn }}',
- '{{ DistributionConfigurationArn }}',
- '{{ InfrastructureConfigurationArn }}',
- '{{ Workflows }}',
- '{{ EnhancedImageMetadataEnabled }}',
- '{{ ImageScanningConfiguration }}',
- '{{ ExecutionRole }}',
- '{{ Tags }}',
+SELECT
+ '{{ name }}',
+ '{{ description }}',
+ '{{ image_tests_configuration }}',
+ '{{ status }}',
+ '{{ schedule }}',
+ '{{ image_recipe_arn }}',
+ '{{ container_recipe_arn }}',
+ '{{ distribution_configuration_arn }}',
+ '{{ infrastructure_configuration_arn }}',
+ '{{ workflows }}',
+ '{{ enhanced_image_metadata_enabled }}',
+ '{{ image_scanning_configuration }}',
+ '{{ execution_role }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -420,51 +420,50 @@ globals:
 resources:
   - name: image_pipeline
     props:
-      - name: Name
-        value: '{{ Name }}'
-      - name: Description
-        value: '{{ Description }}'
-      - name: ImageTestsConfiguration
+      - name: name
+        value: '{{ name }}'
+      - name: description
+        value: '{{ description }}'
+      - name: image_tests_configuration
         value:
-          ImageTestsEnabled: '{{ ImageTestsEnabled }}'
-          TimeoutMinutes: '{{ TimeoutMinutes }}'
-      - name: Status
-        value: '{{ Status }}'
-      - name: Schedule
+          image_tests_enabled: '{{ image_tests_enabled }}'
+          timeout_minutes: '{{ timeout_minutes }}'
+      - name: status
+        value: '{{ status }}'
+      - name: schedule
         value:
-          ScheduleExpression: '{{ ScheduleExpression }}'
-          PipelineExecutionStartCondition: '{{ PipelineExecutionStartCondition }}'
-      - name: ImageRecipeArn
-        value: '{{ ImageRecipeArn }}'
-      - name: ContainerRecipeArn
-        value: '{{ ContainerRecipeArn }}'
-      - name: DistributionConfigurationArn
-        value: '{{ DistributionConfigurationArn }}'
-      - name: InfrastructureConfigurationArn
-        value: '{{ InfrastructureConfigurationArn }}'
-      - name: Workflows
+          schedule_expression: '{{ schedule_expression }}'
+          pipeline_execution_start_condition: '{{ pipeline_execution_start_condition }}'
+      - name: image_recipe_arn
+        value: '{{ image_recipe_arn }}'
+      - name: container_recipe_arn
+        value: '{{ container_recipe_arn }}'
+      - name: distribution_configuration_arn
+        value: '{{ distribution_configuration_arn }}'
+      - name: infrastructure_configuration_arn
+        value: '{{ infrastructure_configuration_arn }}'
+      - name: workflows
         value:
-          - WorkflowArn: '{{ WorkflowArn }}'
-            Parameters:
-              - Name: '{{ Name }}'
-                Value:
-                  - '{{ Value[0] }}'
-            ParallelGroup: '{{ ParallelGroup }}'
-            OnFailure: '{{ OnFailure }}'
-      - name: EnhancedImageMetadataEnabled
-        value: '{{ EnhancedImageMetadataEnabled }}'
-      - name: ImageScanningConfiguration
+          - workflow_arn: '{{ workflow_arn }}'
+            parameters:
+              - name: '{{ name }}'
+                value:
+                  - '{{ value[0] }}'
+            parallel_group: '{{ parallel_group }}'
+            on_failure: '{{ on_failure }}'
+      - name: enhanced_image_metadata_enabled
+        value: '{{ enhanced_image_metadata_enabled }}'
+      - name: image_scanning_configuration
         value:
-          EcrConfiguration:
-            ContainerTags:
-              - '{{ ContainerTags[0] }}'
-            RepositoryName: '{{ RepositoryName }}'
-          ImageScanningEnabled: '{{ ImageScanningEnabled }}'
-      - name: ExecutionRole
-        value: '{{ ExecutionRole }}'
-      - name: Tags
+          ecr_configuration:
+            container_tags:
+              - '{{ container_tags[0] }}'
+            repository_name: '{{ repository_name }}'
+          image_scanning_enabled: '{{ image_scanning_enabled }}'
+      - name: execution_role
+        value: '{{ execution_role }}'
+      - name: tags
         value: {}
-
 ```
 </TabItem>
 </Tabs>
@@ -492,7 +491,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Arn>';
+AND Identifier = '{{ arn }}';
 ```
 
 
@@ -501,7 +500,7 @@ AND Identifier = '<Arn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.imagebuilder.image_pipelines
-WHERE Identifier = '<Arn>'
+WHERE Identifier = '{{ arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/imagebuilder/image_recipes/index.md b/website/docs/services/imagebuilder/image_recipes/index.md
index 64c059bf1..bfcb4e3be 100644
--- a/website/docs/services/imagebuilder/image_recipes/index.md
+++ b/website/docs/services/imagebuilder/image_recipes/index.md
@@ -295,7 +295,7 @@ working_directory,
 additional_instance_configuration,
 tags
 FROM awscc.imagebuilder.image_recipes
-WHERE region = 'us-east-1' AND Identifier = '<Arn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -334,11 +334,11 @@ INSERT INTO awscc.imagebuilder.image_recipes (
  ParentImage,
  region
 )
-SELECT 
-'{{ Name }}',
- '{{ Version }}',
- '{{ Components }}',
- '{{ ParentImage }}',
+SELECT
+'{{ name }}',
+ '{{ version }}',
+ '{{ components }}',
+ '{{ parent_image }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -358,16 +358,16 @@ INSERT INTO awscc.imagebuilder.image_recipes (
  Tags,
  region
 )
-SELECT 
- '{{ Name }}',
- '{{ Description }}',
- '{{ Version }}',
- '{{ Components }}',
- '{{ BlockDeviceMappings }}',
- '{{ ParentImage }}',
- '{{ WorkingDirectory }}',
- '{{ AdditionalInstanceConfiguration }}',
- '{{ Tags }}',
+SELECT
+ '{{ name }}',
+ '{{ description }}',
+ '{{ version }}',
+ '{{ components }}',
+ '{{ block_device_mappings }}',
+ '{{ parent_image }}',
+ '{{ working_directory }}',
+ '{{ additional_instance_configuration }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -385,45 +385,44 @@ globals:
 resources:
   - name: image_recipe
     props:
-      - name: Name
-        value: '{{ Name }}'
-      - name: Description
-        value: '{{ Description }}'
-      - name: Version
-        value: '{{ Version }}'
-      - name: Components
+      - name: name
+        value: '{{ name }}'
+      - name: description
+        value: '{{ description }}'
+      - name: version
+        value: '{{ version }}'
+      - name: components
         value:
-          - ComponentArn: '{{ ComponentArn }}'
-            Parameters:
-              - Name: '{{ Name }}'
-                Value:
-                  - '{{ Value[0] }}'
-      - name: BlockDeviceMappings
+          - component_arn: '{{ component_arn }}'
+            parameters:
+              - name: '{{ name }}'
+                value:
+                  - '{{ value[0] }}'
+      - name: block_device_mappings
         value:
-          - DeviceName: '{{ DeviceName }}'
-            VirtualName: '{{ VirtualName }}'
-            NoDevice: '{{ NoDevice }}'
-            Ebs:
-              Encrypted: '{{ Encrypted }}'
-              DeleteOnTermination: '{{ DeleteOnTermination }}'
-              Iops: '{{ Iops }}'
-              KmsKeyId: '{{ KmsKeyId }}'
-              SnapshotId: '{{ SnapshotId }}'
-              Throughput: '{{ Throughput }}'
-              VolumeSize: '{{ VolumeSize }}'
-              VolumeType: '{{ VolumeType }}'
-      - name: ParentImage
-        value: '{{ ParentImage }}'
-      - name: WorkingDirectory
-        value: '{{ WorkingDirectory }}'
-      - name: AdditionalInstanceConfiguration
+          - device_name: '{{ device_name }}'
+            virtual_name: '{{ virtual_name }}'
+            no_device: '{{ no_device }}'
+            ebs:
+              encrypted: '{{ encrypted }}'
+              delete_on_termination: '{{ delete_on_termination }}'
+              iops: '{{ iops }}'
+              kms_key_id: '{{ kms_key_id }}'
+              snapshot_id: '{{ snapshot_id }}'
+              throughput: '{{ throughput }}'
+              volume_size: '{{ volume_size }}'
+              volume_type: '{{ volume_type }}'
+      - name: parent_image
+        value: '{{ parent_image }}'
+      - name: working_directory
+        value: '{{ working_directory }}'
+      - name: additional_instance_configuration
         value:
-          SystemsManagerAgent:
-            UninstallAfterBuild: '{{ UninstallAfterBuild }}'
-          UserDataOverride: '{{ UserDataOverride }}'
-      - name: Tags
+          systems_manager_agent:
+            uninstall_after_build: '{{ uninstall_after_build }}'
+          user_data_override: '{{ user_data_override }}'
+      - name: tags
         value: {}
-
 ```
 </TabItem>
 </Tabs>
@@ -440,7 +439,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Arn>';
+AND Identifier = '{{ arn }}';
 ```
 
 
@@ -449,7 +448,7 @@ AND Identifier = '<Arn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.imagebuilder.image_recipes
-WHERE Identifier = '<Arn>'
+WHERE Identifier = '{{ arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/imagebuilder/images/index.md b/website/docs/services/imagebuilder/images/index.md
index a4c772ac1..35a8e1fed 100644
--- a/website/docs/services/imagebuilder/images/index.md
+++ b/website/docs/services/imagebuilder/images/index.md
@@ -282,7 +282,7 @@ enhanced_image_metadata_enabled,
 execution_role,
 tags
 FROM awscc.imagebuilder.images
-WHERE region = 'us-east-1' AND Identifier = '<Arn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -327,17 +327,17 @@ INSERT INTO awscc.imagebuilder.images (
  Tags,
  region
 )
-SELECT 
-'{{ ImageScanningConfiguration }}',
- '{{ ContainerRecipeArn }}',
- '{{ Workflows }}',
- '{{ InfrastructureConfigurationArn }}',
- '{{ ImageRecipeArn }}',
- '{{ DistributionConfigurationArn }}',
- '{{ ImageTestsConfiguration }}',
- '{{ EnhancedImageMetadataEnabled }}',
- '{{ ExecutionRole }}',
- '{{ Tags }}',
+SELECT
+'{{ image_scanning_configuration }}',
+ '{{ container_recipe_arn }}',
+ '{{ workflows }}',
+ '{{ infrastructure_configuration_arn }}',
+ '{{ image_recipe_arn }}',
+ '{{ distribution_configuration_arn }}',
+ '{{ image_tests_configuration }}',
+ '{{ enhanced_image_metadata_enabled }}',
+ '{{ execution_role }}',
+ '{{ tags }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -358,17 +358,17 @@ INSERT INTO awscc.imagebuilder.images (
  Tags,
  region
 )
-SELECT 
- '{{ ImageScanningConfiguration }}',
- '{{ ContainerRecipeArn }}',
- '{{ Workflows }}',
- '{{ InfrastructureConfigurationArn }}',
- '{{ ImageRecipeArn }}',
- '{{ DistributionConfigurationArn }}',
- '{{ ImageTestsConfiguration }}',
- '{{ EnhancedImageMetadataEnabled }}',
- '{{ ExecutionRole }}',
- '{{ Tags }}',
+SELECT
+ '{{ image_scanning_configuration }}',
+ '{{ container_recipe_arn }}',
+ '{{ workflows }}',
+ '{{ infrastructure_configuration_arn }}',
+ '{{ image_recipe_arn }}',
+ '{{ distribution_configuration_arn }}',
+ '{{ image_tests_configuration }}',
+ '{{ enhanced_image_metadata_enabled }}',
+ '{{ execution_role }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -386,41 +386,40 @@ globals:
 resources:
   - name: image
     props:
-      - name: ImageScanningConfiguration
+      - name: image_scanning_configuration
         value:
-          EcrConfiguration:
-            ContainerTags:
-              - '{{ ContainerTags[0] }}'
-            RepositoryName: '{{ RepositoryName }}'
-          ImageScanningEnabled: '{{ ImageScanningEnabled }}'
-      - name: ContainerRecipeArn
-        value: '{{ ContainerRecipeArn }}'
-      - name: Workflows
+          ecr_configuration:
+            container_tags:
+              - '{{ container_tags[0] }}'
+            repository_name: '{{ repository_name }}'
+          image_scanning_enabled: '{{ image_scanning_enabled }}'
+      - name: container_recipe_arn
+        value: '{{ container_recipe_arn }}'
+      - name: workflows
         value:
-          - WorkflowArn: '{{ WorkflowArn }}'
-            Parameters:
-              - Name: '{{ Name }}'
-                Value:
-                  - '{{ Value[0] }}'
-            ParallelGroup: '{{ ParallelGroup }}'
-            OnFailure: '{{ OnFailure }}'
-      - name: InfrastructureConfigurationArn
-        value: '{{ InfrastructureConfigurationArn }}'
-      - name: ImageRecipeArn
-        value: '{{ ImageRecipeArn }}'
-      - name: DistributionConfigurationArn
-        value: '{{ DistributionConfigurationArn }}'
-      - name: ImageTestsConfiguration
+          - workflow_arn: '{{ workflow_arn }}'
+            parameters:
+              - name: '{{ name }}'
+                value:
+                  - '{{ value[0] }}'
+            parallel_group: '{{ parallel_group }}'
+            on_failure: '{{ on_failure }}'
+      - name: infrastructure_configuration_arn
+        value: '{{ infrastructure_configuration_arn }}'
+      - name: image_recipe_arn
+        value: '{{ image_recipe_arn }}'
+      - name: distribution_configuration_arn
+        value: '{{ distribution_configuration_arn }}'
+      - name: image_tests_configuration
         value:
-          ImageTestsEnabled: '{{ ImageTestsEnabled }}'
-          TimeoutMinutes: '{{ TimeoutMinutes }}'
-      - name: EnhancedImageMetadataEnabled
-        value: '{{ EnhancedImageMetadataEnabled }}'
-      - name: ExecutionRole
-        value: '{{ ExecutionRole }}'
-      - name: Tags
+          image_tests_enabled: '{{ image_tests_enabled }}'
+          timeout_minutes: '{{ timeout_minutes }}'
+      - name: enhanced_image_metadata_enabled
+        value: '{{ enhanced_image_metadata_enabled }}'
+      - name: execution_role
+        value: '{{ execution_role }}'
+      - name: tags
         value: {}
-
 ```
 </TabItem>
 </Tabs>
@@ -437,7 +436,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Arn>';
+AND Identifier = '{{ arn }}';
 ```
 
 
@@ -446,7 +445,7 @@ AND Identifier = '<Arn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.imagebuilder.images
-WHERE Identifier = '<Arn>'
+WHERE Identifier = '{{ arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/imagebuilder/infrastructure_configurations/index.md b/website/docs/services/imagebuilder/infrastructure_configurations/index.md
index f688b1268..50024a517 100644
--- a/website/docs/services/imagebuilder/infrastructure_configurations/index.md
+++ b/website/docs/services/imagebuilder/infrastructure_configurations/index.md
@@ -271,7 +271,7 @@ resource_tags,
 tags,
 placement
 FROM awscc.imagebuilder.infrastructure_configurations
-WHERE region = 'us-east-1' AND Identifier = '<Arn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -308,9 +308,9 @@ INSERT INTO awscc.imagebuilder.infrastructure_configurations (
  InstanceProfileName,
  region
 )
-SELECT 
-'{{ Name }}',
- '{{ InstanceProfileName }}',
+SELECT
+'{{ name }}',
+ '{{ instance_profile_name }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -335,21 +335,21 @@ INSERT INTO awscc.imagebuilder.infrastructure_configurations (
  Placement,
  region
 )
-SELECT 
- '{{ Name }}',
- '{{ Description }}',
- '{{ InstanceTypes }}',
- '{{ SecurityGroupIds }}',
- '{{ Logging }}',
- '{{ SubnetId }}',
- '{{ KeyPair }}',
- '{{ TerminateInstanceOnFailure }}',
- '{{ InstanceProfileName }}',
- '{{ InstanceMetadataOptions }}',
- '{{ SnsTopicArn }}',
- '{{ ResourceTags }}',
- '{{ Tags }}',
- '{{ Placement }}',
+SELECT
+ '{{ name }}',
+ '{{ description }}',
+ '{{ instance_types }}',
+ '{{ security_group_ids }}',
+ '{{ logging }}',
+ '{{ subnet_id }}',
+ '{{ key_pair }}',
+ '{{ terminate_instance_on_failure }}',
+ '{{ instance_profile_name }}',
+ '{{ instance_metadata_options }}',
+ '{{ sns_topic_arn }}',
+ '{{ resource_tags }}',
+ '{{ tags }}',
+ '{{ placement }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -367,46 +367,45 @@ globals:
 resources:
   - name: infrastructure_configuration
     props:
-      - name: Name
-        value: '{{ Name }}'
-      - name: Description
-        value: '{{ Description }}'
-      - name: InstanceTypes
+      - name: name
+        value: '{{ name }}'
+      - name: description
+        value: '{{ description }}'
+      - name: instance_types
         value:
-          - '{{ InstanceTypes[0] }}'
-      - name: SecurityGroupIds
+          - '{{ instance_types[0] }}'
+      - name: security_group_ids
         value:
-          - '{{ SecurityGroupIds[0] }}'
-      - name: Logging
+          - '{{ security_group_ids[0] }}'
+      - name: logging
         value:
-          S3Logs:
-            S3BucketName: '{{ S3BucketName }}'
-            S3KeyPrefix: '{{ S3KeyPrefix }}'
-      - name: SubnetId
-        value: '{{ SubnetId }}'
-      - name: KeyPair
-        value: '{{ KeyPair }}'
-      - name: TerminateInstanceOnFailure
-        value: '{{ TerminateInstanceOnFailure }}'
-      - name: InstanceProfileName
-        value: '{{ InstanceProfileName }}'
-      - name: InstanceMetadataOptions
+          s3_logs:
+            s3_bucket_name: '{{ s3_bucket_name }}'
+            s3_key_prefix: '{{ s3_key_prefix }}'
+      - name: subnet_id
+        value: '{{ subnet_id }}'
+      - name: key_pair
+        value: '{{ key_pair }}'
+      - name: terminate_instance_on_failure
+        value: '{{ terminate_instance_on_failure }}'
+      - name: instance_profile_name
+        value: '{{ instance_profile_name }}'
+      - name: instance_metadata_options
         value:
-          HttpPutResponseHopLimit: '{{ HttpPutResponseHopLimit }}'
-          HttpTokens: '{{ HttpTokens }}'
-      - name: SnsTopicArn
-        value: '{{ SnsTopicArn }}'
-      - name: ResourceTags
+          http_put_response_hop_limit: '{{ http_put_response_hop_limit }}'
+          http_tokens: '{{ http_tokens }}'
+      - name: sns_topic_arn
+        value: '{{ sns_topic_arn }}'
+      - name: resource_tags
         value: {}
-      - name: Tags
+      - name: tags
         value: {}
-      - name: Placement
+      - name: placement
         value:
-          AvailabilityZone: '{{ AvailabilityZone }}'
-          Tenancy: '{{ Tenancy }}'
-          HostId: '{{ HostId }}'
-          HostResourceGroupArn: '{{ HostResourceGroupArn }}'
-
+          availability_zone: '{{ availability_zone }}'
+          tenancy: '{{ tenancy }}'
+          host_id: '{{ host_id }}'
+          host_resource_group_arn: '{{ host_resource_group_arn }}'
 ```
 </TabItem>
 </Tabs>
@@ -434,7 +433,7 @@ SET PatchDocument = string('{{ {
     "Placement": placement
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Arn>';
+AND Identifier = '{{ arn }}';
 ```
 
 
@@ -443,7 +442,7 @@ AND Identifier = '<Arn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.imagebuilder.infrastructure_configurations
-WHERE Identifier = '<Arn>'
+WHERE Identifier = '{{ arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/imagebuilder/lifecycle_policies/index.md b/website/docs/services/imagebuilder/lifecycle_policies/index.md
index 7af67eeda..e576f58e6 100644
--- a/website/docs/services/imagebuilder/lifecycle_policies/index.md
+++ b/website/docs/services/imagebuilder/lifecycle_policies/index.md
@@ -313,7 +313,7 @@ policy_details,
 resource_selection,
 tags
 FROM awscc.imagebuilder.lifecycle_policies
-WHERE region = 'us-east-1' AND Identifier = '<Arn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -353,12 +353,12 @@ INSERT INTO awscc.imagebuilder.lifecycle_policies (
  ResourceSelection,
  region
 )
-SELECT 
-'{{ Name }}',
- '{{ ExecutionRole }}',
- '{{ ResourceType }}',
- '{{ PolicyDetails }}',
- '{{ ResourceSelection }}',
+SELECT
+'{{ name }}',
+ '{{ execution_role }}',
+ '{{ resource_type }}',
+ '{{ policy_details }}',
+ '{{ resource_selection }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -377,15 +377,15 @@ INSERT INTO awscc.imagebuilder.lifecycle_policies (
  Tags,
  region
 )
-SELECT 
- '{{ Name }}',
- '{{ Description }}',
- '{{ Status }}',
- '{{ ExecutionRole }}',
- '{{ ResourceType }}',
- '{{ PolicyDetails }}',
- '{{ ResourceSelection }}',
- '{{ Tags }}',
+SELECT
+ '{{ name }}',
+ '{{ description }}',
+ '{{ status }}',
+ '{{ execution_role }}',
+ '{{ resource_type }}',
+ '{{ policy_details }}',
+ '{{ resource_selection }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -403,50 +403,49 @@ globals:
 resources:
   - name: lifecycle_policy
     props:
-      - name: Name
-        value: '{{ Name }}'
-      - name: Description
-        value: '{{ Description }}'
-      - name: Status
-        value: '{{ Status }}'
-      - name: ExecutionRole
-        value: '{{ ExecutionRole }}'
-      - name: ResourceType
-        value: '{{ ResourceType }}'
-      - name: PolicyDetails
+      - name: name
+        value: '{{ name }}'
+      - name: description
+        value: '{{ description }}'
+      - name: status
+        value: '{{ status }}'
+      - name: execution_role
+        value: '{{ execution_role }}'
+      - name: resource_type
+        value: '{{ resource_type }}'
+      - name: policy_details
         value:
-          - Action:
-              Type: '{{ Type }}'
-              IncludeResources:
-                Amis: '{{ Amis }}'
-                Containers: '{{ Containers }}'
-                Snapshots: '{{ Snapshots }}'
-            Filter:
-              Type: '{{ Type }}'
-              Value: '{{ Value }}'
-              Unit: '{{ Unit }}'
-              RetainAtLeast: '{{ RetainAtLeast }}'
-            ExclusionRules:
-              TagMap: {}
-              Amis:
-                IsPublic: '{{ IsPublic }}'
-                Regions:
-                  - '{{ Regions[0] }}'
-                SharedAccounts:
-                  - '{{ SharedAccounts[0] }}'
-                LastLaunched:
-                  Value: '{{ Value }}'
-                  Unit: null
-                TagMap: {}
-      - name: ResourceSelection
+          - action:
+              type: '{{ type }}'
+              include_resources:
+                amis: '{{ amis }}'
+                containers: '{{ containers }}'
+                snapshots: '{{ snapshots }}'
+            filter:
+              type: '{{ type }}'
+              value: '{{ value }}'
+              unit: '{{ unit }}'
+              retain_at_least: '{{ retain_at_least }}'
+            exclusion_rules:
+              tag_map: {}
+              amis:
+                is_public: '{{ is_public }}'
+                regions:
+                  - '{{ regions[0] }}'
+                shared_accounts:
+                  - '{{ shared_accounts[0] }}'
+                last_launched:
+                  value: '{{ value }}'
+                  unit: null
+                tag_map: {}
+      - name: resource_selection
         value:
-          Recipes:
-            - Name: '{{ Name }}'
-              SemanticVersion: '{{ SemanticVersion }}'
-          TagMap: {}
-      - name: Tags
+          recipes:
+            - name: '{{ name }}'
+              semantic_version: '{{ semantic_version }}'
+          tag_map: {}
+      - name: tags
         value: {}
-
 ```
 </TabItem>
 </Tabs>
@@ -468,7 +467,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Arn>';
+AND Identifier = '{{ arn }}';
 ```
 
 
@@ -477,7 +476,7 @@ AND Identifier = '<Arn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.imagebuilder.lifecycle_policies
-WHERE Identifier = '<Arn>'
+WHERE Identifier = '{{ arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/imagebuilder/workflows/index.md b/website/docs/services/imagebuilder/workflows/index.md
index 519884a27..3c0d92d3c 100644
--- a/website/docs/services/imagebuilder/workflows/index.md
+++ b/website/docs/services/imagebuilder/workflows/index.md
@@ -188,7 +188,7 @@ uri,
 kms_key_id,
 tags
 FROM awscc.imagebuilder.workflows
-WHERE region = 'us-east-1' AND Identifier = '<Arn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -226,10 +226,10 @@ INSERT INTO awscc.imagebuilder.workflows (
  Type,
  region
 )
-SELECT 
-'{{ Name }}',
- '{{ Version }}',
- '{{ Type }}',
+SELECT
+'{{ name }}',
+ '{{ version }}',
+ '{{ type }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -249,16 +249,16 @@ INSERT INTO awscc.imagebuilder.workflows (
  Tags,
  region
 )
-SELECT 
- '{{ Name }}',
- '{{ Version }}',
- '{{ Description }}',
- '{{ ChangeDescription }}',
- '{{ Type }}',
- '{{ Data }}',
- '{{ Uri }}',
- '{{ KmsKeyId }}',
- '{{ Tags }}',
+SELECT
+ '{{ name }}',
+ '{{ version }}',
+ '{{ description }}',
+ '{{ change_description }}',
+ '{{ type }}',
+ '{{ data }}',
+ '{{ uri }}',
+ '{{ kms_key_id }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -276,25 +276,24 @@ globals:
 resources:
   - name: workflow
     props:
-      - name: Name
-        value: '{{ Name }}'
-      - name: Version
-        value: '{{ Version }}'
-      - name: Description
-        value: '{{ Description }}'
-      - name: ChangeDescription
-        value: '{{ ChangeDescription }}'
-      - name: Type
-        value: '{{ Type }}'
-      - name: Data
-        value: '{{ Data }}'
-      - name: Uri
-        value: '{{ Uri }}'
-      - name: KmsKeyId
-        value: '{{ KmsKeyId }}'
-      - name: Tags
+      - name: name
+        value: '{{ name }}'
+      - name: version
+        value: '{{ version }}'
+      - name: description
+        value: '{{ description }}'
+      - name: change_description
+        value: '{{ change_description }}'
+      - name: type
+        value: '{{ type }}'
+      - name: data
+        value: '{{ data }}'
+      - name: uri
+        value: '{{ uri }}'
+      - name: kms_key_id
+        value: '{{ kms_key_id }}'
+      - name: tags
         value: {}
-
 ```
 </TabItem>
 </Tabs>
@@ -310,7 +309,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Arn>';
+AND Identifier = '{{ arn }}';
 ```
 
 
@@ -319,7 +318,7 @@ AND Identifier = '<Arn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.imagebuilder.workflows
-WHERE Identifier = '<Arn>'
+WHERE Identifier = '{{ arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/inspector/assessment_targets/index.md b/website/docs/services/inspector/assessment_targets/index.md
index c3391bd3d..a96843c79 100644
--- a/website/docs/services/inspector/assessment_targets/index.md
+++ b/website/docs/services/inspector/assessment_targets/index.md
@@ -146,7 +146,7 @@ arn,
 assessment_target_name,
 resource_group_arn
 FROM awscc.inspector.assessment_targets
-WHERE region = 'us-east-1' AND Identifier = '<Arn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -183,9 +183,9 @@ INSERT INTO awscc.inspector.assessment_targets (
  ResourceGroupArn,
  region
 )
-SELECT 
-'{{ AssessmentTargetName }}',
- '{{ ResourceGroupArn }}',
+SELECT
+'{{ assessment_target_name }}',
+ '{{ resource_group_arn }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -198,9 +198,9 @@ INSERT INTO awscc.inspector.assessment_targets (
  ResourceGroupArn,
  region
 )
-SELECT 
- '{{ AssessmentTargetName }}',
- '{{ ResourceGroupArn }}',
+SELECT
+ '{{ assessment_target_name }}',
+ '{{ resource_group_arn }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -218,11 +218,10 @@ globals:
 resources:
   - name: assessment_target
     props:
-      - name: AssessmentTargetName
-        value: '{{ AssessmentTargetName }}'
-      - name: ResourceGroupArn
-        value: '{{ ResourceGroupArn }}'
-
+      - name: assessment_target_name
+        value: '{{ assessment_target_name }}'
+      - name: resource_group_arn
+        value: '{{ resource_group_arn }}'
 ```
 </TabItem>
 </Tabs>
@@ -238,7 +237,7 @@ SET PatchDocument = string('{{ {
     "ResourceGroupArn": resource_group_arn
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Arn>';
+AND Identifier = '{{ arn }}';
 ```
 
 
@@ -247,7 +246,7 @@ AND Identifier = '<Arn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.inspector.assessment_targets
-WHERE Identifier = '<Arn>'
+WHERE Identifier = '{{ arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/inspector/assessment_templates/index.md b/website/docs/services/inspector/assessment_templates/index.md
index 5edef4ba8..d9d4f480b 100644
--- a/website/docs/services/inspector/assessment_templates/index.md
+++ b/website/docs/services/inspector/assessment_templates/index.md
@@ -170,7 +170,7 @@ assessment_template_name,
 rules_package_arns,
 user_attributes_for_findings
 FROM awscc.inspector.assessment_templates
-WHERE region = 'us-east-1' AND Identifier = '<Arn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -208,10 +208,10 @@ INSERT INTO awscc.inspector.assessment_templates (
  RulesPackageArns,
  region
 )
-SELECT 
-'{{ AssessmentTargetArn }}',
- '{{ DurationInSeconds }}',
- '{{ RulesPackageArns }}',
+SELECT
+'{{ assessment_target_arn }}',
+ '{{ duration_in_seconds }}',
+ '{{ rules_package_arns }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -227,12 +227,12 @@ INSERT INTO awscc.inspector.assessment_templates (
  UserAttributesForFindings,
  region
 )
-SELECT 
- '{{ AssessmentTargetArn }}',
- '{{ DurationInSeconds }}',
- '{{ AssessmentTemplateName }}',
- '{{ RulesPackageArns }}',
- '{{ UserAttributesForFindings }}',
+SELECT
+ '{{ assessment_target_arn }}',
+ '{{ duration_in_seconds }}',
+ '{{ assessment_template_name }}',
+ '{{ rules_package_arns }}',
+ '{{ user_attributes_for_findings }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -250,20 +250,19 @@ globals:
 resources:
   - name: assessment_template
     props:
-      - name: AssessmentTargetArn
-        value: '{{ AssessmentTargetArn }}'
-      - name: DurationInSeconds
-        value: '{{ DurationInSeconds }}'
-      - name: AssessmentTemplateName
-        value: '{{ AssessmentTemplateName }}'
-      - name: RulesPackageArns
+      - name: assessment_target_arn
+        value: '{{ assessment_target_arn }}'
+      - name: duration_in_seconds
+        value: '{{ duration_in_seconds }}'
+      - name: assessment_template_name
+        value: '{{ assessment_template_name }}'
+      - name: rules_package_arns
         value:
-          - '{{ RulesPackageArns[0] }}'
-      - name: UserAttributesForFindings
+          - '{{ rules_package_arns[0] }}'
+      - name: user_attributes_for_findings
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -274,7 +273,7 @@ resources:
 ```sql
 /*+ delete */
 DELETE FROM awscc.inspector.assessment_templates
-WHERE Identifier = '<Arn>'
+WHERE Identifier = '{{ arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/inspector/resource_groups/index.md b/website/docs/services/inspector/resource_groups/index.md
index 0c3dc3e65..4163c4c2f 100644
--- a/website/docs/services/inspector/resource_groups/index.md
+++ b/website/docs/services/inspector/resource_groups/index.md
@@ -101,7 +101,7 @@ region,
 arn,
 resource_group_tags
 FROM awscc.inspector.resource_groups
-WHERE region = 'us-east-1' AND Identifier = '<Arn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ arn }}';
 ```
 
 ## `INSERT` example
@@ -124,8 +124,8 @@ INSERT INTO awscc.inspector.resource_groups (
  ResourceGroupTags,
  region
 )
-SELECT 
-'{{ ResourceGroupTags }}',
+SELECT
+'{{ resource_group_tags }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -137,8 +137,8 @@ INSERT INTO awscc.inspector.resource_groups (
  ResourceGroupTags,
  region
 )
-SELECT 
- '{{ ResourceGroupTags }}',
+SELECT
+ '{{ resource_group_tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -156,11 +156,10 @@ globals:
 resources:
   - name: resource_group
     props:
-      - name: ResourceGroupTags
+      - name: resource_group_tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -171,7 +170,7 @@ resources:
 ```sql
 /*+ delete */
 DELETE FROM awscc.inspector.resource_groups
-WHERE Identifier = '<Arn>'
+WHERE Identifier = '{{ arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/inspectorv2/cis_scan_configurations/index.md b/website/docs/services/inspectorv2/cis_scan_configurations/index.md
index beba67112..5002cf459 100644
--- a/website/docs/services/inspectorv2/cis_scan_configurations/index.md
+++ b/website/docs/services/inspectorv2/cis_scan_configurations/index.md
@@ -265,7 +265,7 @@ targets,
 arn,
 tags
 FROM awscc.inspectorv2.cis_scan_configurations
-WHERE region = 'us-east-1' AND Identifier = '<Arn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -304,11 +304,11 @@ INSERT INTO awscc.inspectorv2.cis_scan_configurations (
  Targets,
  region
 )
-SELECT 
-'{{ ScanName }}',
- '{{ SecurityLevel }}',
- '{{ Schedule }}',
- '{{ Targets }}',
+SELECT
+'{{ scan_name }}',
+ '{{ security_level }}',
+ '{{ schedule }}',
+ '{{ targets }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -324,12 +324,12 @@ INSERT INTO awscc.inspectorv2.cis_scan_configurations (
  Tags,
  region
 )
-SELECT 
- '{{ ScanName }}',
- '{{ SecurityLevel }}',
- '{{ Schedule }}',
- '{{ Targets }}',
- '{{ Tags }}',
+SELECT
+ '{{ scan_name }}',
+ '{{ security_level }}',
+ '{{ schedule }}',
+ '{{ targets }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -347,17 +347,16 @@ globals:
 resources:
   - name: cis_scan_configuration
     props:
-      - name: ScanName
-        value: '{{ ScanName }}'
-      - name: SecurityLevel
-        value: '{{ SecurityLevel }}'
-      - name: Schedule
+      - name: scan_name
+        value: '{{ scan_name }}'
+      - name: security_level
+        value: '{{ security_level }}'
+      - name: schedule
         value: null
-      - name: Targets
+      - name: targets
         value: null
-      - name: Tags
+      - name: tags
         value: {}
-
 ```
 </TabItem>
 </Tabs>
@@ -377,7 +376,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Arn>';
+AND Identifier = '{{ arn }}';
 ```
 
 
@@ -386,7 +385,7 @@ AND Identifier = '<Arn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.inspectorv2.cis_scan_configurations
-WHERE Identifier = '<Arn>'
+WHERE Identifier = '{{ arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/inspectorv2/code_security_integrations/index.md b/website/docs/services/inspectorv2/code_security_integrations/index.md
index 874286267..ace730440 100644
--- a/website/docs/services/inspectorv2/code_security_integrations/index.md
+++ b/website/docs/services/inspectorv2/code_security_integrations/index.md
@@ -244,7 +244,7 @@ created_at,
 last_updated_at,
 tags
 FROM awscc.inspectorv2.code_security_integrations
-WHERE region = 'us-east-1' AND Identifier = '<Arn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -284,12 +284,12 @@ INSERT INTO awscc.inspectorv2.code_security_integrations (
  Tags,
  region
 )
-SELECT 
-'{{ Name }}',
- '{{ Type }}',
- '{{ CreateIntegrationDetails }}',
- '{{ UpdateIntegrationDetails }}',
- '{{ Tags }}',
+SELECT
+'{{ name }}',
+ '{{ type }}',
+ '{{ create_integration_details }}',
+ '{{ update_integration_details }}',
+ '{{ tags }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -305,12 +305,12 @@ INSERT INTO awscc.inspectorv2.code_security_integrations (
  Tags,
  region
 )
-SELECT 
- '{{ Name }}',
- '{{ Type }}',
- '{{ CreateIntegrationDetails }}',
- '{{ UpdateIntegrationDetails }}',
- '{{ Tags }}',
+SELECT
+ '{{ name }}',
+ '{{ type }}',
+ '{{ create_integration_details }}',
+ '{{ update_integration_details }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -328,25 +328,24 @@ globals:
 resources:
   - name: code_security_integration
     props:
-      - name: Name
-        value: '{{ Name }}'
-      - name: Type
-        value: '{{ Type }}'
-      - name: CreateIntegrationDetails
+      - name: name
+        value: '{{ name }}'
+      - name: type
+        value: '{{ type }}'
+      - name: create_integration_details
         value:
-          gitlabSelfManaged:
-            instanceUrl: '{{ instanceUrl }}'
-            accessToken: '{{ accessToken }}'
-      - name: UpdateIntegrationDetails
+          gitlab_self_managed:
+            instance_url: '{{ instance_url }}'
+            access_token: '{{ access_token }}'
+      - name: update_integration_details
         value:
-          gitlabSelfManaged:
-            authCode: '{{ authCode }}'
+          gitlab_self_managed:
+            auth_code: '{{ auth_code }}'
           github:
             code: '{{ code }}'
-            installationId: '{{ installationId }}'
-      - name: Tags
+            installation_id: '{{ installation_id }}'
+      - name: tags
         value: {}
-
 ```
 </TabItem>
 </Tabs>
@@ -364,7 +363,7 @@ SET PatchDocument = string('{{ {
     "UpdateIntegrationDetails": update_integration_details
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Arn>';
+AND Identifier = '{{ arn }}';
 ```
 
 
@@ -373,7 +372,7 @@ AND Identifier = '<Arn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.inspectorv2.code_security_integrations
-WHERE Identifier = '<Arn>'
+WHERE Identifier = '{{ arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/inspectorv2/code_security_scan_configurations/index.md b/website/docs/services/inspectorv2/code_security_scan_configurations/index.md
index a59b79d0d..22020a59c 100644
--- a/website/docs/services/inspectorv2/code_security_scan_configurations/index.md
+++ b/website/docs/services/inspectorv2/code_security_scan_configurations/index.md
@@ -200,7 +200,7 @@ scope_settings,
 arn,
 tags
 FROM awscc.inspectorv2.code_security_scan_configurations
-WHERE region = 'us-east-1' AND Identifier = '<Arn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -240,12 +240,12 @@ INSERT INTO awscc.inspectorv2.code_security_scan_configurations (
  Tags,
  region
 )
-SELECT 
-'{{ Name }}',
- '{{ Level }}',
- '{{ Configuration }}',
- '{{ ScopeSettings }}',
- '{{ Tags }}',
+SELECT
+'{{ name }}',
+ '{{ level }}',
+ '{{ configuration }}',
+ '{{ scope_settings }}',
+ '{{ tags }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -261,12 +261,12 @@ INSERT INTO awscc.inspectorv2.code_security_scan_configurations (
  Tags,
  region
 )
-SELECT 
- '{{ Name }}',
- '{{ Level }}',
- '{{ Configuration }}',
- '{{ ScopeSettings }}',
- '{{ Tags }}',
+SELECT
+ '{{ name }}',
+ '{{ level }}',
+ '{{ configuration }}',
+ '{{ scope_settings }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -284,23 +284,22 @@ globals:
 resources:
   - name: code_security_scan_configuration
     props:
-      - name: Name
-        value: '{{ Name }}'
-      - name: Level
-        value: '{{ Level }}'
-      - name: Configuration
+      - name: name
+        value: '{{ name }}'
+      - name: level
+        value: '{{ level }}'
+      - name: configuration
         value:
-          Name: '{{ Name }}'
-          Level: null
-          Configuration: null
-          ScopeSettings:
-            projectSelectionScope: '{{ projectSelectionScope }}'
-          Tags: {}
-      - name: ScopeSettings
+          name: '{{ name }}'
+          level: null
+          configuration: null
+          scope_settings:
+            project_selection_scope: '{{ project_selection_scope }}'
+          tags: {}
+      - name: scope_settings
         value: null
-      - name: Tags
+      - name: tags
         value: null
-
 ```
 </TabItem>
 </Tabs>
@@ -316,7 +315,7 @@ SET PatchDocument = string('{{ {
     "Configuration": configuration
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Arn>';
+AND Identifier = '{{ arn }}';
 ```
 
 
@@ -325,7 +324,7 @@ AND Identifier = '<Arn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.inspectorv2.code_security_scan_configurations
-WHERE Identifier = '<Arn>'
+WHERE Identifier = '{{ arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/inspectorv2/filters/index.md b/website/docs/services/inspectorv2/filters/index.md
index 92e5bc476..b46d827b1 100644
--- a/website/docs/services/inspectorv2/filters/index.md
+++ b/website/docs/services/inspectorv2/filters/index.md
@@ -251,7 +251,7 @@ filter_action,
 arn,
 tags
 FROM awscc.inspectorv2.filters
-WHERE region = 'us-east-1' AND Identifier = '<Arn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -289,10 +289,10 @@ INSERT INTO awscc.inspectorv2.filters (
  FilterAction,
  region
 )
-SELECT 
-'{{ Name }}',
- '{{ FilterCriteria }}',
- '{{ FilterAction }}',
+SELECT
+'{{ name }}',
+ '{{ filter_criteria }}',
+ '{{ filter_action }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -308,12 +308,12 @@ INSERT INTO awscc.inspectorv2.filters (
  Tags,
  region
 )
-SELECT 
- '{{ Name }}',
- '{{ Description }}',
- '{{ FilterCriteria }}',
- '{{ FilterAction }}',
- '{{ Tags }}',
+SELECT
+ '{{ name }}',
+ '{{ description }}',
+ '{{ filter_criteria }}',
+ '{{ filter_action }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -331,78 +331,77 @@ globals:
 resources:
   - name: filter
     props:
-      - name: Name
-        value: '{{ Name }}'
-      - name: Description
-        value: '{{ Description }}'
-      - name: FilterCriteria
+      - name: name
+        value: '{{ name }}'
+      - name: description
+        value: '{{ description }}'
+      - name: filter_criteria
         value:
-          AwsAccountId:
-            - Comparison: '{{ Comparison }}'
-              Value: '{{ Value }}'
-          CodeVulnerabilityDetectorName: null
-          CodeVulnerabilityDetectorTags: null
-          CodeVulnerabilityFilePath: null
-          ComponentId: null
-          ComponentType: null
-          Ec2InstanceImageId: null
-          Ec2InstanceSubnetId: null
-          Ec2InstanceVpcId: null
-          EcrImageArchitecture: null
-          EcrImageHash: null
-          EcrImagePushedAt:
-            - EndInclusive: '{{ EndInclusive }}'
-              StartInclusive: null
-          EcrImageRegistry: null
-          EcrImageRepositoryName: null
-          EcrImageTags: null
-          EpssScore:
-            - LowerInclusive: null
-              UpperInclusive: null
-          ExploitAvailable: null
-          FindingArn: null
-          FindingStatus: null
-          FindingType: null
-          FirstObservedAt: null
-          FixAvailable: null
-          InspectorScore: null
-          LambdaFunctionExecutionRoleArn: null
-          LambdaFunctionLastModifiedAt: null
-          LambdaFunctionLayers: null
-          LambdaFunctionName: null
-          LambdaFunctionRuntime: null
-          LastObservedAt: null
-          NetworkProtocol: null
-          PortRange:
-            - BeginInclusive: '{{ BeginInclusive }}'
-              EndInclusive: null
-          RelatedVulnerabilities: null
-          ResourceId: null
-          ResourceTags:
-            - Comparison: '{{ Comparison }}'
-              Key: '{{ Key }}'
-              Value: '{{ Value }}'
-          ResourceType: null
-          Severity: null
-          Title: null
-          UpdatedAt: null
-          VendorSeverity: null
-          VulnerabilityId: null
-          VulnerabilitySource: null
-          VulnerablePackages:
-            - Architecture: null
-              Epoch: null
-              FilePath: null
-              Name: null
-              Release: null
-              SourceLambdaLayerArn: null
-              SourceLayerHash: null
-              Version: null
-      - name: FilterAction
-        value: '{{ FilterAction }}'
-      - name: Tags
+          aws_account_id:
+            - comparison: '{{ comparison }}'
+              value: '{{ value }}'
+          code_vulnerability_detector_name: null
+          code_vulnerability_detector_tags: null
+          code_vulnerability_file_path: null
+          component_id: null
+          component_type: null
+          ec2_instance_image_id: null
+          ec2_instance_subnet_id: null
+          ec2_instance_vpc_id: null
+          ecr_image_architecture: null
+          ecr_image_hash: null
+          ecr_image_pushed_at:
+            - end_inclusive: '{{ end_inclusive }}'
+              start_inclusive: null
+          ecr_image_registry: null
+          ecr_image_repository_name: null
+          ecr_image_tags: null
+          epss_score:
+            - lower_inclusive: null
+              upper_inclusive: null
+          exploit_available: null
+          finding_arn: null
+          finding_status: null
+          finding_type: null
+          first_observed_at: null
+          fix_available: null
+          inspector_score: null
+          lambda_function_execution_role_arn: null
+          lambda_function_last_modified_at: null
+          lambda_function_layers: null
+          lambda_function_name: null
+          lambda_function_runtime: null
+          last_observed_at: null
+          network_protocol: null
+          port_range:
+            - begin_inclusive: '{{ begin_inclusive }}'
+              end_inclusive: null
+          related_vulnerabilities: null
+          resource_id: null
+          resource_tags:
+            - comparison: '{{ comparison }}'
+              key: '{{ key }}'
+              value: '{{ value }}'
+          resource_type: null
+          severity: null
+          title: null
+          updated_at: null
+          vendor_severity: null
+          vulnerability_id: null
+          vulnerability_source: null
+          vulnerable_packages:
+            - architecture: null
+              epoch: null
+              file_path: null
+              name: null
+              release: null
+              source_lambda_layer_arn: null
+              source_layer_hash: null
+              version: null
+      - name: filter_action
+        value: '{{ filter_action }}'
+      - name: tags
         value: {}
-
 ```
 </TabItem>
 </Tabs>
@@ -422,7 +421,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Arn>';
+AND Identifier = '{{ arn }}';
 ```
 
 
@@ -431,7 +430,7 @@ AND Identifier = '<Arn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.inspectorv2.filters
-WHERE Identifier = '<Arn>'
+WHERE Identifier = '{{ arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/internetmonitor/monitors/index.md b/website/docs/services/internetmonitor/monitors/index.md
index f95e1f42a..229b2faf1 100644
--- a/website/docs/services/internetmonitor/monitors/index.md
+++ b/website/docs/services/internetmonitor/monitors/index.md
@@ -295,7 +295,7 @@ traffic_percentage_to_monitor,
 internet_measurements_log_delivery,
 health_events_config
 FROM awscc.internetmonitor.monitors
-WHERE region = 'us-east-1' AND Identifier = '<MonitorName>';
+WHERE region = 'us-east-1' AND Identifier = '{{ monitor_name }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -331,8 +331,8 @@ INSERT INTO awscc.internetmonitor.monitors (
  MonitorName,
  region
 )
-SELECT 
-'{{ MonitorName }}',
+SELECT
+'{{ monitor_name }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -355,19 +355,19 @@ INSERT INTO awscc.internetmonitor.monitors (
  HealthEventsConfig,
  region
 )
-SELECT 
- '{{ MonitorName }}',
- '{{ LinkedAccountId }}',
- '{{ IncludeLinkedAccounts }}',
- '{{ Resources }}',
- '{{ ResourcesToAdd }}',
- '{{ ResourcesToRemove }}',
- '{{ Status }}',
- '{{ Tags }}',
- '{{ MaxCityNetworksToMonitor }}',
- '{{ TrafficPercentageToMonitor }}',
- '{{ InternetMeasurementsLogDelivery }}',
- '{{ HealthEventsConfig }}',
+SELECT
+ '{{ monitor_name }}',
+ '{{ linked_account_id }}',
+ '{{ include_linked_accounts }}',
+ '{{ resources }}',
+ '{{ resources_to_add }}',
+ '{{ resources_to_remove }}',
+ '{{ status }}',
+ '{{ tags }}',
+ '{{ max_city_networks_to_monitor }}',
+ '{{ traffic_percentage_to_monitor }}',
+ '{{ internet_measurements_log_delivery }}',
+ '{{ health_events_config }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -385,47 +385,46 @@ globals:
 resources:
   - name: monitor
     props:
-      - name: MonitorName
-        value: '{{ MonitorName }}'
-      - name: LinkedAccountId
-        value: '{{ LinkedAccountId }}'
-      - name: IncludeLinkedAccounts
-        value: '{{ IncludeLinkedAccounts }}'
-      - name: Resources
+      - name: monitor_name
+        value: '{{ monitor_name }}'
+      - name: linked_account_id
+        value: '{{ linked_account_id }}'
+      - name: include_linked_accounts
+        value: '{{ include_linked_accounts }}'
+      - name: resources
         value:
-          - '{{ Resources[0] }}'
-      - name: ResourcesToAdd
+          - '{{ resources[0] }}'
+      - name: resources_to_add
         value:
-          - '{{ ResourcesToAdd[0] }}'
-      - name: ResourcesToRemove
+          - '{{ resources_to_add[0] }}'
+      - name: resources_to_remove
         value:
-          - '{{ ResourcesToRemove[0] }}'
-      - name: Status
-        value: '{{ Status }}'
-      - name: Tags
+          - '{{ resources_to_remove[0] }}'
+      - name: status
+        value: '{{ status }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-      - name: MaxCityNetworksToMonitor
-        value: '{{ MaxCityNetworksToMonitor }}'
-      - name: TrafficPercentageToMonitor
-        value: '{{ TrafficPercentageToMonitor }}'
-      - name: InternetMeasurementsLogDelivery
+          - key: '{{ key }}'
+            value: '{{ value }}'
+      - name: max_city_networks_to_monitor
+        value: '{{ max_city_networks_to_monitor }}'
+      - name: traffic_percentage_to_monitor
+        value: '{{ traffic_percentage_to_monitor }}'
+      - name: internet_measurements_log_delivery
         value:
-          S3Config:
-            BucketName: '{{ BucketName }}'
-            BucketPrefix: '{{ BucketPrefix }}'
-            LogDeliveryStatus: '{{ LogDeliveryStatus }}'
-      - name: HealthEventsConfig
+          s3_config:
+            bucket_name: '{{ bucket_name }}'
+            bucket_prefix: '{{ bucket_prefix }}'
+            log_delivery_status: '{{ log_delivery_status }}'
+      - name: health_events_config
         value:
-          AvailabilityScoreThreshold: null
-          PerformanceScoreThreshold: null
-          AvailabilityLocalHealthEventsConfig:
-            Status: '{{ Status }}'
-            HealthScoreThreshold: null
-            MinTrafficImpact: null
-          PerformanceLocalHealthEventsConfig: null
-
+          availability_score_threshold: null
+          performance_score_threshold: null
+          availability_local_health_events_config:
+            status: '{{ status }}'
+            health_score_threshold: null
+            min_traffic_impact: null
+          performance_local_health_events_config: null
 ```
 </TabItem>
 </Tabs>
@@ -451,7 +450,7 @@ SET PatchDocument = string('{{ {
     "HealthEventsConfig": health_events_config
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<MonitorName>';
+AND Identifier = '{{ monitor_name }}';
 ```
 
 
@@ -460,7 +459,7 @@ AND Identifier = '<MonitorName>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.internetmonitor.monitors
-WHERE Identifier = '<MonitorName>'
+WHERE Identifier = '{{ monitor_name }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/invoicing/invoice_units/index.md b/website/docs/services/invoicing/invoice_units/index.md
index 6a238e699..e57980347 100644
--- a/website/docs/services/invoicing/invoice_units/index.md
+++ b/website/docs/services/invoicing/invoice_units/index.md
@@ -195,7 +195,7 @@ rule,
 last_modified,
 resource_tags
 FROM awscc.invoicing.invoice_units
-WHERE region = 'us-east-1' AND Identifier = '<InvoiceUnitArn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ invoice_unit_arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -233,10 +233,10 @@ INSERT INTO awscc.invoicing.invoice_units (
  Rule,
  region
 )
-SELECT 
-'{{ InvoiceReceiver }}',
- '{{ Name }}',
- '{{ Rule }}',
+SELECT
+'{{ invoice_receiver }}',
+ '{{ name }}',
+ '{{ rule }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -253,13 +253,13 @@ INSERT INTO awscc.invoicing.invoice_units (
  ResourceTags,
  region
 )
-SELECT 
- '{{ InvoiceReceiver }}',
- '{{ Name }}',
- '{{ Description }}',
- '{{ TaxInheritanceDisabled }}',
- '{{ Rule }}',
- '{{ ResourceTags }}',
+SELECT
+ '{{ invoice_receiver }}',
+ '{{ name }}',
+ '{{ description }}',
+ '{{ tax_inheritance_disabled }}',
+ '{{ rule }}',
+ '{{ resource_tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -277,23 +277,22 @@ globals:
 resources:
   - name: invoice_unit
     props:
-      - name: InvoiceReceiver
-        value: '{{ InvoiceReceiver }}'
-      - name: Name
-        value: '{{ Name }}'
-      - name: Description
-        value: '{{ Description }}'
-      - name: TaxInheritanceDisabled
-        value: '{{ TaxInheritanceDisabled }}'
-      - name: Rule
+      - name: invoice_receiver
+        value: '{{ invoice_receiver }}'
+      - name: name
+        value: '{{ name }}'
+      - name: description
+        value: '{{ description }}'
+      - name: tax_inheritance_disabled
+        value: '{{ tax_inheritance_disabled }}'
+      - name: rule
         value:
-          LinkedAccounts:
-            - '{{ LinkedAccounts[0] }}'
-      - name: ResourceTags
+          linked_accounts:
+            - '{{ linked_accounts[0] }}'
+      - name: resource_tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -312,7 +311,7 @@ SET PatchDocument = string('{{ {
     "ResourceTags": resource_tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<InvoiceUnitArn>';
+AND Identifier = '{{ invoice_unit_arn }}';
 ```
 
 
@@ -321,7 +320,7 @@ AND Identifier = '<InvoiceUnitArn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.invoicing.invoice_units
-WHERE Identifier = '<InvoiceUnitArn>'
+WHERE Identifier = '{{ invoice_unit_arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/iot/account_audit_configurations/index.md b/website/docs/services/iot/account_audit_configurations/index.md
index d835bb256..542c3eb73 100644
--- a/website/docs/services/iot/account_audit_configurations/index.md
+++ b/website/docs/services/iot/account_audit_configurations/index.md
@@ -238,7 +238,7 @@ audit_check_configurations,
 audit_notification_target_configurations,
 role_arn
 FROM awscc.iot.account_audit_configurations
-WHERE region = 'us-east-1' AND Identifier = '<AccountId>';
+WHERE region = 'us-east-1' AND Identifier = '{{ account_id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -276,10 +276,10 @@ INSERT INTO awscc.iot.account_audit_configurations (
  RoleArn,
  region
 )
-SELECT 
-'{{ AccountId }}',
- '{{ AuditCheckConfigurations }}',
- '{{ RoleArn }}',
+SELECT
+'{{ account_id }}',
+ '{{ audit_check_configurations }}',
+ '{{ role_arn }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -294,11 +294,11 @@ INSERT INTO awscc.iot.account_audit_configurations (
  RoleArn,
  region
 )
-SELECT 
- '{{ AccountId }}',
- '{{ AuditCheckConfigurations }}',
- '{{ AuditNotificationTargetConfigurations }}',
- '{{ RoleArn }}',
+SELECT
+ '{{ account_id }}',
+ '{{ audit_check_configurations }}',
+ '{{ audit_notification_target_configurations }}',
+ '{{ role_arn }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -316,43 +316,42 @@ globals:
 resources:
   - name: account_audit_configuration
     props:
-      - name: AccountId
-        value: '{{ AccountId }}'
-      - name: AuditCheckConfigurations
+      - name: account_id
+        value: '{{ account_id }}'
+      - name: audit_check_configurations
         value:
-          AuthenticatedCognitoRoleOverlyPermissiveCheck:
-            Enabled: '{{ Enabled }}'
-          CaCertificateExpiringCheck: null
-          CaCertificateKeyQualityCheck: null
-          ConflictingClientIdsCheck: null
-          DeviceCertificateExpiringCheck:
-            Enabled: '{{ Enabled }}'
-            Configuration:
-              CertExpirationThresholdInDays: '{{ CertExpirationThresholdInDays }}'
-          DeviceCertificateKeyQualityCheck: null
-          DeviceCertificateSharedCheck: null
-          IotPolicyOverlyPermissiveCheck: null
-          IotRoleAliasAllowsAccessToUnusedServicesCheck: null
-          IotRoleAliasOverlyPermissiveCheck: null
-          LoggingDisabledCheck: null
-          RevokedCaCertificateStillActiveCheck: null
-          RevokedDeviceCertificateStillActiveCheck: null
-          UnauthenticatedCognitoRoleOverlyPermissiveCheck: null
-          IntermediateCaRevokedForActiveDeviceCertificatesCheck: null
-          IoTPolicyPotentialMisConfigurationCheck: null
-          DeviceCertificateAgeCheck:
-            Enabled: '{{ Enabled }}'
-            Configuration:
-              CertAgeThresholdInDays: null
-      - name: AuditNotificationTargetConfigurations
+          authenticated_cognito_role_overly_permissive_check:
+            enabled: '{{ enabled }}'
+          ca_certificate_expiring_check: null
+          ca_certificate_key_quality_check: null
+          conflicting_client_ids_check: null
+          device_certificate_expiring_check:
+            enabled: '{{ enabled }}'
+            configuration:
+              cert_expiration_threshold_in_days: '{{ cert_expiration_threshold_in_days }}'
+          device_certificate_key_quality_check: null
+          device_certificate_shared_check: null
+          iot_policy_overly_permissive_check: null
+          iot_role_alias_allows_access_to_unused_services_check: null
+          iot_role_alias_overly_permissive_check: null
+          logging_disabled_check: null
+          revoked_ca_certificate_still_active_check: null
+          revoked_device_certificate_still_active_check: null
+          unauthenticated_cognito_role_overly_permissive_check: null
+          intermediate_ca_revoked_for_active_device_certificates_check: null
+          io_tpolicy_potential_mis_configuration_check: null
+          device_certificate_age_check:
+            enabled: '{{ enabled }}'
+            configuration:
+              cert_age_threshold_in_days: null
+      - name: audit_notification_target_configurations
         value:
-          Sns:
-            TargetArn: '{{ TargetArn }}'
-            RoleArn: '{{ RoleArn }}'
-            Enabled: '{{ Enabled }}'
-      - name: RoleArn
-        value: '{{ RoleArn }}'
-
+          sns:
+            target_arn: '{{ target_arn }}'
+            role_arn: '{{ role_arn }}'
+            enabled: '{{ enabled }}'
+      - name: role_arn
+        value: '{{ role_arn }}'
 ```
 </TabItem>
 </Tabs>
@@ -370,7 +369,7 @@ SET PatchDocument = string('{{ {
     "RoleArn": role_arn
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<AccountId>';
+AND Identifier = '{{ account_id }}';
 ```
 
 
@@ -379,7 +378,7 @@ AND Identifier = '<AccountId>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.iot.account_audit_configurations
-WHERE Identifier = '<AccountId>'
+WHERE Identifier = '{{ account_id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/iot/authorizers/index.md b/website/docs/services/iot/authorizers/index.md
index 4897d4090..f7025bc2c 100644
--- a/website/docs/services/iot/authorizers/index.md
+++ b/website/docs/services/iot/authorizers/index.md
@@ -194,7 +194,7 @@ token_signing_public_keys,
 enable_caching_for_http,
 tags
 FROM awscc.iot.authorizers
-WHERE region = 'us-east-1' AND Identifier = '<AuthorizerName>';
+WHERE region = 'us-east-1' AND Identifier = '{{ authorizer_name }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -230,8 +230,8 @@ INSERT INTO awscc.iot.authorizers (
  AuthorizerFunctionArn,
  region
 )
-SELECT 
-'{{ AuthorizerFunctionArn }}',
+SELECT
+'{{ authorizer_function_arn }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -250,15 +250,15 @@ INSERT INTO awscc.iot.authorizers (
  Tags,
  region
 )
-SELECT 
- '{{ AuthorizerFunctionArn }}',
- '{{ AuthorizerName }}',
- '{{ SigningDisabled }}',
- '{{ Status }}',
- '{{ TokenKeyName }}',
- '{{ TokenSigningPublicKeys }}',
- '{{ EnableCachingForHttp }}',
- '{{ Tags }}',
+SELECT
+ '{{ authorizer_function_arn }}',
+ '{{ authorizer_name }}',
+ '{{ signing_disabled }}',
+ '{{ status }}',
+ '{{ token_key_name }}',
+ '{{ token_signing_public_keys }}',
+ '{{ enable_caching_for_http }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -276,25 +276,24 @@ globals:
 resources:
   - name: authorizer
     props:
-      - name: AuthorizerFunctionArn
-        value: '{{ AuthorizerFunctionArn }}'
-      - name: AuthorizerName
-        value: '{{ AuthorizerName }}'
-      - name: SigningDisabled
-        value: '{{ SigningDisabled }}'
-      - name: Status
-        value: '{{ Status }}'
-      - name: TokenKeyName
-        value: '{{ TokenKeyName }}'
-      - name: TokenSigningPublicKeys
+      - name: authorizer_function_arn
+        value: '{{ authorizer_function_arn }}'
+      - name: authorizer_name
+        value: '{{ authorizer_name }}'
+      - name: signing_disabled
+        value: '{{ signing_disabled }}'
+      - name: status
+        value: '{{ status }}'
+      - name: token_key_name
+        value: '{{ token_key_name }}'
+      - name: token_signing_public_keys
         value: {}
-      - name: EnableCachingForHttp
-        value: '{{ EnableCachingForHttp }}'
-      - name: Tags
+      - name: enable_caching_for_http
+        value: '{{ enable_caching_for_http }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -315,7 +314,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<AuthorizerName>';
+AND Identifier = '{{ authorizer_name }}';
 ```
 
 
@@ -324,7 +323,7 @@ AND Identifier = '<AuthorizerName>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.iot.authorizers
-WHERE Identifier = '<AuthorizerName>'
+WHERE Identifier = '{{ authorizer_name }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/iot/billing_groups/index.md b/website/docs/services/iot/billing_groups/index.md
index f6de31894..bdbcd43de 100644
--- a/website/docs/services/iot/billing_groups/index.md
+++ b/website/docs/services/iot/billing_groups/index.md
@@ -177,7 +177,7 @@ billing_group_name,
 tags,
 billing_group_properties
 FROM awscc.iot.billing_groups
-WHERE region = 'us-east-1' AND Identifier = '<BillingGroupName>';
+WHERE region = 'us-east-1' AND Identifier = '{{ billing_group_name }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -215,10 +215,10 @@ INSERT INTO awscc.iot.billing_groups (
  BillingGroupProperties,
  region
 )
-SELECT 
-'{{ BillingGroupName }}',
- '{{ Tags }}',
- '{{ BillingGroupProperties }}',
+SELECT
+'{{ billing_group_name }}',
+ '{{ tags }}',
+ '{{ billing_group_properties }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -232,10 +232,10 @@ INSERT INTO awscc.iot.billing_groups (
  BillingGroupProperties,
  region
 )
-SELECT 
- '{{ BillingGroupName }}',
- '{{ Tags }}',
- '{{ BillingGroupProperties }}',
+SELECT
+ '{{ billing_group_name }}',
+ '{{ tags }}',
+ '{{ billing_group_properties }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -253,16 +253,15 @@ globals:
 resources:
   - name: billing_group
     props:
-      - name: BillingGroupName
-        value: '{{ BillingGroupName }}'
-      - name: Tags
+      - name: billing_group_name
+        value: '{{ billing_group_name }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-      - name: BillingGroupProperties
+          - key: '{{ key }}'
+            value: '{{ value }}'
+      - name: billing_group_properties
         value:
-          BillingGroupDescription: '{{ BillingGroupDescription }}'
-
+          billing_group_description: '{{ billing_group_description }}'
 ```
 </TabItem>
 </Tabs>
@@ -279,7 +278,7 @@ SET PatchDocument = string('{{ {
     "BillingGroupProperties": billing_group_properties
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<BillingGroupName>';
+AND Identifier = '{{ billing_group_name }}';
 ```
 
 
@@ -288,7 +287,7 @@ AND Identifier = '<BillingGroupName>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.iot.billing_groups
-WHERE Identifier = '<BillingGroupName>'
+WHERE Identifier = '{{ billing_group_name }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/iot/ca_certificates/index.md b/website/docs/services/iot/ca_certificates/index.md
index 4bb62e599..c0d8a7a64 100644
--- a/website/docs/services/iot/ca_certificates/index.md
+++ b/website/docs/services/iot/ca_certificates/index.md
@@ -217,7 +217,7 @@ id,
 arn,
 tags
 FROM awscc.iot.ca_certificates
-WHERE region = 'us-east-1' AND Identifier = '<Id>';
+WHERE region = 'us-east-1' AND Identifier = '{{ id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -254,9 +254,9 @@ INSERT INTO awscc.iot.ca_certificates (
  Status,
  region
 )
-SELECT 
-'{{ CACertificatePem }}',
- '{{ Status }}',
+SELECT
+'{{ ca_certificate_pem }}',
+ '{{ status }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -275,15 +275,15 @@ INSERT INTO awscc.iot.ca_certificates (
  Tags,
  region
 )
-SELECT 
- '{{ CACertificatePem }}',
- '{{ VerificationCertificatePem }}',
- '{{ Status }}',
- '{{ CertificateMode }}',
- '{{ AutoRegistrationStatus }}',
- '{{ RemoveAutoRegistration }}',
- '{{ RegistrationConfig }}',
- '{{ Tags }}',
+SELECT
+ '{{ ca_certificate_pem }}',
+ '{{ verification_certificate_pem }}',
+ '{{ status }}',
+ '{{ certificate_mode }}',
+ '{{ auto_registration_status }}',
+ '{{ remove_auto_registration }}',
+ '{{ registration_config }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -301,28 +301,27 @@ globals:
 resources:
   - name: ca_certificate
     props:
-      - name: CACertificatePem
-        value: '{{ CACertificatePem }}'
-      - name: VerificationCertificatePem
-        value: '{{ VerificationCertificatePem }}'
-      - name: Status
-        value: '{{ Status }}'
-      - name: CertificateMode
-        value: '{{ CertificateMode }}'
-      - name: AutoRegistrationStatus
-        value: '{{ AutoRegistrationStatus }}'
-      - name: RemoveAutoRegistration
-        value: '{{ RemoveAutoRegistration }}'
-      - name: RegistrationConfig
+      - name: ca_certificate_pem
+        value: '{{ ca_certificate_pem }}'
+      - name: verification_certificate_pem
+        value: '{{ verification_certificate_pem }}'
+      - name: status
+        value: '{{ status }}'
+      - name: certificate_mode
+        value: '{{ certificate_mode }}'
+      - name: auto_registration_status
+        value: '{{ auto_registration_status }}'
+      - name: remove_auto_registration
+        value: '{{ remove_auto_registration }}'
+      - name: registration_config
         value:
-          TemplateBody: '{{ TemplateBody }}'
-          RoleArn: '{{ RoleArn }}'
-          TemplateName: '{{ TemplateName }}'
-      - name: Tags
+          template_body: '{{ template_body }}'
+          role_arn: '{{ role_arn }}'
+          template_name: '{{ template_name }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -342,7 +341,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Id>';
+AND Identifier = '{{ id }}';
 ```
 
 
@@ -351,7 +350,7 @@ AND Identifier = '<Id>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.iot.ca_certificates
-WHERE Identifier = '<Id>'
+WHERE Identifier = '{{ id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/iot/certificate_providers/index.md b/website/docs/services/iot/certificate_providers/index.md
index 39aef974a..68fa2fc77 100644
--- a/website/docs/services/iot/certificate_providers/index.md
+++ b/website/docs/services/iot/certificate_providers/index.md
@@ -170,7 +170,7 @@ account_default_for_operations,
 tags,
 arn
 FROM awscc.iot.certificate_providers
-WHERE region = 'us-east-1' AND Identifier = '<CertificateProviderName>';
+WHERE region = 'us-east-1' AND Identifier = '{{ certificate_provider_name }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -207,9 +207,9 @@ INSERT INTO awscc.iot.certificate_providers (
  AccountDefaultForOperations,
  region
 )
-SELECT 
-'{{ LambdaFunctionArn }}',
- '{{ AccountDefaultForOperations }}',
+SELECT
+'{{ lambda_function_arn }}',
+ '{{ account_default_for_operations }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -224,11 +224,11 @@ INSERT INTO awscc.iot.certificate_providers (
  Tags,
  region
 )
-SELECT 
- '{{ CertificateProviderName }}',
- '{{ LambdaFunctionArn }}',
- '{{ AccountDefaultForOperations }}',
- '{{ Tags }}',
+SELECT
+ '{{ certificate_provider_name }}',
+ '{{ lambda_function_arn }}',
+ '{{ account_default_for_operations }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -246,18 +246,17 @@ globals:
 resources:
   - name: certificate_provider
     props:
-      - name: CertificateProviderName
-        value: '{{ CertificateProviderName }}'
-      - name: LambdaFunctionArn
-        value: '{{ LambdaFunctionArn }}'
-      - name: AccountDefaultForOperations
+      - name: certificate_provider_name
+        value: '{{ certificate_provider_name }}'
+      - name: lambda_function_arn
+        value: '{{ lambda_function_arn }}'
+      - name: account_default_for_operations
         value:
-          - '{{ AccountDefaultForOperations[0] }}'
-      - name: Tags
+          - '{{ account_default_for_operations[0] }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -275,7 +274,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<CertificateProviderName>';
+AND Identifier = '{{ certificate_provider_name }}';
 ```
 
 
@@ -284,7 +283,7 @@ AND Identifier = '<CertificateProviderName>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.iot.certificate_providers
-WHERE Identifier = '<CertificateProviderName>'
+WHERE Identifier = '{{ certificate_provider_name }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/iot/certificates/index.md b/website/docs/services/iot/certificates/index.md
index 6a0b99705..a541d0d2b 100644
--- a/website/docs/services/iot/certificates/index.md
+++ b/website/docs/services/iot/certificates/index.md
@@ -170,7 +170,7 @@ status,
 id,
 arn
 FROM awscc.iot.certificates
-WHERE region = 'us-east-1' AND Identifier = '<Id>';
+WHERE region = 'us-east-1' AND Identifier = '{{ id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -206,8 +206,8 @@ INSERT INTO awscc.iot.certificates (
  Status,
  region
 )
-SELECT 
-'{{ Status }}',
+SELECT
+'{{ status }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -223,12 +223,12 @@ INSERT INTO awscc.iot.certificates (
  Status,
  region
 )
-SELECT 
- '{{ CACertificatePem }}',
- '{{ CertificatePem }}',
- '{{ CertificateSigningRequest }}',
- '{{ CertificateMode }}',
- '{{ Status }}',
+SELECT
+ '{{ ca_certificate_pem }}',
+ '{{ certificate_pem }}',
+ '{{ certificate_signing_request }}',
+ '{{ certificate_mode }}',
+ '{{ status }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -246,17 +246,16 @@ globals:
 resources:
   - name: certificate
     props:
-      - name: CACertificatePem
-        value: '{{ CACertificatePem }}'
-      - name: CertificatePem
-        value: '{{ CertificatePem }}'
-      - name: CertificateSigningRequest
-        value: '{{ CertificateSigningRequest }}'
-      - name: CertificateMode
-        value: '{{ CertificateMode }}'
-      - name: Status
-        value: '{{ Status }}'
-
+      - name: ca_certificate_pem
+        value: '{{ ca_certificate_pem }}'
+      - name: certificate_pem
+        value: '{{ certificate_pem }}'
+      - name: certificate_signing_request
+        value: '{{ certificate_signing_request }}'
+      - name: certificate_mode
+        value: '{{ certificate_mode }}'
+      - name: status
+        value: '{{ status }}'
 ```
 </TabItem>
 </Tabs>
@@ -272,7 +271,7 @@ SET PatchDocument = string('{{ {
     "Status": status
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Id>';
+AND Identifier = '{{ id }}';
 ```
 
 
@@ -281,7 +280,7 @@ AND Identifier = '<Id>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.iot.certificates
-WHERE Identifier = '<Id>'
+WHERE Identifier = '{{ id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/iot/commands/index.md b/website/docs/services/iot/commands/index.md
index dd0f6198a..e6eeab90c 100644
--- a/website/docs/services/iot/commands/index.md
+++ b/website/docs/services/iot/commands/index.md
@@ -284,7 +284,7 @@ payload,
 pending_deletion,
 tags
 FROM awscc.iot.commands
-WHERE region = 'us-east-1' AND Identifier = '<CommandId>';
+WHERE region = 'us-east-1' AND Identifier = '{{ command_id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -320,8 +320,8 @@ INSERT INTO awscc.iot.commands (
  CommandId,
  region
 )
-SELECT 
-'{{ CommandId }}',
+SELECT
+'{{ command_id }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -344,19 +344,19 @@ INSERT INTO awscc.iot.commands (
  Tags,
  region
 )
-SELECT 
- '{{ CommandId }}',
- '{{ CreatedAt }}',
- '{{ Deprecated }}',
- '{{ Description }}',
- '{{ DisplayName }}',
- '{{ LastUpdatedAt }}',
- '{{ MandatoryParameters }}',
- '{{ Namespace }}',
- '{{ RoleArn }}',
- '{{ Payload }}',
- '{{ PendingDeletion }}',
- '{{ Tags }}',
+SELECT
+ '{{ command_id }}',
+ '{{ created_at }}',
+ '{{ deprecated }}',
+ '{{ description }}',
+ '{{ display_name }}',
+ '{{ last_updated_at }}',
+ '{{ mandatory_parameters }}',
+ '{{ namespace }}',
+ '{{ role_arn }}',
+ '{{ payload }}',
+ '{{ pending_deletion }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -374,46 +374,45 @@ globals:
 resources:
   - name: command
     props:
-      - name: CommandId
-        value: '{{ CommandId }}'
-      - name: CreatedAt
-        value: '{{ CreatedAt }}'
-      - name: Deprecated
-        value: '{{ Deprecated }}'
-      - name: Description
-        value: '{{ Description }}'
-      - name: DisplayName
-        value: '{{ DisplayName }}'
-      - name: LastUpdatedAt
-        value: '{{ LastUpdatedAt }}'
-      - name: MandatoryParameters
+      - name: command_id
+        value: '{{ command_id }}'
+      - name: created_at
+        value: '{{ created_at }}'
+      - name: deprecated
+        value: '{{ deprecated }}'
+      - name: description
+        value: '{{ description }}'
+      - name: display_name
+        value: '{{ display_name }}'
+      - name: last_updated_at
+        value: '{{ last_updated_at }}'
+      - name: mandatory_parameters
         value:
-          - Name: '{{ Name }}'
-            Value:
-              S: '{{ S }}'
-              B: '{{ B }}'
-              I: '{{ I }}'
-              L: '{{ L }}'
-              D: null
-              BIN: '{{ BIN }}'
-              UL: '{{ UL }}'
-            DefaultValue: null
-            Description: '{{ Description }}'
-      - name: Namespace
-        value: '{{ Namespace }}'
-      - name: RoleArn
-        value: '{{ RoleArn }}'
-      - name: Payload
+          - name: '{{ name }}'
+            value:
+              s: '{{ s }}'
+              b: '{{ b }}'
+              i: '{{ i }}'
+              l: '{{ l }}'
+              d: null
+              b_in: '{{ b_in }}'
+              u_l: '{{ u_l }}'
+            default_value: null
+            description: '{{ description }}'
+      - name: namespace
+        value: '{{ namespace }}'
+      - name: role_arn
+        value: '{{ role_arn }}'
+      - name: payload
         value:
-          Content: '{{ Content }}'
-          ContentType: '{{ ContentType }}'
-      - name: PendingDeletion
-        value: '{{ PendingDeletion }}'
-      - name: Tags
+          content: '{{ content }}'
+          content_type: '{{ content_type }}'
+      - name: pending_deletion
+        value: '{{ pending_deletion }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -439,7 +438,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<CommandId>';
+AND Identifier = '{{ command_id }}';
 ```
 
 
@@ -448,7 +447,7 @@ AND Identifier = '<CommandId>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.iot.commands
-WHERE Identifier = '<CommandId>'
+WHERE Identifier = '{{ command_id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/iot/custom_metrics/index.md b/website/docs/services/iot/custom_metrics/index.md
index 78c7ecb66..3271b3ecd 100644
--- a/website/docs/services/iot/custom_metrics/index.md
+++ b/website/docs/services/iot/custom_metrics/index.md
@@ -170,7 +170,7 @@ metric_type,
 metric_arn,
 tags
 FROM awscc.iot.custom_metrics
-WHERE region = 'us-east-1' AND Identifier = '<MetricName>';
+WHERE region = 'us-east-1' AND Identifier = '{{ metric_name }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -206,8 +206,8 @@ INSERT INTO awscc.iot.custom_metrics (
  MetricType,
  region
 )
-SELECT 
-'{{ MetricType }}',
+SELECT
+'{{ metric_type }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -222,11 +222,11 @@ INSERT INTO awscc.iot.custom_metrics (
  Tags,
  region
 )
-SELECT 
- '{{ MetricName }}',
- '{{ DisplayName }}',
- '{{ MetricType }}',
- '{{ Tags }}',
+SELECT
+ '{{ metric_name }}',
+ '{{ display_name }}',
+ '{{ metric_type }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -244,17 +244,16 @@ globals:
 resources:
   - name: custom_metric
     props:
-      - name: MetricName
-        value: '{{ MetricName }}'
-      - name: DisplayName
-        value: '{{ DisplayName }}'
-      - name: MetricType
-        value: '{{ MetricType }}'
-      - name: Tags
+      - name: metric_name
+        value: '{{ metric_name }}'
+      - name: display_name
+        value: '{{ display_name }}'
+      - name: metric_type
+        value: '{{ metric_type }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -271,7 +270,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<MetricName>';
+AND Identifier = '{{ metric_name }}';
 ```
 
 
@@ -280,7 +279,7 @@ AND Identifier = '<MetricName>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.iot.custom_metrics
-WHERE Identifier = '<MetricName>'
+WHERE Identifier = '{{ metric_name }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/iot/dimensions/index.md b/website/docs/services/iot/dimensions/index.md
index 9cd308d03..2a6846e6d 100644
--- a/website/docs/services/iot/dimensions/index.md
+++ b/website/docs/services/iot/dimensions/index.md
@@ -170,7 +170,7 @@ string_values,
 tags,
 arn
 FROM awscc.iot.dimensions
-WHERE region = 'us-east-1' AND Identifier = '<Name>';
+WHERE region = 'us-east-1' AND Identifier = '{{ name }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -207,9 +207,9 @@ INSERT INTO awscc.iot.dimensions (
  StringValues,
  region
 )
-SELECT 
-'{{ Type }}',
- '{{ StringValues }}',
+SELECT
+'{{ type }}',
+ '{{ string_values }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -224,11 +224,11 @@ INSERT INTO awscc.iot.dimensions (
  Tags,
  region
 )
-SELECT 
- '{{ Name }}',
- '{{ Type }}',
- '{{ StringValues }}',
- '{{ Tags }}',
+SELECT
+ '{{ name }}',
+ '{{ type }}',
+ '{{ string_values }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -246,18 +246,17 @@ globals:
 resources:
   - name: dimension
     props:
-      - name: Name
-        value: '{{ Name }}'
-      - name: Type
-        value: '{{ Type }}'
-      - name: StringValues
+      - name: name
+        value: '{{ name }}'
+      - name: type
+        value: '{{ type }}'
+      - name: string_values
         value:
-          - '{{ StringValues[0] }}'
-      - name: Tags
+          - '{{ string_values[0] }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -274,7 +273,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Name>';
+AND Identifier = '{{ name }}';
 ```
 
 
@@ -283,7 +282,7 @@ AND Identifier = '<Name>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.iot.dimensions
-WHERE Identifier = '<Name>'
+WHERE Identifier = '{{ name }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/iot/domain_configurations/index.md b/website/docs/services/iot/domain_configurations/index.md
index 5ae3bb130..0f784e710 100644
--- a/website/docs/services/iot/domain_configurations/index.md
+++ b/website/docs/services/iot/domain_configurations/index.md
@@ -296,7 +296,7 @@ application_protocol,
 client_certificate_config,
 tags
 FROM awscc.iot.domain_configurations
-WHERE region = 'us-east-1' AND Identifier = '<DomainConfigurationName>';
+WHERE region = 'us-east-1' AND Identifier = '{{ domain_configuration_name }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -332,7 +332,7 @@ INSERT INTO awscc.iot.domain_configurations (
  ,
  region
 )
-SELECT 
+SELECT
 '{{  }}',
 '{{ region }}';
 ```
@@ -357,20 +357,20 @@ INSERT INTO awscc.iot.domain_configurations (
  Tags,
  region
 )
-SELECT 
- '{{ DomainConfigurationName }}',
- '{{ AuthorizerConfig }}',
- '{{ DomainName }}',
- '{{ ServerCertificateArns }}',
- '{{ ServiceType }}',
- '{{ ValidationCertificateArn }}',
- '{{ DomainConfigurationStatus }}',
- '{{ ServerCertificateConfig }}',
- '{{ TlsConfig }}',
- '{{ AuthenticationType }}',
- '{{ ApplicationProtocol }}',
- '{{ ClientCertificateConfig }}',
- '{{ Tags }}',
+SELECT
+ '{{ domain_configuration_name }}',
+ '{{ authorizer_config }}',
+ '{{ domain_name }}',
+ '{{ server_certificate_arns }}',
+ '{{ service_type }}',
+ '{{ validation_certificate_arn }}',
+ '{{ domain_configuration_status }}',
+ '{{ server_certificate_config }}',
+ '{{ tls_config }}',
+ '{{ authentication_type }}',
+ '{{ application_protocol }}',
+ '{{ client_certificate_config }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -388,43 +388,42 @@ globals:
 resources:
   - name: domain_configuration
     props:
-      - name: DomainConfigurationName
-        value: '{{ DomainConfigurationName }}'
-      - name: AuthorizerConfig
+      - name: domain_configuration_name
+        value: '{{ domain_configuration_name }}'
+      - name: authorizer_config
         value:
-          AllowAuthorizerOverride: '{{ AllowAuthorizerOverride }}'
-          DefaultAuthorizerName: '{{ DefaultAuthorizerName }}'
-      - name: DomainName
-        value: '{{ DomainName }}'
-      - name: ServerCertificateArns
+          allow_authorizer_override: '{{ allow_authorizer_override }}'
+          default_authorizer_name: '{{ default_authorizer_name }}'
+      - name: domain_name
+        value: '{{ domain_name }}'
+      - name: server_certificate_arns
         value:
-          - '{{ ServerCertificateArns[0] }}'
-      - name: ServiceType
-        value: '{{ ServiceType }}'
-      - name: ValidationCertificateArn
-        value: '{{ ValidationCertificateArn }}'
-      - name: DomainConfigurationStatus
-        value: '{{ DomainConfigurationStatus }}'
-      - name: ServerCertificateConfig
+          - '{{ server_certificate_arns[0] }}'
+      - name: service_type
+        value: '{{ service_type }}'
+      - name: validation_certificate_arn
+        value: '{{ validation_certificate_arn }}'
+      - name: domain_configuration_status
+        value: '{{ domain_configuration_status }}'
+      - name: server_certificate_config
         value:
-          EnableOCSPCheck: '{{ EnableOCSPCheck }}'
-          OcspLambdaArn: '{{ OcspLambdaArn }}'
-          OcspAuthorizedResponderArn: '{{ OcspAuthorizedResponderArn }}'
-      - name: TlsConfig
+          enable_oc_sp_check: '{{ enable_oc_sp_check }}'
+          ocsp_lambda_arn: '{{ ocsp_lambda_arn }}'
+          ocsp_authorized_responder_arn: '{{ ocsp_authorized_responder_arn }}'
+      - name: tls_config
         value:
-          SecurityPolicy: '{{ SecurityPolicy }}'
-      - name: AuthenticationType
-        value: '{{ AuthenticationType }}'
-      - name: ApplicationProtocol
-        value: '{{ ApplicationProtocol }}'
-      - name: ClientCertificateConfig
+          security_policy: '{{ security_policy }}'
+      - name: authentication_type
+        value: '{{ authentication_type }}'
+      - name: application_protocol
+        value: '{{ application_protocol }}'
+      - name: client_certificate_config
         value:
-          ClientCertificateCallbackArn: '{{ ClientCertificateCallbackArn }}'
-      - name: Tags
+          client_certificate_callback_arn: '{{ client_certificate_callback_arn }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -447,7 +446,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<DomainConfigurationName>';
+AND Identifier = '{{ domain_configuration_name }}';
 ```
 
 
@@ -456,7 +455,7 @@ AND Identifier = '<DomainConfigurationName>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.iot.domain_configurations
-WHERE Identifier = '<DomainConfigurationName>'
+WHERE Identifier = '{{ domain_configuration_name }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/iot/encryption_configurations/index.md b/website/docs/services/iot/encryption_configurations/index.md
index 834978951..a8171774f 100644
--- a/website/docs/services/iot/encryption_configurations/index.md
+++ b/website/docs/services/iot/encryption_configurations/index.md
@@ -181,7 +181,7 @@ kms_key_arn,
 configuration_details,
 last_modified_date
 FROM awscc.iot.encryption_configurations
-WHERE region = 'us-east-1' AND Identifier = '<AccountId>';
+WHERE region = 'us-east-1' AND Identifier = '{{ account_id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -217,8 +217,8 @@ INSERT INTO awscc.iot.encryption_configurations (
  EncryptionType,
  region
 )
-SELECT 
-'{{ EncryptionType }}',
+SELECT
+'{{ encryption_type }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -232,10 +232,10 @@ INSERT INTO awscc.iot.encryption_configurations (
  KmsKeyArn,
  region
 )
-SELECT 
- '{{ EncryptionType }}',
- '{{ KmsAccessRoleArn }}',
- '{{ KmsKeyArn }}',
+SELECT
+ '{{ encryption_type }}',
+ '{{ kms_access_role_arn }}',
+ '{{ kms_key_arn }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -253,13 +253,12 @@ globals:
 resources:
   - name: encryption_configuration
     props:
-      - name: EncryptionType
-        value: '{{ EncryptionType }}'
-      - name: KmsAccessRoleArn
-        value: '{{ KmsAccessRoleArn }}'
-      - name: KmsKeyArn
-        value: '{{ KmsKeyArn }}'
-
+      - name: encryption_type
+        value: '{{ encryption_type }}'
+      - name: kms_access_role_arn
+        value: '{{ kms_access_role_arn }}'
+      - name: kms_key_arn
+        value: '{{ kms_key_arn }}'
 ```
 </TabItem>
 </Tabs>
@@ -277,7 +276,7 @@ SET PatchDocument = string('{{ {
     "KmsKeyArn": kms_key_arn
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<AccountId>';
+AND Identifier = '{{ account_id }}';
 ```
 
 
@@ -286,7 +285,7 @@ AND Identifier = '<AccountId>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.iot.encryption_configurations
-WHERE Identifier = '<AccountId>'
+WHERE Identifier = '{{ account_id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/iot/fleet_metrics/index.md b/website/docs/services/iot/fleet_metrics/index.md
index 31410dd38..c0f15d6e5 100644
--- a/website/docs/services/iot/fleet_metrics/index.md
+++ b/website/docs/services/iot/fleet_metrics/index.md
@@ -231,7 +231,7 @@ last_modified_date,
 version,
 tags
 FROM awscc.iot.fleet_metrics
-WHERE region = 'us-east-1' AND Identifier = '<MetricName>';
+WHERE region = 'us-east-1' AND Identifier = '{{ metric_name }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -267,8 +267,8 @@ INSERT INTO awscc.iot.fleet_metrics (
  MetricName,
  region
 )
-SELECT 
-'{{ MetricName }}',
+SELECT
+'{{ metric_name }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -289,17 +289,17 @@ INSERT INTO awscc.iot.fleet_metrics (
  Tags,
  region
 )
-SELECT 
- '{{ MetricName }}',
- '{{ Description }}',
- '{{ QueryString }}',
- '{{ Period }}',
- '{{ AggregationField }}',
- '{{ QueryVersion }}',
- '{{ IndexName }}',
- '{{ Unit }}',
- '{{ AggregationType }}',
- '{{ Tags }}',
+SELECT
+ '{{ metric_name }}',
+ '{{ description }}',
+ '{{ query_string }}',
+ '{{ period }}',
+ '{{ aggregation_field }}',
+ '{{ query_version }}',
+ '{{ index_name }}',
+ '{{ unit }}',
+ '{{ aggregation_type }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -317,32 +317,31 @@ globals:
 resources:
   - name: fleet_metric
     props:
-      - name: MetricName
-        value: '{{ MetricName }}'
-      - name: Description
-        value: '{{ Description }}'
-      - name: QueryString
-        value: '{{ QueryString }}'
-      - name: Period
-        value: '{{ Period }}'
-      - name: AggregationField
-        value: '{{ AggregationField }}'
-      - name: QueryVersion
-        value: '{{ QueryVersion }}'
-      - name: IndexName
-        value: '{{ IndexName }}'
-      - name: Unit
-        value: '{{ Unit }}'
-      - name: AggregationType
+      - name: metric_name
+        value: '{{ metric_name }}'
+      - name: description
+        value: '{{ description }}'
+      - name: query_string
+        value: '{{ query_string }}'
+      - name: period
+        value: '{{ period }}'
+      - name: aggregation_field
+        value: '{{ aggregation_field }}'
+      - name: query_version
+        value: '{{ query_version }}'
+      - name: index_name
+        value: '{{ index_name }}'
+      - name: unit
+        value: '{{ unit }}'
+      - name: aggregation_type
         value:
-          Name: '{{ Name }}'
-          Values:
-            - '{{ Values[0] }}'
-      - name: Tags
+          name: '{{ name }}'
+          values:
+            - '{{ values[0] }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -366,7 +365,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<MetricName>';
+AND Identifier = '{{ metric_name }}';
 ```
 
 
@@ -375,7 +374,7 @@ AND Identifier = '<MetricName>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.iot.fleet_metrics
-WHERE Identifier = '<MetricName>'
+WHERE Identifier = '{{ metric_name }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/iot/job_templates/index.md b/website/docs/services/iot/job_templates/index.md
index 7c709af80..372532df4 100644
--- a/website/docs/services/iot/job_templates/index.md
+++ b/website/docs/services/iot/job_templates/index.md
@@ -450,7 +450,7 @@ maintenance_windows,
 destination_package_versions,
 tags
 FROM awscc.iot.job_templates
-WHERE region = 'us-east-1' AND Identifier = '<JobTemplateId>';
+WHERE region = 'us-east-1' AND Identifier = '{{ job_template_id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -487,9 +487,9 @@ INSERT INTO awscc.iot.job_templates (
  Description,
  region
 )
-SELECT 
-'{{ JobTemplateId }}',
- '{{ Description }}',
+SELECT
+'{{ job_template_id }}',
+ '{{ description }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -513,20 +513,20 @@ INSERT INTO awscc.iot.job_templates (
  Tags,
  region
 )
-SELECT 
- '{{ JobArn }}',
- '{{ JobTemplateId }}',
- '{{ Description }}',
- '{{ Document }}',
- '{{ DocumentSource }}',
- '{{ TimeoutConfig }}',
- '{{ JobExecutionsRolloutConfig }}',
- '{{ AbortConfig }}',
- '{{ PresignedUrlConfig }}',
- '{{ JobExecutionsRetryConfig }}',
- '{{ MaintenanceWindows }}',
- '{{ DestinationPackageVersions }}',
- '{{ Tags }}',
+SELECT
+ '{{ job_arn }}',
+ '{{ job_template_id }}',
+ '{{ description }}',
+ '{{ document }}',
+ '{{ document_source }}',
+ '{{ timeout_config }}',
+ '{{ job_executions_rollout_config }}',
+ '{{ abort_config }}',
+ '{{ presigned_url_config }}',
+ '{{ job_executions_retry_config }}',
+ '{{ maintenance_windows }}',
+ '{{ destination_package_versions }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -544,204 +544,203 @@ globals:
 resources:
   - name: job_template
     props:
-      - name: JobArn
-        value: '{{ JobArn }}'
-      - name: JobTemplateId
-        value: '{{ JobTemplateId }}'
-      - name: Description
-        value: '{{ Description }}'
-      - name: Document
-        value: '{{ Document }}'
-      - name: DocumentSource
-        value: '{{ DocumentSource }}'
-      - name: TimeoutConfig
+      - name: job_arn
+        value: '{{ job_arn }}'
+      - name: job_template_id
+        value: '{{ job_template_id }}'
+      - name: description
+        value: '{{ description }}'
+      - name: document
+        value: '{{ document }}'
+      - name: document_source
+        value: '{{ document_source }}'
+      - name: timeout_config
         value:
-          InProgressTimeoutInMinutes: '{{ InProgressTimeoutInMinutes }}'
-      - name: JobExecutionsRolloutConfig
+          in_progress_timeout_in_minutes: '{{ in_progress_timeout_in_minutes }}'
+      - name: job_executions_rollout_config
         value:
-          ExponentialRolloutRate:
-            BaseRatePerMinute: '{{ BaseRatePerMinute }}'
-            IncrementFactor: null
-            RateIncreaseCriteria:
-              NumberOfNotifiedThings: '{{ NumberOfNotifiedThings }}'
-              NumberOfSucceededThings: '{{ NumberOfSucceededThings }}'
-          MaximumPerMinute: '{{ MaximumPerMinute }}'
-      - name: AbortConfig
+          exponential_rollout_rate:
+            base_rate_per_minute: '{{ base_rate_per_minute }}'
+            increment_factor: null
+            rate_increase_criteria:
+              number_of_notified_things: '{{ number_of_notified_things }}'
+              number_of_succeeded_things: '{{ number_of_succeeded_things }}'
+          maximum_per_minute: '{{ maximum_per_minute }}'
+      - name: abort_config
         value:
-          CriteriaList:
-            - Action:
-                CloudwatchAlarm:
-                  StateValue: '{{ StateValue }}'
-                  AlarmName: '{{ AlarmName }}'
-                  StateReason: '{{ StateReason }}'
-                  RoleArn: '{{ RoleArn }}'
-                CloudwatchLogs:
-                  LogGroupName: '{{ LogGroupName }}'
-                  RoleArn: '{{ RoleArn }}'
-                  BatchMode: '{{ BatchMode }}'
-                CloudwatchMetric:
-                  MetricName: '{{ MetricName }}'
-                  MetricValue: '{{ MetricValue }}'
-                  MetricNamespace: '{{ MetricNamespace }}'
-                  MetricUnit: '{{ MetricUnit }}'
-                  RoleArn: '{{ RoleArn }}'
-                  MetricTimestamp: '{{ MetricTimestamp }}'
-                DynamoDB:
-                  TableName: '{{ TableName }}'
-                  PayloadField: '{{ PayloadField }}'
-                  RangeKeyField: '{{ RangeKeyField }}'
-                  HashKeyField: '{{ HashKeyField }}'
-                  RangeKeyValue: '{{ RangeKeyValue }}'
-                  RangeKeyType: '{{ RangeKeyType }}'
-                  HashKeyType: '{{ HashKeyType }}'
-                  HashKeyValue: '{{ HashKeyValue }}'
-                  RoleArn: '{{ RoleArn }}'
-                DynamoDBv2:
-                  PutItem:
-                    TableName: '{{ TableName }}'
-                  RoleArn: '{{ RoleArn }}'
-                Elasticsearch:
-                  Type: '{{ Type }}'
-                  Index: '{{ Index }}'
-                  Id: '{{ Id }}'
-                  Endpoint: '{{ Endpoint }}'
-                  RoleArn: '{{ RoleArn }}'
-                Firehose:
-                  DeliveryStreamName: '{{ DeliveryStreamName }}'
-                  RoleArn: '{{ RoleArn }}'
-                  Separator: '{{ Separator }}'
-                  BatchMode: '{{ BatchMode }}'
-                Http:
-                  ConfirmationUrl: '{{ ConfirmationUrl }}'
-                  Headers:
-                    - Value: '{{ Value }}'
-                      Key: '{{ Key }}'
-                  Url: '{{ Url }}'
-                  Auth:
-                    Sigv4:
-                      ServiceName: '{{ ServiceName }}'
-                      SigningRegion: '{{ SigningRegion }}'
-                      RoleArn: '{{ RoleArn }}'
-                IotAnalytics:
-                  RoleArn: '{{ RoleArn }}'
-                  ChannelName: '{{ ChannelName }}'
-                  BatchMode: '{{ BatchMode }}'
-                IotEvents:
-                  InputName: '{{ InputName }}'
-                  RoleArn: '{{ RoleArn }}'
-                  MessageId: '{{ MessageId }}'
-                  BatchMode: '{{ BatchMode }}'
-                IotSiteWise:
-                  RoleArn: '{{ RoleArn }}'
-                  PutAssetPropertyValueEntries:
-                    - PropertyAlias: '{{ PropertyAlias }}'
-                      PropertyValues:
-                        - Value:
-                            StringValue: '{{ StringValue }}'
-                            DoubleValue: '{{ DoubleValue }}'
-                            BooleanValue: '{{ BooleanValue }}'
-                            IntegerValue: '{{ IntegerValue }}'
-                          Timestamp:
-                            TimeInSeconds: '{{ TimeInSeconds }}'
-                            OffsetInNanos: '{{ OffsetInNanos }}'
-                          Quality: '{{ Quality }}'
-                      AssetId: '{{ AssetId }}'
-                      EntryId: '{{ EntryId }}'
-                      PropertyId: '{{ PropertyId }}'
-                Kafka:
-                  DestinationArn: '{{ DestinationArn }}'
-                  Topic: '{{ Topic }}'
-                  Key: '{{ Key }}'
-                  Partition: '{{ Partition }}'
-                  ClientProperties: {}
-                  Headers:
-                    - Value: '{{ Value }}'
-                      Key: '{{ Key }}'
-                Kinesis:
-                  PartitionKey: '{{ PartitionKey }}'
-                  StreamName: '{{ StreamName }}'
-                  RoleArn: '{{ RoleArn }}'
-                Lambda:
-                  FunctionArn: '{{ FunctionArn }}'
-                Location:
-                  RoleArn: '{{ RoleArn }}'
-                  TrackerName: '{{ TrackerName }}'
-                  DeviceId: '{{ DeviceId }}'
-                  Latitude: '{{ Latitude }}'
-                  Longitude: '{{ Longitude }}'
-                  Timestamp:
-                    Value: '{{ Value }}'
-                    Unit: '{{ Unit }}'
-                OpenSearch:
-                  Type: '{{ Type }}'
-                  Index: '{{ Index }}'
-                  Id: '{{ Id }}'
-                  Endpoint: '{{ Endpoint }}'
-                  RoleArn: '{{ RoleArn }}'
-                Republish:
-                  Qos: '{{ Qos }}'
-                  Topic: '{{ Topic }}'
-                  RoleArn: '{{ RoleArn }}'
-                  Headers:
-                    PayloadFormatIndicator: '{{ PayloadFormatIndicator }}'
-                    ContentType: '{{ ContentType }}'
-                    ResponseTopic: '{{ ResponseTopic }}'
-                    CorrelationData: '{{ CorrelationData }}'
-                    MessageExpiry: '{{ MessageExpiry }}'
-                    UserProperties:
-                      - Key: '{{ Key }}'
-                        Value: '{{ Value }}'
-                S3:
-                  BucketName: '{{ BucketName }}'
-                  Key: '{{ Key }}'
-                  RoleArn: '{{ RoleArn }}'
-                  CannedAcl: '{{ CannedAcl }}'
-                Sns:
-                  TargetArn: '{{ TargetArn }}'
-                  MessageFormat: '{{ MessageFormat }}'
-                  RoleArn: '{{ RoleArn }}'
-                Sqs:
-                  RoleArn: '{{ RoleArn }}'
-                  UseBase64: '{{ UseBase64 }}'
-                  QueueUrl: '{{ QueueUrl }}'
-                StepFunctions:
-                  ExecutionNamePrefix: '{{ ExecutionNamePrefix }}'
-                  StateMachineName: '{{ StateMachineName }}'
-                  RoleArn: '{{ RoleArn }}'
-                Timestream:
-                  RoleArn: '{{ RoleArn }}'
-                  DatabaseName: '{{ DatabaseName }}'
-                  TableName: '{{ TableName }}'
-                  Dimensions:
-                    - Name: '{{ Name }}'
-                      Value: '{{ Value }}'
-                  Timestamp:
-                    Value: '{{ Value }}'
-                    Unit: '{{ Unit }}'
-              FailureType: '{{ FailureType }}'
-              MinNumberOfExecutedThings: '{{ MinNumberOfExecutedThings }}'
-              ThresholdPercentage: null
-      - name: PresignedUrlConfig
+          criteria_list:
+            - action:
+                cloudwatch_alarm:
+                  state_value: '{{ state_value }}'
+                  alarm_name: '{{ alarm_name }}'
+                  state_reason: '{{ state_reason }}'
+                  role_arn: '{{ role_arn }}'
+                cloudwatch_logs:
+                  log_group_name: '{{ log_group_name }}'
+                  role_arn: '{{ role_arn }}'
+                  batch_mode: '{{ batch_mode }}'
+                cloudwatch_metric:
+                  metric_name: '{{ metric_name }}'
+                  metric_value: '{{ metric_value }}'
+                  metric_namespace: '{{ metric_namespace }}'
+                  metric_unit: '{{ metric_unit }}'
+                  role_arn: '{{ role_arn }}'
+                  metric_timestamp: '{{ metric_timestamp }}'
+                dynamo_db:
+                  table_name: '{{ table_name }}'
+                  payload_field: '{{ payload_field }}'
+                  range_key_field: '{{ range_key_field }}'
+                  hash_key_field: '{{ hash_key_field }}'
+                  range_key_value: '{{ range_key_value }}'
+                  range_key_type: '{{ range_key_type }}'
+                  hash_key_type: '{{ hash_key_type }}'
+                  hash_key_value: '{{ hash_key_value }}'
+                  role_arn: '{{ role_arn }}'
+                dynamo_dbv2:
+                  put_item:
+                    table_name: '{{ table_name }}'
+                  role_arn: '{{ role_arn }}'
+                elasticsearch:
+                  type: '{{ type }}'
+                  index: '{{ index }}'
+                  id: '{{ id }}'
+                  endpoint: '{{ endpoint }}'
+                  role_arn: '{{ role_arn }}'
+                firehose:
+                  delivery_stream_name: '{{ delivery_stream_name }}'
+                  role_arn: '{{ role_arn }}'
+                  separator: '{{ separator }}'
+                  batch_mode: '{{ batch_mode }}'
+                http:
+                  confirmation_url: '{{ confirmation_url }}'
+                  headers:
+                    - value: '{{ value }}'
+                      key: '{{ key }}'
+                  url: '{{ url }}'
+                  auth:
+                    sigv4:
+                      service_name: '{{ service_name }}'
+                      signing_region: '{{ signing_region }}'
+                      role_arn: '{{ role_arn }}'
+                iot_analytics:
+                  role_arn: '{{ role_arn }}'
+                  channel_name: '{{ channel_name }}'
+                  batch_mode: '{{ batch_mode }}'
+                iot_events:
+                  input_name: '{{ input_name }}'
+                  role_arn: '{{ role_arn }}'
+                  message_id: '{{ message_id }}'
+                  batch_mode: '{{ batch_mode }}'
+                iot_site_wise:
+                  role_arn: '{{ role_arn }}'
+                  put_asset_property_value_entries:
+                    - property_alias: '{{ property_alias }}'
+                      property_values:
+                        - value:
+                            string_value: '{{ string_value }}'
+                            double_value: '{{ double_value }}'
+                            boolean_value: '{{ boolean_value }}'
+                            integer_value: '{{ integer_value }}'
+                          timestamp:
+                            time_in_seconds: '{{ time_in_seconds }}'
+                            offset_in_nanos: '{{ offset_in_nanos }}'
+                          quality: '{{ quality }}'
+                      asset_id: '{{ asset_id }}'
+                      entry_id: '{{ entry_id }}'
+                      property_id: '{{ property_id }}'
+                kafka:
+                  destination_arn: '{{ destination_arn }}'
+                  topic: '{{ topic }}'
+                  key: '{{ key }}'
+                  partition: '{{ partition }}'
+                  client_properties: {}
+                  headers:
+                    - value: '{{ value }}'
+                      key: '{{ key }}'
+                kinesis:
+                  partition_key: '{{ partition_key }}'
+                  stream_name: '{{ stream_name }}'
+                  role_arn: '{{ role_arn }}'
+                lambda:
+                  function_arn: '{{ function_arn }}'
+                location:
+                  role_arn: '{{ role_arn }}'
+                  tracker_name: '{{ tracker_name }}'
+                  device_id: '{{ device_id }}'
+                  latitude: '{{ latitude }}'
+                  longitude: '{{ longitude }}'
+                  timestamp:
+                    value: '{{ value }}'
+                    unit: '{{ unit }}'
+                open_search:
+                  type: '{{ type }}'
+                  index: '{{ index }}'
+                  id: '{{ id }}'
+                  endpoint: '{{ endpoint }}'
+                  role_arn: '{{ role_arn }}'
+                republish:
+                  qos: '{{ qos }}'
+                  topic: '{{ topic }}'
+                  role_arn: '{{ role_arn }}'
+                  headers:
+                    payload_format_indicator: '{{ payload_format_indicator }}'
+                    content_type: '{{ content_type }}'
+                    response_topic: '{{ response_topic }}'
+                    correlation_data: '{{ correlation_data }}'
+                    message_expiry: '{{ message_expiry }}'
+                    user_properties:
+                      - key: '{{ key }}'
+                        value: '{{ value }}'
+                s3:
+                  bucket_name: '{{ bucket_name }}'
+                  key: '{{ key }}'
+                  role_arn: '{{ role_arn }}'
+                  canned_acl: '{{ canned_acl }}'
+                sns:
+                  target_arn: '{{ target_arn }}'
+                  message_format: '{{ message_format }}'
+                  role_arn: '{{ role_arn }}'
+                sqs:
+                  role_arn: '{{ role_arn }}'
+                  use_base64: '{{ use_base64 }}'
+                  queue_url: '{{ queue_url }}'
+                step_functions:
+                  execution_name_prefix: '{{ execution_name_prefix }}'
+                  state_machine_name: '{{ state_machine_name }}'
+                  role_arn: '{{ role_arn }}'
+                timestream:
+                  role_arn: '{{ role_arn }}'
+                  database_name: '{{ database_name }}'
+                  table_name: '{{ table_name }}'
+                  dimensions:
+                    - name: '{{ name }}'
+                      value: '{{ value }}'
+                  timestamp:
+                    value: '{{ value }}'
+                    unit: '{{ unit }}'
+              failure_type: '{{ failure_type }}'
+              min_number_of_executed_things: '{{ min_number_of_executed_things }}'
+              threshold_percentage: null
+      - name: presigned_url_config
         value:
-          RoleArn: '{{ RoleArn }}'
-          ExpiresInSec: '{{ ExpiresInSec }}'
-      - name: JobExecutionsRetryConfig
+          role_arn: '{{ role_arn }}'
+          expires_in_sec: '{{ expires_in_sec }}'
+      - name: job_executions_retry_config
         value:
-          RetryCriteriaList:
-            - NumberOfRetries: '{{ NumberOfRetries }}'
-              FailureType: '{{ FailureType }}'
-      - name: MaintenanceWindows
+          retry_criteria_list:
+            - number_of_retries: '{{ number_of_retries }}'
+              failure_type: '{{ failure_type }}'
+      - name: maintenance_windows
         value:
-          - StartTime: '{{ StartTime }}'
-            DurationInMinutes: '{{ DurationInMinutes }}'
-      - name: DestinationPackageVersions
+          - start_time: '{{ start_time }}'
+            duration_in_minutes: '{{ duration_in_minutes }}'
+      - name: destination_package_versions
         value:
-          - '{{ DestinationPackageVersions[0] }}'
-      - name: Tags
+          - '{{ destination_package_versions[0] }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -752,7 +751,7 @@ resources:
 ```sql
 /*+ delete */
 DELETE FROM awscc.iot.job_templates
-WHERE Identifier = '<JobTemplateId>'
+WHERE Identifier = '{{ job_template_id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/iot/loggings/index.md b/website/docs/services/iot/loggings/index.md
index 8c601cf3c..71ba459c4 100644
--- a/website/docs/services/iot/loggings/index.md
+++ b/website/docs/services/iot/loggings/index.md
@@ -146,7 +146,7 @@ account_id,
 role_arn,
 default_log_level
 FROM awscc.iot.loggings
-WHERE region = 'us-east-1' AND Identifier = '<AccountId>';
+WHERE region = 'us-east-1' AND Identifier = '{{ account_id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -184,10 +184,10 @@ INSERT INTO awscc.iot.loggings (
  DefaultLogLevel,
  region
 )
-SELECT 
-'{{ AccountId }}',
- '{{ RoleArn }}',
- '{{ DefaultLogLevel }}',
+SELECT
+'{{ account_id }}',
+ '{{ role_arn }}',
+ '{{ default_log_level }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -201,10 +201,10 @@ INSERT INTO awscc.iot.loggings (
  DefaultLogLevel,
  region
 )
-SELECT 
- '{{ AccountId }}',
- '{{ RoleArn }}',
- '{{ DefaultLogLevel }}',
+SELECT
+ '{{ account_id }}',
+ '{{ role_arn }}',
+ '{{ default_log_level }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -222,13 +222,12 @@ globals:
 resources:
   - name: logging
     props:
-      - name: AccountId
-        value: '{{ AccountId }}'
-      - name: RoleArn
-        value: '{{ RoleArn }}'
-      - name: DefaultLogLevel
-        value: '{{ DefaultLogLevel }}'
-
+      - name: account_id
+        value: '{{ account_id }}'
+      - name: role_arn
+        value: '{{ role_arn }}'
+      - name: default_log_level
+        value: '{{ default_log_level }}'
 ```
 </TabItem>
 </Tabs>
@@ -245,7 +244,7 @@ SET PatchDocument = string('{{ {
     "DefaultLogLevel": default_log_level
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<AccountId>';
+AND Identifier = '{{ account_id }}';
 ```
 
 
@@ -254,7 +253,7 @@ AND Identifier = '<AccountId>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.iot.loggings
-WHERE Identifier = '<AccountId>'
+WHERE Identifier = '{{ account_id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/iot/mitigation_actions/index.md b/website/docs/services/iot/mitigation_actions/index.md
index 45111caf2..0724773ef 100644
--- a/website/docs/services/iot/mitigation_actions/index.md
+++ b/website/docs/services/iot/mitigation_actions/index.md
@@ -260,7 +260,7 @@ action_params,
 mitigation_action_arn,
 mitigation_action_id
 FROM awscc.iot.mitigation_actions
-WHERE region = 'us-east-1' AND Identifier = '<ActionName>';
+WHERE region = 'us-east-1' AND Identifier = '{{ action_name }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -297,9 +297,9 @@ INSERT INTO awscc.iot.mitigation_actions (
  ActionParams,
  region
 )
-SELECT 
-'{{ RoleArn }}',
- '{{ ActionParams }}',
+SELECT
+'{{ role_arn }}',
+ '{{ action_params }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -314,11 +314,11 @@ INSERT INTO awscc.iot.mitigation_actions (
  ActionParams,
  region
 )
-SELECT 
- '{{ ActionName }}',
- '{{ RoleArn }}',
- '{{ Tags }}',
- '{{ ActionParams }}',
+SELECT
+ '{{ action_name }}',
+ '{{ role_arn }}',
+ '{{ tags }}',
+ '{{ action_params }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -336,32 +336,31 @@ globals:
 resources:
   - name: mitigation_action
     props:
-      - name: ActionName
-        value: '{{ ActionName }}'
-      - name: RoleArn
-        value: '{{ RoleArn }}'
-      - name: Tags
+      - name: action_name
+        value: '{{ action_name }}'
+      - name: role_arn
+        value: '{{ role_arn }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-      - name: ActionParams
+          - key: '{{ key }}'
+            value: '{{ value }}'
+      - name: action_params
         value:
-          AddThingsToThingGroupParams:
-            OverrideDynamicGroups: '{{ OverrideDynamicGroups }}'
-            ThingGroupNames:
-              - '{{ ThingGroupNames[0] }}'
-          EnableIoTLoggingParams:
-            LogLevel: '{{ LogLevel }}'
-            RoleArnForLogging: '{{ RoleArnForLogging }}'
-          PublishFindingToSnsParams:
-            TopicArn: '{{ TopicArn }}'
-          ReplaceDefaultPolicyVersionParams:
-            TemplateName: '{{ TemplateName }}'
-          UpdateCACertificateParams:
-            Action: '{{ Action }}'
-          UpdateDeviceCertificateParams:
-            Action: '{{ Action }}'
-
+          add_things_to_thing_group_params:
+            override_dynamic_groups: '{{ override_dynamic_groups }}'
+            thing_group_names:
+              - '{{ thing_group_names[0] }}'
+          enable_io_tlogging_params:
+            log_level: '{{ log_level }}'
+            role_arn_for_logging: '{{ role_arn_for_logging }}'
+          publish_finding_to_sns_params:
+            topic_arn: '{{ topic_arn }}'
+          replace_default_policy_version_params:
+            template_name: '{{ template_name }}'
+          update_ca_certificate_params:
+            action: '{{ action }}'
+          update_device_certificate_params:
+            action: '{{ action }}'
 ```
 </TabItem>
 </Tabs>
@@ -379,7 +378,7 @@ SET PatchDocument = string('{{ {
     "ActionParams": action_params
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<ActionName>';
+AND Identifier = '{{ action_name }}';
 ```
 
 
@@ -388,7 +387,7 @@ AND Identifier = '<ActionName>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.iot.mitigation_actions
-WHERE Identifier = '<ActionName>'
+WHERE Identifier = '{{ action_name }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/iot/policies/index.md b/website/docs/services/iot/policies/index.md
index 19849138f..c05d6d2ee 100644
--- a/website/docs/services/iot/policies/index.md
+++ b/website/docs/services/iot/policies/index.md
@@ -170,7 +170,7 @@ policy_document,
 policy_name,
 tags
 FROM awscc.iot.policies
-WHERE region = 'us-east-1' AND Identifier = '<Id>';
+WHERE region = 'us-east-1' AND Identifier = '{{ id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -206,8 +206,8 @@ INSERT INTO awscc.iot.policies (
  PolicyDocument,
  region
 )
-SELECT 
-'{{ PolicyDocument }}',
+SELECT
+'{{ policy_document }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -221,10 +221,10 @@ INSERT INTO awscc.iot.policies (
  Tags,
  region
 )
-SELECT 
- '{{ PolicyDocument }}',
- '{{ PolicyName }}',
- '{{ Tags }}',
+SELECT
+ '{{ policy_document }}',
+ '{{ policy_name }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -242,15 +242,14 @@ globals:
 resources:
   - name: policy
     props:
-      - name: PolicyDocument
+      - name: policy_document
         value: {}
-      - name: PolicyName
-        value: '{{ PolicyName }}'
-      - name: Tags
+      - name: policy_name
+        value: '{{ policy_name }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -267,7 +266,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Id>';
+AND Identifier = '{{ id }}';
 ```
 
 
@@ -276,7 +275,7 @@ AND Identifier = '<Id>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.iot.policies
-WHERE Identifier = '<Id>'
+WHERE Identifier = '{{ id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/iot/provisioning_templates/index.md b/website/docs/services/iot/provisioning_templates/index.md
index 111a3391e..4878993b4 100644
--- a/website/docs/services/iot/provisioning_templates/index.md
+++ b/website/docs/services/iot/provisioning_templates/index.md
@@ -206,7 +206,7 @@ template_type,
 pre_provisioning_hook,
 tags
 FROM awscc.iot.provisioning_templates
-WHERE region = 'us-east-1' AND Identifier = '<TemplateName>';
+WHERE region = 'us-east-1' AND Identifier = '{{ template_name }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -243,9 +243,9 @@ INSERT INTO awscc.iot.provisioning_templates (
  TemplateBody,
  region
 )
-SELECT 
-'{{ ProvisioningRoleArn }}',
- '{{ TemplateBody }}',
+SELECT
+'{{ provisioning_role_arn }}',
+ '{{ template_body }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -264,15 +264,15 @@ INSERT INTO awscc.iot.provisioning_templates (
  Tags,
  region
 )
-SELECT 
- '{{ TemplateName }}',
- '{{ Description }}',
- '{{ Enabled }}',
- '{{ ProvisioningRoleArn }}',
- '{{ TemplateBody }}',
- '{{ TemplateType }}',
- '{{ PreProvisioningHook }}',
- '{{ Tags }}',
+SELECT
+ '{{ template_name }}',
+ '{{ description }}',
+ '{{ enabled }}',
+ '{{ provisioning_role_arn }}',
+ '{{ template_body }}',
+ '{{ template_type }}',
+ '{{ pre_provisioning_hook }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -290,27 +290,26 @@ globals:
 resources:
   - name: provisioning_template
     props:
-      - name: TemplateName
-        value: '{{ TemplateName }}'
-      - name: Description
-        value: '{{ Description }}'
-      - name: Enabled
-        value: '{{ Enabled }}'
-      - name: ProvisioningRoleArn
-        value: '{{ ProvisioningRoleArn }}'
-      - name: TemplateBody
-        value: '{{ TemplateBody }}'
-      - name: TemplateType
-        value: '{{ TemplateType }}'
-      - name: PreProvisioningHook
+      - name: template_name
+        value: '{{ template_name }}'
+      - name: description
+        value: '{{ description }}'
+      - name: enabled
+        value: '{{ enabled }}'
+      - name: provisioning_role_arn
+        value: '{{ provisioning_role_arn }}'
+      - name: template_body
+        value: '{{ template_body }}'
+      - name: template_type
+        value: '{{ template_type }}'
+      - name: pre_provisioning_hook
         value:
-          TargetArn: '{{ TargetArn }}'
-          PayloadVersion: '{{ PayloadVersion }}'
-      - name: Tags
+          target_arn: '{{ target_arn }}'
+          payload_version: '{{ payload_version }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -331,7 +330,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<TemplateName>';
+AND Identifier = '{{ template_name }}';
 ```
 
 
@@ -340,7 +339,7 @@ AND Identifier = '<TemplateName>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.iot.provisioning_templates
-WHERE Identifier = '<TemplateName>'
+WHERE Identifier = '{{ template_name }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/iot/resource_specific_loggings/index.md b/website/docs/services/iot/resource_specific_loggings/index.md
index 67e6e23f4..16233fabe 100644
--- a/website/docs/services/iot/resource_specific_loggings/index.md
+++ b/website/docs/services/iot/resource_specific_loggings/index.md
@@ -152,7 +152,7 @@ target_name,
 log_level,
 target_id
 FROM awscc.iot.resource_specific_loggings
-WHERE region = 'us-east-1' AND Identifier = '<TargetId>';
+WHERE region = 'us-east-1' AND Identifier = '{{ target_id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -190,10 +190,10 @@ INSERT INTO awscc.iot.resource_specific_loggings (
  LogLevel,
  region
 )
-SELECT 
-'{{ TargetType }}',
- '{{ TargetName }}',
- '{{ LogLevel }}',
+SELECT
+'{{ target_type }}',
+ '{{ target_name }}',
+ '{{ log_level }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -207,10 +207,10 @@ INSERT INTO awscc.iot.resource_specific_loggings (
  LogLevel,
  region
 )
-SELECT 
- '{{ TargetType }}',
- '{{ TargetName }}',
- '{{ LogLevel }}',
+SELECT
+ '{{ target_type }}',
+ '{{ target_name }}',
+ '{{ log_level }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -228,13 +228,12 @@ globals:
 resources:
   - name: resource_specific_logging
     props:
-      - name: TargetType
-        value: '{{ TargetType }}'
-      - name: TargetName
-        value: '{{ TargetName }}'
-      - name: LogLevel
-        value: '{{ LogLevel }}'
-
+      - name: target_type
+        value: '{{ target_type }}'
+      - name: target_name
+        value: '{{ target_name }}'
+      - name: log_level
+        value: '{{ log_level }}'
 ```
 </TabItem>
 </Tabs>
@@ -250,7 +249,7 @@ SET PatchDocument = string('{{ {
     "LogLevel": log_level
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<TargetId>';
+AND Identifier = '{{ target_id }}';
 ```
 
 
@@ -259,7 +258,7 @@ AND Identifier = '<TargetId>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.iot.resource_specific_loggings
-WHERE Identifier = '<TargetId>'
+WHERE Identifier = '{{ target_id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/iot/role_aliases/index.md b/website/docs/services/iot/role_aliases/index.md
index 35f02c6ee..a0a9ebce6 100644
--- a/website/docs/services/iot/role_aliases/index.md
+++ b/website/docs/services/iot/role_aliases/index.md
@@ -170,7 +170,7 @@ role_arn,
 credential_duration_seconds,
 tags
 FROM awscc.iot.role_aliases
-WHERE region = 'us-east-1' AND Identifier = '<RoleAlias>';
+WHERE region = 'us-east-1' AND Identifier = '{{ role_alias }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -206,8 +206,8 @@ INSERT INTO awscc.iot.role_aliases (
  RoleArn,
  region
 )
-SELECT 
-'{{ RoleArn }}',
+SELECT
+'{{ role_arn }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -222,11 +222,11 @@ INSERT INTO awscc.iot.role_aliases (
  Tags,
  region
 )
-SELECT 
- '{{ RoleAlias }}',
- '{{ RoleArn }}',
- '{{ CredentialDurationSeconds }}',
- '{{ Tags }}',
+SELECT
+ '{{ role_alias }}',
+ '{{ role_arn }}',
+ '{{ credential_duration_seconds }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -244,17 +244,16 @@ globals:
 resources:
   - name: role_alias
     props:
-      - name: RoleAlias
-        value: '{{ RoleAlias }}'
-      - name: RoleArn
-        value: '{{ RoleArn }}'
-      - name: CredentialDurationSeconds
-        value: '{{ CredentialDurationSeconds }}'
-      - name: Tags
+      - name: role_alias
+        value: '{{ role_alias }}'
+      - name: role_arn
+        value: '{{ role_arn }}'
+      - name: credential_duration_seconds
+        value: '{{ credential_duration_seconds }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -272,7 +271,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<RoleAlias>';
+AND Identifier = '{{ role_alias }}';
 ```
 
 
@@ -281,7 +280,7 @@ AND Identifier = '<RoleAlias>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.iot.role_aliases
-WHERE Identifier = '<RoleAlias>'
+WHERE Identifier = '{{ role_alias }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/iot/scheduled_audits/index.md b/website/docs/services/iot/scheduled_audits/index.md
index fd81c4b26..bb7aa00aa 100644
--- a/website/docs/services/iot/scheduled_audits/index.md
+++ b/website/docs/services/iot/scheduled_audits/index.md
@@ -182,7 +182,7 @@ target_check_names,
 scheduled_audit_arn,
 tags
 FROM awscc.iot.scheduled_audits
-WHERE region = 'us-east-1' AND Identifier = '<ScheduledAuditName>';
+WHERE region = 'us-east-1' AND Identifier = '{{ scheduled_audit_name }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -219,9 +219,9 @@ INSERT INTO awscc.iot.scheduled_audits (
  TargetCheckNames,
  region
 )
-SELECT 
-'{{ Frequency }}',
- '{{ TargetCheckNames }}',
+SELECT
+'{{ frequency }}',
+ '{{ target_check_names }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -238,13 +238,13 @@ INSERT INTO awscc.iot.scheduled_audits (
  Tags,
  region
 )
-SELECT 
- '{{ ScheduledAuditName }}',
- '{{ Frequency }}',
- '{{ DayOfMonth }}',
- '{{ DayOfWeek }}',
- '{{ TargetCheckNames }}',
- '{{ Tags }}',
+SELECT
+ '{{ scheduled_audit_name }}',
+ '{{ frequency }}',
+ '{{ day_of_month }}',
+ '{{ day_of_week }}',
+ '{{ target_check_names }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -262,22 +262,21 @@ globals:
 resources:
   - name: scheduled_audit
     props:
-      - name: ScheduledAuditName
-        value: '{{ ScheduledAuditName }}'
-      - name: Frequency
-        value: '{{ Frequency }}'
-      - name: DayOfMonth
-        value: '{{ DayOfMonth }}'
-      - name: DayOfWeek
-        value: '{{ DayOfWeek }}'
-      - name: TargetCheckNames
+      - name: scheduled_audit_name
+        value: '{{ scheduled_audit_name }}'
+      - name: frequency
+        value: '{{ frequency }}'
+      - name: day_of_month
+        value: '{{ day_of_month }}'
+      - name: day_of_week
+        value: '{{ day_of_week }}'
+      - name: target_check_names
         value:
-          - '{{ TargetCheckNames[0] }}'
-      - name: Tags
+          - '{{ target_check_names[0] }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -297,7 +296,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<ScheduledAuditName>';
+AND Identifier = '{{ scheduled_audit_name }}';
 ```
 
 
@@ -306,7 +305,7 @@ AND Identifier = '<ScheduledAuditName>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.iot.scheduled_audits
-WHERE Identifier = '<ScheduledAuditName>'
+WHERE Identifier = '{{ scheduled_audit_name }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/iot/security_profiles/index.md b/website/docs/services/iot/security_profiles/index.md
index 1bcde359a..19f5977a4 100644
--- a/website/docs/services/iot/security_profiles/index.md
+++ b/website/docs/services/iot/security_profiles/index.md
@@ -362,7 +362,7 @@ tags,
 target_arns,
 security_profile_arn
 FROM awscc.iot.security_profiles
-WHERE region = 'us-east-1' AND Identifier = '<SecurityProfileName>';
+WHERE region = 'us-east-1' AND Identifier = '{{ security_profile_name }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -398,7 +398,7 @@ INSERT INTO awscc.iot.security_profiles (
  ,
  region
 )
-SELECT 
+SELECT
 '{{  }}',
 '{{ region }}';
 ```
@@ -418,15 +418,15 @@ INSERT INTO awscc.iot.security_profiles (
  TargetArns,
  region
 )
-SELECT 
- '{{ SecurityProfileName }}',
- '{{ SecurityProfileDescription }}',
- '{{ Behaviors }}',
- '{{ AlertTargets }}',
- '{{ AdditionalMetricsToRetainV2 }}',
- '{{ MetricsExportConfig }}',
- '{{ Tags }}',
- '{{ TargetArns }}',
+SELECT
+ '{{ security_profile_name }}',
+ '{{ security_profile_description }}',
+ '{{ behaviors }}',
+ '{{ alert_targets }}',
+ '{{ additional_metrics_to_retain_v2 }}',
+ '{{ metrics_export_config }}',
+ '{{ tags }}',
+ '{{ target_arns }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -444,58 +444,57 @@ globals:
 resources:
   - name: security_profile
     props:
-      - name: SecurityProfileName
-        value: '{{ SecurityProfileName }}'
-      - name: SecurityProfileDescription
-        value: '{{ SecurityProfileDescription }}'
-      - name: Behaviors
+      - name: security_profile_name
+        value: '{{ security_profile_name }}'
+      - name: security_profile_description
+        value: '{{ security_profile_description }}'
+      - name: behaviors
         value:
-          - Name: '{{ Name }}'
-            Metric: '{{ Metric }}'
-            MetricDimension:
-              DimensionName: '{{ DimensionName }}'
-              Operator: '{{ Operator }}'
-            Criteria:
-              ComparisonOperator: '{{ ComparisonOperator }}'
-              Value:
-                Count: '{{ Count }}'
-                Cidrs:
-                  - '{{ Cidrs[0] }}'
-                Ports:
-                  - '{{ Ports[0] }}'
-                Number: null
-                Numbers:
+          - name: '{{ name }}'
+            metric: '{{ metric }}'
+            metric_dimension:
+              dimension_name: '{{ dimension_name }}'
+              operator: '{{ operator }}'
+            criteria:
+              comparison_operator: '{{ comparison_operator }}'
+              value:
+                count: '{{ count }}'
+                cidrs:
+                  - '{{ cidrs[0] }}'
+                ports:
+                  - '{{ ports[0] }}'
+                number: null
+                numbers:
                   - null
-                Strings:
-                  - '{{ Strings[0] }}'
-              DurationSeconds: '{{ DurationSeconds }}'
-              ConsecutiveDatapointsToAlarm: '{{ ConsecutiveDatapointsToAlarm }}'
-              ConsecutiveDatapointsToClear: '{{ ConsecutiveDatapointsToClear }}'
-              StatisticalThreshold:
-                Statistic: '{{ Statistic }}'
-              MlDetectionConfig:
-                ConfidenceLevel: '{{ ConfidenceLevel }}'
-            SuppressAlerts: '{{ SuppressAlerts }}'
-            ExportMetric: '{{ ExportMetric }}'
-      - name: AlertTargets
+                strings:
+                  - '{{ strings[0] }}'
+              duration_seconds: '{{ duration_seconds }}'
+              consecutive_datapoints_to_alarm: '{{ consecutive_datapoints_to_alarm }}'
+              consecutive_datapoints_to_clear: '{{ consecutive_datapoints_to_clear }}'
+              statistical_threshold:
+                statistic: '{{ statistic }}'
+              ml_detection_config:
+                confidence_level: '{{ confidence_level }}'
+            suppress_alerts: '{{ suppress_alerts }}'
+            export_metric: '{{ export_metric }}'
+      - name: alert_targets
         value: {}
-      - name: AdditionalMetricsToRetainV2
+      - name: additional_metrics_to_retain_v2
         value:
-          - Metric: '{{ Metric }}'
-            MetricDimension: null
-            ExportMetric: null
-      - name: MetricsExportConfig
+          - metric: '{{ metric }}'
+            metric_dimension: null
+            export_metric: null
+      - name: metrics_export_config
         value:
-          MqttTopic: '{{ MqttTopic }}'
-          RoleArn: '{{ RoleArn }}'
-      - name: Tags
+          mqtt_topic: '{{ mqtt_topic }}'
+          role_arn: '{{ role_arn }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-      - name: TargetArns
+          - key: '{{ key }}'
+            value: '{{ value }}'
+      - name: target_arns
         value:
-          - '{{ TargetArns[0] }}'
-
+          - '{{ target_arns[0] }}'
 ```
 </TabItem>
 </Tabs>
@@ -517,7 +516,7 @@ SET PatchDocument = string('{{ {
     "TargetArns": target_arns
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<SecurityProfileName>';
+AND Identifier = '{{ security_profile_name }}';
 ```
 
 
@@ -526,7 +525,7 @@ AND Identifier = '<SecurityProfileName>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.iot.security_profiles
-WHERE Identifier = '<SecurityProfileName>'
+WHERE Identifier = '{{ security_profile_name }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/iot/software_package_versions/index.md b/website/docs/services/iot/software_package_versions/index.md
index c9ca0a509..0d35fe46e 100644
--- a/website/docs/services/iot/software_package_versions/index.md
+++ b/website/docs/services/iot/software_package_versions/index.md
@@ -265,7 +265,7 @@ status,
 tags,
 version_name
 FROM awscc.iot.software_package_versions
-WHERE region = 'us-east-1' AND Identifier = '<PackageName>|<VersionName>';
+WHERE region = 'us-east-1' AND Identifier = '{{ package_name }}|{{ version_name }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -302,8 +302,8 @@ INSERT INTO awscc.iot.software_package_versions (
  PackageName,
  region
 )
-SELECT 
-'{{ PackageName }}',
+SELECT
+'{{ package_name }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -322,15 +322,15 @@ INSERT INTO awscc.iot.software_package_versions (
  VersionName,
  region
 )
-SELECT 
- '{{ Attributes }}',
- '{{ Artifact }}',
- '{{ Description }}',
- '{{ PackageName }}',
- '{{ Recipe }}',
- '{{ Sbom }}',
- '{{ Tags }}',
- '{{ VersionName }}',
+SELECT
+ '{{ attributes }}',
+ '{{ artifact }}',
+ '{{ description }}',
+ '{{ package_name }}',
+ '{{ recipe }}',
+ '{{ sbom }}',
+ '{{ tags }}',
+ '{{ version_name }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -348,30 +348,29 @@ globals:
 resources:
   - name: software_package_version
     props:
-      - name: Attributes
+      - name: attributes
         value: {}
-      - name: Artifact
+      - name: artifact
         value:
-          S3Location:
-            Bucket: '{{ Bucket }}'
-            Key: '{{ Key }}'
-            Version: '{{ Version }}'
-      - name: Description
-        value: '{{ Description }}'
-      - name: PackageName
-        value: '{{ PackageName }}'
-      - name: Recipe
-        value: '{{ Recipe }}'
-      - name: Sbom
+          s3_location:
+            bucket: '{{ bucket }}'
+            key: '{{ key }}'
+            version: '{{ version }}'
+      - name: description
+        value: '{{ description }}'
+      - name: package_name
+        value: '{{ package_name }}'
+      - name: recipe
+        value: '{{ recipe }}'
+      - name: sbom
         value:
-          S3Location: null
-      - name: Tags
+          s3_location: null
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-      - name: VersionName
-        value: '{{ VersionName }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
+      - name: version_name
+        value: '{{ version_name }}'
 ```
 </TabItem>
 </Tabs>
@@ -392,7 +391,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<PackageName>|<VersionName>';
+AND Identifier = '{{ package_name }}|{{ version_name }}';
 ```
 
 
@@ -401,7 +400,7 @@ AND Identifier = '<PackageName>|<VersionName>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.iot.software_package_versions
-WHERE Identifier = '<PackageName|VersionName>'
+WHERE Identifier = '{{ package_name }}|{{ version_name }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/iot/software_packages/index.md b/website/docs/services/iot/software_packages/index.md
index ef6dc0be9..8e4769005 100644
--- a/website/docs/services/iot/software_packages/index.md
+++ b/website/docs/services/iot/software_packages/index.md
@@ -164,7 +164,7 @@ package_arn,
 package_name,
 tags
 FROM awscc.iot.software_packages
-WHERE region = 'us-east-1' AND Identifier = '<PackageName>';
+WHERE region = 'us-east-1' AND Identifier = '{{ package_name }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -202,10 +202,10 @@ INSERT INTO awscc.iot.software_packages (
  Tags,
  region
 )
-SELECT 
-'{{ Description }}',
- '{{ PackageName }}',
- '{{ Tags }}',
+SELECT
+'{{ description }}',
+ '{{ package_name }}',
+ '{{ tags }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -219,10 +219,10 @@ INSERT INTO awscc.iot.software_packages (
  Tags,
  region
 )
-SELECT 
- '{{ Description }}',
- '{{ PackageName }}',
- '{{ Tags }}',
+SELECT
+ '{{ description }}',
+ '{{ package_name }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -240,15 +240,14 @@ globals:
 resources:
   - name: software_package
     props:
-      - name: Description
-        value: '{{ Description }}'
-      - name: PackageName
-        value: '{{ PackageName }}'
-      - name: Tags
+      - name: description
+        value: '{{ description }}'
+      - name: package_name
+        value: '{{ package_name }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -265,7 +264,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<PackageName>';
+AND Identifier = '{{ package_name }}';
 ```
 
 
@@ -274,7 +273,7 @@ AND Identifier = '<PackageName>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.iot.software_packages
-WHERE Identifier = '<PackageName>'
+WHERE Identifier = '{{ package_name }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/iot/thing_groups/index.md b/website/docs/services/iot/thing_groups/index.md
index 7c20f1fc3..db4305f5e 100644
--- a/website/docs/services/iot/thing_groups/index.md
+++ b/website/docs/services/iot/thing_groups/index.md
@@ -201,7 +201,7 @@ query_string,
 thing_group_properties,
 tags
 FROM awscc.iot.thing_groups
-WHERE region = 'us-east-1' AND Identifier = '<ThingGroupName>';
+WHERE region = 'us-east-1' AND Identifier = '{{ thing_group_name }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -241,12 +241,12 @@ INSERT INTO awscc.iot.thing_groups (
  Tags,
  region
 )
-SELECT 
-'{{ ThingGroupName }}',
- '{{ ParentGroupName }}',
- '{{ QueryString }}',
- '{{ ThingGroupProperties }}',
- '{{ Tags }}',
+SELECT
+'{{ thing_group_name }}',
+ '{{ parent_group_name }}',
+ '{{ query_string }}',
+ '{{ thing_group_properties }}',
+ '{{ tags }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -262,12 +262,12 @@ INSERT INTO awscc.iot.thing_groups (
  Tags,
  region
 )
-SELECT 
- '{{ ThingGroupName }}',
- '{{ ParentGroupName }}',
- '{{ QueryString }}',
- '{{ ThingGroupProperties }}',
- '{{ Tags }}',
+SELECT
+ '{{ thing_group_name }}',
+ '{{ parent_group_name }}',
+ '{{ query_string }}',
+ '{{ thing_group_properties }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -285,22 +285,21 @@ globals:
 resources:
   - name: thing_group
     props:
-      - name: ThingGroupName
-        value: '{{ ThingGroupName }}'
-      - name: ParentGroupName
-        value: '{{ ParentGroupName }}'
-      - name: QueryString
-        value: '{{ QueryString }}'
-      - name: ThingGroupProperties
+      - name: thing_group_name
+        value: '{{ thing_group_name }}'
+      - name: parent_group_name
+        value: '{{ parent_group_name }}'
+      - name: query_string
+        value: '{{ query_string }}'
+      - name: thing_group_properties
         value:
-          AttributePayload:
-            Attributes: {}
-          ThingGroupDescription: '{{ ThingGroupDescription }}'
-      - name: Tags
+          attribute_payload:
+            attributes: {}
+          thing_group_description: '{{ thing_group_description }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -318,7 +317,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<ThingGroupName>';
+AND Identifier = '{{ thing_group_name }}';
 ```
 
 
@@ -327,7 +326,7 @@ AND Identifier = '<ThingGroupName>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.iot.thing_groups
-WHERE Identifier = '<ThingGroupName>'
+WHERE Identifier = '{{ thing_group_name }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/iot/thing_types/index.md b/website/docs/services/iot/thing_types/index.md
index ec6f48e35..568496a4a 100644
--- a/website/docs/services/iot/thing_types/index.md
+++ b/website/docs/services/iot/thing_types/index.md
@@ -217,7 +217,7 @@ deprecate_thing_type,
 thing_type_properties,
 tags
 FROM awscc.iot.thing_types
-WHERE region = 'us-east-1' AND Identifier = '<ThingTypeName>';
+WHERE region = 'us-east-1' AND Identifier = '{{ thing_type_name }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -256,11 +256,11 @@ INSERT INTO awscc.iot.thing_types (
  Tags,
  region
 )
-SELECT 
-'{{ ThingTypeName }}',
- '{{ DeprecateThingType }}',
- '{{ ThingTypeProperties }}',
- '{{ Tags }}',
+SELECT
+'{{ thing_type_name }}',
+ '{{ deprecate_thing_type }}',
+ '{{ thing_type_properties }}',
+ '{{ tags }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -275,11 +275,11 @@ INSERT INTO awscc.iot.thing_types (
  Tags,
  region
 )
-SELECT 
- '{{ ThingTypeName }}',
- '{{ DeprecateThingType }}',
- '{{ ThingTypeProperties }}',
- '{{ Tags }}',
+SELECT
+ '{{ thing_type_name }}',
+ '{{ deprecate_thing_type }}',
+ '{{ thing_type_properties }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -297,25 +297,24 @@ globals:
 resources:
   - name: thing_type
     props:
-      - name: ThingTypeName
-        value: '{{ ThingTypeName }}'
-      - name: DeprecateThingType
-        value: '{{ DeprecateThingType }}'
-      - name: ThingTypeProperties
+      - name: thing_type_name
+        value: '{{ thing_type_name }}'
+      - name: deprecate_thing_type
+        value: '{{ deprecate_thing_type }}'
+      - name: thing_type_properties
         value:
-          SearchableAttributes:
-            - '{{ SearchableAttributes[0] }}'
-          ThingTypeDescription: '{{ ThingTypeDescription }}'
-          Mqtt5Configuration:
-            PropagatingAttributes:
-              - UserPropertyKey: '{{ UserPropertyKey }}'
-                ThingAttribute: '{{ ThingAttribute }}'
-                ConnectionAttribute: '{{ ConnectionAttribute }}'
-      - name: Tags
+          searchable_attributes:
+            - '{{ searchable_attributes[0] }}'
+          thing_type_description: '{{ thing_type_description }}'
+          mqtt5_configuration:
+            propagating_attributes:
+              - user_property_key: '{{ user_property_key }}'
+                thing_attribute: '{{ thing_attribute }}'
+                connection_attribute: '{{ connection_attribute }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -333,7 +332,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<ThingTypeName>';
+AND Identifier = '{{ thing_type_name }}';
 ```
 
 
@@ -342,7 +341,7 @@ AND Identifier = '<ThingTypeName>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.iot.thing_types
-WHERE Identifier = '<ThingTypeName>'
+WHERE Identifier = '{{ thing_type_name }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/iot/things/index.md b/website/docs/services/iot/things/index.md
index 2dfcddbcc..38b3df1d1 100644
--- a/website/docs/services/iot/things/index.md
+++ b/website/docs/services/iot/things/index.md
@@ -159,7 +159,7 @@ arn,
 attribute_payload,
 thing_name
 FROM awscc.iot.things
-WHERE region = 'us-east-1' AND Identifier = '<ThingName>';
+WHERE region = 'us-east-1' AND Identifier = '{{ thing_name }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -196,9 +196,9 @@ INSERT INTO awscc.iot.things (
  ThingName,
  region
 )
-SELECT 
-'{{ AttributePayload }}',
- '{{ ThingName }}',
+SELECT
+'{{ attribute_payload }}',
+ '{{ thing_name }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -211,9 +211,9 @@ INSERT INTO awscc.iot.things (
  ThingName,
  region
 )
-SELECT 
- '{{ AttributePayload }}',
- '{{ ThingName }}',
+SELECT
+ '{{ attribute_payload }}',
+ '{{ thing_name }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -231,12 +231,11 @@ globals:
 resources:
   - name: thing
     props:
-      - name: AttributePayload
+      - name: attribute_payload
         value:
-          Attributes: {}
-      - name: ThingName
-        value: '{{ ThingName }}'
-
+          attributes: {}
+      - name: thing_name
+        value: '{{ thing_name }}'
 ```
 </TabItem>
 </Tabs>
@@ -252,7 +251,7 @@ SET PatchDocument = string('{{ {
     "AttributePayload": attribute_payload
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<ThingName>';
+AND Identifier = '{{ thing_name }}';
 ```
 
 
@@ -261,7 +260,7 @@ AND Identifier = '<ThingName>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.iot.things
-WHERE Identifier = '<ThingName>'
+WHERE Identifier = '{{ thing_name }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/iot/topic_rule_destinations/index.md b/website/docs/services/iot/topic_rule_destinations/index.md
index be45c2454..d845d80c4 100644
--- a/website/docs/services/iot/topic_rule_destinations/index.md
+++ b/website/docs/services/iot/topic_rule_destinations/index.md
@@ -187,7 +187,7 @@ http_url_properties,
 status_reason,
 vpc_properties
 FROM awscc.iot.topic_rule_destinations
-WHERE region = 'us-east-1' AND Identifier = '<Arn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -225,10 +225,10 @@ INSERT INTO awscc.iot.topic_rule_destinations (
  VpcProperties,
  region
 )
-SELECT 
-'{{ Status }}',
- '{{ HttpUrlProperties }}',
- '{{ VpcProperties }}',
+SELECT
+'{{ status }}',
+ '{{ http_url_properties }}',
+ '{{ vpc_properties }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -242,10 +242,10 @@ INSERT INTO awscc.iot.topic_rule_destinations (
  VpcProperties,
  region
 )
-SELECT 
- '{{ Status }}',
- '{{ HttpUrlProperties }}',
- '{{ VpcProperties }}',
+SELECT
+ '{{ status }}',
+ '{{ http_url_properties }}',
+ '{{ vpc_properties }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -263,20 +263,19 @@ globals:
 resources:
   - name: topic_rule_destination
     props:
-      - name: Status
-        value: '{{ Status }}'
-      - name: HttpUrlProperties
+      - name: status
+        value: '{{ status }}'
+      - name: http_url_properties
         value:
-          ConfirmationUrl: '{{ ConfirmationUrl }}'
-      - name: VpcProperties
+          confirmation_url: '{{ confirmation_url }}'
+      - name: vpc_properties
         value:
-          SubnetIds:
-            - '{{ SubnetIds[0] }}'
-          SecurityGroups:
-            - '{{ SecurityGroups[0] }}'
-          VpcId: '{{ VpcId }}'
-          RoleArn: '{{ RoleArn }}'
-
+          subnet_ids:
+            - '{{ subnet_ids[0] }}'
+          security_groups:
+            - '{{ security_groups[0] }}'
+          vpc_id: '{{ vpc_id }}'
+          role_arn: '{{ role_arn }}'
 ```
 </TabItem>
 </Tabs>
@@ -292,7 +291,7 @@ SET PatchDocument = string('{{ {
     "Status": status
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Arn>';
+AND Identifier = '{{ arn }}';
 ```
 
 
@@ -301,7 +300,7 @@ AND Identifier = '<Arn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.iot.topic_rule_destinations
-WHERE Identifier = '<Arn>'
+WHERE Identifier = '{{ arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/iot/topic_rules/index.md b/website/docs/services/iot/topic_rules/index.md
index cd31bb415..02f1d948b 100644
--- a/website/docs/services/iot/topic_rules/index.md
+++ b/website/docs/services/iot/topic_rules/index.md
@@ -797,7 +797,7 @@ rule_name,
 topic_rule_payload,
 tags
 FROM awscc.iot.topic_rules
-WHERE region = 'us-east-1' AND Identifier = '<RuleName>';
+WHERE region = 'us-east-1' AND Identifier = '{{ rule_name }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -833,8 +833,8 @@ INSERT INTO awscc.iot.topic_rules (
  TopicRulePayload,
  region
 )
-SELECT 
-'{{ TopicRulePayload }}',
+SELECT
+'{{ topic_rule_payload }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -848,10 +848,10 @@ INSERT INTO awscc.iot.topic_rules (
  Tags,
  region
 )
-SELECT 
- '{{ RuleName }}',
- '{{ TopicRulePayload }}',
- '{{ Tags }}',
+SELECT
+ '{{ rule_name }}',
+ '{{ topic_rule_payload }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -869,170 +869,169 @@ globals:
 resources:
   - name: topic_rule
     props:
-      - name: RuleName
-        value: '{{ RuleName }}'
-      - name: TopicRulePayload
+      - name: rule_name
+        value: '{{ rule_name }}'
+      - name: topic_rule_payload
         value:
-          RuleDisabled: '{{ RuleDisabled }}'
-          ErrorAction:
-            CloudwatchAlarm:
-              StateValue: '{{ StateValue }}'
-              AlarmName: '{{ AlarmName }}'
-              StateReason: '{{ StateReason }}'
-              RoleArn: '{{ RoleArn }}'
-            CloudwatchLogs:
-              LogGroupName: '{{ LogGroupName }}'
-              RoleArn: '{{ RoleArn }}'
-              BatchMode: '{{ BatchMode }}'
-            CloudwatchMetric:
-              MetricName: '{{ MetricName }}'
-              MetricValue: '{{ MetricValue }}'
-              MetricNamespace: '{{ MetricNamespace }}'
-              MetricUnit: '{{ MetricUnit }}'
-              RoleArn: '{{ RoleArn }}'
-              MetricTimestamp: '{{ MetricTimestamp }}'
-            DynamoDB:
-              TableName: '{{ TableName }}'
-              PayloadField: '{{ PayloadField }}'
-              RangeKeyField: '{{ RangeKeyField }}'
-              HashKeyField: '{{ HashKeyField }}'
-              RangeKeyValue: '{{ RangeKeyValue }}'
-              RangeKeyType: '{{ RangeKeyType }}'
-              HashKeyType: '{{ HashKeyType }}'
-              HashKeyValue: '{{ HashKeyValue }}'
-              RoleArn: '{{ RoleArn }}'
-            DynamoDBv2:
-              PutItem:
-                TableName: '{{ TableName }}'
-              RoleArn: '{{ RoleArn }}'
-            Elasticsearch:
-              Type: '{{ Type }}'
-              Index: '{{ Index }}'
-              Id: '{{ Id }}'
-              Endpoint: '{{ Endpoint }}'
-              RoleArn: '{{ RoleArn }}'
-            Firehose:
-              DeliveryStreamName: '{{ DeliveryStreamName }}'
-              RoleArn: '{{ RoleArn }}'
-              Separator: '{{ Separator }}'
-              BatchMode: '{{ BatchMode }}'
-            Http:
-              ConfirmationUrl: '{{ ConfirmationUrl }}'
-              Headers:
-                - Value: '{{ Value }}'
-                  Key: '{{ Key }}'
-              Url: '{{ Url }}'
-              Auth:
-                Sigv4:
-                  ServiceName: '{{ ServiceName }}'
-                  SigningRegion: '{{ SigningRegion }}'
-                  RoleArn: '{{ RoleArn }}'
-            IotAnalytics:
-              RoleArn: '{{ RoleArn }}'
-              ChannelName: '{{ ChannelName }}'
-              BatchMode: '{{ BatchMode }}'
-            IotEvents:
-              InputName: '{{ InputName }}'
-              RoleArn: '{{ RoleArn }}'
-              MessageId: '{{ MessageId }}'
-              BatchMode: '{{ BatchMode }}'
-            IotSiteWise:
-              RoleArn: '{{ RoleArn }}'
-              PutAssetPropertyValueEntries:
-                - PropertyAlias: '{{ PropertyAlias }}'
-                  PropertyValues:
-                    - Value:
-                        StringValue: '{{ StringValue }}'
-                        DoubleValue: '{{ DoubleValue }}'
-                        BooleanValue: '{{ BooleanValue }}'
-                        IntegerValue: '{{ IntegerValue }}'
-                      Timestamp:
-                        TimeInSeconds: '{{ TimeInSeconds }}'
-                        OffsetInNanos: '{{ OffsetInNanos }}'
-                      Quality: '{{ Quality }}'
-                  AssetId: '{{ AssetId }}'
-                  EntryId: '{{ EntryId }}'
-                  PropertyId: '{{ PropertyId }}'
-            Kafka:
-              DestinationArn: '{{ DestinationArn }}'
-              Topic: '{{ Topic }}'
-              Key: '{{ Key }}'
-              Partition: '{{ Partition }}'
-              ClientProperties: {}
-              Headers:
-                - Value: '{{ Value }}'
-                  Key: '{{ Key }}'
-            Kinesis:
-              PartitionKey: '{{ PartitionKey }}'
-              StreamName: '{{ StreamName }}'
-              RoleArn: '{{ RoleArn }}'
-            Lambda:
-              FunctionArn: '{{ FunctionArn }}'
-            Location:
-              RoleArn: '{{ RoleArn }}'
-              TrackerName: '{{ TrackerName }}'
-              DeviceId: '{{ DeviceId }}'
-              Latitude: '{{ Latitude }}'
-              Longitude: '{{ Longitude }}'
-              Timestamp:
-                Value: '{{ Value }}'
-                Unit: '{{ Unit }}'
-            OpenSearch:
-              Type: '{{ Type }}'
-              Index: '{{ Index }}'
-              Id: '{{ Id }}'
-              Endpoint: '{{ Endpoint }}'
-              RoleArn: '{{ RoleArn }}'
-            Republish:
-              Qos: '{{ Qos }}'
-              Topic: '{{ Topic }}'
-              RoleArn: '{{ RoleArn }}'
-              Headers:
-                PayloadFormatIndicator: '{{ PayloadFormatIndicator }}'
-                ContentType: '{{ ContentType }}'
-                ResponseTopic: '{{ ResponseTopic }}'
-                CorrelationData: '{{ CorrelationData }}'
-                MessageExpiry: '{{ MessageExpiry }}'
-                UserProperties:
-                  - Key: '{{ Key }}'
-                    Value: '{{ Value }}'
-            S3:
-              BucketName: '{{ BucketName }}'
-              Key: '{{ Key }}'
-              RoleArn: '{{ RoleArn }}'
-              CannedAcl: '{{ CannedAcl }}'
-            Sns:
-              TargetArn: '{{ TargetArn }}'
-              MessageFormat: '{{ MessageFormat }}'
-              RoleArn: '{{ RoleArn }}'
-            Sqs:
-              RoleArn: '{{ RoleArn }}'
-              UseBase64: '{{ UseBase64 }}'
-              QueueUrl: '{{ QueueUrl }}'
-            StepFunctions:
-              ExecutionNamePrefix: '{{ ExecutionNamePrefix }}'
-              StateMachineName: '{{ StateMachineName }}'
-              RoleArn: '{{ RoleArn }}'
-            Timestream:
-              RoleArn: '{{ RoleArn }}'
-              DatabaseName: '{{ DatabaseName }}'
-              TableName: '{{ TableName }}'
-              Dimensions:
-                - Name: '{{ Name }}'
-                  Value: '{{ Value }}'
-              Timestamp:
-                Value: '{{ Value }}'
-                Unit: '{{ Unit }}'
-          Description: '{{ Description }}'
-          AwsIotSqlVersion: '{{ AwsIotSqlVersion }}'
-          Actions:
+          rule_disabled: '{{ rule_disabled }}'
+          error_action:
+            cloudwatch_alarm:
+              state_value: '{{ state_value }}'
+              alarm_name: '{{ alarm_name }}'
+              state_reason: '{{ state_reason }}'
+              role_arn: '{{ role_arn }}'
+            cloudwatch_logs:
+              log_group_name: '{{ log_group_name }}'
+              role_arn: '{{ role_arn }}'
+              batch_mode: '{{ batch_mode }}'
+            cloudwatch_metric:
+              metric_name: '{{ metric_name }}'
+              metric_value: '{{ metric_value }}'
+              metric_namespace: '{{ metric_namespace }}'
+              metric_unit: '{{ metric_unit }}'
+              role_arn: '{{ role_arn }}'
+              metric_timestamp: '{{ metric_timestamp }}'
+            dynamo_db:
+              table_name: '{{ table_name }}'
+              payload_field: '{{ payload_field }}'
+              range_key_field: '{{ range_key_field }}'
+              hash_key_field: '{{ hash_key_field }}'
+              range_key_value: '{{ range_key_value }}'
+              range_key_type: '{{ range_key_type }}'
+              hash_key_type: '{{ hash_key_type }}'
+              hash_key_value: '{{ hash_key_value }}'
+              role_arn: '{{ role_arn }}'
+            dynamo_dbv2:
+              put_item:
+                table_name: '{{ table_name }}'
+              role_arn: '{{ role_arn }}'
+            elasticsearch:
+              type: '{{ type }}'
+              index: '{{ index }}'
+              id: '{{ id }}'
+              endpoint: '{{ endpoint }}'
+              role_arn: '{{ role_arn }}'
+            firehose:
+              delivery_stream_name: '{{ delivery_stream_name }}'
+              role_arn: '{{ role_arn }}'
+              separator: '{{ separator }}'
+              batch_mode: '{{ batch_mode }}'
+            http:
+              confirmation_url: '{{ confirmation_url }}'
+              headers:
+                - value: '{{ value }}'
+                  key: '{{ key }}'
+              url: '{{ url }}'
+              auth:
+                sigv4:
+                  service_name: '{{ service_name }}'
+                  signing_region: '{{ signing_region }}'
+                  role_arn: '{{ role_arn }}'
+            iot_analytics:
+              role_arn: '{{ role_arn }}'
+              channel_name: '{{ channel_name }}'
+              batch_mode: '{{ batch_mode }}'
+            iot_events:
+              input_name: '{{ input_name }}'
+              role_arn: '{{ role_arn }}'
+              message_id: '{{ message_id }}'
+              batch_mode: '{{ batch_mode }}'
+            iot_site_wise:
+              role_arn: '{{ role_arn }}'
+              put_asset_property_value_entries:
+                - property_alias: '{{ property_alias }}'
+                  property_values:
+                    - value:
+                        string_value: '{{ string_value }}'
+                        double_value: '{{ double_value }}'
+                        boolean_value: '{{ boolean_value }}'
+                        integer_value: '{{ integer_value }}'
+                      timestamp:
+                        time_in_seconds: '{{ time_in_seconds }}'
+                        offset_in_nanos: '{{ offset_in_nanos }}'
+                      quality: '{{ quality }}'
+                  asset_id: '{{ asset_id }}'
+                  entry_id: '{{ entry_id }}'
+                  property_id: '{{ property_id }}'
+            kafka:
+              destination_arn: '{{ destination_arn }}'
+              topic: '{{ topic }}'
+              key: '{{ key }}'
+              partition: '{{ partition }}'
+              client_properties: {}
+              headers:
+                - value: '{{ value }}'
+                  key: '{{ key }}'
+            kinesis:
+              partition_key: '{{ partition_key }}'
+              stream_name: '{{ stream_name }}'
+              role_arn: '{{ role_arn }}'
+            lambda:
+              function_arn: '{{ function_arn }}'
+            location:
+              role_arn: '{{ role_arn }}'
+              tracker_name: '{{ tracker_name }}'
+              device_id: '{{ device_id }}'
+              latitude: '{{ latitude }}'
+              longitude: '{{ longitude }}'
+              timestamp:
+                value: '{{ value }}'
+                unit: '{{ unit }}'
+            open_search:
+              type: '{{ type }}'
+              index: '{{ index }}'
+              id: '{{ id }}'
+              endpoint: '{{ endpoint }}'
+              role_arn: '{{ role_arn }}'
+            republish:
+              qos: '{{ qos }}'
+              topic: '{{ topic }}'
+              role_arn: '{{ role_arn }}'
+              headers:
+                payload_format_indicator: '{{ payload_format_indicator }}'
+                content_type: '{{ content_type }}'
+                response_topic: '{{ response_topic }}'
+                correlation_data: '{{ correlation_data }}'
+                message_expiry: '{{ message_expiry }}'
+                user_properties:
+                  - key: '{{ key }}'
+                    value: '{{ value }}'
+            s3:
+              bucket_name: '{{ bucket_name }}'
+              key: '{{ key }}'
+              role_arn: '{{ role_arn }}'
+              canned_acl: '{{ canned_acl }}'
+            sns:
+              target_arn: '{{ target_arn }}'
+              message_format: '{{ message_format }}'
+              role_arn: '{{ role_arn }}'
+            sqs:
+              role_arn: '{{ role_arn }}'
+              use_base64: '{{ use_base64 }}'
+              queue_url: '{{ queue_url }}'
+            step_functions:
+              execution_name_prefix: '{{ execution_name_prefix }}'
+              state_machine_name: '{{ state_machine_name }}'
+              role_arn: '{{ role_arn }}'
+            timestream:
+              role_arn: '{{ role_arn }}'
+              database_name: '{{ database_name }}'
+              table_name: '{{ table_name }}'
+              dimensions:
+                - name: '{{ name }}'
+                  value: '{{ value }}'
+              timestamp:
+                value: '{{ value }}'
+                unit: '{{ unit }}'
+          description: '{{ description }}'
+          aws_iot_sql_version: '{{ aws_iot_sql_version }}'
+          actions:
             - null
-          Sql: '{{ Sql }}'
-      - name: Tags
+          sql: '{{ sql }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -1049,7 +1048,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<RuleName>';
+AND Identifier = '{{ rule_name }}';
 ```
 
 
@@ -1058,7 +1057,7 @@ AND Identifier = '<RuleName>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.iot.topic_rules
-WHERE Identifier = '<RuleName>'
+WHERE Identifier = '{{ rule_name }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/iotanalytics/datasets/index.md b/website/docs/services/iotanalytics/datasets/index.md
index b0930ef27..1975fbd64 100644
--- a/website/docs/services/iotanalytics/datasets/index.md
+++ b/website/docs/services/iotanalytics/datasets/index.md
@@ -435,7 +435,7 @@ id,
 retention_period,
 tags
 FROM awscc.iotanalytics.datasets
-WHERE region = 'us-east-1' AND Identifier = '<DatasetName>';
+WHERE region = 'us-east-1' AND Identifier = '{{ dataset_name }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -471,8 +471,8 @@ INSERT INTO awscc.iotanalytics.datasets (
  Actions,
  region
 )
-SELECT 
-'{{ Actions }}',
+SELECT
+'{{ actions }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -491,15 +491,15 @@ INSERT INTO awscc.iotanalytics.datasets (
  Tags,
  region
 )
-SELECT 
- '{{ Actions }}',
- '{{ LateDataRules }}',
- '{{ DatasetName }}',
- '{{ ContentDeliveryRules }}',
- '{{ Triggers }}',
- '{{ VersioningConfiguration }}',
- '{{ RetentionPeriod }}',
- '{{ Tags }}',
+SELECT
+ '{{ actions }}',
+ '{{ late_data_rules }}',
+ '{{ dataset_name }}',
+ '{{ content_delivery_rules }}',
+ '{{ triggers }}',
+ '{{ versioning_configuration }}',
+ '{{ retention_period }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -517,70 +517,69 @@ globals:
 resources:
   - name: dataset
     props:
-      - name: Actions
+      - name: actions
         value:
-          - ActionName: '{{ ActionName }}'
-            ContainerAction:
-              Variables:
-                - VariableName: '{{ VariableName }}'
-                  DatasetContentVersionValue:
-                    DatasetName: '{{ DatasetName }}'
-                  StringValue: '{{ StringValue }}'
-                  DoubleValue: null
-                  OutputFileUriValue:
-                    FileName: '{{ FileName }}'
-              ExecutionRoleArn: '{{ ExecutionRoleArn }}'
-              Image: '{{ Image }}'
-              ResourceConfiguration:
-                VolumeSizeInGB: '{{ VolumeSizeInGB }}'
-                ComputeType: '{{ ComputeType }}'
-            QueryAction:
-              Filters:
-                - Filter: '{{ Filter }}'
-                  Next: '{{ Next }}'
-                  Name: '{{ Name }}'
-              SqlQuery: '{{ SqlQuery }}'
-      - name: LateDataRules
+          - action_name: '{{ action_name }}'
+            container_action:
+              variables:
+                - variable_name: '{{ variable_name }}'
+                  dataset_content_version_value:
+                    dataset_name: '{{ dataset_name }}'
+                  string_value: '{{ string_value }}'
+                  double_value: null
+                  output_file_uri_value:
+                    file_name: '{{ file_name }}'
+              execution_role_arn: '{{ execution_role_arn }}'
+              image: '{{ image }}'
+              resource_configuration:
+                volume_size_in_gb: '{{ volume_size_in_gb }}'
+                compute_type: '{{ compute_type }}'
+            query_action:
+              filters:
+                - filter: '{{ filter }}'
+                  next: '{{ next }}'
+                  name: '{{ name }}'
+              sql_query: '{{ sql_query }}'
+      - name: late_data_rules
         value:
-          - RuleConfiguration:
-              DeltaTimeSessionWindowConfiguration:
-                TimeoutInMinutes: '{{ TimeoutInMinutes }}'
-            RuleName: '{{ RuleName }}'
-      - name: DatasetName
-        value: '{{ DatasetName }}'
-      - name: ContentDeliveryRules
+          - rule_configuration:
+              delta_time_session_window_configuration:
+                timeout_in_minutes: '{{ timeout_in_minutes }}'
+            rule_name: '{{ rule_name }}'
+      - name: dataset_name
+        value: '{{ dataset_name }}'
+      - name: content_delivery_rules
         value:
-          - Destination:
-              IotEventsDestinationConfiguration:
-                InputName: '{{ InputName }}'
-                RoleArn: '{{ RoleArn }}'
-              S3DestinationConfiguration:
-                GlueConfiguration:
-                  DatabaseName: '{{ DatabaseName }}'
-                  TableName: '{{ TableName }}'
-                Bucket: '{{ Bucket }}'
-                Key: '{{ Key }}'
-                RoleArn: '{{ RoleArn }}'
-            EntryName: '{{ EntryName }}'
-      - name: Triggers
+          - destination:
+              iot_events_destination_configuration:
+                input_name: '{{ input_name }}'
+                role_arn: '{{ role_arn }}'
+              s3_destination_configuration:
+                glue_configuration:
+                  database_name: '{{ database_name }}'
+                  table_name: '{{ table_name }}'
+                bucket: '{{ bucket }}'
+                key: '{{ key }}'
+                role_arn: '{{ role_arn }}'
+            entry_name: '{{ entry_name }}'
+      - name: triggers
         value:
-          - TriggeringDataset:
-              DatasetName: '{{ DatasetName }}'
-            Schedule:
-              ScheduleExpression: '{{ ScheduleExpression }}'
-      - name: VersioningConfiguration
+          - triggering_dataset:
+              dataset_name: '{{ dataset_name }}'
+            schedule:
+              schedule_expression: '{{ schedule_expression }}'
+      - name: versioning_configuration
         value:
-          Unlimited: '{{ Unlimited }}'
-          MaxVersions: '{{ MaxVersions }}'
-      - name: RetentionPeriod
+          unlimited: '{{ unlimited }}'
+          max_versions: '{{ max_versions }}'
+      - name: retention_period
         value:
-          NumberOfDays: '{{ NumberOfDays }}'
-          Unlimited: '{{ Unlimited }}'
-      - name: Tags
+          number_of_days: '{{ number_of_days }}'
+          unlimited: '{{ unlimited }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -602,7 +601,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<DatasetName>';
+AND Identifier = '{{ dataset_name }}';
 ```
 
 
@@ -611,7 +610,7 @@ AND Identifier = '<DatasetName>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.iotanalytics.datasets
-WHERE Identifier = '<DatasetName>'
+WHERE Identifier = '{{ dataset_name }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/iotanalytics/pipelines/index.md b/website/docs/services/iotanalytics/pipelines/index.md
index b7bf1be84..3658433aa 100644
--- a/website/docs/services/iotanalytics/pipelines/index.md
+++ b/website/docs/services/iotanalytics/pipelines/index.md
@@ -411,7 +411,7 @@ pipeline_name,
 tags,
 pipeline_activities
 FROM awscc.iotanalytics.pipelines
-WHERE region = 'us-east-1' AND Identifier = '<PipelineName>';
+WHERE region = 'us-east-1' AND Identifier = '{{ pipeline_name }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -447,8 +447,8 @@ INSERT INTO awscc.iotanalytics.pipelines (
  PipelineActivities,
  region
 )
-SELECT 
-'{{ PipelineActivities }}',
+SELECT
+'{{ pipeline_activities }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -462,10 +462,10 @@ INSERT INTO awscc.iotanalytics.pipelines (
  PipelineActivities,
  region
 )
-SELECT 
- '{{ PipelineName }}',
- '{{ Tags }}',
- '{{ PipelineActivities }}',
+SELECT
+ '{{ pipeline_name }}',
+ '{{ tags }}',
+ '{{ pipeline_activities }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -483,62 +483,61 @@ globals:
 resources:
   - name: pipeline
     props:
-      - name: PipelineName
-        value: '{{ PipelineName }}'
-      - name: Tags
+      - name: pipeline_name
+        value: '{{ pipeline_name }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-      - name: PipelineActivities
+          - key: '{{ key }}'
+            value: '{{ value }}'
+      - name: pipeline_activities
         value:
-          - SelectAttributes:
-              Next: '{{ Next }}'
-              Attributes:
-                - '{{ Attributes[0] }}'
-              Name: '{{ Name }}'
-            Datastore:
-              DatastoreName: '{{ DatastoreName }}'
-              Name: '{{ Name }}'
-            Filter:
-              Filter: '{{ Filter }}'
-              Next: '{{ Next }}'
-              Name: '{{ Name }}'
-            AddAttributes:
-              Next: '{{ Next }}'
-              Attributes: {}
-              Name: '{{ Name }}'
-            Channel:
-              ChannelName: '{{ ChannelName }}'
-              Next: '{{ Next }}'
-              Name: '{{ Name }}'
-            DeviceShadowEnrich:
-              Attribute: '{{ Attribute }}'
-              Next: '{{ Next }}'
-              ThingName: '{{ ThingName }}'
-              RoleArn: '{{ RoleArn }}'
-              Name: '{{ Name }}'
-            Math:
-              Attribute: '{{ Attribute }}'
-              Next: '{{ Next }}'
-              Math: '{{ Math }}'
-              Name: '{{ Name }}'
-            Lambda:
-              BatchSize: '{{ BatchSize }}'
-              Next: '{{ Next }}'
-              LambdaName: '{{ LambdaName }}'
-              Name: '{{ Name }}'
-            DeviceRegistryEnrich:
-              Attribute: '{{ Attribute }}'
-              Next: '{{ Next }}'
-              ThingName: '{{ ThingName }}'
-              RoleArn: '{{ RoleArn }}'
-              Name: '{{ Name }}'
-            RemoveAttributes:
-              Next: '{{ Next }}'
-              Attributes:
-                - '{{ Attributes[0] }}'
-              Name: '{{ Name }}'
-
+          - select_attributes:
+              next: '{{ next }}'
+              attributes:
+                - '{{ attributes[0] }}'
+              name: '{{ name }}'
+            datastore:
+              datastore_name: '{{ datastore_name }}'
+              name: '{{ name }}'
+            filter:
+              filter: '{{ filter }}'
+              next: '{{ next }}'
+              name: '{{ name }}'
+            add_attributes:
+              next: '{{ next }}'
+              attributes: {}
+              name: '{{ name }}'
+            channel:
+              channel_name: '{{ channel_name }}'
+              next: '{{ next }}'
+              name: '{{ name }}'
+            device_shadow_enrich:
+              attribute: '{{ attribute }}'
+              next: '{{ next }}'
+              thing_name: '{{ thing_name }}'
+              role_arn: '{{ role_arn }}'
+              name: '{{ name }}'
+            math:
+              attribute: '{{ attribute }}'
+              next: '{{ next }}'
+              math: '{{ math }}'
+              name: '{{ name }}'
+            lambda:
+              batch_size: '{{ batch_size }}'
+              next: '{{ next }}'
+              lambda_name: '{{ lambda_name }}'
+              name: '{{ name }}'
+            device_registry_enrich:
+              attribute: '{{ attribute }}'
+              next: '{{ next }}'
+              thing_name: '{{ thing_name }}'
+              role_arn: '{{ role_arn }}'
+              name: '{{ name }}'
+            remove_attributes:
+              next: '{{ next }}'
+              attributes:
+                - '{{ attributes[0] }}'
+              name: '{{ name }}'
 ```
 </TabItem>
 </Tabs>
@@ -555,7 +554,7 @@ SET PatchDocument = string('{{ {
     "PipelineActivities": pipeline_activities
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<PipelineName>';
+AND Identifier = '{{ pipeline_name }}';
 ```
 
 
@@ -564,7 +563,7 @@ AND Identifier = '<PipelineName>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.iotanalytics.pipelines
-WHERE Identifier = '<PipelineName>'
+WHERE Identifier = '{{ pipeline_name }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/iotcoredeviceadvisor/suite_definitions/index.md b/website/docs/services/iotcoredeviceadvisor/suite_definitions/index.md
index ce14e2277..d9464dbdb 100644
--- a/website/docs/services/iotcoredeviceadvisor/suite_definitions/index.md
+++ b/website/docs/services/iotcoredeviceadvisor/suite_definitions/index.md
@@ -209,7 +209,7 @@ suite_definition_arn,
 suite_definition_version,
 tags
 FROM awscc.iotcoredeviceadvisor.suite_definitions
-WHERE region = 'us-east-1' AND Identifier = '<SuiteDefinitionId>';
+WHERE region = 'us-east-1' AND Identifier = '{{ suite_definition_id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -245,8 +245,8 @@ INSERT INTO awscc.iotcoredeviceadvisor.suite_definitions (
  SuiteDefinitionConfiguration,
  region
 )
-SELECT 
-'{{ SuiteDefinitionConfiguration }}',
+SELECT
+'{{ suite_definition_configuration }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -259,9 +259,9 @@ INSERT INTO awscc.iotcoredeviceadvisor.suite_definitions (
  Tags,
  region
 )
-SELECT 
- '{{ SuiteDefinitionConfiguration }}',
- '{{ Tags }}',
+SELECT
+ '{{ suite_definition_configuration }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -279,20 +279,19 @@ globals:
 resources:
   - name: suite_definition
     props:
-      - name: SuiteDefinitionConfiguration
+      - name: suite_definition_configuration
         value:
-          DevicePermissionRoleArn: '{{ DevicePermissionRoleArn }}'
-          Devices:
-            - CertificateArn: '{{ CertificateArn }}'
-              ThingArn: '{{ ThingArn }}'
-          IntendedForQualification: '{{ IntendedForQualification }}'
-          RootGroup: '{{ RootGroup }}'
-          SuiteDefinitionName: '{{ SuiteDefinitionName }}'
-      - name: Tags
+          device_permission_role_arn: '{{ device_permission_role_arn }}'
+          devices:
+            - certificate_arn: '{{ certificate_arn }}'
+              thing_arn: '{{ thing_arn }}'
+          intended_for_qualification: '{{ intended_for_qualification }}'
+          root_group: '{{ root_group }}'
+          suite_definition_name: '{{ suite_definition_name }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -309,7 +308,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<SuiteDefinitionId>';
+AND Identifier = '{{ suite_definition_id }}';
 ```
 
 
@@ -318,7 +317,7 @@ AND Identifier = '<SuiteDefinitionId>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.iotcoredeviceadvisor.suite_definitions
-WHERE Identifier = '<SuiteDefinitionId>'
+WHERE Identifier = '{{ suite_definition_id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/iotevents/alarm_models/index.md b/website/docs/services/iotevents/alarm_models/index.md
index ecacfceaf..b113b4ea8 100644
--- a/website/docs/services/iotevents/alarm_models/index.md
+++ b/website/docs/services/iotevents/alarm_models/index.md
@@ -471,7 +471,7 @@ alarm_event_actions,
 alarm_capabilities,
 tags
 FROM awscc.iotevents.alarm_models
-WHERE region = 'us-east-1' AND Identifier = '<AlarmModelName>';
+WHERE region = 'us-east-1' AND Identifier = '{{ alarm_model_name }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -508,9 +508,9 @@ INSERT INTO awscc.iotevents.alarm_models (
  AlarmRule,
  region
 )
-SELECT 
-'{{ RoleArn }}',
- '{{ AlarmRule }}',
+SELECT
+'{{ role_arn }}',
+ '{{ alarm_rule }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -530,16 +530,16 @@ INSERT INTO awscc.iotevents.alarm_models (
  Tags,
  region
 )
-SELECT 
- '{{ AlarmModelName }}',
- '{{ AlarmModelDescription }}',
- '{{ RoleArn }}',
- '{{ Key }}',
- '{{ Severity }}',
- '{{ AlarmRule }}',
- '{{ AlarmEventActions }}',
- '{{ AlarmCapabilities }}',
- '{{ Tags }}',
+SELECT
+ '{{ alarm_model_name }}',
+ '{{ alarm_model_description }}',
+ '{{ role_arn }}',
+ '{{ key }}',
+ '{{ severity }}',
+ '{{ alarm_rule }}',
+ '{{ alarm_event_actions }}',
+ '{{ alarm_capabilities }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -557,87 +557,86 @@ globals:
 resources:
   - name: alarm_model
     props:
-      - name: AlarmModelName
-        value: '{{ AlarmModelName }}'
-      - name: AlarmModelDescription
-        value: '{{ AlarmModelDescription }}'
-      - name: RoleArn
-        value: '{{ RoleArn }}'
-      - name: Key
-        value: '{{ Key }}'
-      - name: Severity
-        value: '{{ Severity }}'
-      - name: AlarmRule
+      - name: alarm_model_name
+        value: '{{ alarm_model_name }}'
+      - name: alarm_model_description
+        value: '{{ alarm_model_description }}'
+      - name: role_arn
+        value: '{{ role_arn }}'
+      - name: key
+        value: '{{ key }}'
+      - name: severity
+        value: '{{ severity }}'
+      - name: alarm_rule
         value:
-          SimpleRule:
-            InputProperty: '{{ InputProperty }}'
-            ComparisonOperator: '{{ ComparisonOperator }}'
-            Threshold: '{{ Threshold }}'
-      - name: AlarmEventActions
+          simple_rule:
+            input_property: '{{ input_property }}'
+            comparison_operator: '{{ comparison_operator }}'
+            threshold: '{{ threshold }}'
+      - name: alarm_event_actions
         value:
-          AlarmActions:
-            - DynamoDB:
-                HashKeyField: '{{ HashKeyField }}'
-                HashKeyType: '{{ HashKeyType }}'
-                HashKeyValue: '{{ HashKeyValue }}'
-                Operation: '{{ Operation }}'
-                Payload:
-                  ContentExpression: '{{ ContentExpression }}'
-                  Type: '{{ Type }}'
-                PayloadField: '{{ PayloadField }}'
-                RangeKeyField: '{{ RangeKeyField }}'
-                RangeKeyType: '{{ RangeKeyType }}'
-                RangeKeyValue: '{{ RangeKeyValue }}'
-                TableName: '{{ TableName }}'
-              DynamoDBv2:
-                Payload: null
-                TableName: '{{ TableName }}'
-              Firehose:
-                DeliveryStreamName: '{{ DeliveryStreamName }}'
-                Payload: null
-                Separator: '{{ Separator }}'
-              IotEvents:
-                InputName: '{{ InputName }}'
-                Payload: null
-              IotSiteWise:
-                AssetId: '{{ AssetId }}'
-                EntryId: '{{ EntryId }}'
-                PropertyAlias: '{{ PropertyAlias }}'
-                PropertyId: '{{ PropertyId }}'
-                PropertyValue:
-                  Quality: '{{ Quality }}'
-                  Timestamp:
-                    OffsetInNanos: '{{ OffsetInNanos }}'
-                    TimeInSeconds: '{{ TimeInSeconds }}'
-                  Value:
-                    BooleanValue: '{{ BooleanValue }}'
-                    DoubleValue: '{{ DoubleValue }}'
-                    IntegerValue: '{{ IntegerValue }}'
-                    StringValue: '{{ StringValue }}'
-              IotTopicPublish:
-                MqttTopic: '{{ MqttTopic }}'
-                Payload: null
-              Lambda:
-                FunctionArn: '{{ FunctionArn }}'
-                Payload: null
-              Sns:
-                Payload: null
-                TargetArn: '{{ TargetArn }}'
-              Sqs:
-                Payload: null
-                QueueUrl: '{{ QueueUrl }}'
-                UseBase64: '{{ UseBase64 }}'
-      - name: AlarmCapabilities
+          alarm_actions:
+            - dynamo_db:
+                hash_key_field: '{{ hash_key_field }}'
+                hash_key_type: '{{ hash_key_type }}'
+                hash_key_value: '{{ hash_key_value }}'
+                operation: '{{ operation }}'
+                payload:
+                  content_expression: '{{ content_expression }}'
+                  type: '{{ type }}'
+                payload_field: '{{ payload_field }}'
+                range_key_field: '{{ range_key_field }}'
+                range_key_type: '{{ range_key_type }}'
+                range_key_value: '{{ range_key_value }}'
+                table_name: '{{ table_name }}'
+              dynamo_dbv2:
+                payload: null
+                table_name: '{{ table_name }}'
+              firehose:
+                delivery_stream_name: '{{ delivery_stream_name }}'
+                payload: null
+                separator: '{{ separator }}'
+              iot_events:
+                input_name: '{{ input_name }}'
+                payload: null
+              iot_site_wise:
+                asset_id: '{{ asset_id }}'
+                entry_id: '{{ entry_id }}'
+                property_alias: '{{ property_alias }}'
+                property_id: '{{ property_id }}'
+                property_value:
+                  quality: '{{ quality }}'
+                  timestamp:
+                    offset_in_nanos: '{{ offset_in_nanos }}'
+                    time_in_seconds: '{{ time_in_seconds }}'
+                  value:
+                    boolean_value: '{{ boolean_value }}'
+                    double_value: '{{ double_value }}'
+                    integer_value: '{{ integer_value }}'
+                    string_value: '{{ string_value }}'
+              iot_topic_publish:
+                mqtt_topic: '{{ mqtt_topic }}'
+                payload: null
+              lambda:
+                function_arn: '{{ function_arn }}'
+                payload: null
+              sns:
+                payload: null
+                target_arn: '{{ target_arn }}'
+              sqs:
+                payload: null
+                queue_url: '{{ queue_url }}'
+                use_base64: '{{ use_base64 }}'
+      - name: alarm_capabilities
         value:
-          InitializationConfiguration:
-            DisabledOnInitialization: '{{ DisabledOnInitialization }}'
-          AcknowledgeFlow:
-            Enabled: '{{ Enabled }}'
-      - name: Tags
+          initialization_configuration:
+            disabled_on_initialization: '{{ disabled_on_initialization }}'
+          acknowledge_flow:
+            enabled: '{{ enabled }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -659,7 +658,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<AlarmModelName>';
+AND Identifier = '{{ alarm_model_name }}';
 ```
 
 
@@ -668,7 +667,7 @@ AND Identifier = '<AlarmModelName>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.iotevents.alarm_models
-WHERE Identifier = '<AlarmModelName>'
+WHERE Identifier = '{{ alarm_model_name }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/iotevents/detector_models/index.md b/website/docs/services/iotevents/detector_models/index.md
index 96591a1d4..109c1006a 100644
--- a/website/docs/services/iotevents/detector_models/index.md
+++ b/website/docs/services/iotevents/detector_models/index.md
@@ -242,7 +242,7 @@ key,
 role_arn,
 tags
 FROM awscc.iotevents.detector_models
-WHERE region = 'us-east-1' AND Identifier = '<DetectorModelName>';
+WHERE region = 'us-east-1' AND Identifier = '{{ detector_model_name }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -279,9 +279,9 @@ INSERT INTO awscc.iotevents.detector_models (
  RoleArn,
  region
 )
-SELECT 
-'{{ DetectorModelDefinition }}',
- '{{ RoleArn }}',
+SELECT
+'{{ detector_model_definition }}',
+ '{{ role_arn }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -299,14 +299,14 @@ INSERT INTO awscc.iotevents.detector_models (
  Tags,
  region
 )
-SELECT 
- '{{ DetectorModelDefinition }}',
- '{{ DetectorModelDescription }}',
- '{{ DetectorModelName }}',
- '{{ EvaluationMethod }}',
- '{{ Key }}',
- '{{ RoleArn }}',
- '{{ Tags }}',
+SELECT
+ '{{ detector_model_definition }}',
+ '{{ detector_model_description }}',
+ '{{ detector_model_name }}',
+ '{{ evaluation_method }}',
+ '{{ key }}',
+ '{{ role_arn }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -324,105 +324,104 @@ globals:
 resources:
   - name: detector_model
     props:
-      - name: DetectorModelDefinition
+      - name: detector_model_definition
         value:
-          InitialStateName: '{{ InitialStateName }}'
-          States:
-            - OnEnter:
-                Events:
-                  - Actions:
-                      - ClearTimer:
-                          TimerName: '{{ TimerName }}'
-                        DynamoDB:
-                          HashKeyField: '{{ HashKeyField }}'
-                          HashKeyType: '{{ HashKeyType }}'
-                          HashKeyValue: '{{ HashKeyValue }}'
-                          Operation: '{{ Operation }}'
-                          Payload:
-                            ContentExpression: '{{ ContentExpression }}'
-                            Type: '{{ Type }}'
-                          PayloadField: '{{ PayloadField }}'
-                          RangeKeyField: '{{ RangeKeyField }}'
-                          RangeKeyType: '{{ RangeKeyType }}'
-                          RangeKeyValue: '{{ RangeKeyValue }}'
-                          TableName: '{{ TableName }}'
-                        DynamoDBv2:
-                          Payload: null
-                          TableName: '{{ TableName }}'
-                        Firehose:
-                          DeliveryStreamName: '{{ DeliveryStreamName }}'
-                          Payload: null
-                          Separator: '{{ Separator }}'
-                        IotEvents:
-                          InputName: '{{ InputName }}'
-                          Payload: null
-                        IotSiteWise:
-                          AssetId: '{{ AssetId }}'
-                          EntryId: '{{ EntryId }}'
-                          PropertyAlias: '{{ PropertyAlias }}'
-                          PropertyId: '{{ PropertyId }}'
-                          PropertyValue:
-                            Quality: '{{ Quality }}'
-                            Timestamp:
-                              OffsetInNanos: '{{ OffsetInNanos }}'
-                              TimeInSeconds: '{{ TimeInSeconds }}'
-                            Value:
-                              BooleanValue: '{{ BooleanValue }}'
-                              DoubleValue: '{{ DoubleValue }}'
-                              IntegerValue: '{{ IntegerValue }}'
-                              StringValue: '{{ StringValue }}'
-                        IotTopicPublish:
-                          MqttTopic: '{{ MqttTopic }}'
-                          Payload: null
-                        Lambda:
-                          FunctionArn: '{{ FunctionArn }}'
-                          Payload: null
-                        ResetTimer:
-                          TimerName: '{{ TimerName }}'
-                        SetTimer:
-                          DurationExpression: '{{ DurationExpression }}'
-                          Seconds: '{{ Seconds }}'
-                          TimerName: '{{ TimerName }}'
-                        SetVariable:
-                          Value: '{{ Value }}'
-                          VariableName: '{{ VariableName }}'
-                        Sns:
-                          Payload: null
-                          TargetArn: '{{ TargetArn }}'
-                        Sqs:
-                          Payload: null
-                          QueueUrl: '{{ QueueUrl }}'
-                          UseBase64: '{{ UseBase64 }}'
-                    Condition: '{{ Condition }}'
-                    EventName: '{{ EventName }}'
-              OnExit:
-                Events:
+          initial_state_name: '{{ initial_state_name }}'
+          states:
+            - on_enter:
+                events:
+                  - actions:
+                      - clear_timer:
+                          timer_name: '{{ timer_name }}'
+                        dynamo_db:
+                          hash_key_field: '{{ hash_key_field }}'
+                          hash_key_type: '{{ hash_key_type }}'
+                          hash_key_value: '{{ hash_key_value }}'
+                          operation: '{{ operation }}'
+                          payload:
+                            content_expression: '{{ content_expression }}'
+                            type: '{{ type }}'
+                          payload_field: '{{ payload_field }}'
+                          range_key_field: '{{ range_key_field }}'
+                          range_key_type: '{{ range_key_type }}'
+                          range_key_value: '{{ range_key_value }}'
+                          table_name: '{{ table_name }}'
+                        dynamo_dbv2:
+                          payload: null
+                          table_name: '{{ table_name }}'
+                        firehose:
+                          delivery_stream_name: '{{ delivery_stream_name }}'
+                          payload: null
+                          separator: '{{ separator }}'
+                        iot_events:
+                          input_name: '{{ input_name }}'
+                          payload: null
+                        iot_site_wise:
+                          asset_id: '{{ asset_id }}'
+                          entry_id: '{{ entry_id }}'
+                          property_alias: '{{ property_alias }}'
+                          property_id: '{{ property_id }}'
+                          property_value:
+                            quality: '{{ quality }}'
+                            timestamp:
+                              offset_in_nanos: '{{ offset_in_nanos }}'
+                              time_in_seconds: '{{ time_in_seconds }}'
+                            value:
+                              boolean_value: '{{ boolean_value }}'
+                              double_value: '{{ double_value }}'
+                              integer_value: '{{ integer_value }}'
+                              string_value: '{{ string_value }}'
+                        iot_topic_publish:
+                          mqtt_topic: '{{ mqtt_topic }}'
+                          payload: null
+                        lambda:
+                          function_arn: '{{ function_arn }}'
+                          payload: null
+                        reset_timer:
+                          timer_name: '{{ timer_name }}'
+                        set_timer:
+                          duration_expression: '{{ duration_expression }}'
+                          seconds: '{{ seconds }}'
+                          timer_name: '{{ timer_name }}'
+                        set_variable:
+                          value: '{{ value }}'
+                          variable_name: '{{ variable_name }}'
+                        sns:
+                          payload: null
+                          target_arn: '{{ target_arn }}'
+                        sqs:
+                          payload: null
+                          queue_url: '{{ queue_url }}'
+                          use_base64: '{{ use_base64 }}'
+                    condition: '{{ condition }}'
+                    event_name: '{{ event_name }}'
+              on_exit:
+                events:
                   - null
-              OnInput:
-                Events:
+              on_input:
+                events:
                   - null
-                TransitionEvents:
-                  - Actions:
+                transition_events:
+                  - actions:
                       - null
-                    Condition: '{{ Condition }}'
-                    EventName: '{{ EventName }}'
-                    NextState: '{{ NextState }}'
-              StateName: '{{ StateName }}'
-      - name: DetectorModelDescription
-        value: '{{ DetectorModelDescription }}'
-      - name: DetectorModelName
-        value: '{{ DetectorModelName }}'
-      - name: EvaluationMethod
-        value: '{{ EvaluationMethod }}'
-      - name: Key
-        value: '{{ Key }}'
-      - name: RoleArn
-        value: '{{ RoleArn }}'
-      - name: Tags
+                    condition: '{{ condition }}'
+                    event_name: '{{ event_name }}'
+                    next_state: '{{ next_state }}'
+              state_name: '{{ state_name }}'
+      - name: detector_model_description
+        value: '{{ detector_model_description }}'
+      - name: detector_model_name
+        value: '{{ detector_model_name }}'
+      - name: evaluation_method
+        value: '{{ evaluation_method }}'
+      - name: key
+        value: '{{ key }}'
+      - name: role_arn
+        value: '{{ role_arn }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -442,7 +441,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<DetectorModelName>';
+AND Identifier = '{{ detector_model_name }}';
 ```
 
 
@@ -451,7 +450,7 @@ AND Identifier = '<DetectorModelName>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.iotevents.detector_models
-WHERE Identifier = '<DetectorModelName>'
+WHERE Identifier = '{{ detector_model_name }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/iotevents/inputs/index.md b/website/docs/services/iotevents/inputs/index.md
index ec94b28b2..c1f580e21 100644
--- a/website/docs/services/iotevents/inputs/index.md
+++ b/website/docs/services/iotevents/inputs/index.md
@@ -178,7 +178,7 @@ input_description,
 input_name,
 tags
 FROM awscc.iotevents.inputs
-WHERE region = 'us-east-1' AND Identifier = '<InputName>';
+WHERE region = 'us-east-1' AND Identifier = '{{ input_name }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -214,8 +214,8 @@ INSERT INTO awscc.iotevents.inputs (
  InputDefinition,
  region
 )
-SELECT 
-'{{ InputDefinition }}',
+SELECT
+'{{ input_definition }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -230,11 +230,11 @@ INSERT INTO awscc.iotevents.inputs (
  Tags,
  region
 )
-SELECT 
- '{{ InputDefinition }}',
- '{{ InputDescription }}',
- '{{ InputName }}',
- '{{ Tags }}',
+SELECT
+ '{{ input_definition }}',
+ '{{ input_description }}',
+ '{{ input_name }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -252,19 +252,18 @@ globals:
 resources:
   - name: input
     props:
-      - name: InputDefinition
+      - name: input_definition
         value:
-          Attributes:
-            - JsonPath: '{{ JsonPath }}'
-      - name: InputDescription
-        value: '{{ InputDescription }}'
-      - name: InputName
-        value: '{{ InputName }}'
-      - name: Tags
+          attributes:
+            - json_path: '{{ json_path }}'
+      - name: input_description
+        value: '{{ input_description }}'
+      - name: input_name
+        value: '{{ input_name }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -282,7 +281,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<InputName>';
+AND Identifier = '{{ input_name }}';
 ```
 
 
@@ -291,7 +290,7 @@ AND Identifier = '<InputName>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.iotevents.inputs
-WHERE Identifier = '<InputName>'
+WHERE Identifier = '{{ input_name }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/iotfleetwise/campaigns/index.md b/website/docs/services/iotfleetwise/campaigns/index.md
index 6e996ae7d..ae818a785 100644
--- a/website/docs/services/iotfleetwise/campaigns/index.md
+++ b/website/docs/services/iotfleetwise/campaigns/index.md
@@ -392,7 +392,7 @@ collection_scheme,
 data_partitions,
 tags
 FROM awscc.iotfleetwise.campaigns
-WHERE region = 'us-east-1' AND Identifier = '<Name>';
+WHERE region = 'us-east-1' AND Identifier = '{{ name }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -431,11 +431,11 @@ INSERT INTO awscc.iotfleetwise.campaigns (
  CollectionScheme,
  region
 )
-SELECT 
-'{{ Name }}',
- '{{ SignalCatalogArn }}',
- '{{ TargetArn }}',
- '{{ CollectionScheme }}',
+SELECT
+'{{ name }}',
+ '{{ signal_catalog_arn }}',
+ '{{ target_arn }}',
+ '{{ collection_scheme }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -465,26 +465,26 @@ INSERT INTO awscc.iotfleetwise.campaigns (
  Tags,
  region
 )
-SELECT 
- '{{ Action }}',
- '{{ Compression }}',
- '{{ Description }}',
- '{{ Priority }}',
- '{{ SignalsToCollect }}',
- '{{ SignalsToFetch }}',
- '{{ DataDestinationConfigs }}',
- '{{ StartTime }}',
- '{{ Name }}',
- '{{ ExpiryTime }}',
- '{{ SpoolingMode }}',
- '{{ SignalCatalogArn }}',
- '{{ PostTriggerCollectionDuration }}',
- '{{ DataExtraDimensions }}',
- '{{ DiagnosticsMode }}',
- '{{ TargetArn }}',
- '{{ CollectionScheme }}',
- '{{ DataPartitions }}',
- '{{ Tags }}',
+SELECT
+ '{{ action }}',
+ '{{ compression }}',
+ '{{ description }}',
+ '{{ priority }}',
+ '{{ signals_to_collect }}',
+ '{{ signals_to_fetch }}',
+ '{{ data_destination_configs }}',
+ '{{ start_time }}',
+ '{{ name }}',
+ '{{ expiry_time }}',
+ '{{ spooling_mode }}',
+ '{{ signal_catalog_arn }}',
+ '{{ post_trigger_collection_duration }}',
+ '{{ data_extra_dimensions }}',
+ '{{ diagnostics_mode }}',
+ '{{ target_arn }}',
+ '{{ collection_scheme }}',
+ '{{ data_partitions }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -502,70 +502,69 @@ globals:
 resources:
   - name: campaign
     props:
-      - name: Action
-        value: '{{ Action }}'
-      - name: Compression
-        value: '{{ Compression }}'
-      - name: Description
-        value: '{{ Description }}'
-      - name: Priority
-        value: '{{ Priority }}'
-      - name: SignalsToCollect
+      - name: action
+        value: '{{ action }}'
+      - name: compression
+        value: '{{ compression }}'
+      - name: description
+        value: '{{ description }}'
+      - name: priority
+        value: '{{ priority }}'
+      - name: signals_to_collect
         value:
-          - MaxSampleCount: null
-            Name: '{{ Name }}'
-            MinimumSamplingIntervalMs: null
-            DataPartitionId: '{{ DataPartitionId }}'
-      - name: SignalsToFetch
+          - max_sample_count: null
+            name: '{{ name }}'
+            minimum_sampling_interval_ms: null
+            data_partition_id: '{{ data_partition_id }}'
+      - name: signals_to_fetch
         value:
-          - FullyQualifiedName: '{{ FullyQualifiedName }}'
-            SignalFetchConfig: null
-            ConditionLanguageVersion: null
-            Actions:
-              - '{{ Actions[0] }}'
-      - name: DataDestinationConfigs
+          - fully_qualified_name: '{{ fully_qualified_name }}'
+            signal_fetch_config: null
+            condition_language_version: null
+            actions:
+              - '{{ actions[0] }}'
+      - name: data_destination_configs
         value:
           - null
-      - name: StartTime
-        value: '{{ StartTime }}'
-      - name: Name
-        value: '{{ Name }}'
-      - name: ExpiryTime
-        value: '{{ ExpiryTime }}'
-      - name: SpoolingMode
-        value: '{{ SpoolingMode }}'
-      - name: SignalCatalogArn
-        value: '{{ SignalCatalogArn }}'
-      - name: PostTriggerCollectionDuration
+      - name: start_time
+        value: '{{ start_time }}'
+      - name: name
+        value: '{{ name }}'
+      - name: expiry_time
+        value: '{{ expiry_time }}'
+      - name: spooling_mode
+        value: '{{ spooling_mode }}'
+      - name: signal_catalog_arn
+        value: '{{ signal_catalog_arn }}'
+      - name: post_trigger_collection_duration
         value: null
-      - name: DataExtraDimensions
+      - name: data_extra_dimensions
         value:
-          - '{{ DataExtraDimensions[0] }}'
-      - name: DiagnosticsMode
-        value: '{{ DiagnosticsMode }}'
-      - name: TargetArn
-        value: '{{ TargetArn }}'
-      - name: CollectionScheme
+          - '{{ data_extra_dimensions[0] }}'
+      - name: diagnostics_mode
+        value: '{{ diagnostics_mode }}'
+      - name: target_arn
+        value: '{{ target_arn }}'
+      - name: collection_scheme
         value: null
-      - name: DataPartitions
+      - name: data_partitions
         value:
-          - Id: null
-            StorageOptions:
-              MaximumSize:
-                Unit: '{{ Unit }}'
-                Value: '{{ Value }}'
-              MinimumTimeToLive:
-                Unit: '{{ Unit }}'
-                Value: '{{ Value }}'
-              StorageLocation: '{{ StorageLocation }}'
-            UploadOptions:
-              Expression: '{{ Expression }}'
-              ConditionLanguageVersion: '{{ ConditionLanguageVersion }}'
-      - name: Tags
+          - id: null
+            storage_options:
+              maximum_size:
+                unit: '{{ unit }}'
+                value: '{{ value }}'
+              minimum_time_to_live:
+                unit: '{{ unit }}'
+                value: '{{ value }}'
+              storage_location: '{{ storage_location }}'
+            upload_options:
+              expression: '{{ expression }}'
+              condition_language_version: '{{ condition_language_version }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -584,7 +583,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Name>';
+AND Identifier = '{{ name }}';
 ```
 
 
@@ -593,7 +592,7 @@ AND Identifier = '<Name>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.iotfleetwise.campaigns
-WHERE Identifier = '<Name>'
+WHERE Identifier = '{{ name }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/iotfleetwise/decoder_manifests/index.md b/website/docs/services/iotfleetwise/decoder_manifests/index.md
index 27bceabaf..b97e85232 100644
--- a/website/docs/services/iotfleetwise/decoder_manifests/index.md
+++ b/website/docs/services/iotfleetwise/decoder_manifests/index.md
@@ -206,7 +206,7 @@ status,
 default_for_unmapped_signals,
 tags
 FROM awscc.iotfleetwise.decoder_manifests
-WHERE region = 'us-east-1' AND Identifier = '<Name>';
+WHERE region = 'us-east-1' AND Identifier = '{{ name }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -243,9 +243,9 @@ INSERT INTO awscc.iotfleetwise.decoder_manifests (
  Name,
  region
 )
-SELECT 
-'{{ ModelManifestArn }}',
- '{{ Name }}',
+SELECT
+'{{ model_manifest_arn }}',
+ '{{ name }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -264,15 +264,15 @@ INSERT INTO awscc.iotfleetwise.decoder_manifests (
  Tags,
  region
 )
-SELECT 
- '{{ Description }}',
- '{{ ModelManifestArn }}',
- '{{ Name }}',
- '{{ NetworkInterfaces }}',
- '{{ SignalDecoders }}',
- '{{ Status }}',
- '{{ DefaultForUnmappedSignals }}',
- '{{ Tags }}',
+SELECT
+ '{{ description }}',
+ '{{ model_manifest_arn }}',
+ '{{ name }}',
+ '{{ network_interfaces }}',
+ '{{ signal_decoders }}',
+ '{{ status }}',
+ '{{ default_for_unmapped_signals }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -290,27 +290,26 @@ globals:
 resources:
   - name: decoder_manifest
     props:
-      - name: Description
-        value: '{{ Description }}'
-      - name: ModelManifestArn
-        value: '{{ ModelManifestArn }}'
-      - name: Name
-        value: '{{ Name }}'
-      - name: NetworkInterfaces
+      - name: description
+        value: '{{ description }}'
+      - name: model_manifest_arn
+        value: '{{ model_manifest_arn }}'
+      - name: name
+        value: '{{ name }}'
+      - name: network_interfaces
         value:
           - null
-      - name: SignalDecoders
+      - name: signal_decoders
         value:
           - null
-      - name: Status
-        value: '{{ Status }}'
-      - name: DefaultForUnmappedSignals
-        value: '{{ DefaultForUnmappedSignals }}'
-      - name: Tags
+      - name: status
+        value: '{{ status }}'
+      - name: default_for_unmapped_signals
+        value: '{{ default_for_unmapped_signals }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -331,7 +330,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Name>';
+AND Identifier = '{{ name }}';
 ```
 
 
@@ -340,7 +339,7 @@ AND Identifier = '<Name>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.iotfleetwise.decoder_manifests
-WHERE Identifier = '<Name>'
+WHERE Identifier = '{{ name }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/iotfleetwise/fleets/index.md b/website/docs/services/iotfleetwise/fleets/index.md
index b4ad732c5..0f9700dc5 100644
--- a/website/docs/services/iotfleetwise/fleets/index.md
+++ b/website/docs/services/iotfleetwise/fleets/index.md
@@ -182,7 +182,7 @@ last_modification_time,
 signal_catalog_arn,
 tags
 FROM awscc.iotfleetwise.fleets
-WHERE region = 'us-east-1' AND Identifier = '<Id>';
+WHERE region = 'us-east-1' AND Identifier = '{{ id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -219,9 +219,9 @@ INSERT INTO awscc.iotfleetwise.fleets (
  SignalCatalogArn,
  region
 )
-SELECT 
-'{{ Id }}',
- '{{ SignalCatalogArn }}',
+SELECT
+'{{ id }}',
+ '{{ signal_catalog_arn }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -236,11 +236,11 @@ INSERT INTO awscc.iotfleetwise.fleets (
  Tags,
  region
 )
-SELECT 
- '{{ Description }}',
- '{{ Id }}',
- '{{ SignalCatalogArn }}',
- '{{ Tags }}',
+SELECT
+ '{{ description }}',
+ '{{ id }}',
+ '{{ signal_catalog_arn }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -258,17 +258,16 @@ globals:
 resources:
   - name: fleet
     props:
-      - name: Description
-        value: '{{ Description }}'
-      - name: Id
-        value: '{{ Id }}'
-      - name: SignalCatalogArn
-        value: '{{ SignalCatalogArn }}'
-      - name: Tags
+      - name: description
+        value: '{{ description }}'
+      - name: id
+        value: '{{ id }}'
+      - name: signal_catalog_arn
+        value: '{{ signal_catalog_arn }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -285,7 +284,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Id>';
+AND Identifier = '{{ id }}';
 ```
 
 
@@ -294,7 +293,7 @@ AND Identifier = '<Id>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.iotfleetwise.fleets
-WHERE Identifier = '<Id>'
+WHERE Identifier = '{{ id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/iotfleetwise/model_manifests/index.md b/website/docs/services/iotfleetwise/model_manifests/index.md
index f8c8a098e..9fb7e5ab5 100644
--- a/website/docs/services/iotfleetwise/model_manifests/index.md
+++ b/website/docs/services/iotfleetwise/model_manifests/index.md
@@ -194,7 +194,7 @@ signal_catalog_arn,
 status,
 tags
 FROM awscc.iotfleetwise.model_manifests
-WHERE region = 'us-east-1' AND Identifier = '<Name>';
+WHERE region = 'us-east-1' AND Identifier = '{{ name }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -231,9 +231,9 @@ INSERT INTO awscc.iotfleetwise.model_manifests (
  SignalCatalogArn,
  region
 )
-SELECT 
-'{{ Name }}',
- '{{ SignalCatalogArn }}',
+SELECT
+'{{ name }}',
+ '{{ signal_catalog_arn }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -250,13 +250,13 @@ INSERT INTO awscc.iotfleetwise.model_manifests (
  Tags,
  region
 )
-SELECT 
- '{{ Description }}',
- '{{ Name }}',
- '{{ Nodes }}',
- '{{ SignalCatalogArn }}',
- '{{ Status }}',
- '{{ Tags }}',
+SELECT
+ '{{ description }}',
+ '{{ name }}',
+ '{{ nodes }}',
+ '{{ signal_catalog_arn }}',
+ '{{ status }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -274,22 +274,21 @@ globals:
 resources:
   - name: model_manifest
     props:
-      - name: Description
-        value: '{{ Description }}'
-      - name: Name
-        value: '{{ Name }}'
-      - name: Nodes
+      - name: description
+        value: '{{ description }}'
+      - name: name
+        value: '{{ name }}'
+      - name: nodes
         value:
-          - '{{ Nodes[0] }}'
-      - name: SignalCatalogArn
-        value: '{{ SignalCatalogArn }}'
-      - name: Status
-        value: '{{ Status }}'
-      - name: Tags
+          - '{{ nodes[0] }}'
+      - name: signal_catalog_arn
+        value: '{{ signal_catalog_arn }}'
+      - name: status
+        value: '{{ status }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -309,7 +308,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Name>';
+AND Identifier = '{{ name }}';
 ```
 
 
@@ -318,7 +317,7 @@ AND Identifier = '<Name>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.iotfleetwise.model_manifests
-WHERE Identifier = '<Name>'
+WHERE Identifier = '{{ name }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/iotfleetwise/signal_catalogs/index.md b/website/docs/services/iotfleetwise/signal_catalogs/index.md
index 5569c1b16..f07a770aa 100644
--- a/website/docs/services/iotfleetwise/signal_catalogs/index.md
+++ b/website/docs/services/iotfleetwise/signal_catalogs/index.md
@@ -215,7 +215,7 @@ node_counts,
 nodes,
 tags
 FROM awscc.iotfleetwise.signal_catalogs
-WHERE region = 'us-east-1' AND Identifier = '<Name>';
+WHERE region = 'us-east-1' AND Identifier = '{{ name }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -255,12 +255,12 @@ INSERT INTO awscc.iotfleetwise.signal_catalogs (
  Tags,
  region
 )
-SELECT 
-'{{ Description }}',
- '{{ Name }}',
- '{{ NodeCounts }}',
- '{{ Nodes }}',
- '{{ Tags }}',
+SELECT
+'{{ description }}',
+ '{{ name }}',
+ '{{ node_counts }}',
+ '{{ nodes }}',
+ '{{ tags }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -276,12 +276,12 @@ INSERT INTO awscc.iotfleetwise.signal_catalogs (
  Tags,
  region
 )
-SELECT 
- '{{ Description }}',
- '{{ Name }}',
- '{{ NodeCounts }}',
- '{{ Nodes }}',
- '{{ Tags }}',
+SELECT
+ '{{ description }}',
+ '{{ name }}',
+ '{{ node_counts }}',
+ '{{ nodes }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -299,25 +299,24 @@ globals:
 resources:
   - name: signal_catalog
     props:
-      - name: Description
-        value: '{{ Description }}'
-      - name: Name
-        value: '{{ Name }}'
-      - name: NodeCounts
+      - name: description
+        value: '{{ description }}'
+      - name: name
+        value: '{{ name }}'
+      - name: node_counts
         value:
-          TotalNodes: null
-          TotalBranches: null
-          TotalSensors: null
-          TotalAttributes: null
-          TotalActuators: null
-      - name: Nodes
+          total_nodes: null
+          total_branches: null
+          total_sensors: null
+          total_attributes: null
+          total_actuators: null
+      - name: nodes
         value:
           - null
-      - name: Tags
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -335,7 +334,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Name>';
+AND Identifier = '{{ name }}';
 ```
 
 
@@ -344,7 +343,7 @@ AND Identifier = '<Name>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.iotfleetwise.signal_catalogs
-WHERE Identifier = '<Name>'
+WHERE Identifier = '{{ name }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/iotfleetwise/state_templates/index.md b/website/docs/services/iotfleetwise/state_templates/index.md
index 99134d7d5..91a95c32b 100644
--- a/website/docs/services/iotfleetwise/state_templates/index.md
+++ b/website/docs/services/iotfleetwise/state_templates/index.md
@@ -206,7 +206,7 @@ data_extra_dimensions,
 metadata_extra_dimensions,
 tags
 FROM awscc.iotfleetwise.state_templates
-WHERE region = 'us-east-1' AND Identifier = '<Name>';
+WHERE region = 'us-east-1' AND Identifier = '{{ name }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -244,10 +244,10 @@ INSERT INTO awscc.iotfleetwise.state_templates (
  StateTemplateProperties,
  region
 )
-SELECT 
-'{{ Name }}',
- '{{ SignalCatalogArn }}',
- '{{ StateTemplateProperties }}',
+SELECT
+'{{ name }}',
+ '{{ signal_catalog_arn }}',
+ '{{ state_template_properties }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -265,14 +265,14 @@ INSERT INTO awscc.iotfleetwise.state_templates (
  Tags,
  region
 )
-SELECT 
- '{{ Description }}',
- '{{ Name }}',
- '{{ SignalCatalogArn }}',
- '{{ StateTemplateProperties }}',
- '{{ DataExtraDimensions }}',
- '{{ MetadataExtraDimensions }}',
- '{{ Tags }}',
+SELECT
+ '{{ description }}',
+ '{{ name }}',
+ '{{ signal_catalog_arn }}',
+ '{{ state_template_properties }}',
+ '{{ data_extra_dimensions }}',
+ '{{ metadata_extra_dimensions }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -290,26 +290,25 @@ globals:
 resources:
   - name: state_template
     props:
-      - name: Description
-        value: '{{ Description }}'
-      - name: Name
-        value: '{{ Name }}'
-      - name: SignalCatalogArn
-        value: '{{ SignalCatalogArn }}'
-      - name: StateTemplateProperties
+      - name: description
+        value: '{{ description }}'
+      - name: name
+        value: '{{ name }}'
+      - name: signal_catalog_arn
+        value: '{{ signal_catalog_arn }}'
+      - name: state_template_properties
         value:
-          - '{{ StateTemplateProperties[0] }}'
-      - name: DataExtraDimensions
+          - '{{ state_template_properties[0] }}'
+      - name: data_extra_dimensions
         value:
-          - '{{ DataExtraDimensions[0] }}'
-      - name: MetadataExtraDimensions
+          - '{{ data_extra_dimensions[0] }}'
+      - name: metadata_extra_dimensions
         value:
-          - '{{ MetadataExtraDimensions[0] }}'
-      - name: Tags
+          - '{{ metadata_extra_dimensions[0] }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -329,7 +328,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Name>';
+AND Identifier = '{{ name }}';
 ```
 
 
@@ -338,7 +337,7 @@ AND Identifier = '<Name>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.iotfleetwise.state_templates
-WHERE Identifier = '<Name>'
+WHERE Identifier = '{{ name }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/iotfleetwise/vehicles/index.md b/website/docs/services/iotfleetwise/vehicles/index.md
index 27b7c31a6..58a4d38bd 100644
--- a/website/docs/services/iotfleetwise/vehicles/index.md
+++ b/website/docs/services/iotfleetwise/vehicles/index.md
@@ -212,7 +212,7 @@ model_manifest_arn,
 tags,
 state_templates
 FROM awscc.iotfleetwise.vehicles
-WHERE region = 'us-east-1' AND Identifier = '<Name>';
+WHERE region = 'us-east-1' AND Identifier = '{{ name }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -250,10 +250,10 @@ INSERT INTO awscc.iotfleetwise.vehicles (
  ModelManifestArn,
  region
 )
-SELECT 
-'{{ DecoderManifestArn }}',
- '{{ Name }}',
- '{{ ModelManifestArn }}',
+SELECT
+'{{ decoder_manifest_arn }}',
+ '{{ name }}',
+ '{{ model_manifest_arn }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -271,14 +271,14 @@ INSERT INTO awscc.iotfleetwise.vehicles (
  StateTemplates,
  region
 )
-SELECT 
- '{{ AssociationBehavior }}',
- '{{ Attributes }}',
- '{{ DecoderManifestArn }}',
- '{{ Name }}',
- '{{ ModelManifestArn }}',
- '{{ Tags }}',
- '{{ StateTemplates }}',
+SELECT
+ '{{ association_behavior }}',
+ '{{ attributes }}',
+ '{{ decoder_manifest_arn }}',
+ '{{ name }}',
+ '{{ model_manifest_arn }}',
+ '{{ tags }}',
+ '{{ state_templates }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -296,25 +296,24 @@ globals:
 resources:
   - name: vehicle
     props:
-      - name: AssociationBehavior
-        value: '{{ AssociationBehavior }}'
-      - name: Attributes
+      - name: association_behavior
+        value: '{{ association_behavior }}'
+      - name: attributes
         value: {}
-      - name: DecoderManifestArn
-        value: '{{ DecoderManifestArn }}'
-      - name: Name
-        value: '{{ Name }}'
-      - name: ModelManifestArn
-        value: '{{ ModelManifestArn }}'
-      - name: Tags
+      - name: decoder_manifest_arn
+        value: '{{ decoder_manifest_arn }}'
+      - name: name
+        value: '{{ name }}'
+      - name: model_manifest_arn
+        value: '{{ model_manifest_arn }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-      - name: StateTemplates
+          - key: '{{ key }}'
+            value: '{{ value }}'
+      - name: state_templates
         value:
-          - Identifier: '{{ Identifier }}'
-            StateTemplateUpdateStrategy: null
-
+          - identifier: '{{ identifier }}'
+            state_template_update_strategy: null
 ```
 </TabItem>
 </Tabs>
@@ -335,7 +334,7 @@ SET PatchDocument = string('{{ {
     "StateTemplates": state_templates
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Name>';
+AND Identifier = '{{ name }}';
 ```
 
 
@@ -344,7 +343,7 @@ AND Identifier = '<Name>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.iotfleetwise.vehicles
-WHERE Identifier = '<Name>'
+WHERE Identifier = '{{ name }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/iotsitewise/access_policies/index.md b/website/docs/services/iotsitewise/access_policies/index.md
index 24019c930..fbd6099d7 100644
--- a/website/docs/services/iotsitewise/access_policies/index.md
+++ b/website/docs/services/iotsitewise/access_policies/index.md
@@ -353,7 +353,7 @@ access_policy_identity,
 access_policy_permission,
 access_policy_resource
 FROM awscc.iotsitewise.access_policies
-WHERE region = 'us-east-1' AND Identifier = '<AccessPolicyId>';
+WHERE region = 'us-east-1' AND Identifier = '{{ access_policy_id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -391,10 +391,10 @@ INSERT INTO awscc.iotsitewise.access_policies (
  AccessPolicyResource,
  region
 )
-SELECT 
-'{{ AccessPolicyIdentity }}',
- '{{ AccessPolicyPermission }}',
- '{{ AccessPolicyResource }}',
+SELECT
+'{{ access_policy_identity }}',
+ '{{ access_policy_permission }}',
+ '{{ access_policy_resource }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -408,10 +408,10 @@ INSERT INTO awscc.iotsitewise.access_policies (
  AccessPolicyResource,
  region
 )
-SELECT 
- '{{ AccessPolicyIdentity }}',
- '{{ AccessPolicyPermission }}',
- '{{ AccessPolicyResource }}',
+SELECT
+ '{{ access_policy_identity }}',
+ '{{ access_policy_permission }}',
+ '{{ access_policy_resource }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -429,42 +429,41 @@ globals:
 resources:
   - name: access_policy
     props:
-      - name: AccessPolicyIdentity
+      - name: access_policy_identity
         value:
-          User:
+          user:
             id: '{{ id }}'
-          IamUser:
+          iam_user:
             arn: '{{ arn }}'
-          IamRole:
+          iam_role:
             arn: '{{ arn }}'
-      - name: AccessPolicyPermission
-        value: '{{ AccessPolicyPermission }}'
-      - name: AccessPolicyResource
+      - name: access_policy_permission
+        value: '{{ access_policy_permission }}'
+      - name: access_policy_resource
         value:
-          Portal:
-            PortalAuthMode: '{{ PortalAuthMode }}'
-            PortalContactEmail: '{{ PortalContactEmail }}'
-            PortalDescription: '{{ PortalDescription }}'
-            PortalName: '{{ PortalName }}'
-            PortalType: '{{ PortalType }}'
-            PortalTypeConfiguration: {}
-            RoleArn: '{{ RoleArn }}'
-            NotificationSenderEmail: '{{ NotificationSenderEmail }}'
-            Alarms:
-              AlarmRoleArn: '{{ AlarmRoleArn }}'
-              NotificationLambdaArn: '{{ NotificationLambdaArn }}'
-            Tags:
-              - Key: '{{ Key }}'
-                Value: '{{ Value }}'
-          Project:
-            PortalId: '{{ PortalId }}'
-            ProjectName: '{{ ProjectName }}'
-            ProjectDescription: '{{ ProjectDescription }}'
-            AssetIds:
-              - '{{ AssetIds[0] }}'
-            Tags:
+          portal:
+            portal_auth_mode: '{{ portal_auth_mode }}'
+            portal_contact_email: '{{ portal_contact_email }}'
+            portal_description: '{{ portal_description }}'
+            portal_name: '{{ portal_name }}'
+            portal_type: '{{ portal_type }}'
+            portal_type_configuration: {}
+            role_arn: '{{ role_arn }}'
+            notification_sender_email: '{{ notification_sender_email }}'
+            alarms:
+              alarm_role_arn: '{{ alarm_role_arn }}'
+              notification_lambda_arn: '{{ notification_lambda_arn }}'
+            tags:
+              - key: '{{ key }}'
+                value: '{{ value }}'
+          project:
+            portal_id: '{{ portal_id }}'
+            project_name: '{{ project_name }}'
+            project_description: '{{ project_description }}'
+            asset_ids:
+              - '{{ asset_ids[0] }}'
+            tags:
               - null
-
 ```
 </TabItem>
 </Tabs>
@@ -482,7 +481,7 @@ SET PatchDocument = string('{{ {
     "AccessPolicyResource": access_policy_resource
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<AccessPolicyId>';
+AND Identifier = '{{ access_policy_id }}';
 ```
 
 
@@ -491,7 +490,7 @@ AND Identifier = '<AccessPolicyId>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.iotsitewise.access_policies
-WHERE Identifier = '<AccessPolicyId>'
+WHERE Identifier = '{{ access_policy_id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/iotsitewise/asset_models/index.md b/website/docs/services/iotsitewise/asset_models/index.md
index aeeff977f..643dbec25 100644
--- a/website/docs/services/iotsitewise/asset_models/index.md
+++ b/website/docs/services/iotsitewise/asset_models/index.md
@@ -409,7 +409,7 @@ asset_model_hierarchies,
 enforced_asset_model_interface_relationships,
 tags
 FROM awscc.iotsitewise.asset_models
-WHERE region = 'us-east-1' AND Identifier = '<AssetModelId>';
+WHERE region = 'us-east-1' AND Identifier = '{{ asset_model_id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -445,8 +445,8 @@ INSERT INTO awscc.iotsitewise.asset_models (
  AssetModelName,
  region
 )
-SELECT 
-'{{ AssetModelName }}',
+SELECT
+'{{ asset_model_name }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -466,16 +466,16 @@ INSERT INTO awscc.iotsitewise.asset_models (
  Tags,
  region
 )
-SELECT 
- '{{ AssetModelType }}',
- '{{ AssetModelExternalId }}',
- '{{ AssetModelName }}',
- '{{ AssetModelDescription }}',
- '{{ AssetModelProperties }}',
- '{{ AssetModelCompositeModels }}',
- '{{ AssetModelHierarchies }}',
- '{{ EnforcedAssetModelInterfaceRelationships }}',
- '{{ Tags }}',
+SELECT
+ '{{ asset_model_type }}',
+ '{{ asset_model_external_id }}',
+ '{{ asset_model_name }}',
+ '{{ asset_model_description }}',
+ '{{ asset_model_properties }}',
+ '{{ asset_model_composite_models }}',
+ '{{ asset_model_hierarchies }}',
+ '{{ enforced_asset_model_interface_relationships }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -493,80 +493,79 @@ globals:
 resources:
   - name: asset_model
     props:
-      - name: AssetModelType
-        value: '{{ AssetModelType }}'
-      - name: AssetModelExternalId
-        value: '{{ AssetModelExternalId }}'
-      - name: AssetModelName
-        value: '{{ AssetModelName }}'
-      - name: AssetModelDescription
-        value: '{{ AssetModelDescription }}'
-      - name: AssetModelProperties
+      - name: asset_model_type
+        value: '{{ asset_model_type }}'
+      - name: asset_model_external_id
+        value: '{{ asset_model_external_id }}'
+      - name: asset_model_name
+        value: '{{ asset_model_name }}'
+      - name: asset_model_description
+        value: '{{ asset_model_description }}'
+      - name: asset_model_properties
         value:
-          - LogicalId: '{{ LogicalId }}'
-            Id: '{{ Id }}'
-            ExternalId: '{{ ExternalId }}'
-            Name: '{{ Name }}'
-            DataType: '{{ DataType }}'
-            DataTypeSpec: '{{ DataTypeSpec }}'
-            Unit: '{{ Unit }}'
-            Type:
-              TypeName: '{{ TypeName }}'
-              Attribute:
-                DefaultValue: '{{ DefaultValue }}'
-              Transform:
-                Expression: '{{ Expression }}'
-                Variables:
-                  - Name: '{{ Name }}'
-                    Value:
-                      PropertyLogicalId: '{{ PropertyLogicalId }}'
-                      PropertyId: '{{ PropertyId }}'
-                      PropertyExternalId: '{{ PropertyExternalId }}'
-                      PropertyPath:
-                        - Name: '{{ Name }}'
-                      HierarchyLogicalId: '{{ HierarchyLogicalId }}'
-                      HierarchyId: '{{ HierarchyId }}'
-                      HierarchyExternalId: '{{ HierarchyExternalId }}'
-              Metric:
-                Expression: '{{ Expression }}'
-                Variables:
+          - logical_id: '{{ logical_id }}'
+            id: '{{ id }}'
+            external_id: '{{ external_id }}'
+            name: '{{ name }}'
+            data_type: '{{ data_type }}'
+            data_type_spec: '{{ data_type_spec }}'
+            unit: '{{ unit }}'
+            type:
+              type_name: '{{ type_name }}'
+              attribute:
+                default_value: '{{ default_value }}'
+              transform:
+                expression: '{{ expression }}'
+                variables:
+                  - name: '{{ name }}'
+                    value:
+                      property_logical_id: '{{ property_logical_id }}'
+                      property_id: '{{ property_id }}'
+                      property_external_id: '{{ property_external_id }}'
+                      property_path:
+                        - name: '{{ name }}'
+                      hierarchy_logical_id: '{{ hierarchy_logical_id }}'
+                      hierarchy_id: '{{ hierarchy_id }}'
+                      hierarchy_external_id: '{{ hierarchy_external_id }}'
+              metric:
+                expression: '{{ expression }}'
+                variables:
                   - null
-                Window:
-                  Tumbling:
-                    Interval: '{{ Interval }}'
-                    Offset: '{{ Offset }}'
-      - name: AssetModelCompositeModels
+                window:
+                  tumbling:
+                    interval: '{{ interval }}'
+                    offset: '{{ offset }}'
+      - name: asset_model_composite_models
         value:
-          - Id: '{{ Id }}'
-            ExternalId: '{{ ExternalId }}'
-            ComposedAssetModelId: '{{ ComposedAssetModelId }}'
-            ParentAssetModelCompositeModelExternalId: '{{ ParentAssetModelCompositeModelExternalId }}'
-            Path:
-              - '{{ Path[0] }}'
-            Description: '{{ Description }}'
-            Name: '{{ Name }}'
-            Type: '{{ Type }}'
-            CompositeModelProperties:
+          - id: '{{ id }}'
+            external_id: '{{ external_id }}'
+            composed_asset_model_id: '{{ composed_asset_model_id }}'
+            parent_asset_model_composite_model_external_id: '{{ parent_asset_model_composite_model_external_id }}'
+            path:
+              - '{{ path[0] }}'
+            description: '{{ description }}'
+            name: '{{ name }}'
+            type: '{{ type }}'
+            composite_model_properties:
               - null
-      - name: AssetModelHierarchies
+      - name: asset_model_hierarchies
         value:
-          - Id: '{{ Id }}'
-            ExternalId: '{{ ExternalId }}'
-            LogicalId: '{{ LogicalId }}'
-            Name: '{{ Name }}'
-            ChildAssetModelId: '{{ ChildAssetModelId }}'
-      - name: EnforcedAssetModelInterfaceRelationships
+          - id: '{{ id }}'
+            external_id: '{{ external_id }}'
+            logical_id: '{{ logical_id }}'
+            name: '{{ name }}'
+            child_asset_model_id: '{{ child_asset_model_id }}'
+      - name: enforced_asset_model_interface_relationships
         value:
-          - InterfaceAssetModelId: '{{ InterfaceAssetModelId }}'
-            PropertyMappings:
-              - AssetModelPropertyExternalId: '{{ AssetModelPropertyExternalId }}'
-                AssetModelPropertyLogicalId: '{{ AssetModelPropertyLogicalId }}'
-                InterfaceAssetModelPropertyExternalId: '{{ InterfaceAssetModelPropertyExternalId }}'
-      - name: Tags
+          - interface_asset_model_id: '{{ interface_asset_model_id }}'
+            property_mappings:
+              - asset_model_property_external_id: '{{ asset_model_property_external_id }}'
+                asset_model_property_logical_id: '{{ asset_model_property_logical_id }}'
+                interface_asset_model_property_external_id: '{{ interface_asset_model_property_external_id }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -586,7 +585,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<AssetModelId>';
+AND Identifier = '{{ asset_model_id }}';
 ```
 
 
@@ -595,7 +594,7 @@ AND Identifier = '<AssetModelId>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.iotsitewise.asset_models
-WHERE Identifier = '<AssetModelId>'
+WHERE Identifier = '{{ asset_model_id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/iotsitewise/assets/index.md b/website/docs/services/iotsitewise/assets/index.md
index 8fa0925be..3a8e5985b 100644
--- a/website/docs/services/iotsitewise/assets/index.md
+++ b/website/docs/services/iotsitewise/assets/index.md
@@ -248,7 +248,7 @@ asset_properties,
 asset_hierarchies,
 tags
 FROM awscc.iotsitewise.assets
-WHERE region = 'us-east-1' AND Identifier = '<AssetId>';
+WHERE region = 'us-east-1' AND Identifier = '{{ asset_id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -285,9 +285,9 @@ INSERT INTO awscc.iotsitewise.assets (
  AssetName,
  region
 )
-SELECT 
-'{{ AssetModelId }}',
- '{{ AssetName }}',
+SELECT
+'{{ asset_model_id }}',
+ '{{ asset_name }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -305,14 +305,14 @@ INSERT INTO awscc.iotsitewise.assets (
  Tags,
  region
 )
-SELECT 
- '{{ AssetExternalId }}',
- '{{ AssetModelId }}',
- '{{ AssetName }}',
- '{{ AssetDescription }}',
- '{{ AssetProperties }}',
- '{{ AssetHierarchies }}',
- '{{ Tags }}',
+SELECT
+ '{{ asset_external_id }}',
+ '{{ asset_model_id }}',
+ '{{ asset_name }}',
+ '{{ asset_description }}',
+ '{{ asset_properties }}',
+ '{{ asset_hierarchies }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -330,33 +330,32 @@ globals:
 resources:
   - name: asset
     props:
-      - name: AssetExternalId
-        value: '{{ AssetExternalId }}'
-      - name: AssetModelId
-        value: '{{ AssetModelId }}'
-      - name: AssetName
-        value: '{{ AssetName }}'
-      - name: AssetDescription
-        value: '{{ AssetDescription }}'
-      - name: AssetProperties
+      - name: asset_external_id
+        value: '{{ asset_external_id }}'
+      - name: asset_model_id
+        value: '{{ asset_model_id }}'
+      - name: asset_name
+        value: '{{ asset_name }}'
+      - name: asset_description
+        value: '{{ asset_description }}'
+      - name: asset_properties
         value:
-          - Id: '{{ Id }}'
-            ExternalId: '{{ ExternalId }}'
-            LogicalId: '{{ LogicalId }}'
-            Alias: '{{ Alias }}'
-            NotificationState: '{{ NotificationState }}'
-            Unit: '{{ Unit }}'
-      - name: AssetHierarchies
+          - id: '{{ id }}'
+            external_id: '{{ external_id }}'
+            logical_id: '{{ logical_id }}'
+            alias: '{{ alias }}'
+            notification_state: '{{ notification_state }}'
+            unit: '{{ unit }}'
+      - name: asset_hierarchies
         value:
-          - Id: '{{ Id }}'
-            ExternalId: '{{ ExternalId }}'
-            LogicalId: '{{ LogicalId }}'
-            ChildAssetId: '{{ ChildAssetId }}'
-      - name: Tags
+          - id: '{{ id }}'
+            external_id: '{{ external_id }}'
+            logical_id: '{{ logical_id }}'
+            child_asset_id: '{{ child_asset_id }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -376,7 +375,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<AssetId>';
+AND Identifier = '{{ asset_id }}';
 ```
 
 
@@ -385,7 +384,7 @@ AND Identifier = '<AssetId>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.iotsitewise.assets
-WHERE Identifier = '<AssetId>'
+WHERE Identifier = '{{ asset_id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/iotsitewise/computation_models/index.md b/website/docs/services/iotsitewise/computation_models/index.md
index 2e6117d9b..eb2727256 100644
--- a/website/docs/services/iotsitewise/computation_models/index.md
+++ b/website/docs/services/iotsitewise/computation_models/index.md
@@ -201,7 +201,7 @@ computation_model_configuration,
 computation_model_data_binding,
 tags
 FROM awscc.iotsitewise.computation_models
-WHERE region = 'us-east-1' AND Identifier = '<ComputationModelId>';
+WHERE region = 'us-east-1' AND Identifier = '{{ computation_model_id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -239,10 +239,10 @@ INSERT INTO awscc.iotsitewise.computation_models (
  ComputationModelDataBinding,
  region
 )
-SELECT 
-'{{ ComputationModelName }}',
- '{{ ComputationModelConfiguration }}',
- '{{ ComputationModelDataBinding }}',
+SELECT
+'{{ computation_model_name }}',
+ '{{ computation_model_configuration }}',
+ '{{ computation_model_data_binding }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -258,12 +258,12 @@ INSERT INTO awscc.iotsitewise.computation_models (
  Tags,
  region
 )
-SELECT 
- '{{ ComputationModelName }}',
- '{{ ComputationModelDescription }}',
- '{{ ComputationModelConfiguration }}',
- '{{ ComputationModelDataBinding }}',
- '{{ Tags }}',
+SELECT
+ '{{ computation_model_name }}',
+ '{{ computation_model_description }}',
+ '{{ computation_model_configuration }}',
+ '{{ computation_model_data_binding }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -281,22 +281,21 @@ globals:
 resources:
   - name: computation_model
     props:
-      - name: ComputationModelName
-        value: '{{ ComputationModelName }}'
-      - name: ComputationModelDescription
-        value: '{{ ComputationModelDescription }}'
-      - name: ComputationModelConfiguration
+      - name: computation_model_name
+        value: '{{ computation_model_name }}'
+      - name: computation_model_description
+        value: '{{ computation_model_description }}'
+      - name: computation_model_configuration
         value:
-          AnomalyDetection:
-            InputProperties: '{{ InputProperties }}'
-            ResultProperty: '{{ ResultProperty }}'
-      - name: ComputationModelDataBinding
+          anomaly_detection:
+            input_properties: '{{ input_properties }}'
+            result_property: '{{ result_property }}'
+      - name: computation_model_data_binding
         value: {}
-      - name: Tags
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -316,7 +315,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<ComputationModelId>';
+AND Identifier = '{{ computation_model_id }}';
 ```
 
 
@@ -325,7 +324,7 @@ AND Identifier = '<ComputationModelId>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.iotsitewise.computation_models
-WHERE Identifier = '<ComputationModelId>'
+WHERE Identifier = '{{ computation_model_id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/iotsitewise/dashboards/index.md b/website/docs/services/iotsitewise/dashboards/index.md
index 716b248a1..dbf1eab81 100644
--- a/website/docs/services/iotsitewise/dashboards/index.md
+++ b/website/docs/services/iotsitewise/dashboards/index.md
@@ -182,7 +182,7 @@ dashboard_definition,
 dashboard_arn,
 tags
 FROM awscc.iotsitewise.dashboards
-WHERE region = 'us-east-1' AND Identifier = '<DashboardId>';
+WHERE region = 'us-east-1' AND Identifier = '{{ dashboard_id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -220,10 +220,10 @@ INSERT INTO awscc.iotsitewise.dashboards (
  DashboardDefinition,
  region
 )
-SELECT 
-'{{ DashboardName }}',
- '{{ DashboardDescription }}',
- '{{ DashboardDefinition }}',
+SELECT
+'{{ dashboard_name }}',
+ '{{ dashboard_description }}',
+ '{{ dashboard_definition }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -239,12 +239,12 @@ INSERT INTO awscc.iotsitewise.dashboards (
  Tags,
  region
 )
-SELECT 
- '{{ ProjectId }}',
- '{{ DashboardName }}',
- '{{ DashboardDescription }}',
- '{{ DashboardDefinition }}',
- '{{ Tags }}',
+SELECT
+ '{{ project_id }}',
+ '{{ dashboard_name }}',
+ '{{ dashboard_description }}',
+ '{{ dashboard_definition }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -262,19 +262,18 @@ globals:
 resources:
   - name: dashboard
     props:
-      - name: ProjectId
-        value: '{{ ProjectId }}'
-      - name: DashboardName
-        value: '{{ DashboardName }}'
-      - name: DashboardDescription
-        value: '{{ DashboardDescription }}'
-      - name: DashboardDefinition
-        value: '{{ DashboardDefinition }}'
-      - name: Tags
+      - name: project_id
+        value: '{{ project_id }}'
+      - name: dashboard_name
+        value: '{{ dashboard_name }}'
+      - name: dashboard_description
+        value: '{{ dashboard_description }}'
+      - name: dashboard_definition
+        value: '{{ dashboard_definition }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -293,7 +292,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<DashboardId>';
+AND Identifier = '{{ dashboard_id }}';
 ```
 
 
@@ -302,7 +301,7 @@ AND Identifier = '<DashboardId>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.iotsitewise.dashboards
-WHERE Identifier = '<DashboardId>'
+WHERE Identifier = '{{ dashboard_id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/iotsitewise/datasets/index.md b/website/docs/services/iotsitewise/datasets/index.md
index e46818f02..b73989963 100644
--- a/website/docs/services/iotsitewise/datasets/index.md
+++ b/website/docs/services/iotsitewise/datasets/index.md
@@ -212,7 +212,7 @@ dataset_description,
 dataset_source,
 tags
 FROM awscc.iotsitewise.datasets
-WHERE region = 'us-east-1' AND Identifier = '<DatasetId>';
+WHERE region = 'us-east-1' AND Identifier = '{{ dataset_id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -249,9 +249,9 @@ INSERT INTO awscc.iotsitewise.datasets (
  DatasetSource,
  region
 )
-SELECT 
-'{{ DatasetName }}',
- '{{ DatasetSource }}',
+SELECT
+'{{ dataset_name }}',
+ '{{ dataset_source }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -266,11 +266,11 @@ INSERT INTO awscc.iotsitewise.datasets (
  Tags,
  region
 )
-SELECT 
- '{{ DatasetName }}',
- '{{ DatasetDescription }}',
- '{{ DatasetSource }}',
- '{{ Tags }}',
+SELECT
+ '{{ dataset_name }}',
+ '{{ dataset_description }}',
+ '{{ dataset_source }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -288,23 +288,22 @@ globals:
 resources:
   - name: dataset
     props:
-      - name: DatasetName
-        value: '{{ DatasetName }}'
-      - name: DatasetDescription
-        value: '{{ DatasetDescription }}'
-      - name: DatasetSource
+      - name: dataset_name
+        value: '{{ dataset_name }}'
+      - name: dataset_description
+        value: '{{ dataset_description }}'
+      - name: dataset_source
         value:
-          SourceFormat: '{{ SourceFormat }}'
-          SourceType: '{{ SourceType }}'
-          SourceDetail:
-            Kendra:
-              KnowledgeBaseArn: '{{ KnowledgeBaseArn }}'
-              RoleArn: '{{ RoleArn }}'
-      - name: Tags
+          source_format: '{{ source_format }}'
+          source_type: '{{ source_type }}'
+          source_detail:
+            kendra:
+              knowledge_base_arn: '{{ knowledge_base_arn }}'
+              role_arn: '{{ role_arn }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -323,7 +322,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<DatasetId>';
+AND Identifier = '{{ dataset_id }}';
 ```
 
 
@@ -332,7 +331,7 @@ AND Identifier = '<DatasetId>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.iotsitewise.datasets
-WHERE Identifier = '<DatasetId>'
+WHERE Identifier = '{{ dataset_id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/iotsitewise/gateways/index.md b/website/docs/services/iotsitewise/gateways/index.md
index ac4ecb426..f8cde6484 100644
--- a/website/docs/services/iotsitewise/gateways/index.md
+++ b/website/docs/services/iotsitewise/gateways/index.md
@@ -219,7 +219,7 @@ tags,
 gateway_id,
 gateway_capability_summaries
 FROM awscc.iotsitewise.gateways
-WHERE region = 'us-east-1' AND Identifier = '<GatewayId>';
+WHERE region = 'us-east-1' AND Identifier = '{{ gateway_id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -256,9 +256,9 @@ INSERT INTO awscc.iotsitewise.gateways (
  GatewayPlatform,
  region
 )
-SELECT 
-'{{ GatewayName }}',
- '{{ GatewayPlatform }}',
+SELECT
+'{{ gateway_name }}',
+ '{{ gateway_platform }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -274,12 +274,12 @@ INSERT INTO awscc.iotsitewise.gateways (
  GatewayCapabilitySummaries,
  region
 )
-SELECT 
- '{{ GatewayName }}',
- '{{ GatewayPlatform }}',
- '{{ GatewayVersion }}',
- '{{ Tags }}',
- '{{ GatewayCapabilitySummaries }}',
+SELECT
+ '{{ gateway_name }}',
+ '{{ gateway_platform }}',
+ '{{ gateway_version }}',
+ '{{ tags }}',
+ '{{ gateway_capability_summaries }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -297,26 +297,25 @@ globals:
 resources:
   - name: gateway
     props:
-      - name: GatewayName
-        value: '{{ GatewayName }}'
-      - name: GatewayPlatform
+      - name: gateway_name
+        value: '{{ gateway_name }}'
+      - name: gateway_platform
         value:
-          GreengrassV2:
-            CoreDeviceThingName: '{{ CoreDeviceThingName }}'
-            CoreDeviceOperatingSystem: '{{ CoreDeviceOperatingSystem }}'
-          SiemensIE:
-            IotCoreThingName: '{{ IotCoreThingName }}'
-      - name: GatewayVersion
-        value: '{{ GatewayVersion }}'
-      - name: Tags
+          greengrass_v2:
+            core_device_thing_name: '{{ core_device_thing_name }}'
+            core_device_operating_system: '{{ core_device_operating_system }}'
+          siemens_ie:
+            iot_core_thing_name: '{{ iot_core_thing_name }}'
+      - name: gateway_version
+        value: '{{ gateway_version }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-      - name: GatewayCapabilitySummaries
+          - key: '{{ key }}'
+            value: '{{ value }}'
+      - name: gateway_capability_summaries
         value:
-          - CapabilityNamespace: '{{ CapabilityNamespace }}'
-            CapabilityConfiguration: '{{ CapabilityConfiguration }}'
-
+          - capability_namespace: '{{ capability_namespace }}'
+            capability_configuration: '{{ capability_configuration }}'
 ```
 </TabItem>
 </Tabs>
@@ -334,7 +333,7 @@ SET PatchDocument = string('{{ {
     "GatewayCapabilitySummaries": gateway_capability_summaries
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<GatewayId>';
+AND Identifier = '{{ gateway_id }}';
 ```
 
 
@@ -343,7 +342,7 @@ AND Identifier = '<GatewayId>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.iotsitewise.gateways
-WHERE Identifier = '<GatewayId>'
+WHERE Identifier = '{{ gateway_id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/iotsitewise/portals/index.md b/website/docs/services/iotsitewise/portals/index.md
index 264616072..082451e3a 100644
--- a/website/docs/services/iotsitewise/portals/index.md
+++ b/website/docs/services/iotsitewise/portals/index.md
@@ -236,7 +236,7 @@ notification_sender_email,
 alarms,
 tags
 FROM awscc.iotsitewise.portals
-WHERE region = 'us-east-1' AND Identifier = '<PortalId>';
+WHERE region = 'us-east-1' AND Identifier = '{{ portal_id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -274,10 +274,10 @@ INSERT INTO awscc.iotsitewise.portals (
  RoleArn,
  region
 )
-SELECT 
-'{{ PortalContactEmail }}',
- '{{ PortalName }}',
- '{{ RoleArn }}',
+SELECT
+'{{ portal_contact_email }}',
+ '{{ portal_name }}',
+ '{{ role_arn }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -298,17 +298,17 @@ INSERT INTO awscc.iotsitewise.portals (
  Tags,
  region
 )
-SELECT 
- '{{ PortalAuthMode }}',
- '{{ PortalContactEmail }}',
- '{{ PortalDescription }}',
- '{{ PortalName }}',
- '{{ PortalType }}',
- '{{ PortalTypeConfiguration }}',
- '{{ RoleArn }}',
- '{{ NotificationSenderEmail }}',
- '{{ Alarms }}',
- '{{ Tags }}',
+SELECT
+ '{{ portal_auth_mode }}',
+ '{{ portal_contact_email }}',
+ '{{ portal_description }}',
+ '{{ portal_name }}',
+ '{{ portal_type }}',
+ '{{ portal_type_configuration }}',
+ '{{ role_arn }}',
+ '{{ notification_sender_email }}',
+ '{{ alarms }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -326,31 +326,30 @@ globals:
 resources:
   - name: portal
     props:
-      - name: PortalAuthMode
-        value: '{{ PortalAuthMode }}'
-      - name: PortalContactEmail
-        value: '{{ PortalContactEmail }}'
-      - name: PortalDescription
-        value: '{{ PortalDescription }}'
-      - name: PortalName
-        value: '{{ PortalName }}'
-      - name: PortalType
-        value: '{{ PortalType }}'
-      - name: PortalTypeConfiguration
+      - name: portal_auth_mode
+        value: '{{ portal_auth_mode }}'
+      - name: portal_contact_email
+        value: '{{ portal_contact_email }}'
+      - name: portal_description
+        value: '{{ portal_description }}'
+      - name: portal_name
+        value: '{{ portal_name }}'
+      - name: portal_type
+        value: '{{ portal_type }}'
+      - name: portal_type_configuration
         value: {}
-      - name: RoleArn
-        value: '{{ RoleArn }}'
-      - name: NotificationSenderEmail
-        value: '{{ NotificationSenderEmail }}'
-      - name: Alarms
+      - name: role_arn
+        value: '{{ role_arn }}'
+      - name: notification_sender_email
+        value: '{{ notification_sender_email }}'
+      - name: alarms
         value:
-          AlarmRoleArn: '{{ AlarmRoleArn }}'
-          NotificationLambdaArn: '{{ NotificationLambdaArn }}'
-      - name: Tags
+          alarm_role_arn: '{{ alarm_role_arn }}'
+          notification_lambda_arn: '{{ notification_lambda_arn }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -373,7 +372,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<PortalId>';
+AND Identifier = '{{ portal_id }}';
 ```
 
 
@@ -382,7 +381,7 @@ AND Identifier = '<PortalId>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.iotsitewise.portals
-WHERE Identifier = '<PortalId>'
+WHERE Identifier = '{{ portal_id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/iotsitewise/projects/index.md b/website/docs/services/iotsitewise/projects/index.md
index 93832bf6e..461d9ef0c 100644
--- a/website/docs/services/iotsitewise/projects/index.md
+++ b/website/docs/services/iotsitewise/projects/index.md
@@ -182,7 +182,7 @@ project_arn,
 asset_ids,
 tags
 FROM awscc.iotsitewise.projects
-WHERE region = 'us-east-1' AND Identifier = '<ProjectId>';
+WHERE region = 'us-east-1' AND Identifier = '{{ project_id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -219,9 +219,9 @@ INSERT INTO awscc.iotsitewise.projects (
  ProjectName,
  region
 )
-SELECT 
-'{{ PortalId }}',
- '{{ ProjectName }}',
+SELECT
+'{{ portal_id }}',
+ '{{ project_name }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -237,12 +237,12 @@ INSERT INTO awscc.iotsitewise.projects (
  Tags,
  region
 )
-SELECT 
- '{{ PortalId }}',
- '{{ ProjectName }}',
- '{{ ProjectDescription }}',
- '{{ AssetIds }}',
- '{{ Tags }}',
+SELECT
+ '{{ portal_id }}',
+ '{{ project_name }}',
+ '{{ project_description }}',
+ '{{ asset_ids }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -260,20 +260,19 @@ globals:
 resources:
   - name: project
     props:
-      - name: PortalId
-        value: '{{ PortalId }}'
-      - name: ProjectName
-        value: '{{ ProjectName }}'
-      - name: ProjectDescription
-        value: '{{ ProjectDescription }}'
-      - name: AssetIds
+      - name: portal_id
+        value: '{{ portal_id }}'
+      - name: project_name
+        value: '{{ project_name }}'
+      - name: project_description
+        value: '{{ project_description }}'
+      - name: asset_ids
         value:
-          - '{{ AssetIds[0] }}'
-      - name: Tags
+          - '{{ asset_ids[0] }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -292,7 +291,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<ProjectId>';
+AND Identifier = '{{ project_id }}';
 ```
 
 
@@ -301,7 +300,7 @@ AND Identifier = '<ProjectId>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.iotsitewise.projects
-WHERE Identifier = '<ProjectId>'
+WHERE Identifier = '{{ project_id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/iottwinmaker/component_types/index.md b/website/docs/services/iottwinmaker/component_types/index.md
index db3968ae7..d310fb0b8 100644
--- a/website/docs/services/iottwinmaker/component_types/index.md
+++ b/website/docs/services/iottwinmaker/component_types/index.md
@@ -236,7 +236,7 @@ is_abstract,
 is_schema_initialized,
 tags
 FROM awscc.iottwinmaker.component_types
-WHERE region = 'us-east-1' AND Identifier = '<WorkspaceId>|<ComponentTypeId>';
+WHERE region = 'us-east-1' AND Identifier = '{{ workspace_id }}|{{ component_type_id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -274,9 +274,9 @@ INSERT INTO awscc.iottwinmaker.component_types (
  ComponentTypeId,
  region
 )
-SELECT 
-'{{ WorkspaceId }}',
- '{{ ComponentTypeId }}',
+SELECT
+'{{ workspace_id }}',
+ '{{ component_type_id }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -297,17 +297,17 @@ INSERT INTO awscc.iottwinmaker.component_types (
  Tags,
  region
 )
-SELECT 
- '{{ WorkspaceId }}',
- '{{ ComponentTypeId }}',
- '{{ Description }}',
- '{{ ExtendsFrom }}',
- '{{ Functions }}',
- '{{ IsSingleton }}',
- '{{ PropertyDefinitions }}',
- '{{ PropertyGroups }}',
- '{{ CompositeComponentTypes }}',
- '{{ Tags }}',
+SELECT
+ '{{ workspace_id }}',
+ '{{ component_type_id }}',
+ '{{ description }}',
+ '{{ extends_from }}',
+ '{{ functions }}',
+ '{{ is_singleton }}',
+ '{{ property_definitions }}',
+ '{{ property_groups }}',
+ '{{ composite_component_types }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -325,28 +325,27 @@ globals:
 resources:
   - name: component_type
     props:
-      - name: WorkspaceId
-        value: '{{ WorkspaceId }}'
-      - name: ComponentTypeId
-        value: '{{ ComponentTypeId }}'
-      - name: Description
-        value: '{{ Description }}'
-      - name: ExtendsFrom
+      - name: workspace_id
+        value: '{{ workspace_id }}'
+      - name: component_type_id
+        value: '{{ component_type_id }}'
+      - name: description
+        value: '{{ description }}'
+      - name: extends_from
         value:
-          - '{{ ExtendsFrom[0] }}'
-      - name: Functions
+          - '{{ extends_from[0] }}'
+      - name: functions
         value: {}
-      - name: IsSingleton
-        value: '{{ IsSingleton }}'
-      - name: PropertyDefinitions
+      - name: is_singleton
+        value: '{{ is_singleton }}'
+      - name: property_definitions
         value: {}
-      - name: PropertyGroups
+      - name: property_groups
         value: {}
-      - name: CompositeComponentTypes
+      - name: composite_component_types
         value: {}
-      - name: Tags
+      - name: tags
         value: {}
-
 ```
 </TabItem>
 </Tabs>
@@ -369,7 +368,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<WorkspaceId>|<ComponentTypeId>';
+AND Identifier = '{{ workspace_id }}|{{ component_type_id }}';
 ```
 
 
@@ -378,7 +377,7 @@ AND Identifier = '<WorkspaceId>|<ComponentTypeId>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.iottwinmaker.component_types
-WHERE Identifier = '<WorkspaceId|ComponentTypeId>'
+WHERE Identifier = '{{ workspace_id }}|{{ component_type_id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/iottwinmaker/entities/index.md b/website/docs/services/iottwinmaker/entities/index.md
index d9682fb53..df6bc618a 100644
--- a/website/docs/services/iottwinmaker/entities/index.md
+++ b/website/docs/services/iottwinmaker/entities/index.md
@@ -218,7 +218,7 @@ workspace_id,
 components,
 composite_components
 FROM awscc.iottwinmaker.entities
-WHERE region = 'us-east-1' AND Identifier = '<WorkspaceId>|<EntityId>';
+WHERE region = 'us-east-1' AND Identifier = '{{ workspace_id }}|{{ entity_id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -256,9 +256,9 @@ INSERT INTO awscc.iottwinmaker.entities (
  WorkspaceId,
  region
 )
-SELECT 
-'{{ EntityName }}',
- '{{ WorkspaceId }}',
+SELECT
+'{{ entity_name }}',
+ '{{ workspace_id }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -277,15 +277,15 @@ INSERT INTO awscc.iottwinmaker.entities (
  CompositeComponents,
  region
 )
-SELECT 
- '{{ EntityId }}',
- '{{ EntityName }}',
- '{{ ParentEntityId }}',
- '{{ Description }}',
- '{{ Tags }}',
- '{{ WorkspaceId }}',
- '{{ Components }}',
- '{{ CompositeComponents }}',
+SELECT
+ '{{ entity_id }}',
+ '{{ entity_name }}',
+ '{{ parent_entity_id }}',
+ '{{ description }}',
+ '{{ tags }}',
+ '{{ workspace_id }}',
+ '{{ components }}',
+ '{{ composite_components }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -303,23 +303,22 @@ globals:
 resources:
   - name: entity
     props:
-      - name: EntityId
-        value: '{{ EntityId }}'
-      - name: EntityName
-        value: '{{ EntityName }}'
-      - name: ParentEntityId
-        value: '{{ ParentEntityId }}'
-      - name: Description
-        value: '{{ Description }}'
-      - name: Tags
+      - name: entity_id
+        value: '{{ entity_id }}'
+      - name: entity_name
+        value: '{{ entity_name }}'
+      - name: parent_entity_id
+        value: '{{ parent_entity_id }}'
+      - name: description
+        value: '{{ description }}'
+      - name: tags
         value: {}
-      - name: WorkspaceId
-        value: '{{ WorkspaceId }}'
-      - name: Components
+      - name: workspace_id
+        value: '{{ workspace_id }}'
+      - name: components
         value: {}
-      - name: CompositeComponents
+      - name: composite_components
         value: {}
-
 ```
 </TabItem>
 </Tabs>
@@ -340,7 +339,7 @@ SET PatchDocument = string('{{ {
     "CompositeComponents": composite_components
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<WorkspaceId>|<EntityId>';
+AND Identifier = '{{ workspace_id }}|{{ entity_id }}';
 ```
 
 
@@ -349,7 +348,7 @@ AND Identifier = '<WorkspaceId>|<EntityId>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.iottwinmaker.entities
-WHERE Identifier = '<WorkspaceId|EntityId>'
+WHERE Identifier = '{{ workspace_id }}|{{ entity_id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/iottwinmaker/scenes/index.md b/website/docs/services/iottwinmaker/scenes/index.md
index 910e347dd..2b8d3e4da 100644
--- a/website/docs/services/iottwinmaker/scenes/index.md
+++ b/website/docs/services/iottwinmaker/scenes/index.md
@@ -194,7 +194,7 @@ capabilities,
 scene_metadata,
 generated_scene_metadata
 FROM awscc.iottwinmaker.scenes
-WHERE region = 'us-east-1' AND Identifier = '<WorkspaceId>|<SceneId>';
+WHERE region = 'us-east-1' AND Identifier = '{{ workspace_id }}|{{ scene_id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -233,10 +233,10 @@ INSERT INTO awscc.iottwinmaker.scenes (
  WorkspaceId,
  region
 )
-SELECT 
-'{{ SceneId }}',
- '{{ ContentLocation }}',
- '{{ WorkspaceId }}',
+SELECT
+'{{ scene_id }}',
+ '{{ content_location }}',
+ '{{ workspace_id }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -254,14 +254,14 @@ INSERT INTO awscc.iottwinmaker.scenes (
  SceneMetadata,
  region
 )
-SELECT 
- '{{ SceneId }}',
- '{{ Description }}',
- '{{ ContentLocation }}',
- '{{ Tags }}',
- '{{ WorkspaceId }}',
- '{{ Capabilities }}',
- '{{ SceneMetadata }}',
+SELECT
+ '{{ scene_id }}',
+ '{{ description }}',
+ '{{ content_location }}',
+ '{{ tags }}',
+ '{{ workspace_id }}',
+ '{{ capabilities }}',
+ '{{ scene_metadata }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -279,22 +279,21 @@ globals:
 resources:
   - name: scene
     props:
-      - name: SceneId
-        value: '{{ SceneId }}'
-      - name: Description
-        value: '{{ Description }}'
-      - name: ContentLocation
-        value: '{{ ContentLocation }}'
-      - name: Tags
+      - name: scene_id
+        value: '{{ scene_id }}'
+      - name: description
+        value: '{{ description }}'
+      - name: content_location
+        value: '{{ content_location }}'
+      - name: tags
         value: {}
-      - name: WorkspaceId
-        value: '{{ WorkspaceId }}'
-      - name: Capabilities
+      - name: workspace_id
+        value: '{{ workspace_id }}'
+      - name: capabilities
         value:
-          - '{{ Capabilities[0] }}'
-      - name: SceneMetadata
+          - '{{ capabilities[0] }}'
+      - name: scene_metadata
         value: {}
-
 ```
 </TabItem>
 </Tabs>
@@ -314,7 +313,7 @@ SET PatchDocument = string('{{ {
     "SceneMetadata": scene_metadata
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<WorkspaceId>|<SceneId>';
+AND Identifier = '{{ workspace_id }}|{{ scene_id }}';
 ```
 
 
@@ -323,7 +322,7 @@ AND Identifier = '<WorkspaceId>|<SceneId>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.iottwinmaker.scenes
-WHERE Identifier = '<WorkspaceId|SceneId>'
+WHERE Identifier = '{{ workspace_id }}|{{ scene_id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/iottwinmaker/sync_jobs/index.md b/website/docs/services/iottwinmaker/sync_jobs/index.md
index b0e3e04e7..fdf8a9430 100644
--- a/website/docs/services/iottwinmaker/sync_jobs/index.md
+++ b/website/docs/services/iottwinmaker/sync_jobs/index.md
@@ -170,7 +170,7 @@ arn,
 state,
 tags
 FROM awscc.iottwinmaker.sync_jobs
-WHERE region = 'us-east-1' AND Identifier = '<WorkspaceId>|<SyncSource>';
+WHERE region = 'us-east-1' AND Identifier = '{{ workspace_id }}|{{ sync_source }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -209,10 +209,10 @@ INSERT INTO awscc.iottwinmaker.sync_jobs (
  SyncRole,
  region
 )
-SELECT 
-'{{ WorkspaceId }}',
- '{{ SyncSource }}',
- '{{ SyncRole }}',
+SELECT
+'{{ workspace_id }}',
+ '{{ sync_source }}',
+ '{{ sync_role }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -227,11 +227,11 @@ INSERT INTO awscc.iottwinmaker.sync_jobs (
  Tags,
  region
 )
-SELECT 
- '{{ WorkspaceId }}',
- '{{ SyncSource }}',
- '{{ SyncRole }}',
- '{{ Tags }}',
+SELECT
+ '{{ workspace_id }}',
+ '{{ sync_source }}',
+ '{{ sync_role }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -249,15 +249,14 @@ globals:
 resources:
   - name: sync_job
     props:
-      - name: WorkspaceId
-        value: '{{ WorkspaceId }}'
-      - name: SyncSource
-        value: '{{ SyncSource }}'
-      - name: SyncRole
-        value: '{{ SyncRole }}'
-      - name: Tags
+      - name: workspace_id
+        value: '{{ workspace_id }}'
+      - name: sync_source
+        value: '{{ sync_source }}'
+      - name: sync_role
+        value: '{{ sync_role }}'
+      - name: tags
         value: {}
-
 ```
 </TabItem>
 </Tabs>
@@ -268,7 +267,7 @@ resources:
 ```sql
 /*+ delete */
 DELETE FROM awscc.iottwinmaker.sync_jobs
-WHERE Identifier = '<WorkspaceId|SyncSource>'
+WHERE Identifier = '{{ workspace_id }}|{{ sync_source }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/iottwinmaker/workspaces/index.md b/website/docs/services/iottwinmaker/workspaces/index.md
index 3fa006ba4..70494daf6 100644
--- a/website/docs/services/iottwinmaker/workspaces/index.md
+++ b/website/docs/services/iottwinmaker/workspaces/index.md
@@ -171,7 +171,7 @@ creation_date_time,
 update_date_time,
 tags
 FROM awscc.iottwinmaker.workspaces
-WHERE region = 'us-east-1' AND Identifier = '<WorkspaceId>';
+WHERE region = 'us-east-1' AND Identifier = '{{ workspace_id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -209,10 +209,10 @@ INSERT INTO awscc.iottwinmaker.workspaces (
  S3Location,
  region
 )
-SELECT 
-'{{ WorkspaceId }}',
- '{{ Role }}',
- '{{ S3Location }}',
+SELECT
+'{{ workspace_id }}',
+ '{{ role }}',
+ '{{ s3_location }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -228,12 +228,12 @@ INSERT INTO awscc.iottwinmaker.workspaces (
  Tags,
  region
 )
-SELECT 
- '{{ WorkspaceId }}',
- '{{ Description }}',
- '{{ Role }}',
- '{{ S3Location }}',
- '{{ Tags }}',
+SELECT
+ '{{ workspace_id }}',
+ '{{ description }}',
+ '{{ role }}',
+ '{{ s3_location }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -251,17 +251,16 @@ globals:
 resources:
   - name: workspace
     props:
-      - name: WorkspaceId
-        value: '{{ WorkspaceId }}'
-      - name: Description
-        value: '{{ Description }}'
-      - name: Role
-        value: '{{ Role }}'
-      - name: S3Location
-        value: '{{ S3Location }}'
-      - name: Tags
+      - name: workspace_id
+        value: '{{ workspace_id }}'
+      - name: description
+        value: '{{ description }}'
+      - name: role
+        value: '{{ role }}'
+      - name: s3_location
+        value: '{{ s3_location }}'
+      - name: tags
         value: {}
-
 ```
 </TabItem>
 </Tabs>
@@ -280,7 +279,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<WorkspaceId>';
+AND Identifier = '{{ workspace_id }}';
 ```
 
 
@@ -289,7 +288,7 @@ AND Identifier = '<WorkspaceId>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.iottwinmaker.workspaces
-WHERE Identifier = '<WorkspaceId>'
+WHERE Identifier = '{{ workspace_id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/iotwireless/destinations/index.md b/website/docs/services/iotwireless/destinations/index.md
index fcfacfb3b..f6e8539c8 100644
--- a/website/docs/services/iotwireless/destinations/index.md
+++ b/website/docs/services/iotwireless/destinations/index.md
@@ -182,7 +182,7 @@ tags,
 role_arn,
 arn
 FROM awscc.iotwireless.destinations
-WHERE region = 'us-east-1' AND Identifier = '<Name>';
+WHERE region = 'us-east-1' AND Identifier = '{{ name }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -220,10 +220,10 @@ INSERT INTO awscc.iotwireless.destinations (
  ExpressionType,
  region
 )
-SELECT 
-'{{ Name }}',
- '{{ Expression }}',
- '{{ ExpressionType }}',
+SELECT
+'{{ name }}',
+ '{{ expression }}',
+ '{{ expression_type }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -240,13 +240,13 @@ INSERT INTO awscc.iotwireless.destinations (
  RoleArn,
  region
 )
-SELECT 
- '{{ Name }}',
- '{{ Expression }}',
- '{{ ExpressionType }}',
- '{{ Description }}',
- '{{ Tags }}',
- '{{ RoleArn }}',
+SELECT
+ '{{ name }}',
+ '{{ expression }}',
+ '{{ expression_type }}',
+ '{{ description }}',
+ '{{ tags }}',
+ '{{ role_arn }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -264,21 +264,20 @@ globals:
 resources:
   - name: destination
     props:
-      - name: Name
-        value: '{{ Name }}'
-      - name: Expression
-        value: '{{ Expression }}'
-      - name: ExpressionType
-        value: '{{ ExpressionType }}'
-      - name: Description
-        value: '{{ Description }}'
-      - name: Tags
+      - name: name
+        value: '{{ name }}'
+      - name: expression
+        value: '{{ expression }}'
+      - name: expression_type
+        value: '{{ expression_type }}'
+      - name: description
+        value: '{{ description }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-      - name: RoleArn
-        value: '{{ RoleArn }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
+      - name: role_arn
+        value: '{{ role_arn }}'
 ```
 </TabItem>
 </Tabs>
@@ -298,7 +297,7 @@ SET PatchDocument = string('{{ {
     "RoleArn": role_arn
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Name>';
+AND Identifier = '{{ name }}';
 ```
 
 
@@ -307,7 +306,7 @@ AND Identifier = '<Name>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.iotwireless.destinations
-WHERE Identifier = '<Name>'
+WHERE Identifier = '{{ name }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/iotwireless/device_profiles/index.md b/website/docs/services/iotwireless/device_profiles/index.md
index b5bbc4b81..69128e471 100644
--- a/website/docs/services/iotwireless/device_profiles/index.md
+++ b/website/docs/services/iotwireless/device_profiles/index.md
@@ -267,7 +267,7 @@ tags,
 arn,
 id
 FROM awscc.iotwireless.device_profiles
-WHERE region = 'us-east-1' AND Identifier = '<Id>';
+WHERE region = 'us-east-1' AND Identifier = '{{ id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -303,7 +303,7 @@ INSERT INTO awscc.iotwireless.device_profiles (
  ,
  region
 )
-SELECT 
+SELECT
 '{{  }}',
 '{{ region }}';
 ```
@@ -318,10 +318,10 @@ INSERT INTO awscc.iotwireless.device_profiles (
  Tags,
  region
 )
-SELECT 
- '{{ Name }}',
- '{{ LoRaWAN }}',
- '{{ Tags }}',
+SELECT
+ '{{ name }}',
+ '{{ lo_ra_wan }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -339,35 +339,34 @@ globals:
 resources:
   - name: device_profile
     props:
-      - name: Name
-        value: '{{ Name }}'
-      - name: LoRaWAN
+      - name: name
+        value: '{{ name }}'
+      - name: lo_ra_wan
         value:
-          SupportsClassB: '{{ SupportsClassB }}'
-          ClassBTimeout: '{{ ClassBTimeout }}'
-          PingSlotPeriod: '{{ PingSlotPeriod }}'
-          PingSlotDr: '{{ PingSlotDr }}'
-          PingSlotFreq: '{{ PingSlotFreq }}'
-          SupportsClassC: '{{ SupportsClassC }}'
-          ClassCTimeout: '{{ ClassCTimeout }}'
-          MacVersion: '{{ MacVersion }}'
-          RegParamsRevision: '{{ RegParamsRevision }}'
-          RxDelay1: '{{ RxDelay1 }}'
-          RxDrOffset1: '{{ RxDrOffset1 }}'
-          RxFreq2: '{{ RxFreq2 }}'
-          RxDataRate2: '{{ RxDataRate2 }}'
-          FactoryPresetFreqsList:
-            - '{{ FactoryPresetFreqsList[0] }}'
-          MaxEirp: '{{ MaxEirp }}'
-          MaxDutyCycle: '{{ MaxDutyCycle }}'
-          SupportsJoin: '{{ SupportsJoin }}'
-          RfRegion: '{{ RfRegion }}'
-          Supports32BitFCnt: '{{ Supports32BitFCnt }}'
-      - name: Tags
+          supports_class_b: '{{ supports_class_b }}'
+          class_btimeout: '{{ class_btimeout }}'
+          ping_slot_period: '{{ ping_slot_period }}'
+          ping_slot_dr: '{{ ping_slot_dr }}'
+          ping_slot_freq: '{{ ping_slot_freq }}'
+          supports_class_c: '{{ supports_class_c }}'
+          class_ctimeout: '{{ class_ctimeout }}'
+          mac_version: '{{ mac_version }}'
+          reg_params_revision: '{{ reg_params_revision }}'
+          rx_delay1: '{{ rx_delay1 }}'
+          rx_dr_offset1: '{{ rx_dr_offset1 }}'
+          rx_freq2: '{{ rx_freq2 }}'
+          rx_data_rate2: '{{ rx_data_rate2 }}'
+          factory_preset_freqs_list:
+            - '{{ factory_preset_freqs_list[0] }}'
+          max_eirp: '{{ max_eirp }}'
+          max_duty_cycle: '{{ max_duty_cycle }}'
+          supports_join: '{{ supports_join }}'
+          rf_region: '{{ rf_region }}'
+          supports32_bit_fcnt: '{{ supports32_bit_fcnt }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -383,7 +382,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Id>';
+AND Identifier = '{{ id }}';
 ```
 
 
@@ -392,7 +391,7 @@ AND Identifier = '<Id>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.iotwireless.device_profiles
-WHERE Identifier = '<Id>'
+WHERE Identifier = '{{ id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/iotwireless/fuota_tasks/index.md b/website/docs/services/iotwireless/fuota_tasks/index.md
index 71b4fa1d5..99be500da 100644
--- a/website/docs/services/iotwireless/fuota_tasks/index.md
+++ b/website/docs/services/iotwireless/fuota_tasks/index.md
@@ -240,7 +240,7 @@ disassociate_wireless_device,
 associate_multicast_group,
 disassociate_multicast_group
 FROM awscc.iotwireless.fuota_tasks
-WHERE region = 'us-east-1' AND Identifier = '<Id>';
+WHERE region = 'us-east-1' AND Identifier = '{{ id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -278,10 +278,10 @@ INSERT INTO awscc.iotwireless.fuota_tasks (
  FirmwareUpdateRole,
  region
 )
-SELECT 
-'{{ LoRaWAN }}',
- '{{ FirmwareUpdateImage }}',
- '{{ FirmwareUpdateRole }}',
+SELECT
+'{{ lo_ra_wan }}',
+ '{{ firmware_update_image }}',
+ '{{ firmware_update_role }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -302,17 +302,17 @@ INSERT INTO awscc.iotwireless.fuota_tasks (
  DisassociateMulticastGroup,
  region
 )
-SELECT 
- '{{ Name }}',
- '{{ Description }}',
- '{{ LoRaWAN }}',
- '{{ FirmwareUpdateImage }}',
- '{{ FirmwareUpdateRole }}',
- '{{ Tags }}',
- '{{ AssociateWirelessDevice }}',
- '{{ DisassociateWirelessDevice }}',
- '{{ AssociateMulticastGroup }}',
- '{{ DisassociateMulticastGroup }}',
+SELECT
+ '{{ name }}',
+ '{{ description }}',
+ '{{ lo_ra_wan }}',
+ '{{ firmware_update_image }}',
+ '{{ firmware_update_role }}',
+ '{{ tags }}',
+ '{{ associate_wireless_device }}',
+ '{{ disassociate_wireless_device }}',
+ '{{ associate_multicast_group }}',
+ '{{ disassociate_multicast_group }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -330,33 +330,32 @@ globals:
 resources:
   - name: fuota_task
     props:
-      - name: Name
-        value: '{{ Name }}'
-      - name: Description
-        value: '{{ Description }}'
-      - name: LoRaWAN
+      - name: name
+        value: '{{ name }}'
+      - name: description
+        value: '{{ description }}'
+      - name: lo_ra_wan
         value:
-          RfRegion: '{{ RfRegion }}'
-          DlClass: '{{ DlClass }}'
-          NumberOfDevicesRequested: '{{ NumberOfDevicesRequested }}'
-          NumberOfDevicesInGroup: '{{ NumberOfDevicesInGroup }}'
-      - name: FirmwareUpdateImage
-        value: '{{ FirmwareUpdateImage }}'
-      - name: FirmwareUpdateRole
-        value: '{{ FirmwareUpdateRole }}'
-      - name: Tags
+          rf_region: '{{ rf_region }}'
+          dl_class: '{{ dl_class }}'
+          number_of_devices_requested: '{{ number_of_devices_requested }}'
+          number_of_devices_in_group: '{{ number_of_devices_in_group }}'
+      - name: firmware_update_image
+        value: '{{ firmware_update_image }}'
+      - name: firmware_update_role
+        value: '{{ firmware_update_role }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-      - name: AssociateWirelessDevice
-        value: '{{ AssociateWirelessDevice }}'
-      - name: DisassociateWirelessDevice
-        value: '{{ DisassociateWirelessDevice }}'
-      - name: AssociateMulticastGroup
-        value: '{{ AssociateMulticastGroup }}'
-      - name: DisassociateMulticastGroup
-        value: '{{ DisassociateMulticastGroup }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
+      - name: associate_wireless_device
+        value: '{{ associate_wireless_device }}'
+      - name: disassociate_wireless_device
+        value: '{{ disassociate_wireless_device }}'
+      - name: associate_multicast_group
+        value: '{{ associate_multicast_group }}'
+      - name: disassociate_multicast_group
+        value: '{{ disassociate_multicast_group }}'
 ```
 </TabItem>
 </Tabs>
@@ -380,7 +379,7 @@ SET PatchDocument = string('{{ {
     "DisassociateMulticastGroup": disassociate_multicast_group
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Id>';
+AND Identifier = '{{ id }}';
 ```
 
 
@@ -389,7 +388,7 @@ AND Identifier = '<Id>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.iotwireless.fuota_tasks
-WHERE Identifier = '<Id>'
+WHERE Identifier = '{{ id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/iotwireless/multicast_groups/index.md b/website/docs/services/iotwireless/multicast_groups/index.md
index 34893a8e4..2abb8da8f 100644
--- a/website/docs/services/iotwireless/multicast_groups/index.md
+++ b/website/docs/services/iotwireless/multicast_groups/index.md
@@ -216,7 +216,7 @@ status,
 associate_wireless_device,
 disassociate_wireless_device
 FROM awscc.iotwireless.multicast_groups
-WHERE region = 'us-east-1' AND Identifier = '<Id>';
+WHERE region = 'us-east-1' AND Identifier = '{{ id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -252,8 +252,8 @@ INSERT INTO awscc.iotwireless.multicast_groups (
  LoRaWAN,
  region
 )
-SELECT 
-'{{ LoRaWAN }}',
+SELECT
+'{{ lo_ra_wan }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -270,13 +270,13 @@ INSERT INTO awscc.iotwireless.multicast_groups (
  DisassociateWirelessDevice,
  region
 )
-SELECT 
- '{{ Name }}',
- '{{ Description }}',
- '{{ LoRaWAN }}',
- '{{ Tags }}',
- '{{ AssociateWirelessDevice }}',
- '{{ DisassociateWirelessDevice }}',
+SELECT
+ '{{ name }}',
+ '{{ description }}',
+ '{{ lo_ra_wan }}',
+ '{{ tags }}',
+ '{{ associate_wireless_device }}',
+ '{{ disassociate_wireless_device }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -294,25 +294,24 @@ globals:
 resources:
   - name: multicast_group
     props:
-      - name: Name
-        value: '{{ Name }}'
-      - name: Description
-        value: '{{ Description }}'
-      - name: LoRaWAN
+      - name: name
+        value: '{{ name }}'
+      - name: description
+        value: '{{ description }}'
+      - name: lo_ra_wan
         value:
-          RfRegion: '{{ RfRegion }}'
-          DlClass: '{{ DlClass }}'
-          NumberOfDevicesRequested: '{{ NumberOfDevicesRequested }}'
-          NumberOfDevicesInGroup: '{{ NumberOfDevicesInGroup }}'
-      - name: Tags
+          rf_region: '{{ rf_region }}'
+          dl_class: '{{ dl_class }}'
+          number_of_devices_requested: '{{ number_of_devices_requested }}'
+          number_of_devices_in_group: '{{ number_of_devices_in_group }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-      - name: AssociateWirelessDevice
-        value: '{{ AssociateWirelessDevice }}'
-      - name: DisassociateWirelessDevice
-        value: '{{ DisassociateWirelessDevice }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
+      - name: associate_wireless_device
+        value: '{{ associate_wireless_device }}'
+      - name: disassociate_wireless_device
+        value: '{{ disassociate_wireless_device }}'
 ```
 </TabItem>
 </Tabs>
@@ -332,7 +331,7 @@ SET PatchDocument = string('{{ {
     "DisassociateWirelessDevice": disassociate_wireless_device
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Id>';
+AND Identifier = '{{ id }}';
 ```
 
 
@@ -341,7 +340,7 @@ AND Identifier = '<Id>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.iotwireless.multicast_groups
-WHERE Identifier = '<Id>'
+WHERE Identifier = '{{ id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/iotwireless/network_analyzer_configurations/index.md b/website/docs/services/iotwireless/network_analyzer_configurations/index.md
index 85aba8cab..fe25ce180 100644
--- a/website/docs/services/iotwireless/network_analyzer_configurations/index.md
+++ b/website/docs/services/iotwireless/network_analyzer_configurations/index.md
@@ -194,7 +194,7 @@ wireless_gateways,
 arn,
 tags
 FROM awscc.iotwireless.network_analyzer_configurations
-WHERE region = 'us-east-1' AND Identifier = '<Name>';
+WHERE region = 'us-east-1' AND Identifier = '{{ name }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -230,8 +230,8 @@ INSERT INTO awscc.iotwireless.network_analyzer_configurations (
  Name,
  region
 )
-SELECT 
-'{{ Name }}',
+SELECT
+'{{ name }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -248,13 +248,13 @@ INSERT INTO awscc.iotwireless.network_analyzer_configurations (
  Tags,
  region
 )
-SELECT 
- '{{ Name }}',
- '{{ Description }}',
- '{{ TraceContent }}',
- '{{ WirelessDevices }}',
- '{{ WirelessGateways }}',
- '{{ Tags }}',
+SELECT
+ '{{ name }}',
+ '{{ description }}',
+ '{{ trace_content }}',
+ '{{ wireless_devices }}',
+ '{{ wireless_gateways }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -272,25 +272,24 @@ globals:
 resources:
   - name: network_analyzer_configuration
     props:
-      - name: Name
-        value: '{{ Name }}'
-      - name: Description
-        value: '{{ Description }}'
-      - name: TraceContent
+      - name: name
+        value: '{{ name }}'
+      - name: description
+        value: '{{ description }}'
+      - name: trace_content
         value:
-          WirelessDeviceFrameInfo: '{{ WirelessDeviceFrameInfo }}'
-          LogLevel: '{{ LogLevel }}'
-      - name: WirelessDevices
+          wireless_device_frame_info: '{{ wireless_device_frame_info }}'
+          log_level: '{{ log_level }}'
+      - name: wireless_devices
         value:
-          - '{{ WirelessDevices[0] }}'
-      - name: WirelessGateways
+          - '{{ wireless_devices[0] }}'
+      - name: wireless_gateways
         value:
-          - '{{ WirelessGateways[0] }}'
-      - name: Tags
+          - '{{ wireless_gateways[0] }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -310,7 +309,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Name>';
+AND Identifier = '{{ name }}';
 ```
 
 
@@ -319,7 +318,7 @@ AND Identifier = '<Name>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.iotwireless.network_analyzer_configurations
-WHERE Identifier = '<Name>'
+WHERE Identifier = '{{ name }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/iotwireless/partner_accounts/index.md b/website/docs/services/iotwireless/partner_accounts/index.md
index 2a035a80e..2f6fb13b1 100644
--- a/website/docs/services/iotwireless/partner_accounts/index.md
+++ b/website/docs/services/iotwireless/partner_accounts/index.md
@@ -225,7 +225,7 @@ fingerprint,
 arn,
 tags
 FROM awscc.iotwireless.partner_accounts
-WHERE region = 'us-east-1' AND Identifier = '<PartnerAccountId>';
+WHERE region = 'us-east-1' AND Identifier = '{{ partner_account_id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -267,14 +267,14 @@ INSERT INTO awscc.iotwireless.partner_accounts (
  Tags,
  region
 )
-SELECT 
-'{{ Sidewalk }}',
- '{{ PartnerAccountId }}',
- '{{ PartnerType }}',
- '{{ SidewalkResponse }}',
- '{{ AccountLinked }}',
- '{{ SidewalkUpdate }}',
- '{{ Tags }}',
+SELECT
+'{{ sidewalk }}',
+ '{{ partner_account_id }}',
+ '{{ partner_type }}',
+ '{{ sidewalk_response }}',
+ '{{ account_linked }}',
+ '{{ sidewalk_update }}',
+ '{{ tags }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -292,14 +292,14 @@ INSERT INTO awscc.iotwireless.partner_accounts (
  Tags,
  region
 )
-SELECT 
- '{{ Sidewalk }}',
- '{{ PartnerAccountId }}',
- '{{ PartnerType }}',
- '{{ SidewalkResponse }}',
- '{{ AccountLinked }}',
- '{{ SidewalkUpdate }}',
- '{{ Tags }}',
+SELECT
+ '{{ sidewalk }}',
+ '{{ partner_account_id }}',
+ '{{ partner_type }}',
+ '{{ sidewalk_response }}',
+ '{{ account_linked }}',
+ '{{ sidewalk_update }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -317,28 +317,27 @@ globals:
 resources:
   - name: partner_account
     props:
-      - name: Sidewalk
+      - name: sidewalk
         value:
-          AppServerPrivateKey: '{{ AppServerPrivateKey }}'
-      - name: PartnerAccountId
-        value: '{{ PartnerAccountId }}'
-      - name: PartnerType
-        value: '{{ PartnerType }}'
-      - name: SidewalkResponse
+          app_server_private_key: '{{ app_server_private_key }}'
+      - name: partner_account_id
+        value: '{{ partner_account_id }}'
+      - name: partner_type
+        value: '{{ partner_type }}'
+      - name: sidewalk_response
         value:
-          AmazonId: '{{ AmazonId }}'
-          Fingerprint: '{{ Fingerprint }}'
-          Arn: '{{ Arn }}'
-      - name: AccountLinked
-        value: '{{ AccountLinked }}'
-      - name: SidewalkUpdate
+          amazon_id: '{{ amazon_id }}'
+          fingerprint: '{{ fingerprint }}'
+          arn: '{{ arn }}'
+      - name: account_linked
+        value: '{{ account_linked }}'
+      - name: sidewalk_update
         value:
-          AppServerPrivateKey: '{{ AppServerPrivateKey }}'
-      - name: Tags
+          app_server_private_key: '{{ app_server_private_key }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -359,7 +358,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<PartnerAccountId>';
+AND Identifier = '{{ partner_account_id }}';
 ```
 
 
@@ -368,7 +367,7 @@ AND Identifier = '<PartnerAccountId>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.iotwireless.partner_accounts
-WHERE Identifier = '<PartnerAccountId>'
+WHERE Identifier = '{{ partner_account_id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/iotwireless/service_profiles/index.md b/website/docs/services/iotwireless/service_profiles/index.md
index 73153cdcc..f1488ef11 100644
--- a/website/docs/services/iotwireless/service_profiles/index.md
+++ b/website/docs/services/iotwireless/service_profiles/index.md
@@ -267,7 +267,7 @@ tags,
 arn,
 id
 FROM awscc.iotwireless.service_profiles
-WHERE region = 'us-east-1' AND Identifier = '<Id>';
+WHERE region = 'us-east-1' AND Identifier = '{{ id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -303,7 +303,7 @@ INSERT INTO awscc.iotwireless.service_profiles (
  ,
  region
 )
-SELECT 
+SELECT
 '{{  }}',
 '{{ region }}';
 ```
@@ -318,10 +318,10 @@ INSERT INTO awscc.iotwireless.service_profiles (
  Tags,
  region
 )
-SELECT 
- '{{ Name }}',
- '{{ LoRaWAN }}',
- '{{ Tags }}',
+SELECT
+ '{{ name }}',
+ '{{ lo_ra_wan }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -339,34 +339,33 @@ globals:
 resources:
   - name: service_profile
     props:
-      - name: Name
-        value: '{{ Name }}'
-      - name: LoRaWAN
+      - name: name
+        value: '{{ name }}'
+      - name: lo_ra_wan
         value:
-          UlRate: '{{ UlRate }}'
-          UlBucketSize: '{{ UlBucketSize }}'
-          UlRatePolicy: '{{ UlRatePolicy }}'
-          DlRate: '{{ DlRate }}'
-          DlBucketSize: '{{ DlBucketSize }}'
-          DlRatePolicy: '{{ DlRatePolicy }}'
-          AddGwMetadata: '{{ AddGwMetadata }}'
-          DevStatusReqFreq: '{{ DevStatusReqFreq }}'
-          ReportDevStatusBattery: '{{ ReportDevStatusBattery }}'
-          ReportDevStatusMargin: '{{ ReportDevStatusMargin }}'
-          DrMin: '{{ DrMin }}'
-          DrMax: '{{ DrMax }}'
-          ChannelMask: '{{ ChannelMask }}'
-          PrAllowed: '{{ PrAllowed }}'
-          HrAllowed: '{{ HrAllowed }}'
-          RaAllowed: '{{ RaAllowed }}'
-          NwkGeoLoc: '{{ NwkGeoLoc }}'
-          TargetPer: '{{ TargetPer }}'
-          MinGwDiversity: '{{ MinGwDiversity }}'
-      - name: Tags
+          ul_rate: '{{ ul_rate }}'
+          ul_bucket_size: '{{ ul_bucket_size }}'
+          ul_rate_policy: '{{ ul_rate_policy }}'
+          dl_rate: '{{ dl_rate }}'
+          dl_bucket_size: '{{ dl_bucket_size }}'
+          dl_rate_policy: '{{ dl_rate_policy }}'
+          add_gw_metadata: '{{ add_gw_metadata }}'
+          dev_status_req_freq: '{{ dev_status_req_freq }}'
+          report_dev_status_battery: '{{ report_dev_status_battery }}'
+          report_dev_status_margin: '{{ report_dev_status_margin }}'
+          dr_min: '{{ dr_min }}'
+          dr_max: '{{ dr_max }}'
+          channel_mask: '{{ channel_mask }}'
+          pr_allowed: '{{ pr_allowed }}'
+          hr_allowed: '{{ hr_allowed }}'
+          ra_allowed: '{{ ra_allowed }}'
+          nwk_geo_loc: '{{ nwk_geo_loc }}'
+          target_per: '{{ target_per }}'
+          min_gw_diversity: '{{ min_gw_diversity }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -382,7 +381,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Id>';
+AND Identifier = '{{ id }}';
 ```
 
 
@@ -391,7 +390,7 @@ AND Identifier = '<Id>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.iotwireless.service_profiles
-WHERE Identifier = '<Id>'
+WHERE Identifier = '{{ id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/iotwireless/task_definitions/index.md b/website/docs/services/iotwireless/task_definitions/index.md
index e72f42ff1..974b34e53 100644
--- a/website/docs/services/iotwireless/task_definitions/index.md
+++ b/website/docs/services/iotwireless/task_definitions/index.md
@@ -263,7 +263,7 @@ task_definition_type,
 arn,
 tags
 FROM awscc.iotwireless.task_definitions
-WHERE region = 'us-east-1' AND Identifier = '<Id>';
+WHERE region = 'us-east-1' AND Identifier = '{{ id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -299,8 +299,8 @@ INSERT INTO awscc.iotwireless.task_definitions (
  AutoCreateTasks,
  region
 )
-SELECT 
-'{{ AutoCreateTasks }}',
+SELECT
+'{{ auto_create_tasks }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -317,13 +317,13 @@ INSERT INTO awscc.iotwireless.task_definitions (
  Tags,
  region
 )
-SELECT 
- '{{ Name }}',
- '{{ AutoCreateTasks }}',
- '{{ Update }}',
- '{{ LoRaWANUpdateGatewayTaskEntry }}',
- '{{ TaskDefinitionType }}',
- '{{ Tags }}',
+SELECT
+ '{{ name }}',
+ '{{ auto_create_tasks }}',
+ '{{ update }}',
+ '{{ lo_ra_wan_update_gateway_task_entry }}',
+ '{{ task_definition_type }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -341,33 +341,32 @@ globals:
 resources:
   - name: task_definition
     props:
-      - name: Name
-        value: '{{ Name }}'
-      - name: AutoCreateTasks
-        value: '{{ AutoCreateTasks }}'
-      - name: Update
+      - name: name
+        value: '{{ name }}'
+      - name: auto_create_tasks
+        value: '{{ auto_create_tasks }}'
+      - name: update
         value:
-          UpdateDataSource: '{{ UpdateDataSource }}'
-          UpdateDataRole: '{{ UpdateDataRole }}'
-          LoRaWAN:
-            UpdateSignature: '{{ UpdateSignature }}'
-            SigKeyCrc: '{{ SigKeyCrc }}'
-            CurrentVersion:
-              PackageVersion: '{{ PackageVersion }}'
-              Model: '{{ Model }}'
-              Station: '{{ Station }}'
-            UpdateVersion: null
-      - name: LoRaWANUpdateGatewayTaskEntry
+          update_data_source: '{{ update_data_source }}'
+          update_data_role: '{{ update_data_role }}'
+          lo_ra_wan:
+            update_signature: '{{ update_signature }}'
+            sig_key_crc: '{{ sig_key_crc }}'
+            current_version:
+              package_version: '{{ package_version }}'
+              model: '{{ model }}'
+              station: '{{ station }}'
+            update_version: null
+      - name: lo_ra_wan_update_gateway_task_entry
         value:
-          CurrentVersion: null
-          UpdateVersion: null
-      - name: TaskDefinitionType
-        value: '{{ TaskDefinitionType }}'
-      - name: Tags
+          current_version: null
+          update_version: null
+      - name: task_definition_type
+        value: '{{ task_definition_type }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -388,7 +387,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Id>';
+AND Identifier = '{{ id }}';
 ```
 
 
@@ -397,7 +396,7 @@ AND Identifier = '<Id>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.iotwireless.task_definitions
-WHERE Identifier = '<Id>'
+WHERE Identifier = '{{ id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/iotwireless/wireless_device_import_tasks/index.md b/website/docs/services/iotwireless/wireless_device_import_tasks/index.md
index 5b5771e06..ca767451f 100644
--- a/website/docs/services/iotwireless/wireless_device_import_tasks/index.md
+++ b/website/docs/services/iotwireless/wireless_device_import_tasks/index.md
@@ -234,7 +234,7 @@ onboarded_imported_devices_count,
 failed_imported_devices_count,
 tags
 FROM awscc.iotwireless.wireless_device_import_tasks
-WHERE region = 'us-east-1' AND Identifier = '<Id>';
+WHERE region = 'us-east-1' AND Identifier = '{{ id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -271,9 +271,9 @@ INSERT INTO awscc.iotwireless.wireless_device_import_tasks (
  Sidewalk,
  region
 )
-SELECT 
-'{{ DestinationName }}',
- '{{ Sidewalk }}',
+SELECT
+'{{ destination_name }}',
+ '{{ sidewalk }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -287,10 +287,10 @@ INSERT INTO awscc.iotwireless.wireless_device_import_tasks (
  Tags,
  region
 )
-SELECT 
- '{{ DestinationName }}',
- '{{ Sidewalk }}',
- '{{ Tags }}',
+SELECT
+ '{{ destination_name }}',
+ '{{ sidewalk }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -308,20 +308,19 @@ globals:
 resources:
   - name: wireless_device_import_task
     props:
-      - name: DestinationName
-        value: '{{ DestinationName }}'
-      - name: Sidewalk
+      - name: destination_name
+        value: '{{ destination_name }}'
+      - name: sidewalk
         value:
-          SidewalkManufacturingSn: '{{ SidewalkManufacturingSn }}'
-          DeviceCreationFile: '{{ DeviceCreationFile }}'
-          DeviceCreationFileList:
-            - '{{ DeviceCreationFileList[0] }}'
-          Role: '{{ Role }}'
-      - name: Tags
+          sidewalk_manufacturing_sn: '{{ sidewalk_manufacturing_sn }}'
+          device_creation_file: '{{ device_creation_file }}'
+          device_creation_file_list:
+            - '{{ device_creation_file_list[0] }}'
+          role: '{{ role }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -338,7 +337,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Id>';
+AND Identifier = '{{ id }}';
 ```
 
 
@@ -347,7 +346,7 @@ AND Identifier = '<Id>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.iotwireless.wireless_device_import_tasks
-WHERE Identifier = '<Id>'
+WHERE Identifier = '{{ id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/iotwireless/wireless_devices/index.md b/website/docs/services/iotwireless/wireless_devices/index.md
index ed516410b..3d7409b95 100644
--- a/website/docs/services/iotwireless/wireless_devices/index.md
+++ b/website/docs/services/iotwireless/wireless_devices/index.md
@@ -365,7 +365,7 @@ thing_name,
 last_uplink_received_at,
 positioning
 FROM awscc.iotwireless.wireless_devices
-WHERE region = 'us-east-1' AND Identifier = '<Id>';
+WHERE region = 'us-east-1' AND Identifier = '{{ id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -402,9 +402,9 @@ INSERT INTO awscc.iotwireless.wireless_devices (
  DestinationName,
  region
 )
-SELECT 
-'{{ Type }}',
- '{{ DestinationName }}',
+SELECT
+'{{ type }}',
+ '{{ destination_name }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -424,16 +424,16 @@ INSERT INTO awscc.iotwireless.wireless_devices (
  Positioning,
  region
 )
-SELECT 
- '{{ Type }}',
- '{{ Name }}',
- '{{ Description }}',
- '{{ DestinationName }}',
- '{{ LoRaWAN }}',
- '{{ Tags }}',
- '{{ ThingArn }}',
- '{{ LastUplinkReceivedAt }}',
- '{{ Positioning }}',
+SELECT
+ '{{ type }}',
+ '{{ name }}',
+ '{{ description }}',
+ '{{ destination_name }}',
+ '{{ lo_ra_wan }}',
+ '{{ tags }}',
+ '{{ thing_arn }}',
+ '{{ last_uplink_received_at }}',
+ '{{ positioning }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -451,54 +451,53 @@ globals:
 resources:
   - name: wireless_device
     props:
-      - name: Type
-        value: '{{ Type }}'
-      - name: Name
-        value: '{{ Name }}'
-      - name: Description
-        value: '{{ Description }}'
-      - name: DestinationName
-        value: '{{ DestinationName }}'
-      - name: LoRaWAN
+      - name: type
+        value: '{{ type }}'
+      - name: name
+        value: '{{ name }}'
+      - name: description
+        value: '{{ description }}'
+      - name: destination_name
+        value: '{{ destination_name }}'
+      - name: lo_ra_wan
         value:
-          DevEui: '{{ DevEui }}'
-          DeviceProfileId: '{{ DeviceProfileId }}'
-          ServiceProfileId: '{{ ServiceProfileId }}'
-          OtaaV11:
-            AppKey: '{{ AppKey }}'
-            NwkKey: '{{ NwkKey }}'
-            JoinEui: '{{ JoinEui }}'
-          OtaaV10x:
-            AppKey: '{{ AppKey }}'
-            AppEui: '{{ AppEui }}'
-          AbpV11:
-            DevAddr: '{{ DevAddr }}'
-            SessionKeys:
-              FNwkSIntKey: '{{ FNwkSIntKey }}'
-              SNwkSIntKey: '{{ SNwkSIntKey }}'
-              NwkSEncKey: '{{ NwkSEncKey }}'
-              AppSKey: '{{ AppSKey }}'
-          AbpV10x:
-            DevAddr: '{{ DevAddr }}'
-            SessionKeys:
-              NwkSKey: '{{ NwkSKey }}'
-              AppSKey: '{{ AppSKey }}'
-          FPorts:
-            Applications:
-              - DestinationName: '{{ DestinationName }}'
-                FPort: '{{ FPort }}'
-                Type: '{{ Type }}'
-      - name: Tags
+          dev_eui: '{{ dev_eui }}'
+          device_profile_id: '{{ device_profile_id }}'
+          service_profile_id: '{{ service_profile_id }}'
+          otaa_v11:
+            app_key: '{{ app_key }}'
+            nwk_key: '{{ nwk_key }}'
+            join_eui: '{{ join_eui }}'
+          otaa_v10x:
+            app_key: '{{ app_key }}'
+            app_eui: '{{ app_eui }}'
+          abp_v11:
+            dev_addr: '{{ dev_addr }}'
+            session_keys:
+              f_nwk_sint_key: '{{ f_nwk_sint_key }}'
+              s_nwk_sint_key: '{{ s_nwk_sint_key }}'
+              nwk_senc_key: '{{ nwk_senc_key }}'
+              app_skey: '{{ app_skey }}'
+          abp_v10x:
+            dev_addr: '{{ dev_addr }}'
+            session_keys:
+              nwk_skey: '{{ nwk_skey }}'
+              app_skey: '{{ app_skey }}'
+          f_ports:
+            applications:
+              - destination_name: '{{ destination_name }}'
+                f_port: '{{ f_port }}'
+                type: '{{ type }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-      - name: ThingArn
-        value: '{{ ThingArn }}'
-      - name: LastUplinkReceivedAt
-        value: '{{ LastUplinkReceivedAt }}'
-      - name: Positioning
-        value: '{{ Positioning }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
+      - name: thing_arn
+        value: '{{ thing_arn }}'
+      - name: last_uplink_received_at
+        value: '{{ last_uplink_received_at }}'
+      - name: positioning
+        value: '{{ positioning }}'
 ```
 </TabItem>
 </Tabs>
@@ -522,7 +521,7 @@ SET PatchDocument = string('{{ {
     "Positioning": positioning
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Id>';
+AND Identifier = '{{ id }}';
 ```
 
 
@@ -531,7 +530,7 @@ AND Identifier = '<Id>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.iotwireless.wireless_devices
-WHERE Identifier = '<Id>'
+WHERE Identifier = '{{ id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/iotwireless/wireless_gateways/index.md b/website/docs/services/iotwireless/wireless_gateways/index.md
index 207631a13..d4323889d 100644
--- a/website/docs/services/iotwireless/wireless_gateways/index.md
+++ b/website/docs/services/iotwireless/wireless_gateways/index.md
@@ -206,7 +206,7 @@ thing_arn,
 thing_name,
 last_uplink_received_at
 FROM awscc.iotwireless.wireless_gateways
-WHERE region = 'us-east-1' AND Identifier = '<Id>';
+WHERE region = 'us-east-1' AND Identifier = '{{ id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -242,8 +242,8 @@ INSERT INTO awscc.iotwireless.wireless_gateways (
  LoRaWAN,
  region
 )
-SELECT 
-'{{ LoRaWAN }}',
+SELECT
+'{{ lo_ra_wan }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -261,14 +261,14 @@ INSERT INTO awscc.iotwireless.wireless_gateways (
  LastUplinkReceivedAt,
  region
 )
-SELECT 
- '{{ Name }}',
- '{{ Description }}',
- '{{ Tags }}',
- '{{ LoRaWAN }}',
- '{{ ThingArn }}',
- '{{ ThingName }}',
- '{{ LastUplinkReceivedAt }}',
+SELECT
+ '{{ name }}',
+ '{{ description }}',
+ '{{ tags }}',
+ '{{ lo_ra_wan }}',
+ '{{ thing_arn }}',
+ '{{ thing_name }}',
+ '{{ last_uplink_received_at }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -286,25 +286,24 @@ globals:
 resources:
   - name: wireless_gateway
     props:
-      - name: Name
-        value: '{{ Name }}'
-      - name: Description
-        value: '{{ Description }}'
-      - name: Tags
+      - name: name
+        value: '{{ name }}'
+      - name: description
+        value: '{{ description }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-      - name: LoRaWAN
+          - key: '{{ key }}'
+            value: '{{ value }}'
+      - name: lo_ra_wan
         value:
-          GatewayEui: '{{ GatewayEui }}'
-          RfRegion: '{{ RfRegion }}'
-      - name: ThingArn
-        value: '{{ ThingArn }}'
-      - name: ThingName
-        value: '{{ ThingName }}'
-      - name: LastUplinkReceivedAt
-        value: '{{ LastUplinkReceivedAt }}'
-
+          gateway_eui: '{{ gateway_eui }}'
+          rf_region: '{{ rf_region }}'
+      - name: thing_arn
+        value: '{{ thing_arn }}'
+      - name: thing_name
+        value: '{{ thing_name }}'
+      - name: last_uplink_received_at
+        value: '{{ last_uplink_received_at }}'
 ```
 </TabItem>
 </Tabs>
@@ -326,7 +325,7 @@ SET PatchDocument = string('{{ {
     "LastUplinkReceivedAt": last_uplink_received_at
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Id>';
+AND Identifier = '{{ id }}';
 ```
 
 
@@ -335,7 +334,7 @@ AND Identifier = '<Id>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.iotwireless.wireless_gateways
-WHERE Identifier = '<Id>'
+WHERE Identifier = '{{ id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/ivs/channels/index.md b/website/docs/services/ivs/channels/index.md
index c3402c655..dab6d9b9b 100644
--- a/website/docs/services/ivs/channels/index.md
+++ b/website/docs/services/ivs/channels/index.md
@@ -235,7 +235,7 @@ preset,
 multitrack_input_configuration,
 container_format
 FROM awscc.ivs.channels
-WHERE region = 'us-east-1' AND Identifier = '<Arn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -271,7 +271,7 @@ INSERT INTO awscc.ivs.channels (
  ,
  region
 )
-SELECT 
+SELECT
 '{{  }}',
 '{{ region }}';
 ```
@@ -293,17 +293,17 @@ INSERT INTO awscc.ivs.channels (
  ContainerFormat,
  region
 )
-SELECT 
- '{{ Name }}',
- '{{ Authorized }}',
- '{{ InsecureIngest }}',
- '{{ LatencyMode }}',
- '{{ Type }}',
- '{{ Tags }}',
- '{{ RecordingConfigurationArn }}',
- '{{ Preset }}',
- '{{ MultitrackInputConfiguration }}',
- '{{ ContainerFormat }}',
+SELECT
+ '{{ name }}',
+ '{{ authorized }}',
+ '{{ insecure_ingest }}',
+ '{{ latency_mode }}',
+ '{{ type }}',
+ '{{ tags }}',
+ '{{ recording_configuration_arn }}',
+ '{{ preset }}',
+ '{{ multitrack_input_configuration }}',
+ '{{ container_format }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -321,32 +321,31 @@ globals:
 resources:
   - name: channel
     props:
-      - name: Name
-        value: '{{ Name }}'
-      - name: Authorized
-        value: '{{ Authorized }}'
-      - name: InsecureIngest
-        value: '{{ InsecureIngest }}'
-      - name: LatencyMode
-        value: '{{ LatencyMode }}'
-      - name: Type
-        value: '{{ Type }}'
-      - name: Tags
+      - name: name
+        value: '{{ name }}'
+      - name: authorized
+        value: '{{ authorized }}'
+      - name: insecure_ingest
+        value: '{{ insecure_ingest }}'
+      - name: latency_mode
+        value: '{{ latency_mode }}'
+      - name: type
+        value: '{{ type }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-      - name: RecordingConfigurationArn
-        value: '{{ RecordingConfigurationArn }}'
-      - name: Preset
-        value: '{{ Preset }}'
-      - name: MultitrackInputConfiguration
+          - key: '{{ key }}'
+            value: '{{ value }}'
+      - name: recording_configuration_arn
+        value: '{{ recording_configuration_arn }}'
+      - name: preset
+        value: '{{ preset }}'
+      - name: multitrack_input_configuration
         value:
-          Enabled: '{{ Enabled }}'
-          MaximumResolution: '{{ MaximumResolution }}'
-          Policy: '{{ Policy }}'
-      - name: ContainerFormat
-        value: '{{ ContainerFormat }}'
-
+          enabled: '{{ enabled }}'
+          maximum_resolution: '{{ maximum_resolution }}'
+          policy: '{{ policy }}'
+      - name: container_format
+        value: '{{ container_format }}'
 ```
 </TabItem>
 </Tabs>
@@ -371,7 +370,7 @@ SET PatchDocument = string('{{ {
     "ContainerFormat": container_format
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Arn>';
+AND Identifier = '{{ arn }}';
 ```
 
 
@@ -380,7 +379,7 @@ AND Identifier = '<Arn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.ivs.channels
-WHERE Identifier = '<Arn>'
+WHERE Identifier = '{{ arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/ivs/encoder_configurations/index.md b/website/docs/services/ivs/encoder_configurations/index.md
index 44d0963f3..8c9f511b9 100644
--- a/website/docs/services/ivs/encoder_configurations/index.md
+++ b/website/docs/services/ivs/encoder_configurations/index.md
@@ -186,7 +186,7 @@ video,
 name,
 tags
 FROM awscc.ivs.encoder_configurations
-WHERE region = 'us-east-1' AND Identifier = '<Arn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -222,7 +222,7 @@ INSERT INTO awscc.ivs.encoder_configurations (
  ,
  region
 )
-SELECT 
+SELECT
 '{{  }}',
 '{{ region }}';
 ```
@@ -237,10 +237,10 @@ INSERT INTO awscc.ivs.encoder_configurations (
  Tags,
  region
 )
-SELECT 
- '{{ Video }}',
- '{{ Name }}',
- '{{ Tags }}',
+SELECT
+ '{{ video }}',
+ '{{ name }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -258,19 +258,18 @@ globals:
 resources:
   - name: encoder_configuration
     props:
-      - name: Video
+      - name: video
         value:
-          Bitrate: '{{ Bitrate }}'
-          Framerate: null
-          Height: '{{ Height }}'
-          Width: '{{ Width }}'
-      - name: Name
-        value: '{{ Name }}'
-      - name: Tags
+          bitrate: '{{ bitrate }}'
+          framerate: null
+          height: '{{ height }}'
+          width: '{{ width }}'
+      - name: name
+        value: '{{ name }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -286,7 +285,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Arn>';
+AND Identifier = '{{ arn }}';
 ```
 
 
@@ -295,7 +294,7 @@ AND Identifier = '<Arn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.ivs.encoder_configurations
-WHERE Identifier = '<Arn>'
+WHERE Identifier = '{{ arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/ivs/ingest_configurations/index.md b/website/docs/services/ivs/ingest_configurations/index.md
index e28a45f65..dbc306e15 100644
--- a/website/docs/services/ivs/ingest_configurations/index.md
+++ b/website/docs/services/ivs/ingest_configurations/index.md
@@ -200,7 +200,7 @@ stream_key,
 user_id,
 tags
 FROM awscc.ivs.ingest_configurations
-WHERE region = 'us-east-1' AND Identifier = '<Arn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -236,7 +236,7 @@ INSERT INTO awscc.ivs.ingest_configurations (
  ,
  region
 )
-SELECT 
+SELECT
 '{{  }}',
 '{{ region }}';
 ```
@@ -254,13 +254,13 @@ INSERT INTO awscc.ivs.ingest_configurations (
  Tags,
  region
 )
-SELECT 
- '{{ Name }}',
- '{{ StageArn }}',
- '{{ IngestProtocol }}',
- '{{ InsecureIngest }}',
- '{{ UserId }}',
- '{{ Tags }}',
+SELECT
+ '{{ name }}',
+ '{{ stage_arn }}',
+ '{{ ingest_protocol }}',
+ '{{ insecure_ingest }}',
+ '{{ user_id }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -278,21 +278,20 @@ globals:
 resources:
   - name: ingest_configuration
     props:
-      - name: Name
-        value: '{{ Name }}'
-      - name: StageArn
-        value: '{{ StageArn }}'
-      - name: IngestProtocol
-        value: '{{ IngestProtocol }}'
-      - name: InsecureIngest
-        value: '{{ InsecureIngest }}'
-      - name: UserId
-        value: '{{ UserId }}'
-      - name: Tags
+      - name: name
+        value: '{{ name }}'
+      - name: stage_arn
+        value: '{{ stage_arn }}'
+      - name: ingest_protocol
+        value: '{{ ingest_protocol }}'
+      - name: insecure_ingest
+        value: '{{ insecure_ingest }}'
+      - name: user_id
+        value: '{{ user_id }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -309,7 +308,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Arn>';
+AND Identifier = '{{ arn }}';
 ```
 
 
@@ -318,7 +317,7 @@ AND Identifier = '<Arn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.ivs.ingest_configurations
-WHERE Identifier = '<Arn>'
+WHERE Identifier = '{{ arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/ivs/playback_key_pairs/index.md b/website/docs/services/ivs/playback_key_pairs/index.md
index be14056e3..4ac26541b 100644
--- a/website/docs/services/ivs/playback_key_pairs/index.md
+++ b/website/docs/services/ivs/playback_key_pairs/index.md
@@ -170,7 +170,7 @@ fingerprint,
 arn,
 tags
 FROM awscc.ivs.playback_key_pairs
-WHERE region = 'us-east-1' AND Identifier = '<Arn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -208,10 +208,10 @@ INSERT INTO awscc.ivs.playback_key_pairs (
  Tags,
  region
 )
-SELECT 
-'{{ Name }}',
- '{{ PublicKeyMaterial }}',
- '{{ Tags }}',
+SELECT
+'{{ name }}',
+ '{{ public_key_material }}',
+ '{{ tags }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -225,10 +225,10 @@ INSERT INTO awscc.ivs.playback_key_pairs (
  Tags,
  region
 )
-SELECT 
- '{{ Name }}',
- '{{ PublicKeyMaterial }}',
- '{{ Tags }}',
+SELECT
+ '{{ name }}',
+ '{{ public_key_material }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -246,15 +246,14 @@ globals:
 resources:
   - name: playback_key_pair
     props:
-      - name: Name
-        value: '{{ Name }}'
-      - name: PublicKeyMaterial
-        value: '{{ PublicKeyMaterial }}'
-      - name: Tags
+      - name: name
+        value: '{{ name }}'
+      - name: public_key_material
+        value: '{{ public_key_material }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -270,7 +269,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Arn>';
+AND Identifier = '{{ arn }}';
 ```
 
 
@@ -279,7 +278,7 @@ AND Identifier = '<Arn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.ivs.playback_key_pairs
-WHERE Identifier = '<Arn>'
+WHERE Identifier = '{{ arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/ivs/playback_restriction_policies/index.md b/website/docs/services/ivs/playback_restriction_policies/index.md
index fba90dd1e..251059625 100644
--- a/website/docs/services/ivs/playback_restriction_policies/index.md
+++ b/website/docs/services/ivs/playback_restriction_policies/index.md
@@ -176,7 +176,7 @@ enable_strict_origin_enforcement,
 name,
 tags
 FROM awscc.ivs.playback_restriction_policies
-WHERE region = 'us-east-1' AND Identifier = '<Arn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -216,12 +216,12 @@ INSERT INTO awscc.ivs.playback_restriction_policies (
  Tags,
  region
 )
-SELECT 
-'{{ AllowedCountries }}',
- '{{ AllowedOrigins }}',
- '{{ EnableStrictOriginEnforcement }}',
- '{{ Name }}',
- '{{ Tags }}',
+SELECT
+'{{ allowed_countries }}',
+ '{{ allowed_origins }}',
+ '{{ enable_strict_origin_enforcement }}',
+ '{{ name }}',
+ '{{ tags }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -237,12 +237,12 @@ INSERT INTO awscc.ivs.playback_restriction_policies (
  Tags,
  region
 )
-SELECT 
- '{{ AllowedCountries }}',
- '{{ AllowedOrigins }}',
- '{{ EnableStrictOriginEnforcement }}',
- '{{ Name }}',
- '{{ Tags }}',
+SELECT
+ '{{ allowed_countries }}',
+ '{{ allowed_origins }}',
+ '{{ enable_strict_origin_enforcement }}',
+ '{{ name }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -260,21 +260,20 @@ globals:
 resources:
   - name: playback_restriction_policy
     props:
-      - name: AllowedCountries
+      - name: allowed_countries
         value:
-          - '{{ AllowedCountries[0] }}'
-      - name: AllowedOrigins
+          - '{{ allowed_countries[0] }}'
+      - name: allowed_origins
         value:
-          - '{{ AllowedOrigins[0] }}'
-      - name: EnableStrictOriginEnforcement
-        value: '{{ EnableStrictOriginEnforcement }}'
-      - name: Name
-        value: '{{ Name }}'
-      - name: Tags
+          - '{{ allowed_origins[0] }}'
+      - name: enable_strict_origin_enforcement
+        value: '{{ enable_strict_origin_enforcement }}'
+      - name: name
+        value: '{{ name }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -294,7 +293,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Arn>';
+AND Identifier = '{{ arn }}';
 ```
 
 
@@ -303,7 +302,7 @@ AND Identifier = '<Arn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.ivs.playback_restriction_policies
-WHERE Identifier = '<Arn>'
+WHERE Identifier = '{{ arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/ivs/public_keys/index.md b/website/docs/services/ivs/public_keys/index.md
index 4cc860f06..7670bb103 100644
--- a/website/docs/services/ivs/public_keys/index.md
+++ b/website/docs/services/ivs/public_keys/index.md
@@ -170,7 +170,7 @@ fingerprint,
 arn,
 tags
 FROM awscc.ivs.public_keys
-WHERE region = 'us-east-1' AND Identifier = '<Arn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -208,10 +208,10 @@ INSERT INTO awscc.ivs.public_keys (
  Tags,
  region
 )
-SELECT 
-'{{ Name }}',
- '{{ PublicKeyMaterial }}',
- '{{ Tags }}',
+SELECT
+'{{ name }}',
+ '{{ public_key_material }}',
+ '{{ tags }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -225,10 +225,10 @@ INSERT INTO awscc.ivs.public_keys (
  Tags,
  region
 )
-SELECT 
- '{{ Name }}',
- '{{ PublicKeyMaterial }}',
- '{{ Tags }}',
+SELECT
+ '{{ name }}',
+ '{{ public_key_material }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -246,15 +246,14 @@ globals:
 resources:
   - name: public_key
     props:
-      - name: Name
-        value: '{{ Name }}'
-      - name: PublicKeyMaterial
-        value: '{{ PublicKeyMaterial }}'
-      - name: Tags
+      - name: name
+        value: '{{ name }}'
+      - name: public_key_material
+        value: '{{ public_key_material }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -270,7 +269,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Arn>';
+AND Identifier = '{{ arn }}';
 ```
 
 
@@ -279,7 +278,7 @@ AND Identifier = '<Arn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.ivs.public_keys
-WHERE Identifier = '<Arn>'
+WHERE Identifier = '{{ arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/ivs/recording_configurations/index.md b/website/docs/services/ivs/recording_configurations/index.md
index b76d9f230..5b4df9950 100644
--- a/website/docs/services/ivs/recording_configurations/index.md
+++ b/website/docs/services/ivs/recording_configurations/index.md
@@ -238,7 +238,7 @@ tags,
 thumbnail_configuration,
 rendition_configuration
 FROM awscc.ivs.recording_configurations
-WHERE region = 'us-east-1' AND Identifier = '<Arn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -274,8 +274,8 @@ INSERT INTO awscc.ivs.recording_configurations (
  DestinationConfiguration,
  region
 )
-SELECT 
-'{{ DestinationConfiguration }}',
+SELECT
+'{{ destination_configuration }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -292,13 +292,13 @@ INSERT INTO awscc.ivs.recording_configurations (
  RenditionConfiguration,
  region
 )
-SELECT 
- '{{ Name }}',
- '{{ RecordingReconnectWindowSeconds }}',
- '{{ DestinationConfiguration }}',
- '{{ Tags }}',
- '{{ ThumbnailConfiguration }}',
- '{{ RenditionConfiguration }}',
+SELECT
+ '{{ name }}',
+ '{{ recording_reconnect_window_seconds }}',
+ '{{ destination_configuration }}',
+ '{{ tags }}',
+ '{{ thumbnail_configuration }}',
+ '{{ rendition_configuration }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -316,31 +316,30 @@ globals:
 resources:
   - name: recording_configuration
     props:
-      - name: Name
-        value: '{{ Name }}'
-      - name: RecordingReconnectWindowSeconds
-        value: '{{ RecordingReconnectWindowSeconds }}'
-      - name: DestinationConfiguration
+      - name: name
+        value: '{{ name }}'
+      - name: recording_reconnect_window_seconds
+        value: '{{ recording_reconnect_window_seconds }}'
+      - name: destination_configuration
         value:
-          S3:
-            BucketName: '{{ BucketName }}'
-      - name: Tags
+          s3:
+            bucket_name: '{{ bucket_name }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-      - name: ThumbnailConfiguration
+          - key: '{{ key }}'
+            value: '{{ value }}'
+      - name: thumbnail_configuration
         value:
-          ParticipantThumbnailConfiguration:
-            RecordingMode: '{{ RecordingMode }}'
-            Storage:
-              - '{{ Storage[0] }}'
-            TargetIntervalSeconds: '{{ TargetIntervalSeconds }}'
-      - name: RenditionConfiguration
+          participant_thumbnail_configuration:
+            recording_mode: '{{ recording_mode }}'
+            storage:
+              - '{{ storage[0] }}'
+            target_interval_seconds: '{{ target_interval_seconds }}'
+      - name: rendition_configuration
         value:
-          RenditionSelection: '{{ RenditionSelection }}'
-          Renditions:
-            - '{{ Renditions[0] }}'
-
+          rendition_selection: '{{ rendition_selection }}'
+          renditions:
+            - '{{ renditions[0] }}'
 ```
 </TabItem>
 </Tabs>
@@ -356,7 +355,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Arn>';
+AND Identifier = '{{ arn }}';
 ```
 
 
@@ -365,7 +364,7 @@ AND Identifier = '<Arn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.ivs.recording_configurations
-WHERE Identifier = '<Arn>'
+WHERE Identifier = '{{ arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/ivs/stages/index.md b/website/docs/services/ivs/stages/index.md
index f50050177..a8b54fdb8 100644
--- a/website/docs/services/ivs/stages/index.md
+++ b/website/docs/services/ivs/stages/index.md
@@ -235,7 +235,7 @@ auto_participant_recording_configuration,
 tags,
 active_session_id
 FROM awscc.ivs.stages
-WHERE region = 'us-east-1' AND Identifier = '<Arn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -273,10 +273,10 @@ INSERT INTO awscc.ivs.stages (
  Tags,
  region
 )
-SELECT 
-'{{ Name }}',
- '{{ AutoParticipantRecordingConfiguration }}',
- '{{ Tags }}',
+SELECT
+'{{ name }}',
+ '{{ auto_participant_recording_configuration }}',
+ '{{ tags }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -290,10 +290,10 @@ INSERT INTO awscc.ivs.stages (
  Tags,
  region
 )
-SELECT 
- '{{ Name }}',
- '{{ AutoParticipantRecordingConfiguration }}',
- '{{ Tags }}',
+SELECT
+ '{{ name }}',
+ '{{ auto_participant_recording_configuration }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -311,28 +311,27 @@ globals:
 resources:
   - name: stage
     props:
-      - name: Name
-        value: '{{ Name }}'
-      - name: AutoParticipantRecordingConfiguration
+      - name: name
+        value: '{{ name }}'
+      - name: auto_participant_recording_configuration
         value:
-          StorageConfigurationArn: '{{ StorageConfigurationArn }}'
-          MediaTypes:
-            - '{{ MediaTypes[0] }}'
-          HlsConfiguration:
-            ParticipantRecordingHlsConfiguration:
-              TargetSegmentDurationSeconds: '{{ TargetSegmentDurationSeconds }}'
-          RecordingReconnectWindowSeconds: '{{ RecordingReconnectWindowSeconds }}'
-          ThumbnailConfiguration:
-            ParticipantThumbnailConfiguration:
-              RecordingMode: '{{ RecordingMode }}'
-              Storage:
-                - '{{ Storage[0] }}'
-              TargetIntervalSeconds: '{{ TargetIntervalSeconds }}'
-      - name: Tags
+          storage_configuration_arn: '{{ storage_configuration_arn }}'
+          media_types:
+            - '{{ media_types[0] }}'
+          hls_configuration:
+            participant_recording_hls_configuration:
+              target_segment_duration_seconds: '{{ target_segment_duration_seconds }}'
+          recording_reconnect_window_seconds: '{{ recording_reconnect_window_seconds }}'
+          thumbnail_configuration:
+            participant_thumbnail_configuration:
+              recording_mode: '{{ recording_mode }}'
+              storage:
+                - '{{ storage[0] }}'
+              target_interval_seconds: '{{ target_interval_seconds }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -350,7 +349,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Arn>';
+AND Identifier = '{{ arn }}';
 ```
 
 
@@ -359,7 +358,7 @@ AND Identifier = '<Arn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.ivs.stages
-WHERE Identifier = '<Arn>'
+WHERE Identifier = '{{ arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/ivs/storage_configurations/index.md b/website/docs/services/ivs/storage_configurations/index.md
index 29d283d62..17f2ce166 100644
--- a/website/docs/services/ivs/storage_configurations/index.md
+++ b/website/docs/services/ivs/storage_configurations/index.md
@@ -171,7 +171,7 @@ name,
 s3,
 tags
 FROM awscc.ivs.storage_configurations
-WHERE region = 'us-east-1' AND Identifier = '<Arn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -207,8 +207,8 @@ INSERT INTO awscc.ivs.storage_configurations (
  S3,
  region
 )
-SELECT 
-'{{ S3 }}',
+SELECT
+'{{ s3 }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -222,10 +222,10 @@ INSERT INTO awscc.ivs.storage_configurations (
  Tags,
  region
 )
-SELECT 
- '{{ Name }}',
- '{{ S3 }}',
- '{{ Tags }}',
+SELECT
+ '{{ name }}',
+ '{{ s3 }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -243,16 +243,15 @@ globals:
 resources:
   - name: storage_configuration
     props:
-      - name: Name
-        value: '{{ Name }}'
-      - name: S3
+      - name: name
+        value: '{{ name }}'
+      - name: s3
         value:
-          BucketName: '{{ BucketName }}'
-      - name: Tags
+          bucket_name: '{{ bucket_name }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -268,7 +267,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Arn>';
+AND Identifier = '{{ arn }}';
 ```
 
 
@@ -277,7 +276,7 @@ AND Identifier = '<Arn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.ivs.storage_configurations
-WHERE Identifier = '<Arn>'
+WHERE Identifier = '{{ arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/ivs/stream_keys/index.md b/website/docs/services/ivs/stream_keys/index.md
index fe8d4b386..5fafbe532 100644
--- a/website/docs/services/ivs/stream_keys/index.md
+++ b/website/docs/services/ivs/stream_keys/index.md
@@ -164,7 +164,7 @@ channel_arn,
 tags,
 value
 FROM awscc.ivs.stream_keys
-WHERE region = 'us-east-1' AND Identifier = '<Arn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -200,8 +200,8 @@ INSERT INTO awscc.ivs.stream_keys (
  ChannelArn,
  region
 )
-SELECT 
-'{{ ChannelArn }}',
+SELECT
+'{{ channel_arn }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -214,9 +214,9 @@ INSERT INTO awscc.ivs.stream_keys (
  Tags,
  region
 )
-SELECT 
- '{{ ChannelArn }}',
- '{{ Tags }}',
+SELECT
+ '{{ channel_arn }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -234,13 +234,12 @@ globals:
 resources:
   - name: stream_key
     props:
-      - name: ChannelArn
-        value: '{{ ChannelArn }}'
-      - name: Tags
+      - name: channel_arn
+        value: '{{ channel_arn }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -256,7 +255,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Arn>';
+AND Identifier = '{{ arn }}';
 ```
 
 
@@ -265,7 +264,7 @@ AND Identifier = '<Arn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.ivs.stream_keys
-WHERE Identifier = '<Arn>'
+WHERE Identifier = '{{ arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/ivschat/logging_configurations/index.md b/website/docs/services/ivschat/logging_configurations/index.md
index 31bf903c9..70aa1c0ed 100644
--- a/website/docs/services/ivschat/logging_configurations/index.md
+++ b/website/docs/services/ivschat/logging_configurations/index.md
@@ -214,7 +214,7 @@ name,
 state,
 tags
 FROM awscc.ivschat.logging_configurations
-WHERE region = 'us-east-1' AND Identifier = '<Arn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -250,8 +250,8 @@ INSERT INTO awscc.ivschat.logging_configurations (
  DestinationConfiguration,
  region
 )
-SELECT 
-'{{ DestinationConfiguration }}',
+SELECT
+'{{ destination_configuration }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -265,10 +265,10 @@ INSERT INTO awscc.ivschat.logging_configurations (
  Tags,
  region
 )
-SELECT 
- '{{ DestinationConfiguration }}',
- '{{ Name }}',
- '{{ Tags }}',
+SELECT
+ '{{ destination_configuration }}',
+ '{{ name }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -286,21 +286,20 @@ globals:
 resources:
   - name: logging_configuration
     props:
-      - name: DestinationConfiguration
+      - name: destination_configuration
         value:
-          CloudWatchLogs:
-            LogGroupName: '{{ LogGroupName }}'
-          Firehose:
-            DeliveryStreamName: '{{ DeliveryStreamName }}'
-          S3:
-            BucketName: '{{ BucketName }}'
-      - name: Name
-        value: '{{ Name }}'
-      - name: Tags
+          cloud_watch_logs:
+            log_group_name: '{{ log_group_name }}'
+          firehose:
+            delivery_stream_name: '{{ delivery_stream_name }}'
+          s3:
+            bucket_name: '{{ bucket_name }}'
+      - name: name
+        value: '{{ name }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -318,7 +317,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Arn>';
+AND Identifier = '{{ arn }}';
 ```
 
 
@@ -327,7 +326,7 @@ AND Identifier = '<Arn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.ivschat.logging_configurations
-WHERE Identifier = '<Arn>'
+WHERE Identifier = '{{ arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/ivschat/rooms/index.md b/website/docs/services/ivschat/rooms/index.md
index 04c4a27cf..5f1b2d174 100644
--- a/website/docs/services/ivschat/rooms/index.md
+++ b/website/docs/services/ivschat/rooms/index.md
@@ -200,7 +200,7 @@ maximum_message_rate_per_second,
 message_review_handler,
 tags
 FROM awscc.ivschat.rooms
-WHERE region = 'us-east-1' AND Identifier = '<Arn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -236,7 +236,7 @@ INSERT INTO awscc.ivschat.rooms (
  ,
  region
 )
-SELECT 
+SELECT
 '{{  }}',
 '{{ region }}';
 ```
@@ -254,13 +254,13 @@ INSERT INTO awscc.ivschat.rooms (
  Tags,
  region
 )
-SELECT 
- '{{ Name }}',
- '{{ LoggingConfigurationIdentifiers }}',
- '{{ MaximumMessageLength }}',
- '{{ MaximumMessageRatePerSecond }}',
- '{{ MessageReviewHandler }}',
- '{{ Tags }}',
+SELECT
+ '{{ name }}',
+ '{{ logging_configuration_identifiers }}',
+ '{{ maximum_message_length }}',
+ '{{ maximum_message_rate_per_second }}',
+ '{{ message_review_handler }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -278,24 +278,23 @@ globals:
 resources:
   - name: room
     props:
-      - name: Name
-        value: '{{ Name }}'
-      - name: LoggingConfigurationIdentifiers
+      - name: name
+        value: '{{ name }}'
+      - name: logging_configuration_identifiers
         value:
-          - '{{ LoggingConfigurationIdentifiers[0] }}'
-      - name: MaximumMessageLength
-        value: '{{ MaximumMessageLength }}'
-      - name: MaximumMessageRatePerSecond
-        value: '{{ MaximumMessageRatePerSecond }}'
-      - name: MessageReviewHandler
+          - '{{ logging_configuration_identifiers[0] }}'
+      - name: maximum_message_length
+        value: '{{ maximum_message_length }}'
+      - name: maximum_message_rate_per_second
+        value: '{{ maximum_message_rate_per_second }}'
+      - name: message_review_handler
         value:
-          FallbackResult: '{{ FallbackResult }}'
-          Uri: '{{ Uri }}'
-      - name: Tags
+          fallback_result: '{{ fallback_result }}'
+          uri: '{{ uri }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -316,7 +315,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Arn>';
+AND Identifier = '{{ arn }}';
 ```
 
 
@@ -325,7 +324,7 @@ AND Identifier = '<Arn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.ivschat.rooms
-WHERE Identifier = '<Arn>'
+WHERE Identifier = '{{ arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/kafkaconnect/connectors/index.md b/website/docs/services/kafkaconnect/connectors/index.md
index a463a4dbf..1837e407d 100644
--- a/website/docs/services/kafkaconnect/connectors/index.md
+++ b/website/docs/services/kafkaconnect/connectors/index.md
@@ -511,7 +511,7 @@ service_execution_role_arn,
 tags,
 worker_configuration
 FROM awscc.kafkaconnect.connectors
-WHERE region = 'us-east-1' AND Identifier = '<ConnectorArn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ connector_arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -555,16 +555,16 @@ INSERT INTO awscc.kafkaconnect.connectors (
  ServiceExecutionRoleArn,
  region
 )
-SELECT 
-'{{ Capacity }}',
- '{{ ConnectorConfiguration }}',
- '{{ ConnectorName }}',
- '{{ KafkaCluster }}',
- '{{ KafkaClusterClientAuthentication }}',
- '{{ KafkaClusterEncryptionInTransit }}',
- '{{ KafkaConnectVersion }}',
- '{{ Plugins }}',
- '{{ ServiceExecutionRoleArn }}',
+SELECT
+'{{ capacity }}',
+ '{{ connector_configuration }}',
+ '{{ connector_name }}',
+ '{{ kafka_cluster }}',
+ '{{ kafka_cluster_client_authentication }}',
+ '{{ kafka_cluster_encryption_in_transit }}',
+ '{{ kafka_connect_version }}',
+ '{{ plugins }}',
+ '{{ service_execution_role_arn }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -588,20 +588,20 @@ INSERT INTO awscc.kafkaconnect.connectors (
  WorkerConfiguration,
  region
 )
-SELECT 
- '{{ Capacity }}',
- '{{ ConnectorConfiguration }}',
- '{{ ConnectorDescription }}',
- '{{ ConnectorName }}',
- '{{ KafkaCluster }}',
- '{{ KafkaClusterClientAuthentication }}',
- '{{ KafkaClusterEncryptionInTransit }}',
- '{{ KafkaConnectVersion }}',
- '{{ LogDelivery }}',
- '{{ Plugins }}',
- '{{ ServiceExecutionRoleArn }}',
- '{{ Tags }}',
- '{{ WorkerConfiguration }}',
+SELECT
+ '{{ capacity }}',
+ '{{ connector_configuration }}',
+ '{{ connector_description }}',
+ '{{ connector_name }}',
+ '{{ kafka_cluster }}',
+ '{{ kafka_cluster_client_authentication }}',
+ '{{ kafka_cluster_encryption_in_transit }}',
+ '{{ kafka_connect_version }}',
+ '{{ log_delivery }}',
+ '{{ plugins }}',
+ '{{ service_execution_role_arn }}',
+ '{{ tags }}',
+ '{{ worker_configuration }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -619,82 +619,81 @@ globals:
 resources:
   - name: connector
     props:
-      - name: Capacity
+      - name: capacity
         value:
-          AutoScaling:
-            MaxWorkerCount: '{{ MaxWorkerCount }}'
-            MinWorkerCount: '{{ MinWorkerCount }}'
-            ScaleInPolicy:
-              CpuUtilizationPercentage: '{{ CpuUtilizationPercentage }}'
-            ScaleOutPolicy:
-              CpuUtilizationPercentage: '{{ CpuUtilizationPercentage }}'
-            McuCount: '{{ McuCount }}'
-          ProvisionedCapacity:
-            McuCount: '{{ McuCount }}'
-            WorkerCount: '{{ WorkerCount }}'
-      - name: ConnectorConfiguration
+          auto_scaling:
+            max_worker_count: '{{ max_worker_count }}'
+            min_worker_count: '{{ min_worker_count }}'
+            scale_in_policy:
+              cpu_utilization_percentage: '{{ cpu_utilization_percentage }}'
+            scale_out_policy:
+              cpu_utilization_percentage: '{{ cpu_utilization_percentage }}'
+            mcu_count: '{{ mcu_count }}'
+          provisioned_capacity:
+            mcu_count: '{{ mcu_count }}'
+            worker_count: '{{ worker_count }}'
+      - name: connector_configuration
         value: {}
-      - name: ConnectorDescription
-        value: '{{ ConnectorDescription }}'
-      - name: ConnectorName
-        value: '{{ ConnectorName }}'
-      - name: KafkaCluster
+      - name: connector_description
+        value: '{{ connector_description }}'
+      - name: connector_name
+        value: '{{ connector_name }}'
+      - name: kafka_cluster
         value:
-          ApacheKafkaCluster:
-            BootstrapServers: '{{ BootstrapServers }}'
-            Vpc:
-              SecurityGroups:
-                - '{{ SecurityGroups[0] }}'
-              Subnets:
-                - '{{ Subnets[0] }}'
-      - name: KafkaClusterClientAuthentication
+          apache_kafka_cluster:
+            bootstrap_servers: '{{ bootstrap_servers }}'
+            vpc:
+              security_groups:
+                - '{{ security_groups[0] }}'
+              subnets:
+                - '{{ subnets[0] }}'
+      - name: kafka_cluster_client_authentication
         value:
-          AuthenticationType: '{{ AuthenticationType }}'
-      - name: KafkaClusterEncryptionInTransit
+          authentication_type: '{{ authentication_type }}'
+      - name: kafka_cluster_encryption_in_transit
         value:
-          EncryptionType: '{{ EncryptionType }}'
-      - name: KafkaConnectVersion
-        value: '{{ KafkaConnectVersion }}'
-      - name: LogDelivery
+          encryption_type: '{{ encryption_type }}'
+      - name: kafka_connect_version
+        value: '{{ kafka_connect_version }}'
+      - name: log_delivery
         value:
-          WorkerLogDelivery:
-            CloudWatchLogs:
-              Enabled: '{{ Enabled }}'
-              LogGroup: '{{ LogGroup }}'
-            Firehose:
-              DeliveryStream: '{{ DeliveryStream }}'
-              Enabled: '{{ Enabled }}'
-            S3:
-              Bucket: '{{ Bucket }}'
-              Enabled: '{{ Enabled }}'
-              Prefix: '{{ Prefix }}'
-      - name: Plugins
+          worker_log_delivery:
+            cloud_watch_logs:
+              enabled: '{{ enabled }}'
+              log_group: '{{ log_group }}'
+            firehose:
+              delivery_stream: '{{ delivery_stream }}'
+              enabled: '{{ enabled }}'
+            s3:
+              bucket: '{{ bucket }}'
+              enabled: '{{ enabled }}'
+              prefix: '{{ prefix }}'
+      - name: plugins
         value:
-          - CustomPlugin:
-              Name: '{{ Name }}'
-              Description: '{{ Description }}'
-              ContentType: '{{ ContentType }}'
-              Location:
-                S3Location:
-                  BucketArn: '{{ BucketArn }}'
-                  FileKey: '{{ FileKey }}'
-                  ObjectVersion: '{{ ObjectVersion }}'
-              Tags:
-                - Key: '{{ Key }}'
-                  Value: '{{ Value }}'
-      - name: ServiceExecutionRoleArn
-        value: '{{ ServiceExecutionRoleArn }}'
-      - name: Tags
+          - custom_plugin:
+              name: '{{ name }}'
+              description: '{{ description }}'
+              content_type: '{{ content_type }}'
+              location:
+                s3_location:
+                  bucket_arn: '{{ bucket_arn }}'
+                  file_key: '{{ file_key }}'
+                  object_version: '{{ object_version }}'
+              tags:
+                - key: '{{ key }}'
+                  value: '{{ value }}'
+      - name: service_execution_role_arn
+        value: '{{ service_execution_role_arn }}'
+      - name: tags
         value:
           - null
-      - name: WorkerConfiguration
+      - name: worker_configuration
         value:
-          Name: '{{ Name }}'
-          Description: '{{ Description }}'
-          PropertiesFileContent: '{{ PropertiesFileContent }}'
-          Tags:
+          name: '{{ name }}'
+          description: '{{ description }}'
+          properties_file_content: '{{ properties_file_content }}'
+          tags:
             - null
-
 ```
 </TabItem>
 </Tabs>
@@ -712,7 +711,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<ConnectorArn>';
+AND Identifier = '{{ connector_arn }}';
 ```
 
 
@@ -721,7 +720,7 @@ AND Identifier = '<ConnectorArn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.kafkaconnect.connectors
-WHERE Identifier = '<ConnectorArn>'
+WHERE Identifier = '{{ connector_arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/kafkaconnect/custom_plugins/index.md b/website/docs/services/kafkaconnect/custom_plugins/index.md
index 5ed2800ed..9b9055b1b 100644
--- a/website/docs/services/kafkaconnect/custom_plugins/index.md
+++ b/website/docs/services/kafkaconnect/custom_plugins/index.md
@@ -224,7 +224,7 @@ location,
 revision,
 tags
 FROM awscc.kafkaconnect.custom_plugins
-WHERE region = 'us-east-1' AND Identifier = '<CustomPluginArn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ custom_plugin_arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -262,10 +262,10 @@ INSERT INTO awscc.kafkaconnect.custom_plugins (
  Location,
  region
 )
-SELECT 
-'{{ Name }}',
- '{{ ContentType }}',
- '{{ Location }}',
+SELECT
+'{{ name }}',
+ '{{ content_type }}',
+ '{{ location }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -281,12 +281,12 @@ INSERT INTO awscc.kafkaconnect.custom_plugins (
  Tags,
  region
 )
-SELECT 
- '{{ Name }}',
- '{{ Description }}',
- '{{ ContentType }}',
- '{{ Location }}',
- '{{ Tags }}',
+SELECT
+ '{{ name }}',
+ '{{ description }}',
+ '{{ content_type }}',
+ '{{ location }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -304,23 +304,22 @@ globals:
 resources:
   - name: custom_plugin
     props:
-      - name: Name
-        value: '{{ Name }}'
-      - name: Description
-        value: '{{ Description }}'
-      - name: ContentType
-        value: '{{ ContentType }}'
-      - name: Location
+      - name: name
+        value: '{{ name }}'
+      - name: description
+        value: '{{ description }}'
+      - name: content_type
+        value: '{{ content_type }}'
+      - name: location
         value:
-          S3Location:
-            BucketArn: '{{ BucketArn }}'
-            FileKey: '{{ FileKey }}'
-            ObjectVersion: '{{ ObjectVersion }}'
-      - name: Tags
+          s3_location:
+            bucket_arn: '{{ bucket_arn }}'
+            file_key: '{{ file_key }}'
+            object_version: '{{ object_version }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -336,7 +335,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<CustomPluginArn>';
+AND Identifier = '{{ custom_plugin_arn }}';
 ```
 
 
@@ -345,7 +344,7 @@ AND Identifier = '<CustomPluginArn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.kafkaconnect.custom_plugins
-WHERE Identifier = '<CustomPluginArn>'
+WHERE Identifier = '{{ custom_plugin_arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/kafkaconnect/worker_configurations/index.md b/website/docs/services/kafkaconnect/worker_configurations/index.md
index 33af5fffe..ead012e3b 100644
--- a/website/docs/services/kafkaconnect/worker_configurations/index.md
+++ b/website/docs/services/kafkaconnect/worker_configurations/index.md
@@ -176,7 +176,7 @@ properties_file_content,
 revision,
 tags
 FROM awscc.kafkaconnect.worker_configurations
-WHERE region = 'us-east-1' AND Identifier = '<WorkerConfigurationArn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ worker_configuration_arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -213,9 +213,9 @@ INSERT INTO awscc.kafkaconnect.worker_configurations (
  PropertiesFileContent,
  region
 )
-SELECT 
-'{{ Name }}',
- '{{ PropertiesFileContent }}',
+SELECT
+'{{ name }}',
+ '{{ properties_file_content }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -230,11 +230,11 @@ INSERT INTO awscc.kafkaconnect.worker_configurations (
  Tags,
  region
 )
-SELECT 
- '{{ Name }}',
- '{{ Description }}',
- '{{ PropertiesFileContent }}',
- '{{ Tags }}',
+SELECT
+ '{{ name }}',
+ '{{ description }}',
+ '{{ properties_file_content }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -252,17 +252,16 @@ globals:
 resources:
   - name: worker_configuration
     props:
-      - name: Name
-        value: '{{ Name }}'
-      - name: Description
-        value: '{{ Description }}'
-      - name: PropertiesFileContent
-        value: '{{ PropertiesFileContent }}'
-      - name: Tags
+      - name: name
+        value: '{{ name }}'
+      - name: description
+        value: '{{ description }}'
+      - name: properties_file_content
+        value: '{{ properties_file_content }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -278,7 +277,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<WorkerConfigurationArn>';
+AND Identifier = '{{ worker_configuration_arn }}';
 ```
 
 
@@ -287,7 +286,7 @@ AND Identifier = '<WorkerConfigurationArn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.kafkaconnect.worker_configurations
-WHERE Identifier = '<WorkerConfigurationArn>'
+WHERE Identifier = '{{ worker_configuration_arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/kendra/data_sources/index.md b/website/docs/services/kendra/data_sources/index.md
index a24eae9ee..62aafa1bf 100644
--- a/website/docs/services/kendra/data_sources/index.md
+++ b/website/docs/services/kendra/data_sources/index.md
@@ -1139,7 +1139,7 @@ tags,
 custom_document_enrichment_configuration,
 language_code
 FROM awscc.kendra.data_sources
-WHERE region = 'us-east-1' AND Identifier = '<Id>|<IndexId>';
+WHERE region = 'us-east-1' AND Identifier = '{{ id }}|{{ index_id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -1178,10 +1178,10 @@ INSERT INTO awscc.kendra.data_sources (
  Type,
  region
 )
-SELECT 
-'{{ Name }}',
- '{{ IndexId }}',
- '{{ Type }}',
+SELECT
+'{{ name }}',
+ '{{ index_id }}',
+ '{{ type }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -1202,17 +1202,17 @@ INSERT INTO awscc.kendra.data_sources (
  LanguageCode,
  region
 )
-SELECT 
- '{{ Name }}',
- '{{ IndexId }}',
- '{{ Type }}',
- '{{ DataSourceConfiguration }}',
- '{{ Description }}',
- '{{ Schedule }}',
- '{{ RoleArn }}',
- '{{ Tags }}',
- '{{ CustomDocumentEnrichmentConfiguration }}',
- '{{ LanguageCode }}',
+SELECT
+ '{{ name }}',
+ '{{ index_id }}',
+ '{{ type }}',
+ '{{ data_source_configuration }}',
+ '{{ description }}',
+ '{{ schedule }}',
+ '{{ role_arn }}',
+ '{{ tags }}',
+ '{{ custom_document_enrichment_configuration }}',
+ '{{ language_code }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -1230,243 +1230,242 @@ globals:
 resources:
   - name: data_source
     props:
-      - name: Name
-        value: '{{ Name }}'
-      - name: IndexId
-        value: '{{ IndexId }}'
-      - name: Type
-        value: '{{ Type }}'
-      - name: DataSourceConfiguration
+      - name: name
+        value: '{{ name }}'
+      - name: index_id
+        value: '{{ index_id }}'
+      - name: type
+        value: '{{ type }}'
+      - name: data_source_configuration
         value:
-          S3Configuration:
-            BucketName: '{{ BucketName }}'
-            InclusionPrefixes:
-              - '{{ InclusionPrefixes[0] }}'
-            InclusionPatterns: null
-            ExclusionPatterns: null
-            DocumentsMetadataConfiguration:
-              S3Prefix: '{{ S3Prefix }}'
-            AccessControlListConfiguration:
-              KeyPath: null
-          SharePointConfiguration:
-            SharePointVersion: '{{ SharePointVersion }}'
-            Urls:
-              - '{{ Urls[0] }}'
-            SecretArn: '{{ SecretArn }}'
-            CrawlAttachments: '{{ CrawlAttachments }}'
-            UseChangeLog: '{{ UseChangeLog }}'
-            InclusionPatterns: null
-            ExclusionPatterns: null
-            VpcConfiguration:
-              SubnetIds:
-                - '{{ SubnetIds[0] }}'
-              SecurityGroupIds:
-                - '{{ SecurityGroupIds[0] }}'
-            FieldMappings:
-              - DataSourceFieldName: '{{ DataSourceFieldName }}'
-                DateFieldFormat: '{{ DateFieldFormat }}'
-                IndexFieldName: '{{ IndexFieldName }}'
-            DocumentTitleFieldName: null
-            DisableLocalGroups: '{{ DisableLocalGroups }}'
-            SslCertificateS3Path:
-              Bucket: null
-              Key: null
-          SalesforceConfiguration:
-            ServerUrl: null
-            SecretArn: null
-            StandardObjectConfigurations:
-              - Name: '{{ Name }}'
-                DocumentDataFieldName: null
-                DocumentTitleFieldName: null
-                FieldMappings: null
-            KnowledgeArticleConfiguration:
-              IncludedStates:
-                - '{{ IncludedStates[0] }}'
-              StandardKnowledgeArticleTypeConfiguration:
-                DocumentDataFieldName: null
-                DocumentTitleFieldName: null
-                FieldMappings: null
-              CustomKnowledgeArticleTypeConfigurations:
-                - Name: '{{ Name }}'
-                  DocumentDataFieldName: null
-                  DocumentTitleFieldName: null
-                  FieldMappings: null
-            ChatterFeedConfiguration:
-              DocumentDataFieldName: null
-              DocumentTitleFieldName: null
-              FieldMappings: null
-              IncludeFilterTypes:
-                - '{{ IncludeFilterTypes[0] }}'
-            CrawlAttachments: '{{ CrawlAttachments }}'
-            StandardObjectAttachmentConfiguration:
-              DocumentTitleFieldName: null
-              FieldMappings: null
-            IncludeAttachmentFilePatterns: null
-            ExcludeAttachmentFilePatterns: null
-          OneDriveConfiguration:
-            TenantDomain: '{{ TenantDomain }}'
-            SecretArn: null
-            OneDriveUsers:
-              OneDriveUserList:
-                - '{{ OneDriveUserList[0] }}'
-              OneDriveUserS3Path: null
-            InclusionPatterns: null
-            ExclusionPatterns: null
-            FieldMappings: null
-            DisableLocalGroups: null
-          ServiceNowConfiguration:
-            HostUrl: '{{ HostUrl }}'
-            SecretArn: null
-            ServiceNowBuildVersion: '{{ ServiceNowBuildVersion }}'
-            AuthenticationType: '{{ AuthenticationType }}'
-            KnowledgeArticleConfiguration:
-              CrawlAttachments: '{{ CrawlAttachments }}'
-              IncludeAttachmentFilePatterns: null
-              ExcludeAttachmentFilePatterns: null
-              DocumentDataFieldName: null
-              DocumentTitleFieldName: null
-              FieldMappings: null
-              FilterQuery: '{{ FilterQuery }}'
-            ServiceCatalogConfiguration:
-              CrawlAttachments: '{{ CrawlAttachments }}'
-              IncludeAttachmentFilePatterns: null
-              ExcludeAttachmentFilePatterns: null
-              DocumentDataFieldName: null
-              DocumentTitleFieldName: null
-              FieldMappings: null
-          DatabaseConfiguration:
-            DatabaseEngineType: '{{ DatabaseEngineType }}'
-            ConnectionConfiguration:
-              DatabaseHost: '{{ DatabaseHost }}'
-              DatabasePort: '{{ DatabasePort }}'
-              DatabaseName: '{{ DatabaseName }}'
-              TableName: '{{ TableName }}'
-              SecretArn: null
-            VpcConfiguration: null
-            ColumnConfiguration:
-              DocumentIdColumnName: '{{ DocumentIdColumnName }}'
-              DocumentDataColumnName: null
-              DocumentTitleColumnName: null
-              FieldMappings: null
-              ChangeDetectingColumns:
+          s3_configuration:
+            bucket_name: '{{ bucket_name }}'
+            inclusion_prefixes:
+              - '{{ inclusion_prefixes[0] }}'
+            inclusion_patterns: null
+            exclusion_patterns: null
+            documents_metadata_configuration:
+              s3_prefix: '{{ s3_prefix }}'
+            access_control_list_configuration:
+              key_path: null
+          share_point_configuration:
+            share_point_version: '{{ share_point_version }}'
+            urls:
+              - '{{ urls[0] }}'
+            secret_arn: '{{ secret_arn }}'
+            crawl_attachments: '{{ crawl_attachments }}'
+            use_change_log: '{{ use_change_log }}'
+            inclusion_patterns: null
+            exclusion_patterns: null
+            vpc_configuration:
+              subnet_ids:
+                - '{{ subnet_ids[0] }}'
+              security_group_ids:
+                - '{{ security_group_ids[0] }}'
+            field_mappings:
+              - data_source_field_name: '{{ data_source_field_name }}'
+                date_field_format: '{{ date_field_format }}'
+                index_field_name: '{{ index_field_name }}'
+            document_title_field_name: null
+            disable_local_groups: '{{ disable_local_groups }}'
+            ssl_certificate_s3_path:
+              bucket: null
+              key: null
+          salesforce_configuration:
+            server_url: null
+            secret_arn: null
+            standard_object_configurations:
+              - name: '{{ name }}'
+                document_data_field_name: null
+                document_title_field_name: null
+                field_mappings: null
+            knowledge_article_configuration:
+              included_states:
+                - '{{ included_states[0] }}'
+              standard_knowledge_article_type_configuration:
+                document_data_field_name: null
+                document_title_field_name: null
+                field_mappings: null
+              custom_knowledge_article_type_configurations:
+                - name: '{{ name }}'
+                  document_data_field_name: null
+                  document_title_field_name: null
+                  field_mappings: null
+            chatter_feed_configuration:
+              document_data_field_name: null
+              document_title_field_name: null
+              field_mappings: null
+              include_filter_types:
+                - '{{ include_filter_types[0] }}'
+            crawl_attachments: '{{ crawl_attachments }}'
+            standard_object_attachment_configuration:
+              document_title_field_name: null
+              field_mappings: null
+            include_attachment_file_patterns: null
+            exclude_attachment_file_patterns: null
+          one_drive_configuration:
+            tenant_domain: '{{ tenant_domain }}'
+            secret_arn: null
+            one_drive_users:
+              one_drive_user_list:
+                - '{{ one_drive_user_list[0] }}'
+              one_drive_user_s3_path: null
+            inclusion_patterns: null
+            exclusion_patterns: null
+            field_mappings: null
+            disable_local_groups: null
+          service_now_configuration:
+            host_url: '{{ host_url }}'
+            secret_arn: null
+            service_now_build_version: '{{ service_now_build_version }}'
+            authentication_type: '{{ authentication_type }}'
+            knowledge_article_configuration:
+              crawl_attachments: '{{ crawl_attachments }}'
+              include_attachment_file_patterns: null
+              exclude_attachment_file_patterns: null
+              document_data_field_name: null
+              document_title_field_name: null
+              field_mappings: null
+              filter_query: '{{ filter_query }}'
+            service_catalog_configuration:
+              crawl_attachments: '{{ crawl_attachments }}'
+              include_attachment_file_patterns: null
+              exclude_attachment_file_patterns: null
+              document_data_field_name: null
+              document_title_field_name: null
+              field_mappings: null
+          database_configuration:
+            database_engine_type: '{{ database_engine_type }}'
+            connection_configuration:
+              database_host: '{{ database_host }}'
+              database_port: '{{ database_port }}'
+              database_name: '{{ database_name }}'
+              table_name: '{{ table_name }}'
+              secret_arn: null
+            vpc_configuration: null
+            column_configuration:
+              document_id_column_name: '{{ document_id_column_name }}'
+              document_data_column_name: null
+              document_title_column_name: null
+              field_mappings: null
+              change_detecting_columns:
                 - null
-            AclConfiguration:
-              AllowedGroupsColumnName: null
-            SqlConfiguration:
-              QueryIdentifiersEnclosingOption: '{{ QueryIdentifiersEnclosingOption }}'
-          ConfluenceConfiguration:
-            ServerUrl: null
-            SecretArn: null
-            Version: '{{ Version }}'
-            SpaceConfiguration:
-              CrawlPersonalSpaces: '{{ CrawlPersonalSpaces }}'
-              CrawlArchivedSpaces: '{{ CrawlArchivedSpaces }}'
-              IncludeSpaces:
-                - '{{ IncludeSpaces[0] }}'
-              ExcludeSpaces: null
-              SpaceFieldMappings:
-                - DataSourceFieldName: '{{ DataSourceFieldName }}'
-                  DateFieldFormat: null
-                  IndexFieldName: null
-            PageConfiguration:
-              PageFieldMappings:
-                - DataSourceFieldName: '{{ DataSourceFieldName }}'
-                  DateFieldFormat: null
-                  IndexFieldName: null
-            BlogConfiguration:
-              BlogFieldMappings:
-                - DataSourceFieldName: '{{ DataSourceFieldName }}'
-                  DateFieldFormat: null
-                  IndexFieldName: null
-            AttachmentConfiguration:
-              CrawlAttachments: '{{ CrawlAttachments }}'
-              AttachmentFieldMappings:
-                - DataSourceFieldName: '{{ DataSourceFieldName }}'
-                  DateFieldFormat: null
-                  IndexFieldName: null
-            VpcConfiguration: null
-            InclusionPatterns: null
-            ExclusionPatterns: null
-          GoogleDriveConfiguration:
-            SecretArn: null
-            InclusionPatterns: null
-            ExclusionPatterns: null
-            FieldMappings: null
-            ExcludeMimeTypes:
-              - '{{ ExcludeMimeTypes[0] }}'
-            ExcludeUserAccounts:
-              - '{{ ExcludeUserAccounts[0] }}'
-            ExcludeSharedDrives:
-              - '{{ ExcludeSharedDrives[0] }}'
-          WebCrawlerConfiguration:
-            Urls:
-              SeedUrlConfiguration:
-                SeedUrls:
-                  - '{{ SeedUrls[0] }}'
-                WebCrawlerMode: '{{ WebCrawlerMode }}'
-              SiteMapsConfiguration:
-                SiteMaps:
-                  - '{{ SiteMaps[0] }}'
-            CrawlDepth: '{{ CrawlDepth }}'
-            MaxLinksPerPage: '{{ MaxLinksPerPage }}'
-            MaxContentSizePerPageInMegaBytes: null
-            MaxUrlsPerMinuteCrawlRate: '{{ MaxUrlsPerMinuteCrawlRate }}'
-            UrlInclusionPatterns: null
-            UrlExclusionPatterns: null
-            ProxyConfiguration:
-              Host: '{{ Host }}'
-              Port: '{{ Port }}'
-              Credentials: null
-            AuthenticationConfiguration:
-              BasicAuthentication:
-                - Host: '{{ Host }}'
-                  Port: '{{ Port }}'
-                  Credentials: null
-          WorkDocsConfiguration:
-            OrganizationId: '{{ OrganizationId }}'
-            CrawlComments: '{{ CrawlComments }}'
-            UseChangeLog: '{{ UseChangeLog }}'
-            InclusionPatterns: null
-            ExclusionPatterns: null
-            FieldMappings: null
-          TemplateConfiguration:
-            Template: {}
-      - name: Description
-        value: '{{ Description }}'
-      - name: Schedule
-        value: '{{ Schedule }}'
-      - name: RoleArn
-        value: '{{ RoleArn }}'
-      - name: Tags
+            acl_configuration:
+              allowed_groups_column_name: null
+            sql_configuration:
+              query_identifiers_enclosing_option: '{{ query_identifiers_enclosing_option }}'
+          confluence_configuration:
+            server_url: null
+            secret_arn: null
+            version: '{{ version }}'
+            space_configuration:
+              crawl_personal_spaces: '{{ crawl_personal_spaces }}'
+              crawl_archived_spaces: '{{ crawl_archived_spaces }}'
+              include_spaces:
+                - '{{ include_spaces[0] }}'
+              exclude_spaces: null
+              space_field_mappings:
+                - data_source_field_name: '{{ data_source_field_name }}'
+                  date_field_format: null
+                  index_field_name: null
+            page_configuration:
+              page_field_mappings:
+                - data_source_field_name: '{{ data_source_field_name }}'
+                  date_field_format: null
+                  index_field_name: null
+            blog_configuration:
+              blog_field_mappings:
+                - data_source_field_name: '{{ data_source_field_name }}'
+                  date_field_format: null
+                  index_field_name: null
+            attachment_configuration:
+              crawl_attachments: '{{ crawl_attachments }}'
+              attachment_field_mappings:
+                - data_source_field_name: '{{ data_source_field_name }}'
+                  date_field_format: null
+                  index_field_name: null
+            vpc_configuration: null
+            inclusion_patterns: null
+            exclusion_patterns: null
+          google_drive_configuration:
+            secret_arn: null
+            inclusion_patterns: null
+            exclusion_patterns: null
+            field_mappings: null
+            exclude_mime_types:
+              - '{{ exclude_mime_types[0] }}'
+            exclude_user_accounts:
+              - '{{ exclude_user_accounts[0] }}'
+            exclude_shared_drives:
+              - '{{ exclude_shared_drives[0] }}'
+          web_crawler_configuration:
+            urls:
+              seed_url_configuration:
+                seed_urls:
+                  - '{{ seed_urls[0] }}'
+                web_crawler_mode: '{{ web_crawler_mode }}'
+              site_maps_configuration:
+                site_maps:
+                  - '{{ site_maps[0] }}'
+            crawl_depth: '{{ crawl_depth }}'
+            max_links_per_page: '{{ max_links_per_page }}'
+            max_content_size_per_page_in_mega_bytes: null
+            max_urls_per_minute_crawl_rate: '{{ max_urls_per_minute_crawl_rate }}'
+            url_inclusion_patterns: null
+            url_exclusion_patterns: null
+            proxy_configuration:
+              host: '{{ host }}'
+              port: '{{ port }}'
+              credentials: null
+            authentication_configuration:
+              basic_authentication:
+                - host: '{{ host }}'
+                  port: '{{ port }}'
+                  credentials: null
+          work_docs_configuration:
+            organization_id: '{{ organization_id }}'
+            crawl_comments: '{{ crawl_comments }}'
+            use_change_log: '{{ use_change_log }}'
+            inclusion_patterns: null
+            exclusion_patterns: null
+            field_mappings: null
+          template_configuration:
+            template: {}
+      - name: description
+        value: '{{ description }}'
+      - name: schedule
+        value: '{{ schedule }}'
+      - name: role_arn
+        value: '{{ role_arn }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-      - name: CustomDocumentEnrichmentConfiguration
+          - key: '{{ key }}'
+            value: '{{ value }}'
+      - name: custom_document_enrichment_configuration
         value:
-          InlineConfigurations:
-            - Condition:
-                ConditionDocumentAttributeKey: '{{ ConditionDocumentAttributeKey }}'
-                Operator: '{{ Operator }}'
-                ConditionOnValue:
-                  StringValue: '{{ StringValue }}'
-                  StringListValue:
-                    - '{{ StringListValue[0] }}'
-                  LongValue: '{{ LongValue }}'
-                  DateValue: '{{ DateValue }}'
-              Target:
-                TargetDocumentAttributeKey: null
-                TargetDocumentAttributeValueDeletion: '{{ TargetDocumentAttributeValueDeletion }}'
-                TargetDocumentAttributeValue: null
-              DocumentContentDeletion: '{{ DocumentContentDeletion }}'
-          PreExtractionHookConfiguration:
-            InvocationCondition: null
-            LambdaArn: '{{ LambdaArn }}'
-            S3Bucket: null
-          PostExtractionHookConfiguration: null
-          RoleArn: null
-      - name: LanguageCode
-        value: '{{ LanguageCode }}'
-
+          inline_configurations:
+            - condition:
+                condition_document_attribute_key: '{{ condition_document_attribute_key }}'
+                operator: '{{ operator }}'
+                condition_on_value:
+                  string_value: '{{ string_value }}'
+                  string_list_value:
+                    - '{{ string_list_value[0] }}'
+                  long_value: '{{ long_value }}'
+                  date_value: '{{ date_value }}'
+              target:
+                target_document_attribute_key: null
+                target_document_attribute_value_deletion: '{{ target_document_attribute_value_deletion }}'
+                target_document_attribute_value: null
+              document_content_deletion: '{{ document_content_deletion }}'
+          pre_extraction_hook_configuration:
+            invocation_condition: null
+            lambda_arn: '{{ lambda_arn }}'
+            s3_bucket: null
+          post_extraction_hook_configuration: null
+          role_arn: null
+      - name: language_code
+        value: '{{ language_code }}'
 ```
 </TabItem>
 </Tabs>
@@ -1489,7 +1488,7 @@ SET PatchDocument = string('{{ {
     "LanguageCode": language_code
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Id>|<IndexId>';
+AND Identifier = '{{ id }}|{{ index_id }}';
 ```
 
 
@@ -1498,7 +1497,7 @@ AND Identifier = '<Id>|<IndexId>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.kendra.data_sources
-WHERE Identifier = '<Id|IndexId>'
+WHERE Identifier = '{{ id }}|{{ index_id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/kendra/faqs/index.md b/website/docs/services/kendra/faqs/index.md
index aa479135b..590b13311 100644
--- a/website/docs/services/kendra/faqs/index.md
+++ b/website/docs/services/kendra/faqs/index.md
@@ -217,7 +217,7 @@ tags,
 arn,
 language_code
 FROM awscc.kendra.faqs
-WHERE region = 'us-east-1' AND Identifier = '<Id>|<IndexId>';
+WHERE region = 'us-east-1' AND Identifier = '{{ id }}|{{ index_id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -257,11 +257,11 @@ INSERT INTO awscc.kendra.faqs (
  RoleArn,
  region
 )
-SELECT 
-'{{ IndexId }}',
- '{{ Name }}',
- '{{ S3Path }}',
- '{{ RoleArn }}',
+SELECT
+'{{ index_id }}',
+ '{{ name }}',
+ '{{ s3_path }}',
+ '{{ role_arn }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -280,15 +280,15 @@ INSERT INTO awscc.kendra.faqs (
  LanguageCode,
  region
 )
-SELECT 
- '{{ IndexId }}',
- '{{ Name }}',
- '{{ Description }}',
- '{{ FileFormat }}',
- '{{ S3Path }}',
- '{{ RoleArn }}',
- '{{ Tags }}',
- '{{ LanguageCode }}',
+SELECT
+ '{{ index_id }}',
+ '{{ name }}',
+ '{{ description }}',
+ '{{ file_format }}',
+ '{{ s3_path }}',
+ '{{ role_arn }}',
+ '{{ tags }}',
+ '{{ language_code }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -306,27 +306,26 @@ globals:
 resources:
   - name: faq
     props:
-      - name: IndexId
-        value: '{{ IndexId }}'
-      - name: Name
-        value: '{{ Name }}'
-      - name: Description
-        value: '{{ Description }}'
-      - name: FileFormat
-        value: '{{ FileFormat }}'
-      - name: S3Path
+      - name: index_id
+        value: '{{ index_id }}'
+      - name: name
+        value: '{{ name }}'
+      - name: description
+        value: '{{ description }}'
+      - name: file_format
+        value: '{{ file_format }}'
+      - name: s3_path
         value:
-          Bucket: '{{ Bucket }}'
-          Key: '{{ Key }}'
-      - name: RoleArn
-        value: '{{ RoleArn }}'
-      - name: Tags
+          bucket: '{{ bucket }}'
+          key: '{{ key }}'
+      - name: role_arn
+        value: '{{ role_arn }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-      - name: LanguageCode
-        value: '{{ LanguageCode }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
+      - name: language_code
+        value: '{{ language_code }}'
 ```
 </TabItem>
 </Tabs>
@@ -343,7 +342,7 @@ SET PatchDocument = string('{{ {
     "LanguageCode": language_code
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Id>|<IndexId>';
+AND Identifier = '{{ id }}|{{ index_id }}';
 ```
 
 
@@ -352,7 +351,7 @@ AND Identifier = '<Id>|<IndexId>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.kendra.faqs
-WHERE Identifier = '<Id|IndexId>'
+WHERE Identifier = '{{ id }}|{{ index_id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/kendra/indices/index.md b/website/docs/services/kendra/indices/index.md
index 443dacce2..b89a38389 100644
--- a/website/docs/services/kendra/indices/index.md
+++ b/website/docs/services/kendra/indices/index.md
@@ -365,7 +365,7 @@ capacity_units,
 user_context_policy,
 user_token_configurations
 FROM awscc.kendra.indices
-WHERE region = 'us-east-1' AND Identifier = '<Id>';
+WHERE region = 'us-east-1' AND Identifier = '{{ id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -403,10 +403,10 @@ INSERT INTO awscc.kendra.indices (
  Edition,
  region
 )
-SELECT 
-'{{ Name }}',
- '{{ RoleArn }}',
- '{{ Edition }}',
+SELECT
+'{{ name }}',
+ '{{ role_arn }}',
+ '{{ edition }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -427,17 +427,17 @@ INSERT INTO awscc.kendra.indices (
  UserTokenConfigurations,
  region
 )
-SELECT 
- '{{ Description }}',
- '{{ ServerSideEncryptionConfiguration }}',
- '{{ Tags }}',
- '{{ Name }}',
- '{{ RoleArn }}',
- '{{ Edition }}',
- '{{ DocumentMetadataConfigurations }}',
- '{{ CapacityUnits }}',
- '{{ UserContextPolicy }}',
- '{{ UserTokenConfigurations }}',
+SELECT
+ '{{ description }}',
+ '{{ server_side_encryption_configuration }}',
+ '{{ tags }}',
+ '{{ name }}',
+ '{{ role_arn }}',
+ '{{ edition }}',
+ '{{ document_metadata_configurations }}',
+ '{{ capacity_units }}',
+ '{{ user_context_policy }}',
+ '{{ user_token_configurations }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -455,58 +455,57 @@ globals:
 resources:
   - name: index
     props:
-      - name: Description
-        value: '{{ Description }}'
-      - name: ServerSideEncryptionConfiguration
+      - name: description
+        value: '{{ description }}'
+      - name: server_side_encryption_configuration
         value:
-          KmsKeyId: '{{ KmsKeyId }}'
-      - name: Tags
+          kms_key_id: '{{ kms_key_id }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-      - name: Name
-        value: '{{ Name }}'
-      - name: RoleArn
-        value: '{{ RoleArn }}'
-      - name: Edition
-        value: '{{ Edition }}'
-      - name: DocumentMetadataConfigurations
+          - key: '{{ key }}'
+            value: '{{ value }}'
+      - name: name
+        value: '{{ name }}'
+      - name: role_arn
+        value: '{{ role_arn }}'
+      - name: edition
+        value: '{{ edition }}'
+      - name: document_metadata_configurations
         value:
-          - Name: '{{ Name }}'
-            Type: '{{ Type }}'
-            Relevance:
-              Freshness: '{{ Freshness }}'
-              Importance: '{{ Importance }}'
-              Duration: '{{ Duration }}'
-              RankOrder: '{{ RankOrder }}'
-              ValueImportanceItems:
-                - Key: '{{ Key }}'
-                  Value: null
-            Search:
-              Facetable: '{{ Facetable }}'
-              Searchable: '{{ Searchable }}'
-              Displayable: '{{ Displayable }}'
-              Sortable: '{{ Sortable }}'
-      - name: CapacityUnits
+          - name: '{{ name }}'
+            type: '{{ type }}'
+            relevance:
+              freshness: '{{ freshness }}'
+              importance: '{{ importance }}'
+              duration: '{{ duration }}'
+              rank_order: '{{ rank_order }}'
+              value_importance_items:
+                - key: '{{ key }}'
+                  value: null
+            search:
+              facetable: '{{ facetable }}'
+              searchable: '{{ searchable }}'
+              displayable: '{{ displayable }}'
+              sortable: '{{ sortable }}'
+      - name: capacity_units
         value:
-          StorageCapacityUnits: '{{ StorageCapacityUnits }}'
-          QueryCapacityUnits: '{{ QueryCapacityUnits }}'
-      - name: UserContextPolicy
-        value: '{{ UserContextPolicy }}'
-      - name: UserTokenConfigurations
+          storage_capacity_units: '{{ storage_capacity_units }}'
+          query_capacity_units: '{{ query_capacity_units }}'
+      - name: user_context_policy
+        value: '{{ user_context_policy }}'
+      - name: user_token_configurations
         value:
-          - JwtTokenTypeConfiguration:
-              KeyLocation: '{{ KeyLocation }}'
-              URL: '{{ URL }}'
-              SecretManagerArn: null
-              UserNameAttributeField: '{{ UserNameAttributeField }}'
-              GroupAttributeField: '{{ GroupAttributeField }}'
-              Issuer: '{{ Issuer }}'
-              ClaimRegex: '{{ ClaimRegex }}'
-            JsonTokenTypeConfiguration:
-              UserNameAttributeField: null
-              GroupAttributeField: null
-
+          - jwt_token_type_configuration:
+              key_location: '{{ key_location }}'
+              url: '{{ url }}'
+              secret_manager_arn: null
+              user_name_attribute_field: '{{ user_name_attribute_field }}'
+              group_attribute_field: '{{ group_attribute_field }}'
+              issuer: '{{ issuer }}'
+              claim_regex: '{{ claim_regex }}'
+            json_token_type_configuration:
+              user_name_attribute_field: null
+              group_attribute_field: null
 ```
 </TabItem>
 </Tabs>
@@ -529,7 +528,7 @@ SET PatchDocument = string('{{ {
     "UserTokenConfigurations": user_token_configurations
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Id>';
+AND Identifier = '{{ id }}';
 ```
 
 
@@ -538,7 +537,7 @@ AND Identifier = '<Id>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.kendra.indices
-WHERE Identifier = '<Id>'
+WHERE Identifier = '{{ id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/kendraranking/execution_plans/index.md b/website/docs/services/kendraranking/execution_plans/index.md
index a22e1c1e8..7ca0df69d 100644
--- a/website/docs/services/kendraranking/execution_plans/index.md
+++ b/website/docs/services/kendraranking/execution_plans/index.md
@@ -183,7 +183,7 @@ tags,
 name,
 capacity_units
 FROM awscc.kendraranking.execution_plans
-WHERE region = 'us-east-1' AND Identifier = '<Id>';
+WHERE region = 'us-east-1' AND Identifier = '{{ id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -219,8 +219,8 @@ INSERT INTO awscc.kendraranking.execution_plans (
  Name,
  region
 )
-SELECT 
-'{{ Name }}',
+SELECT
+'{{ name }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -235,11 +235,11 @@ INSERT INTO awscc.kendraranking.execution_plans (
  CapacityUnits,
  region
 )
-SELECT 
- '{{ Description }}',
- '{{ Tags }}',
- '{{ Name }}',
- '{{ CapacityUnits }}',
+SELECT
+ '{{ description }}',
+ '{{ tags }}',
+ '{{ name }}',
+ '{{ capacity_units }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -257,18 +257,17 @@ globals:
 resources:
   - name: execution_plan
     props:
-      - name: Description
-        value: '{{ Description }}'
-      - name: Tags
+      - name: description
+        value: '{{ description }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-      - name: Name
-        value: '{{ Name }}'
-      - name: CapacityUnits
+          - key: '{{ key }}'
+            value: '{{ value }}'
+      - name: name
+        value: '{{ name }}'
+      - name: capacity_units
         value:
-          RescoreCapacityUnits: '{{ RescoreCapacityUnits }}'
-
+          rescore_capacity_units: '{{ rescore_capacity_units }}'
 ```
 </TabItem>
 </Tabs>
@@ -287,7 +286,7 @@ SET PatchDocument = string('{{ {
     "CapacityUnits": capacity_units
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Id>';
+AND Identifier = '{{ id }}';
 ```
 
 
@@ -296,7 +295,7 @@ AND Identifier = '<Id>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.kendraranking.execution_plans
-WHERE Identifier = '<Id>'
+WHERE Identifier = '{{ id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/kinesis/resource_policies/index.md b/website/docs/services/kinesis/resource_policies/index.md
index f37592437..8afc86aed 100644
--- a/website/docs/services/kinesis/resource_policies/index.md
+++ b/website/docs/services/kinesis/resource_policies/index.md
@@ -94,7 +94,7 @@ region,
 resource_arn,
 resource_policy
 FROM awscc.kinesis.resource_policies
-WHERE region = 'us-east-1' AND Identifier = '<ResourceArn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ resource_arn }}';
 ```
 
 ## `INSERT` example
@@ -118,9 +118,9 @@ INSERT INTO awscc.kinesis.resource_policies (
  ResourcePolicy,
  region
 )
-SELECT 
-'{{ ResourceArn }}',
- '{{ ResourcePolicy }}',
+SELECT
+'{{ resource_arn }}',
+ '{{ resource_policy }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -133,9 +133,9 @@ INSERT INTO awscc.kinesis.resource_policies (
  ResourcePolicy,
  region
 )
-SELECT 
- '{{ ResourceArn }}',
- '{{ ResourcePolicy }}',
+SELECT
+ '{{ resource_arn }}',
+ '{{ resource_policy }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -153,11 +153,10 @@ globals:
 resources:
   - name: resource_policy
     props:
-      - name: ResourceArn
-        value: '{{ ResourceArn }}'
-      - name: ResourcePolicy
+      - name: resource_arn
+        value: '{{ resource_arn }}'
+      - name: resource_policy
         value: {}
-
 ```
 </TabItem>
 </Tabs>
@@ -173,7 +172,7 @@ SET PatchDocument = string('{{ {
     "ResourcePolicy": resource_policy
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<ResourceArn>';
+AND Identifier = '{{ resource_arn }}';
 ```
 
 
@@ -182,7 +181,7 @@ AND Identifier = '<ResourceArn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.kinesis.resource_policies
-WHERE Identifier = '<ResourceArn>'
+WHERE Identifier = '{{ resource_arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/kinesis/stream_consumers/index.md b/website/docs/services/kinesis/stream_consumers/index.md
index 77e12e095..ec519150a 100644
--- a/website/docs/services/kinesis/stream_consumers/index.md
+++ b/website/docs/services/kinesis/stream_consumers/index.md
@@ -170,7 +170,7 @@ consumer_status,
 stream_arn,
 tags
 FROM awscc.kinesis.stream_consumers
-WHERE region = 'us-east-1' AND Identifier = '<ConsumerARN>';
+WHERE region = 'us-east-1' AND Identifier = '{{ consumer_arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -207,9 +207,9 @@ INSERT INTO awscc.kinesis.stream_consumers (
  StreamARN,
  region
 )
-SELECT 
-'{{ ConsumerName }}',
- '{{ StreamARN }}',
+SELECT
+'{{ consumer_name }}',
+ '{{ stream_arn }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -223,10 +223,10 @@ INSERT INTO awscc.kinesis.stream_consumers (
  Tags,
  region
 )
-SELECT 
- '{{ ConsumerName }}',
- '{{ StreamARN }}',
- '{{ Tags }}',
+SELECT
+ '{{ consumer_name }}',
+ '{{ stream_arn }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -244,15 +244,14 @@ globals:
 resources:
   - name: stream_consumer
     props:
-      - name: ConsumerName
-        value: '{{ ConsumerName }}'
-      - name: StreamARN
-        value: '{{ StreamARN }}'
-      - name: Tags
+      - name: consumer_name
+        value: '{{ consumer_name }}'
+      - name: stream_arn
+        value: '{{ stream_arn }}'
+      - name: tags
         value:
-          - Value: '{{ Value }}'
-            Key: '{{ Key }}'
-
+          - value: '{{ value }}'
+            key: '{{ key }}'
 ```
 </TabItem>
 </Tabs>
@@ -263,7 +262,7 @@ resources:
 ```sql
 /*+ delete */
 DELETE FROM awscc.kinesis.stream_consumers
-WHERE Identifier = '<ConsumerARN>'
+WHERE Identifier = '{{ consumer_arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/kinesis/streams/index.md b/website/docs/services/kinesis/streams/index.md
index 94adfdf49..09fbdce74 100644
--- a/website/docs/services/kinesis/streams/index.md
+++ b/website/docs/services/kinesis/streams/index.md
@@ -207,7 +207,7 @@ stream_mode_details,
 stream_encryption,
 tags
 FROM awscc.kinesis.streams
-WHERE region = 'us-east-1' AND Identifier = '<Name>';
+WHERE region = 'us-east-1' AND Identifier = '{{ name }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -249,14 +249,14 @@ INSERT INTO awscc.kinesis.streams (
  Tags,
  region
 )
-SELECT 
-'{{ Name }}',
- '{{ DesiredShardLevelMetrics }}',
- '{{ RetentionPeriodHours }}',
- '{{ ShardCount }}',
- '{{ StreamModeDetails }}',
- '{{ StreamEncryption }}',
- '{{ Tags }}',
+SELECT
+'{{ name }}',
+ '{{ desired_shard_level_metrics }}',
+ '{{ retention_period_hours }}',
+ '{{ shard_count }}',
+ '{{ stream_mode_details }}',
+ '{{ stream_encryption }}',
+ '{{ tags }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -274,14 +274,14 @@ INSERT INTO awscc.kinesis.streams (
  Tags,
  region
 )
-SELECT 
- '{{ Name }}',
- '{{ DesiredShardLevelMetrics }}',
- '{{ RetentionPeriodHours }}',
- '{{ ShardCount }}',
- '{{ StreamModeDetails }}',
- '{{ StreamEncryption }}',
- '{{ Tags }}',
+SELECT
+ '{{ name }}',
+ '{{ desired_shard_level_metrics }}',
+ '{{ retention_period_hours }}',
+ '{{ shard_count }}',
+ '{{ stream_mode_details }}',
+ '{{ stream_encryption }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -299,27 +299,26 @@ globals:
 resources:
   - name: stream
     props:
-      - name: Name
-        value: '{{ Name }}'
-      - name: DesiredShardLevelMetrics
+      - name: name
+        value: '{{ name }}'
+      - name: desired_shard_level_metrics
         value:
-          - '{{ DesiredShardLevelMetrics[0] }}'
-      - name: RetentionPeriodHours
-        value: '{{ RetentionPeriodHours }}'
-      - name: ShardCount
-        value: '{{ ShardCount }}'
-      - name: StreamModeDetails
+          - '{{ desired_shard_level_metrics[0] }}'
+      - name: retention_period_hours
+        value: '{{ retention_period_hours }}'
+      - name: shard_count
+        value: '{{ shard_count }}'
+      - name: stream_mode_details
         value:
-          StreamMode: '{{ StreamMode }}'
-      - name: StreamEncryption
+          stream_mode: '{{ stream_mode }}'
+      - name: stream_encryption
         value:
-          EncryptionType: '{{ EncryptionType }}'
-          KeyId: '{{ KeyId }}'
-      - name: Tags
+          encryption_type: '{{ encryption_type }}'
+          key_id: '{{ key_id }}'
+      - name: tags
         value:
-          - Value: '{{ Value }}'
-            Key: '{{ Key }}'
-
+          - value: '{{ value }}'
+            key: '{{ key }}'
 ```
 </TabItem>
 </Tabs>
@@ -340,7 +339,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Name>';
+AND Identifier = '{{ name }}';
 ```
 
 
@@ -349,7 +348,7 @@ AND Identifier = '<Name>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.kinesis.streams
-WHERE Identifier = '<Name>'
+WHERE Identifier = '{{ name }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/kinesisanalyticsv2/applications/index.md b/website/docs/services/kinesisanalyticsv2/applications/index.md
index c890d46b0..b57e555c1 100644
--- a/website/docs/services/kinesisanalyticsv2/applications/index.md
+++ b/website/docs/services/kinesisanalyticsv2/applications/index.md
@@ -542,7 +542,7 @@ run_configuration,
 application_maintenance_configuration,
 tags
 FROM awscc.kinesisanalyticsv2.applications
-WHERE region = 'us-east-1' AND Identifier = '<ApplicationName>';
+WHERE region = 'us-east-1' AND Identifier = '{{ application_name }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -579,9 +579,9 @@ INSERT INTO awscc.kinesisanalyticsv2.applications (
  ServiceExecutionRole,
  region
 )
-SELECT 
-'{{ RuntimeEnvironment }}',
- '{{ ServiceExecutionRole }}',
+SELECT
+'{{ runtime_environment }}',
+ '{{ service_execution_role }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -601,16 +601,16 @@ INSERT INTO awscc.kinesisanalyticsv2.applications (
  Tags,
  region
 )
-SELECT 
- '{{ ApplicationConfiguration }}',
- '{{ ApplicationDescription }}',
- '{{ ApplicationMode }}',
- '{{ ApplicationName }}',
- '{{ RuntimeEnvironment }}',
- '{{ ServiceExecutionRole }}',
- '{{ RunConfiguration }}',
- '{{ ApplicationMaintenanceConfiguration }}',
- '{{ Tags }}',
+SELECT
+ '{{ application_configuration }}',
+ '{{ application_description }}',
+ '{{ application_mode }}',
+ '{{ application_name }}',
+ '{{ runtime_environment }}',
+ '{{ service_execution_role }}',
+ '{{ run_configuration }}',
+ '{{ application_maintenance_configuration }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -628,116 +628,115 @@ globals:
 resources:
   - name: application
     props:
-      - name: ApplicationConfiguration
+      - name: application_configuration
         value:
-          ApplicationCodeConfiguration:
-            CodeContent:
-              ZipFileContent: '{{ ZipFileContent }}'
-              S3ContentLocation:
-                BucketARN: '{{ BucketARN }}'
-                FileKey: '{{ FileKey }}'
-                ObjectVersion: '{{ ObjectVersion }}'
-              TextContent: '{{ TextContent }}'
-            CodeContentType: '{{ CodeContentType }}'
-          ApplicationEncryptionConfiguration:
-            KeyId: '{{ KeyId }}'
-            KeyType: '{{ KeyType }}'
-          ApplicationSnapshotConfiguration:
-            SnapshotsEnabled: '{{ SnapshotsEnabled }}'
-          ApplicationSystemRollbackConfiguration:
-            RollbackEnabled: '{{ RollbackEnabled }}'
-          EnvironmentProperties:
-            PropertyGroups:
-              - PropertyGroupId: '{{ PropertyGroupId }}'
-                PropertyMap: {}
-          FlinkApplicationConfiguration:
-            CheckpointConfiguration:
-              ConfigurationType: '{{ ConfigurationType }}'
-              CheckpointingEnabled: '{{ CheckpointingEnabled }}'
-              CheckpointInterval: '{{ CheckpointInterval }}'
-              MinPauseBetweenCheckpoints: '{{ MinPauseBetweenCheckpoints }}'
-            MonitoringConfiguration:
-              ConfigurationType: '{{ ConfigurationType }}'
-              MetricsLevel: '{{ MetricsLevel }}'
-              LogLevel: '{{ LogLevel }}'
-            ParallelismConfiguration:
-              ConfigurationType: '{{ ConfigurationType }}'
-              ParallelismPerKPU: '{{ ParallelismPerKPU }}'
-              Parallelism: '{{ Parallelism }}'
-              AutoScalingEnabled: '{{ AutoScalingEnabled }}'
-          SqlApplicationConfiguration:
-            Inputs:
-              - NamePrefix: '{{ NamePrefix }}'
-                InputSchema:
-                  RecordEncoding: '{{ RecordEncoding }}'
-                  RecordColumns:
-                    - Mapping: '{{ Mapping }}'
-                      Name: '{{ Name }}'
-                      SqlType: '{{ SqlType }}'
-                  RecordFormat:
-                    RecordFormatType: '{{ RecordFormatType }}'
-                    MappingParameters:
-                      CSVMappingParameters:
-                        RecordColumnDelimiter: '{{ RecordColumnDelimiter }}'
-                        RecordRowDelimiter: '{{ RecordRowDelimiter }}'
-                      JSONMappingParameters:
-                        RecordRowPath: '{{ RecordRowPath }}'
-                KinesisStreamsInput:
-                  ResourceARN: null
-                KinesisFirehoseInput:
-                  ResourceARN: null
-                InputProcessingConfiguration:
-                  InputLambdaProcessor:
-                    ResourceARN: null
-                InputParallelism:
-                  Count: '{{ Count }}'
-          ZeppelinApplicationConfiguration:
-            CatalogConfiguration:
-              GlueDataCatalogConfiguration:
-                DatabaseARN: null
-            MonitoringConfiguration:
-              LogLevel: '{{ LogLevel }}'
-            DeployAsApplicationConfiguration:
-              S3ContentLocation:
-                BucketARN: null
-                BasePath: '{{ BasePath }}'
-            CustomArtifactsConfiguration:
-              - ArtifactType: '{{ ArtifactType }}'
-                MavenReference:
-                  ArtifactId: '{{ ArtifactId }}'
-                  GroupId: '{{ GroupId }}'
-                  Version: '{{ Version }}'
-                S3ContentLocation: null
-          VpcConfigurations:
-            - SecurityGroupIds:
-                - '{{ SecurityGroupIds[0] }}'
-              SubnetIds:
-                - '{{ SubnetIds[0] }}'
-      - name: ApplicationDescription
-        value: '{{ ApplicationDescription }}'
-      - name: ApplicationMode
-        value: '{{ ApplicationMode }}'
-      - name: ApplicationName
-        value: '{{ ApplicationName }}'
-      - name: RuntimeEnvironment
-        value: '{{ RuntimeEnvironment }}'
-      - name: ServiceExecutionRole
+          application_code_configuration:
+            code_content:
+              zip_file_content: '{{ zip_file_content }}'
+              s3_content_location:
+                bucket_arn: '{{ bucket_arn }}'
+                file_key: '{{ file_key }}'
+                object_version: '{{ object_version }}'
+              text_content: '{{ text_content }}'
+            code_content_type: '{{ code_content_type }}'
+          application_encryption_configuration:
+            key_id: '{{ key_id }}'
+            key_type: '{{ key_type }}'
+          application_snapshot_configuration:
+            snapshots_enabled: '{{ snapshots_enabled }}'
+          application_system_rollback_configuration:
+            rollback_enabled: '{{ rollback_enabled }}'
+          environment_properties:
+            property_groups:
+              - property_group_id: '{{ property_group_id }}'
+                property_map: {}
+          flink_application_configuration:
+            checkpoint_configuration:
+              configuration_type: '{{ configuration_type }}'
+              checkpointing_enabled: '{{ checkpointing_enabled }}'
+              checkpoint_interval: '{{ checkpoint_interval }}'
+              min_pause_between_checkpoints: '{{ min_pause_between_checkpoints }}'
+            monitoring_configuration:
+              configuration_type: '{{ configuration_type }}'
+              metrics_level: '{{ metrics_level }}'
+              log_level: '{{ log_level }}'
+            parallelism_configuration:
+              configuration_type: '{{ configuration_type }}'
+              parallelism_per_kp_u: '{{ parallelism_per_kp_u }}'
+              parallelism: '{{ parallelism }}'
+              auto_scaling_enabled: '{{ auto_scaling_enabled }}'
+          sql_application_configuration:
+            inputs:
+              - name_prefix: '{{ name_prefix }}'
+                input_schema:
+                  record_encoding: '{{ record_encoding }}'
+                  record_columns:
+                    - mapping: '{{ mapping }}'
+                      name: '{{ name }}'
+                      sql_type: '{{ sql_type }}'
+                  record_format:
+                    record_format_type: '{{ record_format_type }}'
+                    mapping_parameters:
+                      c_sv_mapping_parameters:
+                        record_column_delimiter: '{{ record_column_delimiter }}'
+                        record_row_delimiter: '{{ record_row_delimiter }}'
+                      j_so_nmapping_parameters:
+                        record_row_path: '{{ record_row_path }}'
+                kinesis_streams_input:
+                  resource_arn: null
+                kinesis_firehose_input:
+                  resource_arn: null
+                input_processing_configuration:
+                  input_lambda_processor:
+                    resource_arn: null
+                input_parallelism:
+                  count: '{{ count }}'
+          zeppelin_application_configuration:
+            catalog_configuration:
+              glue_data_catalog_configuration:
+                database_arn: null
+            monitoring_configuration:
+              log_level: '{{ log_level }}'
+            deploy_as_application_configuration:
+              s3_content_location:
+                bucket_arn: null
+                base_path: '{{ base_path }}'
+            custom_artifacts_configuration:
+              - artifact_type: '{{ artifact_type }}'
+                maven_reference:
+                  artifact_id: '{{ artifact_id }}'
+                  group_id: '{{ group_id }}'
+                  version: '{{ version }}'
+                s3_content_location: null
+          vpc_configurations:
+            - security_group_ids:
+                - '{{ security_group_ids[0] }}'
+              subnet_ids:
+                - '{{ subnet_ids[0] }}'
+      - name: application_description
+        value: '{{ application_description }}'
+      - name: application_mode
+        value: '{{ application_mode }}'
+      - name: application_name
+        value: '{{ application_name }}'
+      - name: runtime_environment
+        value: '{{ runtime_environment }}'
+      - name: service_execution_role
         value: null
-      - name: RunConfiguration
+      - name: run_configuration
         value:
-          ApplicationRestoreConfiguration:
-            ApplicationRestoreType: '{{ ApplicationRestoreType }}'
-            SnapshotName: '{{ SnapshotName }}'
-          FlinkRunConfiguration:
-            AllowNonRestoredState: '{{ AllowNonRestoredState }}'
-      - name: ApplicationMaintenanceConfiguration
+          application_restore_configuration:
+            application_restore_type: '{{ application_restore_type }}'
+            snapshot_name: '{{ snapshot_name }}'
+          flink_run_configuration:
+            allow_non_restored_state: '{{ allow_non_restored_state }}'
+      - name: application_maintenance_configuration
         value:
-          ApplicationMaintenanceWindowStartTime: '{{ ApplicationMaintenanceWindowStartTime }}'
-      - name: Tags
+          application_maintenance_window_start_time: '{{ application_maintenance_window_start_time }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -759,7 +758,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<ApplicationName>';
+AND Identifier = '{{ application_name }}';
 ```
 
 
@@ -768,7 +767,7 @@ AND Identifier = '<ApplicationName>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.kinesisanalyticsv2.applications
-WHERE Identifier = '<ApplicationName>'
+WHERE Identifier = '{{ application_name }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/kinesisfirehose/delivery_streams/index.md b/website/docs/services/kinesisfirehose/delivery_streams/index.md
index ea13afa0f..5089270ea 100644
--- a/website/docs/services/kinesisfirehose/delivery_streams/index.md
+++ b/website/docs/services/kinesisfirehose/delivery_streams/index.md
@@ -2790,7 +2790,7 @@ delivery_stream_name,
 arn,
 tags
 FROM awscc.kinesisfirehose.delivery_streams
-WHERE region = 'us-east-1' AND Identifier = '<DeliveryStreamName>';
+WHERE region = 'us-east-1' AND Identifier = '{{ delivery_stream_name }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -2843,25 +2843,25 @@ INSERT INTO awscc.kinesisfirehose.delivery_streams (
  Tags,
  region
 )
-SELECT 
-'{{ DeliveryStreamEncryptionConfigurationInput }}',
- '{{ HttpEndpointDestinationConfiguration }}',
- '{{ KinesisStreamSourceConfiguration }}',
- '{{ DeliveryStreamType }}',
- '{{ IcebergDestinationConfiguration }}',
- '{{ RedshiftDestinationConfiguration }}',
- '{{ AmazonopensearchserviceDestinationConfiguration }}',
- '{{ MSKSourceConfiguration }}',
- '{{ DirectPutSourceConfiguration }}',
- '{{ SplunkDestinationConfiguration }}',
- '{{ ExtendedS3DestinationConfiguration }}',
- '{{ AmazonOpenSearchServerlessDestinationConfiguration }}',
- '{{ ElasticsearchDestinationConfiguration }}',
- '{{ SnowflakeDestinationConfiguration }}',
- '{{ DatabaseSourceConfiguration }}',
- '{{ S3DestinationConfiguration }}',
- '{{ DeliveryStreamName }}',
- '{{ Tags }}',
+SELECT
+'{{ delivery_stream_encryption_configuration_input }}',
+ '{{ http_endpoint_destination_configuration }}',
+ '{{ kinesis_stream_source_configuration }}',
+ '{{ delivery_stream_type }}',
+ '{{ iceberg_destination_configuration }}',
+ '{{ redshift_destination_configuration }}',
+ '{{ amazonopensearchservice_destination_configuration }}',
+ '{{ msk_source_configuration }}',
+ '{{ direct_put_source_configuration }}',
+ '{{ splunk_destination_configuration }}',
+ '{{ extended_s3_destination_configuration }}',
+ '{{ amazon_open_search_serverless_destination_configuration }}',
+ '{{ elasticsearch_destination_configuration }}',
+ '{{ snowflake_destination_configuration }}',
+ '{{ database_source_configuration }}',
+ '{{ s3_destination_configuration }}',
+ '{{ delivery_stream_name }}',
+ '{{ tags }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -2890,25 +2890,25 @@ INSERT INTO awscc.kinesisfirehose.delivery_streams (
  Tags,
  region
 )
-SELECT 
- '{{ DeliveryStreamEncryptionConfigurationInput }}',
- '{{ HttpEndpointDestinationConfiguration }}',
- '{{ KinesisStreamSourceConfiguration }}',
- '{{ DeliveryStreamType }}',
- '{{ IcebergDestinationConfiguration }}',
- '{{ RedshiftDestinationConfiguration }}',
- '{{ AmazonopensearchserviceDestinationConfiguration }}',
- '{{ MSKSourceConfiguration }}',
- '{{ DirectPutSourceConfiguration }}',
- '{{ SplunkDestinationConfiguration }}',
- '{{ ExtendedS3DestinationConfiguration }}',
- '{{ AmazonOpenSearchServerlessDestinationConfiguration }}',
- '{{ ElasticsearchDestinationConfiguration }}',
- '{{ SnowflakeDestinationConfiguration }}',
- '{{ DatabaseSourceConfiguration }}',
- '{{ S3DestinationConfiguration }}',
- '{{ DeliveryStreamName }}',
- '{{ Tags }}',
+SELECT
+ '{{ delivery_stream_encryption_configuration_input }}',
+ '{{ http_endpoint_destination_configuration }}',
+ '{{ kinesis_stream_source_configuration }}',
+ '{{ delivery_stream_type }}',
+ '{{ iceberg_destination_configuration }}',
+ '{{ redshift_destination_configuration }}',
+ '{{ amazonopensearchservice_destination_configuration }}',
+ '{{ msk_source_configuration }}',
+ '{{ direct_put_source_configuration }}',
+ '{{ splunk_destination_configuration }}',
+ '{{ extended_s3_destination_configuration }}',
+ '{{ amazon_open_search_serverless_destination_configuration }}',
+ '{{ elasticsearch_destination_configuration }}',
+ '{{ snowflake_destination_configuration }}',
+ '{{ database_source_configuration }}',
+ '{{ s3_destination_configuration }}',
+ '{{ delivery_stream_name }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -2926,315 +2926,314 @@ globals:
 resources:
   - name: delivery_stream
     props:
-      - name: DeliveryStreamEncryptionConfigurationInput
+      - name: delivery_stream_encryption_configuration_input
         value:
-          KeyType: '{{ KeyType }}'
-          KeyARN: '{{ KeyARN }}'
-      - name: HttpEndpointDestinationConfiguration
+          key_type: '{{ key_type }}'
+          key_arn: '{{ key_arn }}'
+      - name: http_endpoint_destination_configuration
         value:
-          RequestConfiguration:
-            CommonAttributes:
-              - AttributeValue: '{{ AttributeValue }}'
-                AttributeName: '{{ AttributeName }}'
-            ContentEncoding: '{{ ContentEncoding }}'
-          S3Configuration:
-            ErrorOutputPrefix: '{{ ErrorOutputPrefix }}'
-            BucketARN: '{{ BucketARN }}'
-            BufferingHints:
-              IntervalInSeconds: '{{ IntervalInSeconds }}'
-              SizeInMBs: '{{ SizeInMBs }}'
-            CompressionFormat: '{{ CompressionFormat }}'
-            EncryptionConfiguration:
-              KMSEncryptionConfig:
-                AWSKMSKeyARN: '{{ AWSKMSKeyARN }}'
-              NoEncryptionConfig: '{{ NoEncryptionConfig }}'
-            Prefix: '{{ Prefix }}'
-            CloudWatchLoggingOptions:
-              LogStreamName: '{{ LogStreamName }}'
-              Enabled: '{{ Enabled }}'
-              LogGroupName: '{{ LogGroupName }}'
-            RoleARN: '{{ RoleARN }}'
-          BufferingHints: null
-          RetryOptions:
-            DurationInSeconds: '{{ DurationInSeconds }}'
-          SecretsManagerConfiguration:
-            SecretARN: '{{ SecretARN }}'
-            Enabled: '{{ Enabled }}'
-            RoleARN: '{{ RoleARN }}'
-          EndpointConfiguration:
-            AccessKey: '{{ AccessKey }}'
-            Url: '{{ Url }}'
-            Name: '{{ Name }}'
-          ProcessingConfiguration:
-            Enabled: '{{ Enabled }}'
-            Processors:
-              - Type: '{{ Type }}'
-                Parameters:
-                  - ParameterValue: '{{ ParameterValue }}'
-                    ParameterName: '{{ ParameterName }}'
-          RoleARN: '{{ RoleARN }}'
-          CloudWatchLoggingOptions: null
-          S3BackupMode: '{{ S3BackupMode }}'
-      - name: KinesisStreamSourceConfiguration
+          request_configuration:
+            common_attributes:
+              - attribute_value: '{{ attribute_value }}'
+                attribute_name: '{{ attribute_name }}'
+            content_encoding: '{{ content_encoding }}'
+          s3_configuration:
+            error_output_prefix: '{{ error_output_prefix }}'
+            bucket_arn: '{{ bucket_arn }}'
+            buffering_hints:
+              interval_in_seconds: '{{ interval_in_seconds }}'
+              size_in_mbs: '{{ size_in_mbs }}'
+            compression_format: '{{ compression_format }}'
+            encryption_configuration:
+              kms_encryption_config:
+                aws_kms_key_arn: '{{ aws_kms_key_arn }}'
+              no_encryption_config: '{{ no_encryption_config }}'
+            prefix: '{{ prefix }}'
+            cloud_watch_logging_options:
+              log_stream_name: '{{ log_stream_name }}'
+              enabled: '{{ enabled }}'
+              log_group_name: '{{ log_group_name }}'
+            role_arn: '{{ role_arn }}'
+          buffering_hints: null
+          retry_options:
+            duration_in_seconds: '{{ duration_in_seconds }}'
+          secrets_manager_configuration:
+            secret_arn: '{{ secret_arn }}'
+            enabled: '{{ enabled }}'
+            role_arn: '{{ role_arn }}'
+          endpoint_configuration:
+            access_key: '{{ access_key }}'
+            url: '{{ url }}'
+            name: '{{ name }}'
+          processing_configuration:
+            enabled: '{{ enabled }}'
+            processors:
+              - type: '{{ type }}'
+                parameters:
+                  - parameter_value: '{{ parameter_value }}'
+                    parameter_name: '{{ parameter_name }}'
+          role_arn: '{{ role_arn }}'
+          cloud_watch_logging_options: null
+          s3_backup_mode: '{{ s3_backup_mode }}'
+      - name: kinesis_stream_source_configuration
         value:
-          KinesisStreamARN: '{{ KinesisStreamARN }}'
-          RoleARN: '{{ RoleARN }}'
-      - name: DeliveryStreamType
-        value: '{{ DeliveryStreamType }}'
-      - name: IcebergDestinationConfiguration
+          kinesis_stream_arn: '{{ kinesis_stream_arn }}'
+          role_arn: '{{ role_arn }}'
+      - name: delivery_stream_type
+        value: '{{ delivery_stream_type }}'
+      - name: iceberg_destination_configuration
         value:
-          CatalogConfiguration:
-            CatalogArn: '{{ CatalogArn }}'
-            WarehouseLocation: '{{ WarehouseLocation }}'
-          S3Configuration: null
-          DestinationTableConfigurationList:
-            - DestinationDatabaseName: '{{ DestinationDatabaseName }}'
-              S3ErrorOutputPrefix: '{{ S3ErrorOutputPrefix }}'
-              DestinationTableName: '{{ DestinationTableName }}'
-              UniqueKeys:
-                - '{{ UniqueKeys[0] }}'
-              PartitionSpec:
-                Identity:
-                  - SourceName: '{{ SourceName }}'
-          BufferingHints: null
-          TableCreationConfiguration:
-            Enabled: '{{ Enabled }}'
-          RetryOptions: null
-          s3BackupMode: '{{ s3BackupMode }}'
-          ProcessingConfiguration: null
-          SchemaEvolutionConfiguration:
-            Enabled: '{{ Enabled }}'
-          AppendOnly: '{{ AppendOnly }}'
-          CloudWatchLoggingOptions: null
-          RoleARN: '{{ RoleARN }}'
-      - name: RedshiftDestinationConfiguration
+          catalog_configuration:
+            catalog_arn: '{{ catalog_arn }}'
+            warehouse_location: '{{ warehouse_location }}'
+          s3_configuration: null
+          destination_table_configuration_list:
+            - destination_database_name: '{{ destination_database_name }}'
+              s3_error_output_prefix: '{{ s3_error_output_prefix }}'
+              destination_table_name: '{{ destination_table_name }}'
+              unique_keys:
+                - '{{ unique_keys[0] }}'
+              partition_spec:
+                identity:
+                  - source_name: '{{ source_name }}'
+          buffering_hints: null
+          table_creation_configuration:
+            enabled: '{{ enabled }}'
+          retry_options: null
+          s3_backup_mode: '{{ s3_backup_mode }}'
+          processing_configuration: null
+          schema_evolution_configuration:
+            enabled: '{{ enabled }}'
+          append_only: '{{ append_only }}'
+          cloud_watch_logging_options: null
+          role_arn: '{{ role_arn }}'
+      - name: redshift_destination_configuration
         value:
-          S3BackupConfiguration: null
-          S3Configuration: null
-          Username: '{{ Username }}'
-          CopyCommand:
-            DataTableName: '{{ DataTableName }}'
-            CopyOptions: '{{ CopyOptions }}'
-            DataTableColumns: '{{ DataTableColumns }}'
-          RetryOptions:
-            DurationInSeconds: '{{ DurationInSeconds }}'
-          SecretsManagerConfiguration: null
-          ProcessingConfiguration: null
-          CloudWatchLoggingOptions: null
-          ClusterJDBCURL: '{{ ClusterJDBCURL }}'
-          RoleARN: '{{ RoleARN }}'
-          Password: '{{ Password }}'
-          S3BackupMode: '{{ S3BackupMode }}'
-      - name: AmazonopensearchserviceDestinationConfiguration
+          s3_backup_configuration: null
+          s3_configuration: null
+          username: '{{ username }}'
+          copy_command:
+            data_table_name: '{{ data_table_name }}'
+            copy_options: '{{ copy_options }}'
+            data_table_columns: '{{ data_table_columns }}'
+          retry_options:
+            duration_in_seconds: '{{ duration_in_seconds }}'
+          secrets_manager_configuration: null
+          processing_configuration: null
+          cloud_watch_logging_options: null
+          cluster_jdb_curl: '{{ cluster_jdb_curl }}'
+          role_arn: '{{ role_arn }}'
+          password: '{{ password }}'
+          s3_backup_mode: '{{ s3_backup_mode }}'
+      - name: amazonopensearchservice_destination_configuration
         value:
-          TypeName: '{{ TypeName }}'
-          IndexRotationPeriod: '{{ IndexRotationPeriod }}'
-          ProcessingConfiguration: null
-          ClusterEndpoint: '{{ ClusterEndpoint }}'
-          DomainARN: '{{ DomainARN }}'
-          RoleARN: '{{ RoleARN }}'
-          S3BackupMode: '{{ S3BackupMode }}'
-          IndexName: '{{ IndexName }}'
-          DocumentIdOptions:
-            DefaultDocumentIdFormat: '{{ DefaultDocumentIdFormat }}'
-          S3Configuration: null
-          BufferingHints:
-            IntervalInSeconds: '{{ IntervalInSeconds }}'
-            SizeInMBs: '{{ SizeInMBs }}'
-          RetryOptions:
-            DurationInSeconds: '{{ DurationInSeconds }}'
-          VpcConfiguration:
-            SubnetIds:
-              - '{{ SubnetIds[0] }}'
-            SecurityGroupIds:
-              - '{{ SecurityGroupIds[0] }}'
-            RoleARN: '{{ RoleARN }}'
-          CloudWatchLoggingOptions: null
-      - name: MSKSourceConfiguration
+          type_name: '{{ type_name }}'
+          index_rotation_period: '{{ index_rotation_period }}'
+          processing_configuration: null
+          cluster_endpoint: '{{ cluster_endpoint }}'
+          domain_arn: '{{ domain_arn }}'
+          role_arn: '{{ role_arn }}'
+          s3_backup_mode: '{{ s3_backup_mode }}'
+          index_name: '{{ index_name }}'
+          document_id_options:
+            default_document_id_format: '{{ default_document_id_format }}'
+          s3_configuration: null
+          buffering_hints:
+            interval_in_seconds: '{{ interval_in_seconds }}'
+            size_in_mbs: '{{ size_in_mbs }}'
+          retry_options:
+            duration_in_seconds: '{{ duration_in_seconds }}'
+          vpc_configuration:
+            subnet_ids:
+              - '{{ subnet_ids[0] }}'
+            security_group_ids:
+              - '{{ security_group_ids[0] }}'
+            role_arn: '{{ role_arn }}'
+          cloud_watch_logging_options: null
+      - name: msk_source_configuration
         value:
-          AuthenticationConfiguration:
-            Connectivity: '{{ Connectivity }}'
-            RoleARN: '{{ RoleARN }}'
-          ReadFromTimestamp: '{{ ReadFromTimestamp }}'
-          MSKClusterARN: '{{ MSKClusterARN }}'
-          TopicName: '{{ TopicName }}'
-      - name: DirectPutSourceConfiguration
+          authentication_configuration:
+            connectivity: '{{ connectivity }}'
+            role_arn: '{{ role_arn }}'
+          read_from_timestamp: '{{ read_from_timestamp }}'
+          msk_cluster_arn: '{{ msk_cluster_arn }}'
+          topic_name: '{{ topic_name }}'
+      - name: direct_put_source_configuration
         value:
-          ThroughputHintInMBs: '{{ ThroughputHintInMBs }}'
-      - name: SplunkDestinationConfiguration
+          throughput_hint_in_mbs: '{{ throughput_hint_in_mbs }}'
+      - name: splunk_destination_configuration
         value:
-          HECEndpoint: '{{ HECEndpoint }}'
-          S3Configuration: null
-          BufferingHints:
-            IntervalInSeconds: '{{ IntervalInSeconds }}'
-            SizeInMBs: '{{ SizeInMBs }}'
-          HECToken: '{{ HECToken }}'
-          RetryOptions:
-            DurationInSeconds: '{{ DurationInSeconds }}'
-          HECEndpointType: '{{ HECEndpointType }}'
-          SecretsManagerConfiguration: null
-          HECAcknowledgmentTimeoutInSeconds: '{{ HECAcknowledgmentTimeoutInSeconds }}'
-          ProcessingConfiguration: null
-          CloudWatchLoggingOptions: null
-          S3BackupMode: '{{ S3BackupMode }}'
-      - name: ExtendedS3DestinationConfiguration
+          h_ec_endpoint: '{{ h_ec_endpoint }}'
+          s3_configuration: null
+          buffering_hints:
+            interval_in_seconds: '{{ interval_in_seconds }}'
+            size_in_mbs: '{{ size_in_mbs }}'
+          h_ec_token: '{{ h_ec_token }}'
+          retry_options:
+            duration_in_seconds: '{{ duration_in_seconds }}'
+          h_ec_endpoint_type: '{{ h_ec_endpoint_type }}'
+          secrets_manager_configuration: null
+          h_ecacknowledgment_timeout_in_seconds: '{{ h_ecacknowledgment_timeout_in_seconds }}'
+          processing_configuration: null
+          cloud_watch_logging_options: null
+          s3_backup_mode: '{{ s3_backup_mode }}'
+      - name: extended_s3_destination_configuration
         value:
-          ErrorOutputPrefix: '{{ ErrorOutputPrefix }}'
-          S3BackupConfiguration: null
-          BucketARN: '{{ BucketARN }}'
-          CompressionFormat: '{{ CompressionFormat }}'
-          DataFormatConversionConfiguration:
-            InputFormatConfiguration:
-              Deserializer:
-                HiveJsonSerDe:
-                  TimestampFormats:
-                    - '{{ TimestampFormats[0] }}'
-                OpenXJsonSerDe:
-                  ConvertDotsInJsonKeysToUnderscores: '{{ ConvertDotsInJsonKeysToUnderscores }}'
-                  ColumnToJsonKeyMappings: {}
-                  CaseInsensitive: '{{ CaseInsensitive }}'
-            Enabled: '{{ Enabled }}'
-            SchemaConfiguration:
-              VersionId: '{{ VersionId }}'
-              TableName: '{{ TableName }}'
-              DatabaseName: '{{ DatabaseName }}'
-              Region: '{{ Region }}'
-              CatalogId: '{{ CatalogId }}'
-              RoleARN: '{{ RoleARN }}'
-            OutputFormatConfiguration:
-              Serializer:
-                OrcSerDe:
-                  PaddingTolerance: null
-                  Compression: '{{ Compression }}'
-                  StripeSizeBytes: '{{ StripeSizeBytes }}'
-                  BloomFilterColumns:
-                    - '{{ BloomFilterColumns[0] }}'
-                  BloomFilterFalsePositiveProbability: null
-                  EnablePadding: '{{ EnablePadding }}'
-                  FormatVersion: '{{ FormatVersion }}'
-                  RowIndexStride: '{{ RowIndexStride }}'
-                  BlockSizeBytes: '{{ BlockSizeBytes }}'
-                  DictionaryKeyThreshold: null
-                ParquetSerDe:
-                  Compression: '{{ Compression }}'
-                  BlockSizeBytes: '{{ BlockSizeBytes }}'
-                  EnableDictionaryCompression: '{{ EnableDictionaryCompression }}'
-                  PageSizeBytes: '{{ PageSizeBytes }}'
-                  MaxPaddingBytes: '{{ MaxPaddingBytes }}'
-                  WriterVersion: '{{ WriterVersion }}'
-          EncryptionConfiguration: null
-          CustomTimeZone: '{{ CustomTimeZone }}'
-          DynamicPartitioningConfiguration:
-            Enabled: '{{ Enabled }}'
-            RetryOptions: null
-          Prefix: '{{ Prefix }}'
-          ProcessingConfiguration: null
-          RoleARN: '{{ RoleARN }}'
-          S3BackupMode: '{{ S3BackupMode }}'
-          BufferingHints: null
-          FileExtension: '{{ FileExtension }}'
-          CloudWatchLoggingOptions: null
-      - name: AmazonOpenSearchServerlessDestinationConfiguration
+          error_output_prefix: '{{ error_output_prefix }}'
+          s3_backup_configuration: null
+          bucket_arn: '{{ bucket_arn }}'
+          compression_format: '{{ compression_format }}'
+          data_format_conversion_configuration:
+            input_format_configuration:
+              deserializer:
+                hive_json_ser_de:
+                  timestamp_formats:
+                    - '{{ timestamp_formats[0] }}'
+                open_xjson_ser_de:
+                  convert_dots_in_json_keys_to_underscores: '{{ convert_dots_in_json_keys_to_underscores }}'
+                  column_to_json_key_mappings: {}
+                  case_insensitive: '{{ case_insensitive }}'
+            enabled: '{{ enabled }}'
+            schema_configuration:
+              version_id: '{{ version_id }}'
+              table_name: '{{ table_name }}'
+              database_name: '{{ database_name }}'
+              region: '{{ region }}'
+              catalog_id: '{{ catalog_id }}'
+              role_arn: '{{ role_arn }}'
+            output_format_configuration:
+              serializer:
+                orc_ser_de:
+                  padding_tolerance: null
+                  compression: '{{ compression }}'
+                  stripe_size_bytes: '{{ stripe_size_bytes }}'
+                  bloom_filter_columns:
+                    - '{{ bloom_filter_columns[0] }}'
+                  bloom_filter_false_positive_probability: null
+                  enable_padding: '{{ enable_padding }}'
+                  format_version: '{{ format_version }}'
+                  row_index_stride: '{{ row_index_stride }}'
+                  block_size_bytes: '{{ block_size_bytes }}'
+                  dictionary_key_threshold: null
+                parquet_ser_de:
+                  compression: '{{ compression }}'
+                  block_size_bytes: '{{ block_size_bytes }}'
+                  enable_dictionary_compression: '{{ enable_dictionary_compression }}'
+                  page_size_bytes: '{{ page_size_bytes }}'
+                  max_padding_bytes: '{{ max_padding_bytes }}'
+                  writer_version: '{{ writer_version }}'
+          encryption_configuration: null
+          custom_time_zone: '{{ custom_time_zone }}'
+          dynamic_partitioning_configuration:
+            enabled: '{{ enabled }}'
+            retry_options: null
+          prefix: '{{ prefix }}'
+          processing_configuration: null
+          role_arn: '{{ role_arn }}'
+          s3_backup_mode: '{{ s3_backup_mode }}'
+          buffering_hints: null
+          file_extension: '{{ file_extension }}'
+          cloud_watch_logging_options: null
+      - name: amazon_open_search_serverless_destination_configuration
         value:
-          IndexName: '{{ IndexName }}'
-          S3Configuration: null
-          BufferingHints:
-            IntervalInSeconds: '{{ IntervalInSeconds }}'
-            SizeInMBs: '{{ SizeInMBs }}'
-          RetryOptions:
-            DurationInSeconds: '{{ DurationInSeconds }}'
-          CollectionEndpoint: '{{ CollectionEndpoint }}'
-          VpcConfiguration: null
-          ProcessingConfiguration: null
-          CloudWatchLoggingOptions: null
-          RoleARN: '{{ RoleARN }}'
-          S3BackupMode: '{{ S3BackupMode }}'
-      - name: ElasticsearchDestinationConfiguration
+          index_name: '{{ index_name }}'
+          s3_configuration: null
+          buffering_hints:
+            interval_in_seconds: '{{ interval_in_seconds }}'
+            size_in_mbs: '{{ size_in_mbs }}'
+          retry_options:
+            duration_in_seconds: '{{ duration_in_seconds }}'
+          collection_endpoint: '{{ collection_endpoint }}'
+          vpc_configuration: null
+          processing_configuration: null
+          cloud_watch_logging_options: null
+          role_arn: '{{ role_arn }}'
+          s3_backup_mode: '{{ s3_backup_mode }}'
+      - name: elasticsearch_destination_configuration
         value:
-          TypeName: '{{ TypeName }}'
-          IndexRotationPeriod: '{{ IndexRotationPeriod }}'
-          ProcessingConfiguration: null
-          ClusterEndpoint: '{{ ClusterEndpoint }}'
-          DomainARN: '{{ DomainARN }}'
-          RoleARN: '{{ RoleARN }}'
-          S3BackupMode: '{{ S3BackupMode }}'
-          IndexName: '{{ IndexName }}'
-          DocumentIdOptions: null
-          S3Configuration: null
-          BufferingHints:
-            IntervalInSeconds: '{{ IntervalInSeconds }}'
-            SizeInMBs: '{{ SizeInMBs }}'
-          RetryOptions:
-            DurationInSeconds: '{{ DurationInSeconds }}'
-          VpcConfiguration: null
-          CloudWatchLoggingOptions: null
-      - name: SnowflakeDestinationConfiguration
+          type_name: '{{ type_name }}'
+          index_rotation_period: '{{ index_rotation_period }}'
+          processing_configuration: null
+          cluster_endpoint: '{{ cluster_endpoint }}'
+          domain_arn: '{{ domain_arn }}'
+          role_arn: '{{ role_arn }}'
+          s3_backup_mode: '{{ s3_backup_mode }}'
+          index_name: '{{ index_name }}'
+          document_id_options: null
+          s3_configuration: null
+          buffering_hints:
+            interval_in_seconds: '{{ interval_in_seconds }}'
+            size_in_mbs: '{{ size_in_mbs }}'
+          retry_options:
+            duration_in_seconds: '{{ duration_in_seconds }}'
+          vpc_configuration: null
+          cloud_watch_logging_options: null
+      - name: snowflake_destination_configuration
         value:
-          PrivateKey: '{{ PrivateKey }}'
-          User: '{{ User }}'
-          Table: '{{ Table }}'
-          SnowflakeVpcConfiguration:
-            PrivateLinkVpceId: '{{ PrivateLinkVpceId }}'
-          DataLoadingOption: '{{ DataLoadingOption }}'
-          Schema: '{{ Schema }}'
-          ContentColumnName: '{{ ContentColumnName }}'
-          SecretsManagerConfiguration: null
-          SnowflakeRoleConfiguration:
-            SnowflakeRole: '{{ SnowflakeRole }}'
-            Enabled: '{{ Enabled }}'
-          ProcessingConfiguration: null
-          AccountUrl: '{{ AccountUrl }}'
-          RoleARN: '{{ RoleARN }}'
-          S3BackupMode: '{{ S3BackupMode }}'
-          S3Configuration: null
-          BufferingHints:
-            IntervalInSeconds: '{{ IntervalInSeconds }}'
-            SizeInMBs: '{{ SizeInMBs }}'
-          MetaDataColumnName: '{{ MetaDataColumnName }}'
-          Database: '{{ Database }}'
-          RetryOptions:
-            DurationInSeconds: '{{ DurationInSeconds }}'
-          KeyPassphrase: '{{ KeyPassphrase }}'
-          CloudWatchLoggingOptions: null
-      - name: DatabaseSourceConfiguration
+          private_key: '{{ private_key }}'
+          user: '{{ user }}'
+          table: '{{ table }}'
+          snowflake_vpc_configuration:
+            private_link_vpce_id: '{{ private_link_vpce_id }}'
+          data_loading_option: '{{ data_loading_option }}'
+          schema: '{{ schema }}'
+          content_column_name: '{{ content_column_name }}'
+          secrets_manager_configuration: null
+          snowflake_role_configuration:
+            snowflake_role: '{{ snowflake_role }}'
+            enabled: '{{ enabled }}'
+          processing_configuration: null
+          account_url: '{{ account_url }}'
+          role_arn: '{{ role_arn }}'
+          s3_backup_mode: '{{ s3_backup_mode }}'
+          s3_configuration: null
+          buffering_hints:
+            interval_in_seconds: '{{ interval_in_seconds }}'
+            size_in_mbs: '{{ size_in_mbs }}'
+          meta_data_column_name: '{{ meta_data_column_name }}'
+          database: '{{ database }}'
+          retry_options:
+            duration_in_seconds: '{{ duration_in_seconds }}'
+          key_passphrase: '{{ key_passphrase }}'
+          cloud_watch_logging_options: null
+      - name: database_source_configuration
         value:
-          Digest: '{{ Digest }}'
-          Port: '{{ Port }}'
-          PublicCertificate: '{{ PublicCertificate }}'
-          Columns:
-            Exclude:
-              - '{{ Exclude[0] }}'
-            Include:
+          digest: '{{ digest }}'
+          port: '{{ port }}'
+          public_certificate: '{{ public_certificate }}'
+          columns:
+            exclude:
+              - '{{ exclude[0] }}'
+            include:
               - null
-          Type: '{{ Type }}'
-          SurrogateKeys:
-            - '{{ SurrogateKeys[0] }}'
-          Databases:
-            Exclude:
-              - '{{ Exclude[0] }}'
-            Include:
+          type: '{{ type }}'
+          surrogate_keys:
+            - '{{ surrogate_keys[0] }}'
+          databases:
+            exclude:
+              - '{{ exclude[0] }}'
+            include:
               - null
-          Endpoint: '{{ Endpoint }}'
-          SSLMode: '{{ SSLMode }}'
-          SnapshotWatermarkTable: '{{ SnapshotWatermarkTable }}'
-          DatabaseSourceAuthenticationConfiguration:
-            SecretsManagerConfiguration: null
-          Tables:
-            Exclude:
+          endpoint: '{{ endpoint }}'
+          s_sl_mode: '{{ s_sl_mode }}'
+          snapshot_watermark_table: '{{ snapshot_watermark_table }}'
+          database_source_authentication_configuration:
+            secrets_manager_configuration: null
+          tables:
+            exclude:
               - null
-            Include:
+            include:
               - null
-          DatabaseSourceVPCConfiguration:
-            VpcEndpointServiceName: '{{ VpcEndpointServiceName }}'
-      - name: S3DestinationConfiguration
+          database_source_vpc_configuration:
+            vpc_endpoint_service_name: '{{ vpc_endpoint_service_name }}'
+      - name: s3_destination_configuration
         value: null
-      - name: DeliveryStreamName
-        value: '{{ DeliveryStreamName }}'
-      - name: Tags
+      - name: delivery_stream_name
+        value: '{{ delivery_stream_name }}'
+      - name: tags
         value:
-          - Value: '{{ Value }}'
-            Key: '{{ Key }}'
-
+          - value: '{{ value }}'
+            key: '{{ key }}'
 ```
 </TabItem>
 </Tabs>
@@ -3256,7 +3255,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<DeliveryStreamName>';
+AND Identifier = '{{ delivery_stream_name }}';
 ```
 
 
@@ -3265,7 +3264,7 @@ AND Identifier = '<DeliveryStreamName>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.kinesisfirehose.delivery_streams
-WHERE Identifier = '<DeliveryStreamName>'
+WHERE Identifier = '{{ delivery_stream_name }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/kinesisvideo/signaling_channels/index.md b/website/docs/services/kinesisvideo/signaling_channels/index.md
index 5d0e2ebea..f0db75467 100644
--- a/website/docs/services/kinesisvideo/signaling_channels/index.md
+++ b/website/docs/services/kinesisvideo/signaling_channels/index.md
@@ -170,7 +170,7 @@ type,
 message_ttl_seconds,
 tags
 FROM awscc.kinesisvideo.signaling_channels
-WHERE region = 'us-east-1' AND Identifier = '<Name>';
+WHERE region = 'us-east-1' AND Identifier = '{{ name }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -206,7 +206,7 @@ INSERT INTO awscc.kinesisvideo.signaling_channels (
  ,
  region
 )
-SELECT 
+SELECT
 '{{  }}',
 '{{ region }}';
 ```
@@ -222,11 +222,11 @@ INSERT INTO awscc.kinesisvideo.signaling_channels (
  Tags,
  region
 )
-SELECT 
- '{{ Name }}',
- '{{ Type }}',
- '{{ MessageTtlSeconds }}',
- '{{ Tags }}',
+SELECT
+ '{{ name }}',
+ '{{ type }}',
+ '{{ message_ttl_seconds }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -244,17 +244,16 @@ globals:
 resources:
   - name: signaling_channel
     props:
-      - name: Name
-        value: '{{ Name }}'
-      - name: Type
-        value: '{{ Type }}'
-      - name: MessageTtlSeconds
-        value: '{{ MessageTtlSeconds }}'
-      - name: Tags
+      - name: name
+        value: '{{ name }}'
+      - name: type
+        value: '{{ type }}'
+      - name: message_ttl_seconds
+        value: '{{ message_ttl_seconds }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -272,7 +271,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Name>';
+AND Identifier = '{{ name }}';
 ```
 
 
@@ -281,7 +280,7 @@ AND Identifier = '<Name>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.kinesisvideo.signaling_channels
-WHERE Identifier = '<Name>'
+WHERE Identifier = '{{ name }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/kinesisvideo/streams/index.md b/website/docs/services/kinesisvideo/streams/index.md
index c1d49ff4b..f2e5c4a9c 100644
--- a/website/docs/services/kinesisvideo/streams/index.md
+++ b/website/docs/services/kinesisvideo/streams/index.md
@@ -182,7 +182,7 @@ kms_key_id,
 media_type,
 tags
 FROM awscc.kinesisvideo.streams
-WHERE region = 'us-east-1' AND Identifier = '<Name>';
+WHERE region = 'us-east-1' AND Identifier = '{{ name }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -218,7 +218,7 @@ INSERT INTO awscc.kinesisvideo.streams (
  ,
  region
 )
-SELECT 
+SELECT
 '{{  }}',
 '{{ region }}';
 ```
@@ -236,13 +236,13 @@ INSERT INTO awscc.kinesisvideo.streams (
  Tags,
  region
 )
-SELECT 
- '{{ Name }}',
- '{{ DataRetentionInHours }}',
- '{{ DeviceName }}',
- '{{ KmsKeyId }}',
- '{{ MediaType }}',
- '{{ Tags }}',
+SELECT
+ '{{ name }}',
+ '{{ data_retention_in_hours }}',
+ '{{ device_name }}',
+ '{{ kms_key_id }}',
+ '{{ media_type }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -260,21 +260,20 @@ globals:
 resources:
   - name: stream
     props:
-      - name: Name
-        value: '{{ Name }}'
-      - name: DataRetentionInHours
-        value: '{{ DataRetentionInHours }}'
-      - name: DeviceName
-        value: '{{ DeviceName }}'
-      - name: KmsKeyId
-        value: '{{ KmsKeyId }}'
-      - name: MediaType
-        value: '{{ MediaType }}'
-      - name: Tags
+      - name: name
+        value: '{{ name }}'
+      - name: data_retention_in_hours
+        value: '{{ data_retention_in_hours }}'
+      - name: device_name
+        value: '{{ device_name }}'
+      - name: kms_key_id
+        value: '{{ kms_key_id }}'
+      - name: media_type
+        value: '{{ media_type }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -294,7 +293,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Name>';
+AND Identifier = '{{ name }}';
 ```
 
 
@@ -303,7 +302,7 @@ AND Identifier = '<Name>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.kinesisvideo.streams
-WHERE Identifier = '<Name>'
+WHERE Identifier = '{{ name }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/kms/aliases/index.md b/website/docs/services/kms/aliases/index.md
index afa02e4ac..3f348af4e 100644
--- a/website/docs/services/kms/aliases/index.md
+++ b/website/docs/services/kms/aliases/index.md
@@ -140,7 +140,7 @@ region,
 target_key_id,
 alias_name
 FROM awscc.kms.aliases
-WHERE region = 'us-east-1' AND Identifier = '<AliasName>';
+WHERE region = 'us-east-1' AND Identifier = '{{ alias_name }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -177,9 +177,9 @@ INSERT INTO awscc.kms.aliases (
  AliasName,
  region
 )
-SELECT 
-'{{ TargetKeyId }}',
- '{{ AliasName }}',
+SELECT
+'{{ target_key_id }}',
+ '{{ alias_name }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -192,9 +192,9 @@ INSERT INTO awscc.kms.aliases (
  AliasName,
  region
 )
-SELECT 
- '{{ TargetKeyId }}',
- '{{ AliasName }}',
+SELECT
+ '{{ target_key_id }}',
+ '{{ alias_name }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -212,11 +212,10 @@ globals:
 resources:
   - name: alias
     props:
-      - name: TargetKeyId
-        value: '{{ TargetKeyId }}'
-      - name: AliasName
-        value: '{{ AliasName }}'
-
+      - name: target_key_id
+        value: '{{ target_key_id }}'
+      - name: alias_name
+        value: '{{ alias_name }}'
 ```
 </TabItem>
 </Tabs>
@@ -232,7 +231,7 @@ SET PatchDocument = string('{{ {
     "TargetKeyId": target_key_id
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<AliasName>';
+AND Identifier = '{{ alias_name }}';
 ```
 
 
@@ -241,7 +240,7 @@ AND Identifier = '<AliasName>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.kms.aliases
-WHERE Identifier = '<AliasName>'
+WHERE Identifier = '{{ alias_name }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/kms/keys/index.md b/website/docs/services/kms/keys/index.md
index ace8b3c28..dca8b857e 100644
--- a/website/docs/services/kms/keys/index.md
+++ b/website/docs/services/kms/keys/index.md
@@ -224,7 +224,7 @@ key_id,
 bypass_policy_lockout_safety_check,
 rotation_period_in_days
 FROM awscc.kms.keys
-WHERE region = 'us-east-1' AND Identifier = '<KeyId>';
+WHERE region = 'us-east-1' AND Identifier = '{{ key_id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -271,19 +271,19 @@ INSERT INTO awscc.kms.keys (
  RotationPeriodInDays,
  region
 )
-SELECT 
-'{{ Description }}',
- '{{ Enabled }}',
- '{{ EnableKeyRotation }}',
- '{{ KeyPolicy }}',
- '{{ KeyUsage }}',
- '{{ Origin }}',
- '{{ KeySpec }}',
- '{{ MultiRegion }}',
- '{{ PendingWindowInDays }}',
- '{{ Tags }}',
- '{{ BypassPolicyLockoutSafetyCheck }}',
- '{{ RotationPeriodInDays }}',
+SELECT
+'{{ description }}',
+ '{{ enabled }}',
+ '{{ enable_key_rotation }}',
+ '{{ key_policy }}',
+ '{{ key_usage }}',
+ '{{ origin }}',
+ '{{ key_spec }}',
+ '{{ multi_region }}',
+ '{{ pending_window_in_days }}',
+ '{{ tags }}',
+ '{{ bypass_policy_lockout_safety_check }}',
+ '{{ rotation_period_in_days }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -306,19 +306,19 @@ INSERT INTO awscc.kms.keys (
  RotationPeriodInDays,
  region
 )
-SELECT 
- '{{ Description }}',
- '{{ Enabled }}',
- '{{ EnableKeyRotation }}',
- '{{ KeyPolicy }}',
- '{{ KeyUsage }}',
- '{{ Origin }}',
- '{{ KeySpec }}',
- '{{ MultiRegion }}',
- '{{ PendingWindowInDays }}',
- '{{ Tags }}',
- '{{ BypassPolicyLockoutSafetyCheck }}',
- '{{ RotationPeriodInDays }}',
+SELECT
+ '{{ description }}',
+ '{{ enabled }}',
+ '{{ enable_key_rotation }}',
+ '{{ key_policy }}',
+ '{{ key_usage }}',
+ '{{ origin }}',
+ '{{ key_spec }}',
+ '{{ multi_region }}',
+ '{{ pending_window_in_days }}',
+ '{{ tags }}',
+ '{{ bypass_policy_lockout_safety_check }}',
+ '{{ rotation_period_in_days }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -336,33 +336,32 @@ globals:
 resources:
   - name: key
     props:
-      - name: Description
-        value: '{{ Description }}'
-      - name: Enabled
-        value: '{{ Enabled }}'
-      - name: EnableKeyRotation
-        value: '{{ EnableKeyRotation }}'
-      - name: KeyPolicy
+      - name: description
+        value: '{{ description }}'
+      - name: enabled
+        value: '{{ enabled }}'
+      - name: enable_key_rotation
+        value: '{{ enable_key_rotation }}'
+      - name: key_policy
         value: {}
-      - name: KeyUsage
-        value: '{{ KeyUsage }}'
-      - name: Origin
-        value: '{{ Origin }}'
-      - name: KeySpec
-        value: '{{ KeySpec }}'
-      - name: MultiRegion
-        value: '{{ MultiRegion }}'
-      - name: PendingWindowInDays
-        value: '{{ PendingWindowInDays }}'
-      - name: Tags
+      - name: key_usage
+        value: '{{ key_usage }}'
+      - name: origin
+        value: '{{ origin }}'
+      - name: key_spec
+        value: '{{ key_spec }}'
+      - name: multi_region
+        value: '{{ multi_region }}'
+      - name: pending_window_in_days
+        value: '{{ pending_window_in_days }}'
+      - name: tags
         value:
-          - Value: '{{ Value }}'
-            Key: '{{ Key }}'
-      - name: BypassPolicyLockoutSafetyCheck
-        value: '{{ BypassPolicyLockoutSafetyCheck }}'
-      - name: RotationPeriodInDays
-        value: '{{ RotationPeriodInDays }}'
-
+          - value: '{{ value }}'
+            key: '{{ key }}'
+      - name: bypass_policy_lockout_safety_check
+        value: '{{ bypass_policy_lockout_safety_check }}'
+      - name: rotation_period_in_days
+        value: '{{ rotation_period_in_days }}'
 ```
 </TabItem>
 </Tabs>
@@ -389,7 +388,7 @@ SET PatchDocument = string('{{ {
     "RotationPeriodInDays": rotation_period_in_days
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<KeyId>';
+AND Identifier = '{{ key_id }}';
 ```
 
 
@@ -398,7 +397,7 @@ AND Identifier = '<KeyId>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.kms.keys
-WHERE Identifier = '<KeyId>'
+WHERE Identifier = '{{ key_id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/kms/replica_keys/index.md b/website/docs/services/kms/replica_keys/index.md
index b2931d64a..f176e8880 100644
--- a/website/docs/services/kms/replica_keys/index.md
+++ b/website/docs/services/kms/replica_keys/index.md
@@ -188,7 +188,7 @@ key_id,
 arn,
 tags
 FROM awscc.kms.replica_keys
-WHERE region = 'us-east-1' AND Identifier = '<KeyId>';
+WHERE region = 'us-east-1' AND Identifier = '{{ key_id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -225,9 +225,9 @@ INSERT INTO awscc.kms.replica_keys (
  PrimaryKeyArn,
  region
 )
-SELECT 
-'{{ KeyPolicy }}',
- '{{ PrimaryKeyArn }}',
+SELECT
+'{{ key_policy }}',
+ '{{ primary_key_arn }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -244,13 +244,13 @@ INSERT INTO awscc.kms.replica_keys (
  Tags,
  region
 )
-SELECT 
- '{{ Description }}',
- '{{ PendingWindowInDays }}',
- '{{ KeyPolicy }}',
- '{{ PrimaryKeyArn }}',
- '{{ Enabled }}',
- '{{ Tags }}',
+SELECT
+ '{{ description }}',
+ '{{ pending_window_in_days }}',
+ '{{ key_policy }}',
+ '{{ primary_key_arn }}',
+ '{{ enabled }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -268,21 +268,20 @@ globals:
 resources:
   - name: replica_key
     props:
-      - name: Description
-        value: '{{ Description }}'
-      - name: PendingWindowInDays
-        value: '{{ PendingWindowInDays }}'
-      - name: KeyPolicy
+      - name: description
+        value: '{{ description }}'
+      - name: pending_window_in_days
+        value: '{{ pending_window_in_days }}'
+      - name: key_policy
         value: {}
-      - name: PrimaryKeyArn
-        value: '{{ PrimaryKeyArn }}'
-      - name: Enabled
-        value: '{{ Enabled }}'
-      - name: Tags
+      - name: primary_key_arn
+        value: '{{ primary_key_arn }}'
+      - name: enabled
+        value: '{{ enabled }}'
+      - name: tags
         value:
-          - Value: '{{ Value }}'
-            Key: '{{ Key }}'
-
+          - value: '{{ value }}'
+            key: '{{ key }}'
 ```
 </TabItem>
 </Tabs>
@@ -302,7 +301,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<KeyId>';
+AND Identifier = '{{ key_id }}';
 ```
 
 
@@ -311,7 +310,7 @@ AND Identifier = '<KeyId>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.kms.replica_keys
-WHERE Identifier = '<KeyId>'
+WHERE Identifier = '{{ key_id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/lakeformation/data_cells_filters/index.md b/website/docs/services/lakeformation/data_cells_filters/index.md
index c459dc677..7a146d356 100644
--- a/website/docs/services/lakeformation/data_cells_filters/index.md
+++ b/website/docs/services/lakeformation/data_cells_filters/index.md
@@ -171,7 +171,7 @@ row_filter,
 column_names,
 column_wildcard
 FROM awscc.lakeformation.data_cells_filters
-WHERE region = 'us-east-1' AND Identifier = '<TableCatalogId>|<DatabaseName>|<TableName>|<Name>';
+WHERE region = 'us-east-1' AND Identifier = '{{ table_catalog_id }}|{{ database_name }}|{{ table_name }}|{{ name }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -213,11 +213,11 @@ INSERT INTO awscc.lakeformation.data_cells_filters (
  Name,
  region
 )
-SELECT 
-'{{ TableCatalogId }}',
- '{{ DatabaseName }}',
- '{{ TableName }}',
- '{{ Name }}',
+SELECT
+'{{ table_catalog_id }}',
+ '{{ database_name }}',
+ '{{ table_name }}',
+ '{{ name }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -235,14 +235,14 @@ INSERT INTO awscc.lakeformation.data_cells_filters (
  ColumnWildcard,
  region
 )
-SELECT 
- '{{ TableCatalogId }}',
- '{{ DatabaseName }}',
- '{{ TableName }}',
- '{{ Name }}',
- '{{ RowFilter }}',
- '{{ ColumnNames }}',
- '{{ ColumnWildcard }}',
+SELECT
+ '{{ table_catalog_id }}',
+ '{{ database_name }}',
+ '{{ table_name }}',
+ '{{ name }}',
+ '{{ row_filter }}',
+ '{{ column_names }}',
+ '{{ column_wildcard }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -260,25 +260,24 @@ globals:
 resources:
   - name: data_cells_filter
     props:
-      - name: TableCatalogId
-        value: '{{ TableCatalogId }}'
-      - name: DatabaseName
-        value: '{{ DatabaseName }}'
-      - name: TableName
+      - name: table_catalog_id
+        value: '{{ table_catalog_id }}'
+      - name: database_name
+        value: '{{ database_name }}'
+      - name: table_name
         value: null
-      - name: Name
+      - name: name
         value: null
-      - name: RowFilter
+      - name: row_filter
         value:
-          FilterExpression: '{{ FilterExpression }}'
-          AllRowsWildcard: {}
-      - name: ColumnNames
+          filter_expression: '{{ filter_expression }}'
+          all_rows_wildcard: {}
+      - name: column_names
         value:
           - null
-      - name: ColumnWildcard
+      - name: column_wildcard
         value:
-          ExcludedColumnNames: null
-
+          excluded_column_names: null
 ```
 </TabItem>
 </Tabs>
@@ -289,7 +288,7 @@ resources:
 ```sql
 /*+ delete */
 DELETE FROM awscc.lakeformation.data_cells_filters
-WHERE Identifier = '<TableCatalogId|DatabaseName|TableName|Name>'
+WHERE Identifier = '{{ table_catalog_id }}|{{ database_name }}|{{ table_name }}|{{ name }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/lakeformation/principal_permissions/index.md b/website/docs/services/lakeformation/principal_permissions/index.md
index 50d905cbb..95bdfd672 100644
--- a/website/docs/services/lakeformation/principal_permissions/index.md
+++ b/website/docs/services/lakeformation/principal_permissions/index.md
@@ -174,7 +174,7 @@ permissions_with_grant_option,
 principal_identifier,
 resource_identifier
 FROM awscc.lakeformation.principal_permissions
-WHERE region = 'us-east-1' AND Identifier = '<PrincipalIdentifier>|<ResourceIdentifier>';
+WHERE region = 'us-east-1' AND Identifier = '{{ principal_identifier }}|{{ resource_identifier }}';
 ```
 
 ## `INSERT` example
@@ -200,11 +200,11 @@ INSERT INTO awscc.lakeformation.principal_permissions (
  PermissionsWithGrantOption,
  region
 )
-SELECT 
-'{{ Principal }}',
- '{{ Resource }}',
- '{{ Permissions }}',
- '{{ PermissionsWithGrantOption }}',
+SELECT
+'{{ principal }}',
+ '{{ resource }}',
+ '{{ permissions }}',
+ '{{ permissions_with_grant_option }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -220,12 +220,12 @@ INSERT INTO awscc.lakeformation.principal_permissions (
  PermissionsWithGrantOption,
  region
 )
-SELECT 
- '{{ Catalog }}',
- '{{ Principal }}',
- '{{ Resource }}',
- '{{ Permissions }}',
- '{{ PermissionsWithGrantOption }}',
+SELECT
+ '{{ catalog }}',
+ '{{ principal }}',
+ '{{ resource }}',
+ '{{ permissions }}',
+ '{{ permissions_with_grant_option }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -243,34 +243,33 @@ globals:
 resources:
   - name: principal_permission
     props:
-      - name: Catalog
-        value: '{{ Catalog }}'
-      - name: Principal
+      - name: catalog
+        value: '{{ catalog }}'
+      - name: principal
         value:
-          DataLakePrincipalIdentifier: '{{ DataLakePrincipalIdentifier }}'
-      - name: Resource
+          data_lake_principal_identifier: '{{ data_lake_principal_identifier }}'
+      - name: resource
         value:
-          Catalog: {}
-          Database:
-            CatalogId: null
-            Name: '{{ Name }}'
-          Table:
-            CatalogId: null
-            DatabaseName: null
-            Name: null
-            TableWildcard: {}
-          TableWithColumns:
-            CatalogId: null
-            DatabaseName: null
-            Name: null
-            ColumnNames:
+          catalog: {}
+          database:
+            catalog_id: null
+            name: '{{ name }}'
+          table:
+            catalog_id: null
+            database_name: null
+            name: null
+            table_wildcard: {}
+          table_with_columns:
+            catalog_id: null
+            database_name: null
+            name: null
+            column_names:
               - null
-      - name: Permissions
+      - name: permissions
         value:
-          - '{{ Permissions[0] }}'
-      - name: PermissionsWithGrantOption
+          - '{{ permissions[0] }}'
+      - name: permissions_with_grant_option
         value: null
-
 ```
 </TabItem>
 </Tabs>
@@ -281,7 +280,7 @@ resources:
 ```sql
 /*+ delete */
 DELETE FROM awscc.lakeformation.principal_permissions
-WHERE Identifier = '<PrincipalIdentifier|ResourceIdentifier>'
+WHERE Identifier = '{{ principal_identifier }}|{{ resource_identifier }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/lakeformation/tag_associations/index.md b/website/docs/services/lakeformation/tag_associations/index.md
index 7b79fb4fc..a6170a82a 100644
--- a/website/docs/services/lakeformation/tag_associations/index.md
+++ b/website/docs/services/lakeformation/tag_associations/index.md
@@ -186,7 +186,7 @@ lf_tags,
 resource_identifier,
 tags_identifier
 FROM awscc.lakeformation.tag_associations
-WHERE region = 'us-east-1' AND Identifier = '<ResourceIdentifier>|<TagsIdentifier>';
+WHERE region = 'us-east-1' AND Identifier = '{{ resource_identifier }}|{{ tags_identifier }}';
 ```
 
 ## `INSERT` example
@@ -210,9 +210,9 @@ INSERT INTO awscc.lakeformation.tag_associations (
  LFTags,
  region
 )
-SELECT 
-'{{ Resource }}',
- '{{ LFTags }}',
+SELECT
+'{{ resource }}',
+ '{{ lf_tags }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -225,9 +225,9 @@ INSERT INTO awscc.lakeformation.tag_associations (
  LFTags,
  region
 )
-SELECT 
- '{{ Resource }}',
- '{{ LFTags }}',
+SELECT
+ '{{ resource }}',
+ '{{ lf_tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -245,30 +245,29 @@ globals:
 resources:
   - name: tag_association
     props:
-      - name: Resource
+      - name: resource
         value:
-          Catalog: {}
-          Database:
-            CatalogId: '{{ CatalogId }}'
-            Name: '{{ Name }}'
-          Table:
-            CatalogId: null
-            DatabaseName: null
-            Name: null
-            TableWildcard: {}
-          TableWithColumns:
-            CatalogId: null
-            DatabaseName: null
-            Name: null
-            ColumnNames:
+          catalog: {}
+          database:
+            catalog_id: '{{ catalog_id }}'
+            name: '{{ name }}'
+          table:
+            catalog_id: null
+            database_name: null
+            name: null
+            table_wildcard: {}
+          table_with_columns:
+            catalog_id: null
+            database_name: null
+            name: null
+            column_names:
               - null
-      - name: LFTags
+      - name: lf_tags
         value:
-          - CatalogId: null
-            TagKey: '{{ TagKey }}'
-            TagValues:
-              - '{{ TagValues[0] }}'
-
+          - catalog_id: null
+            tag_key: '{{ tag_key }}'
+            tag_values:
+              - '{{ tag_values[0] }}'
 ```
 </TabItem>
 </Tabs>
@@ -279,7 +278,7 @@ resources:
 ```sql
 /*+ delete */
 DELETE FROM awscc.lakeformation.tag_associations
-WHERE Identifier = '<ResourceIdentifier|TagsIdentifier>'
+WHERE Identifier = '{{ resource_identifier }}|{{ tags_identifier }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/lakeformation/tags/index.md b/website/docs/services/lakeformation/tags/index.md
index 6d3dc6a00..7c175dff7 100644
--- a/website/docs/services/lakeformation/tags/index.md
+++ b/website/docs/services/lakeformation/tags/index.md
@@ -146,7 +146,7 @@ catalog_id,
 tag_key,
 tag_values
 FROM awscc.lakeformation.tags
-WHERE region = 'us-east-1' AND Identifier = '<TagKey>';
+WHERE region = 'us-east-1' AND Identifier = '{{ tag_key }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -183,9 +183,9 @@ INSERT INTO awscc.lakeformation.tags (
  TagValues,
  region
 )
-SELECT 
-'{{ TagKey }}',
- '{{ TagValues }}',
+SELECT
+'{{ tag_key }}',
+ '{{ tag_values }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -199,10 +199,10 @@ INSERT INTO awscc.lakeformation.tags (
  TagValues,
  region
 )
-SELECT 
- '{{ CatalogId }}',
- '{{ TagKey }}',
- '{{ TagValues }}',
+SELECT
+ '{{ catalog_id }}',
+ '{{ tag_key }}',
+ '{{ tag_values }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -220,14 +220,13 @@ globals:
 resources:
   - name: tag
     props:
-      - name: CatalogId
-        value: '{{ CatalogId }}'
-      - name: TagKey
-        value: '{{ TagKey }}'
-      - name: TagValues
+      - name: catalog_id
+        value: '{{ catalog_id }}'
+      - name: tag_key
+        value: '{{ tag_key }}'
+      - name: tag_values
         value:
-          - '{{ TagValues[0] }}'
-
+          - '{{ tag_values[0] }}'
 ```
 </TabItem>
 </Tabs>
@@ -243,7 +242,7 @@ SET PatchDocument = string('{{ {
     "TagValues": tag_values
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<TagKey>';
+AND Identifier = '{{ tag_key }}';
 ```
 
 
@@ -252,7 +251,7 @@ AND Identifier = '<TagKey>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.lakeformation.tags
-WHERE Identifier = '<TagKey>'
+WHERE Identifier = '{{ tag_key }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/lambda/aliases/index.md b/website/docs/services/lambda/aliases/index.md
index e3e7330f7..9de440673 100644
--- a/website/docs/services/lambda/aliases/index.md
+++ b/website/docs/services/lambda/aliases/index.md
@@ -196,7 +196,7 @@ function_version,
 routing_config,
 name
 FROM awscc.lambda.aliases
-WHERE region = 'us-east-1' AND Identifier = '<AliasArn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ alias_arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -234,10 +234,10 @@ INSERT INTO awscc.lambda.aliases (
  Name,
  region
 )
-SELECT 
-'{{ FunctionName }}',
- '{{ FunctionVersion }}',
- '{{ Name }}',
+SELECT
+'{{ function_name }}',
+ '{{ function_version }}',
+ '{{ name }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -254,13 +254,13 @@ INSERT INTO awscc.lambda.aliases (
  Name,
  region
 )
-SELECT 
- '{{ FunctionName }}',
- '{{ ProvisionedConcurrencyConfig }}',
- '{{ Description }}',
- '{{ FunctionVersion }}',
- '{{ RoutingConfig }}',
- '{{ Name }}',
+SELECT
+ '{{ function_name }}',
+ '{{ provisioned_concurrency_config }}',
+ '{{ description }}',
+ '{{ function_version }}',
+ '{{ routing_config }}',
+ '{{ name }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -278,23 +278,22 @@ globals:
 resources:
   - name: alias
     props:
-      - name: FunctionName
-        value: '{{ FunctionName }}'
-      - name: ProvisionedConcurrencyConfig
+      - name: function_name
+        value: '{{ function_name }}'
+      - name: provisioned_concurrency_config
         value:
-          ProvisionedConcurrentExecutions: '{{ ProvisionedConcurrentExecutions }}'
-      - name: Description
-        value: '{{ Description }}'
-      - name: FunctionVersion
-        value: '{{ FunctionVersion }}'
-      - name: RoutingConfig
+          provisioned_concurrent_executions: '{{ provisioned_concurrent_executions }}'
+      - name: description
+        value: '{{ description }}'
+      - name: function_version
+        value: '{{ function_version }}'
+      - name: routing_config
         value:
-          AdditionalVersionWeights:
-            - FunctionWeight: null
-              FunctionVersion: '{{ FunctionVersion }}'
-      - name: Name
-        value: '{{ Name }}'
-
+          additional_version_weights:
+            - function_weight: null
+              function_version: '{{ function_version }}'
+      - name: name
+        value: '{{ name }}'
 ```
 </TabItem>
 </Tabs>
@@ -313,7 +312,7 @@ SET PatchDocument = string('{{ {
     "RoutingConfig": routing_config
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<AliasArn>';
+AND Identifier = '{{ alias_arn }}';
 ```
 
 
@@ -322,7 +321,7 @@ AND Identifier = '<AliasArn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.lambda.aliases
-WHERE Identifier = '<AliasArn>'
+WHERE Identifier = '{{ alias_arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/lambda/code_signing_configs/index.md b/website/docs/services/lambda/code_signing_configs/index.md
index 0b44578b8..e20d25794 100644
--- a/website/docs/services/lambda/code_signing_configs/index.md
+++ b/website/docs/services/lambda/code_signing_configs/index.md
@@ -190,7 +190,7 @@ code_signing_config_id,
 code_signing_config_arn,
 tags
 FROM awscc.lambda.code_signing_configs
-WHERE region = 'us-east-1' AND Identifier = '<CodeSigningConfigArn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ code_signing_config_arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -226,8 +226,8 @@ INSERT INTO awscc.lambda.code_signing_configs (
  AllowedPublishers,
  region
 )
-SELECT 
-'{{ AllowedPublishers }}',
+SELECT
+'{{ allowed_publishers }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -242,11 +242,11 @@ INSERT INTO awscc.lambda.code_signing_configs (
  Tags,
  region
 )
-SELECT 
- '{{ Description }}',
- '{{ AllowedPublishers }}',
- '{{ CodeSigningPolicies }}',
- '{{ Tags }}',
+SELECT
+ '{{ description }}',
+ '{{ allowed_publishers }}',
+ '{{ code_signing_policies }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -264,20 +264,19 @@ globals:
 resources:
   - name: code_signing_config
     props:
-      - name: Description
-        value: '{{ Description }}'
-      - name: AllowedPublishers
+      - name: description
+        value: '{{ description }}'
+      - name: allowed_publishers
         value:
-          SigningProfileVersionArns:
-            - '{{ SigningProfileVersionArns[0] }}'
-      - name: CodeSigningPolicies
+          signing_profile_version_arns:
+            - '{{ signing_profile_version_arns[0] }}'
+      - name: code_signing_policies
         value:
-          UntrustedArtifactOnDeployment: '{{ UntrustedArtifactOnDeployment }}'
-      - name: Tags
+          untrusted_artifact_on_deployment: '{{ untrusted_artifact_on_deployment }}'
+      - name: tags
         value:
-          - Value: '{{ Value }}'
-            Key: '{{ Key }}'
-
+          - value: '{{ value }}'
+            key: '{{ key }}'
 ```
 </TabItem>
 </Tabs>
@@ -296,7 +295,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<CodeSigningConfigArn>';
+AND Identifier = '{{ code_signing_config_arn }}';
 ```
 
 
@@ -305,7 +304,7 @@ AND Identifier = '<CodeSigningConfigArn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.lambda.code_signing_configs
-WHERE Identifier = '<CodeSigningConfigArn>'
+WHERE Identifier = '{{ code_signing_config_arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/lambda/event_invoke_configs/index.md b/website/docs/services/lambda/event_invoke_configs/index.md
index a8dc70d58..c05df8132 100644
--- a/website/docs/services/lambda/event_invoke_configs/index.md
+++ b/website/docs/services/lambda/event_invoke_configs/index.md
@@ -177,7 +177,7 @@ maximum_event_age_in_seconds,
 maximum_retry_attempts,
 qualifier
 FROM awscc.lambda.event_invoke_configs
-WHERE region = 'us-east-1' AND Identifier = '<FunctionName>|<Qualifier>';
+WHERE region = 'us-east-1' AND Identifier = '{{ function_name }}|{{ qualifier }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -215,9 +215,9 @@ INSERT INTO awscc.lambda.event_invoke_configs (
  Qualifier,
  region
 )
-SELECT 
-'{{ FunctionName }}',
- '{{ Qualifier }}',
+SELECT
+'{{ function_name }}',
+ '{{ qualifier }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -233,12 +233,12 @@ INSERT INTO awscc.lambda.event_invoke_configs (
  Qualifier,
  region
 )
-SELECT 
- '{{ DestinationConfig }}',
- '{{ FunctionName }}',
- '{{ MaximumEventAgeInSeconds }}',
- '{{ MaximumRetryAttempts }}',
- '{{ Qualifier }}',
+SELECT
+ '{{ destination_config }}',
+ '{{ function_name }}',
+ '{{ maximum_event_age_in_seconds }}',
+ '{{ maximum_retry_attempts }}',
+ '{{ qualifier }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -256,19 +256,18 @@ globals:
 resources:
   - name: event_invoke_config
     props:
-      - name: DestinationConfig
+      - name: destination_config
         value:
-          OnFailure:
-            Destination: '{{ Destination }}'
-      - name: FunctionName
-        value: '{{ FunctionName }}'
-      - name: MaximumEventAgeInSeconds
-        value: '{{ MaximumEventAgeInSeconds }}'
-      - name: MaximumRetryAttempts
-        value: '{{ MaximumRetryAttempts }}'
-      - name: Qualifier
-        value: '{{ Qualifier }}'
-
+          on_failure:
+            destination: '{{ destination }}'
+      - name: function_name
+        value: '{{ function_name }}'
+      - name: maximum_event_age_in_seconds
+        value: '{{ maximum_event_age_in_seconds }}'
+      - name: maximum_retry_attempts
+        value: '{{ maximum_retry_attempts }}'
+      - name: qualifier
+        value: '{{ qualifier }}'
 ```
 </TabItem>
 </Tabs>
@@ -286,7 +285,7 @@ SET PatchDocument = string('{{ {
     "MaximumRetryAttempts": maximum_retry_attempts
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<FunctionName>|<Qualifier>';
+AND Identifier = '{{ function_name }}|{{ qualifier }}';
 ```
 
 
@@ -295,7 +294,7 @@ AND Identifier = '<FunctionName>|<Qualifier>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.lambda.event_invoke_configs
-WHERE Identifier = '<FunctionName|Qualifier>'
+WHERE Identifier = '{{ function_name }}|{{ qualifier }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/lambda/event_source_mappings/index.md b/website/docs/services/lambda/event_source_mappings/index.md
index f4014f2ea..579dffa49 100644
--- a/website/docs/services/lambda/event_source_mappings/index.md
+++ b/website/docs/services/lambda/event_source_mappings/index.md
@@ -517,7 +517,7 @@ document_db_event_source_config,
 provisioned_poller_config,
 metrics_config
 FROM awscc.lambda.event_source_mappings
-WHERE region = 'us-east-1' AND Identifier = '<Id>';
+WHERE region = 'us-east-1' AND Identifier = '{{ id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -553,8 +553,8 @@ INSERT INTO awscc.lambda.event_source_mappings (
  FunctionName,
  region
 )
-SELECT 
-'{{ FunctionName }}',
+SELECT
+'{{ function_name }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -592,34 +592,34 @@ INSERT INTO awscc.lambda.event_source_mappings (
  MetricsConfig,
  region
 )
-SELECT 
- '{{ BatchSize }}',
- '{{ BisectBatchOnFunctionError }}',
- '{{ DestinationConfig }}',
- '{{ Enabled }}',
- '{{ EventSourceArn }}',
- '{{ FilterCriteria }}',
- '{{ KmsKeyArn }}',
- '{{ FunctionName }}',
- '{{ MaximumBatchingWindowInSeconds }}',
- '{{ MaximumRecordAgeInSeconds }}',
- '{{ MaximumRetryAttempts }}',
- '{{ ParallelizationFactor }}',
- '{{ StartingPosition }}',
- '{{ StartingPositionTimestamp }}',
- '{{ Tags }}',
- '{{ Topics }}',
- '{{ Queues }}',
- '{{ SourceAccessConfigurations }}',
- '{{ TumblingWindowInSeconds }}',
- '{{ FunctionResponseTypes }}',
- '{{ SelfManagedEventSource }}',
- '{{ AmazonManagedKafkaEventSourceConfig }}',
- '{{ SelfManagedKafkaEventSourceConfig }}',
- '{{ ScalingConfig }}',
- '{{ DocumentDBEventSourceConfig }}',
- '{{ ProvisionedPollerConfig }}',
- '{{ MetricsConfig }}',
+SELECT
+ '{{ batch_size }}',
+ '{{ bisect_batch_on_function_error }}',
+ '{{ destination_config }}',
+ '{{ enabled }}',
+ '{{ event_source_arn }}',
+ '{{ filter_criteria }}',
+ '{{ kms_key_arn }}',
+ '{{ function_name }}',
+ '{{ maximum_batching_window_in_seconds }}',
+ '{{ maximum_record_age_in_seconds }}',
+ '{{ maximum_retry_attempts }}',
+ '{{ parallelization_factor }}',
+ '{{ starting_position }}',
+ '{{ starting_position_timestamp }}',
+ '{{ tags }}',
+ '{{ topics }}',
+ '{{ queues }}',
+ '{{ source_access_configurations }}',
+ '{{ tumbling_window_in_seconds }}',
+ '{{ function_response_types }}',
+ '{{ self_managed_event_source }}',
+ '{{ amazon_managed_kafka_event_source_config }}',
+ '{{ self_managed_kafka_event_source_config }}',
+ '{{ scaling_config }}',
+ '{{ document_db_event_source_config }}',
+ '{{ provisioned_poller_config }}',
+ '{{ metrics_config }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -637,94 +637,93 @@ globals:
 resources:
   - name: event_source_mapping
     props:
-      - name: BatchSize
-        value: '{{ BatchSize }}'
-      - name: BisectBatchOnFunctionError
-        value: '{{ BisectBatchOnFunctionError }}'
-      - name: DestinationConfig
+      - name: batch_size
+        value: '{{ batch_size }}'
+      - name: bisect_batch_on_function_error
+        value: '{{ bisect_batch_on_function_error }}'
+      - name: destination_config
         value:
-          OnFailure:
-            Destination: '{{ Destination }}'
-      - name: Enabled
-        value: '{{ Enabled }}'
-      - name: EventSourceArn
-        value: '{{ EventSourceArn }}'
-      - name: FilterCriteria
+          on_failure:
+            destination: '{{ destination }}'
+      - name: enabled
+        value: '{{ enabled }}'
+      - name: event_source_arn
+        value: '{{ event_source_arn }}'
+      - name: filter_criteria
         value:
-          Filters:
-            - Pattern: '{{ Pattern }}'
-      - name: KmsKeyArn
-        value: '{{ KmsKeyArn }}'
-      - name: FunctionName
-        value: '{{ FunctionName }}'
-      - name: MaximumBatchingWindowInSeconds
-        value: '{{ MaximumBatchingWindowInSeconds }}'
-      - name: MaximumRecordAgeInSeconds
-        value: '{{ MaximumRecordAgeInSeconds }}'
-      - name: MaximumRetryAttempts
-        value: '{{ MaximumRetryAttempts }}'
-      - name: ParallelizationFactor
-        value: '{{ ParallelizationFactor }}'
-      - name: StartingPosition
-        value: '{{ StartingPosition }}'
-      - name: StartingPositionTimestamp
+          filters:
+            - pattern: '{{ pattern }}'
+      - name: kms_key_arn
+        value: '{{ kms_key_arn }}'
+      - name: function_name
+        value: '{{ function_name }}'
+      - name: maximum_batching_window_in_seconds
+        value: '{{ maximum_batching_window_in_seconds }}'
+      - name: maximum_record_age_in_seconds
+        value: '{{ maximum_record_age_in_seconds }}'
+      - name: maximum_retry_attempts
+        value: '{{ maximum_retry_attempts }}'
+      - name: parallelization_factor
+        value: '{{ parallelization_factor }}'
+      - name: starting_position
+        value: '{{ starting_position }}'
+      - name: starting_position_timestamp
         value: null
-      - name: Tags
+      - name: tags
         value:
-          - Value: '{{ Value }}'
-            Key: '{{ Key }}'
-      - name: Topics
+          - value: '{{ value }}'
+            key: '{{ key }}'
+      - name: topics
         value:
-          - '{{ Topics[0] }}'
-      - name: Queues
+          - '{{ topics[0] }}'
+      - name: queues
         value:
-          - '{{ Queues[0] }}'
-      - name: SourceAccessConfigurations
+          - '{{ queues[0] }}'
+      - name: source_access_configurations
         value:
-          - Type: '{{ Type }}'
-            URI: '{{ URI }}'
-      - name: TumblingWindowInSeconds
-        value: '{{ TumblingWindowInSeconds }}'
-      - name: FunctionResponseTypes
+          - type: '{{ type }}'
+            uri: '{{ uri }}'
+      - name: tumbling_window_in_seconds
+        value: '{{ tumbling_window_in_seconds }}'
+      - name: function_response_types
         value:
-          - '{{ FunctionResponseTypes[0] }}'
-      - name: SelfManagedEventSource
+          - '{{ function_response_types[0] }}'
+      - name: self_managed_event_source
         value:
-          Endpoints:
-            KafkaBootstrapServers:
-              - '{{ KafkaBootstrapServers[0] }}'
-      - name: AmazonManagedKafkaEventSourceConfig
+          endpoints:
+            kafka_bootstrap_servers:
+              - '{{ kafka_bootstrap_servers[0] }}'
+      - name: amazon_managed_kafka_event_source_config
         value:
-          ConsumerGroupId: '{{ ConsumerGroupId }}'
-          SchemaRegistryConfig:
-            SchemaRegistryURI: '{{ SchemaRegistryURI }}'
-            EventRecordFormat: '{{ EventRecordFormat }}'
-            AccessConfigs:
-              - Type: '{{ Type }}'
-                URI: '{{ URI }}'
-            SchemaValidationConfigs:
-              - Attribute: '{{ Attribute }}'
-      - name: SelfManagedKafkaEventSourceConfig
+          consumer_group_id: '{{ consumer_group_id }}'
+          schema_registry_config:
+            schema_registry_uri: '{{ schema_registry_uri }}'
+            event_record_format: '{{ event_record_format }}'
+            access_configs:
+              - type: '{{ type }}'
+                uri: '{{ uri }}'
+            schema_validation_configs:
+              - attribute: '{{ attribute }}'
+      - name: self_managed_kafka_event_source_config
         value:
-          ConsumerGroupId: null
-          SchemaRegistryConfig: null
-      - name: ScalingConfig
+          consumer_group_id: null
+          schema_registry_config: null
+      - name: scaling_config
         value:
-          MaximumConcurrency: '{{ MaximumConcurrency }}'
-      - name: DocumentDBEventSourceConfig
+          maximum_concurrency: '{{ maximum_concurrency }}'
+      - name: document_db_event_source_config
         value:
-          DatabaseName: '{{ DatabaseName }}'
-          CollectionName: '{{ CollectionName }}'
-          FullDocument: '{{ FullDocument }}'
-      - name: ProvisionedPollerConfig
+          database_name: '{{ database_name }}'
+          collection_name: '{{ collection_name }}'
+          full_document: '{{ full_document }}'
+      - name: provisioned_poller_config
         value:
-          MinimumPollers: '{{ MinimumPollers }}'
-          MaximumPollers: '{{ MaximumPollers }}'
-      - name: MetricsConfig
+          minimum_pollers: '{{ minimum_pollers }}'
+          maximum_pollers: '{{ maximum_pollers }}'
+      - name: metrics_config
         value:
-          Metrics:
-            - '{{ Metrics[0] }}'
-
+          metrics:
+            - '{{ metrics[0] }}'
 ```
 </TabItem>
 </Tabs>
@@ -762,7 +761,7 @@ SET PatchDocument = string('{{ {
     "MetricsConfig": metrics_config
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Id>';
+AND Identifier = '{{ id }}';
 ```
 
 
@@ -771,7 +770,7 @@ AND Identifier = '<Id>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.lambda.event_source_mappings
-WHERE Identifier = '<Id>'
+WHERE Identifier = '{{ id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/lambda/functions/index.md b/website/docs/services/lambda/functions/index.md
index 186acfbf0..411d4fcd6 100644
--- a/website/docs/services/lambda/functions/index.md
+++ b/website/docs/services/lambda/functions/index.md
@@ -467,7 +467,7 @@ arn,
 ephemeral_storage,
 architectures
 FROM awscc.lambda.functions
-WHERE region = 'us-east-1' AND Identifier = '<FunctionName>';
+WHERE region = 'us-east-1' AND Identifier = '{{ function_name }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -504,9 +504,9 @@ INSERT INTO awscc.lambda.functions (
  Role,
  region
 )
-SELECT 
-'{{ Code }}',
- '{{ Role }}',
+SELECT
+'{{ code }}',
+ '{{ role }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -543,33 +543,33 @@ INSERT INTO awscc.lambda.functions (
  Architectures,
  region
 )
-SELECT 
- '{{ Description }}',
- '{{ TracingConfig }}',
- '{{ VpcConfig }}',
- '{{ RuntimeManagementConfig }}',
- '{{ ReservedConcurrentExecutions }}',
- '{{ SnapStart }}',
- '{{ FileSystemConfigs }}',
- '{{ FunctionName }}',
- '{{ Runtime }}',
- '{{ KmsKeyArn }}',
- '{{ PackageType }}',
- '{{ CodeSigningConfigArn }}',
- '{{ Layers }}',
- '{{ Tags }}',
- '{{ ImageConfig }}',
- '{{ MemorySize }}',
- '{{ DeadLetterConfig }}',
- '{{ Timeout }}',
- '{{ Handler }}',
- '{{ Code }}',
- '{{ Role }}',
- '{{ LoggingConfig }}',
- '{{ RecursiveLoop }}',
- '{{ Environment }}',
- '{{ EphemeralStorage }}',
- '{{ Architectures }}',
+SELECT
+ '{{ description }}',
+ '{{ tracing_config }}',
+ '{{ vpc_config }}',
+ '{{ runtime_management_config }}',
+ '{{ reserved_concurrent_executions }}',
+ '{{ snap_start }}',
+ '{{ file_system_configs }}',
+ '{{ function_name }}',
+ '{{ runtime }}',
+ '{{ kms_key_arn }}',
+ '{{ package_type }}',
+ '{{ code_signing_config_arn }}',
+ '{{ layers }}',
+ '{{ tags }}',
+ '{{ image_config }}',
+ '{{ memory_size }}',
+ '{{ dead_letter_config }}',
+ '{{ timeout }}',
+ '{{ handler }}',
+ '{{ code }}',
+ '{{ role }}',
+ '{{ logging_config }}',
+ '{{ recursive_loop }}',
+ '{{ environment }}',
+ '{{ ephemeral_storage }}',
+ '{{ architectures }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -587,92 +587,91 @@ globals:
 resources:
   - name: function
     props:
-      - name: Description
-        value: '{{ Description }}'
-      - name: TracingConfig
+      - name: description
+        value: '{{ description }}'
+      - name: tracing_config
         value:
-          Mode: '{{ Mode }}'
-      - name: VpcConfig
+          mode: '{{ mode }}'
+      - name: vpc_config
         value:
-          Ipv6AllowedForDualStack: '{{ Ipv6AllowedForDualStack }}'
-          SecurityGroupIds:
-            - '{{ SecurityGroupIds[0] }}'
-          SubnetIds:
-            - '{{ SubnetIds[0] }}'
-      - name: RuntimeManagementConfig
+          ipv6_allowed_for_dual_stack: '{{ ipv6_allowed_for_dual_stack }}'
+          security_group_ids:
+            - '{{ security_group_ids[0] }}'
+          subnet_ids:
+            - '{{ subnet_ids[0] }}'
+      - name: runtime_management_config
         value:
-          UpdateRuntimeOn: '{{ UpdateRuntimeOn }}'
-          RuntimeVersionArn: '{{ RuntimeVersionArn }}'
-      - name: ReservedConcurrentExecutions
-        value: '{{ ReservedConcurrentExecutions }}'
-      - name: SnapStart
+          update_runtime_on: '{{ update_runtime_on }}'
+          runtime_version_arn: '{{ runtime_version_arn }}'
+      - name: reserved_concurrent_executions
+        value: '{{ reserved_concurrent_executions }}'
+      - name: snap_start
         value:
-          ApplyOn: '{{ ApplyOn }}'
-      - name: FileSystemConfigs
+          apply_on: '{{ apply_on }}'
+      - name: file_system_configs
         value:
-          - Arn: '{{ Arn }}'
-            LocalMountPath: '{{ LocalMountPath }}'
-      - name: FunctionName
-        value: '{{ FunctionName }}'
-      - name: Runtime
-        value: '{{ Runtime }}'
-      - name: KmsKeyArn
-        value: '{{ KmsKeyArn }}'
-      - name: PackageType
-        value: '{{ PackageType }}'
-      - name: CodeSigningConfigArn
-        value: '{{ CodeSigningConfigArn }}'
-      - name: Layers
+          - arn: '{{ arn }}'
+            local_mount_path: '{{ local_mount_path }}'
+      - name: function_name
+        value: '{{ function_name }}'
+      - name: runtime
+        value: '{{ runtime }}'
+      - name: kms_key_arn
+        value: '{{ kms_key_arn }}'
+      - name: package_type
+        value: '{{ package_type }}'
+      - name: code_signing_config_arn
+        value: '{{ code_signing_config_arn }}'
+      - name: layers
         value:
-          - '{{ Layers[0] }}'
-      - name: Tags
+          - '{{ layers[0] }}'
+      - name: tags
         value:
-          - Value: '{{ Value }}'
-            Key: '{{ Key }}'
-      - name: ImageConfig
+          - value: '{{ value }}'
+            key: '{{ key }}'
+      - name: image_config
         value:
-          WorkingDirectory: '{{ WorkingDirectory }}'
-          Command:
-            - '{{ Command[0] }}'
-          EntryPoint:
-            - '{{ EntryPoint[0] }}'
-      - name: MemorySize
-        value: '{{ MemorySize }}'
-      - name: DeadLetterConfig
+          working_directory: '{{ working_directory }}'
+          command:
+            - '{{ command[0] }}'
+          entry_point:
+            - '{{ entry_point[0] }}'
+      - name: memory_size
+        value: '{{ memory_size }}'
+      - name: dead_letter_config
         value:
-          TargetArn: '{{ TargetArn }}'
-      - name: Timeout
-        value: '{{ Timeout }}'
-      - name: Handler
-        value: '{{ Handler }}'
-      - name: Code
+          target_arn: '{{ target_arn }}'
+      - name: timeout
+        value: '{{ timeout }}'
+      - name: handler
+        value: '{{ handler }}'
+      - name: code
         value:
-          SourceKMSKeyArn: '{{ SourceKMSKeyArn }}'
-          S3ObjectVersion: '{{ S3ObjectVersion }}'
-          S3Bucket: '{{ S3Bucket }}'
-          ZipFile: '{{ ZipFile }}'
-          S3Key: '{{ S3Key }}'
-          ImageUri: '{{ ImageUri }}'
-      - name: Role
-        value: '{{ Role }}'
-      - name: LoggingConfig
+          source_kms_key_arn: '{{ source_kms_key_arn }}'
+          s3_object_version: '{{ s3_object_version }}'
+          s3_bucket: '{{ s3_bucket }}'
+          zip_file: '{{ zip_file }}'
+          s3_key: '{{ s3_key }}'
+          image_uri: '{{ image_uri }}'
+      - name: role
+        value: '{{ role }}'
+      - name: logging_config
         value:
-          LogFormat: '{{ LogFormat }}'
-          ApplicationLogLevel: '{{ ApplicationLogLevel }}'
-          LogGroup: '{{ LogGroup }}'
-          SystemLogLevel: '{{ SystemLogLevel }}'
-      - name: RecursiveLoop
-        value: '{{ RecursiveLoop }}'
-      - name: Environment
+          log_format: '{{ log_format }}'
+          application_log_level: '{{ application_log_level }}'
+          log_group: '{{ log_group }}'
+          system_log_level: '{{ system_log_level }}'
+      - name: recursive_loop
+        value: '{{ recursive_loop }}'
+      - name: environment
         value:
-          Variables: {}
-      - name: EphemeralStorage
+          variables: {}
+      - name: ephemeral_storage
         value:
-          Size: '{{ Size }}'
-      - name: Architectures
+          size: '{{ size }}'
+      - name: architectures
         value:
-          - '{{ Architectures[0] }}'
-
+          - '{{ architectures[0] }}'
 ```
 </TabItem>
 </Tabs>
@@ -711,7 +710,7 @@ SET PatchDocument = string('{{ {
     "Architectures": architectures
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<FunctionName>';
+AND Identifier = '{{ function_name }}';
 ```
 
 
@@ -720,7 +719,7 @@ AND Identifier = '<FunctionName>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.lambda.functions
-WHERE Identifier = '<FunctionName>'
+WHERE Identifier = '{{ function_name }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/lambda/layer_version_permissions/index.md b/website/docs/services/lambda/layer_version_permissions/index.md
index 7d8078a07..a9a90487e 100644
--- a/website/docs/services/lambda/layer_version_permissions/index.md
+++ b/website/docs/services/lambda/layer_version_permissions/index.md
@@ -152,7 +152,7 @@ layer_version_arn,
 organization_id,
 principal
 FROM awscc.lambda.layer_version_permissions
-WHERE region = 'us-east-1' AND Identifier = '<Id>';
+WHERE region = 'us-east-1' AND Identifier = '{{ id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -190,10 +190,10 @@ INSERT INTO awscc.lambda.layer_version_permissions (
  Principal,
  region
 )
-SELECT 
-'{{ Action }}',
- '{{ LayerVersionArn }}',
- '{{ Principal }}',
+SELECT
+'{{ action }}',
+ '{{ layer_version_arn }}',
+ '{{ principal }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -208,11 +208,11 @@ INSERT INTO awscc.lambda.layer_version_permissions (
  Principal,
  region
 )
-SELECT 
- '{{ Action }}',
- '{{ LayerVersionArn }}',
- '{{ OrganizationId }}',
- '{{ Principal }}',
+SELECT
+ '{{ action }}',
+ '{{ layer_version_arn }}',
+ '{{ organization_id }}',
+ '{{ principal }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -230,15 +230,14 @@ globals:
 resources:
   - name: layer_version_permission
     props:
-      - name: Action
-        value: '{{ Action }}'
-      - name: LayerVersionArn
-        value: '{{ LayerVersionArn }}'
-      - name: OrganizationId
-        value: '{{ OrganizationId }}'
-      - name: Principal
-        value: '{{ Principal }}'
-
+      - name: action
+        value: '{{ action }}'
+      - name: layer_version_arn
+        value: '{{ layer_version_arn }}'
+      - name: organization_id
+        value: '{{ organization_id }}'
+      - name: principal
+        value: '{{ principal }}'
 ```
 </TabItem>
 </Tabs>
@@ -249,7 +248,7 @@ resources:
 ```sql
 /*+ delete */
 DELETE FROM awscc.lambda.layer_version_permissions
-WHERE Identifier = '<Id>'
+WHERE Identifier = '{{ id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/lambda/layer_versions/index.md b/website/docs/services/lambda/layer_versions/index.md
index 6ca8dabb7..364cfd799 100644
--- a/website/docs/services/lambda/layer_versions/index.md
+++ b/website/docs/services/lambda/layer_versions/index.md
@@ -181,7 +181,7 @@ content,
 layer_version_arn,
 compatible_architectures
 FROM awscc.lambda.layer_versions
-WHERE region = 'us-east-1' AND Identifier = '<LayerVersionArn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ layer_version_arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -217,8 +217,8 @@ INSERT INTO awscc.lambda.layer_versions (
  Content,
  region
 )
-SELECT 
-'{{ Content }}',
+SELECT
+'{{ content }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -235,13 +235,13 @@ INSERT INTO awscc.lambda.layer_versions (
  CompatibleArchitectures,
  region
 )
-SELECT 
- '{{ CompatibleRuntimes }}',
- '{{ LicenseInfo }}',
- '{{ Description }}',
- '{{ LayerName }}',
- '{{ Content }}',
- '{{ CompatibleArchitectures }}',
+SELECT
+ '{{ compatible_runtimes }}',
+ '{{ license_info }}',
+ '{{ description }}',
+ '{{ layer_name }}',
+ '{{ content }}',
+ '{{ compatible_architectures }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -259,24 +259,23 @@ globals:
 resources:
   - name: layer_version
     props:
-      - name: CompatibleRuntimes
+      - name: compatible_runtimes
         value:
-          - '{{ CompatibleRuntimes[0] }}'
-      - name: LicenseInfo
-        value: '{{ LicenseInfo }}'
-      - name: Description
-        value: '{{ Description }}'
-      - name: LayerName
-        value: '{{ LayerName }}'
-      - name: Content
+          - '{{ compatible_runtimes[0] }}'
+      - name: license_info
+        value: '{{ license_info }}'
+      - name: description
+        value: '{{ description }}'
+      - name: layer_name
+        value: '{{ layer_name }}'
+      - name: content
         value:
-          S3ObjectVersion: '{{ S3ObjectVersion }}'
-          S3Bucket: '{{ S3Bucket }}'
-          S3Key: '{{ S3Key }}'
-      - name: CompatibleArchitectures
+          s3_object_version: '{{ s3_object_version }}'
+          s3_bucket: '{{ s3_bucket }}'
+          s3_key: '{{ s3_key }}'
+      - name: compatible_architectures
         value:
-          - '{{ CompatibleArchitectures[0] }}'
-
+          - '{{ compatible_architectures[0] }}'
 ```
 </TabItem>
 </Tabs>
@@ -287,7 +286,7 @@ resources:
 ```sql
 /*+ delete */
 DELETE FROM awscc.lambda.layer_versions
-WHERE Identifier = '<LayerVersionArn>'
+WHERE Identifier = '{{ layer_version_arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/lambda/permissions/index.md b/website/docs/services/lambda/permissions/index.md
index 0c81b6321..951254516 100644
--- a/website/docs/services/lambda/permissions/index.md
+++ b/website/docs/services/lambda/permissions/index.md
@@ -181,7 +181,7 @@ principal_org_id,
 id,
 principal
 FROM awscc.lambda.permissions
-WHERE region = 'us-east-1' AND Identifier = '<FunctionName>|<Id>';
+WHERE region = 'us-east-1' AND Identifier = '{{ function_name }}|{{ id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -220,10 +220,10 @@ INSERT INTO awscc.lambda.permissions (
  Principal,
  region
 )
-SELECT 
-'{{ FunctionName }}',
- '{{ Action }}',
- '{{ Principal }}',
+SELECT
+'{{ function_name }}',
+ '{{ action }}',
+ '{{ principal }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -242,15 +242,15 @@ INSERT INTO awscc.lambda.permissions (
  Principal,
  region
 )
-SELECT 
- '{{ FunctionName }}',
- '{{ Action }}',
- '{{ EventSourceToken }}',
- '{{ FunctionUrlAuthType }}',
- '{{ SourceArn }}',
- '{{ SourceAccount }}',
- '{{ PrincipalOrgID }}',
- '{{ Principal }}',
+SELECT
+ '{{ function_name }}',
+ '{{ action }}',
+ '{{ event_source_token }}',
+ '{{ function_url_auth_type }}',
+ '{{ source_arn }}',
+ '{{ source_account }}',
+ '{{ principal_org_id }}',
+ '{{ principal }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -268,23 +268,22 @@ globals:
 resources:
   - name: permission
     props:
-      - name: FunctionName
-        value: '{{ FunctionName }}'
-      - name: Action
-        value: '{{ Action }}'
-      - name: EventSourceToken
-        value: '{{ EventSourceToken }}'
-      - name: FunctionUrlAuthType
-        value: '{{ FunctionUrlAuthType }}'
-      - name: SourceArn
-        value: '{{ SourceArn }}'
-      - name: SourceAccount
-        value: '{{ SourceAccount }}'
-      - name: PrincipalOrgID
-        value: '{{ PrincipalOrgID }}'
-      - name: Principal
-        value: '{{ Principal }}'
-
+      - name: function_name
+        value: '{{ function_name }}'
+      - name: action
+        value: '{{ action }}'
+      - name: event_source_token
+        value: '{{ event_source_token }}'
+      - name: function_url_auth_type
+        value: '{{ function_url_auth_type }}'
+      - name: source_arn
+        value: '{{ source_arn }}'
+      - name: source_account
+        value: '{{ source_account }}'
+      - name: principal_org_id
+        value: '{{ principal_org_id }}'
+      - name: principal
+        value: '{{ principal }}'
 ```
 </TabItem>
 </Tabs>
@@ -295,7 +294,7 @@ resources:
 ```sql
 /*+ delete */
 DELETE FROM awscc.lambda.permissions
-WHERE Identifier = '<FunctionName|Id>'
+WHERE Identifier = '{{ function_name }}|{{ id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/lambda/urls/index.md b/website/docs/services/lambda/urls/index.md
index 5ba03aec4..6bef90354 100644
--- a/website/docs/services/lambda/urls/index.md
+++ b/website/docs/services/lambda/urls/index.md
@@ -202,7 +202,7 @@ function_arn,
 function_url,
 cors
 FROM awscc.lambda.urls
-WHERE region = 'us-east-1' AND Identifier = '<FunctionArn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ function_arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -239,9 +239,9 @@ INSERT INTO awscc.lambda.urls (
  AuthType,
  region
 )
-SELECT 
-'{{ TargetFunctionArn }}',
- '{{ AuthType }}',
+SELECT
+'{{ target_function_arn }}',
+ '{{ auth_type }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -257,12 +257,12 @@ INSERT INTO awscc.lambda.urls (
  Cors,
  region
 )
-SELECT 
- '{{ TargetFunctionArn }}',
- '{{ Qualifier }}',
- '{{ AuthType }}',
- '{{ InvokeMode }}',
- '{{ Cors }}',
+SELECT
+ '{{ target_function_arn }}',
+ '{{ qualifier }}',
+ '{{ auth_type }}',
+ '{{ invoke_mode }}',
+ '{{ cors }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -280,27 +280,26 @@ globals:
 resources:
   - name: url
     props:
-      - name: TargetFunctionArn
-        value: '{{ TargetFunctionArn }}'
-      - name: Qualifier
-        value: '{{ Qualifier }}'
-      - name: AuthType
-        value: '{{ AuthType }}'
-      - name: InvokeMode
-        value: '{{ InvokeMode }}'
-      - name: Cors
+      - name: target_function_arn
+        value: '{{ target_function_arn }}'
+      - name: qualifier
+        value: '{{ qualifier }}'
+      - name: auth_type
+        value: '{{ auth_type }}'
+      - name: invoke_mode
+        value: '{{ invoke_mode }}'
+      - name: cors
         value:
-          AllowCredentials: '{{ AllowCredentials }}'
-          AllowHeaders:
-            - '{{ AllowHeaders[0] }}'
-          AllowMethods:
-            - '{{ AllowMethods[0] }}'
-          AllowOrigins:
-            - '{{ AllowOrigins[0] }}'
-          ExposeHeaders:
-            - '{{ ExposeHeaders[0] }}'
-          MaxAge: '{{ MaxAge }}'
-
+          allow_credentials: '{{ allow_credentials }}'
+          allow_headers:
+            - '{{ allow_headers[0] }}'
+          allow_methods:
+            - '{{ allow_methods[0] }}'
+          allow_origins:
+            - '{{ allow_origins[0] }}'
+          expose_headers:
+            - '{{ expose_headers[0] }}'
+          max_age: '{{ max_age }}'
 ```
 </TabItem>
 </Tabs>
@@ -318,7 +317,7 @@ SET PatchDocument = string('{{ {
     "Cors": cors
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<FunctionArn>';
+AND Identifier = '{{ function_arn }}';
 ```
 
 
@@ -327,7 +326,7 @@ AND Identifier = '<FunctionArn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.lambda.urls
-WHERE Identifier = '<FunctionArn>'
+WHERE Identifier = '{{ function_arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/lambda/versions/index.md b/website/docs/services/lambda/versions/index.md
index 5311ad988..ec3160a33 100644
--- a/website/docs/services/lambda/versions/index.md
+++ b/website/docs/services/lambda/versions/index.md
@@ -183,7 +183,7 @@ function_name,
 provisioned_concurrency_config,
 runtime_policy
 FROM awscc.lambda.versions
-WHERE region = 'us-east-1' AND Identifier = '<FunctionArn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ function_arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -219,8 +219,8 @@ INSERT INTO awscc.lambda.versions (
  FunctionName,
  region
 )
-SELECT 
-'{{ FunctionName }}',
+SELECT
+'{{ function_name }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -236,12 +236,12 @@ INSERT INTO awscc.lambda.versions (
  RuntimePolicy,
  region
 )
-SELECT 
- '{{ CodeSha256 }}',
- '{{ Description }}',
- '{{ FunctionName }}',
- '{{ ProvisionedConcurrencyConfig }}',
- '{{ RuntimePolicy }}',
+SELECT
+ '{{ code_sha256 }}',
+ '{{ description }}',
+ '{{ function_name }}',
+ '{{ provisioned_concurrency_config }}',
+ '{{ runtime_policy }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -259,20 +259,19 @@ globals:
 resources:
   - name: version
     props:
-      - name: CodeSha256
-        value: '{{ CodeSha256 }}'
-      - name: Description
-        value: '{{ Description }}'
-      - name: FunctionName
-        value: '{{ FunctionName }}'
-      - name: ProvisionedConcurrencyConfig
+      - name: code_sha256
+        value: '{{ code_sha256 }}'
+      - name: description
+        value: '{{ description }}'
+      - name: function_name
+        value: '{{ function_name }}'
+      - name: provisioned_concurrency_config
         value:
-          ProvisionedConcurrentExecutions: '{{ ProvisionedConcurrentExecutions }}'
-      - name: RuntimePolicy
+          provisioned_concurrent_executions: '{{ provisioned_concurrent_executions }}'
+      - name: runtime_policy
         value:
-          RuntimeVersionArn: '{{ RuntimeVersionArn }}'
-          UpdateRuntimeOn: '{{ UpdateRuntimeOn }}'
-
+          runtime_version_arn: '{{ runtime_version_arn }}'
+          update_runtime_on: '{{ update_runtime_on }}'
 ```
 </TabItem>
 </Tabs>
@@ -283,7 +282,7 @@ resources:
 ```sql
 /*+ delete */
 DELETE FROM awscc.lambda.versions
-WHERE Identifier = '<FunctionArn>'
+WHERE Identifier = '{{ function_arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/launchwizard/deployments/index.md b/website/docs/services/launchwizard/deployments/index.md
index e57ec3be5..1e83e6980 100644
--- a/website/docs/services/launchwizard/deployments/index.md
+++ b/website/docs/services/launchwizard/deployments/index.md
@@ -206,7 +206,7 @@ status,
 tags,
 workload_name
 FROM awscc.launchwizard.deployments
-WHERE region = 'us-east-1' AND Identifier = '<Arn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -244,10 +244,10 @@ INSERT INTO awscc.launchwizard.deployments (
  WorkloadName,
  region
 )
-SELECT 
-'{{ DeploymentPatternName }}',
- '{{ Name }}',
- '{{ WorkloadName }}',
+SELECT
+'{{ deployment_pattern_name }}',
+ '{{ name }}',
+ '{{ workload_name }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -263,12 +263,12 @@ INSERT INTO awscc.launchwizard.deployments (
  WorkloadName,
  region
 )
-SELECT 
- '{{ DeploymentPatternName }}',
- '{{ Name }}',
- '{{ Specifications }}',
- '{{ Tags }}',
- '{{ WorkloadName }}',
+SELECT
+ '{{ deployment_pattern_name }}',
+ '{{ name }}',
+ '{{ specifications }}',
+ '{{ tags }}',
+ '{{ workload_name }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -286,19 +286,18 @@ globals:
 resources:
   - name: deployment
     props:
-      - name: DeploymentPatternName
-        value: '{{ DeploymentPatternName }}'
-      - name: Name
-        value: '{{ Name }}'
-      - name: Specifications
+      - name: deployment_pattern_name
+        value: '{{ deployment_pattern_name }}'
+      - name: name
+        value: '{{ name }}'
+      - name: specifications
         value: {}
-      - name: Tags
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-      - name: WorkloadName
-        value: '{{ WorkloadName }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
+      - name: workload_name
+        value: '{{ workload_name }}'
 ```
 </TabItem>
 </Tabs>
@@ -315,7 +314,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Arn>';
+AND Identifier = '{{ arn }}';
 ```
 
 
@@ -324,7 +323,7 @@ AND Identifier = '<Arn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.launchwizard.deployments
-WHERE Identifier = '<Arn>'
+WHERE Identifier = '{{ arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/lex/bot_aliases/index.md b/website/docs/services/lex/bot_aliases/index.md
index 1068f1a42..c57d81433 100644
--- a/website/docs/services/lex/bot_aliases/index.md
+++ b/website/docs/services/lex/bot_aliases/index.md
@@ -313,7 +313,7 @@ description,
 sentiment_analysis_settings,
 bot_alias_tags
 FROM awscc.lex.bot_aliases
-WHERE region = 'us-east-1' AND Identifier = '<BotAliasId>|<BotId>';
+WHERE region = 'us-east-1' AND Identifier = '{{ bot_alias_id }}|{{ bot_id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -351,9 +351,9 @@ INSERT INTO awscc.lex.bot_aliases (
  BotAliasName,
  region
 )
-SELECT 
-'{{ BotId }}',
- '{{ BotAliasName }}',
+SELECT
+'{{ bot_id }}',
+ '{{ bot_alias_name }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -372,15 +372,15 @@ INSERT INTO awscc.lex.bot_aliases (
  BotAliasTags,
  region
 )
-SELECT 
- '{{ BotId }}',
- '{{ BotAliasLocaleSettings }}',
- '{{ BotAliasName }}',
- '{{ BotVersion }}',
- '{{ ConversationLogSettings }}',
- '{{ Description }}',
- '{{ SentimentAnalysisSettings }}',
- '{{ BotAliasTags }}',
+SELECT
+ '{{ bot_id }}',
+ '{{ bot_alias_locale_settings }}',
+ '{{ bot_alias_name }}',
+ '{{ bot_version }}',
+ '{{ conversation_log_settings }}',
+ '{{ description }}',
+ '{{ sentiment_analysis_settings }}',
+ '{{ bot_alias_tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -398,52 +398,51 @@ globals:
 resources:
   - name: bot_alias
     props:
-      - name: BotId
-        value: '{{ BotId }}'
-      - name: BotAliasLocaleSettings
+      - name: bot_id
+        value: '{{ bot_id }}'
+      - name: bot_alias_locale_settings
         value:
-          - LocaleId: '{{ LocaleId }}'
-            BotAliasLocaleSetting:
-              CodeHookSpecification:
-                LambdaCodeHook:
-                  CodeHookInterfaceVersion: '{{ CodeHookInterfaceVersion }}'
-                  LambdaArn: '{{ LambdaArn }}'
-              Enabled: '{{ Enabled }}'
-      - name: BotAliasName
-        value: '{{ BotAliasName }}'
-      - name: BotVersion
+          - locale_id: '{{ locale_id }}'
+            bot_alias_locale_setting:
+              code_hook_specification:
+                lambda_code_hook:
+                  code_hook_interface_version: '{{ code_hook_interface_version }}'
+                  lambda_arn: '{{ lambda_arn }}'
+              enabled: '{{ enabled }}'
+      - name: bot_alias_name
+        value: '{{ bot_alias_name }}'
+      - name: bot_version
         value:
-          BotId: null
-          Description: '{{ Description }}'
-          BotVersionLocaleSpecification:
-            - LocaleId: '{{ LocaleId }}'
-              BotVersionLocaleDetails:
-                SourceBotVersion: null
-      - name: ConversationLogSettings
+          bot_id: null
+          description: '{{ description }}'
+          bot_version_locale_specification:
+            - locale_id: '{{ locale_id }}'
+              bot_version_locale_details:
+                source_bot_version: null
+      - name: conversation_log_settings
         value:
-          AudioLogSettings:
-            - Destination:
-                S3Bucket:
-                  S3BucketArn: '{{ S3BucketArn }}'
-                  LogPrefix: '{{ LogPrefix }}'
-                  KmsKeyArn: '{{ KmsKeyArn }}'
-              Enabled: '{{ Enabled }}'
-          TextLogSettings:
-            - Destination:
-                CloudWatch:
-                  CloudWatchLogGroupArn: '{{ CloudWatchLogGroupArn }}'
-                  LogPrefix: '{{ LogPrefix }}'
-              Enabled: '{{ Enabled }}'
-      - name: Description
+          audio_log_settings:
+            - destination:
+                s3_bucket:
+                  s3_bucket_arn: '{{ s3_bucket_arn }}'
+                  log_prefix: '{{ log_prefix }}'
+                  kms_key_arn: '{{ kms_key_arn }}'
+              enabled: '{{ enabled }}'
+          text_log_settings:
+            - destination:
+                cloud_watch:
+                  cloud_watch_log_group_arn: '{{ cloud_watch_log_group_arn }}'
+                  log_prefix: '{{ log_prefix }}'
+              enabled: '{{ enabled }}'
+      - name: description
         value: null
-      - name: SentimentAnalysisSettings
+      - name: sentiment_analysis_settings
         value:
-          DetectSentiment: '{{ DetectSentiment }}'
-      - name: BotAliasTags
+          detect_sentiment: '{{ detect_sentiment }}'
+      - name: bot_alias_tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -465,7 +464,7 @@ SET PatchDocument = string('{{ {
     "BotAliasTags": bot_alias_tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<BotAliasId>|<BotId>';
+AND Identifier = '{{ bot_alias_id }}|{{ bot_id }}';
 ```
 
 
@@ -474,7 +473,7 @@ AND Identifier = '<BotAliasId>|<BotId>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.lex.bot_aliases
-WHERE Identifier = '<BotAliasId|BotId>'
+WHERE Identifier = '{{ bot_alias_id }}|{{ bot_id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/lex/bot_versions/index.md b/website/docs/services/lex/bot_versions/index.md
index 71cca03b2..1e8bcec83 100644
--- a/website/docs/services/lex/bot_versions/index.md
+++ b/website/docs/services/lex/bot_versions/index.md
@@ -211,7 +211,7 @@ bot_version,
 description,
 bot_version_locale_specification
 FROM awscc.lex.bot_versions
-WHERE region = 'us-east-1' AND Identifier = '<BotId>|<BotVersion>';
+WHERE region = 'us-east-1' AND Identifier = '{{ bot_id }}|{{ bot_version }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -249,9 +249,9 @@ INSERT INTO awscc.lex.bot_versions (
  BotVersionLocaleSpecification,
  region
 )
-SELECT 
-'{{ BotId }}',
- '{{ BotVersionLocaleSpecification }}',
+SELECT
+'{{ bot_id }}',
+ '{{ bot_version_locale_specification }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -265,10 +265,10 @@ INSERT INTO awscc.lex.bot_versions (
  BotVersionLocaleSpecification,
  region
 )
-SELECT 
- '{{ BotId }}',
- '{{ Description }}',
- '{{ BotVersionLocaleSpecification }}',
+SELECT
+ '{{ bot_id }}',
+ '{{ description }}',
+ '{{ bot_version_locale_specification }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -286,19 +286,18 @@ globals:
 resources:
   - name: bot_version
     props:
-      - name: BotId
-        value: '{{ BotId }}'
-      - name: Description
-        value: '{{ Description }}'
-      - name: BotVersionLocaleSpecification
+      - name: bot_id
+        value: '{{ bot_id }}'
+      - name: description
+        value: '{{ description }}'
+      - name: bot_version_locale_specification
         value:
-          - LocaleId: '{{ LocaleId }}'
-            BotVersionLocaleDetails:
-              SourceBotVersion:
-                BotId: null
-                Description: null
-                BotVersionLocaleSpecification: null
-
+          - locale_id: '{{ locale_id }}'
+            bot_version_locale_details:
+              source_bot_version:
+                bot_id: null
+                description: null
+                bot_version_locale_specification: null
 ```
 </TabItem>
 </Tabs>
@@ -309,7 +308,7 @@ resources:
 ```sql
 /*+ delete */
 DELETE FROM awscc.lex.bot_versions
-WHERE Identifier = '<BotId|BotVersion>'
+WHERE Identifier = '{{ bot_id }}|{{ bot_version }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/lex/bots/index.md b/website/docs/services/lex/bots/index.md
index 85c1f46fb..555a40bed 100644
--- a/website/docs/services/lex/bots/index.md
+++ b/website/docs/services/lex/bots/index.md
@@ -819,7 +819,7 @@ auto_build_bot_locales,
 test_bot_alias_settings,
 replication
 FROM awscc.lex.bots
-WHERE region = 'us-east-1' AND Identifier = '<Id>';
+WHERE region = 'us-east-1' AND Identifier = '{{ id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -858,11 +858,11 @@ INSERT INTO awscc.lex.bots (
  IdleSessionTTLInSeconds,
  region
 )
-SELECT 
-'{{ Name }}',
- '{{ RoleArn }}',
- '{{ DataPrivacy }}',
- '{{ IdleSessionTTLInSeconds }}',
+SELECT
+'{{ name }}',
+ '{{ role_arn }}',
+ '{{ data_privacy }}',
+ '{{ idle_session_ttl_in_seconds }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -886,20 +886,20 @@ INSERT INTO awscc.lex.bots (
  Replication,
  region
 )
-SELECT 
- '{{ Name }}',
- '{{ Description }}',
- '{{ RoleArn }}',
- '{{ DataPrivacy }}',
- '{{ ErrorLogSettings }}',
- '{{ IdleSessionTTLInSeconds }}',
- '{{ BotLocales }}',
- '{{ BotFileS3Location }}',
- '{{ BotTags }}',
- '{{ TestBotAliasTags }}',
- '{{ AutoBuildBotLocales }}',
- '{{ TestBotAliasSettings }}',
- '{{ Replication }}',
+SELECT
+ '{{ name }}',
+ '{{ description }}',
+ '{{ role_arn }}',
+ '{{ data_privacy }}',
+ '{{ error_log_settings }}',
+ '{{ idle_session_ttl_in_seconds }}',
+ '{{ bot_locales }}',
+ '{{ bot_file_s3_location }}',
+ '{{ bot_tags }}',
+ '{{ test_bot_alias_tags }}',
+ '{{ auto_build_bot_locales }}',
+ '{{ test_bot_alias_settings }}',
+ '{{ replication }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -917,326 +917,325 @@ globals:
 resources:
   - name: bot
     props:
-      - name: Name
-        value: '{{ Name }}'
-      - name: Description
-        value: '{{ Description }}'
-      - name: RoleArn
-        value: '{{ RoleArn }}'
-      - name: DataPrivacy
+      - name: name
+        value: '{{ name }}'
+      - name: description
+        value: '{{ description }}'
+      - name: role_arn
+        value: '{{ role_arn }}'
+      - name: data_privacy
         value:
-          ChildDirected: '{{ ChildDirected }}'
-      - name: ErrorLogSettings
+          child_directed: '{{ child_directed }}'
+      - name: error_log_settings
         value:
-          Enabled: '{{ Enabled }}'
-      - name: IdleSessionTTLInSeconds
-        value: '{{ IdleSessionTTLInSeconds }}'
-      - name: BotLocales
+          enabled: '{{ enabled }}'
+      - name: idle_session_ttl_in_seconds
+        value: '{{ idle_session_ttl_in_seconds }}'
+      - name: bot_locales
         value:
-          - LocaleId: '{{ LocaleId }}'
-            Description: null
-            VoiceSettings:
-              VoiceId: '{{ VoiceId }}'
-              Engine: '{{ Engine }}'
-            GenerativeAISettings:
-              BuildtimeSettings:
-                DescriptiveBotBuilderSpecification:
-                  Enabled: '{{ Enabled }}'
-                  BedrockModelSpecification:
-                    ModelArn: '{{ ModelArn }}'
-                    BedrockGuardrailConfiguration:
-                      BedrockGuardrailIdentifier: '{{ BedrockGuardrailIdentifier }}'
-                      BedrockGuardrailVersion: '{{ BedrockGuardrailVersion }}'
-                    BedrockTraceStatus: '{{ BedrockTraceStatus }}'
-                    BedrockModelCustomPrompt: '{{ BedrockModelCustomPrompt }}'
-                SampleUtteranceGenerationSpecification:
-                  Enabled: '{{ Enabled }}'
-                  BedrockModelSpecification: null
-              RuntimeSettings:
-                NluImprovementSpecification:
-                  Enabled: '{{ Enabled }}'
-                SlotResolutionImprovementSpecification:
-                  Enabled: '{{ Enabled }}'
-                  BedrockModelSpecification: null
-            NluConfidenceThreshold: null
-            Intents:
-              - Name: null
-                Description: null
-                ParentIntentSignature: '{{ ParentIntentSignature }}'
-                SampleUtterances:
-                  - Utterance: '{{ Utterance }}'
-                DialogCodeHook:
-                  Enabled: '{{ Enabled }}'
-                FulfillmentCodeHook:
-                  FulfillmentUpdatesSpecification:
-                    StartResponse:
-                      MessageGroups:
-                        - Message:
-                            PlainTextMessage:
-                              Value: '{{ Value }}'
-                            CustomPayload:
-                              Value: '{{ Value }}'
-                            SSMLMessage:
-                              Value: '{{ Value }}'
-                            ImageResponseCard:
-                              Title: '{{ Title }}'
-                              Subtitle: null
-                              ImageUrl: '{{ ImageUrl }}'
-                              Buttons:
-                                - Text: '{{ Text }}'
-                                  Value: '{{ Value }}'
-                          Variations:
+          - locale_id: '{{ locale_id }}'
+            description: null
+            voice_settings:
+              voice_id: '{{ voice_id }}'
+              engine: '{{ engine }}'
+            generative_ai_settings:
+              buildtime_settings:
+                descriptive_bot_builder_specification:
+                  enabled: '{{ enabled }}'
+                  bedrock_model_specification:
+                    model_arn: '{{ model_arn }}'
+                    bedrock_guardrail_configuration:
+                      bedrock_guardrail_identifier: '{{ bedrock_guardrail_identifier }}'
+                      bedrock_guardrail_version: '{{ bedrock_guardrail_version }}'
+                    bedrock_trace_status: '{{ bedrock_trace_status }}'
+                    bedrock_model_custom_prompt: '{{ bedrock_model_custom_prompt }}'
+                sample_utterance_generation_specification:
+                  enabled: '{{ enabled }}'
+                  bedrock_model_specification: null
+              runtime_settings:
+                nlu_improvement_specification:
+                  enabled: '{{ enabled }}'
+                slot_resolution_improvement_specification:
+                  enabled: '{{ enabled }}'
+                  bedrock_model_specification: null
+            nlu_confidence_threshold: null
+            intents:
+              - name: null
+                description: null
+                parent_intent_signature: '{{ parent_intent_signature }}'
+                sample_utterances:
+                  - utterance: '{{ utterance }}'
+                dialog_code_hook:
+                  enabled: '{{ enabled }}'
+                fulfillment_code_hook:
+                  fulfillment_updates_specification:
+                    start_response:
+                      message_groups:
+                        - message:
+                            plain_text_message:
+                              value: '{{ value }}'
+                            custom_payload:
+                              value: '{{ value }}'
+                            ssm_lmessage:
+                              value: '{{ value }}'
+                            image_response_card:
+                              title: '{{ title }}'
+                              subtitle: null
+                              image_url: '{{ image_url }}'
+                              buttons:
+                                - text: '{{ text }}'
+                                  value: '{{ value }}'
+                          variations:
                             - null
-                      DelayInSeconds: '{{ DelayInSeconds }}'
-                      AllowInterrupt: '{{ AllowInterrupt }}'
-                    UpdateResponse:
-                      MessageGroups: null
-                      FrequencyInSeconds: '{{ FrequencyInSeconds }}'
-                      AllowInterrupt: '{{ AllowInterrupt }}'
-                    TimeoutInSeconds: '{{ TimeoutInSeconds }}'
-                    Active: '{{ Active }}'
-                  PostFulfillmentStatusSpecification:
-                    SuccessResponse:
-                      MessageGroupsList: null
-                      AllowInterrupt: '{{ AllowInterrupt }}'
-                    SuccessNextStep:
-                      DialogAction:
-                        Type: '{{ Type }}'
-                        SlotToElicit: null
-                        SuppressNextMessage: '{{ SuppressNextMessage }}'
-                      Intent:
-                        Name: null
-                        Slots:
-                          - SlotName: null
-                            SlotValueOverride:
-                              Shape: '{{ Shape }}'
-                              Value:
-                                InterpretedValue: '{{ InterpretedValue }}'
-                              Values:
+                      delay_in_seconds: '{{ delay_in_seconds }}'
+                      allow_interrupt: '{{ allow_interrupt }}'
+                    update_response:
+                      message_groups: null
+                      frequency_in_seconds: '{{ frequency_in_seconds }}'
+                      allow_interrupt: '{{ allow_interrupt }}'
+                    timeout_in_seconds: '{{ timeout_in_seconds }}'
+                    active: '{{ active }}'
+                  post_fulfillment_status_specification:
+                    success_response:
+                      message_groups_list: null
+                      allow_interrupt: '{{ allow_interrupt }}'
+                    success_next_step:
+                      dialog_action:
+                        type: '{{ type }}'
+                        slot_to_elicit: null
+                        suppress_next_message: '{{ suppress_next_message }}'
+                      intent:
+                        name: null
+                        slots:
+                          - slot_name: null
+                            slot_value_override:
+                              shape: '{{ shape }}'
+                              value:
+                                interpreted_value: '{{ interpreted_value }}'
+                              values:
                                 - null
-                      SessionAttributes:
-                        - Key: '{{ Key }}'
-                          Value: '{{ Value }}'
-                    SuccessConditional:
-                      IsActive: '{{ IsActive }}'
-                      ConditionalBranches:
-                        - Name: null
-                          Condition:
-                            ExpressionString: '{{ ExpressionString }}'
-                          NextStep: null
-                          Response: null
-                      DefaultBranch:
-                        NextStep: null
-                        Response: null
-                    FailureResponse: null
-                    FailureNextStep: null
-                    FailureConditional: null
-                    TimeoutResponse: null
-                    TimeoutNextStep: null
-                    TimeoutConditional: null
-                  Enabled: '{{ Enabled }}'
-                  IsActive: '{{ IsActive }}'
-                IntentConfirmationSetting:
-                  PromptSpecification:
-                    MessageGroupsList: null
-                    MaxRetries: '{{ MaxRetries }}'
-                    AllowInterrupt: '{{ AllowInterrupt }}'
-                    MessageSelectionStrategy: '{{ MessageSelectionStrategy }}'
-                    PromptAttemptsSpecification: {}
-                  IsActive: '{{ IsActive }}'
-                  ConfirmationResponse: null
-                  ConfirmationNextStep: null
-                  ConfirmationConditional: null
-                  DeclinationResponse: null
-                  DeclinationNextStep: null
-                  DeclinationConditional: null
-                  FailureResponse: null
-                  FailureNextStep: null
-                  FailureConditional: null
-                  CodeHook:
-                    EnableCodeHookInvocation: '{{ EnableCodeHookInvocation }}'
-                    IsActive: '{{ IsActive }}'
-                    InvocationLabel: null
-                    PostCodeHookSpecification:
-                      SuccessResponse: null
-                      SuccessNextStep: null
-                      SuccessConditional: null
-                      FailureResponse: null
-                      FailureNextStep: null
-                      FailureConditional: null
-                      TimeoutResponse: null
-                      TimeoutNextStep: null
-                      TimeoutConditional: null
-                  ElicitationCodeHook:
-                    EnableCodeHookInvocation: '{{ EnableCodeHookInvocation }}'
-                    InvocationLabel: null
-                IntentClosingSetting:
-                  ClosingResponse: null
-                  IsActive: '{{ IsActive }}'
-                  Conditional: null
-                  NextStep: null
-                InitialResponseSetting:
-                  InitialResponse: null
-                  NextStep: null
-                  Conditional: null
-                  CodeHook: null
-                InputContexts:
-                  - Name: null
-                OutputContexts:
-                  - Name: null
-                    TimeToLiveInSeconds: '{{ TimeToLiveInSeconds }}'
-                    TurnsToLive: '{{ TurnsToLive }}'
-                KendraConfiguration:
-                  KendraIndex: '{{ KendraIndex }}'
-                  QueryFilterStringEnabled: '{{ QueryFilterStringEnabled }}'
-                  QueryFilterString: '{{ QueryFilterString }}'
-                QnAIntentConfiguration:
-                  DataSourceConfiguration:
-                    OpensearchConfiguration:
-                      DomainEndpoint: '{{ DomainEndpoint }}'
-                      IndexName: '{{ IndexName }}'
-                      IncludeFields:
-                        - '{{ IncludeFields[0] }}'
-                      ExactResponse: '{{ ExactResponse }}'
-                      ExactResponseFields:
-                        QuestionField: '{{ QuestionField }}'
-                        AnswerField: '{{ AnswerField }}'
-                    BedrockKnowledgeStoreConfiguration:
-                      BedrockKnowledgeBaseArn: '{{ BedrockKnowledgeBaseArn }}'
-                      ExactResponse: '{{ ExactResponse }}'
-                      BKBExactResponseFields:
-                        AnswerField: '{{ AnswerField }}'
-                    KendraConfiguration:
-                      KendraIndex: '{{ KendraIndex }}'
-                      QueryFilterString: '{{ QueryFilterString }}'
-                      QueryFilterStringEnabled: '{{ QueryFilterStringEnabled }}'
-                      ExactResponse: '{{ ExactResponse }}'
-                  BedrockModelConfiguration: null
-                QInConnectIntentConfiguration:
-                  QInConnectAssistantConfiguration:
-                    AssistantArn: '{{ AssistantArn }}'
-                BedrockAgentIntentConfiguration:
-                  BedrockAgentConfiguration:
-                    BedrockAgentId: '{{ BedrockAgentId }}'
-                    BedrockAgentAliasId: '{{ BedrockAgentAliasId }}'
-                  BedrockAgentIntentKnowledgeBaseConfiguration:
-                    BedrockKnowledgeBaseArn: '{{ BedrockKnowledgeBaseArn }}'
-                    BedrockModelConfiguration: null
-                SlotPriorities:
-                  - Priority: '{{ Priority }}'
-                    SlotName: null
-                Slots:
-                  - Name: null
-                    Description: null
-                    SlotTypeName: '{{ SlotTypeName }}'
-                    ValueElicitationSetting:
-                      DefaultValueSpecification:
-                        DefaultValueList:
-                          - DefaultValue: '{{ DefaultValue }}'
-                      SlotConstraint: '{{ SlotConstraint }}'
-                      PromptSpecification: null
-                      SampleUtterances: null
-                      WaitAndContinueSpecification:
-                        WaitingResponse: null
-                        ContinueResponse: null
-                        StillWaitingResponse:
-                          MessageGroupsList: null
-                          FrequencyInSeconds: '{{ FrequencyInSeconds }}'
-                          TimeoutInSeconds: '{{ TimeoutInSeconds }}'
-                          AllowInterrupt: '{{ AllowInterrupt }}'
-                        IsActive: '{{ IsActive }}'
-                      SlotCaptureSetting:
-                        CaptureResponse: null
-                        CaptureNextStep: null
-                        CaptureConditional: null
-                        FailureResponse: null
-                        FailureNextStep: null
-                        FailureConditional: null
-                        CodeHook: null
-                        ElicitationCodeHook: null
-                    ObfuscationSetting:
-                      ObfuscationSettingType: '{{ ObfuscationSettingType }}'
-                    MultipleValuesSetting:
-                      AllowMultipleValues: '{{ AllowMultipleValues }}'
-                    SubSlotSetting:
-                      Expression: '{{ Expression }}'
-                      SlotSpecifications: {}
-            SlotTypes:
-              - Name: null
-                Description: null
-                ParentSlotTypeSignature: '{{ ParentSlotTypeSignature }}'
-                SlotTypeValues:
-                  - SampleValue:
-                      Value: '{{ Value }}'
-                    Synonyms:
+                      session_attributes:
+                        - key: '{{ key }}'
+                          value: '{{ value }}'
+                    success_conditional:
+                      is_active: '{{ is_active }}'
+                      conditional_branches:
+                        - name: null
+                          condition:
+                            expression_string: '{{ expression_string }}'
+                          next_step: null
+                          response: null
+                      default_branch:
+                        next_step: null
+                        response: null
+                    failure_response: null
+                    failure_next_step: null
+                    failure_conditional: null
+                    timeout_response: null
+                    timeout_next_step: null
+                    timeout_conditional: null
+                  enabled: '{{ enabled }}'
+                  is_active: '{{ is_active }}'
+                intent_confirmation_setting:
+                  prompt_specification:
+                    message_groups_list: null
+                    max_retries: '{{ max_retries }}'
+                    allow_interrupt: '{{ allow_interrupt }}'
+                    message_selection_strategy: '{{ message_selection_strategy }}'
+                    prompt_attempts_specification: {}
+                  is_active: '{{ is_active }}'
+                  confirmation_response: null
+                  confirmation_next_step: null
+                  confirmation_conditional: null
+                  declination_response: null
+                  declination_next_step: null
+                  declination_conditional: null
+                  failure_response: null
+                  failure_next_step: null
+                  failure_conditional: null
+                  code_hook:
+                    enable_code_hook_invocation: '{{ enable_code_hook_invocation }}'
+                    is_active: '{{ is_active }}'
+                    invocation_label: null
+                    post_code_hook_specification:
+                      success_response: null
+                      success_next_step: null
+                      success_conditional: null
+                      failure_response: null
+                      failure_next_step: null
+                      failure_conditional: null
+                      timeout_response: null
+                      timeout_next_step: null
+                      timeout_conditional: null
+                  elicitation_code_hook:
+                    enable_code_hook_invocation: '{{ enable_code_hook_invocation }}'
+                    invocation_label: null
+                intent_closing_setting:
+                  closing_response: null
+                  is_active: '{{ is_active }}'
+                  conditional: null
+                  next_step: null
+                initial_response_setting:
+                  initial_response: null
+                  next_step: null
+                  conditional: null
+                  code_hook: null
+                input_contexts:
+                  - name: null
+                output_contexts:
+                  - name: null
+                    time_to_live_in_seconds: '{{ time_to_live_in_seconds }}'
+                    turns_to_live: '{{ turns_to_live }}'
+                kendra_configuration:
+                  kendra_index: '{{ kendra_index }}'
+                  query_filter_string_enabled: '{{ query_filter_string_enabled }}'
+                  query_filter_string: '{{ query_filter_string }}'
+                qn_aintent_configuration:
+                  data_source_configuration:
+                    opensearch_configuration:
+                      domain_endpoint: '{{ domain_endpoint }}'
+                      index_name: '{{ index_name }}'
+                      include_fields:
+                        - '{{ include_fields[0] }}'
+                      exact_response: '{{ exact_response }}'
+                      exact_response_fields:
+                        question_field: '{{ question_field }}'
+                        answer_field: '{{ answer_field }}'
+                    bedrock_knowledge_store_configuration:
+                      bedrock_knowledge_base_arn: '{{ bedrock_knowledge_base_arn }}'
+                      exact_response: '{{ exact_response }}'
+                      b_kb_exact_response_fields:
+                        answer_field: '{{ answer_field }}'
+                    kendra_configuration:
+                      kendra_index: '{{ kendra_index }}'
+                      query_filter_string: '{{ query_filter_string }}'
+                      query_filter_string_enabled: '{{ query_filter_string_enabled }}'
+                      exact_response: '{{ exact_response }}'
+                  bedrock_model_configuration: null
+                q_in_connect_intent_configuration:
+                  q_in_connect_assistant_configuration:
+                    assistant_arn: '{{ assistant_arn }}'
+                bedrock_agent_intent_configuration:
+                  bedrock_agent_configuration:
+                    bedrock_agent_id: '{{ bedrock_agent_id }}'
+                    bedrock_agent_alias_id: '{{ bedrock_agent_alias_id }}'
+                  bedrock_agent_intent_knowledge_base_configuration:
+                    bedrock_knowledge_base_arn: '{{ bedrock_knowledge_base_arn }}'
+                    bedrock_model_configuration: null
+                slot_priorities:
+                  - priority: '{{ priority }}'
+                    slot_name: null
+                slots:
+                  - name: null
+                    description: null
+                    slot_type_name: '{{ slot_type_name }}'
+                    value_elicitation_setting:
+                      default_value_specification:
+                        default_value_list:
+                          - default_value: '{{ default_value }}'
+                      slot_constraint: '{{ slot_constraint }}'
+                      prompt_specification: null
+                      sample_utterances: null
+                      wait_and_continue_specification:
+                        waiting_response: null
+                        continue_response: null
+                        still_waiting_response:
+                          message_groups_list: null
+                          frequency_in_seconds: '{{ frequency_in_seconds }}'
+                          timeout_in_seconds: '{{ timeout_in_seconds }}'
+                          allow_interrupt: '{{ allow_interrupt }}'
+                        is_active: '{{ is_active }}'
+                      slot_capture_setting:
+                        capture_response: null
+                        capture_next_step: null
+                        capture_conditional: null
+                        failure_response: null
+                        failure_next_step: null
+                        failure_conditional: null
+                        code_hook: null
+                        elicitation_code_hook: null
+                    obfuscation_setting:
+                      obfuscation_setting_type: '{{ obfuscation_setting_type }}'
+                    multiple_values_setting:
+                      allow_multiple_values: '{{ allow_multiple_values }}'
+                    sub_slot_setting:
+                      expression: '{{ expression }}'
+                      slot_specifications: {}
+            slot_types:
+              - name: null
+                description: null
+                parent_slot_type_signature: '{{ parent_slot_type_signature }}'
+                slot_type_values:
+                  - sample_value:
+                      value: '{{ value }}'
+                    synonyms:
                       - null
-                ValueSelectionSetting:
-                  ResolutionStrategy: '{{ ResolutionStrategy }}'
-                  RegexFilter:
-                    Pattern: '{{ Pattern }}'
-                  AdvancedRecognitionSetting:
-                    AudioRecognitionStrategy: '{{ AudioRecognitionStrategy }}'
-                ExternalSourceSetting:
-                  GrammarSlotTypeSetting:
-                    Source:
-                      S3BucketName: '{{ S3BucketName }}'
-                      S3ObjectKey: '{{ S3ObjectKey }}'
-                      KmsKeyArn: '{{ KmsKeyArn }}'
-                CompositeSlotTypeSetting:
-                  SubSlots:
-                    - Name: '{{ Name }}'
-                      SlotTypeId: '{{ SlotTypeId }}'
-            CustomVocabulary:
-              CustomVocabularyItems:
-                - Phrase: '{{ Phrase }}'
-                  Weight: '{{ Weight }}'
-                  DisplayAs: '{{ DisplayAs }}'
-      - name: BotFileS3Location
+                value_selection_setting:
+                  resolution_strategy: '{{ resolution_strategy }}'
+                  regex_filter:
+                    pattern: '{{ pattern }}'
+                  advanced_recognition_setting:
+                    audio_recognition_strategy: '{{ audio_recognition_strategy }}'
+                external_source_setting:
+                  grammar_slot_type_setting:
+                    source:
+                      s3_bucket_name: '{{ s3_bucket_name }}'
+                      s3_object_key: '{{ s3_object_key }}'
+                      kms_key_arn: '{{ kms_key_arn }}'
+                composite_slot_type_setting:
+                  sub_slots:
+                    - name: '{{ name }}'
+                      slot_type_id: '{{ slot_type_id }}'
+            custom_vocabulary:
+              custom_vocabulary_items:
+                - phrase: '{{ phrase }}'
+                  weight: '{{ weight }}'
+                  display_as: '{{ display_as }}'
+      - name: bot_file_s3_location
         value:
-          S3Bucket: null
-          S3ObjectKey: null
-          S3ObjectVersion: '{{ S3ObjectVersion }}'
-      - name: BotTags
+          s3_bucket: null
+          s3_object_key: null
+          s3_object_version: '{{ s3_object_version }}'
+      - name: bot_tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-      - name: TestBotAliasTags
+          - key: '{{ key }}'
+            value: '{{ value }}'
+      - name: test_bot_alias_tags
         value:
           - null
-      - name: AutoBuildBotLocales
-        value: '{{ AutoBuildBotLocales }}'
-      - name: TestBotAliasSettings
+      - name: auto_build_bot_locales
+        value: '{{ auto_build_bot_locales }}'
+      - name: test_bot_alias_settings
         value:
-          BotAliasLocaleSettings:
-            - LocaleId: '{{ LocaleId }}'
-              BotAliasLocaleSetting:
-                CodeHookSpecification:
-                  LambdaCodeHook:
-                    CodeHookInterfaceVersion: '{{ CodeHookInterfaceVersion }}'
-                    LambdaArn: '{{ LambdaArn }}'
-                Enabled: '{{ Enabled }}'
-          ConversationLogSettings:
-            AudioLogSettings:
-              - Destination:
-                  S3Bucket:
-                    S3BucketArn: '{{ S3BucketArn }}'
-                    LogPrefix: '{{ LogPrefix }}'
-                    KmsKeyArn: '{{ KmsKeyArn }}'
-                Enabled: '{{ Enabled }}'
-            TextLogSettings:
-              - Destination:
-                  CloudWatch:
-                    CloudWatchLogGroupArn: '{{ CloudWatchLogGroupArn }}'
-                    LogPrefix: '{{ LogPrefix }}'
-                Enabled: '{{ Enabled }}'
-          Description: null
-          SentimentAnalysisSettings:
-            DetectSentiment: '{{ DetectSentiment }}'
-      - name: Replication
+          bot_alias_locale_settings:
+            - locale_id: '{{ locale_id }}'
+              bot_alias_locale_setting:
+                code_hook_specification:
+                  lambda_code_hook:
+                    code_hook_interface_version: '{{ code_hook_interface_version }}'
+                    lambda_arn: '{{ lambda_arn }}'
+                enabled: '{{ enabled }}'
+          conversation_log_settings:
+            audio_log_settings:
+              - destination:
+                  s3_bucket:
+                    s3_bucket_arn: '{{ s3_bucket_arn }}'
+                    log_prefix: '{{ log_prefix }}'
+                    kms_key_arn: '{{ kms_key_arn }}'
+                enabled: '{{ enabled }}'
+            text_log_settings:
+              - destination:
+                  cloud_watch:
+                    cloud_watch_log_group_arn: '{{ cloud_watch_log_group_arn }}'
+                    log_prefix: '{{ log_prefix }}'
+                enabled: '{{ enabled }}'
+          description: null
+          sentiment_analysis_settings:
+            detect_sentiment: '{{ detect_sentiment }}'
+      - name: replication
         value:
-          ReplicaRegions:
-            - '{{ ReplicaRegions[0] }}'
-
+          replica_regions:
+            - '{{ replica_regions[0] }}'
 ```
 </TabItem>
 </Tabs>
@@ -1264,7 +1263,7 @@ SET PatchDocument = string('{{ {
     "Replication": replication
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Id>';
+AND Identifier = '{{ id }}';
 ```
 
 
@@ -1273,7 +1272,7 @@ AND Identifier = '<Id>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.lex.bots
-WHERE Identifier = '<Id>'
+WHERE Identifier = '{{ id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/lex/resource_policies/index.md b/website/docs/services/lex/resource_policies/index.md
index 0e76024e8..560edb1cc 100644
--- a/website/docs/services/lex/resource_policies/index.md
+++ b/website/docs/services/lex/resource_policies/index.md
@@ -152,7 +152,7 @@ revision_id,
 policy,
 id
 FROM awscc.lex.resource_policies
-WHERE region = 'us-east-1' AND Identifier = '<Id>';
+WHERE region = 'us-east-1' AND Identifier = '{{ id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -189,9 +189,9 @@ INSERT INTO awscc.lex.resource_policies (
  Policy,
  region
 )
-SELECT 
-'{{ ResourceArn }}',
- '{{ Policy }}',
+SELECT
+'{{ resource_arn }}',
+ '{{ policy }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -204,9 +204,9 @@ INSERT INTO awscc.lex.resource_policies (
  Policy,
  region
 )
-SELECT 
- '{{ ResourceArn }}',
- '{{ Policy }}',
+SELECT
+ '{{ resource_arn }}',
+ '{{ policy }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -224,11 +224,10 @@ globals:
 resources:
   - name: resource_policy
     props:
-      - name: ResourceArn
-        value: '{{ ResourceArn }}'
-      - name: Policy
+      - name: resource_arn
+        value: '{{ resource_arn }}'
+      - name: policy
         value: {}
-
 ```
 </TabItem>
 </Tabs>
@@ -245,7 +244,7 @@ SET PatchDocument = string('{{ {
     "Policy": policy
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Id>';
+AND Identifier = '{{ id }}';
 ```
 
 
@@ -254,7 +253,7 @@ AND Identifier = '<Id>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.lex.resource_policies
-WHERE Identifier = '<Id>'
+WHERE Identifier = '{{ id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/licensemanager/grants/index.md b/website/docs/services/licensemanager/grants/index.md
index 1b38389ee..c90c11ec1 100644
--- a/website/docs/services/licensemanager/grants/index.md
+++ b/website/docs/services/licensemanager/grants/index.md
@@ -171,7 +171,7 @@ allowed_operations,
 principals,
 status
 FROM awscc.licensemanager.grants
-WHERE region = 'us-east-1' AND Identifier = '<GrantArn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ grant_arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -207,7 +207,7 @@ INSERT INTO awscc.licensemanager.grants (
  ,
  region
 )
-SELECT 
+SELECT
 '{{  }}',
 '{{ region }}';
 ```
@@ -225,13 +225,13 @@ INSERT INTO awscc.licensemanager.grants (
  Status,
  region
 )
-SELECT 
- '{{ GrantName }}',
- '{{ LicenseArn }}',
- '{{ HomeRegion }}',
- '{{ AllowedOperations }}',
- '{{ Principals }}',
- '{{ Status }}',
+SELECT
+ '{{ grant_name }}',
+ '{{ license_arn }}',
+ '{{ home_region }}',
+ '{{ allowed_operations }}',
+ '{{ principals }}',
+ '{{ status }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -249,21 +249,20 @@ globals:
 resources:
   - name: grant
     props:
-      - name: GrantName
-        value: '{{ GrantName }}'
-      - name: LicenseArn
-        value: '{{ LicenseArn }}'
-      - name: HomeRegion
-        value: '{{ HomeRegion }}'
-      - name: AllowedOperations
+      - name: grant_name
+        value: '{{ grant_name }}'
+      - name: license_arn
+        value: '{{ license_arn }}'
+      - name: home_region
+        value: '{{ home_region }}'
+      - name: allowed_operations
         value:
-          - '{{ AllowedOperations[0] }}'
-      - name: Principals
+          - '{{ allowed_operations[0] }}'
+      - name: principals
         value:
           - null
-      - name: Status
-        value: '{{ Status }}'
-
+      - name: status
+        value: '{{ status }}'
 ```
 </TabItem>
 </Tabs>
@@ -284,7 +283,7 @@ SET PatchDocument = string('{{ {
     "Status": status
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<GrantArn>';
+AND Identifier = '{{ grant_arn }}';
 ```
 
 
@@ -293,7 +292,7 @@ AND Identifier = '<GrantArn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.licensemanager.grants
-WHERE Identifier = '<GrantArn>'
+WHERE Identifier = '{{ grant_arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/licensemanager/licenses/index.md b/website/docs/services/licensemanager/licenses/index.md
index 3e1af3b01..e1d8a6934 100644
--- a/website/docs/services/licensemanager/licenses/index.md
+++ b/website/docs/services/licensemanager/licenses/index.md
@@ -310,7 +310,7 @@ license_arn,
 status,
 version
 FROM awscc.licensemanager.licenses
-WHERE region = 'us-east-1' AND Identifier = '<LicenseArn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ license_arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -352,14 +352,14 @@ INSERT INTO awscc.licensemanager.licenses (
  ConsumptionConfiguration,
  region
 )
-SELECT 
-'{{ Issuer }}',
- '{{ LicenseName }}',
- '{{ ProductName }}',
- '{{ HomeRegion }}',
- '{{ Validity }}',
- '{{ Entitlements }}',
- '{{ ConsumptionConfiguration }}',
+SELECT
+'{{ issuer }}',
+ '{{ license_name }}',
+ '{{ product_name }}',
+ '{{ home_region }}',
+ '{{ validity }}',
+ '{{ entitlements }}',
+ '{{ consumption_configuration }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -381,18 +381,18 @@ INSERT INTO awscc.licensemanager.licenses (
  Status,
  region
 )
-SELECT 
- '{{ ProductSKU }}',
- '{{ Issuer }}',
- '{{ LicenseName }}',
- '{{ ProductName }}',
- '{{ HomeRegion }}',
- '{{ Validity }}',
- '{{ Entitlements }}',
- '{{ Beneficiary }}',
- '{{ ConsumptionConfiguration }}',
- '{{ LicenseMetadata }}',
- '{{ Status }}',
+SELECT
+ '{{ product_sku }}',
+ '{{ issuer }}',
+ '{{ license_name }}',
+ '{{ product_name }}',
+ '{{ home_region }}',
+ '{{ validity }}',
+ '{{ entitlements }}',
+ '{{ beneficiary }}',
+ '{{ consumption_configuration }}',
+ '{{ license_metadata }}',
+ '{{ status }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -410,47 +410,46 @@ globals:
 resources:
   - name: license
     props:
-      - name: ProductSKU
-        value: '{{ ProductSKU }}'
-      - name: Issuer
+      - name: product_sku
+        value: '{{ product_sku }}'
+      - name: issuer
         value:
-          Name: '{{ Name }}'
-          SignKey: '{{ SignKey }}'
-      - name: LicenseName
-        value: '{{ LicenseName }}'
-      - name: ProductName
-        value: '{{ ProductName }}'
-      - name: HomeRegion
-        value: '{{ HomeRegion }}'
-      - name: Validity
+          name: '{{ name }}'
+          sign_key: '{{ sign_key }}'
+      - name: license_name
+        value: '{{ license_name }}'
+      - name: product_name
+        value: '{{ product_name }}'
+      - name: home_region
+        value: '{{ home_region }}'
+      - name: validity
         value:
-          Begin: '{{ Begin }}'
-          End: '{{ End }}'
-      - name: Entitlements
+          begin: '{{ begin }}'
+          end: '{{ end }}'
+      - name: entitlements
         value:
-          - Name: '{{ Name }}'
-            Value: '{{ Value }}'
-            MaxCount: '{{ MaxCount }}'
-            Overage: '{{ Overage }}'
-            Unit: '{{ Unit }}'
-            AllowCheckIn: '{{ AllowCheckIn }}'
-      - name: Beneficiary
-        value: '{{ Beneficiary }}'
-      - name: ConsumptionConfiguration
+          - name: '{{ name }}'
+            value: '{{ value }}'
+            max_count: '{{ max_count }}'
+            overage: '{{ overage }}'
+            unit: '{{ unit }}'
+            allow_check_in: '{{ allow_check_in }}'
+      - name: beneficiary
+        value: '{{ beneficiary }}'
+      - name: consumption_configuration
         value:
-          RenewType: '{{ RenewType }}'
-          ProvisionalConfiguration:
-            MaxTimeToLiveInMinutes: '{{ MaxTimeToLiveInMinutes }}'
-          BorrowConfiguration:
-            MaxTimeToLiveInMinutes: '{{ MaxTimeToLiveInMinutes }}'
-            AllowEarlyCheckIn: '{{ AllowEarlyCheckIn }}'
-      - name: LicenseMetadata
+          renew_type: '{{ renew_type }}'
+          provisional_configuration:
+            max_time_to_live_in_minutes: '{{ max_time_to_live_in_minutes }}'
+          borrow_configuration:
+            max_time_to_live_in_minutes: '{{ max_time_to_live_in_minutes }}'
+            allow_early_check_in: '{{ allow_early_check_in }}'
+      - name: license_metadata
         value:
-          - Name: '{{ Name }}'
-            Value: '{{ Value }}'
-      - name: Status
-        value: '{{ Status }}'
-
+          - name: '{{ name }}'
+            value: '{{ value }}'
+      - name: status
+        value: '{{ status }}'
 ```
 </TabItem>
 </Tabs>
@@ -476,7 +475,7 @@ SET PatchDocument = string('{{ {
     "Status": status
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<LicenseArn>';
+AND Identifier = '{{ license_arn }}';
 ```
 
 
@@ -485,7 +484,7 @@ AND Identifier = '<LicenseArn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.licensemanager.licenses
-WHERE Identifier = '<LicenseArn>'
+WHERE Identifier = '{{ license_arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/lightsail/alarms/index.md b/website/docs/services/lightsail/alarms/index.md
index 532dca589..842553ea5 100644
--- a/website/docs/services/lightsail/alarms/index.md
+++ b/website/docs/services/lightsail/alarms/index.md
@@ -206,7 +206,7 @@ threshold,
 treat_missing_data,
 state
 FROM awscc.lightsail.alarms
-WHERE region = 'us-east-1' AND Identifier = '<AlarmName>';
+WHERE region = 'us-east-1' AND Identifier = '{{ alarm_name }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -247,13 +247,13 @@ INSERT INTO awscc.lightsail.alarms (
  Threshold,
  region
 )
-SELECT 
-'{{ AlarmName }}',
- '{{ MonitoredResourceName }}',
- '{{ MetricName }}',
- '{{ ComparisonOperator }}',
- '{{ EvaluationPeriods }}',
- '{{ Threshold }}',
+SELECT
+'{{ alarm_name }}',
+ '{{ monitored_resource_name }}',
+ '{{ metric_name }}',
+ '{{ comparison_operator }}',
+ '{{ evaluation_periods }}',
+ '{{ threshold }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -275,18 +275,18 @@ INSERT INTO awscc.lightsail.alarms (
  TreatMissingData,
  region
 )
-SELECT 
- '{{ AlarmName }}',
- '{{ MonitoredResourceName }}',
- '{{ MetricName }}',
- '{{ ComparisonOperator }}',
- '{{ ContactProtocols }}',
- '{{ DatapointsToAlarm }}',
- '{{ EvaluationPeriods }}',
- '{{ NotificationEnabled }}',
- '{{ NotificationTriggers }}',
- '{{ Threshold }}',
- '{{ TreatMissingData }}',
+SELECT
+ '{{ alarm_name }}',
+ '{{ monitored_resource_name }}',
+ '{{ metric_name }}',
+ '{{ comparison_operator }}',
+ '{{ contact_protocols }}',
+ '{{ datapoints_to_alarm }}',
+ '{{ evaluation_periods }}',
+ '{{ notification_enabled }}',
+ '{{ notification_triggers }}',
+ '{{ threshold }}',
+ '{{ treat_missing_data }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -304,31 +304,30 @@ globals:
 resources:
   - name: alarm
     props:
-      - name: AlarmName
-        value: '{{ AlarmName }}'
-      - name: MonitoredResourceName
-        value: '{{ MonitoredResourceName }}'
-      - name: MetricName
-        value: '{{ MetricName }}'
-      - name: ComparisonOperator
-        value: '{{ ComparisonOperator }}'
-      - name: ContactProtocols
+      - name: alarm_name
+        value: '{{ alarm_name }}'
+      - name: monitored_resource_name
+        value: '{{ monitored_resource_name }}'
+      - name: metric_name
+        value: '{{ metric_name }}'
+      - name: comparison_operator
+        value: '{{ comparison_operator }}'
+      - name: contact_protocols
         value:
-          - '{{ ContactProtocols[0] }}'
-      - name: DatapointsToAlarm
-        value: '{{ DatapointsToAlarm }}'
-      - name: EvaluationPeriods
-        value: '{{ EvaluationPeriods }}'
-      - name: NotificationEnabled
-        value: '{{ NotificationEnabled }}'
-      - name: NotificationTriggers
+          - '{{ contact_protocols[0] }}'
+      - name: datapoints_to_alarm
+        value: '{{ datapoints_to_alarm }}'
+      - name: evaluation_periods
+        value: '{{ evaluation_periods }}'
+      - name: notification_enabled
+        value: '{{ notification_enabled }}'
+      - name: notification_triggers
         value:
-          - '{{ NotificationTriggers[0] }}'
-      - name: Threshold
+          - '{{ notification_triggers[0] }}'
+      - name: threshold
         value: null
-      - name: TreatMissingData
-        value: '{{ TreatMissingData }}'
-
+      - name: treat_missing_data
+        value: '{{ treat_missing_data }}'
 ```
 </TabItem>
 </Tabs>
@@ -351,7 +350,7 @@ SET PatchDocument = string('{{ {
     "TreatMissingData": treat_missing_data
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<AlarmName>';
+AND Identifier = '{{ alarm_name }}';
 ```
 
 
@@ -360,7 +359,7 @@ AND Identifier = '<AlarmName>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.lightsail.alarms
-WHERE Identifier = '<AlarmName>'
+WHERE Identifier = '{{ alarm_name }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/lightsail/buckets/index.md b/website/docs/services/lightsail/buckets/index.md
index 985746562..657e53848 100644
--- a/website/docs/services/lightsail/buckets/index.md
+++ b/website/docs/services/lightsail/buckets/index.md
@@ -212,7 +212,7 @@ tags,
 url,
 able_to_update_bundle
 FROM awscc.lightsail.buckets
-WHERE region = 'us-east-1' AND Identifier = '<BucketName>';
+WHERE region = 'us-east-1' AND Identifier = '{{ bucket_name }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -249,9 +249,9 @@ INSERT INTO awscc.lightsail.buckets (
  BundleId,
  region
 )
-SELECT 
-'{{ BucketName }}',
- '{{ BundleId }}',
+SELECT
+'{{ bucket_name }}',
+ '{{ bundle_id }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -269,14 +269,14 @@ INSERT INTO awscc.lightsail.buckets (
  Tags,
  region
 )
-SELECT 
- '{{ BucketName }}',
- '{{ BundleId }}',
- '{{ ObjectVersioning }}',
- '{{ AccessRules }}',
- '{{ ResourcesReceivingAccess }}',
- '{{ ReadOnlyAccessAccounts }}',
- '{{ Tags }}',
+SELECT
+ '{{ bucket_name }}',
+ '{{ bundle_id }}',
+ '{{ object_versioning }}',
+ '{{ access_rules }}',
+ '{{ resources_receiving_access }}',
+ '{{ read_only_access_accounts }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -294,27 +294,26 @@ globals:
 resources:
   - name: bucket
     props:
-      - name: BucketName
-        value: '{{ BucketName }}'
-      - name: BundleId
-        value: '{{ BundleId }}'
-      - name: ObjectVersioning
-        value: '{{ ObjectVersioning }}'
-      - name: AccessRules
+      - name: bucket_name
+        value: '{{ bucket_name }}'
+      - name: bundle_id
+        value: '{{ bundle_id }}'
+      - name: object_versioning
+        value: '{{ object_versioning }}'
+      - name: access_rules
         value:
-          GetObject: '{{ GetObject }}'
-          AllowPublicOverrides: '{{ AllowPublicOverrides }}'
-      - name: ResourcesReceivingAccess
+          get_object: '{{ get_object }}'
+          allow_public_overrides: '{{ allow_public_overrides }}'
+      - name: resources_receiving_access
         value:
-          - '{{ ResourcesReceivingAccess[0] }}'
-      - name: ReadOnlyAccessAccounts
+          - '{{ resources_receiving_access[0] }}'
+      - name: read_only_access_accounts
         value:
-          - '{{ ReadOnlyAccessAccounts[0] }}'
-      - name: Tags
+          - '{{ read_only_access_accounts[0] }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -335,7 +334,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<BucketName>';
+AND Identifier = '{{ bucket_name }}';
 ```
 
 
@@ -344,7 +343,7 @@ AND Identifier = '<BucketName>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.lightsail.buckets
-WHERE Identifier = '<BucketName>'
+WHERE Identifier = '{{ bucket_name }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/lightsail/certificates/index.md b/website/docs/services/lightsail/certificates/index.md
index c414e758d..24d514db8 100644
--- a/website/docs/services/lightsail/certificates/index.md
+++ b/website/docs/services/lightsail/certificates/index.md
@@ -176,7 +176,7 @@ certificate_arn,
 status,
 tags
 FROM awscc.lightsail.certificates
-WHERE region = 'us-east-1' AND Identifier = '<CertificateName>';
+WHERE region = 'us-east-1' AND Identifier = '{{ certificate_name }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -213,9 +213,9 @@ INSERT INTO awscc.lightsail.certificates (
  DomainName,
  region
 )
-SELECT 
-'{{ CertificateName }}',
- '{{ DomainName }}',
+SELECT
+'{{ certificate_name }}',
+ '{{ domain_name }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -230,11 +230,11 @@ INSERT INTO awscc.lightsail.certificates (
  Tags,
  region
 )
-SELECT 
- '{{ CertificateName }}',
- '{{ DomainName }}',
- '{{ SubjectAlternativeNames }}',
- '{{ Tags }}',
+SELECT
+ '{{ certificate_name }}',
+ '{{ domain_name }}',
+ '{{ subject_alternative_names }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -252,18 +252,17 @@ globals:
 resources:
   - name: certificate
     props:
-      - name: CertificateName
-        value: '{{ CertificateName }}'
-      - name: DomainName
-        value: '{{ DomainName }}'
-      - name: SubjectAlternativeNames
+      - name: certificate_name
+        value: '{{ certificate_name }}'
+      - name: domain_name
+        value: '{{ domain_name }}'
+      - name: subject_alternative_names
         value:
-          - '{{ SubjectAlternativeNames[0] }}'
-      - name: Tags
+          - '{{ subject_alternative_names[0] }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -279,7 +278,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<CertificateName>';
+AND Identifier = '{{ certificate_name }}';
 ```
 
 
@@ -288,7 +287,7 @@ AND Identifier = '<CertificateName>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.lightsail.certificates
-WHERE Identifier = '<CertificateName>'
+WHERE Identifier = '{{ certificate_name }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/lightsail/containers/index.md b/website/docs/services/lightsail/containers/index.md
index 703ebc009..4f5d7c717 100644
--- a/website/docs/services/lightsail/containers/index.md
+++ b/website/docs/services/lightsail/containers/index.md
@@ -369,7 +369,7 @@ url,
 principal_arn,
 tags
 FROM awscc.lightsail.containers
-WHERE region = 'us-east-1' AND Identifier = '<ServiceName>';
+WHERE region = 'us-east-1' AND Identifier = '{{ service_name }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -407,10 +407,10 @@ INSERT INTO awscc.lightsail.containers (
  Scale,
  region
 )
-SELECT 
-'{{ ServiceName }}',
- '{{ Power }}',
- '{{ Scale }}',
+SELECT
+'{{ service_name }}',
+ '{{ power }}',
+ '{{ scale }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -429,15 +429,15 @@ INSERT INTO awscc.lightsail.containers (
  Tags,
  region
 )
-SELECT 
- '{{ ServiceName }}',
- '{{ Power }}',
- '{{ Scale }}',
- '{{ PublicDomainNames }}',
- '{{ ContainerServiceDeployment }}',
- '{{ IsDisabled }}',
- '{{ PrivateRegistryAccess }}',
- '{{ Tags }}',
+SELECT
+ '{{ service_name }}',
+ '{{ power }}',
+ '{{ scale }}',
+ '{{ public_domain_names }}',
+ '{{ container_service_deployment }}',
+ '{{ is_disabled }}',
+ '{{ private_registry_access }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -455,52 +455,51 @@ globals:
 resources:
   - name: container
     props:
-      - name: ServiceName
-        value: '{{ ServiceName }}'
-      - name: Power
-        value: '{{ Power }}'
-      - name: Scale
-        value: '{{ Scale }}'
-      - name: PublicDomainNames
+      - name: service_name
+        value: '{{ service_name }}'
+      - name: power
+        value: '{{ power }}'
+      - name: scale
+        value: '{{ scale }}'
+      - name: public_domain_names
         value:
-          - CertificateName: '{{ CertificateName }}'
-            DomainNames:
-              - '{{ DomainNames[0] }}'
-      - name: ContainerServiceDeployment
+          - certificate_name: '{{ certificate_name }}'
+            domain_names:
+              - '{{ domain_names[0] }}'
+      - name: container_service_deployment
         value:
-          Containers:
-            - ServiceName: '{{ ServiceName }}'
-              Power: '{{ Power }}'
-              Scale: '{{ Scale }}'
-              PublicDomainNames:
+          containers:
+            - service_name: '{{ service_name }}'
+              power: '{{ power }}'
+              scale: '{{ scale }}'
+              public_domain_names:
                 - null
-              ContainerServiceDeployment: null
-              IsDisabled: '{{ IsDisabled }}'
-              PrivateRegistryAccess:
-                EcrImagePullerRole:
-                  IsActive: '{{ IsActive }}'
-                  PrincipalArn: '{{ PrincipalArn }}'
-              Tags:
-                - Key: '{{ Key }}'
-                  Value: '{{ Value }}'
-          PublicEndpoint:
-            ContainerName: '{{ ContainerName }}'
-            ContainerPort: '{{ ContainerPort }}'
-            HealthCheckConfig:
-              HealthyThreshold: '{{ HealthyThreshold }}'
-              IntervalSeconds: '{{ IntervalSeconds }}'
-              Path: '{{ Path }}'
-              SuccessCodes: '{{ SuccessCodes }}'
-              TimeoutSeconds: '{{ TimeoutSeconds }}'
-              UnhealthyThreshold: '{{ UnhealthyThreshold }}'
-      - name: IsDisabled
-        value: '{{ IsDisabled }}'
-      - name: PrivateRegistryAccess
+              container_service_deployment: null
+              is_disabled: '{{ is_disabled }}'
+              private_registry_access:
+                ecr_image_puller_role:
+                  is_active: '{{ is_active }}'
+                  principal_arn: '{{ principal_arn }}'
+              tags:
+                - key: '{{ key }}'
+                  value: '{{ value }}'
+          public_endpoint:
+            container_name: '{{ container_name }}'
+            container_port: '{{ container_port }}'
+            health_check_config:
+              healthy_threshold: '{{ healthy_threshold }}'
+              interval_seconds: '{{ interval_seconds }}'
+              path: '{{ path }}'
+              success_codes: '{{ success_codes }}'
+              timeout_seconds: '{{ timeout_seconds }}'
+              unhealthy_threshold: '{{ unhealthy_threshold }}'
+      - name: is_disabled
+        value: '{{ is_disabled }}'
+      - name: private_registry_access
         value: null
-      - name: Tags
+      - name: tags
         value:
           - null
-
 ```
 </TabItem>
 </Tabs>
@@ -521,7 +520,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<ServiceName>';
+AND Identifier = '{{ service_name }}';
 ```
 
 
@@ -530,7 +529,7 @@ AND Identifier = '<ServiceName>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.lightsail.containers
-WHERE Identifier = '<ServiceName>'
+WHERE Identifier = '{{ service_name }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/lightsail/databases/index.md b/website/docs/services/lightsail/databases/index.md
index 50ca1345d..56b37aed1 100644
--- a/website/docs/services/lightsail/databases/index.md
+++ b/website/docs/services/lightsail/databases/index.md
@@ -278,7 +278,7 @@ rotate_master_user_password,
 relational_database_parameters,
 tags
 FROM awscc.lightsail.databases
-WHERE region = 'us-east-1' AND Identifier = '<RelationalDatabaseName>';
+WHERE region = 'us-east-1' AND Identifier = '{{ relational_database_name }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -318,12 +318,12 @@ INSERT INTO awscc.lightsail.databases (
  MasterUsername,
  region
 )
-SELECT 
-'{{ RelationalDatabaseName }}',
- '{{ RelationalDatabaseBlueprintId }}',
- '{{ RelationalDatabaseBundleId }}',
- '{{ MasterDatabaseName }}',
- '{{ MasterUsername }}',
+SELECT
+'{{ relational_database_name }}',
+ '{{ relational_database_blueprint_id }}',
+ '{{ relational_database_bundle_id }}',
+ '{{ master_database_name }}',
+ '{{ master_username }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -349,22 +349,22 @@ INSERT INTO awscc.lightsail.databases (
  Tags,
  region
 )
-SELECT 
- '{{ RelationalDatabaseName }}',
- '{{ AvailabilityZone }}',
- '{{ RelationalDatabaseBlueprintId }}',
- '{{ RelationalDatabaseBundleId }}',
- '{{ MasterDatabaseName }}',
- '{{ MasterUsername }}',
- '{{ MasterUserPassword }}',
- '{{ PreferredBackupWindow }}',
- '{{ PreferredMaintenanceWindow }}',
- '{{ PubliclyAccessible }}',
- '{{ CaCertificateIdentifier }}',
- '{{ BackupRetention }}',
- '{{ RotateMasterUserPassword }}',
- '{{ RelationalDatabaseParameters }}',
- '{{ Tags }}',
+SELECT
+ '{{ relational_database_name }}',
+ '{{ availability_zone }}',
+ '{{ relational_database_blueprint_id }}',
+ '{{ relational_database_bundle_id }}',
+ '{{ master_database_name }}',
+ '{{ master_username }}',
+ '{{ master_user_password }}',
+ '{{ preferred_backup_window }}',
+ '{{ preferred_maintenance_window }}',
+ '{{ publicly_accessible }}',
+ '{{ ca_certificate_identifier }}',
+ '{{ backup_retention }}',
+ '{{ rotate_master_user_password }}',
+ '{{ relational_database_parameters }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -382,47 +382,46 @@ globals:
 resources:
   - name: database
     props:
-      - name: RelationalDatabaseName
-        value: '{{ RelationalDatabaseName }}'
-      - name: AvailabilityZone
-        value: '{{ AvailabilityZone }}'
-      - name: RelationalDatabaseBlueprintId
-        value: '{{ RelationalDatabaseBlueprintId }}'
-      - name: RelationalDatabaseBundleId
-        value: '{{ RelationalDatabaseBundleId }}'
-      - name: MasterDatabaseName
-        value: '{{ MasterDatabaseName }}'
-      - name: MasterUsername
-        value: '{{ MasterUsername }}'
-      - name: MasterUserPassword
-        value: '{{ MasterUserPassword }}'
-      - name: PreferredBackupWindow
-        value: '{{ PreferredBackupWindow }}'
-      - name: PreferredMaintenanceWindow
-        value: '{{ PreferredMaintenanceWindow }}'
-      - name: PubliclyAccessible
-        value: '{{ PubliclyAccessible }}'
-      - name: CaCertificateIdentifier
-        value: '{{ CaCertificateIdentifier }}'
-      - name: BackupRetention
-        value: '{{ BackupRetention }}'
-      - name: RotateMasterUserPassword
-        value: '{{ RotateMasterUserPassword }}'
-      - name: RelationalDatabaseParameters
+      - name: relational_database_name
+        value: '{{ relational_database_name }}'
+      - name: availability_zone
+        value: '{{ availability_zone }}'
+      - name: relational_database_blueprint_id
+        value: '{{ relational_database_blueprint_id }}'
+      - name: relational_database_bundle_id
+        value: '{{ relational_database_bundle_id }}'
+      - name: master_database_name
+        value: '{{ master_database_name }}'
+      - name: master_username
+        value: '{{ master_username }}'
+      - name: master_user_password
+        value: '{{ master_user_password }}'
+      - name: preferred_backup_window
+        value: '{{ preferred_backup_window }}'
+      - name: preferred_maintenance_window
+        value: '{{ preferred_maintenance_window }}'
+      - name: publicly_accessible
+        value: '{{ publicly_accessible }}'
+      - name: ca_certificate_identifier
+        value: '{{ ca_certificate_identifier }}'
+      - name: backup_retention
+        value: '{{ backup_retention }}'
+      - name: rotate_master_user_password
+        value: '{{ rotate_master_user_password }}'
+      - name: relational_database_parameters
         value:
-          - AllowedValues: '{{ AllowedValues }}'
-            ApplyMethod: '{{ ApplyMethod }}'
-            ApplyType: '{{ ApplyType }}'
-            DataType: '{{ DataType }}'
-            Description: '{{ Description }}'
-            IsModifiable: '{{ IsModifiable }}'
-            ParameterName: '{{ ParameterName }}'
-            ParameterValue: '{{ ParameterValue }}'
-      - name: Tags
+          - allowed_values: '{{ allowed_values }}'
+            apply_method: '{{ apply_method }}'
+            apply_type: '{{ apply_type }}'
+            data_type: '{{ data_type }}'
+            description: '{{ description }}'
+            is_modifiable: '{{ is_modifiable }}'
+            parameter_name: '{{ parameter_name }}'
+            parameter_value: '{{ parameter_value }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -446,7 +445,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<RelationalDatabaseName>';
+AND Identifier = '{{ relational_database_name }}';
 ```
 
 
@@ -455,7 +454,7 @@ AND Identifier = '<RelationalDatabaseName>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.lightsail.databases
-WHERE Identifier = '<RelationalDatabaseName>'
+WHERE Identifier = '{{ relational_database_name }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/lightsail/distributions/index.md b/website/docs/services/lightsail/distributions/index.md
index bc9b4415f..a06cb66c4 100644
--- a/website/docs/services/lightsail/distributions/index.md
+++ b/website/docs/services/lightsail/distributions/index.md
@@ -332,7 +332,7 @@ is_enabled,
 certificate_name,
 tags
 FROM awscc.lightsail.distributions
-WHERE region = 'us-east-1' AND Identifier = '<DistributionName>';
+WHERE region = 'us-east-1' AND Identifier = '{{ distribution_name }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -371,11 +371,11 @@ INSERT INTO awscc.lightsail.distributions (
  Origin,
  region
 )
-SELECT 
-'{{ DistributionName }}',
- '{{ BundleId }}',
- '{{ DefaultCacheBehavior }}',
- '{{ Origin }}',
+SELECT
+'{{ distribution_name }}',
+ '{{ bundle_id }}',
+ '{{ default_cache_behavior }}',
+ '{{ origin }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -396,17 +396,17 @@ INSERT INTO awscc.lightsail.distributions (
  Tags,
  region
 )
-SELECT 
- '{{ DistributionName }}',
- '{{ BundleId }}',
- '{{ IpAddressType }}',
- '{{ CacheBehaviors }}',
- '{{ CacheBehaviorSettings }}',
- '{{ DefaultCacheBehavior }}',
- '{{ Origin }}',
- '{{ IsEnabled }}',
- '{{ CertificateName }}',
- '{{ Tags }}',
+SELECT
+ '{{ distribution_name }}',
+ '{{ bundle_id }}',
+ '{{ ip_address_type }}',
+ '{{ cache_behaviors }}',
+ '{{ cache_behavior_settings }}',
+ '{{ default_cache_behavior }}',
+ '{{ origin }}',
+ '{{ is_enabled }}',
+ '{{ certificate_name }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -424,52 +424,51 @@ globals:
 resources:
   - name: distribution
     props:
-      - name: DistributionName
-        value: '{{ DistributionName }}'
-      - name: BundleId
-        value: '{{ BundleId }}'
-      - name: IpAddressType
-        value: '{{ IpAddressType }}'
-      - name: CacheBehaviors
+      - name: distribution_name
+        value: '{{ distribution_name }}'
+      - name: bundle_id
+        value: '{{ bundle_id }}'
+      - name: ip_address_type
+        value: '{{ ip_address_type }}'
+      - name: cache_behaviors
         value:
-          - Behavior: '{{ Behavior }}'
-            Path: '{{ Path }}'
-      - name: CacheBehaviorSettings
+          - behavior: '{{ behavior }}'
+            path: '{{ path }}'
+      - name: cache_behavior_settings
         value:
-          AllowedHTTPMethods: '{{ AllowedHTTPMethods }}'
-          CachedHTTPMethods: '{{ CachedHTTPMethods }}'
-          DefaultTTL: '{{ DefaultTTL }}'
-          MaximumTTL: '{{ MaximumTTL }}'
-          MinimumTTL: '{{ MinimumTTL }}'
-          ForwardedCookies:
-            CookiesAllowList:
-              - '{{ CookiesAllowList[0] }}'
-            Option: '{{ Option }}'
-          ForwardedHeaders:
-            HeadersAllowList:
-              - '{{ HeadersAllowList[0] }}'
-            Option: '{{ Option }}'
-          ForwardedQueryStrings:
-            QueryStringsAllowList:
-              - '{{ QueryStringsAllowList[0] }}'
-            Option: '{{ Option }}'
-      - name: DefaultCacheBehavior
+          allowed_ht_tp_methods: '{{ allowed_ht_tp_methods }}'
+          cached_ht_tp_methods: '{{ cached_ht_tp_methods }}'
+          default_ttl: '{{ default_ttl }}'
+          maximum_ttl: '{{ maximum_ttl }}'
+          minimum_ttl: '{{ minimum_ttl }}'
+          forwarded_cookies:
+            cookies_allow_list:
+              - '{{ cookies_allow_list[0] }}'
+            option: '{{ option }}'
+          forwarded_headers:
+            headers_allow_list:
+              - '{{ headers_allow_list[0] }}'
+            option: '{{ option }}'
+          forwarded_query_strings:
+            query_strings_allow_list:
+              - '{{ query_strings_allow_list[0] }}'
+            option: '{{ option }}'
+      - name: default_cache_behavior
         value:
-          Behavior: '{{ Behavior }}'
-      - name: Origin
+          behavior: '{{ behavior }}'
+      - name: origin
         value:
-          Name: '{{ Name }}'
-          ProtocolPolicy: '{{ ProtocolPolicy }}'
-          RegionName: '{{ RegionName }}'
-      - name: IsEnabled
-        value: '{{ IsEnabled }}'
-      - name: CertificateName
-        value: '{{ CertificateName }}'
-      - name: Tags
+          name: '{{ name }}'
+          protocol_policy: '{{ protocol_policy }}'
+          region_name: '{{ region_name }}'
+      - name: is_enabled
+        value: '{{ is_enabled }}'
+      - name: certificate_name
+        value: '{{ certificate_name }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -492,7 +491,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<DistributionName>';
+AND Identifier = '{{ distribution_name }}';
 ```
 
 
@@ -501,7 +500,7 @@ AND Identifier = '<DistributionName>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.lightsail.distributions
-WHERE Identifier = '<DistributionName>'
+WHERE Identifier = '{{ distribution_name }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/lightsail/domains/index.md b/website/docs/services/lightsail/domains/index.md
index bd6248762..eb58f4ab5 100644
--- a/website/docs/services/lightsail/domains/index.md
+++ b/website/docs/services/lightsail/domains/index.md
@@ -227,7 +227,7 @@ location,
 resource_type,
 tags
 FROM awscc.lightsail.domains
-WHERE region = 'us-east-1' AND Identifier = '<DomainName>';
+WHERE region = 'us-east-1' AND Identifier = '{{ domain_name }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -263,8 +263,8 @@ INSERT INTO awscc.lightsail.domains (
  DomainName,
  region
 )
-SELECT 
-'{{ DomainName }}',
+SELECT
+'{{ domain_name }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -278,10 +278,10 @@ INSERT INTO awscc.lightsail.domains (
  Tags,
  region
 )
-SELECT 
- '{{ DomainName }}',
- '{{ DomainEntries }}',
- '{{ Tags }}',
+SELECT
+ '{{ domain_name }}',
+ '{{ domain_entries }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -299,20 +299,19 @@ globals:
 resources:
   - name: domain
     props:
-      - name: DomainName
-        value: '{{ DomainName }}'
-      - name: DomainEntries
+      - name: domain_name
+        value: '{{ domain_name }}'
+      - name: domain_entries
         value:
-          - Id: '{{ Id }}'
-            Name: '{{ Name }}'
-            Target: '{{ Target }}'
-            IsAlias: '{{ IsAlias }}'
-            Type: '{{ Type }}'
-      - name: Tags
+          - id: '{{ id }}'
+            name: '{{ name }}'
+            target: '{{ target }}'
+            is_alias: '{{ is_alias }}'
+            type: '{{ type }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -328,7 +327,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<DomainName>';
+AND Identifier = '{{ domain_name }}';
 ```
 
 
@@ -337,7 +336,7 @@ AND Identifier = '<DomainName>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.lightsail.domains
-WHERE Identifier = '<DomainName>'
+WHERE Identifier = '{{ domain_name }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/lightsail/instance_snapshots/index.md b/website/docs/services/lightsail/instance_snapshots/index.md
index 5d466875d..c5f600ffb 100644
--- a/website/docs/services/lightsail/instance_snapshots/index.md
+++ b/website/docs/services/lightsail/instance_snapshots/index.md
@@ -224,7 +224,7 @@ support_code,
 location,
 tags
 FROM awscc.lightsail.instance_snapshots
-WHERE region = 'us-east-1' AND Identifier = '<InstanceSnapshotName>';
+WHERE region = 'us-east-1' AND Identifier = '{{ instance_snapshot_name }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -261,9 +261,9 @@ INSERT INTO awscc.lightsail.instance_snapshots (
  InstanceName,
  region
 )
-SELECT 
-'{{ InstanceSnapshotName }}',
- '{{ InstanceName }}',
+SELECT
+'{{ instance_snapshot_name }}',
+ '{{ instance_name }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -277,10 +277,10 @@ INSERT INTO awscc.lightsail.instance_snapshots (
  Tags,
  region
 )
-SELECT 
- '{{ InstanceSnapshotName }}',
- '{{ InstanceName }}',
- '{{ Tags }}',
+SELECT
+ '{{ instance_snapshot_name }}',
+ '{{ instance_name }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -298,15 +298,14 @@ globals:
 resources:
   - name: instance_snapshot
     props:
-      - name: InstanceSnapshotName
-        value: '{{ InstanceSnapshotName }}'
-      - name: InstanceName
-        value: '{{ InstanceName }}'
-      - name: Tags
+      - name: instance_snapshot_name
+        value: '{{ instance_snapshot_name }}'
+      - name: instance_name
+        value: '{{ instance_name }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -322,7 +321,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<InstanceSnapshotName>';
+AND Identifier = '{{ instance_snapshot_name }}';
 ```
 
 
@@ -331,7 +330,7 @@ AND Identifier = '<InstanceSnapshotName>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.lightsail.instance_snapshots
-WHERE Identifier = '<InstanceSnapshotName>'
+WHERE Identifier = '{{ instance_snapshot_name }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/lightsail/instances/index.md b/website/docs/services/lightsail/instances/index.md
index ce58ec075..d1ff37bd0 100644
--- a/website/docs/services/lightsail/instances/index.md
+++ b/website/docs/services/lightsail/instances/index.md
@@ -439,7 +439,7 @@ key_pair_name,
 tags,
 instance_arn
 FROM awscc.lightsail.instances
-WHERE region = 'us-east-1' AND Identifier = '<InstanceName>';
+WHERE region = 'us-east-1' AND Identifier = '{{ instance_name }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -477,10 +477,10 @@ INSERT INTO awscc.lightsail.instances (
  BlueprintId,
  region
 )
-SELECT 
-'{{ InstanceName }}',
- '{{ BundleId }}',
- '{{ BlueprintId }}',
+SELECT
+'{{ instance_name }}',
+ '{{ bundle_id }}',
+ '{{ blueprint_id }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -503,19 +503,19 @@ INSERT INTO awscc.lightsail.instances (
  Tags,
  region
 )
-SELECT 
- '{{ Location }}',
- '{{ Hardware }}',
- '{{ State }}',
- '{{ Networking }}',
- '{{ InstanceName }}',
- '{{ AvailabilityZone }}',
- '{{ BundleId }}',
- '{{ BlueprintId }}',
- '{{ AddOns }}',
- '{{ UserData }}',
- '{{ KeyPairName }}',
- '{{ Tags }}',
+SELECT
+ '{{ location }}',
+ '{{ hardware }}',
+ '{{ state }}',
+ '{{ networking }}',
+ '{{ instance_name }}',
+ '{{ availability_zone }}',
+ '{{ bundle_id }}',
+ '{{ blueprint_id }}',
+ '{{ add_ons }}',
+ '{{ user_data }}',
+ '{{ key_pair_name }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -533,67 +533,66 @@ globals:
 resources:
   - name: instance
     props:
-      - name: Location
+      - name: location
         value:
-          AvailabilityZone: '{{ AvailabilityZone }}'
-          RegionName: '{{ RegionName }}'
-      - name: Hardware
+          availability_zone: '{{ availability_zone }}'
+          region_name: '{{ region_name }}'
+      - name: hardware
         value:
-          CpuCount: '{{ CpuCount }}'
-          RamSizeInGb: '{{ RamSizeInGb }}'
-          Disks:
-            - DiskName: '{{ DiskName }}'
-              SizeInGb: '{{ SizeInGb }}'
-              IsSystemDisk: '{{ IsSystemDisk }}'
-              IOPS: '{{ IOPS }}'
-              Path: '{{ Path }}'
-              AttachedTo: '{{ AttachedTo }}'
-              AttachmentState: '{{ AttachmentState }}'
-      - name: State
+          cpu_count: '{{ cpu_count }}'
+          ram_size_in_gb: '{{ ram_size_in_gb }}'
+          disks:
+            - disk_name: '{{ disk_name }}'
+              size_in_gb: '{{ size_in_gb }}'
+              is_system_disk: '{{ is_system_disk }}'
+              i_op_s: '{{ i_op_s }}'
+              path: '{{ path }}'
+              attached_to: '{{ attached_to }}'
+              attachment_state: '{{ attachment_state }}'
+      - name: state
         value:
-          Code: '{{ Code }}'
-          Name: '{{ Name }}'
-      - name: Networking
+          code: '{{ code }}'
+          name: '{{ name }}'
+      - name: networking
         value:
-          Ports:
-            - FromPort: '{{ FromPort }}'
-              ToPort: '{{ ToPort }}'
-              Protocol: '{{ Protocol }}'
-              AccessFrom: '{{ AccessFrom }}'
-              AccessType: '{{ AccessType }}'
-              CommonName: '{{ CommonName }}'
-              AccessDirection: '{{ AccessDirection }}'
-              Ipv6Cidrs:
-                - '{{ Ipv6Cidrs[0] }}'
-              CidrListAliases:
-                - '{{ CidrListAliases[0] }}'
-              Cidrs:
-                - '{{ Cidrs[0] }}'
-          MonthlyTransfer:
-            GbPerMonthAllocated: '{{ GbPerMonthAllocated }}'
-      - name: InstanceName
-        value: '{{ InstanceName }}'
-      - name: AvailabilityZone
-        value: '{{ AvailabilityZone }}'
-      - name: BundleId
-        value: '{{ BundleId }}'
-      - name: BlueprintId
-        value: '{{ BlueprintId }}'
-      - name: AddOns
+          ports:
+            - from_port: '{{ from_port }}'
+              to_port: '{{ to_port }}'
+              protocol: '{{ protocol }}'
+              access_from: '{{ access_from }}'
+              access_type: '{{ access_type }}'
+              common_name: '{{ common_name }}'
+              access_direction: '{{ access_direction }}'
+              ipv6_cidrs:
+                - '{{ ipv6_cidrs[0] }}'
+              cidr_list_aliases:
+                - '{{ cidr_list_aliases[0] }}'
+              cidrs:
+                - '{{ cidrs[0] }}'
+          monthly_transfer:
+            gb_per_month_allocated: '{{ gb_per_month_allocated }}'
+      - name: instance_name
+        value: '{{ instance_name }}'
+      - name: availability_zone
+        value: '{{ availability_zone }}'
+      - name: bundle_id
+        value: '{{ bundle_id }}'
+      - name: blueprint_id
+        value: '{{ blueprint_id }}'
+      - name: add_ons
         value:
-          - AddOnType: '{{ AddOnType }}'
-            Status: '{{ Status }}'
-            AutoSnapshotAddOnRequest:
-              SnapshotTimeOfDay: '{{ SnapshotTimeOfDay }}'
-      - name: UserData
-        value: '{{ UserData }}'
-      - name: KeyPairName
-        value: '{{ KeyPairName }}'
-      - name: Tags
+          - add_on_type: '{{ add_on_type }}'
+            status: '{{ status }}'
+            auto_snapshot_add_on_request:
+              snapshot_time_of_day: '{{ snapshot_time_of_day }}'
+      - name: user_data
+        value: '{{ user_data }}'
+      - name: key_pair_name
+        value: '{{ key_pair_name }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -612,7 +611,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<InstanceName>';
+AND Identifier = '{{ instance_name }}';
 ```
 
 
@@ -621,7 +620,7 @@ AND Identifier = '<InstanceName>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.lightsail.instances
-WHERE Identifier = '<InstanceName>'
+WHERE Identifier = '{{ instance_name }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/lightsail/load_balancer_tls_certificates/index.md b/website/docs/services/lightsail/load_balancer_tls_certificates/index.md
index 472f2a844..66123f9b0 100644
--- a/website/docs/services/lightsail/load_balancer_tls_certificates/index.md
+++ b/website/docs/services/lightsail/load_balancer_tls_certificates/index.md
@@ -181,7 +181,7 @@ is_attached,
 https_redirection_enabled,
 status
 FROM awscc.lightsail.load_balancer_tls_certificates
-WHERE region = 'us-east-1' AND Identifier = '<CertificateName>|<LoadBalancerName>';
+WHERE region = 'us-east-1' AND Identifier = '{{ certificate_name }}|{{ load_balancer_name }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -220,10 +220,10 @@ INSERT INTO awscc.lightsail.load_balancer_tls_certificates (
  CertificateDomainName,
  region
 )
-SELECT 
-'{{ LoadBalancerName }}',
- '{{ CertificateName }}',
- '{{ CertificateDomainName }}',
+SELECT
+'{{ load_balancer_name }}',
+ '{{ certificate_name }}',
+ '{{ certificate_domain_name }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -240,13 +240,13 @@ INSERT INTO awscc.lightsail.load_balancer_tls_certificates (
  HttpsRedirectionEnabled,
  region
 )
-SELECT 
- '{{ LoadBalancerName }}',
- '{{ CertificateName }}',
- '{{ CertificateDomainName }}',
- '{{ CertificateAlternativeNames }}',
- '{{ IsAttached }}',
- '{{ HttpsRedirectionEnabled }}',
+SELECT
+ '{{ load_balancer_name }}',
+ '{{ certificate_name }}',
+ '{{ certificate_domain_name }}',
+ '{{ certificate_alternative_names }}',
+ '{{ is_attached }}',
+ '{{ https_redirection_enabled }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -264,20 +264,19 @@ globals:
 resources:
   - name: load_balancer_tls_certificate
     props:
-      - name: LoadBalancerName
-        value: '{{ LoadBalancerName }}'
-      - name: CertificateName
-        value: '{{ CertificateName }}'
-      - name: CertificateDomainName
-        value: '{{ CertificateDomainName }}'
-      - name: CertificateAlternativeNames
+      - name: load_balancer_name
+        value: '{{ load_balancer_name }}'
+      - name: certificate_name
+        value: '{{ certificate_name }}'
+      - name: certificate_domain_name
+        value: '{{ certificate_domain_name }}'
+      - name: certificate_alternative_names
         value:
-          - '{{ CertificateAlternativeNames[0] }}'
-      - name: IsAttached
-        value: '{{ IsAttached }}'
-      - name: HttpsRedirectionEnabled
-        value: '{{ HttpsRedirectionEnabled }}'
-
+          - '{{ certificate_alternative_names[0] }}'
+      - name: is_attached
+        value: '{{ is_attached }}'
+      - name: https_redirection_enabled
+        value: '{{ https_redirection_enabled }}'
 ```
 </TabItem>
 </Tabs>
@@ -294,7 +293,7 @@ SET PatchDocument = string('{{ {
     "HttpsRedirectionEnabled": https_redirection_enabled
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<CertificateName>|<LoadBalancerName>';
+AND Identifier = '{{ certificate_name }}|{{ load_balancer_name }}';
 ```
 
 
@@ -303,7 +302,7 @@ AND Identifier = '<CertificateName>|<LoadBalancerName>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.lightsail.load_balancer_tls_certificates
-WHERE Identifier = '<CertificateName|LoadBalancerName>'
+WHERE Identifier = '{{ certificate_name }}|{{ load_balancer_name }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/lightsail/load_balancers/index.md b/website/docs/services/lightsail/load_balancers/index.md
index eae3ea051..76cbbeb90 100644
--- a/website/docs/services/lightsail/load_balancers/index.md
+++ b/website/docs/services/lightsail/load_balancers/index.md
@@ -200,7 +200,7 @@ session_stickiness_lb_cookie_duration_seconds,
 tls_policy_name,
 tags
 FROM awscc.lightsail.load_balancers
-WHERE region = 'us-east-1' AND Identifier = '<LoadBalancerName>';
+WHERE region = 'us-east-1' AND Identifier = '{{ load_balancer_name }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -237,9 +237,9 @@ INSERT INTO awscc.lightsail.load_balancers (
  InstancePort,
  region
 )
-SELECT 
-'{{ LoadBalancerName }}',
- '{{ InstancePort }}',
+SELECT
+'{{ load_balancer_name }}',
+ '{{ instance_port }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -259,16 +259,16 @@ INSERT INTO awscc.lightsail.load_balancers (
  Tags,
  region
 )
-SELECT 
- '{{ LoadBalancerName }}',
- '{{ InstancePort }}',
- '{{ IpAddressType }}',
- '{{ AttachedInstances }}',
- '{{ HealthCheckPath }}',
- '{{ SessionStickinessEnabled }}',
- '{{ SessionStickinessLBCookieDurationSeconds }}',
- '{{ TlsPolicyName }}',
- '{{ Tags }}',
+SELECT
+ '{{ load_balancer_name }}',
+ '{{ instance_port }}',
+ '{{ ip_address_type }}',
+ '{{ attached_instances }}',
+ '{{ health_check_path }}',
+ '{{ session_stickiness_enabled }}',
+ '{{ session_stickiness_lb_cookie_duration_seconds }}',
+ '{{ tls_policy_name }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -286,28 +286,27 @@ globals:
 resources:
   - name: load_balancer
     props:
-      - name: LoadBalancerName
-        value: '{{ LoadBalancerName }}'
-      - name: InstancePort
-        value: '{{ InstancePort }}'
-      - name: IpAddressType
-        value: '{{ IpAddressType }}'
-      - name: AttachedInstances
+      - name: load_balancer_name
+        value: '{{ load_balancer_name }}'
+      - name: instance_port
+        value: '{{ instance_port }}'
+      - name: ip_address_type
+        value: '{{ ip_address_type }}'
+      - name: attached_instances
         value:
-          - '{{ AttachedInstances[0] }}'
-      - name: HealthCheckPath
-        value: '{{ HealthCheckPath }}'
-      - name: SessionStickinessEnabled
-        value: '{{ SessionStickinessEnabled }}'
-      - name: SessionStickinessLBCookieDurationSeconds
-        value: '{{ SessionStickinessLBCookieDurationSeconds }}'
-      - name: TlsPolicyName
-        value: '{{ TlsPolicyName }}'
-      - name: Tags
+          - '{{ attached_instances[0] }}'
+      - name: health_check_path
+        value: '{{ health_check_path }}'
+      - name: session_stickiness_enabled
+        value: '{{ session_stickiness_enabled }}'
+      - name: session_stickiness_lb_cookie_duration_seconds
+        value: '{{ session_stickiness_lb_cookie_duration_seconds }}'
+      - name: tls_policy_name
+        value: '{{ tls_policy_name }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -328,7 +327,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<LoadBalancerName>';
+AND Identifier = '{{ load_balancer_name }}';
 ```
 
 
@@ -337,7 +336,7 @@ AND Identifier = '<LoadBalancerName>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.lightsail.load_balancers
-WHERE Identifier = '<LoadBalancerName>'
+WHERE Identifier = '{{ load_balancer_name }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/lightsail/static_ips/index.md b/website/docs/services/lightsail/static_ips/index.md
index ac67095bb..454ce1ae6 100644
--- a/website/docs/services/lightsail/static_ips/index.md
+++ b/website/docs/services/lightsail/static_ips/index.md
@@ -158,7 +158,7 @@ is_attached,
 ip_address,
 static_ip_arn
 FROM awscc.lightsail.static_ips
-WHERE region = 'us-east-1' AND Identifier = '<StaticIpName>';
+WHERE region = 'us-east-1' AND Identifier = '{{ static_ip_name }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -194,8 +194,8 @@ INSERT INTO awscc.lightsail.static_ips (
  StaticIpName,
  region
 )
-SELECT 
-'{{ StaticIpName }}',
+SELECT
+'{{ static_ip_name }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -208,9 +208,9 @@ INSERT INTO awscc.lightsail.static_ips (
  AttachedTo,
  region
 )
-SELECT 
- '{{ StaticIpName }}',
- '{{ AttachedTo }}',
+SELECT
+ '{{ static_ip_name }}',
+ '{{ attached_to }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -228,11 +228,10 @@ globals:
 resources:
   - name: static_ip
     props:
-      - name: StaticIpName
-        value: '{{ StaticIpName }}'
-      - name: AttachedTo
-        value: '{{ AttachedTo }}'
-
+      - name: static_ip_name
+        value: '{{ static_ip_name }}'
+      - name: attached_to
+        value: '{{ attached_to }}'
 ```
 </TabItem>
 </Tabs>
@@ -248,7 +247,7 @@ SET PatchDocument = string('{{ {
     "AttachedTo": attached_to
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<StaticIpName>';
+AND Identifier = '{{ static_ip_name }}';
 ```
 
 
@@ -257,7 +256,7 @@ AND Identifier = '<StaticIpName>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.lightsail.static_ips
-WHERE Identifier = '<StaticIpName>'
+WHERE Identifier = '{{ static_ip_name }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/location/api_keys/index.md b/website/docs/services/location/api_keys/index.md
index 4e3ad042c..777c35b27 100644
--- a/website/docs/services/location/api_keys/index.md
+++ b/website/docs/services/location/api_keys/index.md
@@ -219,7 +219,7 @@ update_time,
 force_delete,
 arn
 FROM awscc.location.api_keys
-WHERE region = 'us-east-1' AND Identifier = '<KeyName>';
+WHERE region = 'us-east-1' AND Identifier = '{{ key_name }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -256,9 +256,9 @@ INSERT INTO awscc.location.api_keys (
  Restrictions,
  region
 )
-SELECT 
-'{{ KeyName }}',
- '{{ Restrictions }}',
+SELECT
+'{{ key_name }}',
+ '{{ restrictions }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -277,15 +277,15 @@ INSERT INTO awscc.location.api_keys (
  ForceDelete,
  region
 )
-SELECT 
- '{{ Description }}',
- '{{ ExpireTime }}',
- '{{ ForceUpdate }}',
- '{{ KeyName }}',
- '{{ NoExpiry }}',
- '{{ Restrictions }}',
- '{{ Tags }}',
- '{{ ForceDelete }}',
+SELECT
+ '{{ description }}',
+ '{{ expire_time }}',
+ '{{ force_update }}',
+ '{{ key_name }}',
+ '{{ no_expiry }}',
+ '{{ restrictions }}',
+ '{{ tags }}',
+ '{{ force_delete }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -303,31 +303,30 @@ globals:
 resources:
   - name: api_key
     props:
-      - name: Description
-        value: '{{ Description }}'
-      - name: ExpireTime
-        value: '{{ ExpireTime }}'
-      - name: ForceUpdate
-        value: '{{ ForceUpdate }}'
-      - name: KeyName
-        value: '{{ KeyName }}'
-      - name: NoExpiry
-        value: '{{ NoExpiry }}'
-      - name: Restrictions
+      - name: description
+        value: '{{ description }}'
+      - name: expire_time
+        value: '{{ expire_time }}'
+      - name: force_update
+        value: '{{ force_update }}'
+      - name: key_name
+        value: '{{ key_name }}'
+      - name: no_expiry
+        value: '{{ no_expiry }}'
+      - name: restrictions
         value:
-          AllowActions:
-            - '{{ AllowActions[0] }}'
-          AllowResources:
-            - '{{ AllowResources[0] }}'
-          AllowReferers:
-            - '{{ AllowReferers[0] }}'
-      - name: Tags
+          allow_actions:
+            - '{{ allow_actions[0] }}'
+          allow_resources:
+            - '{{ allow_resources[0] }}'
+          allow_referers:
+            - '{{ allow_referers[0] }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-      - name: ForceDelete
-        value: '{{ ForceDelete }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
+      - name: force_delete
+        value: '{{ force_delete }}'
 ```
 </TabItem>
 </Tabs>
@@ -349,7 +348,7 @@ SET PatchDocument = string('{{ {
     "ForceDelete": force_delete
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<KeyName>';
+AND Identifier = '{{ key_name }}';
 ```
 
 
@@ -358,7 +357,7 @@ AND Identifier = '<KeyName>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.location.api_keys
-WHERE Identifier = '<KeyName>'
+WHERE Identifier = '{{ key_name }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/location/geofence_collections/index.md b/website/docs/services/location/geofence_collections/index.md
index a9bbb59f1..233a5db57 100644
--- a/website/docs/services/location/geofence_collections/index.md
+++ b/website/docs/services/location/geofence_collections/index.md
@@ -195,7 +195,7 @@ tags,
 update_time,
 arn
 FROM awscc.location.geofence_collections
-WHERE region = 'us-east-1' AND Identifier = '<CollectionName>';
+WHERE region = 'us-east-1' AND Identifier = '{{ collection_name }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -231,8 +231,8 @@ INSERT INTO awscc.location.geofence_collections (
  CollectionName,
  region
 )
-SELECT 
-'{{ CollectionName }}',
+SELECT
+'{{ collection_name }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -249,13 +249,13 @@ INSERT INTO awscc.location.geofence_collections (
  Tags,
  region
 )
-SELECT 
- '{{ CollectionName }}',
- '{{ Description }}',
- '{{ KmsKeyId }}',
- '{{ PricingPlan }}',
- '{{ PricingPlanDataSource }}',
- '{{ Tags }}',
+SELECT
+ '{{ collection_name }}',
+ '{{ description }}',
+ '{{ kms_key_id }}',
+ '{{ pricing_plan }}',
+ '{{ pricing_plan_data_source }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -273,21 +273,20 @@ globals:
 resources:
   - name: geofence_collection
     props:
-      - name: CollectionName
-        value: '{{ CollectionName }}'
-      - name: Description
-        value: '{{ Description }}'
-      - name: KmsKeyId
-        value: '{{ KmsKeyId }}'
-      - name: PricingPlan
-        value: '{{ PricingPlan }}'
-      - name: PricingPlanDataSource
-        value: '{{ PricingPlanDataSource }}'
-      - name: Tags
+      - name: collection_name
+        value: '{{ collection_name }}'
+      - name: description
+        value: '{{ description }}'
+      - name: kms_key_id
+        value: '{{ kms_key_id }}'
+      - name: pricing_plan
+        value: '{{ pricing_plan }}'
+      - name: pricing_plan_data_source
+        value: '{{ pricing_plan_data_source }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -306,7 +305,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<CollectionName>';
+AND Identifier = '{{ collection_name }}';
 ```
 
 
@@ -315,7 +314,7 @@ AND Identifier = '<CollectionName>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.location.geofence_collections
-WHERE Identifier = '<CollectionName>'
+WHERE Identifier = '{{ collection_name }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/location/maps/index.md b/website/docs/services/location/maps/index.md
index b25807005..b5e6ffdc5 100644
--- a/website/docs/services/location/maps/index.md
+++ b/website/docs/services/location/maps/index.md
@@ -206,7 +206,7 @@ tags,
 update_time,
 arn
 FROM awscc.location.maps
-WHERE region = 'us-east-1' AND Identifier = '<MapName>';
+WHERE region = 'us-east-1' AND Identifier = '{{ map_name }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -243,9 +243,9 @@ INSERT INTO awscc.location.maps (
  MapName,
  region
 )
-SELECT 
-'{{ Configuration }}',
- '{{ MapName }}',
+SELECT
+'{{ configuration }}',
+ '{{ map_name }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -261,12 +261,12 @@ INSERT INTO awscc.location.maps (
  Tags,
  region
 )
-SELECT 
- '{{ Configuration }}',
- '{{ Description }}',
- '{{ MapName }}',
- '{{ PricingPlan }}',
- '{{ Tags }}',
+SELECT
+ '{{ configuration }}',
+ '{{ description }}',
+ '{{ map_name }}',
+ '{{ pricing_plan }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -284,23 +284,22 @@ globals:
 resources:
   - name: map
     props:
-      - name: Configuration
+      - name: configuration
         value:
-          Style: '{{ Style }}'
-          PoliticalView: '{{ PoliticalView }}'
-          CustomLayers:
-            - '{{ CustomLayers[0] }}'
-      - name: Description
-        value: '{{ Description }}'
-      - name: MapName
-        value: '{{ MapName }}'
-      - name: PricingPlan
-        value: '{{ PricingPlan }}'
-      - name: Tags
+          style: '{{ style }}'
+          political_view: '{{ political_view }}'
+          custom_layers:
+            - '{{ custom_layers[0] }}'
+      - name: description
+        value: '{{ description }}'
+      - name: map_name
+        value: '{{ map_name }}'
+      - name: pricing_plan
+        value: '{{ pricing_plan }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -318,7 +317,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<MapName>';
+AND Identifier = '{{ map_name }}';
 ```
 
 
@@ -327,7 +326,7 @@ AND Identifier = '<MapName>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.location.maps
-WHERE Identifier = '<MapName>'
+WHERE Identifier = '{{ map_name }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/location/place_indices/index.md b/website/docs/services/location/place_indices/index.md
index 2ffb9d356..fd683977c 100644
--- a/website/docs/services/location/place_indices/index.md
+++ b/website/docs/services/location/place_indices/index.md
@@ -202,7 +202,7 @@ tags,
 update_time,
 arn
 FROM awscc.location.place_indices
-WHERE region = 'us-east-1' AND Identifier = '<IndexName>';
+WHERE region = 'us-east-1' AND Identifier = '{{ index_name }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -239,9 +239,9 @@ INSERT INTO awscc.location.place_indices (
  IndexName,
  region
 )
-SELECT 
-'{{ DataSource }}',
- '{{ IndexName }}',
+SELECT
+'{{ data_source }}',
+ '{{ index_name }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -258,13 +258,13 @@ INSERT INTO awscc.location.place_indices (
  Tags,
  region
 )
-SELECT 
- '{{ DataSource }}',
- '{{ DataSourceConfiguration }}',
- '{{ Description }}',
- '{{ IndexName }}',
- '{{ PricingPlan }}',
- '{{ Tags }}',
+SELECT
+ '{{ data_source }}',
+ '{{ data_source_configuration }}',
+ '{{ description }}',
+ '{{ index_name }}',
+ '{{ pricing_plan }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -282,22 +282,21 @@ globals:
 resources:
   - name: place_index
     props:
-      - name: DataSource
-        value: '{{ DataSource }}'
-      - name: DataSourceConfiguration
+      - name: data_source
+        value: '{{ data_source }}'
+      - name: data_source_configuration
         value:
-          IntendedUse: '{{ IntendedUse }}'
-      - name: Description
-        value: '{{ Description }}'
-      - name: IndexName
-        value: '{{ IndexName }}'
-      - name: PricingPlan
-        value: '{{ PricingPlan }}'
-      - name: Tags
+          intended_use: '{{ intended_use }}'
+      - name: description
+        value: '{{ description }}'
+      - name: index_name
+        value: '{{ index_name }}'
+      - name: pricing_plan
+        value: '{{ pricing_plan }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -316,7 +315,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<IndexName>';
+AND Identifier = '{{ index_name }}';
 ```
 
 
@@ -325,7 +324,7 @@ AND Identifier = '<IndexName>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.location.place_indices
-WHERE Identifier = '<IndexName>'
+WHERE Identifier = '{{ index_name }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/location/route_calculators/index.md b/website/docs/services/location/route_calculators/index.md
index ff921b18b..2416b3eb7 100644
--- a/website/docs/services/location/route_calculators/index.md
+++ b/website/docs/services/location/route_calculators/index.md
@@ -189,7 +189,7 @@ tags,
 update_time,
 arn
 FROM awscc.location.route_calculators
-WHERE region = 'us-east-1' AND Identifier = '<CalculatorName>';
+WHERE region = 'us-east-1' AND Identifier = '{{ calculator_name }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -226,9 +226,9 @@ INSERT INTO awscc.location.route_calculators (
  DataSource,
  region
 )
-SELECT 
-'{{ CalculatorName }}',
- '{{ DataSource }}',
+SELECT
+'{{ calculator_name }}',
+ '{{ data_source }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -244,12 +244,12 @@ INSERT INTO awscc.location.route_calculators (
  Tags,
  region
 )
-SELECT 
- '{{ CalculatorName }}',
- '{{ DataSource }}',
- '{{ Description }}',
- '{{ PricingPlan }}',
- '{{ Tags }}',
+SELECT
+ '{{ calculator_name }}',
+ '{{ data_source }}',
+ '{{ description }}',
+ '{{ pricing_plan }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -267,19 +267,18 @@ globals:
 resources:
   - name: route_calculator
     props:
-      - name: CalculatorName
-        value: '{{ CalculatorName }}'
-      - name: DataSource
-        value: '{{ DataSource }}'
-      - name: Description
-        value: '{{ Description }}'
-      - name: PricingPlan
-        value: '{{ PricingPlan }}'
-      - name: Tags
+      - name: calculator_name
+        value: '{{ calculator_name }}'
+      - name: data_source
+        value: '{{ data_source }}'
+      - name: description
+        value: '{{ description }}'
+      - name: pricing_plan
+        value: '{{ pricing_plan }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -297,7 +296,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<CalculatorName>';
+AND Identifier = '{{ calculator_name }}';
 ```
 
 
@@ -306,7 +305,7 @@ AND Identifier = '<CalculatorName>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.location.route_calculators
-WHERE Identifier = '<CalculatorName>'
+WHERE Identifier = '{{ calculator_name }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/location/tracker_consumers/index.md b/website/docs/services/location/tracker_consumers/index.md
index 7187f913a..758420280 100644
--- a/website/docs/services/location/tracker_consumers/index.md
+++ b/website/docs/services/location/tracker_consumers/index.md
@@ -139,7 +139,7 @@ region,
 consumer_arn,
 tracker_name
 FROM awscc.location.tracker_consumers
-WHERE region = 'us-east-1' AND Identifier = '<TrackerName>|<ConsumerArn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ tracker_name }}|{{ consumer_arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -177,9 +177,9 @@ INSERT INTO awscc.location.tracker_consumers (
  TrackerName,
  region
 )
-SELECT 
-'{{ ConsumerArn }}',
- '{{ TrackerName }}',
+SELECT
+'{{ consumer_arn }}',
+ '{{ tracker_name }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -192,9 +192,9 @@ INSERT INTO awscc.location.tracker_consumers (
  TrackerName,
  region
 )
-SELECT 
- '{{ ConsumerArn }}',
- '{{ TrackerName }}',
+SELECT
+ '{{ consumer_arn }}',
+ '{{ tracker_name }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -212,11 +212,10 @@ globals:
 resources:
   - name: tracker_consumer
     props:
-      - name: ConsumerArn
-        value: '{{ ConsumerArn }}'
-      - name: TrackerName
-        value: '{{ TrackerName }}'
-
+      - name: consumer_arn
+        value: '{{ consumer_arn }}'
+      - name: tracker_name
+        value: '{{ tracker_name }}'
 ```
 </TabItem>
 </Tabs>
@@ -227,7 +226,7 @@ resources:
 ```sql
 /*+ delete */
 DELETE FROM awscc.location.tracker_consumers
-WHERE Identifier = '<TrackerName|ConsumerArn>'
+WHERE Identifier = '{{ tracker_name }}|{{ consumer_arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/location/trackers/index.md b/website/docs/services/location/trackers/index.md
index 53a639292..d3159cc8e 100644
--- a/website/docs/services/location/trackers/index.md
+++ b/website/docs/services/location/trackers/index.md
@@ -213,7 +213,7 @@ tracker_name,
 update_time,
 arn
 FROM awscc.location.trackers
-WHERE region = 'us-east-1' AND Identifier = '<TrackerName>';
+WHERE region = 'us-east-1' AND Identifier = '{{ tracker_name }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -249,8 +249,8 @@ INSERT INTO awscc.location.trackers (
  TrackerName,
  region
 )
-SELECT 
-'{{ TrackerName }}',
+SELECT
+'{{ tracker_name }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -270,16 +270,16 @@ INSERT INTO awscc.location.trackers (
  TrackerName,
  region
 )
-SELECT 
- '{{ Description }}',
- '{{ EventBridgeEnabled }}',
- '{{ KmsKeyEnableGeospatialQueries }}',
- '{{ KmsKeyId }}',
- '{{ PositionFiltering }}',
- '{{ PricingPlan }}',
- '{{ PricingPlanDataSource }}',
- '{{ Tags }}',
- '{{ TrackerName }}',
+SELECT
+ '{{ description }}',
+ '{{ event_bridge_enabled }}',
+ '{{ kms_key_enable_geospatial_queries }}',
+ '{{ kms_key_id }}',
+ '{{ position_filtering }}',
+ '{{ pricing_plan }}',
+ '{{ pricing_plan_data_source }}',
+ '{{ tags }}',
+ '{{ tracker_name }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -297,27 +297,26 @@ globals:
 resources:
   - name: tracker
     props:
-      - name: Description
-        value: '{{ Description }}'
-      - name: EventBridgeEnabled
-        value: '{{ EventBridgeEnabled }}'
-      - name: KmsKeyEnableGeospatialQueries
-        value: '{{ KmsKeyEnableGeospatialQueries }}'
-      - name: KmsKeyId
-        value: '{{ KmsKeyId }}'
-      - name: PositionFiltering
-        value: '{{ PositionFiltering }}'
-      - name: PricingPlan
-        value: '{{ PricingPlan }}'
-      - name: PricingPlanDataSource
-        value: '{{ PricingPlanDataSource }}'
-      - name: Tags
+      - name: description
+        value: '{{ description }}'
+      - name: event_bridge_enabled
+        value: '{{ event_bridge_enabled }}'
+      - name: kms_key_enable_geospatial_queries
+        value: '{{ kms_key_enable_geospatial_queries }}'
+      - name: kms_key_id
+        value: '{{ kms_key_id }}'
+      - name: position_filtering
+        value: '{{ position_filtering }}'
+      - name: pricing_plan
+        value: '{{ pricing_plan }}'
+      - name: pricing_plan_data_source
+        value: '{{ pricing_plan_data_source }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-      - name: TrackerName
-        value: '{{ TrackerName }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
+      - name: tracker_name
+        value: '{{ tracker_name }}'
 ```
 </TabItem>
 </Tabs>
@@ -339,7 +338,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<TrackerName>';
+AND Identifier = '{{ tracker_name }}';
 ```
 
 
@@ -348,7 +347,7 @@ AND Identifier = '<TrackerName>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.location.trackers
-WHERE Identifier = '<TrackerName>'
+WHERE Identifier = '{{ tracker_name }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/logs/account_policies/index.md b/website/docs/services/logs/account_policies/index.md
index 53f7589c7..a75ec5769 100644
--- a/website/docs/services/logs/account_policies/index.md
+++ b/website/docs/services/logs/account_policies/index.md
@@ -174,7 +174,7 @@ policy_type,
 scope,
 selection_criteria
 FROM awscc.logs.account_policies
-WHERE region = 'us-east-1' AND Identifier = '<AccountId>|<PolicyType>|<PolicyName>';
+WHERE region = 'us-east-1' AND Identifier = '{{ account_id }}|{{ policy_type }}|{{ policy_name }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -214,10 +214,10 @@ INSERT INTO awscc.logs.account_policies (
  PolicyType,
  region
 )
-SELECT 
-'{{ PolicyName }}',
- '{{ PolicyDocument }}',
- '{{ PolicyType }}',
+SELECT
+'{{ policy_name }}',
+ '{{ policy_document }}',
+ '{{ policy_type }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -233,12 +233,12 @@ INSERT INTO awscc.logs.account_policies (
  SelectionCriteria,
  region
 )
-SELECT 
- '{{ PolicyName }}',
- '{{ PolicyDocument }}',
- '{{ PolicyType }}',
- '{{ Scope }}',
- '{{ SelectionCriteria }}',
+SELECT
+ '{{ policy_name }}',
+ '{{ policy_document }}',
+ '{{ policy_type }}',
+ '{{ scope }}',
+ '{{ selection_criteria }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -256,17 +256,16 @@ globals:
 resources:
   - name: account_policy
     props:
-      - name: PolicyName
-        value: '{{ PolicyName }}'
-      - name: PolicyDocument
-        value: '{{ PolicyDocument }}'
-      - name: PolicyType
-        value: '{{ PolicyType }}'
-      - name: Scope
-        value: '{{ Scope }}'
-      - name: SelectionCriteria
-        value: '{{ SelectionCriteria }}'
-
+      - name: policy_name
+        value: '{{ policy_name }}'
+      - name: policy_document
+        value: '{{ policy_document }}'
+      - name: policy_type
+        value: '{{ policy_type }}'
+      - name: scope
+        value: '{{ scope }}'
+      - name: selection_criteria
+        value: '{{ selection_criteria }}'
 ```
 </TabItem>
 </Tabs>
@@ -284,7 +283,7 @@ SET PatchDocument = string('{{ {
     "SelectionCriteria": selection_criteria
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<AccountId>|<PolicyType>|<PolicyName>';
+AND Identifier = '{{ account_id }}|{{ policy_type }}|{{ policy_name }}';
 ```
 
 
@@ -293,7 +292,7 @@ AND Identifier = '<AccountId>|<PolicyType>|<PolicyName>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.logs.account_policies
-WHERE Identifier = '<AccountId|PolicyType|PolicyName>'
+WHERE Identifier = '{{ account_id }}|{{ policy_type }}|{{ policy_name }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/logs/deliveries/index.md b/website/docs/services/logs/deliveries/index.md
index 22e1627b5..92bebb322 100644
--- a/website/docs/services/logs/deliveries/index.md
+++ b/website/docs/services/logs/deliveries/index.md
@@ -195,7 +195,7 @@ field_delimiter,
 s3_suffix_path,
 s3_enable_hive_compatible_path
 FROM awscc.logs.deliveries
-WHERE region = 'us-east-1' AND Identifier = '<DeliveryId>';
+WHERE region = 'us-east-1' AND Identifier = '{{ delivery_id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -232,9 +232,9 @@ INSERT INTO awscc.logs.deliveries (
  DeliveryDestinationArn,
  region
 )
-SELECT 
-'{{ DeliverySourceName }}',
- '{{ DeliveryDestinationArn }}',
+SELECT
+'{{ delivery_source_name }}',
+ '{{ delivery_destination_arn }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -252,14 +252,14 @@ INSERT INTO awscc.logs.deliveries (
  S3EnableHiveCompatiblePath,
  region
 )
-SELECT 
- '{{ DeliverySourceName }}',
- '{{ DeliveryDestinationArn }}',
- '{{ Tags }}',
- '{{ RecordFields }}',
- '{{ FieldDelimiter }}',
- '{{ S3SuffixPath }}',
- '{{ S3EnableHiveCompatiblePath }}',
+SELECT
+ '{{ delivery_source_name }}',
+ '{{ delivery_destination_arn }}',
+ '{{ tags }}',
+ '{{ record_fields }}',
+ '{{ field_delimiter }}',
+ '{{ s3_suffix_path }}',
+ '{{ s3_enable_hive_compatible_path }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -277,24 +277,23 @@ globals:
 resources:
   - name: delivery
     props:
-      - name: DeliverySourceName
-        value: '{{ DeliverySourceName }}'
-      - name: DeliveryDestinationArn
-        value: '{{ DeliveryDestinationArn }}'
-      - name: Tags
+      - name: delivery_source_name
+        value: '{{ delivery_source_name }}'
+      - name: delivery_destination_arn
+        value: '{{ delivery_destination_arn }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-      - name: RecordFields
+          - key: '{{ key }}'
+            value: '{{ value }}'
+      - name: record_fields
         value:
-          - '{{ RecordFields[0] }}'
-      - name: FieldDelimiter
-        value: '{{ FieldDelimiter }}'
-      - name: S3SuffixPath
-        value: '{{ S3SuffixPath }}'
-      - name: S3EnableHiveCompatiblePath
-        value: '{{ S3EnableHiveCompatiblePath }}'
-
+          - '{{ record_fields[0] }}'
+      - name: field_delimiter
+        value: '{{ field_delimiter }}'
+      - name: s3_suffix_path
+        value: '{{ s3_suffix_path }}'
+      - name: s3_enable_hive_compatible_path
+        value: '{{ s3_enable_hive_compatible_path }}'
 ```
 </TabItem>
 </Tabs>
@@ -314,7 +313,7 @@ SET PatchDocument = string('{{ {
     "S3EnableHiveCompatiblePath": s3_enable_hive_compatible_path
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<DeliveryId>';
+AND Identifier = '{{ delivery_id }}';
 ```
 
 
@@ -323,7 +322,7 @@ AND Identifier = '<DeliveryId>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.logs.deliveries
-WHERE Identifier = '<DeliveryId>'
+WHERE Identifier = '{{ delivery_id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/logs/delivery_destinations/index.md b/website/docs/services/logs/delivery_destinations/index.md
index 84fca07d9..c6dd08522 100644
--- a/website/docs/services/logs/delivery_destinations/index.md
+++ b/website/docs/services/logs/delivery_destinations/index.md
@@ -189,7 +189,7 @@ delivery_destination_type,
 delivery_destination_policy,
 output_format
 FROM awscc.logs.delivery_destinations
-WHERE region = 'us-east-1' AND Identifier = '<Name>';
+WHERE region = 'us-east-1' AND Identifier = '{{ name }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -225,8 +225,8 @@ INSERT INTO awscc.logs.delivery_destinations (
  Name,
  region
 )
-SELECT 
-'{{ Name }}',
+SELECT
+'{{ name }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -242,12 +242,12 @@ INSERT INTO awscc.logs.delivery_destinations (
  OutputFormat,
  region
 )
-SELECT 
- '{{ Name }}',
- '{{ DestinationResourceArn }}',
- '{{ Tags }}',
- '{{ DeliveryDestinationPolicy }}',
- '{{ OutputFormat }}',
+SELECT
+ '{{ name }}',
+ '{{ destination_resource_arn }}',
+ '{{ tags }}',
+ '{{ delivery_destination_policy }}',
+ '{{ output_format }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -265,21 +265,20 @@ globals:
 resources:
   - name: delivery_destination
     props:
-      - name: Name
-        value: '{{ Name }}'
-      - name: DestinationResourceArn
-        value: '{{ DestinationResourceArn }}'
-      - name: Tags
+      - name: name
+        value: '{{ name }}'
+      - name: destination_resource_arn
+        value: '{{ destination_resource_arn }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-      - name: DeliveryDestinationPolicy
+          - key: '{{ key }}'
+            value: '{{ value }}'
+      - name: delivery_destination_policy
         value:
-          DeliveryDestinationName: '{{ DeliveryDestinationName }}'
-          DeliveryDestinationPolicy: {}
-      - name: OutputFormat
-        value: '{{ OutputFormat }}'
-
+          delivery_destination_name: '{{ delivery_destination_name }}'
+          delivery_destination_policy: {}
+      - name: output_format
+        value: '{{ output_format }}'
 ```
 </TabItem>
 </Tabs>
@@ -296,7 +295,7 @@ SET PatchDocument = string('{{ {
     "DeliveryDestinationPolicy": delivery_destination_policy
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Name>';
+AND Identifier = '{{ name }}';
 ```
 
 
@@ -305,7 +304,7 @@ AND Identifier = '<Name>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.logs.delivery_destinations
-WHERE Identifier = '<Name>'
+WHERE Identifier = '{{ name }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/logs/delivery_sources/index.md b/website/docs/services/logs/delivery_sources/index.md
index 1cb4effd4..2caa1b51d 100644
--- a/website/docs/services/logs/delivery_sources/index.md
+++ b/website/docs/services/logs/delivery_sources/index.md
@@ -177,7 +177,7 @@ service,
 log_type,
 tags
 FROM awscc.logs.delivery_sources
-WHERE region = 'us-east-1' AND Identifier = '<Name>';
+WHERE region = 'us-east-1' AND Identifier = '{{ name }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -213,8 +213,8 @@ INSERT INTO awscc.logs.delivery_sources (
  Name,
  region
 )
-SELECT 
-'{{ Name }}',
+SELECT
+'{{ name }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -229,11 +229,11 @@ INSERT INTO awscc.logs.delivery_sources (
  Tags,
  region
 )
-SELECT 
- '{{ Name }}',
- '{{ ResourceArn }}',
- '{{ LogType }}',
- '{{ Tags }}',
+SELECT
+ '{{ name }}',
+ '{{ resource_arn }}',
+ '{{ log_type }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -251,17 +251,16 @@ globals:
 resources:
   - name: delivery_source
     props:
-      - name: Name
-        value: '{{ Name }}'
-      - name: ResourceArn
-        value: '{{ ResourceArn }}'
-      - name: LogType
-        value: '{{ LogType }}'
-      - name: Tags
+      - name: name
+        value: '{{ name }}'
+      - name: resource_arn
+        value: '{{ resource_arn }}'
+      - name: log_type
+        value: '{{ log_type }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -279,7 +278,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Name>';
+AND Identifier = '{{ name }}';
 ```
 
 
@@ -288,7 +287,7 @@ AND Identifier = '<Name>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.logs.delivery_sources
-WHERE Identifier = '<Name>'
+WHERE Identifier = '{{ name }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/logs/destinations/index.md b/website/docs/services/logs/destinations/index.md
index 3ccd057cc..00b790e95 100644
--- a/website/docs/services/logs/destinations/index.md
+++ b/website/docs/services/logs/destinations/index.md
@@ -176,7 +176,7 @@ destination_policy,
 role_arn,
 target_arn
 FROM awscc.logs.destinations
-WHERE region = 'us-east-1' AND Identifier = '<DestinationName>';
+WHERE region = 'us-east-1' AND Identifier = '{{ destination_name }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -214,10 +214,10 @@ INSERT INTO awscc.logs.destinations (
  TargetArn,
  region
 )
-SELECT 
-'{{ DestinationName }}',
- '{{ RoleArn }}',
- '{{ TargetArn }}',
+SELECT
+'{{ destination_name }}',
+ '{{ role_arn }}',
+ '{{ target_arn }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -233,12 +233,12 @@ INSERT INTO awscc.logs.destinations (
  TargetArn,
  region
 )
-SELECT 
- '{{ Tags }}',
- '{{ DestinationName }}',
- '{{ DestinationPolicy }}',
- '{{ RoleArn }}',
- '{{ TargetArn }}',
+SELECT
+ '{{ tags }}',
+ '{{ destination_name }}',
+ '{{ destination_policy }}',
+ '{{ role_arn }}',
+ '{{ target_arn }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -256,19 +256,18 @@ globals:
 resources:
   - name: destination
     props:
-      - name: Tags
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-      - name: DestinationName
-        value: '{{ DestinationName }}'
-      - name: DestinationPolicy
-        value: '{{ DestinationPolicy }}'
-      - name: RoleArn
-        value: '{{ RoleArn }}'
-      - name: TargetArn
-        value: '{{ TargetArn }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
+      - name: destination_name
+        value: '{{ destination_name }}'
+      - name: destination_policy
+        value: '{{ destination_policy }}'
+      - name: role_arn
+        value: '{{ role_arn }}'
+      - name: target_arn
+        value: '{{ target_arn }}'
 ```
 </TabItem>
 </Tabs>
@@ -287,7 +286,7 @@ SET PatchDocument = string('{{ {
     "TargetArn": target_arn
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<DestinationName>';
+AND Identifier = '{{ destination_name }}';
 ```
 
 
@@ -296,7 +295,7 @@ AND Identifier = '<DestinationName>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.logs.destinations
-WHERE Identifier = '<DestinationName>'
+WHERE Identifier = '{{ destination_name }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/logs/integrations/index.md b/website/docs/services/logs/integrations/index.md
index f7af26607..9cba1bce5 100644
--- a/website/docs/services/logs/integrations/index.md
+++ b/website/docs/services/logs/integrations/index.md
@@ -170,7 +170,7 @@ integration_type,
 resource_config,
 integration_status
 FROM awscc.logs.integrations
-WHERE region = 'us-east-1' AND Identifier = '<IntegrationName>';
+WHERE region = 'us-east-1' AND Identifier = '{{ integration_name }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -208,10 +208,10 @@ INSERT INTO awscc.logs.integrations (
  ResourceConfig,
  region
 )
-SELECT 
-'{{ IntegrationName }}',
- '{{ IntegrationType }}',
- '{{ ResourceConfig }}',
+SELECT
+'{{ integration_name }}',
+ '{{ integration_type }}',
+ '{{ resource_config }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -225,10 +225,10 @@ INSERT INTO awscc.logs.integrations (
  ResourceConfig,
  region
 )
-SELECT 
- '{{ IntegrationName }}',
- '{{ IntegrationType }}',
- '{{ ResourceConfig }}',
+SELECT
+ '{{ integration_name }}',
+ '{{ integration_type }}',
+ '{{ resource_config }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -246,20 +246,19 @@ globals:
 resources:
   - name: integration
     props:
-      - name: IntegrationName
-        value: '{{ IntegrationName }}'
-      - name: IntegrationType
-        value: '{{ IntegrationType }}'
-      - name: ResourceConfig
+      - name: integration_name
+        value: '{{ integration_name }}'
+      - name: integration_type
+        value: '{{ integration_type }}'
+      - name: resource_config
         value:
-          OpenSearchResourceConfig:
-            KmsKeyArn: '{{ KmsKeyArn }}'
-            DataSourceRoleArn: null
-            DashboardViewerPrincipals:
+          open_search_resource_config:
+            kms_key_arn: '{{ kms_key_arn }}'
+            data_source_role_arn: null
+            dashboard_viewer_principals:
               - null
-            ApplicationARN: null
-            RetentionDays: '{{ RetentionDays }}'
-
+            application_arn: null
+            retention_days: '{{ retention_days }}'
 ```
 </TabItem>
 </Tabs>
@@ -270,7 +269,7 @@ resources:
 ```sql
 /*+ delete */
 DELETE FROM awscc.logs.integrations
-WHERE Identifier = '<IntegrationName>'
+WHERE Identifier = '{{ integration_name }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/logs/log_anomaly_detectors/index.md b/website/docs/services/logs/log_anomaly_detectors/index.md
index 803d34489..41719c938 100644
--- a/website/docs/services/logs/log_anomaly_detectors/index.md
+++ b/website/docs/services/logs/log_anomaly_detectors/index.md
@@ -194,7 +194,7 @@ creation_time_stamp,
 last_modified_time_stamp,
 anomaly_detector_arn
 FROM awscc.logs.log_anomaly_detectors
-WHERE region = 'us-east-1' AND Identifier = '<AnomalyDetectorArn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ anomaly_detector_arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -230,7 +230,7 @@ INSERT INTO awscc.logs.log_anomaly_detectors (
  ,
  region
 )
-SELECT 
+SELECT
 '{{  }}',
 '{{ region }}';
 ```
@@ -249,14 +249,14 @@ INSERT INTO awscc.logs.log_anomaly_detectors (
  AnomalyVisibilityTime,
  region
 )
-SELECT 
- '{{ AccountId }}',
- '{{ KmsKeyId }}',
- '{{ DetectorName }}',
- '{{ LogGroupArnList }}',
- '{{ EvaluationFrequency }}',
- '{{ FilterPattern }}',
- '{{ AnomalyVisibilityTime }}',
+SELECT
+ '{{ account_id }}',
+ '{{ kms_key_id }}',
+ '{{ detector_name }}',
+ '{{ log_group_arn_list }}',
+ '{{ evaluation_frequency }}',
+ '{{ filter_pattern }}',
+ '{{ anomaly_visibility_time }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -274,22 +274,21 @@ globals:
 resources:
   - name: log_anomaly_detector
     props:
-      - name: AccountId
-        value: '{{ AccountId }}'
-      - name: KmsKeyId
-        value: '{{ KmsKeyId }}'
-      - name: DetectorName
-        value: '{{ DetectorName }}'
-      - name: LogGroupArnList
+      - name: account_id
+        value: '{{ account_id }}'
+      - name: kms_key_id
+        value: '{{ kms_key_id }}'
+      - name: detector_name
+        value: '{{ detector_name }}'
+      - name: log_group_arn_list
         value:
-          - '{{ LogGroupArnList[0] }}'
-      - name: EvaluationFrequency
-        value: '{{ EvaluationFrequency }}'
-      - name: FilterPattern
-        value: '{{ FilterPattern }}'
-      - name: AnomalyVisibilityTime
+          - '{{ log_group_arn_list[0] }}'
+      - name: evaluation_frequency
+        value: '{{ evaluation_frequency }}'
+      - name: filter_pattern
+        value: '{{ filter_pattern }}'
+      - name: anomaly_visibility_time
         value: null
-
 ```
 </TabItem>
 </Tabs>
@@ -311,7 +310,7 @@ SET PatchDocument = string('{{ {
     "AnomalyVisibilityTime": anomaly_visibility_time
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<AnomalyDetectorArn>';
+AND Identifier = '{{ anomaly_detector_arn }}';
 ```
 
 
@@ -320,7 +319,7 @@ AND Identifier = '<AnomalyDetectorArn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.logs.log_anomaly_detectors
-WHERE Identifier = '<AnomalyDetectorArn>'
+WHERE Identifier = '{{ anomaly_detector_arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/logs/log_streams/index.md b/website/docs/services/logs/log_streams/index.md
index 67756fd5a..cfdd18b25 100644
--- a/website/docs/services/logs/log_streams/index.md
+++ b/website/docs/services/logs/log_streams/index.md
@@ -139,7 +139,7 @@ region,
 log_stream_name,
 log_group_name
 FROM awscc.logs.log_streams
-WHERE region = 'us-east-1' AND Identifier = '<LogGroupName>|<LogStreamName>';
+WHERE region = 'us-east-1' AND Identifier = '{{ log_group_name }}|{{ log_stream_name }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -176,8 +176,8 @@ INSERT INTO awscc.logs.log_streams (
  LogGroupName,
  region
 )
-SELECT 
-'{{ LogGroupName }}',
+SELECT
+'{{ log_group_name }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -190,9 +190,9 @@ INSERT INTO awscc.logs.log_streams (
  LogGroupName,
  region
 )
-SELECT 
- '{{ LogStreamName }}',
- '{{ LogGroupName }}',
+SELECT
+ '{{ log_stream_name }}',
+ '{{ log_group_name }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -210,11 +210,10 @@ globals:
 resources:
   - name: log_stream
     props:
-      - name: LogStreamName
-        value: '{{ LogStreamName }}'
-      - name: LogGroupName
-        value: '{{ LogGroupName }}'
-
+      - name: log_stream_name
+        value: '{{ log_stream_name }}'
+      - name: log_group_name
+        value: '{{ log_group_name }}'
 ```
 </TabItem>
 </Tabs>
@@ -225,7 +224,7 @@ resources:
 ```sql
 /*+ delete */
 DELETE FROM awscc.logs.log_streams
-WHERE Identifier = '<LogGroupName|LogStreamName>'
+WHERE Identifier = '{{ log_group_name }}|{{ log_stream_name }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/logs/metric_filters/index.md b/website/docs/services/logs/metric_filters/index.md
index 82a33bbf2..2e1ae8081 100644
--- a/website/docs/services/logs/metric_filters/index.md
+++ b/website/docs/services/logs/metric_filters/index.md
@@ -207,7 +207,7 @@ log_group_name,
 apply_on_transformed_logs,
 filter_name
 FROM awscc.logs.metric_filters
-WHERE region = 'us-east-1' AND Identifier = '<LogGroupName>|<FilterName>';
+WHERE region = 'us-east-1' AND Identifier = '{{ log_group_name }}|{{ filter_name }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -246,10 +246,10 @@ INSERT INTO awscc.logs.metric_filters (
  LogGroupName,
  region
 )
-SELECT 
-'{{ MetricTransformations }}',
- '{{ FilterPattern }}',
- '{{ LogGroupName }}',
+SELECT
+'{{ metric_transformations }}',
+ '{{ filter_pattern }}',
+ '{{ log_group_name }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -265,12 +265,12 @@ INSERT INTO awscc.logs.metric_filters (
  FilterName,
  region
 )
-SELECT 
- '{{ MetricTransformations }}',
- '{{ FilterPattern }}',
- '{{ LogGroupName }}',
- '{{ ApplyOnTransformedLogs }}',
- '{{ FilterName }}',
+SELECT
+ '{{ metric_transformations }}',
+ '{{ filter_pattern }}',
+ '{{ log_group_name }}',
+ '{{ apply_on_transformed_logs }}',
+ '{{ filter_name }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -288,25 +288,24 @@ globals:
 resources:
   - name: metric_filter
     props:
-      - name: MetricTransformations
+      - name: metric_transformations
         value:
-          - DefaultValue: null
-            MetricName: '{{ MetricName }}'
-            MetricValue: '{{ MetricValue }}'
-            MetricNamespace: '{{ MetricNamespace }}'
-            Dimensions:
-              - Value: '{{ Value }}'
-                Key: '{{ Key }}'
-            Unit: '{{ Unit }}'
-      - name: FilterPattern
-        value: '{{ FilterPattern }}'
-      - name: LogGroupName
-        value: '{{ LogGroupName }}'
-      - name: ApplyOnTransformedLogs
-        value: '{{ ApplyOnTransformedLogs }}'
-      - name: FilterName
-        value: '{{ FilterName }}'
-
+          - default_value: null
+            metric_name: '{{ metric_name }}'
+            metric_value: '{{ metric_value }}'
+            metric_namespace: '{{ metric_namespace }}'
+            dimensions:
+              - value: '{{ value }}'
+                key: '{{ key }}'
+            unit: '{{ unit }}'
+      - name: filter_pattern
+        value: '{{ filter_pattern }}'
+      - name: log_group_name
+        value: '{{ log_group_name }}'
+      - name: apply_on_transformed_logs
+        value: '{{ apply_on_transformed_logs }}'
+      - name: filter_name
+        value: '{{ filter_name }}'
 ```
 </TabItem>
 </Tabs>
@@ -324,7 +323,7 @@ SET PatchDocument = string('{{ {
     "ApplyOnTransformedLogs": apply_on_transformed_logs
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<LogGroupName>|<FilterName>';
+AND Identifier = '{{ log_group_name }}|{{ filter_name }}';
 ```
 
 
@@ -333,7 +332,7 @@ AND Identifier = '<LogGroupName>|<FilterName>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.logs.metric_filters
-WHERE Identifier = '<LogGroupName|FilterName>'
+WHERE Identifier = '{{ log_group_name }}|{{ filter_name }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/logs/query_definitions/index.md b/website/docs/services/logs/query_definitions/index.md
index 9fade9bbc..065984713 100644
--- a/website/docs/services/logs/query_definitions/index.md
+++ b/website/docs/services/logs/query_definitions/index.md
@@ -158,7 +158,7 @@ log_group_names,
 query_definition_id,
 query_language
 FROM awscc.logs.query_definitions
-WHERE region = 'us-east-1' AND Identifier = '<QueryDefinitionId>';
+WHERE region = 'us-east-1' AND Identifier = '{{ query_definition_id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -195,9 +195,9 @@ INSERT INTO awscc.logs.query_definitions (
  QueryString,
  region
 )
-SELECT 
-'{{ Name }}',
- '{{ QueryString }}',
+SELECT
+'{{ name }}',
+ '{{ query_string }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -212,11 +212,11 @@ INSERT INTO awscc.logs.query_definitions (
  QueryLanguage,
  region
 )
-SELECT 
- '{{ Name }}',
- '{{ QueryString }}',
- '{{ LogGroupNames }}',
- '{{ QueryLanguage }}',
+SELECT
+ '{{ name }}',
+ '{{ query_string }}',
+ '{{ log_group_names }}',
+ '{{ query_language }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -234,16 +234,15 @@ globals:
 resources:
   - name: query_definition
     props:
-      - name: Name
-        value: '{{ Name }}'
-      - name: QueryString
-        value: '{{ QueryString }}'
-      - name: LogGroupNames
+      - name: name
+        value: '{{ name }}'
+      - name: query_string
+        value: '{{ query_string }}'
+      - name: log_group_names
         value:
-          - '{{ LogGroupNames[0] }}'
-      - name: QueryLanguage
-        value: '{{ QueryLanguage }}'
-
+          - '{{ log_group_names[0] }}'
+      - name: query_language
+        value: '{{ query_language }}'
 ```
 </TabItem>
 </Tabs>
@@ -262,7 +261,7 @@ SET PatchDocument = string('{{ {
     "QueryLanguage": query_language
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<QueryDefinitionId>';
+AND Identifier = '{{ query_definition_id }}';
 ```
 
 
@@ -271,7 +270,7 @@ AND Identifier = '<QueryDefinitionId>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.logs.query_definitions
-WHERE Identifier = '<QueryDefinitionId>'
+WHERE Identifier = '{{ query_definition_id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/logs/resource_policies/index.md b/website/docs/services/logs/resource_policies/index.md
index cfbb61eab..2f1c91009 100644
--- a/website/docs/services/logs/resource_policies/index.md
+++ b/website/docs/services/logs/resource_policies/index.md
@@ -140,7 +140,7 @@ region,
 policy_name,
 policy_document
 FROM awscc.logs.resource_policies
-WHERE region = 'us-east-1' AND Identifier = '<PolicyName>';
+WHERE region = 'us-east-1' AND Identifier = '{{ policy_name }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -177,9 +177,9 @@ INSERT INTO awscc.logs.resource_policies (
  PolicyDocument,
  region
 )
-SELECT 
-'{{ PolicyName }}',
- '{{ PolicyDocument }}',
+SELECT
+'{{ policy_name }}',
+ '{{ policy_document }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -192,9 +192,9 @@ INSERT INTO awscc.logs.resource_policies (
  PolicyDocument,
  region
 )
-SELECT 
- '{{ PolicyName }}',
- '{{ PolicyDocument }}',
+SELECT
+ '{{ policy_name }}',
+ '{{ policy_document }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -212,11 +212,10 @@ globals:
 resources:
   - name: resource_policy
     props:
-      - name: PolicyName
-        value: '{{ PolicyName }}'
-      - name: PolicyDocument
-        value: '{{ PolicyDocument }}'
-
+      - name: policy_name
+        value: '{{ policy_name }}'
+      - name: policy_document
+        value: '{{ policy_document }}'
 ```
 </TabItem>
 </Tabs>
@@ -232,7 +231,7 @@ SET PatchDocument = string('{{ {
     "PolicyDocument": policy_document
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<PolicyName>';
+AND Identifier = '{{ policy_name }}';
 ```
 
 
@@ -241,7 +240,7 @@ AND Identifier = '<PolicyName>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.logs.resource_policies
-WHERE Identifier = '<PolicyName>'
+WHERE Identifier = '{{ policy_name }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/logs/subscription_filters/index.md b/website/docs/services/logs/subscription_filters/index.md
index 81fd22d4c..7e53a5083 100644
--- a/website/docs/services/logs/subscription_filters/index.md
+++ b/website/docs/services/logs/subscription_filters/index.md
@@ -175,7 +175,7 @@ role_arn,
 distribution,
 apply_on_transformed_logs
 FROM awscc.logs.subscription_filters
-WHERE region = 'us-east-1' AND Identifier = '<FilterName>|<LogGroupName>';
+WHERE region = 'us-east-1' AND Identifier = '{{ filter_name }}|{{ log_group_name }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -214,10 +214,10 @@ INSERT INTO awscc.logs.subscription_filters (
  LogGroupName,
  region
 )
-SELECT 
-'{{ DestinationArn }}',
- '{{ FilterPattern }}',
- '{{ LogGroupName }}',
+SELECT
+'{{ destination_arn }}',
+ '{{ filter_pattern }}',
+ '{{ log_group_name }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -235,14 +235,14 @@ INSERT INTO awscc.logs.subscription_filters (
  ApplyOnTransformedLogs,
  region
 )
-SELECT 
- '{{ FilterName }}',
- '{{ DestinationArn }}',
- '{{ FilterPattern }}',
- '{{ LogGroupName }}',
- '{{ RoleArn }}',
- '{{ Distribution }}',
- '{{ ApplyOnTransformedLogs }}',
+SELECT
+ '{{ filter_name }}',
+ '{{ destination_arn }}',
+ '{{ filter_pattern }}',
+ '{{ log_group_name }}',
+ '{{ role_arn }}',
+ '{{ distribution }}',
+ '{{ apply_on_transformed_logs }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -260,21 +260,20 @@ globals:
 resources:
   - name: subscription_filter
     props:
-      - name: FilterName
-        value: '{{ FilterName }}'
-      - name: DestinationArn
-        value: '{{ DestinationArn }}'
-      - name: FilterPattern
-        value: '{{ FilterPattern }}'
-      - name: LogGroupName
-        value: '{{ LogGroupName }}'
-      - name: RoleArn
-        value: '{{ RoleArn }}'
-      - name: Distribution
-        value: '{{ Distribution }}'
-      - name: ApplyOnTransformedLogs
-        value: '{{ ApplyOnTransformedLogs }}'
-
+      - name: filter_name
+        value: '{{ filter_name }}'
+      - name: destination_arn
+        value: '{{ destination_arn }}'
+      - name: filter_pattern
+        value: '{{ filter_pattern }}'
+      - name: log_group_name
+        value: '{{ log_group_name }}'
+      - name: role_arn
+        value: '{{ role_arn }}'
+      - name: distribution
+        value: '{{ distribution }}'
+      - name: apply_on_transformed_logs
+        value: '{{ apply_on_transformed_logs }}'
 ```
 </TabItem>
 </Tabs>
@@ -294,7 +293,7 @@ SET PatchDocument = string('{{ {
     "ApplyOnTransformedLogs": apply_on_transformed_logs
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<FilterName>|<LogGroupName>';
+AND Identifier = '{{ filter_name }}|{{ log_group_name }}';
 ```
 
 
@@ -303,7 +302,7 @@ AND Identifier = '<FilterName>|<LogGroupName>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.logs.subscription_filters
-WHERE Identifier = '<FilterName|LogGroupName>'
+WHERE Identifier = '{{ filter_name }}|{{ log_group_name }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/logs/transformers/index.md b/website/docs/services/logs/transformers/index.md
index b454985f5..7dccfb178 100644
--- a/website/docs/services/logs/transformers/index.md
+++ b/website/docs/services/logs/transformers/index.md
@@ -607,7 +607,7 @@ region,
 log_group_identifier,
 transformer_config
 FROM awscc.logs.transformers
-WHERE region = 'us-east-1' AND Identifier = '<LogGroupIdentifier>';
+WHERE region = 'us-east-1' AND Identifier = '{{ log_group_identifier }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -644,9 +644,9 @@ INSERT INTO awscc.logs.transformers (
  TransformerConfig,
  region
 )
-SELECT 
-'{{ LogGroupIdentifier }}',
- '{{ TransformerConfig }}',
+SELECT
+'{{ log_group_identifier }}',
+ '{{ transformer_config }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -659,9 +659,9 @@ INSERT INTO awscc.logs.transformers (
  TransformerConfig,
  region
 )
-SELECT 
- '{{ LogGroupIdentifier }}',
- '{{ TransformerConfig }}',
+SELECT
+ '{{ log_group_identifier }}',
+ '{{ transformer_config }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -679,106 +679,105 @@ globals:
 resources:
   - name: transformer
     props:
-      - name: LogGroupIdentifier
-        value: '{{ LogGroupIdentifier }}'
-      - name: TransformerConfig
+      - name: log_group_identifier
+        value: '{{ log_group_identifier }}'
+      - name: transformer_config
         value:
-          - ParseCloudfront:
-              Source: '{{ Source }}'
-            ParseVPC:
-              Source: null
-            ParseWAF:
-              Source: null
-            ParseJSON:
-              Source: '{{ Source }}'
-              Destination: '{{ Destination }}'
-            ParseRoute53:
-              Source: null
-            ParsePostgres:
-              Source: null
-            ParseToOCSF:
-              Source: null
-              EventSource: '{{ EventSource }}'
-              OcsfVersion: '{{ OcsfVersion }}'
-            ParseKeyValue:
-              Source: null
-              Destination: null
-              FieldDelimiter: '{{ FieldDelimiter }}'
-              KeyValueDelimiter: '{{ KeyValueDelimiter }}'
-              KeyPrefix: null
-              NonMatchValue: null
-              OverwriteIfExists: '{{ OverwriteIfExists }}'
-            CopyValue:
-              Entries:
-                - Source: null
-                  Target: null
-                  OverwriteIfExists: '{{ OverwriteIfExists }}'
-            Csv:
-              QuoteCharacter: '{{ QuoteCharacter }}'
-              Delimiter: '{{ Delimiter }}'
-              Source: '{{ Source }}'
-              Columns:
+          - parse_cloudfront:
+              source: '{{ source }}'
+            parse_vpc:
+              source: null
+            parse_wa_f:
+              source: null
+            parse_js_on:
+              source: '{{ source }}'
+              destination: '{{ destination }}'
+            parse_route53:
+              source: null
+            parse_postgres:
+              source: null
+            parse_to_oc_sf:
+              source: null
+              event_source: '{{ event_source }}'
+              ocsf_version: '{{ ocsf_version }}'
+            parse_key_value:
+              source: null
+              destination: null
+              field_delimiter: '{{ field_delimiter }}'
+              key_value_delimiter: '{{ key_value_delimiter }}'
+              key_prefix: null
+              non_match_value: null
+              overwrite_if_exists: '{{ overwrite_if_exists }}'
+            copy_value:
+              entries:
+                - source: null
+                  target: null
+                  overwrite_if_exists: '{{ overwrite_if_exists }}'
+            csv:
+              quote_character: '{{ quote_character }}'
+              delimiter: '{{ delimiter }}'
+              source: '{{ source }}'
+              columns:
                 - null
-            DateTimeConverter:
-              Source: null
-              Target: null
-              TargetFormat: '{{ TargetFormat }}'
-              MatchPatterns:
+            date_time_converter:
+              source: null
+              target: null
+              target_format: '{{ target_format }}'
+              match_patterns:
                 - null
-              SourceTimezone: '{{ SourceTimezone }}'
-              TargetTimezone: '{{ TargetTimezone }}'
-              Locale: '{{ Locale }}'
-            DeleteKeys:
-              WithKeys:
-                - '{{ WithKeys[0] }}'
-            Grok:
-              Source: null
-              Match: '{{ Match }}'
-            ListToMap:
-              Source: null
-              Key: null
-              ValueKey: null
-              Target: null
-              Flatten: '{{ Flatten }}'
-              FlattenedElement: '{{ FlattenedElement }}'
-            AddKeys:
-              Entries:
-                - Key: null
-                  Value: '{{ Value }}'
-                  OverwriteIfExists: '{{ OverwriteIfExists }}'
-            MoveKeys:
-              Entries:
-                - Source: null
-                  Target: null
-                  OverwriteIfExists: '{{ OverwriteIfExists }}'
-            RenameKeys:
-              Entries:
-                - Key: null
-                  RenameTo: null
-                  OverwriteIfExists: '{{ OverwriteIfExists }}'
-            LowerCaseString:
-              WithKeys:
+              source_timezone: '{{ source_timezone }}'
+              target_timezone: '{{ target_timezone }}'
+              locale: '{{ locale }}'
+            delete_keys:
+              with_keys:
+                - '{{ with_keys[0] }}'
+            grok:
+              source: null
+              match: '{{ match }}'
+            list_to_map:
+              source: null
+              key: null
+              value_key: null
+              target: null
+              flatten: '{{ flatten }}'
+              flattened_element: '{{ flattened_element }}'
+            add_keys:
+              entries:
+                - key: null
+                  value: '{{ value }}'
+                  overwrite_if_exists: '{{ overwrite_if_exists }}'
+            move_keys:
+              entries:
+                - source: null
+                  target: null
+                  overwrite_if_exists: '{{ overwrite_if_exists }}'
+            rename_keys:
+              entries:
+                - key: null
+                  rename_to: null
+                  overwrite_if_exists: '{{ overwrite_if_exists }}'
+            lower_case_string:
+              with_keys:
                 - null
-            SplitString:
-              Entries:
-                - Source: null
-                  Delimiter: '{{ Delimiter }}'
-            SubstituteString:
-              Entries:
-                - Source: null
-                  From: null
-                  To: null
-            TrimString:
-              WithKeys:
+            split_string:
+              entries:
+                - source: null
+                  delimiter: '{{ delimiter }}'
+            substitute_string:
+              entries:
+                - source: null
+                  from: null
+                  to: null
+            trim_string:
+              with_keys:
                 - null
-            UpperCaseString:
-              WithKeys:
+            upper_case_string:
+              with_keys:
                 - null
-            TypeConverter:
-              Entries:
-                - Key: null
-                  Type: '{{ Type }}'
-
+            type_converter:
+              entries:
+                - key: null
+                  type: '{{ type }}'
 ```
 </TabItem>
 </Tabs>
@@ -794,7 +793,7 @@ SET PatchDocument = string('{{ {
     "TransformerConfig": transformer_config
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<LogGroupIdentifier>';
+AND Identifier = '{{ log_group_identifier }}';
 ```
 
 
@@ -803,7 +802,7 @@ AND Identifier = '<LogGroupIdentifier>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.logs.transformers
-WHERE Identifier = '<LogGroupIdentifier>'
+WHERE Identifier = '{{ log_group_identifier }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/lookoutequipment/inference_schedulers/index.md b/website/docs/services/lookoutequipment/inference_schedulers/index.md
index 060b2d400..18d163098 100644
--- a/website/docs/services/lookoutequipment/inference_schedulers/index.md
+++ b/website/docs/services/lookoutequipment/inference_schedulers/index.md
@@ -265,7 +265,7 @@ server_side_kms_key_id,
 tags,
 inference_scheduler_arn
 FROM awscc.lookoutequipment.inference_schedulers
-WHERE region = 'us-east-1' AND Identifier = '<InferenceSchedulerName>';
+WHERE region = 'us-east-1' AND Identifier = '{{ inference_scheduler_name }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -305,12 +305,12 @@ INSERT INTO awscc.lookoutequipment.inference_schedulers (
  RoleArn,
  region
 )
-SELECT 
-'{{ DataInputConfiguration }}',
- '{{ DataOutputConfiguration }}',
- '{{ DataUploadFrequency }}',
- '{{ ModelName }}',
- '{{ RoleArn }}',
+SELECT
+'{{ data_input_configuration }}',
+ '{{ data_output_configuration }}',
+ '{{ data_upload_frequency }}',
+ '{{ model_name }}',
+ '{{ role_arn }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -330,16 +330,16 @@ INSERT INTO awscc.lookoutequipment.inference_schedulers (
  Tags,
  region
 )
-SELECT 
- '{{ DataDelayOffsetInMinutes }}',
- '{{ DataInputConfiguration }}',
- '{{ DataOutputConfiguration }}',
- '{{ DataUploadFrequency }}',
- '{{ InferenceSchedulerName }}',
- '{{ ModelName }}',
- '{{ RoleArn }}',
- '{{ ServerSideKmsKeyId }}',
- '{{ Tags }}',
+SELECT
+ '{{ data_delay_offset_in_minutes }}',
+ '{{ data_input_configuration }}',
+ '{{ data_output_configuration }}',
+ '{{ data_upload_frequency }}',
+ '{{ inference_scheduler_name }}',
+ '{{ model_name }}',
+ '{{ role_arn }}',
+ '{{ server_side_kms_key_id }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -357,38 +357,37 @@ globals:
 resources:
   - name: inference_scheduler
     props:
-      - name: DataDelayOffsetInMinutes
-        value: '{{ DataDelayOffsetInMinutes }}'
-      - name: DataInputConfiguration
+      - name: data_delay_offset_in_minutes
+        value: '{{ data_delay_offset_in_minutes }}'
+      - name: data_input_configuration
         value:
-          InputTimeZoneOffset: '{{ InputTimeZoneOffset }}'
-          InferenceInputNameConfiguration:
-            ComponentTimestampDelimiter: '{{ ComponentTimestampDelimiter }}'
-            TimestampFormat: '{{ TimestampFormat }}'
-          S3InputConfiguration:
-            Bucket: '{{ Bucket }}'
-            Prefix: '{{ Prefix }}'
-      - name: DataOutputConfiguration
+          input_time_zone_offset: '{{ input_time_zone_offset }}'
+          inference_input_name_configuration:
+            component_timestamp_delimiter: '{{ component_timestamp_delimiter }}'
+            timestamp_format: '{{ timestamp_format }}'
+          s3_input_configuration:
+            bucket: '{{ bucket }}'
+            prefix: '{{ prefix }}'
+      - name: data_output_configuration
         value:
-          KmsKeyId: '{{ KmsKeyId }}'
-          S3OutputConfiguration:
-            Bucket: null
-            Prefix: null
-      - name: DataUploadFrequency
-        value: '{{ DataUploadFrequency }}'
-      - name: InferenceSchedulerName
-        value: '{{ InferenceSchedulerName }}'
-      - name: ModelName
-        value: '{{ ModelName }}'
-      - name: RoleArn
-        value: '{{ RoleArn }}'
-      - name: ServerSideKmsKeyId
-        value: '{{ ServerSideKmsKeyId }}'
-      - name: Tags
+          kms_key_id: '{{ kms_key_id }}'
+          s3_output_configuration:
+            bucket: null
+            prefix: null
+      - name: data_upload_frequency
+        value: '{{ data_upload_frequency }}'
+      - name: inference_scheduler_name
+        value: '{{ inference_scheduler_name }}'
+      - name: model_name
+        value: '{{ model_name }}'
+      - name: role_arn
+        value: '{{ role_arn }}'
+      - name: server_side_kms_key_id
+        value: '{{ server_side_kms_key_id }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -409,7 +408,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<InferenceSchedulerName>';
+AND Identifier = '{{ inference_scheduler_name }}';
 ```
 
 
@@ -418,7 +417,7 @@ AND Identifier = '<InferenceSchedulerName>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.lookoutequipment.inference_schedulers
-WHERE Identifier = '<InferenceSchedulerName>'
+WHERE Identifier = '{{ inference_scheduler_name }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/lookoutvision/projects/index.md b/website/docs/services/lookoutvision/projects/index.md
index 14e872dfd..0816dfe8f 100644
--- a/website/docs/services/lookoutvision/projects/index.md
+++ b/website/docs/services/lookoutvision/projects/index.md
@@ -134,7 +134,7 @@ region,
 arn,
 project_name
 FROM awscc.lookoutvision.projects
-WHERE region = 'us-east-1' AND Identifier = '<ProjectName>';
+WHERE region = 'us-east-1' AND Identifier = '{{ project_name }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -170,8 +170,8 @@ INSERT INTO awscc.lookoutvision.projects (
  ProjectName,
  region
 )
-SELECT 
-'{{ ProjectName }}',
+SELECT
+'{{ project_name }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -183,8 +183,8 @@ INSERT INTO awscc.lookoutvision.projects (
  ProjectName,
  region
 )
-SELECT 
- '{{ ProjectName }}',
+SELECT
+ '{{ project_name }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -202,9 +202,8 @@ globals:
 resources:
   - name: project
     props:
-      - name: ProjectName
-        value: '{{ ProjectName }}'
-
+      - name: project_name
+        value: '{{ project_name }}'
 ```
 </TabItem>
 </Tabs>
@@ -215,7 +214,7 @@ resources:
 ```sql
 /*+ delete */
 DELETE FROM awscc.lookoutvision.projects
-WHERE Identifier = '<ProjectName>'
+WHERE Identifier = '{{ project_name }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/m2/applications/index.md b/website/docs/services/m2/applications/index.md
index 35d55499b..d288261ae 100644
--- a/website/docs/services/m2/applications/index.md
+++ b/website/docs/services/m2/applications/index.md
@@ -182,7 +182,7 @@ name,
 role_arn,
 tags
 FROM awscc.m2.applications
-WHERE region = 'us-east-1' AND Identifier = '<ApplicationArn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ application_arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -219,9 +219,9 @@ INSERT INTO awscc.m2.applications (
  Name,
  region
 )
-SELECT 
-'{{ EngineType }}',
- '{{ Name }}',
+SELECT
+'{{ engine_type }}',
+ '{{ name }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -239,14 +239,14 @@ INSERT INTO awscc.m2.applications (
  Tags,
  region
 )
-SELECT 
- '{{ Definition }}',
- '{{ Description }}',
- '{{ EngineType }}',
- '{{ KmsKeyId }}',
- '{{ Name }}',
- '{{ RoleArn }}',
- '{{ Tags }}',
+SELECT
+ '{{ definition }}',
+ '{{ description }}',
+ '{{ engine_type }}',
+ '{{ kms_key_id }}',
+ '{{ name }}',
+ '{{ role_arn }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -264,21 +264,20 @@ globals:
 resources:
   - name: application
     props:
-      - name: Definition
+      - name: definition
         value: null
-      - name: Description
-        value: '{{ Description }}'
-      - name: EngineType
-        value: '{{ EngineType }}'
-      - name: KmsKeyId
-        value: '{{ KmsKeyId }}'
-      - name: Name
-        value: '{{ Name }}'
-      - name: RoleArn
-        value: '{{ RoleArn }}'
-      - name: Tags
+      - name: description
+        value: '{{ description }}'
+      - name: engine_type
+        value: '{{ engine_type }}'
+      - name: kms_key_id
+        value: '{{ kms_key_id }}'
+      - name: name
+        value: '{{ name }}'
+      - name: role_arn
+        value: '{{ role_arn }}'
+      - name: tags
         value: {}
-
 ```
 </TabItem>
 </Tabs>
@@ -296,7 +295,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<ApplicationArn>';
+AND Identifier = '{{ application_arn }}';
 ```
 
 
@@ -305,7 +304,7 @@ AND Identifier = '<ApplicationArn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.m2.applications
-WHERE Identifier = '<ApplicationArn>'
+WHERE Identifier = '{{ application_arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/m2/deployments/index.md b/website/docs/services/m2/deployments/index.md
index 86b2fbb17..54667ce47 100644
--- a/website/docs/services/m2/deployments/index.md
+++ b/website/docs/services/m2/deployments/index.md
@@ -158,7 +158,7 @@ application_version,
 deployment_id,
 status
 FROM awscc.m2.deployments
-WHERE region = 'us-east-1' AND Identifier = '<ApplicationId>';
+WHERE region = 'us-east-1' AND Identifier = '{{ application_id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -196,10 +196,10 @@ INSERT INTO awscc.m2.deployments (
  ApplicationVersion,
  region
 )
-SELECT 
-'{{ EnvironmentId }}',
- '{{ ApplicationId }}',
- '{{ ApplicationVersion }}',
+SELECT
+'{{ environment_id }}',
+ '{{ application_id }}',
+ '{{ application_version }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -213,10 +213,10 @@ INSERT INTO awscc.m2.deployments (
  ApplicationVersion,
  region
 )
-SELECT 
- '{{ EnvironmentId }}',
- '{{ ApplicationId }}',
- '{{ ApplicationVersion }}',
+SELECT
+ '{{ environment_id }}',
+ '{{ application_id }}',
+ '{{ application_version }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -234,13 +234,12 @@ globals:
 resources:
   - name: deployment
     props:
-      - name: EnvironmentId
-        value: '{{ EnvironmentId }}'
-      - name: ApplicationId
-        value: '{{ ApplicationId }}'
-      - name: ApplicationVersion
-        value: '{{ ApplicationVersion }}'
-
+      - name: environment_id
+        value: '{{ environment_id }}'
+      - name: application_id
+        value: '{{ application_id }}'
+      - name: application_version
+        value: '{{ application_version }}'
 ```
 </TabItem>
 </Tabs>
@@ -256,7 +255,7 @@ SET PatchDocument = string('{{ {
     "ApplicationVersion": application_version
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<ApplicationId>';
+AND Identifier = '{{ application_id }}';
 ```
 
 
@@ -265,7 +264,7 @@ AND Identifier = '<ApplicationId>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.m2.deployments
-WHERE Identifier = '<ApplicationId>'
+WHERE Identifier = '{{ application_id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/m2/environments/index.md b/website/docs/services/m2/environments/index.md
index 1228d0e42..79b55cde4 100644
--- a/website/docs/services/m2/environments/index.md
+++ b/website/docs/services/m2/environments/index.md
@@ -231,7 +231,7 @@ storage_configurations,
 subnet_ids,
 tags
 FROM awscc.m2.environments
-WHERE region = 'us-east-1' AND Identifier = '<EnvironmentArn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ environment_arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -269,10 +269,10 @@ INSERT INTO awscc.m2.environments (
  Name,
  region
 )
-SELECT 
-'{{ EngineType }}',
- '{{ InstanceType }}',
- '{{ Name }}',
+SELECT
+'{{ engine_type }}',
+ '{{ instance_type }}',
+ '{{ name }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -297,21 +297,21 @@ INSERT INTO awscc.m2.environments (
  Tags,
  region
 )
-SELECT 
- '{{ Description }}',
- '{{ EngineType }}',
- '{{ EngineVersion }}',
- '{{ HighAvailabilityConfig }}',
- '{{ InstanceType }}',
- '{{ KmsKeyId }}',
- '{{ Name }}',
- '{{ NetworkType }}',
- '{{ PreferredMaintenanceWindow }}',
- '{{ PubliclyAccessible }}',
- '{{ SecurityGroupIds }}',
- '{{ StorageConfigurations }}',
- '{{ SubnetIds }}',
- '{{ Tags }}',
+SELECT
+ '{{ description }}',
+ '{{ engine_type }}',
+ '{{ engine_version }}',
+ '{{ high_availability_config }}',
+ '{{ instance_type }}',
+ '{{ kms_key_id }}',
+ '{{ name }}',
+ '{{ network_type }}',
+ '{{ preferred_maintenance_window }}',
+ '{{ publicly_accessible }}',
+ '{{ security_group_ids }}',
+ '{{ storage_configurations }}',
+ '{{ subnet_ids }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -329,39 +329,38 @@ globals:
 resources:
   - name: environment
     props:
-      - name: Description
-        value: '{{ Description }}'
-      - name: EngineType
-        value: '{{ EngineType }}'
-      - name: EngineVersion
-        value: '{{ EngineVersion }}'
-      - name: HighAvailabilityConfig
+      - name: description
+        value: '{{ description }}'
+      - name: engine_type
+        value: '{{ engine_type }}'
+      - name: engine_version
+        value: '{{ engine_version }}'
+      - name: high_availability_config
         value:
-          DesiredCapacity: '{{ DesiredCapacity }}'
-      - name: InstanceType
-        value: '{{ InstanceType }}'
-      - name: KmsKeyId
-        value: '{{ KmsKeyId }}'
-      - name: Name
-        value: '{{ Name }}'
-      - name: NetworkType
-        value: '{{ NetworkType }}'
-      - name: PreferredMaintenanceWindow
-        value: '{{ PreferredMaintenanceWindow }}'
-      - name: PubliclyAccessible
-        value: '{{ PubliclyAccessible }}'
-      - name: SecurityGroupIds
+          desired_capacity: '{{ desired_capacity }}'
+      - name: instance_type
+        value: '{{ instance_type }}'
+      - name: kms_key_id
+        value: '{{ kms_key_id }}'
+      - name: name
+        value: '{{ name }}'
+      - name: network_type
+        value: '{{ network_type }}'
+      - name: preferred_maintenance_window
+        value: '{{ preferred_maintenance_window }}'
+      - name: publicly_accessible
+        value: '{{ publicly_accessible }}'
+      - name: security_group_ids
         value:
-          - '{{ SecurityGroupIds[0] }}'
-      - name: StorageConfigurations
+          - '{{ security_group_ids[0] }}'
+      - name: storage_configurations
         value:
           - {}
-      - name: SubnetIds
+      - name: subnet_ids
         value:
-          - '{{ SubnetIds[0] }}'
-      - name: Tags
+          - '{{ subnet_ids[0] }}'
+      - name: tags
         value: {}
-
 ```
 </TabItem>
 </Tabs>
@@ -381,7 +380,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<EnvironmentArn>';
+AND Identifier = '{{ environment_arn }}';
 ```
 
 
@@ -390,7 +389,7 @@ AND Identifier = '<EnvironmentArn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.m2.environments
-WHERE Identifier = '<EnvironmentArn>'
+WHERE Identifier = '{{ environment_arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/macie/allow_lists/index.md b/website/docs/services/macie/allow_lists/index.md
index 5abffb30b..9c8e80a38 100644
--- a/website/docs/services/macie/allow_lists/index.md
+++ b/website/docs/services/macie/allow_lists/index.md
@@ -182,7 +182,7 @@ arn,
 status,
 tags
 FROM awscc.macie.allow_lists
-WHERE region = 'us-east-1' AND Identifier = '<Id>';
+WHERE region = 'us-east-1' AND Identifier = '{{ id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -219,9 +219,9 @@ INSERT INTO awscc.macie.allow_lists (
  Criteria,
  region
 )
-SELECT 
-'{{ Name }}',
- '{{ Criteria }}',
+SELECT
+'{{ name }}',
+ '{{ criteria }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -236,11 +236,11 @@ INSERT INTO awscc.macie.allow_lists (
  Tags,
  region
 )
-SELECT 
- '{{ Name }}',
- '{{ Description }}',
- '{{ Criteria }}',
- '{{ Tags }}',
+SELECT
+ '{{ name }}',
+ '{{ description }}',
+ '{{ criteria }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -258,17 +258,16 @@ globals:
 resources:
   - name: allow_list
     props:
-      - name: Name
-        value: '{{ Name }}'
-      - name: Description
-        value: '{{ Description }}'
-      - name: Criteria
+      - name: name
+        value: '{{ name }}'
+      - name: description
+        value: '{{ description }}'
+      - name: criteria
         value: {}
-      - name: Tags
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -287,7 +286,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Id>';
+AND Identifier = '{{ id }}';
 ```
 
 
@@ -296,7 +295,7 @@ AND Identifier = '<Id>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.macie.allow_lists
-WHERE Identifier = '<Id>'
+WHERE Identifier = '{{ id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/macie/custom_data_identifiers/index.md b/website/docs/services/macie/custom_data_identifiers/index.md
index 6d2fb1a0f..baf243aae 100644
--- a/website/docs/services/macie/custom_data_identifiers/index.md
+++ b/website/docs/services/macie/custom_data_identifiers/index.md
@@ -194,7 +194,7 @@ id,
 arn,
 tags
 FROM awscc.macie.custom_data_identifiers
-WHERE region = 'us-east-1' AND Identifier = '<Id>';
+WHERE region = 'us-east-1' AND Identifier = '{{ id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -231,9 +231,9 @@ INSERT INTO awscc.macie.custom_data_identifiers (
  Regex,
  region
 )
-SELECT 
-'{{ Name }}',
- '{{ Regex }}',
+SELECT
+'{{ name }}',
+ '{{ regex }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -251,14 +251,14 @@ INSERT INTO awscc.macie.custom_data_identifiers (
  Tags,
  region
 )
-SELECT 
- '{{ Name }}',
- '{{ Description }}',
- '{{ Regex }}',
- '{{ MaximumMatchDistance }}',
- '{{ Keywords }}',
- '{{ IgnoreWords }}',
- '{{ Tags }}',
+SELECT
+ '{{ name }}',
+ '{{ description }}',
+ '{{ regex }}',
+ '{{ maximum_match_distance }}',
+ '{{ keywords }}',
+ '{{ ignore_words }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -276,25 +276,24 @@ globals:
 resources:
   - name: custom_data_identifier
     props:
-      - name: Name
-        value: '{{ Name }}'
-      - name: Description
-        value: '{{ Description }}'
-      - name: Regex
-        value: '{{ Regex }}'
-      - name: MaximumMatchDistance
-        value: '{{ MaximumMatchDistance }}'
-      - name: Keywords
+      - name: name
+        value: '{{ name }}'
+      - name: description
+        value: '{{ description }}'
+      - name: regex
+        value: '{{ regex }}'
+      - name: maximum_match_distance
+        value: '{{ maximum_match_distance }}'
+      - name: keywords
         value:
-          - '{{ Keywords[0] }}'
-      - name: IgnoreWords
+          - '{{ keywords[0] }}'
+      - name: ignore_words
         value:
-          - '{{ IgnoreWords[0] }}'
-      - name: Tags
+          - '{{ ignore_words[0] }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -310,7 +309,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Id>';
+AND Identifier = '{{ id }}';
 ```
 
 
@@ -319,7 +318,7 @@ AND Identifier = '<Id>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.macie.custom_data_identifiers
-WHERE Identifier = '<Id>'
+WHERE Identifier = '{{ id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/macie/findings_filters/index.md b/website/docs/services/macie/findings_filters/index.md
index 39a69b66e..5f9d4c833 100644
--- a/website/docs/services/macie/findings_filters/index.md
+++ b/website/docs/services/macie/findings_filters/index.md
@@ -195,7 +195,7 @@ id,
 arn,
 tags
 FROM awscc.macie.findings_filters
-WHERE region = 'us-east-1' AND Identifier = '<Id>';
+WHERE region = 'us-east-1' AND Identifier = '{{ id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -232,9 +232,9 @@ INSERT INTO awscc.macie.findings_filters (
  FindingCriteria,
  region
 )
-SELECT 
-'{{ Name }}',
- '{{ FindingCriteria }}',
+SELECT
+'{{ name }}',
+ '{{ finding_criteria }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -251,13 +251,13 @@ INSERT INTO awscc.macie.findings_filters (
  Tags,
  region
 )
-SELECT 
- '{{ Name }}',
- '{{ Description }}',
- '{{ FindingCriteria }}',
- '{{ Action }}',
- '{{ Position }}',
- '{{ Tags }}',
+SELECT
+ '{{ name }}',
+ '{{ description }}',
+ '{{ finding_criteria }}',
+ '{{ action }}',
+ '{{ position }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -275,22 +275,21 @@ globals:
 resources:
   - name: findings_filter
     props:
-      - name: Name
-        value: '{{ Name }}'
-      - name: Description
-        value: '{{ Description }}'
-      - name: FindingCriteria
+      - name: name
+        value: '{{ name }}'
+      - name: description
+        value: '{{ description }}'
+      - name: finding_criteria
         value:
-          Criterion: {}
-      - name: Action
-        value: '{{ Action }}'
-      - name: Position
-        value: '{{ Position }}'
-      - name: Tags
+          criterion: {}
+      - name: action
+        value: '{{ action }}'
+      - name: position
+        value: '{{ position }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -311,7 +310,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Id>';
+AND Identifier = '{{ id }}';
 ```
 
 
@@ -320,7 +319,7 @@ AND Identifier = '<Id>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.macie.findings_filters
-WHERE Identifier = '<Id>'
+WHERE Identifier = '{{ id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/macie/sessions/index.md b/website/docs/services/macie/sessions/index.md
index 826c78bd6..91dfc3eff 100644
--- a/website/docs/services/macie/sessions/index.md
+++ b/website/docs/services/macie/sessions/index.md
@@ -158,7 +158,7 @@ finding_publishing_frequency,
 service_role,
 automated_discovery_status
 FROM awscc.macie.sessions
-WHERE region = 'us-east-1' AND Identifier = '<AwsAccountId>';
+WHERE region = 'us-east-1' AND Identifier = '{{ aws_account_id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -195,9 +195,9 @@ INSERT INTO awscc.macie.sessions (
  FindingPublishingFrequency,
  region
 )
-SELECT 
-'{{ Status }}',
- '{{ FindingPublishingFrequency }}',
+SELECT
+'{{ status }}',
+ '{{ finding_publishing_frequency }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -210,9 +210,9 @@ INSERT INTO awscc.macie.sessions (
  FindingPublishingFrequency,
  region
 )
-SELECT 
- '{{ Status }}',
- '{{ FindingPublishingFrequency }}',
+SELECT
+ '{{ status }}',
+ '{{ finding_publishing_frequency }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -230,11 +230,10 @@ globals:
 resources:
   - name: session
     props:
-      - name: Status
-        value: '{{ Status }}'
-      - name: FindingPublishingFrequency
-        value: '{{ FindingPublishingFrequency }}'
-
+      - name: status
+        value: '{{ status }}'
+      - name: finding_publishing_frequency
+        value: '{{ finding_publishing_frequency }}'
 ```
 </TabItem>
 </Tabs>
@@ -251,7 +250,7 @@ SET PatchDocument = string('{{ {
     "FindingPublishingFrequency": finding_publishing_frequency
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<AwsAccountId>';
+AND Identifier = '{{ aws_account_id }}';
 ```
 
 
@@ -260,7 +259,7 @@ AND Identifier = '<AwsAccountId>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.macie.sessions
-WHERE Identifier = '<AwsAccountId>'
+WHERE Identifier = '{{ aws_account_id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/managedblockchain/accessors/index.md b/website/docs/services/managedblockchain/accessors/index.md
index 4db4756d9..fdd18d546 100644
--- a/website/docs/services/managedblockchain/accessors/index.md
+++ b/website/docs/services/managedblockchain/accessors/index.md
@@ -188,7 +188,7 @@ accessor_type,
 network_type,
 tags
 FROM awscc.managedblockchain.accessors
-WHERE region = 'us-east-1' AND Identifier = '<Id>';
+WHERE region = 'us-east-1' AND Identifier = '{{ id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -224,8 +224,8 @@ INSERT INTO awscc.managedblockchain.accessors (
  AccessorType,
  region
 )
-SELECT 
-'{{ AccessorType }}',
+SELECT
+'{{ accessor_type }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -239,10 +239,10 @@ INSERT INTO awscc.managedblockchain.accessors (
  Tags,
  region
 )
-SELECT 
- '{{ AccessorType }}',
- '{{ NetworkType }}',
- '{{ Tags }}',
+SELECT
+ '{{ accessor_type }}',
+ '{{ network_type }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -260,15 +260,14 @@ globals:
 resources:
   - name: accessor
     props:
-      - name: AccessorType
-        value: '{{ AccessorType }}'
-      - name: NetworkType
-        value: '{{ NetworkType }}'
-      - name: Tags
+      - name: accessor_type
+        value: '{{ accessor_type }}'
+      - name: network_type
+        value: '{{ network_type }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -284,7 +283,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Id>';
+AND Identifier = '{{ id }}';
 ```
 
 
@@ -293,7 +292,7 @@ AND Identifier = '<Id>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.managedblockchain.accessors
-WHERE Identifier = '<Id>'
+WHERE Identifier = '{{ id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/mediaconnect/bridge_outputs/index.md b/website/docs/services/mediaconnect/bridge_outputs/index.md
index 2ce67cef0..6b07e878a 100644
--- a/website/docs/services/mediaconnect/bridge_outputs/index.md
+++ b/website/docs/services/mediaconnect/bridge_outputs/index.md
@@ -127,7 +127,7 @@ bridge_arn,
 network_output,
 name
 FROM awscc.mediaconnect.bridge_outputs
-WHERE region = 'us-east-1' AND Identifier = '<BridgeArn>|<Name>';
+WHERE region = 'us-east-1' AND Identifier = '{{ bridge_arn }}|{{ name }}';
 ```
 
 ## `INSERT` example
@@ -152,10 +152,10 @@ INSERT INTO awscc.mediaconnect.bridge_outputs (
  Name,
  region
 )
-SELECT 
-'{{ BridgeArn }}',
- '{{ NetworkOutput }}',
- '{{ Name }}',
+SELECT
+'{{ bridge_arn }}',
+ '{{ network_output }}',
+ '{{ name }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -169,10 +169,10 @@ INSERT INTO awscc.mediaconnect.bridge_outputs (
  Name,
  region
 )
-SELECT 
- '{{ BridgeArn }}',
- '{{ NetworkOutput }}',
- '{{ Name }}',
+SELECT
+ '{{ bridge_arn }}',
+ '{{ network_output }}',
+ '{{ name }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -190,18 +190,17 @@ globals:
 resources:
   - name: bridge_output
     props:
-      - name: BridgeArn
-        value: '{{ BridgeArn }}'
-      - name: NetworkOutput
+      - name: bridge_arn
+        value: '{{ bridge_arn }}'
+      - name: network_output
         value:
-          Protocol: '{{ Protocol }}'
-          IpAddress: '{{ IpAddress }}'
-          Port: '{{ Port }}'
-          NetworkName: '{{ NetworkName }}'
-          Ttl: '{{ Ttl }}'
-      - name: Name
-        value: '{{ Name }}'
-
+          protocol: '{{ protocol }}'
+          ip_address: '{{ ip_address }}'
+          port: '{{ port }}'
+          network_name: '{{ network_name }}'
+          ttl: '{{ ttl }}'
+      - name: name
+        value: '{{ name }}'
 ```
 </TabItem>
 </Tabs>
@@ -217,7 +216,7 @@ SET PatchDocument = string('{{ {
     "NetworkOutput": network_output
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<BridgeArn>|<Name>';
+AND Identifier = '{{ bridge_arn }}|{{ name }}';
 ```
 
 
@@ -226,7 +225,7 @@ AND Identifier = '<BridgeArn>|<Name>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.mediaconnect.bridge_outputs
-WHERE Identifier = '<BridgeArn|Name>'
+WHERE Identifier = '{{ bridge_arn }}|{{ name }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/mediaconnect/bridge_sources/index.md b/website/docs/services/mediaconnect/bridge_sources/index.md
index 42ea805f1..cb279816d 100644
--- a/website/docs/services/mediaconnect/bridge_sources/index.md
+++ b/website/docs/services/mediaconnect/bridge_sources/index.md
@@ -159,7 +159,7 @@ bridge_arn,
 flow_source,
 network_source
 FROM awscc.mediaconnect.bridge_sources
-WHERE region = 'us-east-1' AND Identifier = '<BridgeArn>|<Name>';
+WHERE region = 'us-east-1' AND Identifier = '{{ bridge_arn }}|{{ name }}';
 ```
 
 ## `INSERT` example
@@ -183,9 +183,9 @@ INSERT INTO awscc.mediaconnect.bridge_sources (
  BridgeArn,
  region
 )
-SELECT 
-'{{ Name }}',
- '{{ BridgeArn }}',
+SELECT
+'{{ name }}',
+ '{{ bridge_arn }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -200,11 +200,11 @@ INSERT INTO awscc.mediaconnect.bridge_sources (
  NetworkSource,
  region
 )
-SELECT 
- '{{ Name }}',
- '{{ BridgeArn }}',
- '{{ FlowSource }}',
- '{{ NetworkSource }}',
+SELECT
+ '{{ name }}',
+ '{{ bridge_arn }}',
+ '{{ flow_source }}',
+ '{{ network_source }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -222,24 +222,23 @@ globals:
 resources:
   - name: bridge_source
     props:
-      - name: Name
-        value: '{{ Name }}'
-      - name: BridgeArn
-        value: '{{ BridgeArn }}'
-      - name: FlowSource
+      - name: name
+        value: '{{ name }}'
+      - name: bridge_arn
+        value: '{{ bridge_arn }}'
+      - name: flow_source
         value:
-          FlowArn: '{{ FlowArn }}'
-          FlowVpcInterfaceAttachment:
-            VpcInterfaceName: '{{ VpcInterfaceName }}'
-      - name: NetworkSource
+          flow_arn: '{{ flow_arn }}'
+          flow_vpc_interface_attachment:
+            vpc_interface_name: '{{ vpc_interface_name }}'
+      - name: network_source
         value:
-          Protocol: '{{ Protocol }}'
-          MulticastIp: '{{ MulticastIp }}'
-          MulticastSourceSettings:
-            MulticastSourceIp: '{{ MulticastSourceIp }}'
-          Port: '{{ Port }}'
-          NetworkName: '{{ NetworkName }}'
-
+          protocol: '{{ protocol }}'
+          multicast_ip: '{{ multicast_ip }}'
+          multicast_source_settings:
+            multicast_source_ip: '{{ multicast_source_ip }}'
+          port: '{{ port }}'
+          network_name: '{{ network_name }}'
 ```
 </TabItem>
 </Tabs>
@@ -256,7 +255,7 @@ SET PatchDocument = string('{{ {
     "NetworkSource": network_source
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<BridgeArn>|<Name>';
+AND Identifier = '{{ bridge_arn }}|{{ name }}';
 ```
 
 
@@ -265,7 +264,7 @@ AND Identifier = '<BridgeArn>|<Name>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.mediaconnect.bridge_sources
-WHERE Identifier = '<BridgeArn|Name>'
+WHERE Identifier = '{{ bridge_arn }}|{{ name }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/mediaconnect/bridges/index.md b/website/docs/services/mediaconnect/bridges/index.md
index e5ad251c7..49704cc41 100644
--- a/website/docs/services/mediaconnect/bridges/index.md
+++ b/website/docs/services/mediaconnect/bridges/index.md
@@ -349,7 +349,7 @@ sources,
 ingress_gateway_bridge,
 egress_gateway_bridge
 FROM awscc.mediaconnect.bridges
-WHERE region = 'us-east-1' AND Identifier = '<BridgeArn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ bridge_arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -387,10 +387,10 @@ INSERT INTO awscc.mediaconnect.bridges (
  Sources,
  region
 )
-SELECT 
-'{{ Name }}',
- '{{ PlacementArn }}',
- '{{ Sources }}',
+SELECT
+'{{ name }}',
+ '{{ placement_arn }}',
+ '{{ sources }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -408,14 +408,14 @@ INSERT INTO awscc.mediaconnect.bridges (
  EgressGatewayBridge,
  region
 )
-SELECT 
- '{{ Name }}',
- '{{ PlacementArn }}',
- '{{ SourceFailoverConfig }}',
- '{{ Outputs }}',
- '{{ Sources }}',
- '{{ IngressGatewayBridge }}',
- '{{ EgressGatewayBridge }}',
+SELECT
+ '{{ name }}',
+ '{{ placement_arn }}',
+ '{{ source_failover_config }}',
+ '{{ outputs }}',
+ '{{ sources }}',
+ '{{ ingress_gateway_bridge }}',
+ '{{ egress_gateway_bridge }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -433,50 +433,49 @@ globals:
 resources:
   - name: bridge
     props:
-      - name: Name
-        value: '{{ Name }}'
-      - name: PlacementArn
-        value: '{{ PlacementArn }}'
-      - name: SourceFailoverConfig
+      - name: name
+        value: '{{ name }}'
+      - name: placement_arn
+        value: '{{ placement_arn }}'
+      - name: source_failover_config
         value:
-          State: '{{ State }}'
-          RecoveryWindow: '{{ RecoveryWindow }}'
-          FailoverMode: '{{ FailoverMode }}'
-          SourcePriority:
-            PrimarySource: '{{ PrimarySource }}'
-      - name: Outputs
+          state: '{{ state }}'
+          recovery_window: '{{ recovery_window }}'
+          failover_mode: '{{ failover_mode }}'
+          source_priority:
+            primary_source: '{{ primary_source }}'
+      - name: outputs
         value:
-          - BridgeArn: '{{ BridgeArn }}'
-            NetworkOutput:
-              Protocol: '{{ Protocol }}'
-              IpAddress: '{{ IpAddress }}'
-              Port: '{{ Port }}'
-              NetworkName: '{{ NetworkName }}'
-              Ttl: '{{ Ttl }}'
-            Name: '{{ Name }}'
-      - name: Sources
+          - bridge_arn: '{{ bridge_arn }}'
+            network_output:
+              protocol: '{{ protocol }}'
+              ip_address: '{{ ip_address }}'
+              port: '{{ port }}'
+              network_name: '{{ network_name }}'
+              ttl: '{{ ttl }}'
+            name: '{{ name }}'
+      - name: sources
         value:
-          - Name: '{{ Name }}'
-            BridgeArn: '{{ BridgeArn }}'
-            FlowSource:
-              FlowArn: '{{ FlowArn }}'
-              FlowVpcInterfaceAttachment:
-                VpcInterfaceName: '{{ VpcInterfaceName }}'
-            NetworkSource:
-              Protocol: '{{ Protocol }}'
-              MulticastIp: '{{ MulticastIp }}'
-              MulticastSourceSettings:
-                MulticastSourceIp: '{{ MulticastSourceIp }}'
-              Port: '{{ Port }}'
-              NetworkName: '{{ NetworkName }}'
-      - name: IngressGatewayBridge
+          - name: '{{ name }}'
+            bridge_arn: '{{ bridge_arn }}'
+            flow_source:
+              flow_arn: '{{ flow_arn }}'
+              flow_vpc_interface_attachment:
+                vpc_interface_name: '{{ vpc_interface_name }}'
+            network_source:
+              protocol: '{{ protocol }}'
+              multicast_ip: '{{ multicast_ip }}'
+              multicast_source_settings:
+                multicast_source_ip: '{{ multicast_source_ip }}'
+              port: '{{ port }}'
+              network_name: '{{ network_name }}'
+      - name: ingress_gateway_bridge
         value:
-          MaxBitrate: '{{ MaxBitrate }}'
-          MaxOutputs: '{{ MaxOutputs }}'
-      - name: EgressGatewayBridge
+          max_bitrate: '{{ max_bitrate }}'
+          max_outputs: '{{ max_outputs }}'
+      - name: egress_gateway_bridge
         value:
-          MaxBitrate: '{{ MaxBitrate }}'
-
+          max_bitrate: '{{ max_bitrate }}'
 ```
 </TabItem>
 </Tabs>
@@ -498,7 +497,7 @@ SET PatchDocument = string('{{ {
     "EgressGatewayBridge": egress_gateway_bridge
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<BridgeArn>';
+AND Identifier = '{{ bridge_arn }}';
 ```
 
 
@@ -507,7 +506,7 @@ AND Identifier = '<BridgeArn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.mediaconnect.bridges
-WHERE Identifier = '<BridgeArn>'
+WHERE Identifier = '{{ bridge_arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/mediaconnect/flow_entitlements/index.md b/website/docs/services/mediaconnect/flow_entitlements/index.md
index 2195b7eea..1bd9ba609 100644
--- a/website/docs/services/mediaconnect/flow_entitlements/index.md
+++ b/website/docs/services/mediaconnect/flow_entitlements/index.md
@@ -223,7 +223,7 @@ entitlement_status,
 name,
 subscribers
 FROM awscc.mediaconnect.flow_entitlements
-WHERE region = 'us-east-1' AND Identifier = '<EntitlementArn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ entitlement_arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -262,11 +262,11 @@ INSERT INTO awscc.mediaconnect.flow_entitlements (
  Subscribers,
  region
 )
-SELECT 
-'{{ FlowArn }}',
- '{{ Description }}',
- '{{ Name }}',
- '{{ Subscribers }}',
+SELECT
+'{{ flow_arn }}',
+ '{{ description }}',
+ '{{ name }}',
+ '{{ subscribers }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -284,14 +284,14 @@ INSERT INTO awscc.mediaconnect.flow_entitlements (
  Subscribers,
  region
 )
-SELECT 
- '{{ FlowArn }}',
- '{{ DataTransferSubscriberFeePercent }}',
- '{{ Description }}',
- '{{ Encryption }}',
- '{{ EntitlementStatus }}',
- '{{ Name }}',
- '{{ Subscribers }}',
+SELECT
+ '{{ flow_arn }}',
+ '{{ data_transfer_subscriber_fee_percent }}',
+ '{{ description }}',
+ '{{ encryption }}',
+ '{{ entitlement_status }}',
+ '{{ name }}',
+ '{{ subscribers }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -309,31 +309,30 @@ globals:
 resources:
   - name: flow_entitlement
     props:
-      - name: FlowArn
-        value: '{{ FlowArn }}'
-      - name: DataTransferSubscriberFeePercent
-        value: '{{ DataTransferSubscriberFeePercent }}'
-      - name: Description
-        value: '{{ Description }}'
-      - name: Encryption
+      - name: flow_arn
+        value: '{{ flow_arn }}'
+      - name: data_transfer_subscriber_fee_percent
+        value: '{{ data_transfer_subscriber_fee_percent }}'
+      - name: description
+        value: '{{ description }}'
+      - name: encryption
         value:
-          Algorithm: '{{ Algorithm }}'
-          ConstantInitializationVector: '{{ ConstantInitializationVector }}'
-          DeviceId: '{{ DeviceId }}'
-          KeyType: '{{ KeyType }}'
-          Region: '{{ Region }}'
-          ResourceId: '{{ ResourceId }}'
-          RoleArn: '{{ RoleArn }}'
-          SecretArn: '{{ SecretArn }}'
-          Url: '{{ Url }}'
-      - name: EntitlementStatus
-        value: '{{ EntitlementStatus }}'
-      - name: Name
-        value: '{{ Name }}'
-      - name: Subscribers
+          algorithm: '{{ algorithm }}'
+          constant_initialization_vector: '{{ constant_initialization_vector }}'
+          device_id: '{{ device_id }}'
+          key_type: '{{ key_type }}'
+          region: '{{ region }}'
+          resource_id: '{{ resource_id }}'
+          role_arn: '{{ role_arn }}'
+          secret_arn: '{{ secret_arn }}'
+          url: '{{ url }}'
+      - name: entitlement_status
+        value: '{{ entitlement_status }}'
+      - name: name
+        value: '{{ name }}'
+      - name: subscribers
         value:
-          - '{{ Subscribers[0] }}'
-
+          - '{{ subscribers[0] }}'
 ```
 </TabItem>
 </Tabs>
@@ -353,7 +352,7 @@ SET PatchDocument = string('{{ {
     "Subscribers": subscribers
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<EntitlementArn>';
+AND Identifier = '{{ entitlement_arn }}';
 ```
 
 
@@ -362,7 +361,7 @@ AND Identifier = '<EntitlementArn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.mediaconnect.flow_entitlements
-WHERE Identifier = '<EntitlementArn>'
+WHERE Identifier = '{{ entitlement_arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/mediaconnect/flow_outputs/index.md b/website/docs/services/mediaconnect/flow_outputs/index.md
index 5eff7978c..34685260d 100644
--- a/website/docs/services/mediaconnect/flow_outputs/index.md
+++ b/website/docs/services/mediaconnect/flow_outputs/index.md
@@ -354,7 +354,7 @@ output_status,
 ndi_program_name,
 ndi_speed_hq_quality
 FROM awscc.mediaconnect.flow_outputs
-WHERE region = 'us-east-1' AND Identifier = '<OutputArn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ output_arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -391,9 +391,9 @@ INSERT INTO awscc.mediaconnect.flow_outputs (
  Protocol,
  region
 )
-SELECT 
-'{{ FlowArn }}',
- '{{ Protocol }}',
+SELECT
+'{{ flow_arn }}',
+ '{{ protocol }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -422,25 +422,25 @@ INSERT INTO awscc.mediaconnect.flow_outputs (
  NdiSpeedHqQuality,
  region
 )
-SELECT 
- '{{ FlowArn }}',
- '{{ CidrAllowList }}',
- '{{ Encryption }}',
- '{{ Description }}',
- '{{ Destination }}',
- '{{ MaxLatency }}',
- '{{ MinLatency }}',
- '{{ Name }}',
- '{{ Port }}',
- '{{ Protocol }}',
- '{{ RemoteId }}',
- '{{ SmoothingLatency }}',
- '{{ StreamId }}',
- '{{ VpcInterfaceAttachment }}',
- '{{ MediaStreamOutputConfigurations }}',
- '{{ OutputStatus }}',
- '{{ NdiProgramName }}',
- '{{ NdiSpeedHqQuality }}',
+SELECT
+ '{{ flow_arn }}',
+ '{{ cidr_allow_list }}',
+ '{{ encryption }}',
+ '{{ description }}',
+ '{{ destination }}',
+ '{{ max_latency }}',
+ '{{ min_latency }}',
+ '{{ name }}',
+ '{{ port }}',
+ '{{ protocol }}',
+ '{{ remote_id }}',
+ '{{ smoothing_latency }}',
+ '{{ stream_id }}',
+ '{{ vpc_interface_attachment }}',
+ '{{ media_stream_output_configurations }}',
+ '{{ output_status }}',
+ '{{ ndi_program_name }}',
+ '{{ ndi_speed_hq_quality }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -458,64 +458,63 @@ globals:
 resources:
   - name: flow_output
     props:
-      - name: FlowArn
-        value: '{{ FlowArn }}'
-      - name: CidrAllowList
+      - name: flow_arn
+        value: '{{ flow_arn }}'
+      - name: cidr_allow_list
         value:
-          - '{{ CidrAllowList[0] }}'
-      - name: Encryption
+          - '{{ cidr_allow_list[0] }}'
+      - name: encryption
         value:
-          Algorithm: '{{ Algorithm }}'
-          ConstantInitializationVector: '{{ ConstantInitializationVector }}'
-          DeviceId: '{{ DeviceId }}'
-          KeyType: '{{ KeyType }}'
-          Region: '{{ Region }}'
-          ResourceId: '{{ ResourceId }}'
-          RoleArn: '{{ RoleArn }}'
-          SecretArn: '{{ SecretArn }}'
-          Url: '{{ Url }}'
-      - name: Description
-        value: '{{ Description }}'
-      - name: Destination
-        value: '{{ Destination }}'
-      - name: MaxLatency
-        value: '{{ MaxLatency }}'
-      - name: MinLatency
-        value: '{{ MinLatency }}'
-      - name: Name
-        value: '{{ Name }}'
-      - name: Port
-        value: '{{ Port }}'
-      - name: Protocol
-        value: '{{ Protocol }}'
-      - name: RemoteId
-        value: '{{ RemoteId }}'
-      - name: SmoothingLatency
-        value: '{{ SmoothingLatency }}'
-      - name: StreamId
-        value: '{{ StreamId }}'
-      - name: VpcInterfaceAttachment
+          algorithm: '{{ algorithm }}'
+          constant_initialization_vector: '{{ constant_initialization_vector }}'
+          device_id: '{{ device_id }}'
+          key_type: '{{ key_type }}'
+          region: '{{ region }}'
+          resource_id: '{{ resource_id }}'
+          role_arn: '{{ role_arn }}'
+          secret_arn: '{{ secret_arn }}'
+          url: '{{ url }}'
+      - name: description
+        value: '{{ description }}'
+      - name: destination
+        value: '{{ destination }}'
+      - name: max_latency
+        value: '{{ max_latency }}'
+      - name: min_latency
+        value: '{{ min_latency }}'
+      - name: name
+        value: '{{ name }}'
+      - name: port
+        value: '{{ port }}'
+      - name: protocol
+        value: '{{ protocol }}'
+      - name: remote_id
+        value: '{{ remote_id }}'
+      - name: smoothing_latency
+        value: '{{ smoothing_latency }}'
+      - name: stream_id
+        value: '{{ stream_id }}'
+      - name: vpc_interface_attachment
         value:
-          VpcInterfaceName: '{{ VpcInterfaceName }}'
-      - name: MediaStreamOutputConfigurations
+          vpc_interface_name: '{{ vpc_interface_name }}'
+      - name: media_stream_output_configurations
         value:
-          - EncodingName: '{{ EncodingName }}'
-            DestinationConfigurations:
-              - DestinationIp: '{{ DestinationIp }}'
-                DestinationPort: '{{ DestinationPort }}'
-                Interface:
-                  Name: '{{ Name }}'
-            MediaStreamName: '{{ MediaStreamName }}'
-            EncodingParameters:
-              CompressionFactor: null
-              EncoderProfile: '{{ EncoderProfile }}'
-      - name: OutputStatus
-        value: '{{ OutputStatus }}'
-      - name: NdiProgramName
-        value: '{{ NdiProgramName }}'
-      - name: NdiSpeedHqQuality
-        value: '{{ NdiSpeedHqQuality }}'
-
+          - encoding_name: '{{ encoding_name }}'
+            destination_configurations:
+              - destination_ip: '{{ destination_ip }}'
+                destination_port: '{{ destination_port }}'
+                interface:
+                  name: '{{ name }}'
+            media_stream_name: '{{ media_stream_name }}'
+            encoding_parameters:
+              compression_factor: null
+              encoder_profile: '{{ encoder_profile }}'
+      - name: output_status
+        value: '{{ output_status }}'
+      - name: ndi_program_name
+        value: '{{ ndi_program_name }}'
+      - name: ndi_speed_hq_quality
+        value: '{{ ndi_speed_hq_quality }}'
 ```
 </TabItem>
 </Tabs>
@@ -547,7 +546,7 @@ SET PatchDocument = string('{{ {
     "NdiSpeedHqQuality": ndi_speed_hq_quality
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<OutputArn>';
+AND Identifier = '{{ output_arn }}';
 ```
 
 
@@ -556,7 +555,7 @@ AND Identifier = '<OutputArn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.mediaconnect.flow_outputs
-WHERE Identifier = '<OutputArn>'
+WHERE Identifier = '{{ output_arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/mediaconnect/flow_sources/index.md b/website/docs/services/mediaconnect/flow_sources/index.md
index b15a3b831..ca23b9ec5 100644
--- a/website/docs/services/mediaconnect/flow_sources/index.md
+++ b/website/docs/services/mediaconnect/flow_sources/index.md
@@ -320,7 +320,7 @@ source_listener_port,
 vpc_interface_name,
 whitelist_cidr
 FROM awscc.mediaconnect.flow_sources
-WHERE region = 'us-east-1' AND Identifier = '<SourceArn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ source_arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -357,9 +357,9 @@ INSERT INTO awscc.mediaconnect.flow_sources (
  Name,
  region
 )
-SELECT 
-'{{ Description }}',
- '{{ Name }}',
+SELECT
+'{{ description }}',
+ '{{ name }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -388,25 +388,25 @@ INSERT INTO awscc.mediaconnect.flow_sources (
  WhitelistCidr,
  region
 )
-SELECT 
- '{{ FlowArn }}',
- '{{ Decryption }}',
- '{{ Description }}',
- '{{ EntitlementArn }}',
- '{{ GatewayBridgeSource }}',
- '{{ IngestPort }}',
- '{{ MaxBitrate }}',
- '{{ MaxLatency }}',
- '{{ MinLatency }}',
- '{{ Name }}',
- '{{ Protocol }}',
- '{{ SenderIpAddress }}',
- '{{ SenderControlPort }}',
- '{{ StreamId }}',
- '{{ SourceListenerAddress }}',
- '{{ SourceListenerPort }}',
- '{{ VpcInterfaceName }}',
- '{{ WhitelistCidr }}',
+SELECT
+ '{{ flow_arn }}',
+ '{{ decryption }}',
+ '{{ description }}',
+ '{{ entitlement_arn }}',
+ '{{ gateway_bridge_source }}',
+ '{{ ingest_port }}',
+ '{{ max_bitrate }}',
+ '{{ max_latency }}',
+ '{{ min_latency }}',
+ '{{ name }}',
+ '{{ protocol }}',
+ '{{ sender_ip_address }}',
+ '{{ sender_control_port }}',
+ '{{ stream_id }}',
+ '{{ source_listener_address }}',
+ '{{ source_listener_port }}',
+ '{{ vpc_interface_name }}',
+ '{{ whitelist_cidr }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -424,55 +424,54 @@ globals:
 resources:
   - name: flow_source
     props:
-      - name: FlowArn
-        value: '{{ FlowArn }}'
-      - name: Decryption
+      - name: flow_arn
+        value: '{{ flow_arn }}'
+      - name: decryption
         value:
-          Algorithm: '{{ Algorithm }}'
-          ConstantInitializationVector: '{{ ConstantInitializationVector }}'
-          DeviceId: '{{ DeviceId }}'
-          KeyType: '{{ KeyType }}'
-          Region: '{{ Region }}'
-          ResourceId: '{{ ResourceId }}'
-          RoleArn: '{{ RoleArn }}'
-          SecretArn: '{{ SecretArn }}'
-          Url: '{{ Url }}'
-      - name: Description
-        value: '{{ Description }}'
-      - name: EntitlementArn
-        value: '{{ EntitlementArn }}'
-      - name: GatewayBridgeSource
+          algorithm: '{{ algorithm }}'
+          constant_initialization_vector: '{{ constant_initialization_vector }}'
+          device_id: '{{ device_id }}'
+          key_type: '{{ key_type }}'
+          region: '{{ region }}'
+          resource_id: '{{ resource_id }}'
+          role_arn: '{{ role_arn }}'
+          secret_arn: '{{ secret_arn }}'
+          url: '{{ url }}'
+      - name: description
+        value: '{{ description }}'
+      - name: entitlement_arn
+        value: '{{ entitlement_arn }}'
+      - name: gateway_bridge_source
         value:
-          BridgeArn: '{{ BridgeArn }}'
-          VpcInterfaceAttachment:
-            VpcInterfaceName: '{{ VpcInterfaceName }}'
-      - name: IngestPort
-        value: '{{ IngestPort }}'
-      - name: MaxBitrate
-        value: '{{ MaxBitrate }}'
-      - name: MaxLatency
-        value: '{{ MaxLatency }}'
-      - name: MinLatency
-        value: '{{ MinLatency }}'
-      - name: Name
-        value: '{{ Name }}'
-      - name: Protocol
-        value: '{{ Protocol }}'
-      - name: SenderIpAddress
-        value: '{{ SenderIpAddress }}'
-      - name: SenderControlPort
-        value: '{{ SenderControlPort }}'
-      - name: StreamId
-        value: '{{ StreamId }}'
-      - name: SourceListenerAddress
-        value: '{{ SourceListenerAddress }}'
-      - name: SourceListenerPort
-        value: '{{ SourceListenerPort }}'
-      - name: VpcInterfaceName
-        value: '{{ VpcInterfaceName }}'
-      - name: WhitelistCidr
-        value: '{{ WhitelistCidr }}'
-
+          bridge_arn: '{{ bridge_arn }}'
+          vpc_interface_attachment:
+            vpc_interface_name: '{{ vpc_interface_name }}'
+      - name: ingest_port
+        value: '{{ ingest_port }}'
+      - name: max_bitrate
+        value: '{{ max_bitrate }}'
+      - name: max_latency
+        value: '{{ max_latency }}'
+      - name: min_latency
+        value: '{{ min_latency }}'
+      - name: name
+        value: '{{ name }}'
+      - name: protocol
+        value: '{{ protocol }}'
+      - name: sender_ip_address
+        value: '{{ sender_ip_address }}'
+      - name: sender_control_port
+        value: '{{ sender_control_port }}'
+      - name: stream_id
+        value: '{{ stream_id }}'
+      - name: source_listener_address
+        value: '{{ source_listener_address }}'
+      - name: source_listener_port
+        value: '{{ source_listener_port }}'
+      - name: vpc_interface_name
+        value: '{{ vpc_interface_name }}'
+      - name: whitelist_cidr
+        value: '{{ whitelist_cidr }}'
 ```
 </TabItem>
 </Tabs>
@@ -504,7 +503,7 @@ SET PatchDocument = string('{{ {
     "WhitelistCidr": whitelist_cidr
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<SourceArn>';
+AND Identifier = '{{ source_arn }}';
 ```
 
 
@@ -513,7 +512,7 @@ AND Identifier = '<SourceArn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.mediaconnect.flow_sources
-WHERE Identifier = '<SourceArn>'
+WHERE Identifier = '{{ source_arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/mediaconnect/flow_vpc_interfaces/index.md b/website/docs/services/mediaconnect/flow_vpc_interfaces/index.md
index 1fb132771..8b390a455 100644
--- a/website/docs/services/mediaconnect/flow_vpc_interfaces/index.md
+++ b/website/docs/services/mediaconnect/flow_vpc_interfaces/index.md
@@ -169,7 +169,7 @@ security_group_ids,
 subnet_id,
 network_interface_ids
 FROM awscc.mediaconnect.flow_vpc_interfaces
-WHERE region = 'us-east-1' AND Identifier = '<FlowArn>|<Name>';
+WHERE region = 'us-east-1' AND Identifier = '{{ flow_arn }}|{{ name }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -210,12 +210,12 @@ INSERT INTO awscc.mediaconnect.flow_vpc_interfaces (
  SubnetId,
  region
 )
-SELECT 
-'{{ FlowArn }}',
- '{{ Name }}',
- '{{ RoleArn }}',
- '{{ SecurityGroupIds }}',
- '{{ SubnetId }}',
+SELECT
+'{{ flow_arn }}',
+ '{{ name }}',
+ '{{ role_arn }}',
+ '{{ security_group_ids }}',
+ '{{ subnet_id }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -231,12 +231,12 @@ INSERT INTO awscc.mediaconnect.flow_vpc_interfaces (
  SubnetId,
  region
 )
-SELECT 
- '{{ FlowArn }}',
- '{{ Name }}',
- '{{ RoleArn }}',
- '{{ SecurityGroupIds }}',
- '{{ SubnetId }}',
+SELECT
+ '{{ flow_arn }}',
+ '{{ name }}',
+ '{{ role_arn }}',
+ '{{ security_group_ids }}',
+ '{{ subnet_id }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -254,18 +254,17 @@ globals:
 resources:
   - name: flow_vpc_interface
     props:
-      - name: FlowArn
-        value: '{{ FlowArn }}'
-      - name: Name
-        value: '{{ Name }}'
-      - name: RoleArn
-        value: '{{ RoleArn }}'
-      - name: SecurityGroupIds
+      - name: flow_arn
+        value: '{{ flow_arn }}'
+      - name: name
+        value: '{{ name }}'
+      - name: role_arn
+        value: '{{ role_arn }}'
+      - name: security_group_ids
         value:
-          - '{{ SecurityGroupIds[0] }}'
-      - name: SubnetId
-        value: '{{ SubnetId }}'
-
+          - '{{ security_group_ids[0] }}'
+      - name: subnet_id
+        value: '{{ subnet_id }}'
 ```
 </TabItem>
 </Tabs>
@@ -283,7 +282,7 @@ SET PatchDocument = string('{{ {
     "SubnetId": subnet_id
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<FlowArn>|<Name>';
+AND Identifier = '{{ flow_arn }}|{{ name }}';
 ```
 
 
@@ -292,7 +291,7 @@ AND Identifier = '<FlowArn>|<Name>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.mediaconnect.flow_vpc_interfaces
-WHERE Identifier = '<FlowArn|Name>'
+WHERE Identifier = '{{ flow_arn }}|{{ name }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/mediaconnect/flows/index.md b/website/docs/services/mediaconnect/flows/index.md
index 1e3e97b58..26b06be18 100644
--- a/website/docs/services/mediaconnect/flows/index.md
+++ b/website/docs/services/mediaconnect/flows/index.md
@@ -694,7 +694,7 @@ flow_size,
 ndi_config,
 flow_ndi_machine_name
 FROM awscc.mediaconnect.flows
-WHERE region = 'us-east-1' AND Identifier = '<FlowArn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ flow_arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -731,9 +731,9 @@ INSERT INTO awscc.mediaconnect.flows (
  Source,
  region
 )
-SELECT 
-'{{ Name }}',
- '{{ Source }}',
+SELECT
+'{{ name }}',
+ '{{ source }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -754,17 +754,17 @@ INSERT INTO awscc.mediaconnect.flows (
  NdiConfig,
  region
 )
-SELECT 
- '{{ Name }}',
- '{{ AvailabilityZone }}',
- '{{ Source }}',
- '{{ SourceFailoverConfig }}',
- '{{ VpcInterfaces }}',
- '{{ MediaStreams }}',
- '{{ Maintenance }}',
- '{{ SourceMonitoringConfig }}',
- '{{ FlowSize }}',
- '{{ NdiConfig }}',
+SELECT
+ '{{ name }}',
+ '{{ availability_zone }}',
+ '{{ source }}',
+ '{{ source_failover_config }}',
+ '{{ vpc_interfaces }}',
+ '{{ media_streams }}',
+ '{{ maintenance }}',
+ '{{ source_monitoring_config }}',
+ '{{ flow_size }}',
+ '{{ ndi_config }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -782,118 +782,117 @@ globals:
 resources:
   - name: flow
     props:
-      - name: Name
-        value: '{{ Name }}'
-      - name: AvailabilityZone
-        value: '{{ AvailabilityZone }}'
-      - name: Source
+      - name: name
+        value: '{{ name }}'
+      - name: availability_zone
+        value: '{{ availability_zone }}'
+      - name: source
         value:
-          SourceArn: '{{ SourceArn }}'
-          Decryption:
-            Algorithm: '{{ Algorithm }}'
-            ConstantInitializationVector: '{{ ConstantInitializationVector }}'
-            DeviceId: '{{ DeviceId }}'
-            KeyType: '{{ KeyType }}'
-            Region: '{{ Region }}'
-            ResourceId: '{{ ResourceId }}'
-            RoleArn: '{{ RoleArn }}'
-            SecretArn: '{{ SecretArn }}'
-            Url: '{{ Url }}'
-          Description: '{{ Description }}'
-          EntitlementArn: '{{ EntitlementArn }}'
-          GatewayBridgeSource:
-            BridgeArn: '{{ BridgeArn }}'
-            VpcInterfaceAttachment:
-              VpcInterfaceName: '{{ VpcInterfaceName }}'
-          IngestIp: '{{ IngestIp }}'
-          IngestPort: '{{ IngestPort }}'
-          MaxBitrate: '{{ MaxBitrate }}'
-          MaxLatency: '{{ MaxLatency }}'
-          MinLatency: '{{ MinLatency }}'
-          Name: '{{ Name }}'
-          Protocol: '{{ Protocol }}'
-          SenderIpAddress: '{{ SenderIpAddress }}'
-          SenderControlPort: '{{ SenderControlPort }}'
-          StreamId: '{{ StreamId }}'
-          SourceIngestPort: '{{ SourceIngestPort }}'
-          SourceListenerAddress: '{{ SourceListenerAddress }}'
-          SourceListenerPort: '{{ SourceListenerPort }}'
-          VpcInterfaceName: '{{ VpcInterfaceName }}'
-          WhitelistCidr: '{{ WhitelistCidr }}'
-          MaxSyncBuffer: '{{ MaxSyncBuffer }}'
-          MediaStreamSourceConfigurations:
-            - EncodingName: '{{ EncodingName }}'
-              InputConfigurations:
-                - InputPort: '{{ InputPort }}'
-                  Interface:
-                    Name: '{{ Name }}'
-              MediaStreamName: '{{ MediaStreamName }}'
-      - name: SourceFailoverConfig
+          source_arn: '{{ source_arn }}'
+          decryption:
+            algorithm: '{{ algorithm }}'
+            constant_initialization_vector: '{{ constant_initialization_vector }}'
+            device_id: '{{ device_id }}'
+            key_type: '{{ key_type }}'
+            region: '{{ region }}'
+            resource_id: '{{ resource_id }}'
+            role_arn: '{{ role_arn }}'
+            secret_arn: '{{ secret_arn }}'
+            url: '{{ url }}'
+          description: '{{ description }}'
+          entitlement_arn: '{{ entitlement_arn }}'
+          gateway_bridge_source:
+            bridge_arn: '{{ bridge_arn }}'
+            vpc_interface_attachment:
+              vpc_interface_name: '{{ vpc_interface_name }}'
+          ingest_ip: '{{ ingest_ip }}'
+          ingest_port: '{{ ingest_port }}'
+          max_bitrate: '{{ max_bitrate }}'
+          max_latency: '{{ max_latency }}'
+          min_latency: '{{ min_latency }}'
+          name: '{{ name }}'
+          protocol: '{{ protocol }}'
+          sender_ip_address: '{{ sender_ip_address }}'
+          sender_control_port: '{{ sender_control_port }}'
+          stream_id: '{{ stream_id }}'
+          source_ingest_port: '{{ source_ingest_port }}'
+          source_listener_address: '{{ source_listener_address }}'
+          source_listener_port: '{{ source_listener_port }}'
+          vpc_interface_name: '{{ vpc_interface_name }}'
+          whitelist_cidr: '{{ whitelist_cidr }}'
+          max_sync_buffer: '{{ max_sync_buffer }}'
+          media_stream_source_configurations:
+            - encoding_name: '{{ encoding_name }}'
+              input_configurations:
+                - input_port: '{{ input_port }}'
+                  interface:
+                    name: '{{ name }}'
+              media_stream_name: '{{ media_stream_name }}'
+      - name: source_failover_config
         value:
-          State: '{{ State }}'
-          RecoveryWindow: '{{ RecoveryWindow }}'
-          FailoverMode: '{{ FailoverMode }}'
-          SourcePriority:
-            PrimarySource: '{{ PrimarySource }}'
-      - name: VpcInterfaces
+          state: '{{ state }}'
+          recovery_window: '{{ recovery_window }}'
+          failover_mode: '{{ failover_mode }}'
+          source_priority:
+            primary_source: '{{ primary_source }}'
+      - name: vpc_interfaces
         value:
-          - Name: '{{ Name }}'
-            NetworkInterfaceType: '{{ NetworkInterfaceType }}'
-            RoleArn: '{{ RoleArn }}'
-            SecurityGroupIds:
-              - '{{ SecurityGroupIds[0] }}'
-            SubnetId: '{{ SubnetId }}'
-            NetworkInterfaceIds:
-              - '{{ NetworkInterfaceIds[0] }}'
-      - name: MediaStreams
+          - name: '{{ name }}'
+            network_interface_type: '{{ network_interface_type }}'
+            role_arn: '{{ role_arn }}'
+            security_group_ids:
+              - '{{ security_group_ids[0] }}'
+            subnet_id: '{{ subnet_id }}'
+            network_interface_ids:
+              - '{{ network_interface_ids[0] }}'
+      - name: media_streams
         value:
-          - MediaStreamId: '{{ MediaStreamId }}'
-            MediaStreamType: '{{ MediaStreamType }}'
-            VideoFormat: '{{ VideoFormat }}'
-            MediaStreamName: '{{ MediaStreamName }}'
-            Description: '{{ Description }}'
-            Attributes:
-              Fmtp:
-                ExactFramerate: '{{ ExactFramerate }}'
-                Colorimetry: '{{ Colorimetry }}'
-                ScanMode: '{{ ScanMode }}'
-                Tcs: '{{ Tcs }}'
-                Range: '{{ Range }}'
-                Par: '{{ Par }}'
-                ChannelOrder: '{{ ChannelOrder }}'
-              Lang: '{{ Lang }}'
-            ClockRate: '{{ ClockRate }}'
-            Fmt: '{{ Fmt }}'
-      - name: Maintenance
+          - media_stream_id: '{{ media_stream_id }}'
+            media_stream_type: '{{ media_stream_type }}'
+            video_format: '{{ video_format }}'
+            media_stream_name: '{{ media_stream_name }}'
+            description: '{{ description }}'
+            attributes:
+              fmtp:
+                exact_framerate: '{{ exact_framerate }}'
+                colorimetry: '{{ colorimetry }}'
+                scan_mode: '{{ scan_mode }}'
+                tcs: '{{ tcs }}'
+                range: '{{ range }}'
+                par: '{{ par }}'
+                channel_order: '{{ channel_order }}'
+              lang: '{{ lang }}'
+            clock_rate: '{{ clock_rate }}'
+            fmt: '{{ fmt }}'
+      - name: maintenance
         value:
-          MaintenanceDay: '{{ MaintenanceDay }}'
-          MaintenanceStartHour: '{{ MaintenanceStartHour }}'
-      - name: SourceMonitoringConfig
+          maintenance_day: '{{ maintenance_day }}'
+          maintenance_start_hour: '{{ maintenance_start_hour }}'
+      - name: source_monitoring_config
         value:
-          ThumbnailState: '{{ ThumbnailState }}'
-          ContentQualityAnalysisState: '{{ ContentQualityAnalysisState }}'
-          AudioMonitoringSettings:
-            - SilentAudio:
-                State: '{{ State }}'
-                ThresholdSeconds: '{{ ThresholdSeconds }}'
-          VideoMonitoringSettings:
-            - BlackFrames:
-                State: '{{ State }}'
-                ThresholdSeconds: '{{ ThresholdSeconds }}'
-              FrozenFrames:
-                State: '{{ State }}'
-                ThresholdSeconds: '{{ ThresholdSeconds }}'
-      - name: FlowSize
-        value: '{{ FlowSize }}'
-      - name: NdiConfig
+          thumbnail_state: '{{ thumbnail_state }}'
+          content_quality_analysis_state: '{{ content_quality_analysis_state }}'
+          audio_monitoring_settings:
+            - silent_audio:
+                state: '{{ state }}'
+                threshold_seconds: '{{ threshold_seconds }}'
+          video_monitoring_settings:
+            - black_frames:
+                state: '{{ state }}'
+                threshold_seconds: '{{ threshold_seconds }}'
+              frozen_frames:
+                state: '{{ state }}'
+                threshold_seconds: '{{ threshold_seconds }}'
+      - name: flow_size
+        value: '{{ flow_size }}'
+      - name: ndi_config
         value:
-          NdiDiscoveryServers:
-            - VpcInterfaceAdapter: '{{ VpcInterfaceAdapter }}'
-              DiscoveryServerAddress: '{{ DiscoveryServerAddress }}'
-              DiscoveryServerPort: '{{ DiscoveryServerPort }}'
-          NdiState: '{{ NdiState }}'
-          MachineName: '{{ MachineName }}'
-
+          ndi_discovery_servers:
+            - vpc_interface_adapter: '{{ vpc_interface_adapter }}'
+              discovery_server_address: '{{ discovery_server_address }}'
+              discovery_server_port: '{{ discovery_server_port }}'
+          ndi_state: '{{ ndi_state }}'
+          machine_name: '{{ machine_name }}'
 ```
 </TabItem>
 </Tabs>
@@ -913,7 +912,7 @@ SET PatchDocument = string('{{ {
     "NdiConfig": ndi_config
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<FlowArn>';
+AND Identifier = '{{ flow_arn }}';
 ```
 
 
@@ -922,7 +921,7 @@ AND Identifier = '<FlowArn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.mediaconnect.flows
-WHERE Identifier = '<FlowArn>'
+WHERE Identifier = '{{ flow_arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/mediaconnect/gateways/index.md b/website/docs/services/mediaconnect/gateways/index.md
index 9e9d466c9..8311eca56 100644
--- a/website/docs/services/mediaconnect/gateways/index.md
+++ b/website/docs/services/mediaconnect/gateways/index.md
@@ -164,7 +164,7 @@ gateway_state,
 egress_cidr_blocks,
 networks
 FROM awscc.mediaconnect.gateways
-WHERE region = 'us-east-1' AND Identifier = '<GatewayArn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ gateway_arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -202,10 +202,10 @@ INSERT INTO awscc.mediaconnect.gateways (
  Networks,
  region
 )
-SELECT 
-'{{ Name }}',
- '{{ EgressCidrBlocks }}',
- '{{ Networks }}',
+SELECT
+'{{ name }}',
+ '{{ egress_cidr_blocks }}',
+ '{{ networks }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -219,10 +219,10 @@ INSERT INTO awscc.mediaconnect.gateways (
  Networks,
  region
 )
-SELECT 
- '{{ Name }}',
- '{{ EgressCidrBlocks }}',
- '{{ Networks }}',
+SELECT
+ '{{ name }}',
+ '{{ egress_cidr_blocks }}',
+ '{{ networks }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -240,16 +240,15 @@ globals:
 resources:
   - name: gateway
     props:
-      - name: Name
-        value: '{{ Name }}'
-      - name: EgressCidrBlocks
+      - name: name
+        value: '{{ name }}'
+      - name: egress_cidr_blocks
         value:
-          - '{{ EgressCidrBlocks[0] }}'
-      - name: Networks
+          - '{{ egress_cidr_blocks[0] }}'
+      - name: networks
         value:
-          - Name: '{{ Name }}'
-            CidrBlock: '{{ CidrBlock }}'
-
+          - name: '{{ name }}'
+            cidr_block: '{{ cidr_block }}'
 ```
 </TabItem>
 </Tabs>
@@ -260,7 +259,7 @@ resources:
 ```sql
 /*+ delete */
 DELETE FROM awscc.mediaconnect.gateways
-WHERE Identifier = '<GatewayArn>'
+WHERE Identifier = '{{ gateway_arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/medialive/channel_placement_groups/index.md b/website/docs/services/medialive/channel_placement_groups/index.md
index ec8d4b77e..855dfa772 100644
--- a/website/docs/services/medialive/channel_placement_groups/index.md
+++ b/website/docs/services/medialive/channel_placement_groups/index.md
@@ -193,7 +193,7 @@ nodes,
 state,
 tags
 FROM awscc.medialive.channel_placement_groups
-WHERE region = 'us-east-1' AND Identifier = '<Id>|<ClusterId>';
+WHERE region = 'us-east-1' AND Identifier = '{{ id }}|{{ cluster_id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -233,11 +233,11 @@ INSERT INTO awscc.medialive.channel_placement_groups (
  Tags,
  region
 )
-SELECT 
-'{{ ClusterId }}',
- '{{ Name }}',
- '{{ Nodes }}',
- '{{ Tags }}',
+SELECT
+'{{ cluster_id }}',
+ '{{ name }}',
+ '{{ nodes }}',
+ '{{ tags }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -252,11 +252,11 @@ INSERT INTO awscc.medialive.channel_placement_groups (
  Tags,
  region
 )
-SELECT 
- '{{ ClusterId }}',
- '{{ Name }}',
- '{{ Nodes }}',
- '{{ Tags }}',
+SELECT
+ '{{ cluster_id }}',
+ '{{ name }}',
+ '{{ nodes }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -274,18 +274,17 @@ globals:
 resources:
   - name: channel_placement_group
     props:
-      - name: ClusterId
-        value: '{{ ClusterId }}'
-      - name: Name
-        value: '{{ Name }}'
-      - name: Nodes
+      - name: cluster_id
+        value: '{{ cluster_id }}'
+      - name: name
+        value: '{{ name }}'
+      - name: nodes
         value:
-          - '{{ Nodes[0] }}'
-      - name: Tags
+          - '{{ nodes[0] }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -303,7 +302,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Id>|<ClusterId>';
+AND Identifier = '{{ id }}|{{ cluster_id }}';
 ```
 
 
@@ -312,7 +311,7 @@ AND Identifier = '<Id>|<ClusterId>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.medialive.channel_placement_groups
-WHERE Identifier = '<Id|ClusterId>'
+WHERE Identifier = '{{ id }}|{{ cluster_id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/medialive/cloud_watch_alarm_template_groups/index.md b/website/docs/services/medialive/cloud_watch_alarm_template_groups/index.md
index d971754a8..ccf743ea8 100644
--- a/website/docs/services/medialive/cloud_watch_alarm_template_groups/index.md
+++ b/website/docs/services/medialive/cloud_watch_alarm_template_groups/index.md
@@ -181,7 +181,7 @@ modified_at,
 name,
 tags
 FROM awscc.medialive.cloud_watch_alarm_template_groups
-WHERE region = 'us-east-1' AND Identifier = '<Identifier>';
+WHERE region = 'us-east-1' AND Identifier = '{{ identifier }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -217,8 +217,8 @@ INSERT INTO awscc.medialive.cloud_watch_alarm_template_groups (
  Name,
  region
 )
-SELECT 
-'{{ Name }}',
+SELECT
+'{{ name }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -232,10 +232,10 @@ INSERT INTO awscc.medialive.cloud_watch_alarm_template_groups (
  Tags,
  region
 )
-SELECT 
- '{{ Description }}',
- '{{ Name }}',
- '{{ Tags }}',
+SELECT
+ '{{ description }}',
+ '{{ name }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -253,13 +253,12 @@ globals:
 resources:
   - name: cloud_watch_alarm_template_group
     props:
-      - name: Description
-        value: '{{ Description }}'
-      - name: Name
-        value: '{{ Name }}'
-      - name: Tags
+      - name: description
+        value: '{{ description }}'
+      - name: name
+        value: '{{ name }}'
+      - name: tags
         value: {}
-
 ```
 </TabItem>
 </Tabs>
@@ -275,7 +274,7 @@ SET PatchDocument = string('{{ {
     "Description": description
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Identifier>';
+AND Identifier = '{{ identifier }}';
 ```
 
 
@@ -284,7 +283,7 @@ AND Identifier = '<Identifier>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.medialive.cloud_watch_alarm_template_groups
-WHERE Identifier = '<Identifier>'
+WHERE Identifier = '{{ identifier }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/medialive/cloud_watch_alarm_templates/index.md b/website/docs/services/medialive/cloud_watch_alarm_templates/index.md
index e139d3620..9e4940d0e 100644
--- a/website/docs/services/medialive/cloud_watch_alarm_templates/index.md
+++ b/website/docs/services/medialive/cloud_watch_alarm_templates/index.md
@@ -247,7 +247,7 @@ target_resource_type,
 threshold,
 treat_missing_data
 FROM awscc.medialive.cloud_watch_alarm_templates
-WHERE region = 'us-east-1' AND Identifier = '<Identifier>';
+WHERE region = 'us-east-1' AND Identifier = '{{ identifier }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -291,16 +291,16 @@ INSERT INTO awscc.medialive.cloud_watch_alarm_templates (
  TreatMissingData,
  region
 )
-SELECT 
-'{{ ComparisonOperator }}',
- '{{ EvaluationPeriods }}',
- '{{ MetricName }}',
- '{{ Name }}',
- '{{ Period }}',
- '{{ Statistic }}',
- '{{ TargetResourceType }}',
- '{{ Threshold }}',
- '{{ TreatMissingData }}',
+SELECT
+'{{ comparison_operator }}',
+ '{{ evaluation_periods }}',
+ '{{ metric_name }}',
+ '{{ name }}',
+ '{{ period }}',
+ '{{ statistic }}',
+ '{{ target_resource_type }}',
+ '{{ threshold }}',
+ '{{ treat_missing_data }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -324,20 +324,20 @@ INSERT INTO awscc.medialive.cloud_watch_alarm_templates (
  TreatMissingData,
  region
 )
-SELECT 
- '{{ ComparisonOperator }}',
- '{{ DatapointsToAlarm }}',
- '{{ Description }}',
- '{{ EvaluationPeriods }}',
- '{{ GroupIdentifier }}',
- '{{ MetricName }}',
- '{{ Name }}',
- '{{ Period }}',
- '{{ Statistic }}',
- '{{ Tags }}',
- '{{ TargetResourceType }}',
- '{{ Threshold }}',
- '{{ TreatMissingData }}',
+SELECT
+ '{{ comparison_operator }}',
+ '{{ datapoints_to_alarm }}',
+ '{{ description }}',
+ '{{ evaluation_periods }}',
+ '{{ group_identifier }}',
+ '{{ metric_name }}',
+ '{{ name }}',
+ '{{ period }}',
+ '{{ statistic }}',
+ '{{ tags }}',
+ '{{ target_resource_type }}',
+ '{{ threshold }}',
+ '{{ treat_missing_data }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -355,33 +355,32 @@ globals:
 resources:
   - name: cloud_watch_alarm_template
     props:
-      - name: ComparisonOperator
-        value: '{{ ComparisonOperator }}'
-      - name: DatapointsToAlarm
+      - name: comparison_operator
+        value: '{{ comparison_operator }}'
+      - name: datapoints_to_alarm
         value: null
-      - name: Description
-        value: '{{ Description }}'
-      - name: EvaluationPeriods
+      - name: description
+        value: '{{ description }}'
+      - name: evaluation_periods
         value: null
-      - name: GroupIdentifier
-        value: '{{ GroupIdentifier }}'
-      - name: MetricName
-        value: '{{ MetricName }}'
-      - name: Name
-        value: '{{ Name }}'
-      - name: Period
+      - name: group_identifier
+        value: '{{ group_identifier }}'
+      - name: metric_name
+        value: '{{ metric_name }}'
+      - name: name
+        value: '{{ name }}'
+      - name: period
         value: null
-      - name: Statistic
-        value: '{{ Statistic }}'
-      - name: Tags
+      - name: statistic
+        value: '{{ statistic }}'
+      - name: tags
         value: {}
-      - name: TargetResourceType
-        value: '{{ TargetResourceType }}'
-      - name: Threshold
+      - name: target_resource_type
+        value: '{{ target_resource_type }}'
+      - name: threshold
         value: null
-      - name: TreatMissingData
-        value: '{{ TreatMissingData }}'
-
+      - name: treat_missing_data
+        value: '{{ treat_missing_data }}'
 ```
 </TabItem>
 </Tabs>
@@ -408,7 +407,7 @@ SET PatchDocument = string('{{ {
     "TreatMissingData": treat_missing_data
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Identifier>';
+AND Identifier = '{{ identifier }}';
 ```
 
 
@@ -417,7 +416,7 @@ AND Identifier = '<Identifier>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.medialive.cloud_watch_alarm_templates
-WHERE Identifier = '<Identifier>'
+WHERE Identifier = '{{ identifier }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/medialive/clusters/index.md b/website/docs/services/medialive/clusters/index.md
index 8f8fb88e0..14fe284f1 100644
--- a/website/docs/services/medialive/clusters/index.md
+++ b/website/docs/services/medialive/clusters/index.md
@@ -218,7 +218,7 @@ network_settings,
 state,
 tags
 FROM awscc.medialive.clusters
-WHERE region = 'us-east-1' AND Identifier = '<Id>';
+WHERE region = 'us-east-1' AND Identifier = '{{ id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -258,12 +258,12 @@ INSERT INTO awscc.medialive.clusters (
  Tags,
  region
 )
-SELECT 
-'{{ ClusterType }}',
- '{{ InstanceRoleArn }}',
- '{{ Name }}',
- '{{ NetworkSettings }}',
- '{{ Tags }}',
+SELECT
+'{{ cluster_type }}',
+ '{{ instance_role_arn }}',
+ '{{ name }}',
+ '{{ network_settings }}',
+ '{{ tags }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -279,12 +279,12 @@ INSERT INTO awscc.medialive.clusters (
  Tags,
  region
 )
-SELECT 
- '{{ ClusterType }}',
- '{{ InstanceRoleArn }}',
- '{{ Name }}',
- '{{ NetworkSettings }}',
- '{{ Tags }}',
+SELECT
+ '{{ cluster_type }}',
+ '{{ instance_role_arn }}',
+ '{{ name }}',
+ '{{ network_settings }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -302,23 +302,22 @@ globals:
 resources:
   - name: cluster
     props:
-      - name: ClusterType
-        value: '{{ ClusterType }}'
-      - name: InstanceRoleArn
-        value: '{{ InstanceRoleArn }}'
-      - name: Name
-        value: '{{ Name }}'
-      - name: NetworkSettings
+      - name: cluster_type
+        value: '{{ cluster_type }}'
+      - name: instance_role_arn
+        value: '{{ instance_role_arn }}'
+      - name: name
+        value: '{{ name }}'
+      - name: network_settings
         value:
-          DefaultRoute: '{{ DefaultRoute }}'
-          InterfaceMappings:
-            - LogicalInterfaceName: '{{ LogicalInterfaceName }}'
-              NetworkId: '{{ NetworkId }}'
-      - name: Tags
+          default_route: '{{ default_route }}'
+          interface_mappings:
+            - logical_interface_name: '{{ logical_interface_name }}'
+              network_id: '{{ network_id }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -336,7 +335,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Id>';
+AND Identifier = '{{ id }}';
 ```
 
 
@@ -345,7 +344,7 @@ AND Identifier = '<Id>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.medialive.clusters
-WHERE Identifier = '<Id>'
+WHERE Identifier = '{{ id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/medialive/event_bridge_rule_template_groups/index.md b/website/docs/services/medialive/event_bridge_rule_template_groups/index.md
index 594e304ac..03675126f 100644
--- a/website/docs/services/medialive/event_bridge_rule_template_groups/index.md
+++ b/website/docs/services/medialive/event_bridge_rule_template_groups/index.md
@@ -181,7 +181,7 @@ modified_at,
 name,
 tags
 FROM awscc.medialive.event_bridge_rule_template_groups
-WHERE region = 'us-east-1' AND Identifier = '<Identifier>';
+WHERE region = 'us-east-1' AND Identifier = '{{ identifier }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -217,8 +217,8 @@ INSERT INTO awscc.medialive.event_bridge_rule_template_groups (
  Name,
  region
 )
-SELECT 
-'{{ Name }}',
+SELECT
+'{{ name }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -232,10 +232,10 @@ INSERT INTO awscc.medialive.event_bridge_rule_template_groups (
  Tags,
  region
 )
-SELECT 
- '{{ Description }}',
- '{{ Name }}',
- '{{ Tags }}',
+SELECT
+ '{{ description }}',
+ '{{ name }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -253,13 +253,12 @@ globals:
 resources:
   - name: event_bridge_rule_template_group
     props:
-      - name: Description
-        value: '{{ Description }}'
-      - name: Name
-        value: '{{ Name }}'
-      - name: Tags
+      - name: description
+        value: '{{ description }}'
+      - name: name
+        value: '{{ name }}'
+      - name: tags
         value: {}
-
 ```
 </TabItem>
 </Tabs>
@@ -275,7 +274,7 @@ SET PatchDocument = string('{{ {
     "Description": description
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Identifier>';
+AND Identifier = '{{ identifier }}';
 ```
 
 
@@ -284,7 +283,7 @@ AND Identifier = '<Identifier>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.medialive.event_bridge_rule_template_groups
-WHERE Identifier = '<Identifier>'
+WHERE Identifier = '{{ identifier }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/medialive/event_bridge_rule_templates/index.md b/website/docs/services/medialive/event_bridge_rule_templates/index.md
index 939adbe97..68496006a 100644
--- a/website/docs/services/medialive/event_bridge_rule_templates/index.md
+++ b/website/docs/services/medialive/event_bridge_rule_templates/index.md
@@ -212,7 +212,7 @@ modified_at,
 name,
 tags
 FROM awscc.medialive.event_bridge_rule_templates
-WHERE region = 'us-east-1' AND Identifier = '<Identifier>';
+WHERE region = 'us-east-1' AND Identifier = '{{ identifier }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -249,9 +249,9 @@ INSERT INTO awscc.medialive.event_bridge_rule_templates (
  Name,
  region
 )
-SELECT 
-'{{ EventType }}',
- '{{ Name }}',
+SELECT
+'{{ event_type }}',
+ '{{ name }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -268,13 +268,13 @@ INSERT INTO awscc.medialive.event_bridge_rule_templates (
  Tags,
  region
 )
-SELECT 
- '{{ Description }}',
- '{{ EventTargets }}',
- '{{ EventType }}',
- '{{ GroupIdentifier }}',
- '{{ Name }}',
- '{{ Tags }}',
+SELECT
+ '{{ description }}',
+ '{{ event_targets }}',
+ '{{ event_type }}',
+ '{{ group_identifier }}',
+ '{{ name }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -292,20 +292,19 @@ globals:
 resources:
   - name: event_bridge_rule_template
     props:
-      - name: Description
-        value: '{{ Description }}'
-      - name: EventTargets
+      - name: description
+        value: '{{ description }}'
+      - name: event_targets
         value:
-          - Arn: '{{ Arn }}'
-      - name: EventType
-        value: '{{ EventType }}'
-      - name: GroupIdentifier
-        value: '{{ GroupIdentifier }}'
-      - name: Name
-        value: '{{ Name }}'
-      - name: Tags
+          - arn: '{{ arn }}'
+      - name: event_type
+        value: '{{ event_type }}'
+      - name: group_identifier
+        value: '{{ group_identifier }}'
+      - name: name
+        value: '{{ name }}'
+      - name: tags
         value: {}
-
 ```
 </TabItem>
 </Tabs>
@@ -325,7 +324,7 @@ SET PatchDocument = string('{{ {
     "Name": name
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Identifier>';
+AND Identifier = '{{ identifier }}';
 ```
 
 
@@ -334,7 +333,7 @@ AND Identifier = '<Identifier>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.medialive.event_bridge_rule_templates
-WHERE Identifier = '<Identifier>'
+WHERE Identifier = '{{ identifier }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/medialive/multiplexes/index.md b/website/docs/services/medialive/multiplexes/index.md
index 36e3b3160..83de92746 100644
--- a/website/docs/services/medialive/multiplexes/index.md
+++ b/website/docs/services/medialive/multiplexes/index.md
@@ -229,7 +229,7 @@ program_count,
 state,
 tags
 FROM awscc.medialive.multiplexes
-WHERE region = 'us-east-1' AND Identifier = '<Id>';
+WHERE region = 'us-east-1' AND Identifier = '{{ id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -267,10 +267,10 @@ INSERT INTO awscc.medialive.multiplexes (
  Name,
  region
 )
-SELECT 
-'{{ AvailabilityZones }}',
- '{{ MultiplexSettings }}',
- '{{ Name }}',
+SELECT
+'{{ availability_zones }}',
+ '{{ multiplex_settings }}',
+ '{{ name }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -286,12 +286,12 @@ INSERT INTO awscc.medialive.multiplexes (
  Tags,
  region
 )
-SELECT 
- '{{ AvailabilityZones }}',
- '{{ Destinations }}',
- '{{ MultiplexSettings }}',
- '{{ Name }}',
- '{{ Tags }}',
+SELECT
+ '{{ availability_zones }}',
+ '{{ destinations }}',
+ '{{ multiplex_settings }}',
+ '{{ name }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -309,25 +309,24 @@ globals:
 resources:
   - name: multiplex
     props:
-      - name: AvailabilityZones
+      - name: availability_zones
         value:
-          - '{{ AvailabilityZones[0] }}'
-      - name: Destinations
+          - '{{ availability_zones[0] }}'
+      - name: destinations
         value:
-          - MultiplexMediaConnectOutputDestinationSettings: null
-      - name: MultiplexSettings
+          - multiplex_media_connect_output_destination_settings: null
+      - name: multiplex_settings
         value:
-          MaximumVideoBufferDelayMilliseconds: '{{ MaximumVideoBufferDelayMilliseconds }}'
-          TransportStreamBitrate: '{{ TransportStreamBitrate }}'
-          TransportStreamId: '{{ TransportStreamId }}'
-          TransportStreamReservedBitrate: '{{ TransportStreamReservedBitrate }}'
-      - name: Name
-        value: '{{ Name }}'
-      - name: Tags
+          maximum_video_buffer_delay_milliseconds: '{{ maximum_video_buffer_delay_milliseconds }}'
+          transport_stream_bitrate: '{{ transport_stream_bitrate }}'
+          transport_stream_id: '{{ transport_stream_id }}'
+          transport_stream_reserved_bitrate: '{{ transport_stream_reserved_bitrate }}'
+      - name: name
+        value: '{{ name }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -346,7 +345,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Id>';
+AND Identifier = '{{ id }}';
 ```
 
 
@@ -355,7 +354,7 @@ AND Identifier = '<Id>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.medialive.multiplexes
-WHERE Identifier = '<Id>'
+WHERE Identifier = '{{ id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/medialive/multiplexprograms/index.md b/website/docs/services/medialive/multiplexprograms/index.md
index 939ebd8e9..c387cbb66 100644
--- a/website/docs/services/medialive/multiplexprograms/index.md
+++ b/website/docs/services/medialive/multiplexprograms/index.md
@@ -288,7 +288,7 @@ packet_identifiers_map,
 pipeline_details,
 program_name
 FROM awscc.medialive.multiplexprograms
-WHERE region = 'us-east-1' AND Identifier = '<ProgramName>|<MultiplexId>';
+WHERE region = 'us-east-1' AND Identifier = '{{ program_name }}|{{ multiplex_id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -330,13 +330,13 @@ INSERT INTO awscc.medialive.multiplexprograms (
  ProgramName,
  region
 )
-SELECT 
-'{{ MultiplexId }}',
- '{{ MultiplexProgramSettings }}',
- '{{ PreferredChannelPipeline }}',
- '{{ PacketIdentifiersMap }}',
- '{{ PipelineDetails }}',
- '{{ ProgramName }}',
+SELECT
+'{{ multiplex_id }}',
+ '{{ multiplex_program_settings }}',
+ '{{ preferred_channel_pipeline }}',
+ '{{ packet_identifiers_map }}',
+ '{{ pipeline_details }}',
+ '{{ program_name }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -353,13 +353,13 @@ INSERT INTO awscc.medialive.multiplexprograms (
  ProgramName,
  region
 )
-SELECT 
- '{{ MultiplexId }}',
- '{{ MultiplexProgramSettings }}',
- '{{ PreferredChannelPipeline }}',
- '{{ PacketIdentifiersMap }}',
- '{{ PipelineDetails }}',
- '{{ ProgramName }}',
+SELECT
+ '{{ multiplex_id }}',
+ '{{ multiplex_program_settings }}',
+ '{{ preferred_channel_pipeline }}',
+ '{{ packet_identifiers_map }}',
+ '{{ pipeline_details }}',
+ '{{ program_name }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -377,44 +377,43 @@ globals:
 resources:
   - name: multiplexprogram
     props:
-      - name: MultiplexId
-        value: '{{ MultiplexId }}'
-      - name: MultiplexProgramSettings
+      - name: multiplex_id
+        value: '{{ multiplex_id }}'
+      - name: multiplex_program_settings
         value:
-          PreferredChannelPipeline: '{{ PreferredChannelPipeline }}'
-          ProgramNumber: '{{ ProgramNumber }}'
-          ServiceDescriptor:
-            ProviderName: '{{ ProviderName }}'
-            ServiceName: '{{ ServiceName }}'
-          VideoSettings: {}
-      - name: PreferredChannelPipeline
+          preferred_channel_pipeline: '{{ preferred_channel_pipeline }}'
+          program_number: '{{ program_number }}'
+          service_descriptor:
+            provider_name: '{{ provider_name }}'
+            service_name: '{{ service_name }}'
+          video_settings: {}
+      - name: preferred_channel_pipeline
         value: null
-      - name: PacketIdentifiersMap
+      - name: packet_identifiers_map
         value:
-          AudioPids:
-            - '{{ AudioPids[0] }}'
-          DvbSubPids:
-            - '{{ DvbSubPids[0] }}'
-          DvbTeletextPid: '{{ DvbTeletextPid }}'
-          EtvPlatformPid: '{{ EtvPlatformPid }}'
-          EtvSignalPid: '{{ EtvSignalPid }}'
-          KlvDataPids:
-            - '{{ KlvDataPids[0] }}'
-          PcrPid: '{{ PcrPid }}'
-          PmtPid: '{{ PmtPid }}'
-          PrivateMetadataPid: '{{ PrivateMetadataPid }}'
-          Scte27Pids:
-            - '{{ Scte27Pids[0] }}'
-          Scte35Pid: '{{ Scte35Pid }}'
-          TimedMetadataPid: '{{ TimedMetadataPid }}'
-          VideoPid: '{{ VideoPid }}'
-      - name: PipelineDetails
+          audio_pids:
+            - '{{ audio_pids[0] }}'
+          dvb_sub_pids:
+            - '{{ dvb_sub_pids[0] }}'
+          dvb_teletext_pid: '{{ dvb_teletext_pid }}'
+          etv_platform_pid: '{{ etv_platform_pid }}'
+          etv_signal_pid: '{{ etv_signal_pid }}'
+          klv_data_pids:
+            - '{{ klv_data_pids[0] }}'
+          pcr_pid: '{{ pcr_pid }}'
+          pmt_pid: '{{ pmt_pid }}'
+          private_metadata_pid: '{{ private_metadata_pid }}'
+          scte27_pids:
+            - '{{ scte27_pids[0] }}'
+          scte35_pid: '{{ scte35_pid }}'
+          timed_metadata_pid: '{{ timed_metadata_pid }}'
+          video_pid: '{{ video_pid }}'
+      - name: pipeline_details
         value:
-          - ActiveChannelPipeline: '{{ ActiveChannelPipeline }}'
-            PipelineId: '{{ PipelineId }}'
-      - name: ProgramName
-        value: '{{ ProgramName }}'
-
+          - active_channel_pipeline: '{{ active_channel_pipeline }}'
+            pipeline_id: '{{ pipeline_id }}'
+      - name: program_name
+        value: '{{ program_name }}'
 ```
 </TabItem>
 </Tabs>
@@ -433,7 +432,7 @@ SET PatchDocument = string('{{ {
     "PipelineDetails": pipeline_details
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<ProgramName>|<MultiplexId>';
+AND Identifier = '{{ program_name }}|{{ multiplex_id }}';
 ```
 
 
@@ -442,7 +441,7 @@ AND Identifier = '<ProgramName>|<MultiplexId>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.medialive.multiplexprograms
-WHERE Identifier = '<ProgramName|MultiplexId>'
+WHERE Identifier = '{{ program_name }}|{{ multiplex_id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/medialive/networks/index.md b/website/docs/services/medialive/networks/index.md
index 287d910c4..afc09125f 100644
--- a/website/docs/services/medialive/networks/index.md
+++ b/website/docs/services/medialive/networks/index.md
@@ -207,7 +207,7 @@ routes,
 state,
 tags
 FROM awscc.medialive.networks
-WHERE region = 'us-east-1' AND Identifier = '<Id>';
+WHERE region = 'us-east-1' AND Identifier = '{{ id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -244,9 +244,9 @@ INSERT INTO awscc.medialive.networks (
  Name,
  region
 )
-SELECT 
-'{{ IpPools }}',
- '{{ Name }}',
+SELECT
+'{{ ip_pools }}',
+ '{{ name }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -261,11 +261,11 @@ INSERT INTO awscc.medialive.networks (
  Tags,
  region
 )
-SELECT 
- '{{ IpPools }}',
- '{{ Name }}',
- '{{ Routes }}',
- '{{ Tags }}',
+SELECT
+ '{{ ip_pools }}',
+ '{{ name }}',
+ '{{ routes }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -283,20 +283,19 @@ globals:
 resources:
   - name: network
     props:
-      - name: IpPools
+      - name: ip_pools
         value:
-          - Cidr: '{{ Cidr }}'
-      - name: Name
-        value: '{{ Name }}'
-      - name: Routes
+          - cidr: '{{ cidr }}'
+      - name: name
+        value: '{{ name }}'
+      - name: routes
         value:
-          - Cidr: '{{ Cidr }}'
-            Gateway: '{{ Gateway }}'
-      - name: Tags
+          - cidr: '{{ cidr }}'
+            gateway: '{{ gateway }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -315,7 +314,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Id>';
+AND Identifier = '{{ id }}';
 ```
 
 
@@ -324,7 +323,7 @@ AND Identifier = '<Id>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.medialive.networks
-WHERE Identifier = '<Id>'
+WHERE Identifier = '{{ id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/medialive/sdi_sources/index.md b/website/docs/services/medialive/sdi_sources/index.md
index f1826835b..83367cda2 100644
--- a/website/docs/services/medialive/sdi_sources/index.md
+++ b/website/docs/services/medialive/sdi_sources/index.md
@@ -188,7 +188,7 @@ type,
 inputs,
 tags
 FROM awscc.medialive.sdi_sources
-WHERE region = 'us-east-1' AND Identifier = '<Id>';
+WHERE region = 'us-east-1' AND Identifier = '{{ id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -225,9 +225,9 @@ INSERT INTO awscc.medialive.sdi_sources (
  Type,
  region
 )
-SELECT 
-'{{ Name }}',
- '{{ Type }}',
+SELECT
+'{{ name }}',
+ '{{ type }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -242,11 +242,11 @@ INSERT INTO awscc.medialive.sdi_sources (
  Tags,
  region
 )
-SELECT 
- '{{ Mode }}',
- '{{ Name }}',
- '{{ Type }}',
- '{{ Tags }}',
+SELECT
+ '{{ mode }}',
+ '{{ name }}',
+ '{{ type }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -264,17 +264,16 @@ globals:
 resources:
   - name: sdi_source
     props:
-      - name: Mode
-        value: '{{ Mode }}'
-      - name: Name
-        value: '{{ Name }}'
-      - name: Type
-        value: '{{ Type }}'
-      - name: Tags
+      - name: mode
+        value: '{{ mode }}'
+      - name: name
+        value: '{{ name }}'
+      - name: type
+        value: '{{ type }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -293,7 +292,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Id>';
+AND Identifier = '{{ id }}';
 ```
 
 
@@ -302,7 +301,7 @@ AND Identifier = '<Id>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.medialive.sdi_sources
-WHERE Identifier = '<Id>'
+WHERE Identifier = '{{ id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/medialive/signal_maps/index.md b/website/docs/services/medialive/signal_maps/index.md
index e5a936b80..fbbad96af 100644
--- a/website/docs/services/medialive/signal_maps/index.md
+++ b/website/docs/services/medialive/signal_maps/index.md
@@ -294,7 +294,7 @@ name,
 status,
 tags
 FROM awscc.medialive.signal_maps
-WHERE region = 'us-east-1' AND Identifier = '<Identifier>';
+WHERE region = 'us-east-1' AND Identifier = '{{ identifier }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -331,9 +331,9 @@ INSERT INTO awscc.medialive.signal_maps (
  Name,
  region
 )
-SELECT 
-'{{ DiscoveryEntryPointArn }}',
- '{{ Name }}',
+SELECT
+'{{ discovery_entry_point_arn }}',
+ '{{ name }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -351,14 +351,14 @@ INSERT INTO awscc.medialive.signal_maps (
  Tags,
  region
 )
-SELECT 
- '{{ CloudWatchAlarmTemplateGroupIdentifiers }}',
- '{{ Description }}',
- '{{ DiscoveryEntryPointArn }}',
- '{{ EventBridgeRuleTemplateGroupIdentifiers }}',
- '{{ ForceRediscovery }}',
- '{{ Name }}',
- '{{ Tags }}',
+SELECT
+ '{{ cloud_watch_alarm_template_group_identifiers }}',
+ '{{ description }}',
+ '{{ discovery_entry_point_arn }}',
+ '{{ event_bridge_rule_template_group_identifiers }}',
+ '{{ force_rediscovery }}',
+ '{{ name }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -376,23 +376,22 @@ globals:
 resources:
   - name: signal_map
     props:
-      - name: CloudWatchAlarmTemplateGroupIdentifiers
+      - name: cloud_watch_alarm_template_group_identifiers
         value:
-          - '{{ CloudWatchAlarmTemplateGroupIdentifiers[0] }}'
-      - name: Description
-        value: '{{ Description }}'
-      - name: DiscoveryEntryPointArn
-        value: '{{ DiscoveryEntryPointArn }}'
-      - name: EventBridgeRuleTemplateGroupIdentifiers
+          - '{{ cloud_watch_alarm_template_group_identifiers[0] }}'
+      - name: description
+        value: '{{ description }}'
+      - name: discovery_entry_point_arn
+        value: '{{ discovery_entry_point_arn }}'
+      - name: event_bridge_rule_template_group_identifiers
         value:
-          - '{{ EventBridgeRuleTemplateGroupIdentifiers[0] }}'
-      - name: ForceRediscovery
-        value: '{{ ForceRediscovery }}'
-      - name: Name
-        value: '{{ Name }}'
-      - name: Tags
+          - '{{ event_bridge_rule_template_group_identifiers[0] }}'
+      - name: force_rediscovery
+        value: '{{ force_rediscovery }}'
+      - name: name
+        value: '{{ name }}'
+      - name: tags
         value: {}
-
 ```
 </TabItem>
 </Tabs>
@@ -413,7 +412,7 @@ SET PatchDocument = string('{{ {
     "Name": name
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Identifier>';
+AND Identifier = '{{ identifier }}';
 ```
 
 
@@ -422,7 +421,7 @@ AND Identifier = '<Identifier>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.medialive.signal_maps
-WHERE Identifier = '<Identifier>'
+WHERE Identifier = '{{ identifier }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/mediapackage/assets/index.md b/website/docs/services/mediapackage/assets/index.md
index 8380be277..e9a2e1f5d 100644
--- a/website/docs/services/mediapackage/assets/index.md
+++ b/website/docs/services/mediapackage/assets/index.md
@@ -200,7 +200,7 @@ source_arn,
 source_role_arn,
 tags
 FROM awscc.mediapackage.assets
-WHERE region = 'us-east-1' AND Identifier = '<Id>';
+WHERE region = 'us-east-1' AND Identifier = '{{ id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -239,11 +239,11 @@ INSERT INTO awscc.mediapackage.assets (
  SourceRoleArn,
  region
 )
-SELECT 
-'{{ Id }}',
- '{{ PackagingGroupId }}',
- '{{ SourceArn }}',
- '{{ SourceRoleArn }}',
+SELECT
+'{{ id }}',
+ '{{ packaging_group_id }}',
+ '{{ source_arn }}',
+ '{{ source_role_arn }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -261,14 +261,14 @@ INSERT INTO awscc.mediapackage.assets (
  Tags,
  region
 )
-SELECT 
- '{{ EgressEndpoints }}',
- '{{ Id }}',
- '{{ PackagingGroupId }}',
- '{{ ResourceId }}',
- '{{ SourceArn }}',
- '{{ SourceRoleArn }}',
- '{{ Tags }}',
+SELECT
+ '{{ egress_endpoints }}',
+ '{{ id }}',
+ '{{ packaging_group_id }}',
+ '{{ resource_id }}',
+ '{{ source_arn }}',
+ '{{ source_role_arn }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -286,25 +286,24 @@ globals:
 resources:
   - name: asset
     props:
-      - name: EgressEndpoints
+      - name: egress_endpoints
         value:
-          - PackagingConfigurationId: '{{ PackagingConfigurationId }}'
-            Url: '{{ Url }}'
-      - name: Id
-        value: '{{ Id }}'
-      - name: PackagingGroupId
-        value: '{{ PackagingGroupId }}'
-      - name: ResourceId
-        value: '{{ ResourceId }}'
-      - name: SourceArn
-        value: '{{ SourceArn }}'
-      - name: SourceRoleArn
-        value: '{{ SourceRoleArn }}'
-      - name: Tags
+          - packaging_configuration_id: '{{ packaging_configuration_id }}'
+            url: '{{ url }}'
+      - name: id
+        value: '{{ id }}'
+      - name: packaging_group_id
+        value: '{{ packaging_group_id }}'
+      - name: resource_id
+        value: '{{ resource_id }}'
+      - name: source_arn
+        value: '{{ source_arn }}'
+      - name: source_role_arn
+        value: '{{ source_role_arn }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -315,7 +314,7 @@ resources:
 ```sql
 /*+ delete */
 DELETE FROM awscc.mediapackage.assets
-WHERE Identifier = '<Id>'
+WHERE Identifier = '{{ id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/mediapackage/channels/index.md b/website/docs/services/mediapackage/channels/index.md
index 780d70b88..8e2db5c01 100644
--- a/website/docs/services/mediapackage/channels/index.md
+++ b/website/docs/services/mediapackage/channels/index.md
@@ -213,7 +213,7 @@ tags,
 egress_access_logs,
 ingress_access_logs
 FROM awscc.mediapackage.channels
-WHERE region = 'us-east-1' AND Identifier = '<Id>';
+WHERE region = 'us-east-1' AND Identifier = '{{ id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -249,8 +249,8 @@ INSERT INTO awscc.mediapackage.channels (
  Id,
  region
 )
-SELECT 
-'{{ Id }}',
+SELECT
+'{{ id }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -267,13 +267,13 @@ INSERT INTO awscc.mediapackage.channels (
  IngressAccessLogs,
  region
 )
-SELECT 
- '{{ Id }}',
- '{{ Description }}',
- '{{ HlsIngest }}',
- '{{ Tags }}',
- '{{ EgressAccessLogs }}',
- '{{ IngressAccessLogs }}',
+SELECT
+ '{{ id }}',
+ '{{ description }}',
+ '{{ hls_ingest }}',
+ '{{ tags }}',
+ '{{ egress_access_logs }}',
+ '{{ ingress_access_logs }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -291,27 +291,26 @@ globals:
 resources:
   - name: channel
     props:
-      - name: Id
-        value: '{{ Id }}'
-      - name: Description
-        value: '{{ Description }}'
-      - name: HlsIngest
+      - name: id
+        value: '{{ id }}'
+      - name: description
+        value: '{{ description }}'
+      - name: hls_ingest
         value:
-          ingestEndpoints:
-            - Id: '{{ Id }}'
-              Username: '{{ Username }}'
-              Password: '{{ Password }}'
-              Url: '{{ Url }}'
-      - name: Tags
+          ingest_endpoints:
+            - id: '{{ id }}'
+              username: '{{ username }}'
+              password: '{{ password }}'
+              url: '{{ url }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-      - name: EgressAccessLogs
+          - key: '{{ key }}'
+            value: '{{ value }}'
+      - name: egress_access_logs
         value:
-          LogGroupName: '{{ LogGroupName }}'
-      - name: IngressAccessLogs
+          log_group_name: '{{ log_group_name }}'
+      - name: ingress_access_logs
         value: null
-
 ```
 </TabItem>
 </Tabs>
@@ -329,7 +328,7 @@ SET PatchDocument = string('{{ {
     "IngressAccessLogs": ingress_access_logs
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Id>';
+AND Identifier = '{{ id }}';
 ```
 
 
@@ -338,7 +337,7 @@ AND Identifier = '<Id>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.mediapackage.channels
-WHERE Identifier = '<Id>'
+WHERE Identifier = '{{ id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/mediapackage/origin_endpoints/index.md b/website/docs/services/mediapackage/origin_endpoints/index.md
index d2408aac0..fd58a61a0 100644
--- a/website/docs/services/mediapackage/origin_endpoints/index.md
+++ b/website/docs/services/mediapackage/origin_endpoints/index.md
@@ -653,7 +653,7 @@ mss_package,
 cmaf_package,
 tags
 FROM awscc.mediapackage.origin_endpoints
-WHERE region = 'us-east-1' AND Identifier = '<Id>';
+WHERE region = 'us-east-1' AND Identifier = '{{ id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -690,9 +690,9 @@ INSERT INTO awscc.mediapackage.origin_endpoints (
  ChannelId,
  region
 )
-SELECT 
-'{{ Id }}',
- '{{ ChannelId }}',
+SELECT
+'{{ id }}',
+ '{{ channel_id }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -717,21 +717,21 @@ INSERT INTO awscc.mediapackage.origin_endpoints (
  Tags,
  region
 )
-SELECT 
- '{{ Id }}',
- '{{ ChannelId }}',
- '{{ Description }}',
- '{{ Whitelist }}',
- '{{ StartoverWindowSeconds }}',
- '{{ TimeDelaySeconds }}',
- '{{ ManifestName }}',
- '{{ Origination }}',
- '{{ Authorization }}',
- '{{ HlsPackage }}',
- '{{ DashPackage }}',
- '{{ MssPackage }}',
- '{{ CmafPackage }}',
- '{{ Tags }}',
+SELECT
+ '{{ id }}',
+ '{{ channel_id }}',
+ '{{ description }}',
+ '{{ whitelist }}',
+ '{{ startover_window_seconds }}',
+ '{{ time_delay_seconds }}',
+ '{{ manifest_name }}',
+ '{{ origination }}',
+ '{{ authorization }}',
+ '{{ hls_package }}',
+ '{{ dash_package }}',
+ '{{ mss_package }}',
+ '{{ cmaf_package }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -749,91 +749,90 @@ globals:
 resources:
   - name: origin_endpoint
     props:
-      - name: Id
-        value: '{{ Id }}'
-      - name: ChannelId
-        value: '{{ ChannelId }}'
-      - name: Description
-        value: '{{ Description }}'
-      - name: Whitelist
+      - name: id
+        value: '{{ id }}'
+      - name: channel_id
+        value: '{{ channel_id }}'
+      - name: description
+        value: '{{ description }}'
+      - name: whitelist
         value:
-          - '{{ Whitelist[0] }}'
-      - name: StartoverWindowSeconds
-        value: '{{ StartoverWindowSeconds }}'
-      - name: TimeDelaySeconds
-        value: '{{ TimeDelaySeconds }}'
-      - name: ManifestName
-        value: '{{ ManifestName }}'
-      - name: Origination
-        value: '{{ Origination }}'
-      - name: Authorization
+          - '{{ whitelist[0] }}'
+      - name: startover_window_seconds
+        value: '{{ startover_window_seconds }}'
+      - name: time_delay_seconds
+        value: '{{ time_delay_seconds }}'
+      - name: manifest_name
+        value: '{{ manifest_name }}'
+      - name: origination
+        value: '{{ origination }}'
+      - name: authorization
         value:
-          CdnIdentifierSecret: '{{ CdnIdentifierSecret }}'
-          SecretsRoleArn: '{{ SecretsRoleArn }}'
-      - name: HlsPackage
+          cdn_identifier_secret: '{{ cdn_identifier_secret }}'
+          secrets_role_arn: '{{ secrets_role_arn }}'
+      - name: hls_package
         value:
-          Encryption:
-            ConstantInitializationVector: '{{ ConstantInitializationVector }}'
-            EncryptionMethod: '{{ EncryptionMethod }}'
-            SpekeKeyProvider:
-              EncryptionContractConfiguration:
-                PresetSpeke20Audio: '{{ PresetSpeke20Audio }}'
-                PresetSpeke20Video: '{{ PresetSpeke20Video }}'
-              RoleArn: '{{ RoleArn }}'
-              SystemIds:
-                - '{{ SystemIds[0] }}'
-              Url: '{{ Url }}'
-          HlsManifests:
-            - AdMarkers: '{{ AdMarkers }}'
-              IncludeIframeOnlyStream: '{{ IncludeIframeOnlyStream }}'
-              ManifestName: '{{ ManifestName }}'
-              ProgramDateTimeIntervalSeconds: '{{ ProgramDateTimeIntervalSeconds }}'
-              RepeatExtXKey: '{{ RepeatExtXKey }}'
-              StreamSelection:
-                MaxVideoBitsPerSecond: '{{ MaxVideoBitsPerSecond }}'
-                MinVideoBitsPerSecond: '{{ MinVideoBitsPerSecond }}'
-                StreamOrder: '{{ StreamOrder }}'
-          IncludeDvbSubtitles: '{{ IncludeDvbSubtitles }}'
-          SegmentDurationSeconds: '{{ SegmentDurationSeconds }}'
-          UseAudioRenditionGroup: '{{ UseAudioRenditionGroup }}'
-      - name: DashPackage
+          encryption:
+            constant_initialization_vector: '{{ constant_initialization_vector }}'
+            encryption_method: '{{ encryption_method }}'
+            speke_key_provider:
+              encryption_contract_configuration:
+                preset_speke20_audio: '{{ preset_speke20_audio }}'
+                preset_speke20_video: '{{ preset_speke20_video }}'
+              role_arn: '{{ role_arn }}'
+              system_ids:
+                - '{{ system_ids[0] }}'
+              url: '{{ url }}'
+          hls_manifests:
+            - ad_markers: '{{ ad_markers }}'
+              include_iframe_only_stream: '{{ include_iframe_only_stream }}'
+              manifest_name: '{{ manifest_name }}'
+              program_date_time_interval_seconds: '{{ program_date_time_interval_seconds }}'
+              repeat_ext_xkey: '{{ repeat_ext_xkey }}'
+              stream_selection:
+                max_video_bits_per_second: '{{ max_video_bits_per_second }}'
+                min_video_bits_per_second: '{{ min_video_bits_per_second }}'
+                stream_order: '{{ stream_order }}'
+          include_dvb_subtitles: '{{ include_dvb_subtitles }}'
+          segment_duration_seconds: '{{ segment_duration_seconds }}'
+          use_audio_rendition_group: '{{ use_audio_rendition_group }}'
+      - name: dash_package
         value:
-          DashManifests:
-            - ManifestLayout: '{{ ManifestLayout }}'
-              ManifestName: null
-              MinBufferTimeSeconds: '{{ MinBufferTimeSeconds }}'
-              Profile: '{{ Profile }}'
-              ScteMarkersSource: '{{ ScteMarkersSource }}'
-              StreamSelection: null
-          Encryption:
-            SpekeKeyProvider: null
-          PeriodTriggers:
-            - '{{ PeriodTriggers[0] }}'
-          SegmentDurationSeconds: null
-          SegmentTemplateFormat: '{{ SegmentTemplateFormat }}'
-          IncludeEncoderConfigurationInSegments: '{{ IncludeEncoderConfigurationInSegments }}'
-          IncludeIframeOnlyStream: '{{ IncludeIframeOnlyStream }}'
-      - name: MssPackage
+          dash_manifests:
+            - manifest_layout: '{{ manifest_layout }}'
+              manifest_name: null
+              min_buffer_time_seconds: '{{ min_buffer_time_seconds }}'
+              profile: '{{ profile }}'
+              scte_markers_source: '{{ scte_markers_source }}'
+              stream_selection: null
+          encryption:
+            speke_key_provider: null
+          period_triggers:
+            - '{{ period_triggers[0] }}'
+          segment_duration_seconds: null
+          segment_template_format: '{{ segment_template_format }}'
+          include_encoder_configuration_in_segments: '{{ include_encoder_configuration_in_segments }}'
+          include_iframe_only_stream: '{{ include_iframe_only_stream }}'
+      - name: mss_package
         value:
-          Encryption:
-            SpekeKeyProvider: null
-          MssManifests:
-            - ManifestName: null
-              StreamSelection: null
-          SegmentDurationSeconds: null
-      - name: CmafPackage
+          encryption:
+            speke_key_provider: null
+          mss_manifests:
+            - manifest_name: null
+              stream_selection: null
+          segment_duration_seconds: null
+      - name: cmaf_package
         value:
-          Encryption:
-            SpekeKeyProvider: null
-          HlsManifests:
+          encryption:
+            speke_key_provider: null
+          hls_manifests:
             - null
-          SegmentDurationSeconds: null
-          IncludeEncoderConfigurationInSegments: '{{ IncludeEncoderConfigurationInSegments }}'
-      - name: Tags
+          segment_duration_seconds: null
+          include_encoder_configuration_in_segments: '{{ include_encoder_configuration_in_segments }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -861,7 +860,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Id>';
+AND Identifier = '{{ id }}';
 ```
 
 
@@ -870,7 +869,7 @@ AND Identifier = '<Id>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.mediapackage.origin_endpoints
-WHERE Identifier = '<Id>'
+WHERE Identifier = '{{ id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/mediapackage/packaging_configurations/index.md b/website/docs/services/mediapackage/packaging_configurations/index.md
index cd4e49a37..92a106fce 100644
--- a/website/docs/services/mediapackage/packaging_configurations/index.md
+++ b/website/docs/services/mediapackage/packaging_configurations/index.md
@@ -587,7 +587,7 @@ hls_package,
 mss_package,
 tags
 FROM awscc.mediapackage.packaging_configurations
-WHERE region = 'us-east-1' AND Identifier = '<Id>';
+WHERE region = 'us-east-1' AND Identifier = '{{ id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -624,9 +624,9 @@ INSERT INTO awscc.mediapackage.packaging_configurations (
  PackagingGroupId,
  region
 )
-SELECT 
-'{{ Id }}',
- '{{ PackagingGroupId }}',
+SELECT
+'{{ id }}',
+ '{{ packaging_group_id }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -644,14 +644,14 @@ INSERT INTO awscc.mediapackage.packaging_configurations (
  Tags,
  region
 )
-SELECT 
- '{{ Id }}',
- '{{ PackagingGroupId }}',
- '{{ CmafPackage }}',
- '{{ DashPackage }}',
- '{{ HlsPackage }}',
- '{{ MssPackage }}',
- '{{ Tags }}',
+SELECT
+ '{{ id }}',
+ '{{ packaging_group_id }}',
+ '{{ cmaf_package }}',
+ '{{ dash_package }}',
+ '{{ hls_package }}',
+ '{{ mss_package }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -669,74 +669,73 @@ globals:
 resources:
   - name: packaging_configuration
     props:
-      - name: Id
-        value: '{{ Id }}'
-      - name: PackagingGroupId
-        value: '{{ PackagingGroupId }}'
-      - name: CmafPackage
+      - name: id
+        value: '{{ id }}'
+      - name: packaging_group_id
+        value: '{{ packaging_group_id }}'
+      - name: cmaf_package
         value:
-          Encryption:
-            SpekeKeyProvider:
-              EncryptionContractConfiguration:
-                PresetSpeke20Audio: '{{ PresetSpeke20Audio }}'
-                PresetSpeke20Video: '{{ PresetSpeke20Video }}'
-              RoleArn: '{{ RoleArn }}'
-              SystemIds:
-                - '{{ SystemIds[0] }}'
-              Url: '{{ Url }}'
-          HlsManifests:
-            - AdMarkers: '{{ AdMarkers }}'
-              IncludeIframeOnlyStream: '{{ IncludeIframeOnlyStream }}'
-              ManifestName: '{{ ManifestName }}'
-              ProgramDateTimeIntervalSeconds: '{{ ProgramDateTimeIntervalSeconds }}'
-              RepeatExtXKey: '{{ RepeatExtXKey }}'
-              StreamSelection:
-                MaxVideoBitsPerSecond: '{{ MaxVideoBitsPerSecond }}'
-                MinVideoBitsPerSecond: '{{ MinVideoBitsPerSecond }}'
-                StreamOrder: '{{ StreamOrder }}'
-          SegmentDurationSeconds: '{{ SegmentDurationSeconds }}'
-          IncludeEncoderConfigurationInSegments: '{{ IncludeEncoderConfigurationInSegments }}'
-      - name: DashPackage
+          encryption:
+            speke_key_provider:
+              encryption_contract_configuration:
+                preset_speke20_audio: '{{ preset_speke20_audio }}'
+                preset_speke20_video: '{{ preset_speke20_video }}'
+              role_arn: '{{ role_arn }}'
+              system_ids:
+                - '{{ system_ids[0] }}'
+              url: '{{ url }}'
+          hls_manifests:
+            - ad_markers: '{{ ad_markers }}'
+              include_iframe_only_stream: '{{ include_iframe_only_stream }}'
+              manifest_name: '{{ manifest_name }}'
+              program_date_time_interval_seconds: '{{ program_date_time_interval_seconds }}'
+              repeat_ext_xkey: '{{ repeat_ext_xkey }}'
+              stream_selection:
+                max_video_bits_per_second: '{{ max_video_bits_per_second }}'
+                min_video_bits_per_second: '{{ min_video_bits_per_second }}'
+                stream_order: '{{ stream_order }}'
+          segment_duration_seconds: '{{ segment_duration_seconds }}'
+          include_encoder_configuration_in_segments: '{{ include_encoder_configuration_in_segments }}'
+      - name: dash_package
         value:
-          DashManifests:
-            - ManifestLayout: '{{ ManifestLayout }}'
-              ManifestName: null
-              MinBufferTimeSeconds: '{{ MinBufferTimeSeconds }}'
-              Profile: '{{ Profile }}'
-              ScteMarkersSource: '{{ ScteMarkersSource }}'
-              StreamSelection: null
-          Encryption:
-            SpekeKeyProvider: null
-          PeriodTriggers:
-            - '{{ PeriodTriggers[0] }}'
-          SegmentDurationSeconds: null
-          SegmentTemplateFormat: '{{ SegmentTemplateFormat }}'
-          IncludeEncoderConfigurationInSegments: '{{ IncludeEncoderConfigurationInSegments }}'
-          IncludeIframeOnlyStream: '{{ IncludeIframeOnlyStream }}'
-      - name: HlsPackage
+          dash_manifests:
+            - manifest_layout: '{{ manifest_layout }}'
+              manifest_name: null
+              min_buffer_time_seconds: '{{ min_buffer_time_seconds }}'
+              profile: '{{ profile }}'
+              scte_markers_source: '{{ scte_markers_source }}'
+              stream_selection: null
+          encryption:
+            speke_key_provider: null
+          period_triggers:
+            - '{{ period_triggers[0] }}'
+          segment_duration_seconds: null
+          segment_template_format: '{{ segment_template_format }}'
+          include_encoder_configuration_in_segments: '{{ include_encoder_configuration_in_segments }}'
+          include_iframe_only_stream: '{{ include_iframe_only_stream }}'
+      - name: hls_package
         value:
-          Encryption:
-            ConstantInitializationVector: '{{ ConstantInitializationVector }}'
-            EncryptionMethod: '{{ EncryptionMethod }}'
-            SpekeKeyProvider: null
-          HlsManifests:
+          encryption:
+            constant_initialization_vector: '{{ constant_initialization_vector }}'
+            encryption_method: '{{ encryption_method }}'
+            speke_key_provider: null
+          hls_manifests:
             - null
-          IncludeDvbSubtitles: '{{ IncludeDvbSubtitles }}'
-          SegmentDurationSeconds: null
-          UseAudioRenditionGroup: '{{ UseAudioRenditionGroup }}'
-      - name: MssPackage
+          include_dvb_subtitles: '{{ include_dvb_subtitles }}'
+          segment_duration_seconds: null
+          use_audio_rendition_group: '{{ use_audio_rendition_group }}'
+      - name: mss_package
         value:
-          Encryption:
-            SpekeKeyProvider: null
-          MssManifests:
-            - ManifestName: null
-              StreamSelection: null
-          SegmentDurationSeconds: null
-      - name: Tags
+          encryption:
+            speke_key_provider: null
+          mss_manifests:
+            - manifest_name: null
+              stream_selection: null
+          segment_duration_seconds: null
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -747,7 +746,7 @@ resources:
 ```sql
 /*+ delete */
 DELETE FROM awscc.mediapackage.packaging_configurations
-WHERE Identifier = '<Id>'
+WHERE Identifier = '{{ id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/mediapackage/packaging_groups/index.md b/website/docs/services/mediapackage/packaging_groups/index.md
index eb458d665..cadf59644 100644
--- a/website/docs/services/mediapackage/packaging_groups/index.md
+++ b/website/docs/services/mediapackage/packaging_groups/index.md
@@ -195,7 +195,7 @@ authorization,
 tags,
 egress_access_logs
 FROM awscc.mediapackage.packaging_groups
-WHERE region = 'us-east-1' AND Identifier = '<Id>';
+WHERE region = 'us-east-1' AND Identifier = '{{ id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -231,8 +231,8 @@ INSERT INTO awscc.mediapackage.packaging_groups (
  Id,
  region
 )
-SELECT 
-'{{ Id }}',
+SELECT
+'{{ id }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -247,11 +247,11 @@ INSERT INTO awscc.mediapackage.packaging_groups (
  EgressAccessLogs,
  region
 )
-SELECT 
- '{{ Id }}',
- '{{ Authorization }}',
- '{{ Tags }}',
- '{{ EgressAccessLogs }}',
+SELECT
+ '{{ id }}',
+ '{{ authorization }}',
+ '{{ tags }}',
+ '{{ egress_access_logs }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -269,20 +269,19 @@ globals:
 resources:
   - name: packaging_group
     props:
-      - name: Id
-        value: '{{ Id }}'
-      - name: Authorization
+      - name: id
+        value: '{{ id }}'
+      - name: authorization
         value:
-          CdnIdentifierSecret: '{{ CdnIdentifierSecret }}'
-          SecretsRoleArn: '{{ SecretsRoleArn }}'
-      - name: Tags
+          cdn_identifier_secret: '{{ cdn_identifier_secret }}'
+          secrets_role_arn: '{{ secrets_role_arn }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-      - name: EgressAccessLogs
+          - key: '{{ key }}'
+            value: '{{ value }}'
+      - name: egress_access_logs
         value:
-          LogGroupName: '{{ LogGroupName }}'
-
+          log_group_name: '{{ log_group_name }}'
 ```
 </TabItem>
 </Tabs>
@@ -299,7 +298,7 @@ SET PatchDocument = string('{{ {
     "EgressAccessLogs": egress_access_logs
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Id>';
+AND Identifier = '{{ id }}';
 ```
 
 
@@ -308,7 +307,7 @@ AND Identifier = '<Id>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.mediapackage.packaging_groups
-WHERE Identifier = '<Id>'
+WHERE Identifier = '{{ id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/mediapackagev2/channel_groups/index.md b/website/docs/services/mediapackagev2/channel_groups/index.md
index 6d764f24c..72a2202e7 100644
--- a/website/docs/services/mediapackagev2/channel_groups/index.md
+++ b/website/docs/services/mediapackagev2/channel_groups/index.md
@@ -182,7 +182,7 @@ egress_domain,
 modified_at,
 tags
 FROM awscc.mediapackagev2.channel_groups
-WHERE region = 'us-east-1' AND Identifier = '<Arn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -218,8 +218,8 @@ INSERT INTO awscc.mediapackagev2.channel_groups (
  ChannelGroupName,
  region
 )
-SELECT 
-'{{ ChannelGroupName }}',
+SELECT
+'{{ channel_group_name }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -233,10 +233,10 @@ INSERT INTO awscc.mediapackagev2.channel_groups (
  Tags,
  region
 )
-SELECT 
- '{{ ChannelGroupName }}',
- '{{ Description }}',
- '{{ Tags }}',
+SELECT
+ '{{ channel_group_name }}',
+ '{{ description }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -254,15 +254,14 @@ globals:
 resources:
   - name: channel_group
     props:
-      - name: ChannelGroupName
-        value: '{{ ChannelGroupName }}'
-      - name: Description
-        value: '{{ Description }}'
-      - name: Tags
+      - name: channel_group_name
+        value: '{{ channel_group_name }}'
+      - name: description
+        value: '{{ description }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -279,7 +278,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Arn>';
+AND Identifier = '{{ arn }}';
 ```
 
 
@@ -288,7 +287,7 @@ AND Identifier = '<Arn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.mediapackagev2.channel_groups
-WHERE Identifier = '<Arn>'
+WHERE Identifier = '{{ arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/mediapackagev2/channel_policies/index.md b/website/docs/services/mediapackagev2/channel_policies/index.md
index ac5fae4fd..01645375b 100644
--- a/website/docs/services/mediapackagev2/channel_policies/index.md
+++ b/website/docs/services/mediapackagev2/channel_policies/index.md
@@ -100,7 +100,7 @@ channel_group_name,
 channel_name,
 policy
 FROM awscc.mediapackagev2.channel_policies
-WHERE region = 'us-east-1' AND Identifier = '<ChannelGroupName>|<ChannelName>';
+WHERE region = 'us-east-1' AND Identifier = '{{ channel_group_name }}|{{ channel_name }}';
 ```
 
 ## `INSERT` example
@@ -125,10 +125,10 @@ INSERT INTO awscc.mediapackagev2.channel_policies (
  Policy,
  region
 )
-SELECT 
-'{{ ChannelGroupName }}',
- '{{ ChannelName }}',
- '{{ Policy }}',
+SELECT
+'{{ channel_group_name }}',
+ '{{ channel_name }}',
+ '{{ policy }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -142,10 +142,10 @@ INSERT INTO awscc.mediapackagev2.channel_policies (
  Policy,
  region
 )
-SELECT 
- '{{ ChannelGroupName }}',
- '{{ ChannelName }}',
- '{{ Policy }}',
+SELECT
+ '{{ channel_group_name }}',
+ '{{ channel_name }}',
+ '{{ policy }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -163,13 +163,12 @@ globals:
 resources:
   - name: channel_policy
     props:
-      - name: ChannelGroupName
-        value: '{{ ChannelGroupName }}'
-      - name: ChannelName
-        value: '{{ ChannelName }}'
-      - name: Policy
+      - name: channel_group_name
+        value: '{{ channel_group_name }}'
+      - name: channel_name
+        value: '{{ channel_name }}'
+      - name: policy
         value: {}
-
 ```
 </TabItem>
 </Tabs>
@@ -185,7 +184,7 @@ SET PatchDocument = string('{{ {
     "Policy": policy
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<ChannelGroupName>|<ChannelName>';
+AND Identifier = '{{ channel_group_name }}|{{ channel_name }}';
 ```
 
 
@@ -194,7 +193,7 @@ AND Identifier = '<ChannelGroupName>|<ChannelName>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.mediapackagev2.channel_policies
-WHERE Identifier = '<ChannelGroupName|ChannelName>'
+WHERE Identifier = '{{ channel_group_name }}|{{ channel_name }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/mediapackagev2/channels/index.md b/website/docs/services/mediapackagev2/channels/index.md
index bec6485bc..9d60e5044 100644
--- a/website/docs/services/mediapackagev2/channels/index.md
+++ b/website/docs/services/mediapackagev2/channels/index.md
@@ -243,7 +243,7 @@ output_header_configuration,
 ingest_endpoint_urls,
 tags
 FROM awscc.mediapackagev2.channels
-WHERE region = 'us-east-1' AND Identifier = '<Arn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -280,9 +280,9 @@ INSERT INTO awscc.mediapackagev2.channels (
  ChannelName,
  region
 )
-SELECT 
-'{{ ChannelGroupName }}',
- '{{ ChannelName }}',
+SELECT
+'{{ channel_group_name }}',
+ '{{ channel_name }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -300,14 +300,14 @@ INSERT INTO awscc.mediapackagev2.channels (
  Tags,
  region
 )
-SELECT 
- '{{ ChannelGroupName }}',
- '{{ ChannelName }}',
- '{{ Description }}',
- '{{ InputSwitchConfiguration }}',
- '{{ InputType }}',
- '{{ OutputHeaderConfiguration }}',
- '{{ Tags }}',
+SELECT
+ '{{ channel_group_name }}',
+ '{{ channel_name }}',
+ '{{ description }}',
+ '{{ input_switch_configuration }}',
+ '{{ input_type }}',
+ '{{ output_header_configuration }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -325,26 +325,25 @@ globals:
 resources:
   - name: channel
     props:
-      - name: ChannelGroupName
-        value: '{{ ChannelGroupName }}'
-      - name: ChannelName
-        value: '{{ ChannelName }}'
-      - name: Description
-        value: '{{ Description }}'
-      - name: InputSwitchConfiguration
+      - name: channel_group_name
+        value: '{{ channel_group_name }}'
+      - name: channel_name
+        value: '{{ channel_name }}'
+      - name: description
+        value: '{{ description }}'
+      - name: input_switch_configuration
         value:
-          MQCSInputSwitching: '{{ MQCSInputSwitching }}'
-          PreferredInput: '{{ PreferredInput }}'
-      - name: InputType
-        value: '{{ InputType }}'
-      - name: OutputHeaderConfiguration
+          m_qc_sinput_switching: '{{ m_qc_sinput_switching }}'
+          preferred_input: '{{ preferred_input }}'
+      - name: input_type
+        value: '{{ input_type }}'
+      - name: output_header_configuration
         value:
-          PublishMQCS: '{{ PublishMQCS }}'
-      - name: Tags
+          publish_mq_cs: '{{ publish_mq_cs }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -363,7 +362,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Arn>';
+AND Identifier = '{{ arn }}';
 ```
 
 
@@ -372,7 +371,7 @@ AND Identifier = '<Arn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.mediapackagev2.channels
-WHERE Identifier = '<Arn>'
+WHERE Identifier = '{{ arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/mediapackagev2/origin_endpoint_policies/index.md b/website/docs/services/mediapackagev2/origin_endpoint_policies/index.md
index bd0653c4b..83de69e77 100644
--- a/website/docs/services/mediapackagev2/origin_endpoint_policies/index.md
+++ b/website/docs/services/mediapackagev2/origin_endpoint_policies/index.md
@@ -124,7 +124,7 @@ channel_name,
 origin_endpoint_name,
 policy
 FROM awscc.mediapackagev2.origin_endpoint_policies
-WHERE region = 'us-east-1' AND Identifier = '<ChannelGroupName>|<ChannelName>|<OriginEndpointName>';
+WHERE region = 'us-east-1' AND Identifier = '{{ channel_group_name }}|{{ channel_name }}|{{ origin_endpoint_name }}';
 ```
 
 ## `INSERT` example
@@ -150,11 +150,11 @@ INSERT INTO awscc.mediapackagev2.origin_endpoint_policies (
  Policy,
  region
 )
-SELECT 
-'{{ ChannelGroupName }}',
- '{{ ChannelName }}',
- '{{ OriginEndpointName }}',
- '{{ Policy }}',
+SELECT
+'{{ channel_group_name }}',
+ '{{ channel_name }}',
+ '{{ origin_endpoint_name }}',
+ '{{ policy }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -170,12 +170,12 @@ INSERT INTO awscc.mediapackagev2.origin_endpoint_policies (
  Policy,
  region
 )
-SELECT 
- '{{ CdnAuthConfiguration }}',
- '{{ ChannelGroupName }}',
- '{{ ChannelName }}',
- '{{ OriginEndpointName }}',
- '{{ Policy }}',
+SELECT
+ '{{ cdn_auth_configuration }}',
+ '{{ channel_group_name }}',
+ '{{ channel_name }}',
+ '{{ origin_endpoint_name }}',
+ '{{ policy }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -193,20 +193,19 @@ globals:
 resources:
   - name: origin_endpoint_policy
     props:
-      - name: CdnAuthConfiguration
+      - name: cdn_auth_configuration
         value:
-          CdnIdentifierSecretArns:
-            - '{{ CdnIdentifierSecretArns[0] }}'
-          SecretsRoleArn: '{{ SecretsRoleArn }}'
-      - name: ChannelGroupName
-        value: '{{ ChannelGroupName }}'
-      - name: ChannelName
-        value: '{{ ChannelName }}'
-      - name: OriginEndpointName
-        value: '{{ OriginEndpointName }}'
-      - name: Policy
+          cdn_identifier_secret_arns:
+            - '{{ cdn_identifier_secret_arns[0] }}'
+          secrets_role_arn: '{{ secrets_role_arn }}'
+      - name: channel_group_name
+        value: '{{ channel_group_name }}'
+      - name: channel_name
+        value: '{{ channel_name }}'
+      - name: origin_endpoint_name
+        value: '{{ origin_endpoint_name }}'
+      - name: policy
         value: {}
-
 ```
 </TabItem>
 </Tabs>
@@ -223,7 +222,7 @@ SET PatchDocument = string('{{ {
     "Policy": policy
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<ChannelGroupName>|<ChannelName>|<OriginEndpointName>';
+AND Identifier = '{{ channel_group_name }}|{{ channel_name }}|{{ origin_endpoint_name }}';
 ```
 
 
@@ -232,7 +231,7 @@ AND Identifier = '<ChannelGroupName>|<ChannelName>|<OriginEndpointName>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.mediapackagev2.origin_endpoint_policies
-WHERE Identifier = '<ChannelGroupName|ChannelName|OriginEndpointName>'
+WHERE Identifier = '{{ channel_group_name }}|{{ channel_name }}|{{ origin_endpoint_name }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/mediapackagev2/origin_endpoints/index.md b/website/docs/services/mediapackagev2/origin_endpoints/index.md
index 8d9e7dc07..e335fc7c9 100644
--- a/website/docs/services/mediapackagev2/origin_endpoints/index.md
+++ b/website/docs/services/mediapackagev2/origin_endpoints/index.md
@@ -788,7 +788,7 @@ hls_manifest_urls,
 low_latency_hls_manifest_urls,
 tags
 FROM awscc.mediapackagev2.origin_endpoints
-WHERE region = 'us-east-1' AND Identifier = '<Arn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -827,11 +827,11 @@ INSERT INTO awscc.mediapackagev2.origin_endpoints (
  OriginEndpointName,
  region
 )
-SELECT 
-'{{ ChannelGroupName }}',
- '{{ ChannelName }}',
- '{{ ContainerType }}',
- '{{ OriginEndpointName }}',
+SELECT
+'{{ channel_group_name }}',
+ '{{ channel_name }}',
+ '{{ container_type }}',
+ '{{ origin_endpoint_name }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -854,19 +854,19 @@ INSERT INTO awscc.mediapackagev2.origin_endpoints (
  Tags,
  region
 )
-SELECT 
- '{{ ChannelGroupName }}',
- '{{ ChannelName }}',
- '{{ ContainerType }}',
- '{{ DashManifests }}',
- '{{ Description }}',
- '{{ ForceEndpointErrorConfiguration }}',
- '{{ HlsManifests }}',
- '{{ LowLatencyHlsManifests }}',
- '{{ OriginEndpointName }}',
- '{{ Segment }}',
- '{{ StartoverWindowSeconds }}',
- '{{ Tags }}',
+SELECT
+ '{{ channel_group_name }}',
+ '{{ channel_name }}',
+ '{{ container_type }}',
+ '{{ dash_manifests }}',
+ '{{ description }}',
+ '{{ force_endpoint_error_configuration }}',
+ '{{ hls_manifests }}',
+ '{{ low_latency_hls_manifests }}',
+ '{{ origin_endpoint_name }}',
+ '{{ segment }}',
+ '{{ startover_window_seconds }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -884,125 +884,124 @@ globals:
 resources:
   - name: origin_endpoint
     props:
-      - name: ChannelGroupName
-        value: '{{ ChannelGroupName }}'
-      - name: ChannelName
-        value: '{{ ChannelName }}'
-      - name: ContainerType
-        value: '{{ ContainerType }}'
-      - name: DashManifests
+      - name: channel_group_name
+        value: '{{ channel_group_name }}'
+      - name: channel_name
+        value: '{{ channel_name }}'
+      - name: container_type
+        value: '{{ container_type }}'
+      - name: dash_manifests
         value:
-          - ManifestName: '{{ ManifestName }}'
-            ManifestWindowSeconds: '{{ ManifestWindowSeconds }}'
-            FilterConfiguration:
-              ManifestFilter: '{{ ManifestFilter }}'
-              Start: '{{ Start }}'
-              End: '{{ End }}'
-              TimeDelaySeconds: '{{ TimeDelaySeconds }}'
-              ClipStartTime: '{{ ClipStartTime }}'
-            MinUpdatePeriodSeconds: '{{ MinUpdatePeriodSeconds }}'
-            MinBufferTimeSeconds: '{{ MinBufferTimeSeconds }}'
-            SuggestedPresentationDelaySeconds: '{{ SuggestedPresentationDelaySeconds }}'
-            SegmentTemplateFormat: '{{ SegmentTemplateFormat }}'
-            PeriodTriggers:
-              - '{{ PeriodTriggers[0] }}'
-            ScteDash:
-              AdMarkerDash: '{{ AdMarkerDash }}'
-            DrmSignaling: '{{ DrmSignaling }}'
-            UtcTiming:
-              TimingMode: '{{ TimingMode }}'
-              TimingSource: '{{ TimingSource }}'
-            Profiles:
-              - '{{ Profiles[0] }}'
-            BaseUrls:
-              - Url: '{{ Url }}'
-                ServiceLocation: '{{ ServiceLocation }}'
-                DvbPriority: '{{ DvbPriority }}'
-                DvbWeight: '{{ DvbWeight }}'
-            ProgramInformation:
-              Title: '{{ Title }}'
-              Source: '{{ Source }}'
-              Copyright: '{{ Copyright }}'
-              LanguageCode: '{{ LanguageCode }}'
-              MoreInformationUrl: '{{ MoreInformationUrl }}'
-            DvbSettings:
-              FontDownload:
-                Url: '{{ Url }}'
-                MimeType: '{{ MimeType }}'
-                FontFamily: '{{ FontFamily }}'
-              ErrorMetrics:
-                - ReportingUrl: '{{ ReportingUrl }}'
-                  Probability: '{{ Probability }}'
-            Compactness: '{{ Compactness }}'
-            SubtitleConfiguration:
-              TtmlConfiguration:
-                TtmlProfile: '{{ TtmlProfile }}'
-      - name: Description
-        value: '{{ Description }}'
-      - name: ForceEndpointErrorConfiguration
+          - manifest_name: '{{ manifest_name }}'
+            manifest_window_seconds: '{{ manifest_window_seconds }}'
+            filter_configuration:
+              manifest_filter: '{{ manifest_filter }}'
+              start: '{{ start }}'
+              end: '{{ end }}'
+              time_delay_seconds: '{{ time_delay_seconds }}'
+              clip_start_time: '{{ clip_start_time }}'
+            min_update_period_seconds: '{{ min_update_period_seconds }}'
+            min_buffer_time_seconds: '{{ min_buffer_time_seconds }}'
+            suggested_presentation_delay_seconds: '{{ suggested_presentation_delay_seconds }}'
+            segment_template_format: '{{ segment_template_format }}'
+            period_triggers:
+              - '{{ period_triggers[0] }}'
+            scte_dash:
+              ad_marker_dash: '{{ ad_marker_dash }}'
+            drm_signaling: '{{ drm_signaling }}'
+            utc_timing:
+              timing_mode: '{{ timing_mode }}'
+              timing_source: '{{ timing_source }}'
+            profiles:
+              - '{{ profiles[0] }}'
+            base_urls:
+              - url: '{{ url }}'
+                service_location: '{{ service_location }}'
+                dvb_priority: '{{ dvb_priority }}'
+                dvb_weight: '{{ dvb_weight }}'
+            program_information:
+              title: '{{ title }}'
+              source: '{{ source }}'
+              copyright: '{{ copyright }}'
+              language_code: '{{ language_code }}'
+              more_information_url: '{{ more_information_url }}'
+            dvb_settings:
+              font_download:
+                url: '{{ url }}'
+                mime_type: '{{ mime_type }}'
+                font_family: '{{ font_family }}'
+              error_metrics:
+                - reporting_url: '{{ reporting_url }}'
+                  probability: '{{ probability }}'
+            compactness: '{{ compactness }}'
+            subtitle_configuration:
+              ttml_configuration:
+                ttml_profile: '{{ ttml_profile }}'
+      - name: description
+        value: '{{ description }}'
+      - name: force_endpoint_error_configuration
         value:
-          EndpointErrorConditions:
-            - '{{ EndpointErrorConditions[0] }}'
-      - name: HlsManifests
+          endpoint_error_conditions:
+            - '{{ endpoint_error_conditions[0] }}'
+      - name: hls_manifests
         value:
-          - ManifestName: '{{ ManifestName }}'
-            Url: '{{ Url }}'
-            ChildManifestName: '{{ ChildManifestName }}'
-            ManifestWindowSeconds: '{{ ManifestWindowSeconds }}'
-            ProgramDateTimeIntervalSeconds: '{{ ProgramDateTimeIntervalSeconds }}'
-            ScteHls:
-              AdMarkerHls: '{{ AdMarkerHls }}'
-            FilterConfiguration: null
-            StartTag:
-              TimeOffset: null
-              Precise: '{{ Precise }}'
-            UrlEncodeChildManifest: '{{ UrlEncodeChildManifest }}'
-      - name: LowLatencyHlsManifests
+          - manifest_name: '{{ manifest_name }}'
+            url: '{{ url }}'
+            child_manifest_name: '{{ child_manifest_name }}'
+            manifest_window_seconds: '{{ manifest_window_seconds }}'
+            program_date_time_interval_seconds: '{{ program_date_time_interval_seconds }}'
+            scte_hls:
+              ad_marker_hls: '{{ ad_marker_hls }}'
+            filter_configuration: null
+            start_tag:
+              time_offset: null
+              precise: '{{ precise }}'
+            url_encode_child_manifest: '{{ url_encode_child_manifest }}'
+      - name: low_latency_hls_manifests
         value:
-          - ManifestName: '{{ ManifestName }}'
-            Url: '{{ Url }}'
-            ChildManifestName: '{{ ChildManifestName }}'
-            ManifestWindowSeconds: '{{ ManifestWindowSeconds }}'
-            ProgramDateTimeIntervalSeconds: '{{ ProgramDateTimeIntervalSeconds }}'
-            ScteHls: null
-            FilterConfiguration: null
-            StartTag: null
-            UrlEncodeChildManifest: '{{ UrlEncodeChildManifest }}'
-      - name: OriginEndpointName
-        value: '{{ OriginEndpointName }}'
-      - name: Segment
+          - manifest_name: '{{ manifest_name }}'
+            url: '{{ url }}'
+            child_manifest_name: '{{ child_manifest_name }}'
+            manifest_window_seconds: '{{ manifest_window_seconds }}'
+            program_date_time_interval_seconds: '{{ program_date_time_interval_seconds }}'
+            scte_hls: null
+            filter_configuration: null
+            start_tag: null
+            url_encode_child_manifest: '{{ url_encode_child_manifest }}'
+      - name: origin_endpoint_name
+        value: '{{ origin_endpoint_name }}'
+      - name: segment
         value:
-          SegmentDurationSeconds: '{{ SegmentDurationSeconds }}'
-          SegmentName: '{{ SegmentName }}'
-          TsUseAudioRenditionGroup: '{{ TsUseAudioRenditionGroup }}'
-          IncludeIframeOnlyStreams: '{{ IncludeIframeOnlyStreams }}'
-          TsIncludeDvbSubtitles: '{{ TsIncludeDvbSubtitles }}'
-          Scte:
-            ScteFilter:
-              - '{{ ScteFilter[0] }}'
-          Encryption:
-            ConstantInitializationVector: '{{ ConstantInitializationVector }}'
-            EncryptionMethod:
-              TsEncryptionMethod: '{{ TsEncryptionMethod }}'
-              CmafEncryptionMethod: '{{ CmafEncryptionMethod }}'
-            KeyRotationIntervalSeconds: '{{ KeyRotationIntervalSeconds }}'
-            CmafExcludeSegmentDrmMetadata: '{{ CmafExcludeSegmentDrmMetadata }}'
-            SpekeKeyProvider:
-              EncryptionContractConfiguration:
-                PresetSpeke20Audio: '{{ PresetSpeke20Audio }}'
-                PresetSpeke20Video: '{{ PresetSpeke20Video }}'
-              ResourceId: '{{ ResourceId }}'
-              DrmSystems:
-                - '{{ DrmSystems[0] }}'
-              RoleArn: '{{ RoleArn }}'
-              Url: '{{ Url }}'
-      - name: StartoverWindowSeconds
-        value: '{{ StartoverWindowSeconds }}'
-      - name: Tags
+          segment_duration_seconds: '{{ segment_duration_seconds }}'
+          segment_name: '{{ segment_name }}'
+          ts_use_audio_rendition_group: '{{ ts_use_audio_rendition_group }}'
+          include_iframe_only_streams: '{{ include_iframe_only_streams }}'
+          ts_include_dvb_subtitles: '{{ ts_include_dvb_subtitles }}'
+          scte:
+            scte_filter:
+              - '{{ scte_filter[0] }}'
+          encryption:
+            constant_initialization_vector: '{{ constant_initialization_vector }}'
+            encryption_method:
+              ts_encryption_method: '{{ ts_encryption_method }}'
+              cmaf_encryption_method: '{{ cmaf_encryption_method }}'
+            key_rotation_interval_seconds: '{{ key_rotation_interval_seconds }}'
+            cmaf_exclude_segment_drm_metadata: '{{ cmaf_exclude_segment_drm_metadata }}'
+            speke_key_provider:
+              encryption_contract_configuration:
+                preset_speke20_audio: '{{ preset_speke20_audio }}'
+                preset_speke20_video: '{{ preset_speke20_video }}'
+              resource_id: '{{ resource_id }}'
+              drm_systems:
+                - '{{ drm_systems[0] }}'
+              role_arn: '{{ role_arn }}'
+              url: '{{ url }}'
+      - name: startover_window_seconds
+        value: '{{ startover_window_seconds }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -1024,7 +1023,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Arn>';
+AND Identifier = '{{ arn }}';
 ```
 
 
@@ -1033,7 +1032,7 @@ AND Identifier = '<Arn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.mediapackagev2.origin_endpoints
-WHERE Identifier = '<Arn>'
+WHERE Identifier = '{{ arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/mediatailor/channel_policies/index.md b/website/docs/services/mediatailor/channel_policies/index.md
index 16c6edcc0..e2d50b449 100644
--- a/website/docs/services/mediatailor/channel_policies/index.md
+++ b/website/docs/services/mediatailor/channel_policies/index.md
@@ -94,7 +94,7 @@ region,
 channel_name,
 policy
 FROM awscc.mediatailor.channel_policies
-WHERE region = 'us-east-1' AND Identifier = '<ChannelName>';
+WHERE region = 'us-east-1' AND Identifier = '{{ channel_name }}';
 ```
 
 ## `INSERT` example
@@ -118,9 +118,9 @@ INSERT INTO awscc.mediatailor.channel_policies (
  Policy,
  region
 )
-SELECT 
-'{{ ChannelName }}',
- '{{ Policy }}',
+SELECT
+'{{ channel_name }}',
+ '{{ policy }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -133,9 +133,9 @@ INSERT INTO awscc.mediatailor.channel_policies (
  Policy,
  region
 )
-SELECT 
- '{{ ChannelName }}',
- '{{ Policy }}',
+SELECT
+ '{{ channel_name }}',
+ '{{ policy }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -153,11 +153,10 @@ globals:
 resources:
   - name: channel_policy
     props:
-      - name: ChannelName
-        value: '{{ ChannelName }}'
-      - name: Policy
+      - name: channel_name
+        value: '{{ channel_name }}'
+      - name: policy
         value: {}
-
 ```
 </TabItem>
 </Tabs>
@@ -173,7 +172,7 @@ SET PatchDocument = string('{{ {
     "Policy": policy
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<ChannelName>';
+AND Identifier = '{{ channel_name }}';
 ```
 
 
@@ -182,7 +181,7 @@ AND Identifier = '<ChannelName>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.mediatailor.channel_policies
-WHERE Identifier = '<ChannelName>'
+WHERE Identifier = '{{ channel_name }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/mediatailor/channels/index.md b/website/docs/services/mediatailor/channels/index.md
index 7fe0494ee..0a14cdedc 100644
--- a/website/docs/services/mediatailor/channels/index.md
+++ b/website/docs/services/mediatailor/channels/index.md
@@ -282,7 +282,7 @@ tags,
 tier,
 time_shift_configuration
 FROM awscc.mediatailor.channels
-WHERE region = 'us-east-1' AND Identifier = '<ChannelName>';
+WHERE region = 'us-east-1' AND Identifier = '{{ channel_name }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -320,10 +320,10 @@ INSERT INTO awscc.mediatailor.channels (
  PlaybackMode,
  region
 )
-SELECT 
-'{{ ChannelName }}',
- '{{ Outputs }}',
- '{{ PlaybackMode }}',
+SELECT
+'{{ channel_name }}',
+ '{{ outputs }}',
+ '{{ playback_mode }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -343,16 +343,16 @@ INSERT INTO awscc.mediatailor.channels (
  TimeShiftConfiguration,
  region
 )
-SELECT 
- '{{ Audiences }}',
- '{{ ChannelName }}',
- '{{ FillerSlate }}',
- '{{ LogConfiguration }}',
- '{{ Outputs }}',
- '{{ PlaybackMode }}',
- '{{ Tags }}',
- '{{ Tier }}',
- '{{ TimeShiftConfiguration }}',
+SELECT
+ '{{ audiences }}',
+ '{{ channel_name }}',
+ '{{ filler_slate }}',
+ '{{ log_configuration }}',
+ '{{ outputs }}',
+ '{{ playback_mode }}',
+ '{{ tags }}',
+ '{{ tier }}',
+ '{{ time_shift_configuration }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -370,44 +370,43 @@ globals:
 resources:
   - name: channel
     props:
-      - name: Audiences
+      - name: audiences
         value:
-          - '{{ Audiences[0] }}'
-      - name: ChannelName
-        value: '{{ ChannelName }}'
-      - name: FillerSlate
+          - '{{ audiences[0] }}'
+      - name: channel_name
+        value: '{{ channel_name }}'
+      - name: filler_slate
         value:
-          SourceLocationName: '{{ SourceLocationName }}'
-          VodSourceName: '{{ VodSourceName }}'
-      - name: LogConfiguration
+          source_location_name: '{{ source_location_name }}'
+          vod_source_name: '{{ vod_source_name }}'
+      - name: log_configuration
         value:
-          LogTypes:
-            - '{{ LogTypes[0] }}'
-      - name: Outputs
+          log_types:
+            - '{{ log_types[0] }}'
+      - name: outputs
         value:
-          - DashPlaylistSettings:
-              ManifestWindowSeconds: null
-              MinBufferTimeSeconds: null
-              MinUpdatePeriodSeconds: null
-              SuggestedPresentationDelaySeconds: null
-            HlsPlaylistSettings:
-              ManifestWindowSeconds: null
-              AdMarkupType:
-                - '{{ AdMarkupType[0] }}'
-            ManifestName: '{{ ManifestName }}'
-            SourceGroup: '{{ SourceGroup }}'
-      - name: PlaybackMode
-        value: '{{ PlaybackMode }}'
-      - name: Tags
+          - dash_playlist_settings:
+              manifest_window_seconds: null
+              min_buffer_time_seconds: null
+              min_update_period_seconds: null
+              suggested_presentation_delay_seconds: null
+            hls_playlist_settings:
+              manifest_window_seconds: null
+              ad_markup_type:
+                - '{{ ad_markup_type[0] }}'
+            manifest_name: '{{ manifest_name }}'
+            source_group: '{{ source_group }}'
+      - name: playback_mode
+        value: '{{ playback_mode }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-      - name: Tier
-        value: '{{ Tier }}'
-      - name: TimeShiftConfiguration
+          - key: '{{ key }}'
+            value: '{{ value }}'
+      - name: tier
+        value: '{{ tier }}'
+      - name: time_shift_configuration
         value:
-          MaxTimeDelaySeconds: null
-
+          max_time_delay_seconds: null
 ```
 </TabItem>
 </Tabs>
@@ -429,7 +428,7 @@ SET PatchDocument = string('{{ {
     "TimeShiftConfiguration": time_shift_configuration
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<ChannelName>';
+AND Identifier = '{{ channel_name }}';
 ```
 
 
@@ -438,7 +437,7 @@ AND Identifier = '<ChannelName>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.mediatailor.channels
-WHERE Identifier = '<ChannelName>'
+WHERE Identifier = '{{ channel_name }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/mediatailor/live_sources/index.md b/website/docs/services/mediatailor/live_sources/index.md
index 9d049b18b..e86804dc1 100644
--- a/website/docs/services/mediatailor/live_sources/index.md
+++ b/website/docs/services/mediatailor/live_sources/index.md
@@ -192,7 +192,7 @@ live_source_name,
 source_location_name,
 tags
 FROM awscc.mediatailor.live_sources
-WHERE region = 'us-east-1' AND Identifier = '<LiveSourceName>|<SourceLocationName>';
+WHERE region = 'us-east-1' AND Identifier = '{{ live_source_name }}|{{ source_location_name }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -231,10 +231,10 @@ INSERT INTO awscc.mediatailor.live_sources (
  SourceLocationName,
  region
 )
-SELECT 
-'{{ HttpPackageConfigurations }}',
- '{{ LiveSourceName }}',
- '{{ SourceLocationName }}',
+SELECT
+'{{ http_package_configurations }}',
+ '{{ live_source_name }}',
+ '{{ source_location_name }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -249,11 +249,11 @@ INSERT INTO awscc.mediatailor.live_sources (
  Tags,
  region
 )
-SELECT 
- '{{ HttpPackageConfigurations }}',
- '{{ LiveSourceName }}',
- '{{ SourceLocationName }}',
- '{{ Tags }}',
+SELECT
+ '{{ http_package_configurations }}',
+ '{{ live_source_name }}',
+ '{{ source_location_name }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -271,20 +271,19 @@ globals:
 resources:
   - name: live_source
     props:
-      - name: HttpPackageConfigurations
+      - name: http_package_configurations
         value:
-          - Path: '{{ Path }}'
-            SourceGroup: '{{ SourceGroup }}'
-            Type: '{{ Type }}'
-      - name: LiveSourceName
-        value: '{{ LiveSourceName }}'
-      - name: SourceLocationName
-        value: '{{ SourceLocationName }}'
-      - name: Tags
+          - path: '{{ path }}'
+            source_group: '{{ source_group }}'
+            type: '{{ type }}'
+      - name: live_source_name
+        value: '{{ live_source_name }}'
+      - name: source_location_name
+        value: '{{ source_location_name }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -301,7 +300,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<LiveSourceName>|<SourceLocationName>';
+AND Identifier = '{{ live_source_name }}|{{ source_location_name }}';
 ```
 
 
@@ -310,7 +309,7 @@ AND Identifier = '<LiveSourceName>|<SourceLocationName>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.mediatailor.live_sources
-WHERE Identifier = '<LiveSourceName|SourceLocationName>'
+WHERE Identifier = '{{ live_source_name }}|{{ source_location_name }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/mediatailor/playback_configurations/index.md b/website/docs/services/mediatailor/playback_configurations/index.md
index 799354aa1..02125b1a9 100644
--- a/website/docs/services/mediatailor/playback_configurations/index.md
+++ b/website/docs/services/mediatailor/playback_configurations/index.md
@@ -405,7 +405,7 @@ tags,
 transcode_profile_name,
 video_content_source_url
 FROM awscc.mediatailor.playback_configurations
-WHERE region = 'us-east-1' AND Identifier = '<Name>';
+WHERE region = 'us-east-1' AND Identifier = '{{ name }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -443,10 +443,10 @@ INSERT INTO awscc.mediatailor.playback_configurations (
  VideoContentSourceUrl,
  region
 )
-SELECT 
-'{{ AdDecisionServerUrl }}',
- '{{ Name }}',
- '{{ VideoContentSourceUrl }}',
+SELECT
+'{{ ad_decision_server_url }}',
+ '{{ name }}',
+ '{{ video_content_source_url }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -475,25 +475,25 @@ INSERT INTO awscc.mediatailor.playback_configurations (
  VideoContentSourceUrl,
  region
 )
-SELECT 
- '{{ AdConditioningConfiguration }}',
- '{{ AdDecisionServerUrl }}',
- '{{ AvailSuppression }}',
- '{{ Bumper }}',
- '{{ CdnConfiguration }}',
- '{{ ConfigurationAliases }}',
- '{{ DashConfiguration }}',
- '{{ InsertionMode }}',
- '{{ LivePreRollConfiguration }}',
- '{{ ManifestProcessingRules }}',
- '{{ Name }}',
- '{{ PersonalizationThresholdSeconds }}',
- '{{ HlsConfiguration }}',
- '{{ LogConfiguration }}',
- '{{ SlateAdUrl }}',
- '{{ Tags }}',
- '{{ TranscodeProfileName }}',
- '{{ VideoContentSourceUrl }}',
+SELECT
+ '{{ ad_conditioning_configuration }}',
+ '{{ ad_decision_server_url }}',
+ '{{ avail_suppression }}',
+ '{{ bumper }}',
+ '{{ cdn_configuration }}',
+ '{{ configuration_aliases }}',
+ '{{ dash_configuration }}',
+ '{{ insertion_mode }}',
+ '{{ live_pre_roll_configuration }}',
+ '{{ manifest_processing_rules }}',
+ '{{ name }}',
+ '{{ personalization_threshold_seconds }}',
+ '{{ hls_configuration }}',
+ '{{ log_configuration }}',
+ '{{ slate_ad_url }}',
+ '{{ tags }}',
+ '{{ transcode_profile_name }}',
+ '{{ video_content_source_url }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -511,72 +511,71 @@ globals:
 resources:
   - name: playback_configuration
     props:
-      - name: AdConditioningConfiguration
+      - name: ad_conditioning_configuration
         value:
-          StreamingMediaFileConditioning: '{{ StreamingMediaFileConditioning }}'
-      - name: AdDecisionServerUrl
-        value: '{{ AdDecisionServerUrl }}'
-      - name: AvailSuppression
+          streaming_media_file_conditioning: '{{ streaming_media_file_conditioning }}'
+      - name: ad_decision_server_url
+        value: '{{ ad_decision_server_url }}'
+      - name: avail_suppression
         value:
-          Mode: '{{ Mode }}'
-          Value: '{{ Value }}'
-          FillPolicy: '{{ FillPolicy }}'
-      - name: Bumper
+          mode: '{{ mode }}'
+          value: '{{ value }}'
+          fill_policy: '{{ fill_policy }}'
+      - name: bumper
         value:
-          StartUrl: '{{ StartUrl }}'
-          EndUrl: '{{ EndUrl }}'
-      - name: CdnConfiguration
+          start_url: '{{ start_url }}'
+          end_url: '{{ end_url }}'
+      - name: cdn_configuration
         value:
-          AdSegmentUrlPrefix: '{{ AdSegmentUrlPrefix }}'
-          ContentSegmentUrlPrefix: '{{ ContentSegmentUrlPrefix }}'
-      - name: ConfigurationAliases
+          ad_segment_url_prefix: '{{ ad_segment_url_prefix }}'
+          content_segment_url_prefix: '{{ content_segment_url_prefix }}'
+      - name: configuration_aliases
         value: null
-      - name: DashConfiguration
+      - name: dash_configuration
         value:
-          MpdLocation: '{{ MpdLocation }}'
-          OriginManifestType: '{{ OriginManifestType }}'
-          ManifestEndpointPrefix: '{{ ManifestEndpointPrefix }}'
-      - name: InsertionMode
-        value: '{{ InsertionMode }}'
-      - name: LivePreRollConfiguration
+          mpd_location: '{{ mpd_location }}'
+          origin_manifest_type: '{{ origin_manifest_type }}'
+          manifest_endpoint_prefix: '{{ manifest_endpoint_prefix }}'
+      - name: insertion_mode
+        value: '{{ insertion_mode }}'
+      - name: live_pre_roll_configuration
         value:
-          AdDecisionServerUrl: '{{ AdDecisionServerUrl }}'
-          MaxDurationSeconds: '{{ MaxDurationSeconds }}'
-      - name: ManifestProcessingRules
+          ad_decision_server_url: '{{ ad_decision_server_url }}'
+          max_duration_seconds: '{{ max_duration_seconds }}'
+      - name: manifest_processing_rules
         value:
-          AdMarkerPassthrough:
-            Enabled: '{{ Enabled }}'
-      - name: Name
-        value: '{{ Name }}'
-      - name: PersonalizationThresholdSeconds
-        value: '{{ PersonalizationThresholdSeconds }}'
-      - name: HlsConfiguration
+          ad_marker_passthrough:
+            enabled: '{{ enabled }}'
+      - name: name
+        value: '{{ name }}'
+      - name: personalization_threshold_seconds
+        value: '{{ personalization_threshold_seconds }}'
+      - name: hls_configuration
         value:
-          ManifestEndpointPrefix: '{{ ManifestEndpointPrefix }}'
-      - name: LogConfiguration
+          manifest_endpoint_prefix: '{{ manifest_endpoint_prefix }}'
+      - name: log_configuration
         value:
-          AdsInteractionLog:
-            ExcludeEventTypes:
-              - '{{ ExcludeEventTypes[0] }}'
-            PublishOptInEventTypes:
-              - '{{ PublishOptInEventTypes[0] }}'
-          EnabledLoggingStrategies:
-            - '{{ EnabledLoggingStrategies[0] }}'
-          ManifestServiceInteractionLog:
-            ExcludeEventTypes:
-              - '{{ ExcludeEventTypes[0] }}'
-          PercentEnabled: '{{ PercentEnabled }}'
-      - name: SlateAdUrl
-        value: '{{ SlateAdUrl }}'
-      - name: Tags
+          ads_interaction_log:
+            exclude_event_types:
+              - '{{ exclude_event_types[0] }}'
+            publish_opt_in_event_types:
+              - '{{ publish_opt_in_event_types[0] }}'
+          enabled_logging_strategies:
+            - '{{ enabled_logging_strategies[0] }}'
+          manifest_service_interaction_log:
+            exclude_event_types:
+              - '{{ exclude_event_types[0] }}'
+          percent_enabled: '{{ percent_enabled }}'
+      - name: slate_ad_url
+        value: '{{ slate_ad_url }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-      - name: TranscodeProfileName
-        value: '{{ TranscodeProfileName }}'
-      - name: VideoContentSourceUrl
-        value: '{{ VideoContentSourceUrl }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
+      - name: transcode_profile_name
+        value: '{{ transcode_profile_name }}'
+      - name: video_content_source_url
+        value: '{{ video_content_source_url }}'
 ```
 </TabItem>
 </Tabs>
@@ -606,7 +605,7 @@ SET PatchDocument = string('{{ {
     "VideoContentSourceUrl": video_content_source_url
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Name>';
+AND Identifier = '{{ name }}';
 ```
 
 
@@ -615,7 +614,7 @@ AND Identifier = '<Name>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.mediatailor.playback_configurations
-WHERE Identifier = '<Name>'
+WHERE Identifier = '{{ name }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/mediatailor/source_locations/index.md b/website/docs/services/mediatailor/source_locations/index.md
index 3c1f0563b..b9b6ec4cb 100644
--- a/website/docs/services/mediatailor/source_locations/index.md
+++ b/website/docs/services/mediatailor/source_locations/index.md
@@ -237,7 +237,7 @@ segment_delivery_configurations,
 source_location_name,
 tags
 FROM awscc.mediatailor.source_locations
-WHERE region = 'us-east-1' AND Identifier = '<SourceLocationName>';
+WHERE region = 'us-east-1' AND Identifier = '{{ source_location_name }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -274,9 +274,9 @@ INSERT INTO awscc.mediatailor.source_locations (
  SourceLocationName,
  region
 )
-SELECT 
-'{{ HttpConfiguration }}',
- '{{ SourceLocationName }}',
+SELECT
+'{{ http_configuration }}',
+ '{{ source_location_name }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -293,13 +293,13 @@ INSERT INTO awscc.mediatailor.source_locations (
  Tags,
  region
 )
-SELECT 
- '{{ AccessConfiguration }}',
- '{{ DefaultSegmentDeliveryConfiguration }}',
- '{{ HttpConfiguration }}',
- '{{ SegmentDeliveryConfigurations }}',
- '{{ SourceLocationName }}',
- '{{ Tags }}',
+SELECT
+ '{{ access_configuration }}',
+ '{{ default_segment_delivery_configuration }}',
+ '{{ http_configuration }}',
+ '{{ segment_delivery_configurations }}',
+ '{{ source_location_name }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -317,30 +317,29 @@ globals:
 resources:
   - name: source_location
     props:
-      - name: AccessConfiguration
+      - name: access_configuration
         value:
-          AccessType: '{{ AccessType }}'
-          SecretsManagerAccessTokenConfiguration:
-            HeaderName: '{{ HeaderName }}'
-            SecretArn: '{{ SecretArn }}'
-            SecretStringKey: '{{ SecretStringKey }}'
-      - name: DefaultSegmentDeliveryConfiguration
+          access_type: '{{ access_type }}'
+          secrets_manager_access_token_configuration:
+            header_name: '{{ header_name }}'
+            secret_arn: '{{ secret_arn }}'
+            secret_string_key: '{{ secret_string_key }}'
+      - name: default_segment_delivery_configuration
         value:
-          BaseUrl: '{{ BaseUrl }}'
-      - name: HttpConfiguration
+          base_url: '{{ base_url }}'
+      - name: http_configuration
         value:
-          BaseUrl: '{{ BaseUrl }}'
-      - name: SegmentDeliveryConfigurations
+          base_url: '{{ base_url }}'
+      - name: segment_delivery_configurations
         value:
-          - BaseUrl: '{{ BaseUrl }}'
-            Name: '{{ Name }}'
-      - name: SourceLocationName
-        value: '{{ SourceLocationName }}'
-      - name: Tags
+          - base_url: '{{ base_url }}'
+            name: '{{ name }}'
+      - name: source_location_name
+        value: '{{ source_location_name }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -360,7 +359,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<SourceLocationName>';
+AND Identifier = '{{ source_location_name }}';
 ```
 
 
@@ -369,7 +368,7 @@ AND Identifier = '<SourceLocationName>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.mediatailor.source_locations
-WHERE Identifier = '<SourceLocationName>'
+WHERE Identifier = '{{ source_location_name }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/mediatailor/vod_sources/index.md b/website/docs/services/mediatailor/vod_sources/index.md
index bbb690a4f..1277b5251 100644
--- a/website/docs/services/mediatailor/vod_sources/index.md
+++ b/website/docs/services/mediatailor/vod_sources/index.md
@@ -192,7 +192,7 @@ source_location_name,
 tags,
 vod_source_name
 FROM awscc.mediatailor.vod_sources
-WHERE region = 'us-east-1' AND Identifier = '<SourceLocationName>|<VodSourceName>';
+WHERE region = 'us-east-1' AND Identifier = '{{ source_location_name }}|{{ vod_source_name }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -231,10 +231,10 @@ INSERT INTO awscc.mediatailor.vod_sources (
  VodSourceName,
  region
 )
-SELECT 
-'{{ HttpPackageConfigurations }}',
- '{{ SourceLocationName }}',
- '{{ VodSourceName }}',
+SELECT
+'{{ http_package_configurations }}',
+ '{{ source_location_name }}',
+ '{{ vod_source_name }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -249,11 +249,11 @@ INSERT INTO awscc.mediatailor.vod_sources (
  VodSourceName,
  region
 )
-SELECT 
- '{{ HttpPackageConfigurations }}',
- '{{ SourceLocationName }}',
- '{{ Tags }}',
- '{{ VodSourceName }}',
+SELECT
+ '{{ http_package_configurations }}',
+ '{{ source_location_name }}',
+ '{{ tags }}',
+ '{{ vod_source_name }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -271,20 +271,19 @@ globals:
 resources:
   - name: vod_source
     props:
-      - name: HttpPackageConfigurations
+      - name: http_package_configurations
         value:
-          - Path: '{{ Path }}'
-            SourceGroup: '{{ SourceGroup }}'
-            Type: '{{ Type }}'
-      - name: SourceLocationName
-        value: '{{ SourceLocationName }}'
-      - name: Tags
+          - path: '{{ path }}'
+            source_group: '{{ source_group }}'
+            type: '{{ type }}'
+      - name: source_location_name
+        value: '{{ source_location_name }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-      - name: VodSourceName
-        value: '{{ VodSourceName }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
+      - name: vod_source_name
+        value: '{{ vod_source_name }}'
 ```
 </TabItem>
 </Tabs>
@@ -301,7 +300,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<SourceLocationName>|<VodSourceName>';
+AND Identifier = '{{ source_location_name }}|{{ vod_source_name }}';
 ```
 
 
@@ -310,7 +309,7 @@ AND Identifier = '<SourceLocationName>|<VodSourceName>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.mediatailor.vod_sources
-WHERE Identifier = '<SourceLocationName|VodSourceName>'
+WHERE Identifier = '{{ source_location_name }}|{{ vod_source_name }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/memorydb/acls/index.md b/website/docs/services/memorydb/acls/index.md
index 7620302c5..a4da48b7b 100644
--- a/website/docs/services/memorydb/acls/index.md
+++ b/website/docs/services/memorydb/acls/index.md
@@ -170,7 +170,7 @@ user_names,
 arn,
 tags
 FROM awscc.memorydb.acls
-WHERE region = 'us-east-1' AND Identifier = '<ACLName>';
+WHERE region = 'us-east-1' AND Identifier = '{{ acl_name }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -206,8 +206,8 @@ INSERT INTO awscc.memorydb.acls (
  ACLName,
  region
 )
-SELECT 
-'{{ ACLName }}',
+SELECT
+'{{ acl_name }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -221,10 +221,10 @@ INSERT INTO awscc.memorydb.acls (
  Tags,
  region
 )
-SELECT 
- '{{ ACLName }}',
- '{{ UserNames }}',
- '{{ Tags }}',
+SELECT
+ '{{ acl_name }}',
+ '{{ user_names }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -242,16 +242,15 @@ globals:
 resources:
   - name: acl
     props:
-      - name: ACLName
-        value: '{{ ACLName }}'
-      - name: UserNames
+      - name: acl_name
+        value: '{{ acl_name }}'
+      - name: user_names
         value:
-          - '{{ UserNames[0] }}'
-      - name: Tags
+          - '{{ user_names[0] }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -268,7 +267,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<ACLName>';
+AND Identifier = '{{ acl_name }}';
 ```
 
 
@@ -277,7 +276,7 @@ AND Identifier = '<ACLName>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.memorydb.acls
-WHERE Identifier = '<ACLName>'
+WHERE Identifier = '{{ acl_name }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/memorydb/clusters/index.md b/website/docs/services/memorydb/clusters/index.md
index 020e86d81..937f8fec3 100644
--- a/website/docs/services/memorydb/clusters/index.md
+++ b/website/docs/services/memorydb/clusters/index.md
@@ -344,7 +344,7 @@ cluster_endpoint,
 auto_minor_version_upgrade,
 tags
 FROM awscc.memorydb.clusters
-WHERE region = 'us-east-1' AND Identifier = '<ClusterName>';
+WHERE region = 'us-east-1' AND Identifier = '{{ cluster_name }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -382,10 +382,10 @@ INSERT INTO awscc.memorydb.clusters (
  ACLName,
  region
 )
-SELECT 
-'{{ ClusterName }}',
- '{{ NodeType }}',
- '{{ ACLName }}',
+SELECT
+'{{ cluster_name }}',
+ '{{ node_type }}',
+ '{{ acl_name }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -425,36 +425,36 @@ INSERT INTO awscc.memorydb.clusters (
  Tags,
  region
 )
-SELECT 
- '{{ ClusterName }}',
- '{{ Description }}',
- '{{ MultiRegionClusterName }}',
- '{{ NodeType }}',
- '{{ NumShards }}',
- '{{ NumReplicasPerShard }}',
- '{{ SubnetGroupName }}',
- '{{ SecurityGroupIds }}',
- '{{ MaintenanceWindow }}',
- '{{ ParameterGroupName }}',
- '{{ Port }}',
- '{{ SnapshotRetentionLimit }}',
- '{{ SnapshotWindow }}',
- '{{ ACLName }}',
- '{{ SnsTopicArn }}',
- '{{ SnsTopicStatus }}',
- '{{ TLSEnabled }}',
- '{{ DataTiering }}',
- '{{ NetworkType }}',
- '{{ IpDiscovery }}',
- '{{ KmsKeyId }}',
- '{{ SnapshotArns }}',
- '{{ SnapshotName }}',
- '{{ FinalSnapshotName }}',
- '{{ Engine }}',
- '{{ EngineVersion }}',
- '{{ ClusterEndpoint }}',
- '{{ AutoMinorVersionUpgrade }}',
- '{{ Tags }}',
+SELECT
+ '{{ cluster_name }}',
+ '{{ description }}',
+ '{{ multi_region_cluster_name }}',
+ '{{ node_type }}',
+ '{{ num_shards }}',
+ '{{ num_replicas_per_shard }}',
+ '{{ subnet_group_name }}',
+ '{{ security_group_ids }}',
+ '{{ maintenance_window }}',
+ '{{ parameter_group_name }}',
+ '{{ port }}',
+ '{{ snapshot_retention_limit }}',
+ '{{ snapshot_window }}',
+ '{{ acl_name }}',
+ '{{ sns_topic_arn }}',
+ '{{ sns_topic_status }}',
+ '{{ tls_enabled }}',
+ '{{ data_tiering }}',
+ '{{ network_type }}',
+ '{{ ip_discovery }}',
+ '{{ kms_key_id }}',
+ '{{ snapshot_arns }}',
+ '{{ snapshot_name }}',
+ '{{ final_snapshot_name }}',
+ '{{ engine }}',
+ '{{ engine_version }}',
+ '{{ cluster_endpoint }}',
+ '{{ auto_minor_version_upgrade }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -472,71 +472,70 @@ globals:
 resources:
   - name: cluster
     props:
-      - name: ClusterName
-        value: '{{ ClusterName }}'
-      - name: Description
-        value: '{{ Description }}'
-      - name: MultiRegionClusterName
-        value: '{{ MultiRegionClusterName }}'
-      - name: NodeType
-        value: '{{ NodeType }}'
-      - name: NumShards
-        value: '{{ NumShards }}'
-      - name: NumReplicasPerShard
-        value: '{{ NumReplicasPerShard }}'
-      - name: SubnetGroupName
-        value: '{{ SubnetGroupName }}'
-      - name: SecurityGroupIds
+      - name: cluster_name
+        value: '{{ cluster_name }}'
+      - name: description
+        value: '{{ description }}'
+      - name: multi_region_cluster_name
+        value: '{{ multi_region_cluster_name }}'
+      - name: node_type
+        value: '{{ node_type }}'
+      - name: num_shards
+        value: '{{ num_shards }}'
+      - name: num_replicas_per_shard
+        value: '{{ num_replicas_per_shard }}'
+      - name: subnet_group_name
+        value: '{{ subnet_group_name }}'
+      - name: security_group_ids
         value:
-          - '{{ SecurityGroupIds[0] }}'
-      - name: MaintenanceWindow
-        value: '{{ MaintenanceWindow }}'
-      - name: ParameterGroupName
-        value: '{{ ParameterGroupName }}'
-      - name: Port
-        value: '{{ Port }}'
-      - name: SnapshotRetentionLimit
-        value: '{{ SnapshotRetentionLimit }}'
-      - name: SnapshotWindow
-        value: '{{ SnapshotWindow }}'
-      - name: ACLName
-        value: '{{ ACLName }}'
-      - name: SnsTopicArn
-        value: '{{ SnsTopicArn }}'
-      - name: SnsTopicStatus
-        value: '{{ SnsTopicStatus }}'
-      - name: TLSEnabled
-        value: '{{ TLSEnabled }}'
-      - name: DataTiering
-        value: '{{ DataTiering }}'
-      - name: NetworkType
-        value: '{{ NetworkType }}'
-      - name: IpDiscovery
-        value: '{{ IpDiscovery }}'
-      - name: KmsKeyId
-        value: '{{ KmsKeyId }}'
-      - name: SnapshotArns
+          - '{{ security_group_ids[0] }}'
+      - name: maintenance_window
+        value: '{{ maintenance_window }}'
+      - name: parameter_group_name
+        value: '{{ parameter_group_name }}'
+      - name: port
+        value: '{{ port }}'
+      - name: snapshot_retention_limit
+        value: '{{ snapshot_retention_limit }}'
+      - name: snapshot_window
+        value: '{{ snapshot_window }}'
+      - name: acl_name
+        value: '{{ acl_name }}'
+      - name: sns_topic_arn
+        value: '{{ sns_topic_arn }}'
+      - name: sns_topic_status
+        value: '{{ sns_topic_status }}'
+      - name: tls_enabled
+        value: '{{ tls_enabled }}'
+      - name: data_tiering
+        value: '{{ data_tiering }}'
+      - name: network_type
+        value: '{{ network_type }}'
+      - name: ip_discovery
+        value: '{{ ip_discovery }}'
+      - name: kms_key_id
+        value: '{{ kms_key_id }}'
+      - name: snapshot_arns
         value:
-          - '{{ SnapshotArns[0] }}'
-      - name: SnapshotName
-        value: '{{ SnapshotName }}'
-      - name: FinalSnapshotName
-        value: '{{ FinalSnapshotName }}'
-      - name: Engine
-        value: '{{ Engine }}'
-      - name: EngineVersion
-        value: '{{ EngineVersion }}'
-      - name: ClusterEndpoint
+          - '{{ snapshot_arns[0] }}'
+      - name: snapshot_name
+        value: '{{ snapshot_name }}'
+      - name: final_snapshot_name
+        value: '{{ final_snapshot_name }}'
+      - name: engine
+        value: '{{ engine }}'
+      - name: engine_version
+        value: '{{ engine_version }}'
+      - name: cluster_endpoint
         value:
-          Address: '{{ Address }}'
-          Port: '{{ Port }}'
-      - name: AutoMinorVersionUpgrade
-        value: '{{ AutoMinorVersionUpgrade }}'
-      - name: Tags
+          address: '{{ address }}'
+          port: '{{ port }}'
+      - name: auto_minor_version_upgrade
+        value: '{{ auto_minor_version_upgrade }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -569,7 +568,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<ClusterName>';
+AND Identifier = '{{ cluster_name }}';
 ```
 
 
@@ -578,7 +577,7 @@ AND Identifier = '<ClusterName>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.memorydb.clusters
-WHERE Identifier = '<ClusterName>'
+WHERE Identifier = '{{ cluster_name }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/memorydb/multi_region_clusters/index.md b/website/docs/services/memorydb/multi_region_clusters/index.md
index edaee6c1c..23932fb4f 100644
--- a/website/docs/services/memorydb/multi_region_clusters/index.md
+++ b/website/docs/services/memorydb/multi_region_clusters/index.md
@@ -218,7 +218,7 @@ engine_version,
 tags,
 update_strategy
 FROM awscc.memorydb.multi_region_clusters
-WHERE region = 'us-east-1' AND Identifier = '<MultiRegionClusterName>';
+WHERE region = 'us-east-1' AND Identifier = '{{ multi_region_cluster_name }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -254,8 +254,8 @@ INSERT INTO awscc.memorydb.multi_region_clusters (
  NodeType,
  region
 )
-SELECT 
-'{{ NodeType }}',
+SELECT
+'{{ node_type }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -276,17 +276,17 @@ INSERT INTO awscc.memorydb.multi_region_clusters (
  UpdateStrategy,
  region
 )
-SELECT 
- '{{ MultiRegionClusterNameSuffix }}',
- '{{ Description }}',
- '{{ NodeType }}',
- '{{ NumShards }}',
- '{{ MultiRegionParameterGroupName }}',
- '{{ TLSEnabled }}',
- '{{ Engine }}',
- '{{ EngineVersion }}',
- '{{ Tags }}',
- '{{ UpdateStrategy }}',
+SELECT
+ '{{ multi_region_cluster_name_suffix }}',
+ '{{ description }}',
+ '{{ node_type }}',
+ '{{ num_shards }}',
+ '{{ multi_region_parameter_group_name }}',
+ '{{ tls_enabled }}',
+ '{{ engine }}',
+ '{{ engine_version }}',
+ '{{ tags }}',
+ '{{ update_strategy }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -304,29 +304,28 @@ globals:
 resources:
   - name: multi_region_cluster
     props:
-      - name: MultiRegionClusterNameSuffix
-        value: '{{ MultiRegionClusterNameSuffix }}'
-      - name: Description
-        value: '{{ Description }}'
-      - name: NodeType
-        value: '{{ NodeType }}'
-      - name: NumShards
-        value: '{{ NumShards }}'
-      - name: MultiRegionParameterGroupName
-        value: '{{ MultiRegionParameterGroupName }}'
-      - name: TLSEnabled
-        value: '{{ TLSEnabled }}'
-      - name: Engine
-        value: '{{ Engine }}'
-      - name: EngineVersion
-        value: '{{ EngineVersion }}'
-      - name: Tags
+      - name: multi_region_cluster_name_suffix
+        value: '{{ multi_region_cluster_name_suffix }}'
+      - name: description
+        value: '{{ description }}'
+      - name: node_type
+        value: '{{ node_type }}'
+      - name: num_shards
+        value: '{{ num_shards }}'
+      - name: multi_region_parameter_group_name
+        value: '{{ multi_region_parameter_group_name }}'
+      - name: tls_enabled
+        value: '{{ tls_enabled }}'
+      - name: engine
+        value: '{{ engine }}'
+      - name: engine_version
+        value: '{{ engine_version }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-      - name: UpdateStrategy
-        value: '{{ UpdateStrategy }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
+      - name: update_strategy
+        value: '{{ update_strategy }}'
 ```
 </TabItem>
 </Tabs>
@@ -347,7 +346,7 @@ SET PatchDocument = string('{{ {
     "UpdateStrategy": update_strategy
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<MultiRegionClusterName>';
+AND Identifier = '{{ multi_region_cluster_name }}';
 ```
 
 
@@ -356,7 +355,7 @@ AND Identifier = '<MultiRegionClusterName>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.memorydb.multi_region_clusters
-WHERE Identifier = '<MultiRegionClusterName>'
+WHERE Identifier = '{{ multi_region_cluster_name }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/memorydb/parameter_groups/index.md b/website/docs/services/memorydb/parameter_groups/index.md
index a6b14b81e..c16fd5691 100644
--- a/website/docs/services/memorydb/parameter_groups/index.md
+++ b/website/docs/services/memorydb/parameter_groups/index.md
@@ -176,7 +176,7 @@ tags,
 parameters,
 arn
 FROM awscc.memorydb.parameter_groups
-WHERE region = 'us-east-1' AND Identifier = '<ParameterGroupName>';
+WHERE region = 'us-east-1' AND Identifier = '{{ parameter_group_name }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -213,9 +213,9 @@ INSERT INTO awscc.memorydb.parameter_groups (
  Family,
  region
 )
-SELECT 
-'{{ ParameterGroupName }}',
- '{{ Family }}',
+SELECT
+'{{ parameter_group_name }}',
+ '{{ family }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -231,12 +231,12 @@ INSERT INTO awscc.memorydb.parameter_groups (
  Parameters,
  region
 )
-SELECT 
- '{{ ParameterGroupName }}',
- '{{ Family }}',
- '{{ Description }}',
- '{{ Tags }}',
- '{{ Parameters }}',
+SELECT
+ '{{ parameter_group_name }}',
+ '{{ family }}',
+ '{{ description }}',
+ '{{ tags }}',
+ '{{ parameters }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -254,19 +254,18 @@ globals:
 resources:
   - name: parameter_group
     props:
-      - name: ParameterGroupName
-        value: '{{ ParameterGroupName }}'
-      - name: Family
-        value: '{{ Family }}'
-      - name: Description
-        value: '{{ Description }}'
-      - name: Tags
+      - name: parameter_group_name
+        value: '{{ parameter_group_name }}'
+      - name: family
+        value: '{{ family }}'
+      - name: description
+        value: '{{ description }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-      - name: Parameters
+          - key: '{{ key }}'
+            value: '{{ value }}'
+      - name: parameters
         value: {}
-
 ```
 </TabItem>
 </Tabs>
@@ -283,7 +282,7 @@ SET PatchDocument = string('{{ {
     "Parameters": parameters
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<ParameterGroupName>';
+AND Identifier = '{{ parameter_group_name }}';
 ```
 
 
@@ -292,7 +291,7 @@ AND Identifier = '<ParameterGroupName>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.memorydb.parameter_groups
-WHERE Identifier = '<ParameterGroupName>'
+WHERE Identifier = '{{ parameter_group_name }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/memorydb/subnet_groups/index.md b/website/docs/services/memorydb/subnet_groups/index.md
index 5c5f01109..9f85f1cf3 100644
--- a/website/docs/services/memorydb/subnet_groups/index.md
+++ b/website/docs/services/memorydb/subnet_groups/index.md
@@ -176,7 +176,7 @@ tags,
 arn,
 supported_network_types
 FROM awscc.memorydb.subnet_groups
-WHERE region = 'us-east-1' AND Identifier = '<SubnetGroupName>';
+WHERE region = 'us-east-1' AND Identifier = '{{ subnet_group_name }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -213,9 +213,9 @@ INSERT INTO awscc.memorydb.subnet_groups (
  SubnetIds,
  region
 )
-SELECT 
-'{{ SubnetGroupName }}',
- '{{ SubnetIds }}',
+SELECT
+'{{ subnet_group_name }}',
+ '{{ subnet_ids }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -230,11 +230,11 @@ INSERT INTO awscc.memorydb.subnet_groups (
  Tags,
  region
 )
-SELECT 
- '{{ SubnetGroupName }}',
- '{{ Description }}',
- '{{ SubnetIds }}',
- '{{ Tags }}',
+SELECT
+ '{{ subnet_group_name }}',
+ '{{ description }}',
+ '{{ subnet_ids }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -252,18 +252,17 @@ globals:
 resources:
   - name: subnet_group
     props:
-      - name: SubnetGroupName
-        value: '{{ SubnetGroupName }}'
-      - name: Description
-        value: '{{ Description }}'
-      - name: SubnetIds
+      - name: subnet_group_name
+        value: '{{ subnet_group_name }}'
+      - name: description
+        value: '{{ description }}'
+      - name: subnet_ids
         value:
-          - '{{ SubnetIds[0] }}'
-      - name: Tags
+          - '{{ subnet_ids[0] }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -281,7 +280,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<SubnetGroupName>';
+AND Identifier = '{{ subnet_group_name }}';
 ```
 
 
@@ -290,7 +289,7 @@ AND Identifier = '<SubnetGroupName>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.memorydb.subnet_groups
-WHERE Identifier = '<SubnetGroupName>'
+WHERE Identifier = '{{ subnet_group_name }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/memorydb/users/index.md b/website/docs/services/memorydb/users/index.md
index 876830d7a..00c1d268d 100644
--- a/website/docs/services/memorydb/users/index.md
+++ b/website/docs/services/memorydb/users/index.md
@@ -188,7 +188,7 @@ authentication_mode,
 arn,
 tags
 FROM awscc.memorydb.users
-WHERE region = 'us-east-1' AND Identifier = '<UserName>';
+WHERE region = 'us-east-1' AND Identifier = '{{ user_name }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -224,8 +224,8 @@ INSERT INTO awscc.memorydb.users (
  UserName,
  region
 )
-SELECT 
-'{{ UserName }}',
+SELECT
+'{{ user_name }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -240,11 +240,11 @@ INSERT INTO awscc.memorydb.users (
  Tags,
  region
 )
-SELECT 
- '{{ UserName }}',
- '{{ AccessString }}',
- '{{ AuthenticationMode }}',
- '{{ Tags }}',
+SELECT
+ '{{ user_name }}',
+ '{{ access_string }}',
+ '{{ authentication_mode }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -262,20 +262,19 @@ globals:
 resources:
   - name: user
     props:
-      - name: UserName
-        value: '{{ UserName }}'
-      - name: AccessString
-        value: '{{ AccessString }}'
-      - name: AuthenticationMode
+      - name: user_name
+        value: '{{ user_name }}'
+      - name: access_string
+        value: '{{ access_string }}'
+      - name: authentication_mode
         value:
-          Type: '{{ Type }}'
-          Passwords:
-            - '{{ Passwords[0] }}'
-      - name: Tags
+          type: '{{ type }}'
+          passwords:
+            - '{{ passwords[0] }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -293,7 +292,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<UserName>';
+AND Identifier = '{{ user_name }}';
 ```
 
 
@@ -302,7 +301,7 @@ AND Identifier = '<UserName>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.memorydb.users
-WHERE Identifier = '<UserName>'
+WHERE Identifier = '{{ user_name }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/mpa/approval_teams/index.md b/website/docs/services/mpa/approval_teams/index.md
index 324322e73..2bd9e7f89 100644
--- a/website/docs/services/mpa/approval_teams/index.md
+++ b/website/docs/services/mpa/approval_teams/index.md
@@ -273,7 +273,7 @@ status,
 status_code,
 status_message
 FROM awscc.mpa.approval_teams
-WHERE region = 'us-east-1' AND Identifier = '<Arn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -313,12 +313,12 @@ INSERT INTO awscc.mpa.approval_teams (
  Description,
  region
 )
-SELECT 
-'{{ ApprovalStrategy }}',
- '{{ Approvers }}',
- '{{ Policies }}',
- '{{ Name }}',
- '{{ Description }}',
+SELECT
+'{{ approval_strategy }}',
+ '{{ approvers }}',
+ '{{ policies }}',
+ '{{ name }}',
+ '{{ description }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -335,13 +335,13 @@ INSERT INTO awscc.mpa.approval_teams (
  Description,
  region
 )
-SELECT 
- '{{ ApprovalStrategy }}',
- '{{ Approvers }}',
- '{{ Tags }}',
- '{{ Policies }}',
- '{{ Name }}',
- '{{ Description }}',
+SELECT
+ '{{ approval_strategy }}',
+ '{{ approvers }}',
+ '{{ tags }}',
+ '{{ policies }}',
+ '{{ name }}',
+ '{{ description }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -359,29 +359,28 @@ globals:
 resources:
   - name: approval_team
     props:
-      - name: ApprovalStrategy
+      - name: approval_strategy
         value:
-          MofN:
-            MinApprovalsRequired: '{{ MinApprovalsRequired }}'
-      - name: Approvers
+          mof_n:
+            min_approvals_required: '{{ min_approvals_required }}'
+      - name: approvers
         value:
-          - PrimaryIdentityId: '{{ PrimaryIdentityId }}'
-            PrimaryIdentitySourceArn: '{{ PrimaryIdentitySourceArn }}'
-            ApproverId: '{{ ApproverId }}'
-            ResponseTime: '{{ ResponseTime }}'
-            PrimaryIdentityStatus: '{{ PrimaryIdentityStatus }}'
-      - name: Tags
+          - primary_identity_id: '{{ primary_identity_id }}'
+            primary_identity_source_arn: '{{ primary_identity_source_arn }}'
+            approver_id: '{{ approver_id }}'
+            response_time: '{{ response_time }}'
+            primary_identity_status: '{{ primary_identity_status }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-      - name: Policies
+          - key: '{{ key }}'
+            value: '{{ value }}'
+      - name: policies
         value:
           - null
-      - name: Name
-        value: '{{ Name }}'
-      - name: Description
-        value: '{{ Description }}'
-
+      - name: name
+        value: '{{ name }}'
+      - name: description
+        value: '{{ description }}'
 ```
 </TabItem>
 </Tabs>
@@ -399,7 +398,7 @@ SET PatchDocument = string('{{ {
     "Description": description
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Arn>';
+AND Identifier = '{{ arn }}';
 ```
 
 
@@ -408,7 +407,7 @@ AND Identifier = '<Arn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.mpa.approval_teams
-WHERE Identifier = '<Arn>'
+WHERE Identifier = '{{ arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/mpa/identity_sources/index.md b/website/docs/services/mpa/identity_sources/index.md
index d8d53139b..316971add 100644
--- a/website/docs/services/mpa/identity_sources/index.md
+++ b/website/docs/services/mpa/identity_sources/index.md
@@ -212,7 +212,7 @@ status,
 status_code,
 status_message
 FROM awscc.mpa.identity_sources
-WHERE region = 'us-east-1' AND Identifier = '<IdentitySourceArn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ identity_source_arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -248,8 +248,8 @@ INSERT INTO awscc.mpa.identity_sources (
  IdentitySourceParameters,
  region
 )
-SELECT 
-'{{ IdentitySourceParameters }}',
+SELECT
+'{{ identity_source_parameters }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -262,9 +262,9 @@ INSERT INTO awscc.mpa.identity_sources (
  Tags,
  region
 )
-SELECT 
- '{{ IdentitySourceParameters }}',
- '{{ Tags }}',
+SELECT
+ '{{ identity_source_parameters }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -282,17 +282,16 @@ globals:
 resources:
   - name: identity_source
     props:
-      - name: IdentitySourceParameters
+      - name: identity_source_parameters
         value:
-          IamIdentityCenter:
-            InstanceArn: '{{ InstanceArn }}'
-            Region: '{{ Region }}'
-            ApprovalPortalUrl: '{{ ApprovalPortalUrl }}'
-      - name: Tags
+          iam_identity_center:
+            instance_arn: '{{ instance_arn }}'
+            region: '{{ region }}'
+            approval_portal_url: '{{ approval_portal_url }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -308,7 +307,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<IdentitySourceArn>';
+AND Identifier = '{{ identity_source_arn }}';
 ```
 
 
@@ -317,7 +316,7 @@ AND Identifier = '<IdentitySourceArn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.mpa.identity_sources
-WHERE Identifier = '<IdentitySourceArn>'
+WHERE Identifier = '{{ identity_source_arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/msk/batch_scram_secrets/index.md b/website/docs/services/msk/batch_scram_secrets/index.md
index ae457a30d..340ba0b8a 100644
--- a/website/docs/services/msk/batch_scram_secrets/index.md
+++ b/website/docs/services/msk/batch_scram_secrets/index.md
@@ -140,7 +140,7 @@ region,
 cluster_arn,
 secret_arn_list
 FROM awscc.msk.batch_scram_secrets
-WHERE region = 'us-east-1' AND Identifier = '<ClusterArn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ cluster_arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -176,8 +176,8 @@ INSERT INTO awscc.msk.batch_scram_secrets (
  ClusterArn,
  region
 )
-SELECT 
-'{{ ClusterArn }}',
+SELECT
+'{{ cluster_arn }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -190,9 +190,9 @@ INSERT INTO awscc.msk.batch_scram_secrets (
  SecretArnList,
  region
 )
-SELECT 
- '{{ ClusterArn }}',
- '{{ SecretArnList }}',
+SELECT
+ '{{ cluster_arn }}',
+ '{{ secret_arn_list }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -210,12 +210,11 @@ globals:
 resources:
   - name: batch_scram_secret
     props:
-      - name: ClusterArn
-        value: '{{ ClusterArn }}'
-      - name: SecretArnList
+      - name: cluster_arn
+        value: '{{ cluster_arn }}'
+      - name: secret_arn_list
         value:
-          - '{{ SecretArnList[0] }}'
-
+          - '{{ secret_arn_list[0] }}'
 ```
 </TabItem>
 </Tabs>
@@ -231,7 +230,7 @@ SET PatchDocument = string('{{ {
     "SecretArnList": secret_arn_list
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<ClusterArn>';
+AND Identifier = '{{ cluster_arn }}';
 ```
 
 
@@ -240,7 +239,7 @@ AND Identifier = '<ClusterArn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.msk.batch_scram_secrets
-WHERE Identifier = '<ClusterArn>'
+WHERE Identifier = '{{ cluster_arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/msk/cluster_policies/index.md b/website/docs/services/msk/cluster_policies/index.md
index 3d43c9924..f2507f79f 100644
--- a/website/docs/services/msk/cluster_policies/index.md
+++ b/website/docs/services/msk/cluster_policies/index.md
@@ -146,7 +146,7 @@ policy,
 cluster_arn,
 current_version
 FROM awscc.msk.cluster_policies
-WHERE region = 'us-east-1' AND Identifier = '<ClusterArn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ cluster_arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -183,9 +183,9 @@ INSERT INTO awscc.msk.cluster_policies (
  ClusterArn,
  region
 )
-SELECT 
-'{{ Policy }}',
- '{{ ClusterArn }}',
+SELECT
+'{{ policy }}',
+ '{{ cluster_arn }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -198,9 +198,9 @@ INSERT INTO awscc.msk.cluster_policies (
  ClusterArn,
  region
 )
-SELECT 
- '{{ Policy }}',
- '{{ ClusterArn }}',
+SELECT
+ '{{ policy }}',
+ '{{ cluster_arn }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -218,11 +218,10 @@ globals:
 resources:
   - name: cluster_policy
     props:
-      - name: Policy
+      - name: policy
         value: {}
-      - name: ClusterArn
-        value: '{{ ClusterArn }}'
-
+      - name: cluster_arn
+        value: '{{ cluster_arn }}'
 ```
 </TabItem>
 </Tabs>
@@ -238,7 +237,7 @@ SET PatchDocument = string('{{ {
     "Policy": policy
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<ClusterArn>';
+AND Identifier = '{{ cluster_arn }}';
 ```
 
 
@@ -247,7 +246,7 @@ AND Identifier = '<ClusterArn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.msk.cluster_policies
-WHERE Identifier = '<ClusterArn>'
+WHERE Identifier = '{{ cluster_arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/msk/clusters/index.md b/website/docs/services/msk/clusters/index.md
index ac191ff5f..325860130 100644
--- a/website/docs/services/msk/clusters/index.md
+++ b/website/docs/services/msk/clusters/index.md
@@ -451,7 +451,7 @@ tags,
 configuration_info,
 storage_mode
 FROM awscc.msk.clusters
-WHERE region = 'us-east-1' AND Identifier = '<Arn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -490,11 +490,11 @@ INSERT INTO awscc.msk.clusters (
  ClusterName,
  region
 )
-SELECT 
-'{{ BrokerNodeGroupInfo }}',
- '{{ KafkaVersion }}',
- '{{ NumberOfBrokerNodes }}',
- '{{ ClusterName }}',
+SELECT
+'{{ broker_node_group_info }}',
+ '{{ kafka_version }}',
+ '{{ number_of_broker_nodes }}',
+ '{{ cluster_name }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -518,20 +518,20 @@ INSERT INTO awscc.msk.clusters (
  StorageMode,
  region
 )
-SELECT 
- '{{ BrokerNodeGroupInfo }}',
- '{{ EnhancedMonitoring }}',
- '{{ KafkaVersion }}',
- '{{ NumberOfBrokerNodes }}',
- '{{ EncryptionInfo }}',
- '{{ OpenMonitoring }}',
- '{{ ClusterName }}',
- '{{ CurrentVersion }}',
- '{{ ClientAuthentication }}',
- '{{ LoggingInfo }}',
- '{{ Tags }}',
- '{{ ConfigurationInfo }}',
- '{{ StorageMode }}',
+SELECT
+ '{{ broker_node_group_info }}',
+ '{{ enhanced_monitoring }}',
+ '{{ kafka_version }}',
+ '{{ number_of_broker_nodes }}',
+ '{{ encryption_info }}',
+ '{{ open_monitoring }}',
+ '{{ cluster_name }}',
+ '{{ current_version }}',
+ '{{ client_authentication }}',
+ '{{ logging_info }}',
+ '{{ tags }}',
+ '{{ configuration_info }}',
+ '{{ storage_mode }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -549,83 +549,82 @@ globals:
 resources:
   - name: cluster
     props:
-      - name: BrokerNodeGroupInfo
+      - name: broker_node_group_info
         value:
-          StorageInfo:
-            EBSStorageInfo:
-              VolumeSize: '{{ VolumeSize }}'
-              ProvisionedThroughput:
-                Enabled: '{{ Enabled }}'
-                VolumeThroughput: '{{ VolumeThroughput }}'
-          ConnectivityInfo:
-            PublicAccess:
-              Type: '{{ Type }}'
-            VpcConnectivity:
-              ClientAuthentication:
-                Tls:
-                  Enabled: '{{ Enabled }}'
-                Sasl:
-                  Scram:
-                    Enabled: '{{ Enabled }}'
-                  Iam:
-                    Enabled: '{{ Enabled }}'
-          SecurityGroups:
-            - '{{ SecurityGroups[0] }}'
-          BrokerAZDistribution: '{{ BrokerAZDistribution }}'
-          ClientSubnets:
-            - '{{ ClientSubnets[0] }}'
-          InstanceType: '{{ InstanceType }}'
-      - name: EnhancedMonitoring
-        value: '{{ EnhancedMonitoring }}'
-      - name: KafkaVersion
-        value: '{{ KafkaVersion }}'
-      - name: NumberOfBrokerNodes
-        value: '{{ NumberOfBrokerNodes }}'
-      - name: EncryptionInfo
+          storage_info:
+            ebs_storage_info:
+              volume_size: '{{ volume_size }}'
+              provisioned_throughput:
+                enabled: '{{ enabled }}'
+                volume_throughput: '{{ volume_throughput }}'
+          connectivity_info:
+            public_access:
+              type: '{{ type }}'
+            vpc_connectivity:
+              client_authentication:
+                tls:
+                  enabled: '{{ enabled }}'
+                sasl:
+                  scram:
+                    enabled: '{{ enabled }}'
+                  iam:
+                    enabled: '{{ enabled }}'
+          security_groups:
+            - '{{ security_groups[0] }}'
+          broker_az_distribution: '{{ broker_az_distribution }}'
+          client_subnets:
+            - '{{ client_subnets[0] }}'
+          instance_type: '{{ instance_type }}'
+      - name: enhanced_monitoring
+        value: '{{ enhanced_monitoring }}'
+      - name: kafka_version
+        value: '{{ kafka_version }}'
+      - name: number_of_broker_nodes
+        value: '{{ number_of_broker_nodes }}'
+      - name: encryption_info
         value:
-          EncryptionAtRest:
-            DataVolumeKMSKeyId: '{{ DataVolumeKMSKeyId }}'
-          EncryptionInTransit:
-            InCluster: '{{ InCluster }}'
-            ClientBroker: '{{ ClientBroker }}'
-      - name: OpenMonitoring
+          encryption_at_rest:
+            data_volume_kms_key_id: '{{ data_volume_kms_key_id }}'
+          encryption_in_transit:
+            in_cluster: '{{ in_cluster }}'
+            client_broker: '{{ client_broker }}'
+      - name: open_monitoring
         value:
-          Prometheus:
-            JmxExporter:
-              EnabledInBroker: '{{ EnabledInBroker }}'
-            NodeExporter:
-              EnabledInBroker: '{{ EnabledInBroker }}'
-      - name: ClusterName
-        value: '{{ ClusterName }}'
-      - name: CurrentVersion
-        value: '{{ CurrentVersion }}'
-      - name: ClientAuthentication
+          prometheus:
+            jmx_exporter:
+              enabled_in_broker: '{{ enabled_in_broker }}'
+            node_exporter:
+              enabled_in_broker: '{{ enabled_in_broker }}'
+      - name: cluster_name
+        value: '{{ cluster_name }}'
+      - name: current_version
+        value: '{{ current_version }}'
+      - name: client_authentication
         value:
-          Sasl:
-            Iam:
-              Enabled: '{{ Enabled }}'
-      - name: LoggingInfo
+          sasl:
+            iam:
+              enabled: '{{ enabled }}'
+      - name: logging_info
         value:
-          BrokerLogs:
-            S3:
-              Enabled: '{{ Enabled }}'
-              Prefix: '{{ Prefix }}'
-              Bucket: '{{ Bucket }}'
-            CloudWatchLogs:
-              LogGroup: '{{ LogGroup }}'
-              Enabled: '{{ Enabled }}'
-            Firehose:
-              Enabled: '{{ Enabled }}'
-              DeliveryStream: '{{ DeliveryStream }}'
-      - name: Tags
+          broker_logs:
+            s3:
+              enabled: '{{ enabled }}'
+              prefix: '{{ prefix }}'
+              bucket: '{{ bucket }}'
+            cloud_watch_logs:
+              log_group: '{{ log_group }}'
+              enabled: '{{ enabled }}'
+            firehose:
+              enabled: '{{ enabled }}'
+              delivery_stream: '{{ delivery_stream }}'
+      - name: tags
         value: {}
-      - name: ConfigurationInfo
+      - name: configuration_info
         value:
-          Revision: '{{ Revision }}'
-          Arn: '{{ Arn }}'
-      - name: StorageMode
-        value: '{{ StorageMode }}'
-
+          revision: '{{ revision }}'
+          arn: '{{ arn }}'
+      - name: storage_mode
+        value: '{{ storage_mode }}'
 ```
 </TabItem>
 </Tabs>
@@ -650,7 +649,7 @@ SET PatchDocument = string('{{ {
     "StorageMode": storage_mode
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Arn>';
+AND Identifier = '{{ arn }}';
 ```
 
 
@@ -659,7 +658,7 @@ AND Identifier = '<Arn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.msk.clusters
-WHERE Identifier = '<Arn>'
+WHERE Identifier = '{{ arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/msk/configurations/index.md b/website/docs/services/msk/configurations/index.md
index e6412e476..3b70c5269 100644
--- a/website/docs/services/msk/configurations/index.md
+++ b/website/docs/services/msk/configurations/index.md
@@ -181,7 +181,7 @@ kafka_versions_list,
 arn,
 latest_revision
 FROM awscc.msk.configurations
-WHERE region = 'us-east-1' AND Identifier = '<Arn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -218,9 +218,9 @@ INSERT INTO awscc.msk.configurations (
  ServerProperties,
  region
 )
-SELECT 
-'{{ Name }}',
- '{{ ServerProperties }}',
+SELECT
+'{{ name }}',
+ '{{ server_properties }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -236,12 +236,12 @@ INSERT INTO awscc.msk.configurations (
  LatestRevision,
  region
 )
-SELECT 
- '{{ Name }}',
- '{{ Description }}',
- '{{ ServerProperties }}',
- '{{ KafkaVersionsList }}',
- '{{ LatestRevision }}',
+SELECT
+ '{{ name }}',
+ '{{ description }}',
+ '{{ server_properties }}',
+ '{{ kafka_versions_list }}',
+ '{{ latest_revision }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -259,21 +259,20 @@ globals:
 resources:
   - name: configuration
     props:
-      - name: Name
-        value: '{{ Name }}'
-      - name: Description
-        value: '{{ Description }}'
-      - name: ServerProperties
-        value: '{{ ServerProperties }}'
-      - name: KafkaVersionsList
+      - name: name
+        value: '{{ name }}'
+      - name: description
+        value: '{{ description }}'
+      - name: server_properties
+        value: '{{ server_properties }}'
+      - name: kafka_versions_list
         value:
-          - '{{ KafkaVersionsList[0] }}'
-      - name: LatestRevision
+          - '{{ kafka_versions_list[0] }}'
+      - name: latest_revision
         value:
-          CreationTime: '{{ CreationTime }}'
-          Description: '{{ Description }}'
-          Revision: '{{ Revision }}'
-
+          creation_time: '{{ creation_time }}'
+          description: '{{ description }}'
+          revision: '{{ revision }}'
 ```
 </TabItem>
 </Tabs>
@@ -290,7 +289,7 @@ SET PatchDocument = string('{{ {
     "ServerProperties": server_properties
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Arn>';
+AND Identifier = '{{ arn }}';
 ```
 
 
@@ -299,7 +298,7 @@ AND Identifier = '<Arn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.msk.configurations
-WHERE Identifier = '<Arn>'
+WHERE Identifier = '{{ arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/msk/replicators/index.md b/website/docs/services/msk/replicators/index.md
index 2732a9d27..2aeaa5dbd 100644
--- a/website/docs/services/msk/replicators/index.md
+++ b/website/docs/services/msk/replicators/index.md
@@ -319,7 +319,7 @@ replication_info_list,
 service_execution_role_arn,
 tags
 FROM awscc.msk.replicators
-WHERE region = 'us-east-1' AND Identifier = '<ReplicatorArn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ replicator_arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -358,11 +358,11 @@ INSERT INTO awscc.msk.replicators (
  ServiceExecutionRoleArn,
  region
 )
-SELECT 
-'{{ ReplicatorName }}',
- '{{ KafkaClusters }}',
- '{{ ReplicationInfoList }}',
- '{{ ServiceExecutionRoleArn }}',
+SELECT
+'{{ replicator_name }}',
+ '{{ kafka_clusters }}',
+ '{{ replication_info_list }}',
+ '{{ service_execution_role_arn }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -379,13 +379,13 @@ INSERT INTO awscc.msk.replicators (
  Tags,
  region
 )
-SELECT 
- '{{ ReplicatorName }}',
- '{{ Description }}',
- '{{ KafkaClusters }}',
- '{{ ReplicationInfoList }}',
- '{{ ServiceExecutionRoleArn }}',
- '{{ Tags }}',
+SELECT
+ '{{ replicator_name }}',
+ '{{ description }}',
+ '{{ kafka_clusters }}',
+ '{{ replication_info_list }}',
+ '{{ service_execution_role_arn }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -403,50 +403,49 @@ globals:
 resources:
   - name: replicator
     props:
-      - name: ReplicatorName
-        value: '{{ ReplicatorName }}'
-      - name: Description
-        value: '{{ Description }}'
-      - name: KafkaClusters
+      - name: replicator_name
+        value: '{{ replicator_name }}'
+      - name: description
+        value: '{{ description }}'
+      - name: kafka_clusters
         value:
-          - AmazonMskCluster:
-              MskClusterArn: '{{ MskClusterArn }}'
-            VpcConfig:
-              SecurityGroupIds:
-                - '{{ SecurityGroupIds[0] }}'
-              SubnetIds:
-                - '{{ SubnetIds[0] }}'
-      - name: ReplicationInfoList
+          - amazon_msk_cluster:
+              msk_cluster_arn: '{{ msk_cluster_arn }}'
+            vpc_config:
+              security_group_ids:
+                - '{{ security_group_ids[0] }}'
+              subnet_ids:
+                - '{{ subnet_ids[0] }}'
+      - name: replication_info_list
         value:
-          - SourceKafkaClusterArn: '{{ SourceKafkaClusterArn }}'
-            TargetKafkaClusterArn: '{{ TargetKafkaClusterArn }}'
-            TargetCompressionType: '{{ TargetCompressionType }}'
-            TopicReplication:
-              TopicsToReplicate:
-                - '{{ TopicsToReplicate[0] }}'
-              TopicsToExclude:
-                - '{{ TopicsToExclude[0] }}'
-              CopyTopicConfigurations: '{{ CopyTopicConfigurations }}'
-              CopyAccessControlListsForTopics: '{{ CopyAccessControlListsForTopics }}'
-              DetectAndCopyNewTopics: '{{ DetectAndCopyNewTopics }}'
-              StartingPosition:
-                Type: '{{ Type }}'
-              TopicNameConfiguration:
-                Type: '{{ Type }}'
-            ConsumerGroupReplication:
-              ConsumerGroupsToReplicate:
-                - '{{ ConsumerGroupsToReplicate[0] }}'
-              ConsumerGroupsToExclude:
-                - '{{ ConsumerGroupsToExclude[0] }}'
-              SynchroniseConsumerGroupOffsets: '{{ SynchroniseConsumerGroupOffsets }}'
-              DetectAndCopyNewConsumerGroups: '{{ DetectAndCopyNewConsumerGroups }}'
-      - name: ServiceExecutionRoleArn
-        value: '{{ ServiceExecutionRoleArn }}'
-      - name: Tags
+          - source_kafka_cluster_arn: '{{ source_kafka_cluster_arn }}'
+            target_kafka_cluster_arn: '{{ target_kafka_cluster_arn }}'
+            target_compression_type: '{{ target_compression_type }}'
+            topic_replication:
+              topics_to_replicate:
+                - '{{ topics_to_replicate[0] }}'
+              topics_to_exclude:
+                - '{{ topics_to_exclude[0] }}'
+              copy_topic_configurations: '{{ copy_topic_configurations }}'
+              copy_access_control_lists_for_topics: '{{ copy_access_control_lists_for_topics }}'
+              detect_and_copy_new_topics: '{{ detect_and_copy_new_topics }}'
+              starting_position:
+                type: '{{ type }}'
+              topic_name_configuration:
+                type: '{{ type }}'
+            consumer_group_replication:
+              consumer_groups_to_replicate:
+                - '{{ consumer_groups_to_replicate[0] }}'
+              consumer_groups_to_exclude:
+                - '{{ consumer_groups_to_exclude[0] }}'
+              synchronise_consumer_group_offsets: '{{ synchronise_consumer_group_offsets }}'
+              detect_and_copy_new_consumer_groups: '{{ detect_and_copy_new_consumer_groups }}'
+      - name: service_execution_role_arn
+        value: '{{ service_execution_role_arn }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -462,7 +461,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<ReplicatorArn>';
+AND Identifier = '{{ replicator_arn }}';
 ```
 
 
@@ -471,7 +470,7 @@ AND Identifier = '<ReplicatorArn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.msk.replicators
-WHERE Identifier = '<ReplicatorArn>'
+WHERE Identifier = '{{ replicator_arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/msk/serverless_clusters/index.md b/website/docs/services/msk/serverless_clusters/index.md
index dce67a243..7e7002171 100644
--- a/website/docs/services/msk/serverless_clusters/index.md
+++ b/website/docs/services/msk/serverless_clusters/index.md
@@ -185,7 +185,7 @@ vpc_configs,
 client_authentication,
 tags
 FROM awscc.msk.serverless_clusters
-WHERE region = 'us-east-1' AND Identifier = '<Arn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -223,10 +223,10 @@ INSERT INTO awscc.msk.serverless_clusters (
  ClientAuthentication,
  region
 )
-SELECT 
-'{{ ClusterName }}',
- '{{ VpcConfigs }}',
- '{{ ClientAuthentication }}',
+SELECT
+'{{ cluster_name }}',
+ '{{ vpc_configs }}',
+ '{{ client_authentication }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -241,11 +241,11 @@ INSERT INTO awscc.msk.serverless_clusters (
  Tags,
  region
 )
-SELECT 
- '{{ ClusterName }}',
- '{{ VpcConfigs }}',
- '{{ ClientAuthentication }}',
- '{{ Tags }}',
+SELECT
+ '{{ cluster_name }}',
+ '{{ vpc_configs }}',
+ '{{ client_authentication }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -263,22 +263,21 @@ globals:
 resources:
   - name: serverless_cluster
     props:
-      - name: ClusterName
-        value: '{{ ClusterName }}'
-      - name: VpcConfigs
+      - name: cluster_name
+        value: '{{ cluster_name }}'
+      - name: vpc_configs
         value:
-          - SecurityGroups:
-              - '{{ SecurityGroups[0] }}'
-            SubnetIds:
-              - '{{ SubnetIds[0] }}'
-      - name: ClientAuthentication
+          - security_groups:
+              - '{{ security_groups[0] }}'
+            subnet_ids:
+              - '{{ subnet_ids[0] }}'
+      - name: client_authentication
         value:
-          Sasl:
-            Iam:
-              Enabled: '{{ Enabled }}'
-      - name: Tags
+          sasl:
+            iam:
+              enabled: '{{ enabled }}'
+      - name: tags
         value: {}
-
 ```
 </TabItem>
 </Tabs>
@@ -289,7 +288,7 @@ resources:
 ```sql
 /*+ delete */
 DELETE FROM awscc.msk.serverless_clusters
-WHERE Identifier = '<Arn>'
+WHERE Identifier = '{{ arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/msk/vpc_connections/index.md b/website/docs/services/msk/vpc_connections/index.md
index bd372c9de..0c357978d 100644
--- a/website/docs/services/msk/vpc_connections/index.md
+++ b/website/docs/services/msk/vpc_connections/index.md
@@ -170,7 +170,7 @@ security_groups,
 tags,
 vpc_id
 FROM awscc.msk.vpc_connections
-WHERE region = 'us-east-1' AND Identifier = '<Arn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -210,12 +210,12 @@ INSERT INTO awscc.msk.vpc_connections (
  VpcId,
  region
 )
-SELECT 
-'{{ Authentication }}',
- '{{ ClientSubnets }}',
- '{{ TargetClusterArn }}',
- '{{ SecurityGroups }}',
- '{{ VpcId }}',
+SELECT
+'{{ authentication }}',
+ '{{ client_subnets }}',
+ '{{ target_cluster_arn }}',
+ '{{ security_groups }}',
+ '{{ vpc_id }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -232,13 +232,13 @@ INSERT INTO awscc.msk.vpc_connections (
  VpcId,
  region
 )
-SELECT 
- '{{ Authentication }}',
- '{{ ClientSubnets }}',
- '{{ TargetClusterArn }}',
- '{{ SecurityGroups }}',
- '{{ Tags }}',
- '{{ VpcId }}',
+SELECT
+ '{{ authentication }}',
+ '{{ client_subnets }}',
+ '{{ target_cluster_arn }}',
+ '{{ security_groups }}',
+ '{{ tags }}',
+ '{{ vpc_id }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -256,21 +256,20 @@ globals:
 resources:
   - name: vpc_connection
     props:
-      - name: Authentication
-        value: '{{ Authentication }}'
-      - name: ClientSubnets
+      - name: authentication
+        value: '{{ authentication }}'
+      - name: client_subnets
         value:
-          - '{{ ClientSubnets[0] }}'
-      - name: TargetClusterArn
-        value: '{{ TargetClusterArn }}'
-      - name: SecurityGroups
+          - '{{ client_subnets[0] }}'
+      - name: target_cluster_arn
+        value: '{{ target_cluster_arn }}'
+      - name: security_groups
         value:
-          - '{{ SecurityGroups[0] }}'
-      - name: Tags
+          - '{{ security_groups[0] }}'
+      - name: tags
         value: {}
-      - name: VpcId
-        value: '{{ VpcId }}'
-
+      - name: vpc_id
+        value: '{{ vpc_id }}'
 ```
 </TabItem>
 </Tabs>
@@ -286,7 +285,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Arn>';
+AND Identifier = '{{ arn }}';
 ```
 
 
@@ -295,7 +294,7 @@ AND Identifier = '<Arn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.msk.vpc_connections
-WHERE Identifier = '<Arn>'
+WHERE Identifier = '{{ arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/mwaa/environments/index.md b/website/docs/services/mwaa/environments/index.md
index c1b8fa1e5..beb2afc4b 100644
--- a/website/docs/services/mwaa/environments/index.md
+++ b/website/docs/services/mwaa/environments/index.md
@@ -325,7 +325,7 @@ database_vpc_endpoint_service,
 webserver_vpc_endpoint_service,
 worker_replacement_strategy
 FROM awscc.mwaa.environments
-WHERE region = 'us-east-1' AND Identifier = '<Name>';
+WHERE region = 'us-east-1' AND Identifier = '{{ name }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -361,8 +361,8 @@ INSERT INTO awscc.mwaa.environments (
  Name,
  region
 )
-SELECT 
-'{{ Name }}',
+SELECT
+'{{ name }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -399,33 +399,33 @@ INSERT INTO awscc.mwaa.environments (
  WorkerReplacementStrategy,
  region
 )
-SELECT 
- '{{ Name }}',
- '{{ ExecutionRoleArn }}',
- '{{ KmsKey }}',
- '{{ AirflowVersion }}',
- '{{ SourceBucketArn }}',
- '{{ DagS3Path }}',
- '{{ PluginsS3Path }}',
- '{{ PluginsS3ObjectVersion }}',
- '{{ RequirementsS3Path }}',
- '{{ RequirementsS3ObjectVersion }}',
- '{{ StartupScriptS3Path }}',
- '{{ StartupScriptS3ObjectVersion }}',
- '{{ AirflowConfigurationOptions }}',
- '{{ EnvironmentClass }}',
- '{{ MaxWorkers }}',
- '{{ MinWorkers }}',
- '{{ MaxWebservers }}',
- '{{ MinWebservers }}',
- '{{ Schedulers }}',
- '{{ NetworkConfiguration }}',
- '{{ LoggingConfiguration }}',
- '{{ WeeklyMaintenanceWindowStart }}',
- '{{ Tags }}',
- '{{ WebserverAccessMode }}',
- '{{ EndpointManagement }}',
- '{{ WorkerReplacementStrategy }}',
+SELECT
+ '{{ name }}',
+ '{{ execution_role_arn }}',
+ '{{ kms_key }}',
+ '{{ airflow_version }}',
+ '{{ source_bucket_arn }}',
+ '{{ dag_s3_path }}',
+ '{{ plugins_s3_path }}',
+ '{{ plugins_s3_object_version }}',
+ '{{ requirements_s3_path }}',
+ '{{ requirements_s3_object_version }}',
+ '{{ startup_script_s3_path }}',
+ '{{ startup_script_s3_object_version }}',
+ '{{ airflow_configuration_options }}',
+ '{{ environment_class }}',
+ '{{ max_workers }}',
+ '{{ min_workers }}',
+ '{{ max_webservers }}',
+ '{{ min_webservers }}',
+ '{{ schedulers }}',
+ '{{ network_configuration }}',
+ '{{ logging_configuration }}',
+ '{{ weekly_maintenance_window_start }}',
+ '{{ tags }}',
+ '{{ webserver_access_mode }}',
+ '{{ endpoint_management }}',
+ '{{ worker_replacement_strategy }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -443,71 +443,70 @@ globals:
 resources:
   - name: environment
     props:
-      - name: Name
-        value: '{{ Name }}'
-      - name: ExecutionRoleArn
-        value: '{{ ExecutionRoleArn }}'
-      - name: KmsKey
-        value: '{{ KmsKey }}'
-      - name: AirflowVersion
-        value: '{{ AirflowVersion }}'
-      - name: SourceBucketArn
-        value: '{{ SourceBucketArn }}'
-      - name: DagS3Path
-        value: '{{ DagS3Path }}'
-      - name: PluginsS3Path
+      - name: name
+        value: '{{ name }}'
+      - name: execution_role_arn
+        value: '{{ execution_role_arn }}'
+      - name: kms_key
+        value: '{{ kms_key }}'
+      - name: airflow_version
+        value: '{{ airflow_version }}'
+      - name: source_bucket_arn
+        value: '{{ source_bucket_arn }}'
+      - name: dag_s3_path
+        value: '{{ dag_s3_path }}'
+      - name: plugins_s3_path
         value: null
-      - name: PluginsS3ObjectVersion
-        value: '{{ PluginsS3ObjectVersion }}'
-      - name: RequirementsS3Path
+      - name: plugins_s3_object_version
+        value: '{{ plugins_s3_object_version }}'
+      - name: requirements_s3_path
         value: null
-      - name: RequirementsS3ObjectVersion
+      - name: requirements_s3_object_version
         value: null
-      - name: StartupScriptS3Path
+      - name: startup_script_s3_path
         value: null
-      - name: StartupScriptS3ObjectVersion
+      - name: startup_script_s3_object_version
         value: null
-      - name: AirflowConfigurationOptions
+      - name: airflow_configuration_options
         value: {}
-      - name: EnvironmentClass
-        value: '{{ EnvironmentClass }}'
-      - name: MaxWorkers
-        value: '{{ MaxWorkers }}'
-      - name: MinWorkers
-        value: '{{ MinWorkers }}'
-      - name: MaxWebservers
-        value: '{{ MaxWebservers }}'
-      - name: MinWebservers
-        value: '{{ MinWebservers }}'
-      - name: Schedulers
-        value: '{{ Schedulers }}'
-      - name: NetworkConfiguration
+      - name: environment_class
+        value: '{{ environment_class }}'
+      - name: max_workers
+        value: '{{ max_workers }}'
+      - name: min_workers
+        value: '{{ min_workers }}'
+      - name: max_webservers
+        value: '{{ max_webservers }}'
+      - name: min_webservers
+        value: '{{ min_webservers }}'
+      - name: schedulers
+        value: '{{ schedulers }}'
+      - name: network_configuration
         value:
-          SubnetIds:
-            - '{{ SubnetIds[0] }}'
-          SecurityGroupIds:
-            - '{{ SecurityGroupIds[0] }}'
-      - name: LoggingConfiguration
+          subnet_ids:
+            - '{{ subnet_ids[0] }}'
+          security_group_ids:
+            - '{{ security_group_ids[0] }}'
+      - name: logging_configuration
         value:
-          DagProcessingLogs:
-            Enabled: '{{ Enabled }}'
-            LogLevel: '{{ LogLevel }}'
-            CloudWatchLogGroupArn: '{{ CloudWatchLogGroupArn }}'
-          SchedulerLogs: null
-          WebserverLogs: null
-          WorkerLogs: null
-          TaskLogs: null
-      - name: WeeklyMaintenanceWindowStart
-        value: '{{ WeeklyMaintenanceWindowStart }}'
-      - name: Tags
+          dag_processing_logs:
+            enabled: '{{ enabled }}'
+            log_level: '{{ log_level }}'
+            cloud_watch_log_group_arn: '{{ cloud_watch_log_group_arn }}'
+          scheduler_logs: null
+          webserver_logs: null
+          worker_logs: null
+          task_logs: null
+      - name: weekly_maintenance_window_start
+        value: '{{ weekly_maintenance_window_start }}'
+      - name: tags
         value: {}
-      - name: WebserverAccessMode
-        value: '{{ WebserverAccessMode }}'
-      - name: EndpointManagement
-        value: '{{ EndpointManagement }}'
-      - name: WorkerReplacementStrategy
-        value: '{{ WorkerReplacementStrategy }}'
-
+      - name: webserver_access_mode
+        value: '{{ webserver_access_mode }}'
+      - name: endpoint_management
+        value: '{{ endpoint_management }}'
+      - name: worker_replacement_strategy
+        value: '{{ worker_replacement_strategy }}'
 ```
 </TabItem>
 </Tabs>
@@ -543,7 +542,7 @@ SET PatchDocument = string('{{ {
     "WorkerReplacementStrategy": worker_replacement_strategy
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Name>';
+AND Identifier = '{{ name }}';
 ```
 
 
@@ -552,7 +551,7 @@ AND Identifier = '<Name>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.mwaa.environments
-WHERE Identifier = '<Name>'
+WHERE Identifier = '{{ name }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/neptune/db_cluster_parameter_groups/index.md b/website/docs/services/neptune/db_cluster_parameter_groups/index.md
index 64223b7aa..ead7b94fb 100644
--- a/website/docs/services/neptune/db_cluster_parameter_groups/index.md
+++ b/website/docs/services/neptune/db_cluster_parameter_groups/index.md
@@ -170,7 +170,7 @@ parameters,
 name,
 tags
 FROM awscc.neptune.db_cluster_parameter_groups
-WHERE region = 'us-east-1' AND Identifier = '<Name>';
+WHERE region = 'us-east-1' AND Identifier = '{{ name }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -208,10 +208,10 @@ INSERT INTO awscc.neptune.db_cluster_parameter_groups (
  Parameters,
  region
 )
-SELECT 
-'{{ Description }}',
- '{{ Family }}',
- '{{ Parameters }}',
+SELECT
+'{{ description }}',
+ '{{ family }}',
+ '{{ parameters }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -227,12 +227,12 @@ INSERT INTO awscc.neptune.db_cluster_parameter_groups (
  Tags,
  region
 )
-SELECT 
- '{{ Description }}',
- '{{ Family }}',
- '{{ Parameters }}',
- '{{ Name }}',
- '{{ Tags }}',
+SELECT
+ '{{ description }}',
+ '{{ family }}',
+ '{{ parameters }}',
+ '{{ name }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -250,19 +250,18 @@ globals:
 resources:
   - name: db_cluster_parameter_group
     props:
-      - name: Description
-        value: '{{ Description }}'
-      - name: Family
-        value: '{{ Family }}'
-      - name: Parameters
+      - name: description
+        value: '{{ description }}'
+      - name: family
+        value: '{{ family }}'
+      - name: parameters
         value: {}
-      - name: Name
-        value: '{{ Name }}'
-      - name: Tags
+      - name: name
+        value: '{{ name }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -279,7 +278,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Name>';
+AND Identifier = '{{ name }}';
 ```
 
 
@@ -288,7 +287,7 @@ AND Identifier = '<Name>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.neptune.db_cluster_parameter_groups
-WHERE Identifier = '<Name>'
+WHERE Identifier = '{{ name }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/neptune/db_clusters/index.md b/website/docs/services/neptune/db_clusters/index.md
index bd7879d4a..77aaf2de3 100644
--- a/website/docs/services/neptune/db_clusters/index.md
+++ b/website/docs/services/neptune/db_clusters/index.md
@@ -338,7 +338,7 @@ tags,
 use_latest_restorable_time,
 vpc_security_group_ids
 FROM awscc.neptune.db_clusters
-WHERE region = 'us-east-1' AND Identifier = '<DBClusterIdentifier>';
+WHERE region = 'us-east-1' AND Identifier = '{{ db_cluster_identifier }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -398,32 +398,32 @@ INSERT INTO awscc.neptune.db_clusters (
  VpcSecurityGroupIds,
  region
 )
-SELECT 
-'{{ AssociatedRoles }}',
- '{{ AvailabilityZones }}',
- '{{ BackupRetentionPeriod }}',
- '{{ CopyTagsToSnapshot }}',
- '{{ DBClusterIdentifier }}',
- '{{ DBClusterParameterGroupName }}',
- '{{ DBInstanceParameterGroupName }}',
- '{{ DBPort }}',
- '{{ DBSubnetGroupName }}',
- '{{ DeletionProtection }}',
- '{{ EnableCloudwatchLogsExports }}',
- '{{ EngineVersion }}',
- '{{ IamAuthEnabled }}',
- '{{ KmsKeyId }}',
- '{{ PreferredBackupWindow }}',
- '{{ PreferredMaintenanceWindow }}',
- '{{ RestoreToTime }}',
- '{{ RestoreType }}',
- '{{ ServerlessScalingConfiguration }}',
- '{{ SnapshotIdentifier }}',
- '{{ SourceDBClusterIdentifier }}',
- '{{ StorageEncrypted }}',
- '{{ Tags }}',
- '{{ UseLatestRestorableTime }}',
- '{{ VpcSecurityGroupIds }}',
+SELECT
+'{{ associated_roles }}',
+ '{{ availability_zones }}',
+ '{{ backup_retention_period }}',
+ '{{ copy_tags_to_snapshot }}',
+ '{{ db_cluster_identifier }}',
+ '{{ db_cluster_parameter_group_name }}',
+ '{{ db_instance_parameter_group_name }}',
+ '{{ db_port }}',
+ '{{ db_subnet_group_name }}',
+ '{{ deletion_protection }}',
+ '{{ enable_cloudwatch_logs_exports }}',
+ '{{ engine_version }}',
+ '{{ iam_auth_enabled }}',
+ '{{ kms_key_id }}',
+ '{{ preferred_backup_window }}',
+ '{{ preferred_maintenance_window }}',
+ '{{ restore_to_time }}',
+ '{{ restore_type }}',
+ '{{ serverless_scaling_configuration }}',
+ '{{ snapshot_identifier }}',
+ '{{ source_db_cluster_identifier }}',
+ '{{ storage_encrypted }}',
+ '{{ tags }}',
+ '{{ use_latest_restorable_time }}',
+ '{{ vpc_security_group_ids }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -459,32 +459,32 @@ INSERT INTO awscc.neptune.db_clusters (
  VpcSecurityGroupIds,
  region
 )
-SELECT 
- '{{ AssociatedRoles }}',
- '{{ AvailabilityZones }}',
- '{{ BackupRetentionPeriod }}',
- '{{ CopyTagsToSnapshot }}',
- '{{ DBClusterIdentifier }}',
- '{{ DBClusterParameterGroupName }}',
- '{{ DBInstanceParameterGroupName }}',
- '{{ DBPort }}',
- '{{ DBSubnetGroupName }}',
- '{{ DeletionProtection }}',
- '{{ EnableCloudwatchLogsExports }}',
- '{{ EngineVersion }}',
- '{{ IamAuthEnabled }}',
- '{{ KmsKeyId }}',
- '{{ PreferredBackupWindow }}',
- '{{ PreferredMaintenanceWindow }}',
- '{{ RestoreToTime }}',
- '{{ RestoreType }}',
- '{{ ServerlessScalingConfiguration }}',
- '{{ SnapshotIdentifier }}',
- '{{ SourceDBClusterIdentifier }}',
- '{{ StorageEncrypted }}',
- '{{ Tags }}',
- '{{ UseLatestRestorableTime }}',
- '{{ VpcSecurityGroupIds }}',
+SELECT
+ '{{ associated_roles }}',
+ '{{ availability_zones }}',
+ '{{ backup_retention_period }}',
+ '{{ copy_tags_to_snapshot }}',
+ '{{ db_cluster_identifier }}',
+ '{{ db_cluster_parameter_group_name }}',
+ '{{ db_instance_parameter_group_name }}',
+ '{{ db_port }}',
+ '{{ db_subnet_group_name }}',
+ '{{ deletion_protection }}',
+ '{{ enable_cloudwatch_logs_exports }}',
+ '{{ engine_version }}',
+ '{{ iam_auth_enabled }}',
+ '{{ kms_key_id }}',
+ '{{ preferred_backup_window }}',
+ '{{ preferred_maintenance_window }}',
+ '{{ restore_to_time }}',
+ '{{ restore_type }}',
+ '{{ serverless_scaling_configuration }}',
+ '{{ snapshot_identifier }}',
+ '{{ source_db_cluster_identifier }}',
+ '{{ storage_encrypted }}',
+ '{{ tags }}',
+ '{{ use_latest_restorable_time }}',
+ '{{ vpc_security_group_ids }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -502,66 +502,65 @@ globals:
 resources:
   - name: db_cluster
     props:
-      - name: AssociatedRoles
+      - name: associated_roles
         value:
-          - FeatureName: '{{ FeatureName }}'
-            RoleArn: '{{ RoleArn }}'
-      - name: AvailabilityZones
+          - feature_name: '{{ feature_name }}'
+            role_arn: '{{ role_arn }}'
+      - name: availability_zones
         value:
-          - '{{ AvailabilityZones[0] }}'
-      - name: BackupRetentionPeriod
-        value: '{{ BackupRetentionPeriod }}'
-      - name: CopyTagsToSnapshot
-        value: '{{ CopyTagsToSnapshot }}'
-      - name: DBClusterIdentifier
-        value: '{{ DBClusterIdentifier }}'
-      - name: DBClusterParameterGroupName
-        value: '{{ DBClusterParameterGroupName }}'
-      - name: DBInstanceParameterGroupName
-        value: '{{ DBInstanceParameterGroupName }}'
-      - name: DBPort
-        value: '{{ DBPort }}'
-      - name: DBSubnetGroupName
-        value: '{{ DBSubnetGroupName }}'
-      - name: DeletionProtection
-        value: '{{ DeletionProtection }}'
-      - name: EnableCloudwatchLogsExports
+          - '{{ availability_zones[0] }}'
+      - name: backup_retention_period
+        value: '{{ backup_retention_period }}'
+      - name: copy_tags_to_snapshot
+        value: '{{ copy_tags_to_snapshot }}'
+      - name: db_cluster_identifier
+        value: '{{ db_cluster_identifier }}'
+      - name: db_cluster_parameter_group_name
+        value: '{{ db_cluster_parameter_group_name }}'
+      - name: db_instance_parameter_group_name
+        value: '{{ db_instance_parameter_group_name }}'
+      - name: db_port
+        value: '{{ db_port }}'
+      - name: db_subnet_group_name
+        value: '{{ db_subnet_group_name }}'
+      - name: deletion_protection
+        value: '{{ deletion_protection }}'
+      - name: enable_cloudwatch_logs_exports
         value:
-          - '{{ EnableCloudwatchLogsExports[0] }}'
-      - name: EngineVersion
-        value: '{{ EngineVersion }}'
-      - name: IamAuthEnabled
-        value: '{{ IamAuthEnabled }}'
-      - name: KmsKeyId
-        value: '{{ KmsKeyId }}'
-      - name: PreferredBackupWindow
-        value: '{{ PreferredBackupWindow }}'
-      - name: PreferredMaintenanceWindow
-        value: '{{ PreferredMaintenanceWindow }}'
-      - name: RestoreToTime
-        value: '{{ RestoreToTime }}'
-      - name: RestoreType
-        value: '{{ RestoreType }}'
-      - name: ServerlessScalingConfiguration
+          - '{{ enable_cloudwatch_logs_exports[0] }}'
+      - name: engine_version
+        value: '{{ engine_version }}'
+      - name: iam_auth_enabled
+        value: '{{ iam_auth_enabled }}'
+      - name: kms_key_id
+        value: '{{ kms_key_id }}'
+      - name: preferred_backup_window
+        value: '{{ preferred_backup_window }}'
+      - name: preferred_maintenance_window
+        value: '{{ preferred_maintenance_window }}'
+      - name: restore_to_time
+        value: '{{ restore_to_time }}'
+      - name: restore_type
+        value: '{{ restore_type }}'
+      - name: serverless_scaling_configuration
         value:
-          MinCapacity: null
-          MaxCapacity: null
-      - name: SnapshotIdentifier
-        value: '{{ SnapshotIdentifier }}'
-      - name: SourceDBClusterIdentifier
-        value: '{{ SourceDBClusterIdentifier }}'
-      - name: StorageEncrypted
-        value: '{{ StorageEncrypted }}'
-      - name: Tags
+          min_capacity: null
+          max_capacity: null
+      - name: snapshot_identifier
+        value: '{{ snapshot_identifier }}'
+      - name: source_db_cluster_identifier
+        value: '{{ source_db_cluster_identifier }}'
+      - name: storage_encrypted
+        value: '{{ storage_encrypted }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-      - name: UseLatestRestorableTime
-        value: '{{ UseLatestRestorableTime }}'
-      - name: VpcSecurityGroupIds
+          - key: '{{ key }}'
+            value: '{{ value }}'
+      - name: use_latest_restorable_time
+        value: '{{ use_latest_restorable_time }}'
+      - name: vpc_security_group_ids
         value:
-          - '{{ VpcSecurityGroupIds[0] }}'
-
+          - '{{ vpc_security_group_ids[0] }}'
 ```
 </TabItem>
 </Tabs>
@@ -591,7 +590,7 @@ SET PatchDocument = string('{{ {
     "VpcSecurityGroupIds": vpc_security_group_ids
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<DBClusterIdentifier>';
+AND Identifier = '{{ db_cluster_identifier }}';
 ```
 
 
@@ -600,7 +599,7 @@ AND Identifier = '<DBClusterIdentifier>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.neptune.db_clusters
-WHERE Identifier = '<DBClusterIdentifier>'
+WHERE Identifier = '{{ db_cluster_identifier }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/neptune/db_instances/index.md b/website/docs/services/neptune/db_instances/index.md
index b14eaec69..3c5bbd995 100644
--- a/website/docs/services/neptune/db_instances/index.md
+++ b/website/docs/services/neptune/db_instances/index.md
@@ -218,7 +218,7 @@ preferred_maintenance_window,
 port,
 tags
 FROM awscc.neptune.db_instances
-WHERE region = 'us-east-1' AND Identifier = '<DBInstanceIdentifier>';
+WHERE region = 'us-east-1' AND Identifier = '{{ db_instance_identifier }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -254,8 +254,8 @@ INSERT INTO awscc.neptune.db_instances (
  DBInstanceClass,
  region
 )
-SELECT 
-'{{ DBInstanceClass }}',
+SELECT
+'{{ db_instance_class }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -277,18 +277,18 @@ INSERT INTO awscc.neptune.db_instances (
  Tags,
  region
 )
-SELECT 
- '{{ AllowMajorVersionUpgrade }}',
- '{{ AutoMinorVersionUpgrade }}',
- '{{ AvailabilityZone }}',
- '{{ DBClusterIdentifier }}',
- '{{ DBInstanceClass }}',
- '{{ DBInstanceIdentifier }}',
- '{{ DBParameterGroupName }}',
- '{{ DBSnapshotIdentifier }}',
- '{{ DBSubnetGroupName }}',
- '{{ PreferredMaintenanceWindow }}',
- '{{ Tags }}',
+SELECT
+ '{{ allow_major_version_upgrade }}',
+ '{{ auto_minor_version_upgrade }}',
+ '{{ availability_zone }}',
+ '{{ db_cluster_identifier }}',
+ '{{ db_instance_class }}',
+ '{{ db_instance_identifier }}',
+ '{{ db_parameter_group_name }}',
+ '{{ db_snapshot_identifier }}',
+ '{{ db_subnet_group_name }}',
+ '{{ preferred_maintenance_window }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -306,31 +306,30 @@ globals:
 resources:
   - name: db_instance
     props:
-      - name: AllowMajorVersionUpgrade
-        value: '{{ AllowMajorVersionUpgrade }}'
-      - name: AutoMinorVersionUpgrade
-        value: '{{ AutoMinorVersionUpgrade }}'
-      - name: AvailabilityZone
-        value: '{{ AvailabilityZone }}'
-      - name: DBClusterIdentifier
-        value: '{{ DBClusterIdentifier }}'
-      - name: DBInstanceClass
-        value: '{{ DBInstanceClass }}'
-      - name: DBInstanceIdentifier
-        value: '{{ DBInstanceIdentifier }}'
-      - name: DBParameterGroupName
-        value: '{{ DBParameterGroupName }}'
-      - name: DBSnapshotIdentifier
-        value: '{{ DBSnapshotIdentifier }}'
-      - name: DBSubnetGroupName
-        value: '{{ DBSubnetGroupName }}'
-      - name: PreferredMaintenanceWindow
-        value: '{{ PreferredMaintenanceWindow }}'
-      - name: Tags
+      - name: allow_major_version_upgrade
+        value: '{{ allow_major_version_upgrade }}'
+      - name: auto_minor_version_upgrade
+        value: '{{ auto_minor_version_upgrade }}'
+      - name: availability_zone
+        value: '{{ availability_zone }}'
+      - name: db_cluster_identifier
+        value: '{{ db_cluster_identifier }}'
+      - name: db_instance_class
+        value: '{{ db_instance_class }}'
+      - name: db_instance_identifier
+        value: '{{ db_instance_identifier }}'
+      - name: db_parameter_group_name
+        value: '{{ db_parameter_group_name }}'
+      - name: db_snapshot_identifier
+        value: '{{ db_snapshot_identifier }}'
+      - name: db_subnet_group_name
+        value: '{{ db_subnet_group_name }}'
+      - name: preferred_maintenance_window
+        value: '{{ preferred_maintenance_window }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -351,7 +350,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<DBInstanceIdentifier>';
+AND Identifier = '{{ db_instance_identifier }}';
 ```
 
 
@@ -360,7 +359,7 @@ AND Identifier = '<DBInstanceIdentifier>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.neptune.db_instances
-WHERE Identifier = '<DBInstanceIdentifier>'
+WHERE Identifier = '{{ db_instance_identifier }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/neptune/db_parameter_groups/index.md b/website/docs/services/neptune/db_parameter_groups/index.md
index 66f1fe1d5..71dfa7932 100644
--- a/website/docs/services/neptune/db_parameter_groups/index.md
+++ b/website/docs/services/neptune/db_parameter_groups/index.md
@@ -170,7 +170,7 @@ family,
 parameters,
 tags
 FROM awscc.neptune.db_parameter_groups
-WHERE region = 'us-east-1' AND Identifier = '<Name>';
+WHERE region = 'us-east-1' AND Identifier = '{{ name }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -208,10 +208,10 @@ INSERT INTO awscc.neptune.db_parameter_groups (
  Parameters,
  region
 )
-SELECT 
-'{{ Description }}',
- '{{ Family }}',
- '{{ Parameters }}',
+SELECT
+'{{ description }}',
+ '{{ family }}',
+ '{{ parameters }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -227,12 +227,12 @@ INSERT INTO awscc.neptune.db_parameter_groups (
  Tags,
  region
 )
-SELECT 
- '{{ Name }}',
- '{{ Description }}',
- '{{ Family }}',
- '{{ Parameters }}',
- '{{ Tags }}',
+SELECT
+ '{{ name }}',
+ '{{ description }}',
+ '{{ family }}',
+ '{{ parameters }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -250,19 +250,18 @@ globals:
 resources:
   - name: db_parameter_group
     props:
-      - name: Name
-        value: '{{ Name }}'
-      - name: Description
-        value: '{{ Description }}'
-      - name: Family
-        value: '{{ Family }}'
-      - name: Parameters
+      - name: name
+        value: '{{ name }}'
+      - name: description
+        value: '{{ description }}'
+      - name: family
+        value: '{{ family }}'
+      - name: parameters
         value: {}
-      - name: Tags
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -279,7 +278,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Name>';
+AND Identifier = '{{ name }}';
 ```
 
 
@@ -288,7 +287,7 @@ AND Identifier = '<Name>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.neptune.db_parameter_groups
-WHERE Identifier = '<Name>'
+WHERE Identifier = '{{ name }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/neptune/db_subnet_groups/index.md b/website/docs/services/neptune/db_subnet_groups/index.md
index 2a9368a80..b2b41d8df 100644
--- a/website/docs/services/neptune/db_subnet_groups/index.md
+++ b/website/docs/services/neptune/db_subnet_groups/index.md
@@ -164,7 +164,7 @@ db_subnet_group_description,
 subnet_ids,
 tags
 FROM awscc.neptune.db_subnet_groups
-WHERE region = 'us-east-1' AND Identifier = '<DBSubnetGroupName>';
+WHERE region = 'us-east-1' AND Identifier = '{{ db_subnet_group_name }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -201,9 +201,9 @@ INSERT INTO awscc.neptune.db_subnet_groups (
  SubnetIds,
  region
 )
-SELECT 
-'{{ DBSubnetGroupDescription }}',
- '{{ SubnetIds }}',
+SELECT
+'{{ db_subnet_group_description }}',
+ '{{ subnet_ids }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -218,11 +218,11 @@ INSERT INTO awscc.neptune.db_subnet_groups (
  Tags,
  region
 )
-SELECT 
- '{{ DBSubnetGroupName }}',
- '{{ DBSubnetGroupDescription }}',
- '{{ SubnetIds }}',
- '{{ Tags }}',
+SELECT
+ '{{ db_subnet_group_name }}',
+ '{{ db_subnet_group_description }}',
+ '{{ subnet_ids }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -240,18 +240,17 @@ globals:
 resources:
   - name: db_subnet_group
     props:
-      - name: DBSubnetGroupName
-        value: '{{ DBSubnetGroupName }}'
-      - name: DBSubnetGroupDescription
-        value: '{{ DBSubnetGroupDescription }}'
-      - name: SubnetIds
+      - name: db_subnet_group_name
+        value: '{{ db_subnet_group_name }}'
+      - name: db_subnet_group_description
+        value: '{{ db_subnet_group_description }}'
+      - name: subnet_ids
         value:
-          - '{{ SubnetIds[0] }}'
-      - name: Tags
+          - '{{ subnet_ids[0] }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -269,7 +268,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<DBSubnetGroupName>';
+AND Identifier = '{{ db_subnet_group_name }}';
 ```
 
 
@@ -278,7 +277,7 @@ AND Identifier = '<DBSubnetGroupName>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.neptune.db_subnet_groups
-WHERE Identifier = '<DBSubnetGroupName>'
+WHERE Identifier = '{{ db_subnet_group_name }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/neptunegraph/graphs/index.md b/website/docs/services/neptunegraph/graphs/index.md
index f2c0453e9..d410b51ee 100644
--- a/website/docs/services/neptunegraph/graphs/index.md
+++ b/website/docs/services/neptunegraph/graphs/index.md
@@ -207,7 +207,7 @@ endpoint,
 graph_arn,
 graph_id
 FROM awscc.neptunegraph.graphs
-WHERE region = 'us-east-1' AND Identifier = '<GraphId>';
+WHERE region = 'us-east-1' AND Identifier = '{{ graph_id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -243,8 +243,8 @@ INSERT INTO awscc.neptunegraph.graphs (
  ProvisionedMemory,
  region
 )
-SELECT 
-'{{ ProvisionedMemory }}',
+SELECT
+'{{ provisioned_memory }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -262,14 +262,14 @@ INSERT INTO awscc.neptunegraph.graphs (
  VectorSearchConfiguration,
  region
 )
-SELECT 
- '{{ DeletionProtection }}',
- '{{ GraphName }}',
- '{{ ProvisionedMemory }}',
- '{{ PublicConnectivity }}',
- '{{ ReplicaCount }}',
- '{{ Tags }}',
- '{{ VectorSearchConfiguration }}',
+SELECT
+ '{{ deletion_protection }}',
+ '{{ graph_name }}',
+ '{{ provisioned_memory }}',
+ '{{ public_connectivity }}',
+ '{{ replica_count }}',
+ '{{ tags }}',
+ '{{ vector_search_configuration }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -287,24 +287,23 @@ globals:
 resources:
   - name: graph
     props:
-      - name: DeletionProtection
-        value: '{{ DeletionProtection }}'
-      - name: GraphName
-        value: '{{ GraphName }}'
-      - name: ProvisionedMemory
-        value: '{{ ProvisionedMemory }}'
-      - name: PublicConnectivity
-        value: '{{ PublicConnectivity }}'
-      - name: ReplicaCount
-        value: '{{ ReplicaCount }}'
-      - name: Tags
+      - name: deletion_protection
+        value: '{{ deletion_protection }}'
+      - name: graph_name
+        value: '{{ graph_name }}'
+      - name: provisioned_memory
+        value: '{{ provisioned_memory }}'
+      - name: public_connectivity
+        value: '{{ public_connectivity }}'
+      - name: replica_count
+        value: '{{ replica_count }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-      - name: VectorSearchConfiguration
+          - key: '{{ key }}'
+            value: '{{ value }}'
+      - name: vector_search_configuration
         value:
-          VectorSearchDimension: '{{ VectorSearchDimension }}'
-
+          vector_search_dimension: '{{ vector_search_dimension }}'
 ```
 </TabItem>
 </Tabs>
@@ -323,7 +322,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<GraphId>';
+AND Identifier = '{{ graph_id }}';
 ```
 
 
@@ -332,7 +331,7 @@ AND Identifier = '<GraphId>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.neptunegraph.graphs
-WHERE Identifier = '<GraphId>'
+WHERE Identifier = '{{ graph_id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/neptunegraph/private_graph_endpoints/index.md b/website/docs/services/neptunegraph/private_graph_endpoints/index.md
index 1ad6d1814..dae2ba1aa 100644
--- a/website/docs/services/neptunegraph/private_graph_endpoints/index.md
+++ b/website/docs/services/neptunegraph/private_graph_endpoints/index.md
@@ -164,7 +164,7 @@ vpc_id,
 private_graph_endpoint_identifier,
 vpc_endpoint_id
 FROM awscc.neptunegraph.private_graph_endpoints
-WHERE region = 'us-east-1' AND Identifier = '<PrivateGraphEndpointIdentifier>';
+WHERE region = 'us-east-1' AND Identifier = '{{ private_graph_endpoint_identifier }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -201,9 +201,9 @@ INSERT INTO awscc.neptunegraph.private_graph_endpoints (
  VpcId,
  region
 )
-SELECT 
-'{{ GraphIdentifier }}',
- '{{ VpcId }}',
+SELECT
+'{{ graph_identifier }}',
+ '{{ vpc_id }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -218,11 +218,11 @@ INSERT INTO awscc.neptunegraph.private_graph_endpoints (
  VpcId,
  region
 )
-SELECT 
- '{{ GraphIdentifier }}',
- '{{ SecurityGroupIds }}',
- '{{ SubnetIds }}',
- '{{ VpcId }}',
+SELECT
+ '{{ graph_identifier }}',
+ '{{ security_group_ids }}',
+ '{{ subnet_ids }}',
+ '{{ vpc_id }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -240,17 +240,16 @@ globals:
 resources:
   - name: private_graph_endpoint
     props:
-      - name: GraphIdentifier
-        value: '{{ GraphIdentifier }}'
-      - name: SecurityGroupIds
+      - name: graph_identifier
+        value: '{{ graph_identifier }}'
+      - name: security_group_ids
         value:
-          - '{{ SecurityGroupIds[0] }}'
-      - name: SubnetIds
+          - '{{ security_group_ids[0] }}'
+      - name: subnet_ids
         value:
-          - '{{ SubnetIds[0] }}'
-      - name: VpcId
-        value: '{{ VpcId }}'
-
+          - '{{ subnet_ids[0] }}'
+      - name: vpc_id
+        value: '{{ vpc_id }}'
 ```
 </TabItem>
 </Tabs>
@@ -261,7 +260,7 @@ resources:
 ```sql
 /*+ delete */
 DELETE FROM awscc.neptunegraph.private_graph_endpoints
-WHERE Identifier = '<PrivateGraphEndpointIdentifier>'
+WHERE Identifier = '{{ private_graph_endpoint_identifier }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/networkfirewall/firewall_policies/index.md b/website/docs/services/networkfirewall/firewall_policies/index.md
index 5c53146ce..c81ff9c97 100644
--- a/website/docs/services/networkfirewall/firewall_policies/index.md
+++ b/website/docs/services/networkfirewall/firewall_policies/index.md
@@ -249,7 +249,7 @@ firewall_policy_id,
 description,
 tags
 FROM awscc.networkfirewall.firewall_policies
-WHERE region = 'us-east-1' AND Identifier = '<FirewallPolicyArn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ firewall_policy_arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -286,9 +286,9 @@ INSERT INTO awscc.networkfirewall.firewall_policies (
  FirewallPolicy,
  region
 )
-SELECT 
-'{{ FirewallPolicyName }}',
- '{{ FirewallPolicy }}',
+SELECT
+'{{ firewall_policy_name }}',
+ '{{ firewall_policy }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -303,11 +303,11 @@ INSERT INTO awscc.networkfirewall.firewall_policies (
  Tags,
  region
 )
-SELECT 
- '{{ FirewallPolicyName }}',
- '{{ FirewallPolicy }}',
- '{{ Description }}',
- '{{ Tags }}',
+SELECT
+ '{{ firewall_policy_name }}',
+ '{{ firewall_policy }}',
+ '{{ description }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -325,22 +325,21 @@ globals:
 resources:
   - name: firewall_policy
     props:
-      - name: FirewallPolicyName
-        value: '{{ FirewallPolicyName }}'
-      - name: FirewallPolicy
+      - name: firewall_policy_name
+        value: '{{ firewall_policy_name }}'
+      - name: firewall_policy
         value:
-          FirewallPolicyName: '{{ FirewallPolicyName }}'
-          FirewallPolicy: null
-          Description: '{{ Description }}'
-          Tags:
-            - Key: '{{ Key }}'
-              Value: '{{ Value }}'
-      - name: Description
-        value: '{{ Description }}'
-      - name: Tags
+          firewall_policy_name: '{{ firewall_policy_name }}'
+          firewall_policy: null
+          description: '{{ description }}'
+          tags:
+            - key: '{{ key }}'
+              value: '{{ value }}'
+      - name: description
+        value: '{{ description }}'
+      - name: tags
         value:
           - null
-
 ```
 </TabItem>
 </Tabs>
@@ -358,7 +357,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<FirewallPolicyArn>';
+AND Identifier = '{{ firewall_policy_arn }}';
 ```
 
 
@@ -367,7 +366,7 @@ AND Identifier = '<FirewallPolicyArn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.networkfirewall.firewall_policies
-WHERE Identifier = '<FirewallPolicyArn>'
+WHERE Identifier = '{{ firewall_policy_arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/networkfirewall/firewalls/index.md b/website/docs/services/networkfirewall/firewalls/index.md
index b16e7aa57..fb974134f 100644
--- a/website/docs/services/networkfirewall/firewalls/index.md
+++ b/website/docs/services/networkfirewall/firewalls/index.md
@@ -250,7 +250,7 @@ endpoint_ids,
 enabled_analysis_types,
 tags
 FROM awscc.networkfirewall.firewalls
-WHERE region = 'us-east-1' AND Identifier = '<FirewallArn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ firewall_arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -287,9 +287,9 @@ INSERT INTO awscc.networkfirewall.firewalls (
  FirewallPolicyArn,
  region
 )
-SELECT 
-'{{ FirewallName }}',
- '{{ FirewallPolicyArn }}',
+SELECT
+'{{ firewall_name }}',
+ '{{ firewall_policy_arn }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -313,20 +313,20 @@ INSERT INTO awscc.networkfirewall.firewalls (
  Tags,
  region
 )
-SELECT 
- '{{ FirewallName }}',
- '{{ FirewallPolicyArn }}',
- '{{ VpcId }}',
- '{{ SubnetMappings }}',
- '{{ AvailabilityZoneMappings }}',
- '{{ DeleteProtection }}',
- '{{ SubnetChangeProtection }}',
- '{{ AvailabilityZoneChangeProtection }}',
- '{{ FirewallPolicyChangeProtection }}',
- '{{ TransitGatewayId }}',
- '{{ Description }}',
- '{{ EnabledAnalysisTypes }}',
- '{{ Tags }}',
+SELECT
+ '{{ firewall_name }}',
+ '{{ firewall_policy_arn }}',
+ '{{ vpc_id }}',
+ '{{ subnet_mappings }}',
+ '{{ availability_zone_mappings }}',
+ '{{ delete_protection }}',
+ '{{ subnet_change_protection }}',
+ '{{ availability_zone_change_protection }}',
+ '{{ firewall_policy_change_protection }}',
+ '{{ transit_gateway_id }}',
+ '{{ description }}',
+ '{{ enabled_analysis_types }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -344,39 +344,38 @@ globals:
 resources:
   - name: firewall
     props:
-      - name: FirewallName
-        value: '{{ FirewallName }}'
-      - name: FirewallPolicyArn
-        value: '{{ FirewallPolicyArn }}'
-      - name: VpcId
-        value: '{{ VpcId }}'
-      - name: SubnetMappings
+      - name: firewall_name
+        value: '{{ firewall_name }}'
+      - name: firewall_policy_arn
+        value: '{{ firewall_policy_arn }}'
+      - name: vpc_id
+        value: '{{ vpc_id }}'
+      - name: subnet_mappings
         value:
-          - SubnetId: '{{ SubnetId }}'
-            IPAddressType: '{{ IPAddressType }}'
-      - name: AvailabilityZoneMappings
+          - subnet_id: '{{ subnet_id }}'
+            ip_address_type: '{{ ip_address_type }}'
+      - name: availability_zone_mappings
         value:
-          - AvailabilityZone: '{{ AvailabilityZone }}'
-      - name: DeleteProtection
-        value: '{{ DeleteProtection }}'
-      - name: SubnetChangeProtection
-        value: '{{ SubnetChangeProtection }}'
-      - name: AvailabilityZoneChangeProtection
-        value: '{{ AvailabilityZoneChangeProtection }}'
-      - name: FirewallPolicyChangeProtection
-        value: '{{ FirewallPolicyChangeProtection }}'
-      - name: TransitGatewayId
-        value: '{{ TransitGatewayId }}'
-      - name: Description
-        value: '{{ Description }}'
-      - name: EnabledAnalysisTypes
+          - availability_zone: '{{ availability_zone }}'
+      - name: delete_protection
+        value: '{{ delete_protection }}'
+      - name: subnet_change_protection
+        value: '{{ subnet_change_protection }}'
+      - name: availability_zone_change_protection
+        value: '{{ availability_zone_change_protection }}'
+      - name: firewall_policy_change_protection
+        value: '{{ firewall_policy_change_protection }}'
+      - name: transit_gateway_id
+        value: '{{ transit_gateway_id }}'
+      - name: description
+        value: '{{ description }}'
+      - name: enabled_analysis_types
         value:
-          - '{{ EnabledAnalysisTypes[0] }}'
-      - name: Tags
+          - '{{ enabled_analysis_types[0] }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -402,7 +401,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<FirewallArn>';
+AND Identifier = '{{ firewall_arn }}';
 ```
 
 
@@ -411,7 +410,7 @@ AND Identifier = '<FirewallArn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.networkfirewall.firewalls
-WHERE Identifier = '<FirewallArn>'
+WHERE Identifier = '{{ firewall_arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/networkfirewall/logging_configurations/index.md b/website/docs/services/networkfirewall/logging_configurations/index.md
index 932c8bb1b..3eed797e4 100644
--- a/website/docs/services/networkfirewall/logging_configurations/index.md
+++ b/website/docs/services/networkfirewall/logging_configurations/index.md
@@ -118,7 +118,7 @@ firewall_arn,
 logging_configuration,
 enable_monitoring_dashboard
 FROM awscc.networkfirewall.logging_configurations
-WHERE region = 'us-east-1' AND Identifier = '<FirewallArn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ firewall_arn }}';
 ```
 
 ## `INSERT` example
@@ -142,9 +142,9 @@ INSERT INTO awscc.networkfirewall.logging_configurations (
  LoggingConfiguration,
  region
 )
-SELECT 
-'{{ FirewallArn }}',
- '{{ LoggingConfiguration }}',
+SELECT
+'{{ firewall_arn }}',
+ '{{ logging_configuration }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -159,11 +159,11 @@ INSERT INTO awscc.networkfirewall.logging_configurations (
  EnableMonitoringDashboard,
  region
 )
-SELECT 
- '{{ FirewallName }}',
- '{{ FirewallArn }}',
- '{{ LoggingConfiguration }}',
- '{{ EnableMonitoringDashboard }}',
+SELECT
+ '{{ firewall_name }}',
+ '{{ firewall_arn }}',
+ '{{ logging_configuration }}',
+ '{{ enable_monitoring_dashboard }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -181,19 +181,18 @@ globals:
 resources:
   - name: logging_configuration
     props:
-      - name: FirewallName
-        value: '{{ FirewallName }}'
-      - name: FirewallArn
-        value: '{{ FirewallArn }}'
-      - name: LoggingConfiguration
+      - name: firewall_name
+        value: '{{ firewall_name }}'
+      - name: firewall_arn
+        value: '{{ firewall_arn }}'
+      - name: logging_configuration
         value:
-          FirewallName: '{{ FirewallName }}'
-          FirewallArn: null
-          LoggingConfiguration: null
-          EnableMonitoringDashboard: '{{ EnableMonitoringDashboard }}'
-      - name: EnableMonitoringDashboard
-        value: '{{ EnableMonitoringDashboard }}'
-
+          firewall_name: '{{ firewall_name }}'
+          firewall_arn: null
+          logging_configuration: null
+          enable_monitoring_dashboard: '{{ enable_monitoring_dashboard }}'
+      - name: enable_monitoring_dashboard
+        value: '{{ enable_monitoring_dashboard }}'
 ```
 </TabItem>
 </Tabs>
@@ -210,7 +209,7 @@ SET PatchDocument = string('{{ {
     "EnableMonitoringDashboard": enable_monitoring_dashboard
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<FirewallArn>';
+AND Identifier = '{{ firewall_arn }}';
 ```
 
 
@@ -219,7 +218,7 @@ AND Identifier = '<FirewallArn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.networkfirewall.logging_configurations
-WHERE Identifier = '<FirewallArn>'
+WHERE Identifier = '{{ firewall_arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/networkfirewall/rule_groups/index.md b/website/docs/services/networkfirewall/rule_groups/index.md
index b4435366d..f3f2db919 100644
--- a/website/docs/services/networkfirewall/rule_groups/index.md
+++ b/website/docs/services/networkfirewall/rule_groups/index.md
@@ -318,7 +318,7 @@ summary_configuration,
 description,
 tags
 FROM awscc.networkfirewall.rule_groups
-WHERE region = 'us-east-1' AND Identifier = '<RuleGroupArn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ rule_group_arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -356,10 +356,10 @@ INSERT INTO awscc.networkfirewall.rule_groups (
  Capacity,
  region
 )
-SELECT 
-'{{ RuleGroupName }}',
- '{{ Type }}',
- '{{ Capacity }}',
+SELECT
+'{{ rule_group_name }}',
+ '{{ type }}',
+ '{{ capacity }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -377,14 +377,14 @@ INSERT INTO awscc.networkfirewall.rule_groups (
  Tags,
  region
 )
-SELECT 
- '{{ RuleGroupName }}',
- '{{ RuleGroup }}',
- '{{ Type }}',
- '{{ Capacity }}',
- '{{ SummaryConfiguration }}',
- '{{ Description }}',
- '{{ Tags }}',
+SELECT
+ '{{ rule_group_name }}',
+ '{{ rule_group }}',
+ '{{ type }}',
+ '{{ capacity }}',
+ '{{ summary_configuration }}',
+ '{{ description }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -402,35 +402,34 @@ globals:
 resources:
   - name: rule_group
     props:
-      - name: RuleGroupName
-        value: '{{ RuleGroupName }}'
-      - name: RuleGroup
+      - name: rule_group_name
+        value: '{{ rule_group_name }}'
+      - name: rule_group
         value:
-          RuleGroupName: '{{ RuleGroupName }}'
-          RuleGroup: null
-          Type: '{{ Type }}'
-          Capacity: '{{ Capacity }}'
-          SummaryConfiguration:
-            RuleOptions:
-              - '{{ RuleOptions[0] }}'
-          Description: '{{ Description }}'
-          Tags:
-            - Key: '{{ Key }}'
-              Value: '{{ Value }}'
-      - name: Type
-        value: '{{ Type }}'
-      - name: Capacity
-        value: '{{ Capacity }}'
-      - name: SummaryConfiguration
+          rule_group_name: '{{ rule_group_name }}'
+          rule_group: null
+          type: '{{ type }}'
+          capacity: '{{ capacity }}'
+          summary_configuration:
+            rule_options:
+              - '{{ rule_options[0] }}'
+          description: '{{ description }}'
+          tags:
+            - key: '{{ key }}'
+              value: '{{ value }}'
+      - name: type
+        value: '{{ type }}'
+      - name: capacity
+        value: '{{ capacity }}'
+      - name: summary_configuration
         value:
-          RuleOptions:
+          rule_options:
             - null
-      - name: Description
-        value: '{{ Description }}'
-      - name: Tags
+      - name: description
+        value: '{{ description }}'
+      - name: tags
         value:
           - null
-
 ```
 </TabItem>
 </Tabs>
@@ -449,7 +448,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<RuleGroupArn>';
+AND Identifier = '{{ rule_group_arn }}';
 ```
 
 
@@ -458,7 +457,7 @@ AND Identifier = '<RuleGroupArn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.networkfirewall.rule_groups
-WHERE Identifier = '<RuleGroupArn>'
+WHERE Identifier = '{{ rule_group_arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/networkfirewall/tls_inspection_configurations/index.md b/website/docs/services/networkfirewall/tls_inspection_configurations/index.md
index 003cd7eac..aaf16a37e 100644
--- a/website/docs/services/networkfirewall/tls_inspection_configurations/index.md
+++ b/website/docs/services/networkfirewall/tls_inspection_configurations/index.md
@@ -249,7 +249,7 @@ tls_inspection_configuration_id,
 description,
 tags
 FROM awscc.networkfirewall.tls_inspection_configurations
-WHERE region = 'us-east-1' AND Identifier = '<TLSInspectionConfigurationArn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ tls_inspection_configuration_arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -286,9 +286,9 @@ INSERT INTO awscc.networkfirewall.tls_inspection_configurations (
  TLSInspectionConfiguration,
  region
 )
-SELECT 
-'{{ TLSInspectionConfigurationName }}',
- '{{ TLSInspectionConfiguration }}',
+SELECT
+'{{ tls_inspection_configuration_name }}',
+ '{{ tls_inspection_configuration }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -303,11 +303,11 @@ INSERT INTO awscc.networkfirewall.tls_inspection_configurations (
  Tags,
  region
 )
-SELECT 
- '{{ TLSInspectionConfigurationName }}',
- '{{ TLSInspectionConfiguration }}',
- '{{ Description }}',
- '{{ Tags }}',
+SELECT
+ '{{ tls_inspection_configuration_name }}',
+ '{{ tls_inspection_configuration }}',
+ '{{ description }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -325,22 +325,21 @@ globals:
 resources:
   - name: tls_inspection_configuration
     props:
-      - name: TLSInspectionConfigurationName
-        value: '{{ TLSInspectionConfigurationName }}'
-      - name: TLSInspectionConfiguration
+      - name: tls_inspection_configuration_name
+        value: '{{ tls_inspection_configuration_name }}'
+      - name: tls_inspection_configuration
         value:
-          TLSInspectionConfigurationName: '{{ TLSInspectionConfigurationName }}'
-          TLSInspectionConfiguration: null
-          Description: '{{ Description }}'
-          Tags:
-            - Key: '{{ Key }}'
-              Value: '{{ Value }}'
-      - name: Description
-        value: '{{ Description }}'
-      - name: Tags
+          tls_inspection_configuration_name: '{{ tls_inspection_configuration_name }}'
+          tls_inspection_configuration: null
+          description: '{{ description }}'
+          tags:
+            - key: '{{ key }}'
+              value: '{{ value }}'
+      - name: description
+        value: '{{ description }}'
+      - name: tags
         value:
           - null
-
 ```
 </TabItem>
 </Tabs>
@@ -358,7 +357,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<TLSInspectionConfigurationArn>';
+AND Identifier = '{{ tls_inspection_configuration_arn }}';
 ```
 
 
@@ -367,7 +366,7 @@ AND Identifier = '<TLSInspectionConfigurationArn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.networkfirewall.tls_inspection_configurations
-WHERE Identifier = '<TLSInspectionConfigurationArn>'
+WHERE Identifier = '{{ tls_inspection_configuration_arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/networkfirewall/vpc_endpoint_associations/index.md b/website/docs/services/networkfirewall/vpc_endpoint_associations/index.md
index 6f665ded5..15a235775 100644
--- a/website/docs/services/networkfirewall/vpc_endpoint_associations/index.md
+++ b/website/docs/services/networkfirewall/vpc_endpoint_associations/index.md
@@ -195,7 +195,7 @@ endpoint_id,
 subnet_mapping,
 tags
 FROM awscc.networkfirewall.vpc_endpoint_associations
-WHERE region = 'us-east-1' AND Identifier = '<VpcEndpointAssociationArn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ vpc_endpoint_association_arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -233,10 +233,10 @@ INSERT INTO awscc.networkfirewall.vpc_endpoint_associations (
  SubnetMapping,
  region
 )
-SELECT 
-'{{ FirewallArn }}',
- '{{ VpcId }}',
- '{{ SubnetMapping }}',
+SELECT
+'{{ firewall_arn }}',
+ '{{ vpc_id }}',
+ '{{ subnet_mapping }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -252,12 +252,12 @@ INSERT INTO awscc.networkfirewall.vpc_endpoint_associations (
  Tags,
  region
 )
-SELECT 
- '{{ Description }}',
- '{{ FirewallArn }}',
- '{{ VpcId }}',
- '{{ SubnetMapping }}',
- '{{ Tags }}',
+SELECT
+ '{{ description }}',
+ '{{ firewall_arn }}',
+ '{{ vpc_id }}',
+ '{{ subnet_mapping }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -275,21 +275,20 @@ globals:
 resources:
   - name: vpc_endpoint_association
     props:
-      - name: Description
-        value: '{{ Description }}'
-      - name: FirewallArn
-        value: '{{ FirewallArn }}'
-      - name: VpcId
-        value: '{{ VpcId }}'
-      - name: SubnetMapping
+      - name: description
+        value: '{{ description }}'
+      - name: firewall_arn
+        value: '{{ firewall_arn }}'
+      - name: vpc_id
+        value: '{{ vpc_id }}'
+      - name: subnet_mapping
         value:
-          SubnetId: '{{ SubnetId }}'
-          IPAddressType: '{{ IPAddressType }}'
-      - name: Tags
+          subnet_id: '{{ subnet_id }}'
+          ip_address_type: '{{ ip_address_type }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -305,7 +304,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<VpcEndpointAssociationArn>';
+AND Identifier = '{{ vpc_endpoint_association_arn }}';
 ```
 
 
@@ -314,7 +313,7 @@ AND Identifier = '<VpcEndpointAssociationArn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.networkfirewall.vpc_endpoint_associations
-WHERE Identifier = '<VpcEndpointAssociationArn>'
+WHERE Identifier = '{{ vpc_endpoint_association_arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/networkmanager/connect_attachments/index.md b/website/docs/services/networkmanager/connect_attachments/index.md
index 74900b79e..524204da1 100644
--- a/website/docs/services/networkmanager/connect_attachments/index.md
+++ b/website/docs/services/networkmanager/connect_attachments/index.md
@@ -313,7 +313,7 @@ updated_at,
 transport_attachment_id,
 options
 FROM awscc.networkmanager.connect_attachments
-WHERE region = 'us-east-1' AND Identifier = '<AttachmentId>';
+WHERE region = 'us-east-1' AND Identifier = '{{ attachment_id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -352,11 +352,11 @@ INSERT INTO awscc.networkmanager.connect_attachments (
  Options,
  region
 )
-SELECT 
-'{{ CoreNetworkId }}',
- '{{ EdgeLocation }}',
- '{{ TransportAttachmentId }}',
- '{{ Options }}',
+SELECT
+'{{ core_network_id }}',
+ '{{ edge_location }}',
+ '{{ transport_attachment_id }}',
+ '{{ options }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -375,15 +375,15 @@ INSERT INTO awscc.networkmanager.connect_attachments (
  Options,
  region
 )
-SELECT 
- '{{ CoreNetworkId }}',
- '{{ EdgeLocation }}',
- '{{ ProposedSegmentChange }}',
- '{{ NetworkFunctionGroupName }}',
- '{{ ProposedNetworkFunctionGroupChange }}',
- '{{ Tags }}',
- '{{ TransportAttachmentId }}',
- '{{ Options }}',
+SELECT
+ '{{ core_network_id }}',
+ '{{ edge_location }}',
+ '{{ proposed_segment_change }}',
+ '{{ network_function_group_name }}',
+ '{{ proposed_network_function_group_change }}',
+ '{{ tags }}',
+ '{{ transport_attachment_id }}',
+ '{{ options }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -401,34 +401,33 @@ globals:
 resources:
   - name: connect_attachment
     props:
-      - name: CoreNetworkId
-        value: '{{ CoreNetworkId }}'
-      - name: EdgeLocation
-        value: '{{ EdgeLocation }}'
-      - name: ProposedSegmentChange
+      - name: core_network_id
+        value: '{{ core_network_id }}'
+      - name: edge_location
+        value: '{{ edge_location }}'
+      - name: proposed_segment_change
         value:
-          Tags:
-            - Key: '{{ Key }}'
-              Value: '{{ Value }}'
-          AttachmentPolicyRuleNumber: '{{ AttachmentPolicyRuleNumber }}'
-          SegmentName: '{{ SegmentName }}'
-      - name: NetworkFunctionGroupName
-        value: '{{ NetworkFunctionGroupName }}'
-      - name: ProposedNetworkFunctionGroupChange
+          tags:
+            - key: '{{ key }}'
+              value: '{{ value }}'
+          attachment_policy_rule_number: '{{ attachment_policy_rule_number }}'
+          segment_name: '{{ segment_name }}'
+      - name: network_function_group_name
+        value: '{{ network_function_group_name }}'
+      - name: proposed_network_function_group_change
         value:
-          Tags:
+          tags:
             - null
-          AttachmentPolicyRuleNumber: '{{ AttachmentPolicyRuleNumber }}'
-          NetworkFunctionGroupName: '{{ NetworkFunctionGroupName }}'
-      - name: Tags
+          attachment_policy_rule_number: '{{ attachment_policy_rule_number }}'
+          network_function_group_name: '{{ network_function_group_name }}'
+      - name: tags
         value:
           - null
-      - name: TransportAttachmentId
-        value: '{{ TransportAttachmentId }}'
-      - name: Options
+      - name: transport_attachment_id
+        value: '{{ transport_attachment_id }}'
+      - name: options
         value:
-          Protocol: '{{ Protocol }}'
-
+          protocol: '{{ protocol }}'
 ```
 </TabItem>
 </Tabs>
@@ -447,7 +446,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<AttachmentId>';
+AND Identifier = '{{ attachment_id }}';
 ```
 
 
@@ -456,7 +455,7 @@ AND Identifier = '<AttachmentId>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.networkmanager.connect_attachments
-WHERE Identifier = '<AttachmentId>'
+WHERE Identifier = '{{ attachment_id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/networkmanager/connect_peers/index.md b/website/docs/services/networkmanager/connect_peers/index.md
index 4544ac58a..d6910a6ee 100644
--- a/website/docs/services/networkmanager/connect_peers/index.md
+++ b/website/docs/services/networkmanager/connect_peers/index.md
@@ -274,7 +274,7 @@ configuration,
 subnet_arn,
 tags
 FROM awscc.networkmanager.connect_peers
-WHERE region = 'us-east-1' AND Identifier = '<ConnectPeerId>';
+WHERE region = 'us-east-1' AND Identifier = '{{ connect_peer_id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -311,9 +311,9 @@ INSERT INTO awscc.networkmanager.connect_peers (
  ConnectAttachmentId,
  region
 )
-SELECT 
-'{{ PeerAddress }}',
- '{{ ConnectAttachmentId }}',
+SELECT
+'{{ peer_address }}',
+ '{{ connect_attachment_id }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -331,14 +331,14 @@ INSERT INTO awscc.networkmanager.connect_peers (
  Tags,
  region
 )
-SELECT 
- '{{ PeerAddress }}',
- '{{ CoreNetworkAddress }}',
- '{{ BgpOptions }}',
- '{{ InsideCidrBlocks }}',
- '{{ ConnectAttachmentId }}',
- '{{ SubnetArn }}',
- '{{ Tags }}',
+SELECT
+ '{{ peer_address }}',
+ '{{ core_network_address }}',
+ '{{ bgp_options }}',
+ '{{ inside_cidr_blocks }}',
+ '{{ connect_attachment_id }}',
+ '{{ subnet_arn }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -356,25 +356,24 @@ globals:
 resources:
   - name: connect_peer
     props:
-      - name: PeerAddress
-        value: '{{ PeerAddress }}'
-      - name: CoreNetworkAddress
-        value: '{{ CoreNetworkAddress }}'
-      - name: BgpOptions
+      - name: peer_address
+        value: '{{ peer_address }}'
+      - name: core_network_address
+        value: '{{ core_network_address }}'
+      - name: bgp_options
         value:
-          PeerAsn: null
-      - name: InsideCidrBlocks
+          peer_asn: null
+      - name: inside_cidr_blocks
         value:
-          - '{{ InsideCidrBlocks[0] }}'
-      - name: ConnectAttachmentId
-        value: '{{ ConnectAttachmentId }}'
-      - name: SubnetArn
-        value: '{{ SubnetArn }}'
-      - name: Tags
+          - '{{ inside_cidr_blocks[0] }}'
+      - name: connect_attachment_id
+        value: '{{ connect_attachment_id }}'
+      - name: subnet_arn
+        value: '{{ subnet_arn }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -390,7 +389,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<ConnectPeerId>';
+AND Identifier = '{{ connect_peer_id }}';
 ```
 
 
@@ -399,7 +398,7 @@ AND Identifier = '<ConnectPeerId>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.networkmanager.connect_peers
-WHERE Identifier = '<ConnectPeerId>'
+WHERE Identifier = '{{ connect_peer_id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/networkmanager/core_networks/index.md b/website/docs/services/networkmanager/core_networks/index.md
index fe97c681c..db0f9b0ce 100644
--- a/website/docs/services/networkmanager/core_networks/index.md
+++ b/website/docs/services/networkmanager/core_networks/index.md
@@ -275,7 +275,7 @@ edges,
 owner_account,
 tags
 FROM awscc.networkmanager.core_networks
-WHERE region = 'us-east-1' AND Identifier = '<CoreNetworkId>';
+WHERE region = 'us-east-1' AND Identifier = '{{ core_network_id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -311,8 +311,8 @@ INSERT INTO awscc.networkmanager.core_networks (
  GlobalNetworkId,
  region
 )
-SELECT 
-'{{ GlobalNetworkId }}',
+SELECT
+'{{ global_network_id }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -327,11 +327,11 @@ INSERT INTO awscc.networkmanager.core_networks (
  Tags,
  region
 )
-SELECT 
- '{{ GlobalNetworkId }}',
- '{{ PolicyDocument }}',
- '{{ Description }}',
- '{{ Tags }}',
+SELECT
+ '{{ global_network_id }}',
+ '{{ policy_document }}',
+ '{{ description }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -349,17 +349,16 @@ globals:
 resources:
   - name: core_network
     props:
-      - name: GlobalNetworkId
-        value: '{{ GlobalNetworkId }}'
-      - name: PolicyDocument
+      - name: global_network_id
+        value: '{{ global_network_id }}'
+      - name: policy_document
         value: {}
-      - name: Description
-        value: '{{ Description }}'
-      - name: Tags
+      - name: description
+        value: '{{ description }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -377,7 +376,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<CoreNetworkId>';
+AND Identifier = '{{ core_network_id }}';
 ```
 
 
@@ -386,7 +385,7 @@ AND Identifier = '<CoreNetworkId>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.networkmanager.core_networks
-WHERE Identifier = '<CoreNetworkId>'
+WHERE Identifier = '{{ core_network_id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/networkmanager/customer_gateway_associations/index.md b/website/docs/services/networkmanager/customer_gateway_associations/index.md
index 5bc009fde..6071935a4 100644
--- a/website/docs/services/networkmanager/customer_gateway_associations/index.md
+++ b/website/docs/services/networkmanager/customer_gateway_associations/index.md
@@ -151,7 +151,7 @@ customer_gateway_arn,
 device_id,
 link_id
 FROM awscc.networkmanager.customer_gateway_associations
-WHERE region = 'us-east-1' AND Identifier = '<GlobalNetworkId>|<CustomerGatewayArn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ global_network_id }}|{{ customer_gateway_arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -190,10 +190,10 @@ INSERT INTO awscc.networkmanager.customer_gateway_associations (
  DeviceId,
  region
 )
-SELECT 
-'{{ GlobalNetworkId }}',
- '{{ CustomerGatewayArn }}',
- '{{ DeviceId }}',
+SELECT
+'{{ global_network_id }}',
+ '{{ customer_gateway_arn }}',
+ '{{ device_id }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -208,11 +208,11 @@ INSERT INTO awscc.networkmanager.customer_gateway_associations (
  LinkId,
  region
 )
-SELECT 
- '{{ GlobalNetworkId }}',
- '{{ CustomerGatewayArn }}',
- '{{ DeviceId }}',
- '{{ LinkId }}',
+SELECT
+ '{{ global_network_id }}',
+ '{{ customer_gateway_arn }}',
+ '{{ device_id }}',
+ '{{ link_id }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -230,15 +230,14 @@ globals:
 resources:
   - name: customer_gateway_association
     props:
-      - name: GlobalNetworkId
-        value: '{{ GlobalNetworkId }}'
-      - name: CustomerGatewayArn
-        value: '{{ CustomerGatewayArn }}'
-      - name: DeviceId
-        value: '{{ DeviceId }}'
-      - name: LinkId
-        value: '{{ LinkId }}'
-
+      - name: global_network_id
+        value: '{{ global_network_id }}'
+      - name: customer_gateway_arn
+        value: '{{ customer_gateway_arn }}'
+      - name: device_id
+        value: '{{ device_id }}'
+      - name: link_id
+        value: '{{ link_id }}'
 ```
 </TabItem>
 </Tabs>
@@ -249,7 +248,7 @@ resources:
 ```sql
 /*+ delete */
 DELETE FROM awscc.networkmanager.customer_gateway_associations
-WHERE Identifier = '<GlobalNetworkId|CustomerGatewayArn>'
+WHERE Identifier = '{{ global_network_id }}|{{ customer_gateway_arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/networkmanager/devices/index.md b/website/docs/services/networkmanager/devices/index.md
index 7148182a3..93c07d655 100644
--- a/website/docs/services/networkmanager/devices/index.md
+++ b/website/docs/services/networkmanager/devices/index.md
@@ -258,7 +258,7 @@ vendor,
 created_at,
 state
 FROM awscc.networkmanager.devices
-WHERE region = 'us-east-1' AND Identifier = '<GlobalNetworkId>|<DeviceId>';
+WHERE region = 'us-east-1' AND Identifier = '{{ global_network_id }}|{{ device_id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -295,8 +295,8 @@ INSERT INTO awscc.networkmanager.devices (
  GlobalNetworkId,
  region
 )
-SELECT 
-'{{ GlobalNetworkId }}',
+SELECT
+'{{ global_network_id }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -317,17 +317,17 @@ INSERT INTO awscc.networkmanager.devices (
  Vendor,
  region
 )
-SELECT 
- '{{ Description }}',
- '{{ Tags }}',
- '{{ GlobalNetworkId }}',
- '{{ AWSLocation }}',
- '{{ Location }}',
- '{{ Model }}',
- '{{ SerialNumber }}',
- '{{ SiteId }}',
- '{{ Type }}',
- '{{ Vendor }}',
+SELECT
+ '{{ description }}',
+ '{{ tags }}',
+ '{{ global_network_id }}',
+ '{{ aws_location }}',
+ '{{ location }}',
+ '{{ model }}',
+ '{{ serial_number }}',
+ '{{ site_id }}',
+ '{{ type }}',
+ '{{ vendor }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -345,34 +345,33 @@ globals:
 resources:
   - name: device
     props:
-      - name: Description
-        value: '{{ Description }}'
-      - name: Tags
+      - name: description
+        value: '{{ description }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-      - name: GlobalNetworkId
-        value: '{{ GlobalNetworkId }}'
-      - name: AWSLocation
+          - key: '{{ key }}'
+            value: '{{ value }}'
+      - name: global_network_id
+        value: '{{ global_network_id }}'
+      - name: aws_location
         value:
-          Zone: '{{ Zone }}'
-          SubnetArn: '{{ SubnetArn }}'
-      - name: Location
+          zone: '{{ zone }}'
+          subnet_arn: '{{ subnet_arn }}'
+      - name: location
         value:
-          Address: '{{ Address }}'
-          Latitude: '{{ Latitude }}'
-          Longitude: '{{ Longitude }}'
-      - name: Model
-        value: '{{ Model }}'
-      - name: SerialNumber
-        value: '{{ SerialNumber }}'
-      - name: SiteId
-        value: '{{ SiteId }}'
-      - name: Type
-        value: '{{ Type }}'
-      - name: Vendor
-        value: '{{ Vendor }}'
-
+          address: '{{ address }}'
+          latitude: '{{ latitude }}'
+          longitude: '{{ longitude }}'
+      - name: model
+        value: '{{ model }}'
+      - name: serial_number
+        value: '{{ serial_number }}'
+      - name: site_id
+        value: '{{ site_id }}'
+      - name: type
+        value: '{{ type }}'
+      - name: vendor
+        value: '{{ vendor }}'
 ```
 </TabItem>
 </Tabs>
@@ -396,7 +395,7 @@ SET PatchDocument = string('{{ {
     "Vendor": vendor
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<GlobalNetworkId>|<DeviceId>';
+AND Identifier = '{{ global_network_id }}|{{ device_id }}';
 ```
 
 
@@ -405,7 +404,7 @@ AND Identifier = '<GlobalNetworkId>|<DeviceId>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.networkmanager.devices
-WHERE Identifier = '<GlobalNetworkId|DeviceId>'
+WHERE Identifier = '{{ global_network_id }}|{{ device_id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/networkmanager/direct_connect_gateway_attachments/index.md b/website/docs/services/networkmanager/direct_connect_gateway_attachments/index.md
index 261242406..c77dbfaf9 100644
--- a/website/docs/services/networkmanager/direct_connect_gateway_attachments/index.md
+++ b/website/docs/services/networkmanager/direct_connect_gateway_attachments/index.md
@@ -300,7 +300,7 @@ tags,
 created_at,
 updated_at
 FROM awscc.networkmanager.direct_connect_gateway_attachments
-WHERE region = 'us-east-1' AND Identifier = '<AttachmentId>';
+WHERE region = 'us-east-1' AND Identifier = '{{ attachment_id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -338,10 +338,10 @@ INSERT INTO awscc.networkmanager.direct_connect_gateway_attachments (
  DirectConnectGatewayArn,
  region
 )
-SELECT 
-'{{ CoreNetworkId }}',
- '{{ EdgeLocations }}',
- '{{ DirectConnectGatewayArn }}',
+SELECT
+'{{ core_network_id }}',
+ '{{ edge_locations }}',
+ '{{ direct_connect_gateway_arn }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -358,13 +358,13 @@ INSERT INTO awscc.networkmanager.direct_connect_gateway_attachments (
  Tags,
  region
 )
-SELECT 
- '{{ CoreNetworkId }}',
- '{{ EdgeLocations }}',
- '{{ DirectConnectGatewayArn }}',
- '{{ ProposedSegmentChange }}',
- '{{ ProposedNetworkFunctionGroupChange }}',
- '{{ Tags }}',
+SELECT
+ '{{ core_network_id }}',
+ '{{ edge_locations }}',
+ '{{ direct_connect_gateway_arn }}',
+ '{{ proposed_segment_change }}',
+ '{{ proposed_network_function_group_change }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -382,30 +382,29 @@ globals:
 resources:
   - name: direct_connect_gateway_attachment
     props:
-      - name: CoreNetworkId
-        value: '{{ CoreNetworkId }}'
-      - name: EdgeLocations
+      - name: core_network_id
+        value: '{{ core_network_id }}'
+      - name: edge_locations
         value:
-          - '{{ EdgeLocations[0] }}'
-      - name: DirectConnectGatewayArn
-        value: '{{ DirectConnectGatewayArn }}'
-      - name: ProposedSegmentChange
+          - '{{ edge_locations[0] }}'
+      - name: direct_connect_gateway_arn
+        value: '{{ direct_connect_gateway_arn }}'
+      - name: proposed_segment_change
         value:
-          Tags:
-            - Key: '{{ Key }}'
-              Value: '{{ Value }}'
-          AttachmentPolicyRuleNumber: '{{ AttachmentPolicyRuleNumber }}'
-          SegmentName: '{{ SegmentName }}'
-      - name: ProposedNetworkFunctionGroupChange
+          tags:
+            - key: '{{ key }}'
+              value: '{{ value }}'
+          attachment_policy_rule_number: '{{ attachment_policy_rule_number }}'
+          segment_name: '{{ segment_name }}'
+      - name: proposed_network_function_group_change
         value:
-          Tags:
+          tags:
             - null
-          AttachmentPolicyRuleNumber: '{{ AttachmentPolicyRuleNumber }}'
-          NetworkFunctionGroupName: '{{ NetworkFunctionGroupName }}'
-      - name: Tags
+          attachment_policy_rule_number: '{{ attachment_policy_rule_number }}'
+          network_function_group_name: '{{ network_function_group_name }}'
+      - name: tags
         value:
           - null
-
 ```
 </TabItem>
 </Tabs>
@@ -424,7 +423,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<AttachmentId>';
+AND Identifier = '{{ attachment_id }}';
 ```
 
 
@@ -433,7 +432,7 @@ AND Identifier = '<AttachmentId>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.networkmanager.direct_connect_gateway_attachments
-WHERE Identifier = '<AttachmentId>'
+WHERE Identifier = '{{ attachment_id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/networkmanager/global_networks/index.md b/website/docs/services/networkmanager/global_networks/index.md
index 0e2653a36..31a622a76 100644
--- a/website/docs/services/networkmanager/global_networks/index.md
+++ b/website/docs/services/networkmanager/global_networks/index.md
@@ -176,7 +176,7 @@ tags,
 created_at,
 state
 FROM awscc.networkmanager.global_networks
-WHERE region = 'us-east-1' AND Identifier = '<Id>';
+WHERE region = 'us-east-1' AND Identifier = '{{ id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -215,11 +215,11 @@ INSERT INTO awscc.networkmanager.global_networks (
  State,
  region
 )
-SELECT 
-'{{ Description }}',
- '{{ Tags }}',
- '{{ CreatedAt }}',
- '{{ State }}',
+SELECT
+'{{ description }}',
+ '{{ tags }}',
+ '{{ created_at }}',
+ '{{ state }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -234,11 +234,11 @@ INSERT INTO awscc.networkmanager.global_networks (
  State,
  region
 )
-SELECT 
- '{{ Description }}',
- '{{ Tags }}',
- '{{ CreatedAt }}',
- '{{ State }}',
+SELECT
+ '{{ description }}',
+ '{{ tags }}',
+ '{{ created_at }}',
+ '{{ state }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -256,17 +256,16 @@ globals:
 resources:
   - name: global_network
     props:
-      - name: Description
-        value: '{{ Description }}'
-      - name: Tags
+      - name: description
+        value: '{{ description }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-      - name: CreatedAt
-        value: '{{ CreatedAt }}'
-      - name: State
-        value: '{{ State }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
+      - name: created_at
+        value: '{{ created_at }}'
+      - name: state
+        value: '{{ state }}'
 ```
 </TabItem>
 </Tabs>
@@ -285,7 +284,7 @@ SET PatchDocument = string('{{ {
     "State": state
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Id>';
+AND Identifier = '{{ id }}';
 ```
 
 
@@ -294,7 +293,7 @@ AND Identifier = '<Id>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.networkmanager.global_networks
-WHERE Identifier = '<Id>'
+WHERE Identifier = '{{ id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/networkmanager/link_associations/index.md b/website/docs/services/networkmanager/link_associations/index.md
index 437c3a420..ae47a0a9a 100644
--- a/website/docs/services/networkmanager/link_associations/index.md
+++ b/website/docs/services/networkmanager/link_associations/index.md
@@ -150,7 +150,7 @@ global_network_id,
 device_id,
 link_id
 FROM awscc.networkmanager.link_associations
-WHERE region = 'us-east-1' AND Identifier = '<GlobalNetworkId>|<DeviceId>|<LinkId>';
+WHERE region = 'us-east-1' AND Identifier = '{{ global_network_id }}|{{ device_id }}|{{ link_id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -190,10 +190,10 @@ INSERT INTO awscc.networkmanager.link_associations (
  LinkId,
  region
 )
-SELECT 
-'{{ GlobalNetworkId }}',
- '{{ DeviceId }}',
- '{{ LinkId }}',
+SELECT
+'{{ global_network_id }}',
+ '{{ device_id }}',
+ '{{ link_id }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -207,10 +207,10 @@ INSERT INTO awscc.networkmanager.link_associations (
  LinkId,
  region
 )
-SELECT 
- '{{ GlobalNetworkId }}',
- '{{ DeviceId }}',
- '{{ LinkId }}',
+SELECT
+ '{{ global_network_id }}',
+ '{{ device_id }}',
+ '{{ link_id }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -228,13 +228,12 @@ globals:
 resources:
   - name: link_association
     props:
-      - name: GlobalNetworkId
-        value: '{{ GlobalNetworkId }}'
-      - name: DeviceId
-        value: '{{ DeviceId }}'
-      - name: LinkId
-        value: '{{ LinkId }}'
-
+      - name: global_network_id
+        value: '{{ global_network_id }}'
+      - name: device_id
+        value: '{{ device_id }}'
+      - name: link_id
+        value: '{{ link_id }}'
 ```
 </TabItem>
 </Tabs>
@@ -245,7 +244,7 @@ resources:
 ```sql
 /*+ delete */
 DELETE FROM awscc.networkmanager.link_associations
-WHERE Identifier = '<GlobalNetworkId|DeviceId|LinkId>'
+WHERE Identifier = '{{ global_network_id }}|{{ device_id }}|{{ link_id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/networkmanager/links/index.md b/website/docs/services/networkmanager/links/index.md
index 1ef92dd5a..32436783b 100644
--- a/website/docs/services/networkmanager/links/index.md
+++ b/website/docs/services/networkmanager/links/index.md
@@ -223,7 +223,7 @@ type,
 created_at,
 state
 FROM awscc.networkmanager.links
-WHERE region = 'us-east-1' AND Identifier = '<GlobalNetworkId>|<LinkId>';
+WHERE region = 'us-east-1' AND Identifier = '{{ global_network_id }}|{{ link_id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -262,10 +262,10 @@ INSERT INTO awscc.networkmanager.links (
  Bandwidth,
  region
 )
-SELECT 
-'{{ GlobalNetworkId }}',
- '{{ SiteId }}',
- '{{ Bandwidth }}',
+SELECT
+'{{ global_network_id }}',
+ '{{ site_id }}',
+ '{{ bandwidth }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -283,14 +283,14 @@ INSERT INTO awscc.networkmanager.links (
  Type,
  region
 )
-SELECT 
- '{{ GlobalNetworkId }}',
- '{{ SiteId }}',
- '{{ Bandwidth }}',
- '{{ Provider }}',
- '{{ Description }}',
- '{{ Tags }}',
- '{{ Type }}',
+SELECT
+ '{{ global_network_id }}',
+ '{{ site_id }}',
+ '{{ bandwidth }}',
+ '{{ provider }}',
+ '{{ description }}',
+ '{{ tags }}',
+ '{{ type }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -308,25 +308,24 @@ globals:
 resources:
   - name: link
     props:
-      - name: GlobalNetworkId
-        value: '{{ GlobalNetworkId }}'
-      - name: SiteId
-        value: '{{ SiteId }}'
-      - name: Bandwidth
+      - name: global_network_id
+        value: '{{ global_network_id }}'
+      - name: site_id
+        value: '{{ site_id }}'
+      - name: bandwidth
         value:
-          DownloadSpeed: '{{ DownloadSpeed }}'
-          UploadSpeed: '{{ UploadSpeed }}'
-      - name: Provider
-        value: '{{ Provider }}'
-      - name: Description
-        value: '{{ Description }}'
-      - name: Tags
+          download_speed: '{{ download_speed }}'
+          upload_speed: '{{ upload_speed }}'
+      - name: provider
+        value: '{{ provider }}'
+      - name: description
+        value: '{{ description }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-      - name: Type
-        value: '{{ Type }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
+      - name: type
+        value: '{{ type }}'
 ```
 </TabItem>
 </Tabs>
@@ -346,7 +345,7 @@ SET PatchDocument = string('{{ {
     "Type": type
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<GlobalNetworkId>|<LinkId>';
+AND Identifier = '{{ global_network_id }}|{{ link_id }}';
 ```
 
 
@@ -355,7 +354,7 @@ AND Identifier = '<GlobalNetworkId>|<LinkId>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.networkmanager.links
-WHERE Identifier = '<GlobalNetworkId|LinkId>'
+WHERE Identifier = '{{ global_network_id }}|{{ link_id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/networkmanager/site_to_site_vpn_attachments/index.md b/website/docs/services/networkmanager/site_to_site_vpn_attachments/index.md
index 5bca5c719..bba6b2d3b 100644
--- a/website/docs/services/networkmanager/site_to_site_vpn_attachments/index.md
+++ b/website/docs/services/networkmanager/site_to_site_vpn_attachments/index.md
@@ -300,7 +300,7 @@ created_at,
 updated_at,
 vpn_connection_arn
 FROM awscc.networkmanager.site_to_site_vpn_attachments
-WHERE region = 'us-east-1' AND Identifier = '<AttachmentId>';
+WHERE region = 'us-east-1' AND Identifier = '{{ attachment_id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -337,9 +337,9 @@ INSERT INTO awscc.networkmanager.site_to_site_vpn_attachments (
  VpnConnectionArn,
  region
 )
-SELECT 
-'{{ CoreNetworkId }}',
- '{{ VpnConnectionArn }}',
+SELECT
+'{{ core_network_id }}',
+ '{{ vpn_connection_arn }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -356,13 +356,13 @@ INSERT INTO awscc.networkmanager.site_to_site_vpn_attachments (
  VpnConnectionArn,
  region
 )
-SELECT 
- '{{ CoreNetworkId }}',
- '{{ ProposedSegmentChange }}',
- '{{ NetworkFunctionGroupName }}',
- '{{ ProposedNetworkFunctionGroupChange }}',
- '{{ Tags }}',
- '{{ VpnConnectionArn }}',
+SELECT
+ '{{ core_network_id }}',
+ '{{ proposed_segment_change }}',
+ '{{ network_function_group_name }}',
+ '{{ proposed_network_function_group_change }}',
+ '{{ tags }}',
+ '{{ vpn_connection_arn }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -380,29 +380,28 @@ globals:
 resources:
   - name: site_to_site_vpn_attachment
     props:
-      - name: CoreNetworkId
-        value: '{{ CoreNetworkId }}'
-      - name: ProposedSegmentChange
+      - name: core_network_id
+        value: '{{ core_network_id }}'
+      - name: proposed_segment_change
         value:
-          Tags:
-            - Key: '{{ Key }}'
-              Value: '{{ Value }}'
-          AttachmentPolicyRuleNumber: '{{ AttachmentPolicyRuleNumber }}'
-          SegmentName: '{{ SegmentName }}'
-      - name: NetworkFunctionGroupName
-        value: '{{ NetworkFunctionGroupName }}'
-      - name: ProposedNetworkFunctionGroupChange
+          tags:
+            - key: '{{ key }}'
+              value: '{{ value }}'
+          attachment_policy_rule_number: '{{ attachment_policy_rule_number }}'
+          segment_name: '{{ segment_name }}'
+      - name: network_function_group_name
+        value: '{{ network_function_group_name }}'
+      - name: proposed_network_function_group_change
         value:
-          Tags:
+          tags:
             - null
-          AttachmentPolicyRuleNumber: '{{ AttachmentPolicyRuleNumber }}'
-          NetworkFunctionGroupName: '{{ NetworkFunctionGroupName }}'
-      - name: Tags
+          attachment_policy_rule_number: '{{ attachment_policy_rule_number }}'
+          network_function_group_name: '{{ network_function_group_name }}'
+      - name: tags
         value:
           - null
-      - name: VpnConnectionArn
-        value: '{{ VpnConnectionArn }}'
-
+      - name: vpn_connection_arn
+        value: '{{ vpn_connection_arn }}'
 ```
 </TabItem>
 </Tabs>
@@ -421,7 +420,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<AttachmentId>';
+AND Identifier = '{{ attachment_id }}';
 ```
 
 
@@ -430,7 +429,7 @@ AND Identifier = '<AttachmentId>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.networkmanager.site_to_site_vpn_attachments
-WHERE Identifier = '<AttachmentId>'
+WHERE Identifier = '{{ attachment_id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/networkmanager/sites/index.md b/website/docs/services/networkmanager/sites/index.md
index 960bf8ac0..d347e8a45 100644
--- a/website/docs/services/networkmanager/sites/index.md
+++ b/website/docs/services/networkmanager/sites/index.md
@@ -210,7 +210,7 @@ location,
 created_at,
 state
 FROM awscc.networkmanager.sites
-WHERE region = 'us-east-1' AND Identifier = '<GlobalNetworkId>|<SiteId>';
+WHERE region = 'us-east-1' AND Identifier = '{{ global_network_id }}|{{ site_id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -247,8 +247,8 @@ INSERT INTO awscc.networkmanager.sites (
  GlobalNetworkId,
  region
 )
-SELECT 
-'{{ GlobalNetworkId }}',
+SELECT
+'{{ global_network_id }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -263,11 +263,11 @@ INSERT INTO awscc.networkmanager.sites (
  Location,
  region
 )
-SELECT 
- '{{ Description }}',
- '{{ Tags }}',
- '{{ GlobalNetworkId }}',
- '{{ Location }}',
+SELECT
+ '{{ description }}',
+ '{{ tags }}',
+ '{{ global_network_id }}',
+ '{{ location }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -285,20 +285,19 @@ globals:
 resources:
   - name: site
     props:
-      - name: Description
-        value: '{{ Description }}'
-      - name: Tags
+      - name: description
+        value: '{{ description }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-      - name: GlobalNetworkId
-        value: '{{ GlobalNetworkId }}'
-      - name: Location
+          - key: '{{ key }}'
+            value: '{{ value }}'
+      - name: global_network_id
+        value: '{{ global_network_id }}'
+      - name: location
         value:
-          Address: '{{ Address }}'
-          Latitude: '{{ Latitude }}'
-          Longitude: '{{ Longitude }}'
-
+          address: '{{ address }}'
+          latitude: '{{ latitude }}'
+          longitude: '{{ longitude }}'
 ```
 </TabItem>
 </Tabs>
@@ -316,7 +315,7 @@ SET PatchDocument = string('{{ {
     "Location": location
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<GlobalNetworkId>|<SiteId>';
+AND Identifier = '{{ global_network_id }}|{{ site_id }}';
 ```
 
 
@@ -325,7 +324,7 @@ AND Identifier = '<GlobalNetworkId>|<SiteId>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.networkmanager.sites
-WHERE Identifier = '<GlobalNetworkId|SiteId>'
+WHERE Identifier = '{{ global_network_id }}|{{ site_id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/networkmanager/transit_gateway_peerings/index.md b/website/docs/services/networkmanager/transit_gateway_peerings/index.md
index 87836bd91..d85339bd8 100644
--- a/website/docs/services/networkmanager/transit_gateway_peerings/index.md
+++ b/website/docs/services/networkmanager/transit_gateway_peerings/index.md
@@ -212,7 +212,7 @@ peering_type,
 created_at,
 tags
 FROM awscc.networkmanager.transit_gateway_peerings
-WHERE region = 'us-east-1' AND Identifier = '<PeeringId>';
+WHERE region = 'us-east-1' AND Identifier = '{{ peering_id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -249,9 +249,9 @@ INSERT INTO awscc.networkmanager.transit_gateway_peerings (
  TransitGatewayArn,
  region
 )
-SELECT 
-'{{ CoreNetworkId }}',
- '{{ TransitGatewayArn }}',
+SELECT
+'{{ core_network_id }}',
+ '{{ transit_gateway_arn }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -265,10 +265,10 @@ INSERT INTO awscc.networkmanager.transit_gateway_peerings (
  Tags,
  region
 )
-SELECT 
- '{{ CoreNetworkId }}',
- '{{ TransitGatewayArn }}',
- '{{ Tags }}',
+SELECT
+ '{{ core_network_id }}',
+ '{{ transit_gateway_arn }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -286,15 +286,14 @@ globals:
 resources:
   - name: transit_gateway_peering
     props:
-      - name: CoreNetworkId
-        value: '{{ CoreNetworkId }}'
-      - name: TransitGatewayArn
-        value: '{{ TransitGatewayArn }}'
-      - name: Tags
+      - name: core_network_id
+        value: '{{ core_network_id }}'
+      - name: transit_gateway_arn
+        value: '{{ transit_gateway_arn }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -310,7 +309,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<PeeringId>';
+AND Identifier = '{{ peering_id }}';
 ```
 
 
@@ -319,7 +318,7 @@ AND Identifier = '<PeeringId>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.networkmanager.transit_gateway_peerings
-WHERE Identifier = '<PeeringId>'
+WHERE Identifier = '{{ peering_id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/networkmanager/transit_gateway_registrations/index.md b/website/docs/services/networkmanager/transit_gateway_registrations/index.md
index fbdb2b96f..65bd55a66 100644
--- a/website/docs/services/networkmanager/transit_gateway_registrations/index.md
+++ b/website/docs/services/networkmanager/transit_gateway_registrations/index.md
@@ -139,7 +139,7 @@ region,
 global_network_id,
 transit_gateway_arn
 FROM awscc.networkmanager.transit_gateway_registrations
-WHERE region = 'us-east-1' AND Identifier = '<GlobalNetworkId>|<TransitGatewayArn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ global_network_id }}|{{ transit_gateway_arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -177,9 +177,9 @@ INSERT INTO awscc.networkmanager.transit_gateway_registrations (
  TransitGatewayArn,
  region
 )
-SELECT 
-'{{ GlobalNetworkId }}',
- '{{ TransitGatewayArn }}',
+SELECT
+'{{ global_network_id }}',
+ '{{ transit_gateway_arn }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -192,9 +192,9 @@ INSERT INTO awscc.networkmanager.transit_gateway_registrations (
  TransitGatewayArn,
  region
 )
-SELECT 
- '{{ GlobalNetworkId }}',
- '{{ TransitGatewayArn }}',
+SELECT
+ '{{ global_network_id }}',
+ '{{ transit_gateway_arn }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -212,11 +212,10 @@ globals:
 resources:
   - name: transit_gateway_registration
     props:
-      - name: GlobalNetworkId
-        value: '{{ GlobalNetworkId }}'
-      - name: TransitGatewayArn
-        value: '{{ TransitGatewayArn }}'
-
+      - name: global_network_id
+        value: '{{ global_network_id }}'
+      - name: transit_gateway_arn
+        value: '{{ transit_gateway_arn }}'
 ```
 </TabItem>
 </Tabs>
@@ -227,7 +226,7 @@ resources:
 ```sql
 /*+ delete */
 DELETE FROM awscc.networkmanager.transit_gateway_registrations
-WHERE Identifier = '<GlobalNetworkId|TransitGatewayArn>'
+WHERE Identifier = '{{ global_network_id }}|{{ transit_gateway_arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/networkmanager/transit_gateway_route_table_attachments/index.md b/website/docs/services/networkmanager/transit_gateway_route_table_attachments/index.md
index 64fcfd961..87fb58604 100644
--- a/website/docs/services/networkmanager/transit_gateway_route_table_attachments/index.md
+++ b/website/docs/services/networkmanager/transit_gateway_route_table_attachments/index.md
@@ -306,7 +306,7 @@ created_at,
 updated_at,
 tags
 FROM awscc.networkmanager.transit_gateway_route_table_attachments
-WHERE region = 'us-east-1' AND Identifier = '<AttachmentId>';
+WHERE region = 'us-east-1' AND Identifier = '{{ attachment_id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -343,9 +343,9 @@ INSERT INTO awscc.networkmanager.transit_gateway_route_table_attachments (
  TransitGatewayRouteTableArn,
  region
 )
-SELECT 
-'{{ PeeringId }}',
- '{{ TransitGatewayRouteTableArn }}',
+SELECT
+'{{ peering_id }}',
+ '{{ transit_gateway_route_table_arn }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -362,13 +362,13 @@ INSERT INTO awscc.networkmanager.transit_gateway_route_table_attachments (
  Tags,
  region
 )
-SELECT 
- '{{ PeeringId }}',
- '{{ TransitGatewayRouteTableArn }}',
- '{{ ProposedSegmentChange }}',
- '{{ NetworkFunctionGroupName }}',
- '{{ ProposedNetworkFunctionGroupChange }}',
- '{{ Tags }}',
+SELECT
+ '{{ peering_id }}',
+ '{{ transit_gateway_route_table_arn }}',
+ '{{ proposed_segment_change }}',
+ '{{ network_function_group_name }}',
+ '{{ proposed_network_function_group_change }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -386,29 +386,28 @@ globals:
 resources:
   - name: transit_gateway_route_table_attachment
     props:
-      - name: PeeringId
-        value: '{{ PeeringId }}'
-      - name: TransitGatewayRouteTableArn
-        value: '{{ TransitGatewayRouteTableArn }}'
-      - name: ProposedSegmentChange
+      - name: peering_id
+        value: '{{ peering_id }}'
+      - name: transit_gateway_route_table_arn
+        value: '{{ transit_gateway_route_table_arn }}'
+      - name: proposed_segment_change
         value:
-          Tags:
-            - Key: '{{ Key }}'
-              Value: '{{ Value }}'
-          AttachmentPolicyRuleNumber: '{{ AttachmentPolicyRuleNumber }}'
-          SegmentName: '{{ SegmentName }}'
-      - name: NetworkFunctionGroupName
-        value: '{{ NetworkFunctionGroupName }}'
-      - name: ProposedNetworkFunctionGroupChange
+          tags:
+            - key: '{{ key }}'
+              value: '{{ value }}'
+          attachment_policy_rule_number: '{{ attachment_policy_rule_number }}'
+          segment_name: '{{ segment_name }}'
+      - name: network_function_group_name
+        value: '{{ network_function_group_name }}'
+      - name: proposed_network_function_group_change
         value:
-          Tags:
+          tags:
             - null
-          AttachmentPolicyRuleNumber: '{{ AttachmentPolicyRuleNumber }}'
-          NetworkFunctionGroupName: '{{ NetworkFunctionGroupName }}'
-      - name: Tags
+          attachment_policy_rule_number: '{{ attachment_policy_rule_number }}'
+          network_function_group_name: '{{ network_function_group_name }}'
+      - name: tags
         value:
           - null
-
 ```
 </TabItem>
 </Tabs>
@@ -427,7 +426,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<AttachmentId>';
+AND Identifier = '{{ attachment_id }}';
 ```
 
 
@@ -436,7 +435,7 @@ AND Identifier = '<AttachmentId>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.networkmanager.transit_gateway_route_table_attachments
-WHERE Identifier = '<AttachmentId>'
+WHERE Identifier = '{{ attachment_id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/networkmanager/vpc_attachments/index.md b/website/docs/services/networkmanager/vpc_attachments/index.md
index e3e7ce63c..c3e3a6fe2 100644
--- a/website/docs/services/networkmanager/vpc_attachments/index.md
+++ b/website/docs/services/networkmanager/vpc_attachments/index.md
@@ -334,7 +334,7 @@ updated_at,
 subnet_arns,
 options
 FROM awscc.networkmanager.vpc_attachments
-WHERE region = 'us-east-1' AND Identifier = '<AttachmentId>';
+WHERE region = 'us-east-1' AND Identifier = '{{ attachment_id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -372,10 +372,10 @@ INSERT INTO awscc.networkmanager.vpc_attachments (
  SubnetArns,
  region
 )
-SELECT 
-'{{ CoreNetworkId }}',
- '{{ VpcArn }}',
- '{{ SubnetArns }}',
+SELECT
+'{{ core_network_id }}',
+ '{{ vpc_arn }}',
+ '{{ subnet_arns }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -393,14 +393,14 @@ INSERT INTO awscc.networkmanager.vpc_attachments (
  Options,
  region
 )
-SELECT 
- '{{ CoreNetworkId }}',
- '{{ VpcArn }}',
- '{{ ProposedSegmentChange }}',
- '{{ ProposedNetworkFunctionGroupChange }}',
- '{{ Tags }}',
- '{{ SubnetArns }}',
- '{{ Options }}',
+SELECT
+ '{{ core_network_id }}',
+ '{{ vpc_arn }}',
+ '{{ proposed_segment_change }}',
+ '{{ proposed_network_function_group_change }}',
+ '{{ tags }}',
+ '{{ subnet_arns }}',
+ '{{ options }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -418,36 +418,35 @@ globals:
 resources:
   - name: vpc_attachment
     props:
-      - name: CoreNetworkId
-        value: '{{ CoreNetworkId }}'
-      - name: VpcArn
-        value: '{{ VpcArn }}'
-      - name: ProposedSegmentChange
+      - name: core_network_id
+        value: '{{ core_network_id }}'
+      - name: vpc_arn
+        value: '{{ vpc_arn }}'
+      - name: proposed_segment_change
         value:
-          Tags:
-            - Key: '{{ Key }}'
-              Value: '{{ Value }}'
-          AttachmentPolicyRuleNumber: '{{ AttachmentPolicyRuleNumber }}'
-          SegmentName: '{{ SegmentName }}'
-      - name: ProposedNetworkFunctionGroupChange
+          tags:
+            - key: '{{ key }}'
+              value: '{{ value }}'
+          attachment_policy_rule_number: '{{ attachment_policy_rule_number }}'
+          segment_name: '{{ segment_name }}'
+      - name: proposed_network_function_group_change
         value:
-          Tags:
+          tags:
             - null
-          AttachmentPolicyRuleNumber: '{{ AttachmentPolicyRuleNumber }}'
-          NetworkFunctionGroupName: '{{ NetworkFunctionGroupName }}'
-      - name: Tags
+          attachment_policy_rule_number: '{{ attachment_policy_rule_number }}'
+          network_function_group_name: '{{ network_function_group_name }}'
+      - name: tags
         value:
           - null
-      - name: SubnetArns
+      - name: subnet_arns
         value:
-          - '{{ SubnetArns[0] }}'
-      - name: Options
+          - '{{ subnet_arns[0] }}'
+      - name: options
         value:
-          Ipv6Support: '{{ Ipv6Support }}'
-          ApplianceModeSupport: '{{ ApplianceModeSupport }}'
-          DnsSupport: '{{ DnsSupport }}'
-          SecurityGroupReferencingSupport: '{{ SecurityGroupReferencingSupport }}'
-
+          ipv6_support: '{{ ipv6_support }}'
+          appliance_mode_support: '{{ appliance_mode_support }}'
+          dns_support: '{{ dns_support }}'
+          security_group_referencing_support: '{{ security_group_referencing_support }}'
 ```
 </TabItem>
 </Tabs>
@@ -467,7 +466,7 @@ SET PatchDocument = string('{{ {
     "Options": options
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<AttachmentId>';
+AND Identifier = '{{ attachment_id }}';
 ```
 
 
@@ -476,7 +475,7 @@ AND Identifier = '<AttachmentId>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.networkmanager.vpc_attachments
-WHERE Identifier = '<AttachmentId>'
+WHERE Identifier = '{{ attachment_id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/notifications/channel_associations/index.md b/website/docs/services/notifications/channel_associations/index.md
index 6451c4734..09110811b 100644
--- a/website/docs/services/notifications/channel_associations/index.md
+++ b/website/docs/services/notifications/channel_associations/index.md
@@ -139,7 +139,7 @@ region,
 arn,
 notification_configuration_arn
 FROM awscc.notifications.channel_associations
-WHERE region = 'us-east-1' AND Identifier = '<Arn>|<NotificationConfigurationArn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ arn }}|{{ notification_configuration_arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -177,9 +177,9 @@ INSERT INTO awscc.notifications.channel_associations (
  NotificationConfigurationArn,
  region
 )
-SELECT 
-'{{ Arn }}',
- '{{ NotificationConfigurationArn }}',
+SELECT
+'{{ arn }}',
+ '{{ notification_configuration_arn }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -192,9 +192,9 @@ INSERT INTO awscc.notifications.channel_associations (
  NotificationConfigurationArn,
  region
 )
-SELECT 
- '{{ Arn }}',
- '{{ NotificationConfigurationArn }}',
+SELECT
+ '{{ arn }}',
+ '{{ notification_configuration_arn }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -212,11 +212,10 @@ globals:
 resources:
   - name: channel_association
     props:
-      - name: Arn
-        value: '{{ Arn }}'
-      - name: NotificationConfigurationArn
-        value: '{{ NotificationConfigurationArn }}'
-
+      - name: arn
+        value: '{{ arn }}'
+      - name: notification_configuration_arn
+        value: '{{ notification_configuration_arn }}'
 ```
 </TabItem>
 </Tabs>
@@ -227,7 +226,7 @@ resources:
 ```sql
 /*+ delete */
 DELETE FROM awscc.notifications.channel_associations
-WHERE Identifier = '<Arn|NotificationConfigurationArn>'
+WHERE Identifier = '{{ arn }}|{{ notification_configuration_arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/notifications/event_rules/index.md b/website/docs/services/notifications/event_rules/index.md
index b65328837..f7e00e1c7 100644
--- a/website/docs/services/notifications/event_rules/index.md
+++ b/website/docs/services/notifications/event_rules/index.md
@@ -182,7 +182,7 @@ regions,
 source,
 status_summary_by_region
 FROM awscc.notifications.event_rules
-WHERE region = 'us-east-1' AND Identifier = '<Arn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -221,11 +221,11 @@ INSERT INTO awscc.notifications.event_rules (
  Source,
  region
 )
-SELECT 
-'{{ EventType }}',
- '{{ NotificationConfigurationArn }}',
- '{{ Regions }}',
- '{{ Source }}',
+SELECT
+'{{ event_type }}',
+ '{{ notification_configuration_arn }}',
+ '{{ regions }}',
+ '{{ source }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -241,12 +241,12 @@ INSERT INTO awscc.notifications.event_rules (
  Source,
  region
 )
-SELECT 
- '{{ EventPattern }}',
- '{{ EventType }}',
- '{{ NotificationConfigurationArn }}',
- '{{ Regions }}',
- '{{ Source }}',
+SELECT
+ '{{ event_pattern }}',
+ '{{ event_type }}',
+ '{{ notification_configuration_arn }}',
+ '{{ regions }}',
+ '{{ source }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -264,18 +264,17 @@ globals:
 resources:
   - name: event_rule
     props:
-      - name: EventPattern
-        value: '{{ EventPattern }}'
-      - name: EventType
-        value: '{{ EventType }}'
-      - name: NotificationConfigurationArn
-        value: '{{ NotificationConfigurationArn }}'
-      - name: Regions
+      - name: event_pattern
+        value: '{{ event_pattern }}'
+      - name: event_type
+        value: '{{ event_type }}'
+      - name: notification_configuration_arn
+        value: '{{ notification_configuration_arn }}'
+      - name: regions
         value:
-          - '{{ Regions[0] }}'
-      - name: Source
-        value: '{{ Source }}'
-
+          - '{{ regions[0] }}'
+      - name: source
+        value: '{{ source }}'
 ```
 </TabItem>
 </Tabs>
@@ -292,7 +291,7 @@ SET PatchDocument = string('{{ {
     "Regions": regions
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Arn>';
+AND Identifier = '{{ arn }}';
 ```
 
 
@@ -301,7 +300,7 @@ AND Identifier = '<Arn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.notifications.event_rules
-WHERE Identifier = '<Arn>'
+WHERE Identifier = '{{ arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/notifications/managed_notification_account_contact_associations/index.md b/website/docs/services/notifications/managed_notification_account_contact_associations/index.md
index 1d69958be..47e87a27d 100644
--- a/website/docs/services/notifications/managed_notification_account_contact_associations/index.md
+++ b/website/docs/services/notifications/managed_notification_account_contact_associations/index.md
@@ -145,7 +145,7 @@ region,
 managed_notification_configuration_arn,
 contact_identifier
 FROM awscc.notifications.managed_notification_account_contact_associations
-WHERE region = 'us-east-1' AND Identifier = '<ManagedNotificationConfigurationArn>|<ContactIdentifier>';
+WHERE region = 'us-east-1' AND Identifier = '{{ managed_notification_configuration_arn }}|{{ contact_identifier }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -183,9 +183,9 @@ INSERT INTO awscc.notifications.managed_notification_account_contact_association
  ContactIdentifier,
  region
 )
-SELECT 
-'{{ ManagedNotificationConfigurationArn }}',
- '{{ ContactIdentifier }}',
+SELECT
+'{{ managed_notification_configuration_arn }}',
+ '{{ contact_identifier }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -198,9 +198,9 @@ INSERT INTO awscc.notifications.managed_notification_account_contact_association
  ContactIdentifier,
  region
 )
-SELECT 
- '{{ ManagedNotificationConfigurationArn }}',
- '{{ ContactIdentifier }}',
+SELECT
+ '{{ managed_notification_configuration_arn }}',
+ '{{ contact_identifier }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -218,11 +218,10 @@ globals:
 resources:
   - name: managed_notification_account_contact_association
     props:
-      - name: ManagedNotificationConfigurationArn
-        value: '{{ ManagedNotificationConfigurationArn }}'
-      - name: ContactIdentifier
-        value: '{{ ContactIdentifier }}'
-
+      - name: managed_notification_configuration_arn
+        value: '{{ managed_notification_configuration_arn }}'
+      - name: contact_identifier
+        value: '{{ contact_identifier }}'
 ```
 </TabItem>
 </Tabs>
@@ -233,7 +232,7 @@ resources:
 ```sql
 /*+ delete */
 DELETE FROM awscc.notifications.managed_notification_account_contact_associations
-WHERE Identifier = '<ManagedNotificationConfigurationArn|ContactIdentifier>'
+WHERE Identifier = '{{ managed_notification_configuration_arn }}|{{ contact_identifier }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/notifications/managed_notification_additional_channel_associations/index.md b/website/docs/services/notifications/managed_notification_additional_channel_associations/index.md
index bc76ff905..bb8c6a55a 100644
--- a/website/docs/services/notifications/managed_notification_additional_channel_associations/index.md
+++ b/website/docs/services/notifications/managed_notification_additional_channel_associations/index.md
@@ -139,7 +139,7 @@ region,
 channel_arn,
 managed_notification_configuration_arn
 FROM awscc.notifications.managed_notification_additional_channel_associations
-WHERE region = 'us-east-1' AND Identifier = '<ChannelArn>|<ManagedNotificationConfigurationArn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ channel_arn }}|{{ managed_notification_configuration_arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -177,9 +177,9 @@ INSERT INTO awscc.notifications.managed_notification_additional_channel_associat
  ManagedNotificationConfigurationArn,
  region
 )
-SELECT 
-'{{ ChannelArn }}',
- '{{ ManagedNotificationConfigurationArn }}',
+SELECT
+'{{ channel_arn }}',
+ '{{ managed_notification_configuration_arn }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -192,9 +192,9 @@ INSERT INTO awscc.notifications.managed_notification_additional_channel_associat
  ManagedNotificationConfigurationArn,
  region
 )
-SELECT 
- '{{ ChannelArn }}',
- '{{ ManagedNotificationConfigurationArn }}',
+SELECT
+ '{{ channel_arn }}',
+ '{{ managed_notification_configuration_arn }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -212,11 +212,10 @@ globals:
 resources:
   - name: managed_notification_additional_channel_association
     props:
-      - name: ChannelArn
-        value: '{{ ChannelArn }}'
-      - name: ManagedNotificationConfigurationArn
-        value: '{{ ManagedNotificationConfigurationArn }}'
-
+      - name: channel_arn
+        value: '{{ channel_arn }}'
+      - name: managed_notification_configuration_arn
+        value: '{{ managed_notification_configuration_arn }}'
 ```
 </TabItem>
 </Tabs>
@@ -227,7 +226,7 @@ resources:
 ```sql
 /*+ delete */
 DELETE FROM awscc.notifications.managed_notification_additional_channel_associations
-WHERE Identifier = '<ChannelArn|ManagedNotificationConfigurationArn>'
+WHERE Identifier = '{{ channel_arn }}|{{ managed_notification_configuration_arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/notifications/notification_configurations/index.md b/website/docs/services/notifications/notification_configurations/index.md
index a20a918a5..fb756345d 100644
--- a/website/docs/services/notifications/notification_configurations/index.md
+++ b/website/docs/services/notifications/notification_configurations/index.md
@@ -182,7 +182,7 @@ name,
 status,
 tags
 FROM awscc.notifications.notification_configurations
-WHERE region = 'us-east-1' AND Identifier = '<Arn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -219,9 +219,9 @@ INSERT INTO awscc.notifications.notification_configurations (
  Name,
  region
 )
-SELECT 
-'{{ Description }}',
- '{{ Name }}',
+SELECT
+'{{ description }}',
+ '{{ name }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -236,11 +236,11 @@ INSERT INTO awscc.notifications.notification_configurations (
  Tags,
  region
 )
-SELECT 
- '{{ AggregationDuration }}',
- '{{ Description }}',
- '{{ Name }}',
- '{{ Tags }}',
+SELECT
+ '{{ aggregation_duration }}',
+ '{{ description }}',
+ '{{ name }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -258,17 +258,16 @@ globals:
 resources:
   - name: notification_configuration
     props:
-      - name: AggregationDuration
-        value: '{{ AggregationDuration }}'
-      - name: Description
-        value: '{{ Description }}'
-      - name: Name
-        value: '{{ Name }}'
-      - name: Tags
+      - name: aggregation_duration
+        value: '{{ aggregation_duration }}'
+      - name: description
+        value: '{{ description }}'
+      - name: name
+        value: '{{ name }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -286,7 +285,7 @@ SET PatchDocument = string('{{ {
     "Name": name
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Arn>';
+AND Identifier = '{{ arn }}';
 ```
 
 
@@ -295,7 +294,7 @@ AND Identifier = '<Arn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.notifications.notification_configurations
-WHERE Identifier = '<Arn>'
+WHERE Identifier = '{{ arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/notifications/notification_hubs/index.md b/website/docs/services/notifications/notification_hubs/index.md
index 2c4520ad5..82b9a4610 100644
--- a/website/docs/services/notifications/notification_hubs/index.md
+++ b/website/docs/services/notifications/notification_hubs/index.md
@@ -152,7 +152,7 @@ region,
 notification_hub_status_summary,
 creation_time
 FROM awscc.notifications.notification_hubs
-WHERE region = 'us-east-1' AND Identifier = '<Region>';
+WHERE region = 'us-east-1' AND Identifier = '{{ region }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -188,8 +188,8 @@ INSERT INTO awscc.notifications.notification_hubs (
  Region,
  region
 )
-SELECT 
-'{{ Region }}',
+SELECT
+'{{ region }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -201,8 +201,8 @@ INSERT INTO awscc.notifications.notification_hubs (
  Region,
  region
 )
-SELECT 
- '{{ Region }}',
+SELECT
+ '{{ region }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -220,9 +220,8 @@ globals:
 resources:
   - name: notification_hub
     props:
-      - name: Region
-        value: '{{ Region }}'
-
+      - name: region
+        value: '{{ region }}'
 ```
 </TabItem>
 </Tabs>
@@ -233,7 +232,7 @@ resources:
 ```sql
 /*+ delete */
 DELETE FROM awscc.notifications.notification_hubs
-WHERE Identifier = '<Region>'
+WHERE Identifier = '{{ region }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/notifications/organizational_unit_associations/index.md b/website/docs/services/notifications/organizational_unit_associations/index.md
index c52df5013..d600d0e97 100644
--- a/website/docs/services/notifications/organizational_unit_associations/index.md
+++ b/website/docs/services/notifications/organizational_unit_associations/index.md
@@ -139,7 +139,7 @@ region,
 notification_configuration_arn,
 organizational_unit_id
 FROM awscc.notifications.organizational_unit_associations
-WHERE region = 'us-east-1' AND Identifier = '<NotificationConfigurationArn>|<OrganizationalUnitId>';
+WHERE region = 'us-east-1' AND Identifier = '{{ notification_configuration_arn }}|{{ organizational_unit_id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -177,9 +177,9 @@ INSERT INTO awscc.notifications.organizational_unit_associations (
  OrganizationalUnitId,
  region
 )
-SELECT 
-'{{ NotificationConfigurationArn }}',
- '{{ OrganizationalUnitId }}',
+SELECT
+'{{ notification_configuration_arn }}',
+ '{{ organizational_unit_id }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -192,9 +192,9 @@ INSERT INTO awscc.notifications.organizational_unit_associations (
  OrganizationalUnitId,
  region
 )
-SELECT 
- '{{ NotificationConfigurationArn }}',
- '{{ OrganizationalUnitId }}',
+SELECT
+ '{{ notification_configuration_arn }}',
+ '{{ organizational_unit_id }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -212,11 +212,10 @@ globals:
 resources:
   - name: organizational_unit_association
     props:
-      - name: NotificationConfigurationArn
-        value: '{{ NotificationConfigurationArn }}'
-      - name: OrganizationalUnitId
-        value: '{{ OrganizationalUnitId }}'
-
+      - name: notification_configuration_arn
+        value: '{{ notification_configuration_arn }}'
+      - name: organizational_unit_id
+        value: '{{ organizational_unit_id }}'
 ```
 </TabItem>
 </Tabs>
@@ -227,7 +226,7 @@ resources:
 ```sql
 /*+ delete */
 DELETE FROM awscc.notifications.organizational_unit_associations
-WHERE Identifier = '<NotificationConfigurationArn|OrganizationalUnitId>'
+WHERE Identifier = '{{ notification_configuration_arn }}|{{ organizational_unit_id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/notificationscontacts/email_contacts/index.md b/website/docs/services/notificationscontacts/email_contacts/index.md
index cedd53626..3d244b7a7 100644
--- a/website/docs/services/notificationscontacts/email_contacts/index.md
+++ b/website/docs/services/notificationscontacts/email_contacts/index.md
@@ -198,7 +198,7 @@ name,
 email_contact,
 tags
 FROM awscc.notificationscontacts.email_contacts
-WHERE region = 'us-east-1' AND Identifier = '<Arn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -235,9 +235,9 @@ INSERT INTO awscc.notificationscontacts.email_contacts (
  Name,
  region
 )
-SELECT 
-'{{ EmailAddress }}',
- '{{ Name }}',
+SELECT
+'{{ email_address }}',
+ '{{ name }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -251,10 +251,10 @@ INSERT INTO awscc.notificationscontacts.email_contacts (
  Tags,
  region
 )
-SELECT 
- '{{ EmailAddress }}',
- '{{ Name }}',
- '{{ Tags }}',
+SELECT
+ '{{ email_address }}',
+ '{{ name }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -272,15 +272,14 @@ globals:
 resources:
   - name: email_contact
     props:
-      - name: EmailAddress
-        value: '{{ EmailAddress }}'
-      - name: Name
-        value: '{{ Name }}'
-      - name: Tags
+      - name: email_address
+        value: '{{ email_address }}'
+      - name: name
+        value: '{{ name }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -291,7 +290,7 @@ resources:
 ```sql
 /*+ delete */
 DELETE FROM awscc.notificationscontacts.email_contacts
-WHERE Identifier = '<Arn>'
+WHERE Identifier = '{{ arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/oam/links/index.md b/website/docs/services/oam/links/index.md
index 5af744bac..c5409f4d6 100644
--- a/website/docs/services/oam/links/index.md
+++ b/website/docs/services/oam/links/index.md
@@ -184,7 +184,7 @@ sink_identifier,
 link_configuration,
 tags
 FROM awscc.oam.links
-WHERE region = 'us-east-1' AND Identifier = '<Arn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -221,9 +221,9 @@ INSERT INTO awscc.oam.links (
  SinkIdentifier,
  region
 )
-SELECT 
-'{{ ResourceTypes }}',
- '{{ SinkIdentifier }}',
+SELECT
+'{{ resource_types }}',
+ '{{ sink_identifier }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -239,12 +239,12 @@ INSERT INTO awscc.oam.links (
  Tags,
  region
 )
-SELECT 
- '{{ LabelTemplate }}',
- '{{ ResourceTypes }}',
- '{{ SinkIdentifier }}',
- '{{ LinkConfiguration }}',
- '{{ Tags }}',
+SELECT
+ '{{ label_template }}',
+ '{{ resource_types }}',
+ '{{ sink_identifier }}',
+ '{{ link_configuration }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -262,21 +262,20 @@ globals:
 resources:
   - name: link
     props:
-      - name: LabelTemplate
-        value: '{{ LabelTemplate }}'
-      - name: ResourceTypes
+      - name: label_template
+        value: '{{ label_template }}'
+      - name: resource_types
         value:
-          - '{{ ResourceTypes[0] }}'
-      - name: SinkIdentifier
-        value: '{{ SinkIdentifier }}'
-      - name: LinkConfiguration
+          - '{{ resource_types[0] }}'
+      - name: sink_identifier
+        value: '{{ sink_identifier }}'
+      - name: link_configuration
         value:
-          MetricConfiguration:
-            Filter: '{{ Filter }}'
-          LogGroupConfiguration: null
-      - name: Tags
+          metric_configuration:
+            filter: '{{ filter }}'
+          log_group_configuration: null
+      - name: tags
         value: {}
-
 ```
 </TabItem>
 </Tabs>
@@ -294,7 +293,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Arn>';
+AND Identifier = '{{ arn }}';
 ```
 
 
@@ -303,7 +302,7 @@ AND Identifier = '<Arn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.oam.links
-WHERE Identifier = '<Arn>'
+WHERE Identifier = '{{ arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/oam/sinks/index.md b/website/docs/services/oam/sinks/index.md
index e369fdeae..eec5ebaac 100644
--- a/website/docs/services/oam/sinks/index.md
+++ b/website/docs/services/oam/sinks/index.md
@@ -152,7 +152,7 @@ name,
 policy,
 tags
 FROM awscc.oam.sinks
-WHERE region = 'us-east-1' AND Identifier = '<Arn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -188,8 +188,8 @@ INSERT INTO awscc.oam.sinks (
  Name,
  region
 )
-SELECT 
-'{{ Name }}',
+SELECT
+'{{ name }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -203,10 +203,10 @@ INSERT INTO awscc.oam.sinks (
  Tags,
  region
 )
-SELECT 
- '{{ Name }}',
- '{{ Policy }}',
- '{{ Tags }}',
+SELECT
+ '{{ name }}',
+ '{{ policy }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -224,13 +224,12 @@ globals:
 resources:
   - name: sink
     props:
-      - name: Name
-        value: '{{ Name }}'
-      - name: Policy
+      - name: name
+        value: '{{ name }}'
+      - name: policy
         value: {}
-      - name: Tags
+      - name: tags
         value: {}
-
 ```
 </TabItem>
 </Tabs>
@@ -247,7 +246,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Arn>';
+AND Identifier = '{{ arn }}';
 ```
 
 
@@ -256,7 +255,7 @@ AND Identifier = '<Arn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.oam.sinks
-WHERE Identifier = '<Arn>'
+WHERE Identifier = '{{ arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/observabilityadmin/organization_telemetry_rules/index.md b/website/docs/services/observabilityadmin/organization_telemetry_rules/index.md
index 4c4d31795..b545da3e3 100644
--- a/website/docs/services/observabilityadmin/organization_telemetry_rules/index.md
+++ b/website/docs/services/observabilityadmin/organization_telemetry_rules/index.md
@@ -227,7 +227,7 @@ rule,
 rule_arn,
 tags
 FROM awscc.observabilityadmin.organization_telemetry_rules
-WHERE region = 'us-east-1' AND Identifier = '<RuleArn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ rule_arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -264,9 +264,9 @@ INSERT INTO awscc.observabilityadmin.organization_telemetry_rules (
  Rule,
  region
 )
-SELECT 
-'{{ RuleName }}',
- '{{ Rule }}',
+SELECT
+'{{ rule_name }}',
+ '{{ rule }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -280,10 +280,10 @@ INSERT INTO awscc.observabilityadmin.organization_telemetry_rules (
  Tags,
  region
 )
-SELECT 
- '{{ RuleName }}',
- '{{ Rule }}',
- '{{ Tags }}',
+SELECT
+ '{{ rule_name }}',
+ '{{ rule }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -301,19 +301,18 @@ globals:
 resources:
   - name: organization_telemetry_rule
     props:
-      - name: RuleName
-        value: '{{ RuleName }}'
-      - name: Rule
+      - name: rule_name
+        value: '{{ rule_name }}'
+      - name: rule
         value:
-          RuleName: '{{ RuleName }}'
-          Rule: null
-          Tags:
-            - Key: '{{ Key }}'
-              Value: '{{ Value }}'
-      - name: Tags
+          rule_name: '{{ rule_name }}'
+          rule: null
+          tags:
+            - key: '{{ key }}'
+              value: '{{ value }}'
+      - name: tags
         value:
           - null
-
 ```
 </TabItem>
 </Tabs>
@@ -330,7 +329,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<RuleArn>';
+AND Identifier = '{{ rule_arn }}';
 ```
 
 
@@ -339,7 +338,7 @@ AND Identifier = '<RuleArn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.observabilityadmin.organization_telemetry_rules
-WHERE Identifier = '<RuleArn>'
+WHERE Identifier = '{{ rule_arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/observabilityadmin/telemetry_rules/index.md b/website/docs/services/observabilityadmin/telemetry_rules/index.md
index 32bcec929..d13c44f00 100644
--- a/website/docs/services/observabilityadmin/telemetry_rules/index.md
+++ b/website/docs/services/observabilityadmin/telemetry_rules/index.md
@@ -227,7 +227,7 @@ rule,
 rule_arn,
 tags
 FROM awscc.observabilityadmin.telemetry_rules
-WHERE region = 'us-east-1' AND Identifier = '<RuleArn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ rule_arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -264,9 +264,9 @@ INSERT INTO awscc.observabilityadmin.telemetry_rules (
  Rule,
  region
 )
-SELECT 
-'{{ RuleName }}',
- '{{ Rule }}',
+SELECT
+'{{ rule_name }}',
+ '{{ rule }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -280,10 +280,10 @@ INSERT INTO awscc.observabilityadmin.telemetry_rules (
  Tags,
  region
 )
-SELECT 
- '{{ RuleName }}',
- '{{ Rule }}',
- '{{ Tags }}',
+SELECT
+ '{{ rule_name }}',
+ '{{ rule }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -301,19 +301,18 @@ globals:
 resources:
   - name: telemetry_rule
     props:
-      - name: RuleName
-        value: '{{ RuleName }}'
-      - name: Rule
+      - name: rule_name
+        value: '{{ rule_name }}'
+      - name: rule
         value:
-          RuleName: '{{ RuleName }}'
-          Rule: null
-          Tags:
-            - Key: '{{ Key }}'
-              Value: '{{ Value }}'
-      - name: Tags
+          rule_name: '{{ rule_name }}'
+          rule: null
+          tags:
+            - key: '{{ key }}'
+              value: '{{ value }}'
+      - name: tags
         value:
           - null
-
 ```
 </TabItem>
 </Tabs>
@@ -330,7 +329,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<RuleArn>';
+AND Identifier = '{{ rule_arn }}';
 ```
 
 
@@ -339,7 +338,7 @@ AND Identifier = '<RuleArn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.observabilityadmin.telemetry_rules
-WHERE Identifier = '<RuleArn>'
+WHERE Identifier = '{{ rule_arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/odb/cloud_autonomous_vm_clusters/index.md b/website/docs/services/odb/cloud_autonomous_vm_clusters/index.md
index 2ea45b6be..d3eedad8a 100644
--- a/website/docs/services/odb/cloud_autonomous_vm_clusters/index.md
+++ b/website/docs/services/odb/cloud_autonomous_vm_clusters/index.md
@@ -436,7 +436,7 @@ tags,
 time_zone,
 total_container_databases
 FROM awscc.odb.cloud_autonomous_vm_clusters
-WHERE region = 'us-east-1' AND Identifier = '<CloudAutonomousVmClusterArn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ cloud_autonomous_vm_cluster_arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -487,23 +487,23 @@ INSERT INTO awscc.odb.cloud_autonomous_vm_clusters (
  TotalContainerDatabases,
  region
 )
-SELECT 
-'{{ OdbNetworkId }}',
- '{{ DisplayName }}',
- '{{ CloudExadataInfrastructureId }}',
- '{{ AutonomousDataStorageSizeInTBs }}',
- '{{ CpuCoreCountPerNode }}',
- '{{ DbServers }}',
- '{{ Description }}',
- '{{ IsMtlsEnabledVmCluster }}',
- '{{ LicenseModel }}',
- '{{ MaintenanceWindow }}',
- '{{ MemoryPerOracleComputeUnitInGBs }}',
- '{{ ScanListenerPortNonTls }}',
- '{{ ScanListenerPortTls }}',
- '{{ Tags }}',
- '{{ TimeZone }}',
- '{{ TotalContainerDatabases }}',
+SELECT
+'{{ odb_network_id }}',
+ '{{ display_name }}',
+ '{{ cloud_exadata_infrastructure_id }}',
+ '{{ autonomous_data_storage_size_in_tbs }}',
+ '{{ cpu_core_count_per_node }}',
+ '{{ db_servers }}',
+ '{{ description }}',
+ '{{ is_mtls_enabled_vm_cluster }}',
+ '{{ license_model }}',
+ '{{ maintenance_window }}',
+ '{{ memory_per_oracle_compute_unit_in_gbs }}',
+ '{{ scan_listener_port_non_tls }}',
+ '{{ scan_listener_port_tls }}',
+ '{{ tags }}',
+ '{{ time_zone }}',
+ '{{ total_container_databases }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -530,23 +530,23 @@ INSERT INTO awscc.odb.cloud_autonomous_vm_clusters (
  TotalContainerDatabases,
  region
 )
-SELECT 
- '{{ OdbNetworkId }}',
- '{{ DisplayName }}',
- '{{ CloudExadataInfrastructureId }}',
- '{{ AutonomousDataStorageSizeInTBs }}',
- '{{ CpuCoreCountPerNode }}',
- '{{ DbServers }}',
- '{{ Description }}',
- '{{ IsMtlsEnabledVmCluster }}',
- '{{ LicenseModel }}',
- '{{ MaintenanceWindow }}',
- '{{ MemoryPerOracleComputeUnitInGBs }}',
- '{{ ScanListenerPortNonTls }}',
- '{{ ScanListenerPortTls }}',
- '{{ Tags }}',
- '{{ TimeZone }}',
- '{{ TotalContainerDatabases }}',
+SELECT
+ '{{ odb_network_id }}',
+ '{{ display_name }}',
+ '{{ cloud_exadata_infrastructure_id }}',
+ '{{ autonomous_data_storage_size_in_tbs }}',
+ '{{ cpu_core_count_per_node }}',
+ '{{ db_servers }}',
+ '{{ description }}',
+ '{{ is_mtls_enabled_vm_cluster }}',
+ '{{ license_model }}',
+ '{{ maintenance_window }}',
+ '{{ memory_per_oracle_compute_unit_in_gbs }}',
+ '{{ scan_listener_port_non_tls }}',
+ '{{ scan_listener_port_tls }}',
+ '{{ tags }}',
+ '{{ time_zone }}',
+ '{{ total_container_databases }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -564,52 +564,51 @@ globals:
 resources:
   - name: cloud_autonomous_vm_cluster
     props:
-      - name: OdbNetworkId
-        value: '{{ OdbNetworkId }}'
-      - name: DisplayName
-        value: '{{ DisplayName }}'
-      - name: CloudExadataInfrastructureId
-        value: '{{ CloudExadataInfrastructureId }}'
-      - name: AutonomousDataStorageSizeInTBs
+      - name: odb_network_id
+        value: '{{ odb_network_id }}'
+      - name: display_name
+        value: '{{ display_name }}'
+      - name: cloud_exadata_infrastructure_id
+        value: '{{ cloud_exadata_infrastructure_id }}'
+      - name: autonomous_data_storage_size_in_tbs
         value: null
-      - name: CpuCoreCountPerNode
-        value: '{{ CpuCoreCountPerNode }}'
-      - name: DbServers
+      - name: cpu_core_count_per_node
+        value: '{{ cpu_core_count_per_node }}'
+      - name: db_servers
         value:
-          - '{{ DbServers[0] }}'
-      - name: Description
-        value: '{{ Description }}'
-      - name: IsMtlsEnabledVmCluster
-        value: '{{ IsMtlsEnabledVmCluster }}'
-      - name: LicenseModel
-        value: '{{ LicenseModel }}'
-      - name: MaintenanceWindow
+          - '{{ db_servers[0] }}'
+      - name: description
+        value: '{{ description }}'
+      - name: is_mtls_enabled_vm_cluster
+        value: '{{ is_mtls_enabled_vm_cluster }}'
+      - name: license_model
+        value: '{{ license_model }}'
+      - name: maintenance_window
         value:
-          DaysOfWeek:
-            - '{{ DaysOfWeek[0] }}'
-          HoursOfDay:
-            - '{{ HoursOfDay[0] }}'
-          LeadTimeInWeeks: '{{ LeadTimeInWeeks }}'
-          Months:
-            - '{{ Months[0] }}'
-          Preference: '{{ Preference }}'
-          WeeksOfMonth:
-            - '{{ WeeksOfMonth[0] }}'
-      - name: MemoryPerOracleComputeUnitInGBs
-        value: '{{ MemoryPerOracleComputeUnitInGBs }}'
-      - name: ScanListenerPortNonTls
-        value: '{{ ScanListenerPortNonTls }}'
-      - name: ScanListenerPortTls
-        value: '{{ ScanListenerPortTls }}'
-      - name: Tags
+          days_of_week:
+            - '{{ days_of_week[0] }}'
+          hours_of_day:
+            - '{{ hours_of_day[0] }}'
+          lead_time_in_weeks: '{{ lead_time_in_weeks }}'
+          months:
+            - '{{ months[0] }}'
+          preference: '{{ preference }}'
+          weeks_of_month:
+            - '{{ weeks_of_month[0] }}'
+      - name: memory_per_oracle_compute_unit_in_gbs
+        value: '{{ memory_per_oracle_compute_unit_in_gbs }}'
+      - name: scan_listener_port_non_tls
+        value: '{{ scan_listener_port_non_tls }}'
+      - name: scan_listener_port_tls
+        value: '{{ scan_listener_port_tls }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-      - name: TimeZone
-        value: '{{ TimeZone }}'
-      - name: TotalContainerDatabases
-        value: '{{ TotalContainerDatabases }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
+      - name: time_zone
+        value: '{{ time_zone }}'
+      - name: total_container_databases
+        value: '{{ total_container_databases }}'
 ```
 </TabItem>
 </Tabs>
@@ -625,7 +624,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<CloudAutonomousVmClusterArn>';
+AND Identifier = '{{ cloud_autonomous_vm_cluster_arn }}';
 ```
 
 
@@ -634,7 +633,7 @@ AND Identifier = '<CloudAutonomousVmClusterArn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.odb.cloud_autonomous_vm_clusters
-WHERE Identifier = '<CloudAutonomousVmClusterArn>'
+WHERE Identifier = '{{ cloud_autonomous_vm_cluster_arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/odb/cloud_exadata_infrastructures/index.md b/website/docs/services/odb/cloud_exadata_infrastructures/index.md
index 36b898930..c66b82e11 100644
--- a/website/docs/services/odb/cloud_exadata_infrastructures/index.md
+++ b/website/docs/services/odb/cloud_exadata_infrastructures/index.md
@@ -333,7 +333,7 @@ tags,
 total_storage_size_in_gbs,
 db_server_ids
 FROM awscc.odb.cloud_exadata_infrastructures
-WHERE region = 'us-east-1' AND Identifier = '<CloudExadataInfrastructureArn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ cloud_exadata_infrastructure_arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -378,17 +378,17 @@ INSERT INTO awscc.odb.cloud_exadata_infrastructures (
  Tags,
  region
 )
-SELECT 
-'{{ AvailabilityZone }}',
- '{{ AvailabilityZoneId }}',
- '{{ ComputeCount }}',
- '{{ CustomerContactsToSendToOCI }}',
- '{{ DatabaseServerType }}',
- '{{ DisplayName }}',
- '{{ Shape }}',
- '{{ StorageCount }}',
- '{{ StorageServerType }}',
- '{{ Tags }}',
+SELECT
+'{{ availability_zone }}',
+ '{{ availability_zone_id }}',
+ '{{ compute_count }}',
+ '{{ customer_contacts_to_send_to_oc_i }}',
+ '{{ database_server_type }}',
+ '{{ display_name }}',
+ '{{ shape }}',
+ '{{ storage_count }}',
+ '{{ storage_server_type }}',
+ '{{ tags }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -409,17 +409,17 @@ INSERT INTO awscc.odb.cloud_exadata_infrastructures (
  Tags,
  region
 )
-SELECT 
- '{{ AvailabilityZone }}',
- '{{ AvailabilityZoneId }}',
- '{{ ComputeCount }}',
- '{{ CustomerContactsToSendToOCI }}',
- '{{ DatabaseServerType }}',
- '{{ DisplayName }}',
- '{{ Shape }}',
- '{{ StorageCount }}',
- '{{ StorageServerType }}',
- '{{ Tags }}',
+SELECT
+ '{{ availability_zone }}',
+ '{{ availability_zone_id }}',
+ '{{ compute_count }}',
+ '{{ customer_contacts_to_send_to_oc_i }}',
+ '{{ database_server_type }}',
+ '{{ display_name }}',
+ '{{ shape }}',
+ '{{ storage_count }}',
+ '{{ storage_server_type }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -437,30 +437,29 @@ globals:
 resources:
   - name: cloud_exadata_infrastructure
     props:
-      - name: AvailabilityZone
-        value: '{{ AvailabilityZone }}'
-      - name: AvailabilityZoneId
-        value: '{{ AvailabilityZoneId }}'
-      - name: ComputeCount
-        value: '{{ ComputeCount }}'
-      - name: CustomerContactsToSendToOCI
+      - name: availability_zone
+        value: '{{ availability_zone }}'
+      - name: availability_zone_id
+        value: '{{ availability_zone_id }}'
+      - name: compute_count
+        value: '{{ compute_count }}'
+      - name: customer_contacts_to_send_to_oc_i
         value:
-          - Email: '{{ Email }}'
-      - name: DatabaseServerType
-        value: '{{ DatabaseServerType }}'
-      - name: DisplayName
-        value: '{{ DisplayName }}'
-      - name: Shape
-        value: '{{ Shape }}'
-      - name: StorageCount
-        value: '{{ StorageCount }}'
-      - name: StorageServerType
-        value: '{{ StorageServerType }}'
-      - name: Tags
+          - email: '{{ email }}'
+      - name: database_server_type
+        value: '{{ database_server_type }}'
+      - name: display_name
+        value: '{{ display_name }}'
+      - name: shape
+        value: '{{ shape }}'
+      - name: storage_count
+        value: '{{ storage_count }}'
+      - name: storage_server_type
+        value: '{{ storage_server_type }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -476,7 +475,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<CloudExadataInfrastructureArn>';
+AND Identifier = '{{ cloud_exadata_infrastructure_arn }}';
 ```
 
 
@@ -485,7 +484,7 @@ AND Identifier = '<CloudExadataInfrastructureArn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.odb.cloud_exadata_infrastructures
-WHERE Identifier = '<CloudExadataInfrastructureArn>'
+WHERE Identifier = '{{ cloud_exadata_infrastructure_arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/odb/cloud_vm_clusters/index.md b/website/docs/services/odb/cloud_vm_clusters/index.md
index 49524f0dc..824db1649 100644
--- a/website/docs/services/odb/cloud_vm_clusters/index.md
+++ b/website/docs/services/odb/cloud_vm_clusters/index.md
@@ -367,7 +367,7 @@ tags,
 time_zone,
 vip_ids
 FROM awscc.odb.cloud_vm_clusters
-WHERE region = 'us-east-1' AND Identifier = '<CloudVmClusterArn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ cloud_vm_cluster_arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -422,27 +422,27 @@ INSERT INTO awscc.odb.cloud_vm_clusters (
  TimeZone,
  region
 )
-SELECT 
-'{{ CloudExadataInfrastructureId }}',
- '{{ ClusterName }}',
- '{{ CpuCoreCount }}',
- '{{ DataCollectionOptions }}',
- '{{ DataStorageSizeInTBs }}',
- '{{ DbNodeStorageSizeInGBs }}',
- '{{ DbServers }}',
- '{{ DisplayName }}',
- '{{ GiVersion }}',
- '{{ Hostname }}',
- '{{ IsLocalBackupEnabled }}',
- '{{ IsSparseDiskgroupEnabled }}',
- '{{ LicenseModel }}',
- '{{ MemorySizeInGBs }}',
- '{{ OdbNetworkId }}',
- '{{ ScanListenerPortTcp }}',
- '{{ SshPublicKeys }}',
- '{{ SystemVersion }}',
- '{{ Tags }}',
- '{{ TimeZone }}',
+SELECT
+'{{ cloud_exadata_infrastructure_id }}',
+ '{{ cluster_name }}',
+ '{{ cpu_core_count }}',
+ '{{ data_collection_options }}',
+ '{{ data_storage_size_in_tbs }}',
+ '{{ db_node_storage_size_in_gbs }}',
+ '{{ db_servers }}',
+ '{{ display_name }}',
+ '{{ gi_version }}',
+ '{{ hostname }}',
+ '{{ is_local_backup_enabled }}',
+ '{{ is_sparse_diskgroup_enabled }}',
+ '{{ license_model }}',
+ '{{ memory_size_in_gbs }}',
+ '{{ odb_network_id }}',
+ '{{ scan_listener_port_tcp }}',
+ '{{ ssh_public_keys }}',
+ '{{ system_version }}',
+ '{{ tags }}',
+ '{{ time_zone }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -473,27 +473,27 @@ INSERT INTO awscc.odb.cloud_vm_clusters (
  TimeZone,
  region
 )
-SELECT 
- '{{ CloudExadataInfrastructureId }}',
- '{{ ClusterName }}',
- '{{ CpuCoreCount }}',
- '{{ DataCollectionOptions }}',
- '{{ DataStorageSizeInTBs }}',
- '{{ DbNodeStorageSizeInGBs }}',
- '{{ DbServers }}',
- '{{ DisplayName }}',
- '{{ GiVersion }}',
- '{{ Hostname }}',
- '{{ IsLocalBackupEnabled }}',
- '{{ IsSparseDiskgroupEnabled }}',
- '{{ LicenseModel }}',
- '{{ MemorySizeInGBs }}',
- '{{ OdbNetworkId }}',
- '{{ ScanListenerPortTcp }}',
- '{{ SshPublicKeys }}',
- '{{ SystemVersion }}',
- '{{ Tags }}',
- '{{ TimeZone }}',
+SELECT
+ '{{ cloud_exadata_infrastructure_id }}',
+ '{{ cluster_name }}',
+ '{{ cpu_core_count }}',
+ '{{ data_collection_options }}',
+ '{{ data_storage_size_in_tbs }}',
+ '{{ db_node_storage_size_in_gbs }}',
+ '{{ db_servers }}',
+ '{{ display_name }}',
+ '{{ gi_version }}',
+ '{{ hostname }}',
+ '{{ is_local_backup_enabled }}',
+ '{{ is_sparse_diskgroup_enabled }}',
+ '{{ license_model }}',
+ '{{ memory_size_in_gbs }}',
+ '{{ odb_network_id }}',
+ '{{ scan_listener_port_tcp }}',
+ '{{ ssh_public_keys }}',
+ '{{ system_version }}',
+ '{{ tags }}',
+ '{{ time_zone }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -511,54 +511,53 @@ globals:
 resources:
   - name: cloud_vm_cluster
     props:
-      - name: CloudExadataInfrastructureId
-        value: '{{ CloudExadataInfrastructureId }}'
-      - name: ClusterName
-        value: '{{ ClusterName }}'
-      - name: CpuCoreCount
-        value: '{{ CpuCoreCount }}'
-      - name: DataCollectionOptions
+      - name: cloud_exadata_infrastructure_id
+        value: '{{ cloud_exadata_infrastructure_id }}'
+      - name: cluster_name
+        value: '{{ cluster_name }}'
+      - name: cpu_core_count
+        value: '{{ cpu_core_count }}'
+      - name: data_collection_options
         value:
-          IsDiagnosticsEventsEnabled: '{{ IsDiagnosticsEventsEnabled }}'
-          IsHealthMonitoringEnabled: '{{ IsHealthMonitoringEnabled }}'
-          IsIncidentLogsEnabled: '{{ IsIncidentLogsEnabled }}'
-      - name: DataStorageSizeInTBs
+          is_diagnostics_events_enabled: '{{ is_diagnostics_events_enabled }}'
+          is_health_monitoring_enabled: '{{ is_health_monitoring_enabled }}'
+          is_incident_logs_enabled: '{{ is_incident_logs_enabled }}'
+      - name: data_storage_size_in_tbs
         value: null
-      - name: DbNodeStorageSizeInGBs
-        value: '{{ DbNodeStorageSizeInGBs }}'
-      - name: DbServers
+      - name: db_node_storage_size_in_gbs
+        value: '{{ db_node_storage_size_in_gbs }}'
+      - name: db_servers
         value:
-          - '{{ DbServers[0] }}'
-      - name: DisplayName
-        value: '{{ DisplayName }}'
-      - name: GiVersion
-        value: '{{ GiVersion }}'
-      - name: Hostname
-        value: '{{ Hostname }}'
-      - name: IsLocalBackupEnabled
-        value: '{{ IsLocalBackupEnabled }}'
-      - name: IsSparseDiskgroupEnabled
-        value: '{{ IsSparseDiskgroupEnabled }}'
-      - name: LicenseModel
-        value: '{{ LicenseModel }}'
-      - name: MemorySizeInGBs
-        value: '{{ MemorySizeInGBs }}'
-      - name: OdbNetworkId
-        value: '{{ OdbNetworkId }}'
-      - name: ScanListenerPortTcp
-        value: '{{ ScanListenerPortTcp }}'
-      - name: SshPublicKeys
+          - '{{ db_servers[0] }}'
+      - name: display_name
+        value: '{{ display_name }}'
+      - name: gi_version
+        value: '{{ gi_version }}'
+      - name: hostname
+        value: '{{ hostname }}'
+      - name: is_local_backup_enabled
+        value: '{{ is_local_backup_enabled }}'
+      - name: is_sparse_diskgroup_enabled
+        value: '{{ is_sparse_diskgroup_enabled }}'
+      - name: license_model
+        value: '{{ license_model }}'
+      - name: memory_size_in_gbs
+        value: '{{ memory_size_in_gbs }}'
+      - name: odb_network_id
+        value: '{{ odb_network_id }}'
+      - name: scan_listener_port_tcp
+        value: '{{ scan_listener_port_tcp }}'
+      - name: ssh_public_keys
         value:
-          - '{{ SshPublicKeys[0] }}'
-      - name: SystemVersion
-        value: '{{ SystemVersion }}'
-      - name: Tags
+          - '{{ ssh_public_keys[0] }}'
+      - name: system_version
+        value: '{{ system_version }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-      - name: TimeZone
-        value: '{{ TimeZone }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
+      - name: time_zone
+        value: '{{ time_zone }}'
 ```
 </TabItem>
 </Tabs>
@@ -574,7 +573,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<CloudVmClusterArn>';
+AND Identifier = '{{ cloud_vm_cluster_arn }}';
 ```
 
 
@@ -583,7 +582,7 @@ AND Identifier = '<CloudVmClusterArn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.odb.cloud_vm_clusters
-WHERE Identifier = '<CloudVmClusterArn>'
+WHERE Identifier = '{{ cloud_vm_cluster_arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/odb/odb_networks/index.md b/website/docs/services/odb/odb_networks/index.md
index ee351d62b..2ec65bc0a 100644
--- a/website/docs/services/odb/odb_networks/index.md
+++ b/website/docs/services/odb/odb_networks/index.md
@@ -218,7 +218,7 @@ odb_network_arn,
 odb_network_id,
 tags
 FROM awscc.odb.odb_networks
-WHERE region = 'us-east-1' AND Identifier = '<OdbNetworkArn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ odb_network_arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -261,15 +261,15 @@ INSERT INTO awscc.odb.odb_networks (
  Tags,
  region
 )
-SELECT 
-'{{ AvailabilityZone }}',
- '{{ AvailabilityZoneId }}',
- '{{ BackupSubnetCidr }}',
- '{{ ClientSubnetCidr }}',
- '{{ DefaultDnsPrefix }}',
- '{{ DeleteAssociatedResources }}',
- '{{ DisplayName }}',
- '{{ Tags }}',
+SELECT
+'{{ availability_zone }}',
+ '{{ availability_zone_id }}',
+ '{{ backup_subnet_cidr }}',
+ '{{ client_subnet_cidr }}',
+ '{{ default_dns_prefix }}',
+ '{{ delete_associated_resources }}',
+ '{{ display_name }}',
+ '{{ tags }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -288,15 +288,15 @@ INSERT INTO awscc.odb.odb_networks (
  Tags,
  region
 )
-SELECT 
- '{{ AvailabilityZone }}',
- '{{ AvailabilityZoneId }}',
- '{{ BackupSubnetCidr }}',
- '{{ ClientSubnetCidr }}',
- '{{ DefaultDnsPrefix }}',
- '{{ DeleteAssociatedResources }}',
- '{{ DisplayName }}',
- '{{ Tags }}',
+SELECT
+ '{{ availability_zone }}',
+ '{{ availability_zone_id }}',
+ '{{ backup_subnet_cidr }}',
+ '{{ client_subnet_cidr }}',
+ '{{ default_dns_prefix }}',
+ '{{ delete_associated_resources }}',
+ '{{ display_name }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -314,25 +314,24 @@ globals:
 resources:
   - name: odb_network
     props:
-      - name: AvailabilityZone
-        value: '{{ AvailabilityZone }}'
-      - name: AvailabilityZoneId
-        value: '{{ AvailabilityZoneId }}'
-      - name: BackupSubnetCidr
-        value: '{{ BackupSubnetCidr }}'
-      - name: ClientSubnetCidr
-        value: '{{ ClientSubnetCidr }}'
-      - name: DefaultDnsPrefix
-        value: '{{ DefaultDnsPrefix }}'
-      - name: DeleteAssociatedResources
-        value: '{{ DeleteAssociatedResources }}'
-      - name: DisplayName
-        value: '{{ DisplayName }}'
-      - name: Tags
+      - name: availability_zone
+        value: '{{ availability_zone }}'
+      - name: availability_zone_id
+        value: '{{ availability_zone_id }}'
+      - name: backup_subnet_cidr
+        value: '{{ backup_subnet_cidr }}'
+      - name: client_subnet_cidr
+        value: '{{ client_subnet_cidr }}'
+      - name: default_dns_prefix
+        value: '{{ default_dns_prefix }}'
+      - name: delete_associated_resources
+        value: '{{ delete_associated_resources }}'
+      - name: display_name
+        value: '{{ display_name }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -349,7 +348,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<OdbNetworkArn>';
+AND Identifier = '{{ odb_network_arn }}';
 ```
 
 
@@ -358,7 +357,7 @@ AND Identifier = '<OdbNetworkArn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.odb.odb_networks
-WHERE Identifier = '<OdbNetworkArn>'
+WHERE Identifier = '{{ odb_network_arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/omics/annotation_stores/index.md b/website/docs/services/omics/annotation_stores/index.md
index 3633342d7..efc1f6d5d 100644
--- a/website/docs/services/omics/annotation_stores/index.md
+++ b/website/docs/services/omics/annotation_stores/index.md
@@ -231,7 +231,7 @@ store_size_bytes,
 tags,
 update_time
 FROM awscc.omics.annotation_stores
-WHERE region = 'us-east-1' AND Identifier = '<Name>';
+WHERE region = 'us-east-1' AND Identifier = '{{ name }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -268,9 +268,9 @@ INSERT INTO awscc.omics.annotation_stores (
  StoreFormat,
  region
 )
-SELECT 
-'{{ Name }}',
- '{{ StoreFormat }}',
+SELECT
+'{{ name }}',
+ '{{ store_format }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -288,14 +288,14 @@ INSERT INTO awscc.omics.annotation_stores (
  Tags,
  region
 )
-SELECT 
- '{{ Description }}',
- '{{ Name }}',
- '{{ Reference }}',
- '{{ SseConfig }}',
- '{{ StoreFormat }}',
- '{{ StoreOptions }}',
- '{{ Tags }}',
+SELECT
+ '{{ description }}',
+ '{{ name }}',
+ '{{ reference }}',
+ '{{ sse_config }}',
+ '{{ store_format }}',
+ '{{ store_options }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -313,24 +313,23 @@ globals:
 resources:
   - name: annotation_store
     props:
-      - name: Description
-        value: '{{ Description }}'
-      - name: Name
-        value: '{{ Name }}'
-      - name: Reference
+      - name: description
+        value: '{{ description }}'
+      - name: name
+        value: '{{ name }}'
+      - name: reference
         value:
-          ReferenceArn: '{{ ReferenceArn }}'
-      - name: SseConfig
+          reference_arn: '{{ reference_arn }}'
+      - name: sse_config
         value:
-          Type: '{{ Type }}'
-          KeyArn: '{{ KeyArn }}'
-      - name: StoreFormat
-        value: '{{ StoreFormat }}'
-      - name: StoreOptions
+          type: '{{ type }}'
+          key_arn: '{{ key_arn }}'
+      - name: store_format
+        value: '{{ store_format }}'
+      - name: store_options
         value: null
-      - name: Tags
+      - name: tags
         value: {}
-
 ```
 </TabItem>
 </Tabs>
@@ -346,7 +345,7 @@ SET PatchDocument = string('{{ {
     "Description": description
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Name>';
+AND Identifier = '{{ name }}';
 ```
 
 
@@ -355,7 +354,7 @@ AND Identifier = '<Name>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.omics.annotation_stores
-WHERE Identifier = '<Name>'
+WHERE Identifier = '{{ name }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/omics/reference_stores/index.md b/website/docs/services/omics/reference_stores/index.md
index 8e0d02480..e3a3b7242 100644
--- a/website/docs/services/omics/reference_stores/index.md
+++ b/website/docs/services/omics/reference_stores/index.md
@@ -176,7 +176,7 @@ reference_store_id,
 sse_config,
 tags
 FROM awscc.omics.reference_stores
-WHERE region = 'us-east-1' AND Identifier = '<ReferenceStoreId>';
+WHERE region = 'us-east-1' AND Identifier = '{{ reference_store_id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -212,8 +212,8 @@ INSERT INTO awscc.omics.reference_stores (
  Name,
  region
 )
-SELECT 
-'{{ Name }}',
+SELECT
+'{{ name }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -228,11 +228,11 @@ INSERT INTO awscc.omics.reference_stores (
  Tags,
  region
 )
-SELECT 
- '{{ Description }}',
- '{{ Name }}',
- '{{ SseConfig }}',
- '{{ Tags }}',
+SELECT
+ '{{ description }}',
+ '{{ name }}',
+ '{{ sse_config }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -250,17 +250,16 @@ globals:
 resources:
   - name: reference_store
     props:
-      - name: Description
-        value: '{{ Description }}'
-      - name: Name
-        value: '{{ Name }}'
-      - name: SseConfig
+      - name: description
+        value: '{{ description }}'
+      - name: name
+        value: '{{ name }}'
+      - name: sse_config
         value:
-          Type: '{{ Type }}'
-          KeyArn: '{{ KeyArn }}'
-      - name: Tags
+          type: '{{ type }}'
+          key_arn: '{{ key_arn }}'
+      - name: tags
         value: {}
-
 ```
 </TabItem>
 </Tabs>
@@ -271,7 +270,7 @@ resources:
 ```sql
 /*+ delete */
 DELETE FROM awscc.omics.reference_stores
-WHERE Identifier = '<ReferenceStoreId>'
+WHERE Identifier = '{{ reference_store_id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/omics/run_groups/index.md b/website/docs/services/omics/run_groups/index.md
index 7fde1b721..8eff19813 100644
--- a/website/docs/services/omics/run_groups/index.md
+++ b/website/docs/services/omics/run_groups/index.md
@@ -182,7 +182,7 @@ max_runs,
 name,
 tags
 FROM awscc.omics.run_groups
-WHERE region = 'us-east-1' AND Identifier = '<Id>';
+WHERE region = 'us-east-1' AND Identifier = '{{ id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -223,13 +223,13 @@ INSERT INTO awscc.omics.run_groups (
  Tags,
  region
 )
-SELECT 
-'{{ MaxCpus }}',
- '{{ MaxGpus }}',
- '{{ MaxDuration }}',
- '{{ MaxRuns }}',
- '{{ Name }}',
- '{{ Tags }}',
+SELECT
+'{{ max_cpus }}',
+ '{{ max_gpus }}',
+ '{{ max_duration }}',
+ '{{ max_runs }}',
+ '{{ name }}',
+ '{{ tags }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -246,13 +246,13 @@ INSERT INTO awscc.omics.run_groups (
  Tags,
  region
 )
-SELECT 
- '{{ MaxCpus }}',
- '{{ MaxGpus }}',
- '{{ MaxDuration }}',
- '{{ MaxRuns }}',
- '{{ Name }}',
- '{{ Tags }}',
+SELECT
+ '{{ max_cpus }}',
+ '{{ max_gpus }}',
+ '{{ max_duration }}',
+ '{{ max_runs }}',
+ '{{ name }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -270,19 +270,18 @@ globals:
 resources:
   - name: run_group
     props:
-      - name: MaxCpus
+      - name: max_cpus
         value: null
-      - name: MaxGpus
+      - name: max_gpus
         value: null
-      - name: MaxDuration
+      - name: max_duration
         value: null
-      - name: MaxRuns
+      - name: max_runs
         value: null
-      - name: Name
-        value: '{{ Name }}'
-      - name: Tags
+      - name: name
+        value: '{{ name }}'
+      - name: tags
         value: {}
-
 ```
 </TabItem>
 </Tabs>
@@ -303,7 +302,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Id>';
+AND Identifier = '{{ id }}';
 ```
 
 
@@ -312,7 +311,7 @@ AND Identifier = '<Id>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.omics.run_groups
-WHERE Identifier = '<Id>'
+WHERE Identifier = '{{ id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/omics/sequence_stores/index.md b/website/docs/services/omics/sequence_stores/index.md
index 144873f6c..97b7d08b0 100644
--- a/website/docs/services/omics/sequence_stores/index.md
+++ b/website/docs/services/omics/sequence_stores/index.md
@@ -242,7 +242,7 @@ status_message,
 tags,
 update_time
 FROM awscc.omics.sequence_stores
-WHERE region = 'us-east-1' AND Identifier = '<SequenceStoreId>';
+WHERE region = 'us-east-1' AND Identifier = '{{ sequence_store_id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -278,8 +278,8 @@ INSERT INTO awscc.omics.sequence_stores (
  Name,
  region
 )
-SELECT 
-'{{ Name }}',
+SELECT
+'{{ name }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -299,16 +299,16 @@ INSERT INTO awscc.omics.sequence_stores (
  Tags,
  region
 )
-SELECT 
- '{{ AccessLogLocation }}',
- '{{ Description }}',
- '{{ ETagAlgorithmFamily }}',
- '{{ FallbackLocation }}',
- '{{ Name }}',
- '{{ PropagatedSetLevelTags }}',
- '{{ S3AccessPolicy }}',
- '{{ SseConfig }}',
- '{{ Tags }}',
+SELECT
+ '{{ access_log_location }}',
+ '{{ description }}',
+ '{{ e_tag_algorithm_family }}',
+ '{{ fallback_location }}',
+ '{{ name }}',
+ '{{ propagated_set_level_tags }}',
+ '{{ s3_access_policy }}',
+ '{{ sse_config }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -326,28 +326,27 @@ globals:
 resources:
   - name: sequence_store
     props:
-      - name: AccessLogLocation
-        value: '{{ AccessLogLocation }}'
-      - name: Description
-        value: '{{ Description }}'
-      - name: ETagAlgorithmFamily
-        value: '{{ ETagAlgorithmFamily }}'
-      - name: FallbackLocation
-        value: '{{ FallbackLocation }}'
-      - name: Name
-        value: '{{ Name }}'
-      - name: PropagatedSetLevelTags
+      - name: access_log_location
+        value: '{{ access_log_location }}'
+      - name: description
+        value: '{{ description }}'
+      - name: e_tag_algorithm_family
+        value: '{{ e_tag_algorithm_family }}'
+      - name: fallback_location
+        value: '{{ fallback_location }}'
+      - name: name
+        value: '{{ name }}'
+      - name: propagated_set_level_tags
         value:
-          - '{{ PropagatedSetLevelTags[0] }}'
-      - name: S3AccessPolicy
+          - '{{ propagated_set_level_tags[0] }}'
+      - name: s3_access_policy
         value: {}
-      - name: SseConfig
+      - name: sse_config
         value:
-          Type: '{{ Type }}'
-          KeyArn: '{{ KeyArn }}'
-      - name: Tags
+          type: '{{ type }}'
+          key_arn: '{{ key_arn }}'
+      - name: tags
         value: {}
-
 ```
 </TabItem>
 </Tabs>
@@ -369,7 +368,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<SequenceStoreId>';
+AND Identifier = '{{ sequence_store_id }}';
 ```
 
 
@@ -378,7 +377,7 @@ AND Identifier = '<SequenceStoreId>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.omics.sequence_stores
-WHERE Identifier = '<SequenceStoreId>'
+WHERE Identifier = '{{ sequence_store_id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/omics/variant_stores/index.md b/website/docs/services/omics/variant_stores/index.md
index ff29e6a22..2240c3a4b 100644
--- a/website/docs/services/omics/variant_stores/index.md
+++ b/website/docs/services/omics/variant_stores/index.md
@@ -219,7 +219,7 @@ store_size_bytes,
 tags,
 update_time
 FROM awscc.omics.variant_stores
-WHERE region = 'us-east-1' AND Identifier = '<Name>';
+WHERE region = 'us-east-1' AND Identifier = '{{ name }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -256,9 +256,9 @@ INSERT INTO awscc.omics.variant_stores (
  Reference,
  region
 )
-SELECT 
-'{{ Name }}',
- '{{ Reference }}',
+SELECT
+'{{ name }}',
+ '{{ reference }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -274,12 +274,12 @@ INSERT INTO awscc.omics.variant_stores (
  Tags,
  region
 )
-SELECT 
- '{{ Description }}',
- '{{ Name }}',
- '{{ Reference }}',
- '{{ SseConfig }}',
- '{{ Tags }}',
+SELECT
+ '{{ description }}',
+ '{{ name }}',
+ '{{ reference }}',
+ '{{ sse_config }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -297,20 +297,19 @@ globals:
 resources:
   - name: variant_store
     props:
-      - name: Description
-        value: '{{ Description }}'
-      - name: Name
-        value: '{{ Name }}'
-      - name: Reference
+      - name: description
+        value: '{{ description }}'
+      - name: name
+        value: '{{ name }}'
+      - name: reference
         value:
-          ReferenceArn: '{{ ReferenceArn }}'
-      - name: SseConfig
+          reference_arn: '{{ reference_arn }}'
+      - name: sse_config
         value:
-          Type: '{{ Type }}'
-          KeyArn: '{{ KeyArn }}'
-      - name: Tags
+          type: '{{ type }}'
+          key_arn: '{{ key_arn }}'
+      - name: tags
         value: {}
-
 ```
 </TabItem>
 </Tabs>
@@ -326,7 +325,7 @@ SET PatchDocument = string('{{ {
     "Description": description
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Name>';
+AND Identifier = '{{ name }}';
 ```
 
 
@@ -335,7 +334,7 @@ AND Identifier = '<Name>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.omics.variant_stores
-WHERE Identifier = '<Name>'
+WHERE Identifier = '{{ name }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/omics/workflow_versions/index.md b/website/docs/services/omics/workflow_versions/index.md
index 8a2742653..e33adb7e2 100644
--- a/website/docs/services/omics/workflow_versions/index.md
+++ b/website/docs/services/omics/workflow_versions/index.md
@@ -294,7 +294,7 @@ readme_path,
 readme_uri,
 readme_markdown
 FROM awscc.omics.workflow_versions
-WHERE region = 'us-east-1' AND Identifier = '<Arn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -331,9 +331,9 @@ INSERT INTO awscc.omics.workflow_versions (
  VersionName,
  region
 )
-SELECT 
-'{{ WorkflowId }}',
- '{{ VersionName }}',
+SELECT
+'{{ workflow_id }}',
+ '{{ version_name }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -361,24 +361,24 @@ INSERT INTO awscc.omics.workflow_versions (
  readmeMarkdown,
  region
 )
-SELECT 
- '{{ WorkflowId }}',
- '{{ VersionName }}',
- '{{ DefinitionUri }}',
- '{{ Description }}',
- '{{ Engine }}',
- '{{ Main }}',
- '{{ ParameterTemplate }}',
- '{{ Accelerators }}',
- '{{ StorageType }}',
- '{{ StorageCapacity }}',
- '{{ Tags }}',
- '{{ WorkflowBucketOwnerId }}',
- '{{ ParameterTemplatePath }}',
- '{{ DefinitionRepository }}',
- '{{ readmePath }}',
- '{{ readmeUri }}',
- '{{ readmeMarkdown }}',
+SELECT
+ '{{ workflow_id }}',
+ '{{ version_name }}',
+ '{{ definition_uri }}',
+ '{{ description }}',
+ '{{ engine }}',
+ '{{ main }}',
+ '{{ parameter_template }}',
+ '{{ accelerators }}',
+ '{{ storage_type }}',
+ '{{ storage_capacity }}',
+ '{{ tags }}',
+ '{{ workflow_bucket_owner_id }}',
+ '{{ parameter_template_path }}',
+ '{{ definition_repository }}',
+ '{{ readme_path }}',
+ '{{ readme_uri }}',
+ '{{ readme_markdown }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -396,48 +396,47 @@ globals:
 resources:
   - name: workflow_version
     props:
-      - name: WorkflowId
-        value: '{{ WorkflowId }}'
-      - name: VersionName
-        value: '{{ VersionName }}'
-      - name: DefinitionUri
-        value: '{{ DefinitionUri }}'
-      - name: Description
-        value: '{{ Description }}'
-      - name: Engine
-        value: '{{ Engine }}'
-      - name: Main
-        value: '{{ Main }}'
-      - name: ParameterTemplate
+      - name: workflow_id
+        value: '{{ workflow_id }}'
+      - name: version_name
+        value: '{{ version_name }}'
+      - name: definition_uri
+        value: '{{ definition_uri }}'
+      - name: description
+        value: '{{ description }}'
+      - name: engine
+        value: '{{ engine }}'
+      - name: main
+        value: '{{ main }}'
+      - name: parameter_template
         value: {}
-      - name: Accelerators
-        value: '{{ Accelerators }}'
-      - name: StorageType
-        value: '{{ StorageType }}'
-      - name: StorageCapacity
+      - name: accelerators
+        value: '{{ accelerators }}'
+      - name: storage_type
+        value: '{{ storage_type }}'
+      - name: storage_capacity
         value: null
-      - name: Tags
+      - name: tags
         value: {}
-      - name: WorkflowBucketOwnerId
-        value: '{{ WorkflowBucketOwnerId }}'
-      - name: ParameterTemplatePath
-        value: '{{ ParameterTemplatePath }}'
-      - name: DefinitionRepository
+      - name: workflow_bucket_owner_id
+        value: '{{ workflow_bucket_owner_id }}'
+      - name: parameter_template_path
+        value: '{{ parameter_template_path }}'
+      - name: definition_repository
         value:
-          connectionArn: '{{ connectionArn }}'
-          fullRepositoryId: '{{ fullRepositoryId }}'
-          sourceReference:
+          connection_arn: '{{ connection_arn }}'
+          full_repository_id: '{{ full_repository_id }}'
+          source_reference:
             type: '{{ type }}'
             value: '{{ value }}'
-          excludeFilePatterns:
-            - '{{ excludeFilePatterns[0] }}'
-      - name: readmePath
-        value: '{{ readmePath }}'
-      - name: readmeUri
-        value: '{{ readmeUri }}'
-      - name: readmeMarkdown
-        value: '{{ readmeMarkdown }}'
-
+          exclude_file_patterns:
+            - '{{ exclude_file_patterns[0] }}'
+      - name: readme_path
+        value: '{{ readme_path }}'
+      - name: readme_uri
+        value: '{{ readme_uri }}'
+      - name: readme_markdown
+        value: '{{ readme_markdown }}'
 ```
 </TabItem>
 </Tabs>
@@ -457,7 +456,7 @@ SET PatchDocument = string('{{ {
     "readmeMarkdown": readme_markdown
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Arn>';
+AND Identifier = '{{ arn }}';
 ```
 
 
@@ -466,7 +465,7 @@ AND Identifier = '<Arn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.omics.workflow_versions
-WHERE Identifier = '<Arn>'
+WHERE Identifier = '{{ arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/omics/workflows/index.md b/website/docs/services/omics/workflows/index.md
index e61708063..4975e382c 100644
--- a/website/docs/services/omics/workflows/index.md
+++ b/website/docs/services/omics/workflows/index.md
@@ -294,7 +294,7 @@ readme_path,
 readme_uri,
 readme_markdown
 FROM awscc.omics.workflows
-WHERE region = 'us-east-1' AND Identifier = '<Id>';
+WHERE region = 'us-east-1' AND Identifier = '{{ id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -345,23 +345,23 @@ INSERT INTO awscc.omics.workflows (
  readmeMarkdown,
  region
 )
-SELECT 
-'{{ DefinitionUri }}',
- '{{ Description }}',
- '{{ Engine }}',
- '{{ Main }}',
- '{{ Name }}',
- '{{ ParameterTemplate }}',
- '{{ Accelerators }}',
- '{{ StorageCapacity }}',
- '{{ Tags }}',
- '{{ StorageType }}',
- '{{ WorkflowBucketOwnerId }}',
- '{{ DefinitionRepository }}',
- '{{ ParameterTemplatePath }}',
- '{{ readmePath }}',
- '{{ readmeUri }}',
- '{{ readmeMarkdown }}',
+SELECT
+'{{ definition_uri }}',
+ '{{ description }}',
+ '{{ engine }}',
+ '{{ main }}',
+ '{{ name }}',
+ '{{ parameter_template }}',
+ '{{ accelerators }}',
+ '{{ storage_capacity }}',
+ '{{ tags }}',
+ '{{ storage_type }}',
+ '{{ workflow_bucket_owner_id }}',
+ '{{ definition_repository }}',
+ '{{ parameter_template_path }}',
+ '{{ readme_path }}',
+ '{{ readme_uri }}',
+ '{{ readme_markdown }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -388,23 +388,23 @@ INSERT INTO awscc.omics.workflows (
  readmeMarkdown,
  region
 )
-SELECT 
- '{{ DefinitionUri }}',
- '{{ Description }}',
- '{{ Engine }}',
- '{{ Main }}',
- '{{ Name }}',
- '{{ ParameterTemplate }}',
- '{{ Accelerators }}',
- '{{ StorageCapacity }}',
- '{{ Tags }}',
- '{{ StorageType }}',
- '{{ WorkflowBucketOwnerId }}',
- '{{ DefinitionRepository }}',
- '{{ ParameterTemplatePath }}',
- '{{ readmePath }}',
- '{{ readmeUri }}',
- '{{ readmeMarkdown }}',
+SELECT
+ '{{ definition_uri }}',
+ '{{ description }}',
+ '{{ engine }}',
+ '{{ main }}',
+ '{{ name }}',
+ '{{ parameter_template }}',
+ '{{ accelerators }}',
+ '{{ storage_capacity }}',
+ '{{ tags }}',
+ '{{ storage_type }}',
+ '{{ workflow_bucket_owner_id }}',
+ '{{ definition_repository }}',
+ '{{ parameter_template_path }}',
+ '{{ readme_path }}',
+ '{{ readme_uri }}',
+ '{{ readme_markdown }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -422,46 +422,45 @@ globals:
 resources:
   - name: workflow
     props:
-      - name: DefinitionUri
-        value: '{{ DefinitionUri }}'
-      - name: Description
-        value: '{{ Description }}'
-      - name: Engine
-        value: '{{ Engine }}'
-      - name: Main
-        value: '{{ Main }}'
-      - name: Name
-        value: '{{ Name }}'
-      - name: ParameterTemplate
+      - name: definition_uri
+        value: '{{ definition_uri }}'
+      - name: description
+        value: '{{ description }}'
+      - name: engine
+        value: '{{ engine }}'
+      - name: main
+        value: '{{ main }}'
+      - name: name
+        value: '{{ name }}'
+      - name: parameter_template
         value: {}
-      - name: Accelerators
-        value: '{{ Accelerators }}'
-      - name: StorageCapacity
+      - name: accelerators
+        value: '{{ accelerators }}'
+      - name: storage_capacity
         value: null
-      - name: Tags
+      - name: tags
         value: {}
-      - name: StorageType
-        value: '{{ StorageType }}'
-      - name: WorkflowBucketOwnerId
-        value: '{{ WorkflowBucketOwnerId }}'
-      - name: DefinitionRepository
+      - name: storage_type
+        value: '{{ storage_type }}'
+      - name: workflow_bucket_owner_id
+        value: '{{ workflow_bucket_owner_id }}'
+      - name: definition_repository
         value:
-          connectionArn: '{{ connectionArn }}'
-          fullRepositoryId: '{{ fullRepositoryId }}'
-          sourceReference:
+          connection_arn: '{{ connection_arn }}'
+          full_repository_id: '{{ full_repository_id }}'
+          source_reference:
             type: '{{ type }}'
             value: '{{ value }}'
-          excludeFilePatterns:
-            - '{{ excludeFilePatterns[0] }}'
-      - name: ParameterTemplatePath
-        value: '{{ ParameterTemplatePath }}'
-      - name: readmePath
-        value: '{{ readmePath }}'
-      - name: readmeUri
-        value: '{{ readmeUri }}'
-      - name: readmeMarkdown
-        value: '{{ readmeMarkdown }}'
-
+          exclude_file_patterns:
+            - '{{ exclude_file_patterns[0] }}'
+      - name: parameter_template_path
+        value: '{{ parameter_template_path }}'
+      - name: readme_path
+        value: '{{ readme_path }}'
+      - name: readme_uri
+        value: '{{ readme_uri }}'
+      - name: readme_markdown
+        value: '{{ readme_markdown }}'
 ```
 </TabItem>
 </Tabs>
@@ -481,7 +480,7 @@ SET PatchDocument = string('{{ {
     "readmeMarkdown": readme_markdown
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Id>';
+AND Identifier = '{{ id }}';
 ```
 
 
@@ -490,7 +489,7 @@ AND Identifier = '<Id>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.omics.workflows
-WHERE Identifier = '<Id>'
+WHERE Identifier = '{{ id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/opensearchserverless/access_policies/index.md b/website/docs/services/opensearchserverless/access_policies/index.md
index d489f5b0e..1bb2f02c3 100644
--- a/website/docs/services/opensearchserverless/access_policies/index.md
+++ b/website/docs/services/opensearchserverless/access_policies/index.md
@@ -157,7 +157,7 @@ type,
 description,
 policy
 FROM awscc.opensearchserverless.access_policies
-WHERE region = 'us-east-1' AND Identifier = '<Type>|<Name>';
+WHERE region = 'us-east-1' AND Identifier = '{{ type }}|{{ name }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -196,10 +196,10 @@ INSERT INTO awscc.opensearchserverless.access_policies (
  Policy,
  region
 )
-SELECT 
-'{{ Name }}',
- '{{ Type }}',
- '{{ Policy }}',
+SELECT
+'{{ name }}',
+ '{{ type }}',
+ '{{ policy }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -214,11 +214,11 @@ INSERT INTO awscc.opensearchserverless.access_policies (
  Policy,
  region
 )
-SELECT 
- '{{ Name }}',
- '{{ Type }}',
- '{{ Description }}',
- '{{ Policy }}',
+SELECT
+ '{{ name }}',
+ '{{ type }}',
+ '{{ description }}',
+ '{{ policy }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -236,15 +236,14 @@ globals:
 resources:
   - name: access_policy
     props:
-      - name: Name
-        value: '{{ Name }}'
-      - name: Type
-        value: '{{ Type }}'
-      - name: Description
-        value: '{{ Description }}'
-      - name: Policy
-        value: '{{ Policy }}'
-
+      - name: name
+        value: '{{ name }}'
+      - name: type
+        value: '{{ type }}'
+      - name: description
+        value: '{{ description }}'
+      - name: policy
+        value: '{{ policy }}'
 ```
 </TabItem>
 </Tabs>
@@ -261,7 +260,7 @@ SET PatchDocument = string('{{ {
     "Policy": policy
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Type>|<Name>';
+AND Identifier = '{{ type }}|{{ name }}';
 ```
 
 
@@ -270,7 +269,7 @@ AND Identifier = '<Type>|<Name>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.opensearchserverless.access_policies
-WHERE Identifier = '<Type|Name>'
+WHERE Identifier = '{{ type }}|{{ name }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/opensearchserverless/collections/index.md b/website/docs/services/opensearchserverless/collections/index.md
index 1c0b31153..e7bd69864 100644
--- a/website/docs/services/opensearchserverless/collections/index.md
+++ b/website/docs/services/opensearchserverless/collections/index.md
@@ -194,7 +194,7 @@ dashboard_endpoint,
 type,
 standby_replicas
 FROM awscc.opensearchserverless.collections
-WHERE region = 'us-east-1' AND Identifier = '<Id>';
+WHERE region = 'us-east-1' AND Identifier = '{{ id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -230,8 +230,8 @@ INSERT INTO awscc.opensearchserverless.collections (
  Name,
  region
 )
-SELECT 
-'{{ Name }}',
+SELECT
+'{{ name }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -247,12 +247,12 @@ INSERT INTO awscc.opensearchserverless.collections (
  StandbyReplicas,
  region
 )
-SELECT 
- '{{ Description }}',
- '{{ Name }}',
- '{{ Tags }}',
- '{{ Type }}',
- '{{ StandbyReplicas }}',
+SELECT
+ '{{ description }}',
+ '{{ name }}',
+ '{{ tags }}',
+ '{{ type }}',
+ '{{ standby_replicas }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -270,19 +270,18 @@ globals:
 resources:
   - name: collection
     props:
-      - name: Description
-        value: '{{ Description }}'
-      - name: Name
-        value: '{{ Name }}'
-      - name: Tags
+      - name: description
+        value: '{{ description }}'
+      - name: name
+        value: '{{ name }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-      - name: Type
-        value: '{{ Type }}'
-      - name: StandbyReplicas
-        value: '{{ StandbyReplicas }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
+      - name: type
+        value: '{{ type }}'
+      - name: standby_replicas
+        value: '{{ standby_replicas }}'
 ```
 </TabItem>
 </Tabs>
@@ -299,7 +298,7 @@ SET PatchDocument = string('{{ {
     "StandbyReplicas": standby_replicas
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Id>';
+AND Identifier = '{{ id }}';
 ```
 
 
@@ -308,7 +307,7 @@ AND Identifier = '<Id>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.opensearchserverless.collections
-WHERE Identifier = '<Id>'
+WHERE Identifier = '{{ id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/opensearchserverless/indices/index.md b/website/docs/services/opensearchserverless/indices/index.md
index 577985090..23af5f4a9 100644
--- a/website/docs/services/opensearchserverless/indices/index.md
+++ b/website/docs/services/opensearchserverless/indices/index.md
@@ -194,7 +194,7 @@ settings,
 mappings,
 uuid
 FROM awscc.opensearchserverless.indices
-WHERE region = 'us-east-1' AND Identifier = '<IndexName>|<CollectionEndpoint>';
+WHERE region = 'us-east-1' AND Identifier = '{{ index_name }}|{{ collection_endpoint }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -232,9 +232,9 @@ INSERT INTO awscc.opensearchserverless.indices (
  IndexName,
  region
 )
-SELECT 
-'{{ CollectionEndpoint }}',
- '{{ IndexName }}',
+SELECT
+'{{ collection_endpoint }}',
+ '{{ index_name }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -249,11 +249,11 @@ INSERT INTO awscc.opensearchserverless.indices (
  Mappings,
  region
 )
-SELECT 
- '{{ CollectionEndpoint }}',
- '{{ IndexName }}',
- '{{ Settings }}',
- '{{ Mappings }}',
+SELECT
+ '{{ collection_endpoint }}',
+ '{{ index_name }}',
+ '{{ settings }}',
+ '{{ mappings }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -271,20 +271,19 @@ globals:
 resources:
   - name: index
     props:
-      - name: CollectionEndpoint
-        value: '{{ CollectionEndpoint }}'
-      - name: IndexName
-        value: '{{ IndexName }}'
-      - name: Settings
+      - name: collection_endpoint
+        value: '{{ collection_endpoint }}'
+      - name: index_name
+        value: '{{ index_name }}'
+      - name: settings
         value:
-          Index:
-            RefreshInterval: '{{ RefreshInterval }}'
-            Knn: '{{ Knn }}'
-            KnnAlgoParamEfSearch: '{{ KnnAlgoParamEfSearch }}'
-      - name: Mappings
+          index:
+            refresh_interval: '{{ refresh_interval }}'
+            knn: '{{ knn }}'
+            knn_algo_param_ef_search: '{{ knn_algo_param_ef_search }}'
+      - name: mappings
         value:
-          Properties: {}
-
+          properties: {}
 ```
 </TabItem>
 </Tabs>
@@ -301,7 +300,7 @@ SET PatchDocument = string('{{ {
     "Mappings": mappings
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<IndexName>|<CollectionEndpoint>';
+AND Identifier = '{{ index_name }}|{{ collection_endpoint }}';
 ```
 
 
@@ -310,7 +309,7 @@ AND Identifier = '<IndexName>|<CollectionEndpoint>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.opensearchserverless.indices
-WHERE Identifier = '<IndexName|CollectionEndpoint>'
+WHERE Identifier = '{{ index_name }}|{{ collection_endpoint }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/opensearchserverless/lifecycle_policies/index.md b/website/docs/services/opensearchserverless/lifecycle_policies/index.md
index 4ec191546..cadb51a3f 100644
--- a/website/docs/services/opensearchserverless/lifecycle_policies/index.md
+++ b/website/docs/services/opensearchserverless/lifecycle_policies/index.md
@@ -157,7 +157,7 @@ type,
 description,
 policy
 FROM awscc.opensearchserverless.lifecycle_policies
-WHERE region = 'us-east-1' AND Identifier = '<Type>|<Name>';
+WHERE region = 'us-east-1' AND Identifier = '{{ type }}|{{ name }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -196,10 +196,10 @@ INSERT INTO awscc.opensearchserverless.lifecycle_policies (
  Policy,
  region
 )
-SELECT 
-'{{ Name }}',
- '{{ Type }}',
- '{{ Policy }}',
+SELECT
+'{{ name }}',
+ '{{ type }}',
+ '{{ policy }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -214,11 +214,11 @@ INSERT INTO awscc.opensearchserverless.lifecycle_policies (
  Policy,
  region
 )
-SELECT 
- '{{ Name }}',
- '{{ Type }}',
- '{{ Description }}',
- '{{ Policy }}',
+SELECT
+ '{{ name }}',
+ '{{ type }}',
+ '{{ description }}',
+ '{{ policy }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -236,15 +236,14 @@ globals:
 resources:
   - name: lifecycle_policy
     props:
-      - name: Name
-        value: '{{ Name }}'
-      - name: Type
-        value: '{{ Type }}'
-      - name: Description
-        value: '{{ Description }}'
-      - name: Policy
-        value: '{{ Policy }}'
-
+      - name: name
+        value: '{{ name }}'
+      - name: type
+        value: '{{ type }}'
+      - name: description
+        value: '{{ description }}'
+      - name: policy
+        value: '{{ policy }}'
 ```
 </TabItem>
 </Tabs>
@@ -261,7 +260,7 @@ SET PatchDocument = string('{{ {
     "Policy": policy
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Type>|<Name>';
+AND Identifier = '{{ type }}|{{ name }}';
 ```
 
 
@@ -270,7 +269,7 @@ AND Identifier = '<Type>|<Name>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.opensearchserverless.lifecycle_policies
-WHERE Identifier = '<Type|Name>'
+WHERE Identifier = '{{ type }}|{{ name }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/opensearchserverless/security_configs/index.md b/website/docs/services/opensearchserverless/security_configs/index.md
index a5c3d6fb6..183db94f9 100644
--- a/website/docs/services/opensearchserverless/security_configs/index.md
+++ b/website/docs/services/opensearchserverless/security_configs/index.md
@@ -223,7 +223,7 @@ saml_options,
 iam_identity_center_options,
 type
 FROM awscc.opensearchserverless.security_configs
-WHERE region = 'us-east-1' AND Identifier = '<Id>';
+WHERE region = 'us-east-1' AND Identifier = '{{ id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -263,12 +263,12 @@ INSERT INTO awscc.opensearchserverless.security_configs (
  Type,
  region
 )
-SELECT 
-'{{ Description }}',
- '{{ Name }}',
- '{{ SamlOptions }}',
- '{{ IamIdentityCenterOptions }}',
- '{{ Type }}',
+SELECT
+'{{ description }}',
+ '{{ name }}',
+ '{{ saml_options }}',
+ '{{ iam_identity_center_options }}',
+ '{{ type }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -284,12 +284,12 @@ INSERT INTO awscc.opensearchserverless.security_configs (
  Type,
  region
 )
-SELECT 
- '{{ Description }}',
- '{{ Name }}',
- '{{ SamlOptions }}',
- '{{ IamIdentityCenterOptions }}',
- '{{ Type }}',
+SELECT
+ '{{ description }}',
+ '{{ name }}',
+ '{{ saml_options }}',
+ '{{ iam_identity_center_options }}',
+ '{{ type }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -307,28 +307,27 @@ globals:
 resources:
   - name: security_config
     props:
-      - name: Description
-        value: '{{ Description }}'
-      - name: Name
-        value: '{{ Name }}'
-      - name: SamlOptions
+      - name: description
+        value: '{{ description }}'
+      - name: name
+        value: '{{ name }}'
+      - name: saml_options
         value:
-          Metadata: '{{ Metadata }}'
-          UserAttribute: '{{ UserAttribute }}'
-          GroupAttribute: '{{ GroupAttribute }}'
-          OpenSearchServerlessEntityId: '{{ OpenSearchServerlessEntityId }}'
-          SessionTimeout: '{{ SessionTimeout }}'
-      - name: IamIdentityCenterOptions
+          metadata: '{{ metadata }}'
+          user_attribute: '{{ user_attribute }}'
+          group_attribute: '{{ group_attribute }}'
+          open_search_serverless_entity_id: '{{ open_search_serverless_entity_id }}'
+          session_timeout: '{{ session_timeout }}'
+      - name: iam_identity_center_options
         value:
-          InstanceArn: '{{ InstanceArn }}'
-          ApplicationArn: '{{ ApplicationArn }}'
-          ApplicationName: '{{ ApplicationName }}'
-          ApplicationDescription: '{{ ApplicationDescription }}'
-          UserAttribute: '{{ UserAttribute }}'
-          GroupAttribute: '{{ GroupAttribute }}'
-      - name: Type
-        value: '{{ Type }}'
-
+          instance_arn: '{{ instance_arn }}'
+          application_arn: '{{ application_arn }}'
+          application_name: '{{ application_name }}'
+          application_description: '{{ application_description }}'
+          user_attribute: '{{ user_attribute }}'
+          group_attribute: '{{ group_attribute }}'
+      - name: type
+        value: '{{ type }}'
 ```
 </TabItem>
 </Tabs>
@@ -345,7 +344,7 @@ SET PatchDocument = string('{{ {
     "SamlOptions": saml_options
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Id>';
+AND Identifier = '{{ id }}';
 ```
 
 
@@ -354,7 +353,7 @@ AND Identifier = '<Id>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.opensearchserverless.security_configs
-WHERE Identifier = '<Id>'
+WHERE Identifier = '{{ id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/opensearchserverless/security_policies/index.md b/website/docs/services/opensearchserverless/security_policies/index.md
index 0d79b3abb..82992e2a3 100644
--- a/website/docs/services/opensearchserverless/security_policies/index.md
+++ b/website/docs/services/opensearchserverless/security_policies/index.md
@@ -157,7 +157,7 @@ policy,
 name,
 type
 FROM awscc.opensearchserverless.security_policies
-WHERE region = 'us-east-1' AND Identifier = '<Type>|<Name>';
+WHERE region = 'us-east-1' AND Identifier = '{{ type }}|{{ name }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -196,10 +196,10 @@ INSERT INTO awscc.opensearchserverless.security_policies (
  Type,
  region
 )
-SELECT 
-'{{ Policy }}',
- '{{ Name }}',
- '{{ Type }}',
+SELECT
+'{{ policy }}',
+ '{{ name }}',
+ '{{ type }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -214,11 +214,11 @@ INSERT INTO awscc.opensearchserverless.security_policies (
  Type,
  region
 )
-SELECT 
- '{{ Description }}',
- '{{ Policy }}',
- '{{ Name }}',
- '{{ Type }}',
+SELECT
+ '{{ description }}',
+ '{{ policy }}',
+ '{{ name }}',
+ '{{ type }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -236,15 +236,14 @@ globals:
 resources:
   - name: security_policy
     props:
-      - name: Description
-        value: '{{ Description }}'
-      - name: Policy
-        value: '{{ Policy }}'
-      - name: Name
-        value: '{{ Name }}'
-      - name: Type
-        value: '{{ Type }}'
-
+      - name: description
+        value: '{{ description }}'
+      - name: policy
+        value: '{{ policy }}'
+      - name: name
+        value: '{{ name }}'
+      - name: type
+        value: '{{ type }}'
 ```
 </TabItem>
 </Tabs>
@@ -261,7 +260,7 @@ SET PatchDocument = string('{{ {
     "Policy": policy
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Type>|<Name>';
+AND Identifier = '{{ type }}|{{ name }}';
 ```
 
 
@@ -270,7 +269,7 @@ AND Identifier = '<Type>|<Name>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.opensearchserverless.security_policies
-WHERE Identifier = '<Type|Name>'
+WHERE Identifier = '{{ type }}|{{ name }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/opensearchserverless/vpc_endpoints/index.md b/website/docs/services/opensearchserverless/vpc_endpoints/index.md
index 9c4ca1d58..4f72b0d23 100644
--- a/website/docs/services/opensearchserverless/vpc_endpoints/index.md
+++ b/website/docs/services/opensearchserverless/vpc_endpoints/index.md
@@ -158,7 +158,7 @@ security_group_ids,
 subnet_ids,
 vpc_id
 FROM awscc.opensearchserverless.vpc_endpoints
-WHERE region = 'us-east-1' AND Identifier = '<Id>';
+WHERE region = 'us-east-1' AND Identifier = '{{ id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -196,10 +196,10 @@ INSERT INTO awscc.opensearchserverless.vpc_endpoints (
  VpcId,
  region
 )
-SELECT 
-'{{ Name }}',
- '{{ SubnetIds }}',
- '{{ VpcId }}',
+SELECT
+'{{ name }}',
+ '{{ subnet_ids }}',
+ '{{ vpc_id }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -214,11 +214,11 @@ INSERT INTO awscc.opensearchserverless.vpc_endpoints (
  VpcId,
  region
 )
-SELECT 
- '{{ Name }}',
- '{{ SecurityGroupIds }}',
- '{{ SubnetIds }}',
- '{{ VpcId }}',
+SELECT
+ '{{ name }}',
+ '{{ security_group_ids }}',
+ '{{ subnet_ids }}',
+ '{{ vpc_id }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -236,17 +236,16 @@ globals:
 resources:
   - name: vpc_endpoint
     props:
-      - name: Name
-        value: '{{ Name }}'
-      - name: SecurityGroupIds
+      - name: name
+        value: '{{ name }}'
+      - name: security_group_ids
         value:
-          - '{{ SecurityGroupIds[0] }}'
-      - name: SubnetIds
+          - '{{ security_group_ids[0] }}'
+      - name: subnet_ids
         value:
-          - '{{ SubnetIds[0] }}'
-      - name: VpcId
-        value: '{{ VpcId }}'
-
+          - '{{ subnet_ids[0] }}'
+      - name: vpc_id
+        value: '{{ vpc_id }}'
 ```
 </TabItem>
 </Tabs>
@@ -263,7 +262,7 @@ SET PatchDocument = string('{{ {
     "SubnetIds": subnet_ids
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Id>';
+AND Identifier = '{{ id }}';
 ```
 
 
@@ -272,7 +271,7 @@ AND Identifier = '<Id>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.opensearchserverless.vpc_endpoints
-WHERE Identifier = '<Id>'
+WHERE Identifier = '{{ id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/opensearchservice/applications/index.md b/website/docs/services/opensearchservice/applications/index.md
index 7a9266bd5..6376d87da 100644
--- a/website/docs/services/opensearchservice/applications/index.md
+++ b/website/docs/services/opensearchservice/applications/index.md
@@ -229,7 +229,7 @@ app_configs,
 data_sources,
 tags
 FROM awscc.opensearchservice.applications
-WHERE region = 'us-east-1' AND Identifier = '<Name>';
+WHERE region = 'us-east-1' AND Identifier = '{{ name }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -265,8 +265,8 @@ INSERT INTO awscc.opensearchservice.applications (
  Name,
  region
 )
-SELECT 
-'{{ Name }}',
+SELECT
+'{{ name }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -283,13 +283,13 @@ INSERT INTO awscc.opensearchservice.applications (
  Tags,
  region
 )
-SELECT 
- '{{ IamIdentityCenterOptions }}',
- '{{ Name }}',
- '{{ Endpoint }}',
- '{{ AppConfigs }}',
- '{{ DataSources }}',
- '{{ Tags }}',
+SELECT
+ '{{ iam_identity_center_options }}',
+ '{{ name }}',
+ '{{ endpoint }}',
+ '{{ app_configs }}',
+ '{{ data_sources }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -307,28 +307,27 @@ globals:
 resources:
   - name: application
     props:
-      - name: IamIdentityCenterOptions
+      - name: iam_identity_center_options
         value:
-          Enabled: '{{ Enabled }}'
-          IamIdentityCenterInstanceArn: '{{ IamIdentityCenterInstanceArn }}'
-          IamRoleForIdentityCenterApplicationArn: '{{ IamRoleForIdentityCenterApplicationArn }}'
-      - name: Name
-        value: '{{ Name }}'
-      - name: Endpoint
-        value: '{{ Endpoint }}'
-      - name: AppConfigs
+          enabled: '{{ enabled }}'
+          iam_identity_center_instance_arn: '{{ iam_identity_center_instance_arn }}'
+          iam_role_for_identity_center_application_arn: '{{ iam_role_for_identity_center_application_arn }}'
+      - name: name
+        value: '{{ name }}'
+      - name: endpoint
+        value: '{{ endpoint }}'
+      - name: app_configs
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-      - name: DataSources
+          - key: '{{ key }}'
+            value: '{{ value }}'
+      - name: data_sources
         value:
-          - DataSourceArn: '{{ DataSourceArn }}'
-            DataSourceDescription: '{{ DataSourceDescription }}'
-      - name: Tags
+          - data_source_arn: '{{ data_source_arn }}'
+            data_source_description: '{{ data_source_description }}'
+      - name: tags
         value:
-          - Value: '{{ Value }}'
-            Key: '{{ Key }}'
-
+          - value: '{{ value }}'
+            key: '{{ key }}'
 ```
 </TabItem>
 </Tabs>
@@ -348,7 +347,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Name>';
+AND Identifier = '{{ name }}';
 ```
 
 
@@ -357,7 +356,7 @@ AND Identifier = '<Name>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.opensearchservice.applications
-WHERE Identifier = '<Name>'
+WHERE Identifier = '{{ name }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/opensearchservice/domains/index.md b/website/docs/services/opensearchservice/domains/index.md
index 7488a9616..ae621d753 100644
--- a/website/docs/services/opensearchservice/domains/index.md
+++ b/website/docs/services/opensearchservice/domains/index.md
@@ -739,7 +739,7 @@ software_update_options,
 skip_shard_migration_wait,
 identity_center_options
 FROM awscc.opensearchservice.domains
-WHERE region = 'us-east-1' AND Identifier = '<DomainName>';
+WHERE region = 'us-east-1' AND Identifier = '{{ domain_name }}';
 ```
 
 ## `INSERT` example
@@ -781,27 +781,27 @@ INSERT INTO awscc.opensearchservice.domains (
  IdentityCenterOptions,
  region
 )
-SELECT 
-'{{ ClusterConfig }}',
- '{{ DomainName }}',
- '{{ AccessPolicies }}',
- '{{ IPAddressType }}',
- '{{ EngineVersion }}',
- '{{ AdvancedOptions }}',
- '{{ LogPublishingOptions }}',
- '{{ SnapshotOptions }}',
- '{{ VPCOptions }}',
- '{{ NodeToNodeEncryptionOptions }}',
- '{{ DomainEndpointOptions }}',
- '{{ CognitoOptions }}',
- '{{ AdvancedSecurityOptions }}',
- '{{ EBSOptions }}',
- '{{ EncryptionAtRestOptions }}',
- '{{ Tags }}',
- '{{ OffPeakWindowOptions }}',
- '{{ SoftwareUpdateOptions }}',
- '{{ SkipShardMigrationWait }}',
- '{{ IdentityCenterOptions }}',
+SELECT
+'{{ cluster_config }}',
+ '{{ domain_name }}',
+ '{{ access_policies }}',
+ '{{ ip_address_type }}',
+ '{{ engine_version }}',
+ '{{ advanced_options }}',
+ '{{ log_publishing_options }}',
+ '{{ snapshot_options }}',
+ '{{ vpc_options }}',
+ '{{ node_to_node_encryption_options }}',
+ '{{ domain_endpoint_options }}',
+ '{{ cognito_options }}',
+ '{{ advanced_security_options }}',
+ '{{ ebs_options }}',
+ '{{ encryption_at_rest_options }}',
+ '{{ tags }}',
+ '{{ off_peak_window_options }}',
+ '{{ software_update_options }}',
+ '{{ skip_shard_migration_wait }}',
+ '{{ identity_center_options }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -832,27 +832,27 @@ INSERT INTO awscc.opensearchservice.domains (
  IdentityCenterOptions,
  region
 )
-SELECT 
- '{{ ClusterConfig }}',
- '{{ DomainName }}',
- '{{ AccessPolicies }}',
- '{{ IPAddressType }}',
- '{{ EngineVersion }}',
- '{{ AdvancedOptions }}',
- '{{ LogPublishingOptions }}',
- '{{ SnapshotOptions }}',
- '{{ VPCOptions }}',
- '{{ NodeToNodeEncryptionOptions }}',
- '{{ DomainEndpointOptions }}',
- '{{ CognitoOptions }}',
- '{{ AdvancedSecurityOptions }}',
- '{{ EBSOptions }}',
- '{{ EncryptionAtRestOptions }}',
- '{{ Tags }}',
- '{{ OffPeakWindowOptions }}',
- '{{ SoftwareUpdateOptions }}',
- '{{ SkipShardMigrationWait }}',
- '{{ IdentityCenterOptions }}',
+SELECT
+ '{{ cluster_config }}',
+ '{{ domain_name }}',
+ '{{ access_policies }}',
+ '{{ ip_address_type }}',
+ '{{ engine_version }}',
+ '{{ advanced_options }}',
+ '{{ log_publishing_options }}',
+ '{{ snapshot_options }}',
+ '{{ vpc_options }}',
+ '{{ node_to_node_encryption_options }}',
+ '{{ domain_endpoint_options }}',
+ '{{ cognito_options }}',
+ '{{ advanced_security_options }}',
+ '{{ ebs_options }}',
+ '{{ encryption_at_rest_options }}',
+ '{{ tags }}',
+ '{{ off_peak_window_options }}',
+ '{{ software_update_options }}',
+ '{{ skip_shard_migration_wait }}',
+ '{{ identity_center_options }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -870,130 +870,129 @@ globals:
 resources:
   - name: domain
     props:
-      - name: ClusterConfig
+      - name: cluster_config
         value:
-          InstanceCount: '{{ InstanceCount }}'
-          WarmEnabled: '{{ WarmEnabled }}'
-          WarmCount: '{{ WarmCount }}'
-          DedicatedMasterEnabled: '{{ DedicatedMasterEnabled }}'
-          ZoneAwarenessConfig:
-            AvailabilityZoneCount: '{{ AvailabilityZoneCount }}'
-          DedicatedMasterCount: '{{ DedicatedMasterCount }}'
-          InstanceType: '{{ InstanceType }}'
-          WarmType: '{{ WarmType }}'
-          ZoneAwarenessEnabled: '{{ ZoneAwarenessEnabled }}'
-          DedicatedMasterType: '{{ DedicatedMasterType }}'
-          MultiAZWithStandbyEnabled: '{{ MultiAZWithStandbyEnabled }}'
-          ColdStorageOptions:
-            Enabled: '{{ Enabled }}'
-          NodeOptions:
-            - NodeType: '{{ NodeType }}'
-              NodeConfig:
-                Enabled: '{{ Enabled }}'
-                Type: '{{ Type }}'
-                Count: '{{ Count }}'
-      - name: DomainName
-        value: '{{ DomainName }}'
-      - name: AccessPolicies
+          instance_count: '{{ instance_count }}'
+          warm_enabled: '{{ warm_enabled }}'
+          warm_count: '{{ warm_count }}'
+          dedicated_master_enabled: '{{ dedicated_master_enabled }}'
+          zone_awareness_config:
+            availability_zone_count: '{{ availability_zone_count }}'
+          dedicated_master_count: '{{ dedicated_master_count }}'
+          instance_type: '{{ instance_type }}'
+          warm_type: '{{ warm_type }}'
+          zone_awareness_enabled: '{{ zone_awareness_enabled }}'
+          dedicated_master_type: '{{ dedicated_master_type }}'
+          multi_az_with_standby_enabled: '{{ multi_az_with_standby_enabled }}'
+          cold_storage_options:
+            enabled: '{{ enabled }}'
+          node_options:
+            - node_type: '{{ node_type }}'
+              node_config:
+                enabled: '{{ enabled }}'
+                type: '{{ type }}'
+                count: '{{ count }}'
+      - name: domain_name
+        value: '{{ domain_name }}'
+      - name: access_policies
         value: {}
-      - name: IPAddressType
-        value: '{{ IPAddressType }}'
-      - name: EngineVersion
-        value: '{{ EngineVersion }}'
-      - name: AdvancedOptions
+      - name: ip_address_type
+        value: '{{ ip_address_type }}'
+      - name: engine_version
+        value: '{{ engine_version }}'
+      - name: advanced_options
         value: {}
-      - name: LogPublishingOptions
+      - name: log_publishing_options
         value: {}
-      - name: SnapshotOptions
+      - name: snapshot_options
         value:
-          AutomatedSnapshotStartHour: '{{ AutomatedSnapshotStartHour }}'
-      - name: VPCOptions
+          automated_snapshot_start_hour: '{{ automated_snapshot_start_hour }}'
+      - name: vpc_options
         value:
-          SecurityGroupIds:
-            - '{{ SecurityGroupIds[0] }}'
-          SubnetIds:
-            - '{{ SubnetIds[0] }}'
-      - name: NodeToNodeEncryptionOptions
+          security_group_ids:
+            - '{{ security_group_ids[0] }}'
+          subnet_ids:
+            - '{{ subnet_ids[0] }}'
+      - name: node_to_node_encryption_options
         value:
-          Enabled: '{{ Enabled }}'
-      - name: DomainEndpointOptions
+          enabled: '{{ enabled }}'
+      - name: domain_endpoint_options
         value:
-          CustomEndpointCertificateArn: '{{ CustomEndpointCertificateArn }}'
-          CustomEndpointEnabled: '{{ CustomEndpointEnabled }}'
-          EnforceHTTPS: '{{ EnforceHTTPS }}'
-          CustomEndpoint: '{{ CustomEndpoint }}'
-          TLSSecurityPolicy: '{{ TLSSecurityPolicy }}'
-      - name: CognitoOptions
+          custom_endpoint_certificate_arn: '{{ custom_endpoint_certificate_arn }}'
+          custom_endpoint_enabled: '{{ custom_endpoint_enabled }}'
+          enforce_ht_tp_s: '{{ enforce_ht_tp_s }}'
+          custom_endpoint: '{{ custom_endpoint }}'
+          tls_security_policy: '{{ tls_security_policy }}'
+      - name: cognito_options
         value:
-          Enabled: '{{ Enabled }}'
-          IdentityPoolId: '{{ IdentityPoolId }}'
-          UserPoolId: '{{ UserPoolId }}'
-          RoleArn: '{{ RoleArn }}'
-      - name: AdvancedSecurityOptions
+          enabled: '{{ enabled }}'
+          identity_pool_id: '{{ identity_pool_id }}'
+          user_pool_id: '{{ user_pool_id }}'
+          role_arn: '{{ role_arn }}'
+      - name: advanced_security_options
         value:
-          Enabled: '{{ Enabled }}'
-          MasterUserOptions:
-            MasterUserPassword: '{{ MasterUserPassword }}'
-            MasterUserName: '{{ MasterUserName }}'
-            MasterUserARN: '{{ MasterUserARN }}'
-          InternalUserDatabaseEnabled: '{{ InternalUserDatabaseEnabled }}'
-          AnonymousAuthEnabled: '{{ AnonymousAuthEnabled }}'
-          SAMLOptions:
-            Enabled: '{{ Enabled }}'
-            Idp:
-              MetadataContent: '{{ MetadataContent }}'
-              EntityId: '{{ EntityId }}'
-            MasterUserName: '{{ MasterUserName }}'
-            MasterBackendRole: '{{ MasterBackendRole }}'
-            SubjectKey: '{{ SubjectKey }}'
-            RolesKey: '{{ RolesKey }}'
-            SessionTimeoutMinutes: '{{ SessionTimeoutMinutes }}'
-          JWTOptions:
-            Enabled: '{{ Enabled }}'
-            PublicKey: '{{ PublicKey }}'
-            SubjectKey: '{{ SubjectKey }}'
-            RolesKey: '{{ RolesKey }}'
-          IAMFederationOptions:
-            Enabled: '{{ Enabled }}'
-            RolesKey: '{{ RolesKey }}'
-            SubjectKey: '{{ SubjectKey }}'
-          AnonymousAuthDisableDate: '{{ AnonymousAuthDisableDate }}'
-      - name: EBSOptions
+          enabled: '{{ enabled }}'
+          master_user_options:
+            master_user_password: '{{ master_user_password }}'
+            master_user_name: '{{ master_user_name }}'
+            master_user_arn: '{{ master_user_arn }}'
+          internal_user_database_enabled: '{{ internal_user_database_enabled }}'
+          anonymous_auth_enabled: '{{ anonymous_auth_enabled }}'
+          s_aml_options:
+            enabled: '{{ enabled }}'
+            idp:
+              metadata_content: '{{ metadata_content }}'
+              entity_id: '{{ entity_id }}'
+            master_user_name: '{{ master_user_name }}'
+            master_backend_role: '{{ master_backend_role }}'
+            subject_key: '{{ subject_key }}'
+            roles_key: '{{ roles_key }}'
+            session_timeout_minutes: '{{ session_timeout_minutes }}'
+          j_wt_options:
+            enabled: '{{ enabled }}'
+            public_key: '{{ public_key }}'
+            subject_key: '{{ subject_key }}'
+            roles_key: '{{ roles_key }}'
+          iam_federation_options:
+            enabled: '{{ enabled }}'
+            roles_key: '{{ roles_key }}'
+            subject_key: '{{ subject_key }}'
+          anonymous_auth_disable_date: '{{ anonymous_auth_disable_date }}'
+      - name: ebs_options
         value:
-          EBSEnabled: '{{ EBSEnabled }}'
-          VolumeType: '{{ VolumeType }}'
-          Iops: '{{ Iops }}'
-          VolumeSize: '{{ VolumeSize }}'
-          Throughput: '{{ Throughput }}'
-      - name: EncryptionAtRestOptions
+          ebs_enabled: '{{ ebs_enabled }}'
+          volume_type: '{{ volume_type }}'
+          iops: '{{ iops }}'
+          volume_size: '{{ volume_size }}'
+          throughput: '{{ throughput }}'
+      - name: encryption_at_rest_options
         value:
-          KmsKeyId: '{{ KmsKeyId }}'
-          Enabled: '{{ Enabled }}'
-      - name: Tags
+          kms_key_id: '{{ kms_key_id }}'
+          enabled: '{{ enabled }}'
+      - name: tags
         value:
-          - Value: '{{ Value }}'
-            Key: '{{ Key }}'
-      - name: OffPeakWindowOptions
+          - value: '{{ value }}'
+            key: '{{ key }}'
+      - name: off_peak_window_options
         value:
-          Enabled: '{{ Enabled }}'
-          OffPeakWindow:
-            WindowStartTime:
-              Hours: '{{ Hours }}'
-              Minutes: '{{ Minutes }}'
-      - name: SoftwareUpdateOptions
+          enabled: '{{ enabled }}'
+          off_peak_window:
+            window_start_time:
+              hours: '{{ hours }}'
+              minutes: '{{ minutes }}'
+      - name: software_update_options
         value:
-          AutoSoftwareUpdateEnabled: '{{ AutoSoftwareUpdateEnabled }}'
-      - name: SkipShardMigrationWait
-        value: '{{ SkipShardMigrationWait }}'
-      - name: IdentityCenterOptions
+          auto_software_update_enabled: '{{ auto_software_update_enabled }}'
+      - name: skip_shard_migration_wait
+        value: '{{ skip_shard_migration_wait }}'
+      - name: identity_center_options
         value:
-          EnabledAPIAccess: '{{ EnabledAPIAccess }}'
-          IdentityCenterInstanceARN: '{{ IdentityCenterInstanceARN }}'
-          SubjectKey: '{{ SubjectKey }}'
-          RolesKey: '{{ RolesKey }}'
-          IdentityCenterApplicationARN: '{{ IdentityCenterApplicationARN }}'
-          IdentityStoreId: '{{ IdentityStoreId }}'
-
+          enabled_api_access: '{{ enabled_api_access }}'
+          identity_center_instance_arn: '{{ identity_center_instance_arn }}'
+          subject_key: '{{ subject_key }}'
+          roles_key: '{{ roles_key }}'
+          identity_center_application_arn: '{{ identity_center_application_arn }}'
+          identity_store_id: '{{ identity_store_id }}'
 ```
 </TabItem>
 </Tabs>
@@ -1025,7 +1024,7 @@ SET PatchDocument = string('{{ {
     "SkipShardMigrationWait": skip_shard_migration_wait
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<DomainName>';
+AND Identifier = '{{ domain_name }}';
 ```
 
 
@@ -1034,7 +1033,7 @@ AND Identifier = '<DomainName>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.opensearchservice.domains
-WHERE Identifier = '<DomainName>'
+WHERE Identifier = '{{ domain_name }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/organizations/accounts/index.md b/website/docs/services/organizations/accounts/index.md
index 2d207946b..7c5d036d6 100644
--- a/website/docs/services/organizations/accounts/index.md
+++ b/website/docs/services/organizations/accounts/index.md
@@ -200,7 +200,7 @@ joined_method,
 joined_timestamp,
 status
 FROM awscc.organizations.accounts
-WHERE region = 'us-east-1' AND Identifier = '<AccountId>';
+WHERE region = 'us-east-1' AND Identifier = '{{ account_id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -237,9 +237,9 @@ INSERT INTO awscc.organizations.accounts (
  Email,
  region
 )
-SELECT 
-'{{ AccountName }}',
- '{{ Email }}',
+SELECT
+'{{ account_name }}',
+ '{{ email }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -255,12 +255,12 @@ INSERT INTO awscc.organizations.accounts (
  Tags,
  region
 )
-SELECT 
- '{{ AccountName }}',
- '{{ Email }}',
- '{{ RoleName }}',
- '{{ ParentIds }}',
- '{{ Tags }}',
+SELECT
+ '{{ account_name }}',
+ '{{ email }}',
+ '{{ role_name }}',
+ '{{ parent_ids }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -278,20 +278,19 @@ globals:
 resources:
   - name: account
     props:
-      - name: AccountName
-        value: '{{ AccountName }}'
-      - name: Email
-        value: '{{ Email }}'
-      - name: RoleName
-        value: '{{ RoleName }}'
-      - name: ParentIds
+      - name: account_name
+        value: '{{ account_name }}'
+      - name: email
+        value: '{{ email }}'
+      - name: role_name
+        value: '{{ role_name }}'
+      - name: parent_ids
         value:
-          - '{{ ParentIds[0] }}'
-      - name: Tags
+          - '{{ parent_ids[0] }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -311,7 +310,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<AccountId>';
+AND Identifier = '{{ account_id }}';
 ```
 
 
@@ -320,7 +319,7 @@ AND Identifier = '<AccountId>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.organizations.accounts
-WHERE Identifier = '<AccountId>'
+WHERE Identifier = '{{ account_id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/organizations/organizational_units/index.md b/website/docs/services/organizations/organizational_units/index.md
index e839acb1a..b0fbf0081 100644
--- a/website/docs/services/organizations/organizational_units/index.md
+++ b/website/docs/services/organizations/organizational_units/index.md
@@ -170,7 +170,7 @@ name,
 parent_id,
 tags
 FROM awscc.organizations.organizational_units
-WHERE region = 'us-east-1' AND Identifier = '<Id>';
+WHERE region = 'us-east-1' AND Identifier = '{{ id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -207,9 +207,9 @@ INSERT INTO awscc.organizations.organizational_units (
  ParentId,
  region
 )
-SELECT 
-'{{ Name }}',
- '{{ ParentId }}',
+SELECT
+'{{ name }}',
+ '{{ parent_id }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -223,10 +223,10 @@ INSERT INTO awscc.organizations.organizational_units (
  Tags,
  region
 )
-SELECT 
- '{{ Name }}',
- '{{ ParentId }}',
- '{{ Tags }}',
+SELECT
+ '{{ name }}',
+ '{{ parent_id }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -244,15 +244,14 @@ globals:
 resources:
   - name: organizational_unit
     props:
-      - name: Name
-        value: '{{ Name }}'
-      - name: ParentId
-        value: '{{ ParentId }}'
-      - name: Tags
+      - name: name
+        value: '{{ name }}'
+      - name: parent_id
+        value: '{{ parent_id }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -269,7 +268,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Id>';
+AND Identifier = '{{ id }}';
 ```
 
 
@@ -278,7 +277,7 @@ AND Identifier = '<Id>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.organizations.organizational_units
-WHERE Identifier = '<Id>'
+WHERE Identifier = '{{ id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/organizations/organizations/index.md b/website/docs/services/organizations/organizations/index.md
index a394ba017..5208bef01 100644
--- a/website/docs/services/organizations/organizations/index.md
+++ b/website/docs/services/organizations/organizations/index.md
@@ -170,7 +170,7 @@ management_account_id,
 management_account_email,
 root_id
 FROM awscc.organizations.organizations
-WHERE region = 'us-east-1' AND Identifier = '<Id>';
+WHERE region = 'us-east-1' AND Identifier = '{{ id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -206,8 +206,8 @@ INSERT INTO awscc.organizations.organizations (
  FeatureSet,
  region
 )
-SELECT 
-'{{ FeatureSet }}',
+SELECT
+'{{ feature_set }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -219,8 +219,8 @@ INSERT INTO awscc.organizations.organizations (
  FeatureSet,
  region
 )
-SELECT 
- '{{ FeatureSet }}',
+SELECT
+ '{{ feature_set }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -238,9 +238,8 @@ globals:
 resources:
   - name: organization
     props:
-      - name: FeatureSet
-        value: '{{ FeatureSet }}'
-
+      - name: feature_set
+        value: '{{ feature_set }}'
 ```
 </TabItem>
 </Tabs>
@@ -256,7 +255,7 @@ SET PatchDocument = string('{{ {
     "FeatureSet": feature_set
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Id>';
+AND Identifier = '{{ id }}';
 ```
 
 
@@ -265,7 +264,7 @@ AND Identifier = '<Id>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.organizations.organizations
-WHERE Identifier = '<Id>'
+WHERE Identifier = '{{ id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/organizations/policies/index.md b/website/docs/services/organizations/policies/index.md
index 91e2c34bf..173ac4a7d 100644
--- a/website/docs/services/organizations/policies/index.md
+++ b/website/docs/services/organizations/policies/index.md
@@ -194,7 +194,7 @@ id,
 arn,
 aws_managed
 FROM awscc.organizations.policies
-WHERE region = 'us-east-1' AND Identifier = '<Id>';
+WHERE region = 'us-east-1' AND Identifier = '{{ id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -232,10 +232,10 @@ INSERT INTO awscc.organizations.policies (
  Content,
  region
 )
-SELECT 
-'{{ Name }}',
- '{{ Type }}',
- '{{ Content }}',
+SELECT
+'{{ name }}',
+ '{{ type }}',
+ '{{ content }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -252,13 +252,13 @@ INSERT INTO awscc.organizations.policies (
  Tags,
  region
 )
-SELECT 
- '{{ Name }}',
- '{{ Type }}',
- '{{ Content }}',
- '{{ Description }}',
- '{{ TargetIds }}',
- '{{ Tags }}',
+SELECT
+ '{{ name }}',
+ '{{ type }}',
+ '{{ content }}',
+ '{{ description }}',
+ '{{ target_ids }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -276,22 +276,21 @@ globals:
 resources:
   - name: policy
     props:
-      - name: Name
-        value: '{{ Name }}'
-      - name: Type
-        value: '{{ Type }}'
-      - name: Content
+      - name: name
+        value: '{{ name }}'
+      - name: type
+        value: '{{ type }}'
+      - name: content
         value: {}
-      - name: Description
-        value: '{{ Description }}'
-      - name: TargetIds
+      - name: description
+        value: '{{ description }}'
+      - name: target_ids
         value:
-          - '{{ TargetIds[0] }}'
-      - name: Tags
+          - '{{ target_ids[0] }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -311,7 +310,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Id>';
+AND Identifier = '{{ id }}';
 ```
 
 
@@ -320,7 +319,7 @@ AND Identifier = '<Id>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.organizations.policies
-WHERE Identifier = '<Id>'
+WHERE Identifier = '{{ id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/organizations/resource_policies/index.md b/website/docs/services/organizations/resource_policies/index.md
index 8fbe50297..4fc63ee64 100644
--- a/website/docs/services/organizations/resource_policies/index.md
+++ b/website/docs/services/organizations/resource_policies/index.md
@@ -164,7 +164,7 @@ arn,
 content,
 tags
 FROM awscc.organizations.resource_policies
-WHERE region = 'us-east-1' AND Identifier = '<Id>';
+WHERE region = 'us-east-1' AND Identifier = '{{ id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -200,8 +200,8 @@ INSERT INTO awscc.organizations.resource_policies (
  Content,
  region
 )
-SELECT 
-'{{ Content }}',
+SELECT
+'{{ content }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -214,9 +214,9 @@ INSERT INTO awscc.organizations.resource_policies (
  Tags,
  region
 )
-SELECT 
- '{{ Content }}',
- '{{ Tags }}',
+SELECT
+ '{{ content }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -234,13 +234,12 @@ globals:
 resources:
   - name: resource_policy
     props:
-      - name: Content
+      - name: content
         value: {}
-      - name: Tags
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -257,7 +256,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Id>';
+AND Identifier = '{{ id }}';
 ```
 
 
@@ -266,7 +265,7 @@ AND Identifier = '<Id>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.organizations.resource_policies
-WHERE Identifier = '<Id>'
+WHERE Identifier = '{{ id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/osis/pipelines/index.md b/website/docs/services/osis/pipelines/index.md
index 9190683f3..3b786064d 100644
--- a/website/docs/services/osis/pipelines/index.md
+++ b/website/docs/services/osis/pipelines/index.md
@@ -297,7 +297,7 @@ vpc_endpoint_service,
 pipeline_arn,
 ingest_endpoint_urls
 FROM awscc.osis.pipelines
-WHERE region = 'us-east-1' AND Identifier = '<PipelineArn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ pipeline_arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -336,11 +336,11 @@ INSERT INTO awscc.osis.pipelines (
  PipelineName,
  region
 )
-SELECT 
-'{{ MaxUnits }}',
- '{{ MinUnits }}',
- '{{ PipelineConfigurationBody }}',
- '{{ PipelineName }}',
+SELECT
+'{{ max_units }}',
+ '{{ min_units }}',
+ '{{ pipeline_configuration_body }}',
+ '{{ pipeline_name }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -360,16 +360,16 @@ INSERT INTO awscc.osis.pipelines (
  VpcOptions,
  region
 )
-SELECT 
- '{{ BufferOptions }}',
- '{{ EncryptionAtRestOptions }}',
- '{{ LogPublishingOptions }}',
- '{{ MaxUnits }}',
- '{{ MinUnits }}',
- '{{ PipelineConfigurationBody }}',
- '{{ PipelineName }}',
- '{{ Tags }}',
- '{{ VpcOptions }}',
+SELECT
+ '{{ buffer_options }}',
+ '{{ encryption_at_rest_options }}',
+ '{{ log_publishing_options }}',
+ '{{ max_units }}',
+ '{{ min_units }}',
+ '{{ pipeline_configuration_body }}',
+ '{{ pipeline_name }}',
+ '{{ tags }}',
+ '{{ vpc_options }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -387,40 +387,39 @@ globals:
 resources:
   - name: pipeline
     props:
-      - name: BufferOptions
+      - name: buffer_options
         value:
-          PersistentBufferEnabled: '{{ PersistentBufferEnabled }}'
-      - name: EncryptionAtRestOptions
+          persistent_buffer_enabled: '{{ persistent_buffer_enabled }}'
+      - name: encryption_at_rest_options
         value:
-          KmsKeyArn: '{{ KmsKeyArn }}'
-      - name: LogPublishingOptions
+          kms_key_arn: '{{ kms_key_arn }}'
+      - name: log_publishing_options
         value:
-          IsLoggingEnabled: '{{ IsLoggingEnabled }}'
-          CloudWatchLogDestination:
-            LogGroup: '{{ LogGroup }}'
-      - name: MaxUnits
-        value: '{{ MaxUnits }}'
-      - name: MinUnits
-        value: '{{ MinUnits }}'
-      - name: PipelineConfigurationBody
-        value: '{{ PipelineConfigurationBody }}'
-      - name: PipelineName
-        value: '{{ PipelineName }}'
-      - name: Tags
+          is_logging_enabled: '{{ is_logging_enabled }}'
+          cloud_watch_log_destination:
+            log_group: '{{ log_group }}'
+      - name: max_units
+        value: '{{ max_units }}'
+      - name: min_units
+        value: '{{ min_units }}'
+      - name: pipeline_configuration_body
+        value: '{{ pipeline_configuration_body }}'
+      - name: pipeline_name
+        value: '{{ pipeline_name }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-      - name: VpcOptions
+          - key: '{{ key }}'
+            value: '{{ value }}'
+      - name: vpc_options
         value:
-          SecurityGroupIds:
-            - '{{ SecurityGroupIds[0] }}'
-          SubnetIds:
-            - '{{ SubnetIds[0] }}'
-          VpcEndpointManagement: '{{ VpcEndpointManagement }}'
-          VpcAttachmentOptions:
-            AttachToVpc: '{{ AttachToVpc }}'
-            CidrBlock: '{{ CidrBlock }}'
-
+          security_group_ids:
+            - '{{ security_group_ids[0] }}'
+          subnet_ids:
+            - '{{ subnet_ids[0] }}'
+          vpc_endpoint_management: '{{ vpc_endpoint_management }}'
+          vpc_attachment_options:
+            attach_to_vpc: '{{ attach_to_vpc }}'
+            cidr_block: '{{ cidr_block }}'
 ```
 </TabItem>
 </Tabs>
@@ -443,7 +442,7 @@ SET PatchDocument = string('{{ {
     "VpcOptions": vpc_options
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<PipelineArn>';
+AND Identifier = '{{ pipeline_arn }}';
 ```
 
 
@@ -452,7 +451,7 @@ AND Identifier = '<PipelineArn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.osis.pipelines
-WHERE Identifier = '<PipelineArn>'
+WHERE Identifier = '{{ pipeline_arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/panorama/application_instances/index.md b/website/docs/services/panorama/application_instances/index.md
index c7082d2ca..5f1b5c2bd 100644
--- a/website/docs/services/panorama/application_instances/index.md
+++ b/website/docs/services/panorama/application_instances/index.md
@@ -235,7 +235,7 @@ manifest_payload,
 arn,
 tags
 FROM awscc.panorama.application_instances
-WHERE region = 'us-east-1' AND Identifier = '<ApplicationInstanceId>';
+WHERE region = 'us-east-1' AND Identifier = '{{ application_instance_id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -272,9 +272,9 @@ INSERT INTO awscc.panorama.application_instances (
  ManifestPayload,
  region
 )
-SELECT 
-'{{ DefaultRuntimeContextDevice }}',
- '{{ ManifestPayload }}',
+SELECT
+'{{ default_runtime_context_device }}',
+ '{{ manifest_payload }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -293,15 +293,15 @@ INSERT INTO awscc.panorama.application_instances (
  Tags,
  region
 )
-SELECT 
- '{{ DefaultRuntimeContextDevice }}',
- '{{ Description }}',
- '{{ ApplicationInstanceIdToReplace }}',
- '{{ ManifestOverridesPayload }}',
- '{{ RuntimeRoleArn }}',
- '{{ Name }}',
- '{{ ManifestPayload }}',
- '{{ Tags }}',
+SELECT
+ '{{ default_runtime_context_device }}',
+ '{{ description }}',
+ '{{ application_instance_id_to_replace }}',
+ '{{ manifest_overrides_payload }}',
+ '{{ runtime_role_arn }}',
+ '{{ name }}',
+ '{{ manifest_payload }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -319,27 +319,26 @@ globals:
 resources:
   - name: application_instance
     props:
-      - name: DefaultRuntimeContextDevice
-        value: '{{ DefaultRuntimeContextDevice }}'
-      - name: Description
-        value: '{{ Description }}'
-      - name: ApplicationInstanceIdToReplace
-        value: '{{ ApplicationInstanceIdToReplace }}'
-      - name: ManifestOverridesPayload
+      - name: default_runtime_context_device
+        value: '{{ default_runtime_context_device }}'
+      - name: description
+        value: '{{ description }}'
+      - name: application_instance_id_to_replace
+        value: '{{ application_instance_id_to_replace }}'
+      - name: manifest_overrides_payload
         value:
-          PayloadData: '{{ PayloadData }}'
-      - name: RuntimeRoleArn
-        value: '{{ RuntimeRoleArn }}'
-      - name: Name
-        value: '{{ Name }}'
-      - name: ManifestPayload
+          payload_data: '{{ payload_data }}'
+      - name: runtime_role_arn
+        value: '{{ runtime_role_arn }}'
+      - name: name
+        value: '{{ name }}'
+      - name: manifest_payload
         value:
-          PayloadData: '{{ PayloadData }}'
-      - name: Tags
+          payload_data: '{{ payload_data }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -355,7 +354,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<ApplicationInstanceId>';
+AND Identifier = '{{ application_instance_id }}';
 ```
 
 
@@ -364,7 +363,7 @@ AND Identifier = '<ApplicationInstanceId>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.panorama.application_instances
-WHERE Identifier = '<ApplicationInstanceId>'
+WHERE Identifier = '{{ application_instance_id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/panorama/package_versions/index.md b/website/docs/services/panorama/package_versions/index.md
index d4736da77..4e9606d0b 100644
--- a/website/docs/services/panorama/package_versions/index.md
+++ b/website/docs/services/panorama/package_versions/index.md
@@ -149,7 +149,7 @@ status_description,
 registered_time,
 updated_latest_patch_version
 FROM awscc.panorama.package_versions
-WHERE region = 'us-east-1' AND Identifier = '<PackageId>|<PackageVersion>|<PatchVersion>';
+WHERE region = 'us-east-1' AND Identifier = '{{ package_id }}|{{ package_version }}|{{ patch_version }}';
 ```
 
 ## `INSERT` example
@@ -174,10 +174,10 @@ INSERT INTO awscc.panorama.package_versions (
  PatchVersion,
  region
 )
-SELECT 
-'{{ PackageId }}',
- '{{ PackageVersion }}',
- '{{ PatchVersion }}',
+SELECT
+'{{ package_id }}',
+ '{{ package_version }}',
+ '{{ patch_version }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -194,13 +194,13 @@ INSERT INTO awscc.panorama.package_versions (
  UpdatedLatestPatchVersion,
  region
 )
-SELECT 
- '{{ OwnerAccount }}',
- '{{ PackageId }}',
- '{{ PackageVersion }}',
- '{{ PatchVersion }}',
- '{{ MarkLatest }}',
- '{{ UpdatedLatestPatchVersion }}',
+SELECT
+ '{{ owner_account }}',
+ '{{ package_id }}',
+ '{{ package_version }}',
+ '{{ patch_version }}',
+ '{{ mark_latest }}',
+ '{{ updated_latest_patch_version }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -218,19 +218,18 @@ globals:
 resources:
   - name: package_version
     props:
-      - name: OwnerAccount
-        value: '{{ OwnerAccount }}'
-      - name: PackageId
-        value: '{{ PackageId }}'
-      - name: PackageVersion
-        value: '{{ PackageVersion }}'
-      - name: PatchVersion
-        value: '{{ PatchVersion }}'
-      - name: MarkLatest
-        value: '{{ MarkLatest }}'
-      - name: UpdatedLatestPatchVersion
+      - name: owner_account
+        value: '{{ owner_account }}'
+      - name: package_id
+        value: '{{ package_id }}'
+      - name: package_version
+        value: '{{ package_version }}'
+      - name: patch_version
+        value: '{{ patch_version }}'
+      - name: mark_latest
+        value: '{{ mark_latest }}'
+      - name: updated_latest_patch_version
         value: null
-
 ```
 </TabItem>
 </Tabs>
@@ -247,7 +246,7 @@ SET PatchDocument = string('{{ {
     "UpdatedLatestPatchVersion": updated_latest_patch_version
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<PackageId>|<PackageVersion>|<PatchVersion>';
+AND Identifier = '{{ package_id }}|{{ package_version }}|{{ patch_version }}';
 ```
 
 
@@ -256,7 +255,7 @@ AND Identifier = '<PackageId>|<PackageVersion>|<PatchVersion>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.panorama.package_versions
-WHERE Identifier = '<PackageId|PackageVersion|PatchVersion>'
+WHERE Identifier = '{{ package_id }}|{{ package_version }}|{{ patch_version }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/panorama/packages/index.md b/website/docs/services/panorama/packages/index.md
index ee5441f4e..df72f2e39 100644
--- a/website/docs/services/panorama/packages/index.md
+++ b/website/docs/services/panorama/packages/index.md
@@ -203,7 +203,7 @@ storage_location,
 created_time,
 tags
 FROM awscc.panorama.packages
-WHERE region = 'us-east-1' AND Identifier = '<PackageId>';
+WHERE region = 'us-east-1' AND Identifier = '{{ package_id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -239,8 +239,8 @@ INSERT INTO awscc.panorama.packages (
  PackageName,
  region
 )
-SELECT 
-'{{ PackageName }}',
+SELECT
+'{{ package_name }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -254,10 +254,10 @@ INSERT INTO awscc.panorama.packages (
  Tags,
  region
 )
-SELECT 
- '{{ PackageName }}',
- '{{ StorageLocation }}',
- '{{ Tags }}',
+SELECT
+ '{{ package_name }}',
+ '{{ storage_location }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -275,20 +275,19 @@ globals:
 resources:
   - name: package
     props:
-      - name: PackageName
-        value: '{{ PackageName }}'
-      - name: StorageLocation
+      - name: package_name
+        value: '{{ package_name }}'
+      - name: storage_location
         value:
-          Bucket: '{{ Bucket }}'
-          RepoPrefixLocation: '{{ RepoPrefixLocation }}'
-          GeneratedPrefixLocation: '{{ GeneratedPrefixLocation }}'
-          BinaryPrefixLocation: '{{ BinaryPrefixLocation }}'
-          ManifestPrefixLocation: '{{ ManifestPrefixLocation }}'
-      - name: Tags
+          bucket: '{{ bucket }}'
+          repo_prefix_location: '{{ repo_prefix_location }}'
+          generated_prefix_location: '{{ generated_prefix_location }}'
+          binary_prefix_location: '{{ binary_prefix_location }}'
+          manifest_prefix_location: '{{ manifest_prefix_location }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -304,7 +303,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<PackageId>';
+AND Identifier = '{{ package_id }}';
 ```
 
 
@@ -313,7 +312,7 @@ AND Identifier = '<PackageId>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.panorama.packages
-WHERE Identifier = '<PackageId>'
+WHERE Identifier = '{{ package_id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/paymentcryptography/aliases/index.md b/website/docs/services/paymentcryptography/aliases/index.md
index 7f0e127a9..d6ef22ceb 100644
--- a/website/docs/services/paymentcryptography/aliases/index.md
+++ b/website/docs/services/paymentcryptography/aliases/index.md
@@ -140,7 +140,7 @@ region,
 alias_name,
 key_arn
 FROM awscc.paymentcryptography.aliases
-WHERE region = 'us-east-1' AND Identifier = '<AliasName>';
+WHERE region = 'us-east-1' AND Identifier = '{{ alias_name }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -176,8 +176,8 @@ INSERT INTO awscc.paymentcryptography.aliases (
  AliasName,
  region
 )
-SELECT 
-'{{ AliasName }}',
+SELECT
+'{{ alias_name }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -190,9 +190,9 @@ INSERT INTO awscc.paymentcryptography.aliases (
  KeyArn,
  region
 )
-SELECT 
- '{{ AliasName }}',
- '{{ KeyArn }}',
+SELECT
+ '{{ alias_name }}',
+ '{{ key_arn }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -210,11 +210,10 @@ globals:
 resources:
   - name: alias
     props:
-      - name: AliasName
-        value: '{{ AliasName }}'
-      - name: KeyArn
-        value: '{{ KeyArn }}'
-
+      - name: alias_name
+        value: '{{ alias_name }}'
+      - name: key_arn
+        value: '{{ key_arn }}'
 ```
 </TabItem>
 </Tabs>
@@ -230,7 +229,7 @@ SET PatchDocument = string('{{ {
     "KeyArn": key_arn
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<AliasName>';
+AND Identifier = '{{ alias_name }}';
 ```
 
 
@@ -239,7 +238,7 @@ AND Identifier = '<AliasName>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.paymentcryptography.aliases
-WHERE Identifier = '<AliasName>'
+WHERE Identifier = '{{ alias_name }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/paymentcryptography/keys/index.md b/website/docs/services/paymentcryptography/keys/index.md
index 93d440582..871b8968d 100644
--- a/website/docs/services/paymentcryptography/keys/index.md
+++ b/website/docs/services/paymentcryptography/keys/index.md
@@ -263,7 +263,7 @@ key_origin,
 key_state,
 tags
 FROM awscc.paymentcryptography.keys
-WHERE region = 'us-east-1' AND Identifier = '<KeyIdentifier>';
+WHERE region = 'us-east-1' AND Identifier = '{{ key_identifier }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -300,9 +300,9 @@ INSERT INTO awscc.paymentcryptography.keys (
  KeyAttributes,
  region
 )
-SELECT 
-'{{ Exportable }}',
- '{{ KeyAttributes }}',
+SELECT
+'{{ exportable }}',
+ '{{ key_attributes }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -319,13 +319,13 @@ INSERT INTO awscc.paymentcryptography.keys (
  Tags,
  region
 )
-SELECT 
- '{{ DeriveKeyUsage }}',
- '{{ Enabled }}',
- '{{ Exportable }}',
- '{{ KeyAttributes }}',
- '{{ KeyCheckValueAlgorithm }}',
- '{{ Tags }}',
+SELECT
+ '{{ derive_key_usage }}',
+ '{{ enabled }}',
+ '{{ exportable }}',
+ '{{ key_attributes }}',
+ '{{ key_check_value_algorithm }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -343,34 +343,33 @@ globals:
 resources:
   - name: key
     props:
-      - name: DeriveKeyUsage
-        value: '{{ DeriveKeyUsage }}'
-      - name: Enabled
-        value: '{{ Enabled }}'
-      - name: Exportable
-        value: '{{ Exportable }}'
-      - name: KeyAttributes
+      - name: derive_key_usage
+        value: '{{ derive_key_usage }}'
+      - name: enabled
+        value: '{{ enabled }}'
+      - name: exportable
+        value: '{{ exportable }}'
+      - name: key_attributes
         value:
-          KeyUsage: '{{ KeyUsage }}'
-          KeyClass: '{{ KeyClass }}'
-          KeyAlgorithm: '{{ KeyAlgorithm }}'
-          KeyModesOfUse:
-            Encrypt: '{{ Encrypt }}'
-            Decrypt: '{{ Decrypt }}'
-            Wrap: '{{ Wrap }}'
-            Unwrap: '{{ Unwrap }}'
-            Generate: '{{ Generate }}'
-            Sign: '{{ Sign }}'
-            Verify: '{{ Verify }}'
-            DeriveKey: '{{ DeriveKey }}'
-            NoRestrictions: '{{ NoRestrictions }}'
-      - name: KeyCheckValueAlgorithm
-        value: '{{ KeyCheckValueAlgorithm }}'
-      - name: Tags
+          key_usage: '{{ key_usage }}'
+          key_class: '{{ key_class }}'
+          key_algorithm: '{{ key_algorithm }}'
+          key_modes_of_use:
+            encrypt: '{{ encrypt }}'
+            decrypt: '{{ decrypt }}'
+            wrap: '{{ wrap }}'
+            unwrap: '{{ unwrap }}'
+            generate: '{{ generate }}'
+            sign: '{{ sign }}'
+            verify: '{{ verify }}'
+            derive_key: '{{ derive_key }}'
+            no_restrictions: '{{ no_restrictions }}'
+      - name: key_check_value_algorithm
+        value: '{{ key_check_value_algorithm }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -391,7 +390,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<KeyIdentifier>';
+AND Identifier = '{{ key_identifier }}';
 ```
 
 
@@ -400,7 +399,7 @@ AND Identifier = '<KeyIdentifier>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.paymentcryptography.keys
-WHERE Identifier = '<KeyIdentifier>'
+WHERE Identifier = '{{ key_identifier }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/pcaconnectorad/connectors/index.md b/website/docs/services/pcaconnectorad/connectors/index.md
index f41b9df91..46eecb495 100644
--- a/website/docs/services/pcaconnectorad/connectors/index.md
+++ b/website/docs/services/pcaconnectorad/connectors/index.md
@@ -170,7 +170,7 @@ directory_id,
 tags,
 vpc_information
 FROM awscc.pcaconnectorad.connectors
-WHERE region = 'us-east-1' AND Identifier = '<ConnectorArn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ connector_arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -208,10 +208,10 @@ INSERT INTO awscc.pcaconnectorad.connectors (
  VpcInformation,
  region
 )
-SELECT 
-'{{ CertificateAuthorityArn }}',
- '{{ DirectoryId }}',
- '{{ VpcInformation }}',
+SELECT
+'{{ certificate_authority_arn }}',
+ '{{ directory_id }}',
+ '{{ vpc_information }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -226,11 +226,11 @@ INSERT INTO awscc.pcaconnectorad.connectors (
  VpcInformation,
  region
 )
-SELECT 
- '{{ CertificateAuthorityArn }}',
- '{{ DirectoryId }}',
- '{{ Tags }}',
- '{{ VpcInformation }}',
+SELECT
+ '{{ certificate_authority_arn }}',
+ '{{ directory_id }}',
+ '{{ tags }}',
+ '{{ vpc_information }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -248,18 +248,17 @@ globals:
 resources:
   - name: connector
     props:
-      - name: CertificateAuthorityArn
-        value: '{{ CertificateAuthorityArn }}'
-      - name: DirectoryId
-        value: '{{ DirectoryId }}'
-      - name: Tags
+      - name: certificate_authority_arn
+        value: '{{ certificate_authority_arn }}'
+      - name: directory_id
+        value: '{{ directory_id }}'
+      - name: tags
         value: {}
-      - name: VpcInformation
+      - name: vpc_information
         value:
-          SecurityGroupIds:
-            - '{{ SecurityGroupIds[0] }}'
-          IpAddressType: '{{ IpAddressType }}'
-
+          security_group_ids:
+            - '{{ security_group_ids[0] }}'
+          ip_address_type: '{{ ip_address_type }}'
 ```
 </TabItem>
 </Tabs>
@@ -275,7 +274,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<ConnectorArn>';
+AND Identifier = '{{ connector_arn }}';
 ```
 
 
@@ -284,7 +283,7 @@ AND Identifier = '<ConnectorArn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.pcaconnectorad.connectors
-WHERE Identifier = '<ConnectorArn>'
+WHERE Identifier = '{{ connector_arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/pcaconnectorad/directory_registrations/index.md b/website/docs/services/pcaconnectorad/directory_registrations/index.md
index 9d66a78ce..f16b536dc 100644
--- a/website/docs/services/pcaconnectorad/directory_registrations/index.md
+++ b/website/docs/services/pcaconnectorad/directory_registrations/index.md
@@ -146,7 +146,7 @@ directory_id,
 directory_registration_arn,
 tags
 FROM awscc.pcaconnectorad.directory_registrations
-WHERE region = 'us-east-1' AND Identifier = '<DirectoryRegistrationArn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ directory_registration_arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -182,8 +182,8 @@ INSERT INTO awscc.pcaconnectorad.directory_registrations (
  DirectoryId,
  region
 )
-SELECT 
-'{{ DirectoryId }}',
+SELECT
+'{{ directory_id }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -196,9 +196,9 @@ INSERT INTO awscc.pcaconnectorad.directory_registrations (
  Tags,
  region
 )
-SELECT 
- '{{ DirectoryId }}',
- '{{ Tags }}',
+SELECT
+ '{{ directory_id }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -216,11 +216,10 @@ globals:
 resources:
   - name: directory_registration
     props:
-      - name: DirectoryId
-        value: '{{ DirectoryId }}'
-      - name: Tags
+      - name: directory_id
+        value: '{{ directory_id }}'
+      - name: tags
         value: {}
-
 ```
 </TabItem>
 </Tabs>
@@ -236,7 +235,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<DirectoryRegistrationArn>';
+AND Identifier = '{{ directory_registration_arn }}';
 ```
 
 
@@ -245,7 +244,7 @@ AND Identifier = '<DirectoryRegistrationArn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.pcaconnectorad.directory_registrations
-WHERE Identifier = '<DirectoryRegistrationArn>'
+WHERE Identifier = '{{ directory_registration_arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/pcaconnectorad/service_principal_names/index.md b/website/docs/services/pcaconnectorad/service_principal_names/index.md
index f807fe27b..1f948bd36 100644
--- a/website/docs/services/pcaconnectorad/service_principal_names/index.md
+++ b/website/docs/services/pcaconnectorad/service_principal_names/index.md
@@ -139,7 +139,7 @@ region,
 connector_arn,
 directory_registration_arn
 FROM awscc.pcaconnectorad.service_principal_names
-WHERE region = 'us-east-1' AND Identifier = '<ConnectorArn>|<DirectoryRegistrationArn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ connector_arn }}|{{ directory_registration_arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -177,9 +177,9 @@ INSERT INTO awscc.pcaconnectorad.service_principal_names (
  DirectoryRegistrationArn,
  region
 )
-SELECT 
-'{{ ConnectorArn }}',
- '{{ DirectoryRegistrationArn }}',
+SELECT
+'{{ connector_arn }}',
+ '{{ directory_registration_arn }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -192,9 +192,9 @@ INSERT INTO awscc.pcaconnectorad.service_principal_names (
  DirectoryRegistrationArn,
  region
 )
-SELECT 
- '{{ ConnectorArn }}',
- '{{ DirectoryRegistrationArn }}',
+SELECT
+ '{{ connector_arn }}',
+ '{{ directory_registration_arn }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -212,11 +212,10 @@ globals:
 resources:
   - name: service_principal_name
     props:
-      - name: ConnectorArn
-        value: '{{ ConnectorArn }}'
-      - name: DirectoryRegistrationArn
-        value: '{{ DirectoryRegistrationArn }}'
-
+      - name: connector_arn
+        value: '{{ connector_arn }}'
+      - name: directory_registration_arn
+        value: '{{ directory_registration_arn }}'
 ```
 </TabItem>
 </Tabs>
@@ -227,7 +226,7 @@ resources:
 ```sql
 /*+ delete */
 DELETE FROM awscc.pcaconnectorad.service_principal_names
-WHERE Identifier = '<ConnectorArn|DirectoryRegistrationArn>'
+WHERE Identifier = '{{ connector_arn }}|{{ directory_registration_arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/pcaconnectorad/template_group_access_control_entries/index.md b/website/docs/services/pcaconnectorad/template_group_access_control_entries/index.md
index f684eb2fd..97cdec692 100644
--- a/website/docs/services/pcaconnectorad/template_group_access_control_entries/index.md
+++ b/website/docs/services/pcaconnectorad/template_group_access_control_entries/index.md
@@ -164,7 +164,7 @@ group_display_name,
 group_security_identifier,
 template_arn
 FROM awscc.pcaconnectorad.template_group_access_control_entries
-WHERE region = 'us-east-1' AND Identifier = '<GroupSecurityIdentifier>|<TemplateArn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ group_security_identifier }}|{{ template_arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -202,9 +202,9 @@ INSERT INTO awscc.pcaconnectorad.template_group_access_control_entries (
  GroupDisplayName,
  region
 )
-SELECT 
-'{{ AccessRights }}',
- '{{ GroupDisplayName }}',
+SELECT
+'{{ access_rights }}',
+ '{{ group_display_name }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -219,11 +219,11 @@ INSERT INTO awscc.pcaconnectorad.template_group_access_control_entries (
  TemplateArn,
  region
 )
-SELECT 
- '{{ AccessRights }}',
- '{{ GroupDisplayName }}',
- '{{ GroupSecurityIdentifier }}',
- '{{ TemplateArn }}',
+SELECT
+ '{{ access_rights }}',
+ '{{ group_display_name }}',
+ '{{ group_security_identifier }}',
+ '{{ template_arn }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -241,17 +241,16 @@ globals:
 resources:
   - name: template_group_access_control_entry
     props:
-      - name: AccessRights
+      - name: access_rights
         value:
-          Enroll: '{{ Enroll }}'
-          AutoEnroll: null
-      - name: GroupDisplayName
-        value: '{{ GroupDisplayName }}'
-      - name: GroupSecurityIdentifier
-        value: '{{ GroupSecurityIdentifier }}'
-      - name: TemplateArn
-        value: '{{ TemplateArn }}'
-
+          enroll: '{{ enroll }}'
+          auto_enroll: null
+      - name: group_display_name
+        value: '{{ group_display_name }}'
+      - name: group_security_identifier
+        value: '{{ group_security_identifier }}'
+      - name: template_arn
+        value: '{{ template_arn }}'
 ```
 </TabItem>
 </Tabs>
@@ -268,7 +267,7 @@ SET PatchDocument = string('{{ {
     "GroupDisplayName": group_display_name
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<GroupSecurityIdentifier>|<TemplateArn>';
+AND Identifier = '{{ group_security_identifier }}|{{ template_arn }}';
 ```
 
 
@@ -277,7 +276,7 @@ AND Identifier = '<GroupSecurityIdentifier>|<TemplateArn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.pcaconnectorad.template_group_access_control_entries
-WHERE Identifier = '<GroupSecurityIdentifier|TemplateArn>'
+WHERE Identifier = '{{ group_security_identifier }}|{{ template_arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/pcaconnectorad/templates/index.md b/website/docs/services/pcaconnectorad/templates/index.md
index 013c7a64c..36c5f78e1 100644
--- a/website/docs/services/pcaconnectorad/templates/index.md
+++ b/website/docs/services/pcaconnectorad/templates/index.md
@@ -164,7 +164,7 @@ reenroll_all_certificate_holders,
 tags,
 template_arn
 FROM awscc.pcaconnectorad.templates
-WHERE region = 'us-east-1' AND Identifier = '<TemplateArn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ template_arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -202,10 +202,10 @@ INSERT INTO awscc.pcaconnectorad.templates (
  Name,
  region
 )
-SELECT 
-'{{ ConnectorArn }}',
- '{{ Definition }}',
- '{{ Name }}',
+SELECT
+'{{ connector_arn }}',
+ '{{ definition }}',
+ '{{ name }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -221,12 +221,12 @@ INSERT INTO awscc.pcaconnectorad.templates (
  Tags,
  region
 )
-SELECT 
- '{{ ConnectorArn }}',
- '{{ Definition }}',
- '{{ Name }}',
- '{{ ReenrollAllCertificateHolders }}',
- '{{ Tags }}',
+SELECT
+ '{{ connector_arn }}',
+ '{{ definition }}',
+ '{{ name }}',
+ '{{ reenroll_all_certificate_holders }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -244,17 +244,16 @@ globals:
 resources:
   - name: template
     props:
-      - name: ConnectorArn
-        value: '{{ ConnectorArn }}'
-      - name: Definition
+      - name: connector_arn
+        value: '{{ connector_arn }}'
+      - name: definition
         value: null
-      - name: Name
-        value: '{{ Name }}'
-      - name: ReenrollAllCertificateHolders
-        value: '{{ ReenrollAllCertificateHolders }}'
-      - name: Tags
+      - name: name
+        value: '{{ name }}'
+      - name: reenroll_all_certificate_holders
+        value: '{{ reenroll_all_certificate_holders }}'
+      - name: tags
         value: {}
-
 ```
 </TabItem>
 </Tabs>
@@ -272,7 +271,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<TemplateArn>';
+AND Identifier = '{{ template_arn }}';
 ```
 
 
@@ -281,7 +280,7 @@ AND Identifier = '<TemplateArn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.pcaconnectorad.templates
-WHERE Identifier = '<TemplateArn>'
+WHERE Identifier = '{{ template_arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/pcaconnectorscep/challenges/index.md b/website/docs/services/pcaconnectorscep/challenges/index.md
index be983a8e9..f4119dbf3 100644
--- a/website/docs/services/pcaconnectorscep/challenges/index.md
+++ b/website/docs/services/pcaconnectorscep/challenges/index.md
@@ -146,7 +146,7 @@ challenge_arn,
 connector_arn,
 tags
 FROM awscc.pcaconnectorscep.challenges
-WHERE region = 'us-east-1' AND Identifier = '<ChallengeArn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ challenge_arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -182,8 +182,8 @@ INSERT INTO awscc.pcaconnectorscep.challenges (
  ConnectorArn,
  region
 )
-SELECT 
-'{{ ConnectorArn }}',
+SELECT
+'{{ connector_arn }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -196,9 +196,9 @@ INSERT INTO awscc.pcaconnectorscep.challenges (
  Tags,
  region
 )
-SELECT 
- '{{ ConnectorArn }}',
- '{{ Tags }}',
+SELECT
+ '{{ connector_arn }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -216,11 +216,10 @@ globals:
 resources:
   - name: challenge
     props:
-      - name: ConnectorArn
-        value: '{{ ConnectorArn }}'
-      - name: Tags
+      - name: connector_arn
+        value: '{{ connector_arn }}'
+      - name: tags
         value: {}
-
 ```
 </TabItem>
 </Tabs>
@@ -236,7 +235,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<ChallengeArn>';
+AND Identifier = '{{ challenge_arn }}';
 ```
 
 
@@ -245,7 +244,7 @@ AND Identifier = '<ChallengeArn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.pcaconnectorscep.challenges
-WHERE Identifier = '<ChallengeArn>'
+WHERE Identifier = '{{ challenge_arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/pcaconnectorscep/connectors/index.md b/website/docs/services/pcaconnectorscep/connectors/index.md
index 1e3eaf99e..e49fd18d1 100644
--- a/website/docs/services/pcaconnectorscep/connectors/index.md
+++ b/website/docs/services/pcaconnectorscep/connectors/index.md
@@ -187,7 +187,7 @@ mobile_device_management,
 open_id_configuration,
 tags
 FROM awscc.pcaconnectorscep.connectors
-WHERE region = 'us-east-1' AND Identifier = '<ConnectorArn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ connector_arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -223,8 +223,8 @@ INSERT INTO awscc.pcaconnectorscep.connectors (
  CertificateAuthorityArn,
  region
 )
-SELECT 
-'{{ CertificateAuthorityArn }}',
+SELECT
+'{{ certificate_authority_arn }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -238,10 +238,10 @@ INSERT INTO awscc.pcaconnectorscep.connectors (
  Tags,
  region
 )
-SELECT 
- '{{ CertificateAuthorityArn }}',
- '{{ MobileDeviceManagement }}',
- '{{ Tags }}',
+SELECT
+ '{{ certificate_authority_arn }}',
+ '{{ mobile_device_management }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -259,13 +259,12 @@ globals:
 resources:
   - name: connector
     props:
-      - name: CertificateAuthorityArn
-        value: '{{ CertificateAuthorityArn }}'
-      - name: MobileDeviceManagement
+      - name: certificate_authority_arn
+        value: '{{ certificate_authority_arn }}'
+      - name: mobile_device_management
         value: {}
-      - name: Tags
+      - name: tags
         value: {}
-
 ```
 </TabItem>
 </Tabs>
@@ -281,7 +280,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<ConnectorArn>';
+AND Identifier = '{{ connector_arn }}';
 ```
 
 
@@ -290,7 +289,7 @@ AND Identifier = '<ConnectorArn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.pcaconnectorscep.connectors
-WHERE Identifier = '<ConnectorArn>'
+WHERE Identifier = '{{ connector_arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/pcs/clusters/index.md b/website/docs/services/pcs/clusters/index.md
index a9baa3fc6..541709b2c 100644
--- a/website/docs/services/pcs/clusters/index.md
+++ b/website/docs/services/pcs/clusters/index.md
@@ -320,7 +320,7 @@ slurm_configuration,
 status,
 tags
 FROM awscc.pcs.clusters
-WHERE region = 'us-east-1' AND Identifier = '<Arn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -358,10 +358,10 @@ INSERT INTO awscc.pcs.clusters (
  Size,
  region
 )
-SELECT 
-'{{ Networking }}',
- '{{ Scheduler }}',
- '{{ Size }}',
+SELECT
+'{{ networking }}',
+ '{{ scheduler }}',
+ '{{ size }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -378,13 +378,13 @@ INSERT INTO awscc.pcs.clusters (
  Tags,
  region
 )
-SELECT 
- '{{ Name }}',
- '{{ Networking }}',
- '{{ Scheduler }}',
- '{{ Size }}',
- '{{ SlurmConfiguration }}',
- '{{ Tags }}',
+SELECT
+ '{{ name }}',
+ '{{ networking }}',
+ '{{ scheduler }}',
+ '{{ size }}',
+ '{{ slurm_configuration }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -402,36 +402,35 @@ globals:
 resources:
   - name: cluster
     props:
-      - name: Name
-        value: '{{ Name }}'
-      - name: Networking
+      - name: name
+        value: '{{ name }}'
+      - name: networking
         value:
-          SecurityGroupIds:
-            - '{{ SecurityGroupIds[0] }}'
-          SubnetIds:
-            - '{{ SubnetIds[0] }}'
-          NetworkType: '{{ NetworkType }}'
-      - name: Scheduler
+          security_group_ids:
+            - '{{ security_group_ids[0] }}'
+          subnet_ids:
+            - '{{ subnet_ids[0] }}'
+          network_type: '{{ network_type }}'
+      - name: scheduler
         value:
-          Type: '{{ Type }}'
-          Version: '{{ Version }}'
-      - name: Size
-        value: '{{ Size }}'
-      - name: SlurmConfiguration
+          type: '{{ type }}'
+          version: '{{ version }}'
+      - name: size
+        value: '{{ size }}'
+      - name: slurm_configuration
         value:
-          Accounting:
-            DefaultPurgeTimeInDays: '{{ DefaultPurgeTimeInDays }}'
-            Mode: '{{ Mode }}'
-          AuthKey:
-            SecretArn: '{{ SecretArn }}'
-            SecretVersion: '{{ SecretVersion }}'
-          ScaleDownIdleTimeInSeconds: '{{ ScaleDownIdleTimeInSeconds }}'
-          SlurmCustomSettings:
-            - ParameterValue: '{{ ParameterValue }}'
-              ParameterName: '{{ ParameterName }}'
-      - name: Tags
+          accounting:
+            default_purge_time_in_days: '{{ default_purge_time_in_days }}'
+            mode: '{{ mode }}'
+          auth_key:
+            secret_arn: '{{ secret_arn }}'
+            secret_version: '{{ secret_version }}'
+          scale_down_idle_time_in_seconds: '{{ scale_down_idle_time_in_seconds }}'
+          slurm_custom_settings:
+            - parameter_value: '{{ parameter_value }}'
+              parameter_name: '{{ parameter_name }}'
+      - name: tags
         value: null
-
 ```
 </TabItem>
 </Tabs>
@@ -447,7 +446,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Arn>';
+AND Identifier = '{{ arn }}';
 ```
 
 
@@ -456,7 +455,7 @@ AND Identifier = '<Arn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.pcs.clusters
-WHERE Identifier = '<Arn>'
+WHERE Identifier = '{{ arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/pcs/compute_node_groups/index.md b/website/docs/services/pcs/compute_node_groups/index.md
index 83e72fe2d..7989b6d59 100644
--- a/website/docs/services/pcs/compute_node_groups/index.md
+++ b/website/docs/services/pcs/compute_node_groups/index.md
@@ -293,7 +293,7 @@ tags,
 ami_id,
 iam_instance_profile_arn
 FROM awscc.pcs.compute_node_groups
-WHERE region = 'us-east-1' AND Identifier = '<Arn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -334,13 +334,13 @@ INSERT INTO awscc.pcs.compute_node_groups (
  IamInstanceProfileArn,
  region
 )
-SELECT 
-'{{ ClusterId }}',
- '{{ SubnetIds }}',
- '{{ ScalingConfiguration }}',
- '{{ InstanceConfigs }}',
- '{{ CustomLaunchTemplate }}',
- '{{ IamInstanceProfileArn }}',
+SELECT
+'{{ cluster_id }}',
+ '{{ subnet_ids }}',
+ '{{ scaling_configuration }}',
+ '{{ instance_configs }}',
+ '{{ custom_launch_template }}',
+ '{{ iam_instance_profile_arn }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -363,19 +363,19 @@ INSERT INTO awscc.pcs.compute_node_groups (
  IamInstanceProfileArn,
  region
 )
-SELECT 
- '{{ ClusterId }}',
- '{{ SpotOptions }}',
- '{{ SlurmConfiguration }}',
- '{{ SubnetIds }}',
- '{{ Name }}',
- '{{ ScalingConfiguration }}',
- '{{ InstanceConfigs }}',
- '{{ PurchaseOption }}',
- '{{ CustomLaunchTemplate }}',
- '{{ Tags }}',
- '{{ AmiId }}',
- '{{ IamInstanceProfileArn }}',
+SELECT
+ '{{ cluster_id }}',
+ '{{ spot_options }}',
+ '{{ slurm_configuration }}',
+ '{{ subnet_ids }}',
+ '{{ name }}',
+ '{{ scaling_configuration }}',
+ '{{ instance_configs }}',
+ '{{ purchase_option }}',
+ '{{ custom_launch_template }}',
+ '{{ tags }}',
+ '{{ ami_id }}',
+ '{{ iam_instance_profile_arn }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -393,41 +393,40 @@ globals:
 resources:
   - name: compute_node_group
     props:
-      - name: ClusterId
-        value: '{{ ClusterId }}'
-      - name: SpotOptions
+      - name: cluster_id
+        value: '{{ cluster_id }}'
+      - name: spot_options
         value:
-          AllocationStrategy: '{{ AllocationStrategy }}'
-      - name: SlurmConfiguration
+          allocation_strategy: '{{ allocation_strategy }}'
+      - name: slurm_configuration
         value:
-          SlurmCustomSettings:
-            - ParameterValue: '{{ ParameterValue }}'
-              ParameterName: '{{ ParameterName }}'
-      - name: SubnetIds
+          slurm_custom_settings:
+            - parameter_value: '{{ parameter_value }}'
+              parameter_name: '{{ parameter_name }}'
+      - name: subnet_ids
         value:
-          - '{{ SubnetIds[0] }}'
-      - name: Name
-        value: '{{ Name }}'
-      - name: ScalingConfiguration
+          - '{{ subnet_ids[0] }}'
+      - name: name
+        value: '{{ name }}'
+      - name: scaling_configuration
         value:
-          MaxInstanceCount: '{{ MaxInstanceCount }}'
-          MinInstanceCount: '{{ MinInstanceCount }}'
-      - name: InstanceConfigs
+          max_instance_count: '{{ max_instance_count }}'
+          min_instance_count: '{{ min_instance_count }}'
+      - name: instance_configs
         value:
-          - InstanceType: '{{ InstanceType }}'
-      - name: PurchaseOption
-        value: '{{ PurchaseOption }}'
-      - name: CustomLaunchTemplate
+          - instance_type: '{{ instance_type }}'
+      - name: purchase_option
+        value: '{{ purchase_option }}'
+      - name: custom_launch_template
         value:
-          Version: '{{ Version }}'
-          TemplateId: '{{ TemplateId }}'
-      - name: Tags
+          version: '{{ version }}'
+          template_id: '{{ template_id }}'
+      - name: tags
         value: null
-      - name: AmiId
-        value: '{{ AmiId }}'
-      - name: IamInstanceProfileArn
-        value: '{{ IamInstanceProfileArn }}'
-
+      - name: ami_id
+        value: '{{ ami_id }}'
+      - name: iam_instance_profile_arn
+        value: '{{ iam_instance_profile_arn }}'
 ```
 </TabItem>
 </Tabs>
@@ -451,7 +450,7 @@ SET PatchDocument = string('{{ {
     "IamInstanceProfileArn": iam_instance_profile_arn
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Arn>';
+AND Identifier = '{{ arn }}';
 ```
 
 
@@ -460,7 +459,7 @@ AND Identifier = '<Arn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.pcs.compute_node_groups
-WHERE Identifier = '<Arn>'
+WHERE Identifier = '{{ arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/pcs/queues/index.md b/website/docs/services/pcs/queues/index.md
index b8c1a4456..9ab81f115 100644
--- a/website/docs/services/pcs/queues/index.md
+++ b/website/docs/services/pcs/queues/index.md
@@ -195,7 +195,7 @@ name,
 status,
 tags
 FROM awscc.pcs.queues
-WHERE region = 'us-east-1' AND Identifier = '<Arn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -231,8 +231,8 @@ INSERT INTO awscc.pcs.queues (
  ClusterId,
  region
 )
-SELECT 
-'{{ ClusterId }}',
+SELECT
+'{{ cluster_id }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -247,11 +247,11 @@ INSERT INTO awscc.pcs.queues (
  Tags,
  region
 )
-SELECT 
- '{{ ClusterId }}',
- '{{ ComputeNodeGroupConfigurations }}',
- '{{ Name }}',
- '{{ Tags }}',
+SELECT
+ '{{ cluster_id }}',
+ '{{ compute_node_group_configurations }}',
+ '{{ name }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -269,16 +269,15 @@ globals:
 resources:
   - name: queue
     props:
-      - name: ClusterId
-        value: '{{ ClusterId }}'
-      - name: ComputeNodeGroupConfigurations
+      - name: cluster_id
+        value: '{{ cluster_id }}'
+      - name: compute_node_group_configurations
         value:
-          - ComputeNodeGroupId: '{{ ComputeNodeGroupId }}'
-      - name: Name
-        value: '{{ Name }}'
-      - name: Tags
+          - compute_node_group_id: '{{ compute_node_group_id }}'
+      - name: name
+        value: '{{ name }}'
+      - name: tags
         value: {}
-
 ```
 </TabItem>
 </Tabs>
@@ -295,7 +294,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Arn>';
+AND Identifier = '{{ arn }}';
 ```
 
 
@@ -304,7 +303,7 @@ AND Identifier = '<Arn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.pcs.queues
-WHERE Identifier = '<Arn>'
+WHERE Identifier = '{{ arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/personalize/dataset_groups/index.md b/website/docs/services/personalize/dataset_groups/index.md
index 5faa0a11b..b7ec02639 100644
--- a/website/docs/services/personalize/dataset_groups/index.md
+++ b/website/docs/services/personalize/dataset_groups/index.md
@@ -152,7 +152,7 @@ kms_key_arn,
 role_arn,
 domain
 FROM awscc.personalize.dataset_groups
-WHERE region = 'us-east-1' AND Identifier = '<DatasetGroupArn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ dataset_group_arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -188,8 +188,8 @@ INSERT INTO awscc.personalize.dataset_groups (
  Name,
  region
 )
-SELECT 
-'{{ Name }}',
+SELECT
+'{{ name }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -204,11 +204,11 @@ INSERT INTO awscc.personalize.dataset_groups (
  Domain,
  region
 )
-SELECT 
- '{{ Name }}',
- '{{ KmsKeyArn }}',
- '{{ RoleArn }}',
- '{{ Domain }}',
+SELECT
+ '{{ name }}',
+ '{{ kms_key_arn }}',
+ '{{ role_arn }}',
+ '{{ domain }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -226,15 +226,14 @@ globals:
 resources:
   - name: dataset_group
     props:
-      - name: Name
-        value: '{{ Name }}'
-      - name: KmsKeyArn
-        value: '{{ KmsKeyArn }}'
-      - name: RoleArn
-        value: '{{ RoleArn }}'
-      - name: Domain
-        value: '{{ Domain }}'
-
+      - name: name
+        value: '{{ name }}'
+      - name: kms_key_arn
+        value: '{{ kms_key_arn }}'
+      - name: role_arn
+        value: '{{ role_arn }}'
+      - name: domain
+        value: '{{ domain }}'
 ```
 </TabItem>
 </Tabs>
@@ -245,7 +244,7 @@ resources:
 ```sql
 /*+ delete */
 DELETE FROM awscc.personalize.dataset_groups
-WHERE Identifier = '<DatasetGroupArn>'
+WHERE Identifier = '{{ dataset_group_arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/personalize/datasets/index.md b/website/docs/services/personalize/datasets/index.md
index c14da5cbd..90cae75c8 100644
--- a/website/docs/services/personalize/datasets/index.md
+++ b/website/docs/services/personalize/datasets/index.md
@@ -198,7 +198,7 @@ dataset_group_arn,
 schema_arn,
 dataset_import_job
 FROM awscc.personalize.datasets
-WHERE region = 'us-east-1' AND Identifier = '<DatasetArn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ dataset_arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -237,11 +237,11 @@ INSERT INTO awscc.personalize.datasets (
  SchemaArn,
  region
 )
-SELECT 
-'{{ Name }}',
- '{{ DatasetType }}',
- '{{ DatasetGroupArn }}',
- '{{ SchemaArn }}',
+SELECT
+'{{ name }}',
+ '{{ dataset_type }}',
+ '{{ dataset_group_arn }}',
+ '{{ schema_arn }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -257,12 +257,12 @@ INSERT INTO awscc.personalize.datasets (
  DatasetImportJob,
  region
 )
-SELECT 
- '{{ Name }}',
- '{{ DatasetType }}',
- '{{ DatasetGroupArn }}',
- '{{ SchemaArn }}',
- '{{ DatasetImportJob }}',
+SELECT
+ '{{ name }}',
+ '{{ dataset_type }}',
+ '{{ dataset_group_arn }}',
+ '{{ schema_arn }}',
+ '{{ dataset_import_job }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -280,23 +280,22 @@ globals:
 resources:
   - name: dataset
     props:
-      - name: Name
-        value: '{{ Name }}'
-      - name: DatasetType
-        value: '{{ DatasetType }}'
-      - name: DatasetGroupArn
-        value: '{{ DatasetGroupArn }}'
-      - name: SchemaArn
-        value: '{{ SchemaArn }}'
-      - name: DatasetImportJob
+      - name: name
+        value: '{{ name }}'
+      - name: dataset_type
+        value: '{{ dataset_type }}'
+      - name: dataset_group_arn
+        value: '{{ dataset_group_arn }}'
+      - name: schema_arn
+        value: '{{ schema_arn }}'
+      - name: dataset_import_job
         value:
-          JobName: '{{ JobName }}'
-          DatasetImportJobArn: '{{ DatasetImportJobArn }}'
-          DatasetArn: '{{ DatasetArn }}'
-          DataSource:
-            DataLocation: '{{ DataLocation }}'
-          RoleArn: '{{ RoleArn }}'
-
+          job_name: '{{ job_name }}'
+          dataset_import_job_arn: '{{ dataset_import_job_arn }}'
+          dataset_arn: '{{ dataset_arn }}'
+          data_source:
+            data_location: '{{ data_location }}'
+          role_arn: '{{ role_arn }}'
 ```
 </TabItem>
 </Tabs>
@@ -312,7 +311,7 @@ SET PatchDocument = string('{{ {
     "DatasetImportJob": dataset_import_job
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<DatasetArn>';
+AND Identifier = '{{ dataset_arn }}';
 ```
 
 
@@ -321,7 +320,7 @@ AND Identifier = '<DatasetArn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.personalize.datasets
-WHERE Identifier = '<DatasetArn>'
+WHERE Identifier = '{{ dataset_arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/personalize/schemata/index.md b/website/docs/services/personalize/schemata/index.md
index aa2b3b12e..379bcbd8b 100644
--- a/website/docs/services/personalize/schemata/index.md
+++ b/website/docs/services/personalize/schemata/index.md
@@ -151,7 +151,7 @@ schema_arn,
 schema,
 domain
 FROM awscc.personalize.schemata
-WHERE region = 'us-east-1' AND Identifier = '<SchemaArn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ schema_arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -188,9 +188,9 @@ INSERT INTO awscc.personalize.schemata (
  Schema,
  region
 )
-SELECT 
-'{{ Name }}',
- '{{ Schema }}',
+SELECT
+'{{ name }}',
+ '{{ schema }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -204,10 +204,10 @@ INSERT INTO awscc.personalize.schemata (
  Domain,
  region
 )
-SELECT 
- '{{ Name }}',
- '{{ Schema }}',
- '{{ Domain }}',
+SELECT
+ '{{ name }}',
+ '{{ schema }}',
+ '{{ domain }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -225,13 +225,12 @@ globals:
 resources:
   - name: schema
     props:
-      - name: Name
-        value: '{{ Name }}'
-      - name: Schema
-        value: '{{ Schema }}'
-      - name: Domain
-        value: '{{ Domain }}'
-
+      - name: name
+        value: '{{ name }}'
+      - name: schema
+        value: '{{ schema }}'
+      - name: domain
+        value: '{{ domain }}'
 ```
 </TabItem>
 </Tabs>
@@ -242,7 +241,7 @@ resources:
 ```sql
 /*+ delete */
 DELETE FROM awscc.personalize.schemata
-WHERE Identifier = '<SchemaArn>'
+WHERE Identifier = '{{ schema_arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/personalize/solutions/index.md b/website/docs/services/personalize/solutions/index.md
index d81e4915b..a030f0eb7 100644
--- a/website/docs/services/personalize/solutions/index.md
+++ b/website/docs/services/personalize/solutions/index.md
@@ -272,7 +272,7 @@ perform_hpo,
 recipe_arn,
 solution_config
 FROM awscc.personalize.solutions
-WHERE region = 'us-east-1' AND Identifier = '<SolutionArn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ solution_arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -309,9 +309,9 @@ INSERT INTO awscc.personalize.solutions (
  DatasetGroupArn,
  region
 )
-SELECT 
-'{{ Name }}',
- '{{ DatasetGroupArn }}',
+SELECT
+'{{ name }}',
+ '{{ dataset_group_arn }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -329,14 +329,14 @@ INSERT INTO awscc.personalize.solutions (
  SolutionConfig,
  region
 )
-SELECT 
- '{{ Name }}',
- '{{ EventType }}',
- '{{ DatasetGroupArn }}',
- '{{ PerformAutoML }}',
- '{{ PerformHPO }}',
- '{{ RecipeArn }}',
- '{{ SolutionConfig }}',
+SELECT
+ '{{ name }}',
+ '{{ event_type }}',
+ '{{ dataset_group_arn }}',
+ '{{ perform_auto_ml }}',
+ '{{ perform_hpo }}',
+ '{{ recipe_arn }}',
+ '{{ solution_config }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -354,49 +354,48 @@ globals:
 resources:
   - name: solution
     props:
-      - name: Name
-        value: '{{ Name }}'
-      - name: EventType
-        value: '{{ EventType }}'
-      - name: DatasetGroupArn
-        value: '{{ DatasetGroupArn }}'
-      - name: PerformAutoML
-        value: '{{ PerformAutoML }}'
-      - name: PerformHPO
-        value: '{{ PerformHPO }}'
-      - name: RecipeArn
-        value: '{{ RecipeArn }}'
-      - name: SolutionConfig
+      - name: name
+        value: '{{ name }}'
+      - name: event_type
+        value: '{{ event_type }}'
+      - name: dataset_group_arn
+        value: '{{ dataset_group_arn }}'
+      - name: perform_auto_ml
+        value: '{{ perform_auto_ml }}'
+      - name: perform_hpo
+        value: '{{ perform_hpo }}'
+      - name: recipe_arn
+        value: '{{ recipe_arn }}'
+      - name: solution_config
         value:
-          AlgorithmHyperParameters: {}
-          AutoMLConfig:
-            MetricName: '{{ MetricName }}'
-            RecipeList:
-              - '{{ RecipeList[0] }}'
-          EventValueThreshold: '{{ EventValueThreshold }}'
-          FeatureTransformationParameters: {}
-          HpoConfig:
-            AlgorithmHyperParameterRanges:
-              CategoricalHyperParameterRanges:
-                - Name: '{{ Name }}'
-                  Values:
-                    - '{{ Values[0] }}'
-              ContinuousHyperParameterRanges:
-                - Name: '{{ Name }}'
-                  MinValue: null
-                  MaxValue: null
-              IntegerHyperParameterRanges:
-                - Name: '{{ Name }}'
-                  MinValue: '{{ MinValue }}'
-                  MaxValue: '{{ MaxValue }}'
-            HpoObjective:
-              MetricName: '{{ MetricName }}'
-              Type: '{{ Type }}'
-              MetricRegex: '{{ MetricRegex }}'
-            HpoResourceConfig:
-              MaxNumberOfTrainingJobs: '{{ MaxNumberOfTrainingJobs }}'
-              MaxParallelTrainingJobs: '{{ MaxParallelTrainingJobs }}'
-
+          algorithm_hyper_parameters: {}
+          auto_ml_config:
+            metric_name: '{{ metric_name }}'
+            recipe_list:
+              - '{{ recipe_list[0] }}'
+          event_value_threshold: '{{ event_value_threshold }}'
+          feature_transformation_parameters: {}
+          hpo_config:
+            algorithm_hyper_parameter_ranges:
+              categorical_hyper_parameter_ranges:
+                - name: '{{ name }}'
+                  values:
+                    - '{{ values[0] }}'
+              continuous_hyper_parameter_ranges:
+                - name: '{{ name }}'
+                  min_value: null
+                  max_value: null
+              integer_hyper_parameter_ranges:
+                - name: '{{ name }}'
+                  min_value: '{{ min_value }}'
+                  max_value: '{{ max_value }}'
+            hpo_objective:
+              metric_name: '{{ metric_name }}'
+              type: '{{ type }}'
+              metric_regex: '{{ metric_regex }}'
+            hpo_resource_config:
+              max_number_of_training_jobs: '{{ max_number_of_training_jobs }}'
+              max_parallel_training_jobs: '{{ max_parallel_training_jobs }}'
 ```
 </TabItem>
 </Tabs>
@@ -407,7 +406,7 @@ resources:
 ```sql
 /*+ delete */
 DELETE FROM awscc.personalize.solutions
-WHERE Identifier = '<SolutionArn>'
+WHERE Identifier = '{{ solution_arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/pinpoint/in_app_templates/index.md b/website/docs/services/pinpoint/in_app_templates/index.md
index 9e760f1b2..99253eb0f 100644
--- a/website/docs/services/pinpoint/in_app_templates/index.md
+++ b/website/docs/services/pinpoint/in_app_templates/index.md
@@ -287,7 +287,7 @@ tags,
 template_description,
 template_name
 FROM awscc.pinpoint.in_app_templates
-WHERE region = 'us-east-1' AND Identifier = '<TemplateName>';
+WHERE region = 'us-east-1' AND Identifier = '{{ template_name }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -323,8 +323,8 @@ INSERT INTO awscc.pinpoint.in_app_templates (
  TemplateName,
  region
 )
-SELECT 
-'{{ TemplateName }}',
+SELECT
+'{{ template_name }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -341,13 +341,13 @@ INSERT INTO awscc.pinpoint.in_app_templates (
  TemplateName,
  region
 )
-SELECT 
- '{{ Content }}',
- '{{ CustomConfig }}',
- '{{ Layout }}',
- '{{ Tags }}',
- '{{ TemplateDescription }}',
- '{{ TemplateName }}',
+SELECT
+ '{{ content }}',
+ '{{ custom_config }}',
+ '{{ layout }}',
+ '{{ tags }}',
+ '{{ template_description }}',
+ '{{ template_name }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -365,43 +365,42 @@ globals:
 resources:
   - name: in_app_template
     props:
-      - name: Content
+      - name: content
         value:
-          - BackgroundColor: '{{ BackgroundColor }}'
-            BodyConfig:
-              Alignment: '{{ Alignment }}'
-              Body: '{{ Body }}'
-              TextColor: '{{ TextColor }}'
-            HeaderConfig:
-              Alignment: null
-              Header: '{{ Header }}'
-              TextColor: '{{ TextColor }}'
-            ImageUrl: '{{ ImageUrl }}'
-            PrimaryBtn:
-              Android:
-                ButtonAction: '{{ ButtonAction }}'
-                Link: '{{ Link }}'
-              DefaultConfig:
-                BackgroundColor: '{{ BackgroundColor }}'
-                BorderRadius: '{{ BorderRadius }}'
-                ButtonAction: null
-                Link: '{{ Link }}'
-                Text: '{{ Text }}'
-                TextColor: '{{ TextColor }}'
-              IOS: null
-              Web: null
-            SecondaryBtn: null
-      - name: CustomConfig
+          - background_color: '{{ background_color }}'
+            body_config:
+              alignment: '{{ alignment }}'
+              body: '{{ body }}'
+              text_color: '{{ text_color }}'
+            header_config:
+              alignment: null
+              header: '{{ header }}'
+              text_color: '{{ text_color }}'
+            image_url: '{{ image_url }}'
+            primary_btn:
+              android:
+                button_action: '{{ button_action }}'
+                link: '{{ link }}'
+              default_config:
+                background_color: '{{ background_color }}'
+                border_radius: '{{ border_radius }}'
+                button_action: null
+                link: '{{ link }}'
+                text: '{{ text }}'
+                text_color: '{{ text_color }}'
+              i_os: null
+              web: null
+            secondary_btn: null
+      - name: custom_config
         value: {}
-      - name: Layout
-        value: '{{ Layout }}'
-      - name: Tags
+      - name: layout
+        value: '{{ layout }}'
+      - name: tags
         value: {}
-      - name: TemplateDescription
-        value: '{{ TemplateDescription }}'
-      - name: TemplateName
-        value: '{{ TemplateName }}'
-
+      - name: template_description
+        value: '{{ template_description }}'
+      - name: template_name
+        value: '{{ template_name }}'
 ```
 </TabItem>
 </Tabs>
@@ -421,7 +420,7 @@ SET PatchDocument = string('{{ {
     "TemplateDescription": template_description
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<TemplateName>';
+AND Identifier = '{{ template_name }}';
 ```
 
 
@@ -430,7 +429,7 @@ AND Identifier = '<TemplateName>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.pinpoint.in_app_templates
-WHERE Identifier = '<TemplateName>'
+WHERE Identifier = '{{ template_name }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/pipes/pipes/index.md b/website/docs/services/pipes/pipes/index.md
index 82ce71bcd..502f94a17 100644
--- a/website/docs/services/pipes/pipes/index.md
+++ b/website/docs/services/pipes/pipes/index.md
@@ -1193,7 +1193,7 @@ tags,
 target,
 target_parameters
 FROM awscc.pipes.pipes
-WHERE region = 'us-east-1' AND Identifier = '<Name>';
+WHERE region = 'us-east-1' AND Identifier = '{{ name }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -1231,10 +1231,10 @@ INSERT INTO awscc.pipes.pipes (
  Target,
  region
 )
-SELECT 
-'{{ RoleArn }}',
- '{{ Source }}',
- '{{ Target }}',
+SELECT
+'{{ role_arn }}',
+ '{{ source }}',
+ '{{ target }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -1258,20 +1258,20 @@ INSERT INTO awscc.pipes.pipes (
  TargetParameters,
  region
 )
-SELECT 
- '{{ Description }}',
- '{{ DesiredState }}',
- '{{ Enrichment }}',
- '{{ EnrichmentParameters }}',
- '{{ KmsKeyIdentifier }}',
- '{{ LogConfiguration }}',
- '{{ Name }}',
- '{{ RoleArn }}',
- '{{ Source }}',
- '{{ SourceParameters }}',
- '{{ Tags }}',
- '{{ Target }}',
- '{{ TargetParameters }}',
+SELECT
+ '{{ description }}',
+ '{{ desired_state }}',
+ '{{ enrichment }}',
+ '{{ enrichment_parameters }}',
+ '{{ kms_key_identifier }}',
+ '{{ log_configuration }}',
+ '{{ name }}',
+ '{{ role_arn }}',
+ '{{ source }}',
+ '{{ source_parameters }}',
+ '{{ tags }}',
+ '{{ target }}',
+ '{{ target_parameters }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -1289,244 +1289,243 @@ globals:
 resources:
   - name: pipe
     props:
-      - name: Description
-        value: '{{ Description }}'
-      - name: DesiredState
-        value: '{{ DesiredState }}'
-      - name: Enrichment
-        value: '{{ Enrichment }}'
-      - name: EnrichmentParameters
+      - name: description
+        value: '{{ description }}'
+      - name: desired_state
+        value: '{{ desired_state }}'
+      - name: enrichment
+        value: '{{ enrichment }}'
+      - name: enrichment_parameters
         value:
-          InputTemplate: '{{ InputTemplate }}'
-          HttpParameters:
-            PathParameterValues:
-              - '{{ PathParameterValues[0] }}'
-            HeaderParameters: {}
-            QueryStringParameters: {}
-      - name: KmsKeyIdentifier
-        value: '{{ KmsKeyIdentifier }}'
-      - name: LogConfiguration
+          input_template: '{{ input_template }}'
+          http_parameters:
+            path_parameter_values:
+              - '{{ path_parameter_values[0] }}'
+            header_parameters: {}
+            query_string_parameters: {}
+      - name: kms_key_identifier
+        value: '{{ kms_key_identifier }}'
+      - name: log_configuration
         value:
-          S3LogDestination:
-            BucketName: '{{ BucketName }}'
-            Prefix: '{{ Prefix }}'
-            BucketOwner: '{{ BucketOwner }}'
-            OutputFormat: '{{ OutputFormat }}'
-          FirehoseLogDestination:
-            DeliveryStreamArn: '{{ DeliveryStreamArn }}'
-          CloudwatchLogsLogDestination:
-            LogGroupArn: '{{ LogGroupArn }}'
-          Level: '{{ Level }}'
-          IncludeExecutionData:
-            - '{{ IncludeExecutionData[0] }}'
-      - name: Name
-        value: '{{ Name }}'
-      - name: RoleArn
-        value: '{{ RoleArn }}'
-      - name: Source
-        value: '{{ Source }}'
-      - name: SourceParameters
+          s3_log_destination:
+            bucket_name: '{{ bucket_name }}'
+            prefix: '{{ prefix }}'
+            bucket_owner: '{{ bucket_owner }}'
+            output_format: '{{ output_format }}'
+          firehose_log_destination:
+            delivery_stream_arn: '{{ delivery_stream_arn }}'
+          cloudwatch_logs_log_destination:
+            log_group_arn: '{{ log_group_arn }}'
+          level: '{{ level }}'
+          include_execution_data:
+            - '{{ include_execution_data[0] }}'
+      - name: name
+        value: '{{ name }}'
+      - name: role_arn
+        value: '{{ role_arn }}'
+      - name: source
+        value: '{{ source }}'
+      - name: source_parameters
         value:
-          FilterCriteria:
-            Filters:
-              - Pattern: '{{ Pattern }}'
-          KinesisStreamParameters:
-            BatchSize: '{{ BatchSize }}'
-            DeadLetterConfig:
-              Arn: '{{ Arn }}'
-            OnPartialBatchItemFailure: '{{ OnPartialBatchItemFailure }}'
-            MaximumBatchingWindowInSeconds: '{{ MaximumBatchingWindowInSeconds }}'
-            MaximumRecordAgeInSeconds: '{{ MaximumRecordAgeInSeconds }}'
-            MaximumRetryAttempts: '{{ MaximumRetryAttempts }}'
-            ParallelizationFactor: '{{ ParallelizationFactor }}'
-            StartingPosition: '{{ StartingPosition }}'
-            StartingPositionTimestamp: '{{ StartingPositionTimestamp }}'
-          DynamoDBStreamParameters:
-            BatchSize: '{{ BatchSize }}'
-            DeadLetterConfig: null
-            OnPartialBatchItemFailure: null
-            MaximumBatchingWindowInSeconds: '{{ MaximumBatchingWindowInSeconds }}'
-            MaximumRecordAgeInSeconds: '{{ MaximumRecordAgeInSeconds }}'
-            MaximumRetryAttempts: '{{ MaximumRetryAttempts }}'
-            ParallelizationFactor: '{{ ParallelizationFactor }}'
-            StartingPosition: '{{ StartingPosition }}'
-          SqsQueueParameters:
-            BatchSize: '{{ BatchSize }}'
-            MaximumBatchingWindowInSeconds: '{{ MaximumBatchingWindowInSeconds }}'
-          ActiveMQBrokerParameters:
-            Credentials: null
-            QueueName: '{{ QueueName }}'
-            BatchSize: '{{ BatchSize }}'
-            MaximumBatchingWindowInSeconds: '{{ MaximumBatchingWindowInSeconds }}'
-          RabbitMQBrokerParameters:
-            Credentials: null
-            QueueName: '{{ QueueName }}'
-            VirtualHost: '{{ VirtualHost }}'
-            BatchSize: '{{ BatchSize }}'
-            MaximumBatchingWindowInSeconds: '{{ MaximumBatchingWindowInSeconds }}'
-          ManagedStreamingKafkaParameters:
-            TopicName: '{{ TopicName }}'
-            StartingPosition: '{{ StartingPosition }}'
-            BatchSize: '{{ BatchSize }}'
-            MaximumBatchingWindowInSeconds: '{{ MaximumBatchingWindowInSeconds }}'
-            ConsumerGroupID: '{{ ConsumerGroupID }}'
-            Credentials: null
-          SelfManagedKafkaParameters:
-            TopicName: '{{ TopicName }}'
-            StartingPosition: '{{ StartingPosition }}'
-            AdditionalBootstrapServers:
-              - '{{ AdditionalBootstrapServers[0] }}'
-            BatchSize: '{{ BatchSize }}'
-            MaximumBatchingWindowInSeconds: '{{ MaximumBatchingWindowInSeconds }}'
-            ConsumerGroupID: '{{ ConsumerGroupID }}'
-            Credentials: null
-            ServerRootCaCertificate: '{{ ServerRootCaCertificate }}'
-            Vpc:
-              Subnets:
-                - '{{ Subnets[0] }}'
-              SecurityGroup:
-                - '{{ SecurityGroup[0] }}'
-      - name: Tags
+          filter_criteria:
+            filters:
+              - pattern: '{{ pattern }}'
+          kinesis_stream_parameters:
+            batch_size: '{{ batch_size }}'
+            dead_letter_config:
+              arn: '{{ arn }}'
+            on_partial_batch_item_failure: '{{ on_partial_batch_item_failure }}'
+            maximum_batching_window_in_seconds: '{{ maximum_batching_window_in_seconds }}'
+            maximum_record_age_in_seconds: '{{ maximum_record_age_in_seconds }}'
+            maximum_retry_attempts: '{{ maximum_retry_attempts }}'
+            parallelization_factor: '{{ parallelization_factor }}'
+            starting_position: '{{ starting_position }}'
+            starting_position_timestamp: '{{ starting_position_timestamp }}'
+          dynamo_db_stream_parameters:
+            batch_size: '{{ batch_size }}'
+            dead_letter_config: null
+            on_partial_batch_item_failure: null
+            maximum_batching_window_in_seconds: '{{ maximum_batching_window_in_seconds }}'
+            maximum_record_age_in_seconds: '{{ maximum_record_age_in_seconds }}'
+            maximum_retry_attempts: '{{ maximum_retry_attempts }}'
+            parallelization_factor: '{{ parallelization_factor }}'
+            starting_position: '{{ starting_position }}'
+          sqs_queue_parameters:
+            batch_size: '{{ batch_size }}'
+            maximum_batching_window_in_seconds: '{{ maximum_batching_window_in_seconds }}'
+          active_mq_broker_parameters:
+            credentials: null
+            queue_name: '{{ queue_name }}'
+            batch_size: '{{ batch_size }}'
+            maximum_batching_window_in_seconds: '{{ maximum_batching_window_in_seconds }}'
+          rabbit_mq_broker_parameters:
+            credentials: null
+            queue_name: '{{ queue_name }}'
+            virtual_host: '{{ virtual_host }}'
+            batch_size: '{{ batch_size }}'
+            maximum_batching_window_in_seconds: '{{ maximum_batching_window_in_seconds }}'
+          managed_streaming_kafka_parameters:
+            topic_name: '{{ topic_name }}'
+            starting_position: '{{ starting_position }}'
+            batch_size: '{{ batch_size }}'
+            maximum_batching_window_in_seconds: '{{ maximum_batching_window_in_seconds }}'
+            consumer_group_id: '{{ consumer_group_id }}'
+            credentials: null
+          self_managed_kafka_parameters:
+            topic_name: '{{ topic_name }}'
+            starting_position: '{{ starting_position }}'
+            additional_bootstrap_servers:
+              - '{{ additional_bootstrap_servers[0] }}'
+            batch_size: '{{ batch_size }}'
+            maximum_batching_window_in_seconds: '{{ maximum_batching_window_in_seconds }}'
+            consumer_group_id: '{{ consumer_group_id }}'
+            credentials: null
+            server_root_ca_certificate: '{{ server_root_ca_certificate }}'
+            vpc:
+              subnets:
+                - '{{ subnets[0] }}'
+              security_group:
+                - '{{ security_group[0] }}'
+      - name: tags
         value: {}
-      - name: Target
-        value: '{{ Target }}'
-      - name: TargetParameters
+      - name: target
+        value: '{{ target }}'
+      - name: target_parameters
         value:
-          InputTemplate: '{{ InputTemplate }}'
-          LambdaFunctionParameters:
-            InvocationType: '{{ InvocationType }}'
-          StepFunctionStateMachineParameters:
-            InvocationType: null
-          KinesisStreamParameters:
-            PartitionKey: '{{ PartitionKey }}'
-          EcsTaskParameters:
-            TaskDefinitionArn: '{{ TaskDefinitionArn }}'
-            TaskCount: '{{ TaskCount }}'
-            LaunchType: '{{ LaunchType }}'
-            NetworkConfiguration:
-              AwsvpcConfiguration:
-                Subnets:
-                  - '{{ Subnets[0] }}'
-                SecurityGroups:
-                  - '{{ SecurityGroups[0] }}'
-                AssignPublicIp: '{{ AssignPublicIp }}'
-            PlatformVersion: '{{ PlatformVersion }}'
-            Group: '{{ Group }}'
-            CapacityProviderStrategy:
-              - CapacityProvider: '{{ CapacityProvider }}'
-                Weight: '{{ Weight }}'
-                Base: '{{ Base }}'
-            EnableECSManagedTags: '{{ EnableECSManagedTags }}'
-            EnableExecuteCommand: '{{ EnableExecuteCommand }}'
-            PlacementConstraints:
-              - Type: '{{ Type }}'
-                Expression: '{{ Expression }}'
-            PlacementStrategy:
-              - Type: '{{ Type }}'
-                Field: '{{ Field }}'
-            PropagateTags: '{{ PropagateTags }}'
-            ReferenceId: '{{ ReferenceId }}'
-            Overrides:
-              ContainerOverrides:
-                - Command:
-                    - '{{ Command[0] }}'
-                  Cpu: '{{ Cpu }}'
-                  Environment:
-                    - Name: '{{ Name }}'
-                      Value: '{{ Value }}'
-                  EnvironmentFiles:
-                    - Type: '{{ Type }}'
-                      Value: '{{ Value }}'
-                  Memory: '{{ Memory }}'
-                  MemoryReservation: '{{ MemoryReservation }}'
-                  Name: '{{ Name }}'
-                  ResourceRequirements:
-                    - Type: '{{ Type }}'
-                      Value: '{{ Value }}'
-              Cpu: '{{ Cpu }}'
-              EphemeralStorage:
-                SizeInGiB: '{{ SizeInGiB }}'
-              ExecutionRoleArn: '{{ ExecutionRoleArn }}'
-              InferenceAcceleratorOverrides:
-                - DeviceName: '{{ DeviceName }}'
-                  DeviceType: '{{ DeviceType }}'
-              Memory: '{{ Memory }}'
-              TaskRoleArn: '{{ TaskRoleArn }}'
-            Tags:
-              - Key: '{{ Key }}'
-                Value: '{{ Value }}'
-          BatchJobParameters:
-            JobDefinition: '{{ JobDefinition }}'
-            JobName: '{{ JobName }}'
-            ArrayProperties:
-              Size: '{{ Size }}'
-            RetryStrategy:
-              Attempts: '{{ Attempts }}'
-            ContainerOverrides:
-              Command:
-                - '{{ Command[0] }}'
-              Environment:
-                - Name: '{{ Name }}'
-                  Value: '{{ Value }}'
-              InstanceType: '{{ InstanceType }}'
-              ResourceRequirements:
-                - Type: '{{ Type }}'
-                  Value: '{{ Value }}'
-            DependsOn:
-              - JobId: '{{ JobId }}'
-                Type: '{{ Type }}'
-            Parameters: {}
-          SqsQueueParameters:
-            MessageGroupId: '{{ MessageGroupId }}'
-            MessageDeduplicationId: '{{ MessageDeduplicationId }}'
-          HttpParameters:
-            PathParameterValues:
-              - '{{ PathParameterValues[0] }}'
-            HeaderParameters: null
-            QueryStringParameters: null
-          RedshiftDataParameters:
-            SecretManagerArn: '{{ SecretManagerArn }}'
-            Database: '{{ Database }}'
-            DbUser: '{{ DbUser }}'
-            StatementName: '{{ StatementName }}'
-            WithEvent: '{{ WithEvent }}'
-            Sqls:
-              - '{{ Sqls[0] }}'
-          SageMakerPipelineParameters:
-            PipelineParameterList:
-              - Name: '{{ Name }}'
-                Value: '{{ Value }}'
-          EventBridgeEventBusParameters:
-            EndpointId: '{{ EndpointId }}'
-            DetailType: '{{ DetailType }}'
-            Source: '{{ Source }}'
-            Resources:
-              - '{{ Resources[0] }}'
-            Time: '{{ Time }}'
-          CloudWatchLogsParameters:
-            LogStreamName: '{{ LogStreamName }}'
-            Timestamp: '{{ Timestamp }}'
-          TimestreamParameters:
-            TimeValue: '{{ TimeValue }}'
-            EpochTimeUnit: '{{ EpochTimeUnit }}'
-            TimeFieldType: '{{ TimeFieldType }}'
-            TimestampFormat: '{{ TimestampFormat }}'
-            VersionValue: '{{ VersionValue }}'
-            DimensionMappings:
-              - DimensionValue: '{{ DimensionValue }}'
-                DimensionValueType: '{{ DimensionValueType }}'
-                DimensionName: '{{ DimensionName }}'
-            SingleMeasureMappings:
-              - MeasureValue: '{{ MeasureValue }}'
-                MeasureValueType: '{{ MeasureValueType }}'
-                MeasureName: '{{ MeasureName }}'
-            MultiMeasureMappings:
-              - MultiMeasureName: '{{ MultiMeasureName }}'
-                MultiMeasureAttributeMappings:
-                  - MeasureValue: '{{ MeasureValue }}'
-                    MeasureValueType: null
-                    MultiMeasureAttributeName: '{{ MultiMeasureAttributeName }}'
-
+          input_template: '{{ input_template }}'
+          lambda_function_parameters:
+            invocation_type: '{{ invocation_type }}'
+          step_function_state_machine_parameters:
+            invocation_type: null
+          kinesis_stream_parameters:
+            partition_key: '{{ partition_key }}'
+          ecs_task_parameters:
+            task_definition_arn: '{{ task_definition_arn }}'
+            task_count: '{{ task_count }}'
+            launch_type: '{{ launch_type }}'
+            network_configuration:
+              awsvpc_configuration:
+                subnets:
+                  - '{{ subnets[0] }}'
+                security_groups:
+                  - '{{ security_groups[0] }}'
+                assign_public_ip: '{{ assign_public_ip }}'
+            platform_version: '{{ platform_version }}'
+            group: '{{ group }}'
+            capacity_provider_strategy:
+              - capacity_provider: '{{ capacity_provider }}'
+                weight: '{{ weight }}'
+                base: '{{ base }}'
+            enable_ecs_managed_tags: '{{ enable_ecs_managed_tags }}'
+            enable_execute_command: '{{ enable_execute_command }}'
+            placement_constraints:
+              - type: '{{ type }}'
+                expression: '{{ expression }}'
+            placement_strategy:
+              - type: '{{ type }}'
+                field: '{{ field }}'
+            propagate_tags: '{{ propagate_tags }}'
+            reference_id: '{{ reference_id }}'
+            overrides:
+              container_overrides:
+                - command:
+                    - '{{ command[0] }}'
+                  cpu: '{{ cpu }}'
+                  environment:
+                    - name: '{{ name }}'
+                      value: '{{ value }}'
+                  environment_files:
+                    - type: '{{ type }}'
+                      value: '{{ value }}'
+                  memory: '{{ memory }}'
+                  memory_reservation: '{{ memory_reservation }}'
+                  name: '{{ name }}'
+                  resource_requirements:
+                    - type: '{{ type }}'
+                      value: '{{ value }}'
+              cpu: '{{ cpu }}'
+              ephemeral_storage:
+                size_in_gi_b: '{{ size_in_gi_b }}'
+              execution_role_arn: '{{ execution_role_arn }}'
+              inference_accelerator_overrides:
+                - device_name: '{{ device_name }}'
+                  device_type: '{{ device_type }}'
+              memory: '{{ memory }}'
+              task_role_arn: '{{ task_role_arn }}'
+            tags:
+              - key: '{{ key }}'
+                value: '{{ value }}'
+          batch_job_parameters:
+            job_definition: '{{ job_definition }}'
+            job_name: '{{ job_name }}'
+            array_properties:
+              size: '{{ size }}'
+            retry_strategy:
+              attempts: '{{ attempts }}'
+            container_overrides:
+              command:
+                - '{{ command[0] }}'
+              environment:
+                - name: '{{ name }}'
+                  value: '{{ value }}'
+              instance_type: '{{ instance_type }}'
+              resource_requirements:
+                - type: '{{ type }}'
+                  value: '{{ value }}'
+            depends_on:
+              - job_id: '{{ job_id }}'
+                type: '{{ type }}'
+            parameters: {}
+          sqs_queue_parameters:
+            message_group_id: '{{ message_group_id }}'
+            message_deduplication_id: '{{ message_deduplication_id }}'
+          http_parameters:
+            path_parameter_values:
+              - '{{ path_parameter_values[0] }}'
+            header_parameters: null
+            query_string_parameters: null
+          redshift_data_parameters:
+            secret_manager_arn: '{{ secret_manager_arn }}'
+            database: '{{ database }}'
+            db_user: '{{ db_user }}'
+            statement_name: '{{ statement_name }}'
+            with_event: '{{ with_event }}'
+            sqls:
+              - '{{ sqls[0] }}'
+          sage_maker_pipeline_parameters:
+            pipeline_parameter_list:
+              - name: '{{ name }}'
+                value: '{{ value }}'
+          event_bridge_event_bus_parameters:
+            endpoint_id: '{{ endpoint_id }}'
+            detail_type: '{{ detail_type }}'
+            source: '{{ source }}'
+            resources:
+              - '{{ resources[0] }}'
+            time: '{{ time }}'
+          cloud_watch_logs_parameters:
+            log_stream_name: '{{ log_stream_name }}'
+            timestamp: '{{ timestamp }}'
+          timestream_parameters:
+            time_value: '{{ time_value }}'
+            epoch_time_unit: '{{ epoch_time_unit }}'
+            time_field_type: '{{ time_field_type }}'
+            timestamp_format: '{{ timestamp_format }}'
+            version_value: '{{ version_value }}'
+            dimension_mappings:
+              - dimension_value: '{{ dimension_value }}'
+                dimension_value_type: '{{ dimension_value_type }}'
+                dimension_name: '{{ dimension_name }}'
+            single_measure_mappings:
+              - measure_value: '{{ measure_value }}'
+                measure_value_type: '{{ measure_value_type }}'
+                measure_name: '{{ measure_name }}'
+            multi_measure_mappings:
+              - multi_measure_name: '{{ multi_measure_name }}'
+                multi_measure_attribute_mappings:
+                  - measure_value: '{{ measure_value }}'
+                    measure_value_type: null
+                    multi_measure_attribute_name: '{{ multi_measure_attribute_name }}'
 ```
 </TabItem>
 </Tabs>
@@ -1551,7 +1550,7 @@ SET PatchDocument = string('{{ {
     "TargetParameters": target_parameters
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Name>';
+AND Identifier = '{{ name }}';
 ```
 
 
@@ -1560,7 +1559,7 @@ AND Identifier = '<Name>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.pipes.pipes
-WHERE Identifier = '<Name>'
+WHERE Identifier = '{{ name }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/proton/environment_account_connections/index.md b/website/docs/services/proton/environment_account_connections/index.md
index d45129f64..7ae733971 100644
--- a/website/docs/services/proton/environment_account_connections/index.md
+++ b/website/docs/services/proton/environment_account_connections/index.md
@@ -200,7 +200,7 @@ role_arn,
 status,
 tags
 FROM awscc.proton.environment_account_connections
-WHERE region = 'us-east-1' AND Identifier = '<Arn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -242,14 +242,14 @@ INSERT INTO awscc.proton.environment_account_connections (
  Tags,
  region
 )
-SELECT 
-'{{ CodebuildRoleArn }}',
- '{{ ComponentRoleArn }}',
- '{{ EnvironmentAccountId }}',
- '{{ EnvironmentName }}',
- '{{ ManagementAccountId }}',
- '{{ RoleArn }}',
- '{{ Tags }}',
+SELECT
+'{{ codebuild_role_arn }}',
+ '{{ component_role_arn }}',
+ '{{ environment_account_id }}',
+ '{{ environment_name }}',
+ '{{ management_account_id }}',
+ '{{ role_arn }}',
+ '{{ tags }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -267,14 +267,14 @@ INSERT INTO awscc.proton.environment_account_connections (
  Tags,
  region
 )
-SELECT 
- '{{ CodebuildRoleArn }}',
- '{{ ComponentRoleArn }}',
- '{{ EnvironmentAccountId }}',
- '{{ EnvironmentName }}',
- '{{ ManagementAccountId }}',
- '{{ RoleArn }}',
- '{{ Tags }}',
+SELECT
+ '{{ codebuild_role_arn }}',
+ '{{ component_role_arn }}',
+ '{{ environment_account_id }}',
+ '{{ environment_name }}',
+ '{{ management_account_id }}',
+ '{{ role_arn }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -292,23 +292,22 @@ globals:
 resources:
   - name: environment_account_connection
     props:
-      - name: CodebuildRoleArn
-        value: '{{ CodebuildRoleArn }}'
-      - name: ComponentRoleArn
-        value: '{{ ComponentRoleArn }}'
-      - name: EnvironmentAccountId
-        value: '{{ EnvironmentAccountId }}'
-      - name: EnvironmentName
-        value: '{{ EnvironmentName }}'
-      - name: ManagementAccountId
-        value: '{{ ManagementAccountId }}'
-      - name: RoleArn
-        value: '{{ RoleArn }}'
-      - name: Tags
+      - name: codebuild_role_arn
+        value: '{{ codebuild_role_arn }}'
+      - name: component_role_arn
+        value: '{{ component_role_arn }}'
+      - name: environment_account_id
+        value: '{{ environment_account_id }}'
+      - name: environment_name
+        value: '{{ environment_name }}'
+      - name: management_account_id
+        value: '{{ management_account_id }}'
+      - name: role_arn
+        value: '{{ role_arn }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -330,7 +329,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Arn>';
+AND Identifier = '{{ arn }}';
 ```
 
 
@@ -339,7 +338,7 @@ AND Identifier = '<Arn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.proton.environment_account_connections
-WHERE Identifier = '<Arn>'
+WHERE Identifier = '{{ arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/proton/environment_templates/index.md b/website/docs/services/proton/environment_templates/index.md
index 2ef306316..3448e14ef 100644
--- a/website/docs/services/proton/environment_templates/index.md
+++ b/website/docs/services/proton/environment_templates/index.md
@@ -182,7 +182,7 @@ name,
 provisioning,
 tags
 FROM awscc.proton.environment_templates
-WHERE region = 'us-east-1' AND Identifier = '<Arn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -223,13 +223,13 @@ INSERT INTO awscc.proton.environment_templates (
  Tags,
  region
 )
-SELECT 
-'{{ Description }}',
- '{{ DisplayName }}',
- '{{ EncryptionKey }}',
- '{{ Name }}',
- '{{ Provisioning }}',
- '{{ Tags }}',
+SELECT
+'{{ description }}',
+ '{{ display_name }}',
+ '{{ encryption_key }}',
+ '{{ name }}',
+ '{{ provisioning }}',
+ '{{ tags }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -246,13 +246,13 @@ INSERT INTO awscc.proton.environment_templates (
  Tags,
  region
 )
-SELECT 
- '{{ Description }}',
- '{{ DisplayName }}',
- '{{ EncryptionKey }}',
- '{{ Name }}',
- '{{ Provisioning }}',
- '{{ Tags }}',
+SELECT
+ '{{ description }}',
+ '{{ display_name }}',
+ '{{ encryption_key }}',
+ '{{ name }}',
+ '{{ provisioning }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -270,21 +270,20 @@ globals:
 resources:
   - name: environment_template
     props:
-      - name: Description
-        value: '{{ Description }}'
-      - name: DisplayName
-        value: '{{ DisplayName }}'
-      - name: EncryptionKey
-        value: '{{ EncryptionKey }}'
-      - name: Name
-        value: '{{ Name }}'
-      - name: Provisioning
-        value: '{{ Provisioning }}'
-      - name: Tags
+      - name: description
+        value: '{{ description }}'
+      - name: display_name
+        value: '{{ display_name }}'
+      - name: encryption_key
+        value: '{{ encryption_key }}'
+      - name: name
+        value: '{{ name }}'
+      - name: provisioning
+        value: '{{ provisioning }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -302,7 +301,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Arn>';
+AND Identifier = '{{ arn }}';
 ```
 
 
@@ -311,7 +310,7 @@ AND Identifier = '<Arn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.proton.environment_templates
-WHERE Identifier = '<Arn>'
+WHERE Identifier = '{{ arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/proton/service_templates/index.md b/website/docs/services/proton/service_templates/index.md
index 9ec60ca32..6488b8607 100644
--- a/website/docs/services/proton/service_templates/index.md
+++ b/website/docs/services/proton/service_templates/index.md
@@ -182,7 +182,7 @@ name,
 pipeline_provisioning,
 tags
 FROM awscc.proton.service_templates
-WHERE region = 'us-east-1' AND Identifier = '<Arn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -223,13 +223,13 @@ INSERT INTO awscc.proton.service_templates (
  Tags,
  region
 )
-SELECT 
-'{{ Description }}',
- '{{ DisplayName }}',
- '{{ EncryptionKey }}',
- '{{ Name }}',
- '{{ PipelineProvisioning }}',
- '{{ Tags }}',
+SELECT
+'{{ description }}',
+ '{{ display_name }}',
+ '{{ encryption_key }}',
+ '{{ name }}',
+ '{{ pipeline_provisioning }}',
+ '{{ tags }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -246,13 +246,13 @@ INSERT INTO awscc.proton.service_templates (
  Tags,
  region
 )
-SELECT 
- '{{ Description }}',
- '{{ DisplayName }}',
- '{{ EncryptionKey }}',
- '{{ Name }}',
- '{{ PipelineProvisioning }}',
- '{{ Tags }}',
+SELECT
+ '{{ description }}',
+ '{{ display_name }}',
+ '{{ encryption_key }}',
+ '{{ name }}',
+ '{{ pipeline_provisioning }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -270,21 +270,20 @@ globals:
 resources:
   - name: service_template
     props:
-      - name: Description
-        value: '{{ Description }}'
-      - name: DisplayName
-        value: '{{ DisplayName }}'
-      - name: EncryptionKey
-        value: '{{ EncryptionKey }}'
-      - name: Name
-        value: '{{ Name }}'
-      - name: PipelineProvisioning
-        value: '{{ PipelineProvisioning }}'
-      - name: Tags
+      - name: description
+        value: '{{ description }}'
+      - name: display_name
+        value: '{{ display_name }}'
+      - name: encryption_key
+        value: '{{ encryption_key }}'
+      - name: name
+        value: '{{ name }}'
+      - name: pipeline_provisioning
+        value: '{{ pipeline_provisioning }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -302,7 +301,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Arn>';
+AND Identifier = '{{ arn }}';
 ```
 
 
@@ -311,7 +310,7 @@ AND Identifier = '<Arn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.proton.service_templates
-WHERE Identifier = '<Arn>'
+WHERE Identifier = '{{ arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/qbusiness/applications/index.md b/website/docs/services/qbusiness/applications/index.md
index d617fb8db..ed64904cd 100644
--- a/website/docs/services/qbusiness/applications/index.md
+++ b/website/docs/services/qbusiness/applications/index.md
@@ -307,7 +307,7 @@ status,
 tags,
 updated_at
 FROM awscc.qbusiness.applications
-WHERE region = 'us-east-1' AND Identifier = '<ApplicationId>';
+WHERE region = 'us-east-1' AND Identifier = '{{ application_id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -343,8 +343,8 @@ INSERT INTO awscc.qbusiness.applications (
  DisplayName,
  region
 )
-SELECT 
-'{{ DisplayName }}',
+SELECT
+'{{ display_name }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -369,21 +369,21 @@ INSERT INTO awscc.qbusiness.applications (
  Tags,
  region
 )
-SELECT 
- '{{ AttachmentsConfiguration }}',
- '{{ AutoSubscriptionConfiguration }}',
- '{{ ClientIdsForOIDC }}',
- '{{ Description }}',
- '{{ DisplayName }}',
- '{{ EncryptionConfiguration }}',
- '{{ IamIdentityProviderArn }}',
- '{{ IdentityCenterInstanceArn }}',
- '{{ IdentityType }}',
- '{{ PersonalizationConfiguration }}',
- '{{ QAppsConfiguration }}',
- '{{ QuickSightConfiguration }}',
- '{{ RoleArn }}',
- '{{ Tags }}',
+SELECT
+ '{{ attachments_configuration }}',
+ '{{ auto_subscription_configuration }}',
+ '{{ client_ids_for_oid_c }}',
+ '{{ description }}',
+ '{{ display_name }}',
+ '{{ encryption_configuration }}',
+ '{{ iam_identity_provider_arn }}',
+ '{{ identity_center_instance_arn }}',
+ '{{ identity_type }}',
+ '{{ personalization_configuration }}',
+ '{{ q_apps_configuration }}',
+ '{{ quick_sight_configuration }}',
+ '{{ role_arn }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -401,45 +401,44 @@ globals:
 resources:
   - name: application
     props:
-      - name: AttachmentsConfiguration
+      - name: attachments_configuration
         value:
-          AttachmentsControlMode: '{{ AttachmentsControlMode }}'
-      - name: AutoSubscriptionConfiguration
+          attachments_control_mode: '{{ attachments_control_mode }}'
+      - name: auto_subscription_configuration
         value:
-          AutoSubscribe: '{{ AutoSubscribe }}'
-          DefaultSubscriptionType: '{{ DefaultSubscriptionType }}'
-      - name: ClientIdsForOIDC
+          auto_subscribe: '{{ auto_subscribe }}'
+          default_subscription_type: '{{ default_subscription_type }}'
+      - name: client_ids_for_oid_c
         value:
-          - '{{ ClientIdsForOIDC[0] }}'
-      - name: Description
-        value: '{{ Description }}'
-      - name: DisplayName
-        value: '{{ DisplayName }}'
-      - name: EncryptionConfiguration
+          - '{{ client_ids_for_oid_c[0] }}'
+      - name: description
+        value: '{{ description }}'
+      - name: display_name
+        value: '{{ display_name }}'
+      - name: encryption_configuration
         value:
-          KmsKeyId: '{{ KmsKeyId }}'
-      - name: IamIdentityProviderArn
-        value: '{{ IamIdentityProviderArn }}'
-      - name: IdentityCenterInstanceArn
-        value: '{{ IdentityCenterInstanceArn }}'
-      - name: IdentityType
-        value: '{{ IdentityType }}'
-      - name: PersonalizationConfiguration
+          kms_key_id: '{{ kms_key_id }}'
+      - name: iam_identity_provider_arn
+        value: '{{ iam_identity_provider_arn }}'
+      - name: identity_center_instance_arn
+        value: '{{ identity_center_instance_arn }}'
+      - name: identity_type
+        value: '{{ identity_type }}'
+      - name: personalization_configuration
         value:
-          PersonalizationControlMode: '{{ PersonalizationControlMode }}'
-      - name: QAppsConfiguration
+          personalization_control_mode: '{{ personalization_control_mode }}'
+      - name: q_apps_configuration
         value:
-          QAppsControlMode: '{{ QAppsControlMode }}'
-      - name: QuickSightConfiguration
+          q_apps_control_mode: '{{ q_apps_control_mode }}'
+      - name: quick_sight_configuration
         value:
-          ClientNamespace: '{{ ClientNamespace }}'
-      - name: RoleArn
-        value: '{{ RoleArn }}'
-      - name: Tags
+          client_namespace: '{{ client_namespace }}'
+      - name: role_arn
+        value: '{{ role_arn }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -463,7 +462,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<ApplicationId>';
+AND Identifier = '{{ application_id }}';
 ```
 
 
@@ -472,7 +471,7 @@ AND Identifier = '<ApplicationId>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.qbusiness.applications
-WHERE Identifier = '<ApplicationId>'
+WHERE Identifier = '{{ application_id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/qbusiness/data_accessors/index.md b/website/docs/services/qbusiness/data_accessors/index.md
index ea23e98ba..3e3421f69 100644
--- a/website/docs/services/qbusiness/data_accessors/index.md
+++ b/website/docs/services/qbusiness/data_accessors/index.md
@@ -264,7 +264,7 @@ principal,
 tags,
 updated_at
 FROM awscc.qbusiness.data_accessors
-WHERE region = 'us-east-1' AND Identifier = '<ApplicationId>|<DataAccessorId>';
+WHERE region = 'us-east-1' AND Identifier = '{{ application_id }}|{{ data_accessor_id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -304,11 +304,11 @@ INSERT INTO awscc.qbusiness.data_accessors (
  Principal,
  region
 )
-SELECT 
-'{{ ActionConfigurations }}',
- '{{ ApplicationId }}',
- '{{ DisplayName }}',
- '{{ Principal }}',
+SELECT
+'{{ action_configurations }}',
+ '{{ application_id }}',
+ '{{ display_name }}',
+ '{{ principal }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -325,13 +325,13 @@ INSERT INTO awscc.qbusiness.data_accessors (
  Tags,
  region
 )
-SELECT 
- '{{ ActionConfigurations }}',
- '{{ ApplicationId }}',
- '{{ AuthenticationDetail }}',
- '{{ DisplayName }}',
- '{{ Principal }}',
- '{{ Tags }}',
+SELECT
+ '{{ action_configurations }}',
+ '{{ application_id }}',
+ '{{ authentication_detail }}',
+ '{{ display_name }}',
+ '{{ principal }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -349,42 +349,41 @@ globals:
 resources:
   - name: data_accessor
     props:
-      - name: ActionConfigurations
+      - name: action_configurations
         value:
-          - Action: '{{ Action }}'
-            FilterConfiguration:
-              DocumentAttributeFilter:
-                AndAllFilters:
+          - action: '{{ action }}'
+            filter_configuration:
+              document_attribute_filter:
+                and_all_filters:
                   - null
-                OrAllFilters:
+                or_all_filters:
                   - null
-                NotFilter: null
-                EqualsTo:
-                  Name: '{{ Name }}'
-                  Value: null
-                ContainsAll: null
-                ContainsAny: null
-                GreaterThan: null
-                GreaterThanOrEquals: null
-                LessThan: null
-                LessThanOrEquals: null
-      - name: ApplicationId
-        value: '{{ ApplicationId }}'
-      - name: AuthenticationDetail
+                not_filter: null
+                equals_to:
+                  name: '{{ name }}'
+                  value: null
+                contains_all: null
+                contains_any: null
+                greater_than: null
+                greater_than_or_equals: null
+                less_than: null
+                less_than_or_equals: null
+      - name: application_id
+        value: '{{ application_id }}'
+      - name: authentication_detail
         value:
-          AuthenticationType: '{{ AuthenticationType }}'
-          AuthenticationConfiguration: null
-          ExternalIds:
-            - '{{ ExternalIds[0] }}'
-      - name: DisplayName
-        value: '{{ DisplayName }}'
-      - name: Principal
-        value: '{{ Principal }}'
-      - name: Tags
+          authentication_type: '{{ authentication_type }}'
+          authentication_configuration: null
+          external_ids:
+            - '{{ external_ids[0] }}'
+      - name: display_name
+        value: '{{ display_name }}'
+      - name: principal
+        value: '{{ principal }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -403,7 +402,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<ApplicationId>|<DataAccessorId>';
+AND Identifier = '{{ application_id }}|{{ data_accessor_id }}';
 ```
 
 
@@ -412,7 +411,7 @@ AND Identifier = '<ApplicationId>|<DataAccessorId>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.qbusiness.data_accessors
-WHERE Identifier = '<ApplicationId|DataAccessorId>'
+WHERE Identifier = '{{ application_id }}|{{ data_accessor_id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/qbusiness/data_sources/index.md b/website/docs/services/qbusiness/data_sources/index.md
index 30f03b389..752ad5d98 100644
--- a/website/docs/services/qbusiness/data_sources/index.md
+++ b/website/docs/services/qbusiness/data_sources/index.md
@@ -404,7 +404,7 @@ type,
 updated_at,
 vpc_configuration
 FROM awscc.qbusiness.data_sources
-WHERE region = 'us-east-1' AND Identifier = '<ApplicationId>|<DataSourceId>|<IndexId>';
+WHERE region = 'us-east-1' AND Identifier = '{{ application_id }}|{{ data_source_id }}|{{ index_id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -445,11 +445,11 @@ INSERT INTO awscc.qbusiness.data_sources (
  IndexId,
  region
 )
-SELECT 
-'{{ ApplicationId }}',
- '{{ Configuration }}',
- '{{ DisplayName }}',
- '{{ IndexId }}',
+SELECT
+'{{ application_id }}',
+ '{{ configuration }}',
+ '{{ display_name }}',
+ '{{ index_id }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -471,18 +471,18 @@ INSERT INTO awscc.qbusiness.data_sources (
  VpcConfiguration,
  region
 )
-SELECT 
- '{{ ApplicationId }}',
- '{{ Configuration }}',
- '{{ Description }}',
- '{{ DisplayName }}',
- '{{ DocumentEnrichmentConfiguration }}',
- '{{ MediaExtractionConfiguration }}',
- '{{ IndexId }}',
- '{{ RoleArn }}',
- '{{ SyncSchedule }}',
- '{{ Tags }}',
- '{{ VpcConfiguration }}',
+SELECT
+ '{{ application_id }}',
+ '{{ configuration }}',
+ '{{ description }}',
+ '{{ display_name }}',
+ '{{ document_enrichment_configuration }}',
+ '{{ media_extraction_configuration }}',
+ '{{ index_id }}',
+ '{{ role_arn }}',
+ '{{ sync_schedule }}',
+ '{{ tags }}',
+ '{{ vpc_configuration }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -500,57 +500,56 @@ globals:
 resources:
   - name: data_source
     props:
-      - name: ApplicationId
-        value: '{{ ApplicationId }}'
-      - name: Configuration
+      - name: application_id
+        value: '{{ application_id }}'
+      - name: configuration
         value: null
-      - name: Description
-        value: '{{ Description }}'
-      - name: DisplayName
-        value: '{{ DisplayName }}'
-      - name: DocumentEnrichmentConfiguration
+      - name: description
+        value: '{{ description }}'
+      - name: display_name
+        value: '{{ display_name }}'
+      - name: document_enrichment_configuration
         value:
-          InlineConfigurations:
-            - Condition:
-                Key: '{{ Key }}'
-                Operator: '{{ Operator }}'
-                Value: null
-              Target:
-                Key: '{{ Key }}'
-                Value: null
-                AttributeValueOperator: '{{ AttributeValueOperator }}'
-              DocumentContentOperator: '{{ DocumentContentOperator }}'
-          PreExtractionHookConfiguration:
-            InvocationCondition: null
-            LambdaArn: '{{ LambdaArn }}'
-            S3BucketName: '{{ S3BucketName }}'
-            RoleArn: '{{ RoleArn }}'
-          PostExtractionHookConfiguration: null
-      - name: MediaExtractionConfiguration
+          inline_configurations:
+            - condition:
+                key: '{{ key }}'
+                operator: '{{ operator }}'
+                value: null
+              target:
+                key: '{{ key }}'
+                value: null
+                attribute_value_operator: '{{ attribute_value_operator }}'
+              document_content_operator: '{{ document_content_operator }}'
+          pre_extraction_hook_configuration:
+            invocation_condition: null
+            lambda_arn: '{{ lambda_arn }}'
+            s3_bucket_name: '{{ s3_bucket_name }}'
+            role_arn: '{{ role_arn }}'
+          post_extraction_hook_configuration: null
+      - name: media_extraction_configuration
         value:
-          ImageExtractionConfiguration:
-            ImageExtractionStatus: '{{ ImageExtractionStatus }}'
-          AudioExtractionConfiguration:
-            AudioExtractionStatus: '{{ AudioExtractionStatus }}'
-          VideoExtractionConfiguration:
-            VideoExtractionStatus: '{{ VideoExtractionStatus }}'
-      - name: IndexId
-        value: '{{ IndexId }}'
-      - name: RoleArn
-        value: '{{ RoleArn }}'
-      - name: SyncSchedule
-        value: '{{ SyncSchedule }}'
-      - name: Tags
+          image_extraction_configuration:
+            image_extraction_status: '{{ image_extraction_status }}'
+          audio_extraction_configuration:
+            audio_extraction_status: '{{ audio_extraction_status }}'
+          video_extraction_configuration:
+            video_extraction_status: '{{ video_extraction_status }}'
+      - name: index_id
+        value: '{{ index_id }}'
+      - name: role_arn
+        value: '{{ role_arn }}'
+      - name: sync_schedule
+        value: '{{ sync_schedule }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-      - name: VpcConfiguration
+          - key: '{{ key }}'
+            value: '{{ value }}'
+      - name: vpc_configuration
         value:
-          SubnetIds:
-            - '{{ SubnetIds[0] }}'
-          SecurityGroupIds:
-            - '{{ SecurityGroupIds[0] }}'
-
+          subnet_ids:
+            - '{{ subnet_ids[0] }}'
+          security_group_ids:
+            - '{{ security_group_ids[0] }}'
 ```
 </TabItem>
 </Tabs>
@@ -574,7 +573,7 @@ SET PatchDocument = string('{{ {
     "VpcConfiguration": vpc_configuration
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<ApplicationId>|<DataSourceId>|<IndexId>';
+AND Identifier = '{{ application_id }}|{{ data_source_id }}|{{ index_id }}';
 ```
 
 
@@ -583,7 +582,7 @@ AND Identifier = '<ApplicationId>|<DataSourceId>|<IndexId>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.qbusiness.data_sources
-WHERE Identifier = '<ApplicationId|DataSourceId|IndexId>'
+WHERE Identifier = '{{ application_id }}|{{ data_source_id }}|{{ index_id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/qbusiness/indices/index.md b/website/docs/services/qbusiness/indices/index.md
index 621485f60..234331ef5 100644
--- a/website/docs/services/qbusiness/indices/index.md
+++ b/website/docs/services/qbusiness/indices/index.md
@@ -266,7 +266,7 @@ status,
 tags,
 updated_at
 FROM awscc.qbusiness.indices
-WHERE region = 'us-east-1' AND Identifier = '<ApplicationId>|<IndexId>';
+WHERE region = 'us-east-1' AND Identifier = '{{ application_id }}|{{ index_id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -304,9 +304,9 @@ INSERT INTO awscc.qbusiness.indices (
  DisplayName,
  region
 )
-SELECT 
-'{{ ApplicationId }}',
- '{{ DisplayName }}',
+SELECT
+'{{ application_id }}',
+ '{{ display_name }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -324,14 +324,14 @@ INSERT INTO awscc.qbusiness.indices (
  Tags,
  region
 )
-SELECT 
- '{{ ApplicationId }}',
- '{{ CapacityConfiguration }}',
- '{{ Description }}',
- '{{ DisplayName }}',
- '{{ DocumentAttributeConfigurations }}',
- '{{ Type }}',
- '{{ Tags }}',
+SELECT
+ '{{ application_id }}',
+ '{{ capacity_configuration }}',
+ '{{ description }}',
+ '{{ display_name }}',
+ '{{ document_attribute_configurations }}',
+ '{{ type }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -349,27 +349,26 @@ globals:
 resources:
   - name: index
     props:
-      - name: ApplicationId
-        value: '{{ ApplicationId }}'
-      - name: CapacityConfiguration
+      - name: application_id
+        value: '{{ application_id }}'
+      - name: capacity_configuration
         value:
-          Units: null
-      - name: Description
-        value: '{{ Description }}'
-      - name: DisplayName
-        value: '{{ DisplayName }}'
-      - name: DocumentAttributeConfigurations
+          units: null
+      - name: description
+        value: '{{ description }}'
+      - name: display_name
+        value: '{{ display_name }}'
+      - name: document_attribute_configurations
         value:
-          - Name: '{{ Name }}'
-            Type: '{{ Type }}'
-            Search: '{{ Search }}'
-      - name: Type
-        value: '{{ Type }}'
-      - name: Tags
+          - name: '{{ name }}'
+            type: '{{ type }}'
+            search: '{{ search }}'
+      - name: type
+        value: '{{ type }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -389,7 +388,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<ApplicationId>|<IndexId>';
+AND Identifier = '{{ application_id }}|{{ index_id }}';
 ```
 
 
@@ -398,7 +397,7 @@ AND Identifier = '<ApplicationId>|<IndexId>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.qbusiness.indices
-WHERE Identifier = '<ApplicationId|IndexId>'
+WHERE Identifier = '{{ application_id }}|{{ index_id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/qbusiness/permissions/index.md b/website/docs/services/qbusiness/permissions/index.md
index fdf9fb8ea..88351450a 100644
--- a/website/docs/services/qbusiness/permissions/index.md
+++ b/website/docs/services/qbusiness/permissions/index.md
@@ -174,7 +174,7 @@ actions,
 conditions,
 principal
 FROM awscc.qbusiness.permissions
-WHERE region = 'us-east-1' AND Identifier = '<ApplicationId>|<StatementId>';
+WHERE region = 'us-east-1' AND Identifier = '{{ application_id }}|{{ statement_id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -214,11 +214,11 @@ INSERT INTO awscc.qbusiness.permissions (
  Principal,
  region
 )
-SELECT 
-'{{ ApplicationId }}',
- '{{ StatementId }}',
- '{{ Actions }}',
- '{{ Principal }}',
+SELECT
+'{{ application_id }}',
+ '{{ statement_id }}',
+ '{{ actions }}',
+ '{{ principal }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -234,12 +234,12 @@ INSERT INTO awscc.qbusiness.permissions (
  Principal,
  region
 )
-SELECT 
- '{{ ApplicationId }}',
- '{{ StatementId }}',
- '{{ Actions }}',
- '{{ Conditions }}',
- '{{ Principal }}',
+SELECT
+ '{{ application_id }}',
+ '{{ statement_id }}',
+ '{{ actions }}',
+ '{{ conditions }}',
+ '{{ principal }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -257,22 +257,21 @@ globals:
 resources:
   - name: permission
     props:
-      - name: ApplicationId
-        value: '{{ ApplicationId }}'
-      - name: StatementId
-        value: '{{ StatementId }}'
-      - name: Actions
+      - name: application_id
+        value: '{{ application_id }}'
+      - name: statement_id
+        value: '{{ statement_id }}'
+      - name: actions
         value:
-          - '{{ Actions[0] }}'
-      - name: Conditions
+          - '{{ actions[0] }}'
+      - name: conditions
         value:
-          - ConditionOperator: '{{ ConditionOperator }}'
-            ConditionKey: '{{ ConditionKey }}'
-            ConditionValues:
-              - '{{ ConditionValues[0] }}'
-      - name: Principal
-        value: '{{ Principal }}'
-
+          - condition_operator: '{{ condition_operator }}'
+            condition_key: '{{ condition_key }}'
+            condition_values:
+              - '{{ condition_values[0] }}'
+      - name: principal
+        value: '{{ principal }}'
 ```
 </TabItem>
 </Tabs>
@@ -283,7 +282,7 @@ resources:
 ```sql
 /*+ delete */
 DELETE FROM awscc.qbusiness.permissions
-WHERE Identifier = '<ApplicationId|StatementId>'
+WHERE Identifier = '{{ application_id }}|{{ statement_id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/qbusiness/plugins/index.md b/website/docs/services/qbusiness/plugins/index.md
index a3016208a..df1fa3268 100644
--- a/website/docs/services/qbusiness/plugins/index.md
+++ b/website/docs/services/qbusiness/plugins/index.md
@@ -240,7 +240,7 @@ tags,
 type,
 updated_at
 FROM awscc.qbusiness.plugins
-WHERE region = 'us-east-1' AND Identifier = '<ApplicationId>|<PluginId>';
+WHERE region = 'us-east-1' AND Identifier = '{{ application_id }}|{{ plugin_id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -279,10 +279,10 @@ INSERT INTO awscc.qbusiness.plugins (
  Type,
  region
 )
-SELECT 
-'{{ AuthConfiguration }}',
- '{{ DisplayName }}',
- '{{ Type }}',
+SELECT
+'{{ auth_configuration }}',
+ '{{ display_name }}',
+ '{{ type }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -301,15 +301,15 @@ INSERT INTO awscc.qbusiness.plugins (
  Type,
  region
 )
-SELECT 
- '{{ ApplicationId }}',
- '{{ AuthConfiguration }}',
- '{{ CustomPluginConfiguration }}',
- '{{ DisplayName }}',
- '{{ ServerUrl }}',
- '{{ State }}',
- '{{ Tags }}',
- '{{ Type }}',
+SELECT
+ '{{ application_id }}',
+ '{{ auth_configuration }}',
+ '{{ custom_plugin_configuration }}',
+ '{{ display_name }}',
+ '{{ server_url }}',
+ '{{ state }}',
+ '{{ tags }}',
+ '{{ type }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -327,28 +327,27 @@ globals:
 resources:
   - name: plugin
     props:
-      - name: ApplicationId
-        value: '{{ ApplicationId }}'
-      - name: AuthConfiguration
+      - name: application_id
+        value: '{{ application_id }}'
+      - name: auth_configuration
         value: null
-      - name: CustomPluginConfiguration
+      - name: custom_plugin_configuration
         value:
-          Description: '{{ Description }}'
-          ApiSchemaType: '{{ ApiSchemaType }}'
-          ApiSchema: null
-      - name: DisplayName
-        value: '{{ DisplayName }}'
-      - name: ServerUrl
-        value: '{{ ServerUrl }}'
-      - name: State
-        value: '{{ State }}'
-      - name: Tags
+          description: '{{ description }}'
+          api_schema_type: '{{ api_schema_type }}'
+          api_schema: null
+      - name: display_name
+        value: '{{ display_name }}'
+      - name: server_url
+        value: '{{ server_url }}'
+      - name: state
+        value: '{{ state }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-      - name: Type
-        value: '{{ Type }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
+      - name: type
+        value: '{{ type }}'
 ```
 </TabItem>
 </Tabs>
@@ -369,7 +368,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<ApplicationId>|<PluginId>';
+AND Identifier = '{{ application_id }}|{{ plugin_id }}';
 ```
 
 
@@ -378,7 +377,7 @@ AND Identifier = '<ApplicationId>|<PluginId>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.qbusiness.plugins
-WHERE Identifier = '<ApplicationId|PluginId>'
+WHERE Identifier = '{{ application_id }}|{{ plugin_id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/qbusiness/retrievers/index.md b/website/docs/services/qbusiness/retrievers/index.md
index a5eda6a13..6153cbd0e 100644
--- a/website/docs/services/qbusiness/retrievers/index.md
+++ b/website/docs/services/qbusiness/retrievers/index.md
@@ -211,7 +211,7 @@ tags,
 type,
 updated_at
 FROM awscc.qbusiness.retrievers
-WHERE region = 'us-east-1' AND Identifier = '<ApplicationId>|<RetrieverId>';
+WHERE region = 'us-east-1' AND Identifier = '{{ application_id }}|{{ retriever_id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -251,11 +251,11 @@ INSERT INTO awscc.qbusiness.retrievers (
  Type,
  region
 )
-SELECT 
-'{{ ApplicationId }}',
- '{{ Configuration }}',
- '{{ DisplayName }}',
- '{{ Type }}',
+SELECT
+'{{ application_id }}',
+ '{{ configuration }}',
+ '{{ display_name }}',
+ '{{ type }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -272,13 +272,13 @@ INSERT INTO awscc.qbusiness.retrievers (
  Type,
  region
 )
-SELECT 
- '{{ ApplicationId }}',
- '{{ Configuration }}',
- '{{ DisplayName }}',
- '{{ RoleArn }}',
- '{{ Tags }}',
- '{{ Type }}',
+SELECT
+ '{{ application_id }}',
+ '{{ configuration }}',
+ '{{ display_name }}',
+ '{{ role_arn }}',
+ '{{ tags }}',
+ '{{ type }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -296,21 +296,20 @@ globals:
 resources:
   - name: retriever
     props:
-      - name: ApplicationId
-        value: '{{ ApplicationId }}'
-      - name: Configuration
+      - name: application_id
+        value: '{{ application_id }}'
+      - name: configuration
         value: null
-      - name: DisplayName
-        value: '{{ DisplayName }}'
-      - name: RoleArn
-        value: '{{ RoleArn }}'
-      - name: Tags
+      - name: display_name
+        value: '{{ display_name }}'
+      - name: role_arn
+        value: '{{ role_arn }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-      - name: Type
-        value: '{{ Type }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
+      - name: type
+        value: '{{ type }}'
 ```
 </TabItem>
 </Tabs>
@@ -329,7 +328,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<ApplicationId>|<RetrieverId>';
+AND Identifier = '{{ application_id }}|{{ retriever_id }}';
 ```
 
 
@@ -338,7 +337,7 @@ AND Identifier = '<ApplicationId>|<RetrieverId>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.qbusiness.retrievers
-WHERE Identifier = '<ApplicationId|RetrieverId>'
+WHERE Identifier = '{{ application_id }}|{{ retriever_id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/qbusiness/web_experiences/index.md b/website/docs/services/qbusiness/web_experiences/index.md
index c0278a933..c74d6f45f 100644
--- a/website/docs/services/qbusiness/web_experiences/index.md
+++ b/website/docs/services/qbusiness/web_experiences/index.md
@@ -276,7 +276,7 @@ origins,
 customization_configuration,
 browser_extension_configuration
 FROM awscc.qbusiness.web_experiences
-WHERE region = 'us-east-1' AND Identifier = '<ApplicationId>|<WebExperienceId>';
+WHERE region = 'us-east-1' AND Identifier = '{{ application_id }}|{{ web_experience_id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -313,8 +313,8 @@ INSERT INTO awscc.qbusiness.web_experiences (
  ApplicationId,
  region
 )
-SELECT 
-'{{ ApplicationId }}',
+SELECT
+'{{ application_id }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -336,18 +336,18 @@ INSERT INTO awscc.qbusiness.web_experiences (
  BrowserExtensionConfiguration,
  region
 )
-SELECT 
- '{{ ApplicationId }}',
- '{{ IdentityProviderConfiguration }}',
- '{{ RoleArn }}',
- '{{ SamplePromptsControlMode }}',
- '{{ Subtitle }}',
- '{{ Tags }}',
- '{{ Title }}',
- '{{ WelcomeMessage }}',
- '{{ Origins }}',
- '{{ CustomizationConfiguration }}',
- '{{ BrowserExtensionConfiguration }}',
+SELECT
+ '{{ application_id }}',
+ '{{ identity_provider_configuration }}',
+ '{{ role_arn }}',
+ '{{ sample_prompts_control_mode }}',
+ '{{ subtitle }}',
+ '{{ tags }}',
+ '{{ title }}',
+ '{{ welcome_message }}',
+ '{{ origins }}',
+ '{{ customization_configuration }}',
+ '{{ browser_extension_configuration }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -365,38 +365,37 @@ globals:
 resources:
   - name: web_experience
     props:
-      - name: ApplicationId
-        value: '{{ ApplicationId }}'
-      - name: IdentityProviderConfiguration
+      - name: application_id
+        value: '{{ application_id }}'
+      - name: identity_provider_configuration
         value: null
-      - name: RoleArn
-        value: '{{ RoleArn }}'
-      - name: SamplePromptsControlMode
-        value: '{{ SamplePromptsControlMode }}'
-      - name: Subtitle
-        value: '{{ Subtitle }}'
-      - name: Tags
+      - name: role_arn
+        value: '{{ role_arn }}'
+      - name: sample_prompts_control_mode
+        value: '{{ sample_prompts_control_mode }}'
+      - name: subtitle
+        value: '{{ subtitle }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-      - name: Title
-        value: '{{ Title }}'
-      - name: WelcomeMessage
-        value: '{{ WelcomeMessage }}'
-      - name: Origins
+          - key: '{{ key }}'
+            value: '{{ value }}'
+      - name: title
+        value: '{{ title }}'
+      - name: welcome_message
+        value: '{{ welcome_message }}'
+      - name: origins
         value:
-          - '{{ Origins[0] }}'
-      - name: CustomizationConfiguration
+          - '{{ origins[0] }}'
+      - name: customization_configuration
         value:
-          CustomCSSUrl: '{{ CustomCSSUrl }}'
-          LogoUrl: '{{ LogoUrl }}'
-          FontUrl: '{{ FontUrl }}'
-          FaviconUrl: '{{ FaviconUrl }}'
-      - name: BrowserExtensionConfiguration
+          custom_cs_surl: '{{ custom_cs_surl }}'
+          logo_url: '{{ logo_url }}'
+          font_url: '{{ font_url }}'
+          favicon_url: '{{ favicon_url }}'
+      - name: browser_extension_configuration
         value:
-          EnabledBrowserExtensions:
-            - '{{ EnabledBrowserExtensions[0] }}'
-
+          enabled_browser_extensions:
+            - '{{ enabled_browser_extensions[0] }}'
 ```
 </TabItem>
 </Tabs>
@@ -421,7 +420,7 @@ SET PatchDocument = string('{{ {
     "BrowserExtensionConfiguration": browser_extension_configuration
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<ApplicationId>|<WebExperienceId>';
+AND Identifier = '{{ application_id }}|{{ web_experience_id }}';
 ```
 
 
@@ -430,7 +429,7 @@ AND Identifier = '<ApplicationId>|<WebExperienceId>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.qbusiness.web_experiences
-WHERE Identifier = '<ApplicationId|WebExperienceId>'
+WHERE Identifier = '{{ application_id }}|{{ web_experience_id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/qldb/streams/index.md b/website/docs/services/qldb/streams/index.md
index 8eb863b37..15d6bf5bb 100644
--- a/website/docs/services/qldb/streams/index.md
+++ b/website/docs/services/qldb/streams/index.md
@@ -201,7 +201,7 @@ tags,
 arn,
 id
 FROM awscc.qldb.streams
-WHERE region = 'us-east-1' AND Identifier = '<LedgerName>|<Id>';
+WHERE region = 'us-east-1' AND Identifier = '{{ ledger_name }}|{{ id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -242,12 +242,12 @@ INSERT INTO awscc.qldb.streams (
  KinesisConfiguration,
  region
 )
-SELECT 
-'{{ LedgerName }}',
- '{{ StreamName }}',
- '{{ RoleArn }}',
- '{{ InclusiveStartTime }}',
- '{{ KinesisConfiguration }}',
+SELECT
+'{{ ledger_name }}',
+ '{{ stream_name }}',
+ '{{ role_arn }}',
+ '{{ inclusive_start_time }}',
+ '{{ kinesis_configuration }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -265,14 +265,14 @@ INSERT INTO awscc.qldb.streams (
  Tags,
  region
 )
-SELECT 
- '{{ LedgerName }}',
- '{{ StreamName }}',
- '{{ RoleArn }}',
- '{{ InclusiveStartTime }}',
- '{{ ExclusiveEndTime }}',
- '{{ KinesisConfiguration }}',
- '{{ Tags }}',
+SELECT
+ '{{ ledger_name }}',
+ '{{ stream_name }}',
+ '{{ role_arn }}',
+ '{{ inclusive_start_time }}',
+ '{{ exclusive_end_time }}',
+ '{{ kinesis_configuration }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -290,25 +290,24 @@ globals:
 resources:
   - name: stream
     props:
-      - name: LedgerName
-        value: '{{ LedgerName }}'
-      - name: StreamName
-        value: '{{ StreamName }}'
-      - name: RoleArn
-        value: '{{ RoleArn }}'
-      - name: InclusiveStartTime
-        value: '{{ InclusiveStartTime }}'
-      - name: ExclusiveEndTime
-        value: '{{ ExclusiveEndTime }}'
-      - name: KinesisConfiguration
+      - name: ledger_name
+        value: '{{ ledger_name }}'
+      - name: stream_name
+        value: '{{ stream_name }}'
+      - name: role_arn
+        value: '{{ role_arn }}'
+      - name: inclusive_start_time
+        value: '{{ inclusive_start_time }}'
+      - name: exclusive_end_time
+        value: '{{ exclusive_end_time }}'
+      - name: kinesis_configuration
         value:
-          StreamArn: null
-          AggregationEnabled: '{{ AggregationEnabled }}'
-      - name: Tags
+          stream_arn: null
+          aggregation_enabled: '{{ aggregation_enabled }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -324,7 +323,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<LedgerName>|<Id>';
+AND Identifier = '{{ ledger_name }}|{{ id }}';
 ```
 
 
@@ -333,7 +332,7 @@ AND Identifier = '<LedgerName>|<Id>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.qldb.streams
-WHERE Identifier = '<LedgerName|Id>'
+WHERE Identifier = '{{ ledger_name }}|{{ id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/quicksight/analyses/index.md b/website/docs/services/quicksight/analyses/index.md
index 50b95219f..a35929838 100644
--- a/website/docs/services/quicksight/analyses/index.md
+++ b/website/docs/services/quicksight/analyses/index.md
@@ -1159,7 +1159,7 @@ arn,
 tags,
 sheets
 FROM awscc.quicksight.analyses
-WHERE region = 'us-east-1' AND Identifier = '<AnalysisId>|<AwsAccountId>';
+WHERE region = 'us-east-1' AND Identifier = '{{ analysis_id }}|{{ aws_account_id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -1198,10 +1198,10 @@ INSERT INTO awscc.quicksight.analyses (
  AwsAccountId,
  region
 )
-SELECT 
-'{{ Name }}',
- '{{ AnalysisId }}',
- '{{ AwsAccountId }}',
+SELECT
+'{{ name }}',
+ '{{ analysis_id }}',
+ '{{ aws_account_id }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -1226,21 +1226,21 @@ INSERT INTO awscc.quicksight.analyses (
  Sheets,
  region
 )
-SELECT 
- '{{ Status }}',
- '{{ Parameters }}',
- '{{ SourceEntity }}',
- '{{ ThemeArn }}',
- '{{ Definition }}',
- '{{ ValidationStrategy }}',
- '{{ FolderArns }}',
- '{{ Name }}',
- '{{ Errors }}',
- '{{ AnalysisId }}',
- '{{ AwsAccountId }}',
- '{{ Permissions }}',
- '{{ Tags }}',
- '{{ Sheets }}',
+SELECT
+ '{{ status }}',
+ '{{ parameters }}',
+ '{{ source_entity }}',
+ '{{ theme_arn }}',
+ '{{ definition }}',
+ '{{ validation_strategy }}',
+ '{{ folder_arns }}',
+ '{{ name }}',
+ '{{ errors }}',
+ '{{ analysis_id }}',
+ '{{ aws_account_id }}',
+ '{{ permissions }}',
+ '{{ tags }}',
+ '{{ sheets }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -1258,1956 +1258,1955 @@ globals:
 resources:
   - name: analysis
     props:
-      - name: Status
-        value: '{{ Status }}'
-      - name: Parameters
+      - name: status
+        value: '{{ status }}'
+      - name: parameters
         value:
-          StringParameters:
-            - Values:
-                - '{{ Values[0] }}'
-              Name: '{{ Name }}'
-          DecimalParameters:
-            - Values:
+          string_parameters:
+            - values:
+                - '{{ values[0] }}'
+              name: '{{ name }}'
+          decimal_parameters:
+            - values:
                 - null
-              Name: '{{ Name }}'
-          IntegerParameters:
-            - Values:
+              name: '{{ name }}'
+          integer_parameters:
+            - values:
                 - null
-              Name: '{{ Name }}'
-          DateTimeParameters:
-            - Values:
-                - '{{ Values[0] }}'
-              Name: '{{ Name }}'
-      - name: SourceEntity
+              name: '{{ name }}'
+          date_time_parameters:
+            - values:
+                - '{{ values[0] }}'
+              name: '{{ name }}'
+      - name: source_entity
         value:
-          SourceTemplate:
-            DataSetReferences:
-              - DataSetArn: '{{ DataSetArn }}'
-                DataSetPlaceholder: '{{ DataSetPlaceholder }}'
-            Arn: '{{ Arn }}'
-      - name: ThemeArn
-        value: '{{ ThemeArn }}'
-      - name: Definition
+          source_template:
+            data_set_references:
+              - data_set_arn: '{{ data_set_arn }}'
+                data_set_placeholder: '{{ data_set_placeholder }}'
+            arn: '{{ arn }}'
+      - name: theme_arn
+        value: '{{ theme_arn }}'
+      - name: definition
         value:
-          Options:
-            Timezone: '{{ Timezone }}'
-            WeekStart: '{{ WeekStart }}'
-          FilterGroups:
-            - Status: '{{ Status }}'
-              Filters:
-                - NestedFilter:
-                    Column:
-                      ColumnName: '{{ ColumnName }}'
-                      DataSetIdentifier: '{{ DataSetIdentifier }}'
-                    InnerFilter:
-                      CategoryInnerFilter:
-                        Configuration:
-                          CustomFilterListConfiguration:
-                            CategoryValues:
-                              - '{{ CategoryValues[0] }}'
-                            NullOption: '{{ NullOption }}'
-                            MatchOperator: '{{ MatchOperator }}'
-                            SelectAllOptions: '{{ SelectAllOptions }}'
-                          CustomFilterConfiguration:
-                            CategoryValue: '{{ CategoryValue }}'
-                            ParameterName: '{{ ParameterName }}'
-                            NullOption: null
-                            MatchOperator: null
-                            SelectAllOptions: null
-                          FilterListConfiguration:
-                            CategoryValues:
-                              - '{{ CategoryValues[0] }}'
-                            NullOption: null
-                            MatchOperator: null
-                            SelectAllOptions: null
-                        Column: null
-                        DefaultFilterControlConfiguration:
-                          ControlOptions:
-                            DefaultSliderOptions:
-                              Type: '{{ Type }}'
-                              StepSize: null
-                              DisplayOptions:
-                                TitleOptions:
-                                  CustomLabel: '{{ CustomLabel }}'
-                                  Visibility: null
-                                  FontConfiguration:
-                                    FontFamily: '{{ FontFamily }}'
-                                    FontStyle: '{{ FontStyle }}'
-                                    FontSize:
-                                      Relative: '{{ Relative }}'
-                                      Absolute: '{{ Absolute }}'
-                                    FontDecoration: '{{ FontDecoration }}'
-                                    FontColor: '{{ FontColor }}'
-                                    FontWeight:
-                                      Name: '{{ Name }}'
-                                InfoIconLabelOptions:
-                                  Visibility: null
-                                  InfoIconText: '{{ InfoIconText }}'
-                              MaximumValue: null
-                              MinimumValue: null
-                            DefaultRelativeDateTimeOptions:
-                              DisplayOptions:
-                                TitleOptions: null
-                                InfoIconLabelOptions: null
-                                DateTimeFormat: '{{ DateTimeFormat }}'
-                              CommitMode: '{{ CommitMode }}'
-                            DefaultTextFieldOptions:
-                              DisplayOptions:
-                                TitleOptions: null
-                                PlaceholderOptions:
-                                  Visibility: null
-                                InfoIconLabelOptions: null
-                            DefaultTextAreaOptions:
-                              Delimiter: '{{ Delimiter }}'
-                              DisplayOptions:
-                                TitleOptions: null
-                                PlaceholderOptions: null
-                                InfoIconLabelOptions: null
-                            DefaultDropdownOptions:
-                              Type: '{{ Type }}'
-                              DisplayOptions:
-                                TitleOptions: null
-                                SelectAllOptions:
-                                  Visibility: null
-                                InfoIconLabelOptions: null
-                              CommitMode: null
-                              SelectableValues:
-                                Values:
-                                  - '{{ Values[0] }}'
-                            DefaultDateTimePickerOptions:
-                              Type: '{{ Type }}'
-                              DisplayOptions:
-                                TitleOptions: null
-                                InfoIconLabelOptions: null
-                                HelperTextVisibility: null
-                                DateIconVisibility: null
-                                DateTimeFormat: '{{ DateTimeFormat }}'
-                              CommitMode: null
-                            DefaultListOptions:
-                              Type: null
-                              DisplayOptions:
-                                TitleOptions: null
-                                SearchOptions:
-                                  Visibility: null
-                                SelectAllOptions: null
-                                InfoIconLabelOptions: null
-                              SelectableValues: null
-                          Title: '{{ Title }}'
-                    IncludeInnerSet: '{{ IncludeInnerSet }}'
-                    FilterId: '{{ FilterId }}'
-                  NumericEqualityFilter:
-                    AggregationFunction:
-                      AttributeAggregationFunction:
-                        SimpleAttributeAggregation: '{{ SimpleAttributeAggregation }}'
-                        ValueForMultipleValues: '{{ ValueForMultipleValues }}'
-                      DateAggregationFunction: '{{ DateAggregationFunction }}'
-                      NumericalAggregationFunction:
-                        PercentileAggregation:
-                          PercentileValue: null
-                        SimpleNumericalAggregation: '{{ SimpleNumericalAggregation }}'
-                      CategoricalAggregationFunction: '{{ CategoricalAggregationFunction }}'
-                    Column: null
-                    Value: null
-                    ParameterName: '{{ ParameterName }}'
-                    NullOption: null
-                    MatchOperator: '{{ MatchOperator }}'
-                    SelectAllOptions: '{{ SelectAllOptions }}'
-                    DefaultFilterControlConfiguration: null
-                    FilterId: '{{ FilterId }}'
-                  NumericRangeFilter:
-                    AggregationFunction: null
-                    Column: null
-                    IncludeMaximum: '{{ IncludeMaximum }}'
-                    RangeMinimum:
-                      StaticValue: null
-                      Parameter: '{{ Parameter }}'
-                    NullOption: null
-                    SelectAllOptions: null
-                    DefaultFilterControlConfiguration: null
-                    FilterId: '{{ FilterId }}'
-                    RangeMaximum: null
-                    IncludeMinimum: '{{ IncludeMinimum }}'
-                  TimeRangeFilter:
-                    RangeMinimumValue:
-                      RollingDate:
-                        Expression: '{{ Expression }}'
-                        DataSetIdentifier: '{{ DataSetIdentifier }}'
-                      StaticValue: '{{ StaticValue }}'
-                      Parameter: '{{ Parameter }}'
-                    Column: null
-                    RangeMaximumValue: null
-                    IncludeMaximum: '{{ IncludeMaximum }}'
-                    TimeGranularity: '{{ TimeGranularity }}'
-                    NullOption: null
-                    DefaultFilterControlConfiguration: null
-                    FilterId: '{{ FilterId }}'
-                    IncludeMinimum: '{{ IncludeMinimum }}'
-                    ExcludePeriodConfiguration:
-                      Status: null
-                      Amount: null
-                      Granularity: null
-                  RelativeDatesFilter:
-                    RelativeDateValue: null
-                    Column: null
-                    RelativeDateType: '{{ RelativeDateType }}'
-                    TimeGranularity: null
-                    ParameterName: '{{ ParameterName }}'
-                    NullOption: null
-                    DefaultFilterControlConfiguration: null
-                    FilterId: '{{ FilterId }}'
-                    AnchorDateConfiguration:
-                      AnchorOption: '{{ AnchorOption }}'
-                      ParameterName: '{{ ParameterName }}'
-                    MinimumGranularity: null
-                    ExcludePeriodConfiguration: null
-                  TopBottomFilter:
-                    AggregationSortConfigurations:
-                      - AggregationFunction: null
-                        SortDirection: '{{ SortDirection }}'
-                        Column: null
-                    Column: null
-                    TimeGranularity: null
-                    ParameterName: '{{ ParameterName }}'
-                    Limit: null
-                    DefaultFilterControlConfiguration: null
-                    FilterId: '{{ FilterId }}'
-                  TimeEqualityFilter:
-                    Column: null
-                    RollingDate: null
-                    Value: '{{ Value }}'
-                    TimeGranularity: null
-                    ParameterName: '{{ ParameterName }}'
-                    DefaultFilterControlConfiguration: null
-                    FilterId: '{{ FilterId }}'
-                  CategoryFilter:
-                    Configuration: null
-                    Column: null
-                    DefaultFilterControlConfiguration: null
-                    FilterId: '{{ FilterId }}'
-              CrossDataset: '{{ CrossDataset }}'
-              ScopeConfiguration:
-                AllSheets: {}
-                SelectedSheets:
-                  SheetVisualScopingConfigurations:
-                    - Scope: '{{ Scope }}'
-                      SheetId: '{{ SheetId }}'
-                      VisualIds:
-                        - '{{ VisualIds[0] }}'
-              FilterGroupId: '{{ FilterGroupId }}'
-          QueryExecutionOptions:
-            QueryExecutionMode: '{{ QueryExecutionMode }}'
-          StaticFiles:
-            - ImageStaticFile:
-                StaticFileId: '{{ StaticFileId }}'
-                Source:
-                  UrlOptions:
-                    Url: '{{ Url }}'
-                  S3Options:
-                    BucketName: '{{ BucketName }}'
-                    ObjectKey: '{{ ObjectKey }}'
-                    Region: '{{ Region }}'
-              SpatialStaticFile:
-                StaticFileId: '{{ StaticFileId }}'
-                Source: null
-          CalculatedFields:
-            - Expression: '{{ Expression }}'
-              DataSetIdentifier: '{{ DataSetIdentifier }}'
-              Name: '{{ Name }}'
-          DataSetIdentifierDeclarations:
-            - Identifier: '{{ Identifier }}'
-              DataSetArn: '{{ DataSetArn }}'
-          ColumnConfigurations:
-            - Role: '{{ Role }}'
-              FormatConfiguration:
-                NumberFormatConfiguration:
-                  FormatConfiguration:
-                    NumberDisplayFormatConfiguration:
-                      NegativeValueConfiguration:
-                        DisplayMode: '{{ DisplayMode }}'
-                      DecimalPlacesConfiguration:
-                        DecimalPlaces: null
-                      NumberScale: '{{ NumberScale }}'
-                      NullValueFormatConfiguration:
-                        NullString: '{{ NullString }}'
-                      Suffix: '{{ Suffix }}'
-                      SeparatorConfiguration:
-                        DecimalSeparator: '{{ DecimalSeparator }}'
-                        ThousandsSeparator:
-                          Symbol: null
-                          Visibility: null
-                          GroupingStyle: '{{ GroupingStyle }}'
-                      Prefix: '{{ Prefix }}'
-                    CurrencyDisplayFormatConfiguration:
-                      NegativeValueConfiguration: null
-                      DecimalPlacesConfiguration: null
-                      NumberScale: null
-                      NullValueFormatConfiguration: null
-                      Suffix: '{{ Suffix }}'
-                      SeparatorConfiguration: null
-                      Symbol: '{{ Symbol }}'
-                      Prefix: '{{ Prefix }}'
-                    PercentageDisplayFormatConfiguration:
-                      NegativeValueConfiguration: null
-                      DecimalPlacesConfiguration: null
-                      NullValueFormatConfiguration: null
-                      Suffix: '{{ Suffix }}'
-                      SeparatorConfiguration: null
-                      Prefix: '{{ Prefix }}'
-                DateTimeFormatConfiguration:
-                  NumericFormatConfiguration: null
-                  NullValueFormatConfiguration: null
-                  DateTimeFormat: '{{ DateTimeFormat }}'
-                StringFormatConfiguration:
-                  NumericFormatConfiguration: null
-                  NullValueFormatConfiguration: null
-              Column: null
-              ColorsConfiguration:
-                CustomColors:
-                  - Color: '{{ Color }}'
-                    FieldValue: '{{ FieldValue }}'
-                    SpecialValue: '{{ SpecialValue }}'
-          AnalysisDefaults:
-            DefaultNewSheetConfiguration:
-              SheetContentType: '{{ SheetContentType }}'
-              InteractiveLayoutConfiguration:
-                FreeForm:
-                  CanvasSizeOptions:
-                    ScreenCanvasSizeOptions:
-                      OptimizedViewPortWidth: '{{ OptimizedViewPortWidth }}'
-                Grid:
-                  CanvasSizeOptions:
-                    ScreenCanvasSizeOptions:
-                      OptimizedViewPortWidth: '{{ OptimizedViewPortWidth }}'
-                      ResizeOption: '{{ ResizeOption }}'
-              PaginatedLayoutConfiguration:
-                SectionBased:
-                  CanvasSizeOptions:
-                    PaperCanvasSizeOptions:
-                      PaperMargin:
-                        Left: '{{ Left }}'
-                        Top: '{{ Top }}'
-                        Right: '{{ Right }}'
-                        Bottom: '{{ Bottom }}'
-                      PaperSize: '{{ PaperSize }}'
-                      PaperOrientation: '{{ PaperOrientation }}'
-          Sheets:
-            - Description: '{{ Description }}'
-              ParameterControls:
-                - Slider:
-                    ParameterControlId: '{{ ParameterControlId }}'
-                    StepSize: null
-                    DisplayOptions: null
-                    SourceParameterName: '{{ SourceParameterName }}'
-                    Title: '{{ Title }}'
-                    MaximumValue: null
-                    MinimumValue: null
-                  TextArea:
-                    ParameterControlId: '{{ ParameterControlId }}'
-                    Delimiter: '{{ Delimiter }}'
-                    DisplayOptions: null
-                    SourceParameterName: '{{ SourceParameterName }}'
-                    Title: '{{ Title }}'
-                  Dropdown:
-                    ParameterControlId: '{{ ParameterControlId }}'
-                    Type: null
-                    DisplayOptions: null
-                    SourceParameterName: '{{ SourceParameterName }}'
-                    CascadingControlConfiguration:
-                      SourceControls:
-                        - SourceSheetControlId: '{{ SourceSheetControlId }}'
-                          ColumnToMatch: null
-                    Title: '{{ Title }}'
-                    CommitMode: null
-                    SelectableValues:
-                      LinkToDataSetColumn: null
-                      Values:
-                        - '{{ Values[0] }}'
-                  TextField:
-                    ParameterControlId: '{{ ParameterControlId }}'
-                    DisplayOptions: null
-                    SourceParameterName: '{{ SourceParameterName }}'
-                    Title: '{{ Title }}'
-                  List:
-                    ParameterControlId: '{{ ParameterControlId }}'
-                    Type: null
-                    DisplayOptions: null
-                    SourceParameterName: '{{ SourceParameterName }}'
-                    CascadingControlConfiguration: null
-                    Title: '{{ Title }}'
-                    SelectableValues: null
-                  DateTimePicker:
-                    ParameterControlId: '{{ ParameterControlId }}'
-                    DisplayOptions: null
-                    SourceParameterName: '{{ SourceParameterName }}'
-                    Title: '{{ Title }}'
-              ContentType: null
-              SheetId: '{{ SheetId }}'
-              Images:
-                - Actions:
-                    - Status: null
-                      Trigger: '{{ Trigger }}'
-                      CustomActionId: '{{ CustomActionId }}'
-                      Name: '{{ Name }}'
-                      ActionOperations:
-                        - NavigationOperation:
-                            LocalNavigationConfiguration:
-                              TargetSheetId: '{{ TargetSheetId }}'
-                          SetParametersOperation:
-                            ParameterValueConfigurations:
-                              - DestinationParameterName: '{{ DestinationParameterName }}'
-                                Value:
-                                  CustomValuesConfiguration:
-                                    IncludeNullValue: '{{ IncludeNullValue }}'
-                                    CustomValues:
-                                      DecimalValues:
+          options:
+            timezone: '{{ timezone }}'
+            week_start: '{{ week_start }}'
+          filter_groups:
+            - status: '{{ status }}'
+              filters:
+                - nested_filter:
+                    column:
+                      column_name: '{{ column_name }}'
+                      data_set_identifier: '{{ data_set_identifier }}'
+                    inner_filter:
+                      category_inner_filter:
+                        configuration:
+                          custom_filter_list_configuration:
+                            category_values:
+                              - '{{ category_values[0] }}'
+                            null_option: '{{ null_option }}'
+                            match_operator: '{{ match_operator }}'
+                            select_all_options: '{{ select_all_options }}'
+                          custom_filter_configuration:
+                            category_value: '{{ category_value }}'
+                            parameter_name: '{{ parameter_name }}'
+                            null_option: null
+                            match_operator: null
+                            select_all_options: null
+                          filter_list_configuration:
+                            category_values:
+                              - '{{ category_values[0] }}'
+                            null_option: null
+                            match_operator: null
+                            select_all_options: null
+                        column: null
+                        default_filter_control_configuration:
+                          control_options:
+                            default_slider_options:
+                              type: '{{ type }}'
+                              step_size: null
+                              display_options:
+                                title_options:
+                                  custom_label: '{{ custom_label }}'
+                                  visibility: null
+                                  font_configuration:
+                                    font_family: '{{ font_family }}'
+                                    font_style: '{{ font_style }}'
+                                    font_size:
+                                      relative: '{{ relative }}'
+                                      absolute: '{{ absolute }}'
+                                    font_decoration: '{{ font_decoration }}'
+                                    font_color: '{{ font_color }}'
+                                    font_weight:
+                                      name: '{{ name }}'
+                                info_icon_label_options:
+                                  visibility: null
+                                  info_icon_text: '{{ info_icon_text }}'
+                              maximum_value: null
+                              minimum_value: null
+                            default_relative_date_time_options:
+                              display_options:
+                                title_options: null
+                                info_icon_label_options: null
+                                date_time_format: '{{ date_time_format }}'
+                              commit_mode: '{{ commit_mode }}'
+                            default_text_field_options:
+                              display_options:
+                                title_options: null
+                                placeholder_options:
+                                  visibility: null
+                                info_icon_label_options: null
+                            default_text_area_options:
+                              delimiter: '{{ delimiter }}'
+                              display_options:
+                                title_options: null
+                                placeholder_options: null
+                                info_icon_label_options: null
+                            default_dropdown_options:
+                              type: '{{ type }}'
+                              display_options:
+                                title_options: null
+                                select_all_options:
+                                  visibility: null
+                                info_icon_label_options: null
+                              commit_mode: null
+                              selectable_values:
+                                values:
+                                  - '{{ values[0] }}'
+                            default_date_time_picker_options:
+                              type: '{{ type }}'
+                              display_options:
+                                title_options: null
+                                info_icon_label_options: null
+                                helper_text_visibility: null
+                                date_icon_visibility: null
+                                date_time_format: '{{ date_time_format }}'
+                              commit_mode: null
+                            default_list_options:
+                              type: null
+                              display_options:
+                                title_options: null
+                                search_options:
+                                  visibility: null
+                                select_all_options: null
+                                info_icon_label_options: null
+                              selectable_values: null
+                          title: '{{ title }}'
+                    include_inner_set: '{{ include_inner_set }}'
+                    filter_id: '{{ filter_id }}'
+                  numeric_equality_filter:
+                    aggregation_function:
+                      attribute_aggregation_function:
+                        simple_attribute_aggregation: '{{ simple_attribute_aggregation }}'
+                        value_for_multiple_values: '{{ value_for_multiple_values }}'
+                      date_aggregation_function: '{{ date_aggregation_function }}'
+                      numerical_aggregation_function:
+                        percentile_aggregation:
+                          percentile_value: null
+                        simple_numerical_aggregation: '{{ simple_numerical_aggregation }}'
+                      categorical_aggregation_function: '{{ categorical_aggregation_function }}'
+                    column: null
+                    value: null
+                    parameter_name: '{{ parameter_name }}'
+                    null_option: null
+                    match_operator: '{{ match_operator }}'
+                    select_all_options: '{{ select_all_options }}'
+                    default_filter_control_configuration: null
+                    filter_id: '{{ filter_id }}'
+                  numeric_range_filter:
+                    aggregation_function: null
+                    column: null
+                    include_maximum: '{{ include_maximum }}'
+                    range_minimum:
+                      static_value: null
+                      parameter: '{{ parameter }}'
+                    null_option: null
+                    select_all_options: null
+                    default_filter_control_configuration: null
+                    filter_id: '{{ filter_id }}'
+                    range_maximum: null
+                    include_minimum: '{{ include_minimum }}'
+                  time_range_filter:
+                    range_minimum_value:
+                      rolling_date:
+                        expression: '{{ expression }}'
+                        data_set_identifier: '{{ data_set_identifier }}'
+                      static_value: '{{ static_value }}'
+                      parameter: '{{ parameter }}'
+                    column: null
+                    range_maximum_value: null
+                    include_maximum: '{{ include_maximum }}'
+                    time_granularity: '{{ time_granularity }}'
+                    null_option: null
+                    default_filter_control_configuration: null
+                    filter_id: '{{ filter_id }}'
+                    include_minimum: '{{ include_minimum }}'
+                    exclude_period_configuration:
+                      status: null
+                      amount: null
+                      granularity: null
+                  relative_dates_filter:
+                    relative_date_value: null
+                    column: null
+                    relative_date_type: '{{ relative_date_type }}'
+                    time_granularity: null
+                    parameter_name: '{{ parameter_name }}'
+                    null_option: null
+                    default_filter_control_configuration: null
+                    filter_id: '{{ filter_id }}'
+                    anchor_date_configuration:
+                      anchor_option: '{{ anchor_option }}'
+                      parameter_name: '{{ parameter_name }}'
+                    minimum_granularity: null
+                    exclude_period_configuration: null
+                  top_bottom_filter:
+                    aggregation_sort_configurations:
+                      - aggregation_function: null
+                        sort_direction: '{{ sort_direction }}'
+                        column: null
+                    column: null
+                    time_granularity: null
+                    parameter_name: '{{ parameter_name }}'
+                    limit: null
+                    default_filter_control_configuration: null
+                    filter_id: '{{ filter_id }}'
+                  time_equality_filter:
+                    column: null
+                    rolling_date: null
+                    value: '{{ value }}'
+                    time_granularity: null
+                    parameter_name: '{{ parameter_name }}'
+                    default_filter_control_configuration: null
+                    filter_id: '{{ filter_id }}'
+                  category_filter:
+                    configuration: null
+                    column: null
+                    default_filter_control_configuration: null
+                    filter_id: '{{ filter_id }}'
+              cross_dataset: '{{ cross_dataset }}'
+              scope_configuration:
+                all_sheets: {}
+                selected_sheets:
+                  sheet_visual_scoping_configurations:
+                    - scope: '{{ scope }}'
+                      sheet_id: '{{ sheet_id }}'
+                      visual_ids:
+                        - '{{ visual_ids[0] }}'
+              filter_group_id: '{{ filter_group_id }}'
+          query_execution_options:
+            query_execution_mode: '{{ query_execution_mode }}'
+          static_files:
+            - image_static_file:
+                static_file_id: '{{ static_file_id }}'
+                source:
+                  url_options:
+                    url: '{{ url }}'
+                  s3_options:
+                    bucket_name: '{{ bucket_name }}'
+                    object_key: '{{ object_key }}'
+                    region: '{{ region }}'
+              spatial_static_file:
+                static_file_id: '{{ static_file_id }}'
+                source: null
+          calculated_fields:
+            - expression: '{{ expression }}'
+              data_set_identifier: '{{ data_set_identifier }}'
+              name: '{{ name }}'
+          data_set_identifier_declarations:
+            - identifier: '{{ identifier }}'
+              data_set_arn: '{{ data_set_arn }}'
+          column_configurations:
+            - role: '{{ role }}'
+              format_configuration:
+                number_format_configuration:
+                  format_configuration:
+                    number_display_format_configuration:
+                      negative_value_configuration:
+                        display_mode: '{{ display_mode }}'
+                      decimal_places_configuration:
+                        decimal_places: null
+                      number_scale: '{{ number_scale }}'
+                      null_value_format_configuration:
+                        null_string: '{{ null_string }}'
+                      suffix: '{{ suffix }}'
+                      separator_configuration:
+                        decimal_separator: '{{ decimal_separator }}'
+                        thousands_separator:
+                          symbol: null
+                          visibility: null
+                          grouping_style: '{{ grouping_style }}'
+                      prefix: '{{ prefix }}'
+                    currency_display_format_configuration:
+                      negative_value_configuration: null
+                      decimal_places_configuration: null
+                      number_scale: null
+                      null_value_format_configuration: null
+                      suffix: '{{ suffix }}'
+                      separator_configuration: null
+                      symbol: '{{ symbol }}'
+                      prefix: '{{ prefix }}'
+                    percentage_display_format_configuration:
+                      negative_value_configuration: null
+                      decimal_places_configuration: null
+                      null_value_format_configuration: null
+                      suffix: '{{ suffix }}'
+                      separator_configuration: null
+                      prefix: '{{ prefix }}'
+                date_time_format_configuration:
+                  numeric_format_configuration: null
+                  null_value_format_configuration: null
+                  date_time_format: '{{ date_time_format }}'
+                string_format_configuration:
+                  numeric_format_configuration: null
+                  null_value_format_configuration: null
+              column: null
+              colors_configuration:
+                custom_colors:
+                  - color: '{{ color }}'
+                    field_value: '{{ field_value }}'
+                    special_value: '{{ special_value }}'
+          analysis_defaults:
+            default_new_sheet_configuration:
+              sheet_content_type: '{{ sheet_content_type }}'
+              interactive_layout_configuration:
+                free_form:
+                  canvas_size_options:
+                    screen_canvas_size_options:
+                      optimized_view_port_width: '{{ optimized_view_port_width }}'
+                grid:
+                  canvas_size_options:
+                    screen_canvas_size_options:
+                      optimized_view_port_width: '{{ optimized_view_port_width }}'
+                      resize_option: '{{ resize_option }}'
+              paginated_layout_configuration:
+                section_based:
+                  canvas_size_options:
+                    paper_canvas_size_options:
+                      paper_margin:
+                        left: '{{ left }}'
+                        top: '{{ top }}'
+                        right: '{{ right }}'
+                        bottom: '{{ bottom }}'
+                      paper_size: '{{ paper_size }}'
+                      paper_orientation: '{{ paper_orientation }}'
+          sheets:
+            - description: '{{ description }}'
+              parameter_controls:
+                - slider:
+                    parameter_control_id: '{{ parameter_control_id }}'
+                    step_size: null
+                    display_options: null
+                    source_parameter_name: '{{ source_parameter_name }}'
+                    title: '{{ title }}'
+                    maximum_value: null
+                    minimum_value: null
+                  text_area:
+                    parameter_control_id: '{{ parameter_control_id }}'
+                    delimiter: '{{ delimiter }}'
+                    display_options: null
+                    source_parameter_name: '{{ source_parameter_name }}'
+                    title: '{{ title }}'
+                  dropdown:
+                    parameter_control_id: '{{ parameter_control_id }}'
+                    type: null
+                    display_options: null
+                    source_parameter_name: '{{ source_parameter_name }}'
+                    cascading_control_configuration:
+                      source_controls:
+                        - source_sheet_control_id: '{{ source_sheet_control_id }}'
+                          column_to_match: null
+                    title: '{{ title }}'
+                    commit_mode: null
+                    selectable_values:
+                      link_to_data_set_column: null
+                      values:
+                        - '{{ values[0] }}'
+                  text_field:
+                    parameter_control_id: '{{ parameter_control_id }}'
+                    display_options: null
+                    source_parameter_name: '{{ source_parameter_name }}'
+                    title: '{{ title }}'
+                  list:
+                    parameter_control_id: '{{ parameter_control_id }}'
+                    type: null
+                    display_options: null
+                    source_parameter_name: '{{ source_parameter_name }}'
+                    cascading_control_configuration: null
+                    title: '{{ title }}'
+                    selectable_values: null
+                  date_time_picker:
+                    parameter_control_id: '{{ parameter_control_id }}'
+                    display_options: null
+                    source_parameter_name: '{{ source_parameter_name }}'
+                    title: '{{ title }}'
+              content_type: null
+              sheet_id: '{{ sheet_id }}'
+              images:
+                - actions:
+                    - status: null
+                      trigger: '{{ trigger }}'
+                      custom_action_id: '{{ custom_action_id }}'
+                      name: '{{ name }}'
+                      action_operations:
+                        - navigation_operation:
+                            local_navigation_configuration:
+                              target_sheet_id: '{{ target_sheet_id }}'
+                          set_parameters_operation:
+                            parameter_value_configurations:
+                              - destination_parameter_name: '{{ destination_parameter_name }}'
+                                value:
+                                  custom_values_configuration:
+                                    include_null_value: '{{ include_null_value }}'
+                                    custom_values:
+                                      decimal_values:
                                         - null
-                                      IntegerValues:
+                                      integer_values:
                                         - null
-                                      StringValues:
-                                        - '{{ StringValues[0] }}'
-                                      DateTimeValues:
-                                        - '{{ DateTimeValues[0] }}'
-                                  SourceParameterName: '{{ SourceParameterName }}'
-                                  SelectAllValueOptions: '{{ SelectAllValueOptions }}'
-                                  SourceField: '{{ SourceField }}'
-                                  SourceColumn: null
-                          URLOperation:
-                            URLTemplate: '{{ URLTemplate }}'
-                            URLTarget: '{{ URLTarget }}'
-                  SheetImageId: '{{ SheetImageId }}'
-                  Tooltip:
-                    Visibility: null
-                    TooltipText:
-                      PlainText: '{{ PlainText }}'
-                  Scaling:
-                    ScalingType: '{{ ScalingType }}'
-                  Interactions:
-                    ImageMenuOption:
-                      AvailabilityStatus: '{{ AvailabilityStatus }}'
-                  Source:
-                    SheetImageStaticFileSource:
-                      StaticFileId: '{{ StaticFileId }}'
-                  ImageContentAltText: '{{ ImageContentAltText }}'
-              SheetControlLayouts:
-                - Configuration:
-                    GridLayout:
-                      CanvasSizeOptions: null
-                      Elements:
-                        - ElementType: '{{ ElementType }}'
-                          ColumnSpan: null
-                          ColumnIndex: null
-                          RowIndex: null
-                          RowSpan: null
-                          ElementId: '{{ ElementId }}'
-              Title: '{{ Title }}'
-              Name: '{{ Name }}'
-              TextBoxes:
-                - SheetTextBoxId: '{{ SheetTextBoxId }}'
-                  Content: '{{ Content }}'
-              Layouts:
-                - Configuration:
-                    GridLayout: null
-                    FreeFormLayout:
-                      CanvasSizeOptions: null
-                      Elements:
-                        - ElementType: null
-                          BorderStyle:
-                            Color: '{{ Color }}'
-                            Visibility: null
-                          Height: '{{ Height }}'
-                          Visibility: null
-                          RenderingRules:
-                            - Expression: '{{ Expression }}'
-                              ConfigurationOverrides:
-                                Visibility: null
-                          YAxisLocation: '{{ YAxisLocation }}'
-                          LoadingAnimation:
-                            Visibility: null
-                          Width: '{{ Width }}'
-                          BackgroundStyle:
-                            Color: '{{ Color }}'
-                            Visibility: null
-                          ElementId: '{{ ElementId }}'
-                          XAxisLocation: '{{ XAxisLocation }}'
-                          SelectedBorderStyle: null
-                    SectionBasedLayout:
-                      CanvasSizeOptions: null
-                      FooterSections:
-                        - Layout:
-                            FreeFormLayout:
-                              Elements:
+                                      string_values:
+                                        - '{{ string_values[0] }}'
+                                      date_time_values:
+                                        - '{{ date_time_values[0] }}'
+                                  source_parameter_name: '{{ source_parameter_name }}'
+                                  select_all_value_options: '{{ select_all_value_options }}'
+                                  source_field: '{{ source_field }}'
+                                  source_column: null
+                          url_operation:
+                            url_template: '{{ url_template }}'
+                            url_target: '{{ url_target }}'
+                  sheet_image_id: '{{ sheet_image_id }}'
+                  tooltip:
+                    visibility: null
+                    tooltip_text:
+                      plain_text: '{{ plain_text }}'
+                  scaling:
+                    scaling_type: '{{ scaling_type }}'
+                  interactions:
+                    image_menu_option:
+                      availability_status: '{{ availability_status }}'
+                  source:
+                    sheet_image_static_file_source:
+                      static_file_id: '{{ static_file_id }}'
+                  image_content_alt_text: '{{ image_content_alt_text }}'
+              sheet_control_layouts:
+                - configuration:
+                    grid_layout:
+                      canvas_size_options: null
+                      elements:
+                        - element_type: '{{ element_type }}'
+                          column_span: null
+                          column_index: null
+                          row_index: null
+                          row_span: null
+                          element_id: '{{ element_id }}'
+              title: '{{ title }}'
+              name: '{{ name }}'
+              text_boxes:
+                - sheet_text_box_id: '{{ sheet_text_box_id }}'
+                  content: '{{ content }}'
+              layouts:
+                - configuration:
+                    grid_layout: null
+                    free_form_layout:
+                      canvas_size_options: null
+                      elements:
+                        - element_type: null
+                          border_style:
+                            color: '{{ color }}'
+                            visibility: null
+                          height: '{{ height }}'
+                          visibility: null
+                          rendering_rules:
+                            - expression: '{{ expression }}'
+                              configuration_overrides:
+                                visibility: null
+                          y_axis_location: '{{ y_axis_location }}'
+                          loading_animation:
+                            visibility: null
+                          width: '{{ width }}'
+                          background_style:
+                            color: '{{ color }}'
+                            visibility: null
+                          element_id: '{{ element_id }}'
+                          x_axis_location: '{{ x_axis_location }}'
+                          selected_border_style: null
+                    section_based_layout:
+                      canvas_size_options: null
+                      footer_sections:
+                        - layout:
+                            free_form_layout:
+                              elements:
                                 - null
-                          Style:
-                            Padding: null
-                            Height: '{{ Height }}'
-                          SectionId: '{{ SectionId }}'
-                      BodySections:
-                        - Content:
-                            Layout: null
-                          Style: null
-                          PageBreakConfiguration:
-                            After:
-                              Status: '{{ Status }}'
-                          SectionId: '{{ SectionId }}'
-                          RepeatConfiguration:
-                            DimensionConfigurations:
-                              - DynamicNumericDimensionConfiguration:
-                                  Column: null
-                                  SortByMetrics:
-                                    - AggregationFunction: null
-                                      SortBy: null
-                                      Direction: null
-                                  Limit: null
-                                DynamicCategoryDimensionConfiguration:
-                                  Column: null
-                                  SortByMetrics:
+                          style:
+                            padding: null
+                            height: '{{ height }}'
+                          section_id: '{{ section_id }}'
+                      body_sections:
+                        - content:
+                            layout: null
+                          style: null
+                          page_break_configuration:
+                            after:
+                              status: '{{ status }}'
+                          section_id: '{{ section_id }}'
+                          repeat_configuration:
+                            dimension_configurations:
+                              - dynamic_numeric_dimension_configuration:
+                                  column: null
+                                  sort_by_metrics:
+                                    - aggregation_function: null
+                                      sort_by: null
+                                      direction: null
+                                  limit: null
+                                dynamic_category_dimension_configuration:
+                                  column: null
+                                  sort_by_metrics:
                                     - null
-                                  Limit: null
-                            NonRepeatingVisuals:
-                              - '{{ NonRepeatingVisuals[0] }}'
-                            PageBreakConfiguration:
-                              After: null
-                      HeaderSections:
+                                  limit: null
+                            non_repeating_visuals:
+                              - '{{ non_repeating_visuals[0] }}'
+                            page_break_configuration:
+                              after: null
+                      header_sections:
                         - null
-              FilterControls:
-                - Slider:
-                    FilterControlId: '{{ FilterControlId }}'
-                    Type: null
-                    StepSize: null
-                    DisplayOptions: null
-                    Title: '{{ Title }}'
-                    MaximumValue: null
-                    SourceFilterId: '{{ SourceFilterId }}'
-                    MinimumValue: null
-                  TextArea:
-                    FilterControlId: '{{ FilterControlId }}'
-                    Delimiter: '{{ Delimiter }}'
-                    DisplayOptions: null
-                    Title: '{{ Title }}'
-                    SourceFilterId: '{{ SourceFilterId }}'
-                  Dropdown:
-                    FilterControlId: '{{ FilterControlId }}'
-                    Type: null
-                    DisplayOptions: null
-                    CascadingControlConfiguration: null
-                    Title: '{{ Title }}'
-                    CommitMode: null
-                    SourceFilterId: '{{ SourceFilterId }}'
-                    SelectableValues: null
-                  TextField:
-                    FilterControlId: '{{ FilterControlId }}'
-                    DisplayOptions: null
-                    Title: '{{ Title }}'
-                    SourceFilterId: '{{ SourceFilterId }}'
-                  List:
-                    FilterControlId: '{{ FilterControlId }}'
-                    Type: null
-                    DisplayOptions: null
-                    CascadingControlConfiguration: null
-                    Title: '{{ Title }}'
-                    SourceFilterId: '{{ SourceFilterId }}'
-                    SelectableValues: null
-                  DateTimePicker:
-                    FilterControlId: '{{ FilterControlId }}'
-                    Type: null
-                    DisplayOptions: null
-                    Title: '{{ Title }}'
-                    CommitMode: null
-                    SourceFilterId: '{{ SourceFilterId }}'
-                  RelativeDateTime:
-                    FilterControlId: '{{ FilterControlId }}'
-                    DisplayOptions: null
-                    Title: '{{ Title }}'
-                    CommitMode: null
-                    SourceFilterId: '{{ SourceFilterId }}'
-                  CrossSheet:
-                    FilterControlId: '{{ FilterControlId }}'
-                    CascadingControlConfiguration: null
-                    SourceFilterId: '{{ SourceFilterId }}'
-              Visuals:
-                - FunnelChartVisual:
-                    Subtitle:
-                      Visibility: null
-                      FormatText:
-                        RichText: '{{ RichText }}'
-                        PlainText: '{{ PlainText }}'
-                    VisualId: '{{ VisualId }}'
-                    ChartConfiguration:
-                      SortConfiguration:
-                        CategoryItemsLimit:
-                          ItemsLimit: null
-                          OtherCategories: '{{ OtherCategories }}'
-                        CategorySort:
-                          - FieldSort:
-                              FieldId: '{{ FieldId }}'
-                              Direction: null
-                            ColumnSort: null
-                      DataLabelOptions:
-                        MeasureLabelVisibility: null
-                        Position: '{{ Position }}'
-                        Visibility: null
-                        CategoryLabelVisibility: null
-                        LabelColor: '{{ LabelColor }}'
-                        MeasureDataLabelStyle: '{{ MeasureDataLabelStyle }}'
-                        LabelFontConfiguration: null
-                      CategoryLabelOptions:
-                        Visibility: null
-                        SortIconVisibility: null
-                        AxisLabelOptions:
-                          - CustomLabel: '{{ CustomLabel }}'
-                            ApplyTo:
-                              Column: null
-                              FieldId: '{{ FieldId }}'
-                            FontConfiguration: null
-                      FieldWells:
-                        FunnelChartAggregatedFieldWells:
-                          Category:
-                            - DateDimensionField:
-                                HierarchyId: '{{ HierarchyId }}'
-                                FormatConfiguration: null
-                                Column: null
-                                FieldId: '{{ FieldId }}'
-                                DateGranularity: null
-                              NumericalDimensionField:
-                                HierarchyId: '{{ HierarchyId }}'
-                                FormatConfiguration: null
-                                Column: null
-                                FieldId: '{{ FieldId }}'
-                              CategoricalDimensionField:
-                                HierarchyId: '{{ HierarchyId }}'
-                                FormatConfiguration: null
-                                Column: null
-                                FieldId: '{{ FieldId }}'
-                          Values:
-                            - DateMeasureField:
-                                AggregationFunction: null
-                                FormatConfiguration: null
-                                Column: null
-                                FieldId: '{{ FieldId }}'
-                              NumericalMeasureField:
-                                AggregationFunction: null
-                                FormatConfiguration: null
-                                Column: null
-                                FieldId: '{{ FieldId }}'
-                              CategoricalMeasureField:
-                                AggregationFunction: null
-                                FormatConfiguration: null
-                                Column: null
-                                FieldId: '{{ FieldId }}'
-                              CalculatedMeasureField:
-                                Expression: '{{ Expression }}'
-                                FieldId: '{{ FieldId }}'
-                      Tooltip:
-                        SelectedTooltipType: '{{ SelectedTooltipType }}'
-                        TooltipVisibility: null
-                        FieldBasedTooltip:
-                          TooltipFields:
-                            - FieldTooltipItem:
-                                TooltipTarget: '{{ TooltipTarget }}'
-                                FieldId: '{{ FieldId }}'
-                                Label: '{{ Label }}'
-                                Visibility: null
-                              ColumnTooltipItem:
-                                Aggregation: null
-                                TooltipTarget: null
-                                Column: null
-                                Label: '{{ Label }}'
-                                Visibility: null
-                          AggregationVisibility: null
-                          TooltipTitleType: '{{ TooltipTitleType }}'
-                      Interactions:
-                        ContextMenuOption:
-                          AvailabilityStatus: null
-                        VisualMenuOption:
-                          AvailabilityStatus: null
-                      ValueLabelOptions: null
-                      VisualPalette:
-                        ChartColor: '{{ ChartColor }}'
-                        ColorMap:
-                          - Element:
-                              DataPathType:
-                                PivotTableDataPathType: '{{ PivotTableDataPathType }}'
-                              FieldId: '{{ FieldId }}'
-                              FieldValue: '{{ FieldValue }}'
-                            Color: '{{ Color }}'
-                            TimeGranularity: null
-                    Actions:
-                      - Status: null
-                        Trigger: '{{ Trigger }}'
-                        CustomActionId: '{{ CustomActionId }}'
-                        Name: '{{ Name }}'
-                        ActionOperations:
-                          - NavigationOperation: null
-                            SetParametersOperation: null
-                            FilterOperation:
-                              SelectedFieldsConfiguration:
-                                SelectedColumns:
+              filter_controls:
+                - slider:
+                    filter_control_id: '{{ filter_control_id }}'
+                    type: null
+                    step_size: null
+                    display_options: null
+                    title: '{{ title }}'
+                    maximum_value: null
+                    source_filter_id: '{{ source_filter_id }}'
+                    minimum_value: null
+                  text_area:
+                    filter_control_id: '{{ filter_control_id }}'
+                    delimiter: '{{ delimiter }}'
+                    display_options: null
+                    title: '{{ title }}'
+                    source_filter_id: '{{ source_filter_id }}'
+                  dropdown:
+                    filter_control_id: '{{ filter_control_id }}'
+                    type: null
+                    display_options: null
+                    cascading_control_configuration: null
+                    title: '{{ title }}'
+                    commit_mode: null
+                    source_filter_id: '{{ source_filter_id }}'
+                    selectable_values: null
+                  text_field:
+                    filter_control_id: '{{ filter_control_id }}'
+                    display_options: null
+                    title: '{{ title }}'
+                    source_filter_id: '{{ source_filter_id }}'
+                  list:
+                    filter_control_id: '{{ filter_control_id }}'
+                    type: null
+                    display_options: null
+                    cascading_control_configuration: null
+                    title: '{{ title }}'
+                    source_filter_id: '{{ source_filter_id }}'
+                    selectable_values: null
+                  date_time_picker:
+                    filter_control_id: '{{ filter_control_id }}'
+                    type: null
+                    display_options: null
+                    title: '{{ title }}'
+                    commit_mode: null
+                    source_filter_id: '{{ source_filter_id }}'
+                  relative_date_time:
+                    filter_control_id: '{{ filter_control_id }}'
+                    display_options: null
+                    title: '{{ title }}'
+                    commit_mode: null
+                    source_filter_id: '{{ source_filter_id }}'
+                  cross_sheet:
+                    filter_control_id: '{{ filter_control_id }}'
+                    cascading_control_configuration: null
+                    source_filter_id: '{{ source_filter_id }}'
+              visuals:
+                - funnel_chart_visual:
+                    subtitle:
+                      visibility: null
+                      format_text:
+                        rich_text: '{{ rich_text }}'
+                        plain_text: '{{ plain_text }}'
+                    visual_id: '{{ visual_id }}'
+                    chart_configuration:
+                      sort_configuration:
+                        category_items_limit:
+                          items_limit: null
+                          other_categories: '{{ other_categories }}'
+                        category_sort:
+                          - field_sort:
+                              field_id: '{{ field_id }}'
+                              direction: null
+                            column_sort: null
+                      data_label_options:
+                        measure_label_visibility: null
+                        position: '{{ position }}'
+                        visibility: null
+                        category_label_visibility: null
+                        label_color: '{{ label_color }}'
+                        measure_data_label_style: '{{ measure_data_label_style }}'
+                        label_font_configuration: null
+                      category_label_options:
+                        visibility: null
+                        sort_icon_visibility: null
+                        axis_label_options:
+                          - custom_label: '{{ custom_label }}'
+                            apply_to:
+                              column: null
+                              field_id: '{{ field_id }}'
+                            font_configuration: null
+                      field_wells:
+                        funnel_chart_aggregated_field_wells:
+                          category:
+                            - date_dimension_field:
+                                hierarchy_id: '{{ hierarchy_id }}'
+                                format_configuration: null
+                                column: null
+                                field_id: '{{ field_id }}'
+                                date_granularity: null
+                              numerical_dimension_field:
+                                hierarchy_id: '{{ hierarchy_id }}'
+                                format_configuration: null
+                                column: null
+                                field_id: '{{ field_id }}'
+                              categorical_dimension_field:
+                                hierarchy_id: '{{ hierarchy_id }}'
+                                format_configuration: null
+                                column: null
+                                field_id: '{{ field_id }}'
+                          values:
+                            - date_measure_field:
+                                aggregation_function: null
+                                format_configuration: null
+                                column: null
+                                field_id: '{{ field_id }}'
+                              numerical_measure_field:
+                                aggregation_function: null
+                                format_configuration: null
+                                column: null
+                                field_id: '{{ field_id }}'
+                              categorical_measure_field:
+                                aggregation_function: null
+                                format_configuration: null
+                                column: null
+                                field_id: '{{ field_id }}'
+                              calculated_measure_field:
+                                expression: '{{ expression }}'
+                                field_id: '{{ field_id }}'
+                      tooltip:
+                        selected_tooltip_type: '{{ selected_tooltip_type }}'
+                        tooltip_visibility: null
+                        field_based_tooltip:
+                          tooltip_fields:
+                            - field_tooltip_item:
+                                tooltip_target: '{{ tooltip_target }}'
+                                field_id: '{{ field_id }}'
+                                label: '{{ label }}'
+                                visibility: null
+                              column_tooltip_item:
+                                aggregation: null
+                                tooltip_target: null
+                                column: null
+                                label: '{{ label }}'
+                                visibility: null
+                          aggregation_visibility: null
+                          tooltip_title_type: '{{ tooltip_title_type }}'
+                      interactions:
+                        context_menu_option:
+                          availability_status: null
+                        visual_menu_option:
+                          availability_status: null
+                      value_label_options: null
+                      visual_palette:
+                        chart_color: '{{ chart_color }}'
+                        color_map:
+                          - element:
+                              data_path_type:
+                                pivot_table_data_path_type: '{{ pivot_table_data_path_type }}'
+                              field_id: '{{ field_id }}'
+                              field_value: '{{ field_value }}'
+                            color: '{{ color }}'
+                            time_granularity: null
+                    actions:
+                      - status: null
+                        trigger: '{{ trigger }}'
+                        custom_action_id: '{{ custom_action_id }}'
+                        name: '{{ name }}'
+                        action_operations:
+                          - navigation_operation: null
+                            set_parameters_operation: null
+                            filter_operation:
+                              selected_fields_configuration:
+                                selected_columns:
                                   - null
-                                SelectedFields:
-                                  - '{{ SelectedFields[0] }}'
-                                SelectedFieldOptions: '{{ SelectedFieldOptions }}'
-                              TargetVisualsConfiguration:
-                                SameSheetTargetVisualConfiguration:
-                                  TargetVisualOptions: '{{ TargetVisualOptions }}'
-                                  TargetVisuals:
-                                    - '{{ TargetVisuals[0] }}'
-                            URLOperation: null
-                    Title:
-                      Visibility: null
-                      FormatText:
-                        RichText: '{{ RichText }}'
-                        PlainText: '{{ PlainText }}'
-                    VisualContentAltText: '{{ VisualContentAltText }}'
-                    ColumnHierarchies:
-                      - DateTimeHierarchy:
-                          HierarchyId: '{{ HierarchyId }}'
-                          DrillDownFilters:
-                            - NumericEqualityFilter:
-                                Column: null
-                                Value: null
-                              TimeRangeFilter:
-                                Column: null
-                                RangeMinimum: '{{ RangeMinimum }}'
-                                TimeGranularity: null
-                                RangeMaximum: '{{ RangeMaximum }}'
-                              CategoryFilter:
-                                Column: null
-                                CategoryValues:
-                                  - '{{ CategoryValues[0] }}'
-                        ExplicitHierarchy:
-                          HierarchyId: '{{ HierarchyId }}'
-                          DrillDownFilters:
-                            - null
-                          Columns:
-                            - null
-                        PredefinedHierarchy:
-                          HierarchyId: '{{ HierarchyId }}'
-                          DrillDownFilters:
-                            - null
-                          Columns:
-                            - null
-                  BoxPlotVisual:
-                    Subtitle: null
-                    VisualId: '{{ VisualId }}'
-                    ChartConfiguration:
-                      SortConfiguration:
-                        CategorySort:
+                                selected_fields:
+                                  - '{{ selected_fields[0] }}'
+                                selected_field_options: '{{ selected_field_options }}'
+                              target_visuals_configuration:
+                                same_sheet_target_visual_configuration:
+                                  target_visual_options: '{{ target_visual_options }}'
+                                  target_visuals:
+                                    - '{{ target_visuals[0] }}'
+                            url_operation: null
+                    title:
+                      visibility: null
+                      format_text:
+                        rich_text: '{{ rich_text }}'
+                        plain_text: '{{ plain_text }}'
+                    visual_content_alt_text: '{{ visual_content_alt_text }}'
+                    column_hierarchies:
+                      - date_time_hierarchy:
+                          hierarchy_id: '{{ hierarchy_id }}'
+                          drill_down_filters:
+                            - numeric_equality_filter:
+                                column: null
+                                value: null
+                              time_range_filter:
+                                column: null
+                                range_minimum: '{{ range_minimum }}'
+                                time_granularity: null
+                                range_maximum: '{{ range_maximum }}'
+                              category_filter:
+                                column: null
+                                category_values:
+                                  - '{{ category_values[0] }}'
+                        explicit_hierarchy:
+                          hierarchy_id: '{{ hierarchy_id }}'
+                          drill_down_filters:
+                            - null
+                          columns:
+                            - null
+                        predefined_hierarchy:
+                          hierarchy_id: '{{ hierarchy_id }}'
+                          drill_down_filters:
+                            - null
+                          columns:
+                            - null
+                  box_plot_visual:
+                    subtitle: null
+                    visual_id: '{{ visual_id }}'
+                    chart_configuration:
+                      sort_configuration:
+                        category_sort:
                           - null
-                        PaginationConfiguration:
-                          PageSize: null
-                          PageNumber: null
-                      Legend:
-                        Position: '{{ Position }}'
-                        ValueFontConfiguration: null
-                        Title: null
-                        Visibility: null
-                        Height: '{{ Height }}'
-                        Width: '{{ Width }}'
-                      ReferenceLines:
-                        - Status: null
-                          DataConfiguration:
-                            DynamicConfiguration:
-                              Column: null
-                              MeasureAggregationFunction: null
-                              Calculation: null
-                            AxisBinding: '{{ AxisBinding }}'
-                            SeriesType: '{{ SeriesType }}'
-                            StaticConfiguration:
-                              Value: null
-                          LabelConfiguration:
-                            HorizontalPosition: '{{ HorizontalPosition }}'
-                            ValueLabelConfiguration:
-                              FormatConfiguration: null
-                              RelativePosition: '{{ RelativePosition }}'
-                            CustomLabelConfiguration:
-                              CustomLabel: '{{ CustomLabel }}'
-                            FontColor: '{{ FontColor }}'
-                            FontConfiguration: null
-                            VerticalPosition: '{{ VerticalPosition }}'
-                          StyleConfiguration:
-                            Pattern: '{{ Pattern }}'
-                            Color: '{{ Color }}'
-                      CategoryAxis:
-                        DataOptions:
-                          DateAxisOptions:
-                            MissingDateVisibility: null
-                          NumericAxisOptions:
-                            Scale:
-                              Logarithmic:
-                                Base: null
-                              Linear:
-                                StepSize: null
-                                StepCount: null
-                            Range:
-                              DataDriven: {}
-                              MinMax:
-                                Minimum: null
-                                Maximum: null
-                        TickLabelOptions:
-                          RotationAngle: null
-                          LabelOptions: null
-                        AxisOffset: '{{ AxisOffset }}'
-                        AxisLineVisibility: null
-                        GridLineVisibility: null
-                        ScrollbarOptions:
-                          VisibleRange:
-                            PercentRange:
-                              From: null
-                              To: null
-                          Visibility: null
-                      PrimaryYAxisLabelOptions: null
-                      CategoryLabelOptions: null
-                      FieldWells:
-                        BoxPlotAggregatedFieldWells:
-                          GroupBy:
-                            - null
-                          Values:
-                            - null
-                      Tooltip: null
-                      BoxPlotOptions:
-                        StyleOptions:
-                          FillStyle: '{{ FillStyle }}'
-                        OutlierVisibility: null
-                        AllDataPointsVisibility: null
-                      Interactions: null
-                      PrimaryYAxisDisplayOptions: null
-                      VisualPalette: null
-                    Actions:
+                        pagination_configuration:
+                          page_size: null
+                          page_number: null
+                      legend:
+                        position: '{{ position }}'
+                        value_font_configuration: null
+                        title: null
+                        visibility: null
+                        height: '{{ height }}'
+                        width: '{{ width }}'
+                      reference_lines:
+                        - status: null
+                          data_configuration:
+                            dynamic_configuration:
+                              column: null
+                              measure_aggregation_function: null
+                              calculation: null
+                            axis_binding: '{{ axis_binding }}'
+                            series_type: '{{ series_type }}'
+                            static_configuration:
+                              value: null
+                          label_configuration:
+                            horizontal_position: '{{ horizontal_position }}'
+                            value_label_configuration:
+                              format_configuration: null
+                              relative_position: '{{ relative_position }}'
+                            custom_label_configuration:
+                              custom_label: '{{ custom_label }}'
+                            font_color: '{{ font_color }}'
+                            font_configuration: null
+                            vertical_position: '{{ vertical_position }}'
+                          style_configuration:
+                            pattern: '{{ pattern }}'
+                            color: '{{ color }}'
+                      category_axis:
+                        data_options:
+                          date_axis_options:
+                            missing_date_visibility: null
+                          numeric_axis_options:
+                            scale:
+                              logarithmic:
+                                base: null
+                              linear:
+                                step_size: null
+                                step_count: null
+                            range:
+                              data_driven: {}
+                              min_max:
+                                minimum: null
+                                maximum: null
+                        tick_label_options:
+                          rotation_angle: null
+                          label_options: null
+                        axis_offset: '{{ axis_offset }}'
+                        axis_line_visibility: null
+                        grid_line_visibility: null
+                        scrollbar_options:
+                          visible_range:
+                            percent_range:
+                              from: null
+                              to: null
+                          visibility: null
+                      primary_yaxis_label_options: null
+                      category_label_options: null
+                      field_wells:
+                        box_plot_aggregated_field_wells:
+                          group_by:
+                            - null
+                          values:
+                            - null
+                      tooltip: null
+                      box_plot_options:
+                        style_options:
+                          fill_style: '{{ fill_style }}'
+                        outlier_visibility: null
+                        all_data_points_visibility: null
+                      interactions: null
+                      primary_yaxis_display_options: null
+                      visual_palette: null
+                    actions:
                       - null
-                    Title: null
-                    VisualContentAltText: '{{ VisualContentAltText }}'
-                    ColumnHierarchies:
+                    title: null
+                    visual_content_alt_text: '{{ visual_content_alt_text }}'
+                    column_hierarchies:
                       - null
-                  GeospatialMapVisual:
-                    Subtitle: null
-                    VisualId: '{{ VisualId }}'
-                    ChartConfiguration:
-                      Legend: null
-                      MapStyleOptions:
-                        BaseMapStyle: '{{ BaseMapStyle }}'
-                      FieldWells:
-                        GeospatialMapAggregatedFieldWells:
-                          Colors:
-                            - null
-                          Values:
-                            - null
-                          Geospatial:
-                            - null
-                      Tooltip: null
-                      WindowOptions:
-                        Bounds:
-                          West: null
-                          South: null
-                          North: null
-                          East: null
-                        MapZoomMode: '{{ MapZoomMode }}'
-                      PointStyleOptions:
-                        SelectedPointStyle: '{{ SelectedPointStyle }}'
-                        ClusterMarkerConfiguration:
-                          ClusterMarker:
-                            SimpleClusterMarker:
-                              Color: '{{ Color }}'
-                        HeatmapConfiguration:
-                          HeatmapColor:
-                            Colors:
-                              - Color: '{{ Color }}'
-                      VisualPalette: null
-                    Actions:
+                  geospatial_map_visual:
+                    subtitle: null
+                    visual_id: '{{ visual_id }}'
+                    chart_configuration:
+                      legend: null
+                      map_style_options:
+                        base_map_style: '{{ base_map_style }}'
+                      field_wells:
+                        geospatial_map_aggregated_field_wells:
+                          colors:
+                            - null
+                          values:
+                            - null
+                          geospatial:
+                            - null
+                      tooltip: null
+                      window_options:
+                        bounds:
+                          west: null
+                          south: null
+                          north: null
+                          east: null
+                        map_zoom_mode: '{{ map_zoom_mode }}'
+                      point_style_options:
+                        selected_point_style: '{{ selected_point_style }}'
+                        cluster_marker_configuration:
+                          cluster_marker:
+                            simple_cluster_marker:
+                              color: '{{ color }}'
+                        heatmap_configuration:
+                          heatmap_color:
+                            colors:
+                              - color: '{{ color }}'
+                      visual_palette: null
+                    actions:
                       - null
-                    Title: null
-                    VisualContentAltText: '{{ VisualContentAltText }}'
-                    ColumnHierarchies:
+                    title: null
+                    visual_content_alt_text: '{{ visual_content_alt_text }}'
+                    column_hierarchies:
                       - null
-                  ScatterPlotVisual:
-                    Subtitle: null
-                    VisualId: '{{ VisualId }}'
-                    ChartConfiguration:
-                      YAxisLabelOptions: null
-                      SortConfiguration:
-                        ScatterPlotLimitConfiguration: null
-                      Legend: null
-                      YAxisDisplayOptions: null
-                      DataLabels:
-                        DataLabelTypes:
-                          - MaximumLabelType:
-                              Visibility: null
-                            DataPathLabelType:
-                              FieldId: '{{ FieldId }}'
-                              Visibility: null
-                              FieldValue: '{{ FieldValue }}'
-                            RangeEndsLabelType:
-                              Visibility: null
-                            FieldLabelType:
-                              FieldId: '{{ FieldId }}'
-                              Visibility: null
-                            MinimumLabelType:
-                              Visibility: null
-                        MeasureLabelVisibility: null
-                        Position: null
-                        LabelContent: '{{ LabelContent }}'
-                        Visibility: null
-                        TotalsVisibility: null
-                        Overlap: '{{ Overlap }}'
-                        CategoryLabelVisibility: null
-                        LabelColor: '{{ LabelColor }}'
-                        LabelFontConfiguration: null
-                      FieldWells:
-                        ScatterPlotUnaggregatedFieldWells:
-                          Category:
-                            - null
-                          Size:
-                            - null
-                          Label:
-                            - null
-                          XAxis:
-                            - null
-                          YAxis:
-                            - null
-                        ScatterPlotCategoricallyAggregatedFieldWells:
-                          Category:
-                            - null
-                          Size:
-                            - null
-                          Label:
-                            - null
-                          XAxis:
-                            - null
-                          YAxis:
-                            - null
-                      Tooltip: null
-                      XAxisLabelOptions: null
-                      Interactions: null
-                      VisualPalette: null
-                      XAxisDisplayOptions: null
-                    Actions:
+                  scatter_plot_visual:
+                    subtitle: null
+                    visual_id: '{{ visual_id }}'
+                    chart_configuration:
+                      y_axis_label_options: null
+                      sort_configuration:
+                        scatter_plot_limit_configuration: null
+                      legend: null
+                      y_axis_display_options: null
+                      data_labels:
+                        data_label_types:
+                          - maximum_label_type:
+                              visibility: null
+                            data_path_label_type:
+                              field_id: '{{ field_id }}'
+                              visibility: null
+                              field_value: '{{ field_value }}'
+                            range_ends_label_type:
+                              visibility: null
+                            field_label_type:
+                              field_id: '{{ field_id }}'
+                              visibility: null
+                            minimum_label_type:
+                              visibility: null
+                        measure_label_visibility: null
+                        position: null
+                        label_content: '{{ label_content }}'
+                        visibility: null
+                        totals_visibility: null
+                        overlap: '{{ overlap }}'
+                        category_label_visibility: null
+                        label_color: '{{ label_color }}'
+                        label_font_configuration: null
+                      field_wells:
+                        scatter_plot_unaggregated_field_wells:
+                          category:
+                            - null
+                          size:
+                            - null
+                          label:
+                            - null
+                          x_axis:
+                            - null
+                          y_axis:
+                            - null
+                        scatter_plot_categorically_aggregated_field_wells:
+                          category:
+                            - null
+                          size:
+                            - null
+                          label:
+                            - null
+                          x_axis:
+                            - null
+                          y_axis:
+                            - null
+                      tooltip: null
+                      x_axis_label_options: null
+                      interactions: null
+                      visual_palette: null
+                      x_axis_display_options: null
+                    actions:
                       - null
-                    Title: null
-                    VisualContentAltText: '{{ VisualContentAltText }}'
-                    ColumnHierarchies:
+                    title: null
+                    visual_content_alt_text: '{{ visual_content_alt_text }}'
+                    column_hierarchies:
                       - null
-                  RadarChartVisual:
-                    Subtitle: null
-                    VisualId: '{{ VisualId }}'
-                    ChartConfiguration:
-                      SortConfiguration:
-                        ColorSort:
+                  radar_chart_visual:
+                    subtitle: null
+                    visual_id: '{{ visual_id }}'
+                    chart_configuration:
+                      sort_configuration:
+                        color_sort:
                           - null
-                        ColorItemsLimit: null
-                        CategoryItemsLimit: null
-                        CategorySort:
+                        color_items_limit: null
+                        category_items_limit: null
+                        category_sort:
                           - null
-                      Legend: null
-                      Shape: '{{ Shape }}'
-                      BaseSeriesSettings:
-                        AreaStyleSettings:
-                          Visibility: null
-                      ColorLabelOptions: null
-                      CategoryLabelOptions: null
-                      AxesRangeScale: '{{ AxesRangeScale }}'
-                      VisualPalette: null
-                      AlternateBandColorsVisibility: null
-                      StartAngle: null
-                      CategoryAxis: null
-                      FieldWells:
-                        RadarChartAggregatedFieldWells:
-                          Category:
-                            - null
-                          Color:
-                            - null
-                          Values:
-                            - null
-                      ColorAxis: null
-                      AlternateBandOddColor: '{{ AlternateBandOddColor }}'
-                      Interactions: null
-                      AlternateBandEvenColor: '{{ AlternateBandEvenColor }}'
-                    Actions:
+                      legend: null
+                      shape: '{{ shape }}'
+                      base_series_settings:
+                        area_style_settings:
+                          visibility: null
+                      color_label_options: null
+                      category_label_options: null
+                      axes_range_scale: '{{ axes_range_scale }}'
+                      visual_palette: null
+                      alternate_band_colors_visibility: null
+                      start_angle: null
+                      category_axis: null
+                      field_wells:
+                        radar_chart_aggregated_field_wells:
+                          category:
+                            - null
+                          color:
+                            - null
+                          values:
+                            - null
+                      color_axis: null
+                      alternate_band_odd_color: '{{ alternate_band_odd_color }}'
+                      interactions: null
+                      alternate_band_even_color: '{{ alternate_band_even_color }}'
+                    actions:
                       - null
-                    Title: null
-                    VisualContentAltText: '{{ VisualContentAltText }}'
-                    ColumnHierarchies:
+                    title: null
+                    visual_content_alt_text: '{{ visual_content_alt_text }}'
+                    column_hierarchies:
                       - null
-                  ComboChartVisual:
-                    Subtitle: null
-                    VisualId: '{{ VisualId }}'
-                    ChartConfiguration:
-                      SortConfiguration:
-                        ColorSort:
+                  combo_chart_visual:
+                    subtitle: null
+                    visual_id: '{{ visual_id }}'
+                    chart_configuration:
+                      sort_configuration:
+                        color_sort:
                           - null
-                        ColorItemsLimit: null
-                        CategoryItemsLimit: null
-                        CategorySort:
+                        color_items_limit: null
+                        category_items_limit: null
+                        category_sort:
                           - null
-                      Legend: null
-                      ReferenceLines:
+                      legend: null
+                      reference_lines:
                         - null
-                      ColorLabelOptions: null
-                      BarDataLabels: null
-                      CategoryLabelOptions: null
-                      Tooltip: null
-                      SingleAxisOptions:
-                        YAxisOptions:
-                          YAxis: '{{ YAxis }}'
-                      PrimaryYAxisDisplayOptions: null
-                      VisualPalette: null
-                      BarsArrangement: '{{ BarsArrangement }}'
-                      SecondaryYAxisLabelOptions: null
-                      LineDataLabels: null
-                      CategoryAxis: null
-                      PrimaryYAxisLabelOptions: null
-                      FieldWells:
-                        ComboChartAggregatedFieldWells:
-                          BarValues:
-                            - null
-                          Category:
-                            - null
-                          Colors:
-                            - null
-                          LineValues:
-                            - null
-                      SecondaryYAxisDisplayOptions: null
-                      Interactions: null
-                    Actions:
+                      color_label_options: null
+                      bar_data_labels: null
+                      category_label_options: null
+                      tooltip: null
+                      single_axis_options:
+                        y_axis_options:
+                          y_axis: '{{ y_axis }}'
+                      primary_yaxis_display_options: null
+                      visual_palette: null
+                      bars_arrangement: '{{ bars_arrangement }}'
+                      secondary_yaxis_label_options: null
+                      line_data_labels: null
+                      category_axis: null
+                      primary_yaxis_label_options: null
+                      field_wells:
+                        combo_chart_aggregated_field_wells:
+                          bar_values:
+                            - null
+                          category:
+                            - null
+                          colors:
+                            - null
+                          line_values:
+                            - null
+                      secondary_yaxis_display_options: null
+                      interactions: null
+                    actions:
                       - null
-                    Title: null
-                    VisualContentAltText: '{{ VisualContentAltText }}'
-                    ColumnHierarchies:
+                    title: null
+                    visual_content_alt_text: '{{ visual_content_alt_text }}'
+                    column_hierarchies:
                       - null
-                  WordCloudVisual:
-                    Subtitle: null
-                    VisualId: '{{ VisualId }}'
-                    ChartConfiguration:
-                      SortConfiguration:
-                        CategoryItemsLimit: null
-                        CategorySort:
+                  word_cloud_visual:
+                    subtitle: null
+                    visual_id: '{{ visual_id }}'
+                    chart_configuration:
+                      sort_configuration:
+                        category_items_limit: null
+                        category_sort:
                           - null
-                      CategoryLabelOptions: null
-                      FieldWells:
-                        WordCloudAggregatedFieldWells:
-                          GroupBy:
-                            - null
-                          Size:
-                            - null
-                      WordCloudOptions:
-                        WordOrientation: '{{ WordOrientation }}'
-                        WordScaling: '{{ WordScaling }}'
-                        CloudLayout: '{{ CloudLayout }}'
-                        MaximumStringLength: null
-                        WordCasing: '{{ WordCasing }}'
-                        WordPadding: '{{ WordPadding }}'
-                      Interactions: null
-                    Actions:
+                      category_label_options: null
+                      field_wells:
+                        word_cloud_aggregated_field_wells:
+                          group_by:
+                            - null
+                          size:
+                            - null
+                      word_cloud_options:
+                        word_orientation: '{{ word_orientation }}'
+                        word_scaling: '{{ word_scaling }}'
+                        cloud_layout: '{{ cloud_layout }}'
+                        maximum_string_length: null
+                        word_casing: '{{ word_casing }}'
+                        word_padding: '{{ word_padding }}'
+                      interactions: null
+                    actions:
                       - null
-                    Title: null
-                    VisualContentAltText: '{{ VisualContentAltText }}'
-                    ColumnHierarchies:
+                    title: null
+                    visual_content_alt_text: '{{ visual_content_alt_text }}'
+                    column_hierarchies:
                       - null
-                  SankeyDiagramVisual:
-                    Subtitle: null
-                    VisualId: '{{ VisualId }}'
-                    ChartConfiguration:
-                      SortConfiguration:
-                        WeightSort:
+                  sankey_diagram_visual:
+                    subtitle: null
+                    visual_id: '{{ visual_id }}'
+                    chart_configuration:
+                      sort_configuration:
+                        weight_sort:
                           - null
-                        SourceItemsLimit: null
-                        DestinationItemsLimit: null
-                      DataLabels: null
-                      FieldWells:
-                        SankeyDiagramAggregatedFieldWells:
-                          Destination:
+                        source_items_limit: null
+                        destination_items_limit: null
+                      data_labels: null
+                      field_wells:
+                        sankey_diagram_aggregated_field_wells:
+                          destination:
                             - null
-                          Source:
+                          source:
                             - null
-                          Weight:
+                          weight:
                             - null
-                      Interactions: null
-                    Actions:
+                      interactions: null
+                    actions:
                       - null
-                    Title: null
-                    VisualContentAltText: '{{ VisualContentAltText }}'
-                  GaugeChartVisual:
-                    Subtitle: null
-                    ConditionalFormatting:
-                      ConditionalFormattingOptions:
-                        - Arc:
-                            ForegroundColor:
-                              Gradient:
-                                Expression: '{{ Expression }}'
-                                Color:
-                                  Stops:
-                                    - GradientOffset: null
-                                      DataValue: null
-                                      Color: '{{ Color }}'
-                              Solid:
-                                Expression: '{{ Expression }}'
-                                Color: '{{ Color }}'
-                          PrimaryValue:
-                            TextColor: null
-                            Icon:
-                              CustomCondition:
-                                Expression: '{{ Expression }}'
-                                Color: '{{ Color }}'
-                                DisplayConfiguration:
-                                  IconDisplayOption: '{{ IconDisplayOption }}'
-                                IconOptions:
-                                  UnicodeIcon: '{{ UnicodeIcon }}'
-                                  Icon: '{{ Icon }}'
-                              IconSet:
-                                Expression: '{{ Expression }}'
-                                IconSetType: '{{ IconSetType }}'
-                    VisualId: '{{ VisualId }}'
-                    ChartConfiguration:
-                      DataLabels: null
-                      FieldWells:
-                        TargetValues:
+                    title: null
+                    visual_content_alt_text: '{{ visual_content_alt_text }}'
+                  gauge_chart_visual:
+                    subtitle: null
+                    conditional_formatting:
+                      conditional_formatting_options:
+                        - arc:
+                            foreground_color:
+                              gradient:
+                                expression: '{{ expression }}'
+                                color:
+                                  stops:
+                                    - gradient_offset: null
+                                      data_value: null
+                                      color: '{{ color }}'
+                              solid:
+                                expression: '{{ expression }}'
+                                color: '{{ color }}'
+                          primary_value:
+                            text_color: null
+                            icon:
+                              custom_condition:
+                                expression: '{{ expression }}'
+                                color: '{{ color }}'
+                                display_configuration:
+                                  icon_display_option: '{{ icon_display_option }}'
+                                icon_options:
+                                  unicode_icon: '{{ unicode_icon }}'
+                                  icon: '{{ icon }}'
+                              icon_set:
+                                expression: '{{ expression }}'
+                                icon_set_type: '{{ icon_set_type }}'
+                    visual_id: '{{ visual_id }}'
+                    chart_configuration:
+                      data_labels: null
+                      field_wells:
+                        target_values:
                           - null
-                        Values:
+                        values:
                           - null
-                      TooltipOptions: null
-                      GaugeChartOptions:
-                        Arc:
-                          ArcAngle: null
-                          ArcThickness: '{{ ArcThickness }}'
-                        Comparison:
-                          ComparisonMethod: '{{ ComparisonMethod }}'
-                          ComparisonFormat:
-                            NumberDisplayFormatConfiguration: null
-                            PercentageDisplayFormatConfiguration: null
-                        PrimaryValueDisplayType: '{{ PrimaryValueDisplayType }}'
-                        ArcAxis:
-                          Range:
-                            Min: null
-                            Max: null
-                          ReserveRange: null
-                        PrimaryValueFontConfiguration: null
-                      ColorConfiguration:
-                        ForegroundColor: '{{ ForegroundColor }}'
-                        BackgroundColor: '{{ BackgroundColor }}'
-                      Interactions: null
-                      VisualPalette: null
-                    Actions:
+                      tooltip_options: null
+                      gauge_chart_options:
+                        arc:
+                          arc_angle: null
+                          arc_thickness: '{{ arc_thickness }}'
+                        comparison:
+                          comparison_method: '{{ comparison_method }}'
+                          comparison_format:
+                            number_display_format_configuration: null
+                            percentage_display_format_configuration: null
+                        primary_value_display_type: '{{ primary_value_display_type }}'
+                        arc_axis:
+                          range:
+                            min: null
+                            max: null
+                          reserve_range: null
+                        primary_value_font_configuration: null
+                      color_configuration:
+                        foreground_color: '{{ foreground_color }}'
+                        background_color: '{{ background_color }}'
+                      interactions: null
+                      visual_palette: null
+                    actions:
                       - null
-                    Title: null
-                    VisualContentAltText: '{{ VisualContentAltText }}'
-                  FilledMapVisual:
-                    Subtitle: null
-                    ConditionalFormatting:
-                      ConditionalFormattingOptions:
-                        - Shape:
-                            Format:
-                              BackgroundColor: null
-                            FieldId: '{{ FieldId }}'
-                    VisualId: '{{ VisualId }}'
-                    ChartConfiguration:
-                      SortConfiguration:
-                        CategorySort:
+                    title: null
+                    visual_content_alt_text: '{{ visual_content_alt_text }}'
+                  filled_map_visual:
+                    subtitle: null
+                    conditional_formatting:
+                      conditional_formatting_options:
+                        - shape:
+                            format:
+                              background_color: null
+                            field_id: '{{ field_id }}'
+                    visual_id: '{{ visual_id }}'
+                    chart_configuration:
+                      sort_configuration:
+                        category_sort:
                           - null
-                      Legend: null
-                      MapStyleOptions: null
-                      FieldWells:
-                        FilledMapAggregatedFieldWells:
-                          Values:
-                            - null
-                          Geospatial:
-                            - null
-                      Tooltip: null
-                      Interactions: null
-                      WindowOptions: null
-                    Actions:
+                      legend: null
+                      map_style_options: null
+                      field_wells:
+                        filled_map_aggregated_field_wells:
+                          values:
+                            - null
+                          geospatial:
+                            - null
+                      tooltip: null
+                      interactions: null
+                      window_options: null
+                    actions:
                       - null
-                    Title: null
-                    VisualContentAltText: '{{ VisualContentAltText }}'
-                    ColumnHierarchies:
+                    title: null
+                    visual_content_alt_text: '{{ visual_content_alt_text }}'
+                    column_hierarchies:
                       - null
-                  WaterfallVisual:
-                    Subtitle: null
-                    VisualId: '{{ VisualId }}'
-                    ChartConfiguration:
-                      CategoryAxisLabelOptions: null
-                      SortConfiguration:
-                        BreakdownItemsLimit: null
-                        CategorySort:
+                  waterfall_visual:
+                    subtitle: null
+                    visual_id: '{{ visual_id }}'
+                    chart_configuration:
+                      category_axis_label_options: null
+                      sort_configuration:
+                        breakdown_items_limit: null
+                        category_sort:
                           - null
-                      Legend: null
-                      DataLabels: null
-                      PrimaryYAxisLabelOptions: null
-                      FieldWells:
-                        WaterfallChartAggregatedFieldWells:
-                          Categories:
-                            - null
-                          Breakdowns:
-                            - null
-                          Values:
-                            - null
-                      WaterfallChartOptions:
-                        TotalBarLabel: '{{ TotalBarLabel }}'
-                      ColorConfiguration:
-                        GroupColorConfiguration:
-                          NegativeBarColor: '{{ NegativeBarColor }}'
-                          TotalBarColor: '{{ TotalBarColor }}'
-                          PositiveBarColor: '{{ PositiveBarColor }}'
-                      Interactions: null
-                      CategoryAxisDisplayOptions: null
-                      PrimaryYAxisDisplayOptions: null
-                      VisualPalette: null
-                    Actions:
+                      legend: null
+                      data_labels: null
+                      primary_yaxis_label_options: null
+                      field_wells:
+                        waterfall_chart_aggregated_field_wells:
+                          categories:
+                            - null
+                          breakdowns:
+                            - null
+                          values:
+                            - null
+                      waterfall_chart_options:
+                        total_bar_label: '{{ total_bar_label }}'
+                      color_configuration:
+                        group_color_configuration:
+                          negative_bar_color: '{{ negative_bar_color }}'
+                          total_bar_color: '{{ total_bar_color }}'
+                          positive_bar_color: '{{ positive_bar_color }}'
+                      interactions: null
+                      category_axis_display_options: null
+                      primary_yaxis_display_options: null
+                      visual_palette: null
+                    actions:
                       - null
-                    Title: null
-                    VisualContentAltText: '{{ VisualContentAltText }}'
-                    ColumnHierarchies:
+                    title: null
+                    visual_content_alt_text: '{{ visual_content_alt_text }}'
+                    column_hierarchies:
                       - null
-                  CustomContentVisual:
-                    Subtitle: null
-                    VisualId: '{{ VisualId }}'
-                    ChartConfiguration:
-                      ContentUrl: '{{ ContentUrl }}'
-                      ContentType: '{{ ContentType }}'
-                      ImageScaling: '{{ ImageScaling }}'
-                      Interactions: null
-                    Actions:
+                  custom_content_visual:
+                    subtitle: null
+                    visual_id: '{{ visual_id }}'
+                    chart_configuration:
+                      content_url: '{{ content_url }}'
+                      content_type: '{{ content_type }}'
+                      image_scaling: '{{ image_scaling }}'
+                      interactions: null
+                    actions:
                       - null
-                    DataSetIdentifier: '{{ DataSetIdentifier }}'
-                    Title: null
-                    VisualContentAltText: '{{ VisualContentAltText }}'
-                  PieChartVisual:
-                    Subtitle: null
-                    VisualId: '{{ VisualId }}'
-                    ChartConfiguration:
-                      SortConfiguration:
-                        SmallMultiplesSort:
+                    data_set_identifier: '{{ data_set_identifier }}'
+                    title: null
+                    visual_content_alt_text: '{{ visual_content_alt_text }}'
+                  pie_chart_visual:
+                    subtitle: null
+                    visual_id: '{{ visual_id }}'
+                    chart_configuration:
+                      sort_configuration:
+                        small_multiples_sort:
                           - null
-                        CategoryItemsLimit: null
-                        CategorySort:
+                        category_items_limit: null
+                        category_sort:
                           - null
-                        SmallMultiplesLimitConfiguration: null
-                      Legend: null
-                      DataLabels: null
-                      ContributionAnalysisDefaults:
-                        - MeasureFieldId: '{{ MeasureFieldId }}'
-                          ContributorDimensions:
-                            - null
-                      CategoryLabelOptions: null
-                      FieldWells:
-                        PieChartAggregatedFieldWells:
-                          Category:
-                            - null
-                          Values:
-                            - null
-                          SmallMultiples:
-                            - null
-                      Tooltip: null
-                      DonutOptions:
-                        DonutCenterOptions:
-                          LabelVisibility: null
-                        ArcOptions:
-                          ArcThickness: '{{ ArcThickness }}'
-                      SmallMultiplesOptions:
-                        MaxVisibleRows: null
-                        PanelConfiguration:
-                          BorderThickness: '{{ BorderThickness }}'
-                          BorderStyle: '{{ BorderStyle }}'
-                          GutterSpacing: '{{ GutterSpacing }}'
-                          BackgroundVisibility: null
-                          BorderVisibility: null
-                          BorderColor: '{{ BorderColor }}'
-                          Title:
-                            Visibility: null
-                            FontConfiguration: null
-                            HorizontalTextAlignment: '{{ HorizontalTextAlignment }}'
-                          GutterVisibility: null
-                          BackgroundColor: '{{ BackgroundColor }}'
-                        MaxVisibleColumns: null
-                        XAxis:
-                          Placement: '{{ Placement }}'
-                          Scale: '{{ Scale }}'
-                        YAxis: null
-                      Interactions: null
-                      ValueLabelOptions: null
-                      VisualPalette: null
-                    Actions:
+                        small_multiples_limit_configuration: null
+                      legend: null
+                      data_labels: null
+                      contribution_analysis_defaults:
+                        - measure_field_id: '{{ measure_field_id }}'
+                          contributor_dimensions:
+                            - null
+                      category_label_options: null
+                      field_wells:
+                        pie_chart_aggregated_field_wells:
+                          category:
+                            - null
+                          values:
+                            - null
+                          small_multiples:
+                            - null
+                      tooltip: null
+                      donut_options:
+                        donut_center_options:
+                          label_visibility: null
+                        arc_options:
+                          arc_thickness: '{{ arc_thickness }}'
+                      small_multiples_options:
+                        max_visible_rows: null
+                        panel_configuration:
+                          border_thickness: '{{ border_thickness }}'
+                          border_style: '{{ border_style }}'
+                          gutter_spacing: '{{ gutter_spacing }}'
+                          background_visibility: null
+                          border_visibility: null
+                          border_color: '{{ border_color }}'
+                          title:
+                            visibility: null
+                            font_configuration: null
+                            horizontal_text_alignment: '{{ horizontal_text_alignment }}'
+                          gutter_visibility: null
+                          background_color: '{{ background_color }}'
+                        max_visible_columns: null
+                        x_axis:
+                          placement: '{{ placement }}'
+                          scale: '{{ scale }}'
+                        y_axis: null
+                      interactions: null
+                      value_label_options: null
+                      visual_palette: null
+                    actions:
                       - null
-                    Title: null
-                    VisualContentAltText: '{{ VisualContentAltText }}'
-                    ColumnHierarchies:
+                    title: null
+                    visual_content_alt_text: '{{ visual_content_alt_text }}'
+                    column_hierarchies:
                       - null
-                  KPIVisual:
-                    Subtitle: null
-                    ConditionalFormatting:
-                      ConditionalFormattingOptions:
-                        - PrimaryValue:
-                            TextColor: null
-                            Icon: null
-                          ActualValue:
-                            TextColor: null
-                            Icon: null
-                          ComparisonValue:
-                            TextColor: null
-                            Icon: null
-                          ProgressBar:
-                            ForegroundColor: null
-                    VisualId: '{{ VisualId }}'
-                    ChartConfiguration:
-                      SortConfiguration:
-                        TrendGroupSort:
+                  k_pi_visual:
+                    subtitle: null
+                    conditional_formatting:
+                      conditional_formatting_options:
+                        - primary_value:
+                            text_color: null
+                            icon: null
+                          actual_value:
+                            text_color: null
+                            icon: null
+                          comparison_value:
+                            text_color: null
+                            icon: null
+                          progress_bar:
+                            foreground_color: null
+                    visual_id: '{{ visual_id }}'
+                    chart_configuration:
+                      sort_configuration:
+                        trend_group_sort:
                           - null
-                      KPIOptions:
-                        SecondaryValueFontConfiguration: null
-                        VisualLayoutOptions:
-                          StandardLayout:
-                            Type: '{{ Type }}'
-                        TrendArrows:
-                          Visibility: null
-                        SecondaryValue:
-                          Visibility: null
-                        Comparison: null
-                        PrimaryValueDisplayType: null
-                        ProgressBar:
-                          Visibility: null
-                        PrimaryValueFontConfiguration: null
-                        Sparkline:
-                          Type: '{{ Type }}'
-                          Color: '{{ Color }}'
-                          TooltipVisibility: null
-                          Visibility: null
-                      FieldWells:
-                        TargetValues:
+                      k_pi_options:
+                        secondary_value_font_configuration: null
+                        visual_layout_options:
+                          standard_layout:
+                            type: '{{ type }}'
+                        trend_arrows:
+                          visibility: null
+                        secondary_value:
+                          visibility: null
+                        comparison: null
+                        primary_value_display_type: null
+                        progress_bar:
+                          visibility: null
+                        primary_value_font_configuration: null
+                        sparkline:
+                          type: '{{ type }}'
+                          color: '{{ color }}'
+                          tooltip_visibility: null
+                          visibility: null
+                      field_wells:
+                        target_values:
                           - null
-                        TrendGroups:
+                        trend_groups:
                           - null
-                        Values:
+                        values:
                           - null
-                      Interactions: null
-                    Actions:
+                      interactions: null
+                    actions:
                       - null
-                    Title: null
-                    VisualContentAltText: '{{ VisualContentAltText }}'
-                    ColumnHierarchies:
+                    title: null
+                    visual_content_alt_text: '{{ visual_content_alt_text }}'
+                    column_hierarchies:
                       - null
-                  HistogramVisual:
-                    Subtitle: null
-                    VisualId: '{{ VisualId }}'
-                    ChartConfiguration:
-                      YAxisDisplayOptions: null
-                      DataLabels: null
-                      BinOptions:
-                        BinWidth:
-                          BinCountLimit: null
-                          Value: null
-                        StartValue: null
-                        SelectedBinType: '{{ SelectedBinType }}'
-                        BinCount:
-                          Value: null
-                      FieldWells:
-                        HistogramAggregatedFieldWells:
-                          Values:
-                            - null
-                      Tooltip: null
-                      XAxisLabelOptions: null
-                      Interactions: null
-                      VisualPalette: null
-                      XAxisDisplayOptions: null
-                    Actions:
+                  histogram_visual:
+                    subtitle: null
+                    visual_id: '{{ visual_id }}'
+                    chart_configuration:
+                      y_axis_display_options: null
+                      data_labels: null
+                      bin_options:
+                        bin_width:
+                          bin_count_limit: null
+                          value: null
+                        start_value: null
+                        selected_bin_type: '{{ selected_bin_type }}'
+                        bin_count:
+                          value: null
+                      field_wells:
+                        histogram_aggregated_field_wells:
+                          values:
+                            - null
+                      tooltip: null
+                      x_axis_label_options: null
+                      interactions: null
+                      visual_palette: null
+                      x_axis_display_options: null
+                    actions:
                       - null
-                    Title: null
-                    VisualContentAltText: '{{ VisualContentAltText }}'
-                  PluginVisual:
-                    Subtitle: null
-                    PluginArn: '{{ PluginArn }}'
-                    VisualId: '{{ VisualId }}'
-                    ChartConfiguration:
-                      SortConfiguration:
-                        PluginVisualTableQuerySort:
-                          ItemsLimitConfiguration:
-                            ItemsLimit: null
-                          RowSort:
-                            - null
-                      VisualOptions:
-                        VisualProperties:
-                          - Value: '{{ Value }}'
-                            Name: '{{ Name }}'
-                      FieldWells:
-                        - Unaggregated:
-                            - FormatConfiguration: null
-                              Column: null
-                              FieldId: '{{ FieldId }}'
-                          AxisName: '{{ AxisName }}'
-                          Measures:
-                            - null
-                          Dimensions:
-                            - null
-                    Title: null
-                    VisualContentAltText: '{{ VisualContentAltText }}'
-                  TableVisual:
-                    Subtitle: null
-                    ConditionalFormatting:
-                      ConditionalFormattingOptions:
-                        - Row:
-                            TextColor: null
-                            BackgroundColor: null
-                          Cell:
-                            FieldId: '{{ FieldId }}'
-                            TextFormat:
-                              TextColor: null
-                              Icon: null
-                              BackgroundColor: null
-                    VisualId: '{{ VisualId }}'
-                    ChartConfiguration:
-                      SortConfiguration:
-                        RowSort:
+                    title: null
+                    visual_content_alt_text: '{{ visual_content_alt_text }}'
+                  plugin_visual:
+                    subtitle: null
+                    plugin_arn: '{{ plugin_arn }}'
+                    visual_id: '{{ visual_id }}'
+                    chart_configuration:
+                      sort_configuration:
+                        plugin_visual_table_query_sort:
+                          items_limit_configuration:
+                            items_limit: null
+                          row_sort:
+                            - null
+                      visual_options:
+                        visual_properties:
+                          - value: '{{ value }}'
+                            name: '{{ name }}'
+                      field_wells:
+                        - unaggregated:
+                            - format_configuration: null
+                              column: null
+                              field_id: '{{ field_id }}'
+                          axis_name: '{{ axis_name }}'
+                          measures:
+                            - null
+                          dimensions:
+                            - null
+                    title: null
+                    visual_content_alt_text: '{{ visual_content_alt_text }}'
+                  table_visual:
+                    subtitle: null
+                    conditional_formatting:
+                      conditional_formatting_options:
+                        - row:
+                            text_color: null
+                            background_color: null
+                          cell:
+                            field_id: '{{ field_id }}'
+                            text_format:
+                              text_color: null
+                              icon: null
+                              background_color: null
+                    visual_id: '{{ visual_id }}'
+                    chart_configuration:
+                      sort_configuration:
+                        row_sort:
                           - null
-                        PaginationConfiguration: null
-                      PaginatedReportOptions:
-                        OverflowColumnHeaderVisibility: null
-                        VerticalOverflowVisibility: null
-                      TableOptions:
-                        HeaderStyle:
-                          VerticalTextAlignment: '{{ VerticalTextAlignment }}'
-                          Visibility: null
-                          Height: null
-                          FontConfiguration: null
-                          Border:
-                            UniformBorder:
-                              Thickness: null
-                              Color: '{{ Color }}'
-                              Style: '{{ Style }}'
-                            SideSpecificBorder:
-                              Left: null
-                              Top: null
-                              InnerHorizontal: null
-                              Right: null
-                              Bottom: null
-                              InnerVertical: null
-                          TextWrap: '{{ TextWrap }}'
-                          HorizontalTextAlignment: null
-                          BackgroundColor: '{{ BackgroundColor }}'
-                        CellStyle: null
-                        Orientation: '{{ Orientation }}'
-                        RowAlternateColorOptions:
-                          Status: null
-                          UsePrimaryBackgroundColor: null
-                          RowAlternateColors:
-                            - '{{ RowAlternateColors[0] }}'
-                      TableInlineVisualizations:
-                        - DataBars:
-                            PositiveColor: '{{ PositiveColor }}'
-                            FieldId: '{{ FieldId }}'
-                            NegativeColor: '{{ NegativeColor }}'
-                      FieldWells:
-                        TableUnaggregatedFieldWells:
-                          Values:
-                            - null
-                        TableAggregatedFieldWells:
-                          GroupBy:
-                            - null
-                          Values:
-                            - null
-                      FieldOptions:
-                        Order:
-                          - '{{ Order[0] }}'
-                        PinnedFieldOptions:
-                          PinnedLeftFields:
-                            - '{{ PinnedLeftFields[0] }}'
-                        TransposedTableOptions:
-                          - ColumnWidth: '{{ ColumnWidth }}'
-                            ColumnIndex: null
-                            ColumnType: '{{ ColumnType }}'
-                        SelectedFieldOptions:
-                          - CustomLabel: '{{ CustomLabel }}'
-                            URLStyling:
-                              LinkConfiguration:
-                                Target: null
-                                Content:
-                                  CustomIconContent:
-                                    Icon: '{{ Icon }}'
-                                  CustomTextContent:
-                                    Value: '{{ Value }}'
-                                    FontConfiguration: null
-                              ImageConfiguration:
-                                SizingOptions:
-                                  TableCellImageScalingConfiguration: '{{ TableCellImageScalingConfiguration }}'
-                            FieldId: '{{ FieldId }}'
-                            Visibility: null
-                            Width: '{{ Width }}'
-                      Interactions: null
-                      TotalOptions:
-                        TotalAggregationOptions:
-                          - TotalAggregationFunction:
-                              SimpleTotalAggregationFunction: '{{ SimpleTotalAggregationFunction }}'
-                            FieldId: '{{ FieldId }}'
-                        CustomLabel: '{{ CustomLabel }}'
-                        ScrollStatus: '{{ ScrollStatus }}'
-                        Placement: '{{ Placement }}'
-                        TotalCellStyle: null
-                        TotalsVisibility: null
-                    Actions:
+                        pagination_configuration: null
+                      paginated_report_options:
+                        overflow_column_header_visibility: null
+                        vertical_overflow_visibility: null
+                      table_options:
+                        header_style:
+                          vertical_text_alignment: '{{ vertical_text_alignment }}'
+                          visibility: null
+                          height: null
+                          font_configuration: null
+                          border:
+                            uniform_border:
+                              thickness: null
+                              color: '{{ color }}'
+                              style: '{{ style }}'
+                            side_specific_border:
+                              left: null
+                              top: null
+                              inner_horizontal: null
+                              right: null
+                              bottom: null
+                              inner_vertical: null
+                          text_wrap: '{{ text_wrap }}'
+                          horizontal_text_alignment: null
+                          background_color: '{{ background_color }}'
+                        cell_style: null
+                        orientation: '{{ orientation }}'
+                        row_alternate_color_options:
+                          status: null
+                          use_primary_background_color: null
+                          row_alternate_colors:
+                            - '{{ row_alternate_colors[0] }}'
+                      table_inline_visualizations:
+                        - data_bars:
+                            positive_color: '{{ positive_color }}'
+                            field_id: '{{ field_id }}'
+                            negative_color: '{{ negative_color }}'
+                      field_wells:
+                        table_unaggregated_field_wells:
+                          values:
+                            - null
+                        table_aggregated_field_wells:
+                          group_by:
+                            - null
+                          values:
+                            - null
+                      field_options:
+                        order:
+                          - '{{ order[0] }}'
+                        pinned_field_options:
+                          pinned_left_fields:
+                            - '{{ pinned_left_fields[0] }}'
+                        transposed_table_options:
+                          - column_width: '{{ column_width }}'
+                            column_index: null
+                            column_type: '{{ column_type }}'
+                        selected_field_options:
+                          - custom_label: '{{ custom_label }}'
+                            url_styling:
+                              link_configuration:
+                                target: null
+                                content:
+                                  custom_icon_content:
+                                    icon: '{{ icon }}'
+                                  custom_text_content:
+                                    value: '{{ value }}'
+                                    font_configuration: null
+                              image_configuration:
+                                sizing_options:
+                                  table_cell_image_scaling_configuration: '{{ table_cell_image_scaling_configuration }}'
+                            field_id: '{{ field_id }}'
+                            visibility: null
+                            width: '{{ width }}'
+                      interactions: null
+                      total_options:
+                        total_aggregation_options:
+                          - total_aggregation_function:
+                              simple_total_aggregation_function: '{{ simple_total_aggregation_function }}'
+                            field_id: '{{ field_id }}'
+                        custom_label: '{{ custom_label }}'
+                        scroll_status: '{{ scroll_status }}'
+                        placement: '{{ placement }}'
+                        total_cell_style: null
+                        totals_visibility: null
+                    actions:
                       - null
-                    Title: null
-                    VisualContentAltText: '{{ VisualContentAltText }}'
-                  PivotTableVisual:
-                    Subtitle: null
-                    ConditionalFormatting:
-                      ConditionalFormattingOptions:
-                        - Cell:
-                            Scope:
-                              Role: '{{ Role }}'
-                            Scopes:
+                    title: null
+                    visual_content_alt_text: '{{ visual_content_alt_text }}'
+                  pivot_table_visual:
+                    subtitle: null
+                    conditional_formatting:
+                      conditional_formatting_options:
+                        - cell:
+                            scope:
+                              role: '{{ role }}'
+                            scopes:
                               - null
-                            FieldId: '{{ FieldId }}'
-                            TextFormat: null
-                    VisualId: '{{ VisualId }}'
-                    ChartConfiguration:
-                      SortConfiguration:
-                        FieldSortOptions:
-                          - SortBy:
-                              Field: null
-                              DataPath:
-                                SortPaths:
+                            field_id: '{{ field_id }}'
+                            text_format: null
+                    visual_id: '{{ visual_id }}'
+                    chart_configuration:
+                      sort_configuration:
+                        field_sort_options:
+                          - sort_by:
+                              field: null
+                              data_path:
+                                sort_paths:
                                   - null
-                                Direction: null
-                              Column: null
-                            FieldId: '{{ FieldId }}'
-                      PaginatedReportOptions:
-                        OverflowColumnHeaderVisibility: null
-                        VerticalOverflowVisibility: null
-                      TableOptions:
-                        RowFieldNamesStyle: null
-                        RowHeaderStyle: null
-                        CollapsedRowDimensionsVisibility: null
-                        RowsLayout: '{{ RowsLayout }}'
-                        MetricPlacement: '{{ MetricPlacement }}'
-                        DefaultCellWidth: '{{ DefaultCellWidth }}'
-                        ColumnNamesVisibility: null
-                        RowsLabelOptions:
-                          CustomLabel: '{{ CustomLabel }}'
-                          Visibility: null
-                        SingleMetricVisibility: null
-                        ColumnHeaderStyle: null
-                        ToggleButtonsVisibility: null
-                        CellStyle: null
-                        RowAlternateColorOptions: null
-                      FieldWells:
-                        PivotTableAggregatedFieldWells:
-                          Values:
-                            - null
-                          Columns:
-                            - null
-                          Rows:
-                            - null
-                      FieldOptions:
-                        CollapseStateOptions:
-                          - Target:
-                              FieldId: '{{ FieldId }}'
-                              FieldDataPathValues:
+                                direction: null
+                              column: null
+                            field_id: '{{ field_id }}'
+                      paginated_report_options:
+                        overflow_column_header_visibility: null
+                        vertical_overflow_visibility: null
+                      table_options:
+                        row_field_names_style: null
+                        row_header_style: null
+                        collapsed_row_dimensions_visibility: null
+                        rows_layout: '{{ rows_layout }}'
+                        metric_placement: '{{ metric_placement }}'
+                        default_cell_width: '{{ default_cell_width }}'
+                        column_names_visibility: null
+                        rows_label_options:
+                          custom_label: '{{ custom_label }}'
+                          visibility: null
+                        single_metric_visibility: null
+                        column_header_style: null
+                        toggle_buttons_visibility: null
+                        cell_style: null
+                        row_alternate_color_options: null
+                      field_wells:
+                        pivot_table_aggregated_field_wells:
+                          values:
+                            - null
+                          columns:
+                            - null
+                          rows:
+                            - null
+                      field_options:
+                        collapse_state_options:
+                          - target:
+                              field_id: '{{ field_id }}'
+                              field_data_path_values:
                                 - null
-                            State: '{{ State }}'
-                        DataPathOptions:
-                          - DataPathList:
+                            state: '{{ state }}'
+                        data_path_options:
+                          - data_path_list:
                               - null
-                            Width: '{{ Width }}'
-                        SelectedFieldOptions:
-                          - CustomLabel: '{{ CustomLabel }}'
-                            FieldId: '{{ FieldId }}'
-                            Visibility: null
-                      Interactions: null
-                      TotalOptions:
-                        ColumnSubtotalOptions:
-                          CustomLabel: '{{ CustomLabel }}'
-                          FieldLevelOptions:
-                            - FieldId: '{{ FieldId }}'
-                          ValueCellStyle: null
-                          TotalCellStyle: null
-                          TotalsVisibility: null
-                          FieldLevel: '{{ FieldLevel }}'
-                          MetricHeaderCellStyle: null
-                          StyleTargets:
-                            - CellType: '{{ CellType }}'
-                        RowSubtotalOptions: null
-                        RowTotalOptions:
-                          TotalAggregationOptions:
-                            - null
-                          CustomLabel: '{{ CustomLabel }}'
-                          ValueCellStyle: null
-                          ScrollStatus: null
-                          Placement: null
-                          TotalCellStyle: null
-                          TotalsVisibility: null
-                          MetricHeaderCellStyle: null
-                        ColumnTotalOptions: null
-                    Actions:
+                            width: '{{ width }}'
+                        selected_field_options:
+                          - custom_label: '{{ custom_label }}'
+                            field_id: '{{ field_id }}'
+                            visibility: null
+                      interactions: null
+                      total_options:
+                        column_subtotal_options:
+                          custom_label: '{{ custom_label }}'
+                          field_level_options:
+                            - field_id: '{{ field_id }}'
+                          value_cell_style: null
+                          total_cell_style: null
+                          totals_visibility: null
+                          field_level: '{{ field_level }}'
+                          metric_header_cell_style: null
+                          style_targets:
+                            - cell_type: '{{ cell_type }}'
+                        row_subtotal_options: null
+                        row_total_options:
+                          total_aggregation_options:
+                            - null
+                          custom_label: '{{ custom_label }}'
+                          value_cell_style: null
+                          scroll_status: null
+                          placement: null
+                          total_cell_style: null
+                          totals_visibility: null
+                          metric_header_cell_style: null
+                        column_total_options: null
+                    actions:
                       - null
-                    Title: null
-                    VisualContentAltText: '{{ VisualContentAltText }}'
-                  BarChartVisual:
-                    Subtitle: null
-                    VisualId: '{{ VisualId }}'
-                    ChartConfiguration:
-                      SortConfiguration:
-                        SmallMultiplesSort:
+                    title: null
+                    visual_content_alt_text: '{{ visual_content_alt_text }}'
+                  bar_chart_visual:
+                    subtitle: null
+                    visual_id: '{{ visual_id }}'
+                    chart_configuration:
+                      sort_configuration:
+                        small_multiples_sort:
                           - null
-                        ColorSort:
+                        color_sort:
                           - null
-                        ColorItemsLimit: null
-                        CategoryItemsLimit: null
-                        CategorySort:
+                        color_items_limit: null
+                        category_items_limit: null
+                        category_sort:
                           - null
-                        SmallMultiplesLimitConfiguration: null
-                      Legend: null
-                      ReferenceLines:
+                        small_multiples_limit_configuration: null
+                      legend: null
+                      reference_lines:
                         - null
-                      DataLabels: null
-                      ColorLabelOptions: null
-                      CategoryLabelOptions: null
-                      Tooltip: null
-                      SmallMultiplesOptions: null
-                      Orientation: '{{ Orientation }}'
-                      VisualPalette: null
-                      ValueLabelOptions: null
-                      BarsArrangement: null
-                      CategoryAxis: null
-                      ContributionAnalysisDefaults:
+                      data_labels: null
+                      color_label_options: null
+                      category_label_options: null
+                      tooltip: null
+                      small_multiples_options: null
+                      orientation: '{{ orientation }}'
+                      visual_palette: null
+                      value_label_options: null
+                      bars_arrangement: null
+                      category_axis: null
+                      contribution_analysis_defaults:
                         - null
-                      FieldWells:
-                        BarChartAggregatedFieldWells:
-                          Category:
+                      field_wells:
+                        bar_chart_aggregated_field_wells:
+                          category:
                             - null
-                          Colors:
+                          colors:
                             - null
-                          Values:
+                          values:
                             - null
-                          SmallMultiples:
+                          small_multiples:
                             - null
-                      ValueAxis: null
-                      Interactions: null
-                    Actions:
+                      value_axis: null
+                      interactions: null
+                    actions:
                       - null
-                    Title: null
-                    VisualContentAltText: '{{ VisualContentAltText }}'
-                    ColumnHierarchies:
+                    title: null
+                    visual_content_alt_text: '{{ visual_content_alt_text }}'
+                    column_hierarchies:
                       - null
-                  HeatMapVisual:
-                    Subtitle: null
-                    VisualId: '{{ VisualId }}'
-                    ChartConfiguration:
-                      SortConfiguration:
-                        HeatMapRowSort:
+                  heat_map_visual:
+                    subtitle: null
+                    visual_id: '{{ visual_id }}'
+                    chart_configuration:
+                      sort_configuration:
+                        heat_map_row_sort:
                           - null
-                        HeatMapRowItemsLimitConfiguration: null
-                        HeatMapColumnItemsLimitConfiguration: null
-                        HeatMapColumnSort:
+                        heat_map_row_items_limit_configuration: null
+                        heat_map_column_items_limit_configuration: null
+                        heat_map_column_sort:
                           - null
-                      ColumnLabelOptions: null
-                      Legend: null
-                      DataLabels: null
-                      FieldWells:
-                        HeatMapAggregatedFieldWells:
-                          Values:
-                            - null
-                          Columns:
-                            - null
-                          Rows:
-                            - null
-                      Tooltip: null
-                      ColorScale:
-                        Colors:
-                          - DataValue: null
-                            Color: '{{ Color }}'
-                        ColorFillType: '{{ ColorFillType }}'
-                        NullValueColor: null
-                      Interactions: null
-                      RowLabelOptions: null
-                    Actions:
+                      column_label_options: null
+                      legend: null
+                      data_labels: null
+                      field_wells:
+                        heat_map_aggregated_field_wells:
+                          values:
+                            - null
+                          columns:
+                            - null
+                          rows:
+                            - null
+                      tooltip: null
+                      color_scale:
+                        colors:
+                          - data_value: null
+                            color: '{{ color }}'
+                        color_fill_type: '{{ color_fill_type }}'
+                        null_value_color: null
+                      interactions: null
+                      row_label_options: null
+                    actions:
                       - null
-                    Title: null
-                    VisualContentAltText: '{{ VisualContentAltText }}'
-                    ColumnHierarchies:
+                    title: null
+                    visual_content_alt_text: '{{ visual_content_alt_text }}'
+                    column_hierarchies:
                       - null
-                  TreeMapVisual:
-                    Subtitle: null
-                    VisualId: '{{ VisualId }}'
-                    ChartConfiguration:
-                      SortConfiguration:
-                        TreeMapSort:
+                  tree_map_visual:
+                    subtitle: null
+                    visual_id: '{{ visual_id }}'
+                    chart_configuration:
+                      sort_configuration:
+                        tree_map_sort:
                           - null
-                        TreeMapGroupItemsLimitConfiguration: null
-                      Legend: null
-                      DataLabels: null
-                      ColorLabelOptions: null
-                      SizeLabelOptions: null
-                      FieldWells:
-                        TreeMapAggregatedFieldWells:
-                          Sizes:
-                            - null
-                          Colors:
-                            - null
-                          Groups:
-                            - null
-                      Tooltip: null
-                      ColorScale: null
-                      Interactions: null
-                      GroupLabelOptions: null
-                    Actions:
+                        tree_map_group_items_limit_configuration: null
+                      legend: null
+                      data_labels: null
+                      color_label_options: null
+                      size_label_options: null
+                      field_wells:
+                        tree_map_aggregated_field_wells:
+                          sizes:
+                            - null
+                          colors:
+                            - null
+                          groups:
+                            - null
+                      tooltip: null
+                      color_scale: null
+                      interactions: null
+                      group_label_options: null
+                    actions:
                       - null
-                    Title: null
-                    VisualContentAltText: '{{ VisualContentAltText }}'
-                    ColumnHierarchies:
+                    title: null
+                    visual_content_alt_text: '{{ visual_content_alt_text }}'
+                    column_hierarchies:
                       - null
-                  InsightVisual:
-                    Subtitle: null
-                    VisualId: '{{ VisualId }}'
-                    Actions:
+                  insight_visual:
+                    subtitle: null
+                    visual_id: '{{ visual_id }}'
+                    actions:
                       - null
-                    DataSetIdentifier: '{{ DataSetIdentifier }}'
-                    InsightConfiguration:
-                      Computations:
-                        - PeriodToDate:
-                            PeriodTimeGranularity: null
-                            Value: null
-                            Time: null
-                            ComputationId: '{{ ComputationId }}'
-                            Name: '{{ Name }}'
-                          GrowthRate:
-                            Value: null
-                            Time: null
-                            PeriodSize: null
-                            ComputationId: '{{ ComputationId }}'
-                            Name: '{{ Name }}'
-                          TopBottomRanked:
-                            Type: '{{ Type }}'
-                            Category: null
-                            ResultSize: null
-                            Value: null
-                            ComputationId: '{{ ComputationId }}'
-                            Name: '{{ Name }}'
-                          TotalAggregation:
-                            Value: null
-                            ComputationId: '{{ ComputationId }}'
-                            Name: '{{ Name }}'
-                          Forecast:
-                            PeriodsBackward: null
-                            PeriodsForward: null
-                            PredictionInterval: null
-                            Seasonality: '{{ Seasonality }}'
-                            CustomSeasonalityValue: null
-                            Value: null
-                            Time: null
-                            UpperBoundary: null
-                            ComputationId: '{{ ComputationId }}'
-                            Name: '{{ Name }}'
-                            LowerBoundary: null
-                          MaximumMinimum:
-                            Type: '{{ Type }}'
-                            Value: null
-                            Time: null
-                            ComputationId: '{{ ComputationId }}'
-                            Name: '{{ Name }}'
-                          PeriodOverPeriod:
-                            Value: null
-                            Time: null
-                            ComputationId: '{{ ComputationId }}'
-                            Name: '{{ Name }}'
-                          MetricComparison:
-                            TargetValue: null
-                            Time: null
-                            ComputationId: '{{ ComputationId }}'
-                            FromValue: null
-                            Name: '{{ Name }}'
-                          TopBottomMovers:
-                            Type: null
-                            Category: null
-                            Value: null
-                            SortOrder: '{{ SortOrder }}'
-                            Time: null
-                            MoverSize: null
-                            ComputationId: '{{ ComputationId }}'
-                            Name: '{{ Name }}'
-                          UniqueValues:
-                            Category: null
-                            ComputationId: '{{ ComputationId }}'
-                            Name: '{{ Name }}'
-                      CustomNarrative:
-                        Narrative: '{{ Narrative }}'
-                      Interactions: null
-                    Title: null
-                    VisualContentAltText: '{{ VisualContentAltText }}'
-                  LineChartVisual:
-                    Subtitle: null
-                    VisualId: '{{ VisualId }}'
-                    ChartConfiguration:
-                      SortConfiguration:
-                        CategoryItemsLimitConfiguration: null
-                        ColorItemsLimitConfiguration: null
-                        SmallMultiplesSort:
+                    data_set_identifier: '{{ data_set_identifier }}'
+                    insight_configuration:
+                      computations:
+                        - period_to_date:
+                            period_time_granularity: null
+                            value: null
+                            time: null
+                            computation_id: '{{ computation_id }}'
+                            name: '{{ name }}'
+                          growth_rate:
+                            value: null
+                            time: null
+                            period_size: null
+                            computation_id: '{{ computation_id }}'
+                            name: '{{ name }}'
+                          top_bottom_ranked:
+                            type: '{{ type }}'
+                            category: null
+                            result_size: null
+                            value: null
+                            computation_id: '{{ computation_id }}'
+                            name: '{{ name }}'
+                          total_aggregation:
+                            value: null
+                            computation_id: '{{ computation_id }}'
+                            name: '{{ name }}'
+                          forecast:
+                            periods_backward: null
+                            periods_forward: null
+                            prediction_interval: null
+                            seasonality: '{{ seasonality }}'
+                            custom_seasonality_value: null
+                            value: null
+                            time: null
+                            upper_boundary: null
+                            computation_id: '{{ computation_id }}'
+                            name: '{{ name }}'
+                            lower_boundary: null
+                          maximum_minimum:
+                            type: '{{ type }}'
+                            value: null
+                            time: null
+                            computation_id: '{{ computation_id }}'
+                            name: '{{ name }}'
+                          period_over_period:
+                            value: null
+                            time: null
+                            computation_id: '{{ computation_id }}'
+                            name: '{{ name }}'
+                          metric_comparison:
+                            target_value: null
+                            time: null
+                            computation_id: '{{ computation_id }}'
+                            from_value: null
+                            name: '{{ name }}'
+                          top_bottom_movers:
+                            type: null
+                            category: null
+                            value: null
+                            sort_order: '{{ sort_order }}'
+                            time: null
+                            mover_size: null
+                            computation_id: '{{ computation_id }}'
+                            name: '{{ name }}'
+                          unique_values:
+                            category: null
+                            computation_id: '{{ computation_id }}'
+                            name: '{{ name }}'
+                      custom_narrative:
+                        narrative: '{{ narrative }}'
+                      interactions: null
+                    title: null
+                    visual_content_alt_text: '{{ visual_content_alt_text }}'
+                  line_chart_visual:
+                    subtitle: null
+                    visual_id: '{{ visual_id }}'
+                    chart_configuration:
+                      sort_configuration:
+                        category_items_limit_configuration: null
+                        color_items_limit_configuration: null
+                        small_multiples_sort:
                           - null
-                        CategorySort:
+                        category_sort:
                           - null
-                        SmallMultiplesLimitConfiguration: null
-                      Legend: null
-                      ReferenceLines:
+                        small_multiples_limit_configuration: null
+                      legend: null
+                      reference_lines:
                         - null
-                      DataLabels: null
-                      Tooltip: null
-                      SingleAxisOptions: null
-                      SmallMultiplesOptions: null
-                      PrimaryYAxisDisplayOptions:
-                        MissingDataConfigurations:
-                          - TreatmentOption: '{{ TreatmentOption }}'
-                        AxisOptions: null
-                      VisualPalette: null
-                      XAxisDisplayOptions: null
-                      DefaultSeriesSettings:
-                        LineStyleSettings:
-                          LineInterpolation: '{{ LineInterpolation }}'
-                          LineStyle: '{{ LineStyle }}'
-                          LineVisibility: null
-                          LineWidth: '{{ LineWidth }}'
-                        AxisBinding: null
-                        MarkerStyleSettings:
-                          MarkerShape: '{{ MarkerShape }}'
-                          MarkerSize: '{{ MarkerSize }}'
-                          MarkerVisibility: null
-                          MarkerColor: '{{ MarkerColor }}'
-                      SecondaryYAxisLabelOptions: null
-                      ForecastConfigurations:
-                        - ForecastProperties:
-                            PeriodsBackward: null
-                            PeriodsForward: null
-                            PredictionInterval: null
-                            Seasonality: null
-                            UpperBoundary: null
-                            LowerBoundary: null
-                          Scenario:
-                            WhatIfRangeScenario:
-                              StartDate: '{{ StartDate }}'
-                              Value: null
-                              EndDate: '{{ EndDate }}'
-                            WhatIfPointScenario:
-                              Value: null
-                              Date: '{{ Date }}'
-                      Series:
-                        - FieldSeriesItem:
-                            FieldId: '{{ FieldId }}'
-                            AxisBinding: null
-                            Settings:
-                              LineStyleSettings: null
-                              MarkerStyleSettings: null
-                          DataFieldSeriesItem:
-                            FieldId: '{{ FieldId }}'
-                            AxisBinding: null
-                            FieldValue: '{{ FieldValue }}'
-                            Settings: null
-                      Type: '{{ Type }}'
-                      PrimaryYAxisLabelOptions: null
-                      ContributionAnalysisDefaults:
+                      data_labels: null
+                      tooltip: null
+                      single_axis_options: null
+                      small_multiples_options: null
+                      primary_yaxis_display_options:
+                        missing_data_configurations:
+                          - treatment_option: '{{ treatment_option }}'
+                        axis_options: null
+                      visual_palette: null
+                      x_axis_display_options: null
+                      default_series_settings:
+                        line_style_settings:
+                          line_interpolation: '{{ line_interpolation }}'
+                          line_style: '{{ line_style }}'
+                          line_visibility: null
+                          line_width: '{{ line_width }}'
+                        axis_binding: null
+                        marker_style_settings:
+                          marker_shape: '{{ marker_shape }}'
+                          marker_size: '{{ marker_size }}'
+                          marker_visibility: null
+                          marker_color: '{{ marker_color }}'
+                      secondary_yaxis_label_options: null
+                      forecast_configurations:
+                        - forecast_properties:
+                            periods_backward: null
+                            periods_forward: null
+                            prediction_interval: null
+                            seasonality: null
+                            upper_boundary: null
+                            lower_boundary: null
+                          scenario:
+                            what_if_range_scenario:
+                              start_date: '{{ start_date }}'
+                              value: null
+                              end_date: '{{ end_date }}'
+                            what_if_point_scenario:
+                              value: null
+                              date: '{{ date }}'
+                      series:
+                        - field_series_item:
+                            field_id: '{{ field_id }}'
+                            axis_binding: null
+                            settings:
+                              line_style_settings: null
+                              marker_style_settings: null
+                          data_field_series_item:
+                            field_id: '{{ field_id }}'
+                            axis_binding: null
+                            field_value: '{{ field_value }}'
+                            settings: null
+                      type: '{{ type }}'
+                      primary_yaxis_label_options: null
+                      contribution_analysis_defaults:
                         - null
-                      FieldWells:
-                        LineChartAggregatedFieldWells:
-                          Category:
+                      field_wells:
+                        line_chart_aggregated_field_wells:
+                          category:
                             - null
-                          Colors:
+                          colors:
                             - null
-                          Values:
+                          values:
                             - null
-                          SmallMultiples:
+                          small_multiples:
                             - null
-                      SecondaryYAxisDisplayOptions: null
-                      XAxisLabelOptions: null
-                      Interactions: null
-                    Actions:
+                      secondary_yaxis_display_options: null
+                      x_axis_label_options: null
+                      interactions: null
+                    actions:
                       - null
-                    Title: null
-                    VisualContentAltText: '{{ VisualContentAltText }}'
-                    ColumnHierarchies:
+                    title: null
+                    visual_content_alt_text: '{{ visual_content_alt_text }}'
+                    column_hierarchies:
                       - null
-                  EmptyVisual:
-                    VisualId: '{{ VisualId }}'
-                    Actions:
+                  empty_visual:
+                    visual_id: '{{ visual_id }}'
+                    actions:
                       - null
-                    DataSetIdentifier: '{{ DataSetIdentifier }}'
-          ParameterDeclarations:
-            - StringParameterDeclaration:
-                MappedDataSetParameters:
-                  - DataSetParameterName: '{{ DataSetParameterName }}'
-                    DataSetIdentifier: '{{ DataSetIdentifier }}'
-                DefaultValues:
-                  DynamicValue:
-                    GroupNameColumn: null
-                    DefaultValueColumn: null
-                    UserNameColumn: null
-                  StaticValues:
-                    - '{{ StaticValues[0] }}'
-                ParameterValueType: '{{ ParameterValueType }}'
-                ValueWhenUnset:
-                  ValueWhenUnsetOption: '{{ ValueWhenUnsetOption }}'
-                  CustomValue: '{{ CustomValue }}'
-                Name: '{{ Name }}'
-              DateTimeParameterDeclaration:
-                MappedDataSetParameters:
+                    data_set_identifier: '{{ data_set_identifier }}'
+          parameter_declarations:
+            - string_parameter_declaration:
+                mapped_data_set_parameters:
+                  - data_set_parameter_name: '{{ data_set_parameter_name }}'
+                    data_set_identifier: '{{ data_set_identifier }}'
+                default_values:
+                  dynamic_value:
+                    group_name_column: null
+                    default_value_column: null
+                    user_name_column: null
+                  static_values:
+                    - '{{ static_values[0] }}'
+                parameter_value_type: '{{ parameter_value_type }}'
+                value_when_unset:
+                  value_when_unset_option: '{{ value_when_unset_option }}'
+                  custom_value: '{{ custom_value }}'
+                name: '{{ name }}'
+              date_time_parameter_declaration:
+                mapped_data_set_parameters:
                   - null
-                DefaultValues:
-                  RollingDate: null
-                  DynamicValue: null
-                  StaticValues:
-                    - '{{ StaticValues[0] }}'
-                TimeGranularity: null
-                ValueWhenUnset:
-                  ValueWhenUnsetOption: null
-                  CustomValue: '{{ CustomValue }}'
-                Name: '{{ Name }}'
-              DecimalParameterDeclaration:
-                MappedDataSetParameters:
+                default_values:
+                  rolling_date: null
+                  dynamic_value: null
+                  static_values:
+                    - '{{ static_values[0] }}'
+                time_granularity: null
+                value_when_unset:
+                  value_when_unset_option: null
+                  custom_value: '{{ custom_value }}'
+                name: '{{ name }}'
+              decimal_parameter_declaration:
+                mapped_data_set_parameters:
                   - null
-                DefaultValues:
-                  DynamicValue: null
-                  StaticValues:
+                default_values:
+                  dynamic_value: null
+                  static_values:
                     - null
-                ParameterValueType: null
-                ValueWhenUnset:
-                  ValueWhenUnsetOption: null
-                  CustomValue: null
-                Name: '{{ Name }}'
-              IntegerParameterDeclaration:
-                MappedDataSetParameters:
+                parameter_value_type: null
+                value_when_unset:
+                  value_when_unset_option: null
+                  custom_value: null
+                name: '{{ name }}'
+              integer_parameter_declaration:
+                mapped_data_set_parameters:
                   - null
-                DefaultValues:
-                  DynamicValue: null
-                  StaticValues:
+                default_values:
+                  dynamic_value: null
+                  static_values:
                     - null
-                ParameterValueType: null
-                ValueWhenUnset:
-                  ValueWhenUnsetOption: null
-                  CustomValue: null
-                Name: '{{ Name }}'
-      - name: ValidationStrategy
+                parameter_value_type: null
+                value_when_unset:
+                  value_when_unset_option: null
+                  custom_value: null
+                name: '{{ name }}'
+      - name: validation_strategy
         value:
-          Mode: '{{ Mode }}'
-      - name: FolderArns
+          mode: '{{ mode }}'
+      - name: folder_arns
         value:
-          - '{{ FolderArns[0] }}'
-      - name: Name
-        value: '{{ Name }}'
-      - name: Errors
+          - '{{ folder_arns[0] }}'
+      - name: name
+        value: '{{ name }}'
+      - name: errors
         value:
-          - Type: '{{ Type }}'
-            Message: '{{ Message }}'
-            ViolatedEntities:
-              - Path: '{{ Path }}'
-      - name: AnalysisId
-        value: '{{ AnalysisId }}'
-      - name: AwsAccountId
-        value: '{{ AwsAccountId }}'
-      - name: Permissions
+          - type: '{{ type }}'
+            message: '{{ message }}'
+            violated_entities:
+              - path: '{{ path }}'
+      - name: analysis_id
+        value: '{{ analysis_id }}'
+      - name: aws_account_id
+        value: '{{ aws_account_id }}'
+      - name: permissions
         value:
-          - Principal: '{{ Principal }}'
-            Actions:
-              - '{{ Actions[0] }}'
-      - name: Tags
+          - principal: '{{ principal }}'
+            actions:
+              - '{{ actions[0] }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-      - name: Sheets
+          - key: '{{ key }}'
+            value: '{{ value }}'
+      - name: sheets
         value:
-          - SheetId: '{{ SheetId }}'
-            Name: '{{ Name }}'
-
+          - sheet_id: '{{ sheet_id }}'
+            name: '{{ name }}'
 ```
 </TabItem>
 </Tabs>
@@ -3234,7 +3233,7 @@ SET PatchDocument = string('{{ {
     "Sheets": sheets
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<AnalysisId>|<AwsAccountId>';
+AND Identifier = '{{ analysis_id }}|{{ aws_account_id }}';
 ```
 
 
@@ -3243,7 +3242,7 @@ AND Identifier = '<AnalysisId>|<AwsAccountId>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.quicksight.analyses
-WHERE Identifier = '<AnalysisId|AwsAccountId>'
+WHERE Identifier = '{{ analysis_id }}|{{ aws_account_id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/quicksight/custom_permissions/index.md b/website/docs/services/quicksight/custom_permissions/index.md
index 211520182..8ce7ee9a6 100644
--- a/website/docs/services/quicksight/custom_permissions/index.md
+++ b/website/docs/services/quicksight/custom_permissions/index.md
@@ -182,7 +182,7 @@ capabilities,
 custom_permissions_name,
 tags
 FROM awscc.quicksight.custom_permissions
-WHERE region = 'us-east-1' AND Identifier = '<AwsAccountId>|<CustomPermissionsName>';
+WHERE region = 'us-east-1' AND Identifier = '{{ aws_account_id }}|{{ custom_permissions_name }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -220,9 +220,9 @@ INSERT INTO awscc.quicksight.custom_permissions (
  CustomPermissionsName,
  region
 )
-SELECT 
-'{{ AwsAccountId }}',
- '{{ CustomPermissionsName }}',
+SELECT
+'{{ aws_account_id }}',
+ '{{ custom_permissions_name }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -237,11 +237,11 @@ INSERT INTO awscc.quicksight.custom_permissions (
  Tags,
  region
 )
-SELECT 
- '{{ AwsAccountId }}',
- '{{ Capabilities }}',
- '{{ CustomPermissionsName }}',
- '{{ Tags }}',
+SELECT
+ '{{ aws_account_id }}',
+ '{{ capabilities }}',
+ '{{ custom_permissions_name }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -259,40 +259,39 @@ globals:
 resources:
   - name: custom_permission
     props:
-      - name: AwsAccountId
-        value: '{{ AwsAccountId }}'
-      - name: Capabilities
+      - name: aws_account_id
+        value: '{{ aws_account_id }}'
+      - name: capabilities
         value:
-          ExportToCsv: '{{ ExportToCsv }}'
-          ExportToExcel: null
-          ExportToPdf: null
-          PrintReports: null
-          CreateAndUpdateThemes: null
-          AddOrRunAnomalyDetectionForAnalyses: null
-          ShareAnalyses: null
-          CreateAndUpdateDatasets: null
-          ShareDatasets: null
-          SubscribeDashboardEmailReports: null
-          CreateAndUpdateDashboardEmailReports: null
-          ShareDashboards: null
-          CreateAndUpdateThresholdAlerts: null
-          RenameSharedFolders: null
-          CreateSharedFolders: null
-          CreateAndUpdateDataSources: null
-          ShareDataSources: null
-          ViewAccountSPICECapacity: null
-          CreateSPICEDataset: null
-          ExportToPdfInScheduledReports: null
-          ExportToCsvInScheduledReports: null
-          ExportToExcelInScheduledReports: null
-          IncludeContentInScheduledReportsEmail: null
-      - name: CustomPermissionsName
-        value: '{{ CustomPermissionsName }}'
-      - name: Tags
+          export_to_csv: '{{ export_to_csv }}'
+          export_to_excel: null
+          export_to_pdf: null
+          print_reports: null
+          create_and_update_themes: null
+          add_or_run_anomaly_detection_for_analyses: null
+          share_analyses: null
+          create_and_update_datasets: null
+          share_datasets: null
+          subscribe_dashboard_email_reports: null
+          create_and_update_dashboard_email_reports: null
+          share_dashboards: null
+          create_and_update_threshold_alerts: null
+          rename_shared_folders: null
+          create_shared_folders: null
+          create_and_update_data_sources: null
+          share_data_sources: null
+          view_account_sp_ic_ecapacity: null
+          create_sp_ic_edataset: null
+          export_to_pdf_in_scheduled_reports: null
+          export_to_csv_in_scheduled_reports: null
+          export_to_excel_in_scheduled_reports: null
+          include_content_in_scheduled_reports_email: null
+      - name: custom_permissions_name
+        value: '{{ custom_permissions_name }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -309,7 +308,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<AwsAccountId>|<CustomPermissionsName>';
+AND Identifier = '{{ aws_account_id }}|{{ custom_permissions_name }}';
 ```
 
 
@@ -318,7 +317,7 @@ AND Identifier = '<AwsAccountId>|<CustomPermissionsName>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.quicksight.custom_permissions
-WHERE Identifier = '<AwsAccountId|CustomPermissionsName>'
+WHERE Identifier = '{{ aws_account_id }}|{{ custom_permissions_name }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/quicksight/dashboards/index.md b/website/docs/services/quicksight/dashboards/index.md
index 66e3876d2..93740ad45 100644
--- a/website/docs/services/quicksight/dashboards/index.md
+++ b/website/docs/services/quicksight/dashboards/index.md
@@ -1371,7 +1371,7 @@ link_entities,
 arn,
 tags
 FROM awscc.quicksight.dashboards
-WHERE region = 'us-east-1' AND Identifier = '<AwsAccountId>|<DashboardId>';
+WHERE region = 'us-east-1' AND Identifier = '{{ aws_account_id }}|{{ dashboard_id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -1410,10 +1410,10 @@ INSERT INTO awscc.quicksight.dashboards (
  AwsAccountId,
  region
 )
-SELECT 
-'{{ DashboardId }}',
- '{{ Name }}',
- '{{ AwsAccountId }}',
+SELECT
+'{{ dashboard_id }}',
+ '{{ name }}',
+ '{{ aws_account_id }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -1439,22 +1439,22 @@ INSERT INTO awscc.quicksight.dashboards (
  Tags,
  region
 )
-SELECT 
- '{{ Parameters }}',
- '{{ VersionDescription }}',
- '{{ SourceEntity }}',
- '{{ ThemeArn }}',
- '{{ Definition }}',
- '{{ ValidationStrategy }}',
- '{{ FolderArns }}',
- '{{ DashboardId }}',
- '{{ LinkSharingConfiguration }}',
- '{{ Name }}',
- '{{ DashboardPublishOptions }}',
- '{{ AwsAccountId }}',
- '{{ Permissions }}',
- '{{ LinkEntities }}',
- '{{ Tags }}',
+SELECT
+ '{{ parameters }}',
+ '{{ version_description }}',
+ '{{ source_entity }}',
+ '{{ theme_arn }}',
+ '{{ definition }}',
+ '{{ validation_strategy }}',
+ '{{ folder_arns }}',
+ '{{ dashboard_id }}',
+ '{{ link_sharing_configuration }}',
+ '{{ name }}',
+ '{{ dashboard_publish_options }}',
+ '{{ aws_account_id }}',
+ '{{ permissions }}',
+ '{{ link_entities }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -1472,1975 +1472,1974 @@ globals:
 resources:
   - name: dashboard
     props:
-      - name: Parameters
+      - name: parameters
         value:
-          StringParameters:
-            - Values:
-                - '{{ Values[0] }}'
-              Name: '{{ Name }}'
-          DecimalParameters:
-            - Values:
+          string_parameters:
+            - values:
+                - '{{ values[0] }}'
+              name: '{{ name }}'
+          decimal_parameters:
+            - values:
                 - null
-              Name: '{{ Name }}'
-          IntegerParameters:
-            - Values:
+              name: '{{ name }}'
+          integer_parameters:
+            - values:
                 - null
-              Name: '{{ Name }}'
-          DateTimeParameters:
-            - Values:
-                - '{{ Values[0] }}'
-              Name: '{{ Name }}'
-      - name: VersionDescription
-        value: '{{ VersionDescription }}'
-      - name: SourceEntity
+              name: '{{ name }}'
+          date_time_parameters:
+            - values:
+                - '{{ values[0] }}'
+              name: '{{ name }}'
+      - name: version_description
+        value: '{{ version_description }}'
+      - name: source_entity
         value:
-          SourceTemplate:
-            DataSetReferences:
-              - DataSetArn: '{{ DataSetArn }}'
-                DataSetPlaceholder: '{{ DataSetPlaceholder }}'
-            Arn: '{{ Arn }}'
-      - name: ThemeArn
-        value: '{{ ThemeArn }}'
-      - name: Definition
+          source_template:
+            data_set_references:
+              - data_set_arn: '{{ data_set_arn }}'
+                data_set_placeholder: '{{ data_set_placeholder }}'
+            arn: '{{ arn }}'
+      - name: theme_arn
+        value: '{{ theme_arn }}'
+      - name: definition
         value:
-          Options:
-            Timezone: '{{ Timezone }}'
-            WeekStart: '{{ WeekStart }}'
-          FilterGroups:
-            - Status: '{{ Status }}'
-              Filters:
-                - NestedFilter:
-                    Column:
-                      ColumnName: '{{ ColumnName }}'
-                      DataSetIdentifier: '{{ DataSetIdentifier }}'
-                    InnerFilter:
-                      CategoryInnerFilter:
-                        Configuration:
-                          CustomFilterListConfiguration:
-                            CategoryValues:
-                              - '{{ CategoryValues[0] }}'
-                            NullOption: '{{ NullOption }}'
-                            MatchOperator: '{{ MatchOperator }}'
-                            SelectAllOptions: '{{ SelectAllOptions }}'
-                          CustomFilterConfiguration:
-                            CategoryValue: '{{ CategoryValue }}'
-                            ParameterName: '{{ ParameterName }}'
-                            NullOption: null
-                            MatchOperator: null
-                            SelectAllOptions: null
-                          FilterListConfiguration:
-                            CategoryValues:
-                              - '{{ CategoryValues[0] }}'
-                            NullOption: null
-                            MatchOperator: null
-                            SelectAllOptions: null
-                        Column: null
-                        DefaultFilterControlConfiguration:
-                          ControlOptions:
-                            DefaultSliderOptions:
-                              Type: '{{ Type }}'
-                              StepSize: null
-                              DisplayOptions:
-                                TitleOptions:
-                                  CustomLabel: '{{ CustomLabel }}'
-                                  Visibility: null
-                                  FontConfiguration:
-                                    FontFamily: '{{ FontFamily }}'
-                                    FontStyle: '{{ FontStyle }}'
-                                    FontSize:
-                                      Relative: '{{ Relative }}'
-                                      Absolute: '{{ Absolute }}'
-                                    FontDecoration: '{{ FontDecoration }}'
-                                    FontColor: '{{ FontColor }}'
-                                    FontWeight:
-                                      Name: '{{ Name }}'
-                                InfoIconLabelOptions:
-                                  Visibility: null
-                                  InfoIconText: '{{ InfoIconText }}'
-                              MaximumValue: null
-                              MinimumValue: null
-                            DefaultRelativeDateTimeOptions:
-                              DisplayOptions:
-                                TitleOptions: null
-                                InfoIconLabelOptions: null
-                                DateTimeFormat: '{{ DateTimeFormat }}'
-                              CommitMode: '{{ CommitMode }}'
-                            DefaultTextFieldOptions:
-                              DisplayOptions:
-                                TitleOptions: null
-                                PlaceholderOptions:
-                                  Visibility: null
-                                InfoIconLabelOptions: null
-                            DefaultTextAreaOptions:
-                              Delimiter: '{{ Delimiter }}'
-                              DisplayOptions:
-                                TitleOptions: null
-                                PlaceholderOptions: null
-                                InfoIconLabelOptions: null
-                            DefaultDropdownOptions:
-                              Type: '{{ Type }}'
-                              DisplayOptions:
-                                TitleOptions: null
-                                SelectAllOptions:
-                                  Visibility: null
-                                InfoIconLabelOptions: null
-                              CommitMode: null
-                              SelectableValues:
-                                Values:
-                                  - '{{ Values[0] }}'
-                            DefaultDateTimePickerOptions:
-                              Type: '{{ Type }}'
-                              DisplayOptions:
-                                TitleOptions: null
-                                InfoIconLabelOptions: null
-                                HelperTextVisibility: null
-                                DateIconVisibility: null
-                                DateTimeFormat: '{{ DateTimeFormat }}'
-                              CommitMode: null
-                            DefaultListOptions:
-                              Type: null
-                              DisplayOptions:
-                                TitleOptions: null
-                                SearchOptions:
-                                  Visibility: null
-                                SelectAllOptions: null
-                                InfoIconLabelOptions: null
-                              SelectableValues: null
-                          Title: '{{ Title }}'
-                    IncludeInnerSet: '{{ IncludeInnerSet }}'
-                    FilterId: '{{ FilterId }}'
-                  NumericEqualityFilter:
-                    AggregationFunction:
-                      AttributeAggregationFunction:
-                        SimpleAttributeAggregation: '{{ SimpleAttributeAggregation }}'
-                        ValueForMultipleValues: '{{ ValueForMultipleValues }}'
-                      DateAggregationFunction: '{{ DateAggregationFunction }}'
-                      NumericalAggregationFunction:
-                        PercentileAggregation:
-                          PercentileValue: null
-                        SimpleNumericalAggregation: '{{ SimpleNumericalAggregation }}'
-                      CategoricalAggregationFunction: '{{ CategoricalAggregationFunction }}'
-                    Column: null
-                    Value: null
-                    ParameterName: '{{ ParameterName }}'
-                    NullOption: null
-                    MatchOperator: '{{ MatchOperator }}'
-                    SelectAllOptions: '{{ SelectAllOptions }}'
-                    DefaultFilterControlConfiguration: null
-                    FilterId: '{{ FilterId }}'
-                  NumericRangeFilter:
-                    AggregationFunction: null
-                    Column: null
-                    IncludeMaximum: '{{ IncludeMaximum }}'
-                    RangeMinimum:
-                      StaticValue: null
-                      Parameter: '{{ Parameter }}'
-                    NullOption: null
-                    SelectAllOptions: null
-                    DefaultFilterControlConfiguration: null
-                    FilterId: '{{ FilterId }}'
-                    RangeMaximum: null
-                    IncludeMinimum: '{{ IncludeMinimum }}'
-                  TimeRangeFilter:
-                    RangeMinimumValue:
-                      RollingDate:
-                        Expression: '{{ Expression }}'
-                        DataSetIdentifier: '{{ DataSetIdentifier }}'
-                      StaticValue: '{{ StaticValue }}'
-                      Parameter: '{{ Parameter }}'
-                    Column: null
-                    RangeMaximumValue: null
-                    IncludeMaximum: '{{ IncludeMaximum }}'
-                    TimeGranularity: '{{ TimeGranularity }}'
-                    NullOption: null
-                    DefaultFilterControlConfiguration: null
-                    FilterId: '{{ FilterId }}'
-                    IncludeMinimum: '{{ IncludeMinimum }}'
-                    ExcludePeriodConfiguration:
-                      Status: null
-                      Amount: null
-                      Granularity: null
-                  RelativeDatesFilter:
-                    RelativeDateValue: null
-                    Column: null
-                    RelativeDateType: '{{ RelativeDateType }}'
-                    TimeGranularity: null
-                    ParameterName: '{{ ParameterName }}'
-                    NullOption: null
-                    DefaultFilterControlConfiguration: null
-                    FilterId: '{{ FilterId }}'
-                    AnchorDateConfiguration:
-                      AnchorOption: '{{ AnchorOption }}'
-                      ParameterName: '{{ ParameterName }}'
-                    MinimumGranularity: null
-                    ExcludePeriodConfiguration: null
-                  TopBottomFilter:
-                    AggregationSortConfigurations:
-                      - AggregationFunction: null
-                        SortDirection: '{{ SortDirection }}'
-                        Column: null
-                    Column: null
-                    TimeGranularity: null
-                    ParameterName: '{{ ParameterName }}'
-                    Limit: null
-                    DefaultFilterControlConfiguration: null
-                    FilterId: '{{ FilterId }}'
-                  TimeEqualityFilter:
-                    Column: null
-                    RollingDate: null
-                    Value: '{{ Value }}'
-                    TimeGranularity: null
-                    ParameterName: '{{ ParameterName }}'
-                    DefaultFilterControlConfiguration: null
-                    FilterId: '{{ FilterId }}'
-                  CategoryFilter:
-                    Configuration: null
-                    Column: null
-                    DefaultFilterControlConfiguration: null
-                    FilterId: '{{ FilterId }}'
-              CrossDataset: '{{ CrossDataset }}'
-              ScopeConfiguration:
-                AllSheets: {}
-                SelectedSheets:
-                  SheetVisualScopingConfigurations:
-                    - Scope: '{{ Scope }}'
-                      SheetId: '{{ SheetId }}'
-                      VisualIds:
-                        - '{{ VisualIds[0] }}'
-              FilterGroupId: '{{ FilterGroupId }}'
-          StaticFiles:
-            - ImageStaticFile:
-                StaticFileId: '{{ StaticFileId }}'
-                Source:
-                  UrlOptions:
-                    Url: '{{ Url }}'
-                  S3Options:
-                    BucketName: '{{ BucketName }}'
-                    ObjectKey: '{{ ObjectKey }}'
-                    Region: '{{ Region }}'
-              SpatialStaticFile:
-                StaticFileId: '{{ StaticFileId }}'
-                Source: null
-          CalculatedFields:
-            - Expression: '{{ Expression }}'
-              DataSetIdentifier: '{{ DataSetIdentifier }}'
-              Name: '{{ Name }}'
-          DataSetIdentifierDeclarations:
-            - Identifier: '{{ Identifier }}'
-              DataSetArn: '{{ DataSetArn }}'
-          ColumnConfigurations:
-            - Role: '{{ Role }}'
-              FormatConfiguration:
-                NumberFormatConfiguration:
-                  FormatConfiguration:
-                    NumberDisplayFormatConfiguration:
-                      NegativeValueConfiguration:
-                        DisplayMode: '{{ DisplayMode }}'
-                      DecimalPlacesConfiguration:
-                        DecimalPlaces: null
-                      NumberScale: '{{ NumberScale }}'
-                      NullValueFormatConfiguration:
-                        NullString: '{{ NullString }}'
-                      Suffix: '{{ Suffix }}'
-                      SeparatorConfiguration:
-                        DecimalSeparator: '{{ DecimalSeparator }}'
-                        ThousandsSeparator:
-                          Symbol: null
-                          Visibility: null
-                          GroupingStyle: '{{ GroupingStyle }}'
-                      Prefix: '{{ Prefix }}'
-                    CurrencyDisplayFormatConfiguration:
-                      NegativeValueConfiguration: null
-                      DecimalPlacesConfiguration: null
-                      NumberScale: null
-                      NullValueFormatConfiguration: null
-                      Suffix: '{{ Suffix }}'
-                      SeparatorConfiguration: null
-                      Symbol: '{{ Symbol }}'
-                      Prefix: '{{ Prefix }}'
-                    PercentageDisplayFormatConfiguration:
-                      NegativeValueConfiguration: null
-                      DecimalPlacesConfiguration: null
-                      NullValueFormatConfiguration: null
-                      Suffix: '{{ Suffix }}'
-                      SeparatorConfiguration: null
-                      Prefix: '{{ Prefix }}'
-                DateTimeFormatConfiguration:
-                  NumericFormatConfiguration: null
-                  NullValueFormatConfiguration: null
-                  DateTimeFormat: '{{ DateTimeFormat }}'
-                StringFormatConfiguration:
-                  NumericFormatConfiguration: null
-                  NullValueFormatConfiguration: null
-              Column: null
-              ColorsConfiguration:
-                CustomColors:
-                  - Color: '{{ Color }}'
-                    FieldValue: '{{ FieldValue }}'
-                    SpecialValue: '{{ SpecialValue }}'
-          AnalysisDefaults:
-            DefaultNewSheetConfiguration:
-              SheetContentType: '{{ SheetContentType }}'
-              InteractiveLayoutConfiguration:
-                FreeForm:
-                  CanvasSizeOptions:
-                    ScreenCanvasSizeOptions:
-                      OptimizedViewPortWidth: '{{ OptimizedViewPortWidth }}'
-                Grid:
-                  CanvasSizeOptions:
-                    ScreenCanvasSizeOptions:
-                      OptimizedViewPortWidth: '{{ OptimizedViewPortWidth }}'
-                      ResizeOption: '{{ ResizeOption }}'
-              PaginatedLayoutConfiguration:
-                SectionBased:
-                  CanvasSizeOptions:
-                    PaperCanvasSizeOptions:
-                      PaperMargin:
-                        Left: '{{ Left }}'
-                        Top: '{{ Top }}'
-                        Right: '{{ Right }}'
-                        Bottom: '{{ Bottom }}'
-                      PaperSize: '{{ PaperSize }}'
-                      PaperOrientation: '{{ PaperOrientation }}'
-          Sheets:
-            - Description: '{{ Description }}'
-              ParameterControls:
-                - Slider:
-                    ParameterControlId: '{{ ParameterControlId }}'
-                    StepSize: null
-                    DisplayOptions: null
-                    SourceParameterName: '{{ SourceParameterName }}'
-                    Title: '{{ Title }}'
-                    MaximumValue: null
-                    MinimumValue: null
-                  TextArea:
-                    ParameterControlId: '{{ ParameterControlId }}'
-                    Delimiter: '{{ Delimiter }}'
-                    DisplayOptions: null
-                    SourceParameterName: '{{ SourceParameterName }}'
-                    Title: '{{ Title }}'
-                  Dropdown:
-                    ParameterControlId: '{{ ParameterControlId }}'
-                    Type: null
-                    DisplayOptions: null
-                    SourceParameterName: '{{ SourceParameterName }}'
-                    CascadingControlConfiguration:
-                      SourceControls:
-                        - SourceSheetControlId: '{{ SourceSheetControlId }}'
-                          ColumnToMatch: null
-                    Title: '{{ Title }}'
-                    CommitMode: null
-                    SelectableValues:
-                      LinkToDataSetColumn: null
-                      Values:
-                        - '{{ Values[0] }}'
-                  TextField:
-                    ParameterControlId: '{{ ParameterControlId }}'
-                    DisplayOptions: null
-                    SourceParameterName: '{{ SourceParameterName }}'
-                    Title: '{{ Title }}'
-                  List:
-                    ParameterControlId: '{{ ParameterControlId }}'
-                    Type: null
-                    DisplayOptions: null
-                    SourceParameterName: '{{ SourceParameterName }}'
-                    CascadingControlConfiguration: null
-                    Title: '{{ Title }}'
-                    SelectableValues: null
-                  DateTimePicker:
-                    ParameterControlId: '{{ ParameterControlId }}'
-                    DisplayOptions: null
-                    SourceParameterName: '{{ SourceParameterName }}'
-                    Title: '{{ Title }}'
-              ContentType: null
-              SheetId: '{{ SheetId }}'
-              Images:
-                - Actions:
-                    - Status: null
-                      Trigger: '{{ Trigger }}'
-                      CustomActionId: '{{ CustomActionId }}'
-                      Name: '{{ Name }}'
-                      ActionOperations:
-                        - NavigationOperation:
-                            LocalNavigationConfiguration:
-                              TargetSheetId: '{{ TargetSheetId }}'
-                          SetParametersOperation:
-                            ParameterValueConfigurations:
-                              - DestinationParameterName: '{{ DestinationParameterName }}'
-                                Value:
-                                  CustomValuesConfiguration:
-                                    IncludeNullValue: '{{ IncludeNullValue }}'
-                                    CustomValues:
-                                      DecimalValues:
+          options:
+            timezone: '{{ timezone }}'
+            week_start: '{{ week_start }}'
+          filter_groups:
+            - status: '{{ status }}'
+              filters:
+                - nested_filter:
+                    column:
+                      column_name: '{{ column_name }}'
+                      data_set_identifier: '{{ data_set_identifier }}'
+                    inner_filter:
+                      category_inner_filter:
+                        configuration:
+                          custom_filter_list_configuration:
+                            category_values:
+                              - '{{ category_values[0] }}'
+                            null_option: '{{ null_option }}'
+                            match_operator: '{{ match_operator }}'
+                            select_all_options: '{{ select_all_options }}'
+                          custom_filter_configuration:
+                            category_value: '{{ category_value }}'
+                            parameter_name: '{{ parameter_name }}'
+                            null_option: null
+                            match_operator: null
+                            select_all_options: null
+                          filter_list_configuration:
+                            category_values:
+                              - '{{ category_values[0] }}'
+                            null_option: null
+                            match_operator: null
+                            select_all_options: null
+                        column: null
+                        default_filter_control_configuration:
+                          control_options:
+                            default_slider_options:
+                              type: '{{ type }}'
+                              step_size: null
+                              display_options:
+                                title_options:
+                                  custom_label: '{{ custom_label }}'
+                                  visibility: null
+                                  font_configuration:
+                                    font_family: '{{ font_family }}'
+                                    font_style: '{{ font_style }}'
+                                    font_size:
+                                      relative: '{{ relative }}'
+                                      absolute: '{{ absolute }}'
+                                    font_decoration: '{{ font_decoration }}'
+                                    font_color: '{{ font_color }}'
+                                    font_weight:
+                                      name: '{{ name }}'
+                                info_icon_label_options:
+                                  visibility: null
+                                  info_icon_text: '{{ info_icon_text }}'
+                              maximum_value: null
+                              minimum_value: null
+                            default_relative_date_time_options:
+                              display_options:
+                                title_options: null
+                                info_icon_label_options: null
+                                date_time_format: '{{ date_time_format }}'
+                              commit_mode: '{{ commit_mode }}'
+                            default_text_field_options:
+                              display_options:
+                                title_options: null
+                                placeholder_options:
+                                  visibility: null
+                                info_icon_label_options: null
+                            default_text_area_options:
+                              delimiter: '{{ delimiter }}'
+                              display_options:
+                                title_options: null
+                                placeholder_options: null
+                                info_icon_label_options: null
+                            default_dropdown_options:
+                              type: '{{ type }}'
+                              display_options:
+                                title_options: null
+                                select_all_options:
+                                  visibility: null
+                                info_icon_label_options: null
+                              commit_mode: null
+                              selectable_values:
+                                values:
+                                  - '{{ values[0] }}'
+                            default_date_time_picker_options:
+                              type: '{{ type }}'
+                              display_options:
+                                title_options: null
+                                info_icon_label_options: null
+                                helper_text_visibility: null
+                                date_icon_visibility: null
+                                date_time_format: '{{ date_time_format }}'
+                              commit_mode: null
+                            default_list_options:
+                              type: null
+                              display_options:
+                                title_options: null
+                                search_options:
+                                  visibility: null
+                                select_all_options: null
+                                info_icon_label_options: null
+                              selectable_values: null
+                          title: '{{ title }}'
+                    include_inner_set: '{{ include_inner_set }}'
+                    filter_id: '{{ filter_id }}'
+                  numeric_equality_filter:
+                    aggregation_function:
+                      attribute_aggregation_function:
+                        simple_attribute_aggregation: '{{ simple_attribute_aggregation }}'
+                        value_for_multiple_values: '{{ value_for_multiple_values }}'
+                      date_aggregation_function: '{{ date_aggregation_function }}'
+                      numerical_aggregation_function:
+                        percentile_aggregation:
+                          percentile_value: null
+                        simple_numerical_aggregation: '{{ simple_numerical_aggregation }}'
+                      categorical_aggregation_function: '{{ categorical_aggregation_function }}'
+                    column: null
+                    value: null
+                    parameter_name: '{{ parameter_name }}'
+                    null_option: null
+                    match_operator: '{{ match_operator }}'
+                    select_all_options: '{{ select_all_options }}'
+                    default_filter_control_configuration: null
+                    filter_id: '{{ filter_id }}'
+                  numeric_range_filter:
+                    aggregation_function: null
+                    column: null
+                    include_maximum: '{{ include_maximum }}'
+                    range_minimum:
+                      static_value: null
+                      parameter: '{{ parameter }}'
+                    null_option: null
+                    select_all_options: null
+                    default_filter_control_configuration: null
+                    filter_id: '{{ filter_id }}'
+                    range_maximum: null
+                    include_minimum: '{{ include_minimum }}'
+                  time_range_filter:
+                    range_minimum_value:
+                      rolling_date:
+                        expression: '{{ expression }}'
+                        data_set_identifier: '{{ data_set_identifier }}'
+                      static_value: '{{ static_value }}'
+                      parameter: '{{ parameter }}'
+                    column: null
+                    range_maximum_value: null
+                    include_maximum: '{{ include_maximum }}'
+                    time_granularity: '{{ time_granularity }}'
+                    null_option: null
+                    default_filter_control_configuration: null
+                    filter_id: '{{ filter_id }}'
+                    include_minimum: '{{ include_minimum }}'
+                    exclude_period_configuration:
+                      status: null
+                      amount: null
+                      granularity: null
+                  relative_dates_filter:
+                    relative_date_value: null
+                    column: null
+                    relative_date_type: '{{ relative_date_type }}'
+                    time_granularity: null
+                    parameter_name: '{{ parameter_name }}'
+                    null_option: null
+                    default_filter_control_configuration: null
+                    filter_id: '{{ filter_id }}'
+                    anchor_date_configuration:
+                      anchor_option: '{{ anchor_option }}'
+                      parameter_name: '{{ parameter_name }}'
+                    minimum_granularity: null
+                    exclude_period_configuration: null
+                  top_bottom_filter:
+                    aggregation_sort_configurations:
+                      - aggregation_function: null
+                        sort_direction: '{{ sort_direction }}'
+                        column: null
+                    column: null
+                    time_granularity: null
+                    parameter_name: '{{ parameter_name }}'
+                    limit: null
+                    default_filter_control_configuration: null
+                    filter_id: '{{ filter_id }}'
+                  time_equality_filter:
+                    column: null
+                    rolling_date: null
+                    value: '{{ value }}'
+                    time_granularity: null
+                    parameter_name: '{{ parameter_name }}'
+                    default_filter_control_configuration: null
+                    filter_id: '{{ filter_id }}'
+                  category_filter:
+                    configuration: null
+                    column: null
+                    default_filter_control_configuration: null
+                    filter_id: '{{ filter_id }}'
+              cross_dataset: '{{ cross_dataset }}'
+              scope_configuration:
+                all_sheets: {}
+                selected_sheets:
+                  sheet_visual_scoping_configurations:
+                    - scope: '{{ scope }}'
+                      sheet_id: '{{ sheet_id }}'
+                      visual_ids:
+                        - '{{ visual_ids[0] }}'
+              filter_group_id: '{{ filter_group_id }}'
+          static_files:
+            - image_static_file:
+                static_file_id: '{{ static_file_id }}'
+                source:
+                  url_options:
+                    url: '{{ url }}'
+                  s3_options:
+                    bucket_name: '{{ bucket_name }}'
+                    object_key: '{{ object_key }}'
+                    region: '{{ region }}'
+              spatial_static_file:
+                static_file_id: '{{ static_file_id }}'
+                source: null
+          calculated_fields:
+            - expression: '{{ expression }}'
+              data_set_identifier: '{{ data_set_identifier }}'
+              name: '{{ name }}'
+          data_set_identifier_declarations:
+            - identifier: '{{ identifier }}'
+              data_set_arn: '{{ data_set_arn }}'
+          column_configurations:
+            - role: '{{ role }}'
+              format_configuration:
+                number_format_configuration:
+                  format_configuration:
+                    number_display_format_configuration:
+                      negative_value_configuration:
+                        display_mode: '{{ display_mode }}'
+                      decimal_places_configuration:
+                        decimal_places: null
+                      number_scale: '{{ number_scale }}'
+                      null_value_format_configuration:
+                        null_string: '{{ null_string }}'
+                      suffix: '{{ suffix }}'
+                      separator_configuration:
+                        decimal_separator: '{{ decimal_separator }}'
+                        thousands_separator:
+                          symbol: null
+                          visibility: null
+                          grouping_style: '{{ grouping_style }}'
+                      prefix: '{{ prefix }}'
+                    currency_display_format_configuration:
+                      negative_value_configuration: null
+                      decimal_places_configuration: null
+                      number_scale: null
+                      null_value_format_configuration: null
+                      suffix: '{{ suffix }}'
+                      separator_configuration: null
+                      symbol: '{{ symbol }}'
+                      prefix: '{{ prefix }}'
+                    percentage_display_format_configuration:
+                      negative_value_configuration: null
+                      decimal_places_configuration: null
+                      null_value_format_configuration: null
+                      suffix: '{{ suffix }}'
+                      separator_configuration: null
+                      prefix: '{{ prefix }}'
+                date_time_format_configuration:
+                  numeric_format_configuration: null
+                  null_value_format_configuration: null
+                  date_time_format: '{{ date_time_format }}'
+                string_format_configuration:
+                  numeric_format_configuration: null
+                  null_value_format_configuration: null
+              column: null
+              colors_configuration:
+                custom_colors:
+                  - color: '{{ color }}'
+                    field_value: '{{ field_value }}'
+                    special_value: '{{ special_value }}'
+          analysis_defaults:
+            default_new_sheet_configuration:
+              sheet_content_type: '{{ sheet_content_type }}'
+              interactive_layout_configuration:
+                free_form:
+                  canvas_size_options:
+                    screen_canvas_size_options:
+                      optimized_view_port_width: '{{ optimized_view_port_width }}'
+                grid:
+                  canvas_size_options:
+                    screen_canvas_size_options:
+                      optimized_view_port_width: '{{ optimized_view_port_width }}'
+                      resize_option: '{{ resize_option }}'
+              paginated_layout_configuration:
+                section_based:
+                  canvas_size_options:
+                    paper_canvas_size_options:
+                      paper_margin:
+                        left: '{{ left }}'
+                        top: '{{ top }}'
+                        right: '{{ right }}'
+                        bottom: '{{ bottom }}'
+                      paper_size: '{{ paper_size }}'
+                      paper_orientation: '{{ paper_orientation }}'
+          sheets:
+            - description: '{{ description }}'
+              parameter_controls:
+                - slider:
+                    parameter_control_id: '{{ parameter_control_id }}'
+                    step_size: null
+                    display_options: null
+                    source_parameter_name: '{{ source_parameter_name }}'
+                    title: '{{ title }}'
+                    maximum_value: null
+                    minimum_value: null
+                  text_area:
+                    parameter_control_id: '{{ parameter_control_id }}'
+                    delimiter: '{{ delimiter }}'
+                    display_options: null
+                    source_parameter_name: '{{ source_parameter_name }}'
+                    title: '{{ title }}'
+                  dropdown:
+                    parameter_control_id: '{{ parameter_control_id }}'
+                    type: null
+                    display_options: null
+                    source_parameter_name: '{{ source_parameter_name }}'
+                    cascading_control_configuration:
+                      source_controls:
+                        - source_sheet_control_id: '{{ source_sheet_control_id }}'
+                          column_to_match: null
+                    title: '{{ title }}'
+                    commit_mode: null
+                    selectable_values:
+                      link_to_data_set_column: null
+                      values:
+                        - '{{ values[0] }}'
+                  text_field:
+                    parameter_control_id: '{{ parameter_control_id }}'
+                    display_options: null
+                    source_parameter_name: '{{ source_parameter_name }}'
+                    title: '{{ title }}'
+                  list:
+                    parameter_control_id: '{{ parameter_control_id }}'
+                    type: null
+                    display_options: null
+                    source_parameter_name: '{{ source_parameter_name }}'
+                    cascading_control_configuration: null
+                    title: '{{ title }}'
+                    selectable_values: null
+                  date_time_picker:
+                    parameter_control_id: '{{ parameter_control_id }}'
+                    display_options: null
+                    source_parameter_name: '{{ source_parameter_name }}'
+                    title: '{{ title }}'
+              content_type: null
+              sheet_id: '{{ sheet_id }}'
+              images:
+                - actions:
+                    - status: null
+                      trigger: '{{ trigger }}'
+                      custom_action_id: '{{ custom_action_id }}'
+                      name: '{{ name }}'
+                      action_operations:
+                        - navigation_operation:
+                            local_navigation_configuration:
+                              target_sheet_id: '{{ target_sheet_id }}'
+                          set_parameters_operation:
+                            parameter_value_configurations:
+                              - destination_parameter_name: '{{ destination_parameter_name }}'
+                                value:
+                                  custom_values_configuration:
+                                    include_null_value: '{{ include_null_value }}'
+                                    custom_values:
+                                      decimal_values:
                                         - null
-                                      IntegerValues:
+                                      integer_values:
                                         - null
-                                      StringValues:
-                                        - '{{ StringValues[0] }}'
-                                      DateTimeValues:
-                                        - '{{ DateTimeValues[0] }}'
-                                  SourceParameterName: '{{ SourceParameterName }}'
-                                  SelectAllValueOptions: '{{ SelectAllValueOptions }}'
-                                  SourceField: '{{ SourceField }}'
-                                  SourceColumn: null
-                          URLOperation:
-                            URLTemplate: '{{ URLTemplate }}'
-                            URLTarget: '{{ URLTarget }}'
-                  SheetImageId: '{{ SheetImageId }}'
-                  Tooltip:
-                    Visibility: null
-                    TooltipText:
-                      PlainText: '{{ PlainText }}'
-                  Scaling:
-                    ScalingType: '{{ ScalingType }}'
-                  Interactions:
-                    ImageMenuOption:
-                      AvailabilityStatus: '{{ AvailabilityStatus }}'
-                  Source:
-                    SheetImageStaticFileSource:
-                      StaticFileId: '{{ StaticFileId }}'
-                  ImageContentAltText: '{{ ImageContentAltText }}'
-              SheetControlLayouts:
-                - Configuration:
-                    GridLayout:
-                      CanvasSizeOptions: null
-                      Elements:
-                        - ElementType: '{{ ElementType }}'
-                          ColumnSpan: null
-                          ColumnIndex: null
-                          RowIndex: null
-                          RowSpan: null
-                          ElementId: '{{ ElementId }}'
-              Title: '{{ Title }}'
-              Name: '{{ Name }}'
-              TextBoxes:
-                - SheetTextBoxId: '{{ SheetTextBoxId }}'
-                  Content: '{{ Content }}'
-              Layouts:
-                - Configuration:
-                    GridLayout: null
-                    FreeFormLayout:
-                      CanvasSizeOptions: null
-                      Elements:
-                        - ElementType: null
-                          BorderStyle:
-                            Color: '{{ Color }}'
-                            Visibility: null
-                          Height: '{{ Height }}'
-                          Visibility: null
-                          RenderingRules:
-                            - Expression: '{{ Expression }}'
-                              ConfigurationOverrides:
-                                Visibility: null
-                          YAxisLocation: '{{ YAxisLocation }}'
-                          LoadingAnimation:
-                            Visibility: null
-                          Width: '{{ Width }}'
-                          BackgroundStyle:
-                            Color: '{{ Color }}'
-                            Visibility: null
-                          ElementId: '{{ ElementId }}'
-                          XAxisLocation: '{{ XAxisLocation }}'
-                          SelectedBorderStyle: null
-                    SectionBasedLayout:
-                      CanvasSizeOptions: null
-                      FooterSections:
-                        - Layout:
-                            FreeFormLayout:
-                              Elements:
+                                      string_values:
+                                        - '{{ string_values[0] }}'
+                                      date_time_values:
+                                        - '{{ date_time_values[0] }}'
+                                  source_parameter_name: '{{ source_parameter_name }}'
+                                  select_all_value_options: '{{ select_all_value_options }}'
+                                  source_field: '{{ source_field }}'
+                                  source_column: null
+                          url_operation:
+                            url_template: '{{ url_template }}'
+                            url_target: '{{ url_target }}'
+                  sheet_image_id: '{{ sheet_image_id }}'
+                  tooltip:
+                    visibility: null
+                    tooltip_text:
+                      plain_text: '{{ plain_text }}'
+                  scaling:
+                    scaling_type: '{{ scaling_type }}'
+                  interactions:
+                    image_menu_option:
+                      availability_status: '{{ availability_status }}'
+                  source:
+                    sheet_image_static_file_source:
+                      static_file_id: '{{ static_file_id }}'
+                  image_content_alt_text: '{{ image_content_alt_text }}'
+              sheet_control_layouts:
+                - configuration:
+                    grid_layout:
+                      canvas_size_options: null
+                      elements:
+                        - element_type: '{{ element_type }}'
+                          column_span: null
+                          column_index: null
+                          row_index: null
+                          row_span: null
+                          element_id: '{{ element_id }}'
+              title: '{{ title }}'
+              name: '{{ name }}'
+              text_boxes:
+                - sheet_text_box_id: '{{ sheet_text_box_id }}'
+                  content: '{{ content }}'
+              layouts:
+                - configuration:
+                    grid_layout: null
+                    free_form_layout:
+                      canvas_size_options: null
+                      elements:
+                        - element_type: null
+                          border_style:
+                            color: '{{ color }}'
+                            visibility: null
+                          height: '{{ height }}'
+                          visibility: null
+                          rendering_rules:
+                            - expression: '{{ expression }}'
+                              configuration_overrides:
+                                visibility: null
+                          y_axis_location: '{{ y_axis_location }}'
+                          loading_animation:
+                            visibility: null
+                          width: '{{ width }}'
+                          background_style:
+                            color: '{{ color }}'
+                            visibility: null
+                          element_id: '{{ element_id }}'
+                          x_axis_location: '{{ x_axis_location }}'
+                          selected_border_style: null
+                    section_based_layout:
+                      canvas_size_options: null
+                      footer_sections:
+                        - layout:
+                            free_form_layout:
+                              elements:
                                 - null
-                          Style:
-                            Padding: null
-                            Height: '{{ Height }}'
-                          SectionId: '{{ SectionId }}'
-                      BodySections:
-                        - Content:
-                            Layout: null
-                          Style: null
-                          PageBreakConfiguration:
-                            After:
-                              Status: '{{ Status }}'
-                          SectionId: '{{ SectionId }}'
-                          RepeatConfiguration:
-                            DimensionConfigurations:
-                              - DynamicNumericDimensionConfiguration:
-                                  Column: null
-                                  SortByMetrics:
-                                    - AggregationFunction: null
-                                      SortBy: null
-                                      Direction: null
-                                  Limit: null
-                                DynamicCategoryDimensionConfiguration:
-                                  Column: null
-                                  SortByMetrics:
+                          style:
+                            padding: null
+                            height: '{{ height }}'
+                          section_id: '{{ section_id }}'
+                      body_sections:
+                        - content:
+                            layout: null
+                          style: null
+                          page_break_configuration:
+                            after:
+                              status: '{{ status }}'
+                          section_id: '{{ section_id }}'
+                          repeat_configuration:
+                            dimension_configurations:
+                              - dynamic_numeric_dimension_configuration:
+                                  column: null
+                                  sort_by_metrics:
+                                    - aggregation_function: null
+                                      sort_by: null
+                                      direction: null
+                                  limit: null
+                                dynamic_category_dimension_configuration:
+                                  column: null
+                                  sort_by_metrics:
                                     - null
-                                  Limit: null
-                            NonRepeatingVisuals:
-                              - '{{ NonRepeatingVisuals[0] }}'
-                            PageBreakConfiguration:
-                              After: null
-                      HeaderSections:
+                                  limit: null
+                            non_repeating_visuals:
+                              - '{{ non_repeating_visuals[0] }}'
+                            page_break_configuration:
+                              after: null
+                      header_sections:
                         - null
-              FilterControls:
-                - Slider:
-                    FilterControlId: '{{ FilterControlId }}'
-                    Type: null
-                    StepSize: null
-                    DisplayOptions: null
-                    Title: '{{ Title }}'
-                    MaximumValue: null
-                    SourceFilterId: '{{ SourceFilterId }}'
-                    MinimumValue: null
-                  TextArea:
-                    FilterControlId: '{{ FilterControlId }}'
-                    Delimiter: '{{ Delimiter }}'
-                    DisplayOptions: null
-                    Title: '{{ Title }}'
-                    SourceFilterId: '{{ SourceFilterId }}'
-                  Dropdown:
-                    FilterControlId: '{{ FilterControlId }}'
-                    Type: null
-                    DisplayOptions: null
-                    CascadingControlConfiguration: null
-                    Title: '{{ Title }}'
-                    CommitMode: null
-                    SourceFilterId: '{{ SourceFilterId }}'
-                    SelectableValues: null
-                  TextField:
-                    FilterControlId: '{{ FilterControlId }}'
-                    DisplayOptions: null
-                    Title: '{{ Title }}'
-                    SourceFilterId: '{{ SourceFilterId }}'
-                  List:
-                    FilterControlId: '{{ FilterControlId }}'
-                    Type: null
-                    DisplayOptions: null
-                    CascadingControlConfiguration: null
-                    Title: '{{ Title }}'
-                    SourceFilterId: '{{ SourceFilterId }}'
-                    SelectableValues: null
-                  DateTimePicker:
-                    FilterControlId: '{{ FilterControlId }}'
-                    Type: null
-                    DisplayOptions: null
-                    Title: '{{ Title }}'
-                    CommitMode: null
-                    SourceFilterId: '{{ SourceFilterId }}'
-                  RelativeDateTime:
-                    FilterControlId: '{{ FilterControlId }}'
-                    DisplayOptions: null
-                    Title: '{{ Title }}'
-                    CommitMode: null
-                    SourceFilterId: '{{ SourceFilterId }}'
-                  CrossSheet:
-                    FilterControlId: '{{ FilterControlId }}'
-                    CascadingControlConfiguration: null
-                    SourceFilterId: '{{ SourceFilterId }}'
-              Visuals:
-                - FunnelChartVisual:
-                    Subtitle:
-                      Visibility: null
-                      FormatText:
-                        RichText: '{{ RichText }}'
-                        PlainText: '{{ PlainText }}'
-                    VisualId: '{{ VisualId }}'
-                    ChartConfiguration:
-                      SortConfiguration:
-                        CategoryItemsLimit:
-                          ItemsLimit: null
-                          OtherCategories: '{{ OtherCategories }}'
-                        CategorySort:
-                          - FieldSort:
-                              FieldId: '{{ FieldId }}'
-                              Direction: null
-                            ColumnSort: null
-                      DataLabelOptions:
-                        MeasureLabelVisibility: null
-                        Position: '{{ Position }}'
-                        Visibility: null
-                        CategoryLabelVisibility: null
-                        LabelColor: '{{ LabelColor }}'
-                        MeasureDataLabelStyle: '{{ MeasureDataLabelStyle }}'
-                        LabelFontConfiguration: null
-                      CategoryLabelOptions:
-                        Visibility: null
-                        SortIconVisibility: null
-                        AxisLabelOptions:
-                          - CustomLabel: '{{ CustomLabel }}'
-                            ApplyTo:
-                              Column: null
-                              FieldId: '{{ FieldId }}'
-                            FontConfiguration: null
-                      FieldWells:
-                        FunnelChartAggregatedFieldWells:
-                          Category:
-                            - DateDimensionField:
-                                HierarchyId: '{{ HierarchyId }}'
-                                FormatConfiguration: null
-                                Column: null
-                                FieldId: '{{ FieldId }}'
-                                DateGranularity: null
-                              NumericalDimensionField:
-                                HierarchyId: '{{ HierarchyId }}'
-                                FormatConfiguration: null
-                                Column: null
-                                FieldId: '{{ FieldId }}'
-                              CategoricalDimensionField:
-                                HierarchyId: '{{ HierarchyId }}'
-                                FormatConfiguration: null
-                                Column: null
-                                FieldId: '{{ FieldId }}'
-                          Values:
-                            - DateMeasureField:
-                                AggregationFunction: null
-                                FormatConfiguration: null
-                                Column: null
-                                FieldId: '{{ FieldId }}'
-                              NumericalMeasureField:
-                                AggregationFunction: null
-                                FormatConfiguration: null
-                                Column: null
-                                FieldId: '{{ FieldId }}'
-                              CategoricalMeasureField:
-                                AggregationFunction: null
-                                FormatConfiguration: null
-                                Column: null
-                                FieldId: '{{ FieldId }}'
-                              CalculatedMeasureField:
-                                Expression: '{{ Expression }}'
-                                FieldId: '{{ FieldId }}'
-                      Tooltip:
-                        SelectedTooltipType: '{{ SelectedTooltipType }}'
-                        TooltipVisibility: null
-                        FieldBasedTooltip:
-                          TooltipFields:
-                            - FieldTooltipItem:
-                                TooltipTarget: '{{ TooltipTarget }}'
-                                FieldId: '{{ FieldId }}'
-                                Label: '{{ Label }}'
-                                Visibility: null
-                              ColumnTooltipItem:
-                                Aggregation: null
-                                TooltipTarget: null
-                                Column: null
-                                Label: '{{ Label }}'
-                                Visibility: null
-                          AggregationVisibility: null
-                          TooltipTitleType: '{{ TooltipTitleType }}'
-                      Interactions:
-                        ContextMenuOption:
-                          AvailabilityStatus: null
-                        VisualMenuOption:
-                          AvailabilityStatus: null
-                      ValueLabelOptions: null
-                      VisualPalette:
-                        ChartColor: '{{ ChartColor }}'
-                        ColorMap:
-                          - Element:
-                              DataPathType:
-                                PivotTableDataPathType: '{{ PivotTableDataPathType }}'
-                              FieldId: '{{ FieldId }}'
-                              FieldValue: '{{ FieldValue }}'
-                            Color: '{{ Color }}'
-                            TimeGranularity: null
-                    Actions:
-                      - Status: null
-                        Trigger: '{{ Trigger }}'
-                        CustomActionId: '{{ CustomActionId }}'
-                        Name: '{{ Name }}'
-                        ActionOperations:
-                          - NavigationOperation: null
-                            SetParametersOperation: null
-                            FilterOperation:
-                              SelectedFieldsConfiguration:
-                                SelectedColumns:
+              filter_controls:
+                - slider:
+                    filter_control_id: '{{ filter_control_id }}'
+                    type: null
+                    step_size: null
+                    display_options: null
+                    title: '{{ title }}'
+                    maximum_value: null
+                    source_filter_id: '{{ source_filter_id }}'
+                    minimum_value: null
+                  text_area:
+                    filter_control_id: '{{ filter_control_id }}'
+                    delimiter: '{{ delimiter }}'
+                    display_options: null
+                    title: '{{ title }}'
+                    source_filter_id: '{{ source_filter_id }}'
+                  dropdown:
+                    filter_control_id: '{{ filter_control_id }}'
+                    type: null
+                    display_options: null
+                    cascading_control_configuration: null
+                    title: '{{ title }}'
+                    commit_mode: null
+                    source_filter_id: '{{ source_filter_id }}'
+                    selectable_values: null
+                  text_field:
+                    filter_control_id: '{{ filter_control_id }}'
+                    display_options: null
+                    title: '{{ title }}'
+                    source_filter_id: '{{ source_filter_id }}'
+                  list:
+                    filter_control_id: '{{ filter_control_id }}'
+                    type: null
+                    display_options: null
+                    cascading_control_configuration: null
+                    title: '{{ title }}'
+                    source_filter_id: '{{ source_filter_id }}'
+                    selectable_values: null
+                  date_time_picker:
+                    filter_control_id: '{{ filter_control_id }}'
+                    type: null
+                    display_options: null
+                    title: '{{ title }}'
+                    commit_mode: null
+                    source_filter_id: '{{ source_filter_id }}'
+                  relative_date_time:
+                    filter_control_id: '{{ filter_control_id }}'
+                    display_options: null
+                    title: '{{ title }}'
+                    commit_mode: null
+                    source_filter_id: '{{ source_filter_id }}'
+                  cross_sheet:
+                    filter_control_id: '{{ filter_control_id }}'
+                    cascading_control_configuration: null
+                    source_filter_id: '{{ source_filter_id }}'
+              visuals:
+                - funnel_chart_visual:
+                    subtitle:
+                      visibility: null
+                      format_text:
+                        rich_text: '{{ rich_text }}'
+                        plain_text: '{{ plain_text }}'
+                    visual_id: '{{ visual_id }}'
+                    chart_configuration:
+                      sort_configuration:
+                        category_items_limit:
+                          items_limit: null
+                          other_categories: '{{ other_categories }}'
+                        category_sort:
+                          - field_sort:
+                              field_id: '{{ field_id }}'
+                              direction: null
+                            column_sort: null
+                      data_label_options:
+                        measure_label_visibility: null
+                        position: '{{ position }}'
+                        visibility: null
+                        category_label_visibility: null
+                        label_color: '{{ label_color }}'
+                        measure_data_label_style: '{{ measure_data_label_style }}'
+                        label_font_configuration: null
+                      category_label_options:
+                        visibility: null
+                        sort_icon_visibility: null
+                        axis_label_options:
+                          - custom_label: '{{ custom_label }}'
+                            apply_to:
+                              column: null
+                              field_id: '{{ field_id }}'
+                            font_configuration: null
+                      field_wells:
+                        funnel_chart_aggregated_field_wells:
+                          category:
+                            - date_dimension_field:
+                                hierarchy_id: '{{ hierarchy_id }}'
+                                format_configuration: null
+                                column: null
+                                field_id: '{{ field_id }}'
+                                date_granularity: null
+                              numerical_dimension_field:
+                                hierarchy_id: '{{ hierarchy_id }}'
+                                format_configuration: null
+                                column: null
+                                field_id: '{{ field_id }}'
+                              categorical_dimension_field:
+                                hierarchy_id: '{{ hierarchy_id }}'
+                                format_configuration: null
+                                column: null
+                                field_id: '{{ field_id }}'
+                          values:
+                            - date_measure_field:
+                                aggregation_function: null
+                                format_configuration: null
+                                column: null
+                                field_id: '{{ field_id }}'
+                              numerical_measure_field:
+                                aggregation_function: null
+                                format_configuration: null
+                                column: null
+                                field_id: '{{ field_id }}'
+                              categorical_measure_field:
+                                aggregation_function: null
+                                format_configuration: null
+                                column: null
+                                field_id: '{{ field_id }}'
+                              calculated_measure_field:
+                                expression: '{{ expression }}'
+                                field_id: '{{ field_id }}'
+                      tooltip:
+                        selected_tooltip_type: '{{ selected_tooltip_type }}'
+                        tooltip_visibility: null
+                        field_based_tooltip:
+                          tooltip_fields:
+                            - field_tooltip_item:
+                                tooltip_target: '{{ tooltip_target }}'
+                                field_id: '{{ field_id }}'
+                                label: '{{ label }}'
+                                visibility: null
+                              column_tooltip_item:
+                                aggregation: null
+                                tooltip_target: null
+                                column: null
+                                label: '{{ label }}'
+                                visibility: null
+                          aggregation_visibility: null
+                          tooltip_title_type: '{{ tooltip_title_type }}'
+                      interactions:
+                        context_menu_option:
+                          availability_status: null
+                        visual_menu_option:
+                          availability_status: null
+                      value_label_options: null
+                      visual_palette:
+                        chart_color: '{{ chart_color }}'
+                        color_map:
+                          - element:
+                              data_path_type:
+                                pivot_table_data_path_type: '{{ pivot_table_data_path_type }}'
+                              field_id: '{{ field_id }}'
+                              field_value: '{{ field_value }}'
+                            color: '{{ color }}'
+                            time_granularity: null
+                    actions:
+                      - status: null
+                        trigger: '{{ trigger }}'
+                        custom_action_id: '{{ custom_action_id }}'
+                        name: '{{ name }}'
+                        action_operations:
+                          - navigation_operation: null
+                            set_parameters_operation: null
+                            filter_operation:
+                              selected_fields_configuration:
+                                selected_columns:
                                   - null
-                                SelectedFields:
-                                  - '{{ SelectedFields[0] }}'
-                                SelectedFieldOptions: '{{ SelectedFieldOptions }}'
-                              TargetVisualsConfiguration:
-                                SameSheetTargetVisualConfiguration:
-                                  TargetVisualOptions: '{{ TargetVisualOptions }}'
-                                  TargetVisuals:
-                                    - '{{ TargetVisuals[0] }}'
-                            URLOperation: null
-                    Title:
-                      Visibility: null
-                      FormatText:
-                        RichText: '{{ RichText }}'
-                        PlainText: '{{ PlainText }}'
-                    VisualContentAltText: '{{ VisualContentAltText }}'
-                    ColumnHierarchies:
-                      - DateTimeHierarchy:
-                          HierarchyId: '{{ HierarchyId }}'
-                          DrillDownFilters:
-                            - NumericEqualityFilter:
-                                Column: null
-                                Value: null
-                              TimeRangeFilter:
-                                Column: null
-                                RangeMinimum: '{{ RangeMinimum }}'
-                                TimeGranularity: null
-                                RangeMaximum: '{{ RangeMaximum }}'
-                              CategoryFilter:
-                                Column: null
-                                CategoryValues:
-                                  - '{{ CategoryValues[0] }}'
-                        ExplicitHierarchy:
-                          HierarchyId: '{{ HierarchyId }}'
-                          DrillDownFilters:
-                            - null
-                          Columns:
-                            - null
-                        PredefinedHierarchy:
-                          HierarchyId: '{{ HierarchyId }}'
-                          DrillDownFilters:
-                            - null
-                          Columns:
-                            - null
-                  BoxPlotVisual:
-                    Subtitle: null
-                    VisualId: '{{ VisualId }}'
-                    ChartConfiguration:
-                      SortConfiguration:
-                        CategorySort:
+                                selected_fields:
+                                  - '{{ selected_fields[0] }}'
+                                selected_field_options: '{{ selected_field_options }}'
+                              target_visuals_configuration:
+                                same_sheet_target_visual_configuration:
+                                  target_visual_options: '{{ target_visual_options }}'
+                                  target_visuals:
+                                    - '{{ target_visuals[0] }}'
+                            url_operation: null
+                    title:
+                      visibility: null
+                      format_text:
+                        rich_text: '{{ rich_text }}'
+                        plain_text: '{{ plain_text }}'
+                    visual_content_alt_text: '{{ visual_content_alt_text }}'
+                    column_hierarchies:
+                      - date_time_hierarchy:
+                          hierarchy_id: '{{ hierarchy_id }}'
+                          drill_down_filters:
+                            - numeric_equality_filter:
+                                column: null
+                                value: null
+                              time_range_filter:
+                                column: null
+                                range_minimum: '{{ range_minimum }}'
+                                time_granularity: null
+                                range_maximum: '{{ range_maximum }}'
+                              category_filter:
+                                column: null
+                                category_values:
+                                  - '{{ category_values[0] }}'
+                        explicit_hierarchy:
+                          hierarchy_id: '{{ hierarchy_id }}'
+                          drill_down_filters:
+                            - null
+                          columns:
+                            - null
+                        predefined_hierarchy:
+                          hierarchy_id: '{{ hierarchy_id }}'
+                          drill_down_filters:
+                            - null
+                          columns:
+                            - null
+                  box_plot_visual:
+                    subtitle: null
+                    visual_id: '{{ visual_id }}'
+                    chart_configuration:
+                      sort_configuration:
+                        category_sort:
                           - null
-                        PaginationConfiguration:
-                          PageSize: null
-                          PageNumber: null
-                      Legend:
-                        Position: '{{ Position }}'
-                        ValueFontConfiguration: null
-                        Title: null
-                        Visibility: null
-                        Height: '{{ Height }}'
-                        Width: '{{ Width }}'
-                      ReferenceLines:
-                        - Status: null
-                          DataConfiguration:
-                            DynamicConfiguration:
-                              Column: null
-                              MeasureAggregationFunction: null
-                              Calculation: null
-                            AxisBinding: '{{ AxisBinding }}'
-                            SeriesType: '{{ SeriesType }}'
-                            StaticConfiguration:
-                              Value: null
-                          LabelConfiguration:
-                            HorizontalPosition: '{{ HorizontalPosition }}'
-                            ValueLabelConfiguration:
-                              FormatConfiguration: null
-                              RelativePosition: '{{ RelativePosition }}'
-                            CustomLabelConfiguration:
-                              CustomLabel: '{{ CustomLabel }}'
-                            FontColor: '{{ FontColor }}'
-                            FontConfiguration: null
-                            VerticalPosition: '{{ VerticalPosition }}'
-                          StyleConfiguration:
-                            Pattern: '{{ Pattern }}'
-                            Color: '{{ Color }}'
-                      CategoryAxis:
-                        DataOptions:
-                          DateAxisOptions:
-                            MissingDateVisibility: null
-                          NumericAxisOptions:
-                            Scale:
-                              Logarithmic:
-                                Base: null
-                              Linear:
-                                StepSize: null
-                                StepCount: null
-                            Range:
-                              DataDriven: {}
-                              MinMax:
-                                Minimum: null
-                                Maximum: null
-                        TickLabelOptions:
-                          RotationAngle: null
-                          LabelOptions: null
-                        AxisOffset: '{{ AxisOffset }}'
-                        AxisLineVisibility: null
-                        GridLineVisibility: null
-                        ScrollbarOptions:
-                          VisibleRange:
-                            PercentRange:
-                              From: null
-                              To: null
-                          Visibility: null
-                      PrimaryYAxisLabelOptions: null
-                      CategoryLabelOptions: null
-                      FieldWells:
-                        BoxPlotAggregatedFieldWells:
-                          GroupBy:
-                            - null
-                          Values:
-                            - null
-                      Tooltip: null
-                      BoxPlotOptions:
-                        StyleOptions:
-                          FillStyle: '{{ FillStyle }}'
-                        OutlierVisibility: null
-                        AllDataPointsVisibility: null
-                      Interactions: null
-                      PrimaryYAxisDisplayOptions: null
-                      VisualPalette: null
-                    Actions:
+                        pagination_configuration:
+                          page_size: null
+                          page_number: null
+                      legend:
+                        position: '{{ position }}'
+                        value_font_configuration: null
+                        title: null
+                        visibility: null
+                        height: '{{ height }}'
+                        width: '{{ width }}'
+                      reference_lines:
+                        - status: null
+                          data_configuration:
+                            dynamic_configuration:
+                              column: null
+                              measure_aggregation_function: null
+                              calculation: null
+                            axis_binding: '{{ axis_binding }}'
+                            series_type: '{{ series_type }}'
+                            static_configuration:
+                              value: null
+                          label_configuration:
+                            horizontal_position: '{{ horizontal_position }}'
+                            value_label_configuration:
+                              format_configuration: null
+                              relative_position: '{{ relative_position }}'
+                            custom_label_configuration:
+                              custom_label: '{{ custom_label }}'
+                            font_color: '{{ font_color }}'
+                            font_configuration: null
+                            vertical_position: '{{ vertical_position }}'
+                          style_configuration:
+                            pattern: '{{ pattern }}'
+                            color: '{{ color }}'
+                      category_axis:
+                        data_options:
+                          date_axis_options:
+                            missing_date_visibility: null
+                          numeric_axis_options:
+                            scale:
+                              logarithmic:
+                                base: null
+                              linear:
+                                step_size: null
+                                step_count: null
+                            range:
+                              data_driven: {}
+                              min_max:
+                                minimum: null
+                                maximum: null
+                        tick_label_options:
+                          rotation_angle: null
+                          label_options: null
+                        axis_offset: '{{ axis_offset }}'
+                        axis_line_visibility: null
+                        grid_line_visibility: null
+                        scrollbar_options:
+                          visible_range:
+                            percent_range:
+                              from: null
+                              to: null
+                          visibility: null
+                      primary_yaxis_label_options: null
+                      category_label_options: null
+                      field_wells:
+                        box_plot_aggregated_field_wells:
+                          group_by:
+                            - null
+                          values:
+                            - null
+                      tooltip: null
+                      box_plot_options:
+                        style_options:
+                          fill_style: '{{ fill_style }}'
+                        outlier_visibility: null
+                        all_data_points_visibility: null
+                      interactions: null
+                      primary_yaxis_display_options: null
+                      visual_palette: null
+                    actions:
                       - null
-                    Title: null
-                    VisualContentAltText: '{{ VisualContentAltText }}'
-                    ColumnHierarchies:
+                    title: null
+                    visual_content_alt_text: '{{ visual_content_alt_text }}'
+                    column_hierarchies:
                       - null
-                  GeospatialMapVisual:
-                    Subtitle: null
-                    VisualId: '{{ VisualId }}'
-                    ChartConfiguration:
-                      Legend: null
-                      MapStyleOptions:
-                        BaseMapStyle: '{{ BaseMapStyle }}'
-                      FieldWells:
-                        GeospatialMapAggregatedFieldWells:
-                          Colors:
-                            - null
-                          Values:
-                            - null
-                          Geospatial:
-                            - null
-                      Tooltip: null
-                      WindowOptions:
-                        Bounds:
-                          West: null
-                          South: null
-                          North: null
-                          East: null
-                        MapZoomMode: '{{ MapZoomMode }}'
-                      PointStyleOptions:
-                        SelectedPointStyle: '{{ SelectedPointStyle }}'
-                        ClusterMarkerConfiguration:
-                          ClusterMarker:
-                            SimpleClusterMarker:
-                              Color: '{{ Color }}'
-                        HeatmapConfiguration:
-                          HeatmapColor:
-                            Colors:
-                              - Color: '{{ Color }}'
-                      VisualPalette: null
-                    Actions:
+                  geospatial_map_visual:
+                    subtitle: null
+                    visual_id: '{{ visual_id }}'
+                    chart_configuration:
+                      legend: null
+                      map_style_options:
+                        base_map_style: '{{ base_map_style }}'
+                      field_wells:
+                        geospatial_map_aggregated_field_wells:
+                          colors:
+                            - null
+                          values:
+                            - null
+                          geospatial:
+                            - null
+                      tooltip: null
+                      window_options:
+                        bounds:
+                          west: null
+                          south: null
+                          north: null
+                          east: null
+                        map_zoom_mode: '{{ map_zoom_mode }}'
+                      point_style_options:
+                        selected_point_style: '{{ selected_point_style }}'
+                        cluster_marker_configuration:
+                          cluster_marker:
+                            simple_cluster_marker:
+                              color: '{{ color }}'
+                        heatmap_configuration:
+                          heatmap_color:
+                            colors:
+                              - color: '{{ color }}'
+                      visual_palette: null
+                    actions:
                       - null
-                    Title: null
-                    VisualContentAltText: '{{ VisualContentAltText }}'
-                    ColumnHierarchies:
+                    title: null
+                    visual_content_alt_text: '{{ visual_content_alt_text }}'
+                    column_hierarchies:
                       - null
-                  ScatterPlotVisual:
-                    Subtitle: null
-                    VisualId: '{{ VisualId }}'
-                    ChartConfiguration:
-                      YAxisLabelOptions: null
-                      SortConfiguration:
-                        ScatterPlotLimitConfiguration: null
-                      Legend: null
-                      YAxisDisplayOptions: null
-                      DataLabels:
-                        DataLabelTypes:
-                          - MaximumLabelType:
-                              Visibility: null
-                            DataPathLabelType:
-                              FieldId: '{{ FieldId }}'
-                              Visibility: null
-                              FieldValue: '{{ FieldValue }}'
-                            RangeEndsLabelType:
-                              Visibility: null
-                            FieldLabelType:
-                              FieldId: '{{ FieldId }}'
-                              Visibility: null
-                            MinimumLabelType:
-                              Visibility: null
-                        MeasureLabelVisibility: null
-                        Position: null
-                        LabelContent: '{{ LabelContent }}'
-                        Visibility: null
-                        TotalsVisibility: null
-                        Overlap: '{{ Overlap }}'
-                        CategoryLabelVisibility: null
-                        LabelColor: '{{ LabelColor }}'
-                        LabelFontConfiguration: null
-                      FieldWells:
-                        ScatterPlotUnaggregatedFieldWells:
-                          Category:
-                            - null
-                          Size:
-                            - null
-                          Label:
-                            - null
-                          XAxis:
-                            - null
-                          YAxis:
-                            - null
-                        ScatterPlotCategoricallyAggregatedFieldWells:
-                          Category:
-                            - null
-                          Size:
-                            - null
-                          Label:
-                            - null
-                          XAxis:
-                            - null
-                          YAxis:
-                            - null
-                      Tooltip: null
-                      XAxisLabelOptions: null
-                      Interactions: null
-                      VisualPalette: null
-                      XAxisDisplayOptions: null
-                    Actions:
+                  scatter_plot_visual:
+                    subtitle: null
+                    visual_id: '{{ visual_id }}'
+                    chart_configuration:
+                      y_axis_label_options: null
+                      sort_configuration:
+                        scatter_plot_limit_configuration: null
+                      legend: null
+                      y_axis_display_options: null
+                      data_labels:
+                        data_label_types:
+                          - maximum_label_type:
+                              visibility: null
+                            data_path_label_type:
+                              field_id: '{{ field_id }}'
+                              visibility: null
+                              field_value: '{{ field_value }}'
+                            range_ends_label_type:
+                              visibility: null
+                            field_label_type:
+                              field_id: '{{ field_id }}'
+                              visibility: null
+                            minimum_label_type:
+                              visibility: null
+                        measure_label_visibility: null
+                        position: null
+                        label_content: '{{ label_content }}'
+                        visibility: null
+                        totals_visibility: null
+                        overlap: '{{ overlap }}'
+                        category_label_visibility: null
+                        label_color: '{{ label_color }}'
+                        label_font_configuration: null
+                      field_wells:
+                        scatter_plot_unaggregated_field_wells:
+                          category:
+                            - null
+                          size:
+                            - null
+                          label:
+                            - null
+                          x_axis:
+                            - null
+                          y_axis:
+                            - null
+                        scatter_plot_categorically_aggregated_field_wells:
+                          category:
+                            - null
+                          size:
+                            - null
+                          label:
+                            - null
+                          x_axis:
+                            - null
+                          y_axis:
+                            - null
+                      tooltip: null
+                      x_axis_label_options: null
+                      interactions: null
+                      visual_palette: null
+                      x_axis_display_options: null
+                    actions:
                       - null
-                    Title: null
-                    VisualContentAltText: '{{ VisualContentAltText }}'
-                    ColumnHierarchies:
+                    title: null
+                    visual_content_alt_text: '{{ visual_content_alt_text }}'
+                    column_hierarchies:
                       - null
-                  RadarChartVisual:
-                    Subtitle: null
-                    VisualId: '{{ VisualId }}'
-                    ChartConfiguration:
-                      SortConfiguration:
-                        ColorSort:
+                  radar_chart_visual:
+                    subtitle: null
+                    visual_id: '{{ visual_id }}'
+                    chart_configuration:
+                      sort_configuration:
+                        color_sort:
                           - null
-                        ColorItemsLimit: null
-                        CategoryItemsLimit: null
-                        CategorySort:
+                        color_items_limit: null
+                        category_items_limit: null
+                        category_sort:
                           - null
-                      Legend: null
-                      Shape: '{{ Shape }}'
-                      BaseSeriesSettings:
-                        AreaStyleSettings:
-                          Visibility: null
-                      ColorLabelOptions: null
-                      CategoryLabelOptions: null
-                      AxesRangeScale: '{{ AxesRangeScale }}'
-                      VisualPalette: null
-                      AlternateBandColorsVisibility: null
-                      StartAngle: null
-                      CategoryAxis: null
-                      FieldWells:
-                        RadarChartAggregatedFieldWells:
-                          Category:
-                            - null
-                          Color:
-                            - null
-                          Values:
-                            - null
-                      ColorAxis: null
-                      AlternateBandOddColor: '{{ AlternateBandOddColor }}'
-                      Interactions: null
-                      AlternateBandEvenColor: '{{ AlternateBandEvenColor }}'
-                    Actions:
+                      legend: null
+                      shape: '{{ shape }}'
+                      base_series_settings:
+                        area_style_settings:
+                          visibility: null
+                      color_label_options: null
+                      category_label_options: null
+                      axes_range_scale: '{{ axes_range_scale }}'
+                      visual_palette: null
+                      alternate_band_colors_visibility: null
+                      start_angle: null
+                      category_axis: null
+                      field_wells:
+                        radar_chart_aggregated_field_wells:
+                          category:
+                            - null
+                          color:
+                            - null
+                          values:
+                            - null
+                      color_axis: null
+                      alternate_band_odd_color: '{{ alternate_band_odd_color }}'
+                      interactions: null
+                      alternate_band_even_color: '{{ alternate_band_even_color }}'
+                    actions:
                       - null
-                    Title: null
-                    VisualContentAltText: '{{ VisualContentAltText }}'
-                    ColumnHierarchies:
+                    title: null
+                    visual_content_alt_text: '{{ visual_content_alt_text }}'
+                    column_hierarchies:
                       - null
-                  ComboChartVisual:
-                    Subtitle: null
-                    VisualId: '{{ VisualId }}'
-                    ChartConfiguration:
-                      SortConfiguration:
-                        ColorSort:
+                  combo_chart_visual:
+                    subtitle: null
+                    visual_id: '{{ visual_id }}'
+                    chart_configuration:
+                      sort_configuration:
+                        color_sort:
                           - null
-                        ColorItemsLimit: null
-                        CategoryItemsLimit: null
-                        CategorySort:
+                        color_items_limit: null
+                        category_items_limit: null
+                        category_sort:
                           - null
-                      Legend: null
-                      ReferenceLines:
+                      legend: null
+                      reference_lines:
                         - null
-                      ColorLabelOptions: null
-                      BarDataLabels: null
-                      CategoryLabelOptions: null
-                      Tooltip: null
-                      SingleAxisOptions:
-                        YAxisOptions:
-                          YAxis: '{{ YAxis }}'
-                      PrimaryYAxisDisplayOptions: null
-                      VisualPalette: null
-                      BarsArrangement: '{{ BarsArrangement }}'
-                      SecondaryYAxisLabelOptions: null
-                      LineDataLabels: null
-                      CategoryAxis: null
-                      PrimaryYAxisLabelOptions: null
-                      FieldWells:
-                        ComboChartAggregatedFieldWells:
-                          BarValues:
-                            - null
-                          Category:
-                            - null
-                          Colors:
-                            - null
-                          LineValues:
-                            - null
-                      SecondaryYAxisDisplayOptions: null
-                      Interactions: null
-                    Actions:
+                      color_label_options: null
+                      bar_data_labels: null
+                      category_label_options: null
+                      tooltip: null
+                      single_axis_options:
+                        y_axis_options:
+                          y_axis: '{{ y_axis }}'
+                      primary_yaxis_display_options: null
+                      visual_palette: null
+                      bars_arrangement: '{{ bars_arrangement }}'
+                      secondary_yaxis_label_options: null
+                      line_data_labels: null
+                      category_axis: null
+                      primary_yaxis_label_options: null
+                      field_wells:
+                        combo_chart_aggregated_field_wells:
+                          bar_values:
+                            - null
+                          category:
+                            - null
+                          colors:
+                            - null
+                          line_values:
+                            - null
+                      secondary_yaxis_display_options: null
+                      interactions: null
+                    actions:
                       - null
-                    Title: null
-                    VisualContentAltText: '{{ VisualContentAltText }}'
-                    ColumnHierarchies:
+                    title: null
+                    visual_content_alt_text: '{{ visual_content_alt_text }}'
+                    column_hierarchies:
                       - null
-                  WordCloudVisual:
-                    Subtitle: null
-                    VisualId: '{{ VisualId }}'
-                    ChartConfiguration:
-                      SortConfiguration:
-                        CategoryItemsLimit: null
-                        CategorySort:
+                  word_cloud_visual:
+                    subtitle: null
+                    visual_id: '{{ visual_id }}'
+                    chart_configuration:
+                      sort_configuration:
+                        category_items_limit: null
+                        category_sort:
                           - null
-                      CategoryLabelOptions: null
-                      FieldWells:
-                        WordCloudAggregatedFieldWells:
-                          GroupBy:
-                            - null
-                          Size:
-                            - null
-                      WordCloudOptions:
-                        WordOrientation: '{{ WordOrientation }}'
-                        WordScaling: '{{ WordScaling }}'
-                        CloudLayout: '{{ CloudLayout }}'
-                        MaximumStringLength: null
-                        WordCasing: '{{ WordCasing }}'
-                        WordPadding: '{{ WordPadding }}'
-                      Interactions: null
-                    Actions:
+                      category_label_options: null
+                      field_wells:
+                        word_cloud_aggregated_field_wells:
+                          group_by:
+                            - null
+                          size:
+                            - null
+                      word_cloud_options:
+                        word_orientation: '{{ word_orientation }}'
+                        word_scaling: '{{ word_scaling }}'
+                        cloud_layout: '{{ cloud_layout }}'
+                        maximum_string_length: null
+                        word_casing: '{{ word_casing }}'
+                        word_padding: '{{ word_padding }}'
+                      interactions: null
+                    actions:
                       - null
-                    Title: null
-                    VisualContentAltText: '{{ VisualContentAltText }}'
-                    ColumnHierarchies:
+                    title: null
+                    visual_content_alt_text: '{{ visual_content_alt_text }}'
+                    column_hierarchies:
                       - null
-                  SankeyDiagramVisual:
-                    Subtitle: null
-                    VisualId: '{{ VisualId }}'
-                    ChartConfiguration:
-                      SortConfiguration:
-                        WeightSort:
+                  sankey_diagram_visual:
+                    subtitle: null
+                    visual_id: '{{ visual_id }}'
+                    chart_configuration:
+                      sort_configuration:
+                        weight_sort:
                           - null
-                        SourceItemsLimit: null
-                        DestinationItemsLimit: null
-                      DataLabels: null
-                      FieldWells:
-                        SankeyDiagramAggregatedFieldWells:
-                          Destination:
+                        source_items_limit: null
+                        destination_items_limit: null
+                      data_labels: null
+                      field_wells:
+                        sankey_diagram_aggregated_field_wells:
+                          destination:
                             - null
-                          Source:
+                          source:
                             - null
-                          Weight:
+                          weight:
                             - null
-                      Interactions: null
-                    Actions:
+                      interactions: null
+                    actions:
                       - null
-                    Title: null
-                    VisualContentAltText: '{{ VisualContentAltText }}'
-                  GaugeChartVisual:
-                    Subtitle: null
-                    ConditionalFormatting:
-                      ConditionalFormattingOptions:
-                        - Arc:
-                            ForegroundColor:
-                              Gradient:
-                                Expression: '{{ Expression }}'
-                                Color:
-                                  Stops:
-                                    - GradientOffset: null
-                                      DataValue: null
-                                      Color: '{{ Color }}'
-                              Solid:
-                                Expression: '{{ Expression }}'
-                                Color: '{{ Color }}'
-                          PrimaryValue:
-                            TextColor: null
-                            Icon:
-                              CustomCondition:
-                                Expression: '{{ Expression }}'
-                                Color: '{{ Color }}'
-                                DisplayConfiguration:
-                                  IconDisplayOption: '{{ IconDisplayOption }}'
-                                IconOptions:
-                                  UnicodeIcon: '{{ UnicodeIcon }}'
-                                  Icon: '{{ Icon }}'
-                              IconSet:
-                                Expression: '{{ Expression }}'
-                                IconSetType: '{{ IconSetType }}'
-                    VisualId: '{{ VisualId }}'
-                    ChartConfiguration:
-                      DataLabels: null
-                      FieldWells:
-                        TargetValues:
+                    title: null
+                    visual_content_alt_text: '{{ visual_content_alt_text }}'
+                  gauge_chart_visual:
+                    subtitle: null
+                    conditional_formatting:
+                      conditional_formatting_options:
+                        - arc:
+                            foreground_color:
+                              gradient:
+                                expression: '{{ expression }}'
+                                color:
+                                  stops:
+                                    - gradient_offset: null
+                                      data_value: null
+                                      color: '{{ color }}'
+                              solid:
+                                expression: '{{ expression }}'
+                                color: '{{ color }}'
+                          primary_value:
+                            text_color: null
+                            icon:
+                              custom_condition:
+                                expression: '{{ expression }}'
+                                color: '{{ color }}'
+                                display_configuration:
+                                  icon_display_option: '{{ icon_display_option }}'
+                                icon_options:
+                                  unicode_icon: '{{ unicode_icon }}'
+                                  icon: '{{ icon }}'
+                              icon_set:
+                                expression: '{{ expression }}'
+                                icon_set_type: '{{ icon_set_type }}'
+                    visual_id: '{{ visual_id }}'
+                    chart_configuration:
+                      data_labels: null
+                      field_wells:
+                        target_values:
                           - null
-                        Values:
+                        values:
                           - null
-                      TooltipOptions: null
-                      GaugeChartOptions:
-                        Arc:
-                          ArcAngle: null
-                          ArcThickness: '{{ ArcThickness }}'
-                        Comparison:
-                          ComparisonMethod: '{{ ComparisonMethod }}'
-                          ComparisonFormat:
-                            NumberDisplayFormatConfiguration: null
-                            PercentageDisplayFormatConfiguration: null
-                        PrimaryValueDisplayType: '{{ PrimaryValueDisplayType }}'
-                        ArcAxis:
-                          Range:
-                            Min: null
-                            Max: null
-                          ReserveRange: null
-                        PrimaryValueFontConfiguration: null
-                      ColorConfiguration:
-                        ForegroundColor: '{{ ForegroundColor }}'
-                        BackgroundColor: '{{ BackgroundColor }}'
-                      Interactions: null
-                      VisualPalette: null
-                    Actions:
+                      tooltip_options: null
+                      gauge_chart_options:
+                        arc:
+                          arc_angle: null
+                          arc_thickness: '{{ arc_thickness }}'
+                        comparison:
+                          comparison_method: '{{ comparison_method }}'
+                          comparison_format:
+                            number_display_format_configuration: null
+                            percentage_display_format_configuration: null
+                        primary_value_display_type: '{{ primary_value_display_type }}'
+                        arc_axis:
+                          range:
+                            min: null
+                            max: null
+                          reserve_range: null
+                        primary_value_font_configuration: null
+                      color_configuration:
+                        foreground_color: '{{ foreground_color }}'
+                        background_color: '{{ background_color }}'
+                      interactions: null
+                      visual_palette: null
+                    actions:
                       - null
-                    Title: null
-                    VisualContentAltText: '{{ VisualContentAltText }}'
-                  FilledMapVisual:
-                    Subtitle: null
-                    ConditionalFormatting:
-                      ConditionalFormattingOptions:
-                        - Shape:
-                            Format:
-                              BackgroundColor: null
-                            FieldId: '{{ FieldId }}'
-                    VisualId: '{{ VisualId }}'
-                    ChartConfiguration:
-                      SortConfiguration:
-                        CategorySort:
+                    title: null
+                    visual_content_alt_text: '{{ visual_content_alt_text }}'
+                  filled_map_visual:
+                    subtitle: null
+                    conditional_formatting:
+                      conditional_formatting_options:
+                        - shape:
+                            format:
+                              background_color: null
+                            field_id: '{{ field_id }}'
+                    visual_id: '{{ visual_id }}'
+                    chart_configuration:
+                      sort_configuration:
+                        category_sort:
                           - null
-                      Legend: null
-                      MapStyleOptions: null
-                      FieldWells:
-                        FilledMapAggregatedFieldWells:
-                          Values:
-                            - null
-                          Geospatial:
-                            - null
-                      Tooltip: null
-                      Interactions: null
-                      WindowOptions: null
-                    Actions:
+                      legend: null
+                      map_style_options: null
+                      field_wells:
+                        filled_map_aggregated_field_wells:
+                          values:
+                            - null
+                          geospatial:
+                            - null
+                      tooltip: null
+                      interactions: null
+                      window_options: null
+                    actions:
                       - null
-                    Title: null
-                    VisualContentAltText: '{{ VisualContentAltText }}'
-                    ColumnHierarchies:
+                    title: null
+                    visual_content_alt_text: '{{ visual_content_alt_text }}'
+                    column_hierarchies:
                       - null
-                  WaterfallVisual:
-                    Subtitle: null
-                    VisualId: '{{ VisualId }}'
-                    ChartConfiguration:
-                      CategoryAxisLabelOptions: null
-                      SortConfiguration:
-                        BreakdownItemsLimit: null
-                        CategorySort:
+                  waterfall_visual:
+                    subtitle: null
+                    visual_id: '{{ visual_id }}'
+                    chart_configuration:
+                      category_axis_label_options: null
+                      sort_configuration:
+                        breakdown_items_limit: null
+                        category_sort:
                           - null
-                      Legend: null
-                      DataLabels: null
-                      PrimaryYAxisLabelOptions: null
-                      FieldWells:
-                        WaterfallChartAggregatedFieldWells:
-                          Categories:
-                            - null
-                          Breakdowns:
-                            - null
-                          Values:
-                            - null
-                      WaterfallChartOptions:
-                        TotalBarLabel: '{{ TotalBarLabel }}'
-                      ColorConfiguration:
-                        GroupColorConfiguration:
-                          NegativeBarColor: '{{ NegativeBarColor }}'
-                          TotalBarColor: '{{ TotalBarColor }}'
-                          PositiveBarColor: '{{ PositiveBarColor }}'
-                      Interactions: null
-                      CategoryAxisDisplayOptions: null
-                      PrimaryYAxisDisplayOptions: null
-                      VisualPalette: null
-                    Actions:
+                      legend: null
+                      data_labels: null
+                      primary_yaxis_label_options: null
+                      field_wells:
+                        waterfall_chart_aggregated_field_wells:
+                          categories:
+                            - null
+                          breakdowns:
+                            - null
+                          values:
+                            - null
+                      waterfall_chart_options:
+                        total_bar_label: '{{ total_bar_label }}'
+                      color_configuration:
+                        group_color_configuration:
+                          negative_bar_color: '{{ negative_bar_color }}'
+                          total_bar_color: '{{ total_bar_color }}'
+                          positive_bar_color: '{{ positive_bar_color }}'
+                      interactions: null
+                      category_axis_display_options: null
+                      primary_yaxis_display_options: null
+                      visual_palette: null
+                    actions:
                       - null
-                    Title: null
-                    VisualContentAltText: '{{ VisualContentAltText }}'
-                    ColumnHierarchies:
+                    title: null
+                    visual_content_alt_text: '{{ visual_content_alt_text }}'
+                    column_hierarchies:
                       - null
-                  CustomContentVisual:
-                    Subtitle: null
-                    VisualId: '{{ VisualId }}'
-                    ChartConfiguration:
-                      ContentUrl: '{{ ContentUrl }}'
-                      ContentType: '{{ ContentType }}'
-                      ImageScaling: '{{ ImageScaling }}'
-                      Interactions: null
-                    Actions:
+                  custom_content_visual:
+                    subtitle: null
+                    visual_id: '{{ visual_id }}'
+                    chart_configuration:
+                      content_url: '{{ content_url }}'
+                      content_type: '{{ content_type }}'
+                      image_scaling: '{{ image_scaling }}'
+                      interactions: null
+                    actions:
                       - null
-                    DataSetIdentifier: '{{ DataSetIdentifier }}'
-                    Title: null
-                    VisualContentAltText: '{{ VisualContentAltText }}'
-                  PieChartVisual:
-                    Subtitle: null
-                    VisualId: '{{ VisualId }}'
-                    ChartConfiguration:
-                      SortConfiguration:
-                        SmallMultiplesSort:
+                    data_set_identifier: '{{ data_set_identifier }}'
+                    title: null
+                    visual_content_alt_text: '{{ visual_content_alt_text }}'
+                  pie_chart_visual:
+                    subtitle: null
+                    visual_id: '{{ visual_id }}'
+                    chart_configuration:
+                      sort_configuration:
+                        small_multiples_sort:
                           - null
-                        CategoryItemsLimit: null
-                        CategorySort:
+                        category_items_limit: null
+                        category_sort:
                           - null
-                        SmallMultiplesLimitConfiguration: null
-                      Legend: null
-                      DataLabels: null
-                      ContributionAnalysisDefaults:
-                        - MeasureFieldId: '{{ MeasureFieldId }}'
-                          ContributorDimensions:
-                            - null
-                      CategoryLabelOptions: null
-                      FieldWells:
-                        PieChartAggregatedFieldWells:
-                          Category:
-                            - null
-                          Values:
-                            - null
-                          SmallMultiples:
-                            - null
-                      Tooltip: null
-                      DonutOptions:
-                        DonutCenterOptions:
-                          LabelVisibility: null
-                        ArcOptions:
-                          ArcThickness: '{{ ArcThickness }}'
-                      SmallMultiplesOptions:
-                        MaxVisibleRows: null
-                        PanelConfiguration:
-                          BorderThickness: '{{ BorderThickness }}'
-                          BorderStyle: '{{ BorderStyle }}'
-                          GutterSpacing: '{{ GutterSpacing }}'
-                          BackgroundVisibility: null
-                          BorderVisibility: null
-                          BorderColor: '{{ BorderColor }}'
-                          Title:
-                            Visibility: null
-                            FontConfiguration: null
-                            HorizontalTextAlignment: '{{ HorizontalTextAlignment }}'
-                          GutterVisibility: null
-                          BackgroundColor: '{{ BackgroundColor }}'
-                        MaxVisibleColumns: null
-                        XAxis:
-                          Placement: '{{ Placement }}'
-                          Scale: '{{ Scale }}'
-                        YAxis: null
-                      Interactions: null
-                      ValueLabelOptions: null
-                      VisualPalette: null
-                    Actions:
+                        small_multiples_limit_configuration: null
+                      legend: null
+                      data_labels: null
+                      contribution_analysis_defaults:
+                        - measure_field_id: '{{ measure_field_id }}'
+                          contributor_dimensions:
+                            - null
+                      category_label_options: null
+                      field_wells:
+                        pie_chart_aggregated_field_wells:
+                          category:
+                            - null
+                          values:
+                            - null
+                          small_multiples:
+                            - null
+                      tooltip: null
+                      donut_options:
+                        donut_center_options:
+                          label_visibility: null
+                        arc_options:
+                          arc_thickness: '{{ arc_thickness }}'
+                      small_multiples_options:
+                        max_visible_rows: null
+                        panel_configuration:
+                          border_thickness: '{{ border_thickness }}'
+                          border_style: '{{ border_style }}'
+                          gutter_spacing: '{{ gutter_spacing }}'
+                          background_visibility: null
+                          border_visibility: null
+                          border_color: '{{ border_color }}'
+                          title:
+                            visibility: null
+                            font_configuration: null
+                            horizontal_text_alignment: '{{ horizontal_text_alignment }}'
+                          gutter_visibility: null
+                          background_color: '{{ background_color }}'
+                        max_visible_columns: null
+                        x_axis:
+                          placement: '{{ placement }}'
+                          scale: '{{ scale }}'
+                        y_axis: null
+                      interactions: null
+                      value_label_options: null
+                      visual_palette: null
+                    actions:
                       - null
-                    Title: null
-                    VisualContentAltText: '{{ VisualContentAltText }}'
-                    ColumnHierarchies:
+                    title: null
+                    visual_content_alt_text: '{{ visual_content_alt_text }}'
+                    column_hierarchies:
                       - null
-                  KPIVisual:
-                    Subtitle: null
-                    ConditionalFormatting:
-                      ConditionalFormattingOptions:
-                        - PrimaryValue:
-                            TextColor: null
-                            Icon: null
-                          ActualValue:
-                            TextColor: null
-                            Icon: null
-                          ComparisonValue:
-                            TextColor: null
-                            Icon: null
-                          ProgressBar:
-                            ForegroundColor: null
-                    VisualId: '{{ VisualId }}'
-                    ChartConfiguration:
-                      SortConfiguration:
-                        TrendGroupSort:
+                  k_pi_visual:
+                    subtitle: null
+                    conditional_formatting:
+                      conditional_formatting_options:
+                        - primary_value:
+                            text_color: null
+                            icon: null
+                          actual_value:
+                            text_color: null
+                            icon: null
+                          comparison_value:
+                            text_color: null
+                            icon: null
+                          progress_bar:
+                            foreground_color: null
+                    visual_id: '{{ visual_id }}'
+                    chart_configuration:
+                      sort_configuration:
+                        trend_group_sort:
                           - null
-                      KPIOptions:
-                        SecondaryValueFontConfiguration: null
-                        VisualLayoutOptions:
-                          StandardLayout:
-                            Type: '{{ Type }}'
-                        TrendArrows:
-                          Visibility: null
-                        SecondaryValue:
-                          Visibility: null
-                        Comparison: null
-                        PrimaryValueDisplayType: null
-                        ProgressBar:
-                          Visibility: null
-                        PrimaryValueFontConfiguration: null
-                        Sparkline:
-                          Type: '{{ Type }}'
-                          Color: '{{ Color }}'
-                          TooltipVisibility: null
-                          Visibility: null
-                      FieldWells:
-                        TargetValues:
+                      k_pi_options:
+                        secondary_value_font_configuration: null
+                        visual_layout_options:
+                          standard_layout:
+                            type: '{{ type }}'
+                        trend_arrows:
+                          visibility: null
+                        secondary_value:
+                          visibility: null
+                        comparison: null
+                        primary_value_display_type: null
+                        progress_bar:
+                          visibility: null
+                        primary_value_font_configuration: null
+                        sparkline:
+                          type: '{{ type }}'
+                          color: '{{ color }}'
+                          tooltip_visibility: null
+                          visibility: null
+                      field_wells:
+                        target_values:
                           - null
-                        TrendGroups:
+                        trend_groups:
                           - null
-                        Values:
+                        values:
                           - null
-                      Interactions: null
-                    Actions:
+                      interactions: null
+                    actions:
                       - null
-                    Title: null
-                    VisualContentAltText: '{{ VisualContentAltText }}'
-                    ColumnHierarchies:
+                    title: null
+                    visual_content_alt_text: '{{ visual_content_alt_text }}'
+                    column_hierarchies:
                       - null
-                  HistogramVisual:
-                    Subtitle: null
-                    VisualId: '{{ VisualId }}'
-                    ChartConfiguration:
-                      YAxisDisplayOptions: null
-                      DataLabels: null
-                      BinOptions:
-                        BinWidth:
-                          BinCountLimit: null
-                          Value: null
-                        StartValue: null
-                        SelectedBinType: '{{ SelectedBinType }}'
-                        BinCount:
-                          Value: null
-                      FieldWells:
-                        HistogramAggregatedFieldWells:
-                          Values:
-                            - null
-                      Tooltip: null
-                      XAxisLabelOptions: null
-                      Interactions: null
-                      VisualPalette: null
-                      XAxisDisplayOptions: null
-                    Actions:
+                  histogram_visual:
+                    subtitle: null
+                    visual_id: '{{ visual_id }}'
+                    chart_configuration:
+                      y_axis_display_options: null
+                      data_labels: null
+                      bin_options:
+                        bin_width:
+                          bin_count_limit: null
+                          value: null
+                        start_value: null
+                        selected_bin_type: '{{ selected_bin_type }}'
+                        bin_count:
+                          value: null
+                      field_wells:
+                        histogram_aggregated_field_wells:
+                          values:
+                            - null
+                      tooltip: null
+                      x_axis_label_options: null
+                      interactions: null
+                      visual_palette: null
+                      x_axis_display_options: null
+                    actions:
                       - null
-                    Title: null
-                    VisualContentAltText: '{{ VisualContentAltText }}'
-                  PluginVisual:
-                    Subtitle: null
-                    PluginArn: '{{ PluginArn }}'
-                    VisualId: '{{ VisualId }}'
-                    ChartConfiguration:
-                      SortConfiguration:
-                        PluginVisualTableQuerySort:
-                          ItemsLimitConfiguration:
-                            ItemsLimit: null
-                          RowSort:
-                            - null
-                      VisualOptions:
-                        VisualProperties:
-                          - Value: '{{ Value }}'
-                            Name: '{{ Name }}'
-                      FieldWells:
-                        - Unaggregated:
-                            - FormatConfiguration: null
-                              Column: null
-                              FieldId: '{{ FieldId }}'
-                          AxisName: '{{ AxisName }}'
-                          Measures:
-                            - null
-                          Dimensions:
-                            - null
-                    Title: null
-                    VisualContentAltText: '{{ VisualContentAltText }}'
-                  TableVisual:
-                    Subtitle: null
-                    ConditionalFormatting:
-                      ConditionalFormattingOptions:
-                        - Row:
-                            TextColor: null
-                            BackgroundColor: null
-                          Cell:
-                            FieldId: '{{ FieldId }}'
-                            TextFormat:
-                              TextColor: null
-                              Icon: null
-                              BackgroundColor: null
-                    VisualId: '{{ VisualId }}'
-                    ChartConfiguration:
-                      SortConfiguration:
-                        RowSort:
+                    title: null
+                    visual_content_alt_text: '{{ visual_content_alt_text }}'
+                  plugin_visual:
+                    subtitle: null
+                    plugin_arn: '{{ plugin_arn }}'
+                    visual_id: '{{ visual_id }}'
+                    chart_configuration:
+                      sort_configuration:
+                        plugin_visual_table_query_sort:
+                          items_limit_configuration:
+                            items_limit: null
+                          row_sort:
+                            - null
+                      visual_options:
+                        visual_properties:
+                          - value: '{{ value }}'
+                            name: '{{ name }}'
+                      field_wells:
+                        - unaggregated:
+                            - format_configuration: null
+                              column: null
+                              field_id: '{{ field_id }}'
+                          axis_name: '{{ axis_name }}'
+                          measures:
+                            - null
+                          dimensions:
+                            - null
+                    title: null
+                    visual_content_alt_text: '{{ visual_content_alt_text }}'
+                  table_visual:
+                    subtitle: null
+                    conditional_formatting:
+                      conditional_formatting_options:
+                        - row:
+                            text_color: null
+                            background_color: null
+                          cell:
+                            field_id: '{{ field_id }}'
+                            text_format:
+                              text_color: null
+                              icon: null
+                              background_color: null
+                    visual_id: '{{ visual_id }}'
+                    chart_configuration:
+                      sort_configuration:
+                        row_sort:
                           - null
-                        PaginationConfiguration: null
-                      PaginatedReportOptions:
-                        OverflowColumnHeaderVisibility: null
-                        VerticalOverflowVisibility: null
-                      TableOptions:
-                        HeaderStyle:
-                          VerticalTextAlignment: '{{ VerticalTextAlignment }}'
-                          Visibility: null
-                          Height: null
-                          FontConfiguration: null
-                          Border:
-                            UniformBorder:
-                              Thickness: null
-                              Color: '{{ Color }}'
-                              Style: '{{ Style }}'
-                            SideSpecificBorder:
-                              Left: null
-                              Top: null
-                              InnerHorizontal: null
-                              Right: null
-                              Bottom: null
-                              InnerVertical: null
-                          TextWrap: '{{ TextWrap }}'
-                          HorizontalTextAlignment: null
-                          BackgroundColor: '{{ BackgroundColor }}'
-                        CellStyle: null
-                        Orientation: '{{ Orientation }}'
-                        RowAlternateColorOptions:
-                          Status: null
-                          UsePrimaryBackgroundColor: null
-                          RowAlternateColors:
-                            - '{{ RowAlternateColors[0] }}'
-                      TableInlineVisualizations:
-                        - DataBars:
-                            PositiveColor: '{{ PositiveColor }}'
-                            FieldId: '{{ FieldId }}'
-                            NegativeColor: '{{ NegativeColor }}'
-                      FieldWells:
-                        TableUnaggregatedFieldWells:
-                          Values:
-                            - null
-                        TableAggregatedFieldWells:
-                          GroupBy:
-                            - null
-                          Values:
-                            - null
-                      FieldOptions:
-                        Order:
-                          - '{{ Order[0] }}'
-                        PinnedFieldOptions:
-                          PinnedLeftFields:
-                            - '{{ PinnedLeftFields[0] }}'
-                        TransposedTableOptions:
-                          - ColumnWidth: '{{ ColumnWidth }}'
-                            ColumnIndex: null
-                            ColumnType: '{{ ColumnType }}'
-                        SelectedFieldOptions:
-                          - CustomLabel: '{{ CustomLabel }}'
-                            URLStyling:
-                              LinkConfiguration:
-                                Target: null
-                                Content:
-                                  CustomIconContent:
-                                    Icon: '{{ Icon }}'
-                                  CustomTextContent:
-                                    Value: '{{ Value }}'
-                                    FontConfiguration: null
-                              ImageConfiguration:
-                                SizingOptions:
-                                  TableCellImageScalingConfiguration: '{{ TableCellImageScalingConfiguration }}'
-                            FieldId: '{{ FieldId }}'
-                            Visibility: null
-                            Width: '{{ Width }}'
-                      Interactions: null
-                      TotalOptions:
-                        TotalAggregationOptions:
-                          - TotalAggregationFunction:
-                              SimpleTotalAggregationFunction: '{{ SimpleTotalAggregationFunction }}'
-                            FieldId: '{{ FieldId }}'
-                        CustomLabel: '{{ CustomLabel }}'
-                        ScrollStatus: '{{ ScrollStatus }}'
-                        Placement: '{{ Placement }}'
-                        TotalCellStyle: null
-                        TotalsVisibility: null
-                    Actions:
+                        pagination_configuration: null
+                      paginated_report_options:
+                        overflow_column_header_visibility: null
+                        vertical_overflow_visibility: null
+                      table_options:
+                        header_style:
+                          vertical_text_alignment: '{{ vertical_text_alignment }}'
+                          visibility: null
+                          height: null
+                          font_configuration: null
+                          border:
+                            uniform_border:
+                              thickness: null
+                              color: '{{ color }}'
+                              style: '{{ style }}'
+                            side_specific_border:
+                              left: null
+                              top: null
+                              inner_horizontal: null
+                              right: null
+                              bottom: null
+                              inner_vertical: null
+                          text_wrap: '{{ text_wrap }}'
+                          horizontal_text_alignment: null
+                          background_color: '{{ background_color }}'
+                        cell_style: null
+                        orientation: '{{ orientation }}'
+                        row_alternate_color_options:
+                          status: null
+                          use_primary_background_color: null
+                          row_alternate_colors:
+                            - '{{ row_alternate_colors[0] }}'
+                      table_inline_visualizations:
+                        - data_bars:
+                            positive_color: '{{ positive_color }}'
+                            field_id: '{{ field_id }}'
+                            negative_color: '{{ negative_color }}'
+                      field_wells:
+                        table_unaggregated_field_wells:
+                          values:
+                            - null
+                        table_aggregated_field_wells:
+                          group_by:
+                            - null
+                          values:
+                            - null
+                      field_options:
+                        order:
+                          - '{{ order[0] }}'
+                        pinned_field_options:
+                          pinned_left_fields:
+                            - '{{ pinned_left_fields[0] }}'
+                        transposed_table_options:
+                          - column_width: '{{ column_width }}'
+                            column_index: null
+                            column_type: '{{ column_type }}'
+                        selected_field_options:
+                          - custom_label: '{{ custom_label }}'
+                            url_styling:
+                              link_configuration:
+                                target: null
+                                content:
+                                  custom_icon_content:
+                                    icon: '{{ icon }}'
+                                  custom_text_content:
+                                    value: '{{ value }}'
+                                    font_configuration: null
+                              image_configuration:
+                                sizing_options:
+                                  table_cell_image_scaling_configuration: '{{ table_cell_image_scaling_configuration }}'
+                            field_id: '{{ field_id }}'
+                            visibility: null
+                            width: '{{ width }}'
+                      interactions: null
+                      total_options:
+                        total_aggregation_options:
+                          - total_aggregation_function:
+                              simple_total_aggregation_function: '{{ simple_total_aggregation_function }}'
+                            field_id: '{{ field_id }}'
+                        custom_label: '{{ custom_label }}'
+                        scroll_status: '{{ scroll_status }}'
+                        placement: '{{ placement }}'
+                        total_cell_style: null
+                        totals_visibility: null
+                    actions:
                       - null
-                    Title: null
-                    VisualContentAltText: '{{ VisualContentAltText }}'
-                  PivotTableVisual:
-                    Subtitle: null
-                    ConditionalFormatting:
-                      ConditionalFormattingOptions:
-                        - Cell:
-                            Scope:
-                              Role: '{{ Role }}'
-                            Scopes:
+                    title: null
+                    visual_content_alt_text: '{{ visual_content_alt_text }}'
+                  pivot_table_visual:
+                    subtitle: null
+                    conditional_formatting:
+                      conditional_formatting_options:
+                        - cell:
+                            scope:
+                              role: '{{ role }}'
+                            scopes:
                               - null
-                            FieldId: '{{ FieldId }}'
-                            TextFormat: null
-                    VisualId: '{{ VisualId }}'
-                    ChartConfiguration:
-                      SortConfiguration:
-                        FieldSortOptions:
-                          - SortBy:
-                              Field: null
-                              DataPath:
-                                SortPaths:
+                            field_id: '{{ field_id }}'
+                            text_format: null
+                    visual_id: '{{ visual_id }}'
+                    chart_configuration:
+                      sort_configuration:
+                        field_sort_options:
+                          - sort_by:
+                              field: null
+                              data_path:
+                                sort_paths:
                                   - null
-                                Direction: null
-                              Column: null
-                            FieldId: '{{ FieldId }}'
-                      PaginatedReportOptions:
-                        OverflowColumnHeaderVisibility: null
-                        VerticalOverflowVisibility: null
-                      TableOptions:
-                        RowFieldNamesStyle: null
-                        RowHeaderStyle: null
-                        CollapsedRowDimensionsVisibility: null
-                        RowsLayout: '{{ RowsLayout }}'
-                        MetricPlacement: '{{ MetricPlacement }}'
-                        DefaultCellWidth: '{{ DefaultCellWidth }}'
-                        ColumnNamesVisibility: null
-                        RowsLabelOptions:
-                          CustomLabel: '{{ CustomLabel }}'
-                          Visibility: null
-                        SingleMetricVisibility: null
-                        ColumnHeaderStyle: null
-                        ToggleButtonsVisibility: null
-                        CellStyle: null
-                        RowAlternateColorOptions: null
-                      FieldWells:
-                        PivotTableAggregatedFieldWells:
-                          Values:
-                            - null
-                          Columns:
-                            - null
-                          Rows:
-                            - null
-                      FieldOptions:
-                        CollapseStateOptions:
-                          - Target:
-                              FieldId: '{{ FieldId }}'
-                              FieldDataPathValues:
+                                direction: null
+                              column: null
+                            field_id: '{{ field_id }}'
+                      paginated_report_options:
+                        overflow_column_header_visibility: null
+                        vertical_overflow_visibility: null
+                      table_options:
+                        row_field_names_style: null
+                        row_header_style: null
+                        collapsed_row_dimensions_visibility: null
+                        rows_layout: '{{ rows_layout }}'
+                        metric_placement: '{{ metric_placement }}'
+                        default_cell_width: '{{ default_cell_width }}'
+                        column_names_visibility: null
+                        rows_label_options:
+                          custom_label: '{{ custom_label }}'
+                          visibility: null
+                        single_metric_visibility: null
+                        column_header_style: null
+                        toggle_buttons_visibility: null
+                        cell_style: null
+                        row_alternate_color_options: null
+                      field_wells:
+                        pivot_table_aggregated_field_wells:
+                          values:
+                            - null
+                          columns:
+                            - null
+                          rows:
+                            - null
+                      field_options:
+                        collapse_state_options:
+                          - target:
+                              field_id: '{{ field_id }}'
+                              field_data_path_values:
                                 - null
-                            State: '{{ State }}'
-                        DataPathOptions:
-                          - DataPathList:
+                            state: '{{ state }}'
+                        data_path_options:
+                          - data_path_list:
                               - null
-                            Width: '{{ Width }}'
-                        SelectedFieldOptions:
-                          - CustomLabel: '{{ CustomLabel }}'
-                            FieldId: '{{ FieldId }}'
-                            Visibility: null
-                      Interactions: null
-                      TotalOptions:
-                        ColumnSubtotalOptions:
-                          CustomLabel: '{{ CustomLabel }}'
-                          FieldLevelOptions:
-                            - FieldId: '{{ FieldId }}'
-                          ValueCellStyle: null
-                          TotalCellStyle: null
-                          TotalsVisibility: null
-                          FieldLevel: '{{ FieldLevel }}'
-                          MetricHeaderCellStyle: null
-                          StyleTargets:
-                            - CellType: '{{ CellType }}'
-                        RowSubtotalOptions: null
-                        RowTotalOptions:
-                          TotalAggregationOptions:
-                            - null
-                          CustomLabel: '{{ CustomLabel }}'
-                          ValueCellStyle: null
-                          ScrollStatus: null
-                          Placement: null
-                          TotalCellStyle: null
-                          TotalsVisibility: null
-                          MetricHeaderCellStyle: null
-                        ColumnTotalOptions: null
-                    Actions:
+                            width: '{{ width }}'
+                        selected_field_options:
+                          - custom_label: '{{ custom_label }}'
+                            field_id: '{{ field_id }}'
+                            visibility: null
+                      interactions: null
+                      total_options:
+                        column_subtotal_options:
+                          custom_label: '{{ custom_label }}'
+                          field_level_options:
+                            - field_id: '{{ field_id }}'
+                          value_cell_style: null
+                          total_cell_style: null
+                          totals_visibility: null
+                          field_level: '{{ field_level }}'
+                          metric_header_cell_style: null
+                          style_targets:
+                            - cell_type: '{{ cell_type }}'
+                        row_subtotal_options: null
+                        row_total_options:
+                          total_aggregation_options:
+                            - null
+                          custom_label: '{{ custom_label }}'
+                          value_cell_style: null
+                          scroll_status: null
+                          placement: null
+                          total_cell_style: null
+                          totals_visibility: null
+                          metric_header_cell_style: null
+                        column_total_options: null
+                    actions:
                       - null
-                    Title: null
-                    VisualContentAltText: '{{ VisualContentAltText }}'
-                  BarChartVisual:
-                    Subtitle: null
-                    VisualId: '{{ VisualId }}'
-                    ChartConfiguration:
-                      SortConfiguration:
-                        SmallMultiplesSort:
+                    title: null
+                    visual_content_alt_text: '{{ visual_content_alt_text }}'
+                  bar_chart_visual:
+                    subtitle: null
+                    visual_id: '{{ visual_id }}'
+                    chart_configuration:
+                      sort_configuration:
+                        small_multiples_sort:
                           - null
-                        ColorSort:
+                        color_sort:
                           - null
-                        ColorItemsLimit: null
-                        CategoryItemsLimit: null
-                        CategorySort:
+                        color_items_limit: null
+                        category_items_limit: null
+                        category_sort:
                           - null
-                        SmallMultiplesLimitConfiguration: null
-                      Legend: null
-                      ReferenceLines:
+                        small_multiples_limit_configuration: null
+                      legend: null
+                      reference_lines:
                         - null
-                      DataLabels: null
-                      ColorLabelOptions: null
-                      CategoryLabelOptions: null
-                      Tooltip: null
-                      SmallMultiplesOptions: null
-                      Orientation: '{{ Orientation }}'
-                      VisualPalette: null
-                      ValueLabelOptions: null
-                      BarsArrangement: null
-                      CategoryAxis: null
-                      ContributionAnalysisDefaults:
+                      data_labels: null
+                      color_label_options: null
+                      category_label_options: null
+                      tooltip: null
+                      small_multiples_options: null
+                      orientation: '{{ orientation }}'
+                      visual_palette: null
+                      value_label_options: null
+                      bars_arrangement: null
+                      category_axis: null
+                      contribution_analysis_defaults:
                         - null
-                      FieldWells:
-                        BarChartAggregatedFieldWells:
-                          Category:
+                      field_wells:
+                        bar_chart_aggregated_field_wells:
+                          category:
                             - null
-                          Colors:
+                          colors:
                             - null
-                          Values:
+                          values:
                             - null
-                          SmallMultiples:
+                          small_multiples:
                             - null
-                      ValueAxis: null
-                      Interactions: null
-                    Actions:
+                      value_axis: null
+                      interactions: null
+                    actions:
                       - null
-                    Title: null
-                    VisualContentAltText: '{{ VisualContentAltText }}'
-                    ColumnHierarchies:
+                    title: null
+                    visual_content_alt_text: '{{ visual_content_alt_text }}'
+                    column_hierarchies:
                       - null
-                  HeatMapVisual:
-                    Subtitle: null
-                    VisualId: '{{ VisualId }}'
-                    ChartConfiguration:
-                      SortConfiguration:
-                        HeatMapRowSort:
+                  heat_map_visual:
+                    subtitle: null
+                    visual_id: '{{ visual_id }}'
+                    chart_configuration:
+                      sort_configuration:
+                        heat_map_row_sort:
                           - null
-                        HeatMapRowItemsLimitConfiguration: null
-                        HeatMapColumnItemsLimitConfiguration: null
-                        HeatMapColumnSort:
+                        heat_map_row_items_limit_configuration: null
+                        heat_map_column_items_limit_configuration: null
+                        heat_map_column_sort:
                           - null
-                      ColumnLabelOptions: null
-                      Legend: null
-                      DataLabels: null
-                      FieldWells:
-                        HeatMapAggregatedFieldWells:
-                          Values:
-                            - null
-                          Columns:
-                            - null
-                          Rows:
-                            - null
-                      Tooltip: null
-                      ColorScale:
-                        Colors:
-                          - DataValue: null
-                            Color: '{{ Color }}'
-                        ColorFillType: '{{ ColorFillType }}'
-                        NullValueColor: null
-                      Interactions: null
-                      RowLabelOptions: null
-                    Actions:
+                      column_label_options: null
+                      legend: null
+                      data_labels: null
+                      field_wells:
+                        heat_map_aggregated_field_wells:
+                          values:
+                            - null
+                          columns:
+                            - null
+                          rows:
+                            - null
+                      tooltip: null
+                      color_scale:
+                        colors:
+                          - data_value: null
+                            color: '{{ color }}'
+                        color_fill_type: '{{ color_fill_type }}'
+                        null_value_color: null
+                      interactions: null
+                      row_label_options: null
+                    actions:
                       - null
-                    Title: null
-                    VisualContentAltText: '{{ VisualContentAltText }}'
-                    ColumnHierarchies:
+                    title: null
+                    visual_content_alt_text: '{{ visual_content_alt_text }}'
+                    column_hierarchies:
                       - null
-                  TreeMapVisual:
-                    Subtitle: null
-                    VisualId: '{{ VisualId }}'
-                    ChartConfiguration:
-                      SortConfiguration:
-                        TreeMapSort:
+                  tree_map_visual:
+                    subtitle: null
+                    visual_id: '{{ visual_id }}'
+                    chart_configuration:
+                      sort_configuration:
+                        tree_map_sort:
                           - null
-                        TreeMapGroupItemsLimitConfiguration: null
-                      Legend: null
-                      DataLabels: null
-                      ColorLabelOptions: null
-                      SizeLabelOptions: null
-                      FieldWells:
-                        TreeMapAggregatedFieldWells:
-                          Sizes:
-                            - null
-                          Colors:
-                            - null
-                          Groups:
-                            - null
-                      Tooltip: null
-                      ColorScale: null
-                      Interactions: null
-                      GroupLabelOptions: null
-                    Actions:
+                        tree_map_group_items_limit_configuration: null
+                      legend: null
+                      data_labels: null
+                      color_label_options: null
+                      size_label_options: null
+                      field_wells:
+                        tree_map_aggregated_field_wells:
+                          sizes:
+                            - null
+                          colors:
+                            - null
+                          groups:
+                            - null
+                      tooltip: null
+                      color_scale: null
+                      interactions: null
+                      group_label_options: null
+                    actions:
                       - null
-                    Title: null
-                    VisualContentAltText: '{{ VisualContentAltText }}'
-                    ColumnHierarchies:
+                    title: null
+                    visual_content_alt_text: '{{ visual_content_alt_text }}'
+                    column_hierarchies:
                       - null
-                  InsightVisual:
-                    Subtitle: null
-                    VisualId: '{{ VisualId }}'
-                    Actions:
+                  insight_visual:
+                    subtitle: null
+                    visual_id: '{{ visual_id }}'
+                    actions:
                       - null
-                    DataSetIdentifier: '{{ DataSetIdentifier }}'
-                    InsightConfiguration:
-                      Computations:
-                        - PeriodToDate:
-                            PeriodTimeGranularity: null
-                            Value: null
-                            Time: null
-                            ComputationId: '{{ ComputationId }}'
-                            Name: '{{ Name }}'
-                          GrowthRate:
-                            Value: null
-                            Time: null
-                            PeriodSize: null
-                            ComputationId: '{{ ComputationId }}'
-                            Name: '{{ Name }}'
-                          TopBottomRanked:
-                            Type: '{{ Type }}'
-                            Category: null
-                            ResultSize: null
-                            Value: null
-                            ComputationId: '{{ ComputationId }}'
-                            Name: '{{ Name }}'
-                          TotalAggregation:
-                            Value: null
-                            ComputationId: '{{ ComputationId }}'
-                            Name: '{{ Name }}'
-                          Forecast:
-                            PeriodsBackward: null
-                            PeriodsForward: null
-                            PredictionInterval: null
-                            Seasonality: '{{ Seasonality }}'
-                            CustomSeasonalityValue: null
-                            Value: null
-                            Time: null
-                            UpperBoundary: null
-                            ComputationId: '{{ ComputationId }}'
-                            Name: '{{ Name }}'
-                            LowerBoundary: null
-                          MaximumMinimum:
-                            Type: '{{ Type }}'
-                            Value: null
-                            Time: null
-                            ComputationId: '{{ ComputationId }}'
-                            Name: '{{ Name }}'
-                          PeriodOverPeriod:
-                            Value: null
-                            Time: null
-                            ComputationId: '{{ ComputationId }}'
-                            Name: '{{ Name }}'
-                          MetricComparison:
-                            TargetValue: null
-                            Time: null
-                            ComputationId: '{{ ComputationId }}'
-                            FromValue: null
-                            Name: '{{ Name }}'
-                          TopBottomMovers:
-                            Type: null
-                            Category: null
-                            Value: null
-                            SortOrder: '{{ SortOrder }}'
-                            Time: null
-                            MoverSize: null
-                            ComputationId: '{{ ComputationId }}'
-                            Name: '{{ Name }}'
-                          UniqueValues:
-                            Category: null
-                            ComputationId: '{{ ComputationId }}'
-                            Name: '{{ Name }}'
-                      CustomNarrative:
-                        Narrative: '{{ Narrative }}'
-                      Interactions: null
-                    Title: null
-                    VisualContentAltText: '{{ VisualContentAltText }}'
-                  LineChartVisual:
-                    Subtitle: null
-                    VisualId: '{{ VisualId }}'
-                    ChartConfiguration:
-                      SortConfiguration:
-                        CategoryItemsLimitConfiguration: null
-                        ColorItemsLimitConfiguration: null
-                        SmallMultiplesSort:
+                    data_set_identifier: '{{ data_set_identifier }}'
+                    insight_configuration:
+                      computations:
+                        - period_to_date:
+                            period_time_granularity: null
+                            value: null
+                            time: null
+                            computation_id: '{{ computation_id }}'
+                            name: '{{ name }}'
+                          growth_rate:
+                            value: null
+                            time: null
+                            period_size: null
+                            computation_id: '{{ computation_id }}'
+                            name: '{{ name }}'
+                          top_bottom_ranked:
+                            type: '{{ type }}'
+                            category: null
+                            result_size: null
+                            value: null
+                            computation_id: '{{ computation_id }}'
+                            name: '{{ name }}'
+                          total_aggregation:
+                            value: null
+                            computation_id: '{{ computation_id }}'
+                            name: '{{ name }}'
+                          forecast:
+                            periods_backward: null
+                            periods_forward: null
+                            prediction_interval: null
+                            seasonality: '{{ seasonality }}'
+                            custom_seasonality_value: null
+                            value: null
+                            time: null
+                            upper_boundary: null
+                            computation_id: '{{ computation_id }}'
+                            name: '{{ name }}'
+                            lower_boundary: null
+                          maximum_minimum:
+                            type: '{{ type }}'
+                            value: null
+                            time: null
+                            computation_id: '{{ computation_id }}'
+                            name: '{{ name }}'
+                          period_over_period:
+                            value: null
+                            time: null
+                            computation_id: '{{ computation_id }}'
+                            name: '{{ name }}'
+                          metric_comparison:
+                            target_value: null
+                            time: null
+                            computation_id: '{{ computation_id }}'
+                            from_value: null
+                            name: '{{ name }}'
+                          top_bottom_movers:
+                            type: null
+                            category: null
+                            value: null
+                            sort_order: '{{ sort_order }}'
+                            time: null
+                            mover_size: null
+                            computation_id: '{{ computation_id }}'
+                            name: '{{ name }}'
+                          unique_values:
+                            category: null
+                            computation_id: '{{ computation_id }}'
+                            name: '{{ name }}'
+                      custom_narrative:
+                        narrative: '{{ narrative }}'
+                      interactions: null
+                    title: null
+                    visual_content_alt_text: '{{ visual_content_alt_text }}'
+                  line_chart_visual:
+                    subtitle: null
+                    visual_id: '{{ visual_id }}'
+                    chart_configuration:
+                      sort_configuration:
+                        category_items_limit_configuration: null
+                        color_items_limit_configuration: null
+                        small_multiples_sort:
                           - null
-                        CategorySort:
+                        category_sort:
                           - null
-                        SmallMultiplesLimitConfiguration: null
-                      Legend: null
-                      ReferenceLines:
+                        small_multiples_limit_configuration: null
+                      legend: null
+                      reference_lines:
                         - null
-                      DataLabels: null
-                      Tooltip: null
-                      SingleAxisOptions: null
-                      SmallMultiplesOptions: null
-                      PrimaryYAxisDisplayOptions:
-                        MissingDataConfigurations:
-                          - TreatmentOption: '{{ TreatmentOption }}'
-                        AxisOptions: null
-                      VisualPalette: null
-                      XAxisDisplayOptions: null
-                      DefaultSeriesSettings:
-                        LineStyleSettings:
-                          LineInterpolation: '{{ LineInterpolation }}'
-                          LineStyle: '{{ LineStyle }}'
-                          LineVisibility: null
-                          LineWidth: '{{ LineWidth }}'
-                        AxisBinding: null
-                        MarkerStyleSettings:
-                          MarkerShape: '{{ MarkerShape }}'
-                          MarkerSize: '{{ MarkerSize }}'
-                          MarkerVisibility: null
-                          MarkerColor: '{{ MarkerColor }}'
-                      SecondaryYAxisLabelOptions: null
-                      ForecastConfigurations:
-                        - ForecastProperties:
-                            PeriodsBackward: null
-                            PeriodsForward: null
-                            PredictionInterval: null
-                            Seasonality: null
-                            UpperBoundary: null
-                            LowerBoundary: null
-                          Scenario:
-                            WhatIfRangeScenario:
-                              StartDate: '{{ StartDate }}'
-                              Value: null
-                              EndDate: '{{ EndDate }}'
-                            WhatIfPointScenario:
-                              Value: null
-                              Date: '{{ Date }}'
-                      Series:
-                        - FieldSeriesItem:
-                            FieldId: '{{ FieldId }}'
-                            AxisBinding: null
-                            Settings:
-                              LineStyleSettings: null
-                              MarkerStyleSettings: null
-                          DataFieldSeriesItem:
-                            FieldId: '{{ FieldId }}'
-                            AxisBinding: null
-                            FieldValue: '{{ FieldValue }}'
-                            Settings: null
-                      Type: '{{ Type }}'
-                      PrimaryYAxisLabelOptions: null
-                      ContributionAnalysisDefaults:
+                      data_labels: null
+                      tooltip: null
+                      single_axis_options: null
+                      small_multiples_options: null
+                      primary_yaxis_display_options:
+                        missing_data_configurations:
+                          - treatment_option: '{{ treatment_option }}'
+                        axis_options: null
+                      visual_palette: null
+                      x_axis_display_options: null
+                      default_series_settings:
+                        line_style_settings:
+                          line_interpolation: '{{ line_interpolation }}'
+                          line_style: '{{ line_style }}'
+                          line_visibility: null
+                          line_width: '{{ line_width }}'
+                        axis_binding: null
+                        marker_style_settings:
+                          marker_shape: '{{ marker_shape }}'
+                          marker_size: '{{ marker_size }}'
+                          marker_visibility: null
+                          marker_color: '{{ marker_color }}'
+                      secondary_yaxis_label_options: null
+                      forecast_configurations:
+                        - forecast_properties:
+                            periods_backward: null
+                            periods_forward: null
+                            prediction_interval: null
+                            seasonality: null
+                            upper_boundary: null
+                            lower_boundary: null
+                          scenario:
+                            what_if_range_scenario:
+                              start_date: '{{ start_date }}'
+                              value: null
+                              end_date: '{{ end_date }}'
+                            what_if_point_scenario:
+                              value: null
+                              date: '{{ date }}'
+                      series:
+                        - field_series_item:
+                            field_id: '{{ field_id }}'
+                            axis_binding: null
+                            settings:
+                              line_style_settings: null
+                              marker_style_settings: null
+                          data_field_series_item:
+                            field_id: '{{ field_id }}'
+                            axis_binding: null
+                            field_value: '{{ field_value }}'
+                            settings: null
+                      type: '{{ type }}'
+                      primary_yaxis_label_options: null
+                      contribution_analysis_defaults:
                         - null
-                      FieldWells:
-                        LineChartAggregatedFieldWells:
-                          Category:
+                      field_wells:
+                        line_chart_aggregated_field_wells:
+                          category:
                             - null
-                          Colors:
+                          colors:
                             - null
-                          Values:
+                          values:
                             - null
-                          SmallMultiples:
+                          small_multiples:
                             - null
-                      SecondaryYAxisDisplayOptions: null
-                      XAxisLabelOptions: null
-                      Interactions: null
-                    Actions:
+                      secondary_yaxis_display_options: null
+                      x_axis_label_options: null
+                      interactions: null
+                    actions:
                       - null
-                    Title: null
-                    VisualContentAltText: '{{ VisualContentAltText }}'
-                    ColumnHierarchies:
+                    title: null
+                    visual_content_alt_text: '{{ visual_content_alt_text }}'
+                    column_hierarchies:
                       - null
-                  EmptyVisual:
-                    VisualId: '{{ VisualId }}'
-                    Actions:
+                  empty_visual:
+                    visual_id: '{{ visual_id }}'
+                    actions:
                       - null
-                    DataSetIdentifier: '{{ DataSetIdentifier }}'
-          ParameterDeclarations:
-            - StringParameterDeclaration:
-                MappedDataSetParameters:
-                  - DataSetParameterName: '{{ DataSetParameterName }}'
-                    DataSetIdentifier: '{{ DataSetIdentifier }}'
-                DefaultValues:
-                  DynamicValue:
-                    GroupNameColumn: null
-                    DefaultValueColumn: null
-                    UserNameColumn: null
-                  StaticValues:
-                    - '{{ StaticValues[0] }}'
-                ParameterValueType: '{{ ParameterValueType }}'
-                ValueWhenUnset:
-                  ValueWhenUnsetOption: '{{ ValueWhenUnsetOption }}'
-                  CustomValue: '{{ CustomValue }}'
-                Name: '{{ Name }}'
-              DateTimeParameterDeclaration:
-                MappedDataSetParameters:
+                    data_set_identifier: '{{ data_set_identifier }}'
+          parameter_declarations:
+            - string_parameter_declaration:
+                mapped_data_set_parameters:
+                  - data_set_parameter_name: '{{ data_set_parameter_name }}'
+                    data_set_identifier: '{{ data_set_identifier }}'
+                default_values:
+                  dynamic_value:
+                    group_name_column: null
+                    default_value_column: null
+                    user_name_column: null
+                  static_values:
+                    - '{{ static_values[0] }}'
+                parameter_value_type: '{{ parameter_value_type }}'
+                value_when_unset:
+                  value_when_unset_option: '{{ value_when_unset_option }}'
+                  custom_value: '{{ custom_value }}'
+                name: '{{ name }}'
+              date_time_parameter_declaration:
+                mapped_data_set_parameters:
                   - null
-                DefaultValues:
-                  RollingDate: null
-                  DynamicValue: null
-                  StaticValues:
-                    - '{{ StaticValues[0] }}'
-                TimeGranularity: null
-                ValueWhenUnset:
-                  ValueWhenUnsetOption: null
-                  CustomValue: '{{ CustomValue }}'
-                Name: '{{ Name }}'
-              DecimalParameterDeclaration:
-                MappedDataSetParameters:
+                default_values:
+                  rolling_date: null
+                  dynamic_value: null
+                  static_values:
+                    - '{{ static_values[0] }}'
+                time_granularity: null
+                value_when_unset:
+                  value_when_unset_option: null
+                  custom_value: '{{ custom_value }}'
+                name: '{{ name }}'
+              decimal_parameter_declaration:
+                mapped_data_set_parameters:
                   - null
-                DefaultValues:
-                  DynamicValue: null
-                  StaticValues:
+                default_values:
+                  dynamic_value: null
+                  static_values:
                     - null
-                ParameterValueType: null
-                ValueWhenUnset:
-                  ValueWhenUnsetOption: null
-                  CustomValue: null
-                Name: '{{ Name }}'
-              IntegerParameterDeclaration:
-                MappedDataSetParameters:
+                parameter_value_type: null
+                value_when_unset:
+                  value_when_unset_option: null
+                  custom_value: null
+                name: '{{ name }}'
+              integer_parameter_declaration:
+                mapped_data_set_parameters:
                   - null
-                DefaultValues:
-                  DynamicValue: null
-                  StaticValues:
+                default_values:
+                  dynamic_value: null
+                  static_values:
                     - null
-                ParameterValueType: null
-                ValueWhenUnset:
-                  ValueWhenUnsetOption: null
-                  CustomValue: null
-                Name: '{{ Name }}'
-      - name: ValidationStrategy
+                parameter_value_type: null
+                value_when_unset:
+                  value_when_unset_option: null
+                  custom_value: null
+                name: '{{ name }}'
+      - name: validation_strategy
         value:
-          Mode: '{{ Mode }}'
-      - name: FolderArns
+          mode: '{{ mode }}'
+      - name: folder_arns
         value:
-          - '{{ FolderArns[0] }}'
-      - name: DashboardId
-        value: '{{ DashboardId }}'
-      - name: LinkSharingConfiguration
+          - '{{ folder_arns[0] }}'
+      - name: dashboard_id
+        value: '{{ dashboard_id }}'
+      - name: link_sharing_configuration
         value:
-          Permissions:
-            - Principal: '{{ Principal }}'
-              Actions:
-                - '{{ Actions[0] }}'
-      - name: Name
-        value: '{{ Name }}'
-      - name: DashboardPublishOptions
+          permissions:
+            - principal: '{{ principal }}'
+              actions:
+                - '{{ actions[0] }}'
+      - name: name
+        value: '{{ name }}'
+      - name: dashboard_publish_options
         value:
-          SheetControlsOption:
-            VisibilityState: '{{ VisibilityState }}'
-          DataPointDrillUpDownOption:
-            AvailabilityStatus: null
-          AdHocFilteringOption:
-            AvailabilityStatus: null
-          VisualPublishOptions:
-            ExportHiddenFieldsOption:
-              AvailabilityStatus: null
-          VisualAxisSortOption:
-            AvailabilityStatus: null
-          ExportWithHiddenFieldsOption:
-            AvailabilityStatus: null
-          ExportToCSVOption:
-            AvailabilityStatus: null
-          DataPointMenuLabelOption:
-            AvailabilityStatus: null
-          VisualMenuOption: null
-          DataPointTooltipOption:
-            AvailabilityStatus: null
-          SheetLayoutElementMaximizationOption:
-            AvailabilityStatus: null
-      - name: AwsAccountId
-        value: '{{ AwsAccountId }}'
-      - name: Permissions
+          sheet_controls_option:
+            visibility_state: '{{ visibility_state }}'
+          data_point_drill_up_down_option:
+            availability_status: null
+          ad_hoc_filtering_option:
+            availability_status: null
+          visual_publish_options:
+            export_hidden_fields_option:
+              availability_status: null
+          visual_axis_sort_option:
+            availability_status: null
+          export_with_hidden_fields_option:
+            availability_status: null
+          export_to_cs_voption:
+            availability_status: null
+          data_point_menu_label_option:
+            availability_status: null
+          visual_menu_option: null
+          data_point_tooltip_option:
+            availability_status: null
+          sheet_layout_element_maximization_option:
+            availability_status: null
+      - name: aws_account_id
+        value: '{{ aws_account_id }}'
+      - name: permissions
         value:
           - null
-      - name: LinkEntities
+      - name: link_entities
         value:
-          - '{{ LinkEntities[0] }}'
-      - name: Tags
+          - '{{ link_entities[0] }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -3468,7 +3467,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<AwsAccountId>|<DashboardId>';
+AND Identifier = '{{ aws_account_id }}|{{ dashboard_id }}';
 ```
 
 
@@ -3477,7 +3476,7 @@ AND Identifier = '<AwsAccountId>|<DashboardId>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.quicksight.dashboards
-WHERE Identifier = '<AwsAccountId|DashboardId>'
+WHERE Identifier = '{{ aws_account_id }}|{{ dashboard_id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/quicksight/data_sets/index.md b/website/docs/services/quicksight/data_sets/index.md
index c355a8e13..638902f56 100644
--- a/website/docs/services/quicksight/data_sets/index.md
+++ b/website/docs/services/quicksight/data_sets/index.md
@@ -652,7 +652,7 @@ data_set_usage_configuration,
 output_columns,
 arn
 FROM awscc.quicksight.data_sets
-WHERE region = 'us-east-1' AND Identifier = '<AwsAccountId>|<DataSetId>';
+WHERE region = 'us-east-1' AND Identifier = '{{ aws_account_id }}|{{ data_set_id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -708,27 +708,27 @@ INSERT INTO awscc.quicksight.data_sets (
  DataSetUsageConfiguration,
  region
 )
-SELECT 
-'{{ FolderArns }}',
- '{{ RowLevelPermissionDataSet }}',
- '{{ IngestionWaitPolicy }}',
- '{{ ColumnLevelPermissionRules }}',
- '{{ Name }}',
- '{{ Permissions }}',
- '{{ UseAs }}',
- '{{ Tags }}',
- '{{ PhysicalTableMap }}',
- '{{ FieldFolders }}',
- '{{ DataSetId }}',
- '{{ PerformanceConfiguration }}',
- '{{ DataSetRefreshProperties }}',
- '{{ RowLevelPermissionTagConfiguration }}',
- '{{ ColumnGroups }}',
- '{{ ImportMode }}',
- '{{ DatasetParameters }}',
- '{{ LogicalTableMap }}',
- '{{ AwsAccountId }}',
- '{{ DataSetUsageConfiguration }}',
+SELECT
+'{{ folder_arns }}',
+ '{{ row_level_permission_data_set }}',
+ '{{ ingestion_wait_policy }}',
+ '{{ column_level_permission_rules }}',
+ '{{ name }}',
+ '{{ permissions }}',
+ '{{ use_as }}',
+ '{{ tags }}',
+ '{{ physical_table_map }}',
+ '{{ field_folders }}',
+ '{{ data_set_id }}',
+ '{{ performance_configuration }}',
+ '{{ data_set_refresh_properties }}',
+ '{{ row_level_permission_tag_configuration }}',
+ '{{ column_groups }}',
+ '{{ import_mode }}',
+ '{{ dataset_parameters }}',
+ '{{ logical_table_map }}',
+ '{{ aws_account_id }}',
+ '{{ data_set_usage_configuration }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -759,27 +759,27 @@ INSERT INTO awscc.quicksight.data_sets (
  DataSetUsageConfiguration,
  region
 )
-SELECT 
- '{{ FolderArns }}',
- '{{ RowLevelPermissionDataSet }}',
- '{{ IngestionWaitPolicy }}',
- '{{ ColumnLevelPermissionRules }}',
- '{{ Name }}',
- '{{ Permissions }}',
- '{{ UseAs }}',
- '{{ Tags }}',
- '{{ PhysicalTableMap }}',
- '{{ FieldFolders }}',
- '{{ DataSetId }}',
- '{{ PerformanceConfiguration }}',
- '{{ DataSetRefreshProperties }}',
- '{{ RowLevelPermissionTagConfiguration }}',
- '{{ ColumnGroups }}',
- '{{ ImportMode }}',
- '{{ DatasetParameters }}',
- '{{ LogicalTableMap }}',
- '{{ AwsAccountId }}',
- '{{ DataSetUsageConfiguration }}',
+SELECT
+ '{{ folder_arns }}',
+ '{{ row_level_permission_data_set }}',
+ '{{ ingestion_wait_policy }}',
+ '{{ column_level_permission_rules }}',
+ '{{ name }}',
+ '{{ permissions }}',
+ '{{ use_as }}',
+ '{{ tags }}',
+ '{{ physical_table_map }}',
+ '{{ field_folders }}',
+ '{{ data_set_id }}',
+ '{{ performance_configuration }}',
+ '{{ data_set_refresh_properties }}',
+ '{{ row_level_permission_tag_configuration }}',
+ '{{ column_groups }}',
+ '{{ import_mode }}',
+ '{{ dataset_parameters }}',
+ '{{ logical_table_map }}',
+ '{{ aws_account_id }}',
+ '{{ data_set_usage_configuration }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -797,120 +797,119 @@ globals:
 resources:
   - name: data_set
     props:
-      - name: FolderArns
+      - name: folder_arns
         value:
-          - '{{ FolderArns[0] }}'
-      - name: RowLevelPermissionDataSet
+          - '{{ folder_arns[0] }}'
+      - name: row_level_permission_data_set
         value:
-          Status: '{{ Status }}'
-          FormatVersion: '{{ FormatVersion }}'
-          Arn: '{{ Arn }}'
-          Namespace: '{{ Namespace }}'
-          PermissionPolicy: '{{ PermissionPolicy }}'
-      - name: IngestionWaitPolicy
+          status: '{{ status }}'
+          format_version: '{{ format_version }}'
+          arn: '{{ arn }}'
+          namespace: '{{ namespace }}'
+          permission_policy: '{{ permission_policy }}'
+      - name: ingestion_wait_policy
         value:
-          WaitForSpiceIngestion: '{{ WaitForSpiceIngestion }}'
-          IngestionWaitTimeInHours: null
-      - name: ColumnLevelPermissionRules
+          wait_for_spice_ingestion: '{{ wait_for_spice_ingestion }}'
+          ingestion_wait_time_in_hours: null
+      - name: column_level_permission_rules
         value:
-          - ColumnNames:
-              - '{{ ColumnNames[0] }}'
-            Principals:
-              - '{{ Principals[0] }}'
-      - name: Name
-        value: '{{ Name }}'
-      - name: Permissions
+          - column_names:
+              - '{{ column_names[0] }}'
+            principals:
+              - '{{ principals[0] }}'
+      - name: name
+        value: '{{ name }}'
+      - name: permissions
         value:
-          - Principal: '{{ Principal }}'
-            Actions:
-              - '{{ Actions[0] }}'
-      - name: UseAs
-        value: '{{ UseAs }}'
-      - name: Tags
+          - principal: '{{ principal }}'
+            actions:
+              - '{{ actions[0] }}'
+      - name: use_as
+        value: '{{ use_as }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-      - name: PhysicalTableMap
+          - key: '{{ key }}'
+            value: '{{ value }}'
+      - name: physical_table_map
         value: {}
-      - name: FieldFolders
+      - name: field_folders
         value: {}
-      - name: DataSetId
-        value: '{{ DataSetId }}'
-      - name: PerformanceConfiguration
+      - name: data_set_id
+        value: '{{ data_set_id }}'
+      - name: performance_configuration
         value:
-          UniqueKeys:
-            - ColumnNames:
-                - '{{ ColumnNames[0] }}'
-      - name: DataSetRefreshProperties
+          unique_keys:
+            - column_names:
+                - '{{ column_names[0] }}'
+      - name: data_set_refresh_properties
         value:
-          RefreshConfiguration:
-            IncrementalRefresh:
-              LookbackWindow:
-                ColumnName: '{{ ColumnName }}'
-                SizeUnit: '{{ SizeUnit }}'
-                Size: null
-          FailureConfiguration:
-            EmailAlert:
-              AlertStatus: '{{ AlertStatus }}'
-      - name: RowLevelPermissionTagConfiguration
+          refresh_configuration:
+            incremental_refresh:
+              lookback_window:
+                column_name: '{{ column_name }}'
+                size_unit: '{{ size_unit }}'
+                size: null
+          failure_configuration:
+            email_alert:
+              alert_status: '{{ alert_status }}'
+      - name: row_level_permission_tag_configuration
         value:
-          Status: null
-          TagRules:
-            - ColumnName: '{{ ColumnName }}'
-              TagKey: '{{ TagKey }}'
-              MatchAllValue: '{{ MatchAllValue }}'
-              TagMultiValueDelimiter: '{{ TagMultiValueDelimiter }}'
-          TagRuleConfigurations:
+          status: null
+          tag_rules:
+            - column_name: '{{ column_name }}'
+              tag_key: '{{ tag_key }}'
+              match_all_value: '{{ match_all_value }}'
+              tag_multi_value_delimiter: '{{ tag_multi_value_delimiter }}'
+          tag_rule_configurations:
             - - '{{ 0[0] }}'
-      - name: ColumnGroups
+      - name: column_groups
         value:
-          - GeoSpatialColumnGroup:
-              Columns:
-                - '{{ Columns[0] }}'
-              CountryCode: '{{ CountryCode }}'
-              Name: '{{ Name }}'
-      - name: ImportMode
-        value: '{{ ImportMode }}'
-      - name: DatasetParameters
+          - geo_spatial_column_group:
+              columns:
+                - '{{ columns[0] }}'
+              country_code: '{{ country_code }}'
+              name: '{{ name }}'
+      - name: import_mode
+        value: '{{ import_mode }}'
+      - name: dataset_parameters
         value:
-          - IntegerDatasetParameter:
-              ValueType: '{{ ValueType }}'
-              DefaultValues:
-                StaticValues:
+          - integer_dataset_parameter:
+              value_type: '{{ value_type }}'
+              default_values:
+                static_values:
                   - null
-              Id: '{{ Id }}'
-              Name: '{{ Name }}'
-            DateTimeDatasetParameter:
-              ValueType: null
-              TimeGranularity: '{{ TimeGranularity }}'
-              DefaultValues:
-                StaticValues:
-                  - '{{ StaticValues[0] }}'
-              Id: '{{ Id }}'
-              Name: '{{ Name }}'
-            DecimalDatasetParameter:
-              ValueType: null
-              DefaultValues:
-                StaticValues:
+              id: '{{ id }}'
+              name: '{{ name }}'
+            date_time_dataset_parameter:
+              value_type: null
+              time_granularity: '{{ time_granularity }}'
+              default_values:
+                static_values:
+                  - '{{ static_values[0] }}'
+              id: '{{ id }}'
+              name: '{{ name }}'
+            decimal_dataset_parameter:
+              value_type: null
+              default_values:
+                static_values:
                   - null
-              Id: '{{ Id }}'
-              Name: '{{ Name }}'
-            StringDatasetParameter:
-              ValueType: null
-              DefaultValues:
-                StaticValues:
-                  - '{{ StaticValues[0] }}'
-              Id: '{{ Id }}'
-              Name: '{{ Name }}'
-      - name: LogicalTableMap
+              id: '{{ id }}'
+              name: '{{ name }}'
+            string_dataset_parameter:
+              value_type: null
+              default_values:
+                static_values:
+                  - '{{ static_values[0] }}'
+              id: '{{ id }}'
+              name: '{{ name }}'
+      - name: logical_table_map
         value: {}
-      - name: AwsAccountId
-        value: '{{ AwsAccountId }}'
-      - name: DataSetUsageConfiguration
+      - name: aws_account_id
+        value: '{{ aws_account_id }}'
+      - name: data_set_usage_configuration
         value:
-          DisableUseAsImportedSource: '{{ DisableUseAsImportedSource }}'
-          DisableUseAsDirectQuerySource: '{{ DisableUseAsDirectQuerySource }}'
-
+          disable_use_as_imported_source: '{{ disable_use_as_imported_source }}'
+          disable_use_as_direct_query_source: '{{ disable_use_as_direct_query_source }}'
 ```
 </TabItem>
 </Tabs>
@@ -943,7 +942,7 @@ SET PatchDocument = string('{{ {
     "DataSetUsageConfiguration": data_set_usage_configuration
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<AwsAccountId>|<DataSetId>';
+AND Identifier = '{{ aws_account_id }}|{{ data_set_id }}';
 ```
 
 
@@ -952,7 +951,7 @@ AND Identifier = '<AwsAccountId>|<DataSetId>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.quicksight.data_sets
-WHERE Identifier = '<AwsAccountId|DataSetId>'
+WHERE Identifier = '{{ aws_account_id }}|{{ data_set_id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/quicksight/data_sources/index.md b/website/docs/services/quicksight/data_sources/index.md
index a3465e460..9a1ef21bc 100644
--- a/website/docs/services/quicksight/data_sources/index.md
+++ b/website/docs/services/quicksight/data_sources/index.md
@@ -873,7 +873,7 @@ credentials,
 data_source_id,
 tags
 FROM awscc.quicksight.data_sources
-WHERE region = 'us-east-1' AND Identifier = '<AwsAccountId>|<DataSourceId>';
+WHERE region = 'us-east-1' AND Identifier = '{{ aws_account_id }}|{{ data_source_id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -911,9 +911,9 @@ INSERT INTO awscc.quicksight.data_sources (
  Type,
  region
 )
-SELECT 
-'{{ Name }}',
- '{{ Type }}',
+SELECT
+'{{ name }}',
+ '{{ type }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -937,20 +937,20 @@ INSERT INTO awscc.quicksight.data_sources (
  Tags,
  region
 )
-SELECT 
- '{{ ErrorInfo }}',
- '{{ FolderArns }}',
- '{{ Name }}',
- '{{ DataSourceParameters }}',
- '{{ Type }}',
- '{{ VpcConnectionProperties }}',
- '{{ AlternateDataSourceParameters }}',
- '{{ AwsAccountId }}',
- '{{ Permissions }}',
- '{{ SslProperties }}',
- '{{ Credentials }}',
- '{{ DataSourceId }}',
- '{{ Tags }}',
+SELECT
+ '{{ error_info }}',
+ '{{ folder_arns }}',
+ '{{ name }}',
+ '{{ data_source_parameters }}',
+ '{{ type }}',
+ '{{ vpc_connection_properties }}',
+ '{{ alternate_data_source_parameters }}',
+ '{{ aws_account_id }}',
+ '{{ permissions }}',
+ '{{ ssl_properties }}',
+ '{{ credentials }}',
+ '{{ data_source_id }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -968,147 +968,146 @@ globals:
 resources:
   - name: data_source
     props:
-      - name: ErrorInfo
+      - name: error_info
         value:
-          Type: '{{ Type }}'
-          Message: '{{ Message }}'
-      - name: FolderArns
+          type: '{{ type }}'
+          message: '{{ message }}'
+      - name: folder_arns
         value:
-          - '{{ FolderArns[0] }}'
-      - name: Name
-        value: '{{ Name }}'
-      - name: DataSourceParameters
+          - '{{ folder_arns[0] }}'
+      - name: name
+        value: '{{ name }}'
+      - name: data_source_parameters
         value:
-          AuroraPostgreSqlParameters:
-            Port: null
-            Database: '{{ Database }}'
-            Host: '{{ Host }}'
-          TeradataParameters:
-            Port: null
-            Database: '{{ Database }}'
-            Host: '{{ Host }}'
-          RdsParameters:
-            InstanceId: '{{ InstanceId }}'
-            Database: '{{ Database }}'
-          AthenaParameters:
-            WorkGroup: '{{ WorkGroup }}'
-            IdentityCenterConfiguration:
-              EnableIdentityPropagation: '{{ EnableIdentityPropagation }}'
-            RoleArn: '{{ RoleArn }}'
-          SparkParameters:
-            Port: null
-            Host: '{{ Host }}'
-          MariaDbParameters:
-            Port: null
-            Database: '{{ Database }}'
-            Host: '{{ Host }}'
-          OracleParameters:
-            UseServiceName: '{{ UseServiceName }}'
-            Port: null
-            Database: '{{ Database }}'
-            Host: '{{ Host }}'
-          PrestoParameters:
-            Port: null
-            Host: '{{ Host }}'
-            Catalog: '{{ Catalog }}'
-          StarburstParameters:
-            Port: null
-            DatabaseAccessControlRole: '{{ DatabaseAccessControlRole }}'
-            ProductType: '{{ ProductType }}'
-            OAuthParameters:
-              TokenProviderUrl: '{{ TokenProviderUrl }}'
-              OAuthScope: '{{ OAuthScope }}'
-              IdentityProviderVpcConnectionProperties:
-                VpcConnectionArn: '{{ VpcConnectionArn }}'
-              IdentityProviderResourceUri: '{{ IdentityProviderResourceUri }}'
-            Host: '{{ Host }}'
-            Catalog: '{{ Catalog }}'
-            AuthenticationType: '{{ AuthenticationType }}'
-          RedshiftParameters:
-            IAMParameters:
-              AutoCreateDatabaseUser: '{{ AutoCreateDatabaseUser }}'
-              DatabaseUser: '{{ DatabaseUser }}'
-              RoleArn: '{{ RoleArn }}'
-              DatabaseGroups:
-                - '{{ DatabaseGroups[0] }}'
-            ClusterId: '{{ ClusterId }}'
-            Port: null
-            Database: '{{ Database }}'
-            Host: '{{ Host }}'
-            IdentityCenterConfiguration: null
-          MySqlParameters:
-            Port: null
-            Database: '{{ Database }}'
-            Host: '{{ Host }}'
-          SqlServerParameters:
-            Port: null
-            Database: '{{ Database }}'
-            Host: '{{ Host }}'
-          SnowflakeParameters:
-            Warehouse: '{{ Warehouse }}'
-            DatabaseAccessControlRole: '{{ DatabaseAccessControlRole }}'
-            Database: '{{ Database }}'
-            OAuthParameters: null
-            Host: '{{ Host }}'
-            AuthenticationType: null
-          AmazonElasticsearchParameters:
-            Domain: '{{ Domain }}'
-          AmazonOpenSearchParameters:
-            Domain: '{{ Domain }}'
-          PostgreSqlParameters:
-            Port: null
-            Database: '{{ Database }}'
-            Host: '{{ Host }}'
-          AuroraParameters:
-            Port: null
-            Database: '{{ Database }}'
-            Host: '{{ Host }}'
-          S3Parameters:
-            ManifestFileLocation:
-              Bucket: '{{ Bucket }}'
-              Key: '{{ Key }}'
-            RoleArn: '{{ RoleArn }}'
-          TrinoParameters:
-            Port: null
-            Host: '{{ Host }}'
-            Catalog: '{{ Catalog }}'
-          DatabricksParameters:
-            Port: null
-            Host: '{{ Host }}'
-            SqlEndpointPath: '{{ SqlEndpointPath }}'
-      - name: Type
-        value: '{{ Type }}'
-      - name: VpcConnectionProperties
+          aurora_postgre_sql_parameters:
+            port: null
+            database: '{{ database }}'
+            host: '{{ host }}'
+          teradata_parameters:
+            port: null
+            database: '{{ database }}'
+            host: '{{ host }}'
+          rds_parameters:
+            instance_id: '{{ instance_id }}'
+            database: '{{ database }}'
+          athena_parameters:
+            work_group: '{{ work_group }}'
+            identity_center_configuration:
+              enable_identity_propagation: '{{ enable_identity_propagation }}'
+            role_arn: '{{ role_arn }}'
+          spark_parameters:
+            port: null
+            host: '{{ host }}'
+          maria_db_parameters:
+            port: null
+            database: '{{ database }}'
+            host: '{{ host }}'
+          oracle_parameters:
+            use_service_name: '{{ use_service_name }}'
+            port: null
+            database: '{{ database }}'
+            host: '{{ host }}'
+          presto_parameters:
+            port: null
+            host: '{{ host }}'
+            catalog: '{{ catalog }}'
+          starburst_parameters:
+            port: null
+            database_access_control_role: '{{ database_access_control_role }}'
+            product_type: '{{ product_type }}'
+            oauth_parameters:
+              token_provider_url: '{{ token_provider_url }}'
+              oauth_scope: '{{ oauth_scope }}'
+              identity_provider_vpc_connection_properties:
+                vpc_connection_arn: '{{ vpc_connection_arn }}'
+              identity_provider_resource_uri: '{{ identity_provider_resource_uri }}'
+            host: '{{ host }}'
+            catalog: '{{ catalog }}'
+            authentication_type: '{{ authentication_type }}'
+          redshift_parameters:
+            iam_parameters:
+              auto_create_database_user: '{{ auto_create_database_user }}'
+              database_user: '{{ database_user }}'
+              role_arn: '{{ role_arn }}'
+              database_groups:
+                - '{{ database_groups[0] }}'
+            cluster_id: '{{ cluster_id }}'
+            port: null
+            database: '{{ database }}'
+            host: '{{ host }}'
+            identity_center_configuration: null
+          my_sql_parameters:
+            port: null
+            database: '{{ database }}'
+            host: '{{ host }}'
+          sql_server_parameters:
+            port: null
+            database: '{{ database }}'
+            host: '{{ host }}'
+          snowflake_parameters:
+            warehouse: '{{ warehouse }}'
+            database_access_control_role: '{{ database_access_control_role }}'
+            database: '{{ database }}'
+            oauth_parameters: null
+            host: '{{ host }}'
+            authentication_type: null
+          amazon_elasticsearch_parameters:
+            domain: '{{ domain }}'
+          amazon_open_search_parameters:
+            domain: '{{ domain }}'
+          postgre_sql_parameters:
+            port: null
+            database: '{{ database }}'
+            host: '{{ host }}'
+          aurora_parameters:
+            port: null
+            database: '{{ database }}'
+            host: '{{ host }}'
+          s3_parameters:
+            manifest_file_location:
+              bucket: '{{ bucket }}'
+              key: '{{ key }}'
+            role_arn: '{{ role_arn }}'
+          trino_parameters:
+            port: null
+            host: '{{ host }}'
+            catalog: '{{ catalog }}'
+          databricks_parameters:
+            port: null
+            host: '{{ host }}'
+            sql_endpoint_path: '{{ sql_endpoint_path }}'
+      - name: type
+        value: '{{ type }}'
+      - name: vpc_connection_properties
         value: null
-      - name: AlternateDataSourceParameters
+      - name: alternate_data_source_parameters
         value:
           - null
-      - name: AwsAccountId
-        value: '{{ AwsAccountId }}'
-      - name: Permissions
+      - name: aws_account_id
+        value: '{{ aws_account_id }}'
+      - name: permissions
         value:
-          - Principal: '{{ Principal }}'
-            Actions:
-              - '{{ Actions[0] }}'
-      - name: SslProperties
+          - principal: '{{ principal }}'
+            actions:
+              - '{{ actions[0] }}'
+      - name: ssl_properties
         value:
-          DisableSsl: '{{ DisableSsl }}'
-      - name: Credentials
+          disable_ssl: '{{ disable_ssl }}'
+      - name: credentials
         value:
-          SecretArn: '{{ SecretArn }}'
-          CopySourceArn: '{{ CopySourceArn }}'
-          CredentialPair:
-            AlternateDataSourceParameters:
+          secret_arn: '{{ secret_arn }}'
+          copy_source_arn: '{{ copy_source_arn }}'
+          credential_pair:
+            alternate_data_source_parameters:
               - null
-            Username: '{{ Username }}'
-            Password: '{{ Password }}'
-      - name: DataSourceId
-        value: '{{ DataSourceId }}'
-      - name: Tags
+            username: '{{ username }}'
+            password: '{{ password }}'
+      - name: data_source_id
+        value: '{{ data_source_id }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -1133,7 +1132,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<AwsAccountId>|<DataSourceId>';
+AND Identifier = '{{ aws_account_id }}|{{ data_source_id }}';
 ```
 
 
@@ -1142,7 +1141,7 @@ AND Identifier = '<AwsAccountId>|<DataSourceId>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.quicksight.data_sources
-WHERE Identifier = '<AwsAccountId|DataSourceId>'
+WHERE Identifier = '{{ aws_account_id }}|{{ data_source_id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/quicksight/folders/index.md b/website/docs/services/quicksight/folders/index.md
index 969d675d2..83882e3bc 100644
--- a/website/docs/services/quicksight/folders/index.md
+++ b/website/docs/services/quicksight/folders/index.md
@@ -223,7 +223,7 @@ permissions,
 sharing_model,
 tags
 FROM awscc.quicksight.folders
-WHERE region = 'us-east-1' AND Identifier = '<AwsAccountId>|<FolderId>';
+WHERE region = 'us-east-1' AND Identifier = '{{ aws_account_id }}|{{ folder_id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -267,15 +267,15 @@ INSERT INTO awscc.quicksight.folders (
  Tags,
  region
 )
-SELECT 
-'{{ AwsAccountId }}',
- '{{ FolderId }}',
- '{{ FolderType }}',
- '{{ Name }}',
- '{{ ParentFolderArn }}',
- '{{ Permissions }}',
- '{{ SharingModel }}',
- '{{ Tags }}',
+SELECT
+'{{ aws_account_id }}',
+ '{{ folder_id }}',
+ '{{ folder_type }}',
+ '{{ name }}',
+ '{{ parent_folder_arn }}',
+ '{{ permissions }}',
+ '{{ sharing_model }}',
+ '{{ tags }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -294,15 +294,15 @@ INSERT INTO awscc.quicksight.folders (
  Tags,
  region
 )
-SELECT 
- '{{ AwsAccountId }}',
- '{{ FolderId }}',
- '{{ FolderType }}',
- '{{ Name }}',
- '{{ ParentFolderArn }}',
- '{{ Permissions }}',
- '{{ SharingModel }}',
- '{{ Tags }}',
+SELECT
+ '{{ aws_account_id }}',
+ '{{ folder_id }}',
+ '{{ folder_type }}',
+ '{{ name }}',
+ '{{ parent_folder_arn }}',
+ '{{ permissions }}',
+ '{{ sharing_model }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -320,28 +320,27 @@ globals:
 resources:
   - name: folder
     props:
-      - name: AwsAccountId
-        value: '{{ AwsAccountId }}'
-      - name: FolderId
-        value: '{{ FolderId }}'
-      - name: FolderType
-        value: '{{ FolderType }}'
-      - name: Name
-        value: '{{ Name }}'
-      - name: ParentFolderArn
-        value: '{{ ParentFolderArn }}'
-      - name: Permissions
+      - name: aws_account_id
+        value: '{{ aws_account_id }}'
+      - name: folder_id
+        value: '{{ folder_id }}'
+      - name: folder_type
+        value: '{{ folder_type }}'
+      - name: name
+        value: '{{ name }}'
+      - name: parent_folder_arn
+        value: '{{ parent_folder_arn }}'
+      - name: permissions
         value:
-          - Principal: '{{ Principal }}'
-            Actions:
-              - '{{ Actions[0] }}'
-      - name: SharingModel
-        value: '{{ SharingModel }}'
-      - name: Tags
+          - principal: '{{ principal }}'
+            actions:
+              - '{{ actions[0] }}'
+      - name: sharing_model
+        value: '{{ sharing_model }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -359,7 +358,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<AwsAccountId>|<FolderId>';
+AND Identifier = '{{ aws_account_id }}|{{ folder_id }}';
 ```
 
 
@@ -368,7 +367,7 @@ AND Identifier = '<AwsAccountId>|<FolderId>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.quicksight.folders
-WHERE Identifier = '<AwsAccountId|FolderId>'
+WHERE Identifier = '{{ aws_account_id }}|{{ folder_id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/quicksight/refresh_schedules/index.md b/website/docs/services/quicksight/refresh_schedules/index.md
index f9226be38..5da8648e1 100644
--- a/website/docs/services/quicksight/refresh_schedules/index.md
+++ b/website/docs/services/quicksight/refresh_schedules/index.md
@@ -274,7 +274,7 @@ aws_account_id,
 data_set_id,
 schedule
 FROM awscc.quicksight.refresh_schedules
-WHERE region = 'us-east-1' AND Identifier = '<AwsAccountId>|<DataSetId>|<Schedule/ScheduleId>';
+WHERE region = 'us-east-1' AND Identifier = '{{ aws_account_id }}|{{ data_set_id }}|{{ schedule/schedule_id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -312,7 +312,7 @@ INSERT INTO awscc.quicksight.refresh_schedules (
  ,
  region
 )
-SELECT 
+SELECT
 '{{  }}',
 '{{ region }}';
 ```
@@ -327,10 +327,10 @@ INSERT INTO awscc.quicksight.refresh_schedules (
  Schedule,
  region
 )
-SELECT 
- '{{ AwsAccountId }}',
- '{{ DataSetId }}',
- '{{ Schedule }}',
+SELECT
+ '{{ aws_account_id }}',
+ '{{ data_set_id }}',
+ '{{ schedule }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -348,23 +348,22 @@ globals:
 resources:
   - name: refresh_schedule
     props:
-      - name: AwsAccountId
-        value: '{{ AwsAccountId }}'
-      - name: DataSetId
-        value: '{{ DataSetId }}'
-      - name: Schedule
+      - name: aws_account_id
+        value: '{{ aws_account_id }}'
+      - name: data_set_id
+        value: '{{ data_set_id }}'
+      - name: schedule
         value:
-          ScheduleId: '{{ ScheduleId }}'
-          ScheduleFrequency:
-            Interval: '{{ Interval }}'
-            RefreshOnDay:
-              DayOfWeek: '{{ DayOfWeek }}'
-              DayOfMonth: '{{ DayOfMonth }}'
-            TimeZone: '{{ TimeZone }}'
-            TimeOfTheDay: '{{ TimeOfTheDay }}'
-          StartAfterDateTime: '{{ StartAfterDateTime }}'
-          RefreshType: '{{ RefreshType }}'
-
+          schedule_id: '{{ schedule_id }}'
+          schedule_frequency:
+            interval: '{{ interval }}'
+            refresh_on_day:
+              day_of_week: '{{ day_of_week }}'
+              day_of_month: '{{ day_of_month }}'
+            time_zone: '{{ time_zone }}'
+            time_of_the_day: '{{ time_of_the_day }}'
+          start_after_date_time: '{{ start_after_date_time }}'
+          refresh_type: '{{ refresh_type }}'
 ```
 </TabItem>
 </Tabs>
@@ -375,7 +374,7 @@ resources:
 ```sql
 /*+ delete */
 DELETE FROM awscc.quicksight.refresh_schedules
-WHERE Identifier = '<AwsAccountId|DataSetId|Schedule/ScheduleId>'
+WHERE Identifier = '{{ aws_account_id }}|{{ data_set_id }}|{{ schedule/schedule_id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/quicksight/templates/index.md b/website/docs/services/quicksight/templates/index.md
index 7d5b1d6e5..69ff5d6ed 100644
--- a/website/docs/services/quicksight/templates/index.md
+++ b/website/docs/services/quicksight/templates/index.md
@@ -1137,7 +1137,7 @@ arn,
 tags,
 template_id
 FROM awscc.quicksight.templates
-WHERE region = 'us-east-1' AND Identifier = '<AwsAccountId>|<TemplateId>';
+WHERE region = 'us-east-1' AND Identifier = '{{ aws_account_id }}|{{ template_id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -1175,9 +1175,9 @@ INSERT INTO awscc.quicksight.templates (
  TemplateId,
  region
 )
-SELECT 
-'{{ AwsAccountId }}',
- '{{ TemplateId }}',
+SELECT
+'{{ aws_account_id }}',
+ '{{ template_id }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -1197,16 +1197,16 @@ INSERT INTO awscc.quicksight.templates (
  TemplateId,
  region
 )
-SELECT 
- '{{ VersionDescription }}',
- '{{ SourceEntity }}',
- '{{ Definition }}',
- '{{ ValidationStrategy }}',
- '{{ Name }}',
- '{{ AwsAccountId }}',
- '{{ Permissions }}',
- '{{ Tags }}',
- '{{ TemplateId }}',
+SELECT
+ '{{ version_description }}',
+ '{{ source_entity }}',
+ '{{ definition }}',
+ '{{ validation_strategy }}',
+ '{{ name }}',
+ '{{ aws_account_id }}',
+ '{{ permissions }}',
+ '{{ tags }}',
+ '{{ template_id }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -1224,1920 +1224,1919 @@ globals:
 resources:
   - name: template
     props:
-      - name: VersionDescription
-        value: '{{ VersionDescription }}'
-      - name: SourceEntity
+      - name: version_description
+        value: '{{ version_description }}'
+      - name: source_entity
         value:
-          SourceAnalysis:
-            DataSetReferences:
-              - DataSetArn: '{{ DataSetArn }}'
-                DataSetPlaceholder: '{{ DataSetPlaceholder }}'
-            Arn: '{{ Arn }}'
-          SourceTemplate:
-            Arn: '{{ Arn }}'
-      - name: Definition
+          source_analysis:
+            data_set_references:
+              - data_set_arn: '{{ data_set_arn }}'
+                data_set_placeholder: '{{ data_set_placeholder }}'
+            arn: '{{ arn }}'
+          source_template:
+            arn: '{{ arn }}'
+      - name: definition
         value:
-          Options:
-            Timezone: '{{ Timezone }}'
-            WeekStart: '{{ WeekStart }}'
-          FilterGroups:
-            - Status: '{{ Status }}'
-              Filters:
-                - NestedFilter:
-                    Column:
-                      ColumnName: '{{ ColumnName }}'
-                      DataSetIdentifier: '{{ DataSetIdentifier }}'
-                    InnerFilter:
-                      CategoryInnerFilter:
-                        Configuration:
-                          CustomFilterListConfiguration:
-                            CategoryValues:
-                              - '{{ CategoryValues[0] }}'
-                            NullOption: '{{ NullOption }}'
-                            MatchOperator: '{{ MatchOperator }}'
-                            SelectAllOptions: '{{ SelectAllOptions }}'
-                          CustomFilterConfiguration:
-                            CategoryValue: '{{ CategoryValue }}'
-                            ParameterName: '{{ ParameterName }}'
-                            NullOption: null
-                            MatchOperator: null
-                            SelectAllOptions: null
-                          FilterListConfiguration:
-                            CategoryValues:
-                              - '{{ CategoryValues[0] }}'
-                            NullOption: null
-                            MatchOperator: null
-                            SelectAllOptions: null
-                        Column: null
-                        DefaultFilterControlConfiguration:
-                          ControlOptions:
-                            DefaultSliderOptions:
-                              Type: '{{ Type }}'
-                              StepSize: null
-                              DisplayOptions:
-                                TitleOptions:
-                                  CustomLabel: '{{ CustomLabel }}'
-                                  Visibility: null
-                                  FontConfiguration:
-                                    FontFamily: '{{ FontFamily }}'
-                                    FontStyle: '{{ FontStyle }}'
-                                    FontSize:
-                                      Relative: '{{ Relative }}'
-                                      Absolute: '{{ Absolute }}'
-                                    FontDecoration: '{{ FontDecoration }}'
-                                    FontColor: '{{ FontColor }}'
-                                    FontWeight:
-                                      Name: '{{ Name }}'
-                                InfoIconLabelOptions:
-                                  Visibility: null
-                                  InfoIconText: '{{ InfoIconText }}'
-                              MaximumValue: null
-                              MinimumValue: null
-                            DefaultRelativeDateTimeOptions:
-                              DisplayOptions:
-                                TitleOptions: null
-                                InfoIconLabelOptions: null
-                                DateTimeFormat: '{{ DateTimeFormat }}'
-                              CommitMode: '{{ CommitMode }}'
-                            DefaultTextFieldOptions:
-                              DisplayOptions:
-                                TitleOptions: null
-                                PlaceholderOptions:
-                                  Visibility: null
-                                InfoIconLabelOptions: null
-                            DefaultTextAreaOptions:
-                              Delimiter: '{{ Delimiter }}'
-                              DisplayOptions:
-                                TitleOptions: null
-                                PlaceholderOptions: null
-                                InfoIconLabelOptions: null
-                            DefaultDropdownOptions:
-                              Type: '{{ Type }}'
-                              DisplayOptions:
-                                TitleOptions: null
-                                SelectAllOptions:
-                                  Visibility: null
-                                InfoIconLabelOptions: null
-                              CommitMode: null
-                              SelectableValues:
-                                Values:
-                                  - '{{ Values[0] }}'
-                            DefaultDateTimePickerOptions:
-                              Type: '{{ Type }}'
-                              DisplayOptions:
-                                TitleOptions: null
-                                InfoIconLabelOptions: null
-                                HelperTextVisibility: null
-                                DateIconVisibility: null
-                                DateTimeFormat: '{{ DateTimeFormat }}'
-                              CommitMode: null
-                            DefaultListOptions:
-                              Type: null
-                              DisplayOptions:
-                                TitleOptions: null
-                                SearchOptions:
-                                  Visibility: null
-                                SelectAllOptions: null
-                                InfoIconLabelOptions: null
-                              SelectableValues: null
-                          Title: '{{ Title }}'
-                    IncludeInnerSet: '{{ IncludeInnerSet }}'
-                    FilterId: '{{ FilterId }}'
-                  NumericEqualityFilter:
-                    AggregationFunction:
-                      AttributeAggregationFunction:
-                        SimpleAttributeAggregation: '{{ SimpleAttributeAggregation }}'
-                        ValueForMultipleValues: '{{ ValueForMultipleValues }}'
-                      DateAggregationFunction: '{{ DateAggregationFunction }}'
-                      NumericalAggregationFunction:
-                        PercentileAggregation:
-                          PercentileValue: null
-                        SimpleNumericalAggregation: '{{ SimpleNumericalAggregation }}'
-                      CategoricalAggregationFunction: '{{ CategoricalAggregationFunction }}'
-                    Column: null
-                    Value: null
-                    ParameterName: '{{ ParameterName }}'
-                    NullOption: null
-                    MatchOperator: '{{ MatchOperator }}'
-                    SelectAllOptions: '{{ SelectAllOptions }}'
-                    DefaultFilterControlConfiguration: null
-                    FilterId: '{{ FilterId }}'
-                  NumericRangeFilter:
-                    AggregationFunction: null
-                    Column: null
-                    IncludeMaximum: '{{ IncludeMaximum }}'
-                    RangeMinimum:
-                      StaticValue: null
-                      Parameter: '{{ Parameter }}'
-                    NullOption: null
-                    SelectAllOptions: null
-                    DefaultFilterControlConfiguration: null
-                    FilterId: '{{ FilterId }}'
-                    RangeMaximum: null
-                    IncludeMinimum: '{{ IncludeMinimum }}'
-                  TimeRangeFilter:
-                    RangeMinimumValue:
-                      RollingDate:
-                        Expression: '{{ Expression }}'
-                        DataSetIdentifier: '{{ DataSetIdentifier }}'
-                      StaticValue: '{{ StaticValue }}'
-                      Parameter: '{{ Parameter }}'
-                    Column: null
-                    RangeMaximumValue: null
-                    IncludeMaximum: '{{ IncludeMaximum }}'
-                    TimeGranularity: '{{ TimeGranularity }}'
-                    NullOption: null
-                    DefaultFilterControlConfiguration: null
-                    FilterId: '{{ FilterId }}'
-                    IncludeMinimum: '{{ IncludeMinimum }}'
-                    ExcludePeriodConfiguration:
-                      Status: null
-                      Amount: null
-                      Granularity: null
-                  RelativeDatesFilter:
-                    RelativeDateValue: null
-                    Column: null
-                    RelativeDateType: '{{ RelativeDateType }}'
-                    TimeGranularity: null
-                    ParameterName: '{{ ParameterName }}'
-                    NullOption: null
-                    DefaultFilterControlConfiguration: null
-                    FilterId: '{{ FilterId }}'
-                    AnchorDateConfiguration:
-                      AnchorOption: '{{ AnchorOption }}'
-                      ParameterName: '{{ ParameterName }}'
-                    MinimumGranularity: null
-                    ExcludePeriodConfiguration: null
-                  TopBottomFilter:
-                    AggregationSortConfigurations:
-                      - AggregationFunction: null
-                        SortDirection: '{{ SortDirection }}'
-                        Column: null
-                    Column: null
-                    TimeGranularity: null
-                    ParameterName: '{{ ParameterName }}'
-                    Limit: null
-                    DefaultFilterControlConfiguration: null
-                    FilterId: '{{ FilterId }}'
-                  TimeEqualityFilter:
-                    Column: null
-                    RollingDate: null
-                    Value: '{{ Value }}'
-                    TimeGranularity: null
-                    ParameterName: '{{ ParameterName }}'
-                    DefaultFilterControlConfiguration: null
-                    FilterId: '{{ FilterId }}'
-                  CategoryFilter:
-                    Configuration: null
-                    Column: null
-                    DefaultFilterControlConfiguration: null
-                    FilterId: '{{ FilterId }}'
-              CrossDataset: '{{ CrossDataset }}'
-              ScopeConfiguration:
-                AllSheets: {}
-                SelectedSheets:
-                  SheetVisualScopingConfigurations:
-                    - Scope: '{{ Scope }}'
-                      SheetId: '{{ SheetId }}'
-                      VisualIds:
-                        - '{{ VisualIds[0] }}'
-              FilterGroupId: '{{ FilterGroupId }}'
-          QueryExecutionOptions:
-            QueryExecutionMode: '{{ QueryExecutionMode }}'
-          CalculatedFields:
-            - Expression: '{{ Expression }}'
-              DataSetIdentifier: '{{ DataSetIdentifier }}'
-              Name: '{{ Name }}'
-          DataSetConfigurations:
-            - Placeholder: '{{ Placeholder }}'
-              DataSetSchema:
-                ColumnSchemaList:
-                  - DataType: '{{ DataType }}'
-                    GeographicRole: '{{ GeographicRole }}'
-                    Name: '{{ Name }}'
-              ColumnGroupSchemaList:
-                - ColumnGroupColumnSchemaList:
-                    - Name: '{{ Name }}'
-                  Name: '{{ Name }}'
-          ColumnConfigurations:
-            - Role: '{{ Role }}'
-              FormatConfiguration:
-                NumberFormatConfiguration:
-                  FormatConfiguration:
-                    NumberDisplayFormatConfiguration:
-                      NegativeValueConfiguration:
-                        DisplayMode: '{{ DisplayMode }}'
-                      DecimalPlacesConfiguration:
-                        DecimalPlaces: null
-                      NumberScale: '{{ NumberScale }}'
-                      NullValueFormatConfiguration:
-                        NullString: '{{ NullString }}'
-                      Suffix: '{{ Suffix }}'
-                      SeparatorConfiguration:
-                        DecimalSeparator: '{{ DecimalSeparator }}'
-                        ThousandsSeparator:
-                          Symbol: null
-                          Visibility: null
-                          GroupingStyle: '{{ GroupingStyle }}'
-                      Prefix: '{{ Prefix }}'
-                    CurrencyDisplayFormatConfiguration:
-                      NegativeValueConfiguration: null
-                      DecimalPlacesConfiguration: null
-                      NumberScale: null
-                      NullValueFormatConfiguration: null
-                      Suffix: '{{ Suffix }}'
-                      SeparatorConfiguration: null
-                      Symbol: '{{ Symbol }}'
-                      Prefix: '{{ Prefix }}'
-                    PercentageDisplayFormatConfiguration:
-                      NegativeValueConfiguration: null
-                      DecimalPlacesConfiguration: null
-                      NullValueFormatConfiguration: null
-                      Suffix: '{{ Suffix }}'
-                      SeparatorConfiguration: null
-                      Prefix: '{{ Prefix }}'
-                DateTimeFormatConfiguration:
-                  NumericFormatConfiguration: null
-                  NullValueFormatConfiguration: null
-                  DateTimeFormat: '{{ DateTimeFormat }}'
-                StringFormatConfiguration:
-                  NumericFormatConfiguration: null
-                  NullValueFormatConfiguration: null
-              Column: null
-              ColorsConfiguration:
-                CustomColors:
-                  - Color: '{{ Color }}'
-                    FieldValue: '{{ FieldValue }}'
-                    SpecialValue: '{{ SpecialValue }}'
-          AnalysisDefaults:
-            DefaultNewSheetConfiguration:
-              SheetContentType: '{{ SheetContentType }}'
-              InteractiveLayoutConfiguration:
-                FreeForm:
-                  CanvasSizeOptions:
-                    ScreenCanvasSizeOptions:
-                      OptimizedViewPortWidth: '{{ OptimizedViewPortWidth }}'
-                Grid:
-                  CanvasSizeOptions:
-                    ScreenCanvasSizeOptions:
-                      OptimizedViewPortWidth: '{{ OptimizedViewPortWidth }}'
-                      ResizeOption: '{{ ResizeOption }}'
-              PaginatedLayoutConfiguration:
-                SectionBased:
-                  CanvasSizeOptions:
-                    PaperCanvasSizeOptions:
-                      PaperMargin:
-                        Left: '{{ Left }}'
-                        Top: '{{ Top }}'
-                        Right: '{{ Right }}'
-                        Bottom: '{{ Bottom }}'
-                      PaperSize: '{{ PaperSize }}'
-                      PaperOrientation: '{{ PaperOrientation }}'
-          Sheets:
-            - Description: '{{ Description }}'
-              ParameterControls:
-                - Slider:
-                    ParameterControlId: '{{ ParameterControlId }}'
-                    StepSize: null
-                    DisplayOptions: null
-                    SourceParameterName: '{{ SourceParameterName }}'
-                    Title: '{{ Title }}'
-                    MaximumValue: null
-                    MinimumValue: null
-                  TextArea:
-                    ParameterControlId: '{{ ParameterControlId }}'
-                    Delimiter: '{{ Delimiter }}'
-                    DisplayOptions: null
-                    SourceParameterName: '{{ SourceParameterName }}'
-                    Title: '{{ Title }}'
-                  Dropdown:
-                    ParameterControlId: '{{ ParameterControlId }}'
-                    Type: null
-                    DisplayOptions: null
-                    SourceParameterName: '{{ SourceParameterName }}'
-                    CascadingControlConfiguration:
-                      SourceControls:
-                        - SourceSheetControlId: '{{ SourceSheetControlId }}'
-                          ColumnToMatch: null
-                    Title: '{{ Title }}'
-                    CommitMode: null
-                    SelectableValues:
-                      LinkToDataSetColumn: null
-                      Values:
-                        - '{{ Values[0] }}'
-                  TextField:
-                    ParameterControlId: '{{ ParameterControlId }}'
-                    DisplayOptions: null
-                    SourceParameterName: '{{ SourceParameterName }}'
-                    Title: '{{ Title }}'
-                  List:
-                    ParameterControlId: '{{ ParameterControlId }}'
-                    Type: null
-                    DisplayOptions: null
-                    SourceParameterName: '{{ SourceParameterName }}'
-                    CascadingControlConfiguration: null
-                    Title: '{{ Title }}'
-                    SelectableValues: null
-                  DateTimePicker:
-                    ParameterControlId: '{{ ParameterControlId }}'
-                    DisplayOptions: null
-                    SourceParameterName: '{{ SourceParameterName }}'
-                    Title: '{{ Title }}'
-              ContentType: null
-              SheetId: '{{ SheetId }}'
-              Images:
-                - Actions:
-                    - Status: null
-                      Trigger: '{{ Trigger }}'
-                      CustomActionId: '{{ CustomActionId }}'
-                      Name: '{{ Name }}'
-                      ActionOperations:
-                        - NavigationOperation:
-                            LocalNavigationConfiguration:
-                              TargetSheetId: '{{ TargetSheetId }}'
-                          SetParametersOperation:
-                            ParameterValueConfigurations:
-                              - DestinationParameterName: '{{ DestinationParameterName }}'
-                                Value:
-                                  CustomValuesConfiguration:
-                                    IncludeNullValue: '{{ IncludeNullValue }}'
-                                    CustomValues:
-                                      DecimalValues:
+          options:
+            timezone: '{{ timezone }}'
+            week_start: '{{ week_start }}'
+          filter_groups:
+            - status: '{{ status }}'
+              filters:
+                - nested_filter:
+                    column:
+                      column_name: '{{ column_name }}'
+                      data_set_identifier: '{{ data_set_identifier }}'
+                    inner_filter:
+                      category_inner_filter:
+                        configuration:
+                          custom_filter_list_configuration:
+                            category_values:
+                              - '{{ category_values[0] }}'
+                            null_option: '{{ null_option }}'
+                            match_operator: '{{ match_operator }}'
+                            select_all_options: '{{ select_all_options }}'
+                          custom_filter_configuration:
+                            category_value: '{{ category_value }}'
+                            parameter_name: '{{ parameter_name }}'
+                            null_option: null
+                            match_operator: null
+                            select_all_options: null
+                          filter_list_configuration:
+                            category_values:
+                              - '{{ category_values[0] }}'
+                            null_option: null
+                            match_operator: null
+                            select_all_options: null
+                        column: null
+                        default_filter_control_configuration:
+                          control_options:
+                            default_slider_options:
+                              type: '{{ type }}'
+                              step_size: null
+                              display_options:
+                                title_options:
+                                  custom_label: '{{ custom_label }}'
+                                  visibility: null
+                                  font_configuration:
+                                    font_family: '{{ font_family }}'
+                                    font_style: '{{ font_style }}'
+                                    font_size:
+                                      relative: '{{ relative }}'
+                                      absolute: '{{ absolute }}'
+                                    font_decoration: '{{ font_decoration }}'
+                                    font_color: '{{ font_color }}'
+                                    font_weight:
+                                      name: '{{ name }}'
+                                info_icon_label_options:
+                                  visibility: null
+                                  info_icon_text: '{{ info_icon_text }}'
+                              maximum_value: null
+                              minimum_value: null
+                            default_relative_date_time_options:
+                              display_options:
+                                title_options: null
+                                info_icon_label_options: null
+                                date_time_format: '{{ date_time_format }}'
+                              commit_mode: '{{ commit_mode }}'
+                            default_text_field_options:
+                              display_options:
+                                title_options: null
+                                placeholder_options:
+                                  visibility: null
+                                info_icon_label_options: null
+                            default_text_area_options:
+                              delimiter: '{{ delimiter }}'
+                              display_options:
+                                title_options: null
+                                placeholder_options: null
+                                info_icon_label_options: null
+                            default_dropdown_options:
+                              type: '{{ type }}'
+                              display_options:
+                                title_options: null
+                                select_all_options:
+                                  visibility: null
+                                info_icon_label_options: null
+                              commit_mode: null
+                              selectable_values:
+                                values:
+                                  - '{{ values[0] }}'
+                            default_date_time_picker_options:
+                              type: '{{ type }}'
+                              display_options:
+                                title_options: null
+                                info_icon_label_options: null
+                                helper_text_visibility: null
+                                date_icon_visibility: null
+                                date_time_format: '{{ date_time_format }}'
+                              commit_mode: null
+                            default_list_options:
+                              type: null
+                              display_options:
+                                title_options: null
+                                search_options:
+                                  visibility: null
+                                select_all_options: null
+                                info_icon_label_options: null
+                              selectable_values: null
+                          title: '{{ title }}'
+                    include_inner_set: '{{ include_inner_set }}'
+                    filter_id: '{{ filter_id }}'
+                  numeric_equality_filter:
+                    aggregation_function:
+                      attribute_aggregation_function:
+                        simple_attribute_aggregation: '{{ simple_attribute_aggregation }}'
+                        value_for_multiple_values: '{{ value_for_multiple_values }}'
+                      date_aggregation_function: '{{ date_aggregation_function }}'
+                      numerical_aggregation_function:
+                        percentile_aggregation:
+                          percentile_value: null
+                        simple_numerical_aggregation: '{{ simple_numerical_aggregation }}'
+                      categorical_aggregation_function: '{{ categorical_aggregation_function }}'
+                    column: null
+                    value: null
+                    parameter_name: '{{ parameter_name }}'
+                    null_option: null
+                    match_operator: '{{ match_operator }}'
+                    select_all_options: '{{ select_all_options }}'
+                    default_filter_control_configuration: null
+                    filter_id: '{{ filter_id }}'
+                  numeric_range_filter:
+                    aggregation_function: null
+                    column: null
+                    include_maximum: '{{ include_maximum }}'
+                    range_minimum:
+                      static_value: null
+                      parameter: '{{ parameter }}'
+                    null_option: null
+                    select_all_options: null
+                    default_filter_control_configuration: null
+                    filter_id: '{{ filter_id }}'
+                    range_maximum: null
+                    include_minimum: '{{ include_minimum }}'
+                  time_range_filter:
+                    range_minimum_value:
+                      rolling_date:
+                        expression: '{{ expression }}'
+                        data_set_identifier: '{{ data_set_identifier }}'
+                      static_value: '{{ static_value }}'
+                      parameter: '{{ parameter }}'
+                    column: null
+                    range_maximum_value: null
+                    include_maximum: '{{ include_maximum }}'
+                    time_granularity: '{{ time_granularity }}'
+                    null_option: null
+                    default_filter_control_configuration: null
+                    filter_id: '{{ filter_id }}'
+                    include_minimum: '{{ include_minimum }}'
+                    exclude_period_configuration:
+                      status: null
+                      amount: null
+                      granularity: null
+                  relative_dates_filter:
+                    relative_date_value: null
+                    column: null
+                    relative_date_type: '{{ relative_date_type }}'
+                    time_granularity: null
+                    parameter_name: '{{ parameter_name }}'
+                    null_option: null
+                    default_filter_control_configuration: null
+                    filter_id: '{{ filter_id }}'
+                    anchor_date_configuration:
+                      anchor_option: '{{ anchor_option }}'
+                      parameter_name: '{{ parameter_name }}'
+                    minimum_granularity: null
+                    exclude_period_configuration: null
+                  top_bottom_filter:
+                    aggregation_sort_configurations:
+                      - aggregation_function: null
+                        sort_direction: '{{ sort_direction }}'
+                        column: null
+                    column: null
+                    time_granularity: null
+                    parameter_name: '{{ parameter_name }}'
+                    limit: null
+                    default_filter_control_configuration: null
+                    filter_id: '{{ filter_id }}'
+                  time_equality_filter:
+                    column: null
+                    rolling_date: null
+                    value: '{{ value }}'
+                    time_granularity: null
+                    parameter_name: '{{ parameter_name }}'
+                    default_filter_control_configuration: null
+                    filter_id: '{{ filter_id }}'
+                  category_filter:
+                    configuration: null
+                    column: null
+                    default_filter_control_configuration: null
+                    filter_id: '{{ filter_id }}'
+              cross_dataset: '{{ cross_dataset }}'
+              scope_configuration:
+                all_sheets: {}
+                selected_sheets:
+                  sheet_visual_scoping_configurations:
+                    - scope: '{{ scope }}'
+                      sheet_id: '{{ sheet_id }}'
+                      visual_ids:
+                        - '{{ visual_ids[0] }}'
+              filter_group_id: '{{ filter_group_id }}'
+          query_execution_options:
+            query_execution_mode: '{{ query_execution_mode }}'
+          calculated_fields:
+            - expression: '{{ expression }}'
+              data_set_identifier: '{{ data_set_identifier }}'
+              name: '{{ name }}'
+          data_set_configurations:
+            - placeholder: '{{ placeholder }}'
+              data_set_schema:
+                column_schema_list:
+                  - data_type: '{{ data_type }}'
+                    geographic_role: '{{ geographic_role }}'
+                    name: '{{ name }}'
+              column_group_schema_list:
+                - column_group_column_schema_list:
+                    - name: '{{ name }}'
+                  name: '{{ name }}'
+          column_configurations:
+            - role: '{{ role }}'
+              format_configuration:
+                number_format_configuration:
+                  format_configuration:
+                    number_display_format_configuration:
+                      negative_value_configuration:
+                        display_mode: '{{ display_mode }}'
+                      decimal_places_configuration:
+                        decimal_places: null
+                      number_scale: '{{ number_scale }}'
+                      null_value_format_configuration:
+                        null_string: '{{ null_string }}'
+                      suffix: '{{ suffix }}'
+                      separator_configuration:
+                        decimal_separator: '{{ decimal_separator }}'
+                        thousands_separator:
+                          symbol: null
+                          visibility: null
+                          grouping_style: '{{ grouping_style }}'
+                      prefix: '{{ prefix }}'
+                    currency_display_format_configuration:
+                      negative_value_configuration: null
+                      decimal_places_configuration: null
+                      number_scale: null
+                      null_value_format_configuration: null
+                      suffix: '{{ suffix }}'
+                      separator_configuration: null
+                      symbol: '{{ symbol }}'
+                      prefix: '{{ prefix }}'
+                    percentage_display_format_configuration:
+                      negative_value_configuration: null
+                      decimal_places_configuration: null
+                      null_value_format_configuration: null
+                      suffix: '{{ suffix }}'
+                      separator_configuration: null
+                      prefix: '{{ prefix }}'
+                date_time_format_configuration:
+                  numeric_format_configuration: null
+                  null_value_format_configuration: null
+                  date_time_format: '{{ date_time_format }}'
+                string_format_configuration:
+                  numeric_format_configuration: null
+                  null_value_format_configuration: null
+              column: null
+              colors_configuration:
+                custom_colors:
+                  - color: '{{ color }}'
+                    field_value: '{{ field_value }}'
+                    special_value: '{{ special_value }}'
+          analysis_defaults:
+            default_new_sheet_configuration:
+              sheet_content_type: '{{ sheet_content_type }}'
+              interactive_layout_configuration:
+                free_form:
+                  canvas_size_options:
+                    screen_canvas_size_options:
+                      optimized_view_port_width: '{{ optimized_view_port_width }}'
+                grid:
+                  canvas_size_options:
+                    screen_canvas_size_options:
+                      optimized_view_port_width: '{{ optimized_view_port_width }}'
+                      resize_option: '{{ resize_option }}'
+              paginated_layout_configuration:
+                section_based:
+                  canvas_size_options:
+                    paper_canvas_size_options:
+                      paper_margin:
+                        left: '{{ left }}'
+                        top: '{{ top }}'
+                        right: '{{ right }}'
+                        bottom: '{{ bottom }}'
+                      paper_size: '{{ paper_size }}'
+                      paper_orientation: '{{ paper_orientation }}'
+          sheets:
+            - description: '{{ description }}'
+              parameter_controls:
+                - slider:
+                    parameter_control_id: '{{ parameter_control_id }}'
+                    step_size: null
+                    display_options: null
+                    source_parameter_name: '{{ source_parameter_name }}'
+                    title: '{{ title }}'
+                    maximum_value: null
+                    minimum_value: null
+                  text_area:
+                    parameter_control_id: '{{ parameter_control_id }}'
+                    delimiter: '{{ delimiter }}'
+                    display_options: null
+                    source_parameter_name: '{{ source_parameter_name }}'
+                    title: '{{ title }}'
+                  dropdown:
+                    parameter_control_id: '{{ parameter_control_id }}'
+                    type: null
+                    display_options: null
+                    source_parameter_name: '{{ source_parameter_name }}'
+                    cascading_control_configuration:
+                      source_controls:
+                        - source_sheet_control_id: '{{ source_sheet_control_id }}'
+                          column_to_match: null
+                    title: '{{ title }}'
+                    commit_mode: null
+                    selectable_values:
+                      link_to_data_set_column: null
+                      values:
+                        - '{{ values[0] }}'
+                  text_field:
+                    parameter_control_id: '{{ parameter_control_id }}'
+                    display_options: null
+                    source_parameter_name: '{{ source_parameter_name }}'
+                    title: '{{ title }}'
+                  list:
+                    parameter_control_id: '{{ parameter_control_id }}'
+                    type: null
+                    display_options: null
+                    source_parameter_name: '{{ source_parameter_name }}'
+                    cascading_control_configuration: null
+                    title: '{{ title }}'
+                    selectable_values: null
+                  date_time_picker:
+                    parameter_control_id: '{{ parameter_control_id }}'
+                    display_options: null
+                    source_parameter_name: '{{ source_parameter_name }}'
+                    title: '{{ title }}'
+              content_type: null
+              sheet_id: '{{ sheet_id }}'
+              images:
+                - actions:
+                    - status: null
+                      trigger: '{{ trigger }}'
+                      custom_action_id: '{{ custom_action_id }}'
+                      name: '{{ name }}'
+                      action_operations:
+                        - navigation_operation:
+                            local_navigation_configuration:
+                              target_sheet_id: '{{ target_sheet_id }}'
+                          set_parameters_operation:
+                            parameter_value_configurations:
+                              - destination_parameter_name: '{{ destination_parameter_name }}'
+                                value:
+                                  custom_values_configuration:
+                                    include_null_value: '{{ include_null_value }}'
+                                    custom_values:
+                                      decimal_values:
                                         - null
-                                      IntegerValues:
+                                      integer_values:
                                         - null
-                                      StringValues:
-                                        - '{{ StringValues[0] }}'
-                                      DateTimeValues:
-                                        - '{{ DateTimeValues[0] }}'
-                                  SourceParameterName: '{{ SourceParameterName }}'
-                                  SelectAllValueOptions: '{{ SelectAllValueOptions }}'
-                                  SourceField: '{{ SourceField }}'
-                                  SourceColumn: null
-                          URLOperation:
-                            URLTemplate: '{{ URLTemplate }}'
-                            URLTarget: '{{ URLTarget }}'
-                  SheetImageId: '{{ SheetImageId }}'
-                  Tooltip:
-                    Visibility: null
-                    TooltipText:
-                      PlainText: '{{ PlainText }}'
-                  Scaling:
-                    ScalingType: '{{ ScalingType }}'
-                  Interactions:
-                    ImageMenuOption:
-                      AvailabilityStatus: '{{ AvailabilityStatus }}'
-                  Source:
-                    SheetImageStaticFileSource:
-                      StaticFileId: '{{ StaticFileId }}'
-                  ImageContentAltText: '{{ ImageContentAltText }}'
-              SheetControlLayouts:
-                - Configuration:
-                    GridLayout:
-                      CanvasSizeOptions: null
-                      Elements:
-                        - ElementType: '{{ ElementType }}'
-                          ColumnSpan: null
-                          ColumnIndex: null
-                          RowIndex: null
-                          RowSpan: null
-                          ElementId: '{{ ElementId }}'
-              Title: '{{ Title }}'
-              Name: '{{ Name }}'
-              TextBoxes:
-                - SheetTextBoxId: '{{ SheetTextBoxId }}'
-                  Content: '{{ Content }}'
-              Layouts:
-                - Configuration:
-                    GridLayout: null
-                    FreeFormLayout:
-                      CanvasSizeOptions: null
-                      Elements:
-                        - ElementType: null
-                          BorderStyle:
-                            Color: '{{ Color }}'
-                            Visibility: null
-                          Height: '{{ Height }}'
-                          Visibility: null
-                          RenderingRules:
-                            - Expression: '{{ Expression }}'
-                              ConfigurationOverrides:
-                                Visibility: null
-                          YAxisLocation: '{{ YAxisLocation }}'
-                          LoadingAnimation:
-                            Visibility: null
-                          Width: '{{ Width }}'
-                          BackgroundStyle:
-                            Color: '{{ Color }}'
-                            Visibility: null
-                          ElementId: '{{ ElementId }}'
-                          XAxisLocation: '{{ XAxisLocation }}'
-                          SelectedBorderStyle: null
-                    SectionBasedLayout:
-                      CanvasSizeOptions: null
-                      FooterSections:
-                        - Layout:
-                            FreeFormLayout:
-                              Elements:
+                                      string_values:
+                                        - '{{ string_values[0] }}'
+                                      date_time_values:
+                                        - '{{ date_time_values[0] }}'
+                                  source_parameter_name: '{{ source_parameter_name }}'
+                                  select_all_value_options: '{{ select_all_value_options }}'
+                                  source_field: '{{ source_field }}'
+                                  source_column: null
+                          url_operation:
+                            url_template: '{{ url_template }}'
+                            url_target: '{{ url_target }}'
+                  sheet_image_id: '{{ sheet_image_id }}'
+                  tooltip:
+                    visibility: null
+                    tooltip_text:
+                      plain_text: '{{ plain_text }}'
+                  scaling:
+                    scaling_type: '{{ scaling_type }}'
+                  interactions:
+                    image_menu_option:
+                      availability_status: '{{ availability_status }}'
+                  source:
+                    sheet_image_static_file_source:
+                      static_file_id: '{{ static_file_id }}'
+                  image_content_alt_text: '{{ image_content_alt_text }}'
+              sheet_control_layouts:
+                - configuration:
+                    grid_layout:
+                      canvas_size_options: null
+                      elements:
+                        - element_type: '{{ element_type }}'
+                          column_span: null
+                          column_index: null
+                          row_index: null
+                          row_span: null
+                          element_id: '{{ element_id }}'
+              title: '{{ title }}'
+              name: '{{ name }}'
+              text_boxes:
+                - sheet_text_box_id: '{{ sheet_text_box_id }}'
+                  content: '{{ content }}'
+              layouts:
+                - configuration:
+                    grid_layout: null
+                    free_form_layout:
+                      canvas_size_options: null
+                      elements:
+                        - element_type: null
+                          border_style:
+                            color: '{{ color }}'
+                            visibility: null
+                          height: '{{ height }}'
+                          visibility: null
+                          rendering_rules:
+                            - expression: '{{ expression }}'
+                              configuration_overrides:
+                                visibility: null
+                          y_axis_location: '{{ y_axis_location }}'
+                          loading_animation:
+                            visibility: null
+                          width: '{{ width }}'
+                          background_style:
+                            color: '{{ color }}'
+                            visibility: null
+                          element_id: '{{ element_id }}'
+                          x_axis_location: '{{ x_axis_location }}'
+                          selected_border_style: null
+                    section_based_layout:
+                      canvas_size_options: null
+                      footer_sections:
+                        - layout:
+                            free_form_layout:
+                              elements:
                                 - null
-                          Style:
-                            Padding: null
-                            Height: '{{ Height }}'
-                          SectionId: '{{ SectionId }}'
-                      BodySections:
-                        - Content:
-                            Layout: null
-                          Style: null
-                          PageBreakConfiguration:
-                            After:
-                              Status: '{{ Status }}'
-                          SectionId: '{{ SectionId }}'
-                          RepeatConfiguration:
-                            DimensionConfigurations:
-                              - DynamicNumericDimensionConfiguration:
-                                  Column: null
-                                  SortByMetrics:
-                                    - AggregationFunction: null
-                                      SortBy: null
-                                      Direction: null
-                                  Limit: null
-                                DynamicCategoryDimensionConfiguration:
-                                  Column: null
-                                  SortByMetrics:
+                          style:
+                            padding: null
+                            height: '{{ height }}'
+                          section_id: '{{ section_id }}'
+                      body_sections:
+                        - content:
+                            layout: null
+                          style: null
+                          page_break_configuration:
+                            after:
+                              status: '{{ status }}'
+                          section_id: '{{ section_id }}'
+                          repeat_configuration:
+                            dimension_configurations:
+                              - dynamic_numeric_dimension_configuration:
+                                  column: null
+                                  sort_by_metrics:
+                                    - aggregation_function: null
+                                      sort_by: null
+                                      direction: null
+                                  limit: null
+                                dynamic_category_dimension_configuration:
+                                  column: null
+                                  sort_by_metrics:
                                     - null
-                                  Limit: null
-                            NonRepeatingVisuals:
-                              - '{{ NonRepeatingVisuals[0] }}'
-                            PageBreakConfiguration:
-                              After: null
-                      HeaderSections:
+                                  limit: null
+                            non_repeating_visuals:
+                              - '{{ non_repeating_visuals[0] }}'
+                            page_break_configuration:
+                              after: null
+                      header_sections:
                         - null
-              FilterControls:
-                - Slider:
-                    FilterControlId: '{{ FilterControlId }}'
-                    Type: null
-                    StepSize: null
-                    DisplayOptions: null
-                    Title: '{{ Title }}'
-                    MaximumValue: null
-                    SourceFilterId: '{{ SourceFilterId }}'
-                    MinimumValue: null
-                  TextArea:
-                    FilterControlId: '{{ FilterControlId }}'
-                    Delimiter: '{{ Delimiter }}'
-                    DisplayOptions: null
-                    Title: '{{ Title }}'
-                    SourceFilterId: '{{ SourceFilterId }}'
-                  Dropdown:
-                    FilterControlId: '{{ FilterControlId }}'
-                    Type: null
-                    DisplayOptions: null
-                    CascadingControlConfiguration: null
-                    Title: '{{ Title }}'
-                    CommitMode: null
-                    SourceFilterId: '{{ SourceFilterId }}'
-                    SelectableValues: null
-                  TextField:
-                    FilterControlId: '{{ FilterControlId }}'
-                    DisplayOptions: null
-                    Title: '{{ Title }}'
-                    SourceFilterId: '{{ SourceFilterId }}'
-                  List:
-                    FilterControlId: '{{ FilterControlId }}'
-                    Type: null
-                    DisplayOptions: null
-                    CascadingControlConfiguration: null
-                    Title: '{{ Title }}'
-                    SourceFilterId: '{{ SourceFilterId }}'
-                    SelectableValues: null
-                  DateTimePicker:
-                    FilterControlId: '{{ FilterControlId }}'
-                    Type: null
-                    DisplayOptions: null
-                    Title: '{{ Title }}'
-                    CommitMode: null
-                    SourceFilterId: '{{ SourceFilterId }}'
-                  RelativeDateTime:
-                    FilterControlId: '{{ FilterControlId }}'
-                    DisplayOptions: null
-                    Title: '{{ Title }}'
-                    CommitMode: null
-                    SourceFilterId: '{{ SourceFilterId }}'
-                  CrossSheet:
-                    FilterControlId: '{{ FilterControlId }}'
-                    CascadingControlConfiguration: null
-                    SourceFilterId: '{{ SourceFilterId }}'
-              Visuals:
-                - FunnelChartVisual:
-                    Subtitle:
-                      Visibility: null
-                      FormatText:
-                        RichText: '{{ RichText }}'
-                        PlainText: '{{ PlainText }}'
-                    VisualId: '{{ VisualId }}'
-                    ChartConfiguration:
-                      SortConfiguration:
-                        CategoryItemsLimit:
-                          ItemsLimit: null
-                          OtherCategories: '{{ OtherCategories }}'
-                        CategorySort:
-                          - FieldSort:
-                              FieldId: '{{ FieldId }}'
-                              Direction: null
-                            ColumnSort: null
-                      DataLabelOptions:
-                        MeasureLabelVisibility: null
-                        Position: '{{ Position }}'
-                        Visibility: null
-                        CategoryLabelVisibility: null
-                        LabelColor: '{{ LabelColor }}'
-                        MeasureDataLabelStyle: '{{ MeasureDataLabelStyle }}'
-                        LabelFontConfiguration: null
-                      CategoryLabelOptions:
-                        Visibility: null
-                        SortIconVisibility: null
-                        AxisLabelOptions:
-                          - CustomLabel: '{{ CustomLabel }}'
-                            ApplyTo:
-                              Column: null
-                              FieldId: '{{ FieldId }}'
-                            FontConfiguration: null
-                      FieldWells:
-                        FunnelChartAggregatedFieldWells:
-                          Category:
-                            - DateDimensionField:
-                                HierarchyId: '{{ HierarchyId }}'
-                                FormatConfiguration: null
-                                Column: null
-                                FieldId: '{{ FieldId }}'
-                                DateGranularity: null
-                              NumericalDimensionField:
-                                HierarchyId: '{{ HierarchyId }}'
-                                FormatConfiguration: null
-                                Column: null
-                                FieldId: '{{ FieldId }}'
-                              CategoricalDimensionField:
-                                HierarchyId: '{{ HierarchyId }}'
-                                FormatConfiguration: null
-                                Column: null
-                                FieldId: '{{ FieldId }}'
-                          Values:
-                            - DateMeasureField:
-                                AggregationFunction: null
-                                FormatConfiguration: null
-                                Column: null
-                                FieldId: '{{ FieldId }}'
-                              NumericalMeasureField:
-                                AggregationFunction: null
-                                FormatConfiguration: null
-                                Column: null
-                                FieldId: '{{ FieldId }}'
-                              CategoricalMeasureField:
-                                AggregationFunction: null
-                                FormatConfiguration: null
-                                Column: null
-                                FieldId: '{{ FieldId }}'
-                              CalculatedMeasureField:
-                                Expression: '{{ Expression }}'
-                                FieldId: '{{ FieldId }}'
-                      Tooltip:
-                        SelectedTooltipType: '{{ SelectedTooltipType }}'
-                        TooltipVisibility: null
-                        FieldBasedTooltip:
-                          TooltipFields:
-                            - FieldTooltipItem:
-                                TooltipTarget: '{{ TooltipTarget }}'
-                                FieldId: '{{ FieldId }}'
-                                Label: '{{ Label }}'
-                                Visibility: null
-                              ColumnTooltipItem:
-                                Aggregation: null
-                                TooltipTarget: null
-                                Column: null
-                                Label: '{{ Label }}'
-                                Visibility: null
-                          AggregationVisibility: null
-                          TooltipTitleType: '{{ TooltipTitleType }}'
-                      Interactions:
-                        ContextMenuOption:
-                          AvailabilityStatus: null
-                        VisualMenuOption:
-                          AvailabilityStatus: null
-                      ValueLabelOptions: null
-                      VisualPalette:
-                        ChartColor: '{{ ChartColor }}'
-                        ColorMap:
-                          - Element:
-                              DataPathType:
-                                PivotTableDataPathType: '{{ PivotTableDataPathType }}'
-                              FieldId: '{{ FieldId }}'
-                              FieldValue: '{{ FieldValue }}'
-                            Color: '{{ Color }}'
-                            TimeGranularity: null
-                    Actions:
-                      - Status: null
-                        Trigger: '{{ Trigger }}'
-                        CustomActionId: '{{ CustomActionId }}'
-                        Name: '{{ Name }}'
-                        ActionOperations:
-                          - NavigationOperation: null
-                            SetParametersOperation: null
-                            FilterOperation:
-                              SelectedFieldsConfiguration:
-                                SelectedColumns:
+              filter_controls:
+                - slider:
+                    filter_control_id: '{{ filter_control_id }}'
+                    type: null
+                    step_size: null
+                    display_options: null
+                    title: '{{ title }}'
+                    maximum_value: null
+                    source_filter_id: '{{ source_filter_id }}'
+                    minimum_value: null
+                  text_area:
+                    filter_control_id: '{{ filter_control_id }}'
+                    delimiter: '{{ delimiter }}'
+                    display_options: null
+                    title: '{{ title }}'
+                    source_filter_id: '{{ source_filter_id }}'
+                  dropdown:
+                    filter_control_id: '{{ filter_control_id }}'
+                    type: null
+                    display_options: null
+                    cascading_control_configuration: null
+                    title: '{{ title }}'
+                    commit_mode: null
+                    source_filter_id: '{{ source_filter_id }}'
+                    selectable_values: null
+                  text_field:
+                    filter_control_id: '{{ filter_control_id }}'
+                    display_options: null
+                    title: '{{ title }}'
+                    source_filter_id: '{{ source_filter_id }}'
+                  list:
+                    filter_control_id: '{{ filter_control_id }}'
+                    type: null
+                    display_options: null
+                    cascading_control_configuration: null
+                    title: '{{ title }}'
+                    source_filter_id: '{{ source_filter_id }}'
+                    selectable_values: null
+                  date_time_picker:
+                    filter_control_id: '{{ filter_control_id }}'
+                    type: null
+                    display_options: null
+                    title: '{{ title }}'
+                    commit_mode: null
+                    source_filter_id: '{{ source_filter_id }}'
+                  relative_date_time:
+                    filter_control_id: '{{ filter_control_id }}'
+                    display_options: null
+                    title: '{{ title }}'
+                    commit_mode: null
+                    source_filter_id: '{{ source_filter_id }}'
+                  cross_sheet:
+                    filter_control_id: '{{ filter_control_id }}'
+                    cascading_control_configuration: null
+                    source_filter_id: '{{ source_filter_id }}'
+              visuals:
+                - funnel_chart_visual:
+                    subtitle:
+                      visibility: null
+                      format_text:
+                        rich_text: '{{ rich_text }}'
+                        plain_text: '{{ plain_text }}'
+                    visual_id: '{{ visual_id }}'
+                    chart_configuration:
+                      sort_configuration:
+                        category_items_limit:
+                          items_limit: null
+                          other_categories: '{{ other_categories }}'
+                        category_sort:
+                          - field_sort:
+                              field_id: '{{ field_id }}'
+                              direction: null
+                            column_sort: null
+                      data_label_options:
+                        measure_label_visibility: null
+                        position: '{{ position }}'
+                        visibility: null
+                        category_label_visibility: null
+                        label_color: '{{ label_color }}'
+                        measure_data_label_style: '{{ measure_data_label_style }}'
+                        label_font_configuration: null
+                      category_label_options:
+                        visibility: null
+                        sort_icon_visibility: null
+                        axis_label_options:
+                          - custom_label: '{{ custom_label }}'
+                            apply_to:
+                              column: null
+                              field_id: '{{ field_id }}'
+                            font_configuration: null
+                      field_wells:
+                        funnel_chart_aggregated_field_wells:
+                          category:
+                            - date_dimension_field:
+                                hierarchy_id: '{{ hierarchy_id }}'
+                                format_configuration: null
+                                column: null
+                                field_id: '{{ field_id }}'
+                                date_granularity: null
+                              numerical_dimension_field:
+                                hierarchy_id: '{{ hierarchy_id }}'
+                                format_configuration: null
+                                column: null
+                                field_id: '{{ field_id }}'
+                              categorical_dimension_field:
+                                hierarchy_id: '{{ hierarchy_id }}'
+                                format_configuration: null
+                                column: null
+                                field_id: '{{ field_id }}'
+                          values:
+                            - date_measure_field:
+                                aggregation_function: null
+                                format_configuration: null
+                                column: null
+                                field_id: '{{ field_id }}'
+                              numerical_measure_field:
+                                aggregation_function: null
+                                format_configuration: null
+                                column: null
+                                field_id: '{{ field_id }}'
+                              categorical_measure_field:
+                                aggregation_function: null
+                                format_configuration: null
+                                column: null
+                                field_id: '{{ field_id }}'
+                              calculated_measure_field:
+                                expression: '{{ expression }}'
+                                field_id: '{{ field_id }}'
+                      tooltip:
+                        selected_tooltip_type: '{{ selected_tooltip_type }}'
+                        tooltip_visibility: null
+                        field_based_tooltip:
+                          tooltip_fields:
+                            - field_tooltip_item:
+                                tooltip_target: '{{ tooltip_target }}'
+                                field_id: '{{ field_id }}'
+                                label: '{{ label }}'
+                                visibility: null
+                              column_tooltip_item:
+                                aggregation: null
+                                tooltip_target: null
+                                column: null
+                                label: '{{ label }}'
+                                visibility: null
+                          aggregation_visibility: null
+                          tooltip_title_type: '{{ tooltip_title_type }}'
+                      interactions:
+                        context_menu_option:
+                          availability_status: null
+                        visual_menu_option:
+                          availability_status: null
+                      value_label_options: null
+                      visual_palette:
+                        chart_color: '{{ chart_color }}'
+                        color_map:
+                          - element:
+                              data_path_type:
+                                pivot_table_data_path_type: '{{ pivot_table_data_path_type }}'
+                              field_id: '{{ field_id }}'
+                              field_value: '{{ field_value }}'
+                            color: '{{ color }}'
+                            time_granularity: null
+                    actions:
+                      - status: null
+                        trigger: '{{ trigger }}'
+                        custom_action_id: '{{ custom_action_id }}'
+                        name: '{{ name }}'
+                        action_operations:
+                          - navigation_operation: null
+                            set_parameters_operation: null
+                            filter_operation:
+                              selected_fields_configuration:
+                                selected_columns:
                                   - null
-                                SelectedFields:
-                                  - '{{ SelectedFields[0] }}'
-                                SelectedFieldOptions: '{{ SelectedFieldOptions }}'
-                              TargetVisualsConfiguration:
-                                SameSheetTargetVisualConfiguration:
-                                  TargetVisualOptions: '{{ TargetVisualOptions }}'
-                                  TargetVisuals:
-                                    - '{{ TargetVisuals[0] }}'
-                            URLOperation: null
-                    Title:
-                      Visibility: null
-                      FormatText:
-                        RichText: '{{ RichText }}'
-                        PlainText: '{{ PlainText }}'
-                    VisualContentAltText: '{{ VisualContentAltText }}'
-                    ColumnHierarchies:
-                      - DateTimeHierarchy:
-                          HierarchyId: '{{ HierarchyId }}'
-                          DrillDownFilters:
-                            - NumericEqualityFilter:
-                                Column: null
-                                Value: null
-                              TimeRangeFilter:
-                                Column: null
-                                RangeMinimum: '{{ RangeMinimum }}'
-                                TimeGranularity: null
-                                RangeMaximum: '{{ RangeMaximum }}'
-                              CategoryFilter:
-                                Column: null
-                                CategoryValues:
-                                  - '{{ CategoryValues[0] }}'
-                        ExplicitHierarchy:
-                          HierarchyId: '{{ HierarchyId }}'
-                          DrillDownFilters:
-                            - null
-                          Columns:
-                            - null
-                        PredefinedHierarchy:
-                          HierarchyId: '{{ HierarchyId }}'
-                          DrillDownFilters:
-                            - null
-                          Columns:
-                            - null
-                  BoxPlotVisual:
-                    Subtitle: null
-                    VisualId: '{{ VisualId }}'
-                    ChartConfiguration:
-                      SortConfiguration:
-                        CategorySort:
+                                selected_fields:
+                                  - '{{ selected_fields[0] }}'
+                                selected_field_options: '{{ selected_field_options }}'
+                              target_visuals_configuration:
+                                same_sheet_target_visual_configuration:
+                                  target_visual_options: '{{ target_visual_options }}'
+                                  target_visuals:
+                                    - '{{ target_visuals[0] }}'
+                            url_operation: null
+                    title:
+                      visibility: null
+                      format_text:
+                        rich_text: '{{ rich_text }}'
+                        plain_text: '{{ plain_text }}'
+                    visual_content_alt_text: '{{ visual_content_alt_text }}'
+                    column_hierarchies:
+                      - date_time_hierarchy:
+                          hierarchy_id: '{{ hierarchy_id }}'
+                          drill_down_filters:
+                            - numeric_equality_filter:
+                                column: null
+                                value: null
+                              time_range_filter:
+                                column: null
+                                range_minimum: '{{ range_minimum }}'
+                                time_granularity: null
+                                range_maximum: '{{ range_maximum }}'
+                              category_filter:
+                                column: null
+                                category_values:
+                                  - '{{ category_values[0] }}'
+                        explicit_hierarchy:
+                          hierarchy_id: '{{ hierarchy_id }}'
+                          drill_down_filters:
+                            - null
+                          columns:
+                            - null
+                        predefined_hierarchy:
+                          hierarchy_id: '{{ hierarchy_id }}'
+                          drill_down_filters:
+                            - null
+                          columns:
+                            - null
+                  box_plot_visual:
+                    subtitle: null
+                    visual_id: '{{ visual_id }}'
+                    chart_configuration:
+                      sort_configuration:
+                        category_sort:
                           - null
-                        PaginationConfiguration:
-                          PageSize: null
-                          PageNumber: null
-                      Legend:
-                        Position: '{{ Position }}'
-                        ValueFontConfiguration: null
-                        Title: null
-                        Visibility: null
-                        Height: '{{ Height }}'
-                        Width: '{{ Width }}'
-                      ReferenceLines:
-                        - Status: null
-                          DataConfiguration:
-                            DynamicConfiguration:
-                              Column: null
-                              MeasureAggregationFunction: null
-                              Calculation: null
-                            AxisBinding: '{{ AxisBinding }}'
-                            SeriesType: '{{ SeriesType }}'
-                            StaticConfiguration:
-                              Value: null
-                          LabelConfiguration:
-                            HorizontalPosition: '{{ HorizontalPosition }}'
-                            ValueLabelConfiguration:
-                              FormatConfiguration: null
-                              RelativePosition: '{{ RelativePosition }}'
-                            CustomLabelConfiguration:
-                              CustomLabel: '{{ CustomLabel }}'
-                            FontColor: '{{ FontColor }}'
-                            FontConfiguration: null
-                            VerticalPosition: '{{ VerticalPosition }}'
-                          StyleConfiguration:
-                            Pattern: '{{ Pattern }}'
-                            Color: '{{ Color }}'
-                      CategoryAxis:
-                        DataOptions:
-                          DateAxisOptions:
-                            MissingDateVisibility: null
-                          NumericAxisOptions:
-                            Scale:
-                              Logarithmic:
-                                Base: null
-                              Linear:
-                                StepSize: null
-                                StepCount: null
-                            Range:
-                              DataDriven: {}
-                              MinMax:
-                                Minimum: null
-                                Maximum: null
-                        TickLabelOptions:
-                          RotationAngle: null
-                          LabelOptions: null
-                        AxisOffset: '{{ AxisOffset }}'
-                        AxisLineVisibility: null
-                        GridLineVisibility: null
-                        ScrollbarOptions:
-                          VisibleRange:
-                            PercentRange:
-                              From: null
-                              To: null
-                          Visibility: null
-                      PrimaryYAxisLabelOptions: null
-                      CategoryLabelOptions: null
-                      FieldWells:
-                        BoxPlotAggregatedFieldWells:
-                          GroupBy:
-                            - null
-                          Values:
-                            - null
-                      Tooltip: null
-                      BoxPlotOptions:
-                        StyleOptions:
-                          FillStyle: '{{ FillStyle }}'
-                        OutlierVisibility: null
-                        AllDataPointsVisibility: null
-                      Interactions: null
-                      PrimaryYAxisDisplayOptions: null
-                      VisualPalette: null
-                    Actions:
+                        pagination_configuration:
+                          page_size: null
+                          page_number: null
+                      legend:
+                        position: '{{ position }}'
+                        value_font_configuration: null
+                        title: null
+                        visibility: null
+                        height: '{{ height }}'
+                        width: '{{ width }}'
+                      reference_lines:
+                        - status: null
+                          data_configuration:
+                            dynamic_configuration:
+                              column: null
+                              measure_aggregation_function: null
+                              calculation: null
+                            axis_binding: '{{ axis_binding }}'
+                            series_type: '{{ series_type }}'
+                            static_configuration:
+                              value: null
+                          label_configuration:
+                            horizontal_position: '{{ horizontal_position }}'
+                            value_label_configuration:
+                              format_configuration: null
+                              relative_position: '{{ relative_position }}'
+                            custom_label_configuration:
+                              custom_label: '{{ custom_label }}'
+                            font_color: '{{ font_color }}'
+                            font_configuration: null
+                            vertical_position: '{{ vertical_position }}'
+                          style_configuration:
+                            pattern: '{{ pattern }}'
+                            color: '{{ color }}'
+                      category_axis:
+                        data_options:
+                          date_axis_options:
+                            missing_date_visibility: null
+                          numeric_axis_options:
+                            scale:
+                              logarithmic:
+                                base: null
+                              linear:
+                                step_size: null
+                                step_count: null
+                            range:
+                              data_driven: {}
+                              min_max:
+                                minimum: null
+                                maximum: null
+                        tick_label_options:
+                          rotation_angle: null
+                          label_options: null
+                        axis_offset: '{{ axis_offset }}'
+                        axis_line_visibility: null
+                        grid_line_visibility: null
+                        scrollbar_options:
+                          visible_range:
+                            percent_range:
+                              from: null
+                              to: null
+                          visibility: null
+                      primary_yaxis_label_options: null
+                      category_label_options: null
+                      field_wells:
+                        box_plot_aggregated_field_wells:
+                          group_by:
+                            - null
+                          values:
+                            - null
+                      tooltip: null
+                      box_plot_options:
+                        style_options:
+                          fill_style: '{{ fill_style }}'
+                        outlier_visibility: null
+                        all_data_points_visibility: null
+                      interactions: null
+                      primary_yaxis_display_options: null
+                      visual_palette: null
+                    actions:
                       - null
-                    Title: null
-                    VisualContentAltText: '{{ VisualContentAltText }}'
-                    ColumnHierarchies:
+                    title: null
+                    visual_content_alt_text: '{{ visual_content_alt_text }}'
+                    column_hierarchies:
                       - null
-                  GeospatialMapVisual:
-                    Subtitle: null
-                    VisualId: '{{ VisualId }}'
-                    ChartConfiguration:
-                      Legend: null
-                      MapStyleOptions:
-                        BaseMapStyle: '{{ BaseMapStyle }}'
-                      FieldWells:
-                        GeospatialMapAggregatedFieldWells:
-                          Colors:
-                            - null
-                          Values:
-                            - null
-                          Geospatial:
-                            - null
-                      Tooltip: null
-                      WindowOptions:
-                        Bounds:
-                          West: null
-                          South: null
-                          North: null
-                          East: null
-                        MapZoomMode: '{{ MapZoomMode }}'
-                      PointStyleOptions:
-                        SelectedPointStyle: '{{ SelectedPointStyle }}'
-                        ClusterMarkerConfiguration:
-                          ClusterMarker:
-                            SimpleClusterMarker:
-                              Color: '{{ Color }}'
-                        HeatmapConfiguration:
-                          HeatmapColor:
-                            Colors:
-                              - Color: '{{ Color }}'
-                      VisualPalette: null
-                    Actions:
+                  geospatial_map_visual:
+                    subtitle: null
+                    visual_id: '{{ visual_id }}'
+                    chart_configuration:
+                      legend: null
+                      map_style_options:
+                        base_map_style: '{{ base_map_style }}'
+                      field_wells:
+                        geospatial_map_aggregated_field_wells:
+                          colors:
+                            - null
+                          values:
+                            - null
+                          geospatial:
+                            - null
+                      tooltip: null
+                      window_options:
+                        bounds:
+                          west: null
+                          south: null
+                          north: null
+                          east: null
+                        map_zoom_mode: '{{ map_zoom_mode }}'
+                      point_style_options:
+                        selected_point_style: '{{ selected_point_style }}'
+                        cluster_marker_configuration:
+                          cluster_marker:
+                            simple_cluster_marker:
+                              color: '{{ color }}'
+                        heatmap_configuration:
+                          heatmap_color:
+                            colors:
+                              - color: '{{ color }}'
+                      visual_palette: null
+                    actions:
                       - null
-                    Title: null
-                    VisualContentAltText: '{{ VisualContentAltText }}'
-                    ColumnHierarchies:
+                    title: null
+                    visual_content_alt_text: '{{ visual_content_alt_text }}'
+                    column_hierarchies:
                       - null
-                  ScatterPlotVisual:
-                    Subtitle: null
-                    VisualId: '{{ VisualId }}'
-                    ChartConfiguration:
-                      YAxisLabelOptions: null
-                      SortConfiguration:
-                        ScatterPlotLimitConfiguration: null
-                      Legend: null
-                      YAxisDisplayOptions: null
-                      DataLabels:
-                        DataLabelTypes:
-                          - MaximumLabelType:
-                              Visibility: null
-                            DataPathLabelType:
-                              FieldId: '{{ FieldId }}'
-                              Visibility: null
-                              FieldValue: '{{ FieldValue }}'
-                            RangeEndsLabelType:
-                              Visibility: null
-                            FieldLabelType:
-                              FieldId: '{{ FieldId }}'
-                              Visibility: null
-                            MinimumLabelType:
-                              Visibility: null
-                        MeasureLabelVisibility: null
-                        Position: null
-                        LabelContent: '{{ LabelContent }}'
-                        Visibility: null
-                        TotalsVisibility: null
-                        Overlap: '{{ Overlap }}'
-                        CategoryLabelVisibility: null
-                        LabelColor: '{{ LabelColor }}'
-                        LabelFontConfiguration: null
-                      FieldWells:
-                        ScatterPlotUnaggregatedFieldWells:
-                          Category:
-                            - null
-                          Size:
-                            - null
-                          Label:
-                            - null
-                          XAxis:
-                            - null
-                          YAxis:
-                            - null
-                        ScatterPlotCategoricallyAggregatedFieldWells:
-                          Category:
-                            - null
-                          Size:
-                            - null
-                          Label:
-                            - null
-                          XAxis:
-                            - null
-                          YAxis:
-                            - null
-                      Tooltip: null
-                      XAxisLabelOptions: null
-                      Interactions: null
-                      VisualPalette: null
-                      XAxisDisplayOptions: null
-                    Actions:
+                  scatter_plot_visual:
+                    subtitle: null
+                    visual_id: '{{ visual_id }}'
+                    chart_configuration:
+                      y_axis_label_options: null
+                      sort_configuration:
+                        scatter_plot_limit_configuration: null
+                      legend: null
+                      y_axis_display_options: null
+                      data_labels:
+                        data_label_types:
+                          - maximum_label_type:
+                              visibility: null
+                            data_path_label_type:
+                              field_id: '{{ field_id }}'
+                              visibility: null
+                              field_value: '{{ field_value }}'
+                            range_ends_label_type:
+                              visibility: null
+                            field_label_type:
+                              field_id: '{{ field_id }}'
+                              visibility: null
+                            minimum_label_type:
+                              visibility: null
+                        measure_label_visibility: null
+                        position: null
+                        label_content: '{{ label_content }}'
+                        visibility: null
+                        totals_visibility: null
+                        overlap: '{{ overlap }}'
+                        category_label_visibility: null
+                        label_color: '{{ label_color }}'
+                        label_font_configuration: null
+                      field_wells:
+                        scatter_plot_unaggregated_field_wells:
+                          category:
+                            - null
+                          size:
+                            - null
+                          label:
+                            - null
+                          x_axis:
+                            - null
+                          y_axis:
+                            - null
+                        scatter_plot_categorically_aggregated_field_wells:
+                          category:
+                            - null
+                          size:
+                            - null
+                          label:
+                            - null
+                          x_axis:
+                            - null
+                          y_axis:
+                            - null
+                      tooltip: null
+                      x_axis_label_options: null
+                      interactions: null
+                      visual_palette: null
+                      x_axis_display_options: null
+                    actions:
                       - null
-                    Title: null
-                    VisualContentAltText: '{{ VisualContentAltText }}'
-                    ColumnHierarchies:
+                    title: null
+                    visual_content_alt_text: '{{ visual_content_alt_text }}'
+                    column_hierarchies:
                       - null
-                  RadarChartVisual:
-                    Subtitle: null
-                    VisualId: '{{ VisualId }}'
-                    ChartConfiguration:
-                      SortConfiguration:
-                        ColorSort:
+                  radar_chart_visual:
+                    subtitle: null
+                    visual_id: '{{ visual_id }}'
+                    chart_configuration:
+                      sort_configuration:
+                        color_sort:
                           - null
-                        ColorItemsLimit: null
-                        CategoryItemsLimit: null
-                        CategorySort:
+                        color_items_limit: null
+                        category_items_limit: null
+                        category_sort:
                           - null
-                      Legend: null
-                      Shape: '{{ Shape }}'
-                      BaseSeriesSettings:
-                        AreaStyleSettings:
-                          Visibility: null
-                      ColorLabelOptions: null
-                      CategoryLabelOptions: null
-                      AxesRangeScale: '{{ AxesRangeScale }}'
-                      VisualPalette: null
-                      AlternateBandColorsVisibility: null
-                      StartAngle: null
-                      CategoryAxis: null
-                      FieldWells:
-                        RadarChartAggregatedFieldWells:
-                          Category:
-                            - null
-                          Color:
-                            - null
-                          Values:
-                            - null
-                      ColorAxis: null
-                      AlternateBandOddColor: '{{ AlternateBandOddColor }}'
-                      Interactions: null
-                      AlternateBandEvenColor: '{{ AlternateBandEvenColor }}'
-                    Actions:
+                      legend: null
+                      shape: '{{ shape }}'
+                      base_series_settings:
+                        area_style_settings:
+                          visibility: null
+                      color_label_options: null
+                      category_label_options: null
+                      axes_range_scale: '{{ axes_range_scale }}'
+                      visual_palette: null
+                      alternate_band_colors_visibility: null
+                      start_angle: null
+                      category_axis: null
+                      field_wells:
+                        radar_chart_aggregated_field_wells:
+                          category:
+                            - null
+                          color:
+                            - null
+                          values:
+                            - null
+                      color_axis: null
+                      alternate_band_odd_color: '{{ alternate_band_odd_color }}'
+                      interactions: null
+                      alternate_band_even_color: '{{ alternate_band_even_color }}'
+                    actions:
                       - null
-                    Title: null
-                    VisualContentAltText: '{{ VisualContentAltText }}'
-                    ColumnHierarchies:
+                    title: null
+                    visual_content_alt_text: '{{ visual_content_alt_text }}'
+                    column_hierarchies:
                       - null
-                  ComboChartVisual:
-                    Subtitle: null
-                    VisualId: '{{ VisualId }}'
-                    ChartConfiguration:
-                      SortConfiguration:
-                        ColorSort:
+                  combo_chart_visual:
+                    subtitle: null
+                    visual_id: '{{ visual_id }}'
+                    chart_configuration:
+                      sort_configuration:
+                        color_sort:
                           - null
-                        ColorItemsLimit: null
-                        CategoryItemsLimit: null
-                        CategorySort:
+                        color_items_limit: null
+                        category_items_limit: null
+                        category_sort:
                           - null
-                      Legend: null
-                      ReferenceLines:
+                      legend: null
+                      reference_lines:
                         - null
-                      ColorLabelOptions: null
-                      BarDataLabels: null
-                      CategoryLabelOptions: null
-                      Tooltip: null
-                      SingleAxisOptions:
-                        YAxisOptions:
-                          YAxis: '{{ YAxis }}'
-                      PrimaryYAxisDisplayOptions: null
-                      VisualPalette: null
-                      BarsArrangement: '{{ BarsArrangement }}'
-                      SecondaryYAxisLabelOptions: null
-                      LineDataLabels: null
-                      CategoryAxis: null
-                      PrimaryYAxisLabelOptions: null
-                      FieldWells:
-                        ComboChartAggregatedFieldWells:
-                          BarValues:
-                            - null
-                          Category:
-                            - null
-                          Colors:
-                            - null
-                          LineValues:
-                            - null
-                      SecondaryYAxisDisplayOptions: null
-                      Interactions: null
-                    Actions:
+                      color_label_options: null
+                      bar_data_labels: null
+                      category_label_options: null
+                      tooltip: null
+                      single_axis_options:
+                        y_axis_options:
+                          y_axis: '{{ y_axis }}'
+                      primary_yaxis_display_options: null
+                      visual_palette: null
+                      bars_arrangement: '{{ bars_arrangement }}'
+                      secondary_yaxis_label_options: null
+                      line_data_labels: null
+                      category_axis: null
+                      primary_yaxis_label_options: null
+                      field_wells:
+                        combo_chart_aggregated_field_wells:
+                          bar_values:
+                            - null
+                          category:
+                            - null
+                          colors:
+                            - null
+                          line_values:
+                            - null
+                      secondary_yaxis_display_options: null
+                      interactions: null
+                    actions:
                       - null
-                    Title: null
-                    VisualContentAltText: '{{ VisualContentAltText }}'
-                    ColumnHierarchies:
+                    title: null
+                    visual_content_alt_text: '{{ visual_content_alt_text }}'
+                    column_hierarchies:
                       - null
-                  WordCloudVisual:
-                    Subtitle: null
-                    VisualId: '{{ VisualId }}'
-                    ChartConfiguration:
-                      SortConfiguration:
-                        CategoryItemsLimit: null
-                        CategorySort:
+                  word_cloud_visual:
+                    subtitle: null
+                    visual_id: '{{ visual_id }}'
+                    chart_configuration:
+                      sort_configuration:
+                        category_items_limit: null
+                        category_sort:
                           - null
-                      CategoryLabelOptions: null
-                      FieldWells:
-                        WordCloudAggregatedFieldWells:
-                          GroupBy:
-                            - null
-                          Size:
-                            - null
-                      WordCloudOptions:
-                        WordOrientation: '{{ WordOrientation }}'
-                        WordScaling: '{{ WordScaling }}'
-                        CloudLayout: '{{ CloudLayout }}'
-                        MaximumStringLength: null
-                        WordCasing: '{{ WordCasing }}'
-                        WordPadding: '{{ WordPadding }}'
-                      Interactions: null
-                    Actions:
+                      category_label_options: null
+                      field_wells:
+                        word_cloud_aggregated_field_wells:
+                          group_by:
+                            - null
+                          size:
+                            - null
+                      word_cloud_options:
+                        word_orientation: '{{ word_orientation }}'
+                        word_scaling: '{{ word_scaling }}'
+                        cloud_layout: '{{ cloud_layout }}'
+                        maximum_string_length: null
+                        word_casing: '{{ word_casing }}'
+                        word_padding: '{{ word_padding }}'
+                      interactions: null
+                    actions:
                       - null
-                    Title: null
-                    VisualContentAltText: '{{ VisualContentAltText }}'
-                    ColumnHierarchies:
+                    title: null
+                    visual_content_alt_text: '{{ visual_content_alt_text }}'
+                    column_hierarchies:
                       - null
-                  SankeyDiagramVisual:
-                    Subtitle: null
-                    VisualId: '{{ VisualId }}'
-                    ChartConfiguration:
-                      SortConfiguration:
-                        WeightSort:
+                  sankey_diagram_visual:
+                    subtitle: null
+                    visual_id: '{{ visual_id }}'
+                    chart_configuration:
+                      sort_configuration:
+                        weight_sort:
                           - null
-                        SourceItemsLimit: null
-                        DestinationItemsLimit: null
-                      DataLabels: null
-                      FieldWells:
-                        SankeyDiagramAggregatedFieldWells:
-                          Destination:
+                        source_items_limit: null
+                        destination_items_limit: null
+                      data_labels: null
+                      field_wells:
+                        sankey_diagram_aggregated_field_wells:
+                          destination:
                             - null
-                          Source:
+                          source:
                             - null
-                          Weight:
+                          weight:
                             - null
-                      Interactions: null
-                    Actions:
+                      interactions: null
+                    actions:
                       - null
-                    Title: null
-                    VisualContentAltText: '{{ VisualContentAltText }}'
-                  GaugeChartVisual:
-                    Subtitle: null
-                    ConditionalFormatting:
-                      ConditionalFormattingOptions:
-                        - Arc:
-                            ForegroundColor:
-                              Gradient:
-                                Expression: '{{ Expression }}'
-                                Color:
-                                  Stops:
-                                    - GradientOffset: null
-                                      DataValue: null
-                                      Color: '{{ Color }}'
-                              Solid:
-                                Expression: '{{ Expression }}'
-                                Color: '{{ Color }}'
-                          PrimaryValue:
-                            TextColor: null
-                            Icon:
-                              CustomCondition:
-                                Expression: '{{ Expression }}'
-                                Color: '{{ Color }}'
-                                DisplayConfiguration:
-                                  IconDisplayOption: '{{ IconDisplayOption }}'
-                                IconOptions:
-                                  UnicodeIcon: '{{ UnicodeIcon }}'
-                                  Icon: '{{ Icon }}'
-                              IconSet:
-                                Expression: '{{ Expression }}'
-                                IconSetType: '{{ IconSetType }}'
-                    VisualId: '{{ VisualId }}'
-                    ChartConfiguration:
-                      DataLabels: null
-                      FieldWells:
-                        TargetValues:
+                    title: null
+                    visual_content_alt_text: '{{ visual_content_alt_text }}'
+                  gauge_chart_visual:
+                    subtitle: null
+                    conditional_formatting:
+                      conditional_formatting_options:
+                        - arc:
+                            foreground_color:
+                              gradient:
+                                expression: '{{ expression }}'
+                                color:
+                                  stops:
+                                    - gradient_offset: null
+                                      data_value: null
+                                      color: '{{ color }}'
+                              solid:
+                                expression: '{{ expression }}'
+                                color: '{{ color }}'
+                          primary_value:
+                            text_color: null
+                            icon:
+                              custom_condition:
+                                expression: '{{ expression }}'
+                                color: '{{ color }}'
+                                display_configuration:
+                                  icon_display_option: '{{ icon_display_option }}'
+                                icon_options:
+                                  unicode_icon: '{{ unicode_icon }}'
+                                  icon: '{{ icon }}'
+                              icon_set:
+                                expression: '{{ expression }}'
+                                icon_set_type: '{{ icon_set_type }}'
+                    visual_id: '{{ visual_id }}'
+                    chart_configuration:
+                      data_labels: null
+                      field_wells:
+                        target_values:
                           - null
-                        Values:
+                        values:
                           - null
-                      TooltipOptions: null
-                      GaugeChartOptions:
-                        Arc:
-                          ArcAngle: null
-                          ArcThickness: '{{ ArcThickness }}'
-                        Comparison:
-                          ComparisonMethod: '{{ ComparisonMethod }}'
-                          ComparisonFormat:
-                            NumberDisplayFormatConfiguration: null
-                            PercentageDisplayFormatConfiguration: null
-                        PrimaryValueDisplayType: '{{ PrimaryValueDisplayType }}'
-                        ArcAxis:
-                          Range:
-                            Min: null
-                            Max: null
-                          ReserveRange: null
-                        PrimaryValueFontConfiguration: null
-                      ColorConfiguration:
-                        ForegroundColor: '{{ ForegroundColor }}'
-                        BackgroundColor: '{{ BackgroundColor }}'
-                      Interactions: null
-                      VisualPalette: null
-                    Actions:
+                      tooltip_options: null
+                      gauge_chart_options:
+                        arc:
+                          arc_angle: null
+                          arc_thickness: '{{ arc_thickness }}'
+                        comparison:
+                          comparison_method: '{{ comparison_method }}'
+                          comparison_format:
+                            number_display_format_configuration: null
+                            percentage_display_format_configuration: null
+                        primary_value_display_type: '{{ primary_value_display_type }}'
+                        arc_axis:
+                          range:
+                            min: null
+                            max: null
+                          reserve_range: null
+                        primary_value_font_configuration: null
+                      color_configuration:
+                        foreground_color: '{{ foreground_color }}'
+                        background_color: '{{ background_color }}'
+                      interactions: null
+                      visual_palette: null
+                    actions:
                       - null
-                    Title: null
-                    VisualContentAltText: '{{ VisualContentAltText }}'
-                  FilledMapVisual:
-                    Subtitle: null
-                    ConditionalFormatting:
-                      ConditionalFormattingOptions:
-                        - Shape:
-                            Format:
-                              BackgroundColor: null
-                            FieldId: '{{ FieldId }}'
-                    VisualId: '{{ VisualId }}'
-                    ChartConfiguration:
-                      SortConfiguration:
-                        CategorySort:
+                    title: null
+                    visual_content_alt_text: '{{ visual_content_alt_text }}'
+                  filled_map_visual:
+                    subtitle: null
+                    conditional_formatting:
+                      conditional_formatting_options:
+                        - shape:
+                            format:
+                              background_color: null
+                            field_id: '{{ field_id }}'
+                    visual_id: '{{ visual_id }}'
+                    chart_configuration:
+                      sort_configuration:
+                        category_sort:
                           - null
-                      Legend: null
-                      MapStyleOptions: null
-                      FieldWells:
-                        FilledMapAggregatedFieldWells:
-                          Values:
-                            - null
-                          Geospatial:
-                            - null
-                      Tooltip: null
-                      Interactions: null
-                      WindowOptions: null
-                    Actions:
+                      legend: null
+                      map_style_options: null
+                      field_wells:
+                        filled_map_aggregated_field_wells:
+                          values:
+                            - null
+                          geospatial:
+                            - null
+                      tooltip: null
+                      interactions: null
+                      window_options: null
+                    actions:
                       - null
-                    Title: null
-                    VisualContentAltText: '{{ VisualContentAltText }}'
-                    ColumnHierarchies:
+                    title: null
+                    visual_content_alt_text: '{{ visual_content_alt_text }}'
+                    column_hierarchies:
                       - null
-                  WaterfallVisual:
-                    Subtitle: null
-                    VisualId: '{{ VisualId }}'
-                    ChartConfiguration:
-                      CategoryAxisLabelOptions: null
-                      SortConfiguration:
-                        BreakdownItemsLimit: null
-                        CategorySort:
+                  waterfall_visual:
+                    subtitle: null
+                    visual_id: '{{ visual_id }}'
+                    chart_configuration:
+                      category_axis_label_options: null
+                      sort_configuration:
+                        breakdown_items_limit: null
+                        category_sort:
                           - null
-                      Legend: null
-                      DataLabels: null
-                      PrimaryYAxisLabelOptions: null
-                      FieldWells:
-                        WaterfallChartAggregatedFieldWells:
-                          Categories:
-                            - null
-                          Breakdowns:
-                            - null
-                          Values:
-                            - null
-                      WaterfallChartOptions:
-                        TotalBarLabel: '{{ TotalBarLabel }}'
-                      ColorConfiguration:
-                        GroupColorConfiguration:
-                          NegativeBarColor: '{{ NegativeBarColor }}'
-                          TotalBarColor: '{{ TotalBarColor }}'
-                          PositiveBarColor: '{{ PositiveBarColor }}'
-                      Interactions: null
-                      CategoryAxisDisplayOptions: null
-                      PrimaryYAxisDisplayOptions: null
-                      VisualPalette: null
-                    Actions:
+                      legend: null
+                      data_labels: null
+                      primary_yaxis_label_options: null
+                      field_wells:
+                        waterfall_chart_aggregated_field_wells:
+                          categories:
+                            - null
+                          breakdowns:
+                            - null
+                          values:
+                            - null
+                      waterfall_chart_options:
+                        total_bar_label: '{{ total_bar_label }}'
+                      color_configuration:
+                        group_color_configuration:
+                          negative_bar_color: '{{ negative_bar_color }}'
+                          total_bar_color: '{{ total_bar_color }}'
+                          positive_bar_color: '{{ positive_bar_color }}'
+                      interactions: null
+                      category_axis_display_options: null
+                      primary_yaxis_display_options: null
+                      visual_palette: null
+                    actions:
                       - null
-                    Title: null
-                    VisualContentAltText: '{{ VisualContentAltText }}'
-                    ColumnHierarchies:
+                    title: null
+                    visual_content_alt_text: '{{ visual_content_alt_text }}'
+                    column_hierarchies:
                       - null
-                  CustomContentVisual:
-                    Subtitle: null
-                    VisualId: '{{ VisualId }}'
-                    ChartConfiguration:
-                      ContentUrl: '{{ ContentUrl }}'
-                      ContentType: '{{ ContentType }}'
-                      ImageScaling: '{{ ImageScaling }}'
-                      Interactions: null
-                    Actions:
+                  custom_content_visual:
+                    subtitle: null
+                    visual_id: '{{ visual_id }}'
+                    chart_configuration:
+                      content_url: '{{ content_url }}'
+                      content_type: '{{ content_type }}'
+                      image_scaling: '{{ image_scaling }}'
+                      interactions: null
+                    actions:
                       - null
-                    DataSetIdentifier: '{{ DataSetIdentifier }}'
-                    Title: null
-                    VisualContentAltText: '{{ VisualContentAltText }}'
-                  PieChartVisual:
-                    Subtitle: null
-                    VisualId: '{{ VisualId }}'
-                    ChartConfiguration:
-                      SortConfiguration:
-                        SmallMultiplesSort:
+                    data_set_identifier: '{{ data_set_identifier }}'
+                    title: null
+                    visual_content_alt_text: '{{ visual_content_alt_text }}'
+                  pie_chart_visual:
+                    subtitle: null
+                    visual_id: '{{ visual_id }}'
+                    chart_configuration:
+                      sort_configuration:
+                        small_multiples_sort:
                           - null
-                        CategoryItemsLimit: null
-                        CategorySort:
+                        category_items_limit: null
+                        category_sort:
                           - null
-                        SmallMultiplesLimitConfiguration: null
-                      Legend: null
-                      DataLabels: null
-                      ContributionAnalysisDefaults:
-                        - MeasureFieldId: '{{ MeasureFieldId }}'
-                          ContributorDimensions:
-                            - null
-                      CategoryLabelOptions: null
-                      FieldWells:
-                        PieChartAggregatedFieldWells:
-                          Category:
-                            - null
-                          Values:
-                            - null
-                          SmallMultiples:
-                            - null
-                      Tooltip: null
-                      DonutOptions:
-                        DonutCenterOptions:
-                          LabelVisibility: null
-                        ArcOptions:
-                          ArcThickness: '{{ ArcThickness }}'
-                      SmallMultiplesOptions:
-                        MaxVisibleRows: null
-                        PanelConfiguration:
-                          BorderThickness: '{{ BorderThickness }}'
-                          BorderStyle: '{{ BorderStyle }}'
-                          GutterSpacing: '{{ GutterSpacing }}'
-                          BackgroundVisibility: null
-                          BorderVisibility: null
-                          BorderColor: '{{ BorderColor }}'
-                          Title:
-                            Visibility: null
-                            FontConfiguration: null
-                            HorizontalTextAlignment: '{{ HorizontalTextAlignment }}'
-                          GutterVisibility: null
-                          BackgroundColor: '{{ BackgroundColor }}'
-                        MaxVisibleColumns: null
-                        XAxis:
-                          Placement: '{{ Placement }}'
-                          Scale: '{{ Scale }}'
-                        YAxis: null
-                      Interactions: null
-                      ValueLabelOptions: null
-                      VisualPalette: null
-                    Actions:
+                        small_multiples_limit_configuration: null
+                      legend: null
+                      data_labels: null
+                      contribution_analysis_defaults:
+                        - measure_field_id: '{{ measure_field_id }}'
+                          contributor_dimensions:
+                            - null
+                      category_label_options: null
+                      field_wells:
+                        pie_chart_aggregated_field_wells:
+                          category:
+                            - null
+                          values:
+                            - null
+                          small_multiples:
+                            - null
+                      tooltip: null
+                      donut_options:
+                        donut_center_options:
+                          label_visibility: null
+                        arc_options:
+                          arc_thickness: '{{ arc_thickness }}'
+                      small_multiples_options:
+                        max_visible_rows: null
+                        panel_configuration:
+                          border_thickness: '{{ border_thickness }}'
+                          border_style: '{{ border_style }}'
+                          gutter_spacing: '{{ gutter_spacing }}'
+                          background_visibility: null
+                          border_visibility: null
+                          border_color: '{{ border_color }}'
+                          title:
+                            visibility: null
+                            font_configuration: null
+                            horizontal_text_alignment: '{{ horizontal_text_alignment }}'
+                          gutter_visibility: null
+                          background_color: '{{ background_color }}'
+                        max_visible_columns: null
+                        x_axis:
+                          placement: '{{ placement }}'
+                          scale: '{{ scale }}'
+                        y_axis: null
+                      interactions: null
+                      value_label_options: null
+                      visual_palette: null
+                    actions:
                       - null
-                    Title: null
-                    VisualContentAltText: '{{ VisualContentAltText }}'
-                    ColumnHierarchies:
+                    title: null
+                    visual_content_alt_text: '{{ visual_content_alt_text }}'
+                    column_hierarchies:
                       - null
-                  KPIVisual:
-                    Subtitle: null
-                    ConditionalFormatting:
-                      ConditionalFormattingOptions:
-                        - PrimaryValue:
-                            TextColor: null
-                            Icon: null
-                          ActualValue:
-                            TextColor: null
-                            Icon: null
-                          ComparisonValue:
-                            TextColor: null
-                            Icon: null
-                          ProgressBar:
-                            ForegroundColor: null
-                    VisualId: '{{ VisualId }}'
-                    ChartConfiguration:
-                      SortConfiguration:
-                        TrendGroupSort:
+                  k_pi_visual:
+                    subtitle: null
+                    conditional_formatting:
+                      conditional_formatting_options:
+                        - primary_value:
+                            text_color: null
+                            icon: null
+                          actual_value:
+                            text_color: null
+                            icon: null
+                          comparison_value:
+                            text_color: null
+                            icon: null
+                          progress_bar:
+                            foreground_color: null
+                    visual_id: '{{ visual_id }}'
+                    chart_configuration:
+                      sort_configuration:
+                        trend_group_sort:
                           - null
-                      KPIOptions:
-                        SecondaryValueFontConfiguration: null
-                        VisualLayoutOptions:
-                          StandardLayout:
-                            Type: '{{ Type }}'
-                        TrendArrows:
-                          Visibility: null
-                        SecondaryValue:
-                          Visibility: null
-                        Comparison: null
-                        PrimaryValueDisplayType: null
-                        ProgressBar:
-                          Visibility: null
-                        PrimaryValueFontConfiguration: null
-                        Sparkline:
-                          Type: '{{ Type }}'
-                          Color: '{{ Color }}'
-                          TooltipVisibility: null
-                          Visibility: null
-                      FieldWells:
-                        TargetValues:
+                      k_pi_options:
+                        secondary_value_font_configuration: null
+                        visual_layout_options:
+                          standard_layout:
+                            type: '{{ type }}'
+                        trend_arrows:
+                          visibility: null
+                        secondary_value:
+                          visibility: null
+                        comparison: null
+                        primary_value_display_type: null
+                        progress_bar:
+                          visibility: null
+                        primary_value_font_configuration: null
+                        sparkline:
+                          type: '{{ type }}'
+                          color: '{{ color }}'
+                          tooltip_visibility: null
+                          visibility: null
+                      field_wells:
+                        target_values:
                           - null
-                        TrendGroups:
+                        trend_groups:
                           - null
-                        Values:
+                        values:
                           - null
-                      Interactions: null
-                    Actions:
+                      interactions: null
+                    actions:
                       - null
-                    Title: null
-                    VisualContentAltText: '{{ VisualContentAltText }}'
-                    ColumnHierarchies:
+                    title: null
+                    visual_content_alt_text: '{{ visual_content_alt_text }}'
+                    column_hierarchies:
                       - null
-                  HistogramVisual:
-                    Subtitle: null
-                    VisualId: '{{ VisualId }}'
-                    ChartConfiguration:
-                      YAxisDisplayOptions: null
-                      DataLabels: null
-                      BinOptions:
-                        BinWidth:
-                          BinCountLimit: null
-                          Value: null
-                        StartValue: null
-                        SelectedBinType: '{{ SelectedBinType }}'
-                        BinCount:
-                          Value: null
-                      FieldWells:
-                        HistogramAggregatedFieldWells:
-                          Values:
-                            - null
-                      Tooltip: null
-                      XAxisLabelOptions: null
-                      Interactions: null
-                      VisualPalette: null
-                      XAxisDisplayOptions: null
-                    Actions:
+                  histogram_visual:
+                    subtitle: null
+                    visual_id: '{{ visual_id }}'
+                    chart_configuration:
+                      y_axis_display_options: null
+                      data_labels: null
+                      bin_options:
+                        bin_width:
+                          bin_count_limit: null
+                          value: null
+                        start_value: null
+                        selected_bin_type: '{{ selected_bin_type }}'
+                        bin_count:
+                          value: null
+                      field_wells:
+                        histogram_aggregated_field_wells:
+                          values:
+                            - null
+                      tooltip: null
+                      x_axis_label_options: null
+                      interactions: null
+                      visual_palette: null
+                      x_axis_display_options: null
+                    actions:
                       - null
-                    Title: null
-                    VisualContentAltText: '{{ VisualContentAltText }}'
-                  PluginVisual:
-                    Subtitle: null
-                    PluginArn: '{{ PluginArn }}'
-                    VisualId: '{{ VisualId }}'
-                    ChartConfiguration:
-                      SortConfiguration:
-                        PluginVisualTableQuerySort:
-                          ItemsLimitConfiguration:
-                            ItemsLimit: null
-                          RowSort:
-                            - null
-                      VisualOptions:
-                        VisualProperties:
-                          - Value: '{{ Value }}'
-                            Name: '{{ Name }}'
-                      FieldWells:
-                        - Unaggregated:
-                            - FormatConfiguration: null
-                              Column: null
-                              FieldId: '{{ FieldId }}'
-                          AxisName: '{{ AxisName }}'
-                          Measures:
-                            - null
-                          Dimensions:
-                            - null
-                    Title: null
-                    VisualContentAltText: '{{ VisualContentAltText }}'
-                  TableVisual:
-                    Subtitle: null
-                    ConditionalFormatting:
-                      ConditionalFormattingOptions:
-                        - Row:
-                            TextColor: null
-                            BackgroundColor: null
-                          Cell:
-                            FieldId: '{{ FieldId }}'
-                            TextFormat:
-                              TextColor: null
-                              Icon: null
-                              BackgroundColor: null
-                    VisualId: '{{ VisualId }}'
-                    ChartConfiguration:
-                      SortConfiguration:
-                        RowSort:
+                    title: null
+                    visual_content_alt_text: '{{ visual_content_alt_text }}'
+                  plugin_visual:
+                    subtitle: null
+                    plugin_arn: '{{ plugin_arn }}'
+                    visual_id: '{{ visual_id }}'
+                    chart_configuration:
+                      sort_configuration:
+                        plugin_visual_table_query_sort:
+                          items_limit_configuration:
+                            items_limit: null
+                          row_sort:
+                            - null
+                      visual_options:
+                        visual_properties:
+                          - value: '{{ value }}'
+                            name: '{{ name }}'
+                      field_wells:
+                        - unaggregated:
+                            - format_configuration: null
+                              column: null
+                              field_id: '{{ field_id }}'
+                          axis_name: '{{ axis_name }}'
+                          measures:
+                            - null
+                          dimensions:
+                            - null
+                    title: null
+                    visual_content_alt_text: '{{ visual_content_alt_text }}'
+                  table_visual:
+                    subtitle: null
+                    conditional_formatting:
+                      conditional_formatting_options:
+                        - row:
+                            text_color: null
+                            background_color: null
+                          cell:
+                            field_id: '{{ field_id }}'
+                            text_format:
+                              text_color: null
+                              icon: null
+                              background_color: null
+                    visual_id: '{{ visual_id }}'
+                    chart_configuration:
+                      sort_configuration:
+                        row_sort:
                           - null
-                        PaginationConfiguration: null
-                      PaginatedReportOptions:
-                        OverflowColumnHeaderVisibility: null
-                        VerticalOverflowVisibility: null
-                      TableOptions:
-                        HeaderStyle:
-                          VerticalTextAlignment: '{{ VerticalTextAlignment }}'
-                          Visibility: null
-                          Height: null
-                          FontConfiguration: null
-                          Border:
-                            UniformBorder:
-                              Thickness: null
-                              Color: '{{ Color }}'
-                              Style: '{{ Style }}'
-                            SideSpecificBorder:
-                              Left: null
-                              Top: null
-                              InnerHorizontal: null
-                              Right: null
-                              Bottom: null
-                              InnerVertical: null
-                          TextWrap: '{{ TextWrap }}'
-                          HorizontalTextAlignment: null
-                          BackgroundColor: '{{ BackgroundColor }}'
-                        CellStyle: null
-                        Orientation: '{{ Orientation }}'
-                        RowAlternateColorOptions:
-                          Status: null
-                          UsePrimaryBackgroundColor: null
-                          RowAlternateColors:
-                            - '{{ RowAlternateColors[0] }}'
-                      TableInlineVisualizations:
-                        - DataBars:
-                            PositiveColor: '{{ PositiveColor }}'
-                            FieldId: '{{ FieldId }}'
-                            NegativeColor: '{{ NegativeColor }}'
-                      FieldWells:
-                        TableUnaggregatedFieldWells:
-                          Values:
-                            - null
-                        TableAggregatedFieldWells:
-                          GroupBy:
-                            - null
-                          Values:
-                            - null
-                      FieldOptions:
-                        Order:
-                          - '{{ Order[0] }}'
-                        PinnedFieldOptions:
-                          PinnedLeftFields:
-                            - '{{ PinnedLeftFields[0] }}'
-                        TransposedTableOptions:
-                          - ColumnWidth: '{{ ColumnWidth }}'
-                            ColumnIndex: null
-                            ColumnType: '{{ ColumnType }}'
-                        SelectedFieldOptions:
-                          - CustomLabel: '{{ CustomLabel }}'
-                            URLStyling:
-                              LinkConfiguration:
-                                Target: null
-                                Content:
-                                  CustomIconContent:
-                                    Icon: '{{ Icon }}'
-                                  CustomTextContent:
-                                    Value: '{{ Value }}'
-                                    FontConfiguration: null
-                              ImageConfiguration:
-                                SizingOptions:
-                                  TableCellImageScalingConfiguration: '{{ TableCellImageScalingConfiguration }}'
-                            FieldId: '{{ FieldId }}'
-                            Visibility: null
-                            Width: '{{ Width }}'
-                      Interactions: null
-                      TotalOptions:
-                        TotalAggregationOptions:
-                          - TotalAggregationFunction:
-                              SimpleTotalAggregationFunction: '{{ SimpleTotalAggregationFunction }}'
-                            FieldId: '{{ FieldId }}'
-                        CustomLabel: '{{ CustomLabel }}'
-                        ScrollStatus: '{{ ScrollStatus }}'
-                        Placement: '{{ Placement }}'
-                        TotalCellStyle: null
-                        TotalsVisibility: null
-                    Actions:
+                        pagination_configuration: null
+                      paginated_report_options:
+                        overflow_column_header_visibility: null
+                        vertical_overflow_visibility: null
+                      table_options:
+                        header_style:
+                          vertical_text_alignment: '{{ vertical_text_alignment }}'
+                          visibility: null
+                          height: null
+                          font_configuration: null
+                          border:
+                            uniform_border:
+                              thickness: null
+                              color: '{{ color }}'
+                              style: '{{ style }}'
+                            side_specific_border:
+                              left: null
+                              top: null
+                              inner_horizontal: null
+                              right: null
+                              bottom: null
+                              inner_vertical: null
+                          text_wrap: '{{ text_wrap }}'
+                          horizontal_text_alignment: null
+                          background_color: '{{ background_color }}'
+                        cell_style: null
+                        orientation: '{{ orientation }}'
+                        row_alternate_color_options:
+                          status: null
+                          use_primary_background_color: null
+                          row_alternate_colors:
+                            - '{{ row_alternate_colors[0] }}'
+                      table_inline_visualizations:
+                        - data_bars:
+                            positive_color: '{{ positive_color }}'
+                            field_id: '{{ field_id }}'
+                            negative_color: '{{ negative_color }}'
+                      field_wells:
+                        table_unaggregated_field_wells:
+                          values:
+                            - null
+                        table_aggregated_field_wells:
+                          group_by:
+                            - null
+                          values:
+                            - null
+                      field_options:
+                        order:
+                          - '{{ order[0] }}'
+                        pinned_field_options:
+                          pinned_left_fields:
+                            - '{{ pinned_left_fields[0] }}'
+                        transposed_table_options:
+                          - column_width: '{{ column_width }}'
+                            column_index: null
+                            column_type: '{{ column_type }}'
+                        selected_field_options:
+                          - custom_label: '{{ custom_label }}'
+                            url_styling:
+                              link_configuration:
+                                target: null
+                                content:
+                                  custom_icon_content:
+                                    icon: '{{ icon }}'
+                                  custom_text_content:
+                                    value: '{{ value }}'
+                                    font_configuration: null
+                              image_configuration:
+                                sizing_options:
+                                  table_cell_image_scaling_configuration: '{{ table_cell_image_scaling_configuration }}'
+                            field_id: '{{ field_id }}'
+                            visibility: null
+                            width: '{{ width }}'
+                      interactions: null
+                      total_options:
+                        total_aggregation_options:
+                          - total_aggregation_function:
+                              simple_total_aggregation_function: '{{ simple_total_aggregation_function }}'
+                            field_id: '{{ field_id }}'
+                        custom_label: '{{ custom_label }}'
+                        scroll_status: '{{ scroll_status }}'
+                        placement: '{{ placement }}'
+                        total_cell_style: null
+                        totals_visibility: null
+                    actions:
                       - null
-                    Title: null
-                    VisualContentAltText: '{{ VisualContentAltText }}'
-                  PivotTableVisual:
-                    Subtitle: null
-                    ConditionalFormatting:
-                      ConditionalFormattingOptions:
-                        - Cell:
-                            Scope:
-                              Role: '{{ Role }}'
-                            Scopes:
+                    title: null
+                    visual_content_alt_text: '{{ visual_content_alt_text }}'
+                  pivot_table_visual:
+                    subtitle: null
+                    conditional_formatting:
+                      conditional_formatting_options:
+                        - cell:
+                            scope:
+                              role: '{{ role }}'
+                            scopes:
                               - null
-                            FieldId: '{{ FieldId }}'
-                            TextFormat: null
-                    VisualId: '{{ VisualId }}'
-                    ChartConfiguration:
-                      SortConfiguration:
-                        FieldSortOptions:
-                          - SortBy:
-                              Field: null
-                              DataPath:
-                                SortPaths:
+                            field_id: '{{ field_id }}'
+                            text_format: null
+                    visual_id: '{{ visual_id }}'
+                    chart_configuration:
+                      sort_configuration:
+                        field_sort_options:
+                          - sort_by:
+                              field: null
+                              data_path:
+                                sort_paths:
                                   - null
-                                Direction: null
-                              Column: null
-                            FieldId: '{{ FieldId }}'
-                      PaginatedReportOptions:
-                        OverflowColumnHeaderVisibility: null
-                        VerticalOverflowVisibility: null
-                      TableOptions:
-                        RowFieldNamesStyle: null
-                        RowHeaderStyle: null
-                        CollapsedRowDimensionsVisibility: null
-                        RowsLayout: '{{ RowsLayout }}'
-                        MetricPlacement: '{{ MetricPlacement }}'
-                        DefaultCellWidth: '{{ DefaultCellWidth }}'
-                        ColumnNamesVisibility: null
-                        RowsLabelOptions:
-                          CustomLabel: '{{ CustomLabel }}'
-                          Visibility: null
-                        SingleMetricVisibility: null
-                        ColumnHeaderStyle: null
-                        ToggleButtonsVisibility: null
-                        CellStyle: null
-                        RowAlternateColorOptions: null
-                      FieldWells:
-                        PivotTableAggregatedFieldWells:
-                          Values:
-                            - null
-                          Columns:
-                            - null
-                          Rows:
-                            - null
-                      FieldOptions:
-                        CollapseStateOptions:
-                          - Target:
-                              FieldId: '{{ FieldId }}'
-                              FieldDataPathValues:
+                                direction: null
+                              column: null
+                            field_id: '{{ field_id }}'
+                      paginated_report_options:
+                        overflow_column_header_visibility: null
+                        vertical_overflow_visibility: null
+                      table_options:
+                        row_field_names_style: null
+                        row_header_style: null
+                        collapsed_row_dimensions_visibility: null
+                        rows_layout: '{{ rows_layout }}'
+                        metric_placement: '{{ metric_placement }}'
+                        default_cell_width: '{{ default_cell_width }}'
+                        column_names_visibility: null
+                        rows_label_options:
+                          custom_label: '{{ custom_label }}'
+                          visibility: null
+                        single_metric_visibility: null
+                        column_header_style: null
+                        toggle_buttons_visibility: null
+                        cell_style: null
+                        row_alternate_color_options: null
+                      field_wells:
+                        pivot_table_aggregated_field_wells:
+                          values:
+                            - null
+                          columns:
+                            - null
+                          rows:
+                            - null
+                      field_options:
+                        collapse_state_options:
+                          - target:
+                              field_id: '{{ field_id }}'
+                              field_data_path_values:
                                 - null
-                            State: '{{ State }}'
-                        DataPathOptions:
-                          - DataPathList:
+                            state: '{{ state }}'
+                        data_path_options:
+                          - data_path_list:
                               - null
-                            Width: '{{ Width }}'
-                        SelectedFieldOptions:
-                          - CustomLabel: '{{ CustomLabel }}'
-                            FieldId: '{{ FieldId }}'
-                            Visibility: null
-                      Interactions: null
-                      TotalOptions:
-                        ColumnSubtotalOptions:
-                          CustomLabel: '{{ CustomLabel }}'
-                          FieldLevelOptions:
-                            - FieldId: '{{ FieldId }}'
-                          ValueCellStyle: null
-                          TotalCellStyle: null
-                          TotalsVisibility: null
-                          FieldLevel: '{{ FieldLevel }}'
-                          MetricHeaderCellStyle: null
-                          StyleTargets:
-                            - CellType: '{{ CellType }}'
-                        RowSubtotalOptions: null
-                        RowTotalOptions:
-                          TotalAggregationOptions:
-                            - null
-                          CustomLabel: '{{ CustomLabel }}'
-                          ValueCellStyle: null
-                          ScrollStatus: null
-                          Placement: null
-                          TotalCellStyle: null
-                          TotalsVisibility: null
-                          MetricHeaderCellStyle: null
-                        ColumnTotalOptions: null
-                    Actions:
+                            width: '{{ width }}'
+                        selected_field_options:
+                          - custom_label: '{{ custom_label }}'
+                            field_id: '{{ field_id }}'
+                            visibility: null
+                      interactions: null
+                      total_options:
+                        column_subtotal_options:
+                          custom_label: '{{ custom_label }}'
+                          field_level_options:
+                            - field_id: '{{ field_id }}'
+                          value_cell_style: null
+                          total_cell_style: null
+                          totals_visibility: null
+                          field_level: '{{ field_level }}'
+                          metric_header_cell_style: null
+                          style_targets:
+                            - cell_type: '{{ cell_type }}'
+                        row_subtotal_options: null
+                        row_total_options:
+                          total_aggregation_options:
+                            - null
+                          custom_label: '{{ custom_label }}'
+                          value_cell_style: null
+                          scroll_status: null
+                          placement: null
+                          total_cell_style: null
+                          totals_visibility: null
+                          metric_header_cell_style: null
+                        column_total_options: null
+                    actions:
                       - null
-                    Title: null
-                    VisualContentAltText: '{{ VisualContentAltText }}'
-                  BarChartVisual:
-                    Subtitle: null
-                    VisualId: '{{ VisualId }}'
-                    ChartConfiguration:
-                      SortConfiguration:
-                        SmallMultiplesSort:
+                    title: null
+                    visual_content_alt_text: '{{ visual_content_alt_text }}'
+                  bar_chart_visual:
+                    subtitle: null
+                    visual_id: '{{ visual_id }}'
+                    chart_configuration:
+                      sort_configuration:
+                        small_multiples_sort:
                           - null
-                        ColorSort:
+                        color_sort:
                           - null
-                        ColorItemsLimit: null
-                        CategoryItemsLimit: null
-                        CategorySort:
+                        color_items_limit: null
+                        category_items_limit: null
+                        category_sort:
                           - null
-                        SmallMultiplesLimitConfiguration: null
-                      Legend: null
-                      ReferenceLines:
+                        small_multiples_limit_configuration: null
+                      legend: null
+                      reference_lines:
                         - null
-                      DataLabels: null
-                      ColorLabelOptions: null
-                      CategoryLabelOptions: null
-                      Tooltip: null
-                      SmallMultiplesOptions: null
-                      Orientation: '{{ Orientation }}'
-                      VisualPalette: null
-                      ValueLabelOptions: null
-                      BarsArrangement: null
-                      CategoryAxis: null
-                      ContributionAnalysisDefaults:
+                      data_labels: null
+                      color_label_options: null
+                      category_label_options: null
+                      tooltip: null
+                      small_multiples_options: null
+                      orientation: '{{ orientation }}'
+                      visual_palette: null
+                      value_label_options: null
+                      bars_arrangement: null
+                      category_axis: null
+                      contribution_analysis_defaults:
                         - null
-                      FieldWells:
-                        BarChartAggregatedFieldWells:
-                          Category:
+                      field_wells:
+                        bar_chart_aggregated_field_wells:
+                          category:
                             - null
-                          Colors:
+                          colors:
                             - null
-                          Values:
+                          values:
                             - null
-                          SmallMultiples:
+                          small_multiples:
                             - null
-                      ValueAxis: null
-                      Interactions: null
-                    Actions:
+                      value_axis: null
+                      interactions: null
+                    actions:
                       - null
-                    Title: null
-                    VisualContentAltText: '{{ VisualContentAltText }}'
-                    ColumnHierarchies:
+                    title: null
+                    visual_content_alt_text: '{{ visual_content_alt_text }}'
+                    column_hierarchies:
                       - null
-                  HeatMapVisual:
-                    Subtitle: null
-                    VisualId: '{{ VisualId }}'
-                    ChartConfiguration:
-                      SortConfiguration:
-                        HeatMapRowSort:
+                  heat_map_visual:
+                    subtitle: null
+                    visual_id: '{{ visual_id }}'
+                    chart_configuration:
+                      sort_configuration:
+                        heat_map_row_sort:
                           - null
-                        HeatMapRowItemsLimitConfiguration: null
-                        HeatMapColumnItemsLimitConfiguration: null
-                        HeatMapColumnSort:
+                        heat_map_row_items_limit_configuration: null
+                        heat_map_column_items_limit_configuration: null
+                        heat_map_column_sort:
                           - null
-                      ColumnLabelOptions: null
-                      Legend: null
-                      DataLabels: null
-                      FieldWells:
-                        HeatMapAggregatedFieldWells:
-                          Values:
-                            - null
-                          Columns:
-                            - null
-                          Rows:
-                            - null
-                      Tooltip: null
-                      ColorScale:
-                        Colors:
-                          - DataValue: null
-                            Color: '{{ Color }}'
-                        ColorFillType: '{{ ColorFillType }}'
-                        NullValueColor: null
-                      Interactions: null
-                      RowLabelOptions: null
-                    Actions:
+                      column_label_options: null
+                      legend: null
+                      data_labels: null
+                      field_wells:
+                        heat_map_aggregated_field_wells:
+                          values:
+                            - null
+                          columns:
+                            - null
+                          rows:
+                            - null
+                      tooltip: null
+                      color_scale:
+                        colors:
+                          - data_value: null
+                            color: '{{ color }}'
+                        color_fill_type: '{{ color_fill_type }}'
+                        null_value_color: null
+                      interactions: null
+                      row_label_options: null
+                    actions:
                       - null
-                    Title: null
-                    VisualContentAltText: '{{ VisualContentAltText }}'
-                    ColumnHierarchies:
+                    title: null
+                    visual_content_alt_text: '{{ visual_content_alt_text }}'
+                    column_hierarchies:
                       - null
-                  TreeMapVisual:
-                    Subtitle: null
-                    VisualId: '{{ VisualId }}'
-                    ChartConfiguration:
-                      SortConfiguration:
-                        TreeMapSort:
+                  tree_map_visual:
+                    subtitle: null
+                    visual_id: '{{ visual_id }}'
+                    chart_configuration:
+                      sort_configuration:
+                        tree_map_sort:
                           - null
-                        TreeMapGroupItemsLimitConfiguration: null
-                      Legend: null
-                      DataLabels: null
-                      ColorLabelOptions: null
-                      SizeLabelOptions: null
-                      FieldWells:
-                        TreeMapAggregatedFieldWells:
-                          Sizes:
-                            - null
-                          Colors:
-                            - null
-                          Groups:
-                            - null
-                      Tooltip: null
-                      ColorScale: null
-                      Interactions: null
-                      GroupLabelOptions: null
-                    Actions:
+                        tree_map_group_items_limit_configuration: null
+                      legend: null
+                      data_labels: null
+                      color_label_options: null
+                      size_label_options: null
+                      field_wells:
+                        tree_map_aggregated_field_wells:
+                          sizes:
+                            - null
+                          colors:
+                            - null
+                          groups:
+                            - null
+                      tooltip: null
+                      color_scale: null
+                      interactions: null
+                      group_label_options: null
+                    actions:
                       - null
-                    Title: null
-                    VisualContentAltText: '{{ VisualContentAltText }}'
-                    ColumnHierarchies:
+                    title: null
+                    visual_content_alt_text: '{{ visual_content_alt_text }}'
+                    column_hierarchies:
                       - null
-                  InsightVisual:
-                    Subtitle: null
-                    VisualId: '{{ VisualId }}'
-                    Actions:
+                  insight_visual:
+                    subtitle: null
+                    visual_id: '{{ visual_id }}'
+                    actions:
                       - null
-                    DataSetIdentifier: '{{ DataSetIdentifier }}'
-                    InsightConfiguration:
-                      Computations:
-                        - PeriodToDate:
-                            PeriodTimeGranularity: null
-                            Value: null
-                            Time: null
-                            ComputationId: '{{ ComputationId }}'
-                            Name: '{{ Name }}'
-                          GrowthRate:
-                            Value: null
-                            Time: null
-                            PeriodSize: null
-                            ComputationId: '{{ ComputationId }}'
-                            Name: '{{ Name }}'
-                          TopBottomRanked:
-                            Type: '{{ Type }}'
-                            Category: null
-                            ResultSize: null
-                            Value: null
-                            ComputationId: '{{ ComputationId }}'
-                            Name: '{{ Name }}'
-                          TotalAggregation:
-                            Value: null
-                            ComputationId: '{{ ComputationId }}'
-                            Name: '{{ Name }}'
-                          Forecast:
-                            PeriodsBackward: null
-                            PeriodsForward: null
-                            PredictionInterval: null
-                            Seasonality: '{{ Seasonality }}'
-                            CustomSeasonalityValue: null
-                            Value: null
-                            Time: null
-                            UpperBoundary: null
-                            ComputationId: '{{ ComputationId }}'
-                            Name: '{{ Name }}'
-                            LowerBoundary: null
-                          MaximumMinimum:
-                            Type: '{{ Type }}'
-                            Value: null
-                            Time: null
-                            ComputationId: '{{ ComputationId }}'
-                            Name: '{{ Name }}'
-                          PeriodOverPeriod:
-                            Value: null
-                            Time: null
-                            ComputationId: '{{ ComputationId }}'
-                            Name: '{{ Name }}'
-                          MetricComparison:
-                            TargetValue: null
-                            Time: null
-                            ComputationId: '{{ ComputationId }}'
-                            FromValue: null
-                            Name: '{{ Name }}'
-                          TopBottomMovers:
-                            Type: null
-                            Category: null
-                            Value: null
-                            SortOrder: '{{ SortOrder }}'
-                            Time: null
-                            MoverSize: null
-                            ComputationId: '{{ ComputationId }}'
-                            Name: '{{ Name }}'
-                          UniqueValues:
-                            Category: null
-                            ComputationId: '{{ ComputationId }}'
-                            Name: '{{ Name }}'
-                      CustomNarrative:
-                        Narrative: '{{ Narrative }}'
-                      Interactions: null
-                    Title: null
-                    VisualContentAltText: '{{ VisualContentAltText }}'
-                  LineChartVisual:
-                    Subtitle: null
-                    VisualId: '{{ VisualId }}'
-                    ChartConfiguration:
-                      SortConfiguration:
-                        CategoryItemsLimitConfiguration: null
-                        ColorItemsLimitConfiguration: null
-                        SmallMultiplesSort:
+                    data_set_identifier: '{{ data_set_identifier }}'
+                    insight_configuration:
+                      computations:
+                        - period_to_date:
+                            period_time_granularity: null
+                            value: null
+                            time: null
+                            computation_id: '{{ computation_id }}'
+                            name: '{{ name }}'
+                          growth_rate:
+                            value: null
+                            time: null
+                            period_size: null
+                            computation_id: '{{ computation_id }}'
+                            name: '{{ name }}'
+                          top_bottom_ranked:
+                            type: '{{ type }}'
+                            category: null
+                            result_size: null
+                            value: null
+                            computation_id: '{{ computation_id }}'
+                            name: '{{ name }}'
+                          total_aggregation:
+                            value: null
+                            computation_id: '{{ computation_id }}'
+                            name: '{{ name }}'
+                          forecast:
+                            periods_backward: null
+                            periods_forward: null
+                            prediction_interval: null
+                            seasonality: '{{ seasonality }}'
+                            custom_seasonality_value: null
+                            value: null
+                            time: null
+                            upper_boundary: null
+                            computation_id: '{{ computation_id }}'
+                            name: '{{ name }}'
+                            lower_boundary: null
+                          maximum_minimum:
+                            type: '{{ type }}'
+                            value: null
+                            time: null
+                            computation_id: '{{ computation_id }}'
+                            name: '{{ name }}'
+                          period_over_period:
+                            value: null
+                            time: null
+                            computation_id: '{{ computation_id }}'
+                            name: '{{ name }}'
+                          metric_comparison:
+                            target_value: null
+                            time: null
+                            computation_id: '{{ computation_id }}'
+                            from_value: null
+                            name: '{{ name }}'
+                          top_bottom_movers:
+                            type: null
+                            category: null
+                            value: null
+                            sort_order: '{{ sort_order }}'
+                            time: null
+                            mover_size: null
+                            computation_id: '{{ computation_id }}'
+                            name: '{{ name }}'
+                          unique_values:
+                            category: null
+                            computation_id: '{{ computation_id }}'
+                            name: '{{ name }}'
+                      custom_narrative:
+                        narrative: '{{ narrative }}'
+                      interactions: null
+                    title: null
+                    visual_content_alt_text: '{{ visual_content_alt_text }}'
+                  line_chart_visual:
+                    subtitle: null
+                    visual_id: '{{ visual_id }}'
+                    chart_configuration:
+                      sort_configuration:
+                        category_items_limit_configuration: null
+                        color_items_limit_configuration: null
+                        small_multiples_sort:
                           - null
-                        CategorySort:
+                        category_sort:
                           - null
-                        SmallMultiplesLimitConfiguration: null
-                      Legend: null
-                      ReferenceLines:
+                        small_multiples_limit_configuration: null
+                      legend: null
+                      reference_lines:
                         - null
-                      DataLabels: null
-                      Tooltip: null
-                      SingleAxisOptions: null
-                      SmallMultiplesOptions: null
-                      PrimaryYAxisDisplayOptions:
-                        MissingDataConfigurations:
-                          - TreatmentOption: '{{ TreatmentOption }}'
-                        AxisOptions: null
-                      VisualPalette: null
-                      XAxisDisplayOptions: null
-                      DefaultSeriesSettings:
-                        LineStyleSettings:
-                          LineInterpolation: '{{ LineInterpolation }}'
-                          LineStyle: '{{ LineStyle }}'
-                          LineVisibility: null
-                          LineWidth: '{{ LineWidth }}'
-                        AxisBinding: null
-                        MarkerStyleSettings:
-                          MarkerShape: '{{ MarkerShape }}'
-                          MarkerSize: '{{ MarkerSize }}'
-                          MarkerVisibility: null
-                          MarkerColor: '{{ MarkerColor }}'
-                      SecondaryYAxisLabelOptions: null
-                      ForecastConfigurations:
-                        - ForecastProperties:
-                            PeriodsBackward: null
-                            PeriodsForward: null
-                            PredictionInterval: null
-                            Seasonality: null
-                            UpperBoundary: null
-                            LowerBoundary: null
-                          Scenario:
-                            WhatIfRangeScenario:
-                              StartDate: '{{ StartDate }}'
-                              Value: null
-                              EndDate: '{{ EndDate }}'
-                            WhatIfPointScenario:
-                              Value: null
-                              Date: '{{ Date }}'
-                      Series:
-                        - FieldSeriesItem:
-                            FieldId: '{{ FieldId }}'
-                            AxisBinding: null
-                            Settings:
-                              LineStyleSettings: null
-                              MarkerStyleSettings: null
-                          DataFieldSeriesItem:
-                            FieldId: '{{ FieldId }}'
-                            AxisBinding: null
-                            FieldValue: '{{ FieldValue }}'
-                            Settings: null
-                      Type: '{{ Type }}'
-                      PrimaryYAxisLabelOptions: null
-                      ContributionAnalysisDefaults:
+                      data_labels: null
+                      tooltip: null
+                      single_axis_options: null
+                      small_multiples_options: null
+                      primary_yaxis_display_options:
+                        missing_data_configurations:
+                          - treatment_option: '{{ treatment_option }}'
+                        axis_options: null
+                      visual_palette: null
+                      x_axis_display_options: null
+                      default_series_settings:
+                        line_style_settings:
+                          line_interpolation: '{{ line_interpolation }}'
+                          line_style: '{{ line_style }}'
+                          line_visibility: null
+                          line_width: '{{ line_width }}'
+                        axis_binding: null
+                        marker_style_settings:
+                          marker_shape: '{{ marker_shape }}'
+                          marker_size: '{{ marker_size }}'
+                          marker_visibility: null
+                          marker_color: '{{ marker_color }}'
+                      secondary_yaxis_label_options: null
+                      forecast_configurations:
+                        - forecast_properties:
+                            periods_backward: null
+                            periods_forward: null
+                            prediction_interval: null
+                            seasonality: null
+                            upper_boundary: null
+                            lower_boundary: null
+                          scenario:
+                            what_if_range_scenario:
+                              start_date: '{{ start_date }}'
+                              value: null
+                              end_date: '{{ end_date }}'
+                            what_if_point_scenario:
+                              value: null
+                              date: '{{ date }}'
+                      series:
+                        - field_series_item:
+                            field_id: '{{ field_id }}'
+                            axis_binding: null
+                            settings:
+                              line_style_settings: null
+                              marker_style_settings: null
+                          data_field_series_item:
+                            field_id: '{{ field_id }}'
+                            axis_binding: null
+                            field_value: '{{ field_value }}'
+                            settings: null
+                      type: '{{ type }}'
+                      primary_yaxis_label_options: null
+                      contribution_analysis_defaults:
                         - null
-                      FieldWells:
-                        LineChartAggregatedFieldWells:
-                          Category:
+                      field_wells:
+                        line_chart_aggregated_field_wells:
+                          category:
                             - null
-                          Colors:
+                          colors:
                             - null
-                          Values:
+                          values:
                             - null
-                          SmallMultiples:
+                          small_multiples:
                             - null
-                      SecondaryYAxisDisplayOptions: null
-                      XAxisLabelOptions: null
-                      Interactions: null
-                    Actions:
+                      secondary_yaxis_display_options: null
+                      x_axis_label_options: null
+                      interactions: null
+                    actions:
                       - null
-                    Title: null
-                    VisualContentAltText: '{{ VisualContentAltText }}'
-                    ColumnHierarchies:
+                    title: null
+                    visual_content_alt_text: '{{ visual_content_alt_text }}'
+                    column_hierarchies:
                       - null
-                  EmptyVisual:
-                    VisualId: '{{ VisualId }}'
-                    Actions:
+                  empty_visual:
+                    visual_id: '{{ visual_id }}'
+                    actions:
                       - null
-                    DataSetIdentifier: '{{ DataSetIdentifier }}'
-          ParameterDeclarations:
-            - StringParameterDeclaration:
-                MappedDataSetParameters:
-                  - DataSetParameterName: '{{ DataSetParameterName }}'
-                    DataSetIdentifier: '{{ DataSetIdentifier }}'
-                DefaultValues:
-                  DynamicValue:
-                    GroupNameColumn: null
-                    DefaultValueColumn: null
-                    UserNameColumn: null
-                  StaticValues:
-                    - '{{ StaticValues[0] }}'
-                ParameterValueType: '{{ ParameterValueType }}'
-                ValueWhenUnset:
-                  ValueWhenUnsetOption: '{{ ValueWhenUnsetOption }}'
-                  CustomValue: '{{ CustomValue }}'
-                Name: '{{ Name }}'
-              DateTimeParameterDeclaration:
-                MappedDataSetParameters:
+                    data_set_identifier: '{{ data_set_identifier }}'
+          parameter_declarations:
+            - string_parameter_declaration:
+                mapped_data_set_parameters:
+                  - data_set_parameter_name: '{{ data_set_parameter_name }}'
+                    data_set_identifier: '{{ data_set_identifier }}'
+                default_values:
+                  dynamic_value:
+                    group_name_column: null
+                    default_value_column: null
+                    user_name_column: null
+                  static_values:
+                    - '{{ static_values[0] }}'
+                parameter_value_type: '{{ parameter_value_type }}'
+                value_when_unset:
+                  value_when_unset_option: '{{ value_when_unset_option }}'
+                  custom_value: '{{ custom_value }}'
+                name: '{{ name }}'
+              date_time_parameter_declaration:
+                mapped_data_set_parameters:
                   - null
-                DefaultValues:
-                  RollingDate: null
-                  DynamicValue: null
-                  StaticValues:
-                    - '{{ StaticValues[0] }}'
-                TimeGranularity: null
-                ValueWhenUnset:
-                  ValueWhenUnsetOption: null
-                  CustomValue: '{{ CustomValue }}'
-                Name: '{{ Name }}'
-              DecimalParameterDeclaration:
-                MappedDataSetParameters:
+                default_values:
+                  rolling_date: null
+                  dynamic_value: null
+                  static_values:
+                    - '{{ static_values[0] }}'
+                time_granularity: null
+                value_when_unset:
+                  value_when_unset_option: null
+                  custom_value: '{{ custom_value }}'
+                name: '{{ name }}'
+              decimal_parameter_declaration:
+                mapped_data_set_parameters:
                   - null
-                DefaultValues:
-                  DynamicValue: null
-                  StaticValues:
+                default_values:
+                  dynamic_value: null
+                  static_values:
                     - null
-                ParameterValueType: null
-                ValueWhenUnset:
-                  ValueWhenUnsetOption: null
-                  CustomValue: null
-                Name: '{{ Name }}'
-              IntegerParameterDeclaration:
-                MappedDataSetParameters:
+                parameter_value_type: null
+                value_when_unset:
+                  value_when_unset_option: null
+                  custom_value: null
+                name: '{{ name }}'
+              integer_parameter_declaration:
+                mapped_data_set_parameters:
                   - null
-                DefaultValues:
-                  DynamicValue: null
-                  StaticValues:
+                default_values:
+                  dynamic_value: null
+                  static_values:
                     - null
-                ParameterValueType: null
-                ValueWhenUnset:
-                  ValueWhenUnsetOption: null
-                  CustomValue: null
-                Name: '{{ Name }}'
-      - name: ValidationStrategy
+                parameter_value_type: null
+                value_when_unset:
+                  value_when_unset_option: null
+                  custom_value: null
+                name: '{{ name }}'
+      - name: validation_strategy
         value:
-          Mode: '{{ Mode }}'
-      - name: Name
-        value: '{{ Name }}'
-      - name: AwsAccountId
-        value: '{{ AwsAccountId }}'
-      - name: Permissions
+          mode: '{{ mode }}'
+      - name: name
+        value: '{{ name }}'
+      - name: aws_account_id
+        value: '{{ aws_account_id }}'
+      - name: permissions
         value:
-          - Principal: '{{ Principal }}'
-            Actions:
-              - '{{ Actions[0] }}'
-      - name: Tags
+          - principal: '{{ principal }}'
+            actions:
+              - '{{ actions[0] }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-      - name: TemplateId
-        value: '{{ TemplateId }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
+      - name: template_id
+        value: '{{ template_id }}'
 ```
 </TabItem>
 </Tabs>
@@ -3159,7 +3158,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<AwsAccountId>|<TemplateId>';
+AND Identifier = '{{ aws_account_id }}|{{ template_id }}';
 ```
 
 
@@ -3168,7 +3167,7 @@ AND Identifier = '<AwsAccountId>|<TemplateId>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.quicksight.templates
-WHERE Identifier = '<AwsAccountId|TemplateId>'
+WHERE Identifier = '{{ aws_account_id }}|{{ template_id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/quicksight/themes/index.md b/website/docs/services/quicksight/themes/index.md
index 37bc83413..76d163f73 100644
--- a/website/docs/services/quicksight/themes/index.md
+++ b/website/docs/services/quicksight/themes/index.md
@@ -450,7 +450,7 @@ type,
 version,
 version_description
 FROM awscc.quicksight.themes
-WHERE region = 'us-east-1' AND Identifier = '<ThemeId>|<AwsAccountId>';
+WHERE region = 'us-east-1' AND Identifier = '{{ theme_id }}|{{ aws_account_id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -491,12 +491,12 @@ INSERT INTO awscc.quicksight.themes (
  ThemeId,
  region
 )
-SELECT 
-'{{ AwsAccountId }}',
- '{{ BaseThemeId }}',
- '{{ Configuration }}',
- '{{ Name }}',
- '{{ ThemeId }}',
+SELECT
+'{{ aws_account_id }}',
+ '{{ base_theme_id }}',
+ '{{ configuration }}',
+ '{{ name }}',
+ '{{ theme_id }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -515,15 +515,15 @@ INSERT INTO awscc.quicksight.themes (
  VersionDescription,
  region
 )
-SELECT 
- '{{ AwsAccountId }}',
- '{{ BaseThemeId }}',
- '{{ Configuration }}',
- '{{ Name }}',
- '{{ Permissions }}',
- '{{ Tags }}',
- '{{ ThemeId }}',
- '{{ VersionDescription }}',
+SELECT
+ '{{ aws_account_id }}',
+ '{{ base_theme_id }}',
+ '{{ configuration }}',
+ '{{ name }}',
+ '{{ permissions }}',
+ '{{ tags }}',
+ '{{ theme_id }}',
+ '{{ version_description }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -541,63 +541,62 @@ globals:
 resources:
   - name: theme
     props:
-      - name: AwsAccountId
-        value: '{{ AwsAccountId }}'
-      - name: BaseThemeId
-        value: '{{ BaseThemeId }}'
-      - name: Configuration
+      - name: aws_account_id
+        value: '{{ aws_account_id }}'
+      - name: base_theme_id
+        value: '{{ base_theme_id }}'
+      - name: configuration
         value:
-          DataColorPalette:
-            Colors:
-              - '{{ Colors[0] }}'
-            MinMaxGradient:
-              - '{{ MinMaxGradient[0] }}'
-            EmptyFillColor: '{{ EmptyFillColor }}'
-          UIColorPalette:
-            PrimaryForeground: '{{ PrimaryForeground }}'
-            PrimaryBackground: '{{ PrimaryBackground }}'
-            SecondaryForeground: '{{ SecondaryForeground }}'
-            SecondaryBackground: '{{ SecondaryBackground }}'
-            Accent: '{{ Accent }}'
-            AccentForeground: '{{ AccentForeground }}'
-            Danger: '{{ Danger }}'
-            DangerForeground: '{{ DangerForeground }}'
-            Warning: '{{ Warning }}'
-            WarningForeground: '{{ WarningForeground }}'
-            Success: '{{ Success }}'
-            SuccessForeground: '{{ SuccessForeground }}'
-            Dimension: '{{ Dimension }}'
-            DimensionForeground: '{{ DimensionForeground }}'
-            Measure: '{{ Measure }}'
-            MeasureForeground: '{{ MeasureForeground }}'
-          Sheet:
-            Tile:
-              Border:
-                Show: '{{ Show }}'
-            TileLayout:
-              Gutter:
-                Show: '{{ Show }}'
-              Margin:
-                Show: '{{ Show }}'
-          Typography:
-            FontFamilies:
-              - FontFamily: '{{ FontFamily }}'
-      - name: Name
-        value: '{{ Name }}'
-      - name: Permissions
+          data_color_palette:
+            colors:
+              - '{{ colors[0] }}'
+            min_max_gradient:
+              - '{{ min_max_gradient[0] }}'
+            empty_fill_color: '{{ empty_fill_color }}'
+          u_icolor_palette:
+            primary_foreground: '{{ primary_foreground }}'
+            primary_background: '{{ primary_background }}'
+            secondary_foreground: '{{ secondary_foreground }}'
+            secondary_background: '{{ secondary_background }}'
+            accent: '{{ accent }}'
+            accent_foreground: '{{ accent_foreground }}'
+            danger: '{{ danger }}'
+            danger_foreground: '{{ danger_foreground }}'
+            warning: '{{ warning }}'
+            warning_foreground: '{{ warning_foreground }}'
+            success: '{{ success }}'
+            success_foreground: '{{ success_foreground }}'
+            dimension: '{{ dimension }}'
+            dimension_foreground: '{{ dimension_foreground }}'
+            measure: '{{ measure }}'
+            measure_foreground: '{{ measure_foreground }}'
+          sheet:
+            tile:
+              border:
+                show: '{{ show }}'
+            tile_layout:
+              gutter:
+                show: '{{ show }}'
+              margin:
+                show: '{{ show }}'
+          typography:
+            font_families:
+              - font_family: '{{ font_family }}'
+      - name: name
+        value: '{{ name }}'
+      - name: permissions
         value:
-          - Principal: '{{ Principal }}'
-            Actions:
-              - '{{ Actions[0] }}'
-      - name: Tags
+          - principal: '{{ principal }}'
+            actions:
+              - '{{ actions[0] }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-      - name: ThemeId
-        value: '{{ ThemeId }}'
-      - name: VersionDescription
-        value: '{{ VersionDescription }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
+      - name: theme_id
+        value: '{{ theme_id }}'
+      - name: version_description
+        value: '{{ version_description }}'
 ```
 </TabItem>
 </Tabs>
@@ -618,7 +617,7 @@ SET PatchDocument = string('{{ {
     "VersionDescription": version_description
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<ThemeId>|<AwsAccountId>';
+AND Identifier = '{{ theme_id }}|{{ aws_account_id }}';
 ```
 
 
@@ -627,7 +626,7 @@ AND Identifier = '<ThemeId>|<AwsAccountId>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.quicksight.themes
-WHERE Identifier = '<ThemeId|AwsAccountId>'
+WHERE Identifier = '{{ theme_id }}|{{ aws_account_id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/quicksight/topics/index.md b/website/docs/services/quicksight/topics/index.md
index 57b501e1e..9a47e2509 100644
--- a/website/docs/services/quicksight/topics/index.md
+++ b/website/docs/services/quicksight/topics/index.md
@@ -817,7 +817,7 @@ tags,
 topic_id,
 user_experience_version
 FROM awscc.quicksight.topics
-WHERE region = 'us-east-1' AND Identifier = '<AwsAccountId>|<TopicId>';
+WHERE region = 'us-east-1' AND Identifier = '{{ aws_account_id }}|{{ topic_id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -863,17 +863,17 @@ INSERT INTO awscc.quicksight.topics (
  UserExperienceVersion,
  region
 )
-SELECT 
-'{{ AwsAccountId }}',
- '{{ ConfigOptions }}',
- '{{ CustomInstructions }}',
- '{{ DataSets }}',
- '{{ Description }}',
- '{{ FolderArns }}',
- '{{ Name }}',
- '{{ Tags }}',
- '{{ TopicId }}',
- '{{ UserExperienceVersion }}',
+SELECT
+'{{ aws_account_id }}',
+ '{{ config_options }}',
+ '{{ custom_instructions }}',
+ '{{ data_sets }}',
+ '{{ description }}',
+ '{{ folder_arns }}',
+ '{{ name }}',
+ '{{ tags }}',
+ '{{ topic_id }}',
+ '{{ user_experience_version }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -894,17 +894,17 @@ INSERT INTO awscc.quicksight.topics (
  UserExperienceVersion,
  region
 )
-SELECT 
- '{{ AwsAccountId }}',
- '{{ ConfigOptions }}',
- '{{ CustomInstructions }}',
- '{{ DataSets }}',
- '{{ Description }}',
- '{{ FolderArns }}',
- '{{ Name }}',
- '{{ Tags }}',
- '{{ TopicId }}',
- '{{ UserExperienceVersion }}',
+SELECT
+ '{{ aws_account_id }}',
+ '{{ config_options }}',
+ '{{ custom_instructions }}',
+ '{{ data_sets }}',
+ '{{ description }}',
+ '{{ folder_arns }}',
+ '{{ name }}',
+ '{{ tags }}',
+ '{{ topic_id }}',
+ '{{ user_experience_version }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -922,168 +922,167 @@ globals:
 resources:
   - name: topic
     props:
-      - name: AwsAccountId
-        value: '{{ AwsAccountId }}'
-      - name: ConfigOptions
+      - name: aws_account_id
+        value: '{{ aws_account_id }}'
+      - name: config_options
         value:
-          QBusinessInsightsEnabled: '{{ QBusinessInsightsEnabled }}'
-      - name: CustomInstructions
+          q_business_insights_enabled: '{{ q_business_insights_enabled }}'
+      - name: custom_instructions
         value:
-          CustomInstructionsString: '{{ CustomInstructionsString }}'
-      - name: DataSets
+          custom_instructions_string: '{{ custom_instructions_string }}'
+      - name: data_sets
         value:
-          - DatasetArn: '{{ DatasetArn }}'
-            DatasetName: '{{ DatasetName }}'
-            DatasetDescription: '{{ DatasetDescription }}'
-            DataAggregation:
-              DatasetRowDateGranularity: '{{ DatasetRowDateGranularity }}'
-              DefaultDateColumnName: '{{ DefaultDateColumnName }}'
-            Filters:
-              - FilterDescription: '{{ FilterDescription }}'
-                FilterClass: '{{ FilterClass }}'
-                FilterName: '{{ FilterName }}'
-                FilterSynonyms:
-                  - '{{ FilterSynonyms[0] }}'
-                OperandFieldName: '{{ OperandFieldName }}'
-                FilterType: '{{ FilterType }}'
-                CategoryFilter:
-                  CategoryFilterFunction: '{{ CategoryFilterFunction }}'
-                  CategoryFilterType: '{{ CategoryFilterType }}'
-                  Constant:
-                    ConstantType: '{{ ConstantType }}'
-                    SingularConstant: '{{ SingularConstant }}'
-                    CollectiveConstant:
-                      ValueList:
-                        - '{{ ValueList[0] }}'
-                  Inverse: '{{ Inverse }}'
-                NumericEqualityFilter:
-                  Constant:
-                    ConstantType: null
-                    SingularConstant: '{{ SingularConstant }}'
-                  Aggregation: '{{ Aggregation }}'
-                NumericRangeFilter:
-                  Inclusive: '{{ Inclusive }}'
-                  Constant:
-                    ConstantType: null
-                    RangeConstant:
-                      Minimum: '{{ Minimum }}'
-                      Maximum: '{{ Maximum }}'
-                  Aggregation: null
-                DateRangeFilter:
-                  Inclusive: '{{ Inclusive }}'
-                  Constant: null
-                RelativeDateFilter:
-                  TimeGranularity: null
-                  RelativeDateFilterFunction: '{{ RelativeDateFilterFunction }}'
-                  Constant: null
-            Columns:
-              - ColumnName: '{{ ColumnName }}'
-                ColumnFriendlyName: '{{ ColumnFriendlyName }}'
-                ColumnDescription: '{{ ColumnDescription }}'
-                ColumnSynonyms:
-                  - '{{ ColumnSynonyms[0] }}'
-                ColumnDataRole: '{{ ColumnDataRole }}'
-                Aggregation: '{{ Aggregation }}'
-                IsIncludedInTopic: '{{ IsIncludedInTopic }}'
-                DisableIndexing: '{{ DisableIndexing }}'
-                ComparativeOrder:
-                  UseOrdering: '{{ UseOrdering }}'
-                  SpecifedOrder:
-                    - '{{ SpecifedOrder[0] }}'
-                  TreatUndefinedSpecifiedValues: '{{ TreatUndefinedSpecifiedValues }}'
-                SemanticType:
-                  TypeName: '{{ TypeName }}'
-                  SubTypeName: '{{ SubTypeName }}'
-                  TypeParameters: {}
-                  TruthyCellValue: '{{ TruthyCellValue }}'
-                  TruthyCellValueSynonyms:
-                    - '{{ TruthyCellValueSynonyms[0] }}'
-                  FalseyCellValue: '{{ FalseyCellValue }}'
-                  FalseyCellValueSynonyms:
-                    - '{{ FalseyCellValueSynonyms[0] }}'
-                TimeGranularity: null
-                AllowedAggregations:
-                  - '{{ AllowedAggregations[0] }}'
-                NotAllowedAggregations:
+          - dataset_arn: '{{ dataset_arn }}'
+            dataset_name: '{{ dataset_name }}'
+            dataset_description: '{{ dataset_description }}'
+            data_aggregation:
+              dataset_row_date_granularity: '{{ dataset_row_date_granularity }}'
+              default_date_column_name: '{{ default_date_column_name }}'
+            filters:
+              - filter_description: '{{ filter_description }}'
+                filter_class: '{{ filter_class }}'
+                filter_name: '{{ filter_name }}'
+                filter_synonyms:
+                  - '{{ filter_synonyms[0] }}'
+                operand_field_name: '{{ operand_field_name }}'
+                filter_type: '{{ filter_type }}'
+                category_filter:
+                  category_filter_function: '{{ category_filter_function }}'
+                  category_filter_type: '{{ category_filter_type }}'
+                  constant:
+                    constant_type: '{{ constant_type }}'
+                    singular_constant: '{{ singular_constant }}'
+                    collective_constant:
+                      value_list:
+                        - '{{ value_list[0] }}'
+                  inverse: '{{ inverse }}'
+                numeric_equality_filter:
+                  constant:
+                    constant_type: null
+                    singular_constant: '{{ singular_constant }}'
+                  aggregation: '{{ aggregation }}'
+                numeric_range_filter:
+                  inclusive: '{{ inclusive }}'
+                  constant:
+                    constant_type: null
+                    range_constant:
+                      minimum: '{{ minimum }}'
+                      maximum: '{{ maximum }}'
+                  aggregation: null
+                date_range_filter:
+                  inclusive: '{{ inclusive }}'
+                  constant: null
+                relative_date_filter:
+                  time_granularity: null
+                  relative_date_filter_function: '{{ relative_date_filter_function }}'
+                  constant: null
+            columns:
+              - column_name: '{{ column_name }}'
+                column_friendly_name: '{{ column_friendly_name }}'
+                column_description: '{{ column_description }}'
+                column_synonyms:
+                  - '{{ column_synonyms[0] }}'
+                column_data_role: '{{ column_data_role }}'
+                aggregation: '{{ aggregation }}'
+                is_included_in_topic: '{{ is_included_in_topic }}'
+                disable_indexing: '{{ disable_indexing }}'
+                comparative_order:
+                  use_ordering: '{{ use_ordering }}'
+                  specifed_order:
+                    - '{{ specifed_order[0] }}'
+                  treat_undefined_specified_values: '{{ treat_undefined_specified_values }}'
+                semantic_type:
+                  type_name: '{{ type_name }}'
+                  sub_type_name: '{{ sub_type_name }}'
+                  type_parameters: {}
+                  truthy_cell_value: '{{ truthy_cell_value }}'
+                  truthy_cell_value_synonyms:
+                    - '{{ truthy_cell_value_synonyms[0] }}'
+                  falsey_cell_value: '{{ falsey_cell_value }}'
+                  falsey_cell_value_synonyms:
+                    - '{{ falsey_cell_value_synonyms[0] }}'
+                time_granularity: null
+                allowed_aggregations:
+                  - '{{ allowed_aggregations[0] }}'
+                not_allowed_aggregations:
                   - null
-                DefaultFormatting:
-                  DisplayFormat: '{{ DisplayFormat }}'
-                  DisplayFormatOptions:
-                    UseBlankCellFormat: '{{ UseBlankCellFormat }}'
-                    BlankCellFormat: '{{ BlankCellFormat }}'
-                    DateFormat: '{{ DateFormat }}'
-                    DecimalSeparator: '{{ DecimalSeparator }}'
-                    GroupingSeparator: '{{ GroupingSeparator }}'
-                    UseGrouping: '{{ UseGrouping }}'
-                    FractionDigits: null
-                    Prefix: '{{ Prefix }}'
-                    Suffix: '{{ Suffix }}'
-                    UnitScaler: '{{ UnitScaler }}'
-                    NegativeFormat:
-                      Prefix: '{{ Prefix }}'
-                      Suffix: '{{ Suffix }}'
-                    CurrencySymbol: '{{ CurrencySymbol }}'
-                NeverAggregateInFilter: '{{ NeverAggregateInFilter }}'
-                CellValueSynonyms:
-                  - CellValue: '{{ CellValue }}'
-                    Synonyms:
-                      - '{{ Synonyms[0] }}'
-                NonAdditive: '{{ NonAdditive }}'
-            CalculatedFields:
-              - CalculatedFieldName: '{{ CalculatedFieldName }}'
-                CalculatedFieldDescription: '{{ CalculatedFieldDescription }}'
-                Expression: '{{ Expression }}'
-                CalculatedFieldSynonyms:
-                  - '{{ CalculatedFieldSynonyms[0] }}'
-                IsIncludedInTopic: '{{ IsIncludedInTopic }}'
-                DisableIndexing: '{{ DisableIndexing }}'
-                ColumnDataRole: null
-                TimeGranularity: null
-                DefaultFormatting: null
-                Aggregation: null
-                ComparativeOrder: null
-                SemanticType: null
-                AllowedAggregations:
+                default_formatting:
+                  display_format: '{{ display_format }}'
+                  display_format_options:
+                    use_blank_cell_format: '{{ use_blank_cell_format }}'
+                    blank_cell_format: '{{ blank_cell_format }}'
+                    date_format: '{{ date_format }}'
+                    decimal_separator: '{{ decimal_separator }}'
+                    grouping_separator: '{{ grouping_separator }}'
+                    use_grouping: '{{ use_grouping }}'
+                    fraction_digits: null
+                    prefix: '{{ prefix }}'
+                    suffix: '{{ suffix }}'
+                    unit_scaler: '{{ unit_scaler }}'
+                    negative_format:
+                      prefix: '{{ prefix }}'
+                      suffix: '{{ suffix }}'
+                    currency_symbol: '{{ currency_symbol }}'
+                never_aggregate_in_filter: '{{ never_aggregate_in_filter }}'
+                cell_value_synonyms:
+                  - cell_value: '{{ cell_value }}'
+                    synonyms:
+                      - '{{ synonyms[0] }}'
+                non_additive: '{{ non_additive }}'
+            calculated_fields:
+              - calculated_field_name: '{{ calculated_field_name }}'
+                calculated_field_description: '{{ calculated_field_description }}'
+                expression: '{{ expression }}'
+                calculated_field_synonyms:
+                  - '{{ calculated_field_synonyms[0] }}'
+                is_included_in_topic: '{{ is_included_in_topic }}'
+                disable_indexing: '{{ disable_indexing }}'
+                column_data_role: null
+                time_granularity: null
+                default_formatting: null
+                aggregation: null
+                comparative_order: null
+                semantic_type: null
+                allowed_aggregations:
                   - null
-                NotAllowedAggregations:
+                not_allowed_aggregations:
                   - null
-                NeverAggregateInFilter: '{{ NeverAggregateInFilter }}'
-                CellValueSynonyms:
+                never_aggregate_in_filter: '{{ never_aggregate_in_filter }}'
+                cell_value_synonyms:
                   - null
-                NonAdditive: '{{ NonAdditive }}'
-            NamedEntities:
-              - EntityName: '{{ EntityName }}'
-                EntityDescription: '{{ EntityDescription }}'
-                EntitySynonyms:
-                  - '{{ EntitySynonyms[0] }}'
-                SemanticEntityType:
-                  TypeName: '{{ TypeName }}'
-                  SubTypeName: '{{ SubTypeName }}'
-                  TypeParameters: null
-                Definition:
-                  - FieldName: '{{ FieldName }}'
-                    PropertyName: '{{ PropertyName }}'
-                    PropertyRole: '{{ PropertyRole }}'
-                    PropertyUsage: '{{ PropertyUsage }}'
-                    Metric:
-                      Aggregation: '{{ Aggregation }}'
-                      AggregationFunctionParameters: {}
-      - name: Description
-        value: '{{ Description }}'
-      - name: FolderArns
+                non_additive: '{{ non_additive }}'
+            named_entities:
+              - entity_name: '{{ entity_name }}'
+                entity_description: '{{ entity_description }}'
+                entity_synonyms:
+                  - '{{ entity_synonyms[0] }}'
+                semantic_entity_type:
+                  type_name: '{{ type_name }}'
+                  sub_type_name: '{{ sub_type_name }}'
+                  type_parameters: null
+                definition:
+                  - field_name: '{{ field_name }}'
+                    property_name: '{{ property_name }}'
+                    property_role: '{{ property_role }}'
+                    property_usage: '{{ property_usage }}'
+                    metric:
+                      aggregation: '{{ aggregation }}'
+                      aggregation_function_parameters: {}
+      - name: description
+        value: '{{ description }}'
+      - name: folder_arns
         value:
-          - '{{ FolderArns[0] }}'
-      - name: Name
-        value: '{{ Name }}'
-      - name: Tags
+          - '{{ folder_arns[0] }}'
+      - name: name
+        value: '{{ name }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-      - name: TopicId
-        value: '{{ TopicId }}'
-      - name: UserExperienceVersion
-        value: '{{ UserExperienceVersion }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
+      - name: topic_id
+        value: '{{ topic_id }}'
+      - name: user_experience_version
+        value: '{{ user_experience_version }}'
 ```
 </TabItem>
 </Tabs>
@@ -1104,7 +1103,7 @@ SET PatchDocument = string('{{ {
     "UserExperienceVersion": user_experience_version
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<AwsAccountId>|<TopicId>';
+AND Identifier = '{{ aws_account_id }}|{{ topic_id }}';
 ```
 
 
@@ -1113,7 +1112,7 @@ AND Identifier = '<AwsAccountId>|<TopicId>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.quicksight.topics
-WHERE Identifier = '<AwsAccountId|TopicId>'
+WHERE Identifier = '{{ aws_account_id }}|{{ topic_id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/quicksight/vpc_connections/index.md b/website/docs/services/quicksight/vpc_connections/index.md
index 4734ec1d3..9d1c6536c 100644
--- a/website/docs/services/quicksight/vpc_connections/index.md
+++ b/website/docs/services/quicksight/vpc_connections/index.md
@@ -262,7 +262,7 @@ tags,
 vpc_connection_id,
 vpc_id
 FROM awscc.quicksight.vpc_connections
-WHERE region = 'us-east-1' AND Identifier = '<AwsAccountId>|<VPCConnectionId>';
+WHERE region = 'us-east-1' AND Identifier = '{{ aws_account_id }}|{{ vpc_connection_id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -307,16 +307,16 @@ INSERT INTO awscc.quicksight.vpc_connections (
  VPCConnectionId,
  region
 )
-SELECT 
-'{{ AvailabilityStatus }}',
- '{{ AwsAccountId }}',
- '{{ DnsResolvers }}',
- '{{ Name }}',
- '{{ RoleArn }}',
- '{{ SecurityGroupIds }}',
- '{{ SubnetIds }}',
- '{{ Tags }}',
- '{{ VPCConnectionId }}',
+SELECT
+'{{ availability_status }}',
+ '{{ aws_account_id }}',
+ '{{ dns_resolvers }}',
+ '{{ name }}',
+ '{{ role_arn }}',
+ '{{ security_group_ids }}',
+ '{{ subnet_ids }}',
+ '{{ tags }}',
+ '{{ vpc_connection_id }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -336,16 +336,16 @@ INSERT INTO awscc.quicksight.vpc_connections (
  VPCConnectionId,
  region
 )
-SELECT 
- '{{ AvailabilityStatus }}',
- '{{ AwsAccountId }}',
- '{{ DnsResolvers }}',
- '{{ Name }}',
- '{{ RoleArn }}',
- '{{ SecurityGroupIds }}',
- '{{ SubnetIds }}',
- '{{ Tags }}',
- '{{ VPCConnectionId }}',
+SELECT
+ '{{ availability_status }}',
+ '{{ aws_account_id }}',
+ '{{ dns_resolvers }}',
+ '{{ name }}',
+ '{{ role_arn }}',
+ '{{ security_group_ids }}',
+ '{{ subnet_ids }}',
+ '{{ tags }}',
+ '{{ vpc_connection_id }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -363,30 +363,29 @@ globals:
 resources:
   - name: vpc_connection
     props:
-      - name: AvailabilityStatus
-        value: '{{ AvailabilityStatus }}'
-      - name: AwsAccountId
-        value: '{{ AwsAccountId }}'
-      - name: DnsResolvers
+      - name: availability_status
+        value: '{{ availability_status }}'
+      - name: aws_account_id
+        value: '{{ aws_account_id }}'
+      - name: dns_resolvers
         value:
-          - '{{ DnsResolvers[0] }}'
-      - name: Name
-        value: '{{ Name }}'
-      - name: RoleArn
-        value: '{{ RoleArn }}'
-      - name: SecurityGroupIds
+          - '{{ dns_resolvers[0] }}'
+      - name: name
+        value: '{{ name }}'
+      - name: role_arn
+        value: '{{ role_arn }}'
+      - name: security_group_ids
         value:
-          - '{{ SecurityGroupIds[0] }}'
-      - name: SubnetIds
+          - '{{ security_group_ids[0] }}'
+      - name: subnet_ids
         value:
-          - '{{ SubnetIds[0] }}'
-      - name: Tags
+          - '{{ subnet_ids[0] }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-      - name: VPCConnectionId
-        value: '{{ VPCConnectionId }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
+      - name: vpc_connection_id
+        value: '{{ vpc_connection_id }}'
 ```
 </TabItem>
 </Tabs>
@@ -408,7 +407,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<AwsAccountId>|<VPCConnectionId>';
+AND Identifier = '{{ aws_account_id }}|{{ vpc_connection_id }}';
 ```
 
 
@@ -417,7 +416,7 @@ AND Identifier = '<AwsAccountId>|<VPCConnectionId>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.quicksight.vpc_connections
-WHERE Identifier = '<AwsAccountId|VPCConnectionId>'
+WHERE Identifier = '{{ aws_account_id }}|{{ vpc_connection_id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/ram/permissions/index.md b/website/docs/services/ram/permissions/index.md
index e4ae6532b..e2287164e 100644
--- a/website/docs/services/ram/permissions/index.md
+++ b/website/docs/services/ram/permissions/index.md
@@ -188,7 +188,7 @@ resource_type,
 policy_template,
 tags
 FROM awscc.ram.permissions
-WHERE region = 'us-east-1' AND Identifier = '<Arn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -226,10 +226,10 @@ INSERT INTO awscc.ram.permissions (
  PolicyTemplate,
  region
 )
-SELECT 
-'{{ Name }}',
- '{{ ResourceType }}',
- '{{ PolicyTemplate }}',
+SELECT
+'{{ name }}',
+ '{{ resource_type }}',
+ '{{ policy_template }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -244,11 +244,11 @@ INSERT INTO awscc.ram.permissions (
  Tags,
  region
 )
-SELECT 
- '{{ Name }}',
- '{{ ResourceType }}',
- '{{ PolicyTemplate }}',
- '{{ Tags }}',
+SELECT
+ '{{ name }}',
+ '{{ resource_type }}',
+ '{{ policy_template }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -266,17 +266,16 @@ globals:
 resources:
   - name: permission
     props:
-      - name: Name
-        value: '{{ Name }}'
-      - name: ResourceType
-        value: '{{ ResourceType }}'
-      - name: PolicyTemplate
+      - name: name
+        value: '{{ name }}'
+      - name: resource_type
+        value: '{{ resource_type }}'
+      - name: policy_template
         value: {}
-      - name: Tags
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -292,7 +291,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Arn>';
+AND Identifier = '{{ arn }}';
 ```
 
 
@@ -301,7 +300,7 @@ AND Identifier = '<Arn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.ram.permissions
-WHERE Identifier = '<Arn>'
+WHERE Identifier = '{{ arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/ram/resource_shares/index.md b/website/docs/services/ram/resource_shares/index.md
index cad9c6a48..814eb0aff 100644
--- a/website/docs/services/ram/resource_shares/index.md
+++ b/website/docs/services/ram/resource_shares/index.md
@@ -188,7 +188,7 @@ resource_arns,
 sources,
 tags
 FROM awscc.ram.resource_shares
-WHERE region = 'us-east-1' AND Identifier = '<Arn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -224,8 +224,8 @@ INSERT INTO awscc.ram.resource_shares (
  Name,
  region
 )
-SELECT 
-'{{ Name }}',
+SELECT
+'{{ name }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -243,14 +243,14 @@ INSERT INTO awscc.ram.resource_shares (
  Tags,
  region
 )
-SELECT 
- '{{ AllowExternalPrincipals }}',
- '{{ Name }}',
- '{{ PermissionArns }}',
- '{{ Principals }}',
- '{{ ResourceArns }}',
- '{{ Sources }}',
- '{{ Tags }}',
+SELECT
+ '{{ allow_external_principals }}',
+ '{{ name }}',
+ '{{ permission_arns }}',
+ '{{ principals }}',
+ '{{ resource_arns }}',
+ '{{ sources }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -268,27 +268,26 @@ globals:
 resources:
   - name: resource_share
     props:
-      - name: AllowExternalPrincipals
-        value: '{{ AllowExternalPrincipals }}'
-      - name: Name
-        value: '{{ Name }}'
-      - name: PermissionArns
+      - name: allow_external_principals
+        value: '{{ allow_external_principals }}'
+      - name: name
+        value: '{{ name }}'
+      - name: permission_arns
         value:
-          - '{{ PermissionArns[0] }}'
-      - name: Principals
+          - '{{ permission_arns[0] }}'
+      - name: principals
         value:
-          - '{{ Principals[0] }}'
-      - name: ResourceArns
+          - '{{ principals[0] }}'
+      - name: resource_arns
         value:
-          - '{{ ResourceArns[0] }}'
-      - name: Sources
+          - '{{ resource_arns[0] }}'
+      - name: sources
         value:
-          - '{{ Sources[0] }}'
-      - name: Tags
+          - '{{ sources[0] }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -310,7 +309,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Arn>';
+AND Identifier = '{{ arn }}';
 ```
 
 
@@ -319,7 +318,7 @@ AND Identifier = '<Arn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.ram.resource_shares
-WHERE Identifier = '<Arn>'
+WHERE Identifier = '{{ arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/rbin/rules/index.md b/website/docs/services/rbin/rules/index.md
index 1518cc66b..a1d68f6d3 100644
--- a/website/docs/services/rbin/rules/index.md
+++ b/website/docs/services/rbin/rules/index.md
@@ -242,7 +242,7 @@ status,
 lock_configuration,
 lock_state
 FROM awscc.rbin.rules
-WHERE region = 'us-east-1' AND Identifier = '<Arn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -279,9 +279,9 @@ INSERT INTO awscc.rbin.rules (
  RetentionPeriod,
  region
 )
-SELECT 
-'{{ ResourceType }}',
- '{{ RetentionPeriod }}',
+SELECT
+'{{ resource_type }}',
+ '{{ retention_period }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -300,15 +300,15 @@ INSERT INTO awscc.rbin.rules (
  LockConfiguration,
  region
 )
-SELECT 
- '{{ Description }}',
- '{{ ResourceTags }}',
- '{{ ExcludeResourceTags }}',
- '{{ ResourceType }}',
- '{{ Tags }}',
- '{{ RetentionPeriod }}',
- '{{ Status }}',
- '{{ LockConfiguration }}',
+SELECT
+ '{{ description }}',
+ '{{ resource_tags }}',
+ '{{ exclude_resource_tags }}',
+ '{{ resource_type }}',
+ '{{ tags }}',
+ '{{ retention_period }}',
+ '{{ status }}',
+ '{{ lock_configuration }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -326,32 +326,31 @@ globals:
 resources:
   - name: rule
     props:
-      - name: Description
-        value: '{{ Description }}'
-      - name: ResourceTags
+      - name: description
+        value: '{{ description }}'
+      - name: resource_tags
         value:
-          - ResourceTagKey: '{{ ResourceTagKey }}'
-            ResourceTagValue: '{{ ResourceTagValue }}'
-      - name: ExcludeResourceTags
+          - resource_tag_key: '{{ resource_tag_key }}'
+            resource_tag_value: '{{ resource_tag_value }}'
+      - name: exclude_resource_tags
         value:
           - null
-      - name: ResourceType
-        value: '{{ ResourceType }}'
-      - name: Tags
+      - name: resource_type
+        value: '{{ resource_type }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-      - name: RetentionPeriod
+          - key: '{{ key }}'
+            value: '{{ value }}'
+      - name: retention_period
         value:
-          RetentionPeriodValue: '{{ RetentionPeriodValue }}'
-          RetentionPeriodUnit: '{{ RetentionPeriodUnit }}'
-      - name: Status
-        value: '{{ Status }}'
-      - name: LockConfiguration
+          retention_period_value: '{{ retention_period_value }}'
+          retention_period_unit: '{{ retention_period_unit }}'
+      - name: status
+        value: '{{ status }}'
+      - name: lock_configuration
         value:
-          UnlockDelayValue: '{{ UnlockDelayValue }}'
-          UnlockDelayUnit: '{{ UnlockDelayUnit }}'
-
+          unlock_delay_value: '{{ unlock_delay_value }}'
+          unlock_delay_unit: '{{ unlock_delay_unit }}'
 ```
 </TabItem>
 </Tabs>
@@ -373,7 +372,7 @@ SET PatchDocument = string('{{ {
     "LockConfiguration": lock_configuration
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Arn>';
+AND Identifier = '{{ arn }}';
 ```
 
 
@@ -382,7 +381,7 @@ AND Identifier = '<Arn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.rbin.rules
-WHERE Identifier = '<Arn>'
+WHERE Identifier = '{{ arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/rds/customdb_engine_versions/index.md b/website/docs/services/rds/customdb_engine_versions/index.md
index fe3532806..6ac0b7b3a 100644
--- a/website/docs/services/rds/customdb_engine_versions/index.md
+++ b/website/docs/services/rds/customdb_engine_versions/index.md
@@ -223,7 +223,7 @@ image_id,
 status,
 tags
 FROM awscc.rds.customdb_engine_versions
-WHERE region = 'us-east-1' AND Identifier = '<Engine>|<EngineVersion>';
+WHERE region = 'us-east-1' AND Identifier = '{{ engine }}|{{ engine_version }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -261,9 +261,9 @@ INSERT INTO awscc.rds.customdb_engine_versions (
  EngineVersion,
  region
 )
-SELECT 
-'{{ Engine }}',
- '{{ EngineVersion }}',
+SELECT
+'{{ engine }}',
+ '{{ engine_version }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -286,19 +286,19 @@ INSERT INTO awscc.rds.customdb_engine_versions (
  Tags,
  region
 )
-SELECT 
- '{{ DatabaseInstallationFilesS3BucketName }}',
- '{{ DatabaseInstallationFilesS3Prefix }}',
- '{{ Description }}',
- '{{ Engine }}',
- '{{ EngineVersion }}',
- '{{ KMSKeyId }}',
- '{{ Manifest }}',
- '{{ SourceCustomDbEngineVersionIdentifier }}',
- '{{ UseAwsProvidedLatestImage }}',
- '{{ ImageId }}',
- '{{ Status }}',
- '{{ Tags }}',
+SELECT
+ '{{ database_installation_files_s3_bucket_name }}',
+ '{{ database_installation_files_s3_prefix }}',
+ '{{ description }}',
+ '{{ engine }}',
+ '{{ engine_version }}',
+ '{{ kms_key_id }}',
+ '{{ manifest }}',
+ '{{ source_custom_db_engine_version_identifier }}',
+ '{{ use_aws_provided_latest_image }}',
+ '{{ image_id }}',
+ '{{ status }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -316,33 +316,32 @@ globals:
 resources:
   - name: customdb_engine_version
     props:
-      - name: DatabaseInstallationFilesS3BucketName
-        value: '{{ DatabaseInstallationFilesS3BucketName }}'
-      - name: DatabaseInstallationFilesS3Prefix
-        value: '{{ DatabaseInstallationFilesS3Prefix }}'
-      - name: Description
-        value: '{{ Description }}'
-      - name: Engine
-        value: '{{ Engine }}'
-      - name: EngineVersion
-        value: '{{ EngineVersion }}'
-      - name: KMSKeyId
-        value: '{{ KMSKeyId }}'
-      - name: Manifest
-        value: '{{ Manifest }}'
-      - name: SourceCustomDbEngineVersionIdentifier
-        value: '{{ SourceCustomDbEngineVersionIdentifier }}'
-      - name: UseAwsProvidedLatestImage
-        value: '{{ UseAwsProvidedLatestImage }}'
-      - name: ImageId
-        value: '{{ ImageId }}'
-      - name: Status
-        value: '{{ Status }}'
-      - name: Tags
+      - name: database_installation_files_s3_bucket_name
+        value: '{{ database_installation_files_s3_bucket_name }}'
+      - name: database_installation_files_s3_prefix
+        value: '{{ database_installation_files_s3_prefix }}'
+      - name: description
+        value: '{{ description }}'
+      - name: engine
+        value: '{{ engine }}'
+      - name: engine_version
+        value: '{{ engine_version }}'
+      - name: kms_key_id
+        value: '{{ kms_key_id }}'
+      - name: manifest
+        value: '{{ manifest }}'
+      - name: source_custom_db_engine_version_identifier
+        value: '{{ source_custom_db_engine_version_identifier }}'
+      - name: use_aws_provided_latest_image
+        value: '{{ use_aws_provided_latest_image }}'
+      - name: image_id
+        value: '{{ image_id }}'
+      - name: status
+        value: '{{ status }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -360,7 +359,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Engine>|<EngineVersion>';
+AND Identifier = '{{ engine }}|{{ engine_version }}';
 ```
 
 
@@ -369,7 +368,7 @@ AND Identifier = '<Engine>|<EngineVersion>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.rds.customdb_engine_versions
-WHERE Identifier = '<Engine|EngineVersion>'
+WHERE Identifier = '{{ engine }}|{{ engine_version }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/rds/db_cluster_parameter_groups/index.md b/website/docs/services/rds/db_cluster_parameter_groups/index.md
index a5231ea5b..c175ec9ce 100644
--- a/website/docs/services/rds/db_cluster_parameter_groups/index.md
+++ b/website/docs/services/rds/db_cluster_parameter_groups/index.md
@@ -170,7 +170,7 @@ parameters,
 db_cluster_parameter_group_name,
 tags
 FROM awscc.rds.db_cluster_parameter_groups
-WHERE region = 'us-east-1' AND Identifier = '<DBClusterParameterGroupName>';
+WHERE region = 'us-east-1' AND Identifier = '{{ db_cluster_parameter_group_name }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -208,10 +208,10 @@ INSERT INTO awscc.rds.db_cluster_parameter_groups (
  Parameters,
  region
 )
-SELECT 
-'{{ Description }}',
- '{{ Family }}',
- '{{ Parameters }}',
+SELECT
+'{{ description }}',
+ '{{ family }}',
+ '{{ parameters }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -227,12 +227,12 @@ INSERT INTO awscc.rds.db_cluster_parameter_groups (
  Tags,
  region
 )
-SELECT 
- '{{ Description }}',
- '{{ Family }}',
- '{{ Parameters }}',
- '{{ DBClusterParameterGroupName }}',
- '{{ Tags }}',
+SELECT
+ '{{ description }}',
+ '{{ family }}',
+ '{{ parameters }}',
+ '{{ db_cluster_parameter_group_name }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -250,19 +250,18 @@ globals:
 resources:
   - name: db_cluster_parameter_group
     props:
-      - name: Description
-        value: '{{ Description }}'
-      - name: Family
-        value: '{{ Family }}'
-      - name: Parameters
+      - name: description
+        value: '{{ description }}'
+      - name: family
+        value: '{{ family }}'
+      - name: parameters
         value: {}
-      - name: DBClusterParameterGroupName
-        value: '{{ DBClusterParameterGroupName }}'
-      - name: Tags
+      - name: db_cluster_parameter_group_name
+        value: '{{ db_cluster_parameter_group_name }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -279,7 +278,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<DBClusterParameterGroupName>';
+AND Identifier = '{{ db_cluster_parameter_group_name }}';
 ```
 
 
@@ -288,7 +287,7 @@ AND Identifier = '<DBClusterParameterGroupName>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.rds.db_cluster_parameter_groups
-WHERE Identifier = '<DBClusterParameterGroupName>'
+WHERE Identifier = '{{ db_cluster_parameter_group_name }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/rds/db_clusters/index.md b/website/docs/services/rds/db_clusters/index.md
index 946f6b3d9..d18b30c2e 100644
--- a/website/docs/services/rds/db_clusters/index.md
+++ b/website/docs/services/rds/db_clusters/index.md
@@ -627,7 +627,7 @@ tags,
 use_latest_restorable_time,
 vpc_security_group_ids
 FROM awscc.rds.db_clusters
-WHERE region = 'us-east-1' AND Identifier = '<DBClusterIdentifier>';
+WHERE region = 'us-east-1' AND Identifier = '{{ db_cluster_identifier }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -722,67 +722,67 @@ INSERT INTO awscc.rds.db_clusters (
  VpcSecurityGroupIds,
  region
 )
-SELECT 
-'{{ AllocatedStorage }}',
- '{{ AssociatedRoles }}',
- '{{ AvailabilityZones }}',
- '{{ AutoMinorVersionUpgrade }}',
- '{{ BacktrackWindow }}',
- '{{ BackupRetentionPeriod }}',
- '{{ ClusterScalabilityType }}',
- '{{ CopyTagsToSnapshot }}',
- '{{ DatabaseInsightsMode }}',
- '{{ DatabaseName }}',
- '{{ DBClusterInstanceClass }}',
- '{{ DBInstanceParameterGroupName }}',
- '{{ DBSystemId }}',
- '{{ GlobalClusterIdentifier }}',
- '{{ DBClusterIdentifier }}',
- '{{ DBClusterParameterGroupName }}',
- '{{ DBSubnetGroupName }}',
- '{{ DeleteAutomatedBackups }}',
- '{{ DeletionProtection }}',
- '{{ Domain }}',
- '{{ DomainIAMRoleName }}',
- '{{ EnableCloudwatchLogsExports }}',
- '{{ EnableGlobalWriteForwarding }}',
- '{{ EnableHttpEndpoint }}',
- '{{ EnableIAMDatabaseAuthentication }}',
- '{{ EnableLocalWriteForwarding }}',
- '{{ Engine }}',
- '{{ EngineLifecycleSupport }}',
- '{{ EngineMode }}',
- '{{ EngineVersion }}',
- '{{ ManageMasterUserPassword }}',
- '{{ Iops }}',
- '{{ KmsKeyId }}',
- '{{ MasterUsername }}',
- '{{ MasterUserPassword }}',
- '{{ MasterUserSecret }}',
- '{{ MonitoringInterval }}',
- '{{ MonitoringRoleArn }}',
- '{{ NetworkType }}',
- '{{ PerformanceInsightsEnabled }}',
- '{{ PerformanceInsightsKmsKeyId }}',
- '{{ PerformanceInsightsRetentionPeriod }}',
- '{{ Port }}',
- '{{ PreferredBackupWindow }}',
- '{{ PreferredMaintenanceWindow }}',
- '{{ PubliclyAccessible }}',
- '{{ ReplicationSourceIdentifier }}',
- '{{ RestoreToTime }}',
- '{{ RestoreType }}',
- '{{ ServerlessV2ScalingConfiguration }}',
- '{{ ScalingConfiguration }}',
- '{{ SnapshotIdentifier }}',
- '{{ SourceDBClusterIdentifier }}',
- '{{ SourceDbClusterResourceId }}',
- '{{ SourceRegion }}',
- '{{ StorageEncrypted }}',
- '{{ StorageType }}',
- '{{ Tags }}',
- '{{ UseLatestRestorableTime }}',
- '{{ VpcSecurityGroupIds }}',
+SELECT
+'{{ allocated_storage }}',
+ '{{ associated_roles }}',
+ '{{ availability_zones }}',
+ '{{ auto_minor_version_upgrade }}',
+ '{{ backtrack_window }}',
+ '{{ backup_retention_period }}',
+ '{{ cluster_scalability_type }}',
+ '{{ copy_tags_to_snapshot }}',
+ '{{ database_insights_mode }}',
+ '{{ database_name }}',
+ '{{ db_cluster_instance_class }}',
+ '{{ db_instance_parameter_group_name }}',
+ '{{ db_system_id }}',
+ '{{ global_cluster_identifier }}',
+ '{{ db_cluster_identifier }}',
+ '{{ db_cluster_parameter_group_name }}',
+ '{{ db_subnet_group_name }}',
+ '{{ delete_automated_backups }}',
+ '{{ deletion_protection }}',
+ '{{ domain }}',
+ '{{ domain_iam_role_name }}',
+ '{{ enable_cloudwatch_logs_exports }}',
+ '{{ enable_global_write_forwarding }}',
+ '{{ enable_http_endpoint }}',
+ '{{ enable_iam_database_authentication }}',
+ '{{ enable_local_write_forwarding }}',
+ '{{ engine }}',
+ '{{ engine_lifecycle_support }}',
+ '{{ engine_mode }}',
+ '{{ engine_version }}',
+ '{{ manage_master_user_password }}',
+ '{{ iops }}',
+ '{{ kms_key_id }}',
+ '{{ master_username }}',
+ '{{ master_user_password }}',
+ '{{ master_user_secret }}',
+ '{{ monitoring_interval }}',
+ '{{ monitoring_role_arn }}',
+ '{{ network_type }}',
+ '{{ performance_insights_enabled }}',
+ '{{ performance_insights_kms_key_id }}',
+ '{{ performance_insights_retention_period }}',
+ '{{ port }}',
+ '{{ preferred_backup_window }}',
+ '{{ preferred_maintenance_window }}',
+ '{{ publicly_accessible }}',
+ '{{ replication_source_identifier }}',
+ '{{ restore_to_time }}',
+ '{{ restore_type }}',
+ '{{ serverless_v2_scaling_configuration }}',
+ '{{ scaling_configuration }}',
+ '{{ snapshot_identifier }}',
+ '{{ source_db_cluster_identifier }}',
+ '{{ source_db_cluster_resource_id }}',
+ '{{ source_region }}',
+ '{{ storage_encrypted }}',
+ '{{ storage_type }}',
+ '{{ tags }}',
+ '{{ use_latest_restorable_time }}',
+ '{{ vpc_security_group_ids }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -853,67 +853,67 @@ INSERT INTO awscc.rds.db_clusters (
  VpcSecurityGroupIds,
  region
 )
-SELECT 
- '{{ AllocatedStorage }}',
- '{{ AssociatedRoles }}',
- '{{ AvailabilityZones }}',
- '{{ AutoMinorVersionUpgrade }}',
- '{{ BacktrackWindow }}',
- '{{ BackupRetentionPeriod }}',
- '{{ ClusterScalabilityType }}',
- '{{ CopyTagsToSnapshot }}',
- '{{ DatabaseInsightsMode }}',
- '{{ DatabaseName }}',
- '{{ DBClusterInstanceClass }}',
- '{{ DBInstanceParameterGroupName }}',
- '{{ DBSystemId }}',
- '{{ GlobalClusterIdentifier }}',
- '{{ DBClusterIdentifier }}',
- '{{ DBClusterParameterGroupName }}',
- '{{ DBSubnetGroupName }}',
- '{{ DeleteAutomatedBackups }}',
- '{{ DeletionProtection }}',
- '{{ Domain }}',
- '{{ DomainIAMRoleName }}',
- '{{ EnableCloudwatchLogsExports }}',
- '{{ EnableGlobalWriteForwarding }}',
- '{{ EnableHttpEndpoint }}',
- '{{ EnableIAMDatabaseAuthentication }}',
- '{{ EnableLocalWriteForwarding }}',
- '{{ Engine }}',
- '{{ EngineLifecycleSupport }}',
- '{{ EngineMode }}',
- '{{ EngineVersion }}',
- '{{ ManageMasterUserPassword }}',
- '{{ Iops }}',
- '{{ KmsKeyId }}',
- '{{ MasterUsername }}',
- '{{ MasterUserPassword }}',
- '{{ MasterUserSecret }}',
- '{{ MonitoringInterval }}',
- '{{ MonitoringRoleArn }}',
- '{{ NetworkType }}',
- '{{ PerformanceInsightsEnabled }}',
- '{{ PerformanceInsightsKmsKeyId }}',
- '{{ PerformanceInsightsRetentionPeriod }}',
- '{{ Port }}',
- '{{ PreferredBackupWindow }}',
- '{{ PreferredMaintenanceWindow }}',
- '{{ PubliclyAccessible }}',
- '{{ ReplicationSourceIdentifier }}',
- '{{ RestoreToTime }}',
- '{{ RestoreType }}',
- '{{ ServerlessV2ScalingConfiguration }}',
- '{{ ScalingConfiguration }}',
- '{{ SnapshotIdentifier }}',
- '{{ SourceDBClusterIdentifier }}',
- '{{ SourceDbClusterResourceId }}',
- '{{ SourceRegion }}',
- '{{ StorageEncrypted }}',
- '{{ StorageType }}',
- '{{ Tags }}',
- '{{ UseLatestRestorableTime }}',
- '{{ VpcSecurityGroupIds }}',
+SELECT
+ '{{ allocated_storage }}',
+ '{{ associated_roles }}',
+ '{{ availability_zones }}',
+ '{{ auto_minor_version_upgrade }}',
+ '{{ backtrack_window }}',
+ '{{ backup_retention_period }}',
+ '{{ cluster_scalability_type }}',
+ '{{ copy_tags_to_snapshot }}',
+ '{{ database_insights_mode }}',
+ '{{ database_name }}',
+ '{{ db_cluster_instance_class }}',
+ '{{ db_instance_parameter_group_name }}',
+ '{{ db_system_id }}',
+ '{{ global_cluster_identifier }}',
+ '{{ db_cluster_identifier }}',
+ '{{ db_cluster_parameter_group_name }}',
+ '{{ db_subnet_group_name }}',
+ '{{ delete_automated_backups }}',
+ '{{ deletion_protection }}',
+ '{{ domain }}',
+ '{{ domain_iam_role_name }}',
+ '{{ enable_cloudwatch_logs_exports }}',
+ '{{ enable_global_write_forwarding }}',
+ '{{ enable_http_endpoint }}',
+ '{{ enable_iam_database_authentication }}',
+ '{{ enable_local_write_forwarding }}',
+ '{{ engine }}',
+ '{{ engine_lifecycle_support }}',
+ '{{ engine_mode }}',
+ '{{ engine_version }}',
+ '{{ manage_master_user_password }}',
+ '{{ iops }}',
+ '{{ kms_key_id }}',
+ '{{ master_username }}',
+ '{{ master_user_password }}',
+ '{{ master_user_secret }}',
+ '{{ monitoring_interval }}',
+ '{{ monitoring_role_arn }}',
+ '{{ network_type }}',
+ '{{ performance_insights_enabled }}',
+ '{{ performance_insights_kms_key_id }}',
+ '{{ performance_insights_retention_period }}',
+ '{{ port }}',
+ '{{ preferred_backup_window }}',
+ '{{ preferred_maintenance_window }}',
+ '{{ publicly_accessible }}',
+ '{{ replication_source_identifier }}',
+ '{{ restore_to_time }}',
+ '{{ restore_type }}',
+ '{{ serverless_v2_scaling_configuration }}',
+ '{{ scaling_configuration }}',
+ '{{ snapshot_identifier }}',
+ '{{ source_db_cluster_identifier }}',
+ '{{ source_db_cluster_resource_id }}',
+ '{{ source_region }}',
+ '{{ storage_encrypted }}',
+ '{{ storage_type }}',
+ '{{ tags }}',
+ '{{ use_latest_restorable_time }}',
+ '{{ vpc_security_group_ids }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -931,145 +931,144 @@ globals:
 resources:
   - name: db_cluster
     props:
-      - name: AllocatedStorage
-        value: '{{ AllocatedStorage }}'
-      - name: AssociatedRoles
+      - name: allocated_storage
+        value: '{{ allocated_storage }}'
+      - name: associated_roles
         value:
-          - FeatureName: '{{ FeatureName }}'
-            RoleArn: '{{ RoleArn }}'
-      - name: AvailabilityZones
+          - feature_name: '{{ feature_name }}'
+            role_arn: '{{ role_arn }}'
+      - name: availability_zones
         value:
-          - '{{ AvailabilityZones[0] }}'
-      - name: AutoMinorVersionUpgrade
-        value: '{{ AutoMinorVersionUpgrade }}'
-      - name: BacktrackWindow
-        value: '{{ BacktrackWindow }}'
-      - name: BackupRetentionPeriod
-        value: '{{ BackupRetentionPeriod }}'
-      - name: ClusterScalabilityType
-        value: '{{ ClusterScalabilityType }}'
-      - name: CopyTagsToSnapshot
-        value: '{{ CopyTagsToSnapshot }}'
-      - name: DatabaseInsightsMode
-        value: '{{ DatabaseInsightsMode }}'
-      - name: DatabaseName
-        value: '{{ DatabaseName }}'
-      - name: DBClusterInstanceClass
-        value: '{{ DBClusterInstanceClass }}'
-      - name: DBInstanceParameterGroupName
-        value: '{{ DBInstanceParameterGroupName }}'
-      - name: DBSystemId
-        value: '{{ DBSystemId }}'
-      - name: GlobalClusterIdentifier
-        value: '{{ GlobalClusterIdentifier }}'
-      - name: DBClusterIdentifier
-        value: '{{ DBClusterIdentifier }}'
-      - name: DBClusterParameterGroupName
-        value: '{{ DBClusterParameterGroupName }}'
-      - name: DBSubnetGroupName
-        value: '{{ DBSubnetGroupName }}'
-      - name: DeleteAutomatedBackups
-        value: '{{ DeleteAutomatedBackups }}'
-      - name: DeletionProtection
-        value: '{{ DeletionProtection }}'
-      - name: Domain
-        value: '{{ Domain }}'
-      - name: DomainIAMRoleName
-        value: '{{ DomainIAMRoleName }}'
-      - name: EnableCloudwatchLogsExports
+          - '{{ availability_zones[0] }}'
+      - name: auto_minor_version_upgrade
+        value: '{{ auto_minor_version_upgrade }}'
+      - name: backtrack_window
+        value: '{{ backtrack_window }}'
+      - name: backup_retention_period
+        value: '{{ backup_retention_period }}'
+      - name: cluster_scalability_type
+        value: '{{ cluster_scalability_type }}'
+      - name: copy_tags_to_snapshot
+        value: '{{ copy_tags_to_snapshot }}'
+      - name: database_insights_mode
+        value: '{{ database_insights_mode }}'
+      - name: database_name
+        value: '{{ database_name }}'
+      - name: db_cluster_instance_class
+        value: '{{ db_cluster_instance_class }}'
+      - name: db_instance_parameter_group_name
+        value: '{{ db_instance_parameter_group_name }}'
+      - name: db_system_id
+        value: '{{ db_system_id }}'
+      - name: global_cluster_identifier
+        value: '{{ global_cluster_identifier }}'
+      - name: db_cluster_identifier
+        value: '{{ db_cluster_identifier }}'
+      - name: db_cluster_parameter_group_name
+        value: '{{ db_cluster_parameter_group_name }}'
+      - name: db_subnet_group_name
+        value: '{{ db_subnet_group_name }}'
+      - name: delete_automated_backups
+        value: '{{ delete_automated_backups }}'
+      - name: deletion_protection
+        value: '{{ deletion_protection }}'
+      - name: domain
+        value: '{{ domain }}'
+      - name: domain_iam_role_name
+        value: '{{ domain_iam_role_name }}'
+      - name: enable_cloudwatch_logs_exports
         value:
-          - '{{ EnableCloudwatchLogsExports[0] }}'
-      - name: EnableGlobalWriteForwarding
-        value: '{{ EnableGlobalWriteForwarding }}'
-      - name: EnableHttpEndpoint
-        value: '{{ EnableHttpEndpoint }}'
-      - name: EnableIAMDatabaseAuthentication
-        value: '{{ EnableIAMDatabaseAuthentication }}'
-      - name: EnableLocalWriteForwarding
-        value: '{{ EnableLocalWriteForwarding }}'
-      - name: Engine
-        value: '{{ Engine }}'
-      - name: EngineLifecycleSupport
-        value: '{{ EngineLifecycleSupport }}'
-      - name: EngineMode
-        value: '{{ EngineMode }}'
-      - name: EngineVersion
-        value: '{{ EngineVersion }}'
-      - name: ManageMasterUserPassword
-        value: '{{ ManageMasterUserPassword }}'
-      - name: Iops
-        value: '{{ Iops }}'
-      - name: KmsKeyId
-        value: '{{ KmsKeyId }}'
-      - name: MasterUsername
-        value: '{{ MasterUsername }}'
-      - name: MasterUserPassword
-        value: '{{ MasterUserPassword }}'
-      - name: MasterUserSecret
+          - '{{ enable_cloudwatch_logs_exports[0] }}'
+      - name: enable_global_write_forwarding
+        value: '{{ enable_global_write_forwarding }}'
+      - name: enable_http_endpoint
+        value: '{{ enable_http_endpoint }}'
+      - name: enable_iam_database_authentication
+        value: '{{ enable_iam_database_authentication }}'
+      - name: enable_local_write_forwarding
+        value: '{{ enable_local_write_forwarding }}'
+      - name: engine
+        value: '{{ engine }}'
+      - name: engine_lifecycle_support
+        value: '{{ engine_lifecycle_support }}'
+      - name: engine_mode
+        value: '{{ engine_mode }}'
+      - name: engine_version
+        value: '{{ engine_version }}'
+      - name: manage_master_user_password
+        value: '{{ manage_master_user_password }}'
+      - name: iops
+        value: '{{ iops }}'
+      - name: kms_key_id
+        value: '{{ kms_key_id }}'
+      - name: master_username
+        value: '{{ master_username }}'
+      - name: master_user_password
+        value: '{{ master_user_password }}'
+      - name: master_user_secret
         value:
-          SecretArn: '{{ SecretArn }}'
-          KmsKeyId: '{{ KmsKeyId }}'
-      - name: MonitoringInterval
-        value: '{{ MonitoringInterval }}'
-      - name: MonitoringRoleArn
-        value: '{{ MonitoringRoleArn }}'
-      - name: NetworkType
-        value: '{{ NetworkType }}'
-      - name: PerformanceInsightsEnabled
-        value: '{{ PerformanceInsightsEnabled }}'
-      - name: PerformanceInsightsKmsKeyId
-        value: '{{ PerformanceInsightsKmsKeyId }}'
-      - name: PerformanceInsightsRetentionPeriod
-        value: '{{ PerformanceInsightsRetentionPeriod }}'
-      - name: Port
-        value: '{{ Port }}'
-      - name: PreferredBackupWindow
-        value: '{{ PreferredBackupWindow }}'
-      - name: PreferredMaintenanceWindow
-        value: '{{ PreferredMaintenanceWindow }}'
-      - name: PubliclyAccessible
-        value: '{{ PubliclyAccessible }}'
-      - name: ReplicationSourceIdentifier
-        value: '{{ ReplicationSourceIdentifier }}'
-      - name: RestoreToTime
-        value: '{{ RestoreToTime }}'
-      - name: RestoreType
-        value: '{{ RestoreType }}'
-      - name: ServerlessV2ScalingConfiguration
+          secret_arn: '{{ secret_arn }}'
+          kms_key_id: '{{ kms_key_id }}'
+      - name: monitoring_interval
+        value: '{{ monitoring_interval }}'
+      - name: monitoring_role_arn
+        value: '{{ monitoring_role_arn }}'
+      - name: network_type
+        value: '{{ network_type }}'
+      - name: performance_insights_enabled
+        value: '{{ performance_insights_enabled }}'
+      - name: performance_insights_kms_key_id
+        value: '{{ performance_insights_kms_key_id }}'
+      - name: performance_insights_retention_period
+        value: '{{ performance_insights_retention_period }}'
+      - name: port
+        value: '{{ port }}'
+      - name: preferred_backup_window
+        value: '{{ preferred_backup_window }}'
+      - name: preferred_maintenance_window
+        value: '{{ preferred_maintenance_window }}'
+      - name: publicly_accessible
+        value: '{{ publicly_accessible }}'
+      - name: replication_source_identifier
+        value: '{{ replication_source_identifier }}'
+      - name: restore_to_time
+        value: '{{ restore_to_time }}'
+      - name: restore_type
+        value: '{{ restore_type }}'
+      - name: serverless_v2_scaling_configuration
         value:
-          MinCapacity: null
-          MaxCapacity: null
-          SecondsUntilAutoPause: '{{ SecondsUntilAutoPause }}'
-      - name: ScalingConfiguration
+          min_capacity: null
+          max_capacity: null
+          seconds_until_auto_pause: '{{ seconds_until_auto_pause }}'
+      - name: scaling_configuration
         value:
-          AutoPause: '{{ AutoPause }}'
-          MaxCapacity: '{{ MaxCapacity }}'
-          MinCapacity: '{{ MinCapacity }}'
-          SecondsBeforeTimeout: '{{ SecondsBeforeTimeout }}'
-          SecondsUntilAutoPause: '{{ SecondsUntilAutoPause }}'
-          TimeoutAction: '{{ TimeoutAction }}'
-      - name: SnapshotIdentifier
-        value: '{{ SnapshotIdentifier }}'
-      - name: SourceDBClusterIdentifier
-        value: '{{ SourceDBClusterIdentifier }}'
-      - name: SourceDbClusterResourceId
-        value: '{{ SourceDbClusterResourceId }}'
-      - name: SourceRegion
-        value: '{{ SourceRegion }}'
-      - name: StorageEncrypted
-        value: '{{ StorageEncrypted }}'
-      - name: StorageType
-        value: '{{ StorageType }}'
-      - name: Tags
+          auto_pause: '{{ auto_pause }}'
+          max_capacity: '{{ max_capacity }}'
+          min_capacity: '{{ min_capacity }}'
+          seconds_before_timeout: '{{ seconds_before_timeout }}'
+          seconds_until_auto_pause: '{{ seconds_until_auto_pause }}'
+          timeout_action: '{{ timeout_action }}'
+      - name: snapshot_identifier
+        value: '{{ snapshot_identifier }}'
+      - name: source_db_cluster_identifier
+        value: '{{ source_db_cluster_identifier }}'
+      - name: source_db_cluster_resource_id
+        value: '{{ source_db_cluster_resource_id }}'
+      - name: source_region
+        value: '{{ source_region }}'
+      - name: storage_encrypted
+        value: '{{ storage_encrypted }}'
+      - name: storage_type
+        value: '{{ storage_type }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-      - name: UseLatestRestorableTime
-        value: '{{ UseLatestRestorableTime }}'
-      - name: VpcSecurityGroupIds
+          - key: '{{ key }}'
+            value: '{{ value }}'
+      - name: use_latest_restorable_time
+        value: '{{ use_latest_restorable_time }}'
+      - name: vpc_security_group_ids
         value:
-          - '{{ VpcSecurityGroupIds[0] }}'
-
+          - '{{ vpc_security_group_ids[0] }}'
 ```
 </TabItem>
 </Tabs>
@@ -1126,7 +1125,7 @@ SET PatchDocument = string('{{ {
     "VpcSecurityGroupIds": vpc_security_group_ids
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<DBClusterIdentifier>';
+AND Identifier = '{{ db_cluster_identifier }}';
 ```
 
 
@@ -1135,7 +1134,7 @@ AND Identifier = '<DBClusterIdentifier>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.rds.db_clusters
-WHERE Identifier = '<DBClusterIdentifier>'
+WHERE Identifier = '{{ db_cluster_identifier }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/rds/db_instances/index.md b/website/docs/services/rds/db_instances/index.md
index eb720bcb2..73a7a6365 100644
--- a/website/docs/services/rds/db_instances/index.md
+++ b/website/docs/services/rds/db_instances/index.md
@@ -804,7 +804,7 @@ use_latest_restorable_time,
 vpc_security_groups,
 apply_immediately
 FROM awscc.rds.db_instances
-WHERE region = 'us-east-1' AND Identifier = '<DBInstanceIdentifier>';
+WHERE region = 'us-east-1' AND Identifier = '{{ db_instance_identifier }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -920,88 +920,88 @@ INSERT INTO awscc.rds.db_instances (
  ApplyImmediately,
  region
 )
-SELECT 
-'{{ AllocatedStorage }}',
- '{{ AllowMajorVersionUpgrade }}',
- '{{ AssociatedRoles }}',
- '{{ AutoMinorVersionUpgrade }}',
- '{{ AutomaticBackupReplicationRegion }}',
- '{{ AutomaticBackupReplicationKmsKeyId }}',
- '{{ AutomaticBackupReplicationRetentionPeriod }}',
- '{{ AvailabilityZone }}',
- '{{ BackupRetentionPeriod }}',
- '{{ BackupTarget }}',
- '{{ CACertificateIdentifier }}',
- '{{ CertificateRotationRestart }}',
- '{{ CharacterSetName }}',
- '{{ CopyTagsToSnapshot }}',
- '{{ CustomIAMInstanceProfile }}',
- '{{ DatabaseInsightsMode }}',
- '{{ DBClusterIdentifier }}',
- '{{ DBClusterSnapshotIdentifier }}',
- '{{ DBInstanceClass }}',
- '{{ DBInstanceIdentifier }}',
- '{{ DBName }}',
- '{{ DBParameterGroupName }}',
- '{{ DBSecurityGroups }}',
- '{{ DBSnapshotIdentifier }}',
- '{{ DBSubnetGroupName }}',
- '{{ DBSystemId }}',
- '{{ DedicatedLogVolume }}',
- '{{ DeleteAutomatedBackups }}',
- '{{ DeletionProtection }}',
- '{{ Domain }}',
- '{{ DomainAuthSecretArn }}',
- '{{ DomainDnsIps }}',
- '{{ DomainFqdn }}',
- '{{ DomainIAMRoleName }}',
- '{{ DomainOu }}',
- '{{ EnableCloudwatchLogsExports }}',
- '{{ EnableIAMDatabaseAuthentication }}',
- '{{ EnablePerformanceInsights }}',
- '{{ Engine }}',
- '{{ EngineLifecycleSupport }}',
- '{{ EngineVersion }}',
- '{{ ManageMasterUserPassword }}',
- '{{ Iops }}',
- '{{ KmsKeyId }}',
- '{{ LicenseModel }}',
- '{{ MasterUsername }}',
- '{{ MasterUserPassword }}',
- '{{ MasterUserSecret }}',
- '{{ MaxAllocatedStorage }}',
- '{{ MonitoringInterval }}',
- '{{ MonitoringRoleArn }}',
- '{{ MultiAZ }}',
- '{{ NcharCharacterSetName }}',
- '{{ NetworkType }}',
- '{{ OptionGroupName }}',
- '{{ PerformanceInsightsKMSKeyId }}',
- '{{ PerformanceInsightsRetentionPeriod }}',
- '{{ Port }}',
- '{{ PreferredBackupWindow }}',
- '{{ PreferredMaintenanceWindow }}',
- '{{ ProcessorFeatures }}',
- '{{ PromotionTier }}',
- '{{ PubliclyAccessible }}',
- '{{ ReplicaMode }}',
- '{{ RestoreTime }}',
- '{{ SourceDBClusterIdentifier }}',
- '{{ SourceDbiResourceId }}',
- '{{ SourceDBInstanceAutomatedBackupsArn }}',
- '{{ SourceDBInstanceIdentifier }}',
- '{{ SourceRegion }}',
- '{{ StorageEncrypted }}',
- '{{ StorageType }}',
- '{{ StorageThroughput }}',
- '{{ Tags }}',
- '{{ TdeCredentialArn }}',
- '{{ TdeCredentialPassword }}',
- '{{ Timezone }}',
- '{{ UseDefaultProcessorFeatures }}',
- '{{ UseLatestRestorableTime }}',
- '{{ VPCSecurityGroups }}',
- '{{ ApplyImmediately }}',
+SELECT
+'{{ allocated_storage }}',
+ '{{ allow_major_version_upgrade }}',
+ '{{ associated_roles }}',
+ '{{ auto_minor_version_upgrade }}',
+ '{{ automatic_backup_replication_region }}',
+ '{{ automatic_backup_replication_kms_key_id }}',
+ '{{ automatic_backup_replication_retention_period }}',
+ '{{ availability_zone }}',
+ '{{ backup_retention_period }}',
+ '{{ backup_target }}',
+ '{{ ca_certificate_identifier }}',
+ '{{ certificate_rotation_restart }}',
+ '{{ character_set_name }}',
+ '{{ copy_tags_to_snapshot }}',
+ '{{ custom_iam_instance_profile }}',
+ '{{ database_insights_mode }}',
+ '{{ db_cluster_identifier }}',
+ '{{ db_cluster_snapshot_identifier }}',
+ '{{ db_instance_class }}',
+ '{{ db_instance_identifier }}',
+ '{{ db_name }}',
+ '{{ db_parameter_group_name }}',
+ '{{ db_security_groups }}',
+ '{{ db_snapshot_identifier }}',
+ '{{ db_subnet_group_name }}',
+ '{{ db_system_id }}',
+ '{{ dedicated_log_volume }}',
+ '{{ delete_automated_backups }}',
+ '{{ deletion_protection }}',
+ '{{ domain }}',
+ '{{ domain_auth_secret_arn }}',
+ '{{ domain_dns_ips }}',
+ '{{ domain_fqdn }}',
+ '{{ domain_iam_role_name }}',
+ '{{ domain_ou }}',
+ '{{ enable_cloudwatch_logs_exports }}',
+ '{{ enable_iam_database_authentication }}',
+ '{{ enable_performance_insights }}',
+ '{{ engine }}',
+ '{{ engine_lifecycle_support }}',
+ '{{ engine_version }}',
+ '{{ manage_master_user_password }}',
+ '{{ iops }}',
+ '{{ kms_key_id }}',
+ '{{ license_model }}',
+ '{{ master_username }}',
+ '{{ master_user_password }}',
+ '{{ master_user_secret }}',
+ '{{ max_allocated_storage }}',
+ '{{ monitoring_interval }}',
+ '{{ monitoring_role_arn }}',
+ '{{ multi_az }}',
+ '{{ nchar_character_set_name }}',
+ '{{ network_type }}',
+ '{{ option_group_name }}',
+ '{{ performance_insights_kms_key_id }}',
+ '{{ performance_insights_retention_period }}',
+ '{{ port }}',
+ '{{ preferred_backup_window }}',
+ '{{ preferred_maintenance_window }}',
+ '{{ processor_features }}',
+ '{{ promotion_tier }}',
+ '{{ publicly_accessible }}',
+ '{{ replica_mode }}',
+ '{{ restore_time }}',
+ '{{ source_db_cluster_identifier }}',
+ '{{ source_dbi_resource_id }}',
+ '{{ source_db_instance_automated_backups_arn }}',
+ '{{ source_db_instance_identifier }}',
+ '{{ source_region }}',
+ '{{ storage_encrypted }}',
+ '{{ storage_type }}',
+ '{{ storage_throughput }}',
+ '{{ tags }}',
+ '{{ tde_credential_arn }}',
+ '{{ tde_credential_password }}',
+ '{{ timezone }}',
+ '{{ use_default_processor_features }}',
+ '{{ use_latest_restorable_time }}',
+ '{{ vpc_security_groups }}',
+ '{{ apply_immediately }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -1093,88 +1093,88 @@ INSERT INTO awscc.rds.db_instances (
  ApplyImmediately,
  region
 )
-SELECT 
- '{{ AllocatedStorage }}',
- '{{ AllowMajorVersionUpgrade }}',
- '{{ AssociatedRoles }}',
- '{{ AutoMinorVersionUpgrade }}',
- '{{ AutomaticBackupReplicationRegion }}',
- '{{ AutomaticBackupReplicationKmsKeyId }}',
- '{{ AutomaticBackupReplicationRetentionPeriod }}',
- '{{ AvailabilityZone }}',
- '{{ BackupRetentionPeriod }}',
- '{{ BackupTarget }}',
- '{{ CACertificateIdentifier }}',
- '{{ CertificateRotationRestart }}',
- '{{ CharacterSetName }}',
- '{{ CopyTagsToSnapshot }}',
- '{{ CustomIAMInstanceProfile }}',
- '{{ DatabaseInsightsMode }}',
- '{{ DBClusterIdentifier }}',
- '{{ DBClusterSnapshotIdentifier }}',
- '{{ DBInstanceClass }}',
- '{{ DBInstanceIdentifier }}',
- '{{ DBName }}',
- '{{ DBParameterGroupName }}',
- '{{ DBSecurityGroups }}',
- '{{ DBSnapshotIdentifier }}',
- '{{ DBSubnetGroupName }}',
- '{{ DBSystemId }}',
- '{{ DedicatedLogVolume }}',
- '{{ DeleteAutomatedBackups }}',
- '{{ DeletionProtection }}',
- '{{ Domain }}',
- '{{ DomainAuthSecretArn }}',
- '{{ DomainDnsIps }}',
- '{{ DomainFqdn }}',
- '{{ DomainIAMRoleName }}',
- '{{ DomainOu }}',
- '{{ EnableCloudwatchLogsExports }}',
- '{{ EnableIAMDatabaseAuthentication }}',
- '{{ EnablePerformanceInsights }}',
- '{{ Engine }}',
- '{{ EngineLifecycleSupport }}',
- '{{ EngineVersion }}',
- '{{ ManageMasterUserPassword }}',
- '{{ Iops }}',
- '{{ KmsKeyId }}',
- '{{ LicenseModel }}',
- '{{ MasterUsername }}',
- '{{ MasterUserPassword }}',
- '{{ MasterUserSecret }}',
- '{{ MaxAllocatedStorage }}',
- '{{ MonitoringInterval }}',
- '{{ MonitoringRoleArn }}',
- '{{ MultiAZ }}',
- '{{ NcharCharacterSetName }}',
- '{{ NetworkType }}',
- '{{ OptionGroupName }}',
- '{{ PerformanceInsightsKMSKeyId }}',
- '{{ PerformanceInsightsRetentionPeriod }}',
- '{{ Port }}',
- '{{ PreferredBackupWindow }}',
- '{{ PreferredMaintenanceWindow }}',
- '{{ ProcessorFeatures }}',
- '{{ PromotionTier }}',
- '{{ PubliclyAccessible }}',
- '{{ ReplicaMode }}',
- '{{ RestoreTime }}',
- '{{ SourceDBClusterIdentifier }}',
- '{{ SourceDbiResourceId }}',
- '{{ SourceDBInstanceAutomatedBackupsArn }}',
- '{{ SourceDBInstanceIdentifier }}',
- '{{ SourceRegion }}',
- '{{ StorageEncrypted }}',
- '{{ StorageType }}',
- '{{ StorageThroughput }}',
- '{{ Tags }}',
- '{{ TdeCredentialArn }}',
- '{{ TdeCredentialPassword }}',
- '{{ Timezone }}',
- '{{ UseDefaultProcessorFeatures }}',
- '{{ UseLatestRestorableTime }}',
- '{{ VPCSecurityGroups }}',
- '{{ ApplyImmediately }}',
+SELECT
+ '{{ allocated_storage }}',
+ '{{ allow_major_version_upgrade }}',
+ '{{ associated_roles }}',
+ '{{ auto_minor_version_upgrade }}',
+ '{{ automatic_backup_replication_region }}',
+ '{{ automatic_backup_replication_kms_key_id }}',
+ '{{ automatic_backup_replication_retention_period }}',
+ '{{ availability_zone }}',
+ '{{ backup_retention_period }}',
+ '{{ backup_target }}',
+ '{{ ca_certificate_identifier }}',
+ '{{ certificate_rotation_restart }}',
+ '{{ character_set_name }}',
+ '{{ copy_tags_to_snapshot }}',
+ '{{ custom_iam_instance_profile }}',
+ '{{ database_insights_mode }}',
+ '{{ db_cluster_identifier }}',
+ '{{ db_cluster_snapshot_identifier }}',
+ '{{ db_instance_class }}',
+ '{{ db_instance_identifier }}',
+ '{{ db_name }}',
+ '{{ db_parameter_group_name }}',
+ '{{ db_security_groups }}',
+ '{{ db_snapshot_identifier }}',
+ '{{ db_subnet_group_name }}',
+ '{{ db_system_id }}',
+ '{{ dedicated_log_volume }}',
+ '{{ delete_automated_backups }}',
+ '{{ deletion_protection }}',
+ '{{ domain }}',
+ '{{ domain_auth_secret_arn }}',
+ '{{ domain_dns_ips }}',
+ '{{ domain_fqdn }}',
+ '{{ domain_iam_role_name }}',
+ '{{ domain_ou }}',
+ '{{ enable_cloudwatch_logs_exports }}',
+ '{{ enable_iam_database_authentication }}',
+ '{{ enable_performance_insights }}',
+ '{{ engine }}',
+ '{{ engine_lifecycle_support }}',
+ '{{ engine_version }}',
+ '{{ manage_master_user_password }}',
+ '{{ iops }}',
+ '{{ kms_key_id }}',
+ '{{ license_model }}',
+ '{{ master_username }}',
+ '{{ master_user_password }}',
+ '{{ master_user_secret }}',
+ '{{ max_allocated_storage }}',
+ '{{ monitoring_interval }}',
+ '{{ monitoring_role_arn }}',
+ '{{ multi_az }}',
+ '{{ nchar_character_set_name }}',
+ '{{ network_type }}',
+ '{{ option_group_name }}',
+ '{{ performance_insights_kms_key_id }}',
+ '{{ performance_insights_retention_period }}',
+ '{{ port }}',
+ '{{ preferred_backup_window }}',
+ '{{ preferred_maintenance_window }}',
+ '{{ processor_features }}',
+ '{{ promotion_tier }}',
+ '{{ publicly_accessible }}',
+ '{{ replica_mode }}',
+ '{{ restore_time }}',
+ '{{ source_db_cluster_identifier }}',
+ '{{ source_dbi_resource_id }}',
+ '{{ source_db_instance_automated_backups_arn }}',
+ '{{ source_db_instance_identifier }}',
+ '{{ source_region }}',
+ '{{ storage_encrypted }}',
+ '{{ storage_type }}',
+ '{{ storage_throughput }}',
+ '{{ tags }}',
+ '{{ tde_credential_arn }}',
+ '{{ tde_credential_password }}',
+ '{{ timezone }}',
+ '{{ use_default_processor_features }}',
+ '{{ use_latest_restorable_time }}',
+ '{{ vpc_security_groups }}',
+ '{{ apply_immediately }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -1192,181 +1192,180 @@ globals:
 resources:
   - name: db_instance
     props:
-      - name: AllocatedStorage
-        value: '{{ AllocatedStorage }}'
-      - name: AllowMajorVersionUpgrade
-        value: '{{ AllowMajorVersionUpgrade }}'
-      - name: AssociatedRoles
+      - name: allocated_storage
+        value: '{{ allocated_storage }}'
+      - name: allow_major_version_upgrade
+        value: '{{ allow_major_version_upgrade }}'
+      - name: associated_roles
         value:
-          - FeatureName: '{{ FeatureName }}'
-            RoleArn: '{{ RoleArn }}'
-      - name: AutoMinorVersionUpgrade
-        value: '{{ AutoMinorVersionUpgrade }}'
-      - name: AutomaticBackupReplicationRegion
-        value: '{{ AutomaticBackupReplicationRegion }}'
-      - name: AutomaticBackupReplicationKmsKeyId
-        value: '{{ AutomaticBackupReplicationKmsKeyId }}'
-      - name: AutomaticBackupReplicationRetentionPeriod
-        value: '{{ AutomaticBackupReplicationRetentionPeriod }}'
-      - name: AvailabilityZone
-        value: '{{ AvailabilityZone }}'
-      - name: BackupRetentionPeriod
-        value: '{{ BackupRetentionPeriod }}'
-      - name: BackupTarget
-        value: '{{ BackupTarget }}'
-      - name: CACertificateIdentifier
-        value: '{{ CACertificateIdentifier }}'
-      - name: CertificateRotationRestart
-        value: '{{ CertificateRotationRestart }}'
-      - name: CharacterSetName
-        value: '{{ CharacterSetName }}'
-      - name: CopyTagsToSnapshot
-        value: '{{ CopyTagsToSnapshot }}'
-      - name: CustomIAMInstanceProfile
-        value: '{{ CustomIAMInstanceProfile }}'
-      - name: DatabaseInsightsMode
-        value: '{{ DatabaseInsightsMode }}'
-      - name: DBClusterIdentifier
-        value: '{{ DBClusterIdentifier }}'
-      - name: DBClusterSnapshotIdentifier
-        value: '{{ DBClusterSnapshotIdentifier }}'
-      - name: DBInstanceClass
-        value: '{{ DBInstanceClass }}'
-      - name: DBInstanceIdentifier
-        value: '{{ DBInstanceIdentifier }}'
-      - name: DBName
-        value: '{{ DBName }}'
-      - name: DBParameterGroupName
-        value: '{{ DBParameterGroupName }}'
-      - name: DBSecurityGroups
+          - feature_name: '{{ feature_name }}'
+            role_arn: '{{ role_arn }}'
+      - name: auto_minor_version_upgrade
+        value: '{{ auto_minor_version_upgrade }}'
+      - name: automatic_backup_replication_region
+        value: '{{ automatic_backup_replication_region }}'
+      - name: automatic_backup_replication_kms_key_id
+        value: '{{ automatic_backup_replication_kms_key_id }}'
+      - name: automatic_backup_replication_retention_period
+        value: '{{ automatic_backup_replication_retention_period }}'
+      - name: availability_zone
+        value: '{{ availability_zone }}'
+      - name: backup_retention_period
+        value: '{{ backup_retention_period }}'
+      - name: backup_target
+        value: '{{ backup_target }}'
+      - name: ca_certificate_identifier
+        value: '{{ ca_certificate_identifier }}'
+      - name: certificate_rotation_restart
+        value: '{{ certificate_rotation_restart }}'
+      - name: character_set_name
+        value: '{{ character_set_name }}'
+      - name: copy_tags_to_snapshot
+        value: '{{ copy_tags_to_snapshot }}'
+      - name: custom_iam_instance_profile
+        value: '{{ custom_iam_instance_profile }}'
+      - name: database_insights_mode
+        value: '{{ database_insights_mode }}'
+      - name: db_cluster_identifier
+        value: '{{ db_cluster_identifier }}'
+      - name: db_cluster_snapshot_identifier
+        value: '{{ db_cluster_snapshot_identifier }}'
+      - name: db_instance_class
+        value: '{{ db_instance_class }}'
+      - name: db_instance_identifier
+        value: '{{ db_instance_identifier }}'
+      - name: db_name
+        value: '{{ db_name }}'
+      - name: db_parameter_group_name
+        value: '{{ db_parameter_group_name }}'
+      - name: db_security_groups
         value:
-          - '{{ DBSecurityGroups[0] }}'
-      - name: DBSnapshotIdentifier
-        value: '{{ DBSnapshotIdentifier }}'
-      - name: DBSubnetGroupName
-        value: '{{ DBSubnetGroupName }}'
-      - name: DBSystemId
-        value: '{{ DBSystemId }}'
-      - name: DedicatedLogVolume
-        value: '{{ DedicatedLogVolume }}'
-      - name: DeleteAutomatedBackups
-        value: '{{ DeleteAutomatedBackups }}'
-      - name: DeletionProtection
-        value: '{{ DeletionProtection }}'
-      - name: Domain
-        value: '{{ Domain }}'
-      - name: DomainAuthSecretArn
-        value: '{{ DomainAuthSecretArn }}'
-      - name: DomainDnsIps
+          - '{{ db_security_groups[0] }}'
+      - name: db_snapshot_identifier
+        value: '{{ db_snapshot_identifier }}'
+      - name: db_subnet_group_name
+        value: '{{ db_subnet_group_name }}'
+      - name: db_system_id
+        value: '{{ db_system_id }}'
+      - name: dedicated_log_volume
+        value: '{{ dedicated_log_volume }}'
+      - name: delete_automated_backups
+        value: '{{ delete_automated_backups }}'
+      - name: deletion_protection
+        value: '{{ deletion_protection }}'
+      - name: domain
+        value: '{{ domain }}'
+      - name: domain_auth_secret_arn
+        value: '{{ domain_auth_secret_arn }}'
+      - name: domain_dns_ips
         value:
-          - '{{ DomainDnsIps[0] }}'
-      - name: DomainFqdn
-        value: '{{ DomainFqdn }}'
-      - name: DomainIAMRoleName
-        value: '{{ DomainIAMRoleName }}'
-      - name: DomainOu
-        value: '{{ DomainOu }}'
-      - name: EnableCloudwatchLogsExports
+          - '{{ domain_dns_ips[0] }}'
+      - name: domain_fqdn
+        value: '{{ domain_fqdn }}'
+      - name: domain_iam_role_name
+        value: '{{ domain_iam_role_name }}'
+      - name: domain_ou
+        value: '{{ domain_ou }}'
+      - name: enable_cloudwatch_logs_exports
         value:
-          - '{{ EnableCloudwatchLogsExports[0] }}'
-      - name: EnableIAMDatabaseAuthentication
-        value: '{{ EnableIAMDatabaseAuthentication }}'
-      - name: EnablePerformanceInsights
-        value: '{{ EnablePerformanceInsights }}'
-      - name: Engine
-        value: '{{ Engine }}'
-      - name: EngineLifecycleSupport
-        value: '{{ EngineLifecycleSupport }}'
-      - name: EngineVersion
-        value: '{{ EngineVersion }}'
-      - name: ManageMasterUserPassword
-        value: '{{ ManageMasterUserPassword }}'
-      - name: Iops
-        value: '{{ Iops }}'
-      - name: KmsKeyId
-        value: '{{ KmsKeyId }}'
-      - name: LicenseModel
-        value: '{{ LicenseModel }}'
-      - name: MasterUsername
-        value: '{{ MasterUsername }}'
-      - name: MasterUserPassword
-        value: '{{ MasterUserPassword }}'
-      - name: MasterUserSecret
+          - '{{ enable_cloudwatch_logs_exports[0] }}'
+      - name: enable_iam_database_authentication
+        value: '{{ enable_iam_database_authentication }}'
+      - name: enable_performance_insights
+        value: '{{ enable_performance_insights }}'
+      - name: engine
+        value: '{{ engine }}'
+      - name: engine_lifecycle_support
+        value: '{{ engine_lifecycle_support }}'
+      - name: engine_version
+        value: '{{ engine_version }}'
+      - name: manage_master_user_password
+        value: '{{ manage_master_user_password }}'
+      - name: iops
+        value: '{{ iops }}'
+      - name: kms_key_id
+        value: '{{ kms_key_id }}'
+      - name: license_model
+        value: '{{ license_model }}'
+      - name: master_username
+        value: '{{ master_username }}'
+      - name: master_user_password
+        value: '{{ master_user_password }}'
+      - name: master_user_secret
         value:
-          SecretArn: '{{ SecretArn }}'
-          KmsKeyId: '{{ KmsKeyId }}'
-      - name: MaxAllocatedStorage
-        value: '{{ MaxAllocatedStorage }}'
-      - name: MonitoringInterval
-        value: '{{ MonitoringInterval }}'
-      - name: MonitoringRoleArn
-        value: '{{ MonitoringRoleArn }}'
-      - name: MultiAZ
-        value: '{{ MultiAZ }}'
-      - name: NcharCharacterSetName
-        value: '{{ NcharCharacterSetName }}'
-      - name: NetworkType
-        value: '{{ NetworkType }}'
-      - name: OptionGroupName
-        value: '{{ OptionGroupName }}'
-      - name: PerformanceInsightsKMSKeyId
-        value: '{{ PerformanceInsightsKMSKeyId }}'
-      - name: PerformanceInsightsRetentionPeriod
-        value: '{{ PerformanceInsightsRetentionPeriod }}'
-      - name: Port
-        value: '{{ Port }}'
-      - name: PreferredBackupWindow
-        value: '{{ PreferredBackupWindow }}'
-      - name: PreferredMaintenanceWindow
-        value: '{{ PreferredMaintenanceWindow }}'
-      - name: ProcessorFeatures
+          secret_arn: '{{ secret_arn }}'
+          kms_key_id: '{{ kms_key_id }}'
+      - name: max_allocated_storage
+        value: '{{ max_allocated_storage }}'
+      - name: monitoring_interval
+        value: '{{ monitoring_interval }}'
+      - name: monitoring_role_arn
+        value: '{{ monitoring_role_arn }}'
+      - name: multi_az
+        value: '{{ multi_az }}'
+      - name: nchar_character_set_name
+        value: '{{ nchar_character_set_name }}'
+      - name: network_type
+        value: '{{ network_type }}'
+      - name: option_group_name
+        value: '{{ option_group_name }}'
+      - name: performance_insights_kms_key_id
+        value: '{{ performance_insights_kms_key_id }}'
+      - name: performance_insights_retention_period
+        value: '{{ performance_insights_retention_period }}'
+      - name: port
+        value: '{{ port }}'
+      - name: preferred_backup_window
+        value: '{{ preferred_backup_window }}'
+      - name: preferred_maintenance_window
+        value: '{{ preferred_maintenance_window }}'
+      - name: processor_features
         value:
-          - Name: '{{ Name }}'
-            Value: '{{ Value }}'
-      - name: PromotionTier
-        value: '{{ PromotionTier }}'
-      - name: PubliclyAccessible
-        value: '{{ PubliclyAccessible }}'
-      - name: ReplicaMode
-        value: '{{ ReplicaMode }}'
-      - name: RestoreTime
-        value: '{{ RestoreTime }}'
-      - name: SourceDBClusterIdentifier
-        value: '{{ SourceDBClusterIdentifier }}'
-      - name: SourceDbiResourceId
-        value: '{{ SourceDbiResourceId }}'
-      - name: SourceDBInstanceAutomatedBackupsArn
-        value: '{{ SourceDBInstanceAutomatedBackupsArn }}'
-      - name: SourceDBInstanceIdentifier
-        value: '{{ SourceDBInstanceIdentifier }}'
-      - name: SourceRegion
-        value: '{{ SourceRegion }}'
-      - name: StorageEncrypted
-        value: '{{ StorageEncrypted }}'
-      - name: StorageType
-        value: '{{ StorageType }}'
-      - name: StorageThroughput
-        value: '{{ StorageThroughput }}'
-      - name: Tags
+          - name: '{{ name }}'
+            value: '{{ value }}'
+      - name: promotion_tier
+        value: '{{ promotion_tier }}'
+      - name: publicly_accessible
+        value: '{{ publicly_accessible }}'
+      - name: replica_mode
+        value: '{{ replica_mode }}'
+      - name: restore_time
+        value: '{{ restore_time }}'
+      - name: source_db_cluster_identifier
+        value: '{{ source_db_cluster_identifier }}'
+      - name: source_dbi_resource_id
+        value: '{{ source_dbi_resource_id }}'
+      - name: source_db_instance_automated_backups_arn
+        value: '{{ source_db_instance_automated_backups_arn }}'
+      - name: source_db_instance_identifier
+        value: '{{ source_db_instance_identifier }}'
+      - name: source_region
+        value: '{{ source_region }}'
+      - name: storage_encrypted
+        value: '{{ storage_encrypted }}'
+      - name: storage_type
+        value: '{{ storage_type }}'
+      - name: storage_throughput
+        value: '{{ storage_throughput }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-      - name: TdeCredentialArn
-        value: '{{ TdeCredentialArn }}'
-      - name: TdeCredentialPassword
-        value: '{{ TdeCredentialPassword }}'
-      - name: Timezone
-        value: '{{ Timezone }}'
-      - name: UseDefaultProcessorFeatures
-        value: '{{ UseDefaultProcessorFeatures }}'
-      - name: UseLatestRestorableTime
-        value: '{{ UseLatestRestorableTime }}'
-      - name: VPCSecurityGroups
+          - key: '{{ key }}'
+            value: '{{ value }}'
+      - name: tde_credential_arn
+        value: '{{ tde_credential_arn }}'
+      - name: tde_credential_password
+        value: '{{ tde_credential_password }}'
+      - name: timezone
+        value: '{{ timezone }}'
+      - name: use_default_processor_features
+        value: '{{ use_default_processor_features }}'
+      - name: use_latest_restorable_time
+        value: '{{ use_latest_restorable_time }}'
+      - name: vpc_security_groups
         value:
-          - '{{ VPCSecurityGroups[0] }}'
-      - name: ApplyImmediately
-        value: '{{ ApplyImmediately }}'
-
+          - '{{ vpc_security_groups[0] }}'
+      - name: apply_immediately
+        value: '{{ apply_immediately }}'
 ```
 </TabItem>
 </Tabs>
@@ -1447,7 +1446,7 @@ SET PatchDocument = string('{{ {
     "ApplyImmediately": apply_immediately
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<DBInstanceIdentifier>';
+AND Identifier = '{{ db_instance_identifier }}';
 ```
 
 
@@ -1456,7 +1455,7 @@ AND Identifier = '<DBInstanceIdentifier>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.rds.db_instances
-WHERE Identifier = '<DBInstanceIdentifier>'
+WHERE Identifier = '{{ db_instance_identifier }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/rds/db_parameter_groups/index.md b/website/docs/services/rds/db_parameter_groups/index.md
index 5edab4499..108dfbdad 100644
--- a/website/docs/services/rds/db_parameter_groups/index.md
+++ b/website/docs/services/rds/db_parameter_groups/index.md
@@ -170,7 +170,7 @@ family,
 parameters,
 tags
 FROM awscc.rds.db_parameter_groups
-WHERE region = 'us-east-1' AND Identifier = '<DBParameterGroupName>';
+WHERE region = 'us-east-1' AND Identifier = '{{ db_parameter_group_name }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -207,9 +207,9 @@ INSERT INTO awscc.rds.db_parameter_groups (
  Family,
  region
 )
-SELECT 
-'{{ Description }}',
- '{{ Family }}',
+SELECT
+'{{ description }}',
+ '{{ family }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -225,12 +225,12 @@ INSERT INTO awscc.rds.db_parameter_groups (
  Tags,
  region
 )
-SELECT 
- '{{ DBParameterGroupName }}',
- '{{ Description }}',
- '{{ Family }}',
- '{{ Parameters }}',
- '{{ Tags }}',
+SELECT
+ '{{ db_parameter_group_name }}',
+ '{{ description }}',
+ '{{ family }}',
+ '{{ parameters }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -248,19 +248,18 @@ globals:
 resources:
   - name: db_parameter_group
     props:
-      - name: DBParameterGroupName
-        value: '{{ DBParameterGroupName }}'
-      - name: Description
-        value: '{{ Description }}'
-      - name: Family
-        value: '{{ Family }}'
-      - name: Parameters
+      - name: db_parameter_group_name
+        value: '{{ db_parameter_group_name }}'
+      - name: description
+        value: '{{ description }}'
+      - name: family
+        value: '{{ family }}'
+      - name: parameters
         value: {}
-      - name: Tags
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -277,7 +276,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<DBParameterGroupName>';
+AND Identifier = '{{ db_parameter_group_name }}';
 ```
 
 
@@ -286,7 +285,7 @@ AND Identifier = '<DBParameterGroupName>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.rds.db_parameter_groups
-WHERE Identifier = '<DBParameterGroupName>'
+WHERE Identifier = '{{ db_parameter_group_name }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/rds/db_proxies/index.md b/website/docs/services/rds/db_proxies/index.md
index 5d9b0e65c..503cc9cae 100644
--- a/website/docs/services/rds/db_proxies/index.md
+++ b/website/docs/services/rds/db_proxies/index.md
@@ -245,7 +245,7 @@ vpc_id,
 vpc_security_group_ids,
 vpc_subnet_ids
 FROM awscc.rds.db_proxies
-WHERE region = 'us-east-1' AND Identifier = '<DBProxyName>';
+WHERE region = 'us-east-1' AND Identifier = '{{ db_proxy_name }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -285,12 +285,12 @@ INSERT INTO awscc.rds.db_proxies (
  VpcSubnetIds,
  region
 )
-SELECT 
-'{{ Auth }}',
- '{{ DBProxyName }}',
- '{{ EngineFamily }}',
- '{{ RoleArn }}',
- '{{ VpcSubnetIds }}',
+SELECT
+'{{ auth }}',
+ '{{ db_proxy_name }}',
+ '{{ engine_family }}',
+ '{{ role_arn }}',
+ '{{ vpc_subnet_ids }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -311,17 +311,17 @@ INSERT INTO awscc.rds.db_proxies (
  VpcSubnetIds,
  region
 )
-SELECT 
- '{{ Auth }}',
- '{{ DBProxyName }}',
- '{{ DebugLogging }}',
- '{{ EngineFamily }}',
- '{{ IdleClientTimeout }}',
- '{{ RequireTLS }}',
- '{{ RoleArn }}',
- '{{ Tags }}',
- '{{ VpcSecurityGroupIds }}',
- '{{ VpcSubnetIds }}',
+SELECT
+ '{{ auth }}',
+ '{{ db_proxy_name }}',
+ '{{ debug_logging }}',
+ '{{ engine_family }}',
+ '{{ idle_client_timeout }}',
+ '{{ require_tls }}',
+ '{{ role_arn }}',
+ '{{ tags }}',
+ '{{ vpc_security_group_ids }}',
+ '{{ vpc_subnet_ids }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -339,36 +339,35 @@ globals:
 resources:
   - name: db_proxy
     props:
-      - name: Auth
+      - name: auth
         value:
-          - AuthScheme: '{{ AuthScheme }}'
-            Description: '{{ Description }}'
-            IAMAuth: '{{ IAMAuth }}'
-            SecretArn: '{{ SecretArn }}'
-            ClientPasswordAuthType: '{{ ClientPasswordAuthType }}'
-      - name: DBProxyName
-        value: '{{ DBProxyName }}'
-      - name: DebugLogging
-        value: '{{ DebugLogging }}'
-      - name: EngineFamily
-        value: '{{ EngineFamily }}'
-      - name: IdleClientTimeout
-        value: '{{ IdleClientTimeout }}'
-      - name: RequireTLS
-        value: '{{ RequireTLS }}'
-      - name: RoleArn
-        value: '{{ RoleArn }}'
-      - name: Tags
+          - auth_scheme: '{{ auth_scheme }}'
+            description: '{{ description }}'
+            iam_auth: '{{ iam_auth }}'
+            secret_arn: '{{ secret_arn }}'
+            client_password_auth_type: '{{ client_password_auth_type }}'
+      - name: db_proxy_name
+        value: '{{ db_proxy_name }}'
+      - name: debug_logging
+        value: '{{ debug_logging }}'
+      - name: engine_family
+        value: '{{ engine_family }}'
+      - name: idle_client_timeout
+        value: '{{ idle_client_timeout }}'
+      - name: require_tls
+        value: '{{ require_tls }}'
+      - name: role_arn
+        value: '{{ role_arn }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-      - name: VpcSecurityGroupIds
+          - key: '{{ key }}'
+            value: '{{ value }}'
+      - name: vpc_security_group_ids
         value:
-          - '{{ VpcSecurityGroupIds[0] }}'
-      - name: VpcSubnetIds
+          - '{{ vpc_security_group_ids[0] }}'
+      - name: vpc_subnet_ids
         value:
-          - '{{ VpcSubnetIds[0] }}'
-
+          - '{{ vpc_subnet_ids[0] }}'
 ```
 </TabItem>
 </Tabs>
@@ -390,7 +389,7 @@ SET PatchDocument = string('{{ {
     "VpcSecurityGroupIds": vpc_security_group_ids
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<DBProxyName>';
+AND Identifier = '{{ db_proxy_name }}';
 ```
 
 
@@ -399,7 +398,7 @@ AND Identifier = '<DBProxyName>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.rds.db_proxies
-WHERE Identifier = '<DBProxyName>'
+WHERE Identifier = '{{ db_proxy_name }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/rds/db_proxy_endpoints/index.md b/website/docs/services/rds/db_proxy_endpoints/index.md
index 29d11f720..076f38786 100644
--- a/website/docs/services/rds/db_proxy_endpoints/index.md
+++ b/website/docs/services/rds/db_proxy_endpoints/index.md
@@ -205,7 +205,7 @@ target_role,
 is_default,
 tags
 FROM awscc.rds.db_proxy_endpoints
-WHERE region = 'us-east-1' AND Identifier = '<DBProxyEndpointName>';
+WHERE region = 'us-east-1' AND Identifier = '{{ db_proxy_endpoint_name }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -243,10 +243,10 @@ INSERT INTO awscc.rds.db_proxy_endpoints (
  VpcSubnetIds,
  region
 )
-SELECT 
-'{{ DBProxyEndpointName }}',
- '{{ DBProxyName }}',
- '{{ VpcSubnetIds }}',
+SELECT
+'{{ db_proxy_endpoint_name }}',
+ '{{ db_proxy_name }}',
+ '{{ vpc_subnet_ids }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -263,13 +263,13 @@ INSERT INTO awscc.rds.db_proxy_endpoints (
  Tags,
  region
 )
-SELECT 
- '{{ DBProxyEndpointName }}',
- '{{ DBProxyName }}',
- '{{ VpcSecurityGroupIds }}',
- '{{ VpcSubnetIds }}',
- '{{ TargetRole }}',
- '{{ Tags }}',
+SELECT
+ '{{ db_proxy_endpoint_name }}',
+ '{{ db_proxy_name }}',
+ '{{ vpc_security_group_ids }}',
+ '{{ vpc_subnet_ids }}',
+ '{{ target_role }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -287,23 +287,22 @@ globals:
 resources:
   - name: db_proxy_endpoint
     props:
-      - name: DBProxyEndpointName
-        value: '{{ DBProxyEndpointName }}'
-      - name: DBProxyName
-        value: '{{ DBProxyName }}'
-      - name: VpcSecurityGroupIds
+      - name: db_proxy_endpoint_name
+        value: '{{ db_proxy_endpoint_name }}'
+      - name: db_proxy_name
+        value: '{{ db_proxy_name }}'
+      - name: vpc_security_group_ids
         value:
-          - '{{ VpcSecurityGroupIds[0] }}'
-      - name: VpcSubnetIds
+          - '{{ vpc_security_group_ids[0] }}'
+      - name: vpc_subnet_ids
         value:
-          - '{{ VpcSubnetIds[0] }}'
-      - name: TargetRole
-        value: '{{ TargetRole }}'
-      - name: Tags
+          - '{{ vpc_subnet_ids[0] }}'
+      - name: target_role
+        value: '{{ target_role }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -321,7 +320,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<DBProxyEndpointName>';
+AND Identifier = '{{ db_proxy_endpoint_name }}';
 ```
 
 
@@ -330,7 +329,7 @@ AND Identifier = '<DBProxyEndpointName>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.rds.db_proxy_endpoints
-WHERE Identifier = '<DBProxyEndpointName>'
+WHERE Identifier = '{{ db_proxy_endpoint_name }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/rds/db_proxy_target_groups/index.md b/website/docs/services/rds/db_proxy_target_groups/index.md
index 8d5c43e79..253a49f45 100644
--- a/website/docs/services/rds/db_proxy_target_groups/index.md
+++ b/website/docs/services/rds/db_proxy_target_groups/index.md
@@ -191,7 +191,7 @@ connection_pool_configuration_info,
 db_instance_identifiers,
 db_cluster_identifiers
 FROM awscc.rds.db_proxy_target_groups
-WHERE region = 'us-east-1' AND Identifier = '<TargetGroupArn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ target_group_arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -228,9 +228,9 @@ INSERT INTO awscc.rds.db_proxy_target_groups (
  TargetGroupName,
  region
 )
-SELECT 
-'{{ DBProxyName }}',
- '{{ TargetGroupName }}',
+SELECT
+'{{ db_proxy_name }}',
+ '{{ target_group_name }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -246,12 +246,12 @@ INSERT INTO awscc.rds.db_proxy_target_groups (
  DBClusterIdentifiers,
  region
 )
-SELECT 
- '{{ DBProxyName }}',
- '{{ TargetGroupName }}',
- '{{ ConnectionPoolConfigurationInfo }}',
- '{{ DBInstanceIdentifiers }}',
- '{{ DBClusterIdentifiers }}',
+SELECT
+ '{{ db_proxy_name }}',
+ '{{ target_group_name }}',
+ '{{ connection_pool_configuration_info }}',
+ '{{ db_instance_identifiers }}',
+ '{{ db_cluster_identifiers }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -269,25 +269,24 @@ globals:
 resources:
   - name: db_proxy_target_group
     props:
-      - name: DBProxyName
-        value: '{{ DBProxyName }}'
-      - name: TargetGroupName
-        value: '{{ TargetGroupName }}'
-      - name: ConnectionPoolConfigurationInfo
+      - name: db_proxy_name
+        value: '{{ db_proxy_name }}'
+      - name: target_group_name
+        value: '{{ target_group_name }}'
+      - name: connection_pool_configuration_info
         value:
-          MaxConnectionsPercent: '{{ MaxConnectionsPercent }}'
-          MaxIdleConnectionsPercent: '{{ MaxIdleConnectionsPercent }}'
-          ConnectionBorrowTimeout: '{{ ConnectionBorrowTimeout }}'
-          SessionPinningFilters:
-            - '{{ SessionPinningFilters[0] }}'
-          InitQuery: '{{ InitQuery }}'
-      - name: DBInstanceIdentifiers
+          max_connections_percent: '{{ max_connections_percent }}'
+          max_idle_connections_percent: '{{ max_idle_connections_percent }}'
+          connection_borrow_timeout: '{{ connection_borrow_timeout }}'
+          session_pinning_filters:
+            - '{{ session_pinning_filters[0] }}'
+          init_query: '{{ init_query }}'
+      - name: db_instance_identifiers
         value:
-          - '{{ DBInstanceIdentifiers[0] }}'
-      - name: DBClusterIdentifiers
+          - '{{ db_instance_identifiers[0] }}'
+      - name: db_cluster_identifiers
         value:
-          - '{{ DBClusterIdentifiers[0] }}'
-
+          - '{{ db_cluster_identifiers[0] }}'
 ```
 </TabItem>
 </Tabs>
@@ -305,7 +304,7 @@ SET PatchDocument = string('{{ {
     "DBClusterIdentifiers": db_cluster_identifiers
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<TargetGroupArn>';
+AND Identifier = '{{ target_group_arn }}';
 ```
 
 
@@ -314,7 +313,7 @@ AND Identifier = '<TargetGroupArn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.rds.db_proxy_target_groups
-WHERE Identifier = '<TargetGroupArn>'
+WHERE Identifier = '{{ target_group_arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/rds/db_shard_groups/index.md b/website/docs/services/rds/db_shard_groups/index.md
index a7919dd83..e0d4b04eb 100644
--- a/website/docs/services/rds/db_shard_groups/index.md
+++ b/website/docs/services/rds/db_shard_groups/index.md
@@ -194,7 +194,7 @@ publicly_accessible,
 endpoint,
 tags
 FROM awscc.rds.db_shard_groups
-WHERE region = 'us-east-1' AND Identifier = '<DBShardGroupIdentifier>';
+WHERE region = 'us-east-1' AND Identifier = '{{ db_shard_group_identifier }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -231,9 +231,9 @@ INSERT INTO awscc.rds.db_shard_groups (
  MaxACU,
  region
 )
-SELECT 
-'{{ DBClusterIdentifier }}',
- '{{ MaxACU }}',
+SELECT
+'{{ db_cluster_identifier }}',
+ '{{ max_ac_u }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -251,14 +251,14 @@ INSERT INTO awscc.rds.db_shard_groups (
  Tags,
  region
 )
-SELECT 
- '{{ DBShardGroupIdentifier }}',
- '{{ DBClusterIdentifier }}',
- '{{ ComputeRedundancy }}',
- '{{ MaxACU }}',
- '{{ MinACU }}',
- '{{ PubliclyAccessible }}',
- '{{ Tags }}',
+SELECT
+ '{{ db_shard_group_identifier }}',
+ '{{ db_cluster_identifier }}',
+ '{{ compute_redundancy }}',
+ '{{ max_ac_u }}',
+ '{{ min_ac_u }}',
+ '{{ publicly_accessible }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -276,23 +276,22 @@ globals:
 resources:
   - name: db_shard_group
     props:
-      - name: DBShardGroupIdentifier
-        value: '{{ DBShardGroupIdentifier }}'
-      - name: DBClusterIdentifier
-        value: '{{ DBClusterIdentifier }}'
-      - name: ComputeRedundancy
-        value: '{{ ComputeRedundancy }}'
-      - name: MaxACU
+      - name: db_shard_group_identifier
+        value: '{{ db_shard_group_identifier }}'
+      - name: db_cluster_identifier
+        value: '{{ db_cluster_identifier }}'
+      - name: compute_redundancy
+        value: '{{ compute_redundancy }}'
+      - name: max_ac_u
         value: null
-      - name: MinACU
+      - name: min_ac_u
         value: null
-      - name: PubliclyAccessible
-        value: '{{ PubliclyAccessible }}'
-      - name: Tags
+      - name: publicly_accessible
+        value: '{{ publicly_accessible }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -311,7 +310,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<DBShardGroupIdentifier>';
+AND Identifier = '{{ db_shard_group_identifier }}';
 ```
 
 
@@ -320,7 +319,7 @@ AND Identifier = '<DBShardGroupIdentifier>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.rds.db_shard_groups
-WHERE Identifier = '<DBShardGroupIdentifier>'
+WHERE Identifier = '{{ db_shard_group_identifier }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/rds/db_subnet_groups/index.md b/website/docs/services/rds/db_subnet_groups/index.md
index 9773005b1..67aa36482 100644
--- a/website/docs/services/rds/db_subnet_groups/index.md
+++ b/website/docs/services/rds/db_subnet_groups/index.md
@@ -164,7 +164,7 @@ db_subnet_group_name,
 subnet_ids,
 tags
 FROM awscc.rds.db_subnet_groups
-WHERE region = 'us-east-1' AND Identifier = '<DBSubnetGroupName>';
+WHERE region = 'us-east-1' AND Identifier = '{{ db_subnet_group_name }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -201,9 +201,9 @@ INSERT INTO awscc.rds.db_subnet_groups (
  SubnetIds,
  region
 )
-SELECT 
-'{{ DBSubnetGroupDescription }}',
- '{{ SubnetIds }}',
+SELECT
+'{{ db_subnet_group_description }}',
+ '{{ subnet_ids }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -218,11 +218,11 @@ INSERT INTO awscc.rds.db_subnet_groups (
  Tags,
  region
 )
-SELECT 
- '{{ DBSubnetGroupDescription }}',
- '{{ DBSubnetGroupName }}',
- '{{ SubnetIds }}',
- '{{ Tags }}',
+SELECT
+ '{{ db_subnet_group_description }}',
+ '{{ db_subnet_group_name }}',
+ '{{ subnet_ids }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -240,18 +240,17 @@ globals:
 resources:
   - name: db_subnet_group
     props:
-      - name: DBSubnetGroupDescription
-        value: '{{ DBSubnetGroupDescription }}'
-      - name: DBSubnetGroupName
-        value: '{{ DBSubnetGroupName }}'
-      - name: SubnetIds
+      - name: db_subnet_group_description
+        value: '{{ db_subnet_group_description }}'
+      - name: db_subnet_group_name
+        value: '{{ db_subnet_group_name }}'
+      - name: subnet_ids
         value:
-          - '{{ SubnetIds[0] }}'
-      - name: Tags
+          - '{{ subnet_ids[0] }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -269,7 +268,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<DBSubnetGroupName>';
+AND Identifier = '{{ db_subnet_group_name }}';
 ```
 
 
@@ -278,7 +277,7 @@ AND Identifier = '<DBSubnetGroupName>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.rds.db_subnet_groups
-WHERE Identifier = '<DBSubnetGroupName>'
+WHERE Identifier = '{{ db_subnet_group_name }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/rds/event_subscriptions/index.md b/website/docs/services/rds/event_subscriptions/index.md
index c75cee31a..351661495 100644
--- a/website/docs/services/rds/event_subscriptions/index.md
+++ b/website/docs/services/rds/event_subscriptions/index.md
@@ -182,7 +182,7 @@ sns_topic_arn,
 source_ids,
 source_type
 FROM awscc.rds.event_subscriptions
-WHERE region = 'us-east-1' AND Identifier = '<SubscriptionName>';
+WHERE region = 'us-east-1' AND Identifier = '{{ subscription_name }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -218,8 +218,8 @@ INSERT INTO awscc.rds.event_subscriptions (
  SnsTopicArn,
  region
 )
-SELECT 
-'{{ SnsTopicArn }}',
+SELECT
+'{{ sns_topic_arn }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -237,14 +237,14 @@ INSERT INTO awscc.rds.event_subscriptions (
  SourceType,
  region
 )
-SELECT 
- '{{ Tags }}',
- '{{ SubscriptionName }}',
- '{{ Enabled }}',
- '{{ EventCategories }}',
- '{{ SnsTopicArn }}',
- '{{ SourceIds }}',
- '{{ SourceType }}',
+SELECT
+ '{{ tags }}',
+ '{{ subscription_name }}',
+ '{{ enabled }}',
+ '{{ event_categories }}',
+ '{{ sns_topic_arn }}',
+ '{{ source_ids }}',
+ '{{ source_type }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -262,25 +262,24 @@ globals:
 resources:
   - name: event_subscription
     props:
-      - name: Tags
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-      - name: SubscriptionName
-        value: '{{ SubscriptionName }}'
-      - name: Enabled
-        value: '{{ Enabled }}'
-      - name: EventCategories
+          - key: '{{ key }}'
+            value: '{{ value }}'
+      - name: subscription_name
+        value: '{{ subscription_name }}'
+      - name: enabled
+        value: '{{ enabled }}'
+      - name: event_categories
         value:
-          - '{{ EventCategories[0] }}'
-      - name: SnsTopicArn
-        value: '{{ SnsTopicArn }}'
-      - name: SourceIds
+          - '{{ event_categories[0] }}'
+      - name: sns_topic_arn
+        value: '{{ sns_topic_arn }}'
+      - name: source_ids
         value:
-          - '{{ SourceIds[0] }}'
-      - name: SourceType
-        value: '{{ SourceType }}'
-
+          - '{{ source_ids[0] }}'
+      - name: source_type
+        value: '{{ source_type }}'
 ```
 </TabItem>
 </Tabs>
@@ -300,7 +299,7 @@ SET PatchDocument = string('{{ {
     "SourceType": source_type
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<SubscriptionName>';
+AND Identifier = '{{ subscription_name }}';
 ```
 
 
@@ -309,7 +308,7 @@ AND Identifier = '<SubscriptionName>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.rds.event_subscriptions
-WHERE Identifier = '<SubscriptionName>'
+WHERE Identifier = '{{ subscription_name }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/rds/global_clusters/index.md b/website/docs/services/rds/global_clusters/index.md
index 658e25c4a..5016d5b3c 100644
--- a/website/docs/services/rds/global_clusters/index.md
+++ b/website/docs/services/rds/global_clusters/index.md
@@ -201,7 +201,7 @@ source_db_cluster_identifier,
 storage_encrypted,
 global_endpoint
 FROM awscc.rds.global_clusters
-WHERE region = 'us-east-1' AND Identifier = '<GlobalClusterIdentifier>';
+WHERE region = 'us-east-1' AND Identifier = '{{ global_cluster_identifier }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -244,15 +244,15 @@ INSERT INTO awscc.rds.global_clusters (
  StorageEncrypted,
  region
 )
-SELECT 
-'{{ Engine }}',
- '{{ Tags }}',
- '{{ EngineLifecycleSupport }}',
- '{{ EngineVersion }}',
- '{{ DeletionProtection }}',
- '{{ GlobalClusterIdentifier }}',
- '{{ SourceDBClusterIdentifier }}',
- '{{ StorageEncrypted }}',
+SELECT
+'{{ engine }}',
+ '{{ tags }}',
+ '{{ engine_lifecycle_support }}',
+ '{{ engine_version }}',
+ '{{ deletion_protection }}',
+ '{{ global_cluster_identifier }}',
+ '{{ source_db_cluster_identifier }}',
+ '{{ storage_encrypted }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -271,15 +271,15 @@ INSERT INTO awscc.rds.global_clusters (
  StorageEncrypted,
  region
 )
-SELECT 
- '{{ Engine }}',
- '{{ Tags }}',
- '{{ EngineLifecycleSupport }}',
- '{{ EngineVersion }}',
- '{{ DeletionProtection }}',
- '{{ GlobalClusterIdentifier }}',
- '{{ SourceDBClusterIdentifier }}',
- '{{ StorageEncrypted }}',
+SELECT
+ '{{ engine }}',
+ '{{ tags }}',
+ '{{ engine_lifecycle_support }}',
+ '{{ engine_version }}',
+ '{{ deletion_protection }}',
+ '{{ global_cluster_identifier }}',
+ '{{ source_db_cluster_identifier }}',
+ '{{ storage_encrypted }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -297,25 +297,24 @@ globals:
 resources:
   - name: global_cluster
     props:
-      - name: Engine
-        value: '{{ Engine }}'
-      - name: Tags
+      - name: engine
+        value: '{{ engine }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-      - name: EngineLifecycleSupport
-        value: '{{ EngineLifecycleSupport }}'
-      - name: EngineVersion
-        value: '{{ EngineVersion }}'
-      - name: DeletionProtection
-        value: '{{ DeletionProtection }}'
-      - name: GlobalClusterIdentifier
-        value: '{{ GlobalClusterIdentifier }}'
-      - name: SourceDBClusterIdentifier
-        value: '{{ SourceDBClusterIdentifier }}'
-      - name: StorageEncrypted
-        value: '{{ StorageEncrypted }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
+      - name: engine_lifecycle_support
+        value: '{{ engine_lifecycle_support }}'
+      - name: engine_version
+        value: '{{ engine_version }}'
+      - name: deletion_protection
+        value: '{{ deletion_protection }}'
+      - name: global_cluster_identifier
+        value: '{{ global_cluster_identifier }}'
+      - name: source_db_cluster_identifier
+        value: '{{ source_db_cluster_identifier }}'
+      - name: storage_encrypted
+        value: '{{ storage_encrypted }}'
 ```
 </TabItem>
 </Tabs>
@@ -334,7 +333,7 @@ SET PatchDocument = string('{{ {
     "DeletionProtection": deletion_protection
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<GlobalClusterIdentifier>';
+AND Identifier = '{{ global_cluster_identifier }}';
 ```
 
 
@@ -343,7 +342,7 @@ AND Identifier = '<GlobalClusterIdentifier>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.rds.global_clusters
-WHERE Identifier = '<GlobalClusterIdentifier>'
+WHERE Identifier = '{{ global_cluster_identifier }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/rds/integrations/index.md b/website/docs/services/rds/integrations/index.md
index aabcdab80..d562c869f 100644
--- a/website/docs/services/rds/integrations/index.md
+++ b/website/docs/services/rds/integrations/index.md
@@ -200,7 +200,7 @@ kms_key_id,
 additional_encryption_context,
 create_time
 FROM awscc.rds.integrations
-WHERE region = 'us-east-1' AND Identifier = '<IntegrationArn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ integration_arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -237,9 +237,9 @@ INSERT INTO awscc.rds.integrations (
  TargetArn,
  region
 )
-SELECT 
-'{{ SourceArn }}',
- '{{ TargetArn }}',
+SELECT
+'{{ source_arn }}',
+ '{{ target_arn }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -258,15 +258,15 @@ INSERT INTO awscc.rds.integrations (
  AdditionalEncryptionContext,
  region
 )
-SELECT 
- '{{ IntegrationName }}',
- '{{ Description }}',
- '{{ Tags }}',
- '{{ DataFilter }}',
- '{{ SourceArn }}',
- '{{ TargetArn }}',
- '{{ KMSKeyId }}',
- '{{ AdditionalEncryptionContext }}',
+SELECT
+ '{{ integration_name }}',
+ '{{ description }}',
+ '{{ tags }}',
+ '{{ data_filter }}',
+ '{{ source_arn }}',
+ '{{ target_arn }}',
+ '{{ kms_key_id }}',
+ '{{ additional_encryption_context }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -284,25 +284,24 @@ globals:
 resources:
   - name: integration
     props:
-      - name: IntegrationName
-        value: '{{ IntegrationName }}'
-      - name: Description
-        value: '{{ Description }}'
-      - name: Tags
+      - name: integration_name
+        value: '{{ integration_name }}'
+      - name: description
+        value: '{{ description }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-      - name: DataFilter
-        value: '{{ DataFilter }}'
-      - name: SourceArn
-        value: '{{ SourceArn }}'
-      - name: TargetArn
-        value: '{{ TargetArn }}'
-      - name: KMSKeyId
-        value: '{{ KMSKeyId }}'
-      - name: AdditionalEncryptionContext
+          - key: '{{ key }}'
+            value: '{{ value }}'
+      - name: data_filter
+        value: '{{ data_filter }}'
+      - name: source_arn
+        value: '{{ source_arn }}'
+      - name: target_arn
+        value: '{{ target_arn }}'
+      - name: kms_key_id
+        value: '{{ kms_key_id }}'
+      - name: additional_encryption_context
         value: {}
-
 ```
 </TabItem>
 </Tabs>
@@ -321,7 +320,7 @@ SET PatchDocument = string('{{ {
     "DataFilter": data_filter
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<IntegrationArn>';
+AND Identifier = '{{ integration_arn }}';
 ```
 
 
@@ -330,7 +329,7 @@ AND Identifier = '<IntegrationArn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.rds.integrations
-WHERE Identifier = '<IntegrationArn>'
+WHERE Identifier = '{{ integration_arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/rds/option_groups/index.md b/website/docs/services/rds/option_groups/index.md
index 999abe7b8..d6ac47ad7 100644
--- a/website/docs/services/rds/option_groups/index.md
+++ b/website/docs/services/rds/option_groups/index.md
@@ -220,7 +220,7 @@ major_engine_version,
 option_configurations,
 tags
 FROM awscc.rds.option_groups
-WHERE region = 'us-east-1' AND Identifier = '<OptionGroupName>';
+WHERE region = 'us-east-1' AND Identifier = '{{ option_group_name }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -258,10 +258,10 @@ INSERT INTO awscc.rds.option_groups (
  MajorEngineVersion,
  region
 )
-SELECT 
-'{{ OptionGroupDescription }}',
- '{{ EngineName }}',
- '{{ MajorEngineVersion }}',
+SELECT
+'{{ option_group_description }}',
+ '{{ engine_name }}',
+ '{{ major_engine_version }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -278,13 +278,13 @@ INSERT INTO awscc.rds.option_groups (
  Tags,
  region
 )
-SELECT 
- '{{ OptionGroupName }}',
- '{{ OptionGroupDescription }}',
- '{{ EngineName }}',
- '{{ MajorEngineVersion }}',
- '{{ OptionConfigurations }}',
- '{{ Tags }}',
+SELECT
+ '{{ option_group_name }}',
+ '{{ option_group_description }}',
+ '{{ engine_name }}',
+ '{{ major_engine_version }}',
+ '{{ option_configurations }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -302,31 +302,30 @@ globals:
 resources:
   - name: option_group
     props:
-      - name: OptionGroupName
-        value: '{{ OptionGroupName }}'
-      - name: OptionGroupDescription
-        value: '{{ OptionGroupDescription }}'
-      - name: EngineName
-        value: '{{ EngineName }}'
-      - name: MajorEngineVersion
-        value: '{{ MajorEngineVersion }}'
-      - name: OptionConfigurations
+      - name: option_group_name
+        value: '{{ option_group_name }}'
+      - name: option_group_description
+        value: '{{ option_group_description }}'
+      - name: engine_name
+        value: '{{ engine_name }}'
+      - name: major_engine_version
+        value: '{{ major_engine_version }}'
+      - name: option_configurations
         value:
-          - DBSecurityGroupMemberships:
-              - '{{ DBSecurityGroupMemberships[0] }}'
-            OptionName: '{{ OptionName }}'
-            OptionSettings:
-              - Name: '{{ Name }}'
-                Value: '{{ Value }}'
-            OptionVersion: '{{ OptionVersion }}'
-            Port: '{{ Port }}'
-            VpcSecurityGroupMemberships:
-              - '{{ VpcSecurityGroupMemberships[0] }}'
-      - name: Tags
+          - db_security_group_memberships:
+              - '{{ db_security_group_memberships[0] }}'
+            option_name: '{{ option_name }}'
+            option_settings:
+              - name: '{{ name }}'
+                value: '{{ value }}'
+            option_version: '{{ option_version }}'
+            port: '{{ port }}'
+            vpc_security_group_memberships:
+              - '{{ vpc_security_group_memberships[0] }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -343,7 +342,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<OptionGroupName>';
+AND Identifier = '{{ option_group_name }}';
 ```
 
 
@@ -352,7 +351,7 @@ AND Identifier = '<OptionGroupName>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.rds.option_groups
-WHERE Identifier = '<OptionGroupName>'
+WHERE Identifier = '{{ option_group_name }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/redshift/cluster_parameter_groups/index.md b/website/docs/services/redshift/cluster_parameter_groups/index.md
index 400d9f10a..66d41addc 100644
--- a/website/docs/services/redshift/cluster_parameter_groups/index.md
+++ b/website/docs/services/redshift/cluster_parameter_groups/index.md
@@ -182,7 +182,7 @@ parameter_group_family,
 parameters,
 tags
 FROM awscc.redshift.cluster_parameter_groups
-WHERE region = 'us-east-1' AND Identifier = '<ParameterGroupName>';
+WHERE region = 'us-east-1' AND Identifier = '{{ parameter_group_name }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -219,9 +219,9 @@ INSERT INTO awscc.redshift.cluster_parameter_groups (
  ParameterGroupFamily,
  region
 )
-SELECT 
-'{{ Description }}',
- '{{ ParameterGroupFamily }}',
+SELECT
+'{{ description }}',
+ '{{ parameter_group_family }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -237,12 +237,12 @@ INSERT INTO awscc.redshift.cluster_parameter_groups (
  Tags,
  region
 )
-SELECT 
- '{{ ParameterGroupName }}',
- '{{ Description }}',
- '{{ ParameterGroupFamily }}',
- '{{ Parameters }}',
- '{{ Tags }}',
+SELECT
+ '{{ parameter_group_name }}',
+ '{{ description }}',
+ '{{ parameter_group_family }}',
+ '{{ parameters }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -260,21 +260,20 @@ globals:
 resources:
   - name: cluster_parameter_group
     props:
-      - name: ParameterGroupName
-        value: '{{ ParameterGroupName }}'
-      - name: Description
-        value: '{{ Description }}'
-      - name: ParameterGroupFamily
-        value: '{{ ParameterGroupFamily }}'
-      - name: Parameters
+      - name: parameter_group_name
+        value: '{{ parameter_group_name }}'
+      - name: description
+        value: '{{ description }}'
+      - name: parameter_group_family
+        value: '{{ parameter_group_family }}'
+      - name: parameters
         value:
-          - ParameterName: '{{ ParameterName }}'
-            ParameterValue: '{{ ParameterValue }}'
-      - name: Tags
+          - parameter_name: '{{ parameter_name }}'
+            parameter_value: '{{ parameter_value }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -291,7 +290,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<ParameterGroupName>';
+AND Identifier = '{{ parameter_group_name }}';
 ```
 
 
@@ -300,7 +299,7 @@ AND Identifier = '<ParameterGroupName>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.redshift.cluster_parameter_groups
-WHERE Identifier = '<ParameterGroupName>'
+WHERE Identifier = '{{ parameter_group_name }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/redshift/cluster_subnet_groups/index.md b/website/docs/services/redshift/cluster_subnet_groups/index.md
index 1d576d9bd..4d994a079 100644
--- a/website/docs/services/redshift/cluster_subnet_groups/index.md
+++ b/website/docs/services/redshift/cluster_subnet_groups/index.md
@@ -164,7 +164,7 @@ subnet_ids,
 tags,
 cluster_subnet_group_name
 FROM awscc.redshift.cluster_subnet_groups
-WHERE region = 'us-east-1' AND Identifier = '<ClusterSubnetGroupName>';
+WHERE region = 'us-east-1' AND Identifier = '{{ cluster_subnet_group_name }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -201,9 +201,9 @@ INSERT INTO awscc.redshift.cluster_subnet_groups (
  SubnetIds,
  region
 )
-SELECT 
-'{{ Description }}',
- '{{ SubnetIds }}',
+SELECT
+'{{ description }}',
+ '{{ subnet_ids }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -217,10 +217,10 @@ INSERT INTO awscc.redshift.cluster_subnet_groups (
  Tags,
  region
 )
-SELECT 
- '{{ Description }}',
- '{{ SubnetIds }}',
- '{{ Tags }}',
+SELECT
+ '{{ description }}',
+ '{{ subnet_ids }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -238,16 +238,15 @@ globals:
 resources:
   - name: cluster_subnet_group
     props:
-      - name: Description
-        value: '{{ Description }}'
-      - name: SubnetIds
+      - name: description
+        value: '{{ description }}'
+      - name: subnet_ids
         value:
-          - '{{ SubnetIds[0] }}'
-      - name: Tags
+          - '{{ subnet_ids[0] }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -265,7 +264,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<ClusterSubnetGroupName>';
+AND Identifier = '{{ cluster_subnet_group_name }}';
 ```
 
 
@@ -274,7 +273,7 @@ AND Identifier = '<ClusterSubnetGroupName>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.redshift.cluster_subnet_groups
-WHERE Identifier = '<ClusterSubnetGroupName>'
+WHERE Identifier = '{{ cluster_subnet_group_name }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/redshift/clusters/index.md b/website/docs/services/redshift/clusters/index.md
index 25017b907..9a4fb6f2f 100644
--- a/website/docs/services/redshift/clusters/index.md
+++ b/website/docs/services/redshift/clusters/index.md
@@ -504,7 +504,7 @@ defer_maintenance_duration,
 db_name,
 snapshot_copy_retention_period
 FROM awscc.redshift.clusters
-WHERE region = 'us-east-1' AND Identifier = '<ClusterIdentifier>';
+WHERE region = 'us-east-1' AND Identifier = '{{ cluster_identifier }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -543,11 +543,11 @@ INSERT INTO awscc.redshift.clusters (
  DBName,
  region
 )
-SELECT 
-'{{ NodeType }}',
- '{{ MasterUsername }}',
- '{{ ClusterType }}',
- '{{ DBName }}',
+SELECT
+'{{ node_type }}',
+ '{{ master_username }}',
+ '{{ cluster_type }}',
+ '{{ db_name }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -610,59 +610,59 @@ INSERT INTO awscc.redshift.clusters (
  SnapshotCopyRetentionPeriod,
  region
 )
-SELECT 
- '{{ RevisionTarget }}',
- '{{ AutomatedSnapshotRetentionPeriod }}',
- '{{ Encrypted }}',
- '{{ Port }}',
- '{{ NumberOfNodes }}',
- '{{ DestinationRegion }}',
- '{{ AllowVersionUpgrade }}',
- '{{ Endpoint }}',
- '{{ NamespaceResourcePolicy }}',
- '{{ MaintenanceTrackName }}',
- '{{ OwnerAccount }}',
- '{{ MultiAZ }}',
- '{{ Tags }}',
- '{{ SnapshotClusterIdentifier }}',
- '{{ IamRoles }}',
- '{{ KmsKeyId }}',
- '{{ SnapshotCopyManual }}',
- '{{ ManageMasterPassword }}',
- '{{ AvailabilityZone }}',
- '{{ ClusterSecurityGroups }}',
- '{{ ClusterIdentifier }}',
- '{{ MasterUserPassword }}',
- '{{ ClusterSubnetGroupName }}',
- '{{ LoggingProperties }}',
- '{{ DeferMaintenance }}',
- '{{ NodeType }}',
- '{{ MasterUsername }}',
- '{{ PubliclyAccessible }}',
- '{{ ManualSnapshotRetentionPeriod }}',
- '{{ ResourceAction }}',
- '{{ HsmClientCertificateIdentifier }}',
- '{{ ElasticIp }}',
- '{{ AvailabilityZoneRelocationStatus }}',
- '{{ AquaConfigurationStatus }}',
- '{{ SnapshotIdentifier }}',
- '{{ AvailabilityZoneRelocation }}',
- '{{ SnapshotCopyGrantName }}',
- '{{ EnhancedVpcRouting }}',
- '{{ ClusterParameterGroupName }}',
- '{{ DeferMaintenanceEndTime }}',
- '{{ RotateEncryptionKey }}',
- '{{ VpcSecurityGroupIds }}',
- '{{ ClusterVersion }}',
- '{{ HsmConfigurationIdentifier }}',
- '{{ PreferredMaintenanceWindow }}',
- '{{ DeferMaintenanceStartTime }}',
- '{{ ClusterType }}',
- '{{ Classic }}',
- '{{ MasterPasswordSecretKmsKeyId }}',
- '{{ DeferMaintenanceDuration }}',
- '{{ DBName }}',
- '{{ SnapshotCopyRetentionPeriod }}',
+SELECT
+ '{{ revision_target }}',
+ '{{ automated_snapshot_retention_period }}',
+ '{{ encrypted }}',
+ '{{ port }}',
+ '{{ number_of_nodes }}',
+ '{{ destination_region }}',
+ '{{ allow_version_upgrade }}',
+ '{{ endpoint }}',
+ '{{ namespace_resource_policy }}',
+ '{{ maintenance_track_name }}',
+ '{{ owner_account }}',
+ '{{ multi_az }}',
+ '{{ tags }}',
+ '{{ snapshot_cluster_identifier }}',
+ '{{ iam_roles }}',
+ '{{ kms_key_id }}',
+ '{{ snapshot_copy_manual }}',
+ '{{ manage_master_password }}',
+ '{{ availability_zone }}',
+ '{{ cluster_security_groups }}',
+ '{{ cluster_identifier }}',
+ '{{ master_user_password }}',
+ '{{ cluster_subnet_group_name }}',
+ '{{ logging_properties }}',
+ '{{ defer_maintenance }}',
+ '{{ node_type }}',
+ '{{ master_username }}',
+ '{{ publicly_accessible }}',
+ '{{ manual_snapshot_retention_period }}',
+ '{{ resource_action }}',
+ '{{ hsm_client_certificate_identifier }}',
+ '{{ elastic_ip }}',
+ '{{ availability_zone_relocation_status }}',
+ '{{ aqua_configuration_status }}',
+ '{{ snapshot_identifier }}',
+ '{{ availability_zone_relocation }}',
+ '{{ snapshot_copy_grant_name }}',
+ '{{ enhanced_vpc_routing }}',
+ '{{ cluster_parameter_group_name }}',
+ '{{ defer_maintenance_end_time }}',
+ '{{ rotate_encryption_key }}',
+ '{{ vpc_security_group_ids }}',
+ '{{ cluster_version }}',
+ '{{ hsm_configuration_identifier }}',
+ '{{ preferred_maintenance_window }}',
+ '{{ defer_maintenance_start_time }}',
+ '{{ cluster_type }}',
+ '{{ classic }}',
+ '{{ master_password_secret_kms_key_id }}',
+ '{{ defer_maintenance_duration }}',
+ '{{ db_name }}',
+ '{{ snapshot_copy_retention_period }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -680,123 +680,122 @@ globals:
 resources:
   - name: cluster
     props:
-      - name: RevisionTarget
-        value: '{{ RevisionTarget }}'
-      - name: AutomatedSnapshotRetentionPeriod
-        value: '{{ AutomatedSnapshotRetentionPeriod }}'
-      - name: Encrypted
-        value: '{{ Encrypted }}'
-      - name: Port
-        value: '{{ Port }}'
-      - name: NumberOfNodes
-        value: '{{ NumberOfNodes }}'
-      - name: DestinationRegion
-        value: '{{ DestinationRegion }}'
-      - name: AllowVersionUpgrade
-        value: '{{ AllowVersionUpgrade }}'
-      - name: Endpoint
+      - name: revision_target
+        value: '{{ revision_target }}'
+      - name: automated_snapshot_retention_period
+        value: '{{ automated_snapshot_retention_period }}'
+      - name: encrypted
+        value: '{{ encrypted }}'
+      - name: port
+        value: '{{ port }}'
+      - name: number_of_nodes
+        value: '{{ number_of_nodes }}'
+      - name: destination_region
+        value: '{{ destination_region }}'
+      - name: allow_version_upgrade
+        value: '{{ allow_version_upgrade }}'
+      - name: endpoint
         value:
-          Address: '{{ Address }}'
-          Port: '{{ Port }}'
-      - name: NamespaceResourcePolicy
+          address: '{{ address }}'
+          port: '{{ port }}'
+      - name: namespace_resource_policy
         value: {}
-      - name: MaintenanceTrackName
-        value: '{{ MaintenanceTrackName }}'
-      - name: OwnerAccount
-        value: '{{ OwnerAccount }}'
-      - name: MultiAZ
-        value: '{{ MultiAZ }}'
-      - name: Tags
+      - name: maintenance_track_name
+        value: '{{ maintenance_track_name }}'
+      - name: owner_account
+        value: '{{ owner_account }}'
+      - name: multi_az
+        value: '{{ multi_az }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-      - name: SnapshotClusterIdentifier
-        value: '{{ SnapshotClusterIdentifier }}'
-      - name: IamRoles
+          - key: '{{ key }}'
+            value: '{{ value }}'
+      - name: snapshot_cluster_identifier
+        value: '{{ snapshot_cluster_identifier }}'
+      - name: iam_roles
         value:
-          - '{{ IamRoles[0] }}'
-      - name: KmsKeyId
-        value: '{{ KmsKeyId }}'
-      - name: SnapshotCopyManual
-        value: '{{ SnapshotCopyManual }}'
-      - name: ManageMasterPassword
-        value: '{{ ManageMasterPassword }}'
-      - name: AvailabilityZone
-        value: '{{ AvailabilityZone }}'
-      - name: ClusterSecurityGroups
+          - '{{ iam_roles[0] }}'
+      - name: kms_key_id
+        value: '{{ kms_key_id }}'
+      - name: snapshot_copy_manual
+        value: '{{ snapshot_copy_manual }}'
+      - name: manage_master_password
+        value: '{{ manage_master_password }}'
+      - name: availability_zone
+        value: '{{ availability_zone }}'
+      - name: cluster_security_groups
         value:
-          - '{{ ClusterSecurityGroups[0] }}'
-      - name: ClusterIdentifier
-        value: '{{ ClusterIdentifier }}'
-      - name: MasterUserPassword
-        value: '{{ MasterUserPassword }}'
-      - name: ClusterSubnetGroupName
-        value: '{{ ClusterSubnetGroupName }}'
-      - name: LoggingProperties
+          - '{{ cluster_security_groups[0] }}'
+      - name: cluster_identifier
+        value: '{{ cluster_identifier }}'
+      - name: master_user_password
+        value: '{{ master_user_password }}'
+      - name: cluster_subnet_group_name
+        value: '{{ cluster_subnet_group_name }}'
+      - name: logging_properties
         value:
-          BucketName: '{{ BucketName }}'
-          S3KeyPrefix: '{{ S3KeyPrefix }}'
-          LogDestinationType: '{{ LogDestinationType }}'
-          LogExports:
-            - '{{ LogExports[0] }}'
-      - name: DeferMaintenance
-        value: '{{ DeferMaintenance }}'
-      - name: NodeType
-        value: '{{ NodeType }}'
-      - name: MasterUsername
-        value: '{{ MasterUsername }}'
-      - name: PubliclyAccessible
-        value: '{{ PubliclyAccessible }}'
-      - name: ManualSnapshotRetentionPeriod
-        value: '{{ ManualSnapshotRetentionPeriod }}'
-      - name: ResourceAction
-        value: '{{ ResourceAction }}'
-      - name: HsmClientCertificateIdentifier
-        value: '{{ HsmClientCertificateIdentifier }}'
-      - name: ElasticIp
-        value: '{{ ElasticIp }}'
-      - name: AvailabilityZoneRelocationStatus
-        value: '{{ AvailabilityZoneRelocationStatus }}'
-      - name: AquaConfigurationStatus
-        value: '{{ AquaConfigurationStatus }}'
-      - name: SnapshotIdentifier
-        value: '{{ SnapshotIdentifier }}'
-      - name: AvailabilityZoneRelocation
-        value: '{{ AvailabilityZoneRelocation }}'
-      - name: SnapshotCopyGrantName
-        value: '{{ SnapshotCopyGrantName }}'
-      - name: EnhancedVpcRouting
-        value: '{{ EnhancedVpcRouting }}'
-      - name: ClusterParameterGroupName
-        value: '{{ ClusterParameterGroupName }}'
-      - name: DeferMaintenanceEndTime
-        value: '{{ DeferMaintenanceEndTime }}'
-      - name: RotateEncryptionKey
-        value: '{{ RotateEncryptionKey }}'
-      - name: VpcSecurityGroupIds
+          bucket_name: '{{ bucket_name }}'
+          s3_key_prefix: '{{ s3_key_prefix }}'
+          log_destination_type: '{{ log_destination_type }}'
+          log_exports:
+            - '{{ log_exports[0] }}'
+      - name: defer_maintenance
+        value: '{{ defer_maintenance }}'
+      - name: node_type
+        value: '{{ node_type }}'
+      - name: master_username
+        value: '{{ master_username }}'
+      - name: publicly_accessible
+        value: '{{ publicly_accessible }}'
+      - name: manual_snapshot_retention_period
+        value: '{{ manual_snapshot_retention_period }}'
+      - name: resource_action
+        value: '{{ resource_action }}'
+      - name: hsm_client_certificate_identifier
+        value: '{{ hsm_client_certificate_identifier }}'
+      - name: elastic_ip
+        value: '{{ elastic_ip }}'
+      - name: availability_zone_relocation_status
+        value: '{{ availability_zone_relocation_status }}'
+      - name: aqua_configuration_status
+        value: '{{ aqua_configuration_status }}'
+      - name: snapshot_identifier
+        value: '{{ snapshot_identifier }}'
+      - name: availability_zone_relocation
+        value: '{{ availability_zone_relocation }}'
+      - name: snapshot_copy_grant_name
+        value: '{{ snapshot_copy_grant_name }}'
+      - name: enhanced_vpc_routing
+        value: '{{ enhanced_vpc_routing }}'
+      - name: cluster_parameter_group_name
+        value: '{{ cluster_parameter_group_name }}'
+      - name: defer_maintenance_end_time
+        value: '{{ defer_maintenance_end_time }}'
+      - name: rotate_encryption_key
+        value: '{{ rotate_encryption_key }}'
+      - name: vpc_security_group_ids
         value:
-          - '{{ VpcSecurityGroupIds[0] }}'
-      - name: ClusterVersion
-        value: '{{ ClusterVersion }}'
-      - name: HsmConfigurationIdentifier
-        value: '{{ HsmConfigurationIdentifier }}'
-      - name: PreferredMaintenanceWindow
-        value: '{{ PreferredMaintenanceWindow }}'
-      - name: DeferMaintenanceStartTime
-        value: '{{ DeferMaintenanceStartTime }}'
-      - name: ClusterType
-        value: '{{ ClusterType }}'
-      - name: Classic
-        value: '{{ Classic }}'
-      - name: MasterPasswordSecretKmsKeyId
-        value: '{{ MasterPasswordSecretKmsKeyId }}'
-      - name: DeferMaintenanceDuration
-        value: '{{ DeferMaintenanceDuration }}'
-      - name: DBName
-        value: '{{ DBName }}'
-      - name: SnapshotCopyRetentionPeriod
-        value: '{{ SnapshotCopyRetentionPeriod }}'
-
+          - '{{ vpc_security_group_ids[0] }}'
+      - name: cluster_version
+        value: '{{ cluster_version }}'
+      - name: hsm_configuration_identifier
+        value: '{{ hsm_configuration_identifier }}'
+      - name: preferred_maintenance_window
+        value: '{{ preferred_maintenance_window }}'
+      - name: defer_maintenance_start_time
+        value: '{{ defer_maintenance_start_time }}'
+      - name: cluster_type
+        value: '{{ cluster_type }}'
+      - name: classic
+        value: '{{ classic }}'
+      - name: master_password_secret_kms_key_id
+        value: '{{ master_password_secret_kms_key_id }}'
+      - name: defer_maintenance_duration
+        value: '{{ defer_maintenance_duration }}'
+      - name: db_name
+        value: '{{ db_name }}'
+      - name: snapshot_copy_retention_period
+        value: '{{ snapshot_copy_retention_period }}'
 ```
 </TabItem>
 </Tabs>
@@ -855,7 +854,7 @@ SET PatchDocument = string('{{ {
     "SnapshotCopyRetentionPeriod": snapshot_copy_retention_period
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<ClusterIdentifier>';
+AND Identifier = '{{ cluster_identifier }}';
 ```
 
 
@@ -864,7 +863,7 @@ AND Identifier = '<ClusterIdentifier>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.redshift.clusters
-WHERE Identifier = '<ClusterIdentifier>'
+WHERE Identifier = '{{ cluster_identifier }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/redshift/endpoint_accesses/index.md b/website/docs/services/redshift/endpoint_accesses/index.md
index f2252c712..1c18ba9e6 100644
--- a/website/docs/services/redshift/endpoint_accesses/index.md
+++ b/website/docs/services/redshift/endpoint_accesses/index.md
@@ -245,7 +245,7 @@ endpoint_create_time,
 cluster_identifier,
 vpc_security_groups
 FROM awscc.redshift.endpoint_accesses
-WHERE region = 'us-east-1' AND Identifier = '<EndpointName>';
+WHERE region = 'us-east-1' AND Identifier = '{{ endpoint_name }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -284,11 +284,11 @@ INSERT INTO awscc.redshift.endpoint_accesses (
  ClusterIdentifier,
  region
 )
-SELECT 
-'{{ EndpointName }}',
- '{{ VpcSecurityGroupIds }}',
- '{{ SubnetGroupName }}',
- '{{ ClusterIdentifier }}',
+SELECT
+'{{ endpoint_name }}',
+ '{{ vpc_security_group_ids }}',
+ '{{ subnet_group_name }}',
+ '{{ cluster_identifier }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -304,12 +304,12 @@ INSERT INTO awscc.redshift.endpoint_accesses (
  ClusterIdentifier,
  region
 )
-SELECT 
- '{{ EndpointName }}',
- '{{ VpcSecurityGroupIds }}',
- '{{ ResourceOwner }}',
- '{{ SubnetGroupName }}',
- '{{ ClusterIdentifier }}',
+SELECT
+ '{{ endpoint_name }}',
+ '{{ vpc_security_group_ids }}',
+ '{{ resource_owner }}',
+ '{{ subnet_group_name }}',
+ '{{ cluster_identifier }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -327,18 +327,17 @@ globals:
 resources:
   - name: endpoint_access
     props:
-      - name: EndpointName
-        value: '{{ EndpointName }}'
-      - name: VpcSecurityGroupIds
+      - name: endpoint_name
+        value: '{{ endpoint_name }}'
+      - name: vpc_security_group_ids
         value:
-          - '{{ VpcSecurityGroupIds[0] }}'
-      - name: ResourceOwner
-        value: '{{ ResourceOwner }}'
-      - name: SubnetGroupName
-        value: '{{ SubnetGroupName }}'
-      - name: ClusterIdentifier
-        value: '{{ ClusterIdentifier }}'
-
+          - '{{ vpc_security_group_ids[0] }}'
+      - name: resource_owner
+        value: '{{ resource_owner }}'
+      - name: subnet_group_name
+        value: '{{ subnet_group_name }}'
+      - name: cluster_identifier
+        value: '{{ cluster_identifier }}'
 ```
 </TabItem>
 </Tabs>
@@ -354,7 +353,7 @@ SET PatchDocument = string('{{ {
     "VpcSecurityGroupIds": vpc_security_group_ids
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<EndpointName>';
+AND Identifier = '{{ endpoint_name }}';
 ```
 
 
@@ -363,7 +362,7 @@ AND Identifier = '<EndpointName>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.redshift.endpoint_accesses
-WHERE Identifier = '<EndpointName>'
+WHERE Identifier = '{{ endpoint_name }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/redshift/endpoint_authorizations/index.md b/website/docs/services/redshift/endpoint_authorizations/index.md
index 0095cf134..b419c2376 100644
--- a/website/docs/services/redshift/endpoint_authorizations/index.md
+++ b/website/docs/services/redshift/endpoint_authorizations/index.md
@@ -190,7 +190,7 @@ vpc_ids,
 cluster_identifier,
 cluster_status
 FROM awscc.redshift.endpoint_authorizations
-WHERE region = 'us-east-1' AND Identifier = '<ClusterIdentifier>|<Account>';
+WHERE region = 'us-east-1' AND Identifier = '{{ cluster_identifier }}|{{ account }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -228,9 +228,9 @@ INSERT INTO awscc.redshift.endpoint_authorizations (
  ClusterIdentifier,
  region
 )
-SELECT 
-'{{ Account }}',
- '{{ ClusterIdentifier }}',
+SELECT
+'{{ account }}',
+ '{{ cluster_identifier }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -245,11 +245,11 @@ INSERT INTO awscc.redshift.endpoint_authorizations (
  ClusterIdentifier,
  region
 )
-SELECT 
- '{{ Account }}',
- '{{ Force }}',
- '{{ VpcIds }}',
- '{{ ClusterIdentifier }}',
+SELECT
+ '{{ account }}',
+ '{{ force }}',
+ '{{ vpc_ids }}',
+ '{{ cluster_identifier }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -267,16 +267,15 @@ globals:
 resources:
   - name: endpoint_authorization
     props:
-      - name: Account
-        value: '{{ Account }}'
-      - name: Force
-        value: '{{ Force }}'
-      - name: VpcIds
+      - name: account
+        value: '{{ account }}'
+      - name: force
+        value: '{{ force }}'
+      - name: vpc_ids
         value:
-          - '{{ VpcIds[0] }}'
-      - name: ClusterIdentifier
-        value: '{{ ClusterIdentifier }}'
-
+          - '{{ vpc_ids[0] }}'
+      - name: cluster_identifier
+        value: '{{ cluster_identifier }}'
 ```
 </TabItem>
 </Tabs>
@@ -293,7 +292,7 @@ SET PatchDocument = string('{{ {
     "VpcIds": vpc_ids
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<ClusterIdentifier>|<Account>';
+AND Identifier = '{{ cluster_identifier }}|{{ account }}';
 ```
 
 
@@ -302,7 +301,7 @@ AND Identifier = '<ClusterIdentifier>|<Account>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.redshift.endpoint_authorizations
-WHERE Identifier = '<ClusterIdentifier|Account>'
+WHERE Identifier = '{{ cluster_identifier }}|{{ account }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/redshift/event_subscriptions/index.md b/website/docs/services/redshift/event_subscriptions/index.md
index f16af2df8..9233fc11a 100644
--- a/website/docs/services/redshift/event_subscriptions/index.md
+++ b/website/docs/services/redshift/event_subscriptions/index.md
@@ -224,7 +224,7 @@ sns_topic_arn,
 subscription_creation_time,
 tags
 FROM awscc.redshift.event_subscriptions
-WHERE region = 'us-east-1' AND Identifier = '<SubscriptionName>';
+WHERE region = 'us-east-1' AND Identifier = '{{ subscription_name }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -260,8 +260,8 @@ INSERT INTO awscc.redshift.event_subscriptions (
  SubscriptionName,
  region
 )
-SELECT 
-'{{ SubscriptionName }}',
+SELECT
+'{{ subscription_name }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -280,15 +280,15 @@ INSERT INTO awscc.redshift.event_subscriptions (
  Tags,
  region
 )
-SELECT 
- '{{ SourceType }}',
- '{{ EventCategories }}',
- '{{ Enabled }}',
- '{{ Severity }}',
- '{{ SubscriptionName }}',
- '{{ SourceIds }}',
- '{{ SnsTopicArn }}',
- '{{ Tags }}',
+SELECT
+ '{{ source_type }}',
+ '{{ event_categories }}',
+ '{{ enabled }}',
+ '{{ severity }}',
+ '{{ subscription_name }}',
+ '{{ source_ids }}',
+ '{{ sns_topic_arn }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -306,27 +306,26 @@ globals:
 resources:
   - name: event_subscription
     props:
-      - name: SourceType
-        value: '{{ SourceType }}'
-      - name: EventCategories
+      - name: source_type
+        value: '{{ source_type }}'
+      - name: event_categories
         value:
-          - '{{ EventCategories[0] }}'
-      - name: Enabled
-        value: '{{ Enabled }}'
-      - name: Severity
-        value: '{{ Severity }}'
-      - name: SubscriptionName
-        value: '{{ SubscriptionName }}'
-      - name: SourceIds
+          - '{{ event_categories[0] }}'
+      - name: enabled
+        value: '{{ enabled }}'
+      - name: severity
+        value: '{{ severity }}'
+      - name: subscription_name
+        value: '{{ subscription_name }}'
+      - name: source_ids
         value:
-          - '{{ SourceIds[0] }}'
-      - name: SnsTopicArn
-        value: '{{ SnsTopicArn }}'
-      - name: Tags
+          - '{{ source_ids[0] }}'
+      - name: sns_topic_arn
+        value: '{{ sns_topic_arn }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -348,7 +347,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<SubscriptionName>';
+AND Identifier = '{{ subscription_name }}';
 ```
 
 
@@ -357,7 +356,7 @@ AND Identifier = '<SubscriptionName>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.redshift.event_subscriptions
-WHERE Identifier = '<SubscriptionName>'
+WHERE Identifier = '{{ subscription_name }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/redshift/integrations/index.md b/website/docs/services/redshift/integrations/index.md
index b3ab60cd8..e5282c893 100644
--- a/website/docs/services/redshift/integrations/index.md
+++ b/website/docs/services/redshift/integrations/index.md
@@ -188,7 +188,7 @@ create_time,
 kms_key_id,
 additional_encryption_context
 FROM awscc.redshift.integrations
-WHERE region = 'us-east-1' AND Identifier = '<IntegrationArn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ integration_arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -225,9 +225,9 @@ INSERT INTO awscc.redshift.integrations (
  TargetArn,
  region
 )
-SELECT 
-'{{ SourceArn }}',
- '{{ TargetArn }}',
+SELECT
+'{{ source_arn }}',
+ '{{ target_arn }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -244,13 +244,13 @@ INSERT INTO awscc.redshift.integrations (
  AdditionalEncryptionContext,
  region
 )
-SELECT 
- '{{ IntegrationName }}',
- '{{ SourceArn }}',
- '{{ TargetArn }}',
- '{{ Tags }}',
- '{{ KMSKeyId }}',
- '{{ AdditionalEncryptionContext }}',
+SELECT
+ '{{ integration_name }}',
+ '{{ source_arn }}',
+ '{{ target_arn }}',
+ '{{ tags }}',
+ '{{ kms_key_id }}',
+ '{{ additional_encryption_context }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -268,21 +268,20 @@ globals:
 resources:
   - name: integration
     props:
-      - name: IntegrationName
-        value: '{{ IntegrationName }}'
-      - name: SourceArn
-        value: '{{ SourceArn }}'
-      - name: TargetArn
-        value: '{{ TargetArn }}'
-      - name: Tags
+      - name: integration_name
+        value: '{{ integration_name }}'
+      - name: source_arn
+        value: '{{ source_arn }}'
+      - name: target_arn
+        value: '{{ target_arn }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-      - name: KMSKeyId
-        value: '{{ KMSKeyId }}'
-      - name: AdditionalEncryptionContext
+          - key: '{{ key }}'
+            value: '{{ value }}'
+      - name: kms_key_id
+        value: '{{ kms_key_id }}'
+      - name: additional_encryption_context
         value: {}
-
 ```
 </TabItem>
 </Tabs>
@@ -299,7 +298,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<IntegrationArn>';
+AND Identifier = '{{ integration_arn }}';
 ```
 
 
@@ -308,7 +307,7 @@ AND Identifier = '<IntegrationArn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.redshift.integrations
-WHERE Identifier = '<IntegrationArn>'
+WHERE Identifier = '{{ integration_arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/redshift/scheduled_actions/index.md b/website/docs/services/redshift/scheduled_actions/index.md
index 405e3e2b8..902dda1e5 100644
--- a/website/docs/services/redshift/scheduled_actions/index.md
+++ b/website/docs/services/redshift/scheduled_actions/index.md
@@ -188,7 +188,7 @@ enable,
 target_action,
 next_invocations
 FROM awscc.redshift.scheduled_actions
-WHERE region = 'us-east-1' AND Identifier = '<ScheduledActionName>';
+WHERE region = 'us-east-1' AND Identifier = '{{ scheduled_action_name }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -224,8 +224,8 @@ INSERT INTO awscc.redshift.scheduled_actions (
  ScheduledActionName,
  region
 )
-SELECT 
-'{{ ScheduledActionName }}',
+SELECT
+'{{ scheduled_action_name }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -244,15 +244,15 @@ INSERT INTO awscc.redshift.scheduled_actions (
  TargetAction,
  region
 )
-SELECT 
- '{{ ScheduledActionDescription }}',
- '{{ ScheduledActionName }}',
- '{{ EndTime }}',
- '{{ Schedule }}',
- '{{ IamRole }}',
- '{{ StartTime }}',
- '{{ Enable }}',
- '{{ TargetAction }}',
+SELECT
+ '{{ scheduled_action_description }}',
+ '{{ scheduled_action_name }}',
+ '{{ end_time }}',
+ '{{ schedule }}',
+ '{{ iam_role }}',
+ '{{ start_time }}',
+ '{{ enable }}',
+ '{{ target_action }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -270,23 +270,22 @@ globals:
 resources:
   - name: scheduled_action
     props:
-      - name: ScheduledActionDescription
-        value: '{{ ScheduledActionDescription }}'
-      - name: ScheduledActionName
-        value: '{{ ScheduledActionName }}'
-      - name: EndTime
-        value: '{{ EndTime }}'
-      - name: Schedule
-        value: '{{ Schedule }}'
-      - name: IamRole
-        value: '{{ IamRole }}'
-      - name: StartTime
+      - name: scheduled_action_description
+        value: '{{ scheduled_action_description }}'
+      - name: scheduled_action_name
+        value: '{{ scheduled_action_name }}'
+      - name: end_time
+        value: '{{ end_time }}'
+      - name: schedule
+        value: '{{ schedule }}'
+      - name: iam_role
+        value: '{{ iam_role }}'
+      - name: start_time
         value: null
-      - name: Enable
-        value: '{{ Enable }}'
-      - name: TargetAction
+      - name: enable
+        value: '{{ enable }}'
+      - name: target_action
         value: {}
-
 ```
 </TabItem>
 </Tabs>
@@ -308,7 +307,7 @@ SET PatchDocument = string('{{ {
     "TargetAction": target_action
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<ScheduledActionName>';
+AND Identifier = '{{ scheduled_action_name }}';
 ```
 
 
@@ -317,7 +316,7 @@ AND Identifier = '<ScheduledActionName>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.redshift.scheduled_actions
-WHERE Identifier = '<ScheduledActionName>'
+WHERE Identifier = '{{ scheduled_action_name }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/redshiftserverless/namespaces/index.md b/website/docs/services/redshiftserverless/namespaces/index.md
index 2c2ff962e..6a883e822 100644
--- a/website/docs/services/redshiftserverless/namespaces/index.md
+++ b/website/docs/services/redshiftserverless/namespaces/index.md
@@ -486,7 +486,7 @@ namespace_resource_policy,
 redshift_idc_application_arn,
 snapshot_copy_configurations
 FROM awscc.redshiftserverless.namespaces
-WHERE region = 'us-east-1' AND Identifier = '<NamespaceName>';
+WHERE region = 'us-east-1' AND Identifier = '{{ namespace_name }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -522,8 +522,8 @@ INSERT INTO awscc.redshiftserverless.namespaces (
  NamespaceName,
  region
 )
-SELECT 
-'{{ NamespaceName }}',
+SELECT
+'{{ namespace_name }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -550,23 +550,23 @@ INSERT INTO awscc.redshiftserverless.namespaces (
  SnapshotCopyConfigurations,
  region
 )
-SELECT 
- '{{ AdminPasswordSecretKmsKeyId }}',
- '{{ AdminUserPassword }}',
- '{{ AdminUsername }}',
- '{{ DbName }}',
- '{{ DefaultIamRoleArn }}',
- '{{ IamRoles }}',
- '{{ KmsKeyId }}',
- '{{ LogExports }}',
- '{{ ManageAdminPassword }}',
- '{{ NamespaceName }}',
- '{{ Tags }}',
- '{{ FinalSnapshotName }}',
- '{{ FinalSnapshotRetentionPeriod }}',
- '{{ NamespaceResourcePolicy }}',
- '{{ RedshiftIdcApplicationArn }}',
- '{{ SnapshotCopyConfigurations }}',
+SELECT
+ '{{ admin_password_secret_kms_key_id }}',
+ '{{ admin_user_password }}',
+ '{{ admin_username }}',
+ '{{ db_name }}',
+ '{{ default_iam_role_arn }}',
+ '{{ iam_roles }}',
+ '{{ kms_key_id }}',
+ '{{ log_exports }}',
+ '{{ manage_admin_password }}',
+ '{{ namespace_name }}',
+ '{{ tags }}',
+ '{{ final_snapshot_name }}',
+ '{{ final_snapshot_retention_period }}',
+ '{{ namespace_resource_policy }}',
+ '{{ redshift_idc_application_arn }}',
+ '{{ snapshot_copy_configurations }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -584,46 +584,45 @@ globals:
 resources:
   - name: namespace
     props:
-      - name: AdminPasswordSecretKmsKeyId
-        value: '{{ AdminPasswordSecretKmsKeyId }}'
-      - name: AdminUserPassword
-        value: '{{ AdminUserPassword }}'
-      - name: AdminUsername
-        value: '{{ AdminUsername }}'
-      - name: DbName
-        value: '{{ DbName }}'
-      - name: DefaultIamRoleArn
-        value: '{{ DefaultIamRoleArn }}'
-      - name: IamRoles
+      - name: admin_password_secret_kms_key_id
+        value: '{{ admin_password_secret_kms_key_id }}'
+      - name: admin_user_password
+        value: '{{ admin_user_password }}'
+      - name: admin_username
+        value: '{{ admin_username }}'
+      - name: db_name
+        value: '{{ db_name }}'
+      - name: default_iam_role_arn
+        value: '{{ default_iam_role_arn }}'
+      - name: iam_roles
         value:
-          - '{{ IamRoles[0] }}'
-      - name: KmsKeyId
-        value: '{{ KmsKeyId }}'
-      - name: LogExports
+          - '{{ iam_roles[0] }}'
+      - name: kms_key_id
+        value: '{{ kms_key_id }}'
+      - name: log_exports
         value:
-          - '{{ LogExports[0] }}'
-      - name: ManageAdminPassword
-        value: '{{ ManageAdminPassword }}'
-      - name: NamespaceName
-        value: '{{ NamespaceName }}'
-      - name: Tags
+          - '{{ log_exports[0] }}'
+      - name: manage_admin_password
+        value: '{{ manage_admin_password }}'
+      - name: namespace_name
+        value: '{{ namespace_name }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-      - name: FinalSnapshotName
-        value: '{{ FinalSnapshotName }}'
-      - name: FinalSnapshotRetentionPeriod
-        value: '{{ FinalSnapshotRetentionPeriod }}'
-      - name: NamespaceResourcePolicy
+          - key: '{{ key }}'
+            value: '{{ value }}'
+      - name: final_snapshot_name
+        value: '{{ final_snapshot_name }}'
+      - name: final_snapshot_retention_period
+        value: '{{ final_snapshot_retention_period }}'
+      - name: namespace_resource_policy
         value: {}
-      - name: RedshiftIdcApplicationArn
-        value: '{{ RedshiftIdcApplicationArn }}'
-      - name: SnapshotCopyConfigurations
+      - name: redshift_idc_application_arn
+        value: '{{ redshift_idc_application_arn }}'
+      - name: snapshot_copy_configurations
         value:
-          - DestinationRegion: '{{ DestinationRegion }}'
-            DestinationKmsKeyId: '{{ DestinationKmsKeyId }}'
-            SnapshotRetentionPeriod: '{{ SnapshotRetentionPeriod }}'
-
+          - destination_region: '{{ destination_region }}'
+            destination_kms_key_id: '{{ destination_kms_key_id }}'
+            snapshot_retention_period: '{{ snapshot_retention_period }}'
 ```
 </TabItem>
 </Tabs>
@@ -653,7 +652,7 @@ SET PatchDocument = string('{{ {
     "SnapshotCopyConfigurations": snapshot_copy_configurations
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<NamespaceName>';
+AND Identifier = '{{ namespace_name }}';
 ```
 
 
@@ -662,7 +661,7 @@ AND Identifier = '<NamespaceName>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.redshiftserverless.namespaces
-WHERE Identifier = '<NamespaceName>'
+WHERE Identifier = '{{ namespace_name }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/redshiftserverless/snapshots/index.md b/website/docs/services/redshiftserverless/snapshots/index.md
index cf3902089..a42f05fb1 100644
--- a/website/docs/services/redshiftserverless/snapshots/index.md
+++ b/website/docs/services/redshiftserverless/snapshots/index.md
@@ -235,7 +235,7 @@ retention_period,
 tags,
 snapshot
 FROM awscc.redshiftserverless.snapshots
-WHERE region = 'us-east-1' AND Identifier = '<SnapshotName>';
+WHERE region = 'us-east-1' AND Identifier = '{{ snapshot_name }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -271,8 +271,8 @@ INSERT INTO awscc.redshiftserverless.snapshots (
  SnapshotName,
  region
 )
-SELECT 
-'{{ SnapshotName }}',
+SELECT
+'{{ snapshot_name }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -287,11 +287,11 @@ INSERT INTO awscc.redshiftserverless.snapshots (
  Tags,
  region
 )
-SELECT 
- '{{ SnapshotName }}',
- '{{ NamespaceName }}',
- '{{ RetentionPeriod }}',
- '{{ Tags }}',
+SELECT
+ '{{ snapshot_name }}',
+ '{{ namespace_name }}',
+ '{{ retention_period }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -309,17 +309,16 @@ globals:
 resources:
   - name: snapshot
     props:
-      - name: SnapshotName
-        value: '{{ SnapshotName }}'
-      - name: NamespaceName
-        value: '{{ NamespaceName }}'
-      - name: RetentionPeriod
-        value: '{{ RetentionPeriod }}'
-      - name: Tags
+      - name: snapshot_name
+        value: '{{ snapshot_name }}'
+      - name: namespace_name
+        value: '{{ namespace_name }}'
+      - name: retention_period
+        value: '{{ retention_period }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -335,7 +334,7 @@ SET PatchDocument = string('{{ {
     "RetentionPeriod": retention_period
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<SnapshotName>';
+AND Identifier = '{{ snapshot_name }}';
 ```
 
 
@@ -344,7 +343,7 @@ AND Identifier = '<SnapshotName>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.redshiftserverless.snapshots
-WHERE Identifier = '<SnapshotName>'
+WHERE Identifier = '{{ snapshot_name }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/redshiftserverless/workgroups/index.md b/website/docs/services/redshiftserverless/workgroups/index.md
index 2d7b0e132..a00b21c48 100644
--- a/website/docs/services/redshiftserverless/workgroups/index.md
+++ b/website/docs/services/redshiftserverless/workgroups/index.md
@@ -441,7 +441,7 @@ tags,
 track_name,
 workgroup
 FROM awscc.redshiftserverless.workgroups
-WHERE region = 'us-east-1' AND Identifier = '<WorkgroupName>';
+WHERE region = 'us-east-1' AND Identifier = '{{ workgroup_name }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -477,8 +477,8 @@ INSERT INTO awscc.redshiftserverless.workgroups (
  WorkgroupName,
  region
 )
-SELECT 
-'{{ WorkgroupName }}',
+SELECT
+'{{ workgroup_name }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -507,25 +507,25 @@ INSERT INTO awscc.redshiftserverless.workgroups (
  Workgroup,
  region
 )
-SELECT 
- '{{ WorkgroupName }}',
- '{{ NamespaceName }}',
- '{{ BaseCapacity }}',
- '{{ MaxCapacity }}',
- '{{ EnhancedVpcRouting }}',
- '{{ ConfigParameters }}',
- '{{ SecurityGroupIds }}',
- '{{ SubnetIds }}',
- '{{ PubliclyAccessible }}',
- '{{ Port }}',
- '{{ PricePerformanceTarget }}',
- '{{ SnapshotArn }}',
- '{{ SnapshotName }}',
- '{{ SnapshotOwnerAccount }}',
- '{{ RecoveryPointId }}',
- '{{ Tags }}',
- '{{ TrackName }}',
- '{{ Workgroup }}',
+SELECT
+ '{{ workgroup_name }}',
+ '{{ namespace_name }}',
+ '{{ base_capacity }}',
+ '{{ max_capacity }}',
+ '{{ enhanced_vpc_routing }}',
+ '{{ config_parameters }}',
+ '{{ security_group_ids }}',
+ '{{ subnet_ids }}',
+ '{{ publicly_accessible }}',
+ '{{ port }}',
+ '{{ price_performance_target }}',
+ '{{ snapshot_arn }}',
+ '{{ snapshot_name }}',
+ '{{ snapshot_owner_account }}',
+ '{{ recovery_point_id }}',
+ '{{ tags }}',
+ '{{ track_name }}',
+ '{{ workgroup }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -543,73 +543,72 @@ globals:
 resources:
   - name: workgroup
     props:
-      - name: WorkgroupName
-        value: '{{ WorkgroupName }}'
-      - name: NamespaceName
-        value: '{{ NamespaceName }}'
-      - name: BaseCapacity
-        value: '{{ BaseCapacity }}'
-      - name: MaxCapacity
-        value: '{{ MaxCapacity }}'
-      - name: EnhancedVpcRouting
-        value: '{{ EnhancedVpcRouting }}'
-      - name: ConfigParameters
+      - name: workgroup_name
+        value: '{{ workgroup_name }}'
+      - name: namespace_name
+        value: '{{ namespace_name }}'
+      - name: base_capacity
+        value: '{{ base_capacity }}'
+      - name: max_capacity
+        value: '{{ max_capacity }}'
+      - name: enhanced_vpc_routing
+        value: '{{ enhanced_vpc_routing }}'
+      - name: config_parameters
         value:
-          - ParameterKey: '{{ ParameterKey }}'
-            ParameterValue: '{{ ParameterValue }}'
-      - name: SecurityGroupIds
+          - parameter_key: '{{ parameter_key }}'
+            parameter_value: '{{ parameter_value }}'
+      - name: security_group_ids
         value:
-          - '{{ SecurityGroupIds[0] }}'
-      - name: SubnetIds
+          - '{{ security_group_ids[0] }}'
+      - name: subnet_ids
         value:
-          - '{{ SubnetIds[0] }}'
-      - name: PubliclyAccessible
-        value: '{{ PubliclyAccessible }}'
-      - name: Port
-        value: '{{ Port }}'
-      - name: PricePerformanceTarget
+          - '{{ subnet_ids[0] }}'
+      - name: publicly_accessible
+        value: '{{ publicly_accessible }}'
+      - name: port
+        value: '{{ port }}'
+      - name: price_performance_target
         value:
-          Status: '{{ Status }}'
-          Level: '{{ Level }}'
-      - name: SnapshotArn
-        value: '{{ SnapshotArn }}'
-      - name: SnapshotName
-        value: '{{ SnapshotName }}'
-      - name: SnapshotOwnerAccount
-        value: '{{ SnapshotOwnerAccount }}'
-      - name: RecoveryPointId
-        value: '{{ RecoveryPointId }}'
-      - name: Tags
+          status: '{{ status }}'
+          level: '{{ level }}'
+      - name: snapshot_arn
+        value: '{{ snapshot_arn }}'
+      - name: snapshot_name
+        value: '{{ snapshot_name }}'
+      - name: snapshot_owner_account
+        value: '{{ snapshot_owner_account }}'
+      - name: recovery_point_id
+        value: '{{ recovery_point_id }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-      - name: TrackName
-        value: '{{ TrackName }}'
-      - name: Workgroup
+          - key: '{{ key }}'
+            value: '{{ value }}'
+      - name: track_name
+        value: '{{ track_name }}'
+      - name: workgroup
         value:
-          WorkgroupName: '{{ WorkgroupName }}'
-          NamespaceName: '{{ NamespaceName }}'
-          BaseCapacity: '{{ BaseCapacity }}'
-          MaxCapacity: '{{ MaxCapacity }}'
-          EnhancedVpcRouting: '{{ EnhancedVpcRouting }}'
-          ConfigParameters:
+          workgroup_name: '{{ workgroup_name }}'
+          namespace_name: '{{ namespace_name }}'
+          base_capacity: '{{ base_capacity }}'
+          max_capacity: '{{ max_capacity }}'
+          enhanced_vpc_routing: '{{ enhanced_vpc_routing }}'
+          config_parameters:
             - null
-          SecurityGroupIds:
-            - '{{ SecurityGroupIds[0] }}'
-          SubnetIds:
-            - '{{ SubnetIds[0] }}'
-          PubliclyAccessible: '{{ PubliclyAccessible }}'
-          Port: '{{ Port }}'
-          PricePerformanceTarget: null
-          SnapshotArn: '{{ SnapshotArn }}'
-          SnapshotName: '{{ SnapshotName }}'
-          SnapshotOwnerAccount: '{{ SnapshotOwnerAccount }}'
-          RecoveryPointId: '{{ RecoveryPointId }}'
-          Tags:
+          security_group_ids:
+            - '{{ security_group_ids[0] }}'
+          subnet_ids:
+            - '{{ subnet_ids[0] }}'
+          publicly_accessible: '{{ publicly_accessible }}'
+          port: '{{ port }}'
+          price_performance_target: null
+          snapshot_arn: '{{ snapshot_arn }}'
+          snapshot_name: '{{ snapshot_name }}'
+          snapshot_owner_account: '{{ snapshot_owner_account }}'
+          recovery_point_id: '{{ recovery_point_id }}'
+          tags:
             - null
-          TrackName: '{{ TrackName }}'
-          Workgroup: null
-
+          track_name: '{{ track_name }}'
+          workgroup: null
 ```
 </TabItem>
 </Tabs>
@@ -639,7 +638,7 @@ SET PatchDocument = string('{{ {
     "TrackName": track_name
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<WorkgroupName>';
+AND Identifier = '{{ workgroup_name }}';
 ```
 
 
@@ -648,7 +647,7 @@ AND Identifier = '<WorkgroupName>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.redshiftserverless.workgroups
-WHERE Identifier = '<WorkgroupName>'
+WHERE Identifier = '{{ workgroup_name }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/refactorspaces/applications/index.md b/website/docs/services/refactorspaces/applications/index.md
index a14f351cf..b86ed9623 100644
--- a/website/docs/services/refactorspaces/applications/index.md
+++ b/website/docs/services/refactorspaces/applications/index.md
@@ -235,7 +235,7 @@ stage_name,
 proxy_url,
 tags
 FROM awscc.refactorspaces.applications
-WHERE region = 'us-east-1' AND Identifier = '<EnvironmentIdentifier>|<ApplicationIdentifier>';
+WHERE region = 'us-east-1' AND Identifier = '{{ environment_identifier }}|{{ application_identifier }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -275,11 +275,11 @@ INSERT INTO awscc.refactorspaces.applications (
  VpcId,
  region
 )
-SELECT 
-'{{ EnvironmentIdentifier }}',
- '{{ Name }}',
- '{{ ProxyType }}',
- '{{ VpcId }}',
+SELECT
+'{{ environment_identifier }}',
+ '{{ name }}',
+ '{{ proxy_type }}',
+ '{{ vpc_id }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -296,13 +296,13 @@ INSERT INTO awscc.refactorspaces.applications (
  Tags,
  region
 )
-SELECT 
- '{{ ApiGatewayProxy }}',
- '{{ EnvironmentIdentifier }}',
- '{{ Name }}',
- '{{ ProxyType }}',
- '{{ VpcId }}',
- '{{ Tags }}',
+SELECT
+ '{{ api_gateway_proxy }}',
+ '{{ environment_identifier }}',
+ '{{ name }}',
+ '{{ proxy_type }}',
+ '{{ vpc_id }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -320,23 +320,22 @@ globals:
 resources:
   - name: application
     props:
-      - name: ApiGatewayProxy
+      - name: api_gateway_proxy
         value:
-          StageName: '{{ StageName }}'
-          EndpointType: '{{ EndpointType }}'
-      - name: EnvironmentIdentifier
-        value: '{{ EnvironmentIdentifier }}'
-      - name: Name
-        value: '{{ Name }}'
-      - name: ProxyType
-        value: '{{ ProxyType }}'
-      - name: VpcId
-        value: '{{ VpcId }}'
-      - name: Tags
+          stage_name: '{{ stage_name }}'
+          endpoint_type: '{{ endpoint_type }}'
+      - name: environment_identifier
+        value: '{{ environment_identifier }}'
+      - name: name
+        value: '{{ name }}'
+      - name: proxy_type
+        value: '{{ proxy_type }}'
+      - name: vpc_id
+        value: '{{ vpc_id }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -347,7 +346,7 @@ resources:
 ```sql
 /*+ delete */
 DELETE FROM awscc.refactorspaces.applications
-WHERE Identifier = '<EnvironmentIdentifier|ApplicationIdentifier>'
+WHERE Identifier = '{{ environment_identifier }}|{{ application_identifier }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/refactorspaces/environments/index.md b/website/docs/services/refactorspaces/environments/index.md
index 0fe71bfe6..ce0aa8bc7 100644
--- a/website/docs/services/refactorspaces/environments/index.md
+++ b/website/docs/services/refactorspaces/environments/index.md
@@ -182,7 +182,7 @@ arn,
 transit_gateway_id,
 tags
 FROM awscc.refactorspaces.environments
-WHERE region = 'us-east-1' AND Identifier = '<EnvironmentIdentifier>';
+WHERE region = 'us-east-1' AND Identifier = '{{ environment_identifier }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -221,11 +221,11 @@ INSERT INTO awscc.refactorspaces.environments (
  Tags,
  region
 )
-SELECT 
-'{{ Description }}',
- '{{ Name }}',
- '{{ NetworkFabricType }}',
- '{{ Tags }}',
+SELECT
+'{{ description }}',
+ '{{ name }}',
+ '{{ network_fabric_type }}',
+ '{{ tags }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -240,11 +240,11 @@ INSERT INTO awscc.refactorspaces.environments (
  Tags,
  region
 )
-SELECT 
- '{{ Description }}',
- '{{ Name }}',
- '{{ NetworkFabricType }}',
- '{{ Tags }}',
+SELECT
+ '{{ description }}',
+ '{{ name }}',
+ '{{ network_fabric_type }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -262,17 +262,16 @@ globals:
 resources:
   - name: environment
     props:
-      - name: Description
-        value: '{{ Description }}'
-      - name: Name
-        value: '{{ Name }}'
-      - name: NetworkFabricType
-        value: '{{ NetworkFabricType }}'
-      - name: Tags
+      - name: description
+        value: '{{ description }}'
+      - name: name
+        value: '{{ name }}'
+      - name: network_fabric_type
+        value: '{{ network_fabric_type }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -288,7 +287,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<EnvironmentIdentifier>';
+AND Identifier = '{{ environment_identifier }}';
 ```
 
 
@@ -297,7 +296,7 @@ AND Identifier = '<EnvironmentIdentifier>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.refactorspaces.environments
-WHERE Identifier = '<EnvironmentIdentifier>'
+WHERE Identifier = '{{ environment_identifier }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/refactorspaces/routes/index.md b/website/docs/services/refactorspaces/routes/index.md
index e241ec6de..ee61b1d18 100644
--- a/website/docs/services/refactorspaces/routes/index.md
+++ b/website/docs/services/refactorspaces/routes/index.md
@@ -244,7 +244,7 @@ default_route,
 uri_path_route,
 tags
 FROM awscc.refactorspaces.routes
-WHERE region = 'us-east-1' AND Identifier = '<EnvironmentIdentifier>|<ApplicationIdentifier>|<RouteIdentifier>';
+WHERE region = 'us-east-1' AND Identifier = '{{ environment_identifier }}|{{ application_identifier }}|{{ route_identifier }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -285,11 +285,11 @@ INSERT INTO awscc.refactorspaces.routes (
  ServiceIdentifier,
  region
 )
-SELECT 
-'{{ ApplicationIdentifier }}',
- '{{ EnvironmentIdentifier }}',
- '{{ RouteType }}',
- '{{ ServiceIdentifier }}',
+SELECT
+'{{ application_identifier }}',
+ '{{ environment_identifier }}',
+ '{{ route_type }}',
+ '{{ service_identifier }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -307,14 +307,14 @@ INSERT INTO awscc.refactorspaces.routes (
  Tags,
  region
 )
-SELECT 
- '{{ ApplicationIdentifier }}',
- '{{ EnvironmentIdentifier }}',
- '{{ RouteType }}',
- '{{ ServiceIdentifier }}',
- '{{ DefaultRoute }}',
- '{{ UriPathRoute }}',
- '{{ Tags }}',
+SELECT
+ '{{ application_identifier }}',
+ '{{ environment_identifier }}',
+ '{{ route_type }}',
+ '{{ service_identifier }}',
+ '{{ default_route }}',
+ '{{ uri_path_route }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -332,30 +332,29 @@ globals:
 resources:
   - name: route
     props:
-      - name: ApplicationIdentifier
-        value: '{{ ApplicationIdentifier }}'
-      - name: EnvironmentIdentifier
-        value: '{{ EnvironmentIdentifier }}'
-      - name: RouteType
-        value: '{{ RouteType }}'
-      - name: ServiceIdentifier
-        value: '{{ ServiceIdentifier }}'
-      - name: DefaultRoute
+      - name: application_identifier
+        value: '{{ application_identifier }}'
+      - name: environment_identifier
+        value: '{{ environment_identifier }}'
+      - name: route_type
+        value: '{{ route_type }}'
+      - name: service_identifier
+        value: '{{ service_identifier }}'
+      - name: default_route
         value:
-          ActivationState: '{{ ActivationState }}'
-      - name: UriPathRoute
+          activation_state: '{{ activation_state }}'
+      - name: uri_path_route
         value:
-          SourcePath: '{{ SourcePath }}'
-          ActivationState: null
-          Methods:
-            - '{{ Methods[0] }}'
-          IncludeChildPaths: '{{ IncludeChildPaths }}'
-          AppendSourcePath: '{{ AppendSourcePath }}'
-      - name: Tags
+          source_path: '{{ source_path }}'
+          activation_state: null
+          methods:
+            - '{{ methods[0] }}'
+          include_child_paths: '{{ include_child_paths }}'
+          append_source_path: '{{ append_source_path }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -372,7 +371,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<EnvironmentIdentifier>|<ApplicationIdentifier>|<RouteIdentifier>';
+AND Identifier = '{{ environment_identifier }}|{{ application_identifier }}|{{ route_identifier }}';
 ```
 
 
@@ -381,7 +380,7 @@ AND Identifier = '<EnvironmentIdentifier>|<ApplicationIdentifier>|<RouteIdentifi
 ```sql
 /*+ delete */
 DELETE FROM awscc.refactorspaces.routes
-WHERE Identifier = '<EnvironmentIdentifier|ApplicationIdentifier|RouteIdentifier>'
+WHERE Identifier = '{{ environment_identifier }}|{{ application_identifier }}|{{ route_identifier }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/refactorspaces/services/index.md b/website/docs/services/refactorspaces/services/index.md
index 711c8b8fc..a64f43a8c 100644
--- a/website/docs/services/refactorspaces/services/index.md
+++ b/website/docs/services/refactorspaces/services/index.md
@@ -229,7 +229,7 @@ url_endpoint,
 vpc_id,
 tags
 FROM awscc.refactorspaces.services
-WHERE region = 'us-east-1' AND Identifier = '<EnvironmentIdentifier>|<ApplicationIdentifier>|<ServiceIdentifier>';
+WHERE region = 'us-east-1' AND Identifier = '{{ environment_identifier }}|{{ application_identifier }}|{{ service_identifier }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -270,11 +270,11 @@ INSERT INTO awscc.refactorspaces.services (
  Name,
  region
 )
-SELECT 
-'{{ ApplicationIdentifier }}',
- '{{ EndpointType }}',
- '{{ EnvironmentIdentifier }}',
- '{{ Name }}',
+SELECT
+'{{ application_identifier }}',
+ '{{ endpoint_type }}',
+ '{{ environment_identifier }}',
+ '{{ name }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -294,16 +294,16 @@ INSERT INTO awscc.refactorspaces.services (
  Tags,
  region
 )
-SELECT 
- '{{ ApplicationIdentifier }}',
- '{{ Description }}',
- '{{ EndpointType }}',
- '{{ EnvironmentIdentifier }}',
- '{{ LambdaEndpoint }}',
- '{{ Name }}',
- '{{ UrlEndpoint }}',
- '{{ VpcId }}',
- '{{ Tags }}',
+SELECT
+ '{{ application_identifier }}',
+ '{{ description }}',
+ '{{ endpoint_type }}',
+ '{{ environment_identifier }}',
+ '{{ lambda_endpoint }}',
+ '{{ name }}',
+ '{{ url_endpoint }}',
+ '{{ vpc_id }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -321,30 +321,29 @@ globals:
 resources:
   - name: service
     props:
-      - name: ApplicationIdentifier
-        value: '{{ ApplicationIdentifier }}'
-      - name: Description
-        value: '{{ Description }}'
-      - name: EndpointType
-        value: '{{ EndpointType }}'
-      - name: EnvironmentIdentifier
-        value: '{{ EnvironmentIdentifier }}'
-      - name: LambdaEndpoint
+      - name: application_identifier
+        value: '{{ application_identifier }}'
+      - name: description
+        value: '{{ description }}'
+      - name: endpoint_type
+        value: '{{ endpoint_type }}'
+      - name: environment_identifier
+        value: '{{ environment_identifier }}'
+      - name: lambda_endpoint
         value:
-          Arn: '{{ Arn }}'
-      - name: Name
-        value: '{{ Name }}'
-      - name: UrlEndpoint
+          arn: '{{ arn }}'
+      - name: name
+        value: '{{ name }}'
+      - name: url_endpoint
         value:
-          HealthUrl: '{{ HealthUrl }}'
-          Url: '{{ Url }}'
-      - name: VpcId
-        value: '{{ VpcId }}'
-      - name: Tags
+          health_url: '{{ health_url }}'
+          url: '{{ url }}'
+      - name: vpc_id
+        value: '{{ vpc_id }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -355,7 +354,7 @@ resources:
 ```sql
 /*+ delete */
 DELETE FROM awscc.refactorspaces.services
-WHERE Identifier = '<EnvironmentIdentifier|ApplicationIdentifier|ServiceIdentifier>'
+WHERE Identifier = '{{ environment_identifier }}|{{ application_identifier }}|{{ service_identifier }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/rekognition/collections/index.md b/website/docs/services/rekognition/collections/index.md
index dff2be0f5..262291488 100644
--- a/website/docs/services/rekognition/collections/index.md
+++ b/website/docs/services/rekognition/collections/index.md
@@ -158,7 +158,7 @@ arn,
 collection_id,
 tags
 FROM awscc.rekognition.collections
-WHERE region = 'us-east-1' AND Identifier = '<CollectionId>';
+WHERE region = 'us-east-1' AND Identifier = '{{ collection_id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -194,8 +194,8 @@ INSERT INTO awscc.rekognition.collections (
  CollectionId,
  region
 )
-SELECT 
-'{{ CollectionId }}',
+SELECT
+'{{ collection_id }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -208,9 +208,9 @@ INSERT INTO awscc.rekognition.collections (
  Tags,
  region
 )
-SELECT 
- '{{ CollectionId }}',
- '{{ Tags }}',
+SELECT
+ '{{ collection_id }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -228,13 +228,12 @@ globals:
 resources:
   - name: collection
     props:
-      - name: CollectionId
-        value: '{{ CollectionId }}'
-      - name: Tags
+      - name: collection_id
+        value: '{{ collection_id }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -250,7 +249,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<CollectionId>';
+AND Identifier = '{{ collection_id }}';
 ```
 
 
@@ -259,7 +258,7 @@ AND Identifier = '<CollectionId>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.rekognition.collections
-WHERE Identifier = '<CollectionId>'
+WHERE Identifier = '{{ collection_id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/rekognition/projects/index.md b/website/docs/services/rekognition/projects/index.md
index 31729b5b9..217864c3c 100644
--- a/website/docs/services/rekognition/projects/index.md
+++ b/website/docs/services/rekognition/projects/index.md
@@ -134,7 +134,7 @@ region,
 arn,
 project_name
 FROM awscc.rekognition.projects
-WHERE region = 'us-east-1' AND Identifier = '<ProjectName>';
+WHERE region = 'us-east-1' AND Identifier = '{{ project_name }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -170,8 +170,8 @@ INSERT INTO awscc.rekognition.projects (
  ProjectName,
  region
 )
-SELECT 
-'{{ ProjectName }}',
+SELECT
+'{{ project_name }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -183,8 +183,8 @@ INSERT INTO awscc.rekognition.projects (
  ProjectName,
  region
 )
-SELECT 
- '{{ ProjectName }}',
+SELECT
+ '{{ project_name }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -202,9 +202,8 @@ globals:
 resources:
   - name: project
     props:
-      - name: ProjectName
-        value: '{{ ProjectName }}'
-
+      - name: project_name
+        value: '{{ project_name }}'
 ```
 </TabItem>
 </Tabs>
@@ -215,7 +214,7 @@ resources:
 ```sql
 /*+ delete */
 DELETE FROM awscc.rekognition.projects
-WHERE Identifier = '<ProjectName>'
+WHERE Identifier = '{{ project_name }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/rekognition/stream_processors/index.md b/website/docs/services/rekognition/stream_processors/index.md
index c84f4fb79..f2dd891ad 100644
--- a/website/docs/services/rekognition/stream_processors/index.md
+++ b/website/docs/services/rekognition/stream_processors/index.md
@@ -322,7 +322,7 @@ status,
 status_message,
 tags
 FROM awscc.rekognition.stream_processors
-WHERE region = 'us-east-1' AND Identifier = '<Name>';
+WHERE region = 'us-east-1' AND Identifier = '{{ name }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -359,9 +359,9 @@ INSERT INTO awscc.rekognition.stream_processors (
  KinesisVideoStream,
  region
 )
-SELECT 
-'{{ RoleArn }}',
- '{{ KinesisVideoStream }}',
+SELECT
+'{{ role_arn }}',
+ '{{ kinesis_video_stream }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -385,20 +385,20 @@ INSERT INTO awscc.rekognition.stream_processors (
  Tags,
  region
 )
-SELECT 
- '{{ Name }}',
- '{{ KmsKeyId }}',
- '{{ RoleArn }}',
- '{{ KinesisVideoStream }}',
- '{{ FaceSearchSettings }}',
- '{{ ConnectedHomeSettings }}',
- '{{ KinesisDataStream }}',
- '{{ S3Destination }}',
- '{{ NotificationChannel }}',
- '{{ DataSharingPreference }}',
- '{{ PolygonRegionsOfInterest }}',
- '{{ BoundingBoxRegionsOfInterest }}',
- '{{ Tags }}',
+SELECT
+ '{{ name }}',
+ '{{ kms_key_id }}',
+ '{{ role_arn }}',
+ '{{ kinesis_video_stream }}',
+ '{{ face_search_settings }}',
+ '{{ connected_home_settings }}',
+ '{{ kinesis_data_stream }}',
+ '{{ s3_destination }}',
+ '{{ notification_channel }}',
+ '{{ data_sharing_preference }}',
+ '{{ polygon_regions_of_interest }}',
+ '{{ bounding_box_regions_of_interest }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -416,52 +416,51 @@ globals:
 resources:
   - name: stream_processor
     props:
-      - name: Name
-        value: '{{ Name }}'
-      - name: KmsKeyId
-        value: '{{ KmsKeyId }}'
-      - name: RoleArn
-        value: '{{ RoleArn }}'
-      - name: KinesisVideoStream
+      - name: name
+        value: '{{ name }}'
+      - name: kms_key_id
+        value: '{{ kms_key_id }}'
+      - name: role_arn
+        value: '{{ role_arn }}'
+      - name: kinesis_video_stream
         value:
-          Arn: '{{ Arn }}'
-      - name: FaceSearchSettings
+          arn: '{{ arn }}'
+      - name: face_search_settings
         value:
-          CollectionId: '{{ CollectionId }}'
-          FaceMatchThreshold: null
-      - name: ConnectedHomeSettings
+          collection_id: '{{ collection_id }}'
+          face_match_threshold: null
+      - name: connected_home_settings
         value:
-          Labels:
-            - '{{ Labels[0] }}'
-          MinConfidence: null
-      - name: KinesisDataStream
+          labels:
+            - '{{ labels[0] }}'
+          min_confidence: null
+      - name: kinesis_data_stream
         value:
-          Arn: '{{ Arn }}'
-      - name: S3Destination
+          arn: '{{ arn }}'
+      - name: s3_destination
         value:
-          BucketName: '{{ BucketName }}'
-          ObjectKeyPrefix: '{{ ObjectKeyPrefix }}'
-      - name: NotificationChannel
+          bucket_name: '{{ bucket_name }}'
+          object_key_prefix: '{{ object_key_prefix }}'
+      - name: notification_channel
         value:
-          Arn: '{{ Arn }}'
-      - name: DataSharingPreference
+          arn: '{{ arn }}'
+      - name: data_sharing_preference
         value:
-          OptIn: '{{ OptIn }}'
-      - name: PolygonRegionsOfInterest
+          opt_in: '{{ opt_in }}'
+      - name: polygon_regions_of_interest
         value:
-          - - X: null
-              'Y': null
-      - name: BoundingBoxRegionsOfInterest
+          - - x: null
+              'y': null
+      - name: bounding_box_regions_of_interest
         value:
-          - Height: null
-            Width: null
-            Left: null
-            Top: null
-      - name: Tags
+          - height: null
+            width: null
+            left: null
+            top: null
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -477,7 +476,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Name>';
+AND Identifier = '{{ name }}';
 ```
 
 
@@ -486,7 +485,7 @@ AND Identifier = '<Name>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.rekognition.stream_processors
-WHERE Identifier = '<Name>'
+WHERE Identifier = '{{ name }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/resiliencehub/apps/index.md b/website/docs/services/resiliencehub/apps/index.md
index 1e56ca4c4..1537696e0 100644
--- a/website/docs/services/resiliencehub/apps/index.md
+++ b/website/docs/services/resiliencehub/apps/index.md
@@ -282,7 +282,7 @@ permission_model,
 event_subscriptions,
 drift_status
 FROM awscc.resiliencehub.apps
-WHERE region = 'us-east-1' AND Identifier = '<AppArn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ app_arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -320,10 +320,10 @@ INSERT INTO awscc.resiliencehub.apps (
  ResourceMappings,
  region
 )
-SELECT 
-'{{ Name }}',
- '{{ AppTemplateBody }}',
- '{{ ResourceMappings }}',
+SELECT
+'{{ name }}',
+ '{{ app_template_body }}',
+ '{{ resource_mappings }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -343,16 +343,16 @@ INSERT INTO awscc.resiliencehub.apps (
  EventSubscriptions,
  region
 )
-SELECT 
- '{{ Name }}',
- '{{ Description }}',
- '{{ ResiliencyPolicyArn }}',
- '{{ Tags }}',
- '{{ AppTemplateBody }}',
- '{{ ResourceMappings }}',
- '{{ AppAssessmentSchedule }}',
- '{{ PermissionModel }}',
- '{{ EventSubscriptions }}',
+SELECT
+ '{{ name }}',
+ '{{ description }}',
+ '{{ resiliency_policy_arn }}',
+ '{{ tags }}',
+ '{{ app_template_body }}',
+ '{{ resource_mappings }}',
+ '{{ app_assessment_schedule }}',
+ '{{ permission_model }}',
+ '{{ event_subscriptions }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -370,42 +370,41 @@ globals:
 resources:
   - name: app
     props:
-      - name: Name
-        value: '{{ Name }}'
-      - name: Description
-        value: '{{ Description }}'
-      - name: ResiliencyPolicyArn
-        value: '{{ ResiliencyPolicyArn }}'
-      - name: Tags
+      - name: name
+        value: '{{ name }}'
+      - name: description
+        value: '{{ description }}'
+      - name: resiliency_policy_arn
+        value: '{{ resiliency_policy_arn }}'
+      - name: tags
         value: {}
-      - name: AppTemplateBody
-        value: '{{ AppTemplateBody }}'
-      - name: ResourceMappings
+      - name: app_template_body
+        value: '{{ app_template_body }}'
+      - name: resource_mappings
         value:
-          - LogicalStackName: '{{ LogicalStackName }}'
-            MappingType: '{{ MappingType }}'
-            ResourceName: '{{ ResourceName }}'
-            TerraformSourceName: '{{ TerraformSourceName }}'
-            EksSourceName: '{{ EksSourceName }}'
-            PhysicalResourceId:
-              AwsAccountId: '{{ AwsAccountId }}'
-              AwsRegion: '{{ AwsRegion }}'
-              Identifier: '{{ Identifier }}'
-              Type: '{{ Type }}'
-      - name: AppAssessmentSchedule
-        value: '{{ AppAssessmentSchedule }}'
-      - name: PermissionModel
+          - logical_stack_name: '{{ logical_stack_name }}'
+            mapping_type: '{{ mapping_type }}'
+            resource_name: '{{ resource_name }}'
+            terraform_source_name: '{{ terraform_source_name }}'
+            eks_source_name: '{{ eks_source_name }}'
+            physical_resource_id:
+              aws_account_id: '{{ aws_account_id }}'
+              aws_region: '{{ aws_region }}'
+              identifier: '{{ identifier }}'
+              type: '{{ type }}'
+      - name: app_assessment_schedule
+        value: '{{ app_assessment_schedule }}'
+      - name: permission_model
         value:
-          Type: '{{ Type }}'
-          InvokerRoleName: '{{ InvokerRoleName }}'
-          CrossAccountRoleArns:
-            - '{{ CrossAccountRoleArns[0] }}'
-      - name: EventSubscriptions
+          type: '{{ type }}'
+          invoker_role_name: '{{ invoker_role_name }}'
+          cross_account_role_arns:
+            - '{{ cross_account_role_arns[0] }}'
+      - name: event_subscriptions
         value:
-          - Name: '{{ Name }}'
-            EventType: '{{ EventType }}'
-            SnsTopicArn: '{{ SnsTopicArn }}'
-
+          - name: '{{ name }}'
+            event_type: '{{ event_type }}'
+            sns_topic_arn: '{{ sns_topic_arn }}'
 ```
 </TabItem>
 </Tabs>
@@ -428,7 +427,7 @@ SET PatchDocument = string('{{ {
     "EventSubscriptions": event_subscriptions
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<AppArn>';
+AND Identifier = '{{ app_arn }}';
 ```
 
 
@@ -437,7 +436,7 @@ AND Identifier = '<AppArn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.resiliencehub.apps
-WHERE Identifier = '<AppArn>'
+WHERE Identifier = '{{ app_arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/resiliencehub/resiliency_policies/index.md b/website/docs/services/resiliencehub/resiliency_policies/index.md
index bf0fd7808..383017bd0 100644
--- a/website/docs/services/resiliencehub/resiliency_policies/index.md
+++ b/website/docs/services/resiliencehub/resiliency_policies/index.md
@@ -213,7 +213,7 @@ policy,
 policy_arn,
 tags
 FROM awscc.resiliencehub.resiliency_policies
-WHERE region = 'us-east-1' AND Identifier = '<PolicyArn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ policy_arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -251,10 +251,10 @@ INSERT INTO awscc.resiliencehub.resiliency_policies (
  Policy,
  region
 )
-SELECT 
-'{{ PolicyName }}',
- '{{ Tier }}',
- '{{ Policy }}',
+SELECT
+'{{ policy_name }}',
+ '{{ tier }}',
+ '{{ policy }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -271,13 +271,13 @@ INSERT INTO awscc.resiliencehub.resiliency_policies (
  Tags,
  region
 )
-SELECT 
- '{{ PolicyName }}',
- '{{ PolicyDescription }}',
- '{{ DataLocationConstraint }}',
- '{{ Tier }}',
- '{{ Policy }}',
- '{{ Tags }}',
+SELECT
+ '{{ policy_name }}',
+ '{{ policy_description }}',
+ '{{ data_location_constraint }}',
+ '{{ tier }}',
+ '{{ policy }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -295,25 +295,24 @@ globals:
 resources:
   - name: resiliency_policy
     props:
-      - name: PolicyName
-        value: '{{ PolicyName }}'
-      - name: PolicyDescription
-        value: '{{ PolicyDescription }}'
-      - name: DataLocationConstraint
-        value: '{{ DataLocationConstraint }}'
-      - name: Tier
-        value: '{{ Tier }}'
-      - name: Policy
+      - name: policy_name
+        value: '{{ policy_name }}'
+      - name: policy_description
+        value: '{{ policy_description }}'
+      - name: data_location_constraint
+        value: '{{ data_location_constraint }}'
+      - name: tier
+        value: '{{ tier }}'
+      - name: policy
         value:
-          AZ:
-            RtoInSecs: '{{ RtoInSecs }}'
-            RpoInSecs: '{{ RpoInSecs }}'
-          Hardware: null
-          Software: null
-          Region: null
-      - name: Tags
+          az:
+            rto_in_secs: '{{ rto_in_secs }}'
+            rpo_in_secs: '{{ rpo_in_secs }}'
+          hardware: null
+          software: null
+          region: null
+      - name: tags
         value: {}
-
 ```
 </TabItem>
 </Tabs>
@@ -334,7 +333,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<PolicyArn>';
+AND Identifier = '{{ policy_arn }}';
 ```
 
 
@@ -343,7 +342,7 @@ AND Identifier = '<PolicyArn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.resiliencehub.resiliency_policies
-WHERE Identifier = '<PolicyArn>'
+WHERE Identifier = '{{ policy_arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/resourceexplorer2/default_view_associations/index.md b/website/docs/services/resourceexplorer2/default_view_associations/index.md
index 407bd996d..ca33c6ed0 100644
--- a/website/docs/services/resourceexplorer2/default_view_associations/index.md
+++ b/website/docs/services/resourceexplorer2/default_view_associations/index.md
@@ -94,7 +94,7 @@ region,
 view_arn,
 associated_aws_principal
 FROM awscc.resourceexplorer2.default_view_associations
-WHERE region = 'us-east-1' AND Identifier = '<AssociatedAwsPrincipal>';
+WHERE region = 'us-east-1' AND Identifier = '{{ associated_aws_principal }}';
 ```
 
 ## `INSERT` example
@@ -117,8 +117,8 @@ INSERT INTO awscc.resourceexplorer2.default_view_associations (
  ViewArn,
  region
 )
-SELECT 
-'{{ ViewArn }}',
+SELECT
+'{{ view_arn }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -130,8 +130,8 @@ INSERT INTO awscc.resourceexplorer2.default_view_associations (
  ViewArn,
  region
 )
-SELECT 
- '{{ ViewArn }}',
+SELECT
+ '{{ view_arn }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -149,9 +149,8 @@ globals:
 resources:
   - name: default_view_association
     props:
-      - name: ViewArn
-        value: '{{ ViewArn }}'
-
+      - name: view_arn
+        value: '{{ view_arn }}'
 ```
 </TabItem>
 </Tabs>
@@ -167,7 +166,7 @@ SET PatchDocument = string('{{ {
     "ViewArn": view_arn
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<AssociatedAwsPrincipal>';
+AND Identifier = '{{ associated_aws_principal }}';
 ```
 
 
@@ -176,7 +175,7 @@ AND Identifier = '<AssociatedAwsPrincipal>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.resourceexplorer2.default_view_associations
-WHERE Identifier = '<AssociatedAwsPrincipal>'
+WHERE Identifier = '{{ associated_aws_principal }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/resourceexplorer2/indices/index.md b/website/docs/services/resourceexplorer2/indices/index.md
index a11998a6d..433d0a60b 100644
--- a/website/docs/services/resourceexplorer2/indices/index.md
+++ b/website/docs/services/resourceexplorer2/indices/index.md
@@ -152,7 +152,7 @@ tags,
 type,
 index_state
 FROM awscc.resourceexplorer2.indices
-WHERE region = 'us-east-1' AND Identifier = '<Arn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -188,8 +188,8 @@ INSERT INTO awscc.resourceexplorer2.indices (
  Type,
  region
 )
-SELECT 
-'{{ Type }}',
+SELECT
+'{{ type }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -202,9 +202,9 @@ INSERT INTO awscc.resourceexplorer2.indices (
  Type,
  region
 )
-SELECT 
- '{{ Tags }}',
- '{{ Type }}',
+SELECT
+ '{{ tags }}',
+ '{{ type }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -222,11 +222,10 @@ globals:
 resources:
   - name: index
     props:
-      - name: Tags
+      - name: tags
         value: {}
-      - name: Type
-        value: '{{ Type }}'
-
+      - name: type
+        value: '{{ type }}'
 ```
 </TabItem>
 </Tabs>
@@ -243,7 +242,7 @@ SET PatchDocument = string('{{ {
     "Type": type
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Arn>';
+AND Identifier = '{{ arn }}';
 ```
 
 
@@ -252,7 +251,7 @@ AND Identifier = '<Arn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.resourceexplorer2.indices
-WHERE Identifier = '<Arn>'
+WHERE Identifier = '{{ arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/resourceexplorer2/views/index.md b/website/docs/services/resourceexplorer2/views/index.md
index 23d3dc7ab..4cefba8d7 100644
--- a/website/docs/services/resourceexplorer2/views/index.md
+++ b/website/docs/services/resourceexplorer2/views/index.md
@@ -178,7 +178,7 @@ tags,
 view_arn,
 view_name
 FROM awscc.resourceexplorer2.views
-WHERE region = 'us-east-1' AND Identifier = '<ViewArn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ view_arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -214,8 +214,8 @@ INSERT INTO awscc.resourceexplorer2.views (
  ViewName,
  region
 )
-SELECT 
-'{{ ViewName }}',
+SELECT
+'{{ view_name }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -231,12 +231,12 @@ INSERT INTO awscc.resourceexplorer2.views (
  ViewName,
  region
 )
-SELECT 
- '{{ Filters }}',
- '{{ IncludedProperties }}',
- '{{ Scope }}',
- '{{ Tags }}',
- '{{ ViewName }}',
+SELECT
+ '{{ filters }}',
+ '{{ included_properties }}',
+ '{{ scope }}',
+ '{{ tags }}',
+ '{{ view_name }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -254,19 +254,18 @@ globals:
 resources:
   - name: view
     props:
-      - name: Filters
+      - name: filters
         value:
-          FilterString: '{{ FilterString }}'
-      - name: IncludedProperties
+          filter_string: '{{ filter_string }}'
+      - name: included_properties
         value:
-          - Name: '{{ Name }}'
-      - name: Scope
-        value: '{{ Scope }}'
-      - name: Tags
+          - name: '{{ name }}'
+      - name: scope
+        value: '{{ scope }}'
+      - name: tags
         value: {}
-      - name: ViewName
-        value: '{{ ViewName }}'
-
+      - name: view_name
+        value: '{{ view_name }}'
 ```
 </TabItem>
 </Tabs>
@@ -284,7 +283,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<ViewArn>';
+AND Identifier = '{{ view_arn }}';
 ```
 
 
@@ -293,7 +292,7 @@ AND Identifier = '<ViewArn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.resourceexplorer2.views
-WHERE Identifier = '<ViewArn>'
+WHERE Identifier = '{{ view_arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/resourcegroups/groups/index.md b/website/docs/services/resourcegroups/groups/index.md
index 94caf3fcd..3431a0979 100644
--- a/website/docs/services/resourcegroups/groups/index.md
+++ b/website/docs/services/resourcegroups/groups/index.md
@@ -247,7 +247,7 @@ arn,
 configuration,
 resources
 FROM awscc.resourcegroups.groups
-WHERE region = 'us-east-1' AND Identifier = '<Name>';
+WHERE region = 'us-east-1' AND Identifier = '{{ name }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -283,8 +283,8 @@ INSERT INTO awscc.resourcegroups.groups (
  Name,
  region
 )
-SELECT 
-'{{ Name }}',
+SELECT
+'{{ name }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -301,13 +301,13 @@ INSERT INTO awscc.resourcegroups.groups (
  Resources,
  region
 )
-SELECT 
- '{{ Name }}',
- '{{ Description }}',
- '{{ ResourceQuery }}',
- '{{ Tags }}',
- '{{ Configuration }}',
- '{{ Resources }}',
+SELECT
+ '{{ name }}',
+ '{{ description }}',
+ '{{ resource_query }}',
+ '{{ tags }}',
+ '{{ configuration }}',
+ '{{ resources }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -325,36 +325,35 @@ globals:
 resources:
   - name: group
     props:
-      - name: Name
-        value: '{{ Name }}'
-      - name: Description
-        value: '{{ Description }}'
-      - name: ResourceQuery
+      - name: name
+        value: '{{ name }}'
+      - name: description
+        value: '{{ description }}'
+      - name: resource_query
         value:
-          Type: '{{ Type }}'
-          Query:
-            ResourceTypeFilters:
-              - '{{ ResourceTypeFilters[0] }}'
-            StackIdentifier: '{{ StackIdentifier }}'
-            TagFilters:
-              - Key: '{{ Key }}'
-                Values:
-                  - '{{ Values[0] }}'
-      - name: Tags
+          type: '{{ type }}'
+          query:
+            resource_type_filters:
+              - '{{ resource_type_filters[0] }}'
+            stack_identifier: '{{ stack_identifier }}'
+            tag_filters:
+              - key: '{{ key }}'
+                values:
+                  - '{{ values[0] }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-      - name: Configuration
+          - key: '{{ key }}'
+            value: '{{ value }}'
+      - name: configuration
         value:
-          - Type: '{{ Type }}'
-            Parameters:
-              - Name: '{{ Name }}'
-                Values:
-                  - '{{ Values[0] }}'
-      - name: Resources
+          - type: '{{ type }}'
+            parameters:
+              - name: '{{ name }}'
+                values:
+                  - '{{ values[0] }}'
+      - name: resources
         value:
-          - '{{ Resources[0] }}'
-
+          - '{{ resources[0] }}'
 ```
 </TabItem>
 </Tabs>
@@ -374,7 +373,7 @@ SET PatchDocument = string('{{ {
     "Resources": resources
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Name>';
+AND Identifier = '{{ name }}';
 ```
 
 
@@ -383,7 +382,7 @@ AND Identifier = '<Name>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.resourcegroups.groups
-WHERE Identifier = '<Name>'
+WHERE Identifier = '{{ name }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/resourcegroups/tag_sync_tasks/index.md b/website/docs/services/resourcegroups/tag_sync_tasks/index.md
index 9d1c97191..36a20f628 100644
--- a/website/docs/services/resourcegroups/tag_sync_tasks/index.md
+++ b/website/docs/services/resourcegroups/tag_sync_tasks/index.md
@@ -170,7 +170,7 @@ tag_value,
 role_arn,
 status
 FROM awscc.resourcegroups.tag_sync_tasks
-WHERE region = 'us-east-1' AND Identifier = '<TaskArn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ task_arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -209,11 +209,11 @@ INSERT INTO awscc.resourcegroups.tag_sync_tasks (
  RoleArn,
  region
 )
-SELECT 
-'{{ Group }}',
- '{{ TagKey }}',
- '{{ TagValue }}',
- '{{ RoleArn }}',
+SELECT
+'{{ group }}',
+ '{{ tag_key }}',
+ '{{ tag_value }}',
+ '{{ role_arn }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -228,11 +228,11 @@ INSERT INTO awscc.resourcegroups.tag_sync_tasks (
  RoleArn,
  region
 )
-SELECT 
- '{{ Group }}',
- '{{ TagKey }}',
- '{{ TagValue }}',
- '{{ RoleArn }}',
+SELECT
+ '{{ group }}',
+ '{{ tag_key }}',
+ '{{ tag_value }}',
+ '{{ role_arn }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -250,15 +250,14 @@ globals:
 resources:
   - name: tag_sync_task
     props:
-      - name: Group
-        value: '{{ Group }}'
-      - name: TagKey
-        value: '{{ TagKey }}'
-      - name: TagValue
-        value: '{{ TagValue }}'
-      - name: RoleArn
-        value: '{{ RoleArn }}'
-
+      - name: group
+        value: '{{ group }}'
+      - name: tag_key
+        value: '{{ tag_key }}'
+      - name: tag_value
+        value: '{{ tag_value }}'
+      - name: role_arn
+        value: '{{ role_arn }}'
 ```
 </TabItem>
 </Tabs>
@@ -269,7 +268,7 @@ resources:
 ```sql
 /*+ delete */
 DELETE FROM awscc.resourcegroups.tag_sync_tasks
-WHERE Identifier = '<TaskArn>'
+WHERE Identifier = '{{ task_arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/robomaker/fleets/index.md b/website/docs/services/robomaker/fleets/index.md
index 771168060..3a8685548 100644
--- a/website/docs/services/robomaker/fleets/index.md
+++ b/website/docs/services/robomaker/fleets/index.md
@@ -146,7 +146,7 @@ arn,
 tags,
 name
 FROM awscc.robomaker.fleets
-WHERE region = 'us-east-1' AND Identifier = '<Arn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -182,7 +182,7 @@ INSERT INTO awscc.robomaker.fleets (
  ,
  region
 )
-SELECT 
+SELECT
 '{{  }}',
 '{{ region }}';
 ```
@@ -196,9 +196,9 @@ INSERT INTO awscc.robomaker.fleets (
  Name,
  region
 )
-SELECT 
- '{{ Tags }}',
- '{{ Name }}',
+SELECT
+ '{{ tags }}',
+ '{{ name }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -216,11 +216,10 @@ globals:
 resources:
   - name: fleet
     props:
-      - name: Tags
+      - name: tags
         value: {}
-      - name: Name
-        value: '{{ Name }}'
-
+      - name: name
+        value: '{{ name }}'
 ```
 </TabItem>
 </Tabs>
@@ -236,7 +235,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Arn>';
+AND Identifier = '{{ arn }}';
 ```
 
 
@@ -245,7 +244,7 @@ AND Identifier = '<Arn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.robomaker.fleets
-WHERE Identifier = '<Arn>'
+WHERE Identifier = '{{ arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/robomaker/robot_application_versions/index.md b/website/docs/services/robomaker/robot_application_versions/index.md
index f011f2517..7f8a53423 100644
--- a/website/docs/services/robomaker/robot_application_versions/index.md
+++ b/website/docs/services/robomaker/robot_application_versions/index.md
@@ -96,7 +96,7 @@ current_revision_id,
 application_version,
 arn
 FROM awscc.robomaker.robot_application_versions
-WHERE region = 'us-east-1' AND Identifier = '<Arn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ arn }}';
 ```
 
 ## `INSERT` example
@@ -119,8 +119,8 @@ INSERT INTO awscc.robomaker.robot_application_versions (
  Application,
  region
 )
-SELECT 
-'{{ Application }}',
+SELECT
+'{{ application }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -133,9 +133,9 @@ INSERT INTO awscc.robomaker.robot_application_versions (
  CurrentRevisionId,
  region
 )
-SELECT 
- '{{ Application }}',
- '{{ CurrentRevisionId }}',
+SELECT
+ '{{ application }}',
+ '{{ current_revision_id }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -153,11 +153,10 @@ globals:
 resources:
   - name: robot_application_version
     props:
-      - name: Application
-        value: '{{ Application }}'
-      - name: CurrentRevisionId
-        value: '{{ CurrentRevisionId }}'
-
+      - name: application
+        value: '{{ application }}'
+      - name: current_revision_id
+        value: '{{ current_revision_id }}'
 ```
 </TabItem>
 </Tabs>
@@ -168,7 +167,7 @@ resources:
 ```sql
 /*+ delete */
 DELETE FROM awscc.robomaker.robot_application_versions
-WHERE Identifier = '<Arn>'
+WHERE Identifier = '{{ arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/robomaker/robot_applications/index.md b/website/docs/services/robomaker/robot_applications/index.md
index 22b9f195a..da6b867b3 100644
--- a/website/docs/services/robomaker/robot_applications/index.md
+++ b/website/docs/services/robomaker/robot_applications/index.md
@@ -199,7 +199,7 @@ current_revision_id,
 arn,
 tags
 FROM awscc.robomaker.robot_applications
-WHERE region = 'us-east-1' AND Identifier = '<Arn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -235,8 +235,8 @@ INSERT INTO awscc.robomaker.robot_applications (
  RobotSoftwareSuite,
  region
 )
-SELECT 
-'{{ RobotSoftwareSuite }}',
+SELECT
+'{{ robot_software_suite }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -253,13 +253,13 @@ INSERT INTO awscc.robomaker.robot_applications (
  Tags,
  region
 )
-SELECT 
- '{{ Name }}',
- '{{ Sources }}',
- '{{ Environment }}',
- '{{ RobotSoftwareSuite }}',
- '{{ CurrentRevisionId }}',
- '{{ Tags }}',
+SELECT
+ '{{ name }}',
+ '{{ sources }}',
+ '{{ environment }}',
+ '{{ robot_software_suite }}',
+ '{{ current_revision_id }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -277,24 +277,23 @@ globals:
 resources:
   - name: robot_application
     props:
-      - name: Name
-        value: '{{ Name }}'
-      - name: Sources
+      - name: name
+        value: '{{ name }}'
+      - name: sources
         value:
-          - S3Bucket: '{{ S3Bucket }}'
-            S3Key: '{{ S3Key }}'
-            Architecture: '{{ Architecture }}'
-      - name: Environment
-        value: '{{ Environment }}'
-      - name: RobotSoftwareSuite
+          - s3_bucket: '{{ s3_bucket }}'
+            s3_key: '{{ s3_key }}'
+            architecture: '{{ architecture }}'
+      - name: environment
+        value: '{{ environment }}'
+      - name: robot_software_suite
         value:
-          Name: '{{ Name }}'
-          Version: '{{ Version }}'
-      - name: CurrentRevisionId
-        value: '{{ CurrentRevisionId }}'
-      - name: Tags
+          name: '{{ name }}'
+          version: '{{ version }}'
+      - name: current_revision_id
+        value: '{{ current_revision_id }}'
+      - name: tags
         value: {}
-
 ```
 </TabItem>
 </Tabs>
@@ -314,7 +313,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Arn>';
+AND Identifier = '{{ arn }}';
 ```
 
 
@@ -323,7 +322,7 @@ AND Identifier = '<Arn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.robomaker.robot_applications
-WHERE Identifier = '<Arn>'
+WHERE Identifier = '{{ arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/robomaker/robots/index.md b/website/docs/services/robomaker/robots/index.md
index e83d498d7..f63d0493c 100644
--- a/website/docs/services/robomaker/robots/index.md
+++ b/website/docs/services/robomaker/robots/index.md
@@ -164,7 +164,7 @@ greengrass_group_id,
 tags,
 name
 FROM awscc.robomaker.robots
-WHERE region = 'us-east-1' AND Identifier = '<Arn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -201,9 +201,9 @@ INSERT INTO awscc.robomaker.robots (
  GreengrassGroupId,
  region
 )
-SELECT 
-'{{ Architecture }}',
- '{{ GreengrassGroupId }}',
+SELECT
+'{{ architecture }}',
+ '{{ greengrass_group_id }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -219,12 +219,12 @@ INSERT INTO awscc.robomaker.robots (
  Name,
  region
 )
-SELECT 
- '{{ Fleet }}',
- '{{ Architecture }}',
- '{{ GreengrassGroupId }}',
- '{{ Tags }}',
- '{{ Name }}',
+SELECT
+ '{{ fleet }}',
+ '{{ architecture }}',
+ '{{ greengrass_group_id }}',
+ '{{ tags }}',
+ '{{ name }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -242,17 +242,16 @@ globals:
 resources:
   - name: robot
     props:
-      - name: Fleet
-        value: '{{ Fleet }}'
-      - name: Architecture
-        value: '{{ Architecture }}'
-      - name: GreengrassGroupId
-        value: '{{ GreengrassGroupId }}'
-      - name: Tags
+      - name: fleet
+        value: '{{ fleet }}'
+      - name: architecture
+        value: '{{ architecture }}'
+      - name: greengrass_group_id
+        value: '{{ greengrass_group_id }}'
+      - name: tags
         value: {}
-      - name: Name
-        value: '{{ Name }}'
-
+      - name: name
+        value: '{{ name }}'
 ```
 </TabItem>
 </Tabs>
@@ -268,7 +267,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Arn>';
+AND Identifier = '{{ arn }}';
 ```
 
 
@@ -277,7 +276,7 @@ AND Identifier = '<Arn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.robomaker.robots
-WHERE Identifier = '<Arn>'
+WHERE Identifier = '{{ arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/robomaker/simulation_application_versions/index.md b/website/docs/services/robomaker/simulation_application_versions/index.md
index a3901d2fc..ab5d25edb 100644
--- a/website/docs/services/robomaker/simulation_application_versions/index.md
+++ b/website/docs/services/robomaker/simulation_application_versions/index.md
@@ -96,7 +96,7 @@ current_revision_id,
 application_version,
 arn
 FROM awscc.robomaker.simulation_application_versions
-WHERE region = 'us-east-1' AND Identifier = '<Arn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ arn }}';
 ```
 
 ## `INSERT` example
@@ -119,8 +119,8 @@ INSERT INTO awscc.robomaker.simulation_application_versions (
  Application,
  region
 )
-SELECT 
-'{{ Application }}',
+SELECT
+'{{ application }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -133,9 +133,9 @@ INSERT INTO awscc.robomaker.simulation_application_versions (
  CurrentRevisionId,
  region
 )
-SELECT 
- '{{ Application }}',
- '{{ CurrentRevisionId }}',
+SELECT
+ '{{ application }}',
+ '{{ current_revision_id }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -153,11 +153,10 @@ globals:
 resources:
   - name: simulation_application_version
     props:
-      - name: Application
-        value: '{{ Application }}'
-      - name: CurrentRevisionId
-        value: '{{ CurrentRevisionId }}'
-
+      - name: application
+        value: '{{ application }}'
+      - name: current_revision_id
+        value: '{{ current_revision_id }}'
 ```
 </TabItem>
 </Tabs>
@@ -168,7 +167,7 @@ resources:
 ```sql
 /*+ delete */
 DELETE FROM awscc.robomaker.simulation_application_versions
-WHERE Identifier = '<Arn>'
+WHERE Identifier = '{{ arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/robomaker/simulation_applications/index.md b/website/docs/services/robomaker/simulation_applications/index.md
index bbb0cebf9..01b02eae6 100644
--- a/website/docs/services/robomaker/simulation_applications/index.md
+++ b/website/docs/services/robomaker/simulation_applications/index.md
@@ -235,7 +235,7 @@ sources,
 environment,
 tags
 FROM awscc.robomaker.simulation_applications
-WHERE region = 'us-east-1' AND Identifier = '<Arn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -272,9 +272,9 @@ INSERT INTO awscc.robomaker.simulation_applications (
  SimulationSoftwareSuite,
  region
 )
-SELECT 
-'{{ RobotSoftwareSuite }}',
- '{{ SimulationSoftwareSuite }}',
+SELECT
+'{{ robot_software_suite }}',
+ '{{ simulation_software_suite }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -293,15 +293,15 @@ INSERT INTO awscc.robomaker.simulation_applications (
  Tags,
  region
 )
-SELECT 
- '{{ Name }}',
- '{{ CurrentRevisionId }}',
- '{{ RenderingEngine }}',
- '{{ RobotSoftwareSuite }}',
- '{{ SimulationSoftwareSuite }}',
- '{{ Sources }}',
- '{{ Environment }}',
- '{{ Tags }}',
+SELECT
+ '{{ name }}',
+ '{{ current_revision_id }}',
+ '{{ rendering_engine }}',
+ '{{ robot_software_suite }}',
+ '{{ simulation_software_suite }}',
+ '{{ sources }}',
+ '{{ environment }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -319,32 +319,31 @@ globals:
 resources:
   - name: simulation_application
     props:
-      - name: Name
-        value: '{{ Name }}'
-      - name: CurrentRevisionId
-        value: '{{ CurrentRevisionId }}'
-      - name: RenderingEngine
+      - name: name
+        value: '{{ name }}'
+      - name: current_revision_id
+        value: '{{ current_revision_id }}'
+      - name: rendering_engine
         value:
-          Name: '{{ Name }}'
-          Version: '{{ Version }}'
-      - name: RobotSoftwareSuite
+          name: '{{ name }}'
+          version: '{{ version }}'
+      - name: robot_software_suite
         value:
-          Name: '{{ Name }}'
-          Version: '{{ Version }}'
-      - name: SimulationSoftwareSuite
+          name: '{{ name }}'
+          version: '{{ version }}'
+      - name: simulation_software_suite
         value:
-          Name: '{{ Name }}'
-          Version: '{{ Version }}'
-      - name: Sources
+          name: '{{ name }}'
+          version: '{{ version }}'
+      - name: sources
         value:
-          - S3Bucket: '{{ S3Bucket }}'
-            S3Key: '{{ S3Key }}'
-            Architecture: '{{ Architecture }}'
-      - name: Environment
-        value: '{{ Environment }}'
-      - name: Tags
+          - s3_bucket: '{{ s3_bucket }}'
+            s3_key: '{{ s3_key }}'
+            architecture: '{{ architecture }}'
+      - name: environment
+        value: '{{ environment }}'
+      - name: tags
         value: {}
-
 ```
 </TabItem>
 </Tabs>
@@ -366,7 +365,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Arn>';
+AND Identifier = '{{ arn }}';
 ```
 
 
@@ -375,7 +374,7 @@ AND Identifier = '<Arn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.robomaker.simulation_applications
-WHERE Identifier = '<Arn>'
+WHERE Identifier = '{{ arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/rolesanywhere/crls/index.md b/website/docs/services/rolesanywhere/crls/index.md
index df3d29134..8fd8c5e29 100644
--- a/website/docs/services/rolesanywhere/crls/index.md
+++ b/website/docs/services/rolesanywhere/crls/index.md
@@ -176,7 +176,7 @@ name,
 trust_anchor_arn,
 tags
 FROM awscc.rolesanywhere.crls
-WHERE region = 'us-east-1' AND Identifier = '<CrlId>';
+WHERE region = 'us-east-1' AND Identifier = '{{ crl_id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -213,9 +213,9 @@ INSERT INTO awscc.rolesanywhere.crls (
  Name,
  region
 )
-SELECT 
-'{{ CrlData }}',
- '{{ Name }}',
+SELECT
+'{{ crl_data }}',
+ '{{ name }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -231,12 +231,12 @@ INSERT INTO awscc.rolesanywhere.crls (
  Tags,
  region
 )
-SELECT 
- '{{ CrlData }}',
- '{{ Enabled }}',
- '{{ Name }}',
- '{{ TrustAnchorArn }}',
- '{{ Tags }}',
+SELECT
+ '{{ crl_data }}',
+ '{{ enabled }}',
+ '{{ name }}',
+ '{{ trust_anchor_arn }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -254,19 +254,18 @@ globals:
 resources:
   - name: crl
     props:
-      - name: CrlData
-        value: '{{ CrlData }}'
-      - name: Enabled
-        value: '{{ Enabled }}'
-      - name: Name
-        value: '{{ Name }}'
-      - name: TrustAnchorArn
-        value: '{{ TrustAnchorArn }}'
-      - name: Tags
+      - name: crl_data
+        value: '{{ crl_data }}'
+      - name: enabled
+        value: '{{ enabled }}'
+      - name: name
+        value: '{{ name }}'
+      - name: trust_anchor_arn
+        value: '{{ trust_anchor_arn }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -286,7 +285,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<CrlId>';
+AND Identifier = '{{ crl_id }}';
 ```
 
 
@@ -295,7 +294,7 @@ AND Identifier = '<CrlId>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.rolesanywhere.crls
-WHERE Identifier = '<CrlId>'
+WHERE Identifier = '{{ crl_id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/rolesanywhere/profiles/index.md b/website/docs/services/rolesanywhere/profiles/index.md
index b14b49107..1087241a5 100644
--- a/website/docs/services/rolesanywhere/profiles/index.md
+++ b/website/docs/services/rolesanywhere/profiles/index.md
@@ -231,7 +231,7 @@ tags,
 attribute_mappings,
 accept_role_session_name
 FROM awscc.rolesanywhere.profiles
-WHERE region = 'us-east-1' AND Identifier = '<ProfileId>';
+WHERE region = 'us-east-1' AND Identifier = '{{ profile_id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -268,9 +268,9 @@ INSERT INTO awscc.rolesanywhere.profiles (
  RoleArns,
  region
 )
-SELECT 
-'{{ Name }}',
- '{{ RoleArns }}',
+SELECT
+'{{ name }}',
+ '{{ role_arns }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -291,17 +291,17 @@ INSERT INTO awscc.rolesanywhere.profiles (
  AcceptRoleSessionName,
  region
 )
-SELECT 
- '{{ DurationSeconds }}',
- '{{ Enabled }}',
- '{{ ManagedPolicyArns }}',
- '{{ Name }}',
- '{{ RequireInstanceProperties }}',
- '{{ RoleArns }}',
- '{{ SessionPolicy }}',
- '{{ Tags }}',
- '{{ AttributeMappings }}',
- '{{ AcceptRoleSessionName }}',
+SELECT
+ '{{ duration_seconds }}',
+ '{{ enabled }}',
+ '{{ managed_policy_arns }}',
+ '{{ name }}',
+ '{{ require_instance_properties }}',
+ '{{ role_arns }}',
+ '{{ session_policy }}',
+ '{{ tags }}',
+ '{{ attribute_mappings }}',
+ '{{ accept_role_session_name }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -319,34 +319,33 @@ globals:
 resources:
   - name: profile
     props:
-      - name: DurationSeconds
+      - name: duration_seconds
         value: null
-      - name: Enabled
-        value: '{{ Enabled }}'
-      - name: ManagedPolicyArns
+      - name: enabled
+        value: '{{ enabled }}'
+      - name: managed_policy_arns
         value:
-          - '{{ ManagedPolicyArns[0] }}'
-      - name: Name
-        value: '{{ Name }}'
-      - name: RequireInstanceProperties
-        value: '{{ RequireInstanceProperties }}'
-      - name: RoleArns
+          - '{{ managed_policy_arns[0] }}'
+      - name: name
+        value: '{{ name }}'
+      - name: require_instance_properties
+        value: '{{ require_instance_properties }}'
+      - name: role_arns
         value:
-          - '{{ RoleArns[0] }}'
-      - name: SessionPolicy
-        value: '{{ SessionPolicy }}'
-      - name: Tags
+          - '{{ role_arns[0] }}'
+      - name: session_policy
+        value: '{{ session_policy }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-      - name: AttributeMappings
+          - key: '{{ key }}'
+            value: '{{ value }}'
+      - name: attribute_mappings
         value:
-          - MappingRules:
-              - Specifier: '{{ Specifier }}'
-            CertificateField: '{{ CertificateField }}'
-      - name: AcceptRoleSessionName
-        value: '{{ AcceptRoleSessionName }}'
-
+          - mapping_rules:
+              - specifier: '{{ specifier }}'
+            certificate_field: '{{ certificate_field }}'
+      - name: accept_role_session_name
+        value: '{{ accept_role_session_name }}'
 ```
 </TabItem>
 </Tabs>
@@ -370,7 +369,7 @@ SET PatchDocument = string('{{ {
     "AcceptRoleSessionName": accept_role_session_name
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<ProfileId>';
+AND Identifier = '{{ profile_id }}';
 ```
 
 
@@ -379,7 +378,7 @@ AND Identifier = '<ProfileId>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.rolesanywhere.profiles
-WHERE Identifier = '<ProfileId>'
+WHERE Identifier = '{{ profile_id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/rolesanywhere/trust_anchors/index.md b/website/docs/services/rolesanywhere/trust_anchors/index.md
index c4e1276f8..833181f89 100644
--- a/website/docs/services/rolesanywhere/trust_anchors/index.md
+++ b/website/docs/services/rolesanywhere/trust_anchors/index.md
@@ -216,7 +216,7 @@ tags,
 trust_anchor_id,
 trust_anchor_arn
 FROM awscc.rolesanywhere.trust_anchors
-WHERE region = 'us-east-1' AND Identifier = '<TrustAnchorId>';
+WHERE region = 'us-east-1' AND Identifier = '{{ trust_anchor_id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -253,9 +253,9 @@ INSERT INTO awscc.rolesanywhere.trust_anchors (
  Source,
  region
 )
-SELECT 
-'{{ Name }}',
- '{{ Source }}',
+SELECT
+'{{ name }}',
+ '{{ source }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -271,12 +271,12 @@ INSERT INTO awscc.rolesanywhere.trust_anchors (
  Tags,
  region
 )
-SELECT 
- '{{ Enabled }}',
- '{{ Name }}',
- '{{ NotificationSettings }}',
- '{{ Source }}',
- '{{ Tags }}',
+SELECT
+ '{{ enabled }}',
+ '{{ name }}',
+ '{{ notification_settings }}',
+ '{{ source }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -294,25 +294,24 @@ globals:
 resources:
   - name: trust_anchor
     props:
-      - name: Enabled
-        value: '{{ Enabled }}'
-      - name: Name
-        value: '{{ Name }}'
-      - name: NotificationSettings
+      - name: enabled
+        value: '{{ enabled }}'
+      - name: name
+        value: '{{ name }}'
+      - name: notification_settings
         value:
-          - Enabled: '{{ Enabled }}'
-            Event: '{{ Event }}'
-            Threshold: null
-            Channel: '{{ Channel }}'
-      - name: Source
+          - enabled: '{{ enabled }}'
+            event: '{{ event }}'
+            threshold: null
+            channel: '{{ channel }}'
+      - name: source
         value:
-          SourceType: '{{ SourceType }}'
-          SourceData: null
-      - name: Tags
+          source_type: '{{ source_type }}'
+          source_data: null
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -332,7 +331,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<TrustAnchorId>';
+AND Identifier = '{{ trust_anchor_id }}';
 ```
 
 
@@ -341,7 +340,7 @@ AND Identifier = '<TrustAnchorId>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.rolesanywhere.trust_anchors
-WHERE Identifier = '<TrustAnchorId>'
+WHERE Identifier = '{{ trust_anchor_id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/route53/cidr_collections/index.md b/website/docs/services/route53/cidr_collections/index.md
index f795efddd..4fa5be99d 100644
--- a/website/docs/services/route53/cidr_collections/index.md
+++ b/website/docs/services/route53/cidr_collections/index.md
@@ -164,7 +164,7 @@ name,
 arn,
 locations
 FROM awscc.route53.cidr_collections
-WHERE Identifier = '<Id>';
+WHERE region = 'us-east-1' AND Identifier = '{{ id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -175,7 +175,7 @@ SELECT
 region,
 id
 FROM awscc.route53.cidr_collections_list_only
-;
+WHERE region = 'us-east-1';
 ```
 </TabItem>
 </Tabs>
@@ -200,8 +200,8 @@ INSERT INTO awscc.route53.cidr_collections (
  Name,
  region
 )
-SELECT 
-'{{ Name }}',
+SELECT
+'{{ name }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -214,9 +214,9 @@ INSERT INTO awscc.route53.cidr_collections (
  Locations,
  region
 )
-SELECT 
- '{{ Name }}',
- '{{ Locations }}',
+SELECT
+ '{{ name }}',
+ '{{ locations }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -234,14 +234,13 @@ globals:
 resources:
   - name: cidr_collection
     props:
-      - name: Name
-        value: '{{ Name }}'
-      - name: Locations
+      - name: name
+        value: '{{ name }}'
+      - name: locations
         value:
-          - LocationName: '{{ LocationName }}'
-            CidrList:
-              - '{{ CidrList[0] }}'
-
+          - location_name: '{{ location_name }}'
+            cidr_list:
+              - '{{ cidr_list[0] }}'
 ```
 </TabItem>
 </Tabs>
@@ -257,7 +256,7 @@ SET PatchDocument = string('{{ {
     "Locations": locations
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Id>';
+AND Identifier = '{{ id }}';
 ```
 
 
@@ -266,7 +265,7 @@ AND Identifier = '<Id>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.route53.cidr_collections
-WHERE Identifier = '<Id>'
+WHERE Identifier = '{{ id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/route53/dnssecs/index.md b/website/docs/services/route53/dnssecs/index.md
index 33090f17f..25acbe94e 100644
--- a/website/docs/services/route53/dnssecs/index.md
+++ b/website/docs/services/route53/dnssecs/index.md
@@ -128,7 +128,7 @@ SELECT
 region,
 hosted_zone_id
 FROM awscc.route53.dnssecs
-WHERE Identifier = '<HostedZoneId>';
+WHERE region = 'us-east-1' AND Identifier = '{{ hosted_zone_id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -139,7 +139,7 @@ SELECT
 region,
 hosted_zone_id
 FROM awscc.route53.dnssecs_list_only
-;
+WHERE region = 'us-east-1';
 ```
 </TabItem>
 </Tabs>
@@ -164,8 +164,8 @@ INSERT INTO awscc.route53.dnssecs (
  HostedZoneId,
  region
 )
-SELECT 
-'{{ HostedZoneId }}',
+SELECT
+'{{ hosted_zone_id }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -177,8 +177,8 @@ INSERT INTO awscc.route53.dnssecs (
  HostedZoneId,
  region
 )
-SELECT 
- '{{ HostedZoneId }}',
+SELECT
+ '{{ hosted_zone_id }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -196,9 +196,8 @@ globals:
 resources:
   - name: dnssec
     props:
-      - name: HostedZoneId
-        value: '{{ HostedZoneId }}'
-
+      - name: hosted_zone_id
+        value: '{{ hosted_zone_id }}'
 ```
 </TabItem>
 </Tabs>
@@ -209,7 +208,7 @@ resources:
 ```sql
 /*+ delete */
 DELETE FROM awscc.route53.dnssecs
-WHERE Identifier = '<HostedZoneId>'
+WHERE Identifier = '{{ hosted_zone_id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/route53/health_checks/index.md b/website/docs/services/route53/health_checks/index.md
index 34a0d7724..413046a22 100644
--- a/website/docs/services/route53/health_checks/index.md
+++ b/website/docs/services/route53/health_checks/index.md
@@ -257,7 +257,7 @@ health_check_id,
 health_check_config,
 health_check_tags
 FROM awscc.route53.health_checks
-WHERE Identifier = '<HealthCheckId>';
+WHERE region = 'us-east-1' AND Identifier = '{{ health_check_id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -268,7 +268,7 @@ SELECT
 region,
 health_check_id
 FROM awscc.route53.health_checks_list_only
-;
+WHERE region = 'us-east-1';
 ```
 </TabItem>
 </Tabs>
@@ -293,8 +293,8 @@ INSERT INTO awscc.route53.health_checks (
  HealthCheckConfig,
  region
 )
-SELECT 
-'{{ HealthCheckConfig }}',
+SELECT
+'{{ health_check_config }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -307,9 +307,9 @@ INSERT INTO awscc.route53.health_checks (
  HealthCheckTags,
  region
 )
-SELECT 
- '{{ HealthCheckConfig }}',
- '{{ HealthCheckTags }}',
+SELECT
+ '{{ health_check_config }}',
+ '{{ health_check_tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -327,34 +327,33 @@ globals:
 resources:
   - name: health_check
     props:
-      - name: HealthCheckConfig
+      - name: health_check_config
         value:
-          AlarmIdentifier:
-            Name: '{{ Name }}'
-            Region: '{{ Region }}'
-          ChildHealthChecks:
-            - '{{ ChildHealthChecks[0] }}'
-          EnableSNI: '{{ EnableSNI }}'
-          FailureThreshold: '{{ FailureThreshold }}'
-          FullyQualifiedDomainName: '{{ FullyQualifiedDomainName }}'
-          HealthThreshold: '{{ HealthThreshold }}'
-          InsufficientDataHealthStatus: '{{ InsufficientDataHealthStatus }}'
-          Inverted: '{{ Inverted }}'
-          IPAddress: '{{ IPAddress }}'
-          MeasureLatency: '{{ MeasureLatency }}'
-          Port: '{{ Port }}'
-          Regions:
-            - '{{ Regions[0] }}'
-          RequestInterval: '{{ RequestInterval }}'
-          ResourcePath: '{{ ResourcePath }}'
-          SearchString: '{{ SearchString }}'
-          RoutingControlArn: '{{ RoutingControlArn }}'
-          Type: '{{ Type }}'
-      - name: HealthCheckTags
+          alarm_identifier:
+            name: '{{ name }}'
+            region: '{{ region }}'
+          child_health_checks:
+            - '{{ child_health_checks[0] }}'
+          enable_sn_i: '{{ enable_sn_i }}'
+          failure_threshold: '{{ failure_threshold }}'
+          fully_qualified_domain_name: '{{ fully_qualified_domain_name }}'
+          health_threshold: '{{ health_threshold }}'
+          insufficient_data_health_status: '{{ insufficient_data_health_status }}'
+          inverted: '{{ inverted }}'
+          ip_address: '{{ ip_address }}'
+          measure_latency: '{{ measure_latency }}'
+          port: '{{ port }}'
+          regions:
+            - '{{ regions[0] }}'
+          request_interval: '{{ request_interval }}'
+          resource_path: '{{ resource_path }}'
+          search_string: '{{ search_string }}'
+          routing_control_arn: '{{ routing_control_arn }}'
+          type: '{{ type }}'
+      - name: health_check_tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -370,7 +369,7 @@ SET PatchDocument = string('{{ {
     "HealthCheckTags": health_check_tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<HealthCheckId>';
+AND Identifier = '{{ health_check_id }}';
 ```
 
 
@@ -379,7 +378,7 @@ AND Identifier = '<HealthCheckId>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.route53.health_checks
-WHERE Identifier = '<HealthCheckId>'
+WHERE Identifier = '{{ health_check_id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/route53/hosted_zones/index.md b/website/docs/services/route53/hosted_zones/index.md
index 2e789ca70..2b4987464 100644
--- a/website/docs/services/route53/hosted_zones/index.md
+++ b/website/docs/services/route53/hosted_zones/index.md
@@ -208,7 +208,7 @@ name_servers,
 query_logging_config,
 name
 FROM awscc.route53.hosted_zones
-WHERE Identifier = '<Id>';
+WHERE region = 'us-east-1' AND Identifier = '{{ id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -219,7 +219,7 @@ SELECT
 region,
 id
 FROM awscc.route53.hosted_zones_list_only
-;
+WHERE region = 'us-east-1';
 ```
 </TabItem>
 </Tabs>
@@ -248,12 +248,12 @@ INSERT INTO awscc.route53.hosted_zones (
  Name,
  region
 )
-SELECT 
-'{{ HostedZoneTags }}',
- '{{ VPCs }}',
- '{{ HostedZoneConfig }}',
- '{{ QueryLoggingConfig }}',
- '{{ Name }}',
+SELECT
+'{{ hosted_zone_tags }}',
+ '{{ vpcs }}',
+ '{{ hosted_zone_config }}',
+ '{{ query_logging_config }}',
+ '{{ name }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -269,12 +269,12 @@ INSERT INTO awscc.route53.hosted_zones (
  Name,
  region
 )
-SELECT 
- '{{ HostedZoneTags }}',
- '{{ VPCs }}',
- '{{ HostedZoneConfig }}',
- '{{ QueryLoggingConfig }}',
- '{{ Name }}',
+SELECT
+ '{{ hosted_zone_tags }}',
+ '{{ vpcs }}',
+ '{{ hosted_zone_config }}',
+ '{{ query_logging_config }}',
+ '{{ name }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -292,23 +292,22 @@ globals:
 resources:
   - name: hosted_zone
     props:
-      - name: HostedZoneTags
+      - name: hosted_zone_tags
         value:
-          - Value: '{{ Value }}'
-            Key: '{{ Key }}'
-      - name: VPCs
+          - value: '{{ value }}'
+            key: '{{ key }}'
+      - name: vpcs
         value:
-          - VPCRegion: '{{ VPCRegion }}'
-            VPCId: '{{ VPCId }}'
-      - name: HostedZoneConfig
+          - vpc_region: '{{ vpc_region }}'
+            vpc_id: '{{ vpc_id }}'
+      - name: hosted_zone_config
         value:
-          Comment: '{{ Comment }}'
-      - name: QueryLoggingConfig
+          comment: '{{ comment }}'
+      - name: query_logging_config
         value:
-          CloudWatchLogsLogGroupArn: '{{ CloudWatchLogsLogGroupArn }}'
-      - name: Name
-        value: '{{ Name }}'
-
+          cloud_watch_logs_log_group_arn: '{{ cloud_watch_logs_log_group_arn }}'
+      - name: name
+        value: '{{ name }}'
 ```
 </TabItem>
 </Tabs>
@@ -327,7 +326,7 @@ SET PatchDocument = string('{{ {
     "QueryLoggingConfig": query_logging_config
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Id>';
+AND Identifier = '{{ id }}';
 ```
 
 
@@ -336,7 +335,7 @@ AND Identifier = '<Id>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.route53.hosted_zones
-WHERE Identifier = '<Id>'
+WHERE Identifier = '{{ id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/route53/key_signing_keys/index.md b/website/docs/services/route53/key_signing_keys/index.md
index 001967af4..a4fc14739 100644
--- a/website/docs/services/route53/key_signing_keys/index.md
+++ b/website/docs/services/route53/key_signing_keys/index.md
@@ -157,7 +157,7 @@ status,
 name,
 key_management_service_arn
 FROM awscc.route53.key_signing_keys
-WHERE Identifier = '<HostedZoneId>|<Name>';
+WHERE region = 'us-east-1' AND Identifier = '{{ hosted_zone_id }}|{{ name }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -169,7 +169,7 @@ region,
 hosted_zone_id,
 name
 FROM awscc.route53.key_signing_keys_list_only
-;
+WHERE region = 'us-east-1';
 ```
 </TabItem>
 </Tabs>
@@ -197,11 +197,11 @@ INSERT INTO awscc.route53.key_signing_keys (
  KeyManagementServiceArn,
  region
 )
-SELECT 
-'{{ HostedZoneId }}',
- '{{ Status }}',
- '{{ Name }}',
- '{{ KeyManagementServiceArn }}',
+SELECT
+'{{ hosted_zone_id }}',
+ '{{ status }}',
+ '{{ name }}',
+ '{{ key_management_service_arn }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -216,11 +216,11 @@ INSERT INTO awscc.route53.key_signing_keys (
  KeyManagementServiceArn,
  region
 )
-SELECT 
- '{{ HostedZoneId }}',
- '{{ Status }}',
- '{{ Name }}',
- '{{ KeyManagementServiceArn }}',
+SELECT
+ '{{ hosted_zone_id }}',
+ '{{ status }}',
+ '{{ name }}',
+ '{{ key_management_service_arn }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -238,15 +238,14 @@ globals:
 resources:
   - name: key_signing_key
     props:
-      - name: HostedZoneId
-        value: '{{ HostedZoneId }}'
-      - name: Status
-        value: '{{ Status }}'
-      - name: Name
-        value: '{{ Name }}'
-      - name: KeyManagementServiceArn
-        value: '{{ KeyManagementServiceArn }}'
-
+      - name: hosted_zone_id
+        value: '{{ hosted_zone_id }}'
+      - name: status
+        value: '{{ status }}'
+      - name: name
+        value: '{{ name }}'
+      - name: key_management_service_arn
+        value: '{{ key_management_service_arn }}'
 ```
 </TabItem>
 </Tabs>
@@ -262,7 +261,7 @@ SET PatchDocument = string('{{ {
     "Status": status
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<HostedZoneId>|<Name>';
+AND Identifier = '{{ hosted_zone_id }}|{{ name }}';
 ```
 
 
@@ -271,7 +270,7 @@ AND Identifier = '<HostedZoneId>|<Name>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.route53.key_signing_keys
-WHERE Identifier = '<HostedZoneId|Name>'
+WHERE Identifier = '{{ hosted_zone_id }}|{{ name }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/route53profiles/profile_associations/index.md b/website/docs/services/route53profiles/profile_associations/index.md
index d98eccfda..33f6efe44 100644
--- a/website/docs/services/route53profiles/profile_associations/index.md
+++ b/website/docs/services/route53profiles/profile_associations/index.md
@@ -176,7 +176,7 @@ name,
 tags,
 arn
 FROM awscc.route53profiles.profile_associations
-WHERE region = 'us-east-1' AND Identifier = '<Id>';
+WHERE region = 'us-east-1' AND Identifier = '{{ id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -214,10 +214,10 @@ INSERT INTO awscc.route53profiles.profile_associations (
  Name,
  region
 )
-SELECT 
-'{{ ResourceId }}',
- '{{ ProfileId }}',
- '{{ Name }}',
+SELECT
+'{{ resource_id }}',
+ '{{ profile_id }}',
+ '{{ name }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -233,12 +233,12 @@ INSERT INTO awscc.route53profiles.profile_associations (
  Arn,
  region
 )
-SELECT 
- '{{ ResourceId }}',
- '{{ ProfileId }}',
- '{{ Name }}',
- '{{ Tags }}',
- '{{ Arn }}',
+SELECT
+ '{{ resource_id }}',
+ '{{ profile_id }}',
+ '{{ name }}',
+ '{{ tags }}',
+ '{{ arn }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -256,19 +256,18 @@ globals:
 resources:
   - name: profile_association
     props:
-      - name: ResourceId
-        value: '{{ ResourceId }}'
-      - name: ProfileId
-        value: '{{ ProfileId }}'
-      - name: Name
-        value: '{{ Name }}'
-      - name: Tags
+      - name: resource_id
+        value: '{{ resource_id }}'
+      - name: profile_id
+        value: '{{ profile_id }}'
+      - name: name
+        value: '{{ name }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-      - name: Arn
-        value: '{{ Arn }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
+      - name: arn
+        value: '{{ arn }}'
 ```
 </TabItem>
 </Tabs>
@@ -285,7 +284,7 @@ SET PatchDocument = string('{{ {
     "Arn": arn
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Id>';
+AND Identifier = '{{ id }}';
 ```
 
 
@@ -294,7 +293,7 @@ AND Identifier = '<Id>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.route53profiles.profile_associations
-WHERE Identifier = '<Id>'
+WHERE Identifier = '{{ id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/route53profiles/profile_resource_associations/index.md b/website/docs/services/route53profiles/profile_resource_associations/index.md
index 9e2b3fc3f..91d41352a 100644
--- a/website/docs/services/route53profiles/profile_resource_associations/index.md
+++ b/website/docs/services/route53profiles/profile_resource_associations/index.md
@@ -164,7 +164,7 @@ resource_arn,
 resource_properties,
 resource_type
 FROM awscc.route53profiles.profile_resource_associations
-WHERE region = 'us-east-1' AND Identifier = '<Id>';
+WHERE region = 'us-east-1' AND Identifier = '{{ id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -202,10 +202,10 @@ INSERT INTO awscc.route53profiles.profile_resource_associations (
  ResourceArn,
  region
 )
-SELECT 
-'{{ ProfileId }}',
- '{{ Name }}',
- '{{ ResourceArn }}',
+SELECT
+'{{ profile_id }}',
+ '{{ name }}',
+ '{{ resource_arn }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -220,11 +220,11 @@ INSERT INTO awscc.route53profiles.profile_resource_associations (
  ResourceProperties,
  region
 )
-SELECT 
- '{{ ProfileId }}',
- '{{ Name }}',
- '{{ ResourceArn }}',
- '{{ ResourceProperties }}',
+SELECT
+ '{{ profile_id }}',
+ '{{ name }}',
+ '{{ resource_arn }}',
+ '{{ resource_properties }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -242,15 +242,14 @@ globals:
 resources:
   - name: profile_resource_association
     props:
-      - name: ProfileId
-        value: '{{ ProfileId }}'
-      - name: Name
-        value: '{{ Name }}'
-      - name: ResourceArn
-        value: '{{ ResourceArn }}'
-      - name: ResourceProperties
-        value: '{{ ResourceProperties }}'
-
+      - name: profile_id
+        value: '{{ profile_id }}'
+      - name: name
+        value: '{{ name }}'
+      - name: resource_arn
+        value: '{{ resource_arn }}'
+      - name: resource_properties
+        value: '{{ resource_properties }}'
 ```
 </TabItem>
 </Tabs>
@@ -266,7 +265,7 @@ SET PatchDocument = string('{{ {
     "ResourceProperties": resource_properties
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Id>';
+AND Identifier = '{{ id }}';
 ```
 
 
@@ -275,7 +274,7 @@ AND Identifier = '<Id>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.route53profiles.profile_resource_associations
-WHERE Identifier = '<Id>'
+WHERE Identifier = '{{ id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/route53profiles/profiles/index.md b/website/docs/services/route53profiles/profiles/index.md
index 37647c3bb..038cd44ff 100644
--- a/website/docs/services/route53profiles/profiles/index.md
+++ b/website/docs/services/route53profiles/profiles/index.md
@@ -170,7 +170,7 @@ tags,
 arn,
 id
 FROM awscc.route53profiles.profiles
-WHERE region = 'us-east-1' AND Identifier = '<Id>';
+WHERE region = 'us-east-1' AND Identifier = '{{ id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -206,8 +206,8 @@ INSERT INTO awscc.route53profiles.profiles (
  Name,
  region
 )
-SELECT 
-'{{ Name }}',
+SELECT
+'{{ name }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -220,9 +220,9 @@ INSERT INTO awscc.route53profiles.profiles (
  Tags,
  region
 )
-SELECT 
- '{{ Name }}',
- '{{ Tags }}',
+SELECT
+ '{{ name }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -240,13 +240,12 @@ globals:
 resources:
   - name: profile
     props:
-      - name: Name
-        value: '{{ Name }}'
-      - name: Tags
+      - name: name
+        value: '{{ name }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -262,7 +261,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Id>';
+AND Identifier = '{{ id }}';
 ```
 
 
@@ -271,7 +270,7 @@ AND Identifier = '<Id>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.route53profiles.profiles
-WHERE Identifier = '<Id>'
+WHERE Identifier = '{{ id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/route53recoverycontrol/clusters/index.md b/website/docs/services/route53recoverycontrol/clusters/index.md
index c54f7e1aa..9d9370bd7 100644
--- a/website/docs/services/route53recoverycontrol/clusters/index.md
+++ b/website/docs/services/route53recoverycontrol/clusters/index.md
@@ -188,7 +188,7 @@ cluster_endpoints,
 tags,
 network_type
 FROM awscc.route53recoverycontrol.clusters
-WHERE region = 'us-east-1' AND Identifier = '<ClusterArn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ cluster_arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -224,8 +224,8 @@ INSERT INTO awscc.route53recoverycontrol.clusters (
  Name,
  region
 )
-SELECT 
-'{{ Name }}',
+SELECT
+'{{ name }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -239,10 +239,10 @@ INSERT INTO awscc.route53recoverycontrol.clusters (
  NetworkType,
  region
 )
-SELECT 
- '{{ Name }}',
- '{{ Tags }}',
- '{{ NetworkType }}',
+SELECT
+ '{{ name }}',
+ '{{ tags }}',
+ '{{ network_type }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -260,15 +260,14 @@ globals:
 resources:
   - name: cluster
     props:
-      - name: Name
-        value: '{{ Name }}'
-      - name: Tags
+      - name: name
+        value: '{{ name }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-      - name: NetworkType
-        value: '{{ NetworkType }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
+      - name: network_type
+        value: '{{ network_type }}'
 ```
 </TabItem>
 </Tabs>
@@ -284,7 +283,7 @@ SET PatchDocument = string('{{ {
     "NetworkType": network_type
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<ClusterArn>';
+AND Identifier = '{{ cluster_arn }}';
 ```
 
 
@@ -293,7 +292,7 @@ AND Identifier = '<ClusterArn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.route53recoverycontrol.clusters
-WHERE Identifier = '<ClusterArn>'
+WHERE Identifier = '{{ cluster_arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/route53recoverycontrol/control_panels/index.md b/website/docs/services/route53recoverycontrol/control_panels/index.md
index a33b01daa..2341c074c 100644
--- a/website/docs/services/route53recoverycontrol/control_panels/index.md
+++ b/website/docs/services/route53recoverycontrol/control_panels/index.md
@@ -182,7 +182,7 @@ default_control_panel,
 routing_control_count,
 tags
 FROM awscc.route53recoverycontrol.control_panels
-WHERE region = 'us-east-1' AND Identifier = '<ControlPanelArn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ control_panel_arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -218,8 +218,8 @@ INSERT INTO awscc.route53recoverycontrol.control_panels (
  Name,
  region
 )
-SELECT 
-'{{ Name }}',
+SELECT
+'{{ name }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -233,10 +233,10 @@ INSERT INTO awscc.route53recoverycontrol.control_panels (
  Tags,
  region
 )
-SELECT 
- '{{ ClusterArn }}',
- '{{ Name }}',
- '{{ Tags }}',
+SELECT
+ '{{ cluster_arn }}',
+ '{{ name }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -254,15 +254,14 @@ globals:
 resources:
   - name: control_panel
     props:
-      - name: ClusterArn
-        value: '{{ ClusterArn }}'
-      - name: Name
-        value: '{{ Name }}'
-      - name: Tags
+      - name: cluster_arn
+        value: '{{ cluster_arn }}'
+      - name: name
+        value: '{{ name }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -278,7 +277,7 @@ SET PatchDocument = string('{{ {
     "Name": name
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<ControlPanelArn>';
+AND Identifier = '{{ control_panel_arn }}';
 ```
 
 
@@ -287,7 +286,7 @@ AND Identifier = '<ControlPanelArn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.route53recoverycontrol.control_panels
-WHERE Identifier = '<ControlPanelArn>'
+WHERE Identifier = '{{ control_panel_arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/route53recoverycontrol/routing_controls/index.md b/website/docs/services/route53recoverycontrol/routing_controls/index.md
index 361cc9ae1..042023281 100644
--- a/website/docs/services/route53recoverycontrol/routing_controls/index.md
+++ b/website/docs/services/route53recoverycontrol/routing_controls/index.md
@@ -158,7 +158,7 @@ name,
 status,
 cluster_arn
 FROM awscc.route53recoverycontrol.routing_controls
-WHERE region = 'us-east-1' AND Identifier = '<RoutingControlArn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ routing_control_arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -194,8 +194,8 @@ INSERT INTO awscc.route53recoverycontrol.routing_controls (
  Name,
  region
 )
-SELECT 
-'{{ Name }}',
+SELECT
+'{{ name }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -209,10 +209,10 @@ INSERT INTO awscc.route53recoverycontrol.routing_controls (
  ClusterArn,
  region
 )
-SELECT 
- '{{ ControlPanelArn }}',
- '{{ Name }}',
- '{{ ClusterArn }}',
+SELECT
+ '{{ control_panel_arn }}',
+ '{{ name }}',
+ '{{ cluster_arn }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -230,13 +230,12 @@ globals:
 resources:
   - name: routing_control
     props:
-      - name: ControlPanelArn
-        value: '{{ ControlPanelArn }}'
-      - name: Name
-        value: '{{ Name }}'
-      - name: ClusterArn
-        value: '{{ ClusterArn }}'
-
+      - name: control_panel_arn
+        value: '{{ control_panel_arn }}'
+      - name: name
+        value: '{{ name }}'
+      - name: cluster_arn
+        value: '{{ cluster_arn }}'
 ```
 </TabItem>
 </Tabs>
@@ -252,7 +251,7 @@ SET PatchDocument = string('{{ {
     "Name": name
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<RoutingControlArn>';
+AND Identifier = '{{ routing_control_arn }}';
 ```
 
 
@@ -261,7 +260,7 @@ AND Identifier = '<RoutingControlArn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.route53recoverycontrol.routing_controls
-WHERE Identifier = '<RoutingControlArn>'
+WHERE Identifier = '{{ routing_control_arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/route53recoverycontrol/safety_rules/index.md b/website/docs/services/route53recoverycontrol/safety_rules/index.md
index 9ebb5b851..c1d5116e5 100644
--- a/website/docs/services/route53recoverycontrol/safety_rules/index.md
+++ b/website/docs/services/route53recoverycontrol/safety_rules/index.md
@@ -234,7 +234,7 @@ status,
 rule_config,
 tags
 FROM awscc.route53recoverycontrol.safety_rules
-WHERE region = 'us-east-1' AND Identifier = '<SafetyRuleArn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ safety_rule_arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -270,7 +270,7 @@ INSERT INTO awscc.route53recoverycontrol.safety_rules (
  ,
  region
 )
-SELECT 
+SELECT
 '{{  }}',
 '{{ region }}';
 ```
@@ -288,13 +288,13 @@ INSERT INTO awscc.route53recoverycontrol.safety_rules (
  Tags,
  region
 )
-SELECT 
- '{{ AssertionRule }}',
- '{{ GatingRule }}',
- '{{ Name }}',
- '{{ ControlPanelArn }}',
- '{{ RuleConfig }}',
- '{{ Tags }}',
+SELECT
+ '{{ assertion_rule }}',
+ '{{ gating_rule }}',
+ '{{ name }}',
+ '{{ control_panel_arn }}',
+ '{{ rule_config }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -312,32 +312,31 @@ globals:
 resources:
   - name: safety_rule
     props:
-      - name: AssertionRule
+      - name: assertion_rule
         value:
-          WaitPeriodMs: '{{ WaitPeriodMs }}'
-          AssertedControls:
-            - '{{ AssertedControls[0] }}'
-      - name: GatingRule
+          wait_period_ms: '{{ wait_period_ms }}'
+          asserted_controls:
+            - '{{ asserted_controls[0] }}'
+      - name: gating_rule
         value:
-          GatingControls:
-            - '{{ GatingControls[0] }}'
-          TargetControls:
-            - '{{ TargetControls[0] }}'
-          WaitPeriodMs: '{{ WaitPeriodMs }}'
-      - name: Name
-        value: '{{ Name }}'
-      - name: ControlPanelArn
-        value: '{{ ControlPanelArn }}'
-      - name: RuleConfig
+          gating_controls:
+            - '{{ gating_controls[0] }}'
+          target_controls:
+            - '{{ target_controls[0] }}'
+          wait_period_ms: '{{ wait_period_ms }}'
+      - name: name
+        value: '{{ name }}'
+      - name: control_panel_arn
+        value: '{{ control_panel_arn }}'
+      - name: rule_config
         value:
-          Type: '{{ Type }}'
-          Threshold: '{{ Threshold }}'
-          Inverted: '{{ Inverted }}'
-      - name: Tags
+          type: '{{ type }}'
+          threshold: '{{ threshold }}'
+          inverted: '{{ inverted }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -358,7 +357,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<SafetyRuleArn>';
+AND Identifier = '{{ safety_rule_arn }}';
 ```
 
 
@@ -367,7 +366,7 @@ AND Identifier = '<SafetyRuleArn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.route53recoverycontrol.safety_rules
-WHERE Identifier = '<SafetyRuleArn>'
+WHERE Identifier = '{{ safety_rule_arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/route53recoveryreadiness/cells/index.md b/website/docs/services/route53recoveryreadiness/cells/index.md
index b25aa527f..770061589 100644
--- a/website/docs/services/route53recoveryreadiness/cells/index.md
+++ b/website/docs/services/route53recoveryreadiness/cells/index.md
@@ -170,7 +170,7 @@ cells,
 parent_readiness_scopes,
 tags
 FROM awscc.route53recoveryreadiness.cells
-WHERE region = 'us-east-1' AND Identifier = '<CellName>';
+WHERE region = 'us-east-1' AND Identifier = '{{ cell_name }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -208,10 +208,10 @@ INSERT INTO awscc.route53recoveryreadiness.cells (
  Tags,
  region
 )
-SELECT 
-'{{ CellName }}',
- '{{ Cells }}',
- '{{ Tags }}',
+SELECT
+'{{ cell_name }}',
+ '{{ cells }}',
+ '{{ tags }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -225,10 +225,10 @@ INSERT INTO awscc.route53recoveryreadiness.cells (
  Tags,
  region
 )
-SELECT 
- '{{ CellName }}',
- '{{ Cells }}',
- '{{ Tags }}',
+SELECT
+ '{{ cell_name }}',
+ '{{ cells }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -246,16 +246,15 @@ globals:
 resources:
   - name: cell
     props:
-      - name: CellName
-        value: '{{ CellName }}'
-      - name: Cells
+      - name: cell_name
+        value: '{{ cell_name }}'
+      - name: cells
         value:
-          - '{{ Cells[0] }}'
-      - name: Tags
+          - '{{ cells[0] }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -272,7 +271,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<CellName>';
+AND Identifier = '{{ cell_name }}';
 ```
 
 
@@ -281,7 +280,7 @@ AND Identifier = '<CellName>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.route53recoveryreadiness.cells
-WHERE Identifier = '<CellName>'
+WHERE Identifier = '{{ cell_name }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/route53recoveryreadiness/readiness_checks/index.md b/website/docs/services/route53recoveryreadiness/readiness_checks/index.md
index 86ce8e6e7..671ba3a72 100644
--- a/website/docs/services/route53recoveryreadiness/readiness_checks/index.md
+++ b/website/docs/services/route53recoveryreadiness/readiness_checks/index.md
@@ -164,7 +164,7 @@ readiness_check_name,
 readiness_check_arn,
 tags
 FROM awscc.route53recoveryreadiness.readiness_checks
-WHERE region = 'us-east-1' AND Identifier = '<ReadinessCheckName>';
+WHERE region = 'us-east-1' AND Identifier = '{{ readiness_check_name }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -202,10 +202,10 @@ INSERT INTO awscc.route53recoveryreadiness.readiness_checks (
  Tags,
  region
 )
-SELECT 
-'{{ ResourceSetName }}',
- '{{ ReadinessCheckName }}',
- '{{ Tags }}',
+SELECT
+'{{ resource_set_name }}',
+ '{{ readiness_check_name }}',
+ '{{ tags }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -219,10 +219,10 @@ INSERT INTO awscc.route53recoveryreadiness.readiness_checks (
  Tags,
  region
 )
-SELECT 
- '{{ ResourceSetName }}',
- '{{ ReadinessCheckName }}',
- '{{ Tags }}',
+SELECT
+ '{{ resource_set_name }}',
+ '{{ readiness_check_name }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -240,15 +240,14 @@ globals:
 resources:
   - name: readiness_check
     props:
-      - name: ResourceSetName
-        value: '{{ ResourceSetName }}'
-      - name: ReadinessCheckName
-        value: '{{ ReadinessCheckName }}'
-      - name: Tags
+      - name: resource_set_name
+        value: '{{ resource_set_name }}'
+      - name: readiness_check_name
+        value: '{{ readiness_check_name }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -265,7 +264,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<ReadinessCheckName>';
+AND Identifier = '{{ readiness_check_name }}';
 ```
 
 
@@ -274,7 +273,7 @@ AND Identifier = '<ReadinessCheckName>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.route53recoveryreadiness.readiness_checks
-WHERE Identifier = '<ReadinessCheckName>'
+WHERE Identifier = '{{ readiness_check_name }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/route53recoveryreadiness/recovery_groups/index.md b/website/docs/services/route53recoveryreadiness/recovery_groups/index.md
index c4a234a6f..56b7070ca 100644
--- a/website/docs/services/route53recoveryreadiness/recovery_groups/index.md
+++ b/website/docs/services/route53recoveryreadiness/recovery_groups/index.md
@@ -164,7 +164,7 @@ cells,
 recovery_group_arn,
 tags
 FROM awscc.route53recoveryreadiness.recovery_groups
-WHERE region = 'us-east-1' AND Identifier = '<RecoveryGroupName>';
+WHERE region = 'us-east-1' AND Identifier = '{{ recovery_group_name }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -202,10 +202,10 @@ INSERT INTO awscc.route53recoveryreadiness.recovery_groups (
  Tags,
  region
 )
-SELECT 
-'{{ RecoveryGroupName }}',
- '{{ Cells }}',
- '{{ Tags }}',
+SELECT
+'{{ recovery_group_name }}',
+ '{{ cells }}',
+ '{{ tags }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -219,10 +219,10 @@ INSERT INTO awscc.route53recoveryreadiness.recovery_groups (
  Tags,
  region
 )
-SELECT 
- '{{ RecoveryGroupName }}',
- '{{ Cells }}',
- '{{ Tags }}',
+SELECT
+ '{{ recovery_group_name }}',
+ '{{ cells }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -240,16 +240,15 @@ globals:
 resources:
   - name: recovery_group
     props:
-      - name: RecoveryGroupName
-        value: '{{ RecoveryGroupName }}'
-      - name: Cells
+      - name: recovery_group_name
+        value: '{{ recovery_group_name }}'
+      - name: cells
         value:
-          - '{{ Cells[0] }}'
-      - name: Tags
+          - '{{ cells[0] }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -266,7 +265,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<RecoveryGroupName>';
+AND Identifier = '{{ recovery_group_name }}';
 ```
 
 
@@ -275,7 +274,7 @@ AND Identifier = '<RecoveryGroupName>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.route53recoveryreadiness.recovery_groups
-WHERE Identifier = '<RecoveryGroupName>'
+WHERE Identifier = '{{ recovery_group_name }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/route53recoveryreadiness/resource_sets/index.md b/website/docs/services/route53recoveryreadiness/resource_sets/index.md
index e1b7a69aa..e4cbdb36a 100644
--- a/website/docs/services/route53recoveryreadiness/resource_sets/index.md
+++ b/website/docs/services/route53recoveryreadiness/resource_sets/index.md
@@ -231,7 +231,7 @@ resource_set_arn,
 resource_set_type,
 tags
 FROM awscc.route53recoveryreadiness.resource_sets
-WHERE region = 'us-east-1' AND Identifier = '<ResourceSetName>';
+WHERE region = 'us-east-1' AND Identifier = '{{ resource_set_name }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -268,9 +268,9 @@ INSERT INTO awscc.route53recoveryreadiness.resource_sets (
  ResourceSetType,
  region
 )
-SELECT 
-'{{ Resources }}',
- '{{ ResourceSetType }}',
+SELECT
+'{{ resources }}',
+ '{{ resource_set_type }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -285,11 +285,11 @@ INSERT INTO awscc.route53recoveryreadiness.resource_sets (
  Tags,
  region
 )
-SELECT 
- '{{ ResourceSetName }}',
- '{{ Resources }}',
- '{{ ResourceSetType }}',
- '{{ Tags }}',
+SELECT
+ '{{ resource_set_name }}',
+ '{{ resources }}',
+ '{{ resource_set_type }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -307,32 +307,31 @@ globals:
 resources:
   - name: resource_set
     props:
-      - name: ResourceSetName
-        value: '{{ ResourceSetName }}'
-      - name: Resources
+      - name: resource_set_name
+        value: '{{ resource_set_name }}'
+      - name: resources
         value:
-          - ResourceArn: '{{ ResourceArn }}'
-            ComponentId: '{{ ComponentId }}'
-            DnsTargetResource:
-              DomainName: '{{ DomainName }}'
-              RecordSetId: '{{ RecordSetId }}'
-              HostedZoneArn: '{{ HostedZoneArn }}'
-              RecordType: '{{ RecordType }}'
-              TargetResource:
-                NLBResource:
-                  Arn: '{{ Arn }}'
-                R53Resource:
-                  DomainName: '{{ DomainName }}'
-                  RecordSetId: '{{ RecordSetId }}'
-            ReadinessScopes:
-              - '{{ ReadinessScopes[0] }}'
-      - name: ResourceSetType
-        value: '{{ ResourceSetType }}'
-      - name: Tags
+          - resource_arn: '{{ resource_arn }}'
+            component_id: '{{ component_id }}'
+            dns_target_resource:
+              domain_name: '{{ domain_name }}'
+              record_set_id: '{{ record_set_id }}'
+              hosted_zone_arn: '{{ hosted_zone_arn }}'
+              record_type: '{{ record_type }}'
+              target_resource:
+                n_lb_resource:
+                  arn: '{{ arn }}'
+                r53_resource:
+                  domain_name: '{{ domain_name }}'
+                  record_set_id: '{{ record_set_id }}'
+            readiness_scopes:
+              - '{{ readiness_scopes[0] }}'
+      - name: resource_set_type
+        value: '{{ resource_set_type }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -349,7 +348,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<ResourceSetName>';
+AND Identifier = '{{ resource_set_name }}';
 ```
 
 
@@ -358,7 +357,7 @@ AND Identifier = '<ResourceSetName>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.route53recoveryreadiness.resource_sets
-WHERE Identifier = '<ResourceSetName>'
+WHERE Identifier = '{{ resource_set_name }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/route53resolver/firewall_domain_lists/index.md b/website/docs/services/route53resolver/firewall_domain_lists/index.md
index 2f412f59e..7604f883e 100644
--- a/website/docs/services/route53resolver/firewall_domain_lists/index.md
+++ b/website/docs/services/route53resolver/firewall_domain_lists/index.md
@@ -218,7 +218,7 @@ domains,
 domain_file_url,
 tags
 FROM awscc.route53resolver.firewall_domain_lists
-WHERE region = 'us-east-1' AND Identifier = '<Id>';
+WHERE region = 'us-east-1' AND Identifier = '{{ id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -257,11 +257,11 @@ INSERT INTO awscc.route53resolver.firewall_domain_lists (
  Tags,
  region
 )
-SELECT 
-'{{ Name }}',
- '{{ Domains }}',
- '{{ DomainFileUrl }}',
- '{{ Tags }}',
+SELECT
+'{{ name }}',
+ '{{ domains }}',
+ '{{ domain_file_url }}',
+ '{{ tags }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -276,11 +276,11 @@ INSERT INTO awscc.route53resolver.firewall_domain_lists (
  Tags,
  region
 )
-SELECT 
- '{{ Name }}',
- '{{ Domains }}',
- '{{ DomainFileUrl }}',
- '{{ Tags }}',
+SELECT
+ '{{ name }}',
+ '{{ domains }}',
+ '{{ domain_file_url }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -298,18 +298,17 @@ globals:
 resources:
   - name: firewall_domain_list
     props:
-      - name: Name
-        value: '{{ Name }}'
-      - name: Domains
+      - name: name
+        value: '{{ name }}'
+      - name: domains
         value:
-          - '{{ Domains[0] }}'
-      - name: DomainFileUrl
-        value: '{{ DomainFileUrl }}'
-      - name: Tags
+          - '{{ domains[0] }}'
+      - name: domain_file_url
+        value: '{{ domain_file_url }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -327,7 +326,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Id>';
+AND Identifier = '{{ id }}';
 ```
 
 
@@ -336,7 +335,7 @@ AND Identifier = '<Id>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.route53resolver.firewall_domain_lists
-WHERE Identifier = '<Id>'
+WHERE Identifier = '{{ id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/route53resolver/firewall_rule_group_associations/index.md b/website/docs/services/route53resolver/firewall_rule_group_associations/index.md
index 47fbffcdf..0283d38bf 100644
--- a/website/docs/services/route53resolver/firewall_rule_group_associations/index.md
+++ b/website/docs/services/route53resolver/firewall_rule_group_associations/index.md
@@ -224,7 +224,7 @@ creation_time,
 modification_time,
 tags
 FROM awscc.route53resolver.firewall_rule_group_associations
-WHERE region = 'us-east-1' AND Identifier = '<Id>';
+WHERE region = 'us-east-1' AND Identifier = '{{ id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -262,10 +262,10 @@ INSERT INTO awscc.route53resolver.firewall_rule_group_associations (
  Priority,
  region
 )
-SELECT 
-'{{ FirewallRuleGroupId }}',
- '{{ VpcId }}',
- '{{ Priority }}',
+SELECT
+'{{ firewall_rule_group_id }}',
+ '{{ vpc_id }}',
+ '{{ priority }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -282,13 +282,13 @@ INSERT INTO awscc.route53resolver.firewall_rule_group_associations (
  Tags,
  region
 )
-SELECT 
- '{{ FirewallRuleGroupId }}',
- '{{ VpcId }}',
- '{{ Name }}',
- '{{ Priority }}',
- '{{ MutationProtection }}',
- '{{ Tags }}',
+SELECT
+ '{{ firewall_rule_group_id }}',
+ '{{ vpc_id }}',
+ '{{ name }}',
+ '{{ priority }}',
+ '{{ mutation_protection }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -306,21 +306,20 @@ globals:
 resources:
   - name: firewall_rule_group_association
     props:
-      - name: FirewallRuleGroupId
-        value: '{{ FirewallRuleGroupId }}'
-      - name: VpcId
-        value: '{{ VpcId }}'
-      - name: Name
-        value: '{{ Name }}'
-      - name: Priority
-        value: '{{ Priority }}'
-      - name: MutationProtection
-        value: '{{ MutationProtection }}'
-      - name: Tags
+      - name: firewall_rule_group_id
+        value: '{{ firewall_rule_group_id }}'
+      - name: vpc_id
+        value: '{{ vpc_id }}'
+      - name: name
+        value: '{{ name }}'
+      - name: priority
+        value: '{{ priority }}'
+      - name: mutation_protection
+        value: '{{ mutation_protection }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -339,7 +338,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Id>';
+AND Identifier = '{{ id }}';
 ```
 
 
@@ -348,7 +347,7 @@ AND Identifier = '<Id>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.route53resolver.firewall_rule_group_associations
-WHERE Identifier = '<Id>'
+WHERE Identifier = '{{ id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/route53resolver/firewall_rule_groups/index.md b/website/docs/services/route53resolver/firewall_rule_groups/index.md
index cd780f3d2..a2c56b994 100644
--- a/website/docs/services/route53resolver/firewall_rule_groups/index.md
+++ b/website/docs/services/route53resolver/firewall_rule_groups/index.md
@@ -280,7 +280,7 @@ modification_time,
 firewall_rules,
 tags
 FROM awscc.route53resolver.firewall_rule_groups
-WHERE region = 'us-east-1' AND Identifier = '<Id>';
+WHERE region = 'us-east-1' AND Identifier = '{{ id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -318,10 +318,10 @@ INSERT INTO awscc.route53resolver.firewall_rule_groups (
  Tags,
  region
 )
-SELECT 
-'{{ Name }}',
- '{{ FirewallRules }}',
- '{{ Tags }}',
+SELECT
+'{{ name }}',
+ '{{ firewall_rules }}',
+ '{{ tags }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -335,10 +335,10 @@ INSERT INTO awscc.route53resolver.firewall_rule_groups (
  Tags,
  region
 )
-SELECT 
- '{{ Name }}',
- '{{ FirewallRules }}',
- '{{ Tags }}',
+SELECT
+ '{{ name }}',
+ '{{ firewall_rules }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -356,27 +356,26 @@ globals:
 resources:
   - name: firewall_rule_group
     props:
-      - name: Name
-        value: '{{ Name }}'
-      - name: FirewallRules
+      - name: name
+        value: '{{ name }}'
+      - name: firewall_rules
         value:
-          - FirewallDomainListId: '{{ FirewallDomainListId }}'
-            FirewallThreatProtectionId: '{{ FirewallThreatProtectionId }}'
-            Priority: '{{ Priority }}'
-            Action: '{{ Action }}'
-            BlockResponse: '{{ BlockResponse }}'
-            BlockOverrideDomain: '{{ BlockOverrideDomain }}'
-            BlockOverrideDnsType: '{{ BlockOverrideDnsType }}'
-            BlockOverrideTtl: '{{ BlockOverrideTtl }}'
-            Qtype: '{{ Qtype }}'
-            ConfidenceThreshold: '{{ ConfidenceThreshold }}'
-            DnsThreatProtection: '{{ DnsThreatProtection }}'
-            FirewallDomainRedirectionAction: '{{ FirewallDomainRedirectionAction }}'
-      - name: Tags
+          - firewall_domain_list_id: '{{ firewall_domain_list_id }}'
+            firewall_threat_protection_id: '{{ firewall_threat_protection_id }}'
+            priority: '{{ priority }}'
+            action: '{{ action }}'
+            block_response: '{{ block_response }}'
+            block_override_domain: '{{ block_override_domain }}'
+            block_override_dns_type: '{{ block_override_dns_type }}'
+            block_override_ttl: '{{ block_override_ttl }}'
+            qtype: '{{ qtype }}'
+            confidence_threshold: '{{ confidence_threshold }}'
+            dns_threat_protection: '{{ dns_threat_protection }}'
+            firewall_domain_redirection_action: '{{ firewall_domain_redirection_action }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -392,7 +391,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Id>';
+AND Identifier = '{{ id }}';
 ```
 
 
@@ -401,7 +400,7 @@ AND Identifier = '<Id>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.route53resolver.firewall_rule_groups
-WHERE Identifier = '<Id>'
+WHERE Identifier = '{{ id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/route53resolver/outpost_resolvers/index.md b/website/docs/services/route53resolver/outpost_resolvers/index.md
index b51f93dd2..625fc510a 100644
--- a/website/docs/services/route53resolver/outpost_resolvers/index.md
+++ b/website/docs/services/route53resolver/outpost_resolvers/index.md
@@ -212,7 +212,7 @@ creation_time,
 modification_time,
 tags
 FROM awscc.route53resolver.outpost_resolvers
-WHERE region = 'us-east-1' AND Identifier = '<Id>';
+WHERE region = 'us-east-1' AND Identifier = '{{ id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -250,10 +250,10 @@ INSERT INTO awscc.route53resolver.outpost_resolvers (
  PreferredInstanceType,
  region
 )
-SELECT 
-'{{ Name }}',
- '{{ OutpostArn }}',
- '{{ PreferredInstanceType }}',
+SELECT
+'{{ name }}',
+ '{{ outpost_arn }}',
+ '{{ preferred_instance_type }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -269,12 +269,12 @@ INSERT INTO awscc.route53resolver.outpost_resolvers (
  Tags,
  region
 )
-SELECT 
- '{{ Name }}',
- '{{ OutpostArn }}',
- '{{ PreferredInstanceType }}',
- '{{ InstanceCount }}',
- '{{ Tags }}',
+SELECT
+ '{{ name }}',
+ '{{ outpost_arn }}',
+ '{{ preferred_instance_type }}',
+ '{{ instance_count }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -292,19 +292,18 @@ globals:
 resources:
   - name: outpost_resolver
     props:
-      - name: Name
-        value: '{{ Name }}'
-      - name: OutpostArn
-        value: '{{ OutpostArn }}'
-      - name: PreferredInstanceType
-        value: '{{ PreferredInstanceType }}'
-      - name: InstanceCount
-        value: '{{ InstanceCount }}'
-      - name: Tags
+      - name: name
+        value: '{{ name }}'
+      - name: outpost_arn
+        value: '{{ outpost_arn }}'
+      - name: preferred_instance_type
+        value: '{{ preferred_instance_type }}'
+      - name: instance_count
+        value: '{{ instance_count }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -323,7 +322,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Id>';
+AND Identifier = '{{ id }}';
 ```
 
 
@@ -332,7 +331,7 @@ AND Identifier = '<Id>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.route53resolver.outpost_resolvers
-WHERE Identifier = '<Id>'
+WHERE Identifier = '{{ id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/route53resolver/resolver_configs/index.md b/website/docs/services/route53resolver/resolver_configs/index.md
index 628e1f4dc..65153f2cb 100644
--- a/website/docs/services/route53resolver/resolver_configs/index.md
+++ b/website/docs/services/route53resolver/resolver_configs/index.md
@@ -157,7 +157,7 @@ resource_id,
 autodefined_reverse,
 autodefined_reverse_flag
 FROM awscc.route53resolver.resolver_configs
-WHERE region = 'us-east-1' AND Identifier = '<ResourceId>';
+WHERE region = 'us-east-1' AND Identifier = '{{ resource_id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -194,9 +194,9 @@ INSERT INTO awscc.route53resolver.resolver_configs (
  AutodefinedReverseFlag,
  region
 )
-SELECT 
-'{{ ResourceId }}',
- '{{ AutodefinedReverseFlag }}',
+SELECT
+'{{ resource_id }}',
+ '{{ autodefined_reverse_flag }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -209,9 +209,9 @@ INSERT INTO awscc.route53resolver.resolver_configs (
  AutodefinedReverseFlag,
  region
 )
-SELECT 
- '{{ ResourceId }}',
- '{{ AutodefinedReverseFlag }}',
+SELECT
+ '{{ resource_id }}',
+ '{{ autodefined_reverse_flag }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -229,11 +229,10 @@ globals:
 resources:
   - name: resolver_config
     props:
-      - name: ResourceId
-        value: '{{ ResourceId }}'
-      - name: AutodefinedReverseFlag
-        value: '{{ AutodefinedReverseFlag }}'
-
+      - name: resource_id
+        value: '{{ resource_id }}'
+      - name: autodefined_reverse_flag
+        value: '{{ autodefined_reverse_flag }}'
 ```
 </TabItem>
 </Tabs>
@@ -244,7 +243,7 @@ resources:
 ```sql
 /*+ delete */
 DELETE FROM awscc.route53resolver.resolver_configs
-WHERE Identifier = '<ResourceId>'
+WHERE Identifier = '{{ resource_id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/route53resolver/resolver_endpoints/index.md b/website/docs/services/route53resolver/resolver_endpoints/index.md
index 26fd0986c..945773052 100644
--- a/website/docs/services/route53resolver/resolver_endpoints/index.md
+++ b/website/docs/services/route53resolver/resolver_endpoints/index.md
@@ -235,7 +235,7 @@ resolver_endpoint_type,
 security_group_ids,
 tags
 FROM awscc.route53resolver.resolver_endpoints
-WHERE region = 'us-east-1' AND Identifier = '<ResolverEndpointId>';
+WHERE region = 'us-east-1' AND Identifier = '{{ resolver_endpoint_id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -273,10 +273,10 @@ INSERT INTO awscc.route53resolver.resolver_endpoints (
  SecurityGroupIds,
  region
 )
-SELECT 
-'{{ Direction }}',
- '{{ IpAddresses }}',
- '{{ SecurityGroupIds }}',
+SELECT
+'{{ direction }}',
+ '{{ ip_addresses }}',
+ '{{ security_group_ids }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -296,16 +296,16 @@ INSERT INTO awscc.route53resolver.resolver_endpoints (
  Tags,
  region
 )
-SELECT 
- '{{ Direction }}',
- '{{ IpAddresses }}',
- '{{ Name }}',
- '{{ OutpostArn }}',
- '{{ PreferredInstanceType }}',
- '{{ Protocols }}',
- '{{ ResolverEndpointType }}',
- '{{ SecurityGroupIds }}',
- '{{ Tags }}',
+SELECT
+ '{{ direction }}',
+ '{{ ip_addresses }}',
+ '{{ name }}',
+ '{{ outpost_arn }}',
+ '{{ preferred_instance_type }}',
+ '{{ protocols }}',
+ '{{ resolver_endpoint_type }}',
+ '{{ security_group_ids }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -323,32 +323,31 @@ globals:
 resources:
   - name: resolver_endpoint
     props:
-      - name: Direction
-        value: '{{ Direction }}'
-      - name: IpAddresses
+      - name: direction
+        value: '{{ direction }}'
+      - name: ip_addresses
         value:
-          - Ip: '{{ Ip }}'
-            Ipv6: '{{ Ipv6 }}'
-            SubnetId: '{{ SubnetId }}'
-      - name: Name
-        value: '{{ Name }}'
-      - name: OutpostArn
-        value: '{{ OutpostArn }}'
-      - name: PreferredInstanceType
-        value: '{{ PreferredInstanceType }}'
-      - name: Protocols
+          - ip: '{{ ip }}'
+            ipv6: '{{ ipv6 }}'
+            subnet_id: '{{ subnet_id }}'
+      - name: name
+        value: '{{ name }}'
+      - name: outpost_arn
+        value: '{{ outpost_arn }}'
+      - name: preferred_instance_type
+        value: '{{ preferred_instance_type }}'
+      - name: protocols
         value:
-          - '{{ Protocols[0] }}'
-      - name: ResolverEndpointType
-        value: '{{ ResolverEndpointType }}'
-      - name: SecurityGroupIds
+          - '{{ protocols[0] }}'
+      - name: resolver_endpoint_type
+        value: '{{ resolver_endpoint_type }}'
+      - name: security_group_ids
         value:
-          - '{{ SecurityGroupIds[0] }}'
-      - name: Tags
+          - '{{ security_group_ids[0] }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -368,7 +367,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<ResolverEndpointId>';
+AND Identifier = '{{ resolver_endpoint_id }}';
 ```
 
 
@@ -377,7 +376,7 @@ AND Identifier = '<ResolverEndpointId>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.route53resolver.resolver_endpoints
-WHERE Identifier = '<ResolverEndpointId>'
+WHERE Identifier = '{{ resolver_endpoint_id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/route53resolver/resolver_query_logging_config_associations/index.md b/website/docs/services/route53resolver/resolver_query_logging_config_associations/index.md
index 220be8c08..40ab5f35a 100644
--- a/website/docs/services/route53resolver/resolver_query_logging_config_associations/index.md
+++ b/website/docs/services/route53resolver/resolver_query_logging_config_associations/index.md
@@ -164,7 +164,7 @@ error,
 error_message,
 creation_time
 FROM awscc.route53resolver.resolver_query_logging_config_associations
-WHERE region = 'us-east-1' AND Identifier = '<Id>';
+WHERE region = 'us-east-1' AND Identifier = '{{ id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -201,9 +201,9 @@ INSERT INTO awscc.route53resolver.resolver_query_logging_config_associations (
  ResourceId,
  region
 )
-SELECT 
-'{{ ResolverQueryLogConfigId }}',
- '{{ ResourceId }}',
+SELECT
+'{{ resolver_query_log_config_id }}',
+ '{{ resource_id }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -216,9 +216,9 @@ INSERT INTO awscc.route53resolver.resolver_query_logging_config_associations (
  ResourceId,
  region
 )
-SELECT 
- '{{ ResolverQueryLogConfigId }}',
- '{{ ResourceId }}',
+SELECT
+ '{{ resolver_query_log_config_id }}',
+ '{{ resource_id }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -236,11 +236,10 @@ globals:
 resources:
   - name: resolver_query_logging_config_association
     props:
-      - name: ResolverQueryLogConfigId
-        value: '{{ ResolverQueryLogConfigId }}'
-      - name: ResourceId
-        value: '{{ ResourceId }}'
-
+      - name: resolver_query_log_config_id
+        value: '{{ resolver_query_log_config_id }}'
+      - name: resource_id
+        value: '{{ resource_id }}'
 ```
 </TabItem>
 </Tabs>
@@ -251,7 +250,7 @@ resources:
 ```sql
 /*+ delete */
 DELETE FROM awscc.route53resolver.resolver_query_logging_config_associations
-WHERE Identifier = '<Id>'
+WHERE Identifier = '{{ id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/route53resolver/resolver_query_logging_configs/index.md b/website/docs/services/route53resolver/resolver_query_logging_configs/index.md
index 182b9b6ef..7a4e7ccdd 100644
--- a/website/docs/services/route53resolver/resolver_query_logging_configs/index.md
+++ b/website/docs/services/route53resolver/resolver_query_logging_configs/index.md
@@ -200,7 +200,7 @@ destination_arn,
 creation_time,
 tags
 FROM awscc.route53resolver.resolver_query_logging_configs
-WHERE region = 'us-east-1' AND Identifier = '<Id>';
+WHERE region = 'us-east-1' AND Identifier = '{{ id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -238,10 +238,10 @@ INSERT INTO awscc.route53resolver.resolver_query_logging_configs (
  Tags,
  region
 )
-SELECT 
-'{{ Name }}',
- '{{ DestinationArn }}',
- '{{ Tags }}',
+SELECT
+'{{ name }}',
+ '{{ destination_arn }}',
+ '{{ tags }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -255,10 +255,10 @@ INSERT INTO awscc.route53resolver.resolver_query_logging_configs (
  Tags,
  region
 )
-SELECT 
- '{{ Name }}',
- '{{ DestinationArn }}',
- '{{ Tags }}',
+SELECT
+ '{{ name }}',
+ '{{ destination_arn }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -276,15 +276,14 @@ globals:
 resources:
   - name: resolver_query_logging_config
     props:
-      - name: Name
-        value: '{{ Name }}'
-      - name: DestinationArn
-        value: '{{ DestinationArn }}'
-      - name: Tags
+      - name: name
+        value: '{{ name }}'
+      - name: destination_arn
+        value: '{{ destination_arn }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -295,7 +294,7 @@ resources:
 ```sql
 /*+ delete */
 DELETE FROM awscc.route53resolver.resolver_query_logging_configs
-WHERE Identifier = '<Id>'
+WHERE Identifier = '{{ id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/route53resolver/resolver_rule_associations/index.md b/website/docs/services/route53resolver/resolver_rule_associations/index.md
index cfaf07660..d08668364 100644
--- a/website/docs/services/route53resolver/resolver_rule_associations/index.md
+++ b/website/docs/services/route53resolver/resolver_rule_associations/index.md
@@ -146,7 +146,7 @@ resolver_rule_id,
 resolver_rule_association_id,
 name
 FROM awscc.route53resolver.resolver_rule_associations
-WHERE region = 'us-east-1' AND Identifier = '<ResolverRuleAssociationId>';
+WHERE region = 'us-east-1' AND Identifier = '{{ resolver_rule_association_id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -183,9 +183,9 @@ INSERT INTO awscc.route53resolver.resolver_rule_associations (
  ResolverRuleId,
  region
 )
-SELECT 
-'{{ VPCId }}',
- '{{ ResolverRuleId }}',
+SELECT
+'{{ vpc_id }}',
+ '{{ resolver_rule_id }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -199,10 +199,10 @@ INSERT INTO awscc.route53resolver.resolver_rule_associations (
  Name,
  region
 )
-SELECT 
- '{{ VPCId }}',
- '{{ ResolverRuleId }}',
- '{{ Name }}',
+SELECT
+ '{{ vpc_id }}',
+ '{{ resolver_rule_id }}',
+ '{{ name }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -220,13 +220,12 @@ globals:
 resources:
   - name: resolver_rule_association
     props:
-      - name: VPCId
-        value: '{{ VPCId }}'
-      - name: ResolverRuleId
-        value: '{{ ResolverRuleId }}'
-      - name: Name
-        value: '{{ Name }}'
-
+      - name: vpc_id
+        value: '{{ vpc_id }}'
+      - name: resolver_rule_id
+        value: '{{ resolver_rule_id }}'
+      - name: name
+        value: '{{ name }}'
 ```
 </TabItem>
 </Tabs>
@@ -237,7 +236,7 @@ resources:
 ```sql
 /*+ delete */
 DELETE FROM awscc.route53resolver.resolver_rule_associations
-WHERE Identifier = '<ResolverRuleAssociationId>'
+WHERE Identifier = '{{ resolver_rule_association_id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/route53resolver/resolver_rules/index.md b/website/docs/services/route53resolver/resolver_rules/index.md
index 1ab02ed72..c1af51205 100644
--- a/website/docs/services/route53resolver/resolver_rules/index.md
+++ b/website/docs/services/route53resolver/resolver_rules/index.md
@@ -221,7 +221,7 @@ target_ips,
 arn,
 resolver_rule_id
 FROM awscc.route53resolver.resolver_rules
-WHERE region = 'us-east-1' AND Identifier = '<ResolverRuleId>';
+WHERE region = 'us-east-1' AND Identifier = '{{ resolver_rule_id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -257,8 +257,8 @@ INSERT INTO awscc.route53resolver.resolver_rules (
  RuleType,
  region
 )
-SELECT 
-'{{ RuleType }}',
+SELECT
+'{{ rule_type }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -276,14 +276,14 @@ INSERT INTO awscc.route53resolver.resolver_rules (
  TargetIps,
  region
 )
-SELECT 
- '{{ ResolverEndpointId }}',
- '{{ DomainName }}',
- '{{ Name }}',
- '{{ RuleType }}',
- '{{ DelegationRecord }}',
- '{{ Tags }}',
- '{{ TargetIps }}',
+SELECT
+ '{{ resolver_endpoint_id }}',
+ '{{ domain_name }}',
+ '{{ name }}',
+ '{{ rule_type }}',
+ '{{ delegation_record }}',
+ '{{ tags }}',
+ '{{ target_ips }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -301,28 +301,27 @@ globals:
 resources:
   - name: resolver_rule
     props:
-      - name: ResolverEndpointId
-        value: '{{ ResolverEndpointId }}'
-      - name: DomainName
-        value: '{{ DomainName }}'
-      - name: Name
-        value: '{{ Name }}'
-      - name: RuleType
-        value: '{{ RuleType }}'
-      - name: DelegationRecord
-        value: '{{ DelegationRecord }}'
-      - name: Tags
+      - name: resolver_endpoint_id
+        value: '{{ resolver_endpoint_id }}'
+      - name: domain_name
+        value: '{{ domain_name }}'
+      - name: name
+        value: '{{ name }}'
+      - name: rule_type
+        value: '{{ rule_type }}'
+      - name: delegation_record
+        value: '{{ delegation_record }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-      - name: TargetIps
+          - key: '{{ key }}'
+            value: '{{ value }}'
+      - name: target_ips
         value:
-          - Ip: '{{ Ip }}'
-            Ipv6: '{{ Ipv6 }}'
-            Port: '{{ Port }}'
-            Protocol: '{{ Protocol }}'
-            ServerNameIndication: '{{ ServerNameIndication }}'
-
+          - ip: '{{ ip }}'
+            ipv6: '{{ ipv6 }}'
+            port: '{{ port }}'
+            protocol: '{{ protocol }}'
+            server_name_indication: '{{ server_name_indication }}'
 ```
 </TabItem>
 </Tabs>
@@ -343,7 +342,7 @@ SET PatchDocument = string('{{ {
     "TargetIps": target_ips
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<ResolverRuleId>';
+AND Identifier = '{{ resolver_rule_id }}';
 ```
 
 
@@ -352,7 +351,7 @@ AND Identifier = '<ResolverRuleId>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.route53resolver.resolver_rules
-WHERE Identifier = '<ResolverRuleId>'
+WHERE Identifier = '{{ resolver_rule_id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/route53resolver/resolverdnssec_configs/index.md b/website/docs/services/route53resolver/resolverdnssec_configs/index.md
index 937c36526..86b25d5f7 100644
--- a/website/docs/services/route53resolver/resolverdnssec_configs/index.md
+++ b/website/docs/services/route53resolver/resolverdnssec_configs/index.md
@@ -146,7 +146,7 @@ owner_id,
 resource_id,
 validation_status
 FROM awscc.route53resolver.resolverdnssec_configs
-WHERE region = 'us-east-1' AND Identifier = '<Id>';
+WHERE region = 'us-east-1' AND Identifier = '{{ id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -182,8 +182,8 @@ INSERT INTO awscc.route53resolver.resolverdnssec_configs (
  ResourceId,
  region
 )
-SELECT 
-'{{ ResourceId }}',
+SELECT
+'{{ resource_id }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -195,8 +195,8 @@ INSERT INTO awscc.route53resolver.resolverdnssec_configs (
  ResourceId,
  region
 )
-SELECT 
- '{{ ResourceId }}',
+SELECT
+ '{{ resource_id }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -214,9 +214,8 @@ globals:
 resources:
   - name: resolverdnssec_config
     props:
-      - name: ResourceId
-        value: '{{ ResourceId }}'
-
+      - name: resource_id
+        value: '{{ resource_id }}'
 ```
 </TabItem>
 </Tabs>
@@ -227,7 +226,7 @@ resources:
 ```sql
 /*+ delete */
 DELETE FROM awscc.route53resolver.resolverdnssec_configs
-WHERE Identifier = '<Id>'
+WHERE Identifier = '{{ id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/rum/app_monitors/index.md b/website/docs/services/rum/app_monitors/index.md
index d5cd595a1..d9c3693a8 100644
--- a/website/docs/services/rum/app_monitors/index.md
+++ b/website/docs/services/rum/app_monitors/index.md
@@ -339,7 +339,7 @@ custom_events,
 resource_policy,
 deobfuscation_configuration
 FROM awscc.rum.app_monitors
-WHERE region = 'us-east-1' AND Identifier = '<Name>';
+WHERE region = 'us-east-1' AND Identifier = '{{ name }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -375,8 +375,8 @@ INSERT INTO awscc.rum.app_monitors (
  Name,
  region
 )
-SELECT 
-'{{ Name }}',
+SELECT
+'{{ name }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -396,16 +396,16 @@ INSERT INTO awscc.rum.app_monitors (
  DeobfuscationConfiguration,
  region
 )
-SELECT 
- '{{ Name }}',
- '{{ Domain }}',
- '{{ DomainList }}',
- '{{ CwLogEnabled }}',
- '{{ Tags }}',
- '{{ AppMonitorConfiguration }}',
- '{{ CustomEvents }}',
- '{{ ResourcePolicy }}',
- '{{ DeobfuscationConfiguration }}',
+SELECT
+ '{{ name }}',
+ '{{ domain }}',
+ '{{ domain_list }}',
+ '{{ cw_log_enabled }}',
+ '{{ tags }}',
+ '{{ app_monitor_configuration }}',
+ '{{ custom_events }}',
+ '{{ resource_policy }}',
+ '{{ deobfuscation_configuration }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -423,57 +423,56 @@ globals:
 resources:
   - name: app_monitor
     props:
-      - name: Name
-        value: '{{ Name }}'
-      - name: Domain
-        value: '{{ Domain }}'
-      - name: DomainList
+      - name: name
+        value: '{{ name }}'
+      - name: domain
+        value: '{{ domain }}'
+      - name: domain_list
         value:
-          - '{{ DomainList[0] }}'
-      - name: CwLogEnabled
-        value: '{{ CwLogEnabled }}'
-      - name: Tags
+          - '{{ domain_list[0] }}'
+      - name: cw_log_enabled
+        value: '{{ cw_log_enabled }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-      - name: AppMonitorConfiguration
+          - key: '{{ key }}'
+            value: '{{ value }}'
+      - name: app_monitor_configuration
         value:
-          IdentityPoolId: '{{ IdentityPoolId }}'
-          ExcludedPages:
-            - '{{ ExcludedPages[0] }}'
-          IncludedPages: null
-          FavoritePages:
-            - '{{ FavoritePages[0] }}'
-          SessionSampleRate: null
-          GuestRoleArn: '{{ GuestRoleArn }}'
-          AllowCookies: '{{ AllowCookies }}'
-          Telemetries:
-            - '{{ Telemetries[0] }}'
-          EnableXRay: '{{ EnableXRay }}'
-          MetricDestinations:
-            - Destination: '{{ Destination }}'
-              DestinationArn: '{{ DestinationArn }}'
-              IamRoleArn: '{{ IamRoleArn }}'
-              MetricDefinitions:
-                - Name: '{{ Name }}'
-                  Namespace: '{{ Namespace }}'
-                  ValueKey: '{{ ValueKey }}'
-                  UnitLabel: '{{ UnitLabel }}'
-                  DimensionKeys: {}
-                  EventPattern: '{{ EventPattern }}'
-      - name: CustomEvents
+          identity_pool_id: '{{ identity_pool_id }}'
+          excluded_pages:
+            - '{{ excluded_pages[0] }}'
+          included_pages: null
+          favorite_pages:
+            - '{{ favorite_pages[0] }}'
+          session_sample_rate: null
+          guest_role_arn: '{{ guest_role_arn }}'
+          allow_cookies: '{{ allow_cookies }}'
+          telemetries:
+            - '{{ telemetries[0] }}'
+          enable_xray: '{{ enable_xray }}'
+          metric_destinations:
+            - destination: '{{ destination }}'
+              destination_arn: '{{ destination_arn }}'
+              iam_role_arn: '{{ iam_role_arn }}'
+              metric_definitions:
+                - name: '{{ name }}'
+                  namespace: '{{ namespace }}'
+                  value_key: '{{ value_key }}'
+                  unit_label: '{{ unit_label }}'
+                  dimension_keys: {}
+                  event_pattern: '{{ event_pattern }}'
+      - name: custom_events
         value:
-          Status: '{{ Status }}'
-      - name: ResourcePolicy
+          status: '{{ status }}'
+      - name: resource_policy
         value:
-          PolicyDocument: '{{ PolicyDocument }}'
-          PolicyRevisionId: '{{ PolicyRevisionId }}'
-      - name: DeobfuscationConfiguration
+          policy_document: '{{ policy_document }}'
+          policy_revision_id: '{{ policy_revision_id }}'
+      - name: deobfuscation_configuration
         value:
-          JavaScriptSourceMaps:
-            Status: '{{ Status }}'
-            S3Uri: '{{ S3Uri }}'
-
+          java_script_source_maps:
+            status: '{{ status }}'
+            s3_uri: '{{ s3_uri }}'
 ```
 </TabItem>
 </Tabs>
@@ -496,7 +495,7 @@ SET PatchDocument = string('{{ {
     "DeobfuscationConfiguration": deobfuscation_configuration
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Name>';
+AND Identifier = '{{ name }}';
 ```
 
 
@@ -505,7 +504,7 @@ AND Identifier = '<Name>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.rum.app_monitors
-WHERE Identifier = '<Name>'
+WHERE Identifier = '{{ name }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/s3/access_grants/index.md b/website/docs/services/s3/access_grants/index.md
index 60f4d1160..34f631c06 100644
--- a/website/docs/services/s3/access_grants/index.md
+++ b/website/docs/services/s3/access_grants/index.md
@@ -219,7 +219,7 @@ access_grant_arn,
 grantee,
 access_grants_location_configuration
 FROM awscc.s3.access_grants
-WHERE region = 'us-east-1' AND Identifier = '<AccessGrantId>';
+WHERE region = 'us-east-1' AND Identifier = '{{ access_grant_id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -257,10 +257,10 @@ INSERT INTO awscc.s3.access_grants (
  Grantee,
  region
 )
-SELECT 
-'{{ AccessGrantsLocationId }}',
- '{{ Permission }}',
- '{{ Grantee }}',
+SELECT
+'{{ access_grants_location_id }}',
+ '{{ permission }}',
+ '{{ grantee }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -278,14 +278,14 @@ INSERT INTO awscc.s3.access_grants (
  AccessGrantsLocationConfiguration,
  region
 )
-SELECT 
- '{{ AccessGrantsLocationId }}',
- '{{ Tags }}',
- '{{ Permission }}',
- '{{ ApplicationArn }}',
- '{{ S3PrefixType }}',
- '{{ Grantee }}',
- '{{ AccessGrantsLocationConfiguration }}',
+SELECT
+ '{{ access_grants_location_id }}',
+ '{{ tags }}',
+ '{{ permission }}',
+ '{{ application_arn }}',
+ '{{ s3_prefix_type }}',
+ '{{ grantee }}',
+ '{{ access_grants_location_configuration }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -303,26 +303,25 @@ globals:
 resources:
   - name: access_grant
     props:
-      - name: AccessGrantsLocationId
-        value: '{{ AccessGrantsLocationId }}'
-      - name: Tags
+      - name: access_grants_location_id
+        value: '{{ access_grants_location_id }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-      - name: Permission
-        value: '{{ Permission }}'
-      - name: ApplicationArn
-        value: '{{ ApplicationArn }}'
-      - name: S3PrefixType
-        value: '{{ S3PrefixType }}'
-      - name: Grantee
+          - key: '{{ key }}'
+            value: '{{ value }}'
+      - name: permission
+        value: '{{ permission }}'
+      - name: application_arn
+        value: '{{ application_arn }}'
+      - name: s3_prefix_type
+        value: '{{ s3_prefix_type }}'
+      - name: grantee
         value:
-          GranteeType: '{{ GranteeType }}'
-          GranteeIdentifier: '{{ GranteeIdentifier }}'
-      - name: AccessGrantsLocationConfiguration
+          grantee_type: '{{ grantee_type }}'
+          grantee_identifier: '{{ grantee_identifier }}'
+      - name: access_grants_location_configuration
         value:
-          S3SubPrefix: '{{ S3SubPrefix }}'
-
+          s3_sub_prefix: '{{ s3_sub_prefix }}'
 ```
 </TabItem>
 </Tabs>
@@ -342,7 +341,7 @@ SET PatchDocument = string('{{ {
     "AccessGrantsLocationConfiguration": access_grants_location_configuration
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<AccessGrantId>';
+AND Identifier = '{{ access_grant_id }}';
 ```
 
 
@@ -351,7 +350,7 @@ AND Identifier = '<AccessGrantId>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.s3.access_grants
-WHERE Identifier = '<AccessGrantId>'
+WHERE Identifier = '{{ access_grant_id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/s3/access_grants_instances/index.md b/website/docs/services/s3/access_grants_instances/index.md
index 5dd4fafc1..c6830803f 100644
--- a/website/docs/services/s3/access_grants_instances/index.md
+++ b/website/docs/services/s3/access_grants_instances/index.md
@@ -164,7 +164,7 @@ identity_center_arn,
 access_grants_instance_id,
 tags
 FROM awscc.s3.access_grants_instances
-WHERE region = 'us-east-1' AND Identifier = '<AccessGrantsInstanceArn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ access_grants_instance_arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -200,7 +200,7 @@ INSERT INTO awscc.s3.access_grants_instances (
  ,
  region
 )
-SELECT 
+SELECT
 '{{  }}',
 '{{ region }}';
 ```
@@ -214,9 +214,9 @@ INSERT INTO awscc.s3.access_grants_instances (
  Tags,
  region
 )
-SELECT 
- '{{ IdentityCenterArn }}',
- '{{ Tags }}',
+SELECT
+ '{{ identity_center_arn }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -234,13 +234,12 @@ globals:
 resources:
   - name: access_grants_instance
     props:
-      - name: IdentityCenterArn
-        value: '{{ IdentityCenterArn }}'
-      - name: Tags
+      - name: identity_center_arn
+        value: '{{ identity_center_arn }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -256,7 +255,7 @@ SET PatchDocument = string('{{ {
     "IdentityCenterArn": identity_center_arn
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<AccessGrantsInstanceArn>';
+AND Identifier = '{{ access_grants_instance_arn }}';
 ```
 
 
@@ -265,7 +264,7 @@ AND Identifier = '<AccessGrantsInstanceArn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.s3.access_grants_instances
-WHERE Identifier = '<AccessGrantsInstanceArn>'
+WHERE Identifier = '{{ access_grants_instance_arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/s3/access_grants_locations/index.md b/website/docs/services/s3/access_grants_locations/index.md
index f56befee8..76579042a 100644
--- a/website/docs/services/s3/access_grants_locations/index.md
+++ b/website/docs/services/s3/access_grants_locations/index.md
@@ -170,7 +170,7 @@ iam_role_arn,
 location_scope,
 tags
 FROM awscc.s3.access_grants_locations
-WHERE region = 'us-east-1' AND Identifier = '<AccessGrantsLocationId>';
+WHERE region = 'us-east-1' AND Identifier = '{{ access_grants_location_id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -206,7 +206,7 @@ INSERT INTO awscc.s3.access_grants_locations (
  ,
  region
 )
-SELECT 
+SELECT
 '{{  }}',
 '{{ region }}';
 ```
@@ -221,10 +221,10 @@ INSERT INTO awscc.s3.access_grants_locations (
  Tags,
  region
 )
-SELECT 
- '{{ IamRoleArn }}',
- '{{ LocationScope }}',
- '{{ Tags }}',
+SELECT
+ '{{ iam_role_arn }}',
+ '{{ location_scope }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -242,15 +242,14 @@ globals:
 resources:
   - name: access_grants_location
     props:
-      - name: IamRoleArn
-        value: '{{ IamRoleArn }}'
-      - name: LocationScope
-        value: '{{ LocationScope }}'
-      - name: Tags
+      - name: iam_role_arn
+        value: '{{ iam_role_arn }}'
+      - name: location_scope
+        value: '{{ location_scope }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -267,7 +266,7 @@ SET PatchDocument = string('{{ {
     "LocationScope": location_scope
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<AccessGrantsLocationId>';
+AND Identifier = '{{ access_grants_location_id }}';
 ```
 
 
@@ -276,7 +275,7 @@ AND Identifier = '<AccessGrantsLocationId>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.s3.access_grants_locations
-WHERE Identifier = '<AccessGrantsLocationId>'
+WHERE Identifier = '{{ access_grants_location_id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/s3/access_points/index.md b/website/docs/services/s3/access_points/index.md
index 56af0a1cf..b8bc1cf9d 100644
--- a/website/docs/services/s3/access_points/index.md
+++ b/website/docs/services/s3/access_points/index.md
@@ -229,7 +229,7 @@ network_origin,
 arn,
 tags
 FROM awscc.s3.access_points
-WHERE region = 'us-east-1' AND Identifier = '<Name>';
+WHERE region = 'us-east-1' AND Identifier = '{{ name }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -265,8 +265,8 @@ INSERT INTO awscc.s3.access_points (
  Bucket,
  region
 )
-SELECT 
-'{{ Bucket }}',
+SELECT
+'{{ bucket }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -284,14 +284,14 @@ INSERT INTO awscc.s3.access_points (
  Tags,
  region
 )
-SELECT 
- '{{ Name }}',
- '{{ Bucket }}',
- '{{ BucketAccountId }}',
- '{{ VpcConfiguration }}',
- '{{ PublicAccessBlockConfiguration }}',
- '{{ Policy }}',
- '{{ Tags }}',
+SELECT
+ '{{ name }}',
+ '{{ bucket }}',
+ '{{ bucket_account_id }}',
+ '{{ vpc_configuration }}',
+ '{{ public_access_block_configuration }}',
+ '{{ policy }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -309,28 +309,27 @@ globals:
 resources:
   - name: access_point
     props:
-      - name: Name
-        value: '{{ Name }}'
-      - name: Bucket
-        value: '{{ Bucket }}'
-      - name: BucketAccountId
-        value: '{{ BucketAccountId }}'
-      - name: VpcConfiguration
+      - name: name
+        value: '{{ name }}'
+      - name: bucket
+        value: '{{ bucket }}'
+      - name: bucket_account_id
+        value: '{{ bucket_account_id }}'
+      - name: vpc_configuration
         value:
-          VpcId: '{{ VpcId }}'
-      - name: PublicAccessBlockConfiguration
+          vpc_id: '{{ vpc_id }}'
+      - name: public_access_block_configuration
         value:
-          RestrictPublicBuckets: '{{ RestrictPublicBuckets }}'
-          BlockPublicPolicy: '{{ BlockPublicPolicy }}'
-          BlockPublicAcls: '{{ BlockPublicAcls }}'
-          IgnorePublicAcls: '{{ IgnorePublicAcls }}'
-      - name: Policy
+          restrict_public_buckets: '{{ restrict_public_buckets }}'
+          block_public_policy: '{{ block_public_policy }}'
+          block_public_acls: '{{ block_public_acls }}'
+          ignore_public_acls: '{{ ignore_public_acls }}'
+      - name: policy
         value: {}
-      - name: Tags
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -348,7 +347,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Name>';
+AND Identifier = '{{ name }}';
 ```
 
 
@@ -357,7 +356,7 @@ AND Identifier = '<Name>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.s3.access_points
-WHERE Identifier = '<Name>'
+WHERE Identifier = '{{ name }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/s3/bucket_policies/index.md b/website/docs/services/s3/bucket_policies/index.md
index 448b94956..9073c956d 100644
--- a/website/docs/services/s3/bucket_policies/index.md
+++ b/website/docs/services/s3/bucket_policies/index.md
@@ -140,7 +140,7 @@ region,
 bucket,
 policy_document
 FROM awscc.s3.bucket_policies
-WHERE region = 'us-east-1' AND Identifier = '<Bucket>';
+WHERE region = 'us-east-1' AND Identifier = '{{ bucket }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -177,9 +177,9 @@ INSERT INTO awscc.s3.bucket_policies (
  PolicyDocument,
  region
 )
-SELECT 
-'{{ Bucket }}',
- '{{ PolicyDocument }}',
+SELECT
+'{{ bucket }}',
+ '{{ policy_document }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -192,9 +192,9 @@ INSERT INTO awscc.s3.bucket_policies (
  PolicyDocument,
  region
 )
-SELECT 
- '{{ Bucket }}',
- '{{ PolicyDocument }}',
+SELECT
+ '{{ bucket }}',
+ '{{ policy_document }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -212,11 +212,10 @@ globals:
 resources:
   - name: bucket_policy
     props:
-      - name: Bucket
-        value: '{{ Bucket }}'
-      - name: PolicyDocument
+      - name: bucket
+        value: '{{ bucket }}'
+      - name: policy_document
         value: {}
-
 ```
 </TabItem>
 </Tabs>
@@ -232,7 +231,7 @@ SET PatchDocument = string('{{ {
     "PolicyDocument": policy_document
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Bucket>';
+AND Identifier = '{{ bucket }}';
 ```
 
 
@@ -241,7 +240,7 @@ AND Identifier = '<Bucket>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.s3.bucket_policies
-WHERE Identifier = '<Bucket>'
+WHERE Identifier = '{{ bucket }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/s3/buckets/index.md b/website/docs/services/s3/buckets/index.md
index aa3817373..2e5c0923c 100644
--- a/website/docs/services/s3/buckets/index.md
+++ b/website/docs/services/s3/buckets/index.md
@@ -1282,7 +1282,7 @@ dual_stack_domain_name,
 regional_domain_name,
 website_url
 FROM awscc.s3.buckets
-WHERE region = 'us-east-1' AND Identifier = '<BucketName>';
+WHERE region = 'us-east-1' AND Identifier = '{{ bucket_name }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -1318,8 +1318,8 @@ INSERT INTO awscc.s3.buckets (
  BucketName,
  region
 )
-SELECT 
-'{{ BucketName }}',
+SELECT
+'{{ bucket_name }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -1352,29 +1352,29 @@ INSERT INTO awscc.s3.buckets (
  WebsiteConfiguration,
  region
 )
-SELECT 
- '{{ AccelerateConfiguration }}',
- '{{ AccessControl }}',
- '{{ AnalyticsConfigurations }}',
- '{{ BucketEncryption }}',
- '{{ BucketName }}',
- '{{ CorsConfiguration }}',
- '{{ IntelligentTieringConfigurations }}',
- '{{ InventoryConfigurations }}',
- '{{ LifecycleConfiguration }}',
- '{{ LoggingConfiguration }}',
- '{{ MetricsConfigurations }}',
- '{{ MetadataTableConfiguration }}',
- '{{ MetadataConfiguration }}',
- '{{ NotificationConfiguration }}',
- '{{ ObjectLockConfiguration }}',
- '{{ ObjectLockEnabled }}',
- '{{ OwnershipControls }}',
- '{{ PublicAccessBlockConfiguration }}',
- '{{ ReplicationConfiguration }}',
- '{{ Tags }}',
- '{{ VersioningConfiguration }}',
- '{{ WebsiteConfiguration }}',
+SELECT
+ '{{ accelerate_configuration }}',
+ '{{ access_control }}',
+ '{{ analytics_configurations }}',
+ '{{ bucket_encryption }}',
+ '{{ bucket_name }}',
+ '{{ cors_configuration }}',
+ '{{ intelligent_tiering_configurations }}',
+ '{{ inventory_configurations }}',
+ '{{ lifecycle_configuration }}',
+ '{{ logging_configuration }}',
+ '{{ metrics_configurations }}',
+ '{{ metadata_table_configuration }}',
+ '{{ metadata_configuration }}',
+ '{{ notification_configuration }}',
+ '{{ object_lock_configuration }}',
+ '{{ object_lock_enabled }}',
+ '{{ ownership_controls }}',
+ '{{ public_access_block_configuration }}',
+ '{{ replication_configuration }}',
+ '{{ tags }}',
+ '{{ versioning_configuration }}',
+ '{{ website_configuration }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -1392,248 +1392,247 @@ globals:
 resources:
   - name: bucket
     props:
-      - name: AccelerateConfiguration
+      - name: accelerate_configuration
         value:
-          AccelerationStatus: '{{ AccelerationStatus }}'
-      - name: AccessControl
-        value: '{{ AccessControl }}'
-      - name: AnalyticsConfigurations
+          acceleration_status: '{{ acceleration_status }}'
+      - name: access_control
+        value: '{{ access_control }}'
+      - name: analytics_configurations
         value:
-          - TagFilters:
-              - Value: '{{ Value }}'
-                Key: '{{ Key }}'
-            StorageClassAnalysis:
-              DataExport:
-                S3BucketDestination:
-                  OutputSchemaVersion: '{{ OutputSchemaVersion }}'
-                  Format: '{{ Format }}'
-                  AccountId: '{{ AccountId }}'
-                  Prefix: '{{ Prefix }}'
-                  Encryption: {}
-                  Arn: '{{ Arn }}'
-                CloudWatchMetrics:
-                  IsEnabled: '{{ IsEnabled }}'
-            Id: '{{ Id }}'
-            Prefix: '{{ Prefix }}'
-      - name: BucketEncryption
+          - tag_filters:
+              - value: '{{ value }}'
+                key: '{{ key }}'
+            storage_class_analysis:
+              data_export:
+                s3_bucket_destination:
+                  output_schema_version: '{{ output_schema_version }}'
+                  format: '{{ format }}'
+                  account_id: '{{ account_id }}'
+                  prefix: '{{ prefix }}'
+                  encryption: {}
+                  arn: '{{ arn }}'
+                cloud_watch_metrics:
+                  is_enabled: '{{ is_enabled }}'
+            id: '{{ id }}'
+            prefix: '{{ prefix }}'
+      - name: bucket_encryption
         value:
-          ServerSideEncryptionConfiguration:
-            - BucketKeyEnabled: '{{ BucketKeyEnabled }}'
-              ServerSideEncryptionByDefault:
-                KMSMasterKeyID: '{{ KMSMasterKeyID }}'
-                SSEAlgorithm: '{{ SSEAlgorithm }}'
-      - name: BucketName
-        value: '{{ BucketName }}'
-      - name: CorsConfiguration
+          server_side_encryption_configuration:
+            - bucket_key_enabled: '{{ bucket_key_enabled }}'
+              server_side_encryption_by_default:
+                kms_master_key_id: '{{ kms_master_key_id }}'
+                sse_algorithm: '{{ sse_algorithm }}'
+      - name: bucket_name
+        value: '{{ bucket_name }}'
+      - name: cors_configuration
         value:
-          CorsRules:
-            - AllowedHeaders:
-                - '{{ AllowedHeaders[0] }}'
-              AllowedMethods:
-                - '{{ AllowedMethods[0] }}'
-              AllowedOrigins:
-                - '{{ AllowedOrigins[0] }}'
-              ExposedHeaders:
-                - '{{ ExposedHeaders[0] }}'
-              Id: '{{ Id }}'
-              MaxAge: '{{ MaxAge }}'
-      - name: IntelligentTieringConfigurations
+          cors_rules:
+            - allowed_headers:
+                - '{{ allowed_headers[0] }}'
+              allowed_methods:
+                - '{{ allowed_methods[0] }}'
+              allowed_origins:
+                - '{{ allowed_origins[0] }}'
+              exposed_headers:
+                - '{{ exposed_headers[0] }}'
+              id: '{{ id }}'
+              max_age: '{{ max_age }}'
+      - name: intelligent_tiering_configurations
         value:
-          - Id: '{{ Id }}'
-            Prefix: '{{ Prefix }}'
-            Status: '{{ Status }}'
-            TagFilters:
+          - id: '{{ id }}'
+            prefix: '{{ prefix }}'
+            status: '{{ status }}'
+            tag_filters:
               - null
-            Tierings:
-              - AccessTier: '{{ AccessTier }}'
-                Days: '{{ Days }}'
-      - name: InventoryConfigurations
+            tierings:
+              - access_tier: '{{ access_tier }}'
+                days: '{{ days }}'
+      - name: inventory_configurations
         value:
-          - Destination:
-              BucketArn: '{{ BucketArn }}'
-              BucketAccountId: '{{ BucketAccountId }}'
-              Format: '{{ Format }}'
-              Prefix: '{{ Prefix }}'
-            Enabled: '{{ Enabled }}'
-            Id: '{{ Id }}'
-            IncludedObjectVersions: '{{ IncludedObjectVersions }}'
-            OptionalFields:
-              - '{{ OptionalFields[0] }}'
-            Prefix: '{{ Prefix }}'
-            ScheduleFrequency: '{{ ScheduleFrequency }}'
-      - name: LifecycleConfiguration
+          - destination:
+              bucket_arn: '{{ bucket_arn }}'
+              bucket_account_id: '{{ bucket_account_id }}'
+              format: '{{ format }}'
+              prefix: '{{ prefix }}'
+            enabled: '{{ enabled }}'
+            id: '{{ id }}'
+            included_object_versions: '{{ included_object_versions }}'
+            optional_fields:
+              - '{{ optional_fields[0] }}'
+            prefix: '{{ prefix }}'
+            schedule_frequency: '{{ schedule_frequency }}'
+      - name: lifecycle_configuration
         value:
-          Rules:
-            - AbortIncompleteMultipartUpload:
-                DaysAfterInitiation: '{{ DaysAfterInitiation }}'
-              ExpirationDate: '{{ ExpirationDate }}'
-              ExpirationInDays: '{{ ExpirationInDays }}'
-              ExpiredObjectDeleteMarker: '{{ ExpiredObjectDeleteMarker }}'
-              Id: '{{ Id }}'
-              NoncurrentVersionExpirationInDays: '{{ NoncurrentVersionExpirationInDays }}'
-              NoncurrentVersionExpiration:
-                NoncurrentDays: '{{ NoncurrentDays }}'
-                NewerNoncurrentVersions: '{{ NewerNoncurrentVersions }}'
-              NoncurrentVersionTransition:
-                StorageClass: '{{ StorageClass }}'
-                TransitionInDays: '{{ TransitionInDays }}'
-                NewerNoncurrentVersions: '{{ NewerNoncurrentVersions }}'
-              NoncurrentVersionTransitions:
+          rules:
+            - abort_incomplete_multipart_upload:
+                days_after_initiation: '{{ days_after_initiation }}'
+              expiration_date: '{{ expiration_date }}'
+              expiration_in_days: '{{ expiration_in_days }}'
+              expired_object_delete_marker: '{{ expired_object_delete_marker }}'
+              id: '{{ id }}'
+              noncurrent_version_expiration_in_days: '{{ noncurrent_version_expiration_in_days }}'
+              noncurrent_version_expiration:
+                noncurrent_days: '{{ noncurrent_days }}'
+                newer_noncurrent_versions: '{{ newer_noncurrent_versions }}'
+              noncurrent_version_transition:
+                storage_class: '{{ storage_class }}'
+                transition_in_days: '{{ transition_in_days }}'
+                newer_noncurrent_versions: '{{ newer_noncurrent_versions }}'
+              noncurrent_version_transitions:
                 - null
-              Prefix: '{{ Prefix }}'
-              Status: '{{ Status }}'
-              TagFilters:
+              prefix: '{{ prefix }}'
+              status: '{{ status }}'
+              tag_filters:
                 - null
-              ObjectSizeGreaterThan: '{{ ObjectSizeGreaterThan }}'
-              ObjectSizeLessThan: '{{ ObjectSizeLessThan }}'
-              Transition:
-                StorageClass: '{{ StorageClass }}'
-                TransitionDate: null
-                TransitionInDays: '{{ TransitionInDays }}'
-              Transitions:
+              object_size_greater_than: '{{ object_size_greater_than }}'
+              object_size_less_than: '{{ object_size_less_than }}'
+              transition:
+                storage_class: '{{ storage_class }}'
+                transition_date: null
+                transition_in_days: '{{ transition_in_days }}'
+              transitions:
                 - null
-          TransitionDefaultMinimumObjectSize: '{{ TransitionDefaultMinimumObjectSize }}'
-      - name: LoggingConfiguration
+          transition_default_minimum_object_size: '{{ transition_default_minimum_object_size }}'
+      - name: logging_configuration
         value:
-          DestinationBucketName: '{{ DestinationBucketName }}'
-          LogFilePrefix: '{{ LogFilePrefix }}'
-          TargetObjectKeyFormat: {}
-      - name: MetricsConfigurations
+          destination_bucket_name: '{{ destination_bucket_name }}'
+          log_file_prefix: '{{ log_file_prefix }}'
+          target_object_key_format: {}
+      - name: metrics_configurations
         value:
-          - AccessPointArn: '{{ AccessPointArn }}'
-            Id: '{{ Id }}'
-            Prefix: '{{ Prefix }}'
-            TagFilters:
+          - access_point_arn: '{{ access_point_arn }}'
+            id: '{{ id }}'
+            prefix: '{{ prefix }}'
+            tag_filters:
               - null
-      - name: MetadataTableConfiguration
+      - name: metadata_table_configuration
         value:
-          S3TablesDestination:
-            TableBucketArn: '{{ TableBucketArn }}'
-            TableName: '{{ TableName }}'
-            TableNamespace: '{{ TableNamespace }}'
-            TableArn: '{{ TableArn }}'
-      - name: MetadataConfiguration
+          s3_tables_destination:
+            table_bucket_arn: '{{ table_bucket_arn }}'
+            table_name: '{{ table_name }}'
+            table_namespace: '{{ table_namespace }}'
+            table_arn: '{{ table_arn }}'
+      - name: metadata_configuration
         value:
-          Destination:
-            TableBucketType: '{{ TableBucketType }}'
-            TableBucketArn: '{{ TableBucketArn }}'
-            TableNamespace: '{{ TableNamespace }}'
-          JournalTableConfiguration:
-            TableName: '{{ TableName }}'
-            TableArn: '{{ TableArn }}'
-            RecordExpiration:
-              Expiration: '{{ Expiration }}'
-              Days: '{{ Days }}'
-            EncryptionConfiguration:
-              SseAlgorithm: '{{ SseAlgorithm }}'
-              KmsKeyArn: '{{ KmsKeyArn }}'
-          InventoryTableConfiguration:
-            TableName: '{{ TableName }}'
-            TableArn: '{{ TableArn }}'
-            ConfigurationState: '{{ ConfigurationState }}'
-            EncryptionConfiguration: null
-      - name: NotificationConfiguration
+          destination:
+            table_bucket_type: '{{ table_bucket_type }}'
+            table_bucket_arn: '{{ table_bucket_arn }}'
+            table_namespace: '{{ table_namespace }}'
+          journal_table_configuration:
+            table_name: '{{ table_name }}'
+            table_arn: '{{ table_arn }}'
+            record_expiration:
+              expiration: '{{ expiration }}'
+              days: '{{ days }}'
+            encryption_configuration:
+              sse_algorithm: '{{ sse_algorithm }}'
+              kms_key_arn: '{{ kms_key_arn }}'
+          inventory_table_configuration:
+            table_name: '{{ table_name }}'
+            table_arn: '{{ table_arn }}'
+            configuration_state: '{{ configuration_state }}'
+            encryption_configuration: null
+      - name: notification_configuration
         value:
-          EventBridgeConfiguration:
-            EventBridgeEnabled: '{{ EventBridgeEnabled }}'
-          LambdaConfigurations:
-            - Event: '{{ Event }}'
-              Filter:
-                S3Key:
-                  Rules:
-                    - Name: '{{ Name }}'
-                      Value: '{{ Value }}'
-              Function: '{{ Function }}'
-          QueueConfigurations:
-            - Event: '{{ Event }}'
-              Filter: null
-              Queue: '{{ Queue }}'
-          TopicConfigurations:
-            - Event: '{{ Event }}'
-              Filter: null
-              Topic: '{{ Topic }}'
-      - name: ObjectLockConfiguration
+          event_bridge_configuration:
+            event_bridge_enabled: '{{ event_bridge_enabled }}'
+          lambda_configurations:
+            - event: '{{ event }}'
+              filter:
+                s3_key:
+                  rules:
+                    - name: '{{ name }}'
+                      value: '{{ value }}'
+              function: '{{ function }}'
+          queue_configurations:
+            - event: '{{ event }}'
+              filter: null
+              queue: '{{ queue }}'
+          topic_configurations:
+            - event: '{{ event }}'
+              filter: null
+              topic: '{{ topic }}'
+      - name: object_lock_configuration
         value:
-          ObjectLockEnabled: '{{ ObjectLockEnabled }}'
-          Rule:
-            DefaultRetention:
-              Years: '{{ Years }}'
-              Days: '{{ Days }}'
-              Mode: '{{ Mode }}'
-      - name: ObjectLockEnabled
-        value: '{{ ObjectLockEnabled }}'
-      - name: OwnershipControls
+          object_lock_enabled: '{{ object_lock_enabled }}'
+          rule:
+            default_retention:
+              years: '{{ years }}'
+              days: '{{ days }}'
+              mode: '{{ mode }}'
+      - name: object_lock_enabled
+        value: '{{ object_lock_enabled }}'
+      - name: ownership_controls
         value:
-          Rules:
-            - ObjectOwnership: '{{ ObjectOwnership }}'
-      - name: PublicAccessBlockConfiguration
+          rules:
+            - object_ownership: '{{ object_ownership }}'
+      - name: public_access_block_configuration
         value:
-          RestrictPublicBuckets: '{{ RestrictPublicBuckets }}'
-          BlockPublicPolicy: '{{ BlockPublicPolicy }}'
-          BlockPublicAcls: '{{ BlockPublicAcls }}'
-          IgnorePublicAcls: '{{ IgnorePublicAcls }}'
-      - name: ReplicationConfiguration
+          restrict_public_buckets: '{{ restrict_public_buckets }}'
+          block_public_policy: '{{ block_public_policy }}'
+          block_public_acls: '{{ block_public_acls }}'
+          ignore_public_acls: '{{ ignore_public_acls }}'
+      - name: replication_configuration
         value:
-          Role: '{{ Role }}'
-          Rules:
-            - DeleteMarkerReplication:
-                Status: '{{ Status }}'
-              Destination:
-                AccessControlTranslation:
-                  Owner: '{{ Owner }}'
-                Account: '{{ Account }}'
-                Bucket: '{{ Bucket }}'
-                EncryptionConfiguration:
-                  ReplicaKmsKeyID: '{{ ReplicaKmsKeyID }}'
-                Metrics:
-                  EventThreshold:
-                    Minutes: '{{ Minutes }}'
-                  Status: '{{ Status }}'
-                ReplicationTime:
-                  Status: '{{ Status }}'
-                  Time: null
-                StorageClass: '{{ StorageClass }}'
-              Filter:
-                And:
-                  Prefix: '{{ Prefix }}'
-                  TagFilters:
+          role: '{{ role }}'
+          rules:
+            - delete_marker_replication:
+                status: '{{ status }}'
+              destination:
+                access_control_translation:
+                  owner: '{{ owner }}'
+                account: '{{ account }}'
+                bucket: '{{ bucket }}'
+                encryption_configuration:
+                  replica_kms_key_id: '{{ replica_kms_key_id }}'
+                metrics:
+                  event_threshold:
+                    minutes: '{{ minutes }}'
+                  status: '{{ status }}'
+                replication_time:
+                  status: '{{ status }}'
+                  time: null
+                storage_class: '{{ storage_class }}'
+              filter:
+                and:
+                  prefix: '{{ prefix }}'
+                  tag_filters:
                     - null
-                Prefix: '{{ Prefix }}'
-                TagFilter: null
-              Id: '{{ Id }}'
-              Prefix: '{{ Prefix }}'
-              Priority: '{{ Priority }}'
-              SourceSelectionCriteria:
-                ReplicaModifications:
-                  Status: '{{ Status }}'
-                SseKmsEncryptedObjects:
-                  Status: '{{ Status }}'
-              Status: '{{ Status }}'
-      - name: Tags
+                prefix: '{{ prefix }}'
+                tag_filter: null
+              id: '{{ id }}'
+              prefix: '{{ prefix }}'
+              priority: '{{ priority }}'
+              source_selection_criteria:
+                replica_modifications:
+                  status: '{{ status }}'
+                sse_kms_encrypted_objects:
+                  status: '{{ status }}'
+              status: '{{ status }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-      - name: VersioningConfiguration
+          - key: '{{ key }}'
+            value: '{{ value }}'
+      - name: versioning_configuration
         value:
-          Status: '{{ Status }}'
-      - name: WebsiteConfiguration
+          status: '{{ status }}'
+      - name: website_configuration
         value:
-          ErrorDocument: '{{ ErrorDocument }}'
-          IndexDocument: '{{ IndexDocument }}'
-          RoutingRules:
-            - RedirectRule:
-                HostName: '{{ HostName }}'
-                HttpRedirectCode: '{{ HttpRedirectCode }}'
-                Protocol: '{{ Protocol }}'
-                ReplaceKeyPrefixWith: '{{ ReplaceKeyPrefixWith }}'
-                ReplaceKeyWith: '{{ ReplaceKeyWith }}'
-              RoutingRuleCondition:
-                KeyPrefixEquals: '{{ KeyPrefixEquals }}'
-                HttpErrorCodeReturnedEquals: '{{ HttpErrorCodeReturnedEquals }}'
-          RedirectAllRequestsTo:
-            HostName: '{{ HostName }}'
-            Protocol: '{{ Protocol }}'
-
+          error_document: '{{ error_document }}'
+          index_document: '{{ index_document }}'
+          routing_rules:
+            - redirect_rule:
+                host_name: '{{ host_name }}'
+                http_redirect_code: '{{ http_redirect_code }}'
+                protocol: '{{ protocol }}'
+                replace_key_prefix_with: '{{ replace_key_prefix_with }}'
+                replace_key_with: '{{ replace_key_with }}'
+              routing_rule_condition:
+                key_prefix_equals: '{{ key_prefix_equals }}'
+                http_error_code_returned_equals: '{{ http_error_code_returned_equals }}'
+          redirect_all_requests_to:
+            host_name: '{{ host_name }}'
+            protocol: '{{ protocol }}'
 ```
 </TabItem>
 </Tabs>
@@ -1667,7 +1666,7 @@ SET PatchDocument = string('{{ {
     "WebsiteConfiguration": website_configuration
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<BucketName>';
+AND Identifier = '{{ bucket_name }}';
 ```
 
 
@@ -1676,7 +1675,7 @@ AND Identifier = '<BucketName>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.s3.buckets
-WHERE Identifier = '<BucketName>'
+WHERE Identifier = '{{ bucket_name }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/s3/multi_region_access_point_policies/index.md b/website/docs/services/s3/multi_region_access_point_policies/index.md
index f5490768b..70020da86 100644
--- a/website/docs/services/s3/multi_region_access_point_policies/index.md
+++ b/website/docs/services/s3/multi_region_access_point_policies/index.md
@@ -112,7 +112,7 @@ mrap_name,
 policy,
 policy_status
 FROM awscc.s3.multi_region_access_point_policies
-WHERE region = 'us-east-1' AND Identifier = '<MrapName>';
+WHERE region = 'us-east-1' AND Identifier = '{{ mrap_name }}';
 ```
 
 ## `INSERT` example
@@ -136,9 +136,9 @@ INSERT INTO awscc.s3.multi_region_access_point_policies (
  Policy,
  region
 )
-SELECT 
-'{{ MrapName }}',
- '{{ Policy }}',
+SELECT
+'{{ mrap_name }}',
+ '{{ policy }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -151,9 +151,9 @@ INSERT INTO awscc.s3.multi_region_access_point_policies (
  Policy,
  region
 )
-SELECT 
- '{{ MrapName }}',
- '{{ Policy }}',
+SELECT
+ '{{ mrap_name }}',
+ '{{ policy }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -171,11 +171,10 @@ globals:
 resources:
   - name: multi_region_access_point_policy
     props:
-      - name: MrapName
-        value: '{{ MrapName }}'
-      - name: Policy
+      - name: mrap_name
+        value: '{{ mrap_name }}'
+      - name: policy
         value: {}
-
 ```
 </TabItem>
 </Tabs>
@@ -191,7 +190,7 @@ SET PatchDocument = string('{{ {
     "Policy": policy
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<MrapName>';
+AND Identifier = '{{ mrap_name }}';
 ```
 
 
@@ -200,7 +199,7 @@ AND Identifier = '<MrapName>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.s3.multi_region_access_point_policies
-WHERE Identifier = '<MrapName>'
+WHERE Identifier = '{{ mrap_name }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/s3/multi_region_access_points/index.md b/website/docs/services/s3/multi_region_access_points/index.md
index b6ce35a26..5011cb7a9 100644
--- a/website/docs/services/s3/multi_region_access_points/index.md
+++ b/website/docs/services/s3/multi_region_access_points/index.md
@@ -186,7 +186,7 @@ created_at,
 regions,
 name
 FROM awscc.s3.multi_region_access_points
-WHERE region = 'us-east-1' AND Identifier = '<Name>';
+WHERE region = 'us-east-1' AND Identifier = '{{ name }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -222,8 +222,8 @@ INSERT INTO awscc.s3.multi_region_access_points (
  Regions,
  region
 )
-SELECT 
-'{{ Regions }}',
+SELECT
+'{{ regions }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -237,10 +237,10 @@ INSERT INTO awscc.s3.multi_region_access_points (
  Name,
  region
 )
-SELECT 
- '{{ PublicAccessBlockConfiguration }}',
- '{{ Regions }}',
- '{{ Name }}',
+SELECT
+ '{{ public_access_block_configuration }}',
+ '{{ regions }}',
+ '{{ name }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -258,19 +258,18 @@ globals:
 resources:
   - name: multi_region_access_point
     props:
-      - name: PublicAccessBlockConfiguration
+      - name: public_access_block_configuration
         value:
-          RestrictPublicBuckets: '{{ RestrictPublicBuckets }}'
-          BlockPublicPolicy: '{{ BlockPublicPolicy }}'
-          BlockPublicAcls: '{{ BlockPublicAcls }}'
-          IgnorePublicAcls: '{{ IgnorePublicAcls }}'
-      - name: Regions
+          restrict_public_buckets: '{{ restrict_public_buckets }}'
+          block_public_policy: '{{ block_public_policy }}'
+          block_public_acls: '{{ block_public_acls }}'
+          ignore_public_acls: '{{ ignore_public_acls }}'
+      - name: regions
         value:
-          - Bucket: '{{ Bucket }}'
-            BucketAccountId: '{{ BucketAccountId }}'
-      - name: Name
-        value: '{{ Name }}'
-
+          - bucket: '{{ bucket }}'
+            bucket_account_id: '{{ bucket_account_id }}'
+      - name: name
+        value: '{{ name }}'
 ```
 </TabItem>
 </Tabs>
@@ -281,7 +280,7 @@ resources:
 ```sql
 /*+ delete */
 DELETE FROM awscc.s3.multi_region_access_points
-WHERE Identifier = '<Name>'
+WHERE Identifier = '{{ name }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/s3/storage_lens/index.md b/website/docs/services/s3/storage_lens/index.md
index c3973ed97..f003dbcef 100644
--- a/website/docs/services/s3/storage_lens/index.md
+++ b/website/docs/services/s3/storage_lens/index.md
@@ -534,7 +534,7 @@ region,
 storage_lens_configuration,
 tags
 FROM awscc.s3.storage_lens
-WHERE region = 'us-east-1' AND Identifier = '<StorageLensConfiguration/Id>';
+WHERE region = 'us-east-1' AND Identifier = '{{ storage_lens_configuration/id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -570,8 +570,8 @@ INSERT INTO awscc.s3.storage_lens (
  StorageLensConfiguration,
  region
 )
-SELECT 
-'{{ StorageLensConfiguration }}',
+SELECT
+'{{ storage_lens_configuration }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -584,9 +584,9 @@ INSERT INTO awscc.s3.storage_lens (
  Tags,
  region
 )
-SELECT 
- '{{ StorageLensConfiguration }}',
- '{{ Tags }}',
+SELECT
+ '{{ storage_lens_configuration }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -604,61 +604,60 @@ globals:
 resources:
   - name: storage_len
     props:
-      - name: StorageLensConfiguration
+      - name: storage_lens_configuration
         value:
-          AccountLevel:
-            AdvancedDataProtectionMetrics:
-              IsEnabled: '{{ IsEnabled }}'
-            StorageLensGroupLevel:
-              StorageLensGroupSelectionCriteria:
-                Exclude:
-                  - '{{ Exclude[0] }}'
-                Include:
+          account_level:
+            advanced_data_protection_metrics:
+              is_enabled: '{{ is_enabled }}'
+            storage_lens_group_level:
+              storage_lens_group_selection_criteria:
+                exclude:
+                  - '{{ exclude[0] }}'
+                include:
                   - null
-            ActivityMetrics:
-              IsEnabled: '{{ IsEnabled }}'
-            BucketLevel:
-              AdvancedDataProtectionMetrics: null
-              PrefixLevel:
-                StorageMetrics:
-                  IsEnabled: '{{ IsEnabled }}'
-                  SelectionCriteria:
-                    Delimiter: '{{ Delimiter }}'
-                    MaxDepth: '{{ MaxDepth }}'
-                    MinStorageBytesPercentage: null
-              ActivityMetrics: null
-              AdvancedCostOptimizationMetrics:
-                IsEnabled: '{{ IsEnabled }}'
-              DetailedStatusCodesMetrics:
-                IsEnabled: '{{ IsEnabled }}'
-            AdvancedCostOptimizationMetrics: null
-            DetailedStatusCodesMetrics: null
-          Exclude:
-            Regions:
-              - '{{ Regions[0] }}'
-            Buckets:
-              - '{{ Buckets[0] }}'
-          IsEnabled: '{{ IsEnabled }}'
-          Include: null
-          AwsOrg:
-            Arn: null
-          Id: '{{ Id }}'
-          StorageLensArn: '{{ StorageLensArn }}'
-          DataExport:
-            S3BucketDestination:
-              OutputSchemaVersion: '{{ OutputSchemaVersion }}'
-              Format: '{{ Format }}'
-              AccountId: '{{ AccountId }}'
-              Prefix: '{{ Prefix }}'
-              Encryption: {}
-              Arn: '{{ Arn }}'
-            CloudWatchMetrics:
-              IsEnabled: '{{ IsEnabled }}'
-      - name: Tags
+            activity_metrics:
+              is_enabled: '{{ is_enabled }}'
+            bucket_level:
+              advanced_data_protection_metrics: null
+              prefix_level:
+                storage_metrics:
+                  is_enabled: '{{ is_enabled }}'
+                  selection_criteria:
+                    delimiter: '{{ delimiter }}'
+                    max_depth: '{{ max_depth }}'
+                    min_storage_bytes_percentage: null
+              activity_metrics: null
+              advanced_cost_optimization_metrics:
+                is_enabled: '{{ is_enabled }}'
+              detailed_status_codes_metrics:
+                is_enabled: '{{ is_enabled }}'
+            advanced_cost_optimization_metrics: null
+            detailed_status_codes_metrics: null
+          exclude:
+            regions:
+              - '{{ regions[0] }}'
+            buckets:
+              - '{{ buckets[0] }}'
+          is_enabled: '{{ is_enabled }}'
+          include: null
+          aws_org:
+            arn: null
+          id: '{{ id }}'
+          storage_lens_arn: '{{ storage_lens_arn }}'
+          data_export:
+            s3_bucket_destination:
+              output_schema_version: '{{ output_schema_version }}'
+              format: '{{ format }}'
+              account_id: '{{ account_id }}'
+              prefix: '{{ prefix }}'
+              encryption: {}
+              arn: '{{ arn }}'
+            cloud_watch_metrics:
+              is_enabled: '{{ is_enabled }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -674,7 +673,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<StorageLensConfiguration/Id>';
+AND Identifier = '{{ storage_lens_configuration/id }}';
 ```
 
 
@@ -683,7 +682,7 @@ AND Identifier = '<StorageLensConfiguration/Id>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.s3.storage_lens
-WHERE Identifier = '<StorageLensConfiguration/Id>'
+WHERE Identifier = '{{ storage_lens_configuration/id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/s3/storage_lens_groups/index.md b/website/docs/services/s3/storage_lens_groups/index.md
index 9e8996e19..079c427d4 100644
--- a/website/docs/services/s3/storage_lens_groups/index.md
+++ b/website/docs/services/s3/storage_lens_groups/index.md
@@ -237,7 +237,7 @@ filter,
 storage_lens_group_arn,
 tags
 FROM awscc.s3.storage_lens_groups
-WHERE region = 'us-east-1' AND Identifier = '<Name>';
+WHERE region = 'us-east-1' AND Identifier = '{{ name }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -274,9 +274,9 @@ INSERT INTO awscc.s3.storage_lens_groups (
  Filter,
  region
 )
-SELECT 
-'{{ Name }}',
- '{{ Filter }}',
+SELECT
+'{{ name }}',
+ '{{ filter }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -290,10 +290,10 @@ INSERT INTO awscc.s3.storage_lens_groups (
  Tags,
  region
 )
-SELECT 
- '{{ Name }}',
- '{{ Filter }}',
- '{{ Tags }}',
+SELECT
+ '{{ name }}',
+ '{{ filter }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -311,39 +311,38 @@ globals:
 resources:
   - name: storage_lens_group
     props:
-      - name: Name
-        value: '{{ Name }}'
-      - name: Filter
+      - name: name
+        value: '{{ name }}'
+      - name: filter
         value:
-          MatchAnyPrefix:
-            - '{{ MatchAnyPrefix[0] }}'
-          MatchAnySuffix:
-            - '{{ MatchAnySuffix[0] }}'
-          MatchAnyTag:
-            - Key: '{{ Key }}'
-              Value: '{{ Value }}'
-          MatchObjectSize:
-            BytesGreaterThan: '{{ BytesGreaterThan }}'
-            BytesLessThan: '{{ BytesLessThan }}'
-          MatchObjectAge:
-            DaysGreaterThan: '{{ DaysGreaterThan }}'
-            DaysLessThan: '{{ DaysLessThan }}'
-          And:
-            MatchAnyPrefix: null
-            MatchAnySuffix: null
-            MatchAnyTag: null
-            MatchObjectSize: null
-            MatchObjectAge: null
-          Or:
-            MatchAnyPrefix: null
-            MatchAnySuffix: null
-            MatchAnyTag: null
-            MatchObjectSize: null
-            MatchObjectAge: null
-      - name: Tags
+          match_any_prefix:
+            - '{{ match_any_prefix[0] }}'
+          match_any_suffix:
+            - '{{ match_any_suffix[0] }}'
+          match_any_tag:
+            - key: '{{ key }}'
+              value: '{{ value }}'
+          match_object_size:
+            bytes_greater_than: '{{ bytes_greater_than }}'
+            bytes_less_than: '{{ bytes_less_than }}'
+          match_object_age:
+            days_greater_than: '{{ days_greater_than }}'
+            days_less_than: '{{ days_less_than }}'
+          and:
+            match_any_prefix: null
+            match_any_suffix: null
+            match_any_tag: null
+            match_object_size: null
+            match_object_age: null
+          or:
+            match_any_prefix: null
+            match_any_suffix: null
+            match_any_tag: null
+            match_object_size: null
+            match_object_age: null
+      - name: tags
         value:
           - null
-
 ```
 </TabItem>
 </Tabs>
@@ -360,7 +359,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Name>';
+AND Identifier = '{{ name }}';
 ```
 
 
@@ -369,7 +368,7 @@ AND Identifier = '<Name>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.s3.storage_lens_groups
-WHERE Identifier = '<Name>'
+WHERE Identifier = '{{ name }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/s3express/access_points/index.md b/website/docs/services/s3express/access_points/index.md
index ef816b232..27e63947a 100644
--- a/website/docs/services/s3express/access_points/index.md
+++ b/website/docs/services/s3express/access_points/index.md
@@ -241,7 +241,7 @@ network_origin,
 arn,
 tags
 FROM awscc.s3express.access_points
-WHERE region = 'us-east-1' AND Identifier = '<Name>';
+WHERE region = 'us-east-1' AND Identifier = '{{ name }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -277,8 +277,8 @@ INSERT INTO awscc.s3express.access_points (
  Bucket,
  region
 )
-SELECT 
-'{{ Bucket }}',
+SELECT
+'{{ bucket }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -297,15 +297,15 @@ INSERT INTO awscc.s3express.access_points (
  Tags,
  region
 )
-SELECT 
- '{{ Name }}',
- '{{ Bucket }}',
- '{{ BucketAccountId }}',
- '{{ VpcConfiguration }}',
- '{{ PublicAccessBlockConfiguration }}',
- '{{ Scope }}',
- '{{ Policy }}',
- '{{ Tags }}',
+SELECT
+ '{{ name }}',
+ '{{ bucket }}',
+ '{{ bucket_account_id }}',
+ '{{ vpc_configuration }}',
+ '{{ public_access_block_configuration }}',
+ '{{ scope }}',
+ '{{ policy }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -323,34 +323,33 @@ globals:
 resources:
   - name: access_point
     props:
-      - name: Name
-        value: '{{ Name }}'
-      - name: Bucket
-        value: '{{ Bucket }}'
-      - name: BucketAccountId
-        value: '{{ BucketAccountId }}'
-      - name: VpcConfiguration
+      - name: name
+        value: '{{ name }}'
+      - name: bucket
+        value: '{{ bucket }}'
+      - name: bucket_account_id
+        value: '{{ bucket_account_id }}'
+      - name: vpc_configuration
         value:
-          VpcId: '{{ VpcId }}'
-      - name: PublicAccessBlockConfiguration
+          vpc_id: '{{ vpc_id }}'
+      - name: public_access_block_configuration
         value:
-          BlockPublicAcls: '{{ BlockPublicAcls }}'
-          IgnorePublicAcls: '{{ IgnorePublicAcls }}'
-          BlockPublicPolicy: '{{ BlockPublicPolicy }}'
-          RestrictPublicBuckets: '{{ RestrictPublicBuckets }}'
-      - name: Scope
+          block_public_acls: '{{ block_public_acls }}'
+          ignore_public_acls: '{{ ignore_public_acls }}'
+          block_public_policy: '{{ block_public_policy }}'
+          restrict_public_buckets: '{{ restrict_public_buckets }}'
+      - name: scope
         value:
-          Prefixes:
-            - '{{ Prefixes[0] }}'
-          Permissions:
-            - '{{ Permissions[0] }}'
-      - name: Policy
+          prefixes:
+            - '{{ prefixes[0] }}'
+          permissions:
+            - '{{ permissions[0] }}'
+      - name: policy
         value: {}
-      - name: Tags
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -369,7 +368,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Name>';
+AND Identifier = '{{ name }}';
 ```
 
 
@@ -378,7 +377,7 @@ AND Identifier = '<Name>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.s3express.access_points
-WHERE Identifier = '<Name>'
+WHERE Identifier = '{{ name }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/s3express/bucket_policies/index.md b/website/docs/services/s3express/bucket_policies/index.md
index b492d4973..a2872e42b 100644
--- a/website/docs/services/s3express/bucket_policies/index.md
+++ b/website/docs/services/s3express/bucket_policies/index.md
@@ -140,7 +140,7 @@ region,
 bucket,
 policy_document
 FROM awscc.s3express.bucket_policies
-WHERE region = 'us-east-1' AND Identifier = '<Bucket>';
+WHERE region = 'us-east-1' AND Identifier = '{{ bucket }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -177,9 +177,9 @@ INSERT INTO awscc.s3express.bucket_policies (
  PolicyDocument,
  region
 )
-SELECT 
-'{{ Bucket }}',
- '{{ PolicyDocument }}',
+SELECT
+'{{ bucket }}',
+ '{{ policy_document }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -192,9 +192,9 @@ INSERT INTO awscc.s3express.bucket_policies (
  PolicyDocument,
  region
 )
-SELECT 
- '{{ Bucket }}',
- '{{ PolicyDocument }}',
+SELECT
+ '{{ bucket }}',
+ '{{ policy_document }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -212,11 +212,10 @@ globals:
 resources:
   - name: bucket_policy
     props:
-      - name: Bucket
-        value: '{{ Bucket }}'
-      - name: PolicyDocument
+      - name: bucket
+        value: '{{ bucket }}'
+      - name: policy_document
         value: {}
-
 ```
 </TabItem>
 </Tabs>
@@ -232,7 +231,7 @@ SET PatchDocument = string('{{ {
     "PolicyDocument": policy_document
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Bucket>';
+AND Identifier = '{{ bucket }}';
 ```
 
 
@@ -241,7 +240,7 @@ AND Identifier = '<Bucket>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.s3express.bucket_policies
-WHERE Identifier = '<Bucket>'
+WHERE Identifier = '{{ bucket }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/s3express/directory_buckets/index.md b/website/docs/services/s3express/directory_buckets/index.md
index 747741ce5..a7edef309 100644
--- a/website/docs/services/s3express/directory_buckets/index.md
+++ b/website/docs/services/s3express/directory_buckets/index.md
@@ -270,7 +270,7 @@ bucket_encryption,
 lifecycle_configuration,
 tags
 FROM awscc.s3express.directory_buckets
-WHERE region = 'us-east-1' AND Identifier = '<BucketName>';
+WHERE region = 'us-east-1' AND Identifier = '{{ bucket_name }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -307,9 +307,9 @@ INSERT INTO awscc.s3express.directory_buckets (
  DataRedundancy,
  region
 )
-SELECT 
-'{{ LocationName }}',
- '{{ DataRedundancy }}',
+SELECT
+'{{ location_name }}',
+ '{{ data_redundancy }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -326,13 +326,13 @@ INSERT INTO awscc.s3express.directory_buckets (
  Tags,
  region
 )
-SELECT 
- '{{ BucketName }}',
- '{{ LocationName }}',
- '{{ DataRedundancy }}',
- '{{ BucketEncryption }}',
- '{{ LifecycleConfiguration }}',
- '{{ Tags }}',
+SELECT
+ '{{ bucket_name }}',
+ '{{ location_name }}',
+ '{{ data_redundancy }}',
+ '{{ bucket_encryption }}',
+ '{{ lifecycle_configuration }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -350,35 +350,34 @@ globals:
 resources:
   - name: directory_bucket
     props:
-      - name: BucketName
-        value: '{{ BucketName }}'
-      - name: LocationName
-        value: '{{ LocationName }}'
-      - name: DataRedundancy
-        value: '{{ DataRedundancy }}'
-      - name: BucketEncryption
+      - name: bucket_name
+        value: '{{ bucket_name }}'
+      - name: location_name
+        value: '{{ location_name }}'
+      - name: data_redundancy
+        value: '{{ data_redundancy }}'
+      - name: bucket_encryption
         value:
-          ServerSideEncryptionConfiguration:
-            - BucketKeyEnabled: '{{ BucketKeyEnabled }}'
-              ServerSideEncryptionByDefault:
-                KMSMasterKeyID: '{{ KMSMasterKeyID }}'
-                SSEAlgorithm: '{{ SSEAlgorithm }}'
-      - name: LifecycleConfiguration
+          server_side_encryption_configuration:
+            - bucket_key_enabled: '{{ bucket_key_enabled }}'
+              server_side_encryption_by_default:
+                kms_master_key_id: '{{ kms_master_key_id }}'
+                sse_algorithm: '{{ sse_algorithm }}'
+      - name: lifecycle_configuration
         value:
-          Rules:
-            - AbortIncompleteMultipartUpload:
-                DaysAfterInitiation: '{{ DaysAfterInitiation }}'
-              ExpirationInDays: '{{ ExpirationInDays }}'
-              Id: '{{ Id }}'
-              Prefix: '{{ Prefix }}'
-              Status: '{{ Status }}'
-              ObjectSizeGreaterThan: '{{ ObjectSizeGreaterThan }}'
-              ObjectSizeLessThan: '{{ ObjectSizeLessThan }}'
-      - name: Tags
+          rules:
+            - abort_incomplete_multipart_upload:
+                days_after_initiation: '{{ days_after_initiation }}'
+              expiration_in_days: '{{ expiration_in_days }}'
+              id: '{{ id }}'
+              prefix: '{{ prefix }}'
+              status: '{{ status }}'
+              object_size_greater_than: '{{ object_size_greater_than }}'
+              object_size_less_than: '{{ object_size_less_than }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -396,7 +395,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<BucketName>';
+AND Identifier = '{{ bucket_name }}';
 ```
 
 
@@ -405,7 +404,7 @@ AND Identifier = '<BucketName>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.s3express.directory_buckets
-WHERE Identifier = '<BucketName>'
+WHERE Identifier = '{{ bucket_name }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/s3objectlambda/access_point_policies/index.md b/website/docs/services/s3objectlambda/access_point_policies/index.md
index 923d24084..59e945e50 100644
--- a/website/docs/services/s3objectlambda/access_point_policies/index.md
+++ b/website/docs/services/s3objectlambda/access_point_policies/index.md
@@ -94,7 +94,7 @@ region,
 object_lambda_access_point,
 policy_document
 FROM awscc.s3objectlambda.access_point_policies
-WHERE region = 'us-east-1' AND Identifier = '<ObjectLambdaAccessPoint>';
+WHERE region = 'us-east-1' AND Identifier = '{{ object_lambda_access_point }}';
 ```
 
 ## `INSERT` example
@@ -118,9 +118,9 @@ INSERT INTO awscc.s3objectlambda.access_point_policies (
  PolicyDocument,
  region
 )
-SELECT 
-'{{ ObjectLambdaAccessPoint }}',
- '{{ PolicyDocument }}',
+SELECT
+'{{ object_lambda_access_point }}',
+ '{{ policy_document }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -133,9 +133,9 @@ INSERT INTO awscc.s3objectlambda.access_point_policies (
  PolicyDocument,
  region
 )
-SELECT 
- '{{ ObjectLambdaAccessPoint }}',
- '{{ PolicyDocument }}',
+SELECT
+ '{{ object_lambda_access_point }}',
+ '{{ policy_document }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -153,11 +153,10 @@ globals:
 resources:
   - name: access_point_policy
     props:
-      - name: ObjectLambdaAccessPoint
-        value: '{{ ObjectLambdaAccessPoint }}'
-      - name: PolicyDocument
+      - name: object_lambda_access_point
+        value: '{{ object_lambda_access_point }}'
+      - name: policy_document
         value: {}
-
 ```
 </TabItem>
 </Tabs>
@@ -173,7 +172,7 @@ SET PatchDocument = string('{{ {
     "PolicyDocument": policy_document
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<ObjectLambdaAccessPoint>';
+AND Identifier = '{{ object_lambda_access_point }}';
 ```
 
 
@@ -182,7 +181,7 @@ AND Identifier = '<ObjectLambdaAccessPoint>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.s3objectlambda.access_point_policies
-WHERE Identifier = '<ObjectLambdaAccessPoint>'
+WHERE Identifier = '{{ object_lambda_access_point }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/s3objectlambda/access_points/index.md b/website/docs/services/s3objectlambda/access_points/index.md
index e8f5ce1d1..b11fdbe56 100644
--- a/website/docs/services/s3objectlambda/access_points/index.md
+++ b/website/docs/services/s3objectlambda/access_points/index.md
@@ -245,7 +245,7 @@ public_access_block_configuration,
 policy_status,
 object_lambda_configuration
 FROM awscc.s3objectlambda.access_points
-WHERE region = 'us-east-1' AND Identifier = '<Name>';
+WHERE region = 'us-east-1' AND Identifier = '{{ name }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -281,8 +281,8 @@ INSERT INTO awscc.s3objectlambda.access_points (
  ObjectLambdaConfiguration,
  region
 )
-SELECT 
-'{{ ObjectLambdaConfiguration }}',
+SELECT
+'{{ object_lambda_configuration }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -295,9 +295,9 @@ INSERT INTO awscc.s3objectlambda.access_points (
  ObjectLambdaConfiguration,
  region
 )
-SELECT 
- '{{ Name }}',
- '{{ ObjectLambdaConfiguration }}',
+SELECT
+ '{{ name }}',
+ '{{ object_lambda_configuration }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -315,19 +315,18 @@ globals:
 resources:
   - name: access_point
     props:
-      - name: Name
-        value: '{{ Name }}'
-      - name: ObjectLambdaConfiguration
+      - name: name
+        value: '{{ name }}'
+      - name: object_lambda_configuration
         value:
-          SupportingAccessPoint: '{{ SupportingAccessPoint }}'
-          AllowedFeatures:
-            - '{{ AllowedFeatures[0] }}'
-          CloudWatchMetricsEnabled: '{{ CloudWatchMetricsEnabled }}'
-          TransformationConfigurations:
-            - Actions:
-                - '{{ Actions[0] }}'
-              ContentTransformation: {}
-
+          supporting_access_point: '{{ supporting_access_point }}'
+          allowed_features:
+            - '{{ allowed_features[0] }}'
+          cloud_watch_metrics_enabled: '{{ cloud_watch_metrics_enabled }}'
+          transformation_configurations:
+            - actions:
+                - '{{ actions[0] }}'
+              content_transformation: {}
 ```
 </TabItem>
 </Tabs>
@@ -343,7 +342,7 @@ SET PatchDocument = string('{{ {
     "ObjectLambdaConfiguration": object_lambda_configuration
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Name>';
+AND Identifier = '{{ name }}';
 ```
 
 
@@ -352,7 +351,7 @@ AND Identifier = '<Name>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.s3objectlambda.access_points
-WHERE Identifier = '<Name>'
+WHERE Identifier = '{{ name }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/s3outposts/access_points/index.md b/website/docs/services/s3outposts/access_points/index.md
index 9c1369ad3..e800ab7ad 100644
--- a/website/docs/services/s3outposts/access_points/index.md
+++ b/website/docs/services/s3outposts/access_points/index.md
@@ -165,7 +165,7 @@ name,
 vpc_configuration,
 policy
 FROM awscc.s3outposts.access_points
-WHERE region = 'us-east-1' AND Identifier = '<Arn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -203,10 +203,10 @@ INSERT INTO awscc.s3outposts.access_points (
  VpcConfiguration,
  region
 )
-SELECT 
-'{{ Bucket }}',
- '{{ Name }}',
- '{{ VpcConfiguration }}',
+SELECT
+'{{ bucket }}',
+ '{{ name }}',
+ '{{ vpc_configuration }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -221,11 +221,11 @@ INSERT INTO awscc.s3outposts.access_points (
  Policy,
  region
 )
-SELECT 
- '{{ Bucket }}',
- '{{ Name }}',
- '{{ VpcConfiguration }}',
- '{{ Policy }}',
+SELECT
+ '{{ bucket }}',
+ '{{ name }}',
+ '{{ vpc_configuration }}',
+ '{{ policy }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -243,16 +243,15 @@ globals:
 resources:
   - name: access_point
     props:
-      - name: Bucket
-        value: '{{ Bucket }}'
-      - name: Name
-        value: '{{ Name }}'
-      - name: VpcConfiguration
+      - name: bucket
+        value: '{{ bucket }}'
+      - name: name
+        value: '{{ name }}'
+      - name: vpc_configuration
         value:
-          VpcId: '{{ VpcId }}'
-      - name: Policy
+          vpc_id: '{{ vpc_id }}'
+      - name: policy
         value: {}
-
 ```
 </TabItem>
 </Tabs>
@@ -268,7 +267,7 @@ SET PatchDocument = string('{{ {
     "Policy": policy
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Arn>';
+AND Identifier = '{{ arn }}';
 ```
 
 
@@ -277,7 +276,7 @@ AND Identifier = '<Arn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.s3outposts.access_points
-WHERE Identifier = '<Arn>'
+WHERE Identifier = '{{ arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/s3outposts/bucket_policies/index.md b/website/docs/services/s3outposts/bucket_policies/index.md
index 94fc83ed9..955e616f1 100644
--- a/website/docs/services/s3outposts/bucket_policies/index.md
+++ b/website/docs/services/s3outposts/bucket_policies/index.md
@@ -94,7 +94,7 @@ region,
 bucket,
 policy_document
 FROM awscc.s3outposts.bucket_policies
-WHERE region = 'us-east-1' AND Identifier = '<Bucket>';
+WHERE region = 'us-east-1' AND Identifier = '{{ bucket }}';
 ```
 
 ## `INSERT` example
@@ -118,9 +118,9 @@ INSERT INTO awscc.s3outposts.bucket_policies (
  PolicyDocument,
  region
 )
-SELECT 
-'{{ Bucket }}',
- '{{ PolicyDocument }}',
+SELECT
+'{{ bucket }}',
+ '{{ policy_document }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -133,9 +133,9 @@ INSERT INTO awscc.s3outposts.bucket_policies (
  PolicyDocument,
  region
 )
-SELECT 
- '{{ Bucket }}',
- '{{ PolicyDocument }}',
+SELECT
+ '{{ bucket }}',
+ '{{ policy_document }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -153,11 +153,10 @@ globals:
 resources:
   - name: bucket_policy
     props:
-      - name: Bucket
-        value: '{{ Bucket }}'
-      - name: PolicyDocument
+      - name: bucket
+        value: '{{ bucket }}'
+      - name: policy_document
         value: {}
-
 ```
 </TabItem>
 </Tabs>
@@ -173,7 +172,7 @@ SET PatchDocument = string('{{ {
     "PolicyDocument": policy_document
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Bucket>';
+AND Identifier = '{{ bucket }}';
 ```
 
 
@@ -182,7 +181,7 @@ AND Identifier = '<Bucket>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.s3outposts.bucket_policies
-WHERE Identifier = '<Bucket>'
+WHERE Identifier = '{{ bucket }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/s3outposts/buckets/index.md b/website/docs/services/s3outposts/buckets/index.md
index 2f40e7145..9a511340d 100644
--- a/website/docs/services/s3outposts/buckets/index.md
+++ b/website/docs/services/s3outposts/buckets/index.md
@@ -233,7 +233,7 @@ outpost_id,
 tags,
 lifecycle_configuration
 FROM awscc.s3outposts.buckets
-WHERE region = 'us-east-1' AND Identifier = '<Arn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -270,9 +270,9 @@ INSERT INTO awscc.s3outposts.buckets (
  OutpostId,
  region
 )
-SELECT 
-'{{ BucketName }}',
- '{{ OutpostId }}',
+SELECT
+'{{ bucket_name }}',
+ '{{ outpost_id }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -287,11 +287,11 @@ INSERT INTO awscc.s3outposts.buckets (
  LifecycleConfiguration,
  region
 )
-SELECT 
- '{{ BucketName }}',
- '{{ OutpostId }}',
- '{{ Tags }}',
- '{{ LifecycleConfiguration }}',
+SELECT
+ '{{ bucket_name }}',
+ '{{ outpost_id }}',
+ '{{ tags }}',
+ '{{ lifecycle_configuration }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -309,30 +309,29 @@ globals:
 resources:
   - name: bucket
     props:
-      - name: BucketName
-        value: '{{ BucketName }}'
-      - name: OutpostId
-        value: '{{ OutpostId }}'
-      - name: Tags
+      - name: bucket_name
+        value: '{{ bucket_name }}'
+      - name: outpost_id
+        value: '{{ outpost_id }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-      - name: LifecycleConfiguration
+          - key: '{{ key }}'
+            value: '{{ value }}'
+      - name: lifecycle_configuration
         value:
-          Rules:
-            - Status: '{{ Status }}'
-              Id: '{{ Id }}'
-              AbortIncompleteMultipartUpload:
-                DaysAfterInitiation: '{{ DaysAfterInitiation }}'
-              ExpirationDate: '{{ ExpirationDate }}'
-              ExpirationInDays: '{{ ExpirationInDays }}'
-              Filter:
-                Prefix: '{{ Prefix }}'
-                Tag:
-                  Key: '{{ Key }}'
-                  Value: '{{ Value }}'
-                AndOperator: null
-
+          rules:
+            - status: '{{ status }}'
+              id: '{{ id }}'
+              abort_incomplete_multipart_upload:
+                days_after_initiation: '{{ days_after_initiation }}'
+              expiration_date: '{{ expiration_date }}'
+              expiration_in_days: '{{ expiration_in_days }}'
+              filter:
+                prefix: '{{ prefix }}'
+                tag:
+                  key: '{{ key }}'
+                  value: '{{ value }}'
+                and_operator: null
 ```
 </TabItem>
 </Tabs>
@@ -349,7 +348,7 @@ SET PatchDocument = string('{{ {
     "LifecycleConfiguration": lifecycle_configuration
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Arn>';
+AND Identifier = '{{ arn }}';
 ```
 
 
@@ -358,7 +357,7 @@ AND Identifier = '<Arn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.s3outposts.buckets
-WHERE Identifier = '<Arn>'
+WHERE Identifier = '{{ arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/s3outposts/endpoints/index.md b/website/docs/services/s3outposts/endpoints/index.md
index c474e3700..d7006d4db 100644
--- a/website/docs/services/s3outposts/endpoints/index.md
+++ b/website/docs/services/s3outposts/endpoints/index.md
@@ -213,7 +213,7 @@ access_type,
 customer_owned_ipv4_pool,
 failed_reason
 FROM awscc.s3outposts.endpoints
-WHERE region = 'us-east-1' AND Identifier = '<Arn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -251,10 +251,10 @@ INSERT INTO awscc.s3outposts.endpoints (
  SubnetId,
  region
 )
-SELECT 
-'{{ OutpostId }}',
- '{{ SecurityGroupId }}',
- '{{ SubnetId }}',
+SELECT
+'{{ outpost_id }}',
+ '{{ security_group_id }}',
+ '{{ subnet_id }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -271,13 +271,13 @@ INSERT INTO awscc.s3outposts.endpoints (
  FailedReason,
  region
 )
-SELECT 
- '{{ OutpostId }}',
- '{{ SecurityGroupId }}',
- '{{ SubnetId }}',
- '{{ AccessType }}',
- '{{ CustomerOwnedIpv4Pool }}',
- '{{ FailedReason }}',
+SELECT
+ '{{ outpost_id }}',
+ '{{ security_group_id }}',
+ '{{ subnet_id }}',
+ '{{ access_type }}',
+ '{{ customer_owned_ipv4_pool }}',
+ '{{ failed_reason }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -295,21 +295,20 @@ globals:
 resources:
   - name: endpoint
     props:
-      - name: OutpostId
-        value: '{{ OutpostId }}'
-      - name: SecurityGroupId
-        value: '{{ SecurityGroupId }}'
-      - name: SubnetId
-        value: '{{ SubnetId }}'
-      - name: AccessType
-        value: '{{ AccessType }}'
-      - name: CustomerOwnedIpv4Pool
-        value: '{{ CustomerOwnedIpv4Pool }}'
-      - name: FailedReason
+      - name: outpost_id
+        value: '{{ outpost_id }}'
+      - name: security_group_id
+        value: '{{ security_group_id }}'
+      - name: subnet_id
+        value: '{{ subnet_id }}'
+      - name: access_type
+        value: '{{ access_type }}'
+      - name: customer_owned_ipv4_pool
+        value: '{{ customer_owned_ipv4_pool }}'
+      - name: failed_reason
         value:
-          ErrorCode: '{{ ErrorCode }}'
-          Message: '{{ Message }}'
-
+          error_code: '{{ error_code }}'
+          message: '{{ message }}'
 ```
 </TabItem>
 </Tabs>
@@ -320,7 +319,7 @@ resources:
 ```sql
 /*+ delete */
 DELETE FROM awscc.s3outposts.endpoints
-WHERE Identifier = '<Arn>'
+WHERE Identifier = '{{ arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/s3tables/table_bucket_policies/index.md b/website/docs/services/s3tables/table_bucket_policies/index.md
index 1bef7e896..52daa8f8e 100644
--- a/website/docs/services/s3tables/table_bucket_policies/index.md
+++ b/website/docs/services/s3tables/table_bucket_policies/index.md
@@ -140,7 +140,7 @@ region,
 resource_policy,
 table_bucket_arn
 FROM awscc.s3tables.table_bucket_policies
-WHERE region = 'us-east-1' AND Identifier = '<TableBucketARN>';
+WHERE region = 'us-east-1' AND Identifier = '{{ table_bucket_arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -177,9 +177,9 @@ INSERT INTO awscc.s3tables.table_bucket_policies (
  TableBucketARN,
  region
 )
-SELECT 
-'{{ ResourcePolicy }}',
- '{{ TableBucketARN }}',
+SELECT
+'{{ resource_policy }}',
+ '{{ table_bucket_arn }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -192,9 +192,9 @@ INSERT INTO awscc.s3tables.table_bucket_policies (
  TableBucketARN,
  region
 )
-SELECT 
- '{{ ResourcePolicy }}',
- '{{ TableBucketARN }}',
+SELECT
+ '{{ resource_policy }}',
+ '{{ table_bucket_arn }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -212,11 +212,10 @@ globals:
 resources:
   - name: table_bucket_policy
     props:
-      - name: ResourcePolicy
+      - name: resource_policy
         value: {}
-      - name: TableBucketARN
-        value: '{{ TableBucketARN }}'
-
+      - name: table_bucket_arn
+        value: '{{ table_bucket_arn }}'
 ```
 </TabItem>
 </Tabs>
@@ -232,7 +231,7 @@ SET PatchDocument = string('{{ {
     "ResourcePolicy": resource_policy
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<TableBucketARN>';
+AND Identifier = '{{ table_bucket_arn }}';
 ```
 
 
@@ -241,7 +240,7 @@ AND Identifier = '<TableBucketARN>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.s3tables.table_bucket_policies
-WHERE Identifier = '<TableBucketARN>'
+WHERE Identifier = '{{ table_bucket_arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/s3tables/table_buckets/index.md b/website/docs/services/s3tables/table_buckets/index.md
index 1a42dd190..d1f7299ef 100644
--- a/website/docs/services/s3tables/table_buckets/index.md
+++ b/website/docs/services/s3tables/table_buckets/index.md
@@ -181,7 +181,7 @@ table_bucket_name,
 unreferenced_file_removal,
 encryption_configuration
 FROM awscc.s3tables.table_buckets
-WHERE region = 'us-east-1' AND Identifier = '<TableBucketARN>';
+WHERE region = 'us-east-1' AND Identifier = '{{ table_bucket_arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -217,8 +217,8 @@ INSERT INTO awscc.s3tables.table_buckets (
  TableBucketName,
  region
 )
-SELECT 
-'{{ TableBucketName }}',
+SELECT
+'{{ table_bucket_name }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -232,10 +232,10 @@ INSERT INTO awscc.s3tables.table_buckets (
  EncryptionConfiguration,
  region
 )
-SELECT 
- '{{ TableBucketName }}',
- '{{ UnreferencedFileRemoval }}',
- '{{ EncryptionConfiguration }}',
+SELECT
+ '{{ table_bucket_name }}',
+ '{{ unreferenced_file_removal }}',
+ '{{ encryption_configuration }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -253,18 +253,17 @@ globals:
 resources:
   - name: table_bucket
     props:
-      - name: TableBucketName
-        value: '{{ TableBucketName }}'
-      - name: UnreferencedFileRemoval
+      - name: table_bucket_name
+        value: '{{ table_bucket_name }}'
+      - name: unreferenced_file_removal
         value:
-          Status: '{{ Status }}'
-          UnreferencedDays: '{{ UnreferencedDays }}'
-          NoncurrentDays: '{{ NoncurrentDays }}'
-      - name: EncryptionConfiguration
+          status: '{{ status }}'
+          unreferenced_days: '{{ unreferenced_days }}'
+          noncurrent_days: '{{ noncurrent_days }}'
+      - name: encryption_configuration
         value:
-          SSEAlgorithm: '{{ SSEAlgorithm }}'
-          KMSKeyArn: '{{ KMSKeyArn }}'
-
+          sse_algorithm: '{{ sse_algorithm }}'
+          kms_key_arn: '{{ kms_key_arn }}'
 ```
 </TabItem>
 </Tabs>
@@ -281,7 +280,7 @@ SET PatchDocument = string('{{ {
     "EncryptionConfiguration": encryption_configuration
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<TableBucketARN>';
+AND Identifier = '{{ table_bucket_arn }}';
 ```
 
 
@@ -290,7 +289,7 @@ AND Identifier = '<TableBucketARN>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.s3tables.table_buckets
-WHERE Identifier = '<TableBucketARN>'
+WHERE Identifier = '{{ table_bucket_arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/s3tables/table_policies/index.md b/website/docs/services/s3tables/table_policies/index.md
index b94decd68..1a5b9461c 100644
--- a/website/docs/services/s3tables/table_policies/index.md
+++ b/website/docs/services/s3tables/table_policies/index.md
@@ -158,7 +158,7 @@ table_bucket_arn,
 table_arn,
 namespace
 FROM awscc.s3tables.table_policies
-WHERE region = 'us-east-1' AND Identifier = '<TableARN>';
+WHERE region = 'us-east-1' AND Identifier = '{{ table_arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -195,9 +195,9 @@ INSERT INTO awscc.s3tables.table_policies (
  TableARN,
  region
 )
-SELECT 
-'{{ ResourcePolicy }}',
- '{{ TableARN }}',
+SELECT
+'{{ resource_policy }}',
+ '{{ table_arn }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -210,9 +210,9 @@ INSERT INTO awscc.s3tables.table_policies (
  TableARN,
  region
 )
-SELECT 
- '{{ ResourcePolicy }}',
- '{{ TableARN }}',
+SELECT
+ '{{ resource_policy }}',
+ '{{ table_arn }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -230,11 +230,10 @@ globals:
 resources:
   - name: table_policy
     props:
-      - name: ResourcePolicy
+      - name: resource_policy
         value: {}
-      - name: TableARN
-        value: '{{ TableARN }}'
-
+      - name: table_arn
+        value: '{{ table_arn }}'
 ```
 </TabItem>
 </Tabs>
@@ -250,7 +249,7 @@ SET PatchDocument = string('{{ {
     "ResourcePolicy": resource_policy
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<TableARN>';
+AND Identifier = '{{ table_arn }}';
 ```
 
 
@@ -259,7 +258,7 @@ AND Identifier = '<TableARN>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.s3tables.table_policies
-WHERE Identifier = '<TableARN>'
+WHERE Identifier = '{{ table_arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/s3tables/tables/index.md b/website/docs/services/s3tables/tables/index.md
index e9b93c212..df52d3b8c 100644
--- a/website/docs/services/s3tables/tables/index.md
+++ b/website/docs/services/s3tables/tables/index.md
@@ -254,7 +254,7 @@ iceberg_metadata,
 warehouse_location,
 snapshot_management
 FROM awscc.s3tables.tables
-WHERE region = 'us-east-1' AND Identifier = '<TableARN>';
+WHERE region = 'us-east-1' AND Identifier = '{{ table_arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -293,11 +293,11 @@ INSERT INTO awscc.s3tables.tables (
  OpenTableFormat,
  region
 )
-SELECT 
-'{{ Namespace }}',
- '{{ TableName }}',
- '{{ TableBucketARN }}',
- '{{ OpenTableFormat }}',
+SELECT
+'{{ namespace }}',
+ '{{ table_name }}',
+ '{{ table_bucket_arn }}',
+ '{{ open_table_format }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -316,15 +316,15 @@ INSERT INTO awscc.s3tables.tables (
  SnapshotManagement,
  region
 )
-SELECT 
- '{{ WithoutMetadata }}',
- '{{ Compaction }}',
- '{{ Namespace }}',
- '{{ TableName }}',
- '{{ TableBucketARN }}',
- '{{ OpenTableFormat }}',
- '{{ IcebergMetadata }}',
- '{{ SnapshotManagement }}',
+SELECT
+ '{{ without_metadata }}',
+ '{{ compaction }}',
+ '{{ namespace }}',
+ '{{ table_name }}',
+ '{{ table_bucket_arn }}',
+ '{{ open_table_format }}',
+ '{{ iceberg_metadata }}',
+ '{{ snapshot_management }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -342,33 +342,32 @@ globals:
 resources:
   - name: table
     props:
-      - name: WithoutMetadata
-        value: '{{ WithoutMetadata }}'
-      - name: Compaction
+      - name: without_metadata
+        value: '{{ without_metadata }}'
+      - name: compaction
         value:
-          Status: '{{ Status }}'
-          TargetFileSizeMB: '{{ TargetFileSizeMB }}'
-      - name: Namespace
-        value: '{{ Namespace }}'
-      - name: TableName
-        value: '{{ TableName }}'
-      - name: TableBucketARN
-        value: '{{ TableBucketARN }}'
-      - name: OpenTableFormat
-        value: '{{ OpenTableFormat }}'
-      - name: IcebergMetadata
+          status: '{{ status }}'
+          target_file_size_mb: '{{ target_file_size_mb }}'
+      - name: namespace
+        value: '{{ namespace }}'
+      - name: table_name
+        value: '{{ table_name }}'
+      - name: table_bucket_arn
+        value: '{{ table_bucket_arn }}'
+      - name: open_table_format
+        value: '{{ open_table_format }}'
+      - name: iceberg_metadata
         value:
-          IcebergSchema:
-            SchemaFieldList:
-              - Type: '{{ Type }}'
-                Required: '{{ Required }}'
-                Name: '{{ Name }}'
-      - name: SnapshotManagement
+          iceberg_schema:
+            schema_field_list:
+              - type: '{{ type }}'
+                required: '{{ required }}'
+                name: '{{ name }}'
+      - name: snapshot_management
         value:
-          Status: '{{ Status }}'
-          MinSnapshotsToKeep: '{{ MinSnapshotsToKeep }}'
-          MaxSnapshotAgeHours: '{{ MaxSnapshotAgeHours }}'
-
+          status: '{{ status }}'
+          min_snapshots_to_keep: '{{ min_snapshots_to_keep }}'
+          max_snapshot_age_hours: '{{ max_snapshot_age_hours }}'
 ```
 </TabItem>
 </Tabs>
@@ -387,7 +386,7 @@ SET PatchDocument = string('{{ {
     "SnapshotManagement": snapshot_management
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<TableARN>';
+AND Identifier = '{{ table_arn }}';
 ```
 
 
@@ -396,7 +395,7 @@ AND Identifier = '<TableARN>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.s3tables.tables
-WHERE Identifier = '<TableARN>'
+WHERE Identifier = '{{ table_arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/sagemaker/app_image_configs/index.md b/website/docs/services/sagemaker/app_image_configs/index.md
index 52cea7e51..53e119825 100644
--- a/website/docs/services/sagemaker/app_image_configs/index.md
+++ b/website/docs/services/sagemaker/app_image_configs/index.md
@@ -289,7 +289,7 @@ jupyter_lab_app_image_config,
 code_editor_app_image_config,
 tags
 FROM awscc.sagemaker.app_image_configs
-WHERE region = 'us-east-1' AND Identifier = '<AppImageConfigName>';
+WHERE region = 'us-east-1' AND Identifier = '{{ app_image_config_name }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -325,8 +325,8 @@ INSERT INTO awscc.sagemaker.app_image_configs (
  AppImageConfigName,
  region
 )
-SELECT 
-'{{ AppImageConfigName }}',
+SELECT
+'{{ app_image_config_name }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -342,12 +342,12 @@ INSERT INTO awscc.sagemaker.app_image_configs (
  Tags,
  region
 )
-SELECT 
- '{{ AppImageConfigName }}',
- '{{ KernelGatewayImageConfig }}',
- '{{ JupyterLabAppImageConfig }}',
- '{{ CodeEditorAppImageConfig }}',
- '{{ Tags }}',
+SELECT
+ '{{ app_image_config_name }}',
+ '{{ kernel_gateway_image_config }}',
+ '{{ jupyter_lab_app_image_config }}',
+ '{{ code_editor_app_image_config }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -365,35 +365,34 @@ globals:
 resources:
   - name: app_image_config
     props:
-      - name: AppImageConfigName
-        value: '{{ AppImageConfigName }}'
-      - name: KernelGatewayImageConfig
+      - name: app_image_config_name
+        value: '{{ app_image_config_name }}'
+      - name: kernel_gateway_image_config
         value:
-          FileSystemConfig:
-            DefaultGid: '{{ DefaultGid }}'
-            DefaultUid: '{{ DefaultUid }}'
-            MountPath: '{{ MountPath }}'
-          KernelSpecs:
-            - DisplayName: '{{ DisplayName }}'
-              Name: '{{ Name }}'
-      - name: JupyterLabAppImageConfig
+          file_system_config:
+            default_gid: '{{ default_gid }}'
+            default_uid: '{{ default_uid }}'
+            mount_path: '{{ mount_path }}'
+          kernel_specs:
+            - display_name: '{{ display_name }}'
+              name: '{{ name }}'
+      - name: jupyter_lab_app_image_config
         value:
-          ContainerConfig:
-            ContainerArguments:
-              - '{{ ContainerArguments[0] }}'
-            ContainerEntrypoint:
-              - '{{ ContainerEntrypoint[0] }}'
-            ContainerEnvironmentVariables:
-              - Value: '{{ Value }}'
-                Key: '{{ Key }}'
-      - name: CodeEditorAppImageConfig
+          container_config:
+            container_arguments:
+              - '{{ container_arguments[0] }}'
+            container_entrypoint:
+              - '{{ container_entrypoint[0] }}'
+            container_environment_variables:
+              - value: '{{ value }}'
+                key: '{{ key }}'
+      - name: code_editor_app_image_config
         value:
-          ContainerConfig: null
-      - name: Tags
+          container_config: null
+      - name: tags
         value:
-          - Value: '{{ Value }}'
-            Key: '{{ Key }}'
-
+          - value: '{{ value }}'
+            key: '{{ key }}'
 ```
 </TabItem>
 </Tabs>
@@ -412,7 +411,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<AppImageConfigName>';
+AND Identifier = '{{ app_image_config_name }}';
 ```
 
 
@@ -421,7 +420,7 @@ AND Identifier = '<AppImageConfigName>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.sagemaker.app_image_configs
-WHERE Identifier = '<AppImageConfigName>'
+WHERE Identifier = '{{ app_image_config_name }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/sagemaker/apps/index.md b/website/docs/services/sagemaker/apps/index.md
index 2fae828d3..ec8d04f8d 100644
--- a/website/docs/services/sagemaker/apps/index.md
+++ b/website/docs/services/sagemaker/apps/index.md
@@ -231,7 +231,7 @@ user_profile_name,
 built_in_lifecycle_config_arn,
 recovery_mode
 FROM awscc.sagemaker.apps
-WHERE region = 'us-east-1' AND Identifier = '<AppName>|<AppType>|<DomainId>|<UserProfileName>';
+WHERE region = 'us-east-1' AND Identifier = '{{ app_name }}|{{ app_type }}|{{ domain_id }}|{{ user_profile_name }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -273,11 +273,11 @@ INSERT INTO awscc.sagemaker.apps (
  UserProfileName,
  region
 )
-SELECT 
-'{{ AppName }}',
- '{{ AppType }}',
- '{{ DomainId }}',
- '{{ UserProfileName }}',
+SELECT
+'{{ app_name }}',
+ '{{ app_type }}',
+ '{{ domain_id }}',
+ '{{ user_profile_name }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -295,14 +295,14 @@ INSERT INTO awscc.sagemaker.apps (
  RecoveryMode,
  region
 )
-SELECT 
- '{{ AppName }}',
- '{{ AppType }}',
- '{{ DomainId }}',
- '{{ ResourceSpec }}',
- '{{ Tags }}',
- '{{ UserProfileName }}',
- '{{ RecoveryMode }}',
+SELECT
+ '{{ app_name }}',
+ '{{ app_type }}',
+ '{{ domain_id }}',
+ '{{ resource_spec }}',
+ '{{ tags }}',
+ '{{ user_profile_name }}',
+ '{{ recovery_mode }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -320,27 +320,26 @@ globals:
 resources:
   - name: app
     props:
-      - name: AppName
-        value: '{{ AppName }}'
-      - name: AppType
-        value: '{{ AppType }}'
-      - name: DomainId
-        value: '{{ DomainId }}'
-      - name: ResourceSpec
+      - name: app_name
+        value: '{{ app_name }}'
+      - name: app_type
+        value: '{{ app_type }}'
+      - name: domain_id
+        value: '{{ domain_id }}'
+      - name: resource_spec
         value:
-          InstanceType: '{{ InstanceType }}'
-          SageMakerImageArn: '{{ SageMakerImageArn }}'
-          SageMakerImageVersionArn: '{{ SageMakerImageVersionArn }}'
-          LifecycleConfigArn: '{{ LifecycleConfigArn }}'
-      - name: Tags
+          instance_type: '{{ instance_type }}'
+          sage_maker_image_arn: '{{ sage_maker_image_arn }}'
+          sage_maker_image_version_arn: '{{ sage_maker_image_version_arn }}'
+          lifecycle_config_arn: '{{ lifecycle_config_arn }}'
+      - name: tags
         value:
-          - Value: '{{ Value }}'
-            Key: '{{ Key }}'
-      - name: UserProfileName
-        value: '{{ UserProfileName }}'
-      - name: RecoveryMode
-        value: '{{ RecoveryMode }}'
-
+          - value: '{{ value }}'
+            key: '{{ key }}'
+      - name: user_profile_name
+        value: '{{ user_profile_name }}'
+      - name: recovery_mode
+        value: '{{ recovery_mode }}'
 ```
 </TabItem>
 </Tabs>
@@ -357,7 +356,7 @@ SET PatchDocument = string('{{ {
     "RecoveryMode": recovery_mode
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<AppName>|<AppType>|<DomainId>|<UserProfileName>';
+AND Identifier = '{{ app_name }}|{{ app_type }}|{{ domain_id }}|{{ user_profile_name }}';
 ```
 
 
@@ -366,7 +365,7 @@ AND Identifier = '<AppName>|<AppType>|<DomainId>|<UserProfileName>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.sagemaker.apps
-WHERE Identifier = '<AppName|AppType|DomainId|UserProfileName>'
+WHERE Identifier = '{{ app_name }}|{{ app_type }}|{{ domain_id }}|{{ user_profile_name }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/sagemaker/clusters/index.md b/website/docs/services/sagemaker/clusters/index.md
index 1fea085ef..ea7cb2791 100644
--- a/website/docs/services/sagemaker/clusters/index.md
+++ b/website/docs/services/sagemaker/clusters/index.md
@@ -436,7 +436,7 @@ auto_scaling,
 cluster_status,
 tags
 FROM awscc.sagemaker.clusters
-WHERE region = 'us-east-1' AND Identifier = '<ClusterArn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ cluster_arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -472,7 +472,7 @@ INSERT INTO awscc.sagemaker.clusters (
  ,
  region
 )
-SELECT 
+SELECT
 '{{  }}',
 '{{ region }}';
 ```
@@ -494,17 +494,17 @@ INSERT INTO awscc.sagemaker.clusters (
  Tags,
  region
 )
-SELECT 
- '{{ VpcConfig }}',
- '{{ NodeRecovery }}',
- '{{ InstanceGroups }}',
- '{{ RestrictedInstanceGroups }}',
- '{{ Orchestrator }}',
- '{{ ClusterRole }}',
- '{{ NodeProvisioningMode }}',
- '{{ ClusterName }}',
- '{{ AutoScaling }}',
- '{{ Tags }}',
+SELECT
+ '{{ vpc_config }}',
+ '{{ node_recovery }}',
+ '{{ instance_groups }}',
+ '{{ restricted_instance_groups }}',
+ '{{ orchestrator }}',
+ '{{ cluster_role }}',
+ '{{ node_provisioning_mode }}',
+ '{{ cluster_name }}',
+ '{{ auto_scaling }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -522,88 +522,87 @@ globals:
 resources:
   - name: cluster
     props:
-      - name: VpcConfig
+      - name: vpc_config
         value:
-          SecurityGroupIds:
-            - '{{ SecurityGroupIds[0] }}'
-          Subnets:
-            - '{{ Subnets[0] }}'
-      - name: NodeRecovery
-        value: '{{ NodeRecovery }}'
-      - name: InstanceGroups
+          security_group_ids:
+            - '{{ security_group_ids[0] }}'
+          subnets:
+            - '{{ subnets[0] }}'
+      - name: node_recovery
+        value: '{{ node_recovery }}'
+      - name: instance_groups
         value:
-          - InstanceGroupName: '{{ InstanceGroupName }}'
-            InstanceStorageConfigs:
+          - instance_group_name: '{{ instance_group_name }}'
+            instance_storage_configs:
               - {}
-            LifeCycleConfig:
-              SourceS3Uri: '{{ SourceS3Uri }}'
-              OnCreate: '{{ OnCreate }}'
-            TrainingPlanArn: '{{ TrainingPlanArn }}'
-            ThreadsPerCore: '{{ ThreadsPerCore }}'
-            OverrideVpcConfig: null
-            InstanceCount: '{{ InstanceCount }}'
-            OnStartDeepHealthChecks:
-              - '{{ OnStartDeepHealthChecks[0] }}'
-            ImageId: '{{ ImageId }}'
-            CurrentCount: '{{ CurrentCount }}'
-            ScheduledUpdateConfig:
-              ScheduleExpression: '{{ ScheduleExpression }}'
-              DeploymentConfig:
-                AutoRollbackConfiguration:
-                  Alarms:
-                    - AlarmName: '{{ AlarmName }}'
-                BlueGreenUpdatePolicy:
-                  MaximumExecutionTimeoutInSeconds: '{{ MaximumExecutionTimeoutInSeconds }}'
-                  TerminationWaitInSeconds: '{{ TerminationWaitInSeconds }}'
-                  TrafficRoutingConfiguration:
-                    CanarySize:
-                      Type: '{{ Type }}'
-                      Value: '{{ Value }}'
-                    LinearStepSize: null
-                    Type: '{{ Type }}'
-                    WaitIntervalInSeconds: '{{ WaitIntervalInSeconds }}'
-                RollingUpdatePolicy:
-                  MaximumBatchSize: null
-                  MaximumExecutionTimeoutInSeconds: '{{ MaximumExecutionTimeoutInSeconds }}'
-                  RollbackMaximumBatchSize: null
-                  WaitIntervalInSeconds: '{{ WaitIntervalInSeconds }}'
-            InstanceType: '{{ InstanceType }}'
-            ExecutionRole: '{{ ExecutionRole }}'
-      - name: RestrictedInstanceGroups
+            life_cycle_config:
+              source_s3_uri: '{{ source_s3_uri }}'
+              on_create: '{{ on_create }}'
+            training_plan_arn: '{{ training_plan_arn }}'
+            threads_per_core: '{{ threads_per_core }}'
+            override_vpc_config: null
+            instance_count: '{{ instance_count }}'
+            on_start_deep_health_checks:
+              - '{{ on_start_deep_health_checks[0] }}'
+            image_id: '{{ image_id }}'
+            current_count: '{{ current_count }}'
+            scheduled_update_config:
+              schedule_expression: '{{ schedule_expression }}'
+              deployment_config:
+                auto_rollback_configuration:
+                  alarms:
+                    - alarm_name: '{{ alarm_name }}'
+                blue_green_update_policy:
+                  maximum_execution_timeout_in_seconds: '{{ maximum_execution_timeout_in_seconds }}'
+                  termination_wait_in_seconds: '{{ termination_wait_in_seconds }}'
+                  traffic_routing_configuration:
+                    canary_size:
+                      type: '{{ type }}'
+                      value: '{{ value }}'
+                    linear_step_size: null
+                    type: '{{ type }}'
+                    wait_interval_in_seconds: '{{ wait_interval_in_seconds }}'
+                rolling_update_policy:
+                  maximum_batch_size: null
+                  maximum_execution_timeout_in_seconds: '{{ maximum_execution_timeout_in_seconds }}'
+                  rollback_maximum_batch_size: null
+                  wait_interval_in_seconds: '{{ wait_interval_in_seconds }}'
+            instance_type: '{{ instance_type }}'
+            execution_role: '{{ execution_role }}'
+      - name: restricted_instance_groups
         value:
-          - OverrideVpcConfig: null
-            InstanceCount: '{{ InstanceCount }}'
-            OnStartDeepHealthChecks: null
-            EnvironmentConfig:
-              FSxLustreConfig:
-                SizeInGiB: '{{ SizeInGiB }}'
-                PerUnitStorageThroughput: '{{ PerUnitStorageThroughput }}'
-            InstanceGroupName: null
-            InstanceStorageConfigs: null
-            CurrentCount: '{{ CurrentCount }}'
-            TrainingPlanArn: '{{ TrainingPlanArn }}'
-            InstanceType: null
-            ThreadsPerCore: '{{ ThreadsPerCore }}'
-            ExecutionRole: null
-      - name: Orchestrator
+          - override_vpc_config: null
+            instance_count: '{{ instance_count }}'
+            on_start_deep_health_checks: null
+            environment_config:
+              f_sx_lustre_config:
+                size_in_gi_b: '{{ size_in_gi_b }}'
+                per_unit_storage_throughput: '{{ per_unit_storage_throughput }}'
+            instance_group_name: null
+            instance_storage_configs: null
+            current_count: '{{ current_count }}'
+            training_plan_arn: '{{ training_plan_arn }}'
+            instance_type: null
+            threads_per_core: '{{ threads_per_core }}'
+            execution_role: null
+      - name: orchestrator
         value:
-          Eks:
-            ClusterArn: '{{ ClusterArn }}'
-      - name: ClusterRole
-        value: '{{ ClusterRole }}'
-      - name: NodeProvisioningMode
-        value: '{{ NodeProvisioningMode }}'
-      - name: ClusterName
-        value: '{{ ClusterName }}'
-      - name: AutoScaling
+          eks:
+            cluster_arn: '{{ cluster_arn }}'
+      - name: cluster_role
+        value: '{{ cluster_role }}'
+      - name: node_provisioning_mode
+        value: '{{ node_provisioning_mode }}'
+      - name: cluster_name
+        value: '{{ cluster_name }}'
+      - name: auto_scaling
         value:
-          Mode: '{{ Mode }}'
-          AutoScalerType: '{{ AutoScalerType }}'
-      - name: Tags
+          mode: '{{ mode }}'
+          auto_scaler_type: '{{ auto_scaler_type }}'
+      - name: tags
         value:
-          - Value: '{{ Value }}'
-            Key: '{{ Key }}'
-
+          - value: '{{ value }}'
+            key: '{{ key }}'
 ```
 </TabItem>
 </Tabs>
@@ -623,7 +622,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<ClusterArn>';
+AND Identifier = '{{ cluster_arn }}';
 ```
 
 
@@ -632,7 +631,7 @@ AND Identifier = '<ClusterArn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.sagemaker.clusters
-WHERE Identifier = '<ClusterArn>'
+WHERE Identifier = '{{ cluster_arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/sagemaker/data_quality_job_definitions/index.md b/website/docs/services/sagemaker/data_quality_job_definitions/index.md
index 3f1aad5a6..1c64f0f1f 100644
--- a/website/docs/services/sagemaker/data_quality_job_definitions/index.md
+++ b/website/docs/services/sagemaker/data_quality_job_definitions/index.md
@@ -459,7 +459,7 @@ stopping_condition,
 tags,
 creation_time
 FROM awscc.sagemaker.data_quality_job_definitions
-WHERE region = 'us-east-1' AND Identifier = '<JobDefinitionArn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ job_definition_arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -499,12 +499,12 @@ INSERT INTO awscc.sagemaker.data_quality_job_definitions (
  RoleArn,
  region
 )
-SELECT 
-'{{ DataQualityAppSpecification }}',
- '{{ DataQualityJobInput }}',
- '{{ DataQualityJobOutputConfig }}',
- '{{ JobResources }}',
- '{{ RoleArn }}',
+SELECT
+'{{ data_quality_app_specification }}',
+ '{{ data_quality_job_input }}',
+ '{{ data_quality_job_output_config }}',
+ '{{ job_resources }}',
+ '{{ role_arn }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -526,18 +526,18 @@ INSERT INTO awscc.sagemaker.data_quality_job_definitions (
  Tags,
  region
 )
-SELECT 
- '{{ JobDefinitionName }}',
- '{{ DataQualityBaselineConfig }}',
- '{{ DataQualityAppSpecification }}',
- '{{ DataQualityJobInput }}',
- '{{ DataQualityJobOutputConfig }}',
- '{{ JobResources }}',
- '{{ NetworkConfig }}',
- '{{ EndpointName }}',
- '{{ RoleArn }}',
- '{{ StoppingCondition }}',
- '{{ Tags }}',
+SELECT
+ '{{ job_definition_name }}',
+ '{{ data_quality_baseline_config }}',
+ '{{ data_quality_app_specification }}',
+ '{{ data_quality_job_input }}',
+ '{{ data_quality_job_output_config }}',
+ '{{ job_resources }}',
+ '{{ network_config }}',
+ '{{ endpoint_name }}',
+ '{{ role_arn }}',
+ '{{ stopping_condition }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -555,81 +555,80 @@ globals:
 resources:
   - name: data_quality_job_definition
     props:
-      - name: JobDefinitionName
-        value: '{{ JobDefinitionName }}'
-      - name: DataQualityBaselineConfig
+      - name: job_definition_name
+        value: '{{ job_definition_name }}'
+      - name: data_quality_baseline_config
         value:
-          BaseliningJobName: '{{ BaseliningJobName }}'
-          ConstraintsResource:
-            S3Uri: '{{ S3Uri }}'
-          StatisticsResource:
-            S3Uri: null
-      - name: DataQualityAppSpecification
+          baselining_job_name: '{{ baselining_job_name }}'
+          constraints_resource:
+            s3_uri: '{{ s3_uri }}'
+          statistics_resource:
+            s3_uri: null
+      - name: data_quality_app_specification
         value:
-          ContainerArguments:
-            - '{{ ContainerArguments[0] }}'
-          ContainerEntrypoint:
-            - '{{ ContainerEntrypoint[0] }}'
-          ImageUri: '{{ ImageUri }}'
-          PostAnalyticsProcessorSourceUri: null
-          RecordPreprocessorSourceUri: null
-          Environment: {}
-      - name: DataQualityJobInput
+          container_arguments:
+            - '{{ container_arguments[0] }}'
+          container_entrypoint:
+            - '{{ container_entrypoint[0] }}'
+          image_uri: '{{ image_uri }}'
+          post_analytics_processor_source_uri: null
+          record_preprocessor_source_uri: null
+          environment: {}
+      - name: data_quality_job_input
         value:
-          EndpointInput:
-            EndpointName: '{{ EndpointName }}'
-            LocalPath: '{{ LocalPath }}'
-            S3DataDistributionType: '{{ S3DataDistributionType }}'
-            S3InputMode: '{{ S3InputMode }}'
-            ExcludeFeaturesAttribute: '{{ ExcludeFeaturesAttribute }}'
-          BatchTransformInput:
-            DataCapturedDestinationS3Uri: '{{ DataCapturedDestinationS3Uri }}'
-            DatasetFormat:
-              Csv:
-                Header: '{{ Header }}'
-              Json:
-                Line: '{{ Line }}'
-              Parquet: '{{ Parquet }}'
-            LocalPath: '{{ LocalPath }}'
-            S3DataDistributionType: '{{ S3DataDistributionType }}'
-            S3InputMode: '{{ S3InputMode }}'
-            ExcludeFeaturesAttribute: '{{ ExcludeFeaturesAttribute }}'
-      - name: DataQualityJobOutputConfig
+          endpoint_input:
+            endpoint_name: '{{ endpoint_name }}'
+            local_path: '{{ local_path }}'
+            s3_data_distribution_type: '{{ s3_data_distribution_type }}'
+            s3_input_mode: '{{ s3_input_mode }}'
+            exclude_features_attribute: '{{ exclude_features_attribute }}'
+          batch_transform_input:
+            data_captured_destination_s3_uri: '{{ data_captured_destination_s3_uri }}'
+            dataset_format:
+              csv:
+                header: '{{ header }}'
+              json:
+                line: '{{ line }}'
+              parquet: '{{ parquet }}'
+            local_path: '{{ local_path }}'
+            s3_data_distribution_type: '{{ s3_data_distribution_type }}'
+            s3_input_mode: '{{ s3_input_mode }}'
+            exclude_features_attribute: '{{ exclude_features_attribute }}'
+      - name: data_quality_job_output_config
         value:
-          KmsKeyId: '{{ KmsKeyId }}'
-          MonitoringOutputs:
-            - S3Output:
-                LocalPath: '{{ LocalPath }}'
-                S3UploadMode: '{{ S3UploadMode }}'
-                S3Uri: '{{ S3Uri }}'
-      - name: JobResources
+          kms_key_id: '{{ kms_key_id }}'
+          monitoring_outputs:
+            - s3_output:
+                local_path: '{{ local_path }}'
+                s3_upload_mode: '{{ s3_upload_mode }}'
+                s3_uri: '{{ s3_uri }}'
+      - name: job_resources
         value:
-          ClusterConfig:
-            InstanceCount: '{{ InstanceCount }}'
-            InstanceType: '{{ InstanceType }}'
-            VolumeSizeInGB: '{{ VolumeSizeInGB }}'
-            VolumeKmsKeyId: '{{ VolumeKmsKeyId }}'
-      - name: NetworkConfig
+          cluster_config:
+            instance_count: '{{ instance_count }}'
+            instance_type: '{{ instance_type }}'
+            volume_size_in_gb: '{{ volume_size_in_gb }}'
+            volume_kms_key_id: '{{ volume_kms_key_id }}'
+      - name: network_config
         value:
-          EnableInterContainerTrafficEncryption: '{{ EnableInterContainerTrafficEncryption }}'
-          EnableNetworkIsolation: '{{ EnableNetworkIsolation }}'
-          VpcConfig:
-            SecurityGroupIds:
-              - '{{ SecurityGroupIds[0] }}'
-            Subnets:
-              - '{{ Subnets[0] }}'
-      - name: EndpointName
+          enable_inter_container_traffic_encryption: '{{ enable_inter_container_traffic_encryption }}'
+          enable_network_isolation: '{{ enable_network_isolation }}'
+          vpc_config:
+            security_group_ids:
+              - '{{ security_group_ids[0] }}'
+            subnets:
+              - '{{ subnets[0] }}'
+      - name: endpoint_name
         value: null
-      - name: RoleArn
-        value: '{{ RoleArn }}'
-      - name: StoppingCondition
+      - name: role_arn
+        value: '{{ role_arn }}'
+      - name: stopping_condition
         value:
-          MaxRuntimeInSeconds: '{{ MaxRuntimeInSeconds }}'
-      - name: Tags
+          max_runtime_in_seconds: '{{ max_runtime_in_seconds }}'
+      - name: tags
         value:
-          - Value: '{{ Value }}'
-            Key: '{{ Key }}'
-
+          - value: '{{ value }}'
+            key: '{{ key }}'
 ```
 </TabItem>
 </Tabs>
@@ -640,7 +639,7 @@ resources:
 ```sql
 /*+ delete */
 DELETE FROM awscc.sagemaker.data_quality_job_definitions
-WHERE Identifier = '<JobDefinitionArn>'
+WHERE Identifier = '{{ job_definition_arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/sagemaker/device_fleets/index.md b/website/docs/services/sagemaker/device_fleets/index.md
index 2af7ec88d..c791f2807 100644
--- a/website/docs/services/sagemaker/device_fleets/index.md
+++ b/website/docs/services/sagemaker/device_fleets/index.md
@@ -136,7 +136,7 @@ output_config,
 role_arn,
 tags
 FROM awscc.sagemaker.device_fleets
-WHERE region = 'us-east-1' AND Identifier = '<DeviceFleetName>';
+WHERE region = 'us-east-1' AND Identifier = '{{ device_fleet_name }}';
 ```
 
 ## `INSERT` example
@@ -161,10 +161,10 @@ INSERT INTO awscc.sagemaker.device_fleets (
  RoleArn,
  region
 )
-SELECT 
-'{{ DeviceFleetName }}',
- '{{ OutputConfig }}',
- '{{ RoleArn }}',
+SELECT
+'{{ device_fleet_name }}',
+ '{{ output_config }}',
+ '{{ role_arn }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -180,12 +180,12 @@ INSERT INTO awscc.sagemaker.device_fleets (
  Tags,
  region
 )
-SELECT 
- '{{ Description }}',
- '{{ DeviceFleetName }}',
- '{{ OutputConfig }}',
- '{{ RoleArn }}',
- '{{ Tags }}',
+SELECT
+ '{{ description }}',
+ '{{ device_fleet_name }}',
+ '{{ output_config }}',
+ '{{ role_arn }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -203,21 +203,20 @@ globals:
 resources:
   - name: device_fleet
     props:
-      - name: Description
-        value: '{{ Description }}'
-      - name: DeviceFleetName
-        value: '{{ DeviceFleetName }}'
-      - name: OutputConfig
+      - name: description
+        value: '{{ description }}'
+      - name: device_fleet_name
+        value: '{{ device_fleet_name }}'
+      - name: output_config
         value:
-          S3OutputLocation: '{{ S3OutputLocation }}'
-          KmsKeyId: '{{ KmsKeyId }}'
-      - name: RoleArn
-        value: '{{ RoleArn }}'
-      - name: Tags
+          s3_output_location: '{{ s3_output_location }}'
+          kms_key_id: '{{ kms_key_id }}'
+      - name: role_arn
+        value: '{{ role_arn }}'
+      - name: tags
         value:
-          - Value: '{{ Value }}'
-            Key: '{{ Key }}'
-
+          - value: '{{ value }}'
+            key: '{{ key }}'
 ```
 </TabItem>
 </Tabs>
@@ -236,7 +235,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<DeviceFleetName>';
+AND Identifier = '{{ device_fleet_name }}';
 ```
 
 
@@ -245,7 +244,7 @@ AND Identifier = '<DeviceFleetName>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.sagemaker.device_fleets
-WHERE Identifier = '<DeviceFleetName>'
+WHERE Identifier = '{{ device_fleet_name }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/sagemaker/devices/index.md b/website/docs/services/sagemaker/devices/index.md
index e5661665b..4ac8697d0 100644
--- a/website/docs/services/sagemaker/devices/index.md
+++ b/website/docs/services/sagemaker/devices/index.md
@@ -136,7 +136,7 @@ device_fleet_name,
 device,
 tags
 FROM awscc.sagemaker.devices
-WHERE region = 'us-east-1' AND Identifier = '<Device/DeviceName>';
+WHERE region = 'us-east-1' AND Identifier = '{{ device/device_name }}';
 ```
 
 ## `INSERT` example
@@ -159,8 +159,8 @@ INSERT INTO awscc.sagemaker.devices (
  DeviceFleetName,
  region
 )
-SELECT 
-'{{ DeviceFleetName }}',
+SELECT
+'{{ device_fleet_name }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -174,10 +174,10 @@ INSERT INTO awscc.sagemaker.devices (
  Tags,
  region
 )
-SELECT 
- '{{ DeviceFleetName }}',
- '{{ Device }}',
- '{{ Tags }}',
+SELECT
+ '{{ device_fleet_name }}',
+ '{{ device }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -195,19 +195,18 @@ globals:
 resources:
   - name: device
     props:
-      - name: DeviceFleetName
-        value: '{{ DeviceFleetName }}'
-      - name: Device
+      - name: device_fleet_name
+        value: '{{ device_fleet_name }}'
+      - name: device
         value:
-          DeviceFleetName: '{{ DeviceFleetName }}'
-          Device: null
-          Tags:
-            - Value: '{{ Value }}'
-              Key: '{{ Key }}'
-      - name: Tags
+          device_fleet_name: '{{ device_fleet_name }}'
+          device: null
+          tags:
+            - value: '{{ value }}'
+              key: '{{ key }}'
+      - name: tags
         value:
           - null
-
 ```
 </TabItem>
 </Tabs>
@@ -224,7 +223,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Device/DeviceName>';
+AND Identifier = '{{ device/device_name }}';
 ```
 
 
@@ -233,7 +232,7 @@ AND Identifier = '<Device/DeviceName>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.sagemaker.devices
-WHERE Identifier = '<Device/DeviceName>'
+WHERE Identifier = '{{ device/device_name }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/sagemaker/endpoints/index.md b/website/docs/services/sagemaker/endpoints/index.md
index 49bb78f08..636b42260 100644
--- a/website/docs/services/sagemaker/endpoints/index.md
+++ b/website/docs/services/sagemaker/endpoints/index.md
@@ -289,7 +289,7 @@ retain_all_variant_properties,
 retain_deployment_config,
 tags
 FROM awscc.sagemaker.endpoints
-WHERE region = 'us-east-1' AND Identifier = '<EndpointArn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ endpoint_arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -325,8 +325,8 @@ INSERT INTO awscc.sagemaker.endpoints (
  EndpointConfigName,
  region
 )
-SELECT 
-'{{ EndpointConfigName }}',
+SELECT
+'{{ endpoint_config_name }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -343,13 +343,13 @@ INSERT INTO awscc.sagemaker.endpoints (
  Tags,
  region
 )
-SELECT 
- '{{ DeploymentConfig }}',
- '{{ EndpointConfigName }}',
- '{{ ExcludeRetainedVariantProperties }}',
- '{{ RetainAllVariantProperties }}',
- '{{ RetainDeploymentConfig }}',
- '{{ Tags }}',
+SELECT
+ '{{ deployment_config }}',
+ '{{ endpoint_config_name }}',
+ '{{ exclude_retained_variant_properties }}',
+ '{{ retain_all_variant_properties }}',
+ '{{ retain_deployment_config }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -367,40 +367,39 @@ globals:
 resources:
   - name: endpoint
     props:
-      - name: DeploymentConfig
+      - name: deployment_config
         value:
-          AutoRollbackConfiguration:
-            Alarms:
-              - AlarmName: '{{ AlarmName }}'
-          BlueGreenUpdatePolicy:
-            MaximumExecutionTimeoutInSeconds: '{{ MaximumExecutionTimeoutInSeconds }}'
-            TerminationWaitInSeconds: '{{ TerminationWaitInSeconds }}'
-            TrafficRoutingConfiguration:
-              CanarySize:
-                Type: '{{ Type }}'
-                Value: '{{ Value }}'
-              LinearStepSize: null
-              Type: '{{ Type }}'
-              WaitIntervalInSeconds: '{{ WaitIntervalInSeconds }}'
-          RollingUpdatePolicy:
-            MaximumBatchSize: null
-            MaximumExecutionTimeoutInSeconds: '{{ MaximumExecutionTimeoutInSeconds }}'
-            RollbackMaximumBatchSize: null
-            WaitIntervalInSeconds: '{{ WaitIntervalInSeconds }}'
-      - name: EndpointConfigName
-        value: '{{ EndpointConfigName }}'
-      - name: ExcludeRetainedVariantProperties
+          auto_rollback_configuration:
+            alarms:
+              - alarm_name: '{{ alarm_name }}'
+          blue_green_update_policy:
+            maximum_execution_timeout_in_seconds: '{{ maximum_execution_timeout_in_seconds }}'
+            termination_wait_in_seconds: '{{ termination_wait_in_seconds }}'
+            traffic_routing_configuration:
+              canary_size:
+                type: '{{ type }}'
+                value: '{{ value }}'
+              linear_step_size: null
+              type: '{{ type }}'
+              wait_interval_in_seconds: '{{ wait_interval_in_seconds }}'
+          rolling_update_policy:
+            maximum_batch_size: null
+            maximum_execution_timeout_in_seconds: '{{ maximum_execution_timeout_in_seconds }}'
+            rollback_maximum_batch_size: null
+            wait_interval_in_seconds: '{{ wait_interval_in_seconds }}'
+      - name: endpoint_config_name
+        value: '{{ endpoint_config_name }}'
+      - name: exclude_retained_variant_properties
         value:
-          - VariantPropertyType: '{{ VariantPropertyType }}'
-      - name: RetainAllVariantProperties
-        value: '{{ RetainAllVariantProperties }}'
-      - name: RetainDeploymentConfig
-        value: '{{ RetainDeploymentConfig }}'
-      - name: Tags
+          - variant_property_type: '{{ variant_property_type }}'
+      - name: retain_all_variant_properties
+        value: '{{ retain_all_variant_properties }}'
+      - name: retain_deployment_config
+        value: '{{ retain_deployment_config }}'
+      - name: tags
         value:
-          - Value: '{{ Value }}'
-            Key: '{{ Key }}'
-
+          - value: '{{ value }}'
+            key: '{{ key }}'
 ```
 </TabItem>
 </Tabs>
@@ -421,7 +420,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<EndpointArn>';
+AND Identifier = '{{ endpoint_arn }}';
 ```
 
 
@@ -430,7 +429,7 @@ AND Identifier = '<EndpointArn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.sagemaker.endpoints
-WHERE Identifier = '<EndpointArn>'
+WHERE Identifier = '{{ endpoint_arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/sagemaker/feature_groups/index.md b/website/docs/services/sagemaker/feature_groups/index.md
index 5e3c907d5..9abf0e713 100644
--- a/website/docs/services/sagemaker/feature_groups/index.md
+++ b/website/docs/services/sagemaker/feature_groups/index.md
@@ -333,7 +333,7 @@ creation_time,
 feature_group_status,
 tags
 FROM awscc.sagemaker.feature_groups
-WHERE region = 'us-east-1' AND Identifier = '<FeatureGroupName>';
+WHERE region = 'us-east-1' AND Identifier = '{{ feature_group_name }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -372,11 +372,11 @@ INSERT INTO awscc.sagemaker.feature_groups (
  FeatureDefinitions,
  region
 )
-SELECT 
-'{{ FeatureGroupName }}',
- '{{ RecordIdentifierFeatureName }}',
- '{{ EventTimeFeatureName }}',
- '{{ FeatureDefinitions }}',
+SELECT
+'{{ feature_group_name }}',
+ '{{ record_identifier_feature_name }}',
+ '{{ event_time_feature_name }}',
+ '{{ feature_definitions }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -397,17 +397,17 @@ INSERT INTO awscc.sagemaker.feature_groups (
  Tags,
  region
 )
-SELECT 
- '{{ FeatureGroupName }}',
- '{{ RecordIdentifierFeatureName }}',
- '{{ EventTimeFeatureName }}',
- '{{ FeatureDefinitions }}',
- '{{ OnlineStoreConfig }}',
- '{{ OfflineStoreConfig }}',
- '{{ ThroughputConfig }}',
- '{{ RoleArn }}',
- '{{ Description }}',
- '{{ Tags }}',
+SELECT
+ '{{ feature_group_name }}',
+ '{{ record_identifier_feature_name }}',
+ '{{ event_time_feature_name }}',
+ '{{ feature_definitions }}',
+ '{{ online_store_config }}',
+ '{{ offline_store_config }}',
+ '{{ throughput_config }}',
+ '{{ role_arn }}',
+ '{{ description }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -425,50 +425,49 @@ globals:
 resources:
   - name: feature_group
     props:
-      - name: FeatureGroupName
-        value: '{{ FeatureGroupName }}'
-      - name: RecordIdentifierFeatureName
-        value: '{{ RecordIdentifierFeatureName }}'
-      - name: EventTimeFeatureName
-        value: '{{ EventTimeFeatureName }}'
-      - name: FeatureDefinitions
+      - name: feature_group_name
+        value: '{{ feature_group_name }}'
+      - name: record_identifier_feature_name
+        value: '{{ record_identifier_feature_name }}'
+      - name: event_time_feature_name
+        value: '{{ event_time_feature_name }}'
+      - name: feature_definitions
         value:
-          - FeatureName: '{{ FeatureName }}'
-            FeatureType: '{{ FeatureType }}'
-      - name: OnlineStoreConfig
+          - feature_name: '{{ feature_name }}'
+            feature_type: '{{ feature_type }}'
+      - name: online_store_config
         value:
-          SecurityConfig:
-            KmsKeyId: '{{ KmsKeyId }}'
-          EnableOnlineStore: '{{ EnableOnlineStore }}'
-          StorageType: '{{ StorageType }}'
-          TtlDuration:
-            Unit: '{{ Unit }}'
-            Value: '{{ Value }}'
-      - name: OfflineStoreConfig
+          security_config:
+            kms_key_id: '{{ kms_key_id }}'
+          enable_online_store: '{{ enable_online_store }}'
+          storage_type: '{{ storage_type }}'
+          ttl_duration:
+            unit: '{{ unit }}'
+            value: '{{ value }}'
+      - name: offline_store_config
         value:
-          S3StorageConfig:
-            S3Uri: '{{ S3Uri }}'
-            KmsKeyId: null
-          DisableGlueTableCreation: '{{ DisableGlueTableCreation }}'
-          DataCatalogConfig:
-            TableName: '{{ TableName }}'
-            Catalog: '{{ Catalog }}'
-            Database: '{{ Database }}'
-          TableFormat: '{{ TableFormat }}'
-      - name: ThroughputConfig
+          s3_storage_config:
+            s3_uri: '{{ s3_uri }}'
+            kms_key_id: null
+          disable_glue_table_creation: '{{ disable_glue_table_creation }}'
+          data_catalog_config:
+            table_name: '{{ table_name }}'
+            catalog: '{{ catalog }}'
+            database: '{{ database }}'
+          table_format: '{{ table_format }}'
+      - name: throughput_config
         value:
-          ThroughputMode: '{{ ThroughputMode }}'
-          ProvisionedReadCapacityUnits: '{{ ProvisionedReadCapacityUnits }}'
-          ProvisionedWriteCapacityUnits: '{{ ProvisionedWriteCapacityUnits }}'
-      - name: RoleArn
-        value: '{{ RoleArn }}'
-      - name: Description
-        value: '{{ Description }}'
-      - name: Tags
+          throughput_mode: '{{ throughput_mode }}'
+          provisioned_read_capacity_units: '{{ provisioned_read_capacity_units }}'
+          provisioned_write_capacity_units: '{{ provisioned_write_capacity_units }}'
+      - name: role_arn
+        value: '{{ role_arn }}'
+      - name: description
+        value: '{{ description }}'
+      - name: tags
         value:
-          - Value: '{{ Value }}'
-            Key: '{{ Key }}'
-
+          - value: '{{ value }}'
+            key: '{{ key }}'
 ```
 </TabItem>
 </Tabs>
@@ -485,7 +484,7 @@ SET PatchDocument = string('{{ {
     "ThroughputConfig": throughput_config
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<FeatureGroupName>';
+AND Identifier = '{{ feature_group_name }}';
 ```
 
 
@@ -494,7 +493,7 @@ AND Identifier = '<FeatureGroupName>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.sagemaker.feature_groups
-WHERE Identifier = '<FeatureGroupName>'
+WHERE Identifier = '{{ feature_group_name }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/sagemaker/image_versions/index.md b/website/docs/services/sagemaker/image_versions/index.md
index 005c745c6..006e1bfd6 100644
--- a/website/docs/services/sagemaker/image_versions/index.md
+++ b/website/docs/services/sagemaker/image_versions/index.md
@@ -223,7 +223,7 @@ processor,
 horovod,
 release_notes
 FROM awscc.sagemaker.image_versions
-WHERE region = 'us-east-1' AND Identifier = '<ImageVersionArn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ image_version_arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -260,9 +260,9 @@ INSERT INTO awscc.sagemaker.image_versions (
  BaseImage,
  region
 )
-SELECT 
-'{{ ImageName }}',
- '{{ BaseImage }}',
+SELECT
+'{{ image_name }}',
+ '{{ base_image }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -284,18 +284,18 @@ INSERT INTO awscc.sagemaker.image_versions (
  ReleaseNotes,
  region
 )
-SELECT 
- '{{ ImageName }}',
- '{{ BaseImage }}',
- '{{ Alias }}',
- '{{ Aliases }}',
- '{{ VendorGuidance }}',
- '{{ JobType }}',
- '{{ MLFramework }}',
- '{{ ProgrammingLang }}',
- '{{ Processor }}',
- '{{ Horovod }}',
- '{{ ReleaseNotes }}',
+SELECT
+ '{{ image_name }}',
+ '{{ base_image }}',
+ '{{ alias }}',
+ '{{ aliases }}',
+ '{{ vendor_guidance }}',
+ '{{ job_type }}',
+ '{{ ml_framework }}',
+ '{{ programming_lang }}',
+ '{{ processor }}',
+ '{{ horovod }}',
+ '{{ release_notes }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -313,30 +313,29 @@ globals:
 resources:
   - name: image_version
     props:
-      - name: ImageName
-        value: '{{ ImageName }}'
-      - name: BaseImage
-        value: '{{ BaseImage }}'
-      - name: Alias
-        value: '{{ Alias }}'
-      - name: Aliases
+      - name: image_name
+        value: '{{ image_name }}'
+      - name: base_image
+        value: '{{ base_image }}'
+      - name: alias
+        value: '{{ alias }}'
+      - name: aliases
         value:
           - null
-      - name: VendorGuidance
-        value: '{{ VendorGuidance }}'
-      - name: JobType
-        value: '{{ JobType }}'
-      - name: MLFramework
-        value: '{{ MLFramework }}'
-      - name: ProgrammingLang
-        value: '{{ ProgrammingLang }}'
-      - name: Processor
-        value: '{{ Processor }}'
-      - name: Horovod
-        value: '{{ Horovod }}'
-      - name: ReleaseNotes
-        value: '{{ ReleaseNotes }}'
-
+      - name: vendor_guidance
+        value: '{{ vendor_guidance }}'
+      - name: job_type
+        value: '{{ job_type }}'
+      - name: ml_framework
+        value: '{{ ml_framework }}'
+      - name: programming_lang
+        value: '{{ programming_lang }}'
+      - name: processor
+        value: '{{ processor }}'
+      - name: horovod
+        value: '{{ horovod }}'
+      - name: release_notes
+        value: '{{ release_notes }}'
 ```
 </TabItem>
 </Tabs>
@@ -360,7 +359,7 @@ SET PatchDocument = string('{{ {
     "ReleaseNotes": release_notes
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<ImageVersionArn>';
+AND Identifier = '{{ image_version_arn }}';
 ```
 
 
@@ -369,7 +368,7 @@ AND Identifier = '<ImageVersionArn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.sagemaker.image_versions
-WHERE Identifier = '<ImageVersionArn>'
+WHERE Identifier = '{{ image_version_arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/sagemaker/images/index.md b/website/docs/services/sagemaker/images/index.md
index 07ec72d30..471186b65 100644
--- a/website/docs/services/sagemaker/images/index.md
+++ b/website/docs/services/sagemaker/images/index.md
@@ -176,7 +176,7 @@ image_display_name,
 image_description,
 tags
 FROM awscc.sagemaker.images
-WHERE region = 'us-east-1' AND Identifier = '<ImageArn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ image_arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -213,9 +213,9 @@ INSERT INTO awscc.sagemaker.images (
  ImageRoleArn,
  region
 )
-SELECT 
-'{{ ImageName }}',
- '{{ ImageRoleArn }}',
+SELECT
+'{{ image_name }}',
+ '{{ image_role_arn }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -231,12 +231,12 @@ INSERT INTO awscc.sagemaker.images (
  Tags,
  region
 )
-SELECT 
- '{{ ImageName }}',
- '{{ ImageRoleArn }}',
- '{{ ImageDisplayName }}',
- '{{ ImageDescription }}',
- '{{ Tags }}',
+SELECT
+ '{{ image_name }}',
+ '{{ image_role_arn }}',
+ '{{ image_display_name }}',
+ '{{ image_description }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -254,19 +254,18 @@ globals:
 resources:
   - name: image
     props:
-      - name: ImageName
-        value: '{{ ImageName }}'
-      - name: ImageRoleArn
-        value: '{{ ImageRoleArn }}'
-      - name: ImageDisplayName
-        value: '{{ ImageDisplayName }}'
-      - name: ImageDescription
-        value: '{{ ImageDescription }}'
-      - name: Tags
+      - name: image_name
+        value: '{{ image_name }}'
+      - name: image_role_arn
+        value: '{{ image_role_arn }}'
+      - name: image_display_name
+        value: '{{ image_display_name }}'
+      - name: image_description
+        value: '{{ image_description }}'
+      - name: tags
         value:
-          - Value: '{{ Value }}'
-            Key: '{{ Key }}'
-
+          - value: '{{ value }}'
+            key: '{{ key }}'
 ```
 </TabItem>
 </Tabs>
@@ -285,7 +284,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<ImageArn>';
+AND Identifier = '{{ image_arn }}';
 ```
 
 
@@ -294,7 +293,7 @@ AND Identifier = '<ImageArn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.sagemaker.images
-WHERE Identifier = '<ImageArn>'
+WHERE Identifier = '{{ image_arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/sagemaker/inference_components/index.md b/website/docs/services/sagemaker/inference_components/index.md
index 39b9d0866..b6e285927 100644
--- a/website/docs/services/sagemaker/inference_components/index.md
+++ b/website/docs/services/sagemaker/inference_components/index.md
@@ -360,7 +360,7 @@ creation_time,
 last_modified_time,
 tags
 FROM awscc.sagemaker.inference_components
-WHERE region = 'us-east-1' AND Identifier = '<InferenceComponentArn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ inference_component_arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -397,9 +397,9 @@ INSERT INTO awscc.sagemaker.inference_components (
  Specification,
  region
 )
-SELECT 
-'{{ EndpointName }}',
- '{{ Specification }}',
+SELECT
+'{{ endpoint_name }}',
+ '{{ specification }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -418,15 +418,15 @@ INSERT INTO awscc.sagemaker.inference_components (
  Tags,
  region
 )
-SELECT 
- '{{ InferenceComponentName }}',
- '{{ EndpointArn }}',
- '{{ EndpointName }}',
- '{{ VariantName }}',
- '{{ Specification }}',
- '{{ RuntimeConfig }}',
- '{{ DeploymentConfig }}',
- '{{ Tags }}',
+SELECT
+ '{{ inference_component_name }}',
+ '{{ endpoint_arn }}',
+ '{{ endpoint_name }}',
+ '{{ variant_name }}',
+ '{{ specification }}',
+ '{{ runtime_config }}',
+ '{{ deployment_config }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -444,56 +444,55 @@ globals:
 resources:
   - name: inference_component
     props:
-      - name: InferenceComponentName
-        value: '{{ InferenceComponentName }}'
-      - name: EndpointArn
-        value: '{{ EndpointArn }}'
-      - name: EndpointName
-        value: '{{ EndpointName }}'
-      - name: VariantName
-        value: '{{ VariantName }}'
-      - name: Specification
+      - name: inference_component_name
+        value: '{{ inference_component_name }}'
+      - name: endpoint_arn
+        value: '{{ endpoint_arn }}'
+      - name: endpoint_name
+        value: '{{ endpoint_name }}'
+      - name: variant_name
+        value: '{{ variant_name }}'
+      - name: specification
         value:
-          ModelName: '{{ ModelName }}'
-          BaseInferenceComponentName: '{{ BaseInferenceComponentName }}'
-          Container:
-            DeployedImage:
-              SpecifiedImage: '{{ SpecifiedImage }}'
-              ResolvedImage: null
-              ResolutionTime: '{{ ResolutionTime }}'
-            Image: null
-            ArtifactUrl: '{{ ArtifactUrl }}'
-            Environment: {}
-          StartupParameters:
-            ModelDataDownloadTimeoutInSeconds: '{{ ModelDataDownloadTimeoutInSeconds }}'
-            ContainerStartupHealthCheckTimeoutInSeconds: null
-          ComputeResourceRequirements:
-            NumberOfCpuCoresRequired: null
-            NumberOfAcceleratorDevicesRequired: null
-            MinMemoryRequiredInMb: '{{ MinMemoryRequiredInMb }}'
-            MaxMemoryRequiredInMb: null
-      - name: RuntimeConfig
+          model_name: '{{ model_name }}'
+          base_inference_component_name: '{{ base_inference_component_name }}'
+          container:
+            deployed_image:
+              specified_image: '{{ specified_image }}'
+              resolved_image: null
+              resolution_time: '{{ resolution_time }}'
+            image: null
+            artifact_url: '{{ artifact_url }}'
+            environment: {}
+          startup_parameters:
+            model_data_download_timeout_in_seconds: '{{ model_data_download_timeout_in_seconds }}'
+            container_startup_health_check_timeout_in_seconds: null
+          compute_resource_requirements:
+            number_of_cpu_cores_required: null
+            number_of_accelerator_devices_required: null
+            min_memory_required_in_mb: '{{ min_memory_required_in_mb }}'
+            max_memory_required_in_mb: null
+      - name: runtime_config
         value:
-          CopyCount: '{{ CopyCount }}'
-          DesiredCopyCount: null
-          CurrentCopyCount: null
-      - name: DeploymentConfig
+          copy_count: '{{ copy_count }}'
+          desired_copy_count: null
+          current_copy_count: null
+      - name: deployment_config
         value:
-          RollingUpdatePolicy:
-            MaximumBatchSize:
-              Type: '{{ Type }}'
-              Value: '{{ Value }}'
-            WaitIntervalInSeconds: '{{ WaitIntervalInSeconds }}'
-            RollbackMaximumBatchSize: null
-            MaximumExecutionTimeoutInSeconds: '{{ MaximumExecutionTimeoutInSeconds }}'
-          AutoRollbackConfiguration:
-            Alarms:
-              - AlarmName: '{{ AlarmName }}'
-      - name: Tags
+          rolling_update_policy:
+            maximum_batch_size:
+              type: '{{ type }}'
+              value: '{{ value }}'
+            wait_interval_in_seconds: '{{ wait_interval_in_seconds }}'
+            rollback_maximum_batch_size: null
+            maximum_execution_timeout_in_seconds: '{{ maximum_execution_timeout_in_seconds }}'
+          auto_rollback_configuration:
+            alarms:
+              - alarm_name: '{{ alarm_name }}'
+      - name: tags
         value:
-          - Value: '{{ Value }}'
-            Key: '{{ Key }}'
-
+          - value: '{{ value }}'
+            key: '{{ key }}'
 ```
 </TabItem>
 </Tabs>
@@ -514,7 +513,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<InferenceComponentArn>';
+AND Identifier = '{{ inference_component_arn }}';
 ```
 
 
@@ -523,7 +522,7 @@ AND Identifier = '<InferenceComponentArn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.sagemaker.inference_components
-WHERE Identifier = '<InferenceComponentArn>'
+WHERE Identifier = '{{ inference_component_arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/sagemaker/inference_experiments/index.md b/website/docs/services/sagemaker/inference_experiments/index.md
index f9108b655..ee0952424 100644
--- a/website/docs/services/sagemaker/inference_experiments/index.md
+++ b/website/docs/services/sagemaker/inference_experiments/index.md
@@ -366,7 +366,7 @@ status,
 status_reason,
 desired_state
 FROM awscc.sagemaker.inference_experiments
-WHERE region = 'us-east-1' AND Identifier = '<Name>';
+WHERE region = 'us-east-1' AND Identifier = '{{ name }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -406,12 +406,12 @@ INSERT INTO awscc.sagemaker.inference_experiments (
  ModelVariants,
  region
 )
-SELECT 
-'{{ Name }}',
- '{{ Type }}',
- '{{ RoleArn }}',
- '{{ EndpointName }}',
- '{{ ModelVariants }}',
+SELECT
+'{{ name }}',
+ '{{ type }}',
+ '{{ role_arn }}',
+ '{{ endpoint_name }}',
+ '{{ model_variants }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -435,20 +435,20 @@ INSERT INTO awscc.sagemaker.inference_experiments (
  DesiredState,
  region
 )
-SELECT 
- '{{ Name }}',
- '{{ Type }}',
- '{{ Description }}',
- '{{ RoleArn }}',
- '{{ EndpointName }}',
- '{{ Schedule }}',
- '{{ KmsKey }}',
- '{{ DataStorageConfig }}',
- '{{ ModelVariants }}',
- '{{ ShadowModeConfig }}',
- '{{ Tags }}',
- '{{ StatusReason }}',
- '{{ DesiredState }}',
+SELECT
+ '{{ name }}',
+ '{{ type }}',
+ '{{ description }}',
+ '{{ role_arn }}',
+ '{{ endpoint_name }}',
+ '{{ schedule }}',
+ '{{ kms_key }}',
+ '{{ data_storage_config }}',
+ '{{ model_variants }}',
+ '{{ shadow_mode_config }}',
+ '{{ tags }}',
+ '{{ status_reason }}',
+ '{{ desired_state }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -466,55 +466,54 @@ globals:
 resources:
   - name: inference_experiment
     props:
-      - name: Name
-        value: '{{ Name }}'
-      - name: Type
-        value: '{{ Type }}'
-      - name: Description
-        value: '{{ Description }}'
-      - name: RoleArn
-        value: '{{ RoleArn }}'
-      - name: EndpointName
-        value: '{{ EndpointName }}'
-      - name: Schedule
+      - name: name
+        value: '{{ name }}'
+      - name: type
+        value: '{{ type }}'
+      - name: description
+        value: '{{ description }}'
+      - name: role_arn
+        value: '{{ role_arn }}'
+      - name: endpoint_name
+        value: '{{ endpoint_name }}'
+      - name: schedule
         value:
-          StartTime: '{{ StartTime }}'
-          EndTime: '{{ EndTime }}'
-      - name: KmsKey
-        value: '{{ KmsKey }}'
-      - name: DataStorageConfig
+          start_time: '{{ start_time }}'
+          end_time: '{{ end_time }}'
+      - name: kms_key
+        value: '{{ kms_key }}'
+      - name: data_storage_config
         value:
-          Destination: '{{ Destination }}'
-          KmsKey: '{{ KmsKey }}'
-          ContentType:
-            CsvContentTypes:
-              - '{{ CsvContentTypes[0] }}'
-            JsonContentTypes:
-              - '{{ JsonContentTypes[0] }}'
-      - name: ModelVariants
+          destination: '{{ destination }}'
+          kms_key: '{{ kms_key }}'
+          content_type:
+            csv_content_types:
+              - '{{ csv_content_types[0] }}'
+            json_content_types:
+              - '{{ json_content_types[0] }}'
+      - name: model_variants
         value:
-          - ModelName: '{{ ModelName }}'
-            VariantName: '{{ VariantName }}'
-            InfrastructureConfig:
-              InfrastructureType: '{{ InfrastructureType }}'
-              RealTimeInferenceConfig:
-                InstanceType: '{{ InstanceType }}'
-                InstanceCount: '{{ InstanceCount }}'
-      - name: ShadowModeConfig
+          - model_name: '{{ model_name }}'
+            variant_name: '{{ variant_name }}'
+            infrastructure_config:
+              infrastructure_type: '{{ infrastructure_type }}'
+              real_time_inference_config:
+                instance_type: '{{ instance_type }}'
+                instance_count: '{{ instance_count }}'
+      - name: shadow_mode_config
         value:
-          SourceModelVariantName: '{{ SourceModelVariantName }}'
-          ShadowModelVariants:
-            - ShadowModelVariantName: '{{ ShadowModelVariantName }}'
-              SamplingPercentage: '{{ SamplingPercentage }}'
-      - name: Tags
+          source_model_variant_name: '{{ source_model_variant_name }}'
+          shadow_model_variants:
+            - shadow_model_variant_name: '{{ shadow_model_variant_name }}'
+              sampling_percentage: '{{ sampling_percentage }}'
+      - name: tags
         value:
-          - Value: '{{ Value }}'
-            Key: '{{ Key }}'
-      - name: StatusReason
-        value: '{{ StatusReason }}'
-      - name: DesiredState
-        value: '{{ DesiredState }}'
-
+          - value: '{{ value }}'
+            key: '{{ key }}'
+      - name: status_reason
+        value: '{{ status_reason }}'
+      - name: desired_state
+        value: '{{ desired_state }}'
 ```
 </TabItem>
 </Tabs>
@@ -537,7 +536,7 @@ SET PatchDocument = string('{{ {
     "DesiredState": desired_state
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Name>';
+AND Identifier = '{{ name }}';
 ```
 
 
@@ -546,7 +545,7 @@ AND Identifier = '<Name>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.sagemaker.inference_experiments
-WHERE Identifier = '<Name>'
+WHERE Identifier = '{{ name }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/sagemaker/mlflow_tracking_servers/index.md b/website/docs/services/sagemaker/mlflow_tracking_servers/index.md
index e8a3d779f..672cbbbcc 100644
--- a/website/docs/services/sagemaker/mlflow_tracking_servers/index.md
+++ b/website/docs/services/sagemaker/mlflow_tracking_servers/index.md
@@ -194,7 +194,7 @@ automatic_model_registration,
 weekly_maintenance_window_start,
 tags
 FROM awscc.sagemaker.mlflow_tracking_servers
-WHERE region = 'us-east-1' AND Identifier = '<TrackingServerName>';
+WHERE region = 'us-east-1' AND Identifier = '{{ tracking_server_name }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -232,10 +232,10 @@ INSERT INTO awscc.sagemaker.mlflow_tracking_servers (
  ArtifactStoreUri,
  region
 )
-SELECT 
-'{{ TrackingServerName }}',
- '{{ RoleArn }}',
- '{{ ArtifactStoreUri }}',
+SELECT
+'{{ tracking_server_name }}',
+ '{{ role_arn }}',
+ '{{ artifact_store_uri }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -254,15 +254,15 @@ INSERT INTO awscc.sagemaker.mlflow_tracking_servers (
  Tags,
  region
 )
-SELECT 
- '{{ TrackingServerName }}',
- '{{ TrackingServerSize }}',
- '{{ MlflowVersion }}',
- '{{ RoleArn }}',
- '{{ ArtifactStoreUri }}',
- '{{ AutomaticModelRegistration }}',
- '{{ WeeklyMaintenanceWindowStart }}',
- '{{ Tags }}',
+SELECT
+ '{{ tracking_server_name }}',
+ '{{ tracking_server_size }}',
+ '{{ mlflow_version }}',
+ '{{ role_arn }}',
+ '{{ artifact_store_uri }}',
+ '{{ automatic_model_registration }}',
+ '{{ weekly_maintenance_window_start }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -280,25 +280,24 @@ globals:
 resources:
   - name: mlflow_tracking_server
     props:
-      - name: TrackingServerName
-        value: '{{ TrackingServerName }}'
-      - name: TrackingServerSize
-        value: '{{ TrackingServerSize }}'
-      - name: MlflowVersion
-        value: '{{ MlflowVersion }}'
-      - name: RoleArn
-        value: '{{ RoleArn }}'
-      - name: ArtifactStoreUri
-        value: '{{ ArtifactStoreUri }}'
-      - name: AutomaticModelRegistration
-        value: '{{ AutomaticModelRegistration }}'
-      - name: WeeklyMaintenanceWindowStart
-        value: '{{ WeeklyMaintenanceWindowStart }}'
-      - name: Tags
+      - name: tracking_server_name
+        value: '{{ tracking_server_name }}'
+      - name: tracking_server_size
+        value: '{{ tracking_server_size }}'
+      - name: mlflow_version
+        value: '{{ mlflow_version }}'
+      - name: role_arn
+        value: '{{ role_arn }}'
+      - name: artifact_store_uri
+        value: '{{ artifact_store_uri }}'
+      - name: automatic_model_registration
+        value: '{{ automatic_model_registration }}'
+      - name: weekly_maintenance_window_start
+        value: '{{ weekly_maintenance_window_start }}'
+      - name: tags
         value:
-          - Value: '{{ Value }}'
-            Key: '{{ Key }}'
-
+          - value: '{{ value }}'
+            key: '{{ key }}'
 ```
 </TabItem>
 </Tabs>
@@ -320,7 +319,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<TrackingServerName>';
+AND Identifier = '{{ tracking_server_name }}';
 ```
 
 
@@ -329,7 +328,7 @@ AND Identifier = '<TrackingServerName>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.sagemaker.mlflow_tracking_servers
-WHERE Identifier = '<TrackingServerName>'
+WHERE Identifier = '{{ tracking_server_name }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/sagemaker/model_bias_job_definitions/index.md b/website/docs/services/sagemaker/model_bias_job_definitions/index.md
index d92b241dd..1319ed7ba 100644
--- a/website/docs/services/sagemaker/model_bias_job_definitions/index.md
+++ b/website/docs/services/sagemaker/model_bias_job_definitions/index.md
@@ -449,7 +449,7 @@ stopping_condition,
 tags,
 creation_time
 FROM awscc.sagemaker.model_bias_job_definitions
-WHERE region = 'us-east-1' AND Identifier = '<JobDefinitionArn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ job_definition_arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -489,12 +489,12 @@ INSERT INTO awscc.sagemaker.model_bias_job_definitions (
  RoleArn,
  region
 )
-SELECT 
-'{{ ModelBiasAppSpecification }}',
- '{{ ModelBiasJobInput }}',
- '{{ ModelBiasJobOutputConfig }}',
- '{{ JobResources }}',
- '{{ RoleArn }}',
+SELECT
+'{{ model_bias_app_specification }}',
+ '{{ model_bias_job_input }}',
+ '{{ model_bias_job_output_config }}',
+ '{{ job_resources }}',
+ '{{ role_arn }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -516,18 +516,18 @@ INSERT INTO awscc.sagemaker.model_bias_job_definitions (
  Tags,
  region
 )
-SELECT 
- '{{ JobDefinitionName }}',
- '{{ ModelBiasBaselineConfig }}',
- '{{ ModelBiasAppSpecification }}',
- '{{ ModelBiasJobInput }}',
- '{{ ModelBiasJobOutputConfig }}',
- '{{ JobResources }}',
- '{{ NetworkConfig }}',
- '{{ EndpointName }}',
- '{{ RoleArn }}',
- '{{ StoppingCondition }}',
- '{{ Tags }}',
+SELECT
+ '{{ job_definition_name }}',
+ '{{ model_bias_baseline_config }}',
+ '{{ model_bias_app_specification }}',
+ '{{ model_bias_job_input }}',
+ '{{ model_bias_job_output_config }}',
+ '{{ job_resources }}',
+ '{{ network_config }}',
+ '{{ endpoint_name }}',
+ '{{ role_arn }}',
+ '{{ stopping_condition }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -545,76 +545,75 @@ globals:
 resources:
   - name: model_bias_job_definition
     props:
-      - name: JobDefinitionName
-        value: '{{ JobDefinitionName }}'
-      - name: ModelBiasBaselineConfig
+      - name: job_definition_name
+        value: '{{ job_definition_name }}'
+      - name: model_bias_baseline_config
         value:
-          BaseliningJobName: '{{ BaseliningJobName }}'
-          ConstraintsResource:
-            S3Uri: '{{ S3Uri }}'
-      - name: ModelBiasAppSpecification
+          baselining_job_name: '{{ baselining_job_name }}'
+          constraints_resource:
+            s3_uri: '{{ s3_uri }}'
+      - name: model_bias_app_specification
         value:
-          ImageUri: '{{ ImageUri }}'
-          ConfigUri: null
-          Environment: {}
-      - name: ModelBiasJobInput
+          image_uri: '{{ image_uri }}'
+          config_uri: null
+          environment: {}
+      - name: model_bias_job_input
         value:
-          EndpointInput:
-            EndpointName: '{{ EndpointName }}'
-            LocalPath: '{{ LocalPath }}'
-            S3DataDistributionType: '{{ S3DataDistributionType }}'
-            S3InputMode: '{{ S3InputMode }}'
-            ExcludeFeaturesAttribute: '{{ ExcludeFeaturesAttribute }}'
-          BatchTransformInput:
-            DataCapturedDestinationS3Uri: '{{ DataCapturedDestinationS3Uri }}'
-            DatasetFormat:
-              Csv:
-                Header: '{{ Header }}'
-              Json:
-                Line: '{{ Line }}'
-              Parquet: '{{ Parquet }}'
-            LocalPath: '{{ LocalPath }}'
-            S3DataDistributionType: '{{ S3DataDistributionType }}'
-            S3InputMode: '{{ S3InputMode }}'
-            ExcludeFeaturesAttribute: '{{ ExcludeFeaturesAttribute }}'
-          GroundTruthS3Input:
-            S3Uri: '{{ S3Uri }}'
-      - name: ModelBiasJobOutputConfig
+          endpoint_input:
+            endpoint_name: '{{ endpoint_name }}'
+            local_path: '{{ local_path }}'
+            s3_data_distribution_type: '{{ s3_data_distribution_type }}'
+            s3_input_mode: '{{ s3_input_mode }}'
+            exclude_features_attribute: '{{ exclude_features_attribute }}'
+          batch_transform_input:
+            data_captured_destination_s3_uri: '{{ data_captured_destination_s3_uri }}'
+            dataset_format:
+              csv:
+                header: '{{ header }}'
+              json:
+                line: '{{ line }}'
+              parquet: '{{ parquet }}'
+            local_path: '{{ local_path }}'
+            s3_data_distribution_type: '{{ s3_data_distribution_type }}'
+            s3_input_mode: '{{ s3_input_mode }}'
+            exclude_features_attribute: '{{ exclude_features_attribute }}'
+          ground_truth_s3_input:
+            s3_uri: '{{ s3_uri }}'
+      - name: model_bias_job_output_config
         value:
-          KmsKeyId: '{{ KmsKeyId }}'
-          MonitoringOutputs:
-            - S3Output:
-                LocalPath: '{{ LocalPath }}'
-                S3UploadMode: '{{ S3UploadMode }}'
-                S3Uri: '{{ S3Uri }}'
-      - name: JobResources
+          kms_key_id: '{{ kms_key_id }}'
+          monitoring_outputs:
+            - s3_output:
+                local_path: '{{ local_path }}'
+                s3_upload_mode: '{{ s3_upload_mode }}'
+                s3_uri: '{{ s3_uri }}'
+      - name: job_resources
         value:
-          ClusterConfig:
-            InstanceCount: '{{ InstanceCount }}'
-            InstanceType: '{{ InstanceType }}'
-            VolumeSizeInGB: '{{ VolumeSizeInGB }}'
-            VolumeKmsKeyId: '{{ VolumeKmsKeyId }}'
-      - name: NetworkConfig
+          cluster_config:
+            instance_count: '{{ instance_count }}'
+            instance_type: '{{ instance_type }}'
+            volume_size_in_gb: '{{ volume_size_in_gb }}'
+            volume_kms_key_id: '{{ volume_kms_key_id }}'
+      - name: network_config
         value:
-          EnableInterContainerTrafficEncryption: '{{ EnableInterContainerTrafficEncryption }}'
-          EnableNetworkIsolation: '{{ EnableNetworkIsolation }}'
-          VpcConfig:
-            SecurityGroupIds:
-              - '{{ SecurityGroupIds[0] }}'
-            Subnets:
-              - '{{ Subnets[0] }}'
-      - name: EndpointName
+          enable_inter_container_traffic_encryption: '{{ enable_inter_container_traffic_encryption }}'
+          enable_network_isolation: '{{ enable_network_isolation }}'
+          vpc_config:
+            security_group_ids:
+              - '{{ security_group_ids[0] }}'
+            subnets:
+              - '{{ subnets[0] }}'
+      - name: endpoint_name
         value: null
-      - name: RoleArn
-        value: '{{ RoleArn }}'
-      - name: StoppingCondition
+      - name: role_arn
+        value: '{{ role_arn }}'
+      - name: stopping_condition
         value:
-          MaxRuntimeInSeconds: '{{ MaxRuntimeInSeconds }}'
-      - name: Tags
+          max_runtime_in_seconds: '{{ max_runtime_in_seconds }}'
+      - name: tags
         value:
-          - Value: '{{ Value }}'
-            Key: '{{ Key }}'
-
+          - value: '{{ value }}'
+            key: '{{ key }}'
 ```
 </TabItem>
 </Tabs>
@@ -625,7 +624,7 @@ resources:
 ```sql
 /*+ delete */
 DELETE FROM awscc.sagemaker.model_bias_job_definitions
-WHERE Identifier = '<JobDefinitionArn>'
+WHERE Identifier = '{{ job_definition_arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/sagemaker/model_explainability_job_definitions/index.md b/website/docs/services/sagemaker/model_explainability_job_definitions/index.md
index 7eadf61bd..8d7ce85de 100644
--- a/website/docs/services/sagemaker/model_explainability_job_definitions/index.md
+++ b/website/docs/services/sagemaker/model_explainability_job_definitions/index.md
@@ -437,7 +437,7 @@ stopping_condition,
 tags,
 creation_time
 FROM awscc.sagemaker.model_explainability_job_definitions
-WHERE region = 'us-east-1' AND Identifier = '<JobDefinitionArn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ job_definition_arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -477,12 +477,12 @@ INSERT INTO awscc.sagemaker.model_explainability_job_definitions (
  RoleArn,
  region
 )
-SELECT 
-'{{ ModelExplainabilityAppSpecification }}',
- '{{ ModelExplainabilityJobInput }}',
- '{{ ModelExplainabilityJobOutputConfig }}',
- '{{ JobResources }}',
- '{{ RoleArn }}',
+SELECT
+'{{ model_explainability_app_specification }}',
+ '{{ model_explainability_job_input }}',
+ '{{ model_explainability_job_output_config }}',
+ '{{ job_resources }}',
+ '{{ role_arn }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -504,18 +504,18 @@ INSERT INTO awscc.sagemaker.model_explainability_job_definitions (
  Tags,
  region
 )
-SELECT 
- '{{ JobDefinitionName }}',
- '{{ ModelExplainabilityBaselineConfig }}',
- '{{ ModelExplainabilityAppSpecification }}',
- '{{ ModelExplainabilityJobInput }}',
- '{{ ModelExplainabilityJobOutputConfig }}',
- '{{ JobResources }}',
- '{{ NetworkConfig }}',
- '{{ EndpointName }}',
- '{{ RoleArn }}',
- '{{ StoppingCondition }}',
- '{{ Tags }}',
+SELECT
+ '{{ job_definition_name }}',
+ '{{ model_explainability_baseline_config }}',
+ '{{ model_explainability_app_specification }}',
+ '{{ model_explainability_job_input }}',
+ '{{ model_explainability_job_output_config }}',
+ '{{ job_resources }}',
+ '{{ network_config }}',
+ '{{ endpoint_name }}',
+ '{{ role_arn }}',
+ '{{ stopping_condition }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -533,74 +533,73 @@ globals:
 resources:
   - name: model_explainability_job_definition
     props:
-      - name: JobDefinitionName
-        value: '{{ JobDefinitionName }}'
-      - name: ModelExplainabilityBaselineConfig
+      - name: job_definition_name
+        value: '{{ job_definition_name }}'
+      - name: model_explainability_baseline_config
         value:
-          BaseliningJobName: '{{ BaseliningJobName }}'
-          ConstraintsResource:
-            S3Uri: '{{ S3Uri }}'
-      - name: ModelExplainabilityAppSpecification
+          baselining_job_name: '{{ baselining_job_name }}'
+          constraints_resource:
+            s3_uri: '{{ s3_uri }}'
+      - name: model_explainability_app_specification
         value:
-          ImageUri: '{{ ImageUri }}'
-          ConfigUri: null
-          Environment: {}
-      - name: ModelExplainabilityJobInput
+          image_uri: '{{ image_uri }}'
+          config_uri: null
+          environment: {}
+      - name: model_explainability_job_input
         value:
-          EndpointInput:
-            EndpointName: '{{ EndpointName }}'
-            LocalPath: '{{ LocalPath }}'
-            S3DataDistributionType: '{{ S3DataDistributionType }}'
-            S3InputMode: '{{ S3InputMode }}'
-            ExcludeFeaturesAttribute: '{{ ExcludeFeaturesAttribute }}'
-          BatchTransformInput:
-            DataCapturedDestinationS3Uri: '{{ DataCapturedDestinationS3Uri }}'
-            DatasetFormat:
-              Csv:
-                Header: '{{ Header }}'
-              Json:
-                Line: '{{ Line }}'
-              Parquet: '{{ Parquet }}'
-            LocalPath: '{{ LocalPath }}'
-            S3DataDistributionType: '{{ S3DataDistributionType }}'
-            S3InputMode: '{{ S3InputMode }}'
-            ExcludeFeaturesAttribute: '{{ ExcludeFeaturesAttribute }}'
-      - name: ModelExplainabilityJobOutputConfig
+          endpoint_input:
+            endpoint_name: '{{ endpoint_name }}'
+            local_path: '{{ local_path }}'
+            s3_data_distribution_type: '{{ s3_data_distribution_type }}'
+            s3_input_mode: '{{ s3_input_mode }}'
+            exclude_features_attribute: '{{ exclude_features_attribute }}'
+          batch_transform_input:
+            data_captured_destination_s3_uri: '{{ data_captured_destination_s3_uri }}'
+            dataset_format:
+              csv:
+                header: '{{ header }}'
+              json:
+                line: '{{ line }}'
+              parquet: '{{ parquet }}'
+            local_path: '{{ local_path }}'
+            s3_data_distribution_type: '{{ s3_data_distribution_type }}'
+            s3_input_mode: '{{ s3_input_mode }}'
+            exclude_features_attribute: '{{ exclude_features_attribute }}'
+      - name: model_explainability_job_output_config
         value:
-          KmsKeyId: '{{ KmsKeyId }}'
-          MonitoringOutputs:
-            - S3Output:
-                LocalPath: '{{ LocalPath }}'
-                S3UploadMode: '{{ S3UploadMode }}'
-                S3Uri: '{{ S3Uri }}'
-      - name: JobResources
+          kms_key_id: '{{ kms_key_id }}'
+          monitoring_outputs:
+            - s3_output:
+                local_path: '{{ local_path }}'
+                s3_upload_mode: '{{ s3_upload_mode }}'
+                s3_uri: '{{ s3_uri }}'
+      - name: job_resources
         value:
-          ClusterConfig:
-            InstanceCount: '{{ InstanceCount }}'
-            InstanceType: '{{ InstanceType }}'
-            VolumeSizeInGB: '{{ VolumeSizeInGB }}'
-            VolumeKmsKeyId: '{{ VolumeKmsKeyId }}'
-      - name: NetworkConfig
+          cluster_config:
+            instance_count: '{{ instance_count }}'
+            instance_type: '{{ instance_type }}'
+            volume_size_in_gb: '{{ volume_size_in_gb }}'
+            volume_kms_key_id: '{{ volume_kms_key_id }}'
+      - name: network_config
         value:
-          EnableInterContainerTrafficEncryption: '{{ EnableInterContainerTrafficEncryption }}'
-          EnableNetworkIsolation: '{{ EnableNetworkIsolation }}'
-          VpcConfig:
-            SecurityGroupIds:
-              - '{{ SecurityGroupIds[0] }}'
-            Subnets:
-              - '{{ Subnets[0] }}'
-      - name: EndpointName
+          enable_inter_container_traffic_encryption: '{{ enable_inter_container_traffic_encryption }}'
+          enable_network_isolation: '{{ enable_network_isolation }}'
+          vpc_config:
+            security_group_ids:
+              - '{{ security_group_ids[0] }}'
+            subnets:
+              - '{{ subnets[0] }}'
+      - name: endpoint_name
         value: null
-      - name: RoleArn
-        value: '{{ RoleArn }}'
-      - name: StoppingCondition
+      - name: role_arn
+        value: '{{ role_arn }}'
+      - name: stopping_condition
         value:
-          MaxRuntimeInSeconds: '{{ MaxRuntimeInSeconds }}'
-      - name: Tags
+          max_runtime_in_seconds: '{{ max_runtime_in_seconds }}'
+      - name: tags
         value:
-          - Value: '{{ Value }}'
-            Key: '{{ Key }}'
-
+          - value: '{{ value }}'
+            key: '{{ key }}'
 ```
 </TabItem>
 </Tabs>
@@ -611,7 +610,7 @@ resources:
 ```sql
 /*+ delete */
 DELETE FROM awscc.sagemaker.model_explainability_job_definitions
-WHERE Identifier = '<JobDefinitionArn>'
+WHERE Identifier = '{{ job_definition_arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/sagemaker/model_package_groups/index.md b/website/docs/services/sagemaker/model_package_groups/index.md
index b1e04b9e7..207b69124 100644
--- a/website/docs/services/sagemaker/model_package_groups/index.md
+++ b/website/docs/services/sagemaker/model_package_groups/index.md
@@ -182,7 +182,7 @@ model_package_group_policy,
 creation_time,
 model_package_group_status
 FROM awscc.sagemaker.model_package_groups
-WHERE region = 'us-east-1' AND Identifier = '<ModelPackageGroupArn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ model_package_group_arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -218,8 +218,8 @@ INSERT INTO awscc.sagemaker.model_package_groups (
  ModelPackageGroupName,
  region
 )
-SELECT 
-'{{ ModelPackageGroupName }}',
+SELECT
+'{{ model_package_group_name }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -234,11 +234,11 @@ INSERT INTO awscc.sagemaker.model_package_groups (
  ModelPackageGroupPolicy,
  region
 )
-SELECT 
- '{{ Tags }}',
- '{{ ModelPackageGroupName }}',
- '{{ ModelPackageGroupDescription }}',
- '{{ ModelPackageGroupPolicy }}',
+SELECT
+ '{{ tags }}',
+ '{{ model_package_group_name }}',
+ '{{ model_package_group_description }}',
+ '{{ model_package_group_policy }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -256,17 +256,16 @@ globals:
 resources:
   - name: model_package_group
     props:
-      - name: Tags
+      - name: tags
         value:
-          - Value: '{{ Value }}'
-            Key: '{{ Key }}'
-      - name: ModelPackageGroupName
-        value: '{{ ModelPackageGroupName }}'
-      - name: ModelPackageGroupDescription
-        value: '{{ ModelPackageGroupDescription }}'
-      - name: ModelPackageGroupPolicy
+          - value: '{{ value }}'
+            key: '{{ key }}'
+      - name: model_package_group_name
+        value: '{{ model_package_group_name }}'
+      - name: model_package_group_description
+        value: '{{ model_package_group_description }}'
+      - name: model_package_group_policy
         value: {}
-
 ```
 </TabItem>
 </Tabs>
@@ -283,7 +282,7 @@ SET PatchDocument = string('{{ {
     "ModelPackageGroupPolicy": model_package_group_policy
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<ModelPackageGroupArn>';
+AND Identifier = '{{ model_package_group_arn }}';
 ```
 
 
@@ -292,7 +291,7 @@ AND Identifier = '<ModelPackageGroupArn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.sagemaker.model_package_groups
-WHERE Identifier = '<ModelPackageGroupArn>'
+WHERE Identifier = '{{ model_package_group_arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/sagemaker/model_packages/index.md b/website/docs/services/sagemaker/model_packages/index.md
index c27546969..0a32d4e28 100644
--- a/website/docs/services/sagemaker/model_packages/index.md
+++ b/website/docs/services/sagemaker/model_packages/index.md
@@ -936,7 +936,7 @@ source_uri,
 model_card,
 security_config
 FROM awscc.sagemaker.model_packages
-WHERE region = 'us-east-1' AND Identifier = '<ModelPackageArn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ model_package_arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -998,34 +998,34 @@ INSERT INTO awscc.sagemaker.model_packages (
  SecurityConfig,
  region
 )
-SELECT 
-'{{ Tags }}',
- '{{ AdditionalInferenceSpecifications }}',
- '{{ CertifyForMarketplace }}',
- '{{ ClientToken }}',
- '{{ CustomerMetadataProperties }}',
- '{{ Domain }}',
- '{{ DriftCheckBaselines }}',
- '{{ InferenceSpecification }}',
- '{{ MetadataProperties }}',
- '{{ ModelApprovalStatus }}',
- '{{ ModelMetrics }}',
- '{{ ModelPackageDescription }}',
- '{{ ModelPackageGroupName }}',
- '{{ ModelPackageName }}',
- '{{ SamplePayloadUrl }}',
- '{{ SkipModelValidation }}',
- '{{ SourceAlgorithmSpecification }}',
- '{{ Task }}',
- '{{ ValidationSpecification }}',
- '{{ ApprovalDescription }}',
- '{{ LastModifiedTime }}',
- '{{ ModelPackageVersion }}',
- '{{ AdditionalInferenceSpecificationsToAdd }}',
- '{{ ModelPackageStatusDetails }}',
- '{{ SourceUri }}',
- '{{ ModelCard }}',
- '{{ SecurityConfig }}',
+SELECT
+'{{ tags }}',
+ '{{ additional_inference_specifications }}',
+ '{{ certify_for_marketplace }}',
+ '{{ client_token }}',
+ '{{ customer_metadata_properties }}',
+ '{{ domain }}',
+ '{{ drift_check_baselines }}',
+ '{{ inference_specification }}',
+ '{{ metadata_properties }}',
+ '{{ model_approval_status }}',
+ '{{ model_metrics }}',
+ '{{ model_package_description }}',
+ '{{ model_package_group_name }}',
+ '{{ model_package_name }}',
+ '{{ sample_payload_url }}',
+ '{{ skip_model_validation }}',
+ '{{ source_algorithm_specification }}',
+ '{{ task }}',
+ '{{ validation_specification }}',
+ '{{ approval_description }}',
+ '{{ last_modified_time }}',
+ '{{ model_package_version }}',
+ '{{ additional_inference_specifications_to_add }}',
+ '{{ model_package_status_details }}',
+ '{{ source_uri }}',
+ '{{ model_card }}',
+ '{{ security_config }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -1063,34 +1063,34 @@ INSERT INTO awscc.sagemaker.model_packages (
  SecurityConfig,
  region
 )
-SELECT 
- '{{ Tags }}',
- '{{ AdditionalInferenceSpecifications }}',
- '{{ CertifyForMarketplace }}',
- '{{ ClientToken }}',
- '{{ CustomerMetadataProperties }}',
- '{{ Domain }}',
- '{{ DriftCheckBaselines }}',
- '{{ InferenceSpecification }}',
- '{{ MetadataProperties }}',
- '{{ ModelApprovalStatus }}',
- '{{ ModelMetrics }}',
- '{{ ModelPackageDescription }}',
- '{{ ModelPackageGroupName }}',
- '{{ ModelPackageName }}',
- '{{ SamplePayloadUrl }}',
- '{{ SkipModelValidation }}',
- '{{ SourceAlgorithmSpecification }}',
- '{{ Task }}',
- '{{ ValidationSpecification }}',
- '{{ ApprovalDescription }}',
- '{{ LastModifiedTime }}',
- '{{ ModelPackageVersion }}',
- '{{ AdditionalInferenceSpecificationsToAdd }}',
- '{{ ModelPackageStatusDetails }}',
- '{{ SourceUri }}',
- '{{ ModelCard }}',
- '{{ SecurityConfig }}',
+SELECT
+ '{{ tags }}',
+ '{{ additional_inference_specifications }}',
+ '{{ certify_for_marketplace }}',
+ '{{ client_token }}',
+ '{{ customer_metadata_properties }}',
+ '{{ domain }}',
+ '{{ drift_check_baselines }}',
+ '{{ inference_specification }}',
+ '{{ metadata_properties }}',
+ '{{ model_approval_status }}',
+ '{{ model_metrics }}',
+ '{{ model_package_description }}',
+ '{{ model_package_group_name }}',
+ '{{ model_package_name }}',
+ '{{ sample_payload_url }}',
+ '{{ skip_model_validation }}',
+ '{{ source_algorithm_specification }}',
+ '{{ task }}',
+ '{{ validation_specification }}',
+ '{{ approval_description }}',
+ '{{ last_modified_time }}',
+ '{{ model_package_version }}',
+ '{{ additional_inference_specifications_to_add }}',
+ '{{ model_package_status_details }}',
+ '{{ source_uri }}',
+ '{{ model_card }}',
+ '{{ security_config }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -1108,171 +1108,170 @@ globals:
 resources:
   - name: model_package
     props:
-      - name: Tags
+      - name: tags
         value:
-          - Value: '{{ Value }}'
-            Key: '{{ Key }}'
-      - name: AdditionalInferenceSpecifications
+          - value: '{{ value }}'
+            key: '{{ key }}'
+      - name: additional_inference_specifications
         value:
-          - Containers:
-              - ContainerHostname: '{{ ContainerHostname }}'
-                Environment: {}
-                ModelInput:
-                  DataInputConfig: '{{ DataInputConfig }}'
-                Image: '{{ Image }}'
-                ImageDigest: '{{ ImageDigest }}'
-                ModelDataUrl: '{{ ModelDataUrl }}'
-                ModelDataSource:
-                  S3DataSource:
-                    S3DataType: '{{ S3DataType }}'
-                    S3Uri: '{{ S3Uri }}'
-                    CompressionType: '{{ CompressionType }}'
-                    ModelAccessConfig:
-                      AcceptEula: '{{ AcceptEula }}'
-                Framework: '{{ Framework }}'
-                FrameworkVersion: '{{ FrameworkVersion }}'
-                NearestModelName: '{{ NearestModelName }}'
-            Description: '{{ Description }}'
-            Name: '{{ Name }}'
-            SupportedContentTypes:
-              - '{{ SupportedContentTypes[0] }}'
-            SupportedRealtimeInferenceInstanceTypes:
-              - '{{ SupportedRealtimeInferenceInstanceTypes[0] }}'
-            SupportedResponseMIMETypes:
-              - '{{ SupportedResponseMIMETypes[0] }}'
-            SupportedTransformInstanceTypes:
-              - '{{ SupportedTransformInstanceTypes[0] }}'
-      - name: CertifyForMarketplace
-        value: '{{ CertifyForMarketplace }}'
-      - name: ClientToken
-        value: '{{ ClientToken }}'
-      - name: CustomerMetadataProperties
+          - containers:
+              - container_hostname: '{{ container_hostname }}'
+                environment: {}
+                model_input:
+                  data_input_config: '{{ data_input_config }}'
+                image: '{{ image }}'
+                image_digest: '{{ image_digest }}'
+                model_data_url: '{{ model_data_url }}'
+                model_data_source:
+                  s3_data_source:
+                    s3_data_type: '{{ s3_data_type }}'
+                    s3_uri: '{{ s3_uri }}'
+                    compression_type: '{{ compression_type }}'
+                    model_access_config:
+                      accept_eula: '{{ accept_eula }}'
+                framework: '{{ framework }}'
+                framework_version: '{{ framework_version }}'
+                nearest_model_name: '{{ nearest_model_name }}'
+            description: '{{ description }}'
+            name: '{{ name }}'
+            supported_content_types:
+              - '{{ supported_content_types[0] }}'
+            supported_realtime_inference_instance_types:
+              - '{{ supported_realtime_inference_instance_types[0] }}'
+            supported_response_mi_me_types:
+              - '{{ supported_response_mi_me_types[0] }}'
+            supported_transform_instance_types:
+              - '{{ supported_transform_instance_types[0] }}'
+      - name: certify_for_marketplace
+        value: '{{ certify_for_marketplace }}'
+      - name: client_token
+        value: '{{ client_token }}'
+      - name: customer_metadata_properties
         value: {}
-      - name: Domain
-        value: '{{ Domain }}'
-      - name: DriftCheckBaselines
+      - name: domain
+        value: '{{ domain }}'
+      - name: drift_check_baselines
         value:
-          Bias:
-            PostTrainingConstraints:
-              ContentDigest: '{{ ContentDigest }}'
-              ContentType: '{{ ContentType }}'
-              S3Uri: '{{ S3Uri }}'
-            PreTrainingConstraints: null
-            ConfigFile:
-              ContentDigest: '{{ ContentDigest }}'
-              ContentType: '{{ ContentType }}'
-              S3Uri: '{{ S3Uri }}'
-          Explainability:
-            Constraints: null
-            ConfigFile: null
-          ModelDataQuality:
-            Constraints: null
-            Statistics: null
-          ModelQuality:
-            Constraints: null
-            Statistics: null
-      - name: InferenceSpecification
+          bias:
+            post_training_constraints:
+              content_digest: '{{ content_digest }}'
+              content_type: '{{ content_type }}'
+              s3_uri: '{{ s3_uri }}'
+            pre_training_constraints: null
+            config_file:
+              content_digest: '{{ content_digest }}'
+              content_type: '{{ content_type }}'
+              s3_uri: '{{ s3_uri }}'
+          explainability:
+            constraints: null
+            config_file: null
+          model_data_quality:
+            constraints: null
+            statistics: null
+          model_quality:
+            constraints: null
+            statistics: null
+      - name: inference_specification
         value:
-          Containers:
+          containers:
             - null
-          SupportedContentTypes:
+          supported_content_types:
             - null
-          SupportedRealtimeInferenceInstanceTypes:
+          supported_realtime_inference_instance_types:
             - null
-          SupportedResponseMIMETypes:
+          supported_response_mi_me_types:
             - null
-          SupportedTransformInstanceTypes:
+          supported_transform_instance_types:
             - null
-      - name: MetadataProperties
+      - name: metadata_properties
         value:
-          CommitId: '{{ CommitId }}'
-          GeneratedBy: '{{ GeneratedBy }}'
-          ProjectId: '{{ ProjectId }}'
-          Repository: '{{ Repository }}'
-      - name: ModelApprovalStatus
-        value: '{{ ModelApprovalStatus }}'
-      - name: ModelMetrics
+          commit_id: '{{ commit_id }}'
+          generated_by: '{{ generated_by }}'
+          project_id: '{{ project_id }}'
+          repository: '{{ repository }}'
+      - name: model_approval_status
+        value: '{{ model_approval_status }}'
+      - name: model_metrics
         value:
-          Bias:
-            Report: null
-            PreTrainingReport: null
-            PostTrainingReport: null
-          Explainability:
-            Report: null
-          ModelDataQuality:
-            Constraints: null
-            Statistics: null
-          ModelQuality:
-            Constraints: null
-            Statistics: null
-      - name: ModelPackageDescription
-        value: '{{ ModelPackageDescription }}'
-      - name: ModelPackageGroupName
-        value: '{{ ModelPackageGroupName }}'
-      - name: ModelPackageName
-        value: '{{ ModelPackageName }}'
-      - name: SamplePayloadUrl
-        value: '{{ SamplePayloadUrl }}'
-      - name: SkipModelValidation
-        value: '{{ SkipModelValidation }}'
-      - name: SourceAlgorithmSpecification
+          bias:
+            report: null
+            pre_training_report: null
+            post_training_report: null
+          explainability:
+            report: null
+          model_data_quality:
+            constraints: null
+            statistics: null
+          model_quality:
+            constraints: null
+            statistics: null
+      - name: model_package_description
+        value: '{{ model_package_description }}'
+      - name: model_package_group_name
+        value: '{{ model_package_group_name }}'
+      - name: model_package_name
+        value: '{{ model_package_name }}'
+      - name: sample_payload_url
+        value: '{{ sample_payload_url }}'
+      - name: skip_model_validation
+        value: '{{ skip_model_validation }}'
+      - name: source_algorithm_specification
         value:
-          SourceAlgorithms:
-            - AlgorithmName: '{{ AlgorithmName }}'
-              ModelDataUrl: '{{ ModelDataUrl }}'
-      - name: Task
-        value: '{{ Task }}'
-      - name: ValidationSpecification
+          source_algorithms:
+            - algorithm_name: '{{ algorithm_name }}'
+              model_data_url: '{{ model_data_url }}'
+      - name: task
+        value: '{{ task }}'
+      - name: validation_specification
         value:
-          ValidationProfiles:
-            - TransformJobDefinition:
-                Environment: null
-                BatchStrategy: '{{ BatchStrategy }}'
-                MaxConcurrentTransforms: '{{ MaxConcurrentTransforms }}'
-                MaxPayloadInMB: '{{ MaxPayloadInMB }}'
-                TransformInput:
-                  CompressionType: '{{ CompressionType }}'
-                  ContentType: '{{ ContentType }}'
-                  DataSource:
-                    S3DataSource:
-                      S3DataType: '{{ S3DataType }}'
-                      S3Uri: '{{ S3Uri }}'
-                  SplitType: '{{ SplitType }}'
-                TransformOutput:
-                  Accept: '{{ Accept }}'
-                  KmsKeyId: '{{ KmsKeyId }}'
-                  S3OutputPath: '{{ S3OutputPath }}'
-                  AssembleWith: '{{ AssembleWith }}'
-                TransformResources:
-                  InstanceCount: '{{ InstanceCount }}'
-                  InstanceType: '{{ InstanceType }}'
-                  VolumeKmsKeyId: '{{ VolumeKmsKeyId }}'
-              ProfileName: '{{ ProfileName }}'
-          ValidationRole: '{{ ValidationRole }}'
-      - name: ApprovalDescription
-        value: '{{ ApprovalDescription }}'
-      - name: LastModifiedTime
-        value: '{{ LastModifiedTime }}'
-      - name: ModelPackageVersion
-        value: '{{ ModelPackageVersion }}'
-      - name: AdditionalInferenceSpecificationsToAdd
+          validation_profiles:
+            - transform_job_definition:
+                environment: null
+                batch_strategy: '{{ batch_strategy }}'
+                max_concurrent_transforms: '{{ max_concurrent_transforms }}'
+                max_payload_in_mb: '{{ max_payload_in_mb }}'
+                transform_input:
+                  compression_type: '{{ compression_type }}'
+                  content_type: '{{ content_type }}'
+                  data_source:
+                    s3_data_source:
+                      s3_data_type: '{{ s3_data_type }}'
+                      s3_uri: '{{ s3_uri }}'
+                  split_type: '{{ split_type }}'
+                transform_output:
+                  accept: '{{ accept }}'
+                  kms_key_id: '{{ kms_key_id }}'
+                  s3_output_path: '{{ s3_output_path }}'
+                  assemble_with: '{{ assemble_with }}'
+                transform_resources:
+                  instance_count: '{{ instance_count }}'
+                  instance_type: '{{ instance_type }}'
+                  volume_kms_key_id: '{{ volume_kms_key_id }}'
+              profile_name: '{{ profile_name }}'
+          validation_role: '{{ validation_role }}'
+      - name: approval_description
+        value: '{{ approval_description }}'
+      - name: last_modified_time
+        value: '{{ last_modified_time }}'
+      - name: model_package_version
+        value: '{{ model_package_version }}'
+      - name: additional_inference_specifications_to_add
         value: null
-      - name: ModelPackageStatusDetails
+      - name: model_package_status_details
         value:
-          ValidationStatuses:
-            - FailureReason: '{{ FailureReason }}'
-              Name: '{{ Name }}'
-              Status: '{{ Status }}'
-      - name: SourceUri
-        value: '{{ SourceUri }}'
-      - name: ModelCard
+          validation_statuses:
+            - failure_reason: '{{ failure_reason }}'
+              name: '{{ name }}'
+              status: '{{ status }}'
+      - name: source_uri
+        value: '{{ source_uri }}'
+      - name: model_card
         value:
-          ModelCardContent: '{{ ModelCardContent }}'
-          ModelCardStatus: '{{ ModelCardStatus }}'
-      - name: SecurityConfig
+          model_card_content: '{{ model_card_content }}'
+          model_card_status: '{{ model_card_status }}'
+      - name: security_config
         value:
-          KmsKeyId: '{{ KmsKeyId }}'
-
+          kms_key_id: '{{ kms_key_id }}'
 ```
 </TabItem>
 </Tabs>
@@ -1301,7 +1300,7 @@ SET PatchDocument = string('{{ {
     "ModelCard": model_card
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<ModelPackageArn>';
+AND Identifier = '{{ model_package_arn }}';
 ```
 
 
@@ -1310,7 +1309,7 @@ AND Identifier = '<ModelPackageArn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.sagemaker.model_packages
-WHERE Identifier = '<ModelPackageArn>'
+WHERE Identifier = '{{ model_package_arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/sagemaker/model_quality_job_definitions/index.md b/website/docs/services/sagemaker/model_quality_job_definitions/index.md
index c298f5f99..641d2c22d 100644
--- a/website/docs/services/sagemaker/model_quality_job_definitions/index.md
+++ b/website/docs/services/sagemaker/model_quality_job_definitions/index.md
@@ -464,7 +464,7 @@ stopping_condition,
 tags,
 creation_time
 FROM awscc.sagemaker.model_quality_job_definitions
-WHERE region = 'us-east-1' AND Identifier = '<JobDefinitionArn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ job_definition_arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -504,12 +504,12 @@ INSERT INTO awscc.sagemaker.model_quality_job_definitions (
  RoleArn,
  region
 )
-SELECT 
-'{{ ModelQualityAppSpecification }}',
- '{{ ModelQualityJobInput }}',
- '{{ ModelQualityJobOutputConfig }}',
- '{{ JobResources }}',
- '{{ RoleArn }}',
+SELECT
+'{{ model_quality_app_specification }}',
+ '{{ model_quality_job_input }}',
+ '{{ model_quality_job_output_config }}',
+ '{{ job_resources }}',
+ '{{ role_arn }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -531,18 +531,18 @@ INSERT INTO awscc.sagemaker.model_quality_job_definitions (
  Tags,
  region
 )
-SELECT 
- '{{ JobDefinitionName }}',
- '{{ ModelQualityBaselineConfig }}',
- '{{ ModelQualityAppSpecification }}',
- '{{ ModelQualityJobInput }}',
- '{{ ModelQualityJobOutputConfig }}',
- '{{ JobResources }}',
- '{{ NetworkConfig }}',
- '{{ EndpointName }}',
- '{{ RoleArn }}',
- '{{ StoppingCondition }}',
- '{{ Tags }}',
+SELECT
+ '{{ job_definition_name }}',
+ '{{ model_quality_baseline_config }}',
+ '{{ model_quality_app_specification }}',
+ '{{ model_quality_job_input }}',
+ '{{ model_quality_job_output_config }}',
+ '{{ job_resources }}',
+ '{{ network_config }}',
+ '{{ endpoint_name }}',
+ '{{ role_arn }}',
+ '{{ stopping_condition }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -560,82 +560,81 @@ globals:
 resources:
   - name: model_quality_job_definition
     props:
-      - name: JobDefinitionName
-        value: '{{ JobDefinitionName }}'
-      - name: ModelQualityBaselineConfig
+      - name: job_definition_name
+        value: '{{ job_definition_name }}'
+      - name: model_quality_baseline_config
         value:
-          BaseliningJobName: '{{ BaseliningJobName }}'
-          ConstraintsResource:
-            S3Uri: '{{ S3Uri }}'
-      - name: ModelQualityAppSpecification
+          baselining_job_name: '{{ baselining_job_name }}'
+          constraints_resource:
+            s3_uri: '{{ s3_uri }}'
+      - name: model_quality_app_specification
         value:
-          ContainerArguments:
-            - '{{ ContainerArguments[0] }}'
-          ContainerEntrypoint:
-            - '{{ ContainerEntrypoint[0] }}'
-          ImageUri: '{{ ImageUri }}'
-          PostAnalyticsProcessorSourceUri: null
-          RecordPreprocessorSourceUri: null
-          Environment: {}
-          ProblemType: '{{ ProblemType }}'
-      - name: ModelQualityJobInput
+          container_arguments:
+            - '{{ container_arguments[0] }}'
+          container_entrypoint:
+            - '{{ container_entrypoint[0] }}'
+          image_uri: '{{ image_uri }}'
+          post_analytics_processor_source_uri: null
+          record_preprocessor_source_uri: null
+          environment: {}
+          problem_type: '{{ problem_type }}'
+      - name: model_quality_job_input
         value:
-          EndpointInput:
-            EndpointName: '{{ EndpointName }}'
-            LocalPath: '{{ LocalPath }}'
-            S3DataDistributionType: '{{ S3DataDistributionType }}'
-            S3InputMode: '{{ S3InputMode }}'
-            ExcludeFeaturesAttribute: '{{ ExcludeFeaturesAttribute }}'
-          BatchTransformInput:
-            DataCapturedDestinationS3Uri: '{{ DataCapturedDestinationS3Uri }}'
-            DatasetFormat:
-              Csv:
-                Header: '{{ Header }}'
-              Json:
-                Line: '{{ Line }}'
-              Parquet: '{{ Parquet }}'
-            LocalPath: '{{ LocalPath }}'
-            S3DataDistributionType: '{{ S3DataDistributionType }}'
-            S3InputMode: '{{ S3InputMode }}'
-            ExcludeFeaturesAttribute: '{{ ExcludeFeaturesAttribute }}'
-          GroundTruthS3Input:
-            S3Uri: '{{ S3Uri }}'
-      - name: ModelQualityJobOutputConfig
+          endpoint_input:
+            endpoint_name: '{{ endpoint_name }}'
+            local_path: '{{ local_path }}'
+            s3_data_distribution_type: '{{ s3_data_distribution_type }}'
+            s3_input_mode: '{{ s3_input_mode }}'
+            exclude_features_attribute: '{{ exclude_features_attribute }}'
+          batch_transform_input:
+            data_captured_destination_s3_uri: '{{ data_captured_destination_s3_uri }}'
+            dataset_format:
+              csv:
+                header: '{{ header }}'
+              json:
+                line: '{{ line }}'
+              parquet: '{{ parquet }}'
+            local_path: '{{ local_path }}'
+            s3_data_distribution_type: '{{ s3_data_distribution_type }}'
+            s3_input_mode: '{{ s3_input_mode }}'
+            exclude_features_attribute: '{{ exclude_features_attribute }}'
+          ground_truth_s3_input:
+            s3_uri: '{{ s3_uri }}'
+      - name: model_quality_job_output_config
         value:
-          KmsKeyId: '{{ KmsKeyId }}'
-          MonitoringOutputs:
-            - S3Output:
-                LocalPath: '{{ LocalPath }}'
-                S3UploadMode: '{{ S3UploadMode }}'
-                S3Uri: '{{ S3Uri }}'
-      - name: JobResources
+          kms_key_id: '{{ kms_key_id }}'
+          monitoring_outputs:
+            - s3_output:
+                local_path: '{{ local_path }}'
+                s3_upload_mode: '{{ s3_upload_mode }}'
+                s3_uri: '{{ s3_uri }}'
+      - name: job_resources
         value:
-          ClusterConfig:
-            InstanceCount: '{{ InstanceCount }}'
-            InstanceType: '{{ InstanceType }}'
-            VolumeSizeInGB: '{{ VolumeSizeInGB }}'
-            VolumeKmsKeyId: '{{ VolumeKmsKeyId }}'
-      - name: NetworkConfig
+          cluster_config:
+            instance_count: '{{ instance_count }}'
+            instance_type: '{{ instance_type }}'
+            volume_size_in_gb: '{{ volume_size_in_gb }}'
+            volume_kms_key_id: '{{ volume_kms_key_id }}'
+      - name: network_config
         value:
-          EnableInterContainerTrafficEncryption: '{{ EnableInterContainerTrafficEncryption }}'
-          EnableNetworkIsolation: '{{ EnableNetworkIsolation }}'
-          VpcConfig:
-            SecurityGroupIds:
-              - '{{ SecurityGroupIds[0] }}'
-            Subnets:
-              - '{{ Subnets[0] }}'
-      - name: EndpointName
+          enable_inter_container_traffic_encryption: '{{ enable_inter_container_traffic_encryption }}'
+          enable_network_isolation: '{{ enable_network_isolation }}'
+          vpc_config:
+            security_group_ids:
+              - '{{ security_group_ids[0] }}'
+            subnets:
+              - '{{ subnets[0] }}'
+      - name: endpoint_name
         value: null
-      - name: RoleArn
-        value: '{{ RoleArn }}'
-      - name: StoppingCondition
+      - name: role_arn
+        value: '{{ role_arn }}'
+      - name: stopping_condition
         value:
-          MaxRuntimeInSeconds: '{{ MaxRuntimeInSeconds }}'
-      - name: Tags
+          max_runtime_in_seconds: '{{ max_runtime_in_seconds }}'
+      - name: tags
         value:
-          - Value: '{{ Value }}'
-            Key: '{{ Key }}'
-
+          - value: '{{ value }}'
+            key: '{{ key }}'
 ```
 </TabItem>
 </Tabs>
@@ -646,7 +645,7 @@ resources:
 ```sql
 /*+ delete */
 DELETE FROM awscc.sagemaker.model_quality_job_definitions
-WHERE Identifier = '<JobDefinitionArn>'
+WHERE Identifier = '{{ job_definition_arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/sagemaker/monitoring_schedules/index.md b/website/docs/services/sagemaker/monitoring_schedules/index.md
index 7c1806c42..da6605f93 100644
--- a/website/docs/services/sagemaker/monitoring_schedules/index.md
+++ b/website/docs/services/sagemaker/monitoring_schedules/index.md
@@ -402,7 +402,7 @@ last_modified_time,
 last_monitoring_execution_summary,
 monitoring_schedule_status
 FROM awscc.sagemaker.monitoring_schedules
-WHERE region = 'us-east-1' AND Identifier = '<MonitoringScheduleArn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ monitoring_schedule_arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -439,9 +439,9 @@ INSERT INTO awscc.sagemaker.monitoring_schedules (
  MonitoringScheduleConfig,
  region
 )
-SELECT 
-'{{ MonitoringScheduleName }}',
- '{{ MonitoringScheduleConfig }}',
+SELECT
+'{{ monitoring_schedule_name }}',
+ '{{ monitoring_schedule_config }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -459,14 +459,14 @@ INSERT INTO awscc.sagemaker.monitoring_schedules (
  MonitoringScheduleStatus,
  region
 )
-SELECT 
- '{{ MonitoringScheduleName }}',
- '{{ MonitoringScheduleConfig }}',
- '{{ Tags }}',
- '{{ EndpointName }}',
- '{{ FailureReason }}',
- '{{ LastMonitoringExecutionSummary }}',
- '{{ MonitoringScheduleStatus }}',
+SELECT
+ '{{ monitoring_schedule_name }}',
+ '{{ monitoring_schedule_config }}',
+ '{{ tags }}',
+ '{{ endpoint_name }}',
+ '{{ failure_reason }}',
+ '{{ last_monitoring_execution_summary }}',
+ '{{ monitoring_schedule_status }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -484,95 +484,94 @@ globals:
 resources:
   - name: monitoring_schedule
     props:
-      - name: MonitoringScheduleName
-        value: '{{ MonitoringScheduleName }}'
-      - name: MonitoringScheduleConfig
+      - name: monitoring_schedule_name
+        value: '{{ monitoring_schedule_name }}'
+      - name: monitoring_schedule_config
         value:
-          MonitoringJobDefinition:
-            BaselineConfig:
-              ConstraintsResource:
-                S3Uri: '{{ S3Uri }}'
-              StatisticsResource:
-                S3Uri: null
-            Environment: {}
-            MonitoringAppSpecification:
-              ContainerArguments:
-                - '{{ ContainerArguments[0] }}'
-              ContainerEntrypoint:
-                - '{{ ContainerEntrypoint[0] }}'
-              ImageUri: '{{ ImageUri }}'
-              PostAnalyticsProcessorSourceUri: null
-              RecordPreprocessorSourceUri: null
-            MonitoringInputs:
-              - EndpointInput:
-                  EndpointName: '{{ EndpointName }}'
-                  LocalPath: '{{ LocalPath }}'
-                  S3DataDistributionType: '{{ S3DataDistributionType }}'
-                  S3InputMode: '{{ S3InputMode }}'
-                  ExcludeFeaturesAttribute: '{{ ExcludeFeaturesAttribute }}'
-                BatchTransformInput:
-                  DataCapturedDestinationS3Uri: '{{ DataCapturedDestinationS3Uri }}'
-                  DatasetFormat:
-                    Csv:
-                      Header: '{{ Header }}'
-                    Json:
-                      Line: '{{ Line }}'
-                    Parquet: '{{ Parquet }}'
-                  LocalPath: '{{ LocalPath }}'
-                  S3DataDistributionType: '{{ S3DataDistributionType }}'
-                  S3InputMode: '{{ S3InputMode }}'
-                  ExcludeFeaturesAttribute: '{{ ExcludeFeaturesAttribute }}'
-            MonitoringOutputConfig:
-              KmsKeyId: '{{ KmsKeyId }}'
-              MonitoringOutputs:
-                - S3Output:
-                    LocalPath: '{{ LocalPath }}'
-                    S3UploadMode: '{{ S3UploadMode }}'
-                    S3Uri: '{{ S3Uri }}'
-            MonitoringResources:
-              ClusterConfig:
-                InstanceCount: '{{ InstanceCount }}'
-                InstanceType: '{{ InstanceType }}'
-                VolumeSizeInGB: '{{ VolumeSizeInGB }}'
-                VolumeKmsKeyId: '{{ VolumeKmsKeyId }}'
-            NetworkConfig:
-              EnableInterContainerTrafficEncryption: '{{ EnableInterContainerTrafficEncryption }}'
-              EnableNetworkIsolation: '{{ EnableNetworkIsolation }}'
-              VpcConfig:
-                SecurityGroupIds:
-                  - '{{ SecurityGroupIds[0] }}'
-                Subnets:
-                  - '{{ Subnets[0] }}'
-            RoleArn: '{{ RoleArn }}'
-            StoppingCondition:
-              MaxRuntimeInSeconds: '{{ MaxRuntimeInSeconds }}'
-          MonitoringJobDefinitionName: '{{ MonitoringJobDefinitionName }}'
-          MonitoringType: '{{ MonitoringType }}'
-          ScheduleConfig:
-            ScheduleExpression: '{{ ScheduleExpression }}'
-            DataAnalysisStartTime: '{{ DataAnalysisStartTime }}'
-            DataAnalysisEndTime: null
-      - name: Tags
+          monitoring_job_definition:
+            baseline_config:
+              constraints_resource:
+                s3_uri: '{{ s3_uri }}'
+              statistics_resource:
+                s3_uri: null
+            environment: {}
+            monitoring_app_specification:
+              container_arguments:
+                - '{{ container_arguments[0] }}'
+              container_entrypoint:
+                - '{{ container_entrypoint[0] }}'
+              image_uri: '{{ image_uri }}'
+              post_analytics_processor_source_uri: null
+              record_preprocessor_source_uri: null
+            monitoring_inputs:
+              - endpoint_input:
+                  endpoint_name: '{{ endpoint_name }}'
+                  local_path: '{{ local_path }}'
+                  s3_data_distribution_type: '{{ s3_data_distribution_type }}'
+                  s3_input_mode: '{{ s3_input_mode }}'
+                  exclude_features_attribute: '{{ exclude_features_attribute }}'
+                batch_transform_input:
+                  data_captured_destination_s3_uri: '{{ data_captured_destination_s3_uri }}'
+                  dataset_format:
+                    csv:
+                      header: '{{ header }}'
+                    json:
+                      line: '{{ line }}'
+                    parquet: '{{ parquet }}'
+                  local_path: '{{ local_path }}'
+                  s3_data_distribution_type: '{{ s3_data_distribution_type }}'
+                  s3_input_mode: '{{ s3_input_mode }}'
+                  exclude_features_attribute: '{{ exclude_features_attribute }}'
+            monitoring_output_config:
+              kms_key_id: '{{ kms_key_id }}'
+              monitoring_outputs:
+                - s3_output:
+                    local_path: '{{ local_path }}'
+                    s3_upload_mode: '{{ s3_upload_mode }}'
+                    s3_uri: '{{ s3_uri }}'
+            monitoring_resources:
+              cluster_config:
+                instance_count: '{{ instance_count }}'
+                instance_type: '{{ instance_type }}'
+                volume_size_in_gb: '{{ volume_size_in_gb }}'
+                volume_kms_key_id: '{{ volume_kms_key_id }}'
+            network_config:
+              enable_inter_container_traffic_encryption: '{{ enable_inter_container_traffic_encryption }}'
+              enable_network_isolation: '{{ enable_network_isolation }}'
+              vpc_config:
+                security_group_ids:
+                  - '{{ security_group_ids[0] }}'
+                subnets:
+                  - '{{ subnets[0] }}'
+            role_arn: '{{ role_arn }}'
+            stopping_condition:
+              max_runtime_in_seconds: '{{ max_runtime_in_seconds }}'
+          monitoring_job_definition_name: '{{ monitoring_job_definition_name }}'
+          monitoring_type: '{{ monitoring_type }}'
+          schedule_config:
+            schedule_expression: '{{ schedule_expression }}'
+            data_analysis_start_time: '{{ data_analysis_start_time }}'
+            data_analysis_end_time: null
+      - name: tags
         value:
-          - Value: '{{ Value }}'
-            Key: '{{ Key }}'
-      - name: EndpointName
+          - value: '{{ value }}'
+            key: '{{ key }}'
+      - name: endpoint_name
         value: null
-      - name: FailureReason
-        value: '{{ FailureReason }}'
-      - name: LastMonitoringExecutionSummary
+      - name: failure_reason
+        value: '{{ failure_reason }}'
+      - name: last_monitoring_execution_summary
         value:
-          CreationTime: '{{ CreationTime }}'
-          EndpointName: null
-          FailureReason: '{{ FailureReason }}'
-          LastModifiedTime: '{{ LastModifiedTime }}'
-          MonitoringExecutionStatus: '{{ MonitoringExecutionStatus }}'
-          MonitoringScheduleName: null
-          ProcessingJobArn: '{{ ProcessingJobArn }}'
-          ScheduledTime: '{{ ScheduledTime }}'
-      - name: MonitoringScheduleStatus
-        value: '{{ MonitoringScheduleStatus }}'
-
+          creation_time: '{{ creation_time }}'
+          endpoint_name: null
+          failure_reason: '{{ failure_reason }}'
+          last_modified_time: '{{ last_modified_time }}'
+          monitoring_execution_status: '{{ monitoring_execution_status }}'
+          monitoring_schedule_name: null
+          processing_job_arn: '{{ processing_job_arn }}'
+          scheduled_time: '{{ scheduled_time }}'
+      - name: monitoring_schedule_status
+        value: '{{ monitoring_schedule_status }}'
 ```
 </TabItem>
 </Tabs>
@@ -593,7 +592,7 @@ SET PatchDocument = string('{{ {
     "MonitoringScheduleStatus": monitoring_schedule_status
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<MonitoringScheduleArn>';
+AND Identifier = '{{ monitoring_schedule_arn }}';
 ```
 
 
@@ -602,7 +601,7 @@ AND Identifier = '<MonitoringScheduleArn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.sagemaker.monitoring_schedules
-WHERE Identifier = '<MonitoringScheduleArn>'
+WHERE Identifier = '{{ monitoring_schedule_arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/sagemaker/partner_apps/index.md b/website/docs/services/sagemaker/partner_apps/index.md
index a47107ca7..81c3cc7e0 100644
--- a/website/docs/services/sagemaker/partner_apps/index.md
+++ b/website/docs/services/sagemaker/partner_apps/index.md
@@ -237,7 +237,7 @@ maintenance_config,
 client_token,
 tags
 FROM awscc.sagemaker.partner_apps
-WHERE region = 'us-east-1' AND Identifier = '<Arn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -277,12 +277,12 @@ INSERT INTO awscc.sagemaker.partner_apps (
  AuthType,
  region
 )
-SELECT 
-'{{ Name }}',
- '{{ Type }}',
- '{{ ExecutionRoleArn }}',
- '{{ Tier }}',
- '{{ AuthType }}',
+SELECT
+'{{ name }}',
+ '{{ type }}',
+ '{{ execution_role_arn }}',
+ '{{ tier }}',
+ '{{ auth_type }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -304,18 +304,18 @@ INSERT INTO awscc.sagemaker.partner_apps (
  Tags,
  region
 )
-SELECT 
- '{{ Name }}',
- '{{ Type }}',
- '{{ ExecutionRoleArn }}',
- '{{ KmsKeyId }}',
- '{{ Tier }}',
- '{{ EnableIamSessionBasedIdentity }}',
- '{{ ApplicationConfig }}',
- '{{ AuthType }}',
- '{{ MaintenanceConfig }}',
- '{{ ClientToken }}',
- '{{ Tags }}',
+SELECT
+ '{{ name }}',
+ '{{ type }}',
+ '{{ execution_role_arn }}',
+ '{{ kms_key_id }}',
+ '{{ tier }}',
+ '{{ enable_iam_session_based_identity }}',
+ '{{ application_config }}',
+ '{{ auth_type }}',
+ '{{ maintenance_config }}',
+ '{{ client_token }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -333,35 +333,34 @@ globals:
 resources:
   - name: partner_app
     props:
-      - name: Name
-        value: '{{ Name }}'
-      - name: Type
-        value: '{{ Type }}'
-      - name: ExecutionRoleArn
-        value: '{{ ExecutionRoleArn }}'
-      - name: KmsKeyId
-        value: '{{ KmsKeyId }}'
-      - name: Tier
-        value: '{{ Tier }}'
-      - name: EnableIamSessionBasedIdentity
-        value: '{{ EnableIamSessionBasedIdentity }}'
-      - name: ApplicationConfig
+      - name: name
+        value: '{{ name }}'
+      - name: type
+        value: '{{ type }}'
+      - name: execution_role_arn
+        value: '{{ execution_role_arn }}'
+      - name: kms_key_id
+        value: '{{ kms_key_id }}'
+      - name: tier
+        value: '{{ tier }}'
+      - name: enable_iam_session_based_identity
+        value: '{{ enable_iam_session_based_identity }}'
+      - name: application_config
         value:
-          AdminUsers:
-            - '{{ AdminUsers[0] }}'
-          Arguments: {}
-      - name: AuthType
-        value: '{{ AuthType }}'
-      - name: MaintenanceConfig
+          admin_users:
+            - '{{ admin_users[0] }}'
+          arguments: {}
+      - name: auth_type
+        value: '{{ auth_type }}'
+      - name: maintenance_config
         value:
-          MaintenanceWindowStart: '{{ MaintenanceWindowStart }}'
-      - name: ClientToken
-        value: '{{ ClientToken }}'
-      - name: Tags
+          maintenance_window_start: '{{ maintenance_window_start }}'
+      - name: client_token
+        value: '{{ client_token }}'
+      - name: tags
         value:
-          - Value: '{{ Value }}'
-            Key: '{{ Key }}'
-
+          - value: '{{ value }}'
+            key: '{{ key }}'
 ```
 </TabItem>
 </Tabs>
@@ -382,7 +381,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Arn>';
+AND Identifier = '{{ arn }}';
 ```
 
 
@@ -391,7 +390,7 @@ AND Identifier = '<Arn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.sagemaker.partner_apps
-WHERE Identifier = '<Arn>'
+WHERE Identifier = '{{ arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/sagemaker/pipelines/index.md b/website/docs/services/sagemaker/pipelines/index.md
index ea6c63d4d..a82ae1822 100644
--- a/website/docs/services/sagemaker/pipelines/index.md
+++ b/website/docs/services/sagemaker/pipelines/index.md
@@ -189,7 +189,7 @@ role_arn,
 tags,
 parallelism_configuration
 FROM awscc.sagemaker.pipelines
-WHERE region = 'us-east-1' AND Identifier = '<PipelineName>';
+WHERE region = 'us-east-1' AND Identifier = '{{ pipeline_name }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -227,10 +227,10 @@ INSERT INTO awscc.sagemaker.pipelines (
  RoleArn,
  region
 )
-SELECT 
-'{{ PipelineName }}',
- '{{ PipelineDefinition }}',
- '{{ RoleArn }}',
+SELECT
+'{{ pipeline_name }}',
+ '{{ pipeline_definition }}',
+ '{{ role_arn }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -248,14 +248,14 @@ INSERT INTO awscc.sagemaker.pipelines (
  ParallelismConfiguration,
  region
 )
-SELECT 
- '{{ PipelineName }}',
- '{{ PipelineDisplayName }}',
- '{{ PipelineDescription }}',
- '{{ PipelineDefinition }}',
- '{{ RoleArn }}',
- '{{ Tags }}',
- '{{ ParallelismConfiguration }}',
+SELECT
+ '{{ pipeline_name }}',
+ '{{ pipeline_display_name }}',
+ '{{ pipeline_description }}',
+ '{{ pipeline_definition }}',
+ '{{ role_arn }}',
+ '{{ tags }}',
+ '{{ parallelism_configuration }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -273,24 +273,23 @@ globals:
 resources:
   - name: pipeline
     props:
-      - name: PipelineName
-        value: '{{ PipelineName }}'
-      - name: PipelineDisplayName
-        value: '{{ PipelineDisplayName }}'
-      - name: PipelineDescription
-        value: '{{ PipelineDescription }}'
-      - name: PipelineDefinition
+      - name: pipeline_name
+        value: '{{ pipeline_name }}'
+      - name: pipeline_display_name
+        value: '{{ pipeline_display_name }}'
+      - name: pipeline_description
+        value: '{{ pipeline_description }}'
+      - name: pipeline_definition
         value: {}
-      - name: RoleArn
-        value: '{{ RoleArn }}'
-      - name: Tags
+      - name: role_arn
+        value: '{{ role_arn }}'
+      - name: tags
         value:
-          - Value: '{{ Value }}'
-            Key: '{{ Key }}'
-      - name: ParallelismConfiguration
+          - value: '{{ value }}'
+            key: '{{ key }}'
+      - name: parallelism_configuration
         value:
-          MaxParallelExecutionSteps: '{{ MaxParallelExecutionSteps }}'
-
+          max_parallel_execution_steps: '{{ max_parallel_execution_steps }}'
 ```
 </TabItem>
 </Tabs>
@@ -311,7 +310,7 @@ SET PatchDocument = string('{{ {
     "ParallelismConfiguration": parallelism_configuration
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<PipelineName>';
+AND Identifier = '{{ pipeline_name }}';
 ```
 
 
@@ -320,7 +319,7 @@ AND Identifier = '<PipelineName>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.sagemaker.pipelines
-WHERE Identifier = '<PipelineName>'
+WHERE Identifier = '{{ pipeline_name }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/sagemaker/processing_jobs/index.md b/website/docs/services/sagemaker/processing_jobs/index.md
index c6dbf2d14..f8bd3093d 100644
--- a/website/docs/services/sagemaker/processing_jobs/index.md
+++ b/website/docs/services/sagemaker/processing_jobs/index.md
@@ -598,7 +598,7 @@ last_modified_time,
 processing_start_time,
 processing_end_time
 FROM awscc.sagemaker.processing_jobs
-WHERE region = 'us-east-1' AND Identifier = '<ProcessingJobArn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ processing_job_arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -636,10 +636,10 @@ INSERT INTO awscc.sagemaker.processing_jobs (
  RoleArn,
  region
 )
-SELECT 
-'{{ AppSpecification }}',
- '{{ ProcessingResources }}',
- '{{ RoleArn }}',
+SELECT
+'{{ app_specification }}',
+ '{{ processing_resources }}',
+ '{{ role_arn }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -661,18 +661,18 @@ INSERT INTO awscc.sagemaker.processing_jobs (
  Tags,
  region
 )
-SELECT 
- '{{ AppSpecification }}',
- '{{ Environment }}',
- '{{ ExperimentConfig }}',
- '{{ NetworkConfig }}',
- '{{ ProcessingInputs }}',
- '{{ ProcessingJobName }}',
- '{{ ProcessingOutputConfig }}',
- '{{ ProcessingResources }}',
- '{{ RoleArn }}',
- '{{ StoppingCondition }}',
- '{{ Tags }}',
+SELECT
+ '{{ app_specification }}',
+ '{{ environment }}',
+ '{{ experiment_config }}',
+ '{{ network_config }}',
+ '{{ processing_inputs }}',
+ '{{ processing_job_name }}',
+ '{{ processing_output_config }}',
+ '{{ processing_resources }}',
+ '{{ role_arn }}',
+ '{{ stopping_condition }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -690,95 +690,94 @@ globals:
 resources:
   - name: processing_job
     props:
-      - name: AppSpecification
+      - name: app_specification
         value:
-          ContainerArguments:
-            - '{{ ContainerArguments[0] }}'
-          ContainerEntrypoint:
-            - '{{ ContainerEntrypoint[0] }}'
-          ImageUri: '{{ ImageUri }}'
-      - name: Environment
+          container_arguments:
+            - '{{ container_arguments[0] }}'
+          container_entrypoint:
+            - '{{ container_entrypoint[0] }}'
+          image_uri: '{{ image_uri }}'
+      - name: environment
         value: {}
-      - name: ExperimentConfig
+      - name: experiment_config
         value:
-          ExperimentName: '{{ ExperimentName }}'
-          TrialName: '{{ TrialName }}'
-          TrialComponentDisplayName: '{{ TrialComponentDisplayName }}'
-          RunName: '{{ RunName }}'
-      - name: NetworkConfig
+          experiment_name: '{{ experiment_name }}'
+          trial_name: '{{ trial_name }}'
+          trial_component_display_name: '{{ trial_component_display_name }}'
+          run_name: '{{ run_name }}'
+      - name: network_config
         value:
-          EnableInterContainerTrafficEncryption: '{{ EnableInterContainerTrafficEncryption }}'
-          EnableNetworkIsolation: '{{ EnableNetworkIsolation }}'
-          VpcConfig:
-            SecurityGroupIds:
-              - '{{ SecurityGroupIds[0] }}'
-            Subnets:
-              - '{{ Subnets[0] }}'
-      - name: ProcessingInputs
+          enable_inter_container_traffic_encryption: '{{ enable_inter_container_traffic_encryption }}'
+          enable_network_isolation: '{{ enable_network_isolation }}'
+          vpc_config:
+            security_group_ids:
+              - '{{ security_group_ids[0] }}'
+            subnets:
+              - '{{ subnets[0] }}'
+      - name: processing_inputs
         value:
-          - S3Input:
-              LocalPath: '{{ LocalPath }}'
-              S3CompressionType: '{{ S3CompressionType }}'
-              S3DataDistributionType: '{{ S3DataDistributionType }}'
-              S3DataType: '{{ S3DataType }}'
-              S3InputMode: '{{ S3InputMode }}'
-              S3Uri: '{{ S3Uri }}'
-            DatasetDefinition:
-              AthenaDatasetDefinition:
-                Catalog: '{{ Catalog }}'
-                Database: '{{ Database }}'
-                OutputS3Uri: '{{ OutputS3Uri }}'
-                QueryString: '{{ QueryString }}'
-                WorkGroup: '{{ WorkGroup }}'
-                OutputFormat: '{{ OutputFormat }}'
-                KmsKeyId: '{{ KmsKeyId }}'
-                OutputCompression: '{{ OutputCompression }}'
-              RedshiftDatasetDefinition:
-                Database: '{{ Database }}'
-                DbUser: '{{ DbUser }}'
-                QueryString: '{{ QueryString }}'
-                ClusterId: '{{ ClusterId }}'
-                ClusterRoleArn: '{{ ClusterRoleArn }}'
-                OutputS3Uri: '{{ OutputS3Uri }}'
-                OutputFormat: '{{ OutputFormat }}'
-                KmsKeyId: '{{ KmsKeyId }}'
-                OutputCompression: '{{ OutputCompression }}'
-              DataDistributionType: '{{ DataDistributionType }}'
-              InputMode: '{{ InputMode }}'
-              LocalPath: '{{ LocalPath }}'
-            InputName: '{{ InputName }}'
-            AppManaged: '{{ AppManaged }}'
-      - name: ProcessingJobName
-        value: '{{ ProcessingJobName }}'
-      - name: ProcessingOutputConfig
+          - s3_input:
+              local_path: '{{ local_path }}'
+              s3_compression_type: '{{ s3_compression_type }}'
+              s3_data_distribution_type: '{{ s3_data_distribution_type }}'
+              s3_data_type: '{{ s3_data_type }}'
+              s3_input_mode: '{{ s3_input_mode }}'
+              s3_uri: '{{ s3_uri }}'
+            dataset_definition:
+              athena_dataset_definition:
+                catalog: '{{ catalog }}'
+                database: '{{ database }}'
+                output_s3_uri: '{{ output_s3_uri }}'
+                query_string: '{{ query_string }}'
+                work_group: '{{ work_group }}'
+                output_format: '{{ output_format }}'
+                kms_key_id: '{{ kms_key_id }}'
+                output_compression: '{{ output_compression }}'
+              redshift_dataset_definition:
+                database: '{{ database }}'
+                db_user: '{{ db_user }}'
+                query_string: '{{ query_string }}'
+                cluster_id: '{{ cluster_id }}'
+                cluster_role_arn: '{{ cluster_role_arn }}'
+                output_s3_uri: '{{ output_s3_uri }}'
+                output_format: '{{ output_format }}'
+                kms_key_id: '{{ kms_key_id }}'
+                output_compression: '{{ output_compression }}'
+              data_distribution_type: '{{ data_distribution_type }}'
+              input_mode: '{{ input_mode }}'
+              local_path: '{{ local_path }}'
+            input_name: '{{ input_name }}'
+            app_managed: '{{ app_managed }}'
+      - name: processing_job_name
+        value: '{{ processing_job_name }}'
+      - name: processing_output_config
         value:
-          KmsKeyId: '{{ KmsKeyId }}'
-          Outputs:
-            - OutputName: '{{ OutputName }}'
-              AppManaged: '{{ AppManaged }}'
-              S3Output:
-                LocalPath: '{{ LocalPath }}'
-                S3UploadMode: '{{ S3UploadMode }}'
-                S3Uri: '{{ S3Uri }}'
-              FeatureStoreOutput:
-                FeatureGroupName: '{{ FeatureGroupName }}'
-      - name: ProcessingResources
+          kms_key_id: '{{ kms_key_id }}'
+          outputs:
+            - output_name: '{{ output_name }}'
+              app_managed: '{{ app_managed }}'
+              s3_output:
+                local_path: '{{ local_path }}'
+                s3_upload_mode: '{{ s3_upload_mode }}'
+                s3_uri: '{{ s3_uri }}'
+              feature_store_output:
+                feature_group_name: '{{ feature_group_name }}'
+      - name: processing_resources
         value:
-          ClusterConfig:
-            InstanceCount: '{{ InstanceCount }}'
-            InstanceType: '{{ InstanceType }}'
-            VolumeSizeInGB: '{{ VolumeSizeInGB }}'
-            VolumeKmsKeyId: '{{ VolumeKmsKeyId }}'
-      - name: RoleArn
-        value: '{{ RoleArn }}'
-      - name: StoppingCondition
+          cluster_config:
+            instance_count: '{{ instance_count }}'
+            instance_type: '{{ instance_type }}'
+            volume_size_in_gb: '{{ volume_size_in_gb }}'
+            volume_kms_key_id: '{{ volume_kms_key_id }}'
+      - name: role_arn
+        value: '{{ role_arn }}'
+      - name: stopping_condition
         value:
-          MaxRuntimeInSeconds: '{{ MaxRuntimeInSeconds }}'
-      - name: Tags
+          max_runtime_in_seconds: '{{ max_runtime_in_seconds }}'
+      - name: tags
         value:
-          - Value: '{{ Value }}'
-            Key: '{{ Key }}'
-
+          - value: '{{ value }}'
+            key: '{{ key }}'
 ```
 </TabItem>
 </Tabs>
@@ -789,7 +788,7 @@ resources:
 ```sql
 /*+ delete */
 DELETE FROM awscc.sagemaker.processing_jobs
-WHERE Identifier = '<ProcessingJobArn>'
+WHERE Identifier = '{{ processing_job_arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/sagemaker/projects/index.md b/website/docs/services/sagemaker/projects/index.md
index 2affffd2c..99c2657c8 100644
--- a/website/docs/services/sagemaker/projects/index.md
+++ b/website/docs/services/sagemaker/projects/index.md
@@ -287,7 +287,7 @@ service_catalog_provisioned_product_details,
 template_provider_details,
 project_status
 FROM awscc.sagemaker.projects
-WHERE region = 'us-east-1' AND Identifier = '<ProjectArn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ project_arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -323,8 +323,8 @@ INSERT INTO awscc.sagemaker.projects (
  ProjectName,
  region
 )
-SELECT 
-'{{ ProjectName }}',
+SELECT
+'{{ project_name }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -341,13 +341,13 @@ INSERT INTO awscc.sagemaker.projects (
  TemplateProviderDetails,
  region
 )
-SELECT 
- '{{ Tags }}',
- '{{ ProjectName }}',
- '{{ ProjectDescription }}',
- '{{ ServiceCatalogProvisioningDetails }}',
- '{{ ServiceCatalogProvisionedProductDetails }}',
- '{{ TemplateProviderDetails }}',
+SELECT
+ '{{ tags }}',
+ '{{ project_name }}',
+ '{{ project_description }}',
+ '{{ service_catalog_provisioning_details }}',
+ '{{ service_catalog_provisioned_product_details }}',
+ '{{ template_provider_details }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -365,36 +365,35 @@ globals:
 resources:
   - name: project
     props:
-      - name: Tags
+      - name: tags
         value:
-          - Value: '{{ Value }}'
-            Key: '{{ Key }}'
-      - name: ProjectName
-        value: '{{ ProjectName }}'
-      - name: ProjectDescription
-        value: '{{ ProjectDescription }}'
-      - name: ServiceCatalogProvisioningDetails
+          - value: '{{ value }}'
+            key: '{{ key }}'
+      - name: project_name
+        value: '{{ project_name }}'
+      - name: project_description
+        value: '{{ project_description }}'
+      - name: service_catalog_provisioning_details
         value:
-          ProductId: '{{ ProductId }}'
-          ProvisioningArtifactId: '{{ ProvisioningArtifactId }}'
-          PathId: '{{ PathId }}'
-          ProvisioningParameters:
-            - Key: '{{ Key }}'
-              Value: '{{ Value }}'
-      - name: ServiceCatalogProvisionedProductDetails
+          product_id: '{{ product_id }}'
+          provisioning_artifact_id: '{{ provisioning_artifact_id }}'
+          path_id: '{{ path_id }}'
+          provisioning_parameters:
+            - key: '{{ key }}'
+              value: '{{ value }}'
+      - name: service_catalog_provisioned_product_details
         value:
-          ProvisionedProductId: null
-          ProvisionedProductStatusMessage: '{{ ProvisionedProductStatusMessage }}'
-      - name: TemplateProviderDetails
+          provisioned_product_id: null
+          provisioned_product_status_message: '{{ provisioned_product_status_message }}'
+      - name: template_provider_details
         value:
-          - CfnTemplateProviderDetail:
-              Parameters:
-                - Key: '{{ Key }}'
-                  Value: '{{ Value }}'
-              RoleARN: '{{ RoleARN }}'
-              TemplateName: '{{ TemplateName }}'
-              TemplateURL: '{{ TemplateURL }}'
-
+          - cfn_template_provider_detail:
+              parameters:
+                - key: '{{ key }}'
+                  value: '{{ value }}'
+              role_arn: '{{ role_arn }}'
+              template_name: '{{ template_name }}'
+              template_url: '{{ template_url }}'
 ```
 </TabItem>
 </Tabs>
@@ -410,7 +409,7 @@ SET PatchDocument = string('{{ {
     "ServiceCatalogProvisionedProductDetails": service_catalog_provisioned_product_details
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<ProjectArn>';
+AND Identifier = '{{ project_arn }}';
 ```
 
 
@@ -419,7 +418,7 @@ AND Identifier = '<ProjectArn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.sagemaker.projects
-WHERE Identifier = '<ProjectArn>'
+WHERE Identifier = '{{ project_arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/sagemaker/spaces/index.md b/website/docs/services/sagemaker/spaces/index.md
index 2d56122c5..965ebaac6 100644
--- a/website/docs/services/sagemaker/spaces/index.md
+++ b/website/docs/services/sagemaker/spaces/index.md
@@ -496,7 +496,7 @@ space_sharing_settings,
 space_display_name,
 url
 FROM awscc.sagemaker.spaces
-WHERE region = 'us-east-1' AND Identifier = '<DomainId>|<SpaceName>';
+WHERE region = 'us-east-1' AND Identifier = '{{ domain_id }}|{{ space_name }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -534,9 +534,9 @@ INSERT INTO awscc.sagemaker.spaces (
  SpaceName,
  region
 )
-SELECT 
-'{{ DomainId }}',
- '{{ SpaceName }}',
+SELECT
+'{{ domain_id }}',
+ '{{ space_name }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -554,14 +554,14 @@ INSERT INTO awscc.sagemaker.spaces (
  SpaceDisplayName,
  region
 )
-SELECT 
- '{{ DomainId }}',
- '{{ SpaceName }}',
- '{{ SpaceSettings }}',
- '{{ Tags }}',
- '{{ OwnershipSettings }}',
- '{{ SpaceSharingSettings }}',
- '{{ SpaceDisplayName }}',
+SELECT
+ '{{ domain_id }}',
+ '{{ space_name }}',
+ '{{ space_settings }}',
+ '{{ tags }}',
+ '{{ ownership_settings }}',
+ '{{ space_sharing_settings }}',
+ '{{ space_display_name }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -579,64 +579,63 @@ globals:
 resources:
   - name: space
     props:
-      - name: DomainId
-        value: '{{ DomainId }}'
-      - name: SpaceName
-        value: '{{ SpaceName }}'
-      - name: SpaceSettings
+      - name: domain_id
+        value: '{{ domain_id }}'
+      - name: space_name
+        value: '{{ space_name }}'
+      - name: space_settings
         value:
-          JupyterServerAppSettings:
-            DefaultResourceSpec:
-              InstanceType: '{{ InstanceType }}'
-              SageMakerImageArn: '{{ SageMakerImageArn }}'
-              SageMakerImageVersionArn: '{{ SageMakerImageVersionArn }}'
-              LifecycleConfigArn: '{{ LifecycleConfigArn }}'
-            LifecycleConfigArns:
-              - '{{ LifecycleConfigArns[0] }}'
-          KernelGatewayAppSettings:
-            CustomImages:
-              - AppImageConfigName: '{{ AppImageConfigName }}'
-                ImageName: '{{ ImageName }}'
-                ImageVersionNumber: '{{ ImageVersionNumber }}'
-            DefaultResourceSpec: null
-            LifecycleConfigArns:
+          jupyter_server_app_settings:
+            default_resource_spec:
+              instance_type: '{{ instance_type }}'
+              sage_maker_image_arn: '{{ sage_maker_image_arn }}'
+              sage_maker_image_version_arn: '{{ sage_maker_image_version_arn }}'
+              lifecycle_config_arn: '{{ lifecycle_config_arn }}'
+            lifecycle_config_arns:
+              - '{{ lifecycle_config_arns[0] }}'
+          kernel_gateway_app_settings:
+            custom_images:
+              - app_image_config_name: '{{ app_image_config_name }}'
+                image_name: '{{ image_name }}'
+                image_version_number: '{{ image_version_number }}'
+            default_resource_spec: null
+            lifecycle_config_arns:
               - null
-          JupyterLabAppSettings:
-            DefaultResourceSpec: null
-            AppLifecycleManagement:
-              IdleSettings:
-                IdleTimeoutInMinutes: '{{ IdleTimeoutInMinutes }}'
-            CodeRepositories:
-              - RepositoryUrl: '{{ RepositoryUrl }}'
-          CodeEditorAppSettings:
-            DefaultResourceSpec: null
-            AppLifecycleManagement: null
-          SpaceStorageSettings:
-            EbsStorageSettings:
-              EbsVolumeSizeInGb: '{{ EbsVolumeSizeInGb }}'
-          SpaceManagedResources: '{{ SpaceManagedResources }}'
-          RemoteAccess: '{{ RemoteAccess }}'
-          AppType: '{{ AppType }}'
-          CustomFileSystems:
-            - EFSFileSystem:
-                FileSystemId: '{{ FileSystemId }}'
-              FSxLustreFileSystem:
-                FileSystemId: '{{ FileSystemId }}'
-              S3FileSystem:
-                S3Uri: '{{ S3Uri }}'
-      - name: Tags
+          jupyter_lab_app_settings:
+            default_resource_spec: null
+            app_lifecycle_management:
+              idle_settings:
+                idle_timeout_in_minutes: '{{ idle_timeout_in_minutes }}'
+            code_repositories:
+              - repository_url: '{{ repository_url }}'
+          code_editor_app_settings:
+            default_resource_spec: null
+            app_lifecycle_management: null
+          space_storage_settings:
+            ebs_storage_settings:
+              ebs_volume_size_in_gb: '{{ ebs_volume_size_in_gb }}'
+          space_managed_resources: '{{ space_managed_resources }}'
+          remote_access: '{{ remote_access }}'
+          app_type: '{{ app_type }}'
+          custom_file_systems:
+            - e_fs_file_system:
+                file_system_id: '{{ file_system_id }}'
+              f_sx_lustre_file_system:
+                file_system_id: '{{ file_system_id }}'
+              s3_file_system:
+                s3_uri: '{{ s3_uri }}'
+      - name: tags
         value:
-          - Value: '{{ Value }}'
-            Key: '{{ Key }}'
-      - name: OwnershipSettings
+          - value: '{{ value }}'
+            key: '{{ key }}'
+      - name: ownership_settings
         value:
-          OwnerUserProfileName: '{{ OwnerUserProfileName }}'
-      - name: SpaceSharingSettings
+          owner_user_profile_name: '{{ owner_user_profile_name }}'
+      - name: space_sharing_settings
         value:
-          SharingType: '{{ SharingType }}'
-      - name: SpaceDisplayName
-        value: '{{ SpaceDisplayName }}'
-
+          sharing_type: '{{ sharing_type }}'
+      - name: space_display_name
+        value: '{{ space_display_name }}'
 ```
 </TabItem>
 </Tabs>
@@ -654,7 +653,7 @@ SET PatchDocument = string('{{ {
     "SpaceDisplayName": space_display_name
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<DomainId>|<SpaceName>';
+AND Identifier = '{{ domain_id }}|{{ space_name }}';
 ```
 
 
@@ -663,7 +662,7 @@ AND Identifier = '<DomainId>|<SpaceName>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.sagemaker.spaces
-WHERE Identifier = '<DomainId|SpaceName>'
+WHERE Identifier = '{{ domain_id }}|{{ space_name }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/sagemaker/studio_lifecycle_configs/index.md b/website/docs/services/sagemaker/studio_lifecycle_configs/index.md
index 57230ae54..78439f6bc 100644
--- a/website/docs/services/sagemaker/studio_lifecycle_configs/index.md
+++ b/website/docs/services/sagemaker/studio_lifecycle_configs/index.md
@@ -164,7 +164,7 @@ studio_lifecycle_config_content,
 studio_lifecycle_config_name,
 tags
 FROM awscc.sagemaker.studio_lifecycle_configs
-WHERE region = 'us-east-1' AND Identifier = '<StudioLifecycleConfigName>';
+WHERE region = 'us-east-1' AND Identifier = '{{ studio_lifecycle_config_name }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -202,10 +202,10 @@ INSERT INTO awscc.sagemaker.studio_lifecycle_configs (
  StudioLifecycleConfigName,
  region
 )
-SELECT 
-'{{ StudioLifecycleConfigAppType }}',
- '{{ StudioLifecycleConfigContent }}',
- '{{ StudioLifecycleConfigName }}',
+SELECT
+'{{ studio_lifecycle_config_app_type }}',
+ '{{ studio_lifecycle_config_content }}',
+ '{{ studio_lifecycle_config_name }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -220,11 +220,11 @@ INSERT INTO awscc.sagemaker.studio_lifecycle_configs (
  Tags,
  region
 )
-SELECT 
- '{{ StudioLifecycleConfigAppType }}',
- '{{ StudioLifecycleConfigContent }}',
- '{{ StudioLifecycleConfigName }}',
- '{{ Tags }}',
+SELECT
+ '{{ studio_lifecycle_config_app_type }}',
+ '{{ studio_lifecycle_config_content }}',
+ '{{ studio_lifecycle_config_name }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -242,17 +242,16 @@ globals:
 resources:
   - name: studio_lifecycle_config
     props:
-      - name: StudioLifecycleConfigAppType
-        value: '{{ StudioLifecycleConfigAppType }}'
-      - name: StudioLifecycleConfigContent
-        value: '{{ StudioLifecycleConfigContent }}'
-      - name: StudioLifecycleConfigName
-        value: '{{ StudioLifecycleConfigName }}'
-      - name: Tags
+      - name: studio_lifecycle_config_app_type
+        value: '{{ studio_lifecycle_config_app_type }}'
+      - name: studio_lifecycle_config_content
+        value: '{{ studio_lifecycle_config_content }}'
+      - name: studio_lifecycle_config_name
+        value: '{{ studio_lifecycle_config_name }}'
+      - name: tags
         value:
-          - Value: '{{ Value }}'
-            Key: '{{ Key }}'
-
+          - value: '{{ value }}'
+            key: '{{ key }}'
 ```
 </TabItem>
 </Tabs>
@@ -263,7 +262,7 @@ resources:
 ```sql
 /*+ delete */
 DELETE FROM awscc.sagemaker.studio_lifecycle_configs
-WHERE Identifier = '<StudioLifecycleConfigName>'
+WHERE Identifier = '{{ studio_lifecycle_config_name }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/sagemaker/user_profiles/index.md b/website/docs/services/sagemaker/user_profiles/index.md
index 319a1855f..88ee84507 100644
--- a/website/docs/services/sagemaker/user_profiles/index.md
+++ b/website/docs/services/sagemaker/user_profiles/index.md
@@ -654,7 +654,7 @@ user_profile_name,
 user_settings,
 tags
 FROM awscc.sagemaker.user_profiles
-WHERE region = 'us-east-1' AND Identifier = '<UserProfileName>|<DomainId>';
+WHERE region = 'us-east-1' AND Identifier = '{{ user_profile_name }}|{{ domain_id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -692,9 +692,9 @@ INSERT INTO awscc.sagemaker.user_profiles (
  UserProfileName,
  region
 )
-SELECT 
-'{{ DomainId }}',
- '{{ UserProfileName }}',
+SELECT
+'{{ domain_id }}',
+ '{{ user_profile_name }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -711,13 +711,13 @@ INSERT INTO awscc.sagemaker.user_profiles (
  Tags,
  region
 )
-SELECT 
- '{{ DomainId }}',
- '{{ SingleSignOnUserIdentifier }}',
- '{{ SingleSignOnUserValue }}',
- '{{ UserProfileName }}',
- '{{ UserSettings }}',
- '{{ Tags }}',
+SELECT
+ '{{ domain_id }}',
+ '{{ single_sign_on_user_identifier }}',
+ '{{ single_sign_on_user_value }}',
+ '{{ user_profile_name }}',
+ '{{ user_settings }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -735,101 +735,100 @@ globals:
 resources:
   - name: user_profile
     props:
-      - name: DomainId
-        value: '{{ DomainId }}'
-      - name: SingleSignOnUserIdentifier
-        value: '{{ SingleSignOnUserIdentifier }}'
-      - name: SingleSignOnUserValue
-        value: '{{ SingleSignOnUserValue }}'
-      - name: UserProfileName
-        value: '{{ UserProfileName }}'
-      - name: UserSettings
+      - name: domain_id
+        value: '{{ domain_id }}'
+      - name: single_sign_on_user_identifier
+        value: '{{ single_sign_on_user_identifier }}'
+      - name: single_sign_on_user_value
+        value: '{{ single_sign_on_user_value }}'
+      - name: user_profile_name
+        value: '{{ user_profile_name }}'
+      - name: user_settings
         value:
-          ExecutionRole: '{{ ExecutionRole }}'
-          AutoMountHomeEFS: '{{ AutoMountHomeEFS }}'
-          JupyterServerAppSettings:
-            DefaultResourceSpec:
-              InstanceType: '{{ InstanceType }}'
-              SageMakerImageArn: '{{ SageMakerImageArn }}'
-              SageMakerImageVersionArn: '{{ SageMakerImageVersionArn }}'
-              LifecycleConfigArn: '{{ LifecycleConfigArn }}'
-            LifecycleConfigArns:
-              - '{{ LifecycleConfigArns[0] }}'
-          KernelGatewayAppSettings:
-            CustomImages:
-              - AppImageConfigName: '{{ AppImageConfigName }}'
-                ImageName: '{{ ImageName }}'
-                ImageVersionNumber: '{{ ImageVersionNumber }}'
-            DefaultResourceSpec: null
-            LifecycleConfigArns:
+          execution_role: '{{ execution_role }}'
+          auto_mount_home_ef_s: '{{ auto_mount_home_ef_s }}'
+          jupyter_server_app_settings:
+            default_resource_spec:
+              instance_type: '{{ instance_type }}'
+              sage_maker_image_arn: '{{ sage_maker_image_arn }}'
+              sage_maker_image_version_arn: '{{ sage_maker_image_version_arn }}'
+              lifecycle_config_arn: '{{ lifecycle_config_arn }}'
+            lifecycle_config_arns:
+              - '{{ lifecycle_config_arns[0] }}'
+          kernel_gateway_app_settings:
+            custom_images:
+              - app_image_config_name: '{{ app_image_config_name }}'
+                image_name: '{{ image_name }}'
+                image_version_number: '{{ image_version_number }}'
+            default_resource_spec: null
+            lifecycle_config_arns:
               - null
-          RStudioServerProAppSettings:
-            AccessStatus: '{{ AccessStatus }}'
-            UserGroup: '{{ UserGroup }}'
-          JupyterLabAppSettings:
-            DefaultResourceSpec: null
-            LifecycleConfigArns:
+          r_studio_server_pro_app_settings:
+            access_status: '{{ access_status }}'
+            user_group: '{{ user_group }}'
+          jupyter_lab_app_settings:
+            default_resource_spec: null
+            lifecycle_config_arns:
               - null
-            CodeRepositories:
-              - RepositoryUrl: '{{ RepositoryUrl }}'
-            CustomImages:
+            code_repositories:
+              - repository_url: '{{ repository_url }}'
+            custom_images:
               - null
-            AppLifecycleManagement:
-              IdleSettings:
-                LifecycleManagement: '{{ LifecycleManagement }}'
-                IdleTimeoutInMinutes: '{{ IdleTimeoutInMinutes }}'
-                MinIdleTimeoutInMinutes: '{{ MinIdleTimeoutInMinutes }}'
-                MaxIdleTimeoutInMinutes: '{{ MaxIdleTimeoutInMinutes }}'
-            BuiltInLifecycleConfigArn: '{{ BuiltInLifecycleConfigArn }}'
-          SpaceStorageSettings:
-            DefaultEbsStorageSettings:
-              DefaultEbsVolumeSizeInGb: '{{ DefaultEbsVolumeSizeInGb }}'
-              MaximumEbsVolumeSizeInGb: null
-          CodeEditorAppSettings:
-            DefaultResourceSpec: null
-            LifecycleConfigArns:
+            app_lifecycle_management:
+              idle_settings:
+                lifecycle_management: '{{ lifecycle_management }}'
+                idle_timeout_in_minutes: '{{ idle_timeout_in_minutes }}'
+                min_idle_timeout_in_minutes: '{{ min_idle_timeout_in_minutes }}'
+                max_idle_timeout_in_minutes: '{{ max_idle_timeout_in_minutes }}'
+            built_in_lifecycle_config_arn: '{{ built_in_lifecycle_config_arn }}'
+          space_storage_settings:
+            default_ebs_storage_settings:
+              default_ebs_volume_size_in_gb: '{{ default_ebs_volume_size_in_gb }}'
+              maximum_ebs_volume_size_in_gb: null
+          code_editor_app_settings:
+            default_resource_spec: null
+            lifecycle_config_arns:
               - null
-            CustomImages:
+            custom_images:
               - null
-            AppLifecycleManagement: null
-            BuiltInLifecycleConfigArn: '{{ BuiltInLifecycleConfigArn }}'
-          StudioWebPortalSettings:
-            HiddenMlTools:
-              - '{{ HiddenMlTools[0] }}'
-            HiddenAppTypes:
-              - '{{ HiddenAppTypes[0] }}'
-            HiddenInstanceTypes:
-              - '{{ HiddenInstanceTypes[0] }}'
-            HiddenSageMakerImageVersionAliases:
-              - SageMakerImageName: '{{ SageMakerImageName }}'
-                VersionAliases:
-                  - '{{ VersionAliases[0] }}'
-          DefaultLandingUri: '{{ DefaultLandingUri }}'
-          StudioWebPortal: '{{ StudioWebPortal }}'
-          CustomPosixUserConfig:
-            Uid: '{{ Uid }}'
-            Gid: '{{ Gid }}'
-          CustomFileSystemConfigs:
-            - EFSFileSystemConfig:
-                FileSystemPath: '{{ FileSystemPath }}'
-                FileSystemId: '{{ FileSystemId }}'
-              FSxLustreFileSystemConfig:
-                FileSystemPath: '{{ FileSystemPath }}'
-                FileSystemId: '{{ FileSystemId }}'
-              S3FileSystemConfig:
-                MountPath: '{{ MountPath }}'
-                S3Uri: '{{ S3Uri }}'
-          SecurityGroups:
-            - '{{ SecurityGroups[0] }}'
-          SharingSettings:
-            NotebookOutputOption: '{{ NotebookOutputOption }}'
-            S3KmsKeyId: '{{ S3KmsKeyId }}'
-            S3OutputPath: '{{ S3OutputPath }}'
-      - name: Tags
+            app_lifecycle_management: null
+            built_in_lifecycle_config_arn: '{{ built_in_lifecycle_config_arn }}'
+          studio_web_portal_settings:
+            hidden_ml_tools:
+              - '{{ hidden_ml_tools[0] }}'
+            hidden_app_types:
+              - '{{ hidden_app_types[0] }}'
+            hidden_instance_types:
+              - '{{ hidden_instance_types[0] }}'
+            hidden_sage_maker_image_version_aliases:
+              - sage_maker_image_name: '{{ sage_maker_image_name }}'
+                version_aliases:
+                  - '{{ version_aliases[0] }}'
+          default_landing_uri: '{{ default_landing_uri }}'
+          studio_web_portal: '{{ studio_web_portal }}'
+          custom_posix_user_config:
+            uid: '{{ uid }}'
+            gid: '{{ gid }}'
+          custom_file_system_configs:
+            - e_fs_file_system_config:
+                file_system_path: '{{ file_system_path }}'
+                file_system_id: '{{ file_system_id }}'
+              f_sx_lustre_file_system_config:
+                file_system_path: '{{ file_system_path }}'
+                file_system_id: '{{ file_system_id }}'
+              s3_file_system_config:
+                mount_path: '{{ mount_path }}'
+                s3_uri: '{{ s3_uri }}'
+          security_groups:
+            - '{{ security_groups[0] }}'
+          sharing_settings:
+            notebook_output_option: '{{ notebook_output_option }}'
+            s3_kms_key_id: '{{ s3_kms_key_id }}'
+            s3_output_path: '{{ s3_output_path }}'
+      - name: tags
         value:
-          - Value: '{{ Value }}'
-            Key: '{{ Key }}'
-
+          - value: '{{ value }}'
+            key: '{{ key }}'
 ```
 </TabItem>
 </Tabs>
@@ -840,7 +839,7 @@ resources:
 ```sql
 /*+ delete */
 DELETE FROM awscc.sagemaker.user_profiles
-WHERE Identifier = '<UserProfileName|DomainId>'
+WHERE Identifier = '{{ user_profile_name }}|{{ domain_id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/scheduler/schedule_groups/index.md b/website/docs/services/scheduler/schedule_groups/index.md
index 7db65b1cb..631550216 100644
--- a/website/docs/services/scheduler/schedule_groups/index.md
+++ b/website/docs/services/scheduler/schedule_groups/index.md
@@ -176,7 +176,7 @@ name,
 state,
 tags
 FROM awscc.scheduler.schedule_groups
-WHERE region = 'us-east-1' AND Identifier = '<Name>';
+WHERE region = 'us-east-1' AND Identifier = '{{ name }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -213,9 +213,9 @@ INSERT INTO awscc.scheduler.schedule_groups (
  Tags,
  region
 )
-SELECT 
-'{{ Name }}',
- '{{ Tags }}',
+SELECT
+'{{ name }}',
+ '{{ tags }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -228,9 +228,9 @@ INSERT INTO awscc.scheduler.schedule_groups (
  Tags,
  region
 )
-SELECT 
- '{{ Name }}',
- '{{ Tags }}',
+SELECT
+ '{{ name }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -248,13 +248,12 @@ globals:
 resources:
   - name: schedule_group
     props:
-      - name: Name
-        value: '{{ Name }}'
-      - name: Tags
+      - name: name
+        value: '{{ name }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -270,7 +269,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Name>';
+AND Identifier = '{{ name }}';
 ```
 
 
@@ -279,7 +278,7 @@ AND Identifier = '<Name>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.scheduler.schedule_groups
-WHERE Identifier = '<Name>'
+WHERE Identifier = '{{ name }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/scheduler/schedules/index.md b/website/docs/services/scheduler/schedules/index.md
index 448e9df9a..120465d06 100644
--- a/website/docs/services/scheduler/schedules/index.md
+++ b/website/docs/services/scheduler/schedules/index.md
@@ -448,7 +448,7 @@ start_date,
 state,
 target
 FROM awscc.scheduler.schedules
-WHERE region = 'us-east-1' AND Identifier = '<Name>';
+WHERE region = 'us-east-1' AND Identifier = '{{ name }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -486,10 +486,10 @@ INSERT INTO awscc.scheduler.schedules (
  Target,
  region
 )
-SELECT 
-'{{ FlexibleTimeWindow }}',
- '{{ ScheduleExpression }}',
- '{{ Target }}',
+SELECT
+'{{ flexible_time_window }}',
+ '{{ schedule_expression }}',
+ '{{ target }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -511,18 +511,18 @@ INSERT INTO awscc.scheduler.schedules (
  Target,
  region
 )
-SELECT 
- '{{ Description }}',
- '{{ EndDate }}',
- '{{ FlexibleTimeWindow }}',
- '{{ GroupName }}',
- '{{ KmsKeyArn }}',
- '{{ Name }}',
- '{{ ScheduleExpression }}',
- '{{ ScheduleExpressionTimezone }}',
- '{{ StartDate }}',
- '{{ State }}',
- '{{ Target }}',
+SELECT
+ '{{ description }}',
+ '{{ end_date }}',
+ '{{ flexible_time_window }}',
+ '{{ group_name }}',
+ '{{ kms_key_arn }}',
+ '{{ name }}',
+ '{{ schedule_expression }}',
+ '{{ schedule_expression_timezone }}',
+ '{{ start_date }}',
+ '{{ state }}',
+ '{{ target }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -540,79 +540,78 @@ globals:
 resources:
   - name: schedule
     props:
-      - name: Description
-        value: '{{ Description }}'
-      - name: EndDate
-        value: '{{ EndDate }}'
-      - name: FlexibleTimeWindow
+      - name: description
+        value: '{{ description }}'
+      - name: end_date
+        value: '{{ end_date }}'
+      - name: flexible_time_window
         value:
-          Mode: '{{ Mode }}'
-          MaximumWindowInMinutes: null
-      - name: GroupName
-        value: '{{ GroupName }}'
-      - name: KmsKeyArn
-        value: '{{ KmsKeyArn }}'
-      - name: Name
-        value: '{{ Name }}'
-      - name: ScheduleExpression
-        value: '{{ ScheduleExpression }}'
-      - name: ScheduleExpressionTimezone
-        value: '{{ ScheduleExpressionTimezone }}'
-      - name: StartDate
-        value: '{{ StartDate }}'
-      - name: State
-        value: '{{ State }}'
-      - name: Target
+          mode: '{{ mode }}'
+          maximum_window_in_minutes: null
+      - name: group_name
+        value: '{{ group_name }}'
+      - name: kms_key_arn
+        value: '{{ kms_key_arn }}'
+      - name: name
+        value: '{{ name }}'
+      - name: schedule_expression
+        value: '{{ schedule_expression }}'
+      - name: schedule_expression_timezone
+        value: '{{ schedule_expression_timezone }}'
+      - name: start_date
+        value: '{{ start_date }}'
+      - name: state
+        value: '{{ state }}'
+      - name: target
         value:
-          Arn: '{{ Arn }}'
-          RoleArn: '{{ RoleArn }}'
-          DeadLetterConfig:
-            Arn: '{{ Arn }}'
-          RetryPolicy:
-            MaximumEventAgeInSeconds: null
-            MaximumRetryAttempts: null
-          Input: '{{ Input }}'
-          EcsParameters:
-            TaskDefinitionArn: '{{ TaskDefinitionArn }}'
-            TaskCount: null
-            LaunchType: '{{ LaunchType }}'
-            NetworkConfiguration:
-              AwsvpcConfiguration:
-                Subnets:
-                  - '{{ Subnets[0] }}'
-                SecurityGroups:
-                  - '{{ SecurityGroups[0] }}'
-                AssignPublicIp: '{{ AssignPublicIp }}'
-            PlatformVersion: '{{ PlatformVersion }}'
-            Group: '{{ Group }}'
-            CapacityProviderStrategy:
-              - CapacityProvider: '{{ CapacityProvider }}'
-                Weight: null
-                Base: null
-            EnableECSManagedTags: '{{ EnableECSManagedTags }}'
-            EnableExecuteCommand: '{{ EnableExecuteCommand }}'
-            PlacementConstraints:
-              - Type: '{{ Type }}'
-                Expression: '{{ Expression }}'
-            PlacementStrategy:
-              - Type: '{{ Type }}'
-                Field: '{{ Field }}'
-            PropagateTags: '{{ PropagateTags }}'
-            ReferenceId: '{{ ReferenceId }}'
-            Tags:
+          arn: '{{ arn }}'
+          role_arn: '{{ role_arn }}'
+          dead_letter_config:
+            arn: '{{ arn }}'
+          retry_policy:
+            maximum_event_age_in_seconds: null
+            maximum_retry_attempts: null
+          input: '{{ input }}'
+          ecs_parameters:
+            task_definition_arn: '{{ task_definition_arn }}'
+            task_count: null
+            launch_type: '{{ launch_type }}'
+            network_configuration:
+              awsvpc_configuration:
+                subnets:
+                  - '{{ subnets[0] }}'
+                security_groups:
+                  - '{{ security_groups[0] }}'
+                assign_public_ip: '{{ assign_public_ip }}'
+            platform_version: '{{ platform_version }}'
+            group: '{{ group }}'
+            capacity_provider_strategy:
+              - capacity_provider: '{{ capacity_provider }}'
+                weight: null
+                base: null
+            enable_ecs_managed_tags: '{{ enable_ecs_managed_tags }}'
+            enable_execute_command: '{{ enable_execute_command }}'
+            placement_constraints:
+              - type: '{{ type }}'
+                expression: '{{ expression }}'
+            placement_strategy:
+              - type: '{{ type }}'
+                field: '{{ field }}'
+            propagate_tags: '{{ propagate_tags }}'
+            reference_id: '{{ reference_id }}'
+            tags:
               - {}
-          EventBridgeParameters:
-            DetailType: '{{ DetailType }}'
-            Source: '{{ Source }}'
-          KinesisParameters:
-            PartitionKey: '{{ PartitionKey }}'
-          SageMakerPipelineParameters:
-            PipelineParameterList:
-              - Name: '{{ Name }}'
-                Value: '{{ Value }}'
-          SqsParameters:
-            MessageGroupId: '{{ MessageGroupId }}'
-
+          event_bridge_parameters:
+            detail_type: '{{ detail_type }}'
+            source: '{{ source }}'
+          kinesis_parameters:
+            partition_key: '{{ partition_key }}'
+          sage_maker_pipeline_parameters:
+            pipeline_parameter_list:
+              - name: '{{ name }}'
+                value: '{{ value }}'
+          sqs_parameters:
+            message_group_id: '{{ message_group_id }}'
 ```
 </TabItem>
 </Tabs>
@@ -637,7 +636,7 @@ SET PatchDocument = string('{{ {
     "Target": target
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Name>';
+AND Identifier = '{{ name }}';
 ```
 
 
@@ -646,7 +645,7 @@ AND Identifier = '<Name>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.scheduler.schedules
-WHERE Identifier = '<Name>'
+WHERE Identifier = '{{ name }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/secretsmanager/resource_policies/index.md b/website/docs/services/secretsmanager/resource_policies/index.md
index f48cd58c0..0701a0435 100644
--- a/website/docs/services/secretsmanager/resource_policies/index.md
+++ b/website/docs/services/secretsmanager/resource_policies/index.md
@@ -152,7 +152,7 @@ secret_id,
 resource_policy,
 block_public_policy
 FROM awscc.secretsmanager.resource_policies
-WHERE region = 'us-east-1' AND Identifier = '<Id>';
+WHERE region = 'us-east-1' AND Identifier = '{{ id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -189,9 +189,9 @@ INSERT INTO awscc.secretsmanager.resource_policies (
  ResourcePolicy,
  region
 )
-SELECT 
-'{{ SecretId }}',
- '{{ ResourcePolicy }}',
+SELECT
+'{{ secret_id }}',
+ '{{ resource_policy }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -205,10 +205,10 @@ INSERT INTO awscc.secretsmanager.resource_policies (
  BlockPublicPolicy,
  region
 )
-SELECT 
- '{{ SecretId }}',
- '{{ ResourcePolicy }}',
- '{{ BlockPublicPolicy }}',
+SELECT
+ '{{ secret_id }}',
+ '{{ resource_policy }}',
+ '{{ block_public_policy }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -226,13 +226,12 @@ globals:
 resources:
   - name: resource_policy
     props:
-      - name: SecretId
-        value: '{{ SecretId }}'
-      - name: ResourcePolicy
+      - name: secret_id
+        value: '{{ secret_id }}'
+      - name: resource_policy
         value: {}
-      - name: BlockPublicPolicy
-        value: '{{ BlockPublicPolicy }}'
-
+      - name: block_public_policy
+        value: '{{ block_public_policy }}'
 ```
 </TabItem>
 </Tabs>
@@ -249,7 +248,7 @@ SET PatchDocument = string('{{ {
     "BlockPublicPolicy": block_public_policy
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Id>';
+AND Identifier = '{{ id }}';
 ```
 
 
@@ -258,7 +257,7 @@ AND Identifier = '<Id>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.secretsmanager.resource_policies
-WHERE Identifier = '<Id>'
+WHERE Identifier = '{{ id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/secretsmanager/rotation_schedules/index.md b/website/docs/services/secretsmanager/rotation_schedules/index.md
index af41ec89b..90c7fdb09 100644
--- a/website/docs/services/secretsmanager/rotation_schedules/index.md
+++ b/website/docs/services/secretsmanager/rotation_schedules/index.md
@@ -238,7 +238,7 @@ rotate_immediately_on_update,
 rotation_lambda_arn,
 rotation_rules
 FROM awscc.secretsmanager.rotation_schedules
-WHERE region = 'us-east-1' AND Identifier = '<Id>';
+WHERE region = 'us-east-1' AND Identifier = '{{ id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -274,8 +274,8 @@ INSERT INTO awscc.secretsmanager.rotation_schedules (
  SecretId,
  region
 )
-SELECT 
-'{{ SecretId }}',
+SELECT
+'{{ secret_id }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -291,12 +291,12 @@ INSERT INTO awscc.secretsmanager.rotation_schedules (
  RotationRules,
  region
 )
-SELECT 
- '{{ HostedRotationLambda }}',
- '{{ SecretId }}',
- '{{ RotateImmediatelyOnUpdate }}',
- '{{ RotationLambdaARN }}',
- '{{ RotationRules }}',
+SELECT
+ '{{ hosted_rotation_lambda }}',
+ '{{ secret_id }}',
+ '{{ rotate_immediately_on_update }}',
+ '{{ rotation_lambda_arn }}',
+ '{{ rotation_rules }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -314,31 +314,30 @@ globals:
 resources:
   - name: rotation_schedule
     props:
-      - name: HostedRotationLambda
+      - name: hosted_rotation_lambda
         value:
-          Runtime: '{{ Runtime }}'
-          KmsKeyArn: '{{ KmsKeyArn }}'
-          MasterSecretArn: '{{ MasterSecretArn }}'
-          RotationLambdaName: '{{ RotationLambdaName }}'
-          RotationType: '{{ RotationType }}'
-          ExcludeCharacters: '{{ ExcludeCharacters }}'
-          VpcSecurityGroupIds: '{{ VpcSecurityGroupIds }}'
-          MasterSecretKmsKeyArn: '{{ MasterSecretKmsKeyArn }}'
-          SuperuserSecretArn: '{{ SuperuserSecretArn }}'
-          SuperuserSecretKmsKeyArn: '{{ SuperuserSecretKmsKeyArn }}'
-          VpcSubnetIds: '{{ VpcSubnetIds }}'
-      - name: SecretId
-        value: '{{ SecretId }}'
-      - name: RotateImmediatelyOnUpdate
-        value: '{{ RotateImmediatelyOnUpdate }}'
-      - name: RotationLambdaARN
-        value: '{{ RotationLambdaARN }}'
-      - name: RotationRules
+          runtime: '{{ runtime }}'
+          kms_key_arn: '{{ kms_key_arn }}'
+          master_secret_arn: '{{ master_secret_arn }}'
+          rotation_lambda_name: '{{ rotation_lambda_name }}'
+          rotation_type: '{{ rotation_type }}'
+          exclude_characters: '{{ exclude_characters }}'
+          vpc_security_group_ids: '{{ vpc_security_group_ids }}'
+          master_secret_kms_key_arn: '{{ master_secret_kms_key_arn }}'
+          superuser_secret_arn: '{{ superuser_secret_arn }}'
+          superuser_secret_kms_key_arn: '{{ superuser_secret_kms_key_arn }}'
+          vpc_subnet_ids: '{{ vpc_subnet_ids }}'
+      - name: secret_id
+        value: '{{ secret_id }}'
+      - name: rotate_immediately_on_update
+        value: '{{ rotate_immediately_on_update }}'
+      - name: rotation_lambda_arn
+        value: '{{ rotation_lambda_arn }}'
+      - name: rotation_rules
         value:
-          ScheduleExpression: '{{ ScheduleExpression }}'
-          Duration: '{{ Duration }}'
-          AutomaticallyAfterDays: '{{ AutomaticallyAfterDays }}'
-
+          schedule_expression: '{{ schedule_expression }}'
+          duration: '{{ duration }}'
+          automatically_after_days: '{{ automatically_after_days }}'
 ```
 </TabItem>
 </Tabs>
@@ -357,7 +356,7 @@ SET PatchDocument = string('{{ {
     "RotationRules": rotation_rules
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Id>';
+AND Identifier = '{{ id }}';
 ```
 
 
@@ -366,7 +365,7 @@ AND Identifier = '<Id>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.secretsmanager.rotation_schedules
-WHERE Identifier = '<Id>'
+WHERE Identifier = '{{ id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/secretsmanager/secret_target_attachments/index.md b/website/docs/services/secretsmanager/secret_target_attachments/index.md
index c9be529ae..23b1419e6 100644
--- a/website/docs/services/secretsmanager/secret_target_attachments/index.md
+++ b/website/docs/services/secretsmanager/secret_target_attachments/index.md
@@ -152,7 +152,7 @@ secret_id,
 target_type,
 target_id
 FROM awscc.secretsmanager.secret_target_attachments
-WHERE region = 'us-east-1' AND Identifier = '<Id>';
+WHERE region = 'us-east-1' AND Identifier = '{{ id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -190,10 +190,10 @@ INSERT INTO awscc.secretsmanager.secret_target_attachments (
  TargetId,
  region
 )
-SELECT 
-'{{ SecretId }}',
- '{{ TargetType }}',
- '{{ TargetId }}',
+SELECT
+'{{ secret_id }}',
+ '{{ target_type }}',
+ '{{ target_id }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -207,10 +207,10 @@ INSERT INTO awscc.secretsmanager.secret_target_attachments (
  TargetId,
  region
 )
-SELECT 
- '{{ SecretId }}',
- '{{ TargetType }}',
- '{{ TargetId }}',
+SELECT
+ '{{ secret_id }}',
+ '{{ target_type }}',
+ '{{ target_id }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -228,13 +228,12 @@ globals:
 resources:
   - name: secret_target_attachment
     props:
-      - name: SecretId
-        value: '{{ SecretId }}'
-      - name: TargetType
-        value: '{{ TargetType }}'
-      - name: TargetId
-        value: '{{ TargetId }}'
-
+      - name: secret_id
+        value: '{{ secret_id }}'
+      - name: target_type
+        value: '{{ target_type }}'
+      - name: target_id
+        value: '{{ target_id }}'
 ```
 </TabItem>
 </Tabs>
@@ -251,7 +250,7 @@ SET PatchDocument = string('{{ {
     "TargetId": target_id
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Id>';
+AND Identifier = '{{ id }}';
 ```
 
 
@@ -260,7 +259,7 @@ AND Identifier = '<Id>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.secretsmanager.secret_target_attachments
-WHERE Identifier = '<Id>'
+WHERE Identifier = '{{ id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/secretsmanager/secrets/index.md b/website/docs/services/secretsmanager/secrets/index.md
index b280af94b..a50429853 100644
--- a/website/docs/services/secretsmanager/secrets/index.md
+++ b/website/docs/services/secretsmanager/secrets/index.md
@@ -252,7 +252,7 @@ id,
 tags,
 name
 FROM awscc.secretsmanager.secrets
-WHERE region = 'us-east-1' AND Identifier = '<Id>';
+WHERE region = 'us-east-1' AND Identifier = '{{ id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -294,14 +294,14 @@ INSERT INTO awscc.secretsmanager.secrets (
  Name,
  region
 )
-SELECT 
-'{{ Description }}',
- '{{ KmsKeyId }}',
- '{{ SecretString }}',
- '{{ GenerateSecretString }}',
- '{{ ReplicaRegions }}',
- '{{ Tags }}',
- '{{ Name }}',
+SELECT
+'{{ description }}',
+ '{{ kms_key_id }}',
+ '{{ secret_string }}',
+ '{{ generate_secret_string }}',
+ '{{ replica_regions }}',
+ '{{ tags }}',
+ '{{ name }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -319,14 +319,14 @@ INSERT INTO awscc.secretsmanager.secrets (
  Name,
  region
 )
-SELECT 
- '{{ Description }}',
- '{{ KmsKeyId }}',
- '{{ SecretString }}',
- '{{ GenerateSecretString }}',
- '{{ ReplicaRegions }}',
- '{{ Tags }}',
- '{{ Name }}',
+SELECT
+ '{{ description }}',
+ '{{ kms_key_id }}',
+ '{{ secret_string }}',
+ '{{ generate_secret_string }}',
+ '{{ replica_regions }}',
+ '{{ tags }}',
+ '{{ name }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -344,35 +344,34 @@ globals:
 resources:
   - name: secret
     props:
-      - name: Description
-        value: '{{ Description }}'
-      - name: KmsKeyId
-        value: '{{ KmsKeyId }}'
-      - name: SecretString
-        value: '{{ SecretString }}'
-      - name: GenerateSecretString
+      - name: description
+        value: '{{ description }}'
+      - name: kms_key_id
+        value: '{{ kms_key_id }}'
+      - name: secret_string
+        value: '{{ secret_string }}'
+      - name: generate_secret_string
         value:
-          ExcludeUppercase: '{{ ExcludeUppercase }}'
-          RequireEachIncludedType: '{{ RequireEachIncludedType }}'
-          IncludeSpace: '{{ IncludeSpace }}'
-          ExcludeCharacters: '{{ ExcludeCharacters }}'
-          GenerateStringKey: '{{ GenerateStringKey }}'
-          PasswordLength: '{{ PasswordLength }}'
-          ExcludePunctuation: '{{ ExcludePunctuation }}'
-          ExcludeLowercase: '{{ ExcludeLowercase }}'
-          SecretStringTemplate: '{{ SecretStringTemplate }}'
-          ExcludeNumbers: '{{ ExcludeNumbers }}'
-      - name: ReplicaRegions
+          exclude_uppercase: '{{ exclude_uppercase }}'
+          require_each_included_type: '{{ require_each_included_type }}'
+          include_space: '{{ include_space }}'
+          exclude_characters: '{{ exclude_characters }}'
+          generate_string_key: '{{ generate_string_key }}'
+          password_length: '{{ password_length }}'
+          exclude_punctuation: '{{ exclude_punctuation }}'
+          exclude_lowercase: '{{ exclude_lowercase }}'
+          secret_string_template: '{{ secret_string_template }}'
+          exclude_numbers: '{{ exclude_numbers }}'
+      - name: replica_regions
         value:
-          - KmsKeyId: '{{ KmsKeyId }}'
-            Region: '{{ Region }}'
-      - name: Tags
+          - kms_key_id: '{{ kms_key_id }}'
+            region: '{{ region }}'
+      - name: tags
         value:
-          - Value: '{{ Value }}'
-            Key: '{{ Key }}'
-      - name: Name
-        value: '{{ Name }}'
-
+          - value: '{{ value }}'
+            key: '{{ key }}'
+      - name: name
+        value: '{{ name }}'
 ```
 </TabItem>
 </Tabs>
@@ -393,7 +392,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Id>';
+AND Identifier = '{{ id }}';
 ```
 
 
@@ -402,7 +401,7 @@ AND Identifier = '<Id>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.secretsmanager.secrets
-WHERE Identifier = '<Id>'
+WHERE Identifier = '{{ id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/securityhub/aggregator_v2s/index.md b/website/docs/services/securityhub/aggregator_v2s/index.md
index 90c505fed..abd87c896 100644
--- a/website/docs/services/securityhub/aggregator_v2s/index.md
+++ b/website/docs/services/securityhub/aggregator_v2s/index.md
@@ -153,7 +153,7 @@ linked_regions,
 tags,
 aggregation_region
 FROM awscc.securityhub.aggregator_v2s
-WHERE region = 'us-east-1' AND Identifier = '<AggregatorV2Arn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ aggregator_v2_arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -190,9 +190,9 @@ INSERT INTO awscc.securityhub.aggregator_v2s (
  LinkedRegions,
  region
 )
-SELECT 
-'{{ RegionLinkingMode }}',
- '{{ LinkedRegions }}',
+SELECT
+'{{ region_linking_mode }}',
+ '{{ linked_regions }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -206,10 +206,10 @@ INSERT INTO awscc.securityhub.aggregator_v2s (
  Tags,
  region
 )
-SELECT 
- '{{ RegionLinkingMode }}',
- '{{ LinkedRegions }}',
- '{{ Tags }}',
+SELECT
+ '{{ region_linking_mode }}',
+ '{{ linked_regions }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -227,14 +227,13 @@ globals:
 resources:
   - name: aggregator_v2
     props:
-      - name: RegionLinkingMode
-        value: '{{ RegionLinkingMode }}'
-      - name: LinkedRegions
+      - name: region_linking_mode
+        value: '{{ region_linking_mode }}'
+      - name: linked_regions
         value:
-          - '{{ LinkedRegions[0] }}'
-      - name: Tags
+          - '{{ linked_regions[0] }}'
+      - name: tags
         value: {}
-
 ```
 </TabItem>
 </Tabs>
@@ -252,7 +251,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<AggregatorV2Arn>';
+AND Identifier = '{{ aggregator_v2_arn }}';
 ```
 
 
@@ -261,7 +260,7 @@ AND Identifier = '<AggregatorV2Arn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.securityhub.aggregator_v2s
-WHERE Identifier = '<AggregatorV2Arn>'
+WHERE Identifier = '{{ aggregator_v2_arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/securityhub/automation_rule_v2s/index.md b/website/docs/services/securityhub/automation_rule_v2s/index.md
index 089d8fcd4..68dbc1b14 100644
--- a/website/docs/services/securityhub/automation_rule_v2s/index.md
+++ b/website/docs/services/securityhub/automation_rule_v2s/index.md
@@ -281,7 +281,7 @@ rule_id,
 created_at,
 updated_at
 FROM awscc.securityhub.automation_rule_v2s
-WHERE region = 'us-east-1' AND Identifier = '<RuleArn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ rule_arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -321,12 +321,12 @@ INSERT INTO awscc.securityhub.automation_rule_v2s (
  Actions,
  region
 )
-SELECT 
-'{{ RuleName }}',
- '{{ Description }}',
- '{{ RuleOrder }}',
- '{{ Criteria }}',
- '{{ Actions }}',
+SELECT
+'{{ rule_name }}',
+ '{{ description }}',
+ '{{ rule_order }}',
+ '{{ criteria }}',
+ '{{ actions }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -344,14 +344,14 @@ INSERT INTO awscc.securityhub.automation_rule_v2s (
  Tags,
  region
 )
-SELECT 
- '{{ RuleName }}',
- '{{ RuleStatus }}',
- '{{ Description }}',
- '{{ RuleOrder }}',
- '{{ Criteria }}',
- '{{ Actions }}',
- '{{ Tags }}',
+SELECT
+ '{{ rule_name }}',
+ '{{ rule_status }}',
+ '{{ description }}',
+ '{{ rule_order }}',
+ '{{ criteria }}',
+ '{{ actions }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -369,61 +369,60 @@ globals:
 resources:
   - name: automation_rule_v2
     props:
-      - name: RuleName
-        value: '{{ RuleName }}'
-      - name: RuleStatus
-        value: '{{ RuleStatus }}'
-      - name: Description
-        value: '{{ Description }}'
-      - name: RuleOrder
+      - name: rule_name
+        value: '{{ rule_name }}'
+      - name: rule_status
+        value: '{{ rule_status }}'
+      - name: description
+        value: '{{ description }}'
+      - name: rule_order
         value: null
-      - name: Criteria
+      - name: criteria
         value:
-          OcsfFindingCriteria:
-            CompositeFilters:
-              - StringFilters:
-                  - FieldName: '{{ FieldName }}'
-                    Filter:
-                      Comparison: '{{ Comparison }}'
-                      Value: '{{ Value }}'
-                DateFilters:
-                  - FieldName: '{{ FieldName }}'
-                    Filter:
-                      DateRange:
-                        Unit: '{{ Unit }}'
-                        Value: null
-                      End: '{{ End }}'
-                      Start: null
-                BooleanFilters:
-                  - FieldName: '{{ FieldName }}'
-                    Filter:
-                      Value: '{{ Value }}'
-                NumberFilters:
-                  - FieldName: '{{ FieldName }}'
-                    Filter:
-                      Eq: null
-                      Gte: null
-                      Lte: null
-                MapFilters:
-                  - FieldName: '{{ FieldName }}'
-                    Filter:
-                      Comparison: '{{ Comparison }}'
-                      Key: null
-                      Value: null
-                Operator: '{{ Operator }}'
-            CompositeOperator: null
-      - name: Actions
+          ocsf_finding_criteria:
+            composite_filters:
+              - string_filters:
+                  - field_name: '{{ field_name }}'
+                    filter:
+                      comparison: '{{ comparison }}'
+                      value: '{{ value }}'
+                date_filters:
+                  - field_name: '{{ field_name }}'
+                    filter:
+                      date_range:
+                        unit: '{{ unit }}'
+                        value: null
+                      end: '{{ end }}'
+                      start: null
+                boolean_filters:
+                  - field_name: '{{ field_name }}'
+                    filter:
+                      value: '{{ value }}'
+                number_filters:
+                  - field_name: '{{ field_name }}'
+                    filter:
+                      eq: null
+                      gte: null
+                      lte: null
+                map_filters:
+                  - field_name: '{{ field_name }}'
+                    filter:
+                      comparison: '{{ comparison }}'
+                      key: null
+                      value: null
+                operator: '{{ operator }}'
+            composite_operator: null
+      - name: actions
         value:
-          - Type: '{{ Type }}'
-            FindingFieldsUpdate:
-              SeverityId: '{{ SeverityId }}'
-              Comment: '{{ Comment }}'
-              StatusId: '{{ StatusId }}'
-            ExternalIntegrationConfiguration:
-              ConnectorArn: '{{ ConnectorArn }}'
-      - name: Tags
+          - type: '{{ type }}'
+            finding_fields_update:
+              severity_id: '{{ severity_id }}'
+              comment: '{{ comment }}'
+              status_id: '{{ status_id }}'
+            external_integration_configuration:
+              connector_arn: '{{ connector_arn }}'
+      - name: tags
         value: {}
-
 ```
 </TabItem>
 </Tabs>
@@ -445,7 +444,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<RuleArn>';
+AND Identifier = '{{ rule_arn }}';
 ```
 
 
@@ -454,7 +453,7 @@ AND Identifier = '<RuleArn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.securityhub.automation_rule_v2s
-WHERE Identifier = '<RuleArn>'
+WHERE Identifier = '{{ rule_arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/securityhub/automation_rules/index.md b/website/docs/services/securityhub/automation_rules/index.md
index c28dc6750..ffc969666 100644
--- a/website/docs/services/securityhub/automation_rules/index.md
+++ b/website/docs/services/securityhub/automation_rules/index.md
@@ -534,7 +534,7 @@ actions,
 criteria,
 tags
 FROM awscc.securityhub.automation_rules
-WHERE region = 'us-east-1' AND Identifier = '<RuleArn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ rule_arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -574,12 +574,12 @@ INSERT INTO awscc.securityhub.automation_rules (
  Criteria,
  region
 )
-SELECT 
-'{{ RuleOrder }}',
- '{{ Description }}',
- '{{ RuleName }}',
- '{{ Actions }}',
- '{{ Criteria }}',
+SELECT
+'{{ rule_order }}',
+ '{{ description }}',
+ '{{ rule_name }}',
+ '{{ actions }}',
+ '{{ criteria }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -598,15 +598,15 @@ INSERT INTO awscc.securityhub.automation_rules (
  Tags,
  region
 )
-SELECT 
- '{{ RuleStatus }}',
- '{{ RuleOrder }}',
- '{{ Description }}',
- '{{ RuleName }}',
- '{{ IsTerminal }}',
- '{{ Actions }}',
- '{{ Criteria }}',
- '{{ Tags }}',
+SELECT
+ '{{ rule_status }}',
+ '{{ rule_order }}',
+ '{{ description }}',
+ '{{ rule_name }}',
+ '{{ is_terminal }}',
+ '{{ actions }}',
+ '{{ criteria }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -624,122 +624,121 @@ globals:
 resources:
   - name: automation_rule
     props:
-      - name: RuleStatus
-        value: '{{ RuleStatus }}'
-      - name: RuleOrder
-        value: '{{ RuleOrder }}'
-      - name: Description
-        value: '{{ Description }}'
-      - name: RuleName
-        value: '{{ RuleName }}'
-      - name: IsTerminal
-        value: '{{ IsTerminal }}'
-      - name: Actions
+      - name: rule_status
+        value: '{{ rule_status }}'
+      - name: rule_order
+        value: '{{ rule_order }}'
+      - name: description
+        value: '{{ description }}'
+      - name: rule_name
+        value: '{{ rule_name }}'
+      - name: is_terminal
+        value: '{{ is_terminal }}'
+      - name: actions
         value:
-          - Type: '{{ Type }}'
-            FindingFieldsUpdate:
-              Types:
-                - '{{ Types[0] }}'
-              Severity:
-                Product: null
-                Label: '{{ Label }}'
-                Normalized: '{{ Normalized }}'
-              Confidence: null
-              Criticality: null
-              UserDefinedFields: {}
-              VerificationState: '{{ VerificationState }}'
-              RelatedFindings:
-                - ProductArn: '{{ ProductArn }}'
-                  Id: null
-              Note:
-                Text: '{{ Text }}'
-                UpdatedBy: null
-              Workflow:
-                Status: '{{ Status }}'
-      - name: Criteria
+          - type: '{{ type }}'
+            finding_fields_update:
+              types:
+                - '{{ types[0] }}'
+              severity:
+                product: null
+                label: '{{ label }}'
+                normalized: '{{ normalized }}'
+              confidence: null
+              criticality: null
+              user_defined_fields: {}
+              verification_state: '{{ verification_state }}'
+              related_findings:
+                - product_arn: '{{ product_arn }}'
+                  id: null
+              note:
+                text: '{{ text }}'
+                updated_by: null
+              workflow:
+                status: '{{ status }}'
+      - name: criteria
         value:
-          ProductArn:
-            - Comparison: '{{ Comparison }}'
-              Value: '{{ Value }}'
-          AwsAccountId:
+          product_arn:
+            - comparison: '{{ comparison }}'
+              value: '{{ value }}'
+          aws_account_id:
             - null
-          Id:
+          id:
             - null
-          GeneratorId:
+          generator_id:
             - null
-          Type:
+          type:
             - null
-          FirstObservedAt:
-            - DateRange:
-                Unit: '{{ Unit }}'
-                Value: null
-              End: '{{ End }}'
-              Start: null
-          LastObservedAt:
+          first_observed_at:
+            - date_range:
+                unit: '{{ unit }}'
+                value: null
+              end: '{{ end }}'
+              start: null
+          last_observed_at:
             - null
-          CreatedAt:
+          created_at:
             - null
-          UpdatedAt:
+          updated_at:
             - null
-          Confidence:
-            - Eq: null
-              Gte: null
-              Lte: null
-          Criticality:
+          confidence:
+            - eq: null
+              gte: null
+              lte: null
+          criticality:
             - null
-          Title:
+          title:
             - null
-          Description:
+          description:
             - null
-          SourceUrl:
+          source_url:
             - null
-          ProductName:
+          product_name:
             - null
-          CompanyName:
+          company_name:
             - null
-          SeverityLabel:
+          severity_label:
             - null
-          ResourceType:
+          resource_type:
             - null
-          ResourceId:
+          resource_id:
             - null
-          ResourcePartition:
+          resource_partition:
             - null
-          ResourceRegion:
+          resource_region:
             - null
-          ResourceTags:
-            - Comparison: '{{ Comparison }}'
-              Key: null
-              Value: null
-          ResourceDetailsOther:
+          resource_tags:
+            - comparison: '{{ comparison }}'
+              key: null
+              value: null
+          resource_details_other:
             - null
-          ComplianceStatus:
+          compliance_status:
             - null
-          ComplianceSecurityControlId:
+          compliance_security_control_id:
             - null
-          ComplianceAssociatedStandardsId:
+          compliance_associated_standards_id:
             - null
-          VerificationState:
+          verification_state:
             - null
-          WorkflowStatus:
+          workflow_status:
             - null
-          RecordState:
+          record_state:
             - null
-          RelatedFindingsProductArn:
+          related_findings_product_arn:
             - null
-          RelatedFindingsId:
+          related_findings_id:
             - null
-          NoteText:
+          note_text:
             - null
-          NoteUpdatedAt:
+          note_updated_at:
             - null
-          NoteUpdatedBy:
+          note_updated_by:
             - null
-          UserDefinedFields:
+          user_defined_fields:
             - null
-      - name: Tags
+      - name: tags
         value: {}
-
 ```
 </TabItem>
 </Tabs>
@@ -762,7 +761,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<RuleArn>';
+AND Identifier = '{{ rule_arn }}';
 ```
 
 
@@ -771,7 +770,7 @@ AND Identifier = '<RuleArn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.securityhub.automation_rules
-WHERE Identifier = '<RuleArn>'
+WHERE Identifier = '{{ rule_arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/securityhub/configuration_policies/index.md b/website/docs/services/securityhub/configuration_policies/index.md
index 4bff02227..fedceaa10 100644
--- a/website/docs/services/securityhub/configuration_policies/index.md
+++ b/website/docs/services/securityhub/configuration_policies/index.md
@@ -223,7 +223,7 @@ updated_at,
 service_enabled,
 tags
 FROM awscc.securityhub.configuration_policies
-WHERE region = 'us-east-1' AND Identifier = '<Arn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -260,9 +260,9 @@ INSERT INTO awscc.securityhub.configuration_policies (
  ConfigurationPolicy,
  region
 )
-SELECT 
-'{{ Name }}',
- '{{ ConfigurationPolicy }}',
+SELECT
+'{{ name }}',
+ '{{ configuration_policy }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -277,11 +277,11 @@ INSERT INTO awscc.securityhub.configuration_policies (
  Tags,
  region
 )
-SELECT 
- '{{ Name }}',
- '{{ Description }}',
- '{{ ConfigurationPolicy }}',
- '{{ Tags }}',
+SELECT
+ '{{ name }}',
+ '{{ description }}',
+ '{{ configuration_policy }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -299,27 +299,26 @@ globals:
 resources:
   - name: configuration_policy
     props:
-      - name: Name
-        value: '{{ Name }}'
-      - name: Description
-        value: '{{ Description }}'
-      - name: ConfigurationPolicy
+      - name: name
+        value: '{{ name }}'
+      - name: description
+        value: '{{ description }}'
+      - name: configuration_policy
         value:
-          SecurityHub:
-            EnabledStandardIdentifiers:
-              - '{{ EnabledStandardIdentifiers[0] }}'
-            ServiceEnabled: '{{ ServiceEnabled }}'
-            SecurityControlsConfiguration:
-              DisabledSecurityControlIdentifiers:
-                - '{{ DisabledSecurityControlIdentifiers[0] }}'
-              EnabledSecurityControlIdentifiers:
-                - '{{ EnabledSecurityControlIdentifiers[0] }}'
-              SecurityControlCustomParameters:
-                - Parameters: {}
-                  SecurityControlId: '{{ SecurityControlId }}'
-      - name: Tags
+          security_hub:
+            enabled_standard_identifiers:
+              - '{{ enabled_standard_identifiers[0] }}'
+            service_enabled: '{{ service_enabled }}'
+            security_controls_configuration:
+              disabled_security_control_identifiers:
+                - '{{ disabled_security_control_identifiers[0] }}'
+              enabled_security_control_identifiers:
+                - '{{ enabled_security_control_identifiers[0] }}'
+              security_control_custom_parameters:
+                - parameters: {}
+                  security_control_id: '{{ security_control_id }}'
+      - name: tags
         value: {}
-
 ```
 </TabItem>
 </Tabs>
@@ -338,7 +337,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Arn>';
+AND Identifier = '{{ arn }}';
 ```
 
 
@@ -347,7 +346,7 @@ AND Identifier = '<Arn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.securityhub.configuration_policies
-WHERE Identifier = '<Arn>'
+WHERE Identifier = '{{ arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/securityhub/delegated_admins/index.md b/website/docs/services/securityhub/delegated_admins/index.md
index 7465c0490..1f8ed4d1c 100644
--- a/website/docs/services/securityhub/delegated_admins/index.md
+++ b/website/docs/services/securityhub/delegated_admins/index.md
@@ -140,7 +140,7 @@ delegated_admin_identifier,
 admin_account_id,
 status
 FROM awscc.securityhub.delegated_admins
-WHERE region = 'us-east-1' AND Identifier = '<DelegatedAdminIdentifier>';
+WHERE region = 'us-east-1' AND Identifier = '{{ delegated_admin_identifier }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -176,8 +176,8 @@ INSERT INTO awscc.securityhub.delegated_admins (
  AdminAccountId,
  region
 )
-SELECT 
-'{{ AdminAccountId }}',
+SELECT
+'{{ admin_account_id }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -189,8 +189,8 @@ INSERT INTO awscc.securityhub.delegated_admins (
  AdminAccountId,
  region
 )
-SELECT 
- '{{ AdminAccountId }}',
+SELECT
+ '{{ admin_account_id }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -208,9 +208,8 @@ globals:
 resources:
   - name: delegated_admin
     props:
-      - name: AdminAccountId
-        value: '{{ AdminAccountId }}'
-
+      - name: admin_account_id
+        value: '{{ admin_account_id }}'
 ```
 </TabItem>
 </Tabs>
@@ -221,7 +220,7 @@ resources:
 ```sql
 /*+ delete */
 DELETE FROM awscc.securityhub.delegated_admins
-WHERE Identifier = '<DelegatedAdminIdentifier>'
+WHERE Identifier = '{{ delegated_admin_identifier }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/securityhub/finding_aggregators/index.md b/website/docs/services/securityhub/finding_aggregators/index.md
index 677799504..645e342b7 100644
--- a/website/docs/services/securityhub/finding_aggregators/index.md
+++ b/website/docs/services/securityhub/finding_aggregators/index.md
@@ -147,7 +147,7 @@ region_linking_mode,
 regions,
 finding_aggregation_region
 FROM awscc.securityhub.finding_aggregators
-WHERE region = 'us-east-1' AND Identifier = '<FindingAggregatorArn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ finding_aggregator_arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -183,8 +183,8 @@ INSERT INTO awscc.securityhub.finding_aggregators (
  RegionLinkingMode,
  region
 )
-SELECT 
-'{{ RegionLinkingMode }}',
+SELECT
+'{{ region_linking_mode }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -197,9 +197,9 @@ INSERT INTO awscc.securityhub.finding_aggregators (
  Regions,
  region
 )
-SELECT 
- '{{ RegionLinkingMode }}',
- '{{ Regions }}',
+SELECT
+ '{{ region_linking_mode }}',
+ '{{ regions }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -217,12 +217,11 @@ globals:
 resources:
   - name: finding_aggregator
     props:
-      - name: RegionLinkingMode
-        value: '{{ RegionLinkingMode }}'
-      - name: Regions
+      - name: region_linking_mode
+        value: '{{ region_linking_mode }}'
+      - name: regions
         value:
-          - '{{ Regions[0] }}'
-
+          - '{{ regions[0] }}'
 ```
 </TabItem>
 </Tabs>
@@ -239,7 +238,7 @@ SET PatchDocument = string('{{ {
     "Regions": regions
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<FindingAggregatorArn>';
+AND Identifier = '{{ finding_aggregator_arn }}';
 ```
 
 
@@ -248,7 +247,7 @@ AND Identifier = '<FindingAggregatorArn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.securityhub.finding_aggregators
-WHERE Identifier = '<FindingAggregatorArn>'
+WHERE Identifier = '{{ finding_aggregator_arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/securityhub/hub_v2s/index.md b/website/docs/services/securityhub/hub_v2s/index.md
index 78b6139c3..676b1a492 100644
--- a/website/docs/services/securityhub/hub_v2s/index.md
+++ b/website/docs/services/securityhub/hub_v2s/index.md
@@ -146,7 +146,7 @@ hub_v2_arn,
 subscribed_at,
 tags
 FROM awscc.securityhub.hub_v2s
-WHERE region = 'us-east-1' AND Identifier = '<HubV2Arn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ hub_v2_arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -182,8 +182,8 @@ INSERT INTO awscc.securityhub.hub_v2s (
  Tags,
  region
 )
-SELECT 
-'{{ Tags }}',
+SELECT
+'{{ tags }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -195,8 +195,8 @@ INSERT INTO awscc.securityhub.hub_v2s (
  Tags,
  region
 )
-SELECT 
- '{{ Tags }}',
+SELECT
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -214,9 +214,8 @@ globals:
 resources:
   - name: hub_v2
     props:
-      - name: Tags
+      - name: tags
         value: {}
-
 ```
 </TabItem>
 </Tabs>
@@ -232,7 +231,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<HubV2Arn>';
+AND Identifier = '{{ hub_v2_arn }}';
 ```
 
 
@@ -241,7 +240,7 @@ AND Identifier = '<HubV2Arn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.securityhub.hub_v2s
-WHERE Identifier = '<HubV2Arn>'
+WHERE Identifier = '{{ hub_v2_arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/securityhub/hubs/index.md b/website/docs/services/securityhub/hubs/index.md
index 420b768f2..1a56f503f 100644
--- a/website/docs/services/securityhub/hubs/index.md
+++ b/website/docs/services/securityhub/hubs/index.md
@@ -164,7 +164,7 @@ auto_enable_controls,
 tags,
 subscribed_at
 FROM awscc.securityhub.hubs
-WHERE region = 'us-east-1' AND Identifier = '<ARN>';
+WHERE region = 'us-east-1' AND Identifier = '{{ arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -203,11 +203,11 @@ INSERT INTO awscc.securityhub.hubs (
  Tags,
  region
 )
-SELECT 
-'{{ EnableDefaultStandards }}',
- '{{ ControlFindingGenerator }}',
- '{{ AutoEnableControls }}',
- '{{ Tags }}',
+SELECT
+'{{ enable_default_standards }}',
+ '{{ control_finding_generator }}',
+ '{{ auto_enable_controls }}',
+ '{{ tags }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -222,11 +222,11 @@ INSERT INTO awscc.securityhub.hubs (
  Tags,
  region
 )
-SELECT 
- '{{ EnableDefaultStandards }}',
- '{{ ControlFindingGenerator }}',
- '{{ AutoEnableControls }}',
- '{{ Tags }}',
+SELECT
+ '{{ enable_default_standards }}',
+ '{{ control_finding_generator }}',
+ '{{ auto_enable_controls }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -244,15 +244,14 @@ globals:
 resources:
   - name: hub
     props:
-      - name: EnableDefaultStandards
-        value: '{{ EnableDefaultStandards }}'
-      - name: ControlFindingGenerator
-        value: '{{ ControlFindingGenerator }}'
-      - name: AutoEnableControls
-        value: '{{ AutoEnableControls }}'
-      - name: Tags
+      - name: enable_default_standards
+        value: '{{ enable_default_standards }}'
+      - name: control_finding_generator
+        value: '{{ control_finding_generator }}'
+      - name: auto_enable_controls
+        value: '{{ auto_enable_controls }}'
+      - name: tags
         value: {}
-
 ```
 </TabItem>
 </Tabs>
@@ -271,7 +270,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<ARN>';
+AND Identifier = '{{ arn }}';
 ```
 
 
@@ -280,7 +279,7 @@ AND Identifier = '<ARN>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.securityhub.hubs
-WHERE Identifier = '<ARN>'
+WHERE Identifier = '{{ arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/securityhub/insights/index.md b/website/docs/services/securityhub/insights/index.md
index c68db2c43..c58a967e5 100644
--- a/website/docs/services/securityhub/insights/index.md
+++ b/website/docs/services/securityhub/insights/index.md
@@ -760,7 +760,7 @@ name,
 filters,
 group_by_attribute
 FROM awscc.securityhub.insights
-WHERE region = 'us-east-1' AND Identifier = '<InsightArn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ insight_arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -798,10 +798,10 @@ INSERT INTO awscc.securityhub.insights (
  GroupByAttribute,
  region
 )
-SELECT 
-'{{ Name }}',
- '{{ Filters }}',
- '{{ GroupByAttribute }}',
+SELECT
+'{{ name }}',
+ '{{ filters }}',
+ '{{ group_by_attribute }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -815,10 +815,10 @@ INSERT INTO awscc.securityhub.insights (
  GroupByAttribute,
  region
 )
-SELECT 
- '{{ Name }}',
- '{{ Filters }}',
- '{{ GroupByAttribute }}',
+SELECT
+ '{{ name }}',
+ '{{ filters }}',
+ '{{ group_by_attribute }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -836,230 +836,229 @@ globals:
 resources:
   - name: insight
     props:
-      - name: Name
-        value: '{{ Name }}'
-      - name: Filters
+      - name: name
+        value: '{{ name }}'
+      - name: filters
         value:
-          ProductArn:
-            - Comparison: '{{ Comparison }}'
-              Value: '{{ Value }}'
-          AwsAccountId:
+          product_arn:
+            - comparison: '{{ comparison }}'
+              value: '{{ value }}'
+          aws_account_id:
             - null
-          AwsAccountName:
+          aws_account_name:
             - null
-          Id:
+          id:
             - null
-          GeneratorId:
+          generator_id:
             - null
-          Type:
+          type:
             - null
-          Region:
+          region:
             - null
-          FirstObservedAt:
-            - DateRange:
-                Unit: '{{ Unit }}'
-                Value: null
-              End: '{{ End }}'
-              Start: null
-          LastObservedAt:
+          first_observed_at:
+            - date_range:
+                unit: '{{ unit }}'
+                value: null
+              end: '{{ end }}'
+              start: null
+          last_observed_at:
             - null
-          CreatedAt:
+          created_at:
             - null
-          UpdatedAt:
+          updated_at:
             - null
-          SeverityLabel:
+          severity_label:
             - null
-          Confidence:
-            - Eq: null
-              Gte: null
-              Lte: null
-          Criticality:
+          confidence:
+            - eq: null
+              gte: null
+              lte: null
+          criticality:
             - null
-          Title:
+          title:
             - null
-          Description:
+          description:
             - null
-          RecommendationText:
+          recommendation_text:
             - null
-          SourceUrl:
+          source_url:
             - null
-          ProductFields:
-            - Comparison: '{{ Comparison }}'
-              Key: null
-              Value: null
-          ProductName:
+          product_fields:
+            - comparison: '{{ comparison }}'
+              key: null
+              value: null
+          product_name:
             - null
-          CompanyName:
+          company_name:
             - null
-          UserDefinedFields:
+          user_defined_fields:
             - null
-          MalwareName:
+          malware_name:
             - null
-          MalwareType:
+          malware_type:
             - null
-          MalwarePath:
+          malware_path:
             - null
-          MalwareState:
+          malware_state:
             - null
-          NetworkDirection:
+          network_direction:
             - null
-          NetworkProtocol:
+          network_protocol:
             - null
-          NetworkSourceIpV4:
-            - Cidr: null
-          NetworkSourceIpV6:
+          network_source_ip_v4:
+            - cidr: null
+          network_source_ip_v6:
             - null
-          NetworkSourcePort:
+          network_source_port:
             - null
-          NetworkSourceDomain:
+          network_source_domain:
             - null
-          NetworkSourceMac:
+          network_source_mac:
             - null
-          NetworkDestinationIpV4:
+          network_destination_ip_v4:
             - null
-          NetworkDestinationIpV6:
+          network_destination_ip_v6:
             - null
-          NetworkDestinationPort:
+          network_destination_port:
             - null
-          NetworkDestinationDomain:
+          network_destination_domain:
             - null
-          ProcessName:
+          process_name:
             - null
-          ProcessPath:
+          process_path:
             - null
-          ProcessPid:
+          process_pid:
             - null
-          ProcessParentPid:
+          process_parent_pid:
             - null
-          ProcessLaunchedAt:
+          process_launched_at:
             - null
-          ProcessTerminatedAt:
+          process_terminated_at:
             - null
-          ThreatIntelIndicatorType:
+          threat_intel_indicator_type:
             - null
-          ThreatIntelIndicatorValue:
+          threat_intel_indicator_value:
             - null
-          ThreatIntelIndicatorCategory:
+          threat_intel_indicator_category:
             - null
-          ThreatIntelIndicatorLastObservedAt:
+          threat_intel_indicator_last_observed_at:
             - null
-          ThreatIntelIndicatorSource:
+          threat_intel_indicator_source:
             - null
-          ThreatIntelIndicatorSourceUrl:
+          threat_intel_indicator_source_url:
             - null
-          ResourceType:
+          resource_type:
             - null
-          ResourceId:
+          resource_id:
             - null
-          ResourcePartition:
+          resource_partition:
             - null
-          ResourceRegion:
+          resource_region:
             - null
-          ResourceTags:
+          resource_tags:
             - null
-          ResourceAwsEc2InstanceType:
+          resource_aws_ec2_instance_type:
             - null
-          ResourceAwsEc2InstanceImageId:
+          resource_aws_ec2_instance_image_id:
             - null
-          ResourceAwsEc2InstanceIpV4Addresses:
+          resource_aws_ec2_instance_ip_v4_addresses:
             - null
-          ResourceAwsEc2InstanceIpV6Addresses:
+          resource_aws_ec2_instance_ip_v6_addresses:
             - null
-          ResourceAwsEc2InstanceKeyName:
+          resource_aws_ec2_instance_key_name:
             - null
-          ResourceAwsEc2InstanceIamInstanceProfileArn:
+          resource_aws_ec2_instance_iam_instance_profile_arn:
             - null
-          ResourceAwsEc2InstanceVpcId:
+          resource_aws_ec2_instance_vpc_id:
             - null
-          ResourceAwsEc2InstanceSubnetId:
+          resource_aws_ec2_instance_subnet_id:
             - null
-          ResourceAwsEc2InstanceLaunchedAt:
+          resource_aws_ec2_instance_launched_at:
             - null
-          ResourceAwsS3BucketOwnerId:
+          resource_aws_s3_bucket_owner_id:
             - null
-          ResourceAwsS3BucketOwnerName:
+          resource_aws_s3_bucket_owner_name:
             - null
-          ResourceAwsIamAccessKeyStatus:
+          resource_aws_iam_access_key_status:
             - null
-          ResourceAwsIamAccessKeyCreatedAt:
+          resource_aws_iam_access_key_created_at:
             - null
-          ResourceContainerName:
+          resource_container_name:
             - null
-          ResourceContainerImageId:
+          resource_container_image_id:
             - null
-          ResourceContainerImageName:
+          resource_container_image_name:
             - null
-          ResourceContainerLaunchedAt:
+          resource_container_launched_at:
             - null
-          ResourceDetailsOther:
+          resource_details_other:
             - null
-          ComplianceStatus:
+          compliance_status:
             - null
-          VerificationState:
+          verification_state:
             - null
-          WorkflowState:
+          workflow_state:
             - null
-          WorkflowStatus:
+          workflow_status:
             - null
-          RecordState:
+          record_state:
             - null
-          RelatedFindingsProductArn:
+          related_findings_product_arn:
             - null
-          RelatedFindingsId:
+          related_findings_id:
             - null
-          ResourceApplicationArn:
+          resource_application_arn:
             - null
-          ResourceApplicationName:
+          resource_application_name:
             - null
-          NoteText:
+          note_text:
             - null
-          NoteUpdatedAt:
+          note_updated_at:
             - null
-          NoteUpdatedBy:
+          note_updated_by:
             - null
-          Sample:
-            - Value: '{{ Value }}'
-          ComplianceAssociatedStandardsId:
+          sample:
+            - value: '{{ value }}'
+          compliance_associated_standards_id:
             - null
-          ComplianceSecurityControlId:
+          compliance_security_control_id:
             - null
-          ComplianceSecurityControlParametersName:
+          compliance_security_control_parameters_name:
             - null
-          ComplianceSecurityControlParametersValue:
+          compliance_security_control_parameters_value:
             - null
-          FindingProviderFieldsConfidence:
+          finding_provider_fields_confidence:
             - null
-          FindingProviderFieldsCriticality:
+          finding_provider_fields_criticality:
             - null
-          FindingProviderFieldsRelatedFindingsId:
+          finding_provider_fields_related_findings_id:
             - null
-          FindingProviderFieldsRelatedFindingsProductArn:
+          finding_provider_fields_related_findings_product_arn:
             - null
-          FindingProviderFieldsSeverityLabel:
+          finding_provider_fields_severity_label:
             - null
-          FindingProviderFieldsSeverityOriginal:
+          finding_provider_fields_severity_original:
             - null
-          FindingProviderFieldsTypes:
+          finding_provider_fields_types:
             - null
-          ResourceAwsIamAccessKeyPrincipalName:
+          resource_aws_iam_access_key_principal_name:
             - null
-          ResourceAwsIamUserUserName:
+          resource_aws_iam_user_user_name:
             - null
-          VulnerabilitiesExploitAvailable:
+          vulnerabilities_exploit_available:
             - null
-          VulnerabilitiesFixAvailable:
+          vulnerabilities_fix_available:
             - null
-          Keyword:
-            - Value: null
-          ResourceAwsIamAccessKeyUserName:
+          keyword:
+            - value: null
+          resource_aws_iam_access_key_user_name:
             - null
-          SeverityNormalized:
+          severity_normalized:
             - null
-          SeverityProduct:
+          severity_product:
             - null
-      - name: GroupByAttribute
+      - name: group_by_attribute
         value: null
-
 ```
 </TabItem>
 </Tabs>
@@ -1077,7 +1076,7 @@ SET PatchDocument = string('{{ {
     "GroupByAttribute": group_by_attribute
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<InsightArn>';
+AND Identifier = '{{ insight_arn }}';
 ```
 
 
@@ -1086,7 +1085,7 @@ AND Identifier = '<InsightArn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.securityhub.insights
-WHERE Identifier = '<InsightArn>'
+WHERE Identifier = '{{ insight_arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/securityhub/organization_configurations/index.md b/website/docs/services/securityhub/organization_configurations/index.md
index 67d225379..00932fcf6 100644
--- a/website/docs/services/securityhub/organization_configurations/index.md
+++ b/website/docs/services/securityhub/organization_configurations/index.md
@@ -170,7 +170,7 @@ status_message,
 member_account_limit_reached,
 organization_configuration_identifier
 FROM awscc.securityhub.organization_configurations
-WHERE region = 'us-east-1' AND Identifier = '<OrganizationConfigurationIdentifier>';
+WHERE region = 'us-east-1' AND Identifier = '{{ organization_configuration_identifier }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -206,8 +206,8 @@ INSERT INTO awscc.securityhub.organization_configurations (
  AutoEnable,
  region
 )
-SELECT 
-'{{ AutoEnable }}',
+SELECT
+'{{ auto_enable }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -221,10 +221,10 @@ INSERT INTO awscc.securityhub.organization_configurations (
  ConfigurationType,
  region
 )
-SELECT 
- '{{ AutoEnable }}',
- '{{ AutoEnableStandards }}',
- '{{ ConfigurationType }}',
+SELECT
+ '{{ auto_enable }}',
+ '{{ auto_enable_standards }}',
+ '{{ configuration_type }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -242,13 +242,12 @@ globals:
 resources:
   - name: organization_configuration
     props:
-      - name: AutoEnable
-        value: '{{ AutoEnable }}'
-      - name: AutoEnableStandards
-        value: '{{ AutoEnableStandards }}'
-      - name: ConfigurationType
-        value: '{{ ConfigurationType }}'
-
+      - name: auto_enable
+        value: '{{ auto_enable }}'
+      - name: auto_enable_standards
+        value: '{{ auto_enable_standards }}'
+      - name: configuration_type
+        value: '{{ configuration_type }}'
 ```
 </TabItem>
 </Tabs>
@@ -266,7 +265,7 @@ SET PatchDocument = string('{{ {
     "ConfigurationType": configuration_type
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<OrganizationConfigurationIdentifier>';
+AND Identifier = '{{ organization_configuration_identifier }}';
 ```
 
 
@@ -275,7 +274,7 @@ AND Identifier = '<OrganizationConfigurationIdentifier>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.securityhub.organization_configurations
-WHERE Identifier = '<OrganizationConfigurationIdentifier>'
+WHERE Identifier = '{{ organization_configuration_identifier }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/securityhub/policy_associations/index.md b/website/docs/services/securityhub/policy_associations/index.md
index aaddc1db2..c902718e0 100644
--- a/website/docs/services/securityhub/policy_associations/index.md
+++ b/website/docs/services/securityhub/policy_associations/index.md
@@ -176,7 +176,7 @@ target_type,
 updated_at,
 association_identifier
 FROM awscc.securityhub.policy_associations
-WHERE region = 'us-east-1' AND Identifier = '<AssociationIdentifier>';
+WHERE region = 'us-east-1' AND Identifier = '{{ association_identifier }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -214,10 +214,10 @@ INSERT INTO awscc.securityhub.policy_associations (
  TargetType,
  region
 )
-SELECT 
-'{{ ConfigurationPolicyId }}',
- '{{ TargetId }}',
- '{{ TargetType }}',
+SELECT
+'{{ configuration_policy_id }}',
+ '{{ target_id }}',
+ '{{ target_type }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -231,10 +231,10 @@ INSERT INTO awscc.securityhub.policy_associations (
  TargetType,
  region
 )
-SELECT 
- '{{ ConfigurationPolicyId }}',
- '{{ TargetId }}',
- '{{ TargetType }}',
+SELECT
+ '{{ configuration_policy_id }}',
+ '{{ target_id }}',
+ '{{ target_type }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -252,13 +252,12 @@ globals:
 resources:
   - name: policy_association
     props:
-      - name: ConfigurationPolicyId
-        value: '{{ ConfigurationPolicyId }}'
-      - name: TargetId
-        value: '{{ TargetId }}'
-      - name: TargetType
-        value: '{{ TargetType }}'
-
+      - name: configuration_policy_id
+        value: '{{ configuration_policy_id }}'
+      - name: target_id
+        value: '{{ target_id }}'
+      - name: target_type
+        value: '{{ target_type }}'
 ```
 </TabItem>
 </Tabs>
@@ -274,7 +273,7 @@ SET PatchDocument = string('{{ {
     "ConfigurationPolicyId": configuration_policy_id
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<AssociationIdentifier>';
+AND Identifier = '{{ association_identifier }}';
 ```
 
 
@@ -283,7 +282,7 @@ AND Identifier = '<AssociationIdentifier>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.securityhub.policy_associations
-WHERE Identifier = '<AssociationIdentifier>'
+WHERE Identifier = '{{ association_identifier }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/securityhub/product_subscriptions/index.md b/website/docs/services/securityhub/product_subscriptions/index.md
index a55deba2f..935ce77a3 100644
--- a/website/docs/services/securityhub/product_subscriptions/index.md
+++ b/website/docs/services/securityhub/product_subscriptions/index.md
@@ -134,7 +134,7 @@ region,
 product_arn,
 product_subscription_arn
 FROM awscc.securityhub.product_subscriptions
-WHERE region = 'us-east-1' AND Identifier = '<ProductSubscriptionArn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ product_subscription_arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -170,8 +170,8 @@ INSERT INTO awscc.securityhub.product_subscriptions (
  ProductArn,
  region
 )
-SELECT 
-'{{ ProductArn }}',
+SELECT
+'{{ product_arn }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -183,8 +183,8 @@ INSERT INTO awscc.securityhub.product_subscriptions (
  ProductArn,
  region
 )
-SELECT 
- '{{ ProductArn }}',
+SELECT
+ '{{ product_arn }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -202,9 +202,8 @@ globals:
 resources:
   - name: product_subscription
     props:
-      - name: ProductArn
-        value: '{{ ProductArn }}'
-
+      - name: product_arn
+        value: '{{ product_arn }}'
 ```
 </TabItem>
 </Tabs>
@@ -215,7 +214,7 @@ resources:
 ```sql
 /*+ delete */
 DELETE FROM awscc.securityhub.product_subscriptions
-WHERE Identifier = '<ProductSubscriptionArn>'
+WHERE Identifier = '{{ product_subscription_arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/securityhub/security_controls/index.md b/website/docs/services/securityhub/security_controls/index.md
index 620fd8ca8..d7c9c749c 100644
--- a/website/docs/services/securityhub/security_controls/index.md
+++ b/website/docs/services/securityhub/security_controls/index.md
@@ -147,7 +147,7 @@ security_control_arn,
 last_update_reason,
 parameters
 FROM awscc.securityhub.security_controls
-WHERE region = 'us-east-1' AND Identifier = '<SecurityControlId>';
+WHERE region = 'us-east-1' AND Identifier = '{{ security_control_id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -183,8 +183,8 @@ INSERT INTO awscc.securityhub.security_controls (
  Parameters,
  region
 )
-SELECT 
-'{{ Parameters }}',
+SELECT
+'{{ parameters }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -199,11 +199,11 @@ INSERT INTO awscc.securityhub.security_controls (
  Parameters,
  region
 )
-SELECT 
- '{{ SecurityControlId }}',
- '{{ SecurityControlArn }}',
- '{{ LastUpdateReason }}',
- '{{ Parameters }}',
+SELECT
+ '{{ security_control_id }}',
+ '{{ security_control_arn }}',
+ '{{ last_update_reason }}',
+ '{{ parameters }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -221,15 +221,14 @@ globals:
 resources:
   - name: security_control
     props:
-      - name: SecurityControlId
-        value: '{{ SecurityControlId }}'
-      - name: SecurityControlArn
+      - name: security_control_id
+        value: '{{ security_control_id }}'
+      - name: security_control_arn
         value: null
-      - name: LastUpdateReason
-        value: '{{ LastUpdateReason }}'
-      - name: Parameters
+      - name: last_update_reason
+        value: '{{ last_update_reason }}'
+      - name: parameters
         value: {}
-
 ```
 </TabItem>
 </Tabs>
@@ -247,7 +246,7 @@ SET PatchDocument = string('{{ {
     "Parameters": parameters
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<SecurityControlId>';
+AND Identifier = '{{ security_control_id }}';
 ```
 
 
@@ -256,7 +255,7 @@ AND Identifier = '<SecurityControlId>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.securityhub.security_controls
-WHERE Identifier = '<SecurityControlId>'
+WHERE Identifier = '{{ security_control_id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/securityhub/standards/index.md b/website/docs/services/securityhub/standards/index.md
index de3bd7685..47a27228e 100644
--- a/website/docs/services/securityhub/standards/index.md
+++ b/website/docs/services/securityhub/standards/index.md
@@ -158,7 +158,7 @@ standards_subscription_arn,
 standards_arn,
 disabled_standards_controls
 FROM awscc.securityhub.standards
-WHERE region = 'us-east-1' AND Identifier = '<StandardsSubscriptionArn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ standards_subscription_arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -194,8 +194,8 @@ INSERT INTO awscc.securityhub.standards (
  StandardsArn,
  region
 )
-SELECT 
-'{{ StandardsArn }}',
+SELECT
+'{{ standards_arn }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -208,9 +208,9 @@ INSERT INTO awscc.securityhub.standards (
  DisabledStandardsControls,
  region
 )
-SELECT 
- '{{ StandardsArn }}',
- '{{ DisabledStandardsControls }}',
+SELECT
+ '{{ standards_arn }}',
+ '{{ disabled_standards_controls }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -228,13 +228,12 @@ globals:
 resources:
   - name: standard
     props:
-      - name: StandardsArn
-        value: '{{ StandardsArn }}'
-      - name: DisabledStandardsControls
+      - name: standards_arn
+        value: '{{ standards_arn }}'
+      - name: disabled_standards_controls
         value:
-          - StandardsControlArn: '{{ StandardsControlArn }}'
-            Reason: '{{ Reason }}'
-
+          - standards_control_arn: '{{ standards_control_arn }}'
+            reason: '{{ reason }}'
 ```
 </TabItem>
 </Tabs>
@@ -250,7 +249,7 @@ SET PatchDocument = string('{{ {
     "DisabledStandardsControls": disabled_standards_controls
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<StandardsSubscriptionArn>';
+AND Identifier = '{{ standards_subscription_arn }}';
 ```
 
 
@@ -259,7 +258,7 @@ AND Identifier = '<StandardsSubscriptionArn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.securityhub.standards
-WHERE Identifier = '<StandardsSubscriptionArn>'
+WHERE Identifier = '{{ standards_subscription_arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/securitylake/data_lakes/index.md b/website/docs/services/securitylake/data_lakes/index.md
index 568229cc2..1a62a177d 100644
--- a/website/docs/services/securitylake/data_lakes/index.md
+++ b/website/docs/services/securitylake/data_lakes/index.md
@@ -232,7 +232,7 @@ tags,
 arn,
 s3_bucket_arn
 FROM awscc.securitylake.data_lakes
-WHERE region = 'us-east-1' AND Identifier = '<Arn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -272,12 +272,12 @@ INSERT INTO awscc.securitylake.data_lakes (
  Tags,
  region
 )
-SELECT 
-'{{ EncryptionConfiguration }}',
- '{{ LifecycleConfiguration }}',
- '{{ ReplicationConfiguration }}',
- '{{ MetaStoreManagerRoleArn }}',
- '{{ Tags }}',
+SELECT
+'{{ encryption_configuration }}',
+ '{{ lifecycle_configuration }}',
+ '{{ replication_configuration }}',
+ '{{ meta_store_manager_role_arn }}',
+ '{{ tags }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -293,12 +293,12 @@ INSERT INTO awscc.securitylake.data_lakes (
  Tags,
  region
 )
-SELECT 
- '{{ EncryptionConfiguration }}',
- '{{ LifecycleConfiguration }}',
- '{{ ReplicationConfiguration }}',
- '{{ MetaStoreManagerRoleArn }}',
- '{{ Tags }}',
+SELECT
+ '{{ encryption_configuration }}',
+ '{{ lifecycle_configuration }}',
+ '{{ replication_configuration }}',
+ '{{ meta_store_manager_role_arn }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -316,28 +316,27 @@ globals:
 resources:
   - name: data_lake
     props:
-      - name: EncryptionConfiguration
+      - name: encryption_configuration
         value:
-          KmsKeyId: '{{ KmsKeyId }}'
-      - name: LifecycleConfiguration
+          kms_key_id: '{{ kms_key_id }}'
+      - name: lifecycle_configuration
         value:
-          Expiration:
-            Days: '{{ Days }}'
-          Transitions:
-            - Days: '{{ Days }}'
-              StorageClass: '{{ StorageClass }}'
-      - name: ReplicationConfiguration
+          expiration:
+            days: '{{ days }}'
+          transitions:
+            - days: '{{ days }}'
+              storage_class: '{{ storage_class }}'
+      - name: replication_configuration
         value:
-          Regions:
-            - '{{ Regions[0] }}'
-          RoleArn: '{{ RoleArn }}'
-      - name: MetaStoreManagerRoleArn
-        value: '{{ MetaStoreManagerRoleArn }}'
-      - name: Tags
+          regions:
+            - '{{ regions[0] }}'
+          role_arn: '{{ role_arn }}'
+      - name: meta_store_manager_role_arn
+        value: '{{ meta_store_manager_role_arn }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -357,7 +356,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Arn>';
+AND Identifier = '{{ arn }}';
 ```
 
 
@@ -366,7 +365,7 @@ AND Identifier = '<Arn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.securitylake.data_lakes
-WHERE Identifier = '<Arn>'
+WHERE Identifier = '{{ arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/securitylake/subscriber_notifications/index.md b/website/docs/services/securitylake/subscriber_notifications/index.md
index c041f9003..ea821ae77 100644
--- a/website/docs/services/securitylake/subscriber_notifications/index.md
+++ b/website/docs/services/securitylake/subscriber_notifications/index.md
@@ -185,7 +185,7 @@ notification_configuration,
 subscriber_arn,
 subscriber_endpoint
 FROM awscc.securitylake.subscriber_notifications
-WHERE region = 'us-east-1' AND Identifier = '<SubscriberArn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ subscriber_arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -222,9 +222,9 @@ INSERT INTO awscc.securitylake.subscriber_notifications (
  SubscriberArn,
  region
 )
-SELECT 
-'{{ NotificationConfiguration }}',
- '{{ SubscriberArn }}',
+SELECT
+'{{ notification_configuration }}',
+ '{{ subscriber_arn }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -237,9 +237,9 @@ INSERT INTO awscc.securitylake.subscriber_notifications (
  SubscriberArn,
  region
 )
-SELECT 
- '{{ NotificationConfiguration }}',
- '{{ SubscriberArn }}',
+SELECT
+ '{{ notification_configuration }}',
+ '{{ subscriber_arn }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -257,18 +257,17 @@ globals:
 resources:
   - name: subscriber_notification
     props:
-      - name: NotificationConfiguration
+      - name: notification_configuration
         value:
-          HttpsNotificationConfiguration:
-            AuthorizationApiKeyName: '{{ AuthorizationApiKeyName }}'
-            AuthorizationApiKeyValue: '{{ AuthorizationApiKeyValue }}'
-            Endpoint: '{{ Endpoint }}'
-            HttpMethod: '{{ HttpMethod }}'
-            TargetRoleArn: '{{ TargetRoleArn }}'
-          SqsNotificationConfiguration: {}
-      - name: SubscriberArn
-        value: '{{ SubscriberArn }}'
-
+          https_notification_configuration:
+            authorization_api_key_name: '{{ authorization_api_key_name }}'
+            authorization_api_key_value: '{{ authorization_api_key_value }}'
+            endpoint: '{{ endpoint }}'
+            http_method: '{{ http_method }}'
+            target_role_arn: '{{ target_role_arn }}'
+          sqs_notification_configuration: {}
+      - name: subscriber_arn
+        value: '{{ subscriber_arn }}'
 ```
 </TabItem>
 </Tabs>
@@ -284,7 +283,7 @@ SET PatchDocument = string('{{ {
     "NotificationConfiguration": notification_configuration
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<SubscriberArn>';
+AND Identifier = '{{ subscriber_arn }}';
 ```
 
 
@@ -293,7 +292,7 @@ AND Identifier = '<SubscriberArn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.securitylake.subscriber_notifications
-WHERE Identifier = '<SubscriberArn>'
+WHERE Identifier = '{{ subscriber_arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/securitylake/subscribers/index.md b/website/docs/services/securitylake/subscribers/index.md
index ea6ae7994..31ff05241 100644
--- a/website/docs/services/securitylake/subscribers/index.md
+++ b/website/docs/services/securitylake/subscribers/index.md
@@ -260,7 +260,7 @@ subscriber_role_arn,
 s3_bucket_arn,
 subscriber_arn
 FROM awscc.securitylake.subscribers
-WHERE region = 'us-east-1' AND Identifier = '<SubscriberArn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ subscriber_arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -300,12 +300,12 @@ INSERT INTO awscc.securitylake.subscribers (
  Sources,
  region
 )
-SELECT 
-'{{ AccessTypes }}',
- '{{ DataLakeArn }}',
- '{{ SubscriberIdentity }}',
- '{{ SubscriberName }}',
- '{{ Sources }}',
+SELECT
+'{{ access_types }}',
+ '{{ data_lake_arn }}',
+ '{{ subscriber_identity }}',
+ '{{ subscriber_name }}',
+ '{{ sources }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -323,14 +323,14 @@ INSERT INTO awscc.securitylake.subscribers (
  Sources,
  region
 )
-SELECT 
- '{{ AccessTypes }}',
- '{{ DataLakeArn }}',
- '{{ SubscriberIdentity }}',
- '{{ SubscriberName }}',
- '{{ SubscriberDescription }}',
- '{{ Tags }}',
- '{{ Sources }}',
+SELECT
+ '{{ access_types }}',
+ '{{ data_lake_arn }}',
+ '{{ subscriber_identity }}',
+ '{{ subscriber_name }}',
+ '{{ subscriber_description }}',
+ '{{ tags }}',
+ '{{ sources }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -348,27 +348,26 @@ globals:
 resources:
   - name: subscriber
     props:
-      - name: AccessTypes
+      - name: access_types
         value:
-          - '{{ AccessTypes[0] }}'
-      - name: DataLakeArn
-        value: '{{ DataLakeArn }}'
-      - name: SubscriberIdentity
+          - '{{ access_types[0] }}'
+      - name: data_lake_arn
+        value: '{{ data_lake_arn }}'
+      - name: subscriber_identity
         value:
-          ExternalId: '{{ ExternalId }}'
-          Principal: '{{ Principal }}'
-      - name: SubscriberName
-        value: '{{ SubscriberName }}'
-      - name: SubscriberDescription
-        value: '{{ SubscriberDescription }}'
-      - name: Tags
+          external_id: '{{ external_id }}'
+          principal: '{{ principal }}'
+      - name: subscriber_name
+        value: '{{ subscriber_name }}'
+      - name: subscriber_description
+        value: '{{ subscriber_description }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-      - name: Sources
+          - key: '{{ key }}'
+            value: '{{ value }}'
+      - name: sources
         value:
           - null
-
 ```
 </TabItem>
 </Tabs>
@@ -389,7 +388,7 @@ SET PatchDocument = string('{{ {
     "Sources": sources
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<SubscriberArn>';
+AND Identifier = '{{ subscriber_arn }}';
 ```
 
 
@@ -398,7 +397,7 @@ AND Identifier = '<SubscriberArn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.securitylake.subscribers
-WHERE Identifier = '<SubscriberArn>'
+WHERE Identifier = '{{ subscriber_arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/servicecatalog/cloud_formation_provisioned_products/index.md b/website/docs/services/servicecatalog/cloud_formation_provisioned_products/index.md
index 5247b2a3f..a4513ab8b 100644
--- a/website/docs/services/servicecatalog/cloud_formation_provisioned_products/index.md
+++ b/website/docs/services/servicecatalog/cloud_formation_provisioned_products/index.md
@@ -239,7 +239,7 @@ record_id,
 cloudformation_stack_arn,
 outputs
 FROM awscc.servicecatalog.cloud_formation_provisioned_products
-WHERE region = 'us-east-1' AND Identifier = '<ProvisionedProductId>';
+WHERE region = 'us-east-1' AND Identifier = '{{ provisioned_product_id }}';
 ```
 
 ## `INSERT` example
@@ -273,19 +273,19 @@ INSERT INTO awscc.servicecatalog.cloud_formation_provisioned_products (
  Tags,
  region
 )
-SELECT 
-'{{ AcceptLanguage }}',
- '{{ NotificationArns }}',
- '{{ PathId }}',
- '{{ PathName }}',
- '{{ ProductId }}',
- '{{ ProductName }}',
- '{{ ProvisionedProductName }}',
- '{{ ProvisioningArtifactId }}',
- '{{ ProvisioningArtifactName }}',
- '{{ ProvisioningParameters }}',
- '{{ ProvisioningPreferences }}',
- '{{ Tags }}',
+SELECT
+'{{ accept_language }}',
+ '{{ notification_arns }}',
+ '{{ path_id }}',
+ '{{ path_name }}',
+ '{{ product_id }}',
+ '{{ product_name }}',
+ '{{ provisioned_product_name }}',
+ '{{ provisioning_artifact_id }}',
+ '{{ provisioning_artifact_name }}',
+ '{{ provisioning_parameters }}',
+ '{{ provisioning_preferences }}',
+ '{{ tags }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -308,19 +308,19 @@ INSERT INTO awscc.servicecatalog.cloud_formation_provisioned_products (
  Tags,
  region
 )
-SELECT 
- '{{ AcceptLanguage }}',
- '{{ NotificationArns }}',
- '{{ PathId }}',
- '{{ PathName }}',
- '{{ ProductId }}',
- '{{ ProductName }}',
- '{{ ProvisionedProductName }}',
- '{{ ProvisioningArtifactId }}',
- '{{ ProvisioningArtifactName }}',
- '{{ ProvisioningParameters }}',
- '{{ ProvisioningPreferences }}',
- '{{ Tags }}',
+SELECT
+ '{{ accept_language }}',
+ '{{ notification_arns }}',
+ '{{ path_id }}',
+ '{{ path_name }}',
+ '{{ product_id }}',
+ '{{ product_name }}',
+ '{{ provisioned_product_name }}',
+ '{{ provisioning_artifact_id }}',
+ '{{ provisioning_artifact_name }}',
+ '{{ provisioning_parameters }}',
+ '{{ provisioning_preferences }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -338,45 +338,44 @@ globals:
 resources:
   - name: cloud_formation_provisioned_product
     props:
-      - name: AcceptLanguage
-        value: '{{ AcceptLanguage }}'
-      - name: NotificationArns
+      - name: accept_language
+        value: '{{ accept_language }}'
+      - name: notification_arns
         value:
-          - '{{ NotificationArns[0] }}'
-      - name: PathId
-        value: '{{ PathId }}'
-      - name: PathName
-        value: '{{ PathName }}'
-      - name: ProductId
-        value: '{{ ProductId }}'
-      - name: ProductName
-        value: '{{ ProductName }}'
-      - name: ProvisionedProductName
-        value: '{{ ProvisionedProductName }}'
-      - name: ProvisioningArtifactId
-        value: '{{ ProvisioningArtifactId }}'
-      - name: ProvisioningArtifactName
-        value: '{{ ProvisioningArtifactName }}'
-      - name: ProvisioningParameters
+          - '{{ notification_arns[0] }}'
+      - name: path_id
+        value: '{{ path_id }}'
+      - name: path_name
+        value: '{{ path_name }}'
+      - name: product_id
+        value: '{{ product_id }}'
+      - name: product_name
+        value: '{{ product_name }}'
+      - name: provisioned_product_name
+        value: '{{ provisioned_product_name }}'
+      - name: provisioning_artifact_id
+        value: '{{ provisioning_artifact_id }}'
+      - name: provisioning_artifact_name
+        value: '{{ provisioning_artifact_name }}'
+      - name: provisioning_parameters
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-      - name: ProvisioningPreferences
+          - key: '{{ key }}'
+            value: '{{ value }}'
+      - name: provisioning_preferences
         value:
-          StackSetAccounts:
-            - '{{ StackSetAccounts[0] }}'
-          StackSetFailureToleranceCount: '{{ StackSetFailureToleranceCount }}'
-          StackSetFailureTolerancePercentage: '{{ StackSetFailureTolerancePercentage }}'
-          StackSetMaxConcurrencyCount: '{{ StackSetMaxConcurrencyCount }}'
-          StackSetMaxConcurrencyPercentage: '{{ StackSetMaxConcurrencyPercentage }}'
-          StackSetOperationType: '{{ StackSetOperationType }}'
-          StackSetRegions:
-            - '{{ StackSetRegions[0] }}'
-      - name: Tags
+          stack_set_accounts:
+            - '{{ stack_set_accounts[0] }}'
+          stack_set_failure_tolerance_count: '{{ stack_set_failure_tolerance_count }}'
+          stack_set_failure_tolerance_percentage: '{{ stack_set_failure_tolerance_percentage }}'
+          stack_set_max_concurrency_count: '{{ stack_set_max_concurrency_count }}'
+          stack_set_max_concurrency_percentage: '{{ stack_set_max_concurrency_percentage }}'
+          stack_set_operation_type: '{{ stack_set_operation_type }}'
+          stack_set_regions:
+            - '{{ stack_set_regions[0] }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -401,7 +400,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<ProvisionedProductId>';
+AND Identifier = '{{ provisioned_product_id }}';
 ```
 
 
@@ -410,7 +409,7 @@ AND Identifier = '<ProvisionedProductId>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.servicecatalog.cloud_formation_provisioned_products
-WHERE Identifier = '<ProvisionedProductId>'
+WHERE Identifier = '{{ provisioned_product_id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/servicecatalog/service_action_associations/index.md b/website/docs/services/servicecatalog/service_action_associations/index.md
index 5b277a77c..d607d46b6 100644
--- a/website/docs/services/servicecatalog/service_action_associations/index.md
+++ b/website/docs/services/servicecatalog/service_action_associations/index.md
@@ -150,7 +150,7 @@ product_id,
 provisioning_artifact_id,
 service_action_id
 FROM awscc.servicecatalog.service_action_associations
-WHERE region = 'us-east-1' AND Identifier = '<ProductId>|<ProvisioningArtifactId>|<ServiceActionId>';
+WHERE region = 'us-east-1' AND Identifier = '{{ product_id }}|{{ provisioning_artifact_id }}|{{ service_action_id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -190,10 +190,10 @@ INSERT INTO awscc.servicecatalog.service_action_associations (
  ServiceActionId,
  region
 )
-SELECT 
-'{{ ProductId }}',
- '{{ ProvisioningArtifactId }}',
- '{{ ServiceActionId }}',
+SELECT
+'{{ product_id }}',
+ '{{ provisioning_artifact_id }}',
+ '{{ service_action_id }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -207,10 +207,10 @@ INSERT INTO awscc.servicecatalog.service_action_associations (
  ServiceActionId,
  region
 )
-SELECT 
- '{{ ProductId }}',
- '{{ ProvisioningArtifactId }}',
- '{{ ServiceActionId }}',
+SELECT
+ '{{ product_id }}',
+ '{{ provisioning_artifact_id }}',
+ '{{ service_action_id }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -228,13 +228,12 @@ globals:
 resources:
   - name: service_action_association
     props:
-      - name: ProductId
-        value: '{{ ProductId }}'
-      - name: ProvisioningArtifactId
-        value: '{{ ProvisioningArtifactId }}'
-      - name: ServiceActionId
-        value: '{{ ServiceActionId }}'
-
+      - name: product_id
+        value: '{{ product_id }}'
+      - name: provisioning_artifact_id
+        value: '{{ provisioning_artifact_id }}'
+      - name: service_action_id
+        value: '{{ service_action_id }}'
 ```
 </TabItem>
 </Tabs>
@@ -245,7 +244,7 @@ resources:
 ```sql
 /*+ delete */
 DELETE FROM awscc.servicecatalog.service_action_associations
-WHERE Identifier = '<ProductId|ProvisioningArtifactId|ServiceActionId>'
+WHERE Identifier = '{{ product_id }}|{{ provisioning_artifact_id }}|{{ service_action_id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/servicecatalog/service_actions/index.md b/website/docs/services/servicecatalog/service_actions/index.md
index 6a818a0a3..05afe627f 100644
--- a/website/docs/services/servicecatalog/service_actions/index.md
+++ b/website/docs/services/servicecatalog/service_actions/index.md
@@ -176,7 +176,7 @@ definition,
 description,
 id
 FROM awscc.servicecatalog.service_actions
-WHERE region = 'us-east-1' AND Identifier = '<Id>';
+WHERE region = 'us-east-1' AND Identifier = '{{ id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -214,10 +214,10 @@ INSERT INTO awscc.servicecatalog.service_actions (
  Definition,
  region
 )
-SELECT 
-'{{ Name }}',
- '{{ DefinitionType }}',
- '{{ Definition }}',
+SELECT
+'{{ name }}',
+ '{{ definition_type }}',
+ '{{ definition }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -233,12 +233,12 @@ INSERT INTO awscc.servicecatalog.service_actions (
  Description,
  region
 )
-SELECT 
- '{{ AcceptLanguage }}',
- '{{ Name }}',
- '{{ DefinitionType }}',
- '{{ Definition }}',
- '{{ Description }}',
+SELECT
+ '{{ accept_language }}',
+ '{{ name }}',
+ '{{ definition_type }}',
+ '{{ definition }}',
+ '{{ description }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -256,19 +256,18 @@ globals:
 resources:
   - name: service_action
     props:
-      - name: AcceptLanguage
-        value: '{{ AcceptLanguage }}'
-      - name: Name
-        value: '{{ Name }}'
-      - name: DefinitionType
-        value: '{{ DefinitionType }}'
-      - name: Definition
+      - name: accept_language
+        value: '{{ accept_language }}'
+      - name: name
+        value: '{{ name }}'
+      - name: definition_type
+        value: '{{ definition_type }}'
+      - name: definition
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-      - name: Description
-        value: '{{ Description }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
+      - name: description
+        value: '{{ description }}'
 ```
 </TabItem>
 </Tabs>
@@ -288,7 +287,7 @@ SET PatchDocument = string('{{ {
     "Description": description
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Id>';
+AND Identifier = '{{ id }}';
 ```
 
 
@@ -297,7 +296,7 @@ AND Identifier = '<Id>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.servicecatalog.service_actions
-WHERE Identifier = '<Id>'
+WHERE Identifier = '{{ id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/servicecatalog/tag_options/index.md b/website/docs/services/servicecatalog/tag_options/index.md
index c4dc52627..461828f56 100644
--- a/website/docs/services/servicecatalog/tag_options/index.md
+++ b/website/docs/services/servicecatalog/tag_options/index.md
@@ -152,7 +152,7 @@ active,
 value,
 key
 FROM awscc.servicecatalog.tag_options
-WHERE region = 'us-east-1' AND Identifier = '<Id>';
+WHERE region = 'us-east-1' AND Identifier = '{{ id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -189,9 +189,9 @@ INSERT INTO awscc.servicecatalog.tag_options (
  Key,
  region
 )
-SELECT 
-'{{ Value }}',
- '{{ Key }}',
+SELECT
+'{{ value }}',
+ '{{ key }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -205,10 +205,10 @@ INSERT INTO awscc.servicecatalog.tag_options (
  Key,
  region
 )
-SELECT 
- '{{ Active }}',
- '{{ Value }}',
- '{{ Key }}',
+SELECT
+ '{{ active }}',
+ '{{ value }}',
+ '{{ key }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -226,13 +226,12 @@ globals:
 resources:
   - name: tag_option
     props:
-      - name: Active
-        value: '{{ Active }}'
-      - name: Value
-        value: '{{ Value }}'
-      - name: Key
-        value: '{{ Key }}'
-
+      - name: active
+        value: '{{ active }}'
+      - name: value
+        value: '{{ value }}'
+      - name: key
+        value: '{{ key }}'
 ```
 </TabItem>
 </Tabs>
@@ -248,7 +247,7 @@ SET PatchDocument = string('{{ {
     "Active": active
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Id>';
+AND Identifier = '{{ id }}';
 ```
 
 
@@ -257,7 +256,7 @@ AND Identifier = '<Id>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.servicecatalog.tag_options
-WHERE Identifier = '<Id>'
+WHERE Identifier = '{{ id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/servicecatalogappregistry/applications/index.md b/website/docs/services/servicecatalogappregistry/applications/index.md
index 39a7a9a61..78a976ac9 100644
--- a/website/docs/services/servicecatalogappregistry/applications/index.md
+++ b/website/docs/services/servicecatalogappregistry/applications/index.md
@@ -176,7 +176,7 @@ application_tag_key,
 application_tag_value,
 application_name
 FROM awscc.servicecatalogappregistry.applications
-WHERE region = 'us-east-1' AND Identifier = '<Id>';
+WHERE region = 'us-east-1' AND Identifier = '{{ id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -212,8 +212,8 @@ INSERT INTO awscc.servicecatalogappregistry.applications (
  Name,
  region
 )
-SELECT 
-'{{ Name }}',
+SELECT
+'{{ name }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -227,10 +227,10 @@ INSERT INTO awscc.servicecatalogappregistry.applications (
  Tags,
  region
 )
-SELECT 
- '{{ Name }}',
- '{{ Description }}',
- '{{ Tags }}',
+SELECT
+ '{{ name }}',
+ '{{ description }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -248,13 +248,12 @@ globals:
 resources:
   - name: application
     props:
-      - name: Name
-        value: '{{ Name }}'
-      - name: Description
-        value: '{{ Description }}'
-      - name: Tags
+      - name: name
+        value: '{{ name }}'
+      - name: description
+        value: '{{ description }}'
+      - name: tags
         value: {}
-
 ```
 </TabItem>
 </Tabs>
@@ -272,7 +271,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Id>';
+AND Identifier = '{{ id }}';
 ```
 
 
@@ -281,7 +280,7 @@ AND Identifier = '<Id>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.servicecatalogappregistry.applications
-WHERE Identifier = '<Id>'
+WHERE Identifier = '{{ id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/servicecatalogappregistry/attribute_group_associations/index.md b/website/docs/services/servicecatalogappregistry/attribute_group_associations/index.md
index 6f8374cf4..0ff9a33b2 100644
--- a/website/docs/services/servicecatalogappregistry/attribute_group_associations/index.md
+++ b/website/docs/services/servicecatalogappregistry/attribute_group_associations/index.md
@@ -161,7 +161,7 @@ attribute_group,
 application_arn,
 attribute_group_arn
 FROM awscc.servicecatalogappregistry.attribute_group_associations
-WHERE region = 'us-east-1' AND Identifier = '<ApplicationArn>|<AttributeGroupArn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ application_arn }}|{{ attribute_group_arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -199,9 +199,9 @@ INSERT INTO awscc.servicecatalogappregistry.attribute_group_associations (
  AttributeGroup,
  region
 )
-SELECT 
-'{{ Application }}',
- '{{ AttributeGroup }}',
+SELECT
+'{{ application }}',
+ '{{ attribute_group }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -214,9 +214,9 @@ INSERT INTO awscc.servicecatalogappregistry.attribute_group_associations (
  AttributeGroup,
  region
 )
-SELECT 
- '{{ Application }}',
- '{{ AttributeGroup }}',
+SELECT
+ '{{ application }}',
+ '{{ attribute_group }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -234,11 +234,10 @@ globals:
 resources:
   - name: attribute_group_association
     props:
-      - name: Application
-        value: '{{ Application }}'
-      - name: AttributeGroup
-        value: '{{ AttributeGroup }}'
-
+      - name: application
+        value: '{{ application }}'
+      - name: attribute_group
+        value: '{{ attribute_group }}'
 ```
 </TabItem>
 </Tabs>
@@ -249,7 +248,7 @@ resources:
 ```sql
 /*+ delete */
 DELETE FROM awscc.servicecatalogappregistry.attribute_group_associations
-WHERE Identifier = '<ApplicationArn|AttributeGroupArn>'
+WHERE Identifier = '{{ application_arn }}|{{ attribute_group_arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/servicecatalogappregistry/attribute_groups/index.md b/website/docs/services/servicecatalogappregistry/attribute_groups/index.md
index 4828fb0ba..5c692afc5 100644
--- a/website/docs/services/servicecatalogappregistry/attribute_groups/index.md
+++ b/website/docs/services/servicecatalogappregistry/attribute_groups/index.md
@@ -164,7 +164,7 @@ description,
 attributes,
 tags
 FROM awscc.servicecatalogappregistry.attribute_groups
-WHERE region = 'us-east-1' AND Identifier = '<Id>';
+WHERE region = 'us-east-1' AND Identifier = '{{ id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -201,9 +201,9 @@ INSERT INTO awscc.servicecatalogappregistry.attribute_groups (
  Attributes,
  region
 )
-SELECT 
-'{{ Name }}',
- '{{ Attributes }}',
+SELECT
+'{{ name }}',
+ '{{ attributes }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -218,11 +218,11 @@ INSERT INTO awscc.servicecatalogappregistry.attribute_groups (
  Tags,
  region
 )
-SELECT 
- '{{ Name }}',
- '{{ Description }}',
- '{{ Attributes }}',
- '{{ Tags }}',
+SELECT
+ '{{ name }}',
+ '{{ description }}',
+ '{{ attributes }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -240,15 +240,14 @@ globals:
 resources:
   - name: attribute_group
     props:
-      - name: Name
-        value: '{{ Name }}'
-      - name: Description
-        value: '{{ Description }}'
-      - name: Attributes
+      - name: name
+        value: '{{ name }}'
+      - name: description
+        value: '{{ description }}'
+      - name: attributes
         value: {}
-      - name: Tags
+      - name: tags
         value: {}
-
 ```
 </TabItem>
 </Tabs>
@@ -267,7 +266,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Id>';
+AND Identifier = '{{ id }}';
 ```
 
 
@@ -276,7 +275,7 @@ AND Identifier = '<Id>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.servicecatalogappregistry.attribute_groups
-WHERE Identifier = '<Id>'
+WHERE Identifier = '{{ id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/servicecatalogappregistry/resource_associations/index.md b/website/docs/services/servicecatalogappregistry/resource_associations/index.md
index a00e9bbe3..c621fe338 100644
--- a/website/docs/services/servicecatalogappregistry/resource_associations/index.md
+++ b/website/docs/services/servicecatalogappregistry/resource_associations/index.md
@@ -172,7 +172,7 @@ resource_type,
 application_arn,
 resource_arn
 FROM awscc.servicecatalogappregistry.resource_associations
-WHERE region = 'us-east-1' AND Identifier = '<ApplicationArn>|<ResourceArn>|<ResourceType>';
+WHERE region = 'us-east-1' AND Identifier = '{{ application_arn }}|{{ resource_arn }}|{{ resource_type }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -212,10 +212,10 @@ INSERT INTO awscc.servicecatalogappregistry.resource_associations (
  ResourceType,
  region
 )
-SELECT 
-'{{ Application }}',
- '{{ Resource }}',
- '{{ ResourceType }}',
+SELECT
+'{{ application }}',
+ '{{ resource }}',
+ '{{ resource_type }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -229,10 +229,10 @@ INSERT INTO awscc.servicecatalogappregistry.resource_associations (
  ResourceType,
  region
 )
-SELECT 
- '{{ Application }}',
- '{{ Resource }}',
- '{{ ResourceType }}',
+SELECT
+ '{{ application }}',
+ '{{ resource }}',
+ '{{ resource_type }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -250,13 +250,12 @@ globals:
 resources:
   - name: resource_association
     props:
-      - name: Application
-        value: '{{ Application }}'
-      - name: Resource
-        value: '{{ Resource }}'
-      - name: ResourceType
-        value: '{{ ResourceType }}'
-
+      - name: application
+        value: '{{ application }}'
+      - name: resource
+        value: '{{ resource }}'
+      - name: resource_type
+        value: '{{ resource_type }}'
 ```
 </TabItem>
 </Tabs>
@@ -267,7 +266,7 @@ resources:
 ```sql
 /*+ delete */
 DELETE FROM awscc.servicecatalogappregistry.resource_associations
-WHERE Identifier = '<ApplicationArn|ResourceArn|ResourceType>'
+WHERE Identifier = '{{ application_arn }}|{{ resource_arn }}|{{ resource_type }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/ses/configuration_set_event_destinations/index.md b/website/docs/services/ses/configuration_set_event_destinations/index.md
index 66d3ced76..777993011 100644
--- a/website/docs/services/ses/configuration_set_event_destinations/index.md
+++ b/website/docs/services/ses/configuration_set_event_destinations/index.md
@@ -233,7 +233,7 @@ id,
 configuration_set_name,
 event_destination
 FROM awscc.ses.configuration_set_event_destinations
-WHERE region = 'us-east-1' AND Identifier = '<Id>';
+WHERE region = 'us-east-1' AND Identifier = '{{ id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -270,9 +270,9 @@ INSERT INTO awscc.ses.configuration_set_event_destinations (
  EventDestination,
  region
 )
-SELECT 
-'{{ ConfigurationSetName }}',
- '{{ EventDestination }}',
+SELECT
+'{{ configuration_set_name }}',
+ '{{ event_destination }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -285,9 +285,9 @@ INSERT INTO awscc.ses.configuration_set_event_destinations (
  EventDestination,
  region
 )
-SELECT 
- '{{ ConfigurationSetName }}',
- '{{ EventDestination }}',
+SELECT
+ '{{ configuration_set_name }}',
+ '{{ event_destination }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -305,27 +305,26 @@ globals:
 resources:
   - name: configuration_set_event_destination
     props:
-      - name: ConfigurationSetName
-        value: '{{ ConfigurationSetName }}'
-      - name: EventDestination
+      - name: configuration_set_name
+        value: '{{ configuration_set_name }}'
+      - name: event_destination
         value:
-          Name: '{{ Name }}'
-          Enabled: '{{ Enabled }}'
-          MatchingEventTypes:
-            - '{{ MatchingEventTypes[0] }}'
-          CloudWatchDestination:
-            DimensionConfigurations:
-              - DimensionValueSource: '{{ DimensionValueSource }}'
-                DefaultDimensionValue: '{{ DefaultDimensionValue }}'
-                DimensionName: '{{ DimensionName }}'
-          KinesisFirehoseDestination:
-            IAMRoleARN: '{{ IAMRoleARN }}'
-            DeliveryStreamARN: '{{ DeliveryStreamARN }}'
-          SnsDestination:
-            TopicARN: '{{ TopicARN }}'
-          EventBridgeDestination:
-            EventBusArn: '{{ EventBusArn }}'
-
+          name: '{{ name }}'
+          enabled: '{{ enabled }}'
+          matching_event_types:
+            - '{{ matching_event_types[0] }}'
+          cloud_watch_destination:
+            dimension_configurations:
+              - dimension_value_source: '{{ dimension_value_source }}'
+                default_dimension_value: '{{ default_dimension_value }}'
+                dimension_name: '{{ dimension_name }}'
+          kinesis_firehose_destination:
+            iam_role_arn: '{{ iam_role_arn }}'
+            delivery_stream_arn: '{{ delivery_stream_arn }}'
+          sns_destination:
+            topic_arn: '{{ topic_arn }}'
+          event_bridge_destination:
+            event_bus_arn: '{{ event_bus_arn }}'
 ```
 </TabItem>
 </Tabs>
@@ -341,7 +340,7 @@ SET PatchDocument = string('{{ {
     "EventDestination": event_destination
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Id>';
+AND Identifier = '{{ id }}';
 ```
 
 
@@ -350,7 +349,7 @@ AND Identifier = '<Id>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.ses.configuration_set_event_destinations
-WHERE Identifier = '<Id>'
+WHERE Identifier = '{{ id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/ses/configuration_sets/index.md b/website/docs/services/ses/configuration_sets/index.md
index 0d12e287d..fd967ac88 100644
--- a/website/docs/services/ses/configuration_sets/index.md
+++ b/website/docs/services/ses/configuration_sets/index.md
@@ -264,7 +264,7 @@ suppression_options,
 vdm_options,
 tags
 FROM awscc.ses.configuration_sets
-WHERE region = 'us-east-1' AND Identifier = '<Name>';
+WHERE region = 'us-east-1' AND Identifier = '{{ name }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -307,15 +307,15 @@ INSERT INTO awscc.ses.configuration_sets (
  Tags,
  region
 )
-SELECT 
-'{{ Name }}',
- '{{ TrackingOptions }}',
- '{{ DeliveryOptions }}',
- '{{ ReputationOptions }}',
- '{{ SendingOptions }}',
- '{{ SuppressionOptions }}',
- '{{ VdmOptions }}',
- '{{ Tags }}',
+SELECT
+'{{ name }}',
+ '{{ tracking_options }}',
+ '{{ delivery_options }}',
+ '{{ reputation_options }}',
+ '{{ sending_options }}',
+ '{{ suppression_options }}',
+ '{{ vdm_options }}',
+ '{{ tags }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -334,15 +334,15 @@ INSERT INTO awscc.ses.configuration_sets (
  Tags,
  region
 )
-SELECT 
- '{{ Name }}',
- '{{ TrackingOptions }}',
- '{{ DeliveryOptions }}',
- '{{ ReputationOptions }}',
- '{{ SendingOptions }}',
- '{{ SuppressionOptions }}',
- '{{ VdmOptions }}',
- '{{ Tags }}',
+SELECT
+ '{{ name }}',
+ '{{ tracking_options }}',
+ '{{ delivery_options }}',
+ '{{ reputation_options }}',
+ '{{ sending_options }}',
+ '{{ suppression_options }}',
+ '{{ vdm_options }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -360,38 +360,37 @@ globals:
 resources:
   - name: configuration_set
     props:
-      - name: Name
-        value: '{{ Name }}'
-      - name: TrackingOptions
+      - name: name
+        value: '{{ name }}'
+      - name: tracking_options
         value:
-          CustomRedirectDomain: '{{ CustomRedirectDomain }}'
-          HttpsPolicy: '{{ HttpsPolicy }}'
-      - name: DeliveryOptions
+          custom_redirect_domain: '{{ custom_redirect_domain }}'
+          https_policy: '{{ https_policy }}'
+      - name: delivery_options
         value:
-          TlsPolicy: '{{ TlsPolicy }}'
-          SendingPoolName: '{{ SendingPoolName }}'
-          MaxDeliverySeconds: null
-      - name: ReputationOptions
+          tls_policy: '{{ tls_policy }}'
+          sending_pool_name: '{{ sending_pool_name }}'
+          max_delivery_seconds: null
+      - name: reputation_options
         value:
-          ReputationMetricsEnabled: '{{ ReputationMetricsEnabled }}'
-      - name: SendingOptions
+          reputation_metrics_enabled: '{{ reputation_metrics_enabled }}'
+      - name: sending_options
         value:
-          SendingEnabled: '{{ SendingEnabled }}'
-      - name: SuppressionOptions
+          sending_enabled: '{{ sending_enabled }}'
+      - name: suppression_options
         value:
-          SuppressedReasons:
-            - '{{ SuppressedReasons[0] }}'
-      - name: VdmOptions
+          suppressed_reasons:
+            - '{{ suppressed_reasons[0] }}'
+      - name: vdm_options
         value:
-          DashboardOptions:
-            EngagementMetrics: '{{ EngagementMetrics }}'
-          GuardianOptions:
-            OptimizedSharedDelivery: '{{ OptimizedSharedDelivery }}'
-      - name: Tags
+          dashboard_options:
+            engagement_metrics: '{{ engagement_metrics }}'
+          guardian_options:
+            optimized_shared_delivery: '{{ optimized_shared_delivery }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -413,7 +412,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Name>';
+AND Identifier = '{{ name }}';
 ```
 
 
@@ -422,7 +421,7 @@ AND Identifier = '<Name>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.ses.configuration_sets
-WHERE Identifier = '<Name>'
+WHERE Identifier = '{{ name }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/ses/contact_lists/index.md b/website/docs/services/ses/contact_lists/index.md
index ebd379d0c..6c1de05d9 100644
--- a/website/docs/services/ses/contact_lists/index.md
+++ b/website/docs/services/ses/contact_lists/index.md
@@ -186,7 +186,7 @@ description,
 topics,
 tags
 FROM awscc.ses.contact_lists
-WHERE region = 'us-east-1' AND Identifier = '<ContactListName>';
+WHERE region = 'us-east-1' AND Identifier = '{{ contact_list_name }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -225,11 +225,11 @@ INSERT INTO awscc.ses.contact_lists (
  Tags,
  region
 )
-SELECT 
-'{{ ContactListName }}',
- '{{ Description }}',
- '{{ Topics }}',
- '{{ Tags }}',
+SELECT
+'{{ contact_list_name }}',
+ '{{ description }}',
+ '{{ topics }}',
+ '{{ tags }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -244,11 +244,11 @@ INSERT INTO awscc.ses.contact_lists (
  Tags,
  region
 )
-SELECT 
- '{{ ContactListName }}',
- '{{ Description }}',
- '{{ Topics }}',
- '{{ Tags }}',
+SELECT
+ '{{ contact_list_name }}',
+ '{{ description }}',
+ '{{ topics }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -266,21 +266,20 @@ globals:
 resources:
   - name: contact_list
     props:
-      - name: ContactListName
-        value: '{{ ContactListName }}'
-      - name: Description
-        value: '{{ Description }}'
-      - name: Topics
+      - name: contact_list_name
+        value: '{{ contact_list_name }}'
+      - name: description
+        value: '{{ description }}'
+      - name: topics
         value:
-          - TopicName: '{{ TopicName }}'
-            DisplayName: '{{ DisplayName }}'
-            Description: '{{ Description }}'
-            DefaultSubscriptionStatus: '{{ DefaultSubscriptionStatus }}'
-      - name: Tags
+          - topic_name: '{{ topic_name }}'
+            display_name: '{{ display_name }}'
+            description: '{{ description }}'
+            default_subscription_status: '{{ default_subscription_status }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -298,7 +297,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<ContactListName>';
+AND Identifier = '{{ contact_list_name }}';
 ```
 
 
@@ -307,7 +306,7 @@ AND Identifier = '<ContactListName>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.ses.contact_lists
-WHERE Identifier = '<ContactListName>'
+WHERE Identifier = '{{ contact_list_name }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/ses/dedicated_ip_pools/index.md b/website/docs/services/ses/dedicated_ip_pools/index.md
index 87c7d3636..7e82b40cb 100644
--- a/website/docs/services/ses/dedicated_ip_pools/index.md
+++ b/website/docs/services/ses/dedicated_ip_pools/index.md
@@ -158,7 +158,7 @@ pool_name,
 scaling_mode,
 tags
 FROM awscc.ses.dedicated_ip_pools
-WHERE region = 'us-east-1' AND Identifier = '<PoolName>';
+WHERE region = 'us-east-1' AND Identifier = '{{ pool_name }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -196,10 +196,10 @@ INSERT INTO awscc.ses.dedicated_ip_pools (
  Tags,
  region
 )
-SELECT 
-'{{ PoolName }}',
- '{{ ScalingMode }}',
- '{{ Tags }}',
+SELECT
+'{{ pool_name }}',
+ '{{ scaling_mode }}',
+ '{{ tags }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -213,10 +213,10 @@ INSERT INTO awscc.ses.dedicated_ip_pools (
  Tags,
  region
 )
-SELECT 
- '{{ PoolName }}',
- '{{ ScalingMode }}',
- '{{ Tags }}',
+SELECT
+ '{{ pool_name }}',
+ '{{ scaling_mode }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -234,15 +234,14 @@ globals:
 resources:
   - name: dedicated_ip_pool
     props:
-      - name: PoolName
-        value: '{{ PoolName }}'
-      - name: ScalingMode
-        value: '{{ ScalingMode }}'
-      - name: Tags
+      - name: pool_name
+        value: '{{ pool_name }}'
+      - name: scaling_mode
+        value: '{{ scaling_mode }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -259,7 +258,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<PoolName>';
+AND Identifier = '{{ pool_name }}';
 ```
 
 
@@ -268,7 +267,7 @@ AND Identifier = '<PoolName>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.ses.dedicated_ip_pools
-WHERE Identifier = '<PoolName>'
+WHERE Identifier = '{{ pool_name }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/ses/email_identities/index.md b/website/docs/services/ses/email_identities/index.md
index 41949465b..c23fc816c 100644
--- a/website/docs/services/ses/email_identities/index.md
+++ b/website/docs/services/ses/email_identities/index.md
@@ -268,7 +268,7 @@ dkim_dns_token_value2,
 dkim_dns_token_value3,
 tags
 FROM awscc.ses.email_identities
-WHERE region = 'us-east-1' AND Identifier = '<EmailIdentity>';
+WHERE region = 'us-east-1' AND Identifier = '{{ email_identity }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -304,8 +304,8 @@ INSERT INTO awscc.ses.email_identities (
  EmailIdentity,
  region
 )
-SELECT 
-'{{ EmailIdentity }}',
+SELECT
+'{{ email_identity }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -323,14 +323,14 @@ INSERT INTO awscc.ses.email_identities (
  Tags,
  region
 )
-SELECT 
- '{{ EmailIdentity }}',
- '{{ ConfigurationSetAttributes }}',
- '{{ DkimSigningAttributes }}',
- '{{ DkimAttributes }}',
- '{{ MailFromAttributes }}',
- '{{ FeedbackAttributes }}',
- '{{ Tags }}',
+SELECT
+ '{{ email_identity }}',
+ '{{ configuration_set_attributes }}',
+ '{{ dkim_signing_attributes }}',
+ '{{ dkim_attributes }}',
+ '{{ mail_from_attributes }}',
+ '{{ feedback_attributes }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -348,31 +348,30 @@ globals:
 resources:
   - name: email_identity
     props:
-      - name: EmailIdentity
-        value: '{{ EmailIdentity }}'
-      - name: ConfigurationSetAttributes
+      - name: email_identity
+        value: '{{ email_identity }}'
+      - name: configuration_set_attributes
         value:
-          ConfigurationSetName: '{{ ConfigurationSetName }}'
-      - name: DkimSigningAttributes
+          configuration_set_name: '{{ configuration_set_name }}'
+      - name: dkim_signing_attributes
         value:
-          DomainSigningSelector: '{{ DomainSigningSelector }}'
-          DomainSigningPrivateKey: '{{ DomainSigningPrivateKey }}'
-          NextSigningKeyLength: '{{ NextSigningKeyLength }}'
-      - name: DkimAttributes
+          domain_signing_selector: '{{ domain_signing_selector }}'
+          domain_signing_private_key: '{{ domain_signing_private_key }}'
+          next_signing_key_length: '{{ next_signing_key_length }}'
+      - name: dkim_attributes
         value:
-          SigningEnabled: '{{ SigningEnabled }}'
-      - name: MailFromAttributes
+          signing_enabled: '{{ signing_enabled }}'
+      - name: mail_from_attributes
         value:
-          MailFromDomain: '{{ MailFromDomain }}'
-          BehaviorOnMxFailure: '{{ BehaviorOnMxFailure }}'
-      - name: FeedbackAttributes
+          mail_from_domain: '{{ mail_from_domain }}'
+          behavior_on_mx_failure: '{{ behavior_on_mx_failure }}'
+      - name: feedback_attributes
         value:
-          EmailForwardingEnabled: '{{ EmailForwardingEnabled }}'
-      - name: Tags
+          email_forwarding_enabled: '{{ email_forwarding_enabled }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -393,7 +392,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<EmailIdentity>';
+AND Identifier = '{{ email_identity }}';
 ```
 
 
@@ -402,7 +401,7 @@ AND Identifier = '<EmailIdentity>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.ses.email_identities
-WHERE Identifier = '<EmailIdentity>'
+WHERE Identifier = '{{ email_identity }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/ses/mail_manager_addon_instances/index.md b/website/docs/services/ses/mail_manager_addon_instances/index.md
index db0661279..a18ca566d 100644
--- a/website/docs/services/ses/mail_manager_addon_instances/index.md
+++ b/website/docs/services/ses/mail_manager_addon_instances/index.md
@@ -170,7 +170,7 @@ addon_name,
 addon_subscription_id,
 tags
 FROM awscc.ses.mail_manager_addon_instances
-WHERE region = 'us-east-1' AND Identifier = '<AddonInstanceId>';
+WHERE region = 'us-east-1' AND Identifier = '{{ addon_instance_id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -206,8 +206,8 @@ INSERT INTO awscc.ses.mail_manager_addon_instances (
  AddonSubscriptionId,
  region
 )
-SELECT 
-'{{ AddonSubscriptionId }}',
+SELECT
+'{{ addon_subscription_id }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -220,9 +220,9 @@ INSERT INTO awscc.ses.mail_manager_addon_instances (
  Tags,
  region
 )
-SELECT 
- '{{ AddonSubscriptionId }}',
- '{{ Tags }}',
+SELECT
+ '{{ addon_subscription_id }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -240,13 +240,12 @@ globals:
 resources:
   - name: mail_manager_addon_instance
     props:
-      - name: AddonSubscriptionId
-        value: '{{ AddonSubscriptionId }}'
-      - name: Tags
+      - name: addon_subscription_id
+        value: '{{ addon_subscription_id }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -262,7 +261,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<AddonInstanceId>';
+AND Identifier = '{{ addon_instance_id }}';
 ```
 
 
@@ -271,7 +270,7 @@ AND Identifier = '<AddonInstanceId>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.ses.mail_manager_addon_instances
-WHERE Identifier = '<AddonInstanceId>'
+WHERE Identifier = '{{ addon_instance_id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/ses/mail_manager_addon_subscriptions/index.md b/website/docs/services/ses/mail_manager_addon_subscriptions/index.md
index 376134ec4..5d2fa5020 100644
--- a/website/docs/services/ses/mail_manager_addon_subscriptions/index.md
+++ b/website/docs/services/ses/mail_manager_addon_subscriptions/index.md
@@ -164,7 +164,7 @@ addon_subscription_arn,
 addon_subscription_id,
 tags
 FROM awscc.ses.mail_manager_addon_subscriptions
-WHERE region = 'us-east-1' AND Identifier = '<AddonSubscriptionId>';
+WHERE region = 'us-east-1' AND Identifier = '{{ addon_subscription_id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -200,8 +200,8 @@ INSERT INTO awscc.ses.mail_manager_addon_subscriptions (
  AddonName,
  region
 )
-SELECT 
-'{{ AddonName }}',
+SELECT
+'{{ addon_name }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -214,9 +214,9 @@ INSERT INTO awscc.ses.mail_manager_addon_subscriptions (
  Tags,
  region
 )
-SELECT 
- '{{ AddonName }}',
- '{{ Tags }}',
+SELECT
+ '{{ addon_name }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -234,13 +234,12 @@ globals:
 resources:
   - name: mail_manager_addon_subscription
     props:
-      - name: AddonName
-        value: '{{ AddonName }}'
-      - name: Tags
+      - name: addon_name
+        value: '{{ addon_name }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -256,7 +255,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<AddonSubscriptionId>';
+AND Identifier = '{{ addon_subscription_id }}';
 ```
 
 
@@ -265,7 +264,7 @@ AND Identifier = '<AddonSubscriptionId>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.ses.mail_manager_addon_subscriptions
-WHERE Identifier = '<AddonSubscriptionId>'
+WHERE Identifier = '{{ addon_subscription_id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/ses/mail_manager_address_lists/index.md b/website/docs/services/ses/mail_manager_address_lists/index.md
index cc1785ba8..50b609520 100644
--- a/website/docs/services/ses/mail_manager_address_lists/index.md
+++ b/website/docs/services/ses/mail_manager_address_lists/index.md
@@ -164,7 +164,7 @@ address_list_id,
 address_list_name,
 tags
 FROM awscc.ses.mail_manager_address_lists
-WHERE region = 'us-east-1' AND Identifier = '<AddressListId>';
+WHERE region = 'us-east-1' AND Identifier = '{{ address_list_id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -201,9 +201,9 @@ INSERT INTO awscc.ses.mail_manager_address_lists (
  Tags,
  region
 )
-SELECT 
-'{{ AddressListName }}',
- '{{ Tags }}',
+SELECT
+'{{ address_list_name }}',
+ '{{ tags }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -216,9 +216,9 @@ INSERT INTO awscc.ses.mail_manager_address_lists (
  Tags,
  region
 )
-SELECT 
- '{{ AddressListName }}',
- '{{ Tags }}',
+SELECT
+ '{{ address_list_name }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -236,13 +236,12 @@ globals:
 resources:
   - name: mail_manager_address_list
     props:
-      - name: AddressListName
-        value: '{{ AddressListName }}'
-      - name: Tags
+      - name: address_list_name
+        value: '{{ address_list_name }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -258,7 +257,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<AddressListId>';
+AND Identifier = '{{ address_list_id }}';
 ```
 
 
@@ -267,7 +266,7 @@ AND Identifier = '<AddressListId>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.ses.mail_manager_address_lists
-WHERE Identifier = '<AddressListId>'
+WHERE Identifier = '{{ address_list_id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/ses/mail_manager_archives/index.md b/website/docs/services/ses/mail_manager_archives/index.md
index daefb1f16..7037c6370 100644
--- a/website/docs/services/ses/mail_manager_archives/index.md
+++ b/website/docs/services/ses/mail_manager_archives/index.md
@@ -182,7 +182,7 @@ kms_key_arn,
 retention,
 tags
 FROM awscc.ses.mail_manager_archives
-WHERE region = 'us-east-1' AND Identifier = '<ArchiveId>';
+WHERE region = 'us-east-1' AND Identifier = '{{ archive_id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -221,11 +221,11 @@ INSERT INTO awscc.ses.mail_manager_archives (
  Tags,
  region
 )
-SELECT 
-'{{ ArchiveName }}',
- '{{ KmsKeyArn }}',
- '{{ Retention }}',
- '{{ Tags }}',
+SELECT
+'{{ archive_name }}',
+ '{{ kms_key_arn }}',
+ '{{ retention }}',
+ '{{ tags }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -240,11 +240,11 @@ INSERT INTO awscc.ses.mail_manager_archives (
  Tags,
  region
 )
-SELECT 
- '{{ ArchiveName }}',
- '{{ KmsKeyArn }}',
- '{{ Retention }}',
- '{{ Tags }}',
+SELECT
+ '{{ archive_name }}',
+ '{{ kms_key_arn }}',
+ '{{ retention }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -262,17 +262,16 @@ globals:
 resources:
   - name: mail_manager_archive
     props:
-      - name: ArchiveName
-        value: '{{ ArchiveName }}'
-      - name: KmsKeyArn
-        value: '{{ KmsKeyArn }}'
-      - name: Retention
+      - name: archive_name
+        value: '{{ archive_name }}'
+      - name: kms_key_arn
+        value: '{{ kms_key_arn }}'
+      - name: retention
         value: null
-      - name: Tags
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -290,7 +289,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<ArchiveId>';
+AND Identifier = '{{ archive_id }}';
 ```
 
 
@@ -299,7 +298,7 @@ AND Identifier = '<ArchiveId>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.ses.mail_manager_archives
-WHERE Identifier = '<ArchiveId>'
+WHERE Identifier = '{{ archive_id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/ses/mail_manager_ingress_points/index.md b/website/docs/services/ses/mail_manager_ingress_points/index.md
index 72848802c..45276606b 100644
--- a/website/docs/services/ses/mail_manager_ingress_points/index.md
+++ b/website/docs/services/ses/mail_manager_ingress_points/index.md
@@ -212,7 +212,7 @@ status_to_update,
 tags,
 type
 FROM awscc.ses.mail_manager_ingress_points
-WHERE region = 'us-east-1' AND Identifier = '<IngressPointId>';
+WHERE region = 'us-east-1' AND Identifier = '{{ ingress_point_id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -250,10 +250,10 @@ INSERT INTO awscc.ses.mail_manager_ingress_points (
  Type,
  region
 )
-SELECT 
-'{{ TrafficPolicyId }}',
- '{{ RuleSetId }}',
- '{{ Type }}',
+SELECT
+'{{ traffic_policy_id }}',
+ '{{ rule_set_id }}',
+ '{{ type }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -272,15 +272,15 @@ INSERT INTO awscc.ses.mail_manager_ingress_points (
  Type,
  region
 )
-SELECT 
- '{{ TrafficPolicyId }}',
- '{{ IngressPointConfiguration }}',
- '{{ IngressPointName }}',
- '{{ NetworkConfiguration }}',
- '{{ RuleSetId }}',
- '{{ StatusToUpdate }}',
- '{{ Tags }}',
- '{{ Type }}',
+SELECT
+ '{{ traffic_policy_id }}',
+ '{{ ingress_point_configuration }}',
+ '{{ ingress_point_name }}',
+ '{{ network_configuration }}',
+ '{{ rule_set_id }}',
+ '{{ status_to_update }}',
+ '{{ tags }}',
+ '{{ type }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -298,25 +298,24 @@ globals:
 resources:
   - name: mail_manager_ingress_point
     props:
-      - name: TrafficPolicyId
-        value: '{{ TrafficPolicyId }}'
-      - name: IngressPointConfiguration
+      - name: traffic_policy_id
+        value: '{{ traffic_policy_id }}'
+      - name: ingress_point_configuration
         value: null
-      - name: IngressPointName
-        value: '{{ IngressPointName }}'
-      - name: NetworkConfiguration
+      - name: ingress_point_name
+        value: '{{ ingress_point_name }}'
+      - name: network_configuration
         value: null
-      - name: RuleSetId
-        value: '{{ RuleSetId }}'
-      - name: StatusToUpdate
-        value: '{{ StatusToUpdate }}'
-      - name: Tags
+      - name: rule_set_id
+        value: '{{ rule_set_id }}'
+      - name: status_to_update
+        value: '{{ status_to_update }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-      - name: Type
-        value: '{{ Type }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
+      - name: type
+        value: '{{ type }}'
 ```
 </TabItem>
 </Tabs>
@@ -337,7 +336,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<IngressPointId>';
+AND Identifier = '{{ ingress_point_id }}';
 ```
 
 
@@ -346,7 +345,7 @@ AND Identifier = '<IngressPointId>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.ses.mail_manager_ingress_points
-WHERE Identifier = '<IngressPointId>'
+WHERE Identifier = '{{ ingress_point_id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/ses/mail_manager_relays/index.md b/website/docs/services/ses/mail_manager_relays/index.md
index 021ec8f8a..9563d6cd2 100644
--- a/website/docs/services/ses/mail_manager_relays/index.md
+++ b/website/docs/services/ses/mail_manager_relays/index.md
@@ -182,7 +182,7 @@ server_name,
 server_port,
 tags
 FROM awscc.ses.mail_manager_relays
-WHERE region = 'us-east-1' AND Identifier = '<RelayId>';
+WHERE region = 'us-east-1' AND Identifier = '{{ relay_id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -220,10 +220,10 @@ INSERT INTO awscc.ses.mail_manager_relays (
  ServerPort,
  region
 )
-SELECT 
-'{{ Authentication }}',
- '{{ ServerName }}',
- '{{ ServerPort }}',
+SELECT
+'{{ authentication }}',
+ '{{ server_name }}',
+ '{{ server_port }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -239,12 +239,12 @@ INSERT INTO awscc.ses.mail_manager_relays (
  Tags,
  region
 )
-SELECT 
- '{{ Authentication }}',
- '{{ RelayName }}',
- '{{ ServerName }}',
- '{{ ServerPort }}',
- '{{ Tags }}',
+SELECT
+ '{{ authentication }}',
+ '{{ relay_name }}',
+ '{{ server_name }}',
+ '{{ server_port }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -262,19 +262,18 @@ globals:
 resources:
   - name: mail_manager_relay
     props:
-      - name: Authentication
+      - name: authentication
         value: null
-      - name: RelayName
-        value: '{{ RelayName }}'
-      - name: ServerName
-        value: '{{ ServerName }}'
-      - name: ServerPort
+      - name: relay_name
+        value: '{{ relay_name }}'
+      - name: server_name
+        value: '{{ server_name }}'
+      - name: server_port
         value: null
-      - name: Tags
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -294,7 +293,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<RelayId>';
+AND Identifier = '{{ relay_id }}';
 ```
 
 
@@ -303,7 +302,7 @@ AND Identifier = '<RelayId>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.ses.mail_manager_relays
-WHERE Identifier = '<RelayId>'
+WHERE Identifier = '{{ relay_id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/ses/mail_manager_rule_sets/index.md b/website/docs/services/ses/mail_manager_rule_sets/index.md
index e9b6bf277..abd49e489 100644
--- a/website/docs/services/ses/mail_manager_rule_sets/index.md
+++ b/website/docs/services/ses/mail_manager_rule_sets/index.md
@@ -192,7 +192,7 @@ rule_set_name,
 rules,
 tags
 FROM awscc.ses.mail_manager_rule_sets
-WHERE region = 'us-east-1' AND Identifier = '<RuleSetId>';
+WHERE region = 'us-east-1' AND Identifier = '{{ rule_set_id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -228,8 +228,8 @@ INSERT INTO awscc.ses.mail_manager_rule_sets (
  Rules,
  region
 )
-SELECT 
-'{{ Rules }}',
+SELECT
+'{{ rules }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -243,10 +243,10 @@ INSERT INTO awscc.ses.mail_manager_rule_sets (
  Tags,
  region
 )
-SELECT 
- '{{ RuleSetName }}',
- '{{ Rules }}',
- '{{ Tags }}',
+SELECT
+ '{{ rule_set_name }}',
+ '{{ rules }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -264,22 +264,21 @@ globals:
 resources:
   - name: mail_manager_rule_set
     props:
-      - name: RuleSetName
-        value: '{{ RuleSetName }}'
-      - name: Rules
+      - name: rule_set_name
+        value: '{{ rule_set_name }}'
+      - name: rules
         value:
-          - Name: '{{ Name }}'
-            Conditions:
+          - name: '{{ name }}'
+            conditions:
               - null
-            Unless:
+            unless:
               - null
-            Actions:
+            actions:
               - null
-      - name: Tags
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -297,7 +296,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<RuleSetId>';
+AND Identifier = '{{ rule_set_id }}';
 ```
 
 
@@ -306,7 +305,7 @@ AND Identifier = '<RuleSetId>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.ses.mail_manager_rule_sets
-WHERE Identifier = '<RuleSetId>'
+WHERE Identifier = '{{ rule_set_id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/ses/mail_manager_traffic_policies/index.md b/website/docs/services/ses/mail_manager_traffic_policies/index.md
index 63c30c0fd..bdc722612 100644
--- a/website/docs/services/ses/mail_manager_traffic_policies/index.md
+++ b/website/docs/services/ses/mail_manager_traffic_policies/index.md
@@ -189,7 +189,7 @@ traffic_policy_arn,
 traffic_policy_id,
 traffic_policy_name
 FROM awscc.ses.mail_manager_traffic_policies
-WHERE region = 'us-east-1' AND Identifier = '<TrafficPolicyId>';
+WHERE region = 'us-east-1' AND Identifier = '{{ traffic_policy_id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -226,9 +226,9 @@ INSERT INTO awscc.ses.mail_manager_traffic_policies (
  PolicyStatements,
  region
 )
-SELECT 
-'{{ DefaultAction }}',
- '{{ PolicyStatements }}',
+SELECT
+'{{ default_action }}',
+ '{{ policy_statements }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -244,12 +244,12 @@ INSERT INTO awscc.ses.mail_manager_traffic_policies (
  TrafficPolicyName,
  region
 )
-SELECT 
- '{{ DefaultAction }}',
- '{{ MaxMessageSizeBytes }}',
- '{{ PolicyStatements }}',
- '{{ Tags }}',
- '{{ TrafficPolicyName }}',
+SELECT
+ '{{ default_action }}',
+ '{{ max_message_size_bytes }}',
+ '{{ policy_statements }}',
+ '{{ tags }}',
+ '{{ traffic_policy_name }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -267,22 +267,21 @@ globals:
 resources:
   - name: mail_manager_traffic_policy
     props:
-      - name: DefaultAction
-        value: '{{ DefaultAction }}'
-      - name: MaxMessageSizeBytes
+      - name: default_action
+        value: '{{ default_action }}'
+      - name: max_message_size_bytes
         value: null
-      - name: PolicyStatements
+      - name: policy_statements
         value:
-          - Conditions:
+          - conditions:
               - null
-            Action: null
-      - name: Tags
+            action: null
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-      - name: TrafficPolicyName
-        value: '{{ TrafficPolicyName }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
+      - name: traffic_policy_name
+        value: '{{ traffic_policy_name }}'
 ```
 </TabItem>
 </Tabs>
@@ -302,7 +301,7 @@ SET PatchDocument = string('{{ {
     "TrafficPolicyName": traffic_policy_name
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<TrafficPolicyId>';
+AND Identifier = '{{ traffic_policy_id }}';
 ```
 
 
@@ -311,7 +310,7 @@ AND Identifier = '<TrafficPolicyId>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.ses.mail_manager_traffic_policies
-WHERE Identifier = '<TrafficPolicyId>'
+WHERE Identifier = '{{ traffic_policy_id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/ses/templates/index.md b/website/docs/services/ses/templates/index.md
index e47fa477b..a1439f098 100644
--- a/website/docs/services/ses/templates/index.md
+++ b/website/docs/services/ses/templates/index.md
@@ -147,7 +147,7 @@ region,
 id,
 template
 FROM awscc.ses.templates
-WHERE region = 'us-east-1' AND Identifier = '<Id>';
+WHERE region = 'us-east-1' AND Identifier = '{{ id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -183,8 +183,8 @@ INSERT INTO awscc.ses.templates (
  Template,
  region
 )
-SELECT 
-'{{ Template }}',
+SELECT
+'{{ template }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -196,8 +196,8 @@ INSERT INTO awscc.ses.templates (
  Template,
  region
 )
-SELECT 
- '{{ Template }}',
+SELECT
+ '{{ template }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -215,10 +215,9 @@ globals:
 resources:
   - name: template
     props:
-      - name: Template
+      - name: template
         value:
-          Template: null
-
+          template: null
 ```
 </TabItem>
 </Tabs>
@@ -229,7 +228,7 @@ resources:
 ```sql
 /*+ delete */
 DELETE FROM awscc.ses.templates
-WHERE Identifier = '<Id>'
+WHERE Identifier = '{{ id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/ses/vdm_attributes/index.md b/website/docs/services/ses/vdm_attributes/index.md
index 70a9f5d6b..5d9ce274c 100644
--- a/website/docs/services/ses/vdm_attributes/index.md
+++ b/website/docs/services/ses/vdm_attributes/index.md
@@ -114,7 +114,7 @@ vdm_attributes_resource_id,
 dashboard_attributes,
 guardian_attributes
 FROM awscc.ses.vdm_attributes
-WHERE region = 'us-east-1' AND Identifier = '<VdmAttributesResourceId>';
+WHERE region = 'us-east-1' AND Identifier = '{{ vdm_attributes_resource_id }}';
 ```
 
 ## `INSERT` example
@@ -138,9 +138,9 @@ INSERT INTO awscc.ses.vdm_attributes (
  GuardianAttributes,
  region
 )
-SELECT 
-'{{ DashboardAttributes }}',
- '{{ GuardianAttributes }}',
+SELECT
+'{{ dashboard_attributes }}',
+ '{{ guardian_attributes }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -153,9 +153,9 @@ INSERT INTO awscc.ses.vdm_attributes (
  GuardianAttributes,
  region
 )
-SELECT 
- '{{ DashboardAttributes }}',
- '{{ GuardianAttributes }}',
+SELECT
+ '{{ dashboard_attributes }}',
+ '{{ guardian_attributes }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -173,13 +173,12 @@ globals:
 resources:
   - name: vdm_attribute
     props:
-      - name: DashboardAttributes
+      - name: dashboard_attributes
         value:
-          EngagementMetrics: '{{ EngagementMetrics }}'
-      - name: GuardianAttributes
+          engagement_metrics: '{{ engagement_metrics }}'
+      - name: guardian_attributes
         value:
-          OptimizedSharedDelivery: '{{ OptimizedSharedDelivery }}'
-
+          optimized_shared_delivery: '{{ optimized_shared_delivery }}'
 ```
 </TabItem>
 </Tabs>
@@ -196,7 +195,7 @@ SET PatchDocument = string('{{ {
     "GuardianAttributes": guardian_attributes
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<VdmAttributesResourceId>';
+AND Identifier = '{{ vdm_attributes_resource_id }}';
 ```
 
 
@@ -205,7 +204,7 @@ AND Identifier = '<VdmAttributesResourceId>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.ses.vdm_attributes
-WHERE Identifier = '<VdmAttributesResourceId>'
+WHERE Identifier = '{{ vdm_attributes_resource_id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/shield/drt_accesses/index.md b/website/docs/services/shield/drt_accesses/index.md
index 72de9480d..f92810ed2 100644
--- a/website/docs/services/shield/drt_accesses/index.md
+++ b/website/docs/services/shield/drt_accesses/index.md
@@ -146,7 +146,7 @@ account_id,
 log_bucket_list,
 role_arn
 FROM awscc.shield.drt_accesses
-WHERE Identifier = '<AccountId>';
+WHERE region = 'us-east-1' AND Identifier = '{{ account_id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -157,7 +157,7 @@ SELECT
 region,
 account_id
 FROM awscc.shield.drt_accesses_list_only
-;
+WHERE region = 'us-east-1';
 ```
 </TabItem>
 </Tabs>
@@ -182,8 +182,8 @@ INSERT INTO awscc.shield.drt_accesses (
  RoleArn,
  region
 )
-SELECT 
-'{{ RoleArn }}',
+SELECT
+'{{ role_arn }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -196,9 +196,9 @@ INSERT INTO awscc.shield.drt_accesses (
  RoleArn,
  region
 )
-SELECT 
- '{{ LogBucketList }}',
- '{{ RoleArn }}',
+SELECT
+ '{{ log_bucket_list }}',
+ '{{ role_arn }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -216,12 +216,11 @@ globals:
 resources:
   - name: drt_access
     props:
-      - name: LogBucketList
+      - name: log_bucket_list
         value:
-          - '{{ LogBucketList[0] }}'
-      - name: RoleArn
-        value: '{{ RoleArn }}'
-
+          - '{{ log_bucket_list[0] }}'
+      - name: role_arn
+        value: '{{ role_arn }}'
 ```
 </TabItem>
 </Tabs>
@@ -238,7 +237,7 @@ SET PatchDocument = string('{{ {
     "RoleArn": role_arn
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<AccountId>';
+AND Identifier = '{{ account_id }}';
 ```
 
 
@@ -247,7 +246,7 @@ AND Identifier = '<AccountId>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.shield.drt_accesses
-WHERE Identifier = '<AccountId>'
+WHERE Identifier = '{{ account_id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/shield/proactive_engagements/index.md b/website/docs/services/shield/proactive_engagements/index.md
index 0a88028f4..2a0b46f5c 100644
--- a/website/docs/services/shield/proactive_engagements/index.md
+++ b/website/docs/services/shield/proactive_engagements/index.md
@@ -163,7 +163,7 @@ account_id,
 proactive_engagement_status,
 emergency_contact_list
 FROM awscc.shield.proactive_engagements
-WHERE Identifier = '<AccountId>';
+WHERE region = 'us-east-1' AND Identifier = '{{ account_id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -174,7 +174,7 @@ SELECT
 region,
 account_id
 FROM awscc.shield.proactive_engagements_list_only
-;
+WHERE region = 'us-east-1';
 ```
 </TabItem>
 </Tabs>
@@ -200,9 +200,9 @@ INSERT INTO awscc.shield.proactive_engagements (
  EmergencyContactList,
  region
 )
-SELECT 
-'{{ ProactiveEngagementStatus }}',
- '{{ EmergencyContactList }}',
+SELECT
+'{{ proactive_engagement_status }}',
+ '{{ emergency_contact_list }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -215,9 +215,9 @@ INSERT INTO awscc.shield.proactive_engagements (
  EmergencyContactList,
  region
 )
-SELECT 
- '{{ ProactiveEngagementStatus }}',
- '{{ EmergencyContactList }}',
+SELECT
+ '{{ proactive_engagement_status }}',
+ '{{ emergency_contact_list }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -235,14 +235,13 @@ globals:
 resources:
   - name: proactive_engagement
     props:
-      - name: ProactiveEngagementStatus
-        value: '{{ ProactiveEngagementStatus }}'
-      - name: EmergencyContactList
+      - name: proactive_engagement_status
+        value: '{{ proactive_engagement_status }}'
+      - name: emergency_contact_list
         value:
-          - ContactNotes: '{{ ContactNotes }}'
-            EmailAddress: '{{ EmailAddress }}'
-            PhoneNumber: '{{ PhoneNumber }}'
-
+          - contact_notes: '{{ contact_notes }}'
+            email_address: '{{ email_address }}'
+            phone_number: '{{ phone_number }}'
 ```
 </TabItem>
 </Tabs>
@@ -259,7 +258,7 @@ SET PatchDocument = string('{{ {
     "EmergencyContactList": emergency_contact_list
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<AccountId>';
+AND Identifier = '{{ account_id }}';
 ```
 
 
@@ -268,7 +267,7 @@ AND Identifier = '<AccountId>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.shield.proactive_engagements
-WHERE Identifier = '<AccountId>'
+WHERE Identifier = '{{ account_id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/shield/protection_groups/index.md b/website/docs/services/shield/protection_groups/index.md
index a648e9276..1506ce145 100644
--- a/website/docs/services/shield/protection_groups/index.md
+++ b/website/docs/services/shield/protection_groups/index.md
@@ -182,7 +182,7 @@ members,
 resource_type,
 tags
 FROM awscc.shield.protection_groups
-WHERE Identifier = '<ProtectionGroupArn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ protection_group_arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -193,7 +193,7 @@ SELECT
 region,
 protection_group_arn
 FROM awscc.shield.protection_groups_list_only
-;
+WHERE region = 'us-east-1';
 ```
 </TabItem>
 </Tabs>
@@ -220,10 +220,10 @@ INSERT INTO awscc.shield.protection_groups (
  Pattern,
  region
 )
-SELECT 
-'{{ ProtectionGroupId }}',
- '{{ Aggregation }}',
- '{{ Pattern }}',
+SELECT
+'{{ protection_group_id }}',
+ '{{ aggregation }}',
+ '{{ pattern }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -240,13 +240,13 @@ INSERT INTO awscc.shield.protection_groups (
  Tags,
  region
 )
-SELECT 
- '{{ ProtectionGroupId }}',
- '{{ Aggregation }}',
- '{{ Pattern }}',
- '{{ Members }}',
- '{{ ResourceType }}',
- '{{ Tags }}',
+SELECT
+ '{{ protection_group_id }}',
+ '{{ aggregation }}',
+ '{{ pattern }}',
+ '{{ members }}',
+ '{{ resource_type }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -264,22 +264,21 @@ globals:
 resources:
   - name: protection_group
     props:
-      - name: ProtectionGroupId
-        value: '{{ ProtectionGroupId }}'
-      - name: Aggregation
-        value: '{{ Aggregation }}'
-      - name: Pattern
-        value: '{{ Pattern }}'
-      - name: Members
+      - name: protection_group_id
+        value: '{{ protection_group_id }}'
+      - name: aggregation
+        value: '{{ aggregation }}'
+      - name: pattern
+        value: '{{ pattern }}'
+      - name: members
         value:
-          - '{{ Members[0] }}'
-      - name: ResourceType
-        value: '{{ ResourceType }}'
-      - name: Tags
+          - '{{ members[0] }}'
+      - name: resource_type
+        value: '{{ resource_type }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -299,7 +298,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<ProtectionGroupArn>';
+AND Identifier = '{{ protection_group_arn }}';
 ```
 
 
@@ -308,7 +307,7 @@ AND Identifier = '<ProtectionGroupArn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.shield.protection_groups
-WHERE Identifier = '<ProtectionGroupArn>'
+WHERE Identifier = '{{ protection_group_arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/shield/protections/index.md b/website/docs/services/shield/protections/index.md
index 8ff2d6ac4..e3f2a862a 100644
--- a/website/docs/services/shield/protections/index.md
+++ b/website/docs/services/shield/protections/index.md
@@ -194,7 +194,7 @@ health_check_arns,
 application_layer_automatic_response_configuration,
 tags
 FROM awscc.shield.protections
-WHERE Identifier = '<ProtectionArn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ protection_arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -205,7 +205,7 @@ SELECT
 region,
 protection_arn
 FROM awscc.shield.protections_list_only
-;
+WHERE region = 'us-east-1';
 ```
 </TabItem>
 </Tabs>
@@ -231,9 +231,9 @@ INSERT INTO awscc.shield.protections (
  ResourceArn,
  region
 )
-SELECT 
-'{{ Name }}',
- '{{ ResourceArn }}',
+SELECT
+'{{ name }}',
+ '{{ resource_arn }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -249,12 +249,12 @@ INSERT INTO awscc.shield.protections (
  Tags,
  region
 )
-SELECT 
- '{{ Name }}',
- '{{ ResourceArn }}',
- '{{ HealthCheckArns }}',
- '{{ ApplicationLayerAutomaticResponseConfiguration }}',
- '{{ Tags }}',
+SELECT
+ '{{ name }}',
+ '{{ resource_arn }}',
+ '{{ health_check_arns }}',
+ '{{ application_layer_automatic_response_configuration }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -272,22 +272,21 @@ globals:
 resources:
   - name: protection
     props:
-      - name: Name
-        value: '{{ Name }}'
-      - name: ResourceArn
-        value: '{{ ResourceArn }}'
-      - name: HealthCheckArns
+      - name: name
+        value: '{{ name }}'
+      - name: resource_arn
+        value: '{{ resource_arn }}'
+      - name: health_check_arns
         value:
-          - '{{ HealthCheckArns[0] }}'
-      - name: ApplicationLayerAutomaticResponseConfiguration
+          - '{{ health_check_arns[0] }}'
+      - name: application_layer_automatic_response_configuration
         value:
-          Action: {}
-          Status: '{{ Status }}'
-      - name: Tags
+          action: {}
+          status: '{{ status }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -305,7 +304,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<ProtectionArn>';
+AND Identifier = '{{ protection_arn }}';
 ```
 
 
@@ -314,7 +313,7 @@ AND Identifier = '<ProtectionArn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.shield.protections
-WHERE Identifier = '<ProtectionArn>'
+WHERE Identifier = '{{ protection_arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/signer/profile_permissions/index.md b/website/docs/services/signer/profile_permissions/index.md
index f6250bebe..47ba41bd9 100644
--- a/website/docs/services/signer/profile_permissions/index.md
+++ b/website/docs/services/signer/profile_permissions/index.md
@@ -157,7 +157,7 @@ action,
 principal,
 statement_id
 FROM awscc.signer.profile_permissions
-WHERE region = 'us-east-1' AND Identifier = '<StatementId>|<ProfileName>';
+WHERE region = 'us-east-1' AND Identifier = '{{ statement_id }}|{{ profile_name }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -197,11 +197,11 @@ INSERT INTO awscc.signer.profile_permissions (
  StatementId,
  region
 )
-SELECT 
-'{{ ProfileName }}',
- '{{ Action }}',
- '{{ Principal }}',
- '{{ StatementId }}',
+SELECT
+'{{ profile_name }}',
+ '{{ action }}',
+ '{{ principal }}',
+ '{{ statement_id }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -217,12 +217,12 @@ INSERT INTO awscc.signer.profile_permissions (
  StatementId,
  region
 )
-SELECT 
- '{{ ProfileName }}',
- '{{ ProfileVersion }}',
- '{{ Action }}',
- '{{ Principal }}',
- '{{ StatementId }}',
+SELECT
+ '{{ profile_name }}',
+ '{{ profile_version }}',
+ '{{ action }}',
+ '{{ principal }}',
+ '{{ statement_id }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -240,17 +240,16 @@ globals:
 resources:
   - name: profile_permission
     props:
-      - name: ProfileName
-        value: '{{ ProfileName }}'
-      - name: ProfileVersion
-        value: '{{ ProfileVersion }}'
-      - name: Action
-        value: '{{ Action }}'
-      - name: Principal
-        value: '{{ Principal }}'
-      - name: StatementId
-        value: '{{ StatementId }}'
-
+      - name: profile_name
+        value: '{{ profile_name }}'
+      - name: profile_version
+        value: '{{ profile_version }}'
+      - name: action
+        value: '{{ action }}'
+      - name: principal
+        value: '{{ principal }}'
+      - name: statement_id
+        value: '{{ statement_id }}'
 ```
 </TabItem>
 </Tabs>
@@ -261,7 +260,7 @@ resources:
 ```sql
 /*+ delete */
 DELETE FROM awscc.signer.profile_permissions
-WHERE Identifier = '<StatementId|ProfileName>'
+WHERE Identifier = '{{ statement_id }}|{{ profile_name }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/signer/signing_profiles/index.md b/website/docs/services/signer/signing_profiles/index.md
index 493eaffec..858abe5a3 100644
--- a/website/docs/services/signer/signing_profiles/index.md
+++ b/website/docs/services/signer/signing_profiles/index.md
@@ -189,7 +189,7 @@ signature_validity_period,
 platform_id,
 tags
 FROM awscc.signer.signing_profiles
-WHERE region = 'us-east-1' AND Identifier = '<Arn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -225,8 +225,8 @@ INSERT INTO awscc.signer.signing_profiles (
  PlatformId,
  region
 )
-SELECT 
-'{{ PlatformId }}',
+SELECT
+'{{ platform_id }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -240,10 +240,10 @@ INSERT INTO awscc.signer.signing_profiles (
  Tags,
  region
 )
-SELECT 
- '{{ SignatureValidityPeriod }}',
- '{{ PlatformId }}',
- '{{ Tags }}',
+SELECT
+ '{{ signature_validity_period }}',
+ '{{ platform_id }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -261,17 +261,16 @@ globals:
 resources:
   - name: signing_profile
     props:
-      - name: SignatureValidityPeriod
+      - name: signature_validity_period
         value:
-          Value: '{{ Value }}'
-          Type: '{{ Type }}'
-      - name: PlatformId
-        value: '{{ PlatformId }}'
-      - name: Tags
+          value: '{{ value }}'
+          type: '{{ type }}'
+      - name: platform_id
+        value: '{{ platform_id }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -287,7 +286,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Arn>';
+AND Identifier = '{{ arn }}';
 ```
 
 
@@ -296,7 +295,7 @@ AND Identifier = '<Arn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.signer.signing_profiles
-WHERE Identifier = '<Arn>'
+WHERE Identifier = '{{ arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/simspaceweaver/simulations/index.md b/website/docs/services/simspaceweaver/simulations/index.md
index 80f7a0327..4b47d9d58 100644
--- a/website/docs/services/simspaceweaver/simulations/index.md
+++ b/website/docs/services/simspaceweaver/simulations/index.md
@@ -171,7 +171,7 @@ describe_payload,
 maximum_duration,
 snapshot_s3_location
 FROM awscc.simspaceweaver.simulations
-WHERE region = 'us-east-1' AND Identifier = '<Name>';
+WHERE region = 'us-east-1' AND Identifier = '{{ name }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -208,9 +208,9 @@ INSERT INTO awscc.simspaceweaver.simulations (
  RoleArn,
  region
 )
-SELECT 
-'{{ Name }}',
- '{{ RoleArn }}',
+SELECT
+'{{ name }}',
+ '{{ role_arn }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -226,12 +226,12 @@ INSERT INTO awscc.simspaceweaver.simulations (
  SnapshotS3Location,
  region
 )
-SELECT 
- '{{ Name }}',
- '{{ RoleArn }}',
- '{{ SchemaS3Location }}',
- '{{ MaximumDuration }}',
- '{{ SnapshotS3Location }}',
+SELECT
+ '{{ name }}',
+ '{{ role_arn }}',
+ '{{ schema_s3_location }}',
+ '{{ maximum_duration }}',
+ '{{ snapshot_s3_location }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -249,19 +249,18 @@ globals:
 resources:
   - name: simulation
     props:
-      - name: Name
-        value: '{{ Name }}'
-      - name: RoleArn
-        value: '{{ RoleArn }}'
-      - name: SchemaS3Location
+      - name: name
+        value: '{{ name }}'
+      - name: role_arn
+        value: '{{ role_arn }}'
+      - name: schema_s3_location
         value:
-          BucketName: '{{ BucketName }}'
-          ObjectKey: '{{ ObjectKey }}'
-      - name: MaximumDuration
-        value: '{{ MaximumDuration }}'
-      - name: SnapshotS3Location
+          bucket_name: '{{ bucket_name }}'
+          object_key: '{{ object_key }}'
+      - name: maximum_duration
+        value: '{{ maximum_duration }}'
+      - name: snapshot_s3_location
         value: null
-
 ```
 </TabItem>
 </Tabs>
@@ -272,7 +271,7 @@ resources:
 ```sql
 /*+ delete */
 DELETE FROM awscc.simspaceweaver.simulations
-WHERE Identifier = '<Name>'
+WHERE Identifier = '{{ name }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/sns/topic_inline_policies/index.md b/website/docs/services/sns/topic_inline_policies/index.md
index 0afa5e885..5d30e4af8 100644
--- a/website/docs/services/sns/topic_inline_policies/index.md
+++ b/website/docs/services/sns/topic_inline_policies/index.md
@@ -94,7 +94,7 @@ region,
 policy_document,
 topic_arn
 FROM awscc.sns.topic_inline_policies
-WHERE region = 'us-east-1' AND Identifier = '<TopicArn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ topic_arn }}';
 ```
 
 ## `INSERT` example
@@ -118,9 +118,9 @@ INSERT INTO awscc.sns.topic_inline_policies (
  TopicArn,
  region
 )
-SELECT 
-'{{ PolicyDocument }}',
- '{{ TopicArn }}',
+SELECT
+'{{ policy_document }}',
+ '{{ topic_arn }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -133,9 +133,9 @@ INSERT INTO awscc.sns.topic_inline_policies (
  TopicArn,
  region
 )
-SELECT 
- '{{ PolicyDocument }}',
- '{{ TopicArn }}',
+SELECT
+ '{{ policy_document }}',
+ '{{ topic_arn }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -153,11 +153,10 @@ globals:
 resources:
   - name: topic_inline_policy
     props:
-      - name: PolicyDocument
+      - name: policy_document
         value: {}
-      - name: TopicArn
-        value: '{{ TopicArn }}'
-
+      - name: topic_arn
+        value: '{{ topic_arn }}'
 ```
 </TabItem>
 </Tabs>
@@ -173,7 +172,7 @@ SET PatchDocument = string('{{ {
     "PolicyDocument": policy_document
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<TopicArn>';
+AND Identifier = '{{ topic_arn }}';
 ```
 
 
@@ -182,7 +181,7 @@ AND Identifier = '<TopicArn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.sns.topic_inline_policies
-WHERE Identifier = '<TopicArn>'
+WHERE Identifier = '{{ topic_arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/sns/topics/index.md b/website/docs/services/sns/topics/index.md
index c7fb3b11a..9af57e969 100644
--- a/website/docs/services/sns/topics/index.md
+++ b/website/docs/services/sns/topics/index.md
@@ -258,7 +258,7 @@ signature_version,
 tracing_config,
 delivery_status_logging
 FROM awscc.sns.topics
-WHERE region = 'us-east-1' AND Identifier = '<TopicArn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ topic_arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -306,20 +306,20 @@ INSERT INTO awscc.sns.topics (
  DeliveryStatusLogging,
  region
 )
-SELECT 
-'{{ DisplayName }}',
- '{{ KmsMasterKeyId }}',
- '{{ DataProtectionPolicy }}',
- '{{ Subscription }}',
- '{{ FifoTopic }}',
- '{{ ContentBasedDeduplication }}',
- '{{ ArchivePolicy }}',
- '{{ FifoThroughputScope }}',
- '{{ Tags }}',
- '{{ TopicName }}',
- '{{ SignatureVersion }}',
- '{{ TracingConfig }}',
- '{{ DeliveryStatusLogging }}',
+SELECT
+'{{ display_name }}',
+ '{{ kms_master_key_id }}',
+ '{{ data_protection_policy }}',
+ '{{ subscription }}',
+ '{{ fifo_topic }}',
+ '{{ content_based_deduplication }}',
+ '{{ archive_policy }}',
+ '{{ fifo_throughput_scope }}',
+ '{{ tags }}',
+ '{{ topic_name }}',
+ '{{ signature_version }}',
+ '{{ tracing_config }}',
+ '{{ delivery_status_logging }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -343,20 +343,20 @@ INSERT INTO awscc.sns.topics (
  DeliveryStatusLogging,
  region
 )
-SELECT 
- '{{ DisplayName }}',
- '{{ KmsMasterKeyId }}',
- '{{ DataProtectionPolicy }}',
- '{{ Subscription }}',
- '{{ FifoTopic }}',
- '{{ ContentBasedDeduplication }}',
- '{{ ArchivePolicy }}',
- '{{ FifoThroughputScope }}',
- '{{ Tags }}',
- '{{ TopicName }}',
- '{{ SignatureVersion }}',
- '{{ TracingConfig }}',
- '{{ DeliveryStatusLogging }}',
+SELECT
+ '{{ display_name }}',
+ '{{ kms_master_key_id }}',
+ '{{ data_protection_policy }}',
+ '{{ subscription }}',
+ '{{ fifo_topic }}',
+ '{{ content_based_deduplication }}',
+ '{{ archive_policy }}',
+ '{{ fifo_throughput_scope }}',
+ '{{ tags }}',
+ '{{ topic_name }}',
+ '{{ signature_version }}',
+ '{{ tracing_config }}',
+ '{{ delivery_status_logging }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -374,41 +374,40 @@ globals:
 resources:
   - name: topic
     props:
-      - name: DisplayName
-        value: '{{ DisplayName }}'
-      - name: KmsMasterKeyId
-        value: '{{ KmsMasterKeyId }}'
-      - name: DataProtectionPolicy
+      - name: display_name
+        value: '{{ display_name }}'
+      - name: kms_master_key_id
+        value: '{{ kms_master_key_id }}'
+      - name: data_protection_policy
         value: {}
-      - name: Subscription
+      - name: subscription
         value:
-          - Endpoint: '{{ Endpoint }}'
-            Protocol: '{{ Protocol }}'
-      - name: FifoTopic
-        value: '{{ FifoTopic }}'
-      - name: ContentBasedDeduplication
-        value: '{{ ContentBasedDeduplication }}'
-      - name: ArchivePolicy
+          - endpoint: '{{ endpoint }}'
+            protocol: '{{ protocol }}'
+      - name: fifo_topic
+        value: '{{ fifo_topic }}'
+      - name: content_based_deduplication
+        value: '{{ content_based_deduplication }}'
+      - name: archive_policy
         value: {}
-      - name: FifoThroughputScope
-        value: '{{ FifoThroughputScope }}'
-      - name: Tags
+      - name: fifo_throughput_scope
+        value: '{{ fifo_throughput_scope }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-      - name: TopicName
-        value: '{{ TopicName }}'
-      - name: SignatureVersion
-        value: '{{ SignatureVersion }}'
-      - name: TracingConfig
-        value: '{{ TracingConfig }}'
-      - name: DeliveryStatusLogging
+          - key: '{{ key }}'
+            value: '{{ value }}'
+      - name: topic_name
+        value: '{{ topic_name }}'
+      - name: signature_version
+        value: '{{ signature_version }}'
+      - name: tracing_config
+        value: '{{ tracing_config }}'
+      - name: delivery_status_logging
         value:
-          - Protocol: '{{ Protocol }}'
-            SuccessFeedbackRoleArn: '{{ SuccessFeedbackRoleArn }}'
-            SuccessFeedbackSampleRate: '{{ SuccessFeedbackSampleRate }}'
-            FailureFeedbackRoleArn: '{{ FailureFeedbackRoleArn }}'
-
+          - protocol: '{{ protocol }}'
+            success_feedback_role_arn: '{{ success_feedback_role_arn }}'
+            success_feedback_sample_rate: '{{ success_feedback_sample_rate }}'
+            failure_feedback_role_arn: '{{ failure_feedback_role_arn }}'
 ```
 </TabItem>
 </Tabs>
@@ -434,7 +433,7 @@ SET PatchDocument = string('{{ {
     "DeliveryStatusLogging": delivery_status_logging
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<TopicArn>';
+AND Identifier = '{{ topic_arn }}';
 ```
 
 
@@ -443,7 +442,7 @@ AND Identifier = '<TopicArn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.sns.topics
-WHERE Identifier = '<TopicArn>'
+WHERE Identifier = '{{ topic_arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/sqs/queue_inline_policies/index.md b/website/docs/services/sqs/queue_inline_policies/index.md
index 4d51ff828..f2400bd7b 100644
--- a/website/docs/services/sqs/queue_inline_policies/index.md
+++ b/website/docs/services/sqs/queue_inline_policies/index.md
@@ -94,7 +94,7 @@ region,
 policy_document,
 queue
 FROM awscc.sqs.queue_inline_policies
-WHERE region = 'us-east-1' AND Identifier = '<Queue>';
+WHERE region = 'us-east-1' AND Identifier = '{{ queue }}';
 ```
 
 ## `INSERT` example
@@ -118,9 +118,9 @@ INSERT INTO awscc.sqs.queue_inline_policies (
  Queue,
  region
 )
-SELECT 
-'{{ PolicyDocument }}',
- '{{ Queue }}',
+SELECT
+'{{ policy_document }}',
+ '{{ queue }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -133,9 +133,9 @@ INSERT INTO awscc.sqs.queue_inline_policies (
  Queue,
  region
 )
-SELECT 
- '{{ PolicyDocument }}',
- '{{ Queue }}',
+SELECT
+ '{{ policy_document }}',
+ '{{ queue }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -153,11 +153,10 @@ globals:
 resources:
   - name: queue_inline_policy
     props:
-      - name: PolicyDocument
+      - name: policy_document
         value: {}
-      - name: Queue
-        value: '{{ Queue }}'
-
+      - name: queue
+        value: '{{ queue }}'
 ```
 </TabItem>
 </Tabs>
@@ -173,7 +172,7 @@ SET PatchDocument = string('{{ {
     "PolicyDocument": policy_document
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Queue>';
+AND Identifier = '{{ queue }}';
 ```
 
 
@@ -182,7 +181,7 @@ AND Identifier = '<Queue>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.sqs.queue_inline_policies
-WHERE Identifier = '<Queue>'
+WHERE Identifier = '{{ queue }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/sqs/queues/index.md b/website/docs/services/sqs/queues/index.md
index 1267f8562..bbdd1ad14 100644
--- a/website/docs/services/sqs/queues/index.md
+++ b/website/docs/services/sqs/queues/index.md
@@ -248,7 +248,7 @@ redrive_policy,
 tags,
 visibility_timeout
 FROM awscc.sqs.queues
-WHERE region = 'us-east-1' AND Identifier = '<QueueUrl>';
+WHERE region = 'us-east-1' AND Identifier = '{{ queue_url }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -299,23 +299,23 @@ INSERT INTO awscc.sqs.queues (
  VisibilityTimeout,
  region
 )
-SELECT 
-'{{ ContentBasedDeduplication }}',
- '{{ DeduplicationScope }}',
- '{{ DelaySeconds }}',
- '{{ FifoQueue }}',
- '{{ FifoThroughputLimit }}',
- '{{ KmsDataKeyReusePeriodSeconds }}',
- '{{ KmsMasterKeyId }}',
- '{{ SqsManagedSseEnabled }}',
- '{{ MaximumMessageSize }}',
- '{{ MessageRetentionPeriod }}',
- '{{ QueueName }}',
- '{{ ReceiveMessageWaitTimeSeconds }}',
- '{{ RedriveAllowPolicy }}',
- '{{ RedrivePolicy }}',
- '{{ Tags }}',
- '{{ VisibilityTimeout }}',
+SELECT
+'{{ content_based_deduplication }}',
+ '{{ deduplication_scope }}',
+ '{{ delay_seconds }}',
+ '{{ fifo_queue }}',
+ '{{ fifo_throughput_limit }}',
+ '{{ kms_data_key_reuse_period_seconds }}',
+ '{{ kms_master_key_id }}',
+ '{{ sqs_managed_sse_enabled }}',
+ '{{ maximum_message_size }}',
+ '{{ message_retention_period }}',
+ '{{ queue_name }}',
+ '{{ receive_message_wait_time_seconds }}',
+ '{{ redrive_allow_policy }}',
+ '{{ redrive_policy }}',
+ '{{ tags }}',
+ '{{ visibility_timeout }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -342,23 +342,23 @@ INSERT INTO awscc.sqs.queues (
  VisibilityTimeout,
  region
 )
-SELECT 
- '{{ ContentBasedDeduplication }}',
- '{{ DeduplicationScope }}',
- '{{ DelaySeconds }}',
- '{{ FifoQueue }}',
- '{{ FifoThroughputLimit }}',
- '{{ KmsDataKeyReusePeriodSeconds }}',
- '{{ KmsMasterKeyId }}',
- '{{ SqsManagedSseEnabled }}',
- '{{ MaximumMessageSize }}',
- '{{ MessageRetentionPeriod }}',
- '{{ QueueName }}',
- '{{ ReceiveMessageWaitTimeSeconds }}',
- '{{ RedriveAllowPolicy }}',
- '{{ RedrivePolicy }}',
- '{{ Tags }}',
- '{{ VisibilityTimeout }}',
+SELECT
+ '{{ content_based_deduplication }}',
+ '{{ deduplication_scope }}',
+ '{{ delay_seconds }}',
+ '{{ fifo_queue }}',
+ '{{ fifo_throughput_limit }}',
+ '{{ kms_data_key_reuse_period_seconds }}',
+ '{{ kms_master_key_id }}',
+ '{{ sqs_managed_sse_enabled }}',
+ '{{ maximum_message_size }}',
+ '{{ message_retention_period }}',
+ '{{ queue_name }}',
+ '{{ receive_message_wait_time_seconds }}',
+ '{{ redrive_allow_policy }}',
+ '{{ redrive_policy }}',
+ '{{ tags }}',
+ '{{ visibility_timeout }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -376,41 +376,40 @@ globals:
 resources:
   - name: queue
     props:
-      - name: ContentBasedDeduplication
-        value: '{{ ContentBasedDeduplication }}'
-      - name: DeduplicationScope
-        value: '{{ DeduplicationScope }}'
-      - name: DelaySeconds
-        value: '{{ DelaySeconds }}'
-      - name: FifoQueue
-        value: '{{ FifoQueue }}'
-      - name: FifoThroughputLimit
-        value: '{{ FifoThroughputLimit }}'
-      - name: KmsDataKeyReusePeriodSeconds
-        value: '{{ KmsDataKeyReusePeriodSeconds }}'
-      - name: KmsMasterKeyId
-        value: '{{ KmsMasterKeyId }}'
-      - name: SqsManagedSseEnabled
-        value: '{{ SqsManagedSseEnabled }}'
-      - name: MaximumMessageSize
-        value: '{{ MaximumMessageSize }}'
-      - name: MessageRetentionPeriod
-        value: '{{ MessageRetentionPeriod }}'
-      - name: QueueName
-        value: '{{ QueueName }}'
-      - name: ReceiveMessageWaitTimeSeconds
-        value: '{{ ReceiveMessageWaitTimeSeconds }}'
-      - name: RedriveAllowPolicy
+      - name: content_based_deduplication
+        value: '{{ content_based_deduplication }}'
+      - name: deduplication_scope
+        value: '{{ deduplication_scope }}'
+      - name: delay_seconds
+        value: '{{ delay_seconds }}'
+      - name: fifo_queue
+        value: '{{ fifo_queue }}'
+      - name: fifo_throughput_limit
+        value: '{{ fifo_throughput_limit }}'
+      - name: kms_data_key_reuse_period_seconds
+        value: '{{ kms_data_key_reuse_period_seconds }}'
+      - name: kms_master_key_id
+        value: '{{ kms_master_key_id }}'
+      - name: sqs_managed_sse_enabled
+        value: '{{ sqs_managed_sse_enabled }}'
+      - name: maximum_message_size
+        value: '{{ maximum_message_size }}'
+      - name: message_retention_period
+        value: '{{ message_retention_period }}'
+      - name: queue_name
+        value: '{{ queue_name }}'
+      - name: receive_message_wait_time_seconds
+        value: '{{ receive_message_wait_time_seconds }}'
+      - name: redrive_allow_policy
         value: {}
-      - name: RedrivePolicy
+      - name: redrive_policy
         value: {}
-      - name: Tags
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-      - name: VisibilityTimeout
-        value: '{{ VisibilityTimeout }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
+      - name: visibility_timeout
+        value: '{{ visibility_timeout }}'
 ```
 </TabItem>
 </Tabs>
@@ -439,7 +438,7 @@ SET PatchDocument = string('{{ {
     "VisibilityTimeout": visibility_timeout
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<QueueUrl>';
+AND Identifier = '{{ queue_url }}';
 ```
 
 
@@ -448,7 +447,7 @@ AND Identifier = '<QueueUrl>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.sqs.queues
-WHERE Identifier = '<QueueUrl>'
+WHERE Identifier = '{{ queue_url }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/ssm/associations/index.md b/website/docs/services/ssm/associations/index.md
index e8b66b604..f495af569 100644
--- a/website/docs/services/ssm/associations/index.md
+++ b/website/docs/services/ssm/associations/index.md
@@ -272,7 +272,7 @@ document_version,
 association_id,
 automation_target_parameter_name
 FROM awscc.ssm.associations
-WHERE region = 'us-east-1' AND Identifier = '<AssociationId>';
+WHERE region = 'us-east-1' AND Identifier = '{{ association_id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -308,8 +308,8 @@ INSERT INTO awscc.ssm.associations (
  Name,
  region
 )
-SELECT 
-'{{ Name }}',
+SELECT
+'{{ name }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -337,24 +337,24 @@ INSERT INTO awscc.ssm.associations (
  AutomationTargetParameterName,
  region
 )
-SELECT 
- '{{ AssociationName }}',
- '{{ CalendarNames }}',
- '{{ ScheduleExpression }}',
- '{{ MaxErrors }}',
- '{{ Parameters }}',
- '{{ InstanceId }}',
- '{{ WaitForSuccessTimeoutSeconds }}',
- '{{ MaxConcurrency }}',
- '{{ ComplianceSeverity }}',
- '{{ Targets }}',
- '{{ SyncCompliance }}',
- '{{ OutputLocation }}',
- '{{ ScheduleOffset }}',
- '{{ Name }}',
- '{{ ApplyOnlyAtCronInterval }}',
- '{{ DocumentVersion }}',
- '{{ AutomationTargetParameterName }}',
+SELECT
+ '{{ association_name }}',
+ '{{ calendar_names }}',
+ '{{ schedule_expression }}',
+ '{{ max_errors }}',
+ '{{ parameters }}',
+ '{{ instance_id }}',
+ '{{ wait_for_success_timeout_seconds }}',
+ '{{ max_concurrency }}',
+ '{{ compliance_severity }}',
+ '{{ targets }}',
+ '{{ sync_compliance }}',
+ '{{ output_location }}',
+ '{{ schedule_offset }}',
+ '{{ name }}',
+ '{{ apply_only_at_cron_interval }}',
+ '{{ document_version }}',
+ '{{ automation_target_parameter_name }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -372,49 +372,48 @@ globals:
 resources:
   - name: association
     props:
-      - name: AssociationName
-        value: '{{ AssociationName }}'
-      - name: CalendarNames
+      - name: association_name
+        value: '{{ association_name }}'
+      - name: calendar_names
         value:
-          - '{{ CalendarNames[0] }}'
-      - name: ScheduleExpression
-        value: '{{ ScheduleExpression }}'
-      - name: MaxErrors
-        value: '{{ MaxErrors }}'
-      - name: Parameters
+          - '{{ calendar_names[0] }}'
+      - name: schedule_expression
+        value: '{{ schedule_expression }}'
+      - name: max_errors
+        value: '{{ max_errors }}'
+      - name: parameters
         value: {}
-      - name: InstanceId
-        value: '{{ InstanceId }}'
-      - name: WaitForSuccessTimeoutSeconds
-        value: '{{ WaitForSuccessTimeoutSeconds }}'
-      - name: MaxConcurrency
-        value: '{{ MaxConcurrency }}'
-      - name: ComplianceSeverity
-        value: '{{ ComplianceSeverity }}'
-      - name: Targets
+      - name: instance_id
+        value: '{{ instance_id }}'
+      - name: wait_for_success_timeout_seconds
+        value: '{{ wait_for_success_timeout_seconds }}'
+      - name: max_concurrency
+        value: '{{ max_concurrency }}'
+      - name: compliance_severity
+        value: '{{ compliance_severity }}'
+      - name: targets
         value:
-          - Values:
-              - '{{ Values[0] }}'
-            Key: '{{ Key }}'
-      - name: SyncCompliance
-        value: '{{ SyncCompliance }}'
-      - name: OutputLocation
+          - values:
+              - '{{ values[0] }}'
+            key: '{{ key }}'
+      - name: sync_compliance
+        value: '{{ sync_compliance }}'
+      - name: output_location
         value:
-          S3Location:
-            OutputS3KeyPrefix: '{{ OutputS3KeyPrefix }}'
-            OutputS3Region: '{{ OutputS3Region }}'
-            OutputS3BucketName: '{{ OutputS3BucketName }}'
-      - name: ScheduleOffset
-        value: '{{ ScheduleOffset }}'
-      - name: Name
-        value: '{{ Name }}'
-      - name: ApplyOnlyAtCronInterval
-        value: '{{ ApplyOnlyAtCronInterval }}'
-      - name: DocumentVersion
-        value: '{{ DocumentVersion }}'
-      - name: AutomationTargetParameterName
-        value: '{{ AutomationTargetParameterName }}'
-
+          s3_location:
+            output_s3_key_prefix: '{{ output_s3_key_prefix }}'
+            output_s3_region: '{{ output_s3_region }}'
+            output_s3_bucket_name: '{{ output_s3_bucket_name }}'
+      - name: schedule_offset
+        value: '{{ schedule_offset }}'
+      - name: name
+        value: '{{ name }}'
+      - name: apply_only_at_cron_interval
+        value: '{{ apply_only_at_cron_interval }}'
+      - name: document_version
+        value: '{{ document_version }}'
+      - name: automation_target_parameter_name
+        value: '{{ automation_target_parameter_name }}'
 ```
 </TabItem>
 </Tabs>
@@ -446,7 +445,7 @@ SET PatchDocument = string('{{ {
     "AutomationTargetParameterName": automation_target_parameter_name
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<AssociationId>';
+AND Identifier = '{{ association_id }}';
 ```
 
 
@@ -455,7 +454,7 @@ AND Identifier = '<AssociationId>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.ssm.associations
-WHERE Identifier = '<AssociationId>'
+WHERE Identifier = '{{ association_id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/ssm/documents/index.md b/website/docs/services/ssm/documents/index.md
index c8c162664..359217333 100644
--- a/website/docs/services/ssm/documents/index.md
+++ b/website/docs/services/ssm/documents/index.md
@@ -229,7 +229,7 @@ tags,
 requires,
 update_method
 FROM awscc.ssm.documents
-WHERE region = 'us-east-1' AND Identifier = '<Name>';
+WHERE region = 'us-east-1' AND Identifier = '{{ name }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -265,8 +265,8 @@ INSERT INTO awscc.ssm.documents (
  Content,
  region
 )
-SELECT 
-'{{ Content }}',
+SELECT
+'{{ content }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -287,17 +287,17 @@ INSERT INTO awscc.ssm.documents (
  UpdateMethod,
  region
 )
-SELECT 
- '{{ Content }}',
- '{{ Attachments }}',
- '{{ Name }}',
- '{{ VersionName }}',
- '{{ DocumentType }}',
- '{{ DocumentFormat }}',
- '{{ TargetType }}',
- '{{ Tags }}',
- '{{ Requires }}',
- '{{ UpdateMethod }}',
+SELECT
+ '{{ content }}',
+ '{{ attachments }}',
+ '{{ name }}',
+ '{{ version_name }}',
+ '{{ document_type }}',
+ '{{ document_format }}',
+ '{{ target_type }}',
+ '{{ tags }}',
+ '{{ requires }}',
+ '{{ update_method }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -315,35 +315,34 @@ globals:
 resources:
   - name: document
     props:
-      - name: Content
+      - name: content
         value: {}
-      - name: Attachments
+      - name: attachments
         value:
-          - Key: '{{ Key }}'
-            Values:
-              - '{{ Values[0] }}'
-            Name: '{{ Name }}'
-      - name: Name
-        value: '{{ Name }}'
-      - name: VersionName
-        value: '{{ VersionName }}'
-      - name: DocumentType
-        value: '{{ DocumentType }}'
-      - name: DocumentFormat
-        value: '{{ DocumentFormat }}'
-      - name: TargetType
-        value: '{{ TargetType }}'
-      - name: Tags
+          - key: '{{ key }}'
+            values:
+              - '{{ values[0] }}'
+            name: '{{ name }}'
+      - name: name
+        value: '{{ name }}'
+      - name: version_name
+        value: '{{ version_name }}'
+      - name: document_type
+        value: '{{ document_type }}'
+      - name: document_format
+        value: '{{ document_format }}'
+      - name: target_type
+        value: '{{ target_type }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-      - name: Requires
+          - key: '{{ key }}'
+            value: '{{ value }}'
+      - name: requires
         value:
-          - Name: '{{ Name }}'
-            Version: '{{ Version }}'
-      - name: UpdateMethod
-        value: '{{ UpdateMethod }}'
-
+          - name: '{{ name }}'
+            version: '{{ version }}'
+      - name: update_method
+        value: '{{ update_method }}'
 ```
 </TabItem>
 </Tabs>
@@ -366,7 +365,7 @@ SET PatchDocument = string('{{ {
     "UpdateMethod": update_method
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Name>';
+AND Identifier = '{{ name }}';
 ```
 
 
@@ -375,7 +374,7 @@ AND Identifier = '<Name>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.ssm.documents
-WHERE Identifier = '<Name>'
+WHERE Identifier = '{{ name }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/ssm/parameters/index.md b/website/docs/services/ssm/parameters/index.md
index 326529ea3..f492ed779 100644
--- a/website/docs/services/ssm/parameters/index.md
+++ b/website/docs/services/ssm/parameters/index.md
@@ -182,7 +182,7 @@ tags,
 data_type,
 name
 FROM awscc.ssm.parameters
-WHERE region = 'us-east-1' AND Identifier = '<Name>';
+WHERE region = 'us-east-1' AND Identifier = '{{ name }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -219,9 +219,9 @@ INSERT INTO awscc.ssm.parameters (
  Value,
  region
 )
-SELECT 
-'{{ Type }}',
- '{{ Value }}',
+SELECT
+'{{ type }}',
+ '{{ value }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -241,16 +241,16 @@ INSERT INTO awscc.ssm.parameters (
  Name,
  region
 )
-SELECT 
- '{{ Type }}',
- '{{ Value }}',
- '{{ Description }}',
- '{{ Policies }}',
- '{{ AllowedPattern }}',
- '{{ Tier }}',
- '{{ Tags }}',
- '{{ DataType }}',
- '{{ Name }}',
+SELECT
+ '{{ type }}',
+ '{{ value }}',
+ '{{ description }}',
+ '{{ policies }}',
+ '{{ allowed_pattern }}',
+ '{{ tier }}',
+ '{{ tags }}',
+ '{{ data_type }}',
+ '{{ name }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -268,25 +268,24 @@ globals:
 resources:
   - name: parameter
     props:
-      - name: Type
-        value: '{{ Type }}'
-      - name: Value
-        value: '{{ Value }}'
-      - name: Description
-        value: '{{ Description }}'
-      - name: Policies
-        value: '{{ Policies }}'
-      - name: AllowedPattern
-        value: '{{ AllowedPattern }}'
-      - name: Tier
-        value: '{{ Tier }}'
-      - name: Tags
+      - name: type
+        value: '{{ type }}'
+      - name: value
+        value: '{{ value }}'
+      - name: description
+        value: '{{ description }}'
+      - name: policies
+        value: '{{ policies }}'
+      - name: allowed_pattern
+        value: '{{ allowed_pattern }}'
+      - name: tier
+        value: '{{ tier }}'
+      - name: tags
         value: {}
-      - name: DataType
-        value: '{{ DataType }}'
-      - name: Name
-        value: '{{ Name }}'
-
+      - name: data_type
+        value: '{{ data_type }}'
+      - name: name
+        value: '{{ name }}'
 ```
 </TabItem>
 </Tabs>
@@ -309,7 +308,7 @@ SET PatchDocument = string('{{ {
     "DataType": data_type
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Name>';
+AND Identifier = '{{ name }}';
 ```
 
 
@@ -318,7 +317,7 @@ AND Identifier = '<Name>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.ssm.parameters
-WHERE Identifier = '<Name>'
+WHERE Identifier = '{{ name }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/ssm/patch_baselines/index.md b/website/docs/services/ssm/patch_baselines/index.md
index ea25844b6..607aea270 100644
--- a/website/docs/services/ssm/patch_baselines/index.md
+++ b/website/docs/services/ssm/patch_baselines/index.md
@@ -313,7 +313,7 @@ global_filters,
 available_security_updates_compliance_status,
 tags
 FROM awscc.ssm.patch_baselines
-WHERE region = 'us-east-1' AND Identifier = '<Id>';
+WHERE region = 'us-east-1' AND Identifier = '{{ id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -349,8 +349,8 @@ INSERT INTO awscc.ssm.patch_baselines (
  Name,
  region
 )
-SELECT 
-'{{ Name }}',
+SELECT
+'{{ name }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -376,22 +376,22 @@ INSERT INTO awscc.ssm.patch_baselines (
  Tags,
  region
 )
-SELECT 
- '{{ DefaultBaseline }}',
- '{{ OperatingSystem }}',
- '{{ Description }}',
- '{{ ApprovalRules }}',
- '{{ Sources }}',
- '{{ Name }}',
- '{{ RejectedPatches }}',
- '{{ ApprovedPatches }}',
- '{{ RejectedPatchesAction }}',
- '{{ PatchGroups }}',
- '{{ ApprovedPatchesComplianceLevel }}',
- '{{ ApprovedPatchesEnableNonSecurity }}',
- '{{ GlobalFilters }}',
- '{{ AvailableSecurityUpdatesComplianceStatus }}',
- '{{ Tags }}',
+SELECT
+ '{{ default_baseline }}',
+ '{{ operating_system }}',
+ '{{ description }}',
+ '{{ approval_rules }}',
+ '{{ sources }}',
+ '{{ name }}',
+ '{{ rejected_patches }}',
+ '{{ approved_patches }}',
+ '{{ rejected_patches_action }}',
+ '{{ patch_groups }}',
+ '{{ approved_patches_compliance_level }}',
+ '{{ approved_patches_enable_non_security }}',
+ '{{ global_filters }}',
+ '{{ available_security_updates_compliance_status }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -409,56 +409,55 @@ globals:
 resources:
   - name: patch_baseline
     props:
-      - name: DefaultBaseline
-        value: '{{ DefaultBaseline }}'
-      - name: OperatingSystem
-        value: '{{ OperatingSystem }}'
-      - name: Description
-        value: '{{ Description }}'
-      - name: ApprovalRules
+      - name: default_baseline
+        value: '{{ default_baseline }}'
+      - name: operating_system
+        value: '{{ operating_system }}'
+      - name: description
+        value: '{{ description }}'
+      - name: approval_rules
         value:
-          PatchRules:
-            - ApproveUntilDate: '{{ ApproveUntilDate }}'
-              EnableNonSecurity: '{{ EnableNonSecurity }}'
-              PatchFilterGroup:
-                PatchFilters:
-                  - Values:
-                      - '{{ Values[0] }}'
-                    Key: '{{ Key }}'
-              ApproveAfterDays: '{{ ApproveAfterDays }}'
-              ComplianceLevel: '{{ ComplianceLevel }}'
-      - name: Sources
+          patch_rules:
+            - approve_until_date: '{{ approve_until_date }}'
+              enable_non_security: '{{ enable_non_security }}'
+              patch_filter_group:
+                patch_filters:
+                  - values:
+                      - '{{ values[0] }}'
+                    key: '{{ key }}'
+              approve_after_days: '{{ approve_after_days }}'
+              compliance_level: '{{ compliance_level }}'
+      - name: sources
         value:
-          - Products:
-              - '{{ Products[0] }}'
-            Configuration: '{{ Configuration }}'
-            Name: '{{ Name }}'
-      - name: Name
-        value: '{{ Name }}'
-      - name: RejectedPatches
+          - products:
+              - '{{ products[0] }}'
+            configuration: '{{ configuration }}'
+            name: '{{ name }}'
+      - name: name
+        value: '{{ name }}'
+      - name: rejected_patches
         value:
-          - '{{ RejectedPatches[0] }}'
-      - name: ApprovedPatches
+          - '{{ rejected_patches[0] }}'
+      - name: approved_patches
         value:
-          - '{{ ApprovedPatches[0] }}'
-      - name: RejectedPatchesAction
-        value: '{{ RejectedPatchesAction }}'
-      - name: PatchGroups
+          - '{{ approved_patches[0] }}'
+      - name: rejected_patches_action
+        value: '{{ rejected_patches_action }}'
+      - name: patch_groups
         value:
-          - '{{ PatchGroups[0] }}'
-      - name: ApprovedPatchesComplianceLevel
-        value: '{{ ApprovedPatchesComplianceLevel }}'
-      - name: ApprovedPatchesEnableNonSecurity
-        value: '{{ ApprovedPatchesEnableNonSecurity }}'
-      - name: GlobalFilters
+          - '{{ patch_groups[0] }}'
+      - name: approved_patches_compliance_level
+        value: '{{ approved_patches_compliance_level }}'
+      - name: approved_patches_enable_non_security
+        value: '{{ approved_patches_enable_non_security }}'
+      - name: global_filters
         value: null
-      - name: AvailableSecurityUpdatesComplianceStatus
-        value: '{{ AvailableSecurityUpdatesComplianceStatus }}'
-      - name: Tags
+      - name: available_security_updates_compliance_status
+        value: '{{ available_security_updates_compliance_status }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -487,7 +486,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Id>';
+AND Identifier = '{{ id }}';
 ```
 
 
@@ -496,7 +495,7 @@ AND Identifier = '<Id>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.ssm.patch_baselines
-WHERE Identifier = '<Id>'
+WHERE Identifier = '{{ id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/ssm/resource_data_syncs/index.md b/website/docs/services/ssm/resource_data_syncs/index.md
index 458398aac..f44cb7485 100644
--- a/website/docs/services/ssm/resource_data_syncs/index.md
+++ b/website/docs/services/ssm/resource_data_syncs/index.md
@@ -243,7 +243,7 @@ sync_name,
 sync_type,
 bucket_prefix
 FROM awscc.ssm.resource_data_syncs
-WHERE region = 'us-east-1' AND Identifier = '<SyncName>';
+WHERE region = 'us-east-1' AND Identifier = '{{ sync_name }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -279,8 +279,8 @@ INSERT INTO awscc.ssm.resource_data_syncs (
  SyncName,
  region
 )
-SELECT 
-'{{ SyncName }}',
+SELECT
+'{{ sync_name }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -300,16 +300,16 @@ INSERT INTO awscc.ssm.resource_data_syncs (
  BucketPrefix,
  region
 )
-SELECT 
- '{{ S3Destination }}',
- '{{ KMSKeyArn }}',
- '{{ SyncSource }}',
- '{{ BucketName }}',
- '{{ BucketRegion }}',
- '{{ SyncFormat }}',
- '{{ SyncName }}',
- '{{ SyncType }}',
- '{{ BucketPrefix }}',
+SELECT
+ '{{ s3_destination }}',
+ '{{ kms_key_arn }}',
+ '{{ sync_source }}',
+ '{{ bucket_name }}',
+ '{{ bucket_region }}',
+ '{{ sync_format }}',
+ '{{ sync_name }}',
+ '{{ sync_type }}',
+ '{{ bucket_prefix }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -327,38 +327,37 @@ globals:
 resources:
   - name: resource_data_sync
     props:
-      - name: S3Destination
+      - name: s3_destination
         value:
-          KMSKeyArn: '{{ KMSKeyArn }}'
-          BucketPrefix: '{{ BucketPrefix }}'
-          BucketName: '{{ BucketName }}'
-          BucketRegion: '{{ BucketRegion }}'
-          SyncFormat: '{{ SyncFormat }}'
-      - name: KMSKeyArn
-        value: '{{ KMSKeyArn }}'
-      - name: SyncSource
+          kms_key_arn: '{{ kms_key_arn }}'
+          bucket_prefix: '{{ bucket_prefix }}'
+          bucket_name: '{{ bucket_name }}'
+          bucket_region: '{{ bucket_region }}'
+          sync_format: '{{ sync_format }}'
+      - name: kms_key_arn
+        value: '{{ kms_key_arn }}'
+      - name: sync_source
         value:
-          IncludeFutureRegions: '{{ IncludeFutureRegions }}'
-          SourceRegions:
-            - '{{ SourceRegions[0] }}'
-          SourceType: '{{ SourceType }}'
-          AwsOrganizationsSource:
-            OrganizationalUnits:
-              - '{{ OrganizationalUnits[0] }}'
-            OrganizationSourceType: '{{ OrganizationSourceType }}'
-      - name: BucketName
-        value: '{{ BucketName }}'
-      - name: BucketRegion
-        value: '{{ BucketRegion }}'
-      - name: SyncFormat
-        value: '{{ SyncFormat }}'
-      - name: SyncName
-        value: '{{ SyncName }}'
-      - name: SyncType
-        value: '{{ SyncType }}'
-      - name: BucketPrefix
-        value: '{{ BucketPrefix }}'
-
+          include_future_regions: '{{ include_future_regions }}'
+          source_regions:
+            - '{{ source_regions[0] }}'
+          source_type: '{{ source_type }}'
+          aws_organizations_source:
+            organizational_units:
+              - '{{ organizational_units[0] }}'
+            organization_source_type: '{{ organization_source_type }}'
+      - name: bucket_name
+        value: '{{ bucket_name }}'
+      - name: bucket_region
+        value: '{{ bucket_region }}'
+      - name: sync_format
+        value: '{{ sync_format }}'
+      - name: sync_name
+        value: '{{ sync_name }}'
+      - name: sync_type
+        value: '{{ sync_type }}'
+      - name: bucket_prefix
+        value: '{{ bucket_prefix }}'
 ```
 </TabItem>
 </Tabs>
@@ -374,7 +373,7 @@ SET PatchDocument = string('{{ {
     "SyncSource": sync_source
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<SyncName>';
+AND Identifier = '{{ sync_name }}';
 ```
 
 
@@ -383,7 +382,7 @@ AND Identifier = '<SyncName>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.ssm.resource_data_syncs
-WHERE Identifier = '<SyncName>'
+WHERE Identifier = '{{ sync_name }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/ssm/resource_policies/index.md b/website/docs/services/ssm/resource_policies/index.md
index f21b72c1f..23221aab7 100644
--- a/website/docs/services/ssm/resource_policies/index.md
+++ b/website/docs/services/ssm/resource_policies/index.md
@@ -162,7 +162,7 @@ policy,
 policy_id,
 policy_hash
 FROM awscc.ssm.resource_policies
-WHERE region = 'us-east-1' AND Identifier = '<PolicyId>|<ResourceArn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ policy_id }}|{{ resource_arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -200,9 +200,9 @@ INSERT INTO awscc.ssm.resource_policies (
  Policy,
  region
 )
-SELECT 
-'{{ ResourceArn }}',
- '{{ Policy }}',
+SELECT
+'{{ resource_arn }}',
+ '{{ policy }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -215,9 +215,9 @@ INSERT INTO awscc.ssm.resource_policies (
  Policy,
  region
 )
-SELECT 
- '{{ ResourceArn }}',
- '{{ Policy }}',
+SELECT
+ '{{ resource_arn }}',
+ '{{ policy }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -235,11 +235,10 @@ globals:
 resources:
   - name: resource_policy
     props:
-      - name: ResourceArn
-        value: '{{ ResourceArn }}'
-      - name: Policy
+      - name: resource_arn
+        value: '{{ resource_arn }}'
+      - name: policy
         value: {}
-
 ```
 </TabItem>
 </Tabs>
@@ -255,7 +254,7 @@ SET PatchDocument = string('{{ {
     "Policy": policy
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<PolicyId>|<ResourceArn>';
+AND Identifier = '{{ policy_id }}|{{ resource_arn }}';
 ```
 
 
@@ -264,7 +263,7 @@ AND Identifier = '<PolicyId>|<ResourceArn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.ssm.resource_policies
-WHERE Identifier = '<PolicyId|ResourceArn>'
+WHERE Identifier = '{{ policy_id }}|{{ resource_arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/ssmcontacts/contact_channels/index.md b/website/docs/services/ssmcontacts/contact_channels/index.md
index e4344bff2..3ee5d9148 100644
--- a/website/docs/services/ssmcontacts/contact_channels/index.md
+++ b/website/docs/services/ssmcontacts/contact_channels/index.md
@@ -164,7 +164,7 @@ defer_activation,
 channel_address,
 arn
 FROM awscc.ssmcontacts.contact_channels
-WHERE region = 'us-east-1' AND Identifier = '<Arn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -204,12 +204,12 @@ INSERT INTO awscc.ssmcontacts.contact_channels (
  ChannelAddress,
  region
 )
-SELECT 
-'{{ ContactId }}',
- '{{ ChannelName }}',
- '{{ ChannelType }}',
- '{{ DeferActivation }}',
- '{{ ChannelAddress }}',
+SELECT
+'{{ contact_id }}',
+ '{{ channel_name }}',
+ '{{ channel_type }}',
+ '{{ defer_activation }}',
+ '{{ channel_address }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -225,12 +225,12 @@ INSERT INTO awscc.ssmcontacts.contact_channels (
  ChannelAddress,
  region
 )
-SELECT 
- '{{ ContactId }}',
- '{{ ChannelName }}',
- '{{ ChannelType }}',
- '{{ DeferActivation }}',
- '{{ ChannelAddress }}',
+SELECT
+ '{{ contact_id }}',
+ '{{ channel_name }}',
+ '{{ channel_type }}',
+ '{{ defer_activation }}',
+ '{{ channel_address }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -248,17 +248,16 @@ globals:
 resources:
   - name: contact_channel
     props:
-      - name: ContactId
-        value: '{{ ContactId }}'
-      - name: ChannelName
-        value: '{{ ChannelName }}'
-      - name: ChannelType
-        value: '{{ ChannelType }}'
-      - name: DeferActivation
-        value: '{{ DeferActivation }}'
-      - name: ChannelAddress
-        value: '{{ ChannelAddress }}'
-
+      - name: contact_id
+        value: '{{ contact_id }}'
+      - name: channel_name
+        value: '{{ channel_name }}'
+      - name: channel_type
+        value: '{{ channel_type }}'
+      - name: defer_activation
+        value: '{{ defer_activation }}'
+      - name: channel_address
+        value: '{{ channel_address }}'
 ```
 </TabItem>
 </Tabs>
@@ -276,7 +275,7 @@ SET PatchDocument = string('{{ {
     "ChannelAddress": channel_address
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Arn>';
+AND Identifier = '{{ arn }}';
 ```
 
 
@@ -285,7 +284,7 @@ AND Identifier = '<Arn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.ssmcontacts.contact_channels
-WHERE Identifier = '<Arn>'
+WHERE Identifier = '{{ arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/ssmcontacts/contacts/index.md b/website/docs/services/ssmcontacts/contacts/index.md
index 04342c654..200cc6d3b 100644
--- a/website/docs/services/ssmcontacts/contacts/index.md
+++ b/website/docs/services/ssmcontacts/contacts/index.md
@@ -224,7 +224,7 @@ plan,
 tags,
 arn
 FROM awscc.ssmcontacts.contacts
-WHERE region = 'us-east-1' AND Identifier = '<Arn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -262,10 +262,10 @@ INSERT INTO awscc.ssmcontacts.contacts (
  Type,
  region
 )
-SELECT 
-'{{ Alias }}',
- '{{ DisplayName }}',
- '{{ Type }}',
+SELECT
+'{{ alias }}',
+ '{{ display_name }}',
+ '{{ type }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -281,12 +281,12 @@ INSERT INTO awscc.ssmcontacts.contacts (
  Tags,
  region
 )
-SELECT 
- '{{ Alias }}',
- '{{ DisplayName }}',
- '{{ Type }}',
- '{{ Plan }}',
- '{{ Tags }}',
+SELECT
+ '{{ alias }}',
+ '{{ display_name }}',
+ '{{ type }}',
+ '{{ plan }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -304,27 +304,26 @@ globals:
 resources:
   - name: contact
     props:
-      - name: Alias
-        value: '{{ Alias }}'
-      - name: DisplayName
-        value: '{{ DisplayName }}'
-      - name: Type
-        value: '{{ Type }}'
-      - name: Plan
+      - name: alias
+        value: '{{ alias }}'
+      - name: display_name
+        value: '{{ display_name }}'
+      - name: type
+        value: '{{ type }}'
+      - name: plan
         value:
-          - DurationInMinutes: '{{ DurationInMinutes }}'
-            Targets:
-              - ContactTargetInfo:
-                  ContactId: '{{ ContactId }}'
-                  IsEssential: '{{ IsEssential }}'
-                ChannelTargetInfo:
-                  ChannelId: '{{ ChannelId }}'
-                  RetryIntervalInMinutes: '{{ RetryIntervalInMinutes }}'
-      - name: Tags
+          - duration_in_minutes: '{{ duration_in_minutes }}'
+            targets:
+              - contact_target_info:
+                  contact_id: '{{ contact_id }}'
+                  is_essential: '{{ is_essential }}'
+                channel_target_info:
+                  channel_id: '{{ channel_id }}'
+                  retry_interval_in_minutes: '{{ retry_interval_in_minutes }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -342,7 +341,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Arn>';
+AND Identifier = '{{ arn }}';
 ```
 
 
@@ -351,7 +350,7 @@ AND Identifier = '<Arn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.ssmcontacts.contacts
-WHERE Identifier = '<Arn>'
+WHERE Identifier = '{{ arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/ssmcontacts/plans/index.md b/website/docs/services/ssmcontacts/plans/index.md
index 4c8777b0e..d4693bb35 100644
--- a/website/docs/services/ssmcontacts/plans/index.md
+++ b/website/docs/services/ssmcontacts/plans/index.md
@@ -154,7 +154,7 @@ stages,
 rotation_ids,
 arn
 FROM awscc.ssmcontacts.plans
-WHERE region = 'us-east-1' AND Identifier = '<Arn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ arn }}';
 ```
 
 ## `INSERT` example
@@ -179,10 +179,10 @@ INSERT INTO awscc.ssmcontacts.plans (
  RotationIds,
  region
 )
-SELECT 
-'{{ ContactId }}',
- '{{ Stages }}',
- '{{ RotationIds }}',
+SELECT
+'{{ contact_id }}',
+ '{{ stages }}',
+ '{{ rotation_ids }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -196,10 +196,10 @@ INSERT INTO awscc.ssmcontacts.plans (
  RotationIds,
  region
 )
-SELECT 
- '{{ ContactId }}',
- '{{ Stages }}',
- '{{ RotationIds }}',
+SELECT
+ '{{ contact_id }}',
+ '{{ stages }}',
+ '{{ rotation_ids }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -217,22 +217,21 @@ globals:
 resources:
   - name: plan
     props:
-      - name: ContactId
-        value: '{{ ContactId }}'
-      - name: Stages
+      - name: contact_id
+        value: '{{ contact_id }}'
+      - name: stages
         value:
-          - DurationInMinutes: '{{ DurationInMinutes }}'
-            Targets:
-              - ContactTargetInfo:
-                  ContactId: '{{ ContactId }}'
-                  IsEssential: '{{ IsEssential }}'
-                ChannelTargetInfo:
-                  ChannelId: '{{ ChannelId }}'
-                  RetryIntervalInMinutes: '{{ RetryIntervalInMinutes }}'
-      - name: RotationIds
+          - duration_in_minutes: '{{ duration_in_minutes }}'
+            targets:
+              - contact_target_info:
+                  contact_id: '{{ contact_id }}'
+                  is_essential: '{{ is_essential }}'
+                channel_target_info:
+                  channel_id: '{{ channel_id }}'
+                  retry_interval_in_minutes: '{{ retry_interval_in_minutes }}'
+      - name: rotation_ids
         value:
-          - '{{ RotationIds[0] }}'
-
+          - '{{ rotation_ids[0] }}'
 ```
 </TabItem>
 </Tabs>
@@ -249,7 +248,7 @@ SET PatchDocument = string('{{ {
     "RotationIds": rotation_ids
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Arn>';
+AND Identifier = '{{ arn }}';
 ```
 
 
@@ -258,7 +257,7 @@ AND Identifier = '<Arn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.ssmcontacts.plans
-WHERE Identifier = '<Arn>'
+WHERE Identifier = '{{ arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/ssmcontacts/rotations/index.md b/website/docs/services/ssmcontacts/rotations/index.md
index 0da947fc0..7c2d18e6b 100644
--- a/website/docs/services/ssmcontacts/rotations/index.md
+++ b/website/docs/services/ssmcontacts/rotations/index.md
@@ -250,7 +250,7 @@ recurrence,
 tags,
 arn
 FROM awscc.ssmcontacts.rotations
-WHERE region = 'us-east-1' AND Identifier = '<Arn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -290,12 +290,12 @@ INSERT INTO awscc.ssmcontacts.rotations (
  Recurrence,
  region
 )
-SELECT 
-'{{ Name }}',
- '{{ ContactIds }}',
- '{{ StartTime }}',
- '{{ TimeZoneId }}',
- '{{ Recurrence }}',
+SELECT
+'{{ name }}',
+ '{{ contact_ids }}',
+ '{{ start_time }}',
+ '{{ time_zone_id }}',
+ '{{ recurrence }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -312,13 +312,13 @@ INSERT INTO awscc.ssmcontacts.rotations (
  Tags,
  region
 )
-SELECT 
- '{{ Name }}',
- '{{ ContactIds }}',
- '{{ StartTime }}',
- '{{ TimeZoneId }}',
- '{{ Recurrence }}',
- '{{ Tags }}',
+SELECT
+ '{{ name }}',
+ '{{ contact_ids }}',
+ '{{ start_time }}',
+ '{{ time_zone_id }}',
+ '{{ recurrence }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -336,37 +336,36 @@ globals:
 resources:
   - name: rotation
     props:
-      - name: Name
-        value: '{{ Name }}'
-      - name: ContactIds
+      - name: name
+        value: '{{ name }}'
+      - name: contact_ids
         value:
-          - '{{ ContactIds[0] }}'
-      - name: StartTime
-        value: '{{ StartTime }}'
-      - name: TimeZoneId
-        value: '{{ TimeZoneId }}'
-      - name: Recurrence
+          - '{{ contact_ids[0] }}'
+      - name: start_time
+        value: '{{ start_time }}'
+      - name: time_zone_id
+        value: '{{ time_zone_id }}'
+      - name: recurrence
         value:
-          MonthlySettings:
-            - DayOfMonth: '{{ DayOfMonth }}'
-              HandOffTime: '{{ HandOffTime }}'
-          WeeklySettings:
-            - DayOfWeek: '{{ DayOfWeek }}'
-              HandOffTime: null
-          DailySettings:
+          monthly_settings:
+            - day_of_month: '{{ day_of_month }}'
+              hand_off_time: '{{ hand_off_time }}'
+          weekly_settings:
+            - day_of_week: '{{ day_of_week }}'
+              hand_off_time: null
+          daily_settings:
             - null
-          NumberOfOnCalls: '{{ NumberOfOnCalls }}'
-          RecurrenceMultiplier: '{{ RecurrenceMultiplier }}'
-          ShiftCoverages:
-            - DayOfWeek: null
-              CoverageTimes:
-                - StartTime: null
-                  EndTime: null
-      - name: Tags
+          number_of_on_calls: '{{ number_of_on_calls }}'
+          recurrence_multiplier: '{{ recurrence_multiplier }}'
+          shift_coverages:
+            - day_of_week: null
+              coverage_times:
+                - start_time: null
+                  end_time: null
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -387,7 +386,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Arn>';
+AND Identifier = '{{ arn }}';
 ```
 
 
@@ -396,7 +395,7 @@ AND Identifier = '<Arn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.ssmcontacts.rotations
-WHERE Identifier = '<Arn>'
+WHERE Identifier = '{{ arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/ssmguiconnect/preferences/index.md b/website/docs/services/ssmguiconnect/preferences/index.md
index 8999cd510..08c3884aa 100644
--- a/website/docs/services/ssmguiconnect/preferences/index.md
+++ b/website/docs/services/ssmguiconnect/preferences/index.md
@@ -171,7 +171,7 @@ region,
 account_id,
 connection_recording_preferences
 FROM awscc.ssmguiconnect.preferences
-WHERE region = 'us-east-1' AND Identifier = '<AccountId>';
+WHERE region = 'us-east-1' AND Identifier = '{{ account_id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -207,8 +207,8 @@ INSERT INTO awscc.ssmguiconnect.preferences (
  ConnectionRecordingPreferences,
  region
 )
-SELECT 
-'{{ ConnectionRecordingPreferences }}',
+SELECT
+'{{ connection_recording_preferences }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -220,8 +220,8 @@ INSERT INTO awscc.ssmguiconnect.preferences (
  ConnectionRecordingPreferences,
  region
 )
-SELECT 
- '{{ ConnectionRecordingPreferences }}',
+SELECT
+ '{{ connection_recording_preferences }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -239,14 +239,13 @@ globals:
 resources:
   - name: preference
     props:
-      - name: ConnectionRecordingPreferences
+      - name: connection_recording_preferences
         value:
-          RecordingDestinations:
-            S3Buckets:
-              - BucketOwner: '{{ BucketOwner }}'
-                BucketName: '{{ BucketName }}'
-          KMSKeyArn: '{{ KMSKeyArn }}'
-
+          recording_destinations:
+            s3_buckets:
+              - bucket_owner: '{{ bucket_owner }}'
+                bucket_name: '{{ bucket_name }}'
+          kms_key_arn: '{{ kms_key_arn }}'
 ```
 </TabItem>
 </Tabs>
@@ -262,7 +261,7 @@ SET PatchDocument = string('{{ {
     "ConnectionRecordingPreferences": connection_recording_preferences
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<AccountId>';
+AND Identifier = '{{ account_id }}';
 ```
 
 
@@ -271,7 +270,7 @@ AND Identifier = '<AccountId>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.ssmguiconnect.preferences
-WHERE Identifier = '<AccountId>'
+WHERE Identifier = '{{ account_id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/ssmincidents/replication_sets/index.md b/website/docs/services/ssmincidents/replication_sets/index.md
index be4ebacfa..08db2d505 100644
--- a/website/docs/services/ssmincidents/replication_sets/index.md
+++ b/website/docs/services/ssmincidents/replication_sets/index.md
@@ -183,7 +183,7 @@ regions,
 deletion_protected,
 tags
 FROM awscc.ssmincidents.replication_sets
-WHERE region = 'us-east-1' AND Identifier = '<Arn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -219,8 +219,8 @@ INSERT INTO awscc.ssmincidents.replication_sets (
  Regions,
  region
 )
-SELECT 
-'{{ Regions }}',
+SELECT
+'{{ regions }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -234,10 +234,10 @@ INSERT INTO awscc.ssmincidents.replication_sets (
  Tags,
  region
 )
-SELECT 
- '{{ Regions }}',
- '{{ DeletionProtected }}',
- '{{ Tags }}',
+SELECT
+ '{{ regions }}',
+ '{{ deletion_protected }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -255,18 +255,17 @@ globals:
 resources:
   - name: replication_set
     props:
-      - name: Regions
+      - name: regions
         value:
-          - RegionName: '{{ RegionName }}'
-            RegionConfiguration:
-              SseKmsKeyId: '{{ SseKmsKeyId }}'
-      - name: DeletionProtected
-        value: '{{ DeletionProtected }}'
-      - name: Tags
+          - region_name: '{{ region_name }}'
+            region_configuration:
+              sse_kms_key_id: '{{ sse_kms_key_id }}'
+      - name: deletion_protected
+        value: '{{ deletion_protected }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -284,7 +283,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Arn>';
+AND Identifier = '{{ arn }}';
 ```
 
 
@@ -293,7 +292,7 @@ AND Identifier = '<Arn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.ssmincidents.replication_sets
-WHERE Identifier = '<Arn>'
+WHERE Identifier = '{{ arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/ssmincidents/response_plans/index.md b/website/docs/services/ssmincidents/response_plans/index.md
index fb565c989..842855f29 100644
--- a/website/docs/services/ssmincidents/response_plans/index.md
+++ b/website/docs/services/ssmincidents/response_plans/index.md
@@ -334,7 +334,7 @@ integrations,
 tags,
 incident_template
 FROM awscc.ssmincidents.response_plans
-WHERE region = 'us-east-1' AND Identifier = '<Arn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -371,9 +371,9 @@ INSERT INTO awscc.ssmincidents.response_plans (
  IncidentTemplate,
  region
 )
-SELECT 
-'{{ Name }}',
- '{{ IncidentTemplate }}',
+SELECT
+'{{ name }}',
+ '{{ incident_template }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -392,15 +392,15 @@ INSERT INTO awscc.ssmincidents.response_plans (
  IncidentTemplate,
  region
 )
-SELECT 
- '{{ Name }}',
- '{{ DisplayName }}',
- '{{ ChatChannel }}',
- '{{ Engagements }}',
- '{{ Actions }}',
- '{{ Integrations }}',
- '{{ Tags }}',
- '{{ IncidentTemplate }}',
+SELECT
+ '{{ name }}',
+ '{{ display_name }}',
+ '{{ chat_channel }}',
+ '{{ engagements }}',
+ '{{ actions }}',
+ '{{ integrations }}',
+ '{{ tags }}',
+ '{{ incident_template }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -418,54 +418,53 @@ globals:
 resources:
   - name: response_plan
     props:
-      - name: Name
-        value: '{{ Name }}'
-      - name: DisplayName
-        value: '{{ DisplayName }}'
-      - name: ChatChannel
+      - name: name
+        value: '{{ name }}'
+      - name: display_name
+        value: '{{ display_name }}'
+      - name: chat_channel
         value:
-          ChatbotSns:
-            - '{{ ChatbotSns[0] }}'
-      - name: Engagements
+          chatbot_sns:
+            - '{{ chatbot_sns[0] }}'
+      - name: engagements
         value:
-          - '{{ Engagements[0] }}'
-      - name: Actions
+          - '{{ engagements[0] }}'
+      - name: actions
         value:
-          - SsmAutomation:
-              RoleArn: '{{ RoleArn }}'
-              DocumentName: '{{ DocumentName }}'
-              DocumentVersion: '{{ DocumentVersion }}'
-              TargetAccount: '{{ TargetAccount }}'
-              Parameters:
-                - Key: '{{ Key }}'
-                  Values:
-                    - '{{ Values[0] }}'
-              DynamicParameters:
-                - Key: '{{ Key }}'
-                  Value:
-                    Variable: '{{ Variable }}'
-      - name: Integrations
+          - ssm_automation:
+              role_arn: '{{ role_arn }}'
+              document_name: '{{ document_name }}'
+              document_version: '{{ document_version }}'
+              target_account: '{{ target_account }}'
+              parameters:
+                - key: '{{ key }}'
+                  values:
+                    - '{{ values[0] }}'
+              dynamic_parameters:
+                - key: '{{ key }}'
+                  value:
+                    variable: '{{ variable }}'
+      - name: integrations
         value:
-          - PagerDutyConfiguration:
-              Name: '{{ Name }}'
-              SecretId: '{{ SecretId }}'
-              PagerDutyIncidentConfiguration:
-                ServiceId: '{{ ServiceId }}'
-      - name: Tags
+          - pager_duty_configuration:
+              name: '{{ name }}'
+              secret_id: '{{ secret_id }}'
+              pager_duty_incident_configuration:
+                service_id: '{{ service_id }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-      - name: IncidentTemplate
+          - key: '{{ key }}'
+            value: '{{ value }}'
+      - name: incident_template
         value:
-          DedupeString: '{{ DedupeString }}'
-          Impact: '{{ Impact }}'
-          NotificationTargets:
-            - SnsTopicArn: null
-          Summary: '{{ Summary }}'
-          Title: '{{ Title }}'
-          IncidentTags:
+          dedupe_string: '{{ dedupe_string }}'
+          impact: '{{ impact }}'
+          notification_targets:
+            - sns_topic_arn: null
+          summary: '{{ summary }}'
+          title: '{{ title }}'
+          incident_tags:
             - null
-
 ```
 </TabItem>
 </Tabs>
@@ -487,7 +486,7 @@ SET PatchDocument = string('{{ {
     "IncidentTemplate": incident_template
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Arn>';
+AND Identifier = '{{ arn }}';
 ```
 
 
@@ -496,7 +495,7 @@ AND Identifier = '<Arn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.ssmincidents.response_plans
-WHERE Identifier = '<Arn>'
+WHERE Identifier = '{{ arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/ssmquicksetup/configuration_managers/index.md b/website/docs/services/ssmquicksetup/configuration_managers/index.md
index 38dd62634..c66312a4b 100644
--- a/website/docs/services/ssmquicksetup/configuration_managers/index.md
+++ b/website/docs/services/ssmquicksetup/configuration_managers/index.md
@@ -235,7 +235,7 @@ name,
 status_summaries,
 tags
 FROM awscc.ssmquicksetup.configuration_managers
-WHERE region = 'us-east-1' AND Identifier = '<ManagerArn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ manager_arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -271,8 +271,8 @@ INSERT INTO awscc.ssmquicksetup.configuration_managers (
  ConfigurationDefinitions,
  region
 )
-SELECT 
-'{{ ConfigurationDefinitions }}',
+SELECT
+'{{ configuration_definitions }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -287,11 +287,11 @@ INSERT INTO awscc.ssmquicksetup.configuration_managers (
  Tags,
  region
 )
-SELECT 
- '{{ ConfigurationDefinitions }}',
- '{{ Description }}',
- '{{ Name }}',
- '{{ Tags }}',
+SELECT
+ '{{ configuration_definitions }}',
+ '{{ description }}',
+ '{{ name }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -309,21 +309,20 @@ globals:
 resources:
   - name: configuration_manager
     props:
-      - name: ConfigurationDefinitions
+      - name: configuration_definitions
         value:
-          - Type: '{{ Type }}'
-            Parameters: {}
-            TypeVersion: '{{ TypeVersion }}'
-            LocalDeploymentExecutionRoleName: '{{ LocalDeploymentExecutionRoleName }}'
-            LocalDeploymentAdministrationRoleArn: '{{ LocalDeploymentAdministrationRoleArn }}'
+          - type: '{{ type }}'
+            parameters: {}
+            type_version: '{{ type_version }}'
+            local_deployment_execution_role_name: '{{ local_deployment_execution_role_name }}'
+            local_deployment_administration_role_arn: '{{ local_deployment_administration_role_arn }}'
             id: '{{ id }}'
-      - name: Description
-        value: '{{ Description }}'
-      - name: Name
-        value: '{{ Name }}'
-      - name: Tags
+      - name: description
+        value: '{{ description }}'
+      - name: name
+        value: '{{ name }}'
+      - name: tags
         value: {}
-
 ```
 </TabItem>
 </Tabs>
@@ -341,7 +340,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<ManagerArn>';
+AND Identifier = '{{ manager_arn }}';
 ```
 
 
@@ -350,7 +349,7 @@ AND Identifier = '<ManagerArn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.ssmquicksetup.configuration_managers
-WHERE Identifier = '<ManagerArn>'
+WHERE Identifier = '{{ manager_arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/sso/application_assignments/index.md b/website/docs/services/sso/application_assignments/index.md
index 8fb8ab90d..75d6c061a 100644
--- a/website/docs/services/sso/application_assignments/index.md
+++ b/website/docs/services/sso/application_assignments/index.md
@@ -150,7 +150,7 @@ application_arn,
 principal_type,
 principal_id
 FROM awscc.sso.application_assignments
-WHERE region = 'us-east-1' AND Identifier = '<ApplicationArn>|<PrincipalType>|<PrincipalId>';
+WHERE region = 'us-east-1' AND Identifier = '{{ application_arn }}|{{ principal_type }}|{{ principal_id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -190,10 +190,10 @@ INSERT INTO awscc.sso.application_assignments (
  PrincipalId,
  region
 )
-SELECT 
-'{{ ApplicationArn }}',
- '{{ PrincipalType }}',
- '{{ PrincipalId }}',
+SELECT
+'{{ application_arn }}',
+ '{{ principal_type }}',
+ '{{ principal_id }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -207,10 +207,10 @@ INSERT INTO awscc.sso.application_assignments (
  PrincipalId,
  region
 )
-SELECT 
- '{{ ApplicationArn }}',
- '{{ PrincipalType }}',
- '{{ PrincipalId }}',
+SELECT
+ '{{ application_arn }}',
+ '{{ principal_type }}',
+ '{{ principal_id }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -228,13 +228,12 @@ globals:
 resources:
   - name: application_assignment
     props:
-      - name: ApplicationArn
-        value: '{{ ApplicationArn }}'
-      - name: PrincipalType
-        value: '{{ PrincipalType }}'
-      - name: PrincipalId
-        value: '{{ PrincipalId }}'
-
+      - name: application_arn
+        value: '{{ application_arn }}'
+      - name: principal_type
+        value: '{{ principal_type }}'
+      - name: principal_id
+        value: '{{ principal_id }}'
 ```
 </TabItem>
 </Tabs>
@@ -245,7 +244,7 @@ resources:
 ```sql
 /*+ delete */
 DELETE FROM awscc.sso.application_assignments
-WHERE Identifier = '<ApplicationArn|PrincipalType|PrincipalId>'
+WHERE Identifier = '{{ application_arn }}|{{ principal_type }}|{{ principal_id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/sso/applications/index.md b/website/docs/services/sso/applications/index.md
index 161bce9a0..ebb7098bd 100644
--- a/website/docs/services/sso/applications/index.md
+++ b/website/docs/services/sso/applications/index.md
@@ -212,7 +212,7 @@ status,
 portal_options,
 tags
 FROM awscc.sso.applications
-WHERE region = 'us-east-1' AND Identifier = '<ApplicationArn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ application_arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -250,10 +250,10 @@ INSERT INTO awscc.sso.applications (
  ApplicationProviderArn,
  region
 )
-SELECT 
-'{{ Name }}',
- '{{ InstanceArn }}',
- '{{ ApplicationProviderArn }}',
+SELECT
+'{{ name }}',
+ '{{ instance_arn }}',
+ '{{ application_provider_arn }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -271,14 +271,14 @@ INSERT INTO awscc.sso.applications (
  Tags,
  region
 )
-SELECT 
- '{{ Name }}',
- '{{ Description }}',
- '{{ InstanceArn }}',
- '{{ ApplicationProviderArn }}',
- '{{ Status }}',
- '{{ PortalOptions }}',
- '{{ Tags }}',
+SELECT
+ '{{ name }}',
+ '{{ description }}',
+ '{{ instance_arn }}',
+ '{{ application_provider_arn }}',
+ '{{ status }}',
+ '{{ portal_options }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -296,27 +296,26 @@ globals:
 resources:
   - name: application
     props:
-      - name: Name
-        value: '{{ Name }}'
-      - name: Description
-        value: '{{ Description }}'
-      - name: InstanceArn
-        value: '{{ InstanceArn }}'
-      - name: ApplicationProviderArn
-        value: '{{ ApplicationProviderArn }}'
-      - name: Status
-        value: '{{ Status }}'
-      - name: PortalOptions
+      - name: name
+        value: '{{ name }}'
+      - name: description
+        value: '{{ description }}'
+      - name: instance_arn
+        value: '{{ instance_arn }}'
+      - name: application_provider_arn
+        value: '{{ application_provider_arn }}'
+      - name: status
+        value: '{{ status }}'
+      - name: portal_options
         value:
-          Visibility: '{{ Visibility }}'
-          SignInOptions:
-            Origin: '{{ Origin }}'
-            ApplicationUrl: '{{ ApplicationUrl }}'
-      - name: Tags
+          visibility: '{{ visibility }}'
+          sign_in_options:
+            origin: '{{ origin }}'
+            application_url: '{{ application_url }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -336,7 +335,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<ApplicationArn>';
+AND Identifier = '{{ application_arn }}';
 ```
 
 
@@ -345,7 +344,7 @@ AND Identifier = '<ApplicationArn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.sso.applications
-WHERE Identifier = '<ApplicationArn>'
+WHERE Identifier = '{{ application_arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/sso/assignments/index.md b/website/docs/services/sso/assignments/index.md
index 568bd219e..0c304b970 100644
--- a/website/docs/services/sso/assignments/index.md
+++ b/website/docs/services/sso/assignments/index.md
@@ -183,7 +183,7 @@ permission_set_arn,
 principal_type,
 principal_id
 FROM awscc.sso.assignments
-WHERE region = 'us-east-1' AND Identifier = '<InstanceArn>|<TargetId>|<TargetType>|<PermissionSetArn>|<PrincipalType>|<PrincipalId>';
+WHERE region = 'us-east-1' AND Identifier = '{{ instance_arn }}|{{ target_id }}|{{ target_type }}|{{ permission_set_arn }}|{{ principal_type }}|{{ principal_id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -229,13 +229,13 @@ INSERT INTO awscc.sso.assignments (
  PrincipalId,
  region
 )
-SELECT 
-'{{ InstanceArn }}',
- '{{ TargetId }}',
- '{{ TargetType }}',
- '{{ PermissionSetArn }}',
- '{{ PrincipalType }}',
- '{{ PrincipalId }}',
+SELECT
+'{{ instance_arn }}',
+ '{{ target_id }}',
+ '{{ target_type }}',
+ '{{ permission_set_arn }}',
+ '{{ principal_type }}',
+ '{{ principal_id }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -252,13 +252,13 @@ INSERT INTO awscc.sso.assignments (
  PrincipalId,
  region
 )
-SELECT 
- '{{ InstanceArn }}',
- '{{ TargetId }}',
- '{{ TargetType }}',
- '{{ PermissionSetArn }}',
- '{{ PrincipalType }}',
- '{{ PrincipalId }}',
+SELECT
+ '{{ instance_arn }}',
+ '{{ target_id }}',
+ '{{ target_type }}',
+ '{{ permission_set_arn }}',
+ '{{ principal_type }}',
+ '{{ principal_id }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -276,19 +276,18 @@ globals:
 resources:
   - name: assignment
     props:
-      - name: InstanceArn
-        value: '{{ InstanceArn }}'
-      - name: TargetId
-        value: '{{ TargetId }}'
-      - name: TargetType
-        value: '{{ TargetType }}'
-      - name: PermissionSetArn
-        value: '{{ PermissionSetArn }}'
-      - name: PrincipalType
-        value: '{{ PrincipalType }}'
-      - name: PrincipalId
-        value: '{{ PrincipalId }}'
-
+      - name: instance_arn
+        value: '{{ instance_arn }}'
+      - name: target_id
+        value: '{{ target_id }}'
+      - name: target_type
+        value: '{{ target_type }}'
+      - name: permission_set_arn
+        value: '{{ permission_set_arn }}'
+      - name: principal_type
+        value: '{{ principal_type }}'
+      - name: principal_id
+        value: '{{ principal_id }}'
 ```
 </TabItem>
 </Tabs>
@@ -299,7 +298,7 @@ resources:
 ```sql
 /*+ delete */
 DELETE FROM awscc.sso.assignments
-WHERE Identifier = '<InstanceArn|TargetId|TargetType|PermissionSetArn|PrincipalType|PrincipalId>'
+WHERE Identifier = '{{ instance_arn }}|{{ target_id }}|{{ target_type }}|{{ permission_set_arn }}|{{ principal_type }}|{{ principal_id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/sso/instance_access_control_attribute_configurations/index.md b/website/docs/services/sso/instance_access_control_attribute_configurations/index.md
index f25e1c6ae..07b106e01 100644
--- a/website/docs/services/sso/instance_access_control_attribute_configurations/index.md
+++ b/website/docs/services/sso/instance_access_control_attribute_configurations/index.md
@@ -191,7 +191,7 @@ instance_arn,
 instance_access_control_attribute_configuration,
 access_control_attributes
 FROM awscc.sso.instance_access_control_attribute_configurations
-WHERE region = 'us-east-1' AND Identifier = '<InstanceArn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ instance_arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -227,8 +227,8 @@ INSERT INTO awscc.sso.instance_access_control_attribute_configurations (
  InstanceArn,
  region
 )
-SELECT 
-'{{ InstanceArn }}',
+SELECT
+'{{ instance_arn }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -242,10 +242,10 @@ INSERT INTO awscc.sso.instance_access_control_attribute_configurations (
  AccessControlAttributes,
  region
 )
-SELECT 
- '{{ InstanceArn }}',
- '{{ InstanceAccessControlAttributeConfiguration }}',
- '{{ AccessControlAttributes }}',
+SELECT
+ '{{ instance_arn }}',
+ '{{ instance_access_control_attribute_configuration }}',
+ '{{ access_control_attributes }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -263,18 +263,17 @@ globals:
 resources:
   - name: instance_access_control_attribute_configuration
     props:
-      - name: InstanceArn
-        value: '{{ InstanceArn }}'
-      - name: InstanceAccessControlAttributeConfiguration
+      - name: instance_arn
+        value: '{{ instance_arn }}'
+      - name: instance_access_control_attribute_configuration
         value:
-          AccessControlAttributes:
-            - Key: '{{ Key }}'
-              Value:
-                Source:
-                  - '{{ Source[0] }}'
-      - name: AccessControlAttributes
+          access_control_attributes:
+            - key: '{{ key }}'
+              value:
+                source:
+                  - '{{ source[0] }}'
+      - name: access_control_attributes
         value: null
-
 ```
 </TabItem>
 </Tabs>
@@ -291,7 +290,7 @@ SET PatchDocument = string('{{ {
     "AccessControlAttributes": access_control_attributes
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<InstanceArn>';
+AND Identifier = '{{ instance_arn }}';
 ```
 
 
@@ -300,7 +299,7 @@ AND Identifier = '<InstanceArn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.sso.instance_access_control_attribute_configurations
-WHERE Identifier = '<InstanceArn>'
+WHERE Identifier = '{{ instance_arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/sso/instances/index.md b/website/docs/services/sso/instances/index.md
index f708bfb0c..5df03006d 100644
--- a/website/docs/services/sso/instances/index.md
+++ b/website/docs/services/sso/instances/index.md
@@ -176,7 +176,7 @@ identity_store_id,
 status,
 tags
 FROM awscc.sso.instances
-WHERE region = 'us-east-1' AND Identifier = '<InstanceArn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ instance_arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -213,9 +213,9 @@ INSERT INTO awscc.sso.instances (
  Tags,
  region
 )
-SELECT 
-'{{ Name }}',
- '{{ Tags }}',
+SELECT
+'{{ name }}',
+ '{{ tags }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -228,9 +228,9 @@ INSERT INTO awscc.sso.instances (
  Tags,
  region
 )
-SELECT 
- '{{ Name }}',
- '{{ Tags }}',
+SELECT
+ '{{ name }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -248,13 +248,12 @@ globals:
 resources:
   - name: instance
     props:
-      - name: Name
-        value: '{{ Name }}'
-      - name: Tags
+      - name: name
+        value: '{{ name }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -271,7 +270,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<InstanceArn>';
+AND Identifier = '{{ instance_arn }}';
 ```
 
 
@@ -280,7 +279,7 @@ AND Identifier = '<InstanceArn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.sso.instances
-WHERE Identifier = '<InstanceArn>'
+WHERE Identifier = '{{ instance_arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/sso/permission_sets/index.md b/website/docs/services/sso/permission_sets/index.md
index 511e16860..b1aa73ad6 100644
--- a/website/docs/services/sso/permission_sets/index.md
+++ b/website/docs/services/sso/permission_sets/index.md
@@ -223,7 +223,7 @@ tags,
 customer_managed_policy_references,
 permissions_boundary
 FROM awscc.sso.permission_sets
-WHERE region = 'us-east-1' AND Identifier = '<InstanceArn>|<PermissionSetArn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ instance_arn }}|{{ permission_set_arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -261,9 +261,9 @@ INSERT INTO awscc.sso.permission_sets (
  InstanceArn,
  region
 )
-SELECT 
-'{{ Name }}',
- '{{ InstanceArn }}',
+SELECT
+'{{ name }}',
+ '{{ instance_arn }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -284,17 +284,17 @@ INSERT INTO awscc.sso.permission_sets (
  PermissionsBoundary,
  region
 )
-SELECT 
- '{{ Name }}',
- '{{ Description }}',
- '{{ InstanceArn }}',
- '{{ SessionDuration }}',
- '{{ RelayStateType }}',
- '{{ ManagedPolicies }}',
- '{{ InlinePolicy }}',
- '{{ Tags }}',
- '{{ CustomerManagedPolicyReferences }}',
- '{{ PermissionsBoundary }}',
+SELECT
+ '{{ name }}',
+ '{{ description }}',
+ '{{ instance_arn }}',
+ '{{ session_duration }}',
+ '{{ relay_state_type }}',
+ '{{ managed_policies }}',
+ '{{ inline_policy }}',
+ '{{ tags }}',
+ '{{ customer_managed_policy_references }}',
+ '{{ permissions_boundary }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -312,34 +312,33 @@ globals:
 resources:
   - name: permission_set
     props:
-      - name: Name
-        value: '{{ Name }}'
-      - name: Description
-        value: '{{ Description }}'
-      - name: InstanceArn
-        value: '{{ InstanceArn }}'
-      - name: SessionDuration
-        value: '{{ SessionDuration }}'
-      - name: RelayStateType
-        value: '{{ RelayStateType }}'
-      - name: ManagedPolicies
+      - name: name
+        value: '{{ name }}'
+      - name: description
+        value: '{{ description }}'
+      - name: instance_arn
+        value: '{{ instance_arn }}'
+      - name: session_duration
+        value: '{{ session_duration }}'
+      - name: relay_state_type
+        value: '{{ relay_state_type }}'
+      - name: managed_policies
         value:
-          - '{{ ManagedPolicies[0] }}'
-      - name: InlinePolicy
+          - '{{ managed_policies[0] }}'
+      - name: inline_policy
         value: {}
-      - name: Tags
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-      - name: CustomerManagedPolicyReferences
+          - key: '{{ key }}'
+            value: '{{ value }}'
+      - name: customer_managed_policy_references
         value:
-          - Name: '{{ Name }}'
-            Path: '{{ Path }}'
-      - name: PermissionsBoundary
+          - name: '{{ name }}'
+            path: '{{ path }}'
+      - name: permissions_boundary
         value:
-          CustomerManagedPolicyReference: null
-          ManagedPolicyArn: null
-
+          customer_managed_policy_reference: null
+          managed_policy_arn: null
 ```
 </TabItem>
 </Tabs>
@@ -362,7 +361,7 @@ SET PatchDocument = string('{{ {
     "PermissionsBoundary": permissions_boundary
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<InstanceArn>|<PermissionSetArn>';
+AND Identifier = '{{ instance_arn }}|{{ permission_set_arn }}';
 ```
 
 
@@ -371,7 +370,7 @@ AND Identifier = '<InstanceArn>|<PermissionSetArn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.sso.permission_sets
-WHERE Identifier = '<InstanceArn|PermissionSetArn>'
+WHERE Identifier = '{{ instance_arn }}|{{ permission_set_arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/stepfunctions/activities/index.md b/website/docs/services/stepfunctions/activities/index.md
index c1c4ca904..b78c3e39d 100644
--- a/website/docs/services/stepfunctions/activities/index.md
+++ b/website/docs/services/stepfunctions/activities/index.md
@@ -181,7 +181,7 @@ name,
 tags,
 encryption_configuration
 FROM awscc.stepfunctions.activities
-WHERE region = 'us-east-1' AND Identifier = '<Arn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -217,8 +217,8 @@ INSERT INTO awscc.stepfunctions.activities (
  Name,
  region
 )
-SELECT 
-'{{ Name }}',
+SELECT
+'{{ name }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -232,10 +232,10 @@ INSERT INTO awscc.stepfunctions.activities (
  EncryptionConfiguration,
  region
 )
-SELECT 
- '{{ Name }}',
- '{{ Tags }}',
- '{{ EncryptionConfiguration }}',
+SELECT
+ '{{ name }}',
+ '{{ tags }}',
+ '{{ encryption_configuration }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -253,18 +253,17 @@ globals:
 resources:
   - name: activity
     props:
-      - name: Name
-        value: '{{ Name }}'
-      - name: Tags
+      - name: name
+        value: '{{ name }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-      - name: EncryptionConfiguration
+          - key: '{{ key }}'
+            value: '{{ value }}'
+      - name: encryption_configuration
         value:
-          KmsKeyId: '{{ KmsKeyId }}'
-          KmsDataKeyReusePeriodSeconds: '{{ KmsDataKeyReusePeriodSeconds }}'
-          Type: '{{ Type }}'
-
+          kms_key_id: '{{ kms_key_id }}'
+          kms_data_key_reuse_period_seconds: '{{ kms_data_key_reuse_period_seconds }}'
+          type: '{{ type }}'
 ```
 </TabItem>
 </Tabs>
@@ -280,7 +279,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Arn>';
+AND Identifier = '{{ arn }}';
 ```
 
 
@@ -289,7 +288,7 @@ AND Identifier = '<Arn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.stepfunctions.activities
-WHERE Identifier = '<Arn>'
+WHERE Identifier = '{{ arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/stepfunctions/state_machine_aliases/index.md b/website/docs/services/stepfunctions/state_machine_aliases/index.md
index 6e37c7636..4771708d8 100644
--- a/website/docs/services/stepfunctions/state_machine_aliases/index.md
+++ b/website/docs/services/stepfunctions/state_machine_aliases/index.md
@@ -197,7 +197,7 @@ description,
 routing_configuration,
 deployment_preference
 FROM awscc.stepfunctions.state_machine_aliases
-WHERE region = 'us-east-1' AND Identifier = '<Arn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -236,11 +236,11 @@ INSERT INTO awscc.stepfunctions.state_machine_aliases (
  DeploymentPreference,
  region
 )
-SELECT 
-'{{ Name }}',
- '{{ Description }}',
- '{{ RoutingConfiguration }}',
- '{{ DeploymentPreference }}',
+SELECT
+'{{ name }}',
+ '{{ description }}',
+ '{{ routing_configuration }}',
+ '{{ deployment_preference }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -255,11 +255,11 @@ INSERT INTO awscc.stepfunctions.state_machine_aliases (
  DeploymentPreference,
  region
 )
-SELECT 
- '{{ Name }}',
- '{{ Description }}',
- '{{ RoutingConfiguration }}',
- '{{ DeploymentPreference }}',
+SELECT
+ '{{ name }}',
+ '{{ description }}',
+ '{{ routing_configuration }}',
+ '{{ deployment_preference }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -277,23 +277,22 @@ globals:
 resources:
   - name: state_machine_alias
     props:
-      - name: Name
-        value: '{{ Name }}'
-      - name: Description
-        value: '{{ Description }}'
-      - name: RoutingConfiguration
+      - name: name
+        value: '{{ name }}'
+      - name: description
+        value: '{{ description }}'
+      - name: routing_configuration
         value:
-          - StateMachineVersionArn: '{{ StateMachineVersionArn }}'
-            Weight: '{{ Weight }}'
-      - name: DeploymentPreference
+          - state_machine_version_arn: '{{ state_machine_version_arn }}'
+            weight: '{{ weight }}'
+      - name: deployment_preference
         value:
-          StateMachineVersionArn: '{{ StateMachineVersionArn }}'
-          Type: '{{ Type }}'
-          Percentage: '{{ Percentage }}'
-          Interval: '{{ Interval }}'
-          Alarms:
-            - '{{ Alarms[0] }}'
-
+          state_machine_version_arn: '{{ state_machine_version_arn }}'
+          type: '{{ type }}'
+          percentage: '{{ percentage }}'
+          interval: '{{ interval }}'
+          alarms:
+            - '{{ alarms[0] }}'
 ```
 </TabItem>
 </Tabs>
@@ -311,7 +310,7 @@ SET PatchDocument = string('{{ {
     "DeploymentPreference": deployment_preference
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Arn>';
+AND Identifier = '{{ arn }}';
 ```
 
 
@@ -320,7 +319,7 @@ AND Identifier = '<Arn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.stepfunctions.state_machine_aliases
-WHERE Identifier = '<Arn>'
+WHERE Identifier = '{{ arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/stepfunctions/state_machine_versions/index.md b/website/docs/services/stepfunctions/state_machine_versions/index.md
index 663863ca1..4cddfdc04 100644
--- a/website/docs/services/stepfunctions/state_machine_versions/index.md
+++ b/website/docs/services/stepfunctions/state_machine_versions/index.md
@@ -146,7 +146,7 @@ state_machine_arn,
 state_machine_revision_id,
 description
 FROM awscc.stepfunctions.state_machine_versions
-WHERE region = 'us-east-1' AND Identifier = '<Arn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -182,8 +182,8 @@ INSERT INTO awscc.stepfunctions.state_machine_versions (
  StateMachineArn,
  region
 )
-SELECT 
-'{{ StateMachineArn }}',
+SELECT
+'{{ state_machine_arn }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -197,10 +197,10 @@ INSERT INTO awscc.stepfunctions.state_machine_versions (
  Description,
  region
 )
-SELECT 
- '{{ StateMachineArn }}',
- '{{ StateMachineRevisionId }}',
- '{{ Description }}',
+SELECT
+ '{{ state_machine_arn }}',
+ '{{ state_machine_revision_id }}',
+ '{{ description }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -218,13 +218,12 @@ globals:
 resources:
   - name: state_machine_version
     props:
-      - name: StateMachineArn
-        value: '{{ StateMachineArn }}'
-      - name: StateMachineRevisionId
-        value: '{{ StateMachineRevisionId }}'
-      - name: Description
-        value: '{{ Description }}'
-
+      - name: state_machine_arn
+        value: '{{ state_machine_arn }}'
+      - name: state_machine_revision_id
+        value: '{{ state_machine_revision_id }}'
+      - name: description
+        value: '{{ description }}'
 ```
 </TabItem>
 </Tabs>
@@ -235,7 +234,7 @@ resources:
 ```sql
 /*+ delete */
 DELETE FROM awscc.stepfunctions.state_machine_versions
-WHERE Identifier = '<Arn>'
+WHERE Identifier = '{{ arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/stepfunctions/state_machines/index.md b/website/docs/services/stepfunctions/state_machines/index.md
index 032be4eed..15f7d5e54 100644
--- a/website/docs/services/stepfunctions/state_machines/index.md
+++ b/website/docs/services/stepfunctions/state_machines/index.md
@@ -296,7 +296,7 @@ definition_substitutions,
 definition,
 tags
 FROM awscc.stepfunctions.state_machines
-WHERE region = 'us-east-1' AND Identifier = '<Arn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -332,8 +332,8 @@ INSERT INTO awscc.stepfunctions.state_machines (
  RoleArn,
  region
 )
-SELECT 
-'{{ RoleArn }}',
+SELECT
+'{{ role_arn }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -355,18 +355,18 @@ INSERT INTO awscc.stepfunctions.state_machines (
  Tags,
  region
 )
-SELECT 
- '{{ DefinitionString }}',
- '{{ RoleArn }}',
- '{{ StateMachineName }}',
- '{{ StateMachineType }}',
- '{{ LoggingConfiguration }}',
- '{{ TracingConfiguration }}',
- '{{ EncryptionConfiguration }}',
- '{{ DefinitionS3Location }}',
- '{{ DefinitionSubstitutions }}',
- '{{ Definition }}',
- '{{ Tags }}',
+SELECT
+ '{{ definition_string }}',
+ '{{ role_arn }}',
+ '{{ state_machine_name }}',
+ '{{ state_machine_type }}',
+ '{{ logging_configuration }}',
+ '{{ tracing_configuration }}',
+ '{{ encryption_configuration }}',
+ '{{ definition_s3_location }}',
+ '{{ definition_substitutions }}',
+ '{{ definition }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -384,43 +384,42 @@ globals:
 resources:
   - name: state_machine
     props:
-      - name: DefinitionString
-        value: '{{ DefinitionString }}'
-      - name: RoleArn
-        value: '{{ RoleArn }}'
-      - name: StateMachineName
-        value: '{{ StateMachineName }}'
-      - name: StateMachineType
-        value: '{{ StateMachineType }}'
-      - name: LoggingConfiguration
+      - name: definition_string
+        value: '{{ definition_string }}'
+      - name: role_arn
+        value: '{{ role_arn }}'
+      - name: state_machine_name
+        value: '{{ state_machine_name }}'
+      - name: state_machine_type
+        value: '{{ state_machine_type }}'
+      - name: logging_configuration
         value:
-          Level: '{{ Level }}'
-          IncludeExecutionData: '{{ IncludeExecutionData }}'
-          Destinations:
-            - CloudWatchLogsLogGroup:
-                LogGroupArn: '{{ LogGroupArn }}'
-      - name: TracingConfiguration
+          level: '{{ level }}'
+          include_execution_data: '{{ include_execution_data }}'
+          destinations:
+            - cloud_watch_logs_log_group:
+                log_group_arn: '{{ log_group_arn }}'
+      - name: tracing_configuration
         value:
-          Enabled: '{{ Enabled }}'
-      - name: EncryptionConfiguration
+          enabled: '{{ enabled }}'
+      - name: encryption_configuration
         value:
-          KmsKeyId: '{{ KmsKeyId }}'
-          KmsDataKeyReusePeriodSeconds: '{{ KmsDataKeyReusePeriodSeconds }}'
-          Type: '{{ Type }}'
-      - name: DefinitionS3Location
+          kms_key_id: '{{ kms_key_id }}'
+          kms_data_key_reuse_period_seconds: '{{ kms_data_key_reuse_period_seconds }}'
+          type: '{{ type }}'
+      - name: definition_s3_location
         value:
-          Bucket: '{{ Bucket }}'
-          Key: '{{ Key }}'
-          Version: '{{ Version }}'
-      - name: DefinitionSubstitutions
+          bucket: '{{ bucket }}'
+          key: '{{ key }}'
+          version: '{{ version }}'
+      - name: definition_substitutions
         value: {}
-      - name: Definition
+      - name: definition
         value: {}
-      - name: Tags
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -444,7 +443,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Arn>';
+AND Identifier = '{{ arn }}';
 ```
 
 
@@ -453,7 +452,7 @@ AND Identifier = '<Arn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.stepfunctions.state_machines
-WHERE Identifier = '<Arn>'
+WHERE Identifier = '{{ arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/supportapp/account_aliases/index.md b/website/docs/services/supportapp/account_aliases/index.md
index a694b9d77..74359ee2d 100644
--- a/website/docs/services/supportapp/account_aliases/index.md
+++ b/website/docs/services/supportapp/account_aliases/index.md
@@ -145,7 +145,7 @@ region,
 account_alias,
 account_alias_resource_id
 FROM awscc.supportapp.account_aliases
-WHERE region = 'us-east-1' AND Identifier = '<AccountAliasResourceId>';
+WHERE region = 'us-east-1' AND Identifier = '{{ account_alias_resource_id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -181,8 +181,8 @@ INSERT INTO awscc.supportapp.account_aliases (
  AccountAlias,
  region
 )
-SELECT 
-'{{ AccountAlias }}',
+SELECT
+'{{ account_alias }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -194,8 +194,8 @@ INSERT INTO awscc.supportapp.account_aliases (
  AccountAlias,
  region
 )
-SELECT 
- '{{ AccountAlias }}',
+SELECT
+ '{{ account_alias }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -213,9 +213,8 @@ globals:
 resources:
   - name: account_alias
     props:
-      - name: AccountAlias
-        value: '{{ AccountAlias }}'
-
+      - name: account_alias
+        value: '{{ account_alias }}'
 ```
 </TabItem>
 </Tabs>
@@ -231,7 +230,7 @@ SET PatchDocument = string('{{ {
     "AccountAlias": account_alias
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<AccountAliasResourceId>';
+AND Identifier = '{{ account_alias_resource_id }}';
 ```
 
 
@@ -240,7 +239,7 @@ AND Identifier = '<AccountAliasResourceId>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.supportapp.account_aliases
-WHERE Identifier = '<AccountAliasResourceId>'
+WHERE Identifier = '{{ account_alias_resource_id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/supportapp/slack_channel_configurations/index.md b/website/docs/services/supportapp/slack_channel_configurations/index.md
index c4bcee6f0..a4353b7ea 100644
--- a/website/docs/services/supportapp/slack_channel_configurations/index.md
+++ b/website/docs/services/supportapp/slack_channel_configurations/index.md
@@ -181,7 +181,7 @@ notify_on_resolve_case,
 notify_on_case_severity,
 channel_role_arn
 FROM awscc.supportapp.slack_channel_configurations
-WHERE region = 'us-east-1' AND Identifier = '<TeamId>|<ChannelId>';
+WHERE region = 'us-east-1' AND Identifier = '{{ team_id }}|{{ channel_id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -221,11 +221,11 @@ INSERT INTO awscc.supportapp.slack_channel_configurations (
  ChannelRoleArn,
  region
 )
-SELECT 
-'{{ TeamId }}',
- '{{ ChannelId }}',
- '{{ NotifyOnCaseSeverity }}',
- '{{ ChannelRoleArn }}',
+SELECT
+'{{ team_id }}',
+ '{{ channel_id }}',
+ '{{ notify_on_case_severity }}',
+ '{{ channel_role_arn }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -244,15 +244,15 @@ INSERT INTO awscc.supportapp.slack_channel_configurations (
  ChannelRoleArn,
  region
 )
-SELECT 
- '{{ TeamId }}',
- '{{ ChannelId }}',
- '{{ ChannelName }}',
- '{{ NotifyOnCreateOrReopenCase }}',
- '{{ NotifyOnAddCorrespondenceToCase }}',
- '{{ NotifyOnResolveCase }}',
- '{{ NotifyOnCaseSeverity }}',
- '{{ ChannelRoleArn }}',
+SELECT
+ '{{ team_id }}',
+ '{{ channel_id }}',
+ '{{ channel_name }}',
+ '{{ notify_on_create_or_reopen_case }}',
+ '{{ notify_on_add_correspondence_to_case }}',
+ '{{ notify_on_resolve_case }}',
+ '{{ notify_on_case_severity }}',
+ '{{ channel_role_arn }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -270,23 +270,22 @@ globals:
 resources:
   - name: slack_channel_configuration
     props:
-      - name: TeamId
-        value: '{{ TeamId }}'
-      - name: ChannelId
-        value: '{{ ChannelId }}'
-      - name: ChannelName
-        value: '{{ ChannelName }}'
-      - name: NotifyOnCreateOrReopenCase
-        value: '{{ NotifyOnCreateOrReopenCase }}'
-      - name: NotifyOnAddCorrespondenceToCase
-        value: '{{ NotifyOnAddCorrespondenceToCase }}'
-      - name: NotifyOnResolveCase
-        value: '{{ NotifyOnResolveCase }}'
-      - name: NotifyOnCaseSeverity
-        value: '{{ NotifyOnCaseSeverity }}'
-      - name: ChannelRoleArn
-        value: '{{ ChannelRoleArn }}'
-
+      - name: team_id
+        value: '{{ team_id }}'
+      - name: channel_id
+        value: '{{ channel_id }}'
+      - name: channel_name
+        value: '{{ channel_name }}'
+      - name: notify_on_create_or_reopen_case
+        value: '{{ notify_on_create_or_reopen_case }}'
+      - name: notify_on_add_correspondence_to_case
+        value: '{{ notify_on_add_correspondence_to_case }}'
+      - name: notify_on_resolve_case
+        value: '{{ notify_on_resolve_case }}'
+      - name: notify_on_case_severity
+        value: '{{ notify_on_case_severity }}'
+      - name: channel_role_arn
+        value: '{{ channel_role_arn }}'
 ```
 </TabItem>
 </Tabs>
@@ -307,7 +306,7 @@ SET PatchDocument = string('{{ {
     "ChannelRoleArn": channel_role_arn
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<TeamId>|<ChannelId>';
+AND Identifier = '{{ team_id }}|{{ channel_id }}';
 ```
 
 
@@ -316,7 +315,7 @@ AND Identifier = '<TeamId>|<ChannelId>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.supportapp.slack_channel_configurations
-WHERE Identifier = '<TeamId|ChannelId>'
+WHERE Identifier = '{{ team_id }}|{{ channel_id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/supportapp/slack_workspace_configurations/index.md b/website/docs/services/supportapp/slack_workspace_configurations/index.md
index 63aa696c6..67dcdf33b 100644
--- a/website/docs/services/supportapp/slack_workspace_configurations/index.md
+++ b/website/docs/services/supportapp/slack_workspace_configurations/index.md
@@ -140,7 +140,7 @@ region,
 team_id,
 version_id
 FROM awscc.supportapp.slack_workspace_configurations
-WHERE region = 'us-east-1' AND Identifier = '<TeamId>';
+WHERE region = 'us-east-1' AND Identifier = '{{ team_id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -176,8 +176,8 @@ INSERT INTO awscc.supportapp.slack_workspace_configurations (
  TeamId,
  region
 )
-SELECT 
-'{{ TeamId }}',
+SELECT
+'{{ team_id }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -190,9 +190,9 @@ INSERT INTO awscc.supportapp.slack_workspace_configurations (
  VersionId,
  region
 )
-SELECT 
- '{{ TeamId }}',
- '{{ VersionId }}',
+SELECT
+ '{{ team_id }}',
+ '{{ version_id }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -210,11 +210,10 @@ globals:
 resources:
   - name: slack_workspace_configuration
     props:
-      - name: TeamId
-        value: '{{ TeamId }}'
-      - name: VersionId
-        value: '{{ VersionId }}'
-
+      - name: team_id
+        value: '{{ team_id }}'
+      - name: version_id
+        value: '{{ version_id }}'
 ```
 </TabItem>
 </Tabs>
@@ -230,7 +229,7 @@ SET PatchDocument = string('{{ {
     "VersionId": version_id
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<TeamId>';
+AND Identifier = '{{ team_id }}';
 ```
 
 
@@ -239,7 +238,7 @@ AND Identifier = '<TeamId>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.supportapp.slack_workspace_configurations
-WHERE Identifier = '<TeamId>'
+WHERE Identifier = '{{ team_id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/synthetics/canaries/index.md b/website/docs/services/synthetics/canaries/index.md
index 0c11fdd53..61e819bd1 100644
--- a/website/docs/services/synthetics/canaries/index.md
+++ b/website/docs/services/synthetics/canaries/index.md
@@ -449,7 +449,7 @@ dry_run_and_update,
 browser_configs,
 visual_references
 FROM awscc.synthetics.canaries
-WHERE region = 'us-east-1' AND Identifier = '<Name>';
+WHERE region = 'us-east-1' AND Identifier = '{{ name }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -490,13 +490,13 @@ INSERT INTO awscc.synthetics.canaries (
  RuntimeVersion,
  region
 )
-SELECT 
-'{{ Name }}',
- '{{ Code }}',
- '{{ ArtifactS3Location }}',
- '{{ Schedule }}',
- '{{ ExecutionRoleArn }}',
- '{{ RuntimeVersion }}',
+SELECT
+'{{ name }}',
+ '{{ code }}',
+ '{{ artifact_s3_location }}',
+ '{{ schedule }}',
+ '{{ execution_role_arn }}',
+ '{{ runtime_version }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -527,27 +527,27 @@ INSERT INTO awscc.synthetics.canaries (
  VisualReferences,
  region
 )
-SELECT 
- '{{ Name }}',
- '{{ Code }}',
- '{{ ArtifactS3Location }}',
- '{{ ArtifactConfig }}',
- '{{ Schedule }}',
- '{{ ExecutionRoleArn }}',
- '{{ RuntimeVersion }}',
- '{{ SuccessRetentionPeriod }}',
- '{{ FailureRetentionPeriod }}',
- '{{ Tags }}',
- '{{ VPCConfig }}',
- '{{ RunConfig }}',
- '{{ StartCanaryAfterCreation }}',
- '{{ VisualReference }}',
- '{{ DeleteLambdaResourcesOnCanaryDeletion }}',
- '{{ ResourcesToReplicateTags }}',
- '{{ ProvisionedResourceCleanup }}',
- '{{ DryRunAndUpdate }}',
- '{{ BrowserConfigs }}',
- '{{ VisualReferences }}',
+SELECT
+ '{{ name }}',
+ '{{ code }}',
+ '{{ artifact_s3_location }}',
+ '{{ artifact_config }}',
+ '{{ schedule }}',
+ '{{ execution_role_arn }}',
+ '{{ runtime_version }}',
+ '{{ success_retention_period }}',
+ '{{ failure_retention_period }}',
+ '{{ tags }}',
+ '{{ vpc_config }}',
+ '{{ run_config }}',
+ '{{ start_canary_after_creation }}',
+ '{{ visual_reference }}',
+ '{{ delete_lambda_resources_on_canary_deletion }}',
+ '{{ resources_to_replicate_tags }}',
+ '{{ provisioned_resource_cleanup }}',
+ '{{ dry_run_and_update }}',
+ '{{ browser_configs }}',
+ '{{ visual_references }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -565,85 +565,84 @@ globals:
 resources:
   - name: canary
     props:
-      - name: Name
-        value: '{{ Name }}'
-      - name: Code
+      - name: name
+        value: '{{ name }}'
+      - name: code
         value:
-          S3Bucket: '{{ S3Bucket }}'
-          S3Key: '{{ S3Key }}'
-          S3ObjectVersion: '{{ S3ObjectVersion }}'
-          Script: '{{ Script }}'
-          Handler: '{{ Handler }}'
-          SourceLocationArn: '{{ SourceLocationArn }}'
-          Dependencies:
-            - Type: '{{ Type }}'
-              Reference: '{{ Reference }}'
-      - name: ArtifactS3Location
-        value: '{{ ArtifactS3Location }}'
-      - name: ArtifactConfig
+          s3_bucket: '{{ s3_bucket }}'
+          s3_key: '{{ s3_key }}'
+          s3_object_version: '{{ s3_object_version }}'
+          script: '{{ script }}'
+          handler: '{{ handler }}'
+          source_location_arn: '{{ source_location_arn }}'
+          dependencies:
+            - type: '{{ type }}'
+              reference: '{{ reference }}'
+      - name: artifact_s3_location
+        value: '{{ artifact_s3_location }}'
+      - name: artifact_config
         value:
-          S3Encryption:
-            EncryptionMode: '{{ EncryptionMode }}'
-            KmsKeyArn: '{{ KmsKeyArn }}'
-      - name: Schedule
+          s3_encryption:
+            encryption_mode: '{{ encryption_mode }}'
+            kms_key_arn: '{{ kms_key_arn }}'
+      - name: schedule
         value:
-          Expression: '{{ Expression }}'
-          DurationInSeconds: '{{ DurationInSeconds }}'
-          RetryConfig:
-            MaxRetries: '{{ MaxRetries }}'
-      - name: ExecutionRoleArn
-        value: '{{ ExecutionRoleArn }}'
-      - name: RuntimeVersion
-        value: '{{ RuntimeVersion }}'
-      - name: SuccessRetentionPeriod
-        value: '{{ SuccessRetentionPeriod }}'
-      - name: FailureRetentionPeriod
-        value: '{{ FailureRetentionPeriod }}'
-      - name: Tags
+          expression: '{{ expression }}'
+          duration_in_seconds: '{{ duration_in_seconds }}'
+          retry_config:
+            max_retries: '{{ max_retries }}'
+      - name: execution_role_arn
+        value: '{{ execution_role_arn }}'
+      - name: runtime_version
+        value: '{{ runtime_version }}'
+      - name: success_retention_period
+        value: '{{ success_retention_period }}'
+      - name: failure_retention_period
+        value: '{{ failure_retention_period }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-      - name: VPCConfig
+          - key: '{{ key }}'
+            value: '{{ value }}'
+      - name: vpc_config
         value:
-          VpcId: '{{ VpcId }}'
-          SubnetIds:
-            - '{{ SubnetIds[0] }}'
-          SecurityGroupIds:
-            - '{{ SecurityGroupIds[0] }}'
-          Ipv6AllowedForDualStack: '{{ Ipv6AllowedForDualStack }}'
-      - name: RunConfig
+          vpc_id: '{{ vpc_id }}'
+          subnet_ids:
+            - '{{ subnet_ids[0] }}'
+          security_group_ids:
+            - '{{ security_group_ids[0] }}'
+          ipv6_allowed_for_dual_stack: '{{ ipv6_allowed_for_dual_stack }}'
+      - name: run_config
         value:
-          TimeoutInSeconds: '{{ TimeoutInSeconds }}'
-          MemoryInMB: '{{ MemoryInMB }}'
-          EphemeralStorage: '{{ EphemeralStorage }}'
-          ActiveTracing: '{{ ActiveTracing }}'
-          EnvironmentVariables: {}
-      - name: StartCanaryAfterCreation
-        value: '{{ StartCanaryAfterCreation }}'
-      - name: VisualReference
+          timeout_in_seconds: '{{ timeout_in_seconds }}'
+          memory_in_mb: '{{ memory_in_mb }}'
+          ephemeral_storage: '{{ ephemeral_storage }}'
+          active_tracing: '{{ active_tracing }}'
+          environment_variables: {}
+      - name: start_canary_after_creation
+        value: '{{ start_canary_after_creation }}'
+      - name: visual_reference
         value:
-          BaseCanaryRunId: '{{ BaseCanaryRunId }}'
-          BaseScreenshots:
-            - ScreenshotName: '{{ ScreenshotName }}'
-              IgnoreCoordinates:
-                - '{{ IgnoreCoordinates[0] }}'
-          BrowserType: '{{ BrowserType }}'
-      - name: DeleteLambdaResourcesOnCanaryDeletion
-        value: '{{ DeleteLambdaResourcesOnCanaryDeletion }}'
-      - name: ResourcesToReplicateTags
+          base_canary_run_id: '{{ base_canary_run_id }}'
+          base_screenshots:
+            - screenshot_name: '{{ screenshot_name }}'
+              ignore_coordinates:
+                - '{{ ignore_coordinates[0] }}'
+          browser_type: '{{ browser_type }}'
+      - name: delete_lambda_resources_on_canary_deletion
+        value: '{{ delete_lambda_resources_on_canary_deletion }}'
+      - name: resources_to_replicate_tags
         value:
-          - '{{ ResourcesToReplicateTags[0] }}'
-      - name: ProvisionedResourceCleanup
-        value: '{{ ProvisionedResourceCleanup }}'
-      - name: DryRunAndUpdate
-        value: '{{ DryRunAndUpdate }}'
-      - name: BrowserConfigs
+          - '{{ resources_to_replicate_tags[0] }}'
+      - name: provisioned_resource_cleanup
+        value: '{{ provisioned_resource_cleanup }}'
+      - name: dry_run_and_update
+        value: '{{ dry_run_and_update }}'
+      - name: browser_configs
         value:
-          - BrowserType: null
-      - name: VisualReferences
+          - browser_type: null
+      - name: visual_references
         value:
           - null
-
 ```
 </TabItem>
 </Tabs>
@@ -676,7 +675,7 @@ SET PatchDocument = string('{{ {
     "VisualReferences": visual_references
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Name>';
+AND Identifier = '{{ name }}';
 ```
 
 
@@ -685,7 +684,7 @@ AND Identifier = '<Name>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.synthetics.canaries
-WHERE Identifier = '<Name>'
+WHERE Identifier = '{{ name }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/synthetics/groups/index.md b/website/docs/services/synthetics/groups/index.md
index a0634b079..6a50c9fb5 100644
--- a/website/docs/services/synthetics/groups/index.md
+++ b/website/docs/services/synthetics/groups/index.md
@@ -164,7 +164,7 @@ id,
 tags,
 resource_arns
 FROM awscc.synthetics.groups
-WHERE region = 'us-east-1' AND Identifier = '<Name>';
+WHERE region = 'us-east-1' AND Identifier = '{{ name }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -200,8 +200,8 @@ INSERT INTO awscc.synthetics.groups (
  Name,
  region
 )
-SELECT 
-'{{ Name }}',
+SELECT
+'{{ name }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -215,10 +215,10 @@ INSERT INTO awscc.synthetics.groups (
  ResourceArns,
  region
 )
-SELECT 
- '{{ Name }}',
- '{{ Tags }}',
- '{{ ResourceArns }}',
+SELECT
+ '{{ name }}',
+ '{{ tags }}',
+ '{{ resource_arns }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -236,16 +236,15 @@ globals:
 resources:
   - name: group
     props:
-      - name: Name
-        value: '{{ Name }}'
-      - name: Tags
+      - name: name
+        value: '{{ name }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-      - name: ResourceArns
+          - key: '{{ key }}'
+            value: '{{ value }}'
+      - name: resource_arns
         value:
-          - '{{ ResourceArns[0] }}'
-
+          - '{{ resource_arns[0] }}'
 ```
 </TabItem>
 </Tabs>
@@ -262,7 +261,7 @@ SET PatchDocument = string('{{ {
     "ResourceArns": resource_arns
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Name>';
+AND Identifier = '{{ name }}';
 ```
 
 
@@ -271,7 +270,7 @@ AND Identifier = '<Name>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.synthetics.groups
-WHERE Identifier = '<Name>'
+WHERE Identifier = '{{ name }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/systemsmanagersap/applications/index.md b/website/docs/services/systemsmanagersap/applications/index.md
index 400692f2d..ced409efc 100644
--- a/website/docs/services/systemsmanagersap/applications/index.md
+++ b/website/docs/services/systemsmanagersap/applications/index.md
@@ -234,7 +234,7 @@ tags,
 database_arn,
 components_info
 FROM awscc.systemsmanagersap.applications
-WHERE region = 'us-east-1' AND Identifier = '<Arn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -271,9 +271,9 @@ INSERT INTO awscc.systemsmanagersap.applications (
  ApplicationType,
  region
 )
-SELECT 
-'{{ ApplicationId }}',
- '{{ ApplicationType }}',
+SELECT
+'{{ application_id }}',
+ '{{ application_type }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -293,16 +293,16 @@ INSERT INTO awscc.systemsmanagersap.applications (
  ComponentsInfo,
  region
 )
-SELECT 
- '{{ ApplicationId }}',
- '{{ ApplicationType }}',
- '{{ Credentials }}',
- '{{ Instances }}',
- '{{ SapInstanceNumber }}',
- '{{ Sid }}',
- '{{ Tags }}',
- '{{ DatabaseArn }}',
- '{{ ComponentsInfo }}',
+SELECT
+ '{{ application_id }}',
+ '{{ application_type }}',
+ '{{ credentials }}',
+ '{{ instances }}',
+ '{{ sap_instance_number }}',
+ '{{ sid }}',
+ '{{ tags }}',
+ '{{ database_arn }}',
+ '{{ components_info }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -320,34 +320,33 @@ globals:
 resources:
   - name: application
     props:
-      - name: ApplicationId
-        value: '{{ ApplicationId }}'
-      - name: ApplicationType
-        value: '{{ ApplicationType }}'
-      - name: Credentials
+      - name: application_id
+        value: '{{ application_id }}'
+      - name: application_type
+        value: '{{ application_type }}'
+      - name: credentials
         value:
-          - DatabaseName: '{{ DatabaseName }}'
-            CredentialType: '{{ CredentialType }}'
-            SecretId: '{{ SecretId }}'
-      - name: Instances
+          - database_name: '{{ database_name }}'
+            credential_type: '{{ credential_type }}'
+            secret_id: '{{ secret_id }}'
+      - name: instances
         value:
-          - '{{ Instances[0] }}'
-      - name: SapInstanceNumber
-        value: '{{ SapInstanceNumber }}'
-      - name: Sid
-        value: '{{ Sid }}'
-      - name: Tags
+          - '{{ instances[0] }}'
+      - name: sap_instance_number
+        value: '{{ sap_instance_number }}'
+      - name: sid
+        value: '{{ sid }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-      - name: DatabaseArn
-        value: '{{ DatabaseArn }}'
-      - name: ComponentsInfo
+          - key: '{{ key }}'
+            value: '{{ value }}'
+      - name: database_arn
+        value: '{{ database_arn }}'
+      - name: components_info
         value:
-          - ComponentType: '{{ ComponentType }}'
-            Ec2InstanceId: '{{ Ec2InstanceId }}'
-            Sid: '{{ Sid }}'
-
+          - component_type: '{{ component_type }}'
+            ec2_instance_id: '{{ ec2_instance_id }}'
+            sid: '{{ sid }}'
 ```
 </TabItem>
 </Tabs>
@@ -365,7 +364,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Arn>';
+AND Identifier = '{{ arn }}';
 ```
 
 
@@ -374,7 +373,7 @@ AND Identifier = '<Arn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.systemsmanagersap.applications
-WHERE Identifier = '<Arn>'
+WHERE Identifier = '{{ arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/timestream/databases/index.md b/website/docs/services/timestream/databases/index.md
index 88e193852..d20979406 100644
--- a/website/docs/services/timestream/databases/index.md
+++ b/website/docs/services/timestream/databases/index.md
@@ -164,7 +164,7 @@ database_name,
 kms_key_id,
 tags
 FROM awscc.timestream.databases
-WHERE region = 'us-east-1' AND Identifier = '<DatabaseName>';
+WHERE region = 'us-east-1' AND Identifier = '{{ database_name }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -202,10 +202,10 @@ INSERT INTO awscc.timestream.databases (
  Tags,
  region
 )
-SELECT 
-'{{ DatabaseName }}',
- '{{ KmsKeyId }}',
- '{{ Tags }}',
+SELECT
+'{{ database_name }}',
+ '{{ kms_key_id }}',
+ '{{ tags }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -219,10 +219,10 @@ INSERT INTO awscc.timestream.databases (
  Tags,
  region
 )
-SELECT 
- '{{ DatabaseName }}',
- '{{ KmsKeyId }}',
- '{{ Tags }}',
+SELECT
+ '{{ database_name }}',
+ '{{ kms_key_id }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -240,15 +240,14 @@ globals:
 resources:
   - name: database
     props:
-      - name: DatabaseName
-        value: '{{ DatabaseName }}'
-      - name: KmsKeyId
-        value: '{{ KmsKeyId }}'
-      - name: Tags
+      - name: database_name
+        value: '{{ database_name }}'
+      - name: kms_key_id
+        value: '{{ kms_key_id }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -265,7 +264,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<DatabaseName>';
+AND Identifier = '{{ database_name }}';
 ```
 
 
@@ -274,7 +273,7 @@ AND Identifier = '<DatabaseName>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.timestream.databases
-WHERE Identifier = '<DatabaseName>'
+WHERE Identifier = '{{ database_name }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/timestream/influxdb_instances/index.md b/website/docs/services/timestream/influxdb_instances/index.md
index 0650378e6..3b1f4b0dd 100644
--- a/website/docs/services/timestream/influxdb_instances/index.md
+++ b/website/docs/services/timestream/influxdb_instances/index.md
@@ -303,7 +303,7 @@ id,
 deployment_type,
 tags
 FROM awscc.timestream.influxdb_instances
-WHERE region = 'us-east-1' AND Identifier = '<Id>';
+WHERE region = 'us-east-1' AND Identifier = '{{ id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -355,24 +355,24 @@ INSERT INTO awscc.timestream.influxdb_instances (
  Tags,
  region
 )
-SELECT 
-'{{ Username }}',
- '{{ Password }}',
- '{{ Organization }}',
- '{{ Bucket }}',
- '{{ DbInstanceType }}',
- '{{ VpcSubnetIds }}',
- '{{ VpcSecurityGroupIds }}',
- '{{ PubliclyAccessible }}',
- '{{ DbStorageType }}',
- '{{ AllocatedStorage }}',
- '{{ DbParameterGroupIdentifier }}',
- '{{ Port }}',
- '{{ NetworkType }}',
- '{{ LogDeliveryConfiguration }}',
- '{{ Name }}',
- '{{ DeploymentType }}',
- '{{ Tags }}',
+SELECT
+'{{ username }}',
+ '{{ password }}',
+ '{{ organization }}',
+ '{{ bucket }}',
+ '{{ db_instance_type }}',
+ '{{ vpc_subnet_ids }}',
+ '{{ vpc_security_group_ids }}',
+ '{{ publicly_accessible }}',
+ '{{ db_storage_type }}',
+ '{{ allocated_storage }}',
+ '{{ db_parameter_group_identifier }}',
+ '{{ port }}',
+ '{{ network_type }}',
+ '{{ log_delivery_configuration }}',
+ '{{ name }}',
+ '{{ deployment_type }}',
+ '{{ tags }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -400,24 +400,24 @@ INSERT INTO awscc.timestream.influxdb_instances (
  Tags,
  region
 )
-SELECT 
- '{{ Username }}',
- '{{ Password }}',
- '{{ Organization }}',
- '{{ Bucket }}',
- '{{ DbInstanceType }}',
- '{{ VpcSubnetIds }}',
- '{{ VpcSecurityGroupIds }}',
- '{{ PubliclyAccessible }}',
- '{{ DbStorageType }}',
- '{{ AllocatedStorage }}',
- '{{ DbParameterGroupIdentifier }}',
- '{{ Port }}',
- '{{ NetworkType }}',
- '{{ LogDeliveryConfiguration }}',
- '{{ Name }}',
- '{{ DeploymentType }}',
- '{{ Tags }}',
+SELECT
+ '{{ username }}',
+ '{{ password }}',
+ '{{ organization }}',
+ '{{ bucket }}',
+ '{{ db_instance_type }}',
+ '{{ vpc_subnet_ids }}',
+ '{{ vpc_security_group_ids }}',
+ '{{ publicly_accessible }}',
+ '{{ db_storage_type }}',
+ '{{ allocated_storage }}',
+ '{{ db_parameter_group_identifier }}',
+ '{{ port }}',
+ '{{ network_type }}',
+ '{{ log_delivery_configuration }}',
+ '{{ name }}',
+ '{{ deployment_type }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -435,48 +435,47 @@ globals:
 resources:
   - name: influxdb_instance
     props:
-      - name: Username
-        value: '{{ Username }}'
-      - name: Password
-        value: '{{ Password }}'
-      - name: Organization
-        value: '{{ Organization }}'
-      - name: Bucket
-        value: '{{ Bucket }}'
-      - name: DbInstanceType
-        value: '{{ DbInstanceType }}'
-      - name: VpcSubnetIds
+      - name: username
+        value: '{{ username }}'
+      - name: password
+        value: '{{ password }}'
+      - name: organization
+        value: '{{ organization }}'
+      - name: bucket
+        value: '{{ bucket }}'
+      - name: db_instance_type
+        value: '{{ db_instance_type }}'
+      - name: vpc_subnet_ids
         value:
-          - '{{ VpcSubnetIds[0] }}'
-      - name: VpcSecurityGroupIds
+          - '{{ vpc_subnet_ids[0] }}'
+      - name: vpc_security_group_ids
         value:
-          - '{{ VpcSecurityGroupIds[0] }}'
-      - name: PubliclyAccessible
-        value: '{{ PubliclyAccessible }}'
-      - name: DbStorageType
-        value: '{{ DbStorageType }}'
-      - name: AllocatedStorage
-        value: '{{ AllocatedStorage }}'
-      - name: DbParameterGroupIdentifier
-        value: '{{ DbParameterGroupIdentifier }}'
-      - name: Port
-        value: '{{ Port }}'
-      - name: NetworkType
-        value: '{{ NetworkType }}'
-      - name: LogDeliveryConfiguration
+          - '{{ vpc_security_group_ids[0] }}'
+      - name: publicly_accessible
+        value: '{{ publicly_accessible }}'
+      - name: db_storage_type
+        value: '{{ db_storage_type }}'
+      - name: allocated_storage
+        value: '{{ allocated_storage }}'
+      - name: db_parameter_group_identifier
+        value: '{{ db_parameter_group_identifier }}'
+      - name: port
+        value: '{{ port }}'
+      - name: network_type
+        value: '{{ network_type }}'
+      - name: log_delivery_configuration
         value:
-          S3Configuration:
-            BucketName: '{{ BucketName }}'
-            Enabled: '{{ Enabled }}'
-      - name: Name
-        value: '{{ Name }}'
-      - name: DeploymentType
-        value: '{{ DeploymentType }}'
-      - name: Tags
+          s3_configuration:
+            bucket_name: '{{ bucket_name }}'
+            enabled: '{{ enabled }}'
+      - name: name
+        value: '{{ name }}'
+      - name: deployment_type
+        value: '{{ deployment_type }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -499,7 +498,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Id>';
+AND Identifier = '{{ id }}';
 ```
 
 
@@ -508,7 +507,7 @@ AND Identifier = '<Id>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.timestream.influxdb_instances
-WHERE Identifier = '<Id>'
+WHERE Identifier = '{{ id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/timestream/scheduled_queries/index.md b/website/docs/services/timestream/scheduled_queries/index.md
index b22b5a2cd..5fc5b0932 100644
--- a/website/docs/services/timestream/scheduled_queries/index.md
+++ b/website/docs/services/timestream/scheduled_queries/index.md
@@ -394,7 +394,7 @@ sq_error_report_configuration,
 sq_kms_key_id,
 tags
 FROM awscc.timestream.scheduled_queries
-WHERE region = 'us-east-1' AND Identifier = '<Arn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -434,12 +434,12 @@ INSERT INTO awscc.timestream.scheduled_queries (
  ErrorReportConfiguration,
  region
 )
-SELECT 
-'{{ QueryString }}',
- '{{ ScheduleConfiguration }}',
- '{{ NotificationConfiguration }}',
- '{{ ScheduledQueryExecutionRoleArn }}',
- '{{ ErrorReportConfiguration }}',
+SELECT
+'{{ query_string }}',
+ '{{ schedule_configuration }}',
+ '{{ notification_configuration }}',
+ '{{ scheduled_query_execution_role_arn }}',
+ '{{ error_report_configuration }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -460,17 +460,17 @@ INSERT INTO awscc.timestream.scheduled_queries (
  Tags,
  region
 )
-SELECT 
- '{{ ScheduledQueryName }}',
- '{{ QueryString }}',
- '{{ ScheduleConfiguration }}',
- '{{ NotificationConfiguration }}',
- '{{ ClientToken }}',
- '{{ ScheduledQueryExecutionRoleArn }}',
- '{{ TargetConfiguration }}',
- '{{ ErrorReportConfiguration }}',
- '{{ KmsKeyId }}',
- '{{ Tags }}',
+SELECT
+ '{{ scheduled_query_name }}',
+ '{{ query_string }}',
+ '{{ schedule_configuration }}',
+ '{{ notification_configuration }}',
+ '{{ client_token }}',
+ '{{ scheduled_query_execution_role_arn }}',
+ '{{ target_configuration }}',
+ '{{ error_report_configuration }}',
+ '{{ kms_key_id }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -488,56 +488,55 @@ globals:
 resources:
   - name: scheduled_query
     props:
-      - name: ScheduledQueryName
-        value: '{{ ScheduledQueryName }}'
-      - name: QueryString
-        value: '{{ QueryString }}'
-      - name: ScheduleConfiguration
+      - name: scheduled_query_name
+        value: '{{ scheduled_query_name }}'
+      - name: query_string
+        value: '{{ query_string }}'
+      - name: schedule_configuration
         value:
-          ScheduleExpression: '{{ ScheduleExpression }}'
-      - name: NotificationConfiguration
+          schedule_expression: '{{ schedule_expression }}'
+      - name: notification_configuration
         value:
-          SnsConfiguration:
-            TopicArn: '{{ TopicArn }}'
-      - name: ClientToken
-        value: '{{ ClientToken }}'
-      - name: ScheduledQueryExecutionRoleArn
-        value: '{{ ScheduledQueryExecutionRoleArn }}'
-      - name: TargetConfiguration
+          sns_configuration:
+            topic_arn: '{{ topic_arn }}'
+      - name: client_token
+        value: '{{ client_token }}'
+      - name: scheduled_query_execution_role_arn
+        value: '{{ scheduled_query_execution_role_arn }}'
+      - name: target_configuration
         value:
-          TimestreamConfiguration:
-            DatabaseName: '{{ DatabaseName }}'
-            TableName: '{{ TableName }}'
-            TimeColumn: '{{ TimeColumn }}'
-            DimensionMappings:
-              - Name: '{{ Name }}'
-                DimensionValueType: '{{ DimensionValueType }}'
-            MultiMeasureMappings:
-              TargetMultiMeasureName: '{{ TargetMultiMeasureName }}'
-              MultiMeasureAttributeMappings:
-                - SourceColumn: '{{ SourceColumn }}'
-                  MeasureValueType: '{{ MeasureValueType }}'
-                  TargetMultiMeasureAttributeName: '{{ TargetMultiMeasureAttributeName }}'
-            MixedMeasureMappings:
-              - MeasureName: '{{ MeasureName }}'
-                SourceColumn: '{{ SourceColumn }}'
-                TargetMeasureName: '{{ TargetMeasureName }}'
-                MeasureValueType: '{{ MeasureValueType }}'
-                MultiMeasureAttributeMappings: null
-            MeasureNameColumn: '{{ MeasureNameColumn }}'
-      - name: ErrorReportConfiguration
+          timestream_configuration:
+            database_name: '{{ database_name }}'
+            table_name: '{{ table_name }}'
+            time_column: '{{ time_column }}'
+            dimension_mappings:
+              - name: '{{ name }}'
+                dimension_value_type: '{{ dimension_value_type }}'
+            multi_measure_mappings:
+              target_multi_measure_name: '{{ target_multi_measure_name }}'
+              multi_measure_attribute_mappings:
+                - source_column: '{{ source_column }}'
+                  measure_value_type: '{{ measure_value_type }}'
+                  target_multi_measure_attribute_name: '{{ target_multi_measure_attribute_name }}'
+            mixed_measure_mappings:
+              - measure_name: '{{ measure_name }}'
+                source_column: '{{ source_column }}'
+                target_measure_name: '{{ target_measure_name }}'
+                measure_value_type: '{{ measure_value_type }}'
+                multi_measure_attribute_mappings: null
+            measure_name_column: '{{ measure_name_column }}'
+      - name: error_report_configuration
         value:
-          S3Configuration:
-            BucketName: '{{ BucketName }}'
-            ObjectKeyPrefix: '{{ ObjectKeyPrefix }}'
-            EncryptionOption: '{{ EncryptionOption }}'
-      - name: KmsKeyId
-        value: '{{ KmsKeyId }}'
-      - name: Tags
+          s3_configuration:
+            bucket_name: '{{ bucket_name }}'
+            object_key_prefix: '{{ object_key_prefix }}'
+            encryption_option: '{{ encryption_option }}'
+      - name: kms_key_id
+        value: '{{ kms_key_id }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -554,7 +553,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Arn>';
+AND Identifier = '{{ arn }}';
 ```
 
 
@@ -563,7 +562,7 @@ AND Identifier = '<Arn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.timestream.scheduled_queries
-WHERE Identifier = '<Arn>'
+WHERE Identifier = '{{ arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/timestream/tables/index.md b/website/docs/services/timestream/tables/index.md
index 96844dff3..0d38a05b6 100644
--- a/website/docs/services/timestream/tables/index.md
+++ b/website/docs/services/timestream/tables/index.md
@@ -275,7 +275,7 @@ schema,
 magnetic_store_write_properties,
 tags
 FROM awscc.timestream.tables
-WHERE region = 'us-east-1' AND Identifier = '<DatabaseName>|<TableName>';
+WHERE region = 'us-east-1' AND Identifier = '{{ database_name }}|{{ table_name }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -312,8 +312,8 @@ INSERT INTO awscc.timestream.tables (
  DatabaseName,
  region
 )
-SELECT 
-'{{ DatabaseName }}',
+SELECT
+'{{ database_name }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -330,13 +330,13 @@ INSERT INTO awscc.timestream.tables (
  Tags,
  region
 )
-SELECT 
- '{{ DatabaseName }}',
- '{{ TableName }}',
- '{{ RetentionProperties }}',
- '{{ Schema }}',
- '{{ MagneticStoreWriteProperties }}',
- '{{ Tags }}',
+SELECT
+ '{{ database_name }}',
+ '{{ table_name }}',
+ '{{ retention_properties }}',
+ '{{ schema }}',
+ '{{ magnetic_store_write_properties }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -354,34 +354,33 @@ globals:
 resources:
   - name: table
     props:
-      - name: DatabaseName
-        value: '{{ DatabaseName }}'
-      - name: TableName
-        value: '{{ TableName }}'
-      - name: RetentionProperties
+      - name: database_name
+        value: '{{ database_name }}'
+      - name: table_name
+        value: '{{ table_name }}'
+      - name: retention_properties
         value:
-          MemoryStoreRetentionPeriodInHours: '{{ MemoryStoreRetentionPeriodInHours }}'
-          MagneticStoreRetentionPeriodInDays: '{{ MagneticStoreRetentionPeriodInDays }}'
-      - name: Schema
+          memory_store_retention_period_in_hours: '{{ memory_store_retention_period_in_hours }}'
+          magnetic_store_retention_period_in_days: '{{ magnetic_store_retention_period_in_days }}'
+      - name: schema
         value:
-          CompositePartitionKey:
-            - Type: '{{ Type }}'
-              Name: '{{ Name }}'
-              EnforcementInRecord: '{{ EnforcementInRecord }}'
-      - name: MagneticStoreWriteProperties
+          composite_partition_key:
+            - type: '{{ type }}'
+              name: '{{ name }}'
+              enforcement_in_record: '{{ enforcement_in_record }}'
+      - name: magnetic_store_write_properties
         value:
-          EnableMagneticStoreWrites: '{{ EnableMagneticStoreWrites }}'
-          MagneticStoreRejectedDataLocation:
-            S3Configuration:
-              BucketName: '{{ BucketName }}'
-              ObjectKeyPrefix: '{{ ObjectKeyPrefix }}'
-              EncryptionOption: '{{ EncryptionOption }}'
-              KmsKeyId: '{{ KmsKeyId }}'
-      - name: Tags
+          enable_magnetic_store_writes: '{{ enable_magnetic_store_writes }}'
+          magnetic_store_rejected_data_location:
+            s3_configuration:
+              bucket_name: '{{ bucket_name }}'
+              object_key_prefix: '{{ object_key_prefix }}'
+              encryption_option: '{{ encryption_option }}'
+              kms_key_id: '{{ kms_key_id }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -400,7 +399,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<DatabaseName>|<TableName>';
+AND Identifier = '{{ database_name }}|{{ table_name }}';
 ```
 
 
@@ -409,7 +408,7 @@ AND Identifier = '<DatabaseName>|<TableName>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.timestream.tables
-WHERE Identifier = '<DatabaseName|TableName>'
+WHERE Identifier = '{{ database_name }}|{{ table_name }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/transfer/agreements/index.md b/website/docs/services/transfer/agreements/index.md
index bb736360f..bcc04554d 100644
--- a/website/docs/services/transfer/agreements/index.md
+++ b/website/docs/services/transfer/agreements/index.md
@@ -250,7 +250,7 @@ preserve_filename,
 enforce_message_signing,
 custom_directories
 FROM awscc.transfer.agreements
-WHERE region = 'us-east-1' AND Identifier = '<AgreementId>|<ServerId>';
+WHERE region = 'us-east-1' AND Identifier = '{{ agreement_id }}|{{ server_id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -290,11 +290,11 @@ INSERT INTO awscc.transfer.agreements (
  AccessRole,
  region
 )
-SELECT 
-'{{ ServerId }}',
- '{{ LocalProfileId }}',
- '{{ PartnerProfileId }}',
- '{{ AccessRole }}',
+SELECT
+'{{ server_id }}',
+ '{{ local_profile_id }}',
+ '{{ partner_profile_id }}',
+ '{{ access_role }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -316,18 +316,18 @@ INSERT INTO awscc.transfer.agreements (
  CustomDirectories,
  region
 )
-SELECT 
- '{{ Description }}',
- '{{ ServerId }}',
- '{{ LocalProfileId }}',
- '{{ PartnerProfileId }}',
- '{{ BaseDirectory }}',
- '{{ AccessRole }}',
- '{{ Status }}',
- '{{ Tags }}',
- '{{ PreserveFilename }}',
- '{{ EnforceMessageSigning }}',
- '{{ CustomDirectories }}',
+SELECT
+ '{{ description }}',
+ '{{ server_id }}',
+ '{{ local_profile_id }}',
+ '{{ partner_profile_id }}',
+ '{{ base_directory }}',
+ '{{ access_role }}',
+ '{{ status }}',
+ '{{ tags }}',
+ '{{ preserve_filename }}',
+ '{{ enforce_message_signing }}',
+ '{{ custom_directories }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -345,36 +345,35 @@ globals:
 resources:
   - name: agreement
     props:
-      - name: Description
-        value: '{{ Description }}'
-      - name: ServerId
-        value: '{{ ServerId }}'
-      - name: LocalProfileId
-        value: '{{ LocalProfileId }}'
-      - name: PartnerProfileId
-        value: '{{ PartnerProfileId }}'
-      - name: BaseDirectory
-        value: '{{ BaseDirectory }}'
-      - name: AccessRole
-        value: '{{ AccessRole }}'
-      - name: Status
-        value: '{{ Status }}'
-      - name: Tags
+      - name: description
+        value: '{{ description }}'
+      - name: server_id
+        value: '{{ server_id }}'
+      - name: local_profile_id
+        value: '{{ local_profile_id }}'
+      - name: partner_profile_id
+        value: '{{ partner_profile_id }}'
+      - name: base_directory
+        value: '{{ base_directory }}'
+      - name: access_role
+        value: '{{ access_role }}'
+      - name: status
+        value: '{{ status }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-      - name: PreserveFilename
-        value: '{{ PreserveFilename }}'
-      - name: EnforceMessageSigning
-        value: '{{ EnforceMessageSigning }}'
-      - name: CustomDirectories
+          - key: '{{ key }}'
+            value: '{{ value }}'
+      - name: preserve_filename
+        value: '{{ preserve_filename }}'
+      - name: enforce_message_signing
+        value: '{{ enforce_message_signing }}'
+      - name: custom_directories
         value:
-          FailedFilesDirectory: '{{ FailedFilesDirectory }}'
-          MdnFilesDirectory: '{{ MdnFilesDirectory }}'
-          PayloadFilesDirectory: '{{ PayloadFilesDirectory }}'
-          StatusFilesDirectory: '{{ StatusFilesDirectory }}'
-          TemporaryFilesDirectory: '{{ TemporaryFilesDirectory }}'
-
+          failed_files_directory: '{{ failed_files_directory }}'
+          mdn_files_directory: '{{ mdn_files_directory }}'
+          payload_files_directory: '{{ payload_files_directory }}'
+          status_files_directory: '{{ status_files_directory }}'
+          temporary_files_directory: '{{ temporary_files_directory }}'
 ```
 </TabItem>
 </Tabs>
@@ -399,7 +398,7 @@ SET PatchDocument = string('{{ {
     "CustomDirectories": custom_directories
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<AgreementId>|<ServerId>';
+AND Identifier = '{{ agreement_id }}|{{ server_id }}';
 ```
 
 
@@ -408,7 +407,7 @@ AND Identifier = '<AgreementId>|<ServerId>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.transfer.agreements
-WHERE Identifier = '<AgreementId|ServerId>'
+WHERE Identifier = '{{ agreement_id }}|{{ server_id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/transfer/certificates/index.md b/website/docs/services/transfer/certificates/index.md
index 2a8daceae..04b05d0f1 100644
--- a/website/docs/services/transfer/certificates/index.md
+++ b/website/docs/services/transfer/certificates/index.md
@@ -235,7 +235,7 @@ serial,
 not_before_date,
 not_after_date
 FROM awscc.transfer.certificates
-WHERE region = 'us-east-1' AND Identifier = '<CertificateId>';
+WHERE region = 'us-east-1' AND Identifier = '{{ certificate_id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -272,9 +272,9 @@ INSERT INTO awscc.transfer.certificates (
  Certificate,
  region
 )
-SELECT 
-'{{ Usage }}',
- '{{ Certificate }}',
+SELECT
+'{{ usage }}',
+ '{{ certificate }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -293,15 +293,15 @@ INSERT INTO awscc.transfer.certificates (
  Tags,
  region
 )
-SELECT 
- '{{ Usage }}',
- '{{ Certificate }}',
- '{{ CertificateChain }}',
- '{{ PrivateKey }}',
- '{{ ActiveDate }}',
- '{{ InactiveDate }}',
- '{{ Description }}',
- '{{ Tags }}',
+SELECT
+ '{{ usage }}',
+ '{{ certificate }}',
+ '{{ certificate_chain }}',
+ '{{ private_key }}',
+ '{{ active_date }}',
+ '{{ inactive_date }}',
+ '{{ description }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -319,25 +319,24 @@ globals:
 resources:
   - name: certificate
     props:
-      - name: Usage
-        value: '{{ Usage }}'
-      - name: Certificate
-        value: '{{ Certificate }}'
-      - name: CertificateChain
-        value: '{{ CertificateChain }}'
-      - name: PrivateKey
-        value: '{{ PrivateKey }}'
-      - name: ActiveDate
-        value: '{{ ActiveDate }}'
-      - name: InactiveDate
-        value: '{{ InactiveDate }}'
-      - name: Description
-        value: '{{ Description }}'
-      - name: Tags
+      - name: usage
+        value: '{{ usage }}'
+      - name: certificate
+        value: '{{ certificate }}'
+      - name: certificate_chain
+        value: '{{ certificate_chain }}'
+      - name: private_key
+        value: '{{ private_key }}'
+      - name: active_date
+        value: '{{ active_date }}'
+      - name: inactive_date
+        value: '{{ inactive_date }}'
+      - name: description
+        value: '{{ description }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -357,7 +356,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<CertificateId>';
+AND Identifier = '{{ certificate_id }}';
 ```
 
 
@@ -366,7 +365,7 @@ AND Identifier = '<CertificateId>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.transfer.certificates
-WHERE Identifier = '<CertificateId>'
+WHERE Identifier = '{{ certificate_id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/transfer/connectors/index.md b/website/docs/services/transfer/connectors/index.md
index 02c286f07..7fe97434d 100644
--- a/website/docs/services/transfer/connectors/index.md
+++ b/website/docs/services/transfer/connectors/index.md
@@ -269,7 +269,7 @@ tags,
 url,
 security_policy_name
 FROM awscc.transfer.connectors
-WHERE region = 'us-east-1' AND Identifier = '<ConnectorId>';
+WHERE region = 'us-east-1' AND Identifier = '{{ connector_id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -306,9 +306,9 @@ INSERT INTO awscc.transfer.connectors (
  Url,
  region
 )
-SELECT 
-'{{ AccessRole }}',
- '{{ Url }}',
+SELECT
+'{{ access_role }}',
+ '{{ url }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -326,14 +326,14 @@ INSERT INTO awscc.transfer.connectors (
  SecurityPolicyName,
  region
 )
-SELECT 
- '{{ AccessRole }}',
- '{{ As2Config }}',
- '{{ SftpConfig }}',
- '{{ LoggingRole }}',
- '{{ Tags }}',
- '{{ Url }}',
- '{{ SecurityPolicyName }}',
+SELECT
+ '{{ access_role }}',
+ '{{ as2_config }}',
+ '{{ sftp_config }}',
+ '{{ logging_role }}',
+ '{{ tags }}',
+ '{{ url }}',
+ '{{ security_policy_name }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -351,37 +351,36 @@ globals:
 resources:
   - name: connector
     props:
-      - name: AccessRole
-        value: '{{ AccessRole }}'
-      - name: As2Config
+      - name: access_role
+        value: '{{ access_role }}'
+      - name: as2_config
         value:
-          LocalProfileId: '{{ LocalProfileId }}'
-          PartnerProfileId: '{{ PartnerProfileId }}'
-          MessageSubject: '{{ MessageSubject }}'
-          Compression: '{{ Compression }}'
-          EncryptionAlgorithm: '{{ EncryptionAlgorithm }}'
-          SigningAlgorithm: '{{ SigningAlgorithm }}'
-          MdnSigningAlgorithm: '{{ MdnSigningAlgorithm }}'
-          MdnResponse: '{{ MdnResponse }}'
-          BasicAuthSecretId: '{{ BasicAuthSecretId }}'
-          PreserveContentType: '{{ PreserveContentType }}'
-      - name: SftpConfig
+          local_profile_id: '{{ local_profile_id }}'
+          partner_profile_id: '{{ partner_profile_id }}'
+          message_subject: '{{ message_subject }}'
+          compression: '{{ compression }}'
+          encryption_algorithm: '{{ encryption_algorithm }}'
+          signing_algorithm: '{{ signing_algorithm }}'
+          mdn_signing_algorithm: '{{ mdn_signing_algorithm }}'
+          mdn_response: '{{ mdn_response }}'
+          basic_auth_secret_id: '{{ basic_auth_secret_id }}'
+          preserve_content_type: '{{ preserve_content_type }}'
+      - name: sftp_config
         value:
-          UserSecretId: '{{ UserSecretId }}'
-          TrustedHostKeys:
-            - '{{ TrustedHostKeys[0] }}'
-          MaxConcurrentConnections: '{{ MaxConcurrentConnections }}'
-      - name: LoggingRole
-        value: '{{ LoggingRole }}'
-      - name: Tags
+          user_secret_id: '{{ user_secret_id }}'
+          trusted_host_keys:
+            - '{{ trusted_host_keys[0] }}'
+          max_concurrent_connections: '{{ max_concurrent_connections }}'
+      - name: logging_role
+        value: '{{ logging_role }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-      - name: Url
-        value: '{{ Url }}'
-      - name: SecurityPolicyName
-        value: '{{ SecurityPolicyName }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
+      - name: url
+        value: '{{ url }}'
+      - name: security_policy_name
+        value: '{{ security_policy_name }}'
 ```
 </TabItem>
 </Tabs>
@@ -403,7 +402,7 @@ SET PatchDocument = string('{{ {
     "SecurityPolicyName": security_policy_name
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<ConnectorId>';
+AND Identifier = '{{ connector_id }}';
 ```
 
 
@@ -412,7 +411,7 @@ AND Identifier = '<ConnectorId>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.transfer.connectors
-WHERE Identifier = '<ConnectorId>'
+WHERE Identifier = '{{ connector_id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/transfer/profiles/index.md b/website/docs/services/transfer/profiles/index.md
index 8160a7b3c..d79a70d0c 100644
--- a/website/docs/services/transfer/profiles/index.md
+++ b/website/docs/services/transfer/profiles/index.md
@@ -176,7 +176,7 @@ certificate_ids,
 arn,
 profile_id
 FROM awscc.transfer.profiles
-WHERE region = 'us-east-1' AND Identifier = '<ProfileId>';
+WHERE region = 'us-east-1' AND Identifier = '{{ profile_id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -213,9 +213,9 @@ INSERT INTO awscc.transfer.profiles (
  ProfileType,
  region
 )
-SELECT 
-'{{ As2Id }}',
- '{{ ProfileType }}',
+SELECT
+'{{ as2_id }}',
+ '{{ profile_type }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -230,11 +230,11 @@ INSERT INTO awscc.transfer.profiles (
  CertificateIds,
  region
 )
-SELECT 
- '{{ As2Id }}',
- '{{ ProfileType }}',
- '{{ Tags }}',
- '{{ CertificateIds }}',
+SELECT
+ '{{ as2_id }}',
+ '{{ profile_type }}',
+ '{{ tags }}',
+ '{{ certificate_ids }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -252,18 +252,17 @@ globals:
 resources:
   - name: profile
     props:
-      - name: As2Id
-        value: '{{ As2Id }}'
-      - name: ProfileType
-        value: '{{ ProfileType }}'
-      - name: Tags
+      - name: as2_id
+        value: '{{ as2_id }}'
+      - name: profile_type
+        value: '{{ profile_type }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-      - name: CertificateIds
+          - key: '{{ key }}'
+            value: '{{ value }}'
+      - name: certificate_ids
         value:
-          - '{{ CertificateIds[0] }}'
-
+          - '{{ certificate_ids[0] }}'
 ```
 </TabItem>
 </Tabs>
@@ -281,7 +280,7 @@ SET PatchDocument = string('{{ {
     "CertificateIds": certificate_ids
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<ProfileId>';
+AND Identifier = '{{ profile_id }}';
 ```
 
 
@@ -290,7 +289,7 @@ AND Identifier = '<ProfileId>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.transfer.profiles
-WHERE Identifier = '<ProfileId>'
+WHERE Identifier = '{{ profile_id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/transfer/servers/index.md b/website/docs/services/transfer/servers/index.md
index 7d1a36496..1bc3e99c1 100644
--- a/website/docs/services/transfer/servers/index.md
+++ b/website/docs/services/transfer/servers/index.md
@@ -363,7 +363,7 @@ structured_log_destinations,
 tags,
 workflow_details
 FROM awscc.transfer.servers
-WHERE region = 'us-east-1' AND Identifier = '<Arn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -415,24 +415,24 @@ INSERT INTO awscc.transfer.servers (
  WorkflowDetails,
  region
 )
-SELECT 
-'{{ Certificate }}',
- '{{ Domain }}',
- '{{ EndpointDetails }}',
- '{{ EndpointType }}',
- '{{ IdentityProviderDetails }}',
- '{{ IdentityProviderType }}',
- '{{ IpAddressType }}',
- '{{ LoggingRole }}',
- '{{ PostAuthenticationLoginBanner }}',
- '{{ PreAuthenticationLoginBanner }}',
- '{{ ProtocolDetails }}',
- '{{ Protocols }}',
- '{{ S3StorageOptions }}',
- '{{ SecurityPolicyName }}',
- '{{ StructuredLogDestinations }}',
- '{{ Tags }}',
- '{{ WorkflowDetails }}',
+SELECT
+'{{ certificate }}',
+ '{{ domain }}',
+ '{{ endpoint_details }}',
+ '{{ endpoint_type }}',
+ '{{ identity_provider_details }}',
+ '{{ identity_provider_type }}',
+ '{{ ip_address_type }}',
+ '{{ logging_role }}',
+ '{{ post_authentication_login_banner }}',
+ '{{ pre_authentication_login_banner }}',
+ '{{ protocol_details }}',
+ '{{ protocols }}',
+ '{{ s3_storage_options }}',
+ '{{ security_policy_name }}',
+ '{{ structured_log_destinations }}',
+ '{{ tags }}',
+ '{{ workflow_details }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -460,24 +460,24 @@ INSERT INTO awscc.transfer.servers (
  WorkflowDetails,
  region
 )
-SELECT 
- '{{ Certificate }}',
- '{{ Domain }}',
- '{{ EndpointDetails }}',
- '{{ EndpointType }}',
- '{{ IdentityProviderDetails }}',
- '{{ IdentityProviderType }}',
- '{{ IpAddressType }}',
- '{{ LoggingRole }}',
- '{{ PostAuthenticationLoginBanner }}',
- '{{ PreAuthenticationLoginBanner }}',
- '{{ ProtocolDetails }}',
- '{{ Protocols }}',
- '{{ S3StorageOptions }}',
- '{{ SecurityPolicyName }}',
- '{{ StructuredLogDestinations }}',
- '{{ Tags }}',
- '{{ WorkflowDetails }}',
+SELECT
+ '{{ certificate }}',
+ '{{ domain }}',
+ '{{ endpoint_details }}',
+ '{{ endpoint_type }}',
+ '{{ identity_provider_details }}',
+ '{{ identity_provider_type }}',
+ '{{ ip_address_type }}',
+ '{{ logging_role }}',
+ '{{ post_authentication_login_banner }}',
+ '{{ pre_authentication_login_banner }}',
+ '{{ protocol_details }}',
+ '{{ protocols }}',
+ '{{ s3_storage_options }}',
+ '{{ security_policy_name }}',
+ '{{ structured_log_destinations }}',
+ '{{ tags }}',
+ '{{ workflow_details }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -495,67 +495,66 @@ globals:
 resources:
   - name: server
     props:
-      - name: Certificate
-        value: '{{ Certificate }}'
-      - name: Domain
-        value: '{{ Domain }}'
-      - name: EndpointDetails
+      - name: certificate
+        value: '{{ certificate }}'
+      - name: domain
+        value: '{{ domain }}'
+      - name: endpoint_details
         value:
-          AddressAllocationIds:
-            - '{{ AddressAllocationIds[0] }}'
-          SubnetIds:
-            - '{{ SubnetIds[0] }}'
-          VpcEndpointId: '{{ VpcEndpointId }}'
-          VpcId: '{{ VpcId }}'
-          SecurityGroupIds:
-            - '{{ SecurityGroupIds[0] }}'
-      - name: EndpointType
-        value: '{{ EndpointType }}'
-      - name: IdentityProviderDetails
+          address_allocation_ids:
+            - '{{ address_allocation_ids[0] }}'
+          subnet_ids:
+            - '{{ subnet_ids[0] }}'
+          vpc_endpoint_id: '{{ vpc_endpoint_id }}'
+          vpc_id: '{{ vpc_id }}'
+          security_group_ids:
+            - '{{ security_group_ids[0] }}'
+      - name: endpoint_type
+        value: '{{ endpoint_type }}'
+      - name: identity_provider_details
         value:
-          ApplicationArn: '{{ ApplicationArn }}'
-          InstanceArn: '{{ InstanceArn }}'
-          Role: '{{ Role }}'
-      - name: IdentityProviderType
-        value: '{{ IdentityProviderType }}'
-      - name: IpAddressType
-        value: '{{ IpAddressType }}'
-      - name: LoggingRole
-        value: '{{ LoggingRole }}'
-      - name: PostAuthenticationLoginBanner
-        value: '{{ PostAuthenticationLoginBanner }}'
-      - name: PreAuthenticationLoginBanner
-        value: '{{ PreAuthenticationLoginBanner }}'
-      - name: ProtocolDetails
+          application_arn: '{{ application_arn }}'
+          instance_arn: '{{ instance_arn }}'
+          role: '{{ role }}'
+      - name: identity_provider_type
+        value: '{{ identity_provider_type }}'
+      - name: ip_address_type
+        value: '{{ ip_address_type }}'
+      - name: logging_role
+        value: '{{ logging_role }}'
+      - name: post_authentication_login_banner
+        value: '{{ post_authentication_login_banner }}'
+      - name: pre_authentication_login_banner
+        value: '{{ pre_authentication_login_banner }}'
+      - name: protocol_details
         value:
-          PassiveIp: '{{ PassiveIp }}'
-          TlsSessionResumptionMode: '{{ TlsSessionResumptionMode }}'
-          SetStatOption: '{{ SetStatOption }}'
-          As2Transports:
-            - '{{ As2Transports[0] }}'
-      - name: Protocols
+          passive_ip: '{{ passive_ip }}'
+          tls_session_resumption_mode: '{{ tls_session_resumption_mode }}'
+          set_stat_option: '{{ set_stat_option }}'
+          as2_transports:
+            - '{{ as2_transports[0] }}'
+      - name: protocols
         value:
-          - '{{ Protocols[0] }}'
-      - name: S3StorageOptions
+          - '{{ protocols[0] }}'
+      - name: s3_storage_options
         value:
-          DirectoryListingOptimization: '{{ DirectoryListingOptimization }}'
-      - name: SecurityPolicyName
-        value: '{{ SecurityPolicyName }}'
-      - name: StructuredLogDestinations
+          directory_listing_optimization: '{{ directory_listing_optimization }}'
+      - name: security_policy_name
+        value: '{{ security_policy_name }}'
+      - name: structured_log_destinations
         value:
-          - '{{ StructuredLogDestinations[0] }}'
-      - name: Tags
+          - '{{ structured_log_destinations[0] }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-      - name: WorkflowDetails
+          - key: '{{ key }}'
+            value: '{{ value }}'
+      - name: workflow_details
         value:
-          OnUpload:
-            - WorkflowId: '{{ WorkflowId }}'
-              ExecutionRole: '{{ ExecutionRole }}'
-          OnPartialUpload:
+          on_upload:
+            - workflow_id: '{{ workflow_id }}'
+              execution_role: '{{ execution_role }}'
+          on_partial_upload:
             - null
-
 ```
 </TabItem>
 </Tabs>
@@ -585,7 +584,7 @@ SET PatchDocument = string('{{ {
     "WorkflowDetails": workflow_details
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Arn>';
+AND Identifier = '{{ arn }}';
 ```
 
 
@@ -594,7 +593,7 @@ AND Identifier = '<Arn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.transfer.servers
-WHERE Identifier = '<Arn>'
+WHERE Identifier = '{{ arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/transfer/users/index.md b/website/docs/services/transfer/users/index.md
index 310715400..fc56ae55b 100644
--- a/website/docs/services/transfer/users/index.md
+++ b/website/docs/services/transfer/users/index.md
@@ -240,7 +240,7 @@ ssh_public_keys,
 tags,
 user_name
 FROM awscc.transfer.users
-WHERE region = 'us-east-1' AND Identifier = '<Arn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -278,10 +278,10 @@ INSERT INTO awscc.transfer.users (
  UserName,
  region
 )
-SELECT 
-'{{ Role }}',
- '{{ ServerId }}',
- '{{ UserName }}',
+SELECT
+'{{ role }}',
+ '{{ server_id }}',
+ '{{ user_name }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -302,17 +302,17 @@ INSERT INTO awscc.transfer.users (
  UserName,
  region
 )
-SELECT 
- '{{ HomeDirectory }}',
- '{{ HomeDirectoryMappings }}',
- '{{ HomeDirectoryType }}',
- '{{ Policy }}',
- '{{ PosixProfile }}',
- '{{ Role }}',
- '{{ ServerId }}',
- '{{ SshPublicKeys }}',
- '{{ Tags }}',
- '{{ UserName }}',
+SELECT
+ '{{ home_directory }}',
+ '{{ home_directory_mappings }}',
+ '{{ home_directory_type }}',
+ '{{ policy }}',
+ '{{ posix_profile }}',
+ '{{ role }}',
+ '{{ server_id }}',
+ '{{ ssh_public_keys }}',
+ '{{ tags }}',
+ '{{ user_name }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -330,37 +330,36 @@ globals:
 resources:
   - name: user
     props:
-      - name: HomeDirectory
-        value: '{{ HomeDirectory }}'
-      - name: HomeDirectoryMappings
+      - name: home_directory
+        value: '{{ home_directory }}'
+      - name: home_directory_mappings
         value:
-          - Entry: '{{ Entry }}'
-            Target: '{{ Target }}'
-            Type: '{{ Type }}'
-      - name: HomeDirectoryType
-        value: '{{ HomeDirectoryType }}'
-      - name: Policy
-        value: '{{ Policy }}'
-      - name: PosixProfile
+          - entry: '{{ entry }}'
+            target: '{{ target }}'
+            type: '{{ type }}'
+      - name: home_directory_type
+        value: '{{ home_directory_type }}'
+      - name: policy
+        value: '{{ policy }}'
+      - name: posix_profile
         value:
-          Uid: null
-          Gid: null
-          SecondaryGids:
+          uid: null
+          gid: null
+          secondary_gids:
             - null
-      - name: Role
-        value: '{{ Role }}'
-      - name: ServerId
-        value: '{{ ServerId }}'
-      - name: SshPublicKeys
+      - name: role
+        value: '{{ role }}'
+      - name: server_id
+        value: '{{ server_id }}'
+      - name: ssh_public_keys
         value:
-          - '{{ SshPublicKeys[0] }}'
-      - name: Tags
+          - '{{ ssh_public_keys[0] }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-      - name: UserName
-        value: '{{ UserName }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
+      - name: user_name
+        value: '{{ user_name }}'
 ```
 </TabItem>
 </Tabs>
@@ -383,7 +382,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Arn>';
+AND Identifier = '{{ arn }}';
 ```
 
 
@@ -392,7 +391,7 @@ AND Identifier = '<Arn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.transfer.users
-WHERE Identifier = '<Arn>'
+WHERE Identifier = '{{ arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/transfer/web_apps/index.md b/website/docs/services/transfer/web_apps/index.md
index 64e1287fb..163a2eaed 100644
--- a/website/docs/services/transfer/web_apps/index.md
+++ b/website/docs/services/transfer/web_apps/index.md
@@ -222,7 +222,7 @@ web_app_customization,
 web_app_endpoint_policy,
 tags
 FROM awscc.transfer.web_apps
-WHERE region = 'us-east-1' AND Identifier = '<Arn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -258,8 +258,8 @@ INSERT INTO awscc.transfer.web_apps (
  IdentityProviderDetails,
  region
 )
-SELECT 
-'{{ IdentityProviderDetails }}',
+SELECT
+'{{ identity_provider_details }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -276,13 +276,13 @@ INSERT INTO awscc.transfer.web_apps (
  Tags,
  region
 )
-SELECT 
- '{{ IdentityProviderDetails }}',
- '{{ AccessEndpoint }}',
- '{{ WebAppUnits }}',
- '{{ WebAppCustomization }}',
- '{{ WebAppEndpointPolicy }}',
- '{{ Tags }}',
+SELECT
+ '{{ identity_provider_details }}',
+ '{{ access_endpoint }}',
+ '{{ web_app_units }}',
+ '{{ web_app_customization }}',
+ '{{ web_app_endpoint_policy }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -300,27 +300,26 @@ globals:
 resources:
   - name: web_app
     props:
-      - name: IdentityProviderDetails
+      - name: identity_provider_details
         value:
-          ApplicationArn: '{{ ApplicationArn }}'
-          InstanceArn: '{{ InstanceArn }}'
-          Role: '{{ Role }}'
-      - name: AccessEndpoint
-        value: '{{ AccessEndpoint }}'
-      - name: WebAppUnits
+          application_arn: '{{ application_arn }}'
+          instance_arn: '{{ instance_arn }}'
+          role: '{{ role }}'
+      - name: access_endpoint
+        value: '{{ access_endpoint }}'
+      - name: web_app_units
         value: null
-      - name: WebAppCustomization
+      - name: web_app_customization
         value:
-          Title: '{{ Title }}'
-          LogoFile: '{{ LogoFile }}'
-          FaviconFile: '{{ FaviconFile }}'
-      - name: WebAppEndpointPolicy
-        value: '{{ WebAppEndpointPolicy }}'
-      - name: Tags
+          title: '{{ title }}'
+          logo_file: '{{ logo_file }}'
+          favicon_file: '{{ favicon_file }}'
+      - name: web_app_endpoint_policy
+        value: '{{ web_app_endpoint_policy }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -339,7 +338,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Arn>';
+AND Identifier = '{{ arn }}';
 ```
 
 
@@ -348,7 +347,7 @@ AND Identifier = '<Arn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.transfer.web_apps
-WHERE Identifier = '<Arn>'
+WHERE Identifier = '{{ arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/transfer/workflows/index.md b/website/docs/services/transfer/workflows/index.md
index 443313cce..54c8f9fb4 100644
--- a/website/docs/services/transfer/workflows/index.md
+++ b/website/docs/services/transfer/workflows/index.md
@@ -339,7 +339,7 @@ description,
 workflow_id,
 arn
 FROM awscc.transfer.workflows
-WHERE region = 'us-east-1' AND Identifier = '<WorkflowId>';
+WHERE region = 'us-east-1' AND Identifier = '{{ workflow_id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -375,8 +375,8 @@ INSERT INTO awscc.transfer.workflows (
  Steps,
  region
 )
-SELECT 
-'{{ Steps }}',
+SELECT
+'{{ steps }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -391,11 +391,11 @@ INSERT INTO awscc.transfer.workflows (
  Description,
  region
 )
-SELECT 
- '{{ OnExceptionSteps }}',
- '{{ Steps }}',
- '{{ Tags }}',
- '{{ Description }}',
+SELECT
+ '{{ on_exception_steps }}',
+ '{{ steps }}',
+ '{{ tags }}',
+ '{{ description }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -413,51 +413,50 @@ globals:
 resources:
   - name: workflow
     props:
-      - name: OnExceptionSteps
+      - name: on_exception_steps
         value:
-          - CopyStepDetails:
-              DestinationFileLocation:
-                S3FileLocation:
-                  Bucket: '{{ Bucket }}'
-                  Key: '{{ Key }}'
-              Name: '{{ Name }}'
-              OverwriteExisting: '{{ OverwriteExisting }}'
-              SourceFileLocation: '{{ SourceFileLocation }}'
-            CustomStepDetails:
-              Name: '{{ Name }}'
-              Target: '{{ Target }}'
-              TimeoutSeconds: '{{ TimeoutSeconds }}'
-              SourceFileLocation: '{{ SourceFileLocation }}'
-            DecryptStepDetails:
-              DestinationFileLocation:
-                S3FileLocation: null
-                EfsFileLocation:
-                  FileSystemId: '{{ FileSystemId }}'
-                  Path: '{{ Path }}'
-              Name: '{{ Name }}'
-              Type: '{{ Type }}'
-              OverwriteExisting: '{{ OverwriteExisting }}'
-              SourceFileLocation: '{{ SourceFileLocation }}'
-            DeleteStepDetails:
-              Name: '{{ Name }}'
-              SourceFileLocation: '{{ SourceFileLocation }}'
-            TagStepDetails:
-              Name: '{{ Name }}'
-              Tags:
-                - Key: '{{ Key }}'
-                  Value: '{{ Value }}'
-              SourceFileLocation: '{{ SourceFileLocation }}'
-            Type: '{{ Type }}'
-      - name: Steps
+          - copy_step_details:
+              destination_file_location:
+                s3_file_location:
+                  bucket: '{{ bucket }}'
+                  key: '{{ key }}'
+              name: '{{ name }}'
+              overwrite_existing: '{{ overwrite_existing }}'
+              source_file_location: '{{ source_file_location }}'
+            custom_step_details:
+              name: '{{ name }}'
+              target: '{{ target }}'
+              timeout_seconds: '{{ timeout_seconds }}'
+              source_file_location: '{{ source_file_location }}'
+            decrypt_step_details:
+              destination_file_location:
+                s3_file_location: null
+                efs_file_location:
+                  file_system_id: '{{ file_system_id }}'
+                  path: '{{ path }}'
+              name: '{{ name }}'
+              type: '{{ type }}'
+              overwrite_existing: '{{ overwrite_existing }}'
+              source_file_location: '{{ source_file_location }}'
+            delete_step_details:
+              name: '{{ name }}'
+              source_file_location: '{{ source_file_location }}'
+            tag_step_details:
+              name: '{{ name }}'
+              tags:
+                - key: '{{ key }}'
+                  value: '{{ value }}'
+              source_file_location: '{{ source_file_location }}'
+            type: '{{ type }}'
+      - name: steps
         value:
           - null
-      - name: Tags
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-      - name: Description
-        value: '{{ Description }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
+      - name: description
+        value: '{{ description }}'
 ```
 </TabItem>
 </Tabs>
@@ -473,7 +472,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<WorkflowId>';
+AND Identifier = '{{ workflow_id }}';
 ```
 
 
@@ -482,7 +481,7 @@ AND Identifier = '<WorkflowId>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.transfer.workflows
-WHERE Identifier = '<WorkflowId>'
+WHERE Identifier = '{{ workflow_id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/verifiedpermissions/identity_sources/index.md b/website/docs/services/verifiedpermissions/identity_sources/index.md
index ce05baeec..406583867 100644
--- a/website/docs/services/verifiedpermissions/identity_sources/index.md
+++ b/website/docs/services/verifiedpermissions/identity_sources/index.md
@@ -185,7 +185,7 @@ identity_source_id,
 policy_store_id,
 principal_entity_type
 FROM awscc.verifiedpermissions.identity_sources
-WHERE region = 'us-east-1' AND Identifier = '<IdentitySourceId>|<PolicyStoreId>';
+WHERE region = 'us-east-1' AND Identifier = '{{ identity_source_id }}|{{ policy_store_id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -223,9 +223,9 @@ INSERT INTO awscc.verifiedpermissions.identity_sources (
  PolicyStoreId,
  region
 )
-SELECT 
-'{{ Configuration }}',
- '{{ PolicyStoreId }}',
+SELECT
+'{{ configuration }}',
+ '{{ policy_store_id }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -239,10 +239,10 @@ INSERT INTO awscc.verifiedpermissions.identity_sources (
  PrincipalEntityType,
  region
 )
-SELECT 
- '{{ Configuration }}',
- '{{ PolicyStoreId }}',
- '{{ PrincipalEntityType }}',
+SELECT
+ '{{ configuration }}',
+ '{{ policy_store_id }}',
+ '{{ principal_entity_type }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -260,13 +260,12 @@ globals:
 resources:
   - name: identity_source
     props:
-      - name: Configuration
+      - name: configuration
         value: null
-      - name: PolicyStoreId
-        value: '{{ PolicyStoreId }}'
-      - name: PrincipalEntityType
-        value: '{{ PrincipalEntityType }}'
-
+      - name: policy_store_id
+        value: '{{ policy_store_id }}'
+      - name: principal_entity_type
+        value: '{{ principal_entity_type }}'
 ```
 </TabItem>
 </Tabs>
@@ -283,7 +282,7 @@ SET PatchDocument = string('{{ {
     "PrincipalEntityType": principal_entity_type
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<IdentitySourceId>|<PolicyStoreId>';
+AND Identifier = '{{ identity_source_id }}|{{ policy_store_id }}';
 ```
 
 
@@ -292,7 +291,7 @@ AND Identifier = '<IdentitySourceId>|<PolicyStoreId>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.verifiedpermissions.identity_sources
-WHERE Identifier = '<IdentitySourceId|PolicyStoreId>'
+WHERE Identifier = '{{ identity_source_id }}|{{ policy_store_id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/verifiedpermissions/policies/index.md b/website/docs/services/verifiedpermissions/policies/index.md
index 001fdce69..6ee13bb2b 100644
--- a/website/docs/services/verifiedpermissions/policies/index.md
+++ b/website/docs/services/verifiedpermissions/policies/index.md
@@ -157,7 +157,7 @@ policy_id,
 policy_store_id,
 policy_type
 FROM awscc.verifiedpermissions.policies
-WHERE region = 'us-east-1' AND Identifier = '<PolicyId>|<PolicyStoreId>';
+WHERE region = 'us-east-1' AND Identifier = '{{ policy_id }}|{{ policy_store_id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -195,9 +195,9 @@ INSERT INTO awscc.verifiedpermissions.policies (
  PolicyStoreId,
  region
 )
-SELECT 
-'{{ Definition }}',
- '{{ PolicyStoreId }}',
+SELECT
+'{{ definition }}',
+ '{{ policy_store_id }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -210,9 +210,9 @@ INSERT INTO awscc.verifiedpermissions.policies (
  PolicyStoreId,
  region
 )
-SELECT 
- '{{ Definition }}',
- '{{ PolicyStoreId }}',
+SELECT
+ '{{ definition }}',
+ '{{ policy_store_id }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -230,11 +230,10 @@ globals:
 resources:
   - name: policy
     props:
-      - name: Definition
+      - name: definition
         value: null
-      - name: PolicyStoreId
-        value: '{{ PolicyStoreId }}'
-
+      - name: policy_store_id
+        value: '{{ policy_store_id }}'
 ```
 </TabItem>
 </Tabs>
@@ -250,7 +249,7 @@ SET PatchDocument = string('{{ {
     "Definition": definition
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<PolicyId>|<PolicyStoreId>';
+AND Identifier = '{{ policy_id }}|{{ policy_store_id }}';
 ```
 
 
@@ -259,7 +258,7 @@ AND Identifier = '<PolicyId>|<PolicyStoreId>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.verifiedpermissions.policies
-WHERE Identifier = '<PolicyId|PolicyStoreId>'
+WHERE Identifier = '{{ policy_id }}|{{ policy_store_id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/verifiedpermissions/policy_stores/index.md b/website/docs/services/verifiedpermissions/policy_stores/index.md
index 17e941e6e..6df1296a1 100644
--- a/website/docs/services/verifiedpermissions/policy_stores/index.md
+++ b/website/docs/services/verifiedpermissions/policy_stores/index.md
@@ -196,7 +196,7 @@ schema,
 deletion_protection,
 tags
 FROM awscc.verifiedpermissions.policy_stores
-WHERE region = 'us-east-1' AND Identifier = '<PolicyStoreId>';
+WHERE region = 'us-east-1' AND Identifier = '{{ policy_store_id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -232,8 +232,8 @@ INSERT INTO awscc.verifiedpermissions.policy_stores (
  ValidationSettings,
  region
 )
-SELECT 
-'{{ ValidationSettings }}',
+SELECT
+'{{ validation_settings }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -249,12 +249,12 @@ INSERT INTO awscc.verifiedpermissions.policy_stores (
  Tags,
  region
 )
-SELECT 
- '{{ Description }}',
- '{{ ValidationSettings }}',
- '{{ Schema }}',
- '{{ DeletionProtection }}',
- '{{ Tags }}',
+SELECT
+ '{{ description }}',
+ '{{ validation_settings }}',
+ '{{ schema }}',
+ '{{ deletion_protection }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -272,21 +272,20 @@ globals:
 resources:
   - name: policy_store
     props:
-      - name: Description
-        value: '{{ Description }}'
-      - name: ValidationSettings
+      - name: description
+        value: '{{ description }}'
+      - name: validation_settings
         value:
-          Mode: '{{ Mode }}'
-      - name: Schema
+          mode: '{{ mode }}'
+      - name: schema
         value: null
-      - name: DeletionProtection
+      - name: deletion_protection
         value:
-          Mode: '{{ Mode }}'
-      - name: Tags
+          mode: '{{ mode }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -306,7 +305,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<PolicyStoreId>';
+AND Identifier = '{{ policy_store_id }}';
 ```
 
 
@@ -315,7 +314,7 @@ AND Identifier = '<PolicyStoreId>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.verifiedpermissions.policy_stores
-WHERE Identifier = '<PolicyStoreId>'
+WHERE Identifier = '{{ policy_store_id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/verifiedpermissions/policy_templates/index.md b/website/docs/services/verifiedpermissions/policy_templates/index.md
index 492bc7e2b..c44a04c3d 100644
--- a/website/docs/services/verifiedpermissions/policy_templates/index.md
+++ b/website/docs/services/verifiedpermissions/policy_templates/index.md
@@ -157,7 +157,7 @@ policy_store_id,
 policy_template_id,
 statement
 FROM awscc.verifiedpermissions.policy_templates
-WHERE region = 'us-east-1' AND Identifier = '<PolicyStoreId>|<PolicyTemplateId>';
+WHERE region = 'us-east-1' AND Identifier = '{{ policy_store_id }}|{{ policy_template_id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -195,9 +195,9 @@ INSERT INTO awscc.verifiedpermissions.policy_templates (
  Statement,
  region
 )
-SELECT 
-'{{ PolicyStoreId }}',
- '{{ Statement }}',
+SELECT
+'{{ policy_store_id }}',
+ '{{ statement }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -211,10 +211,10 @@ INSERT INTO awscc.verifiedpermissions.policy_templates (
  Statement,
  region
 )
-SELECT 
- '{{ Description }}',
- '{{ PolicyStoreId }}',
- '{{ Statement }}',
+SELECT
+ '{{ description }}',
+ '{{ policy_store_id }}',
+ '{{ statement }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -232,13 +232,12 @@ globals:
 resources:
   - name: policy_template
     props:
-      - name: Description
-        value: '{{ Description }}'
-      - name: PolicyStoreId
-        value: '{{ PolicyStoreId }}'
-      - name: Statement
-        value: '{{ Statement }}'
-
+      - name: description
+        value: '{{ description }}'
+      - name: policy_store_id
+        value: '{{ policy_store_id }}'
+      - name: statement
+        value: '{{ statement }}'
 ```
 </TabItem>
 </Tabs>
@@ -255,7 +254,7 @@ SET PatchDocument = string('{{ {
     "Statement": statement
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<PolicyStoreId>|<PolicyTemplateId>';
+AND Identifier = '{{ policy_store_id }}|{{ policy_template_id }}';
 ```
 
 
@@ -264,7 +263,7 @@ AND Identifier = '<PolicyStoreId>|<PolicyTemplateId>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.verifiedpermissions.policy_templates
-WHERE Identifier = '<PolicyStoreId|PolicyTemplateId>'
+WHERE Identifier = '{{ policy_store_id }}|{{ policy_template_id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/voiceid/domains/index.md b/website/docs/services/voiceid/domains/index.md
index b1e55df85..8146772fe 100644
--- a/website/docs/services/voiceid/domains/index.md
+++ b/website/docs/services/voiceid/domains/index.md
@@ -177,7 +177,7 @@ name,
 server_side_encryption_configuration,
 tags
 FROM awscc.voiceid.domains
-WHERE region = 'us-east-1' AND Identifier = '<DomainId>';
+WHERE region = 'us-east-1' AND Identifier = '{{ domain_id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -214,9 +214,9 @@ INSERT INTO awscc.voiceid.domains (
  ServerSideEncryptionConfiguration,
  region
 )
-SELECT 
-'{{ Name }}',
- '{{ ServerSideEncryptionConfiguration }}',
+SELECT
+'{{ name }}',
+ '{{ server_side_encryption_configuration }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -231,11 +231,11 @@ INSERT INTO awscc.voiceid.domains (
  Tags,
  region
 )
-SELECT 
- '{{ Description }}',
- '{{ Name }}',
- '{{ ServerSideEncryptionConfiguration }}',
- '{{ Tags }}',
+SELECT
+ '{{ description }}',
+ '{{ name }}',
+ '{{ server_side_encryption_configuration }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -253,18 +253,17 @@ globals:
 resources:
   - name: domain
     props:
-      - name: Description
-        value: '{{ Description }}'
-      - name: Name
-        value: '{{ Name }}'
-      - name: ServerSideEncryptionConfiguration
+      - name: description
+        value: '{{ description }}'
+      - name: name
+        value: '{{ name }}'
+      - name: server_side_encryption_configuration
         value:
-          KmsKeyId: '{{ KmsKeyId }}'
-      - name: Tags
+          kms_key_id: '{{ kms_key_id }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -283,7 +282,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<DomainId>';
+AND Identifier = '{{ domain_id }}';
 ```
 
 
@@ -292,7 +291,7 @@ AND Identifier = '<DomainId>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.voiceid.domains
-WHERE Identifier = '<DomainId>'
+WHERE Identifier = '{{ domain_id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/vpclattice/access_log_subscriptions/index.md b/website/docs/services/vpclattice/access_log_subscriptions/index.md
index 4338642a7..9ddca8c59 100644
--- a/website/docs/services/vpclattice/access_log_subscriptions/index.md
+++ b/website/docs/services/vpclattice/access_log_subscriptions/index.md
@@ -188,7 +188,7 @@ resource_identifier,
 service_network_log_type,
 tags
 FROM awscc.vpclattice.access_log_subscriptions
-WHERE region = 'us-east-1' AND Identifier = '<Arn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -224,8 +224,8 @@ INSERT INTO awscc.vpclattice.access_log_subscriptions (
  DestinationArn,
  region
 )
-SELECT 
-'{{ DestinationArn }}',
+SELECT
+'{{ destination_arn }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -240,11 +240,11 @@ INSERT INTO awscc.vpclattice.access_log_subscriptions (
  Tags,
  region
 )
-SELECT 
- '{{ DestinationArn }}',
- '{{ ResourceIdentifier }}',
- '{{ ServiceNetworkLogType }}',
- '{{ Tags }}',
+SELECT
+ '{{ destination_arn }}',
+ '{{ resource_identifier }}',
+ '{{ service_network_log_type }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -262,17 +262,16 @@ globals:
 resources:
   - name: access_log_subscription
     props:
-      - name: DestinationArn
-        value: '{{ DestinationArn }}'
-      - name: ResourceIdentifier
-        value: '{{ ResourceIdentifier }}'
-      - name: ServiceNetworkLogType
-        value: '{{ ServiceNetworkLogType }}'
-      - name: Tags
+      - name: destination_arn
+        value: '{{ destination_arn }}'
+      - name: resource_identifier
+        value: '{{ resource_identifier }}'
+      - name: service_network_log_type
+        value: '{{ service_network_log_type }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -290,7 +289,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Arn>';
+AND Identifier = '{{ arn }}';
 ```
 
 
@@ -299,7 +298,7 @@ AND Identifier = '<Arn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.vpclattice.access_log_subscriptions
-WHERE Identifier = '<Arn>'
+WHERE Identifier = '{{ arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/vpclattice/auth_policies/index.md b/website/docs/services/vpclattice/auth_policies/index.md
index 411d3f3b3..c5cc56a9b 100644
--- a/website/docs/services/vpclattice/auth_policies/index.md
+++ b/website/docs/services/vpclattice/auth_policies/index.md
@@ -100,7 +100,7 @@ resource_identifier,
 policy,
 state
 FROM awscc.vpclattice.auth_policies
-WHERE region = 'us-east-1' AND Identifier = '<ResourceIdentifier>';
+WHERE region = 'us-east-1' AND Identifier = '{{ resource_identifier }}';
 ```
 
 ## `INSERT` example
@@ -124,9 +124,9 @@ INSERT INTO awscc.vpclattice.auth_policies (
  Policy,
  region
 )
-SELECT 
-'{{ ResourceIdentifier }}',
- '{{ Policy }}',
+SELECT
+'{{ resource_identifier }}',
+ '{{ policy }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -139,9 +139,9 @@ INSERT INTO awscc.vpclattice.auth_policies (
  Policy,
  region
 )
-SELECT 
- '{{ ResourceIdentifier }}',
- '{{ Policy }}',
+SELECT
+ '{{ resource_identifier }}',
+ '{{ policy }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -159,11 +159,10 @@ globals:
 resources:
   - name: auth_policy
     props:
-      - name: ResourceIdentifier
-        value: '{{ ResourceIdentifier }}'
-      - name: Policy
+      - name: resource_identifier
+        value: '{{ resource_identifier }}'
+      - name: policy
         value: {}
-
 ```
 </TabItem>
 </Tabs>
@@ -179,7 +178,7 @@ SET PatchDocument = string('{{ {
     "Policy": policy
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<ResourceIdentifier>';
+AND Identifier = '{{ resource_identifier }}';
 ```
 
 
@@ -188,7 +187,7 @@ AND Identifier = '<ResourceIdentifier>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.vpclattice.auth_policies
-WHERE Identifier = '<ResourceIdentifier>'
+WHERE Identifier = '{{ resource_identifier }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/vpclattice/listeners/index.md b/website/docs/services/vpclattice/listeners/index.md
index b9db3f585..e95e48fe8 100644
--- a/website/docs/services/vpclattice/listeners/index.md
+++ b/website/docs/services/vpclattice/listeners/index.md
@@ -238,7 +238,7 @@ service_id,
 service_identifier,
 tags
 FROM awscc.vpclattice.listeners
-WHERE region = 'us-east-1' AND Identifier = '<Arn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -275,9 +275,9 @@ INSERT INTO awscc.vpclattice.listeners (
  Protocol,
  region
 )
-SELECT 
-'{{ DefaultAction }}',
- '{{ Protocol }}',
+SELECT
+'{{ default_action }}',
+ '{{ protocol }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -294,13 +294,13 @@ INSERT INTO awscc.vpclattice.listeners (
  Tags,
  region
 )
-SELECT 
- '{{ DefaultAction }}',
- '{{ Name }}',
- '{{ Port }}',
- '{{ Protocol }}',
- '{{ ServiceIdentifier }}',
- '{{ Tags }}',
+SELECT
+ '{{ default_action }}',
+ '{{ name }}',
+ '{{ port }}',
+ '{{ protocol }}',
+ '{{ service_identifier }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -318,27 +318,26 @@ globals:
 resources:
   - name: listener
     props:
-      - name: DefaultAction
+      - name: default_action
         value:
-          Forward:
-            TargetGroups:
-              - TargetGroupIdentifier: '{{ TargetGroupIdentifier }}'
-                Weight: '{{ Weight }}'
-          FixedResponse:
-            StatusCode: '{{ StatusCode }}'
-      - name: Name
-        value: '{{ Name }}'
-      - name: Port
-        value: '{{ Port }}'
-      - name: Protocol
-        value: '{{ Protocol }}'
-      - name: ServiceIdentifier
-        value: '{{ ServiceIdentifier }}'
-      - name: Tags
+          forward:
+            target_groups:
+              - target_group_identifier: '{{ target_group_identifier }}'
+                weight: '{{ weight }}'
+          fixed_response:
+            status_code: '{{ status_code }}'
+      - name: name
+        value: '{{ name }}'
+      - name: port
+        value: '{{ port }}'
+      - name: protocol
+        value: '{{ protocol }}'
+      - name: service_identifier
+        value: '{{ service_identifier }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -355,7 +354,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Arn>';
+AND Identifier = '{{ arn }}';
 ```
 
 
@@ -364,7 +363,7 @@ AND Identifier = '<Arn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.vpclattice.listeners
-WHERE Identifier = '<Arn>'
+WHERE Identifier = '{{ arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/vpclattice/resource_configurations/index.md b/website/docs/services/vpclattice/resource_configurations/index.md
index 037510d67..6864fba68 100644
--- a/website/docs/services/vpclattice/resource_configurations/index.md
+++ b/website/docs/services/vpclattice/resource_configurations/index.md
@@ -207,7 +207,7 @@ resource_configuration_group_id,
 tags,
 name
 FROM awscc.vpclattice.resource_configurations
-WHERE region = 'us-east-1' AND Identifier = '<Arn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -244,9 +244,9 @@ INSERT INTO awscc.vpclattice.resource_configurations (
  Name,
  region
 )
-SELECT 
-'{{ ResourceConfigurationType }}',
- '{{ Name }}',
+SELECT
+'{{ resource_configuration_type }}',
+ '{{ name }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -267,17 +267,17 @@ INSERT INTO awscc.vpclattice.resource_configurations (
  Name,
  region
 )
-SELECT 
- '{{ AllowAssociationToSharableServiceNetwork }}',
- '{{ ProtocolType }}',
- '{{ ResourceConfigurationType }}',
- '{{ PortRanges }}',
- '{{ ResourceConfigurationDefinition }}',
- '{{ ResourceGatewayId }}',
- '{{ ResourceConfigurationAuthType }}',
- '{{ ResourceConfigurationGroupId }}',
- '{{ Tags }}',
- '{{ Name }}',
+SELECT
+ '{{ allow_association_to_sharable_service_network }}',
+ '{{ protocol_type }}',
+ '{{ resource_configuration_type }}',
+ '{{ port_ranges }}',
+ '{{ resource_configuration_definition }}',
+ '{{ resource_gateway_id }}',
+ '{{ resource_configuration_auth_type }}',
+ '{{ resource_configuration_group_id }}',
+ '{{ tags }}',
+ '{{ name }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -295,30 +295,29 @@ globals:
 resources:
   - name: resource_configuration
     props:
-      - name: AllowAssociationToSharableServiceNetwork
-        value: '{{ AllowAssociationToSharableServiceNetwork }}'
-      - name: ProtocolType
-        value: '{{ ProtocolType }}'
-      - name: ResourceConfigurationType
-        value: '{{ ResourceConfigurationType }}'
-      - name: PortRanges
+      - name: allow_association_to_sharable_service_network
+        value: '{{ allow_association_to_sharable_service_network }}'
+      - name: protocol_type
+        value: '{{ protocol_type }}'
+      - name: resource_configuration_type
+        value: '{{ resource_configuration_type }}'
+      - name: port_ranges
         value:
-          - '{{ PortRanges[0] }}'
-      - name: ResourceConfigurationDefinition
+          - '{{ port_ranges[0] }}'
+      - name: resource_configuration_definition
         value: {}
-      - name: ResourceGatewayId
-        value: '{{ ResourceGatewayId }}'
-      - name: ResourceConfigurationAuthType
-        value: '{{ ResourceConfigurationAuthType }}'
-      - name: ResourceConfigurationGroupId
-        value: '{{ ResourceConfigurationGroupId }}'
-      - name: Tags
+      - name: resource_gateway_id
+        value: '{{ resource_gateway_id }}'
+      - name: resource_configuration_auth_type
+        value: '{{ resource_configuration_auth_type }}'
+      - name: resource_configuration_group_id
+        value: '{{ resource_configuration_group_id }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-      - name: Name
-        value: '{{ Name }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
+      - name: name
+        value: '{{ name }}'
 ```
 </TabItem>
 </Tabs>
@@ -339,7 +338,7 @@ SET PatchDocument = string('{{ {
     "Name": name
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Arn>';
+AND Identifier = '{{ arn }}';
 ```
 
 
@@ -348,7 +347,7 @@ AND Identifier = '<Arn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.vpclattice.resource_configurations
-WHERE Identifier = '<Arn>'
+WHERE Identifier = '{{ arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/vpclattice/resource_gateways/index.md b/website/docs/services/vpclattice/resource_gateways/index.md
index 31037e6cb..37ebbea88 100644
--- a/website/docs/services/vpclattice/resource_gateways/index.md
+++ b/website/docs/services/vpclattice/resource_gateways/index.md
@@ -194,7 +194,7 @@ security_group_ids,
 tags,
 name
 FROM awscc.vpclattice.resource_gateways
-WHERE region = 'us-east-1' AND Identifier = '<Arn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -232,10 +232,10 @@ INSERT INTO awscc.vpclattice.resource_gateways (
  Name,
  region
 )
-SELECT 
-'{{ VpcIdentifier }}',
- '{{ SubnetIds }}',
- '{{ Name }}',
+SELECT
+'{{ vpc_identifier }}',
+ '{{ subnet_ids }}',
+ '{{ name }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -253,14 +253,14 @@ INSERT INTO awscc.vpclattice.resource_gateways (
  Name,
  region
 )
-SELECT 
- '{{ IpAddressType }}',
- '{{ VpcIdentifier }}',
- '{{ Ipv4AddressesPerEni }}',
- '{{ SubnetIds }}',
- '{{ SecurityGroupIds }}',
- '{{ Tags }}',
- '{{ Name }}',
+SELECT
+ '{{ ip_address_type }}',
+ '{{ vpc_identifier }}',
+ '{{ ipv4_addresses_per_eni }}',
+ '{{ subnet_ids }}',
+ '{{ security_group_ids }}',
+ '{{ tags }}',
+ '{{ name }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -278,25 +278,24 @@ globals:
 resources:
   - name: resource_gateway
     props:
-      - name: IpAddressType
-        value: '{{ IpAddressType }}'
-      - name: VpcIdentifier
-        value: '{{ VpcIdentifier }}'
-      - name: Ipv4AddressesPerEni
-        value: '{{ Ipv4AddressesPerEni }}'
-      - name: SubnetIds
+      - name: ip_address_type
+        value: '{{ ip_address_type }}'
+      - name: vpc_identifier
+        value: '{{ vpc_identifier }}'
+      - name: ipv4_addresses_per_eni
+        value: '{{ ipv4_addresses_per_eni }}'
+      - name: subnet_ids
         value:
-          - '{{ SubnetIds[0] }}'
-      - name: SecurityGroupIds
+          - '{{ subnet_ids[0] }}'
+      - name: security_group_ids
         value:
-          - '{{ SecurityGroupIds[0] }}'
-      - name: Tags
+          - '{{ security_group_ids[0] }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-      - name: Name
-        value: '{{ Name }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
+      - name: name
+        value: '{{ name }}'
 ```
 </TabItem>
 </Tabs>
@@ -314,7 +313,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Arn>';
+AND Identifier = '{{ arn }}';
 ```
 
 
@@ -323,7 +322,7 @@ AND Identifier = '<Arn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.vpclattice.resource_gateways
-WHERE Identifier = '<Arn>'
+WHERE Identifier = '{{ arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/vpclattice/resource_policies/index.md b/website/docs/services/vpclattice/resource_policies/index.md
index cc6cb238d..208cc5612 100644
--- a/website/docs/services/vpclattice/resource_policies/index.md
+++ b/website/docs/services/vpclattice/resource_policies/index.md
@@ -94,7 +94,7 @@ region,
 resource_arn,
 policy
 FROM awscc.vpclattice.resource_policies
-WHERE region = 'us-east-1' AND Identifier = '<ResourceArn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ resource_arn }}';
 ```
 
 ## `INSERT` example
@@ -118,9 +118,9 @@ INSERT INTO awscc.vpclattice.resource_policies (
  Policy,
  region
 )
-SELECT 
-'{{ ResourceArn }}',
- '{{ Policy }}',
+SELECT
+'{{ resource_arn }}',
+ '{{ policy }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -133,9 +133,9 @@ INSERT INTO awscc.vpclattice.resource_policies (
  Policy,
  region
 )
-SELECT 
- '{{ ResourceArn }}',
- '{{ Policy }}',
+SELECT
+ '{{ resource_arn }}',
+ '{{ policy }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -153,11 +153,10 @@ globals:
 resources:
   - name: resource_policy
     props:
-      - name: ResourceArn
-        value: '{{ ResourceArn }}'
-      - name: Policy
+      - name: resource_arn
+        value: '{{ resource_arn }}'
+      - name: policy
         value: {}
-
 ```
 </TabItem>
 </Tabs>
@@ -173,7 +172,7 @@ SET PatchDocument = string('{{ {
     "Policy": policy
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<ResourceArn>';
+AND Identifier = '{{ resource_arn }}';
 ```
 
 
@@ -182,7 +181,7 @@ AND Identifier = '<ResourceArn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.vpclattice.resource_policies
-WHERE Identifier = '<ResourceArn>'
+WHERE Identifier = '{{ resource_arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/vpclattice/rules/index.md b/website/docs/services/vpclattice/rules/index.md
index 78568a526..5c72c7a95 100644
--- a/website/docs/services/vpclattice/rules/index.md
+++ b/website/docs/services/vpclattice/rules/index.md
@@ -285,7 +285,7 @@ priority,
 service_identifier,
 tags
 FROM awscc.vpclattice.rules
-WHERE region = 'us-east-1' AND Identifier = '<Arn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -323,10 +323,10 @@ INSERT INTO awscc.vpclattice.rules (
  Priority,
  region
 )
-SELECT 
-'{{ Action }}',
- '{{ Match }}',
- '{{ Priority }}',
+SELECT
+'{{ action }}',
+ '{{ match }}',
+ '{{ priority }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -344,14 +344,14 @@ INSERT INTO awscc.vpclattice.rules (
  Tags,
  region
 )
-SELECT 
- '{{ Action }}',
- '{{ ListenerIdentifier }}',
- '{{ Match }}',
- '{{ Name }}',
- '{{ Priority }}',
- '{{ ServiceIdentifier }}',
- '{{ Tags }}',
+SELECT
+ '{{ action }}',
+ '{{ listener_identifier }}',
+ '{{ match }}',
+ '{{ name }}',
+ '{{ priority }}',
+ '{{ service_identifier }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -369,43 +369,42 @@ globals:
 resources:
   - name: rule
     props:
-      - name: Action
+      - name: action
         value:
-          Forward:
-            TargetGroups:
-              - TargetGroupIdentifier: '{{ TargetGroupIdentifier }}'
-                Weight: '{{ Weight }}'
-          FixedResponse:
-            StatusCode: '{{ StatusCode }}'
-      - name: ListenerIdentifier
-        value: '{{ ListenerIdentifier }}'
-      - name: Match
+          forward:
+            target_groups:
+              - target_group_identifier: '{{ target_group_identifier }}'
+                weight: '{{ weight }}'
+          fixed_response:
+            status_code: '{{ status_code }}'
+      - name: listener_identifier
+        value: '{{ listener_identifier }}'
+      - name: match
         value:
-          HttpMatch:
-            Method: '{{ Method }}'
-            PathMatch:
-              Match:
-                Exact: '{{ Exact }}'
-                Prefix: '{{ Prefix }}'
-              CaseSensitive: '{{ CaseSensitive }}'
-            HeaderMatches:
-              - Name: '{{ Name }}'
-                Match:
-                  Exact: '{{ Exact }}'
-                  Prefix: '{{ Prefix }}'
-                  Contains: '{{ Contains }}'
-                CaseSensitive: '{{ CaseSensitive }}'
-      - name: Name
-        value: '{{ Name }}'
-      - name: Priority
-        value: '{{ Priority }}'
-      - name: ServiceIdentifier
-        value: '{{ ServiceIdentifier }}'
-      - name: Tags
+          http_match:
+            method: '{{ method }}'
+            path_match:
+              match:
+                exact: '{{ exact }}'
+                prefix: '{{ prefix }}'
+              case_sensitive: '{{ case_sensitive }}'
+            header_matches:
+              - name: '{{ name }}'
+                match:
+                  exact: '{{ exact }}'
+                  prefix: '{{ prefix }}'
+                  contains: '{{ contains }}'
+                case_sensitive: '{{ case_sensitive }}'
+      - name: name
+        value: '{{ name }}'
+      - name: priority
+        value: '{{ priority }}'
+      - name: service_identifier
+        value: '{{ service_identifier }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -424,7 +423,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Arn>';
+AND Identifier = '{{ arn }}';
 ```
 
 
@@ -433,7 +432,7 @@ AND Identifier = '<Arn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.vpclattice.rules
-WHERE Identifier = '<Arn>'
+WHERE Identifier = '{{ arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/vpclattice/service_network_resource_associations/index.md b/website/docs/services/vpclattice/service_network_resource_associations/index.md
index c0e391e3b..bf78c4310 100644
--- a/website/docs/services/vpclattice/service_network_resource_associations/index.md
+++ b/website/docs/services/vpclattice/service_network_resource_associations/index.md
@@ -170,7 +170,7 @@ resource_configuration_id,
 service_network_id,
 tags
 FROM awscc.vpclattice.service_network_resource_associations
-WHERE region = 'us-east-1' AND Identifier = '<Arn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -208,10 +208,10 @@ INSERT INTO awscc.vpclattice.service_network_resource_associations (
  Tags,
  region
 )
-SELECT 
-'{{ ResourceConfigurationId }}',
- '{{ ServiceNetworkId }}',
- '{{ Tags }}',
+SELECT
+'{{ resource_configuration_id }}',
+ '{{ service_network_id }}',
+ '{{ tags }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -225,10 +225,10 @@ INSERT INTO awscc.vpclattice.service_network_resource_associations (
  Tags,
  region
 )
-SELECT 
- '{{ ResourceConfigurationId }}',
- '{{ ServiceNetworkId }}',
- '{{ Tags }}',
+SELECT
+ '{{ resource_configuration_id }}',
+ '{{ service_network_id }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -246,15 +246,14 @@ globals:
 resources:
   - name: service_network_resource_association
     props:
-      - name: ResourceConfigurationId
-        value: '{{ ResourceConfigurationId }}'
-      - name: ServiceNetworkId
-        value: '{{ ServiceNetworkId }}'
-      - name: Tags
+      - name: resource_configuration_id
+        value: '{{ resource_configuration_id }}'
+      - name: service_network_id
+        value: '{{ service_network_id }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -270,7 +269,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Arn>';
+AND Identifier = '{{ arn }}';
 ```
 
 
@@ -279,7 +278,7 @@ AND Identifier = '<Arn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.vpclattice.service_network_resource_associations
-WHERE Identifier = '<Arn>'
+WHERE Identifier = '{{ arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/vpclattice/service_network_service_associations/index.md b/website/docs/services/vpclattice/service_network_service_associations/index.md
index fabf92a6e..e32b3051d 100644
--- a/website/docs/services/vpclattice/service_network_service_associations/index.md
+++ b/website/docs/services/vpclattice/service_network_service_associations/index.md
@@ -236,7 +236,7 @@ service_name,
 status,
 tags
 FROM awscc.vpclattice.service_network_service_associations
-WHERE region = 'us-east-1' AND Identifier = '<Arn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -275,11 +275,11 @@ INSERT INTO awscc.vpclattice.service_network_service_associations (
  Tags,
  region
 )
-SELECT 
-'{{ DnsEntry }}',
- '{{ ServiceNetworkIdentifier }}',
- '{{ ServiceIdentifier }}',
- '{{ Tags }}',
+SELECT
+'{{ dns_entry }}',
+ '{{ service_network_identifier }}',
+ '{{ service_identifier }}',
+ '{{ tags }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -294,11 +294,11 @@ INSERT INTO awscc.vpclattice.service_network_service_associations (
  Tags,
  region
 )
-SELECT 
- '{{ DnsEntry }}',
- '{{ ServiceNetworkIdentifier }}',
- '{{ ServiceIdentifier }}',
- '{{ Tags }}',
+SELECT
+ '{{ dns_entry }}',
+ '{{ service_network_identifier }}',
+ '{{ service_identifier }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -316,19 +316,18 @@ globals:
 resources:
   - name: service_network_service_association
     props:
-      - name: DnsEntry
+      - name: dns_entry
         value:
-          DomainName: '{{ DomainName }}'
-          HostedZoneId: '{{ HostedZoneId }}'
-      - name: ServiceNetworkIdentifier
-        value: '{{ ServiceNetworkIdentifier }}'
-      - name: ServiceIdentifier
-        value: '{{ ServiceIdentifier }}'
-      - name: Tags
+          domain_name: '{{ domain_name }}'
+          hosted_zone_id: '{{ hosted_zone_id }}'
+      - name: service_network_identifier
+        value: '{{ service_network_identifier }}'
+      - name: service_identifier
+        value: '{{ service_identifier }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -344,7 +343,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Arn>';
+AND Identifier = '{{ arn }}';
 ```
 
 
@@ -353,7 +352,7 @@ AND Identifier = '<Arn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.vpclattice.service_network_service_associations
-WHERE Identifier = '<Arn>'
+WHERE Identifier = '{{ arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/vpclattice/service_network_vpc_associations/index.md b/website/docs/services/vpclattice/service_network_vpc_associations/index.md
index cf513bc89..72256529a 100644
--- a/website/docs/services/vpclattice/service_network_vpc_associations/index.md
+++ b/website/docs/services/vpclattice/service_network_vpc_associations/index.md
@@ -212,7 +212,7 @@ vpc_id,
 vpc_identifier,
 tags
 FROM awscc.vpclattice.service_network_vpc_associations
-WHERE region = 'us-east-1' AND Identifier = '<Arn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -251,11 +251,11 @@ INSERT INTO awscc.vpclattice.service_network_vpc_associations (
  Tags,
  region
 )
-SELECT 
-'{{ SecurityGroupIds }}',
- '{{ ServiceNetworkIdentifier }}',
- '{{ VpcIdentifier }}',
- '{{ Tags }}',
+SELECT
+'{{ security_group_ids }}',
+ '{{ service_network_identifier }}',
+ '{{ vpc_identifier }}',
+ '{{ tags }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -270,11 +270,11 @@ INSERT INTO awscc.vpclattice.service_network_vpc_associations (
  Tags,
  region
 )
-SELECT 
- '{{ SecurityGroupIds }}',
- '{{ ServiceNetworkIdentifier }}',
- '{{ VpcIdentifier }}',
- '{{ Tags }}',
+SELECT
+ '{{ security_group_ids }}',
+ '{{ service_network_identifier }}',
+ '{{ vpc_identifier }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -292,18 +292,17 @@ globals:
 resources:
   - name: service_network_vpc_association
     props:
-      - name: SecurityGroupIds
+      - name: security_group_ids
         value:
-          - '{{ SecurityGroupIds[0] }}'
-      - name: ServiceNetworkIdentifier
-        value: '{{ ServiceNetworkIdentifier }}'
-      - name: VpcIdentifier
-        value: '{{ VpcIdentifier }}'
-      - name: Tags
+          - '{{ security_group_ids[0] }}'
+      - name: service_network_identifier
+        value: '{{ service_network_identifier }}'
+      - name: vpc_identifier
+        value: '{{ vpc_identifier }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -320,7 +319,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Arn>';
+AND Identifier = '{{ arn }}';
 ```
 
 
@@ -329,7 +328,7 @@ AND Identifier = '<Arn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.vpclattice.service_network_vpc_associations
-WHERE Identifier = '<Arn>'
+WHERE Identifier = '{{ arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/vpclattice/service_networks/index.md b/website/docs/services/vpclattice/service_networks/index.md
index 898051f47..c389871db 100644
--- a/website/docs/services/vpclattice/service_networks/index.md
+++ b/website/docs/services/vpclattice/service_networks/index.md
@@ -195,7 +195,7 @@ auth_type,
 tags,
 sharing_config
 FROM awscc.vpclattice.service_networks
-WHERE region = 'us-east-1' AND Identifier = '<Arn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -234,11 +234,11 @@ INSERT INTO awscc.vpclattice.service_networks (
  SharingConfig,
  region
 )
-SELECT 
-'{{ Name }}',
- '{{ AuthType }}',
- '{{ Tags }}',
- '{{ SharingConfig }}',
+SELECT
+'{{ name }}',
+ '{{ auth_type }}',
+ '{{ tags }}',
+ '{{ sharing_config }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -253,11 +253,11 @@ INSERT INTO awscc.vpclattice.service_networks (
  SharingConfig,
  region
 )
-SELECT 
- '{{ Name }}',
- '{{ AuthType }}',
- '{{ Tags }}',
- '{{ SharingConfig }}',
+SELECT
+ '{{ name }}',
+ '{{ auth_type }}',
+ '{{ tags }}',
+ '{{ sharing_config }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -275,18 +275,17 @@ globals:
 resources:
   - name: service_network
     props:
-      - name: Name
-        value: '{{ Name }}'
-      - name: AuthType
-        value: '{{ AuthType }}'
-      - name: Tags
+      - name: name
+        value: '{{ name }}'
+      - name: auth_type
+        value: '{{ auth_type }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-      - name: SharingConfig
+          - key: '{{ key }}'
+            value: '{{ value }}'
+      - name: sharing_config
         value:
           enabled: '{{ enabled }}'
-
 ```
 </TabItem>
 </Tabs>
@@ -304,7 +303,7 @@ SET PatchDocument = string('{{ {
     "SharingConfig": sharing_config
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Arn>';
+AND Identifier = '{{ arn }}';
 ```
 
 
@@ -313,7 +312,7 @@ AND Identifier = '<Arn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.vpclattice.service_networks
-WHERE Identifier = '<Arn>'
+WHERE Identifier = '{{ arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/vpclattice/services/index.md b/website/docs/services/vpclattice/services/index.md
index 27147301f..4d17aff26 100644
--- a/website/docs/services/vpclattice/services/index.md
+++ b/website/docs/services/vpclattice/services/index.md
@@ -218,7 +218,7 @@ certificate_arn,
 custom_domain_name,
 tags
 FROM awscc.vpclattice.services
-WHERE region = 'us-east-1' AND Identifier = '<Arn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -259,13 +259,13 @@ INSERT INTO awscc.vpclattice.services (
  Tags,
  region
 )
-SELECT 
-'{{ AuthType }}',
- '{{ DnsEntry }}',
- '{{ Name }}',
- '{{ CertificateArn }}',
- '{{ CustomDomainName }}',
- '{{ Tags }}',
+SELECT
+'{{ auth_type }}',
+ '{{ dns_entry }}',
+ '{{ name }}',
+ '{{ certificate_arn }}',
+ '{{ custom_domain_name }}',
+ '{{ tags }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -282,13 +282,13 @@ INSERT INTO awscc.vpclattice.services (
  Tags,
  region
 )
-SELECT 
- '{{ AuthType }}',
- '{{ DnsEntry }}',
- '{{ Name }}',
- '{{ CertificateArn }}',
- '{{ CustomDomainName }}',
- '{{ Tags }}',
+SELECT
+ '{{ auth_type }}',
+ '{{ dns_entry }}',
+ '{{ name }}',
+ '{{ certificate_arn }}',
+ '{{ custom_domain_name }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -306,23 +306,22 @@ globals:
 resources:
   - name: service
     props:
-      - name: AuthType
-        value: '{{ AuthType }}'
-      - name: DnsEntry
+      - name: auth_type
+        value: '{{ auth_type }}'
+      - name: dns_entry
         value:
-          DomainName: '{{ DomainName }}'
-          HostedZoneId: '{{ HostedZoneId }}'
-      - name: Name
-        value: '{{ Name }}'
-      - name: CertificateArn
-        value: '{{ CertificateArn }}'
-      - name: CustomDomainName
-        value: '{{ CustomDomainName }}'
-      - name: Tags
+          domain_name: '{{ domain_name }}'
+          hosted_zone_id: '{{ hosted_zone_id }}'
+      - name: name
+        value: '{{ name }}'
+      - name: certificate_arn
+        value: '{{ certificate_arn }}'
+      - name: custom_domain_name
+        value: '{{ custom_domain_name }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -340,7 +339,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Arn>';
+AND Identifier = '{{ arn }}';
 ```
 
 
@@ -349,7 +348,7 @@ AND Identifier = '<Arn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.vpclattice.services
-WHERE Identifier = '<Arn>'
+WHERE Identifier = '{{ arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/vpclattice/target_groups/index.md b/website/docs/services/vpclattice/target_groups/index.md
index 30fdced8e..5e42bbaac 100644
--- a/website/docs/services/vpclattice/target_groups/index.md
+++ b/website/docs/services/vpclattice/target_groups/index.md
@@ -308,7 +308,7 @@ type,
 targets,
 tags
 FROM awscc.vpclattice.target_groups
-WHERE region = 'us-east-1' AND Identifier = '<Arn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -344,8 +344,8 @@ INSERT INTO awscc.vpclattice.target_groups (
  Type,
  region
 )
-SELECT 
-'{{ Type }}',
+SELECT
+'{{ type }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -361,12 +361,12 @@ INSERT INTO awscc.vpclattice.target_groups (
  Tags,
  region
 )
-SELECT 
- '{{ Config }}',
- '{{ Name }}',
- '{{ Type }}',
- '{{ Targets }}',
- '{{ Tags }}',
+SELECT
+ '{{ config }}',
+ '{{ name }}',
+ '{{ type }}',
+ '{{ targets }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -384,39 +384,38 @@ globals:
 resources:
   - name: target_group
     props:
-      - name: Config
+      - name: config
         value:
-          Port: '{{ Port }}'
-          Protocol: '{{ Protocol }}'
-          ProtocolVersion: '{{ ProtocolVersion }}'
-          IpAddressType: '{{ IpAddressType }}'
-          LambdaEventStructureVersion: '{{ LambdaEventStructureVersion }}'
-          VpcIdentifier: '{{ VpcIdentifier }}'
-          HealthCheck:
-            Enabled: '{{ Enabled }}'
-            Protocol: '{{ Protocol }}'
-            ProtocolVersion: '{{ ProtocolVersion }}'
-            Port: '{{ Port }}'
-            Path: '{{ Path }}'
-            HealthCheckIntervalSeconds: '{{ HealthCheckIntervalSeconds }}'
-            HealthCheckTimeoutSeconds: '{{ HealthCheckTimeoutSeconds }}'
-            HealthyThresholdCount: '{{ HealthyThresholdCount }}'
-            UnhealthyThresholdCount: '{{ UnhealthyThresholdCount }}'
-            Matcher:
-              HttpCode: '{{ HttpCode }}'
-      - name: Name
-        value: '{{ Name }}'
-      - name: Type
-        value: '{{ Type }}'
-      - name: Targets
+          port: '{{ port }}'
+          protocol: '{{ protocol }}'
+          protocol_version: '{{ protocol_version }}'
+          ip_address_type: '{{ ip_address_type }}'
+          lambda_event_structure_version: '{{ lambda_event_structure_version }}'
+          vpc_identifier: '{{ vpc_identifier }}'
+          health_check:
+            enabled: '{{ enabled }}'
+            protocol: '{{ protocol }}'
+            protocol_version: '{{ protocol_version }}'
+            port: '{{ port }}'
+            path: '{{ path }}'
+            health_check_interval_seconds: '{{ health_check_interval_seconds }}'
+            health_check_timeout_seconds: '{{ health_check_timeout_seconds }}'
+            healthy_threshold_count: '{{ healthy_threshold_count }}'
+            unhealthy_threshold_count: '{{ unhealthy_threshold_count }}'
+            matcher:
+              http_code: '{{ http_code }}'
+      - name: name
+        value: '{{ name }}'
+      - name: type
+        value: '{{ type }}'
+      - name: targets
         value:
-          - Id: '{{ Id }}'
-            Port: '{{ Port }}'
-      - name: Tags
+          - id: '{{ id }}'
+            port: '{{ port }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -433,7 +432,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Arn>';
+AND Identifier = '{{ arn }}';
 ```
 
 
@@ -442,7 +441,7 @@ AND Identifier = '<Arn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.vpclattice.target_groups
-WHERE Identifier = '<Arn>'
+WHERE Identifier = '{{ arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/wafv2/ip_sets/index.md b/website/docs/services/wafv2/ip_sets/index.md
index 98fb4d6b5..e32c57be6 100644
--- a/website/docs/services/wafv2/ip_sets/index.md
+++ b/website/docs/services/wafv2/ip_sets/index.md
@@ -198,7 +198,7 @@ ip_address_version,
 addresses,
 tags
 FROM awscc.wafv2.ip_sets
-WHERE Identifier = '<Name>|<Id>|<Scope>';
+WHERE region = 'us-east-1' AND Identifier = '{{ name }}|{{ id }}|{{ scope }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -211,7 +211,7 @@ name,
 id,
 scope
 FROM awscc.wafv2.ip_sets_list_only
-;
+WHERE region = 'us-east-1';
 ```
 </TabItem>
 </Tabs>
@@ -238,10 +238,10 @@ INSERT INTO awscc.wafv2.ip_sets (
  Addresses,
  region
 )
-SELECT 
-'{{ Scope }}',
- '{{ IPAddressVersion }}',
- '{{ Addresses }}',
+SELECT
+'{{ scope }}',
+ '{{ ip_address_version }}',
+ '{{ addresses }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -258,13 +258,13 @@ INSERT INTO awscc.wafv2.ip_sets (
  Tags,
  region
 )
-SELECT 
- '{{ Description }}',
- '{{ Name }}',
- '{{ Scope }}',
- '{{ IPAddressVersion }}',
- '{{ Addresses }}',
- '{{ Tags }}',
+SELECT
+ '{{ description }}',
+ '{{ name }}',
+ '{{ scope }}',
+ '{{ ip_address_version }}',
+ '{{ addresses }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -282,22 +282,21 @@ globals:
 resources:
   - name: ip_set
     props:
-      - name: Description
-        value: '{{ Description }}'
-      - name: Name
-        value: '{{ Name }}'
-      - name: Scope
-        value: '{{ Scope }}'
-      - name: IPAddressVersion
-        value: '{{ IPAddressVersion }}'
-      - name: Addresses
+      - name: description
+        value: '{{ description }}'
+      - name: name
+        value: '{{ name }}'
+      - name: scope
+        value: '{{ scope }}'
+      - name: ip_address_version
+        value: '{{ ip_address_version }}'
+      - name: addresses
         value:
-          - '{{ Addresses[0] }}'
-      - name: Tags
+          - '{{ addresses[0] }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -316,7 +315,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Name>|<Id>|<Scope>';
+AND Identifier = '{{ name }}|{{ id }}|{{ scope }}';
 ```
 
 
@@ -325,7 +324,7 @@ AND Identifier = '<Name>|<Id>|<Scope>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.wafv2.ip_sets
-WHERE Identifier = '<Name|Id|Scope>'
+WHERE Identifier = '{{ name }}|{{ id }}|{{ scope }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/wafv2/logging_configurations/index.md b/website/docs/services/wafv2/logging_configurations/index.md
index 69b3bb189..6caf50251 100644
--- a/website/docs/services/wafv2/logging_configurations/index.md
+++ b/website/docs/services/wafv2/logging_configurations/index.md
@@ -410,7 +410,7 @@ redacted_fields,
 managed_by_firewall_manager,
 logging_filter
 FROM awscc.wafv2.logging_configurations
-WHERE Identifier = '<ResourceArn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ resource_arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -421,7 +421,7 @@ SELECT
 region,
 resource_arn
 FROM awscc.wafv2.logging_configurations_list_only
-;
+WHERE region = 'us-east-1';
 ```
 </TabItem>
 </Tabs>
@@ -447,9 +447,9 @@ INSERT INTO awscc.wafv2.logging_configurations (
  LogDestinationConfigs,
  region
 )
-SELECT 
-'{{ ResourceArn }}',
- '{{ LogDestinationConfigs }}',
+SELECT
+'{{ resource_arn }}',
+ '{{ log_destination_configs }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -464,11 +464,11 @@ INSERT INTO awscc.wafv2.logging_configurations (
  LoggingFilter,
  region
 )
-SELECT 
- '{{ ResourceArn }}',
- '{{ LogDestinationConfigs }}',
- '{{ RedactedFields }}',
- '{{ LoggingFilter }}',
+SELECT
+ '{{ resource_arn }}',
+ '{{ log_destination_configs }}',
+ '{{ redacted_fields }}',
+ '{{ logging_filter }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -486,67 +486,66 @@ globals:
 resources:
   - name: logging_configuration
     props:
-      - name: ResourceArn
-        value: '{{ ResourceArn }}'
-      - name: LogDestinationConfigs
+      - name: resource_arn
+        value: '{{ resource_arn }}'
+      - name: log_destination_configs
         value:
-          - '{{ LogDestinationConfigs[0] }}'
-      - name: RedactedFields
+          - '{{ log_destination_configs[0] }}'
+      - name: redacted_fields
         value:
-          - SingleHeader:
-              Name: '{{ Name }}'
-            SingleQueryArgument:
-              Name: '{{ Name }}'
-            AllQueryArguments: {}
-            UriPath: {}
-            QueryString: {}
-            Body:
-              OversizeHandling: '{{ OversizeHandling }}'
-            Method: {}
-            JsonBody:
-              MatchPattern:
-                All: {}
-                IncludedPaths:
-                  - '{{ IncludedPaths[0] }}'
-              MatchScope: '{{ MatchScope }}'
-              InvalidFallbackBehavior: '{{ InvalidFallbackBehavior }}'
-              OversizeHandling: null
-            Headers:
-              MatchPattern:
-                All: {}
-                IncludedHeaders:
-                  - '{{ IncludedHeaders[0] }}'
-                ExcludedHeaders:
-                  - '{{ ExcludedHeaders[0] }}'
-              MatchScope: '{{ MatchScope }}'
-              OversizeHandling: null
-            Cookies:
-              MatchPattern:
-                All: {}
-                IncludedCookies:
-                  - '{{ IncludedCookies[0] }}'
-                ExcludedCookies:
-                  - '{{ ExcludedCookies[0] }}'
-              MatchScope: null
-              OversizeHandling: null
-            JA3Fingerprint:
-              FallbackBehavior: '{{ FallbackBehavior }}'
-            JA4Fingerprint:
-              FallbackBehavior: '{{ FallbackBehavior }}'
-            UriFragment:
-              FallbackBehavior: '{{ FallbackBehavior }}'
-      - name: LoggingFilter
+          - single_header:
+              name: '{{ name }}'
+            single_query_argument:
+              name: '{{ name }}'
+            all_query_arguments: {}
+            uri_path: {}
+            query_string: {}
+            body:
+              oversize_handling: '{{ oversize_handling }}'
+            method: {}
+            json_body:
+              match_pattern:
+                all: {}
+                included_paths:
+                  - '{{ included_paths[0] }}'
+              match_scope: '{{ match_scope }}'
+              invalid_fallback_behavior: '{{ invalid_fallback_behavior }}'
+              oversize_handling: null
+            headers:
+              match_pattern:
+                all: {}
+                included_headers:
+                  - '{{ included_headers[0] }}'
+                excluded_headers:
+                  - '{{ excluded_headers[0] }}'
+              match_scope: '{{ match_scope }}'
+              oversize_handling: null
+            cookies:
+              match_pattern:
+                all: {}
+                included_cookies:
+                  - '{{ included_cookies[0] }}'
+                excluded_cookies:
+                  - '{{ excluded_cookies[0] }}'
+              match_scope: null
+              oversize_handling: null
+            j_a3_fingerprint:
+              fallback_behavior: '{{ fallback_behavior }}'
+            j_a4_fingerprint:
+              fallback_behavior: '{{ fallback_behavior }}'
+            uri_fragment:
+              fallback_behavior: '{{ fallback_behavior }}'
+      - name: logging_filter
         value:
-          DefaultBehavior: '{{ DefaultBehavior }}'
-          Filters:
-            - Behavior: '{{ Behavior }}'
-              Conditions:
-                - ActionCondition:
-                    Action: '{{ Action }}'
-                  LabelNameCondition:
-                    LabelName: '{{ LabelName }}'
-              Requirement: '{{ Requirement }}'
-
+          default_behavior: '{{ default_behavior }}'
+          filters:
+            - behavior: '{{ behavior }}'
+              conditions:
+                - action_condition:
+                    action: '{{ action }}'
+                  label_name_condition:
+                    label_name: '{{ label_name }}'
+              requirement: '{{ requirement }}'
 ```
 </TabItem>
 </Tabs>
@@ -564,7 +563,7 @@ SET PatchDocument = string('{{ {
     "LoggingFilter": logging_filter
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<ResourceArn>';
+AND Identifier = '{{ resource_arn }}';
 ```
 
 
@@ -573,7 +572,7 @@ AND Identifier = '<ResourceArn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.wafv2.logging_configurations
-WHERE Identifier = '<ResourceArn>'
+WHERE Identifier = '{{ resource_arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/wafv2/regex_pattern_sets/index.md b/website/docs/services/wafv2/regex_pattern_sets/index.md
index 5cd513303..4c3432d54 100644
--- a/website/docs/services/wafv2/regex_pattern_sets/index.md
+++ b/website/docs/services/wafv2/regex_pattern_sets/index.md
@@ -192,7 +192,7 @@ regular_expression_list,
 scope,
 tags
 FROM awscc.wafv2.regex_pattern_sets
-WHERE Identifier = '<Name>|<Id>|<Scope>';
+WHERE region = 'us-east-1' AND Identifier = '{{ name }}|{{ id }}|{{ scope }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -205,7 +205,7 @@ name,
 id,
 scope
 FROM awscc.wafv2.regex_pattern_sets_list_only
-;
+WHERE region = 'us-east-1';
 ```
 </TabItem>
 </Tabs>
@@ -231,9 +231,9 @@ INSERT INTO awscc.wafv2.regex_pattern_sets (
  Scope,
  region
 )
-SELECT 
-'{{ RegularExpressionList }}',
- '{{ Scope }}',
+SELECT
+'{{ regular_expression_list }}',
+ '{{ scope }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -249,12 +249,12 @@ INSERT INTO awscc.wafv2.regex_pattern_sets (
  Tags,
  region
 )
-SELECT 
- '{{ Description }}',
- '{{ Name }}',
- '{{ RegularExpressionList }}',
- '{{ Scope }}',
- '{{ Tags }}',
+SELECT
+ '{{ description }}',
+ '{{ name }}',
+ '{{ regular_expression_list }}',
+ '{{ scope }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -272,20 +272,19 @@ globals:
 resources:
   - name: regex_pattern_set
     props:
-      - name: Description
-        value: '{{ Description }}'
-      - name: Name
-        value: '{{ Name }}'
-      - name: RegularExpressionList
+      - name: description
+        value: '{{ description }}'
+      - name: name
+        value: '{{ name }}'
+      - name: regular_expression_list
         value:
-          - '{{ RegularExpressionList[0] }}'
-      - name: Scope
-        value: '{{ Scope }}'
-      - name: Tags
+          - '{{ regular_expression_list[0] }}'
+      - name: scope
+        value: '{{ scope }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -303,7 +302,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Name>|<Id>|<Scope>';
+AND Identifier = '{{ name }}|{{ id }}|{{ scope }}';
 ```
 
 
@@ -312,7 +311,7 @@ AND Identifier = '<Name>|<Id>|<Scope>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.wafv2.regex_pattern_sets
-WHERE Identifier = '<Name|Id|Scope>'
+WHERE Identifier = '{{ name }}|{{ id }}|{{ scope }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/wafv2/rule_groups/index.md b/website/docs/services/wafv2/rule_groups/index.md
index c3b2bb53b..2a174ff1f 100644
--- a/website/docs/services/wafv2/rule_groups/index.md
+++ b/website/docs/services/wafv2/rule_groups/index.md
@@ -725,7 +725,7 @@ custom_response_bodies,
 available_labels,
 consumed_labels
 FROM awscc.wafv2.rule_groups
-WHERE Identifier = '<Name>|<Id>|<Scope>';
+WHERE region = 'us-east-1' AND Identifier = '{{ name }}|{{ id }}|{{ scope }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -738,7 +738,7 @@ name,
 id,
 scope
 FROM awscc.wafv2.rule_groups_list_only
-;
+WHERE region = 'us-east-1';
 ```
 </TabItem>
 </Tabs>
@@ -765,10 +765,10 @@ INSERT INTO awscc.wafv2.rule_groups (
  VisibilityConfig,
  region
 )
-SELECT 
-'{{ Capacity }}',
- '{{ Scope }}',
- '{{ VisibilityConfig }}',
+SELECT
+'{{ capacity }}',
+ '{{ scope }}',
+ '{{ visibility_config }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -789,17 +789,17 @@ INSERT INTO awscc.wafv2.rule_groups (
  ConsumedLabels,
  region
 )
-SELECT 
- '{{ Capacity }}',
- '{{ Description }}',
- '{{ Name }}',
- '{{ Scope }}',
- '{{ Rules }}',
- '{{ VisibilityConfig }}',
- '{{ Tags }}',
- '{{ CustomResponseBodies }}',
- '{{ AvailableLabels }}',
- '{{ ConsumedLabels }}',
+SELECT
+ '{{ capacity }}',
+ '{{ description }}',
+ '{{ name }}',
+ '{{ scope }}',
+ '{{ rules }}',
+ '{{ visibility_config }}',
+ '{{ tags }}',
+ '{{ custom_response_bodies }}',
+ '{{ available_labels }}',
+ '{{ consumed_labels }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -817,280 +817,279 @@ globals:
 resources:
   - name: rule_group
     props:
-      - name: Capacity
-        value: '{{ Capacity }}'
-      - name: Description
-        value: '{{ Description }}'
-      - name: Name
-        value: '{{ Name }}'
-      - name: Scope
-        value: '{{ Scope }}'
-      - name: Rules
+      - name: capacity
+        value: '{{ capacity }}'
+      - name: description
+        value: '{{ description }}'
+      - name: name
+        value: '{{ name }}'
+      - name: scope
+        value: '{{ scope }}'
+      - name: rules
         value:
-          - Name: null
-            Priority: '{{ Priority }}'
-            Statement:
-              ByteMatchStatement:
-                SearchString: '{{ SearchString }}'
-                SearchStringBase64: '{{ SearchStringBase64 }}'
-                FieldToMatch:
-                  SingleHeader:
-                    Name: '{{ Name }}'
-                  SingleQueryArgument:
-                    Name: '{{ Name }}'
-                  AllQueryArguments: {}
-                  UriPath: {}
-                  QueryString: {}
-                  Body:
-                    OversizeHandling: '{{ OversizeHandling }}'
-                  Method: {}
-                  JsonBody:
-                    MatchPattern:
-                      All: {}
-                      IncludedPaths:
-                        - '{{ IncludedPaths[0] }}'
-                    MatchScope: '{{ MatchScope }}'
-                    InvalidFallbackBehavior: '{{ InvalidFallbackBehavior }}'
-                    OversizeHandling: null
-                  Headers:
-                    MatchPattern:
-                      All: {}
-                      IncludedHeaders:
-                        - '{{ IncludedHeaders[0] }}'
-                      ExcludedHeaders:
-                        - '{{ ExcludedHeaders[0] }}'
-                    MatchScope: '{{ MatchScope }}'
-                    OversizeHandling: null
-                  Cookies:
-                    MatchPattern:
-                      All: {}
-                      IncludedCookies:
-                        - '{{ IncludedCookies[0] }}'
-                      ExcludedCookies:
-                        - '{{ ExcludedCookies[0] }}'
-                    MatchScope: null
-                    OversizeHandling: null
-                  JA3Fingerprint:
-                    FallbackBehavior: '{{ FallbackBehavior }}'
-                  JA4Fingerprint:
-                    FallbackBehavior: '{{ FallbackBehavior }}'
-                  UriFragment:
-                    FallbackBehavior: '{{ FallbackBehavior }}'
-                TextTransformations:
-                  - Priority: '{{ Priority }}'
-                    Type: '{{ Type }}'
-                PositionalConstraint: '{{ PositionalConstraint }}'
-              SqliMatchStatement:
-                FieldToMatch: null
-                TextTransformations:
+          - name: null
+            priority: '{{ priority }}'
+            statement:
+              byte_match_statement:
+                search_string: '{{ search_string }}'
+                search_string_base64: '{{ search_string_base64 }}'
+                field_to_match:
+                  single_header:
+                    name: '{{ name }}'
+                  single_query_argument:
+                    name: '{{ name }}'
+                  all_query_arguments: {}
+                  uri_path: {}
+                  query_string: {}
+                  body:
+                    oversize_handling: '{{ oversize_handling }}'
+                  method: {}
+                  json_body:
+                    match_pattern:
+                      all: {}
+                      included_paths:
+                        - '{{ included_paths[0] }}'
+                    match_scope: '{{ match_scope }}'
+                    invalid_fallback_behavior: '{{ invalid_fallback_behavior }}'
+                    oversize_handling: null
+                  headers:
+                    match_pattern:
+                      all: {}
+                      included_headers:
+                        - '{{ included_headers[0] }}'
+                      excluded_headers:
+                        - '{{ excluded_headers[0] }}'
+                    match_scope: '{{ match_scope }}'
+                    oversize_handling: null
+                  cookies:
+                    match_pattern:
+                      all: {}
+                      included_cookies:
+                        - '{{ included_cookies[0] }}'
+                      excluded_cookies:
+                        - '{{ excluded_cookies[0] }}'
+                    match_scope: null
+                    oversize_handling: null
+                  j_a3_fingerprint:
+                    fallback_behavior: '{{ fallback_behavior }}'
+                  j_a4_fingerprint:
+                    fallback_behavior: '{{ fallback_behavior }}'
+                  uri_fragment:
+                    fallback_behavior: '{{ fallback_behavior }}'
+                text_transformations:
+                  - priority: '{{ priority }}'
+                    type: '{{ type }}'
+                positional_constraint: '{{ positional_constraint }}'
+              sqli_match_statement:
+                field_to_match: null
+                text_transformations:
                   - null
-                SensitivityLevel: '{{ SensitivityLevel }}'
-              XssMatchStatement:
-                FieldToMatch: null
-                TextTransformations:
+                sensitivity_level: '{{ sensitivity_level }}'
+              xss_match_statement:
+                field_to_match: null
+                text_transformations:
                   - null
-              SizeConstraintStatement:
-                FieldToMatch: null
-                ComparisonOperator: '{{ ComparisonOperator }}'
-                Size: null
-                TextTransformations:
+              size_constraint_statement:
+                field_to_match: null
+                comparison_operator: '{{ comparison_operator }}'
+                size: null
+                text_transformations:
                   - null
-              GeoMatchStatement:
-                CountryCodes:
-                  - '{{ CountryCodes[0] }}'
-                ForwardedIPConfig:
-                  HeaderName: '{{ HeaderName }}'
-                  FallbackBehavior: '{{ FallbackBehavior }}'
-              RuleGroupReferenceStatement:
-                Arn: '{{ Arn }}'
-                ExcludedRules:
-                  - Name: null
-                RuleActionOverrides:
-                  - Name: null
-                    ActionToUse:
-                      Allow:
-                        CustomRequestHandling:
-                          InsertHeaders:
-                            - Name: '{{ Name }}'
-                              Value: '{{ Value }}'
-                      Block:
-                        CustomResponse:
-                          ResponseCode: '{{ ResponseCode }}'
-                          CustomResponseBodyKey: '{{ CustomResponseBodyKey }}'
-                          ResponseHeaders:
+              geo_match_statement:
+                country_codes:
+                  - '{{ country_codes[0] }}'
+                forwarded_ip_config:
+                  header_name: '{{ header_name }}'
+                  fallback_behavior: '{{ fallback_behavior }}'
+              rule_group_reference_statement:
+                arn: '{{ arn }}'
+                excluded_rules:
+                  - name: null
+                rule_action_overrides:
+                  - name: null
+                    action_to_use:
+                      allow:
+                        custom_request_handling:
+                          insert_headers:
+                            - name: '{{ name }}'
+                              value: '{{ value }}'
+                      block:
+                        custom_response:
+                          response_code: '{{ response_code }}'
+                          custom_response_body_key: '{{ custom_response_body_key }}'
+                          response_headers:
                             - null
-                      Count:
-                        CustomRequestHandling: null
-                      Captcha:
-                        CustomRequestHandling: null
-                      Challenge:
-                        CustomRequestHandling: null
-              IPSetReferenceStatement:
-                Arn: null
-                IPSetForwardedIPConfig:
-                  HeaderName: '{{ HeaderName }}'
-                  FallbackBehavior: '{{ FallbackBehavior }}'
-                  Position: '{{ Position }}'
-              RegexPatternSetReferenceStatement:
-                Arn: null
-                FieldToMatch: null
-                TextTransformations:
+                      count:
+                        custom_request_handling: null
+                      captcha:
+                        custom_request_handling: null
+                      challenge:
+                        custom_request_handling: null
+              ip_set_reference_statement:
+                arn: null
+                ip_set_forwarded_ip_config:
+                  header_name: '{{ header_name }}'
+                  fallback_behavior: '{{ fallback_behavior }}'
+                  position: '{{ position }}'
+              regex_pattern_set_reference_statement:
+                arn: null
+                field_to_match: null
+                text_transformations:
                   - null
-              ManagedRuleGroupStatement:
-                Name: null
-                VendorName: '{{ VendorName }}'
-                Version: '{{ Version }}'
-                ExcludedRules:
+              managed_rule_group_statement:
+                name: null
+                vendor_name: '{{ vendor_name }}'
+                version: '{{ version }}'
+                excluded_rules:
                   - null
-                ScopeDownStatement: null
-                ManagedRuleGroupConfigs:
-                  - LoginPath: '{{ LoginPath }}'
-                    PayloadType: '{{ PayloadType }}'
-                    UsernameField:
-                      Identifier: '{{ Identifier }}'
-                    PasswordField: null
-                    AWSManagedRulesBotControlRuleSet:
-                      InspectionLevel: '{{ InspectionLevel }}'
-                      EnableMachineLearning: '{{ EnableMachineLearning }}'
-                    AWSManagedRulesATPRuleSet:
-                      LoginPath: '{{ LoginPath }}'
-                      EnableRegexInPath: '{{ EnableRegexInPath }}'
-                      RequestInspection:
-                        PayloadType: '{{ PayloadType }}'
-                        UsernameField: null
-                        PasswordField: null
-                      ResponseInspection:
-                        StatusCode:
-                          SuccessCodes:
-                            - '{{ SuccessCodes[0] }}'
-                          FailureCodes:
-                            - '{{ FailureCodes[0] }}'
-                        Header:
-                          Name: '{{ Name }}'
-                          SuccessValues:
-                            - '{{ SuccessValues[0] }}'
-                          FailureValues:
-                            - '{{ FailureValues[0] }}'
-                        BodyContains:
-                          SuccessStrings:
-                            - '{{ SuccessStrings[0] }}'
-                          FailureStrings:
-                            - '{{ FailureStrings[0] }}'
-                        Json:
-                          Identifier: '{{ Identifier }}'
-                          SuccessValues:
-                            - '{{ SuccessValues[0] }}'
-                          FailureValues:
-                            - '{{ FailureValues[0] }}'
-                    AWSManagedRulesACFPRuleSet:
-                      CreationPath: '{{ CreationPath }}'
-                      RegistrationPagePath: '{{ RegistrationPagePath }}'
-                      RequestInspection:
-                        PayloadType: '{{ PayloadType }}'
-                        UsernameField: null
-                        PasswordField: null
-                        EmailField: null
-                        PhoneNumberFields:
+                scope_down_statement: null
+                managed_rule_group_configs:
+                  - login_path: '{{ login_path }}'
+                    payload_type: '{{ payload_type }}'
+                    username_field:
+                      identifier: '{{ identifier }}'
+                    password_field: null
+                    aws_managed_rules_bot_control_rule_set:
+                      inspection_level: '{{ inspection_level }}'
+                      enable_machine_learning: '{{ enable_machine_learning }}'
+                    aws_managed_rules_at_prule_set:
+                      login_path: '{{ login_path }}'
+                      enable_regex_in_path: '{{ enable_regex_in_path }}'
+                      request_inspection:
+                        payload_type: '{{ payload_type }}'
+                        username_field: null
+                        password_field: null
+                      response_inspection:
+                        status_code:
+                          success_codes:
+                            - '{{ success_codes[0] }}'
+                          failure_codes:
+                            - '{{ failure_codes[0] }}'
+                        header:
+                          name: '{{ name }}'
+                          success_values:
+                            - '{{ success_values[0] }}'
+                          failure_values:
+                            - '{{ failure_values[0] }}'
+                        body_contains:
+                          success_strings:
+                            - '{{ success_strings[0] }}'
+                          failure_strings:
+                            - '{{ failure_strings[0] }}'
+                        json:
+                          identifier: '{{ identifier }}'
+                          success_values:
+                            - '{{ success_values[0] }}'
+                          failure_values:
+                            - '{{ failure_values[0] }}'
+                    aws_managed_rules_ac_fp_rule_set:
+                      creation_path: '{{ creation_path }}'
+                      registration_page_path: '{{ registration_page_path }}'
+                      request_inspection:
+                        payload_type: '{{ payload_type }}'
+                        username_field: null
+                        password_field: null
+                        email_field: null
+                        phone_number_fields:
                           - null
-                        AddressFields:
+                        address_fields:
                           - null
-                      ResponseInspection: null
-                      EnableRegexInPath: '{{ EnableRegexInPath }}'
-                    AWSManagedRulesAntiDDoSRuleSet:
-                      ClientSideActionConfig:
-                        Challenge:
-                          UsageOfAction: '{{ UsageOfAction }}'
-                          Sensitivity: '{{ Sensitivity }}'
-                          ExemptUriRegularExpressions:
-                            - RegexString: '{{ RegexString }}'
-                      SensitivityToBlock: null
-                RuleActionOverrides:
+                      response_inspection: null
+                      enable_regex_in_path: '{{ enable_regex_in_path }}'
+                    aws_managed_rules_anti_ddo_srule_set:
+                      client_side_action_config:
+                        challenge:
+                          usage_of_action: '{{ usage_of_action }}'
+                          sensitivity: '{{ sensitivity }}'
+                          exempt_uri_regular_expressions:
+                            - regex_string: '{{ regex_string }}'
+                      sensitivity_to_block: null
+                rule_action_overrides:
                   - null
-              RateBasedStatement:
-                Limit: '{{ Limit }}'
-                EvaluationWindowSec: '{{ EvaluationWindowSec }}'
-                AggregateKeyType: '{{ AggregateKeyType }}'
-                CustomKeys:
-                  - Cookie:
-                      Name: '{{ Name }}'
-                      TextTransformations:
+              rate_based_statement:
+                limit: '{{ limit }}'
+                evaluation_window_sec: '{{ evaluation_window_sec }}'
+                aggregate_key_type: '{{ aggregate_key_type }}'
+                custom_keys:
+                  - cookie:
+                      name: '{{ name }}'
+                      text_transformations:
                         - null
-                    ForwardedIP: {}
-                    Header:
-                      Name: '{{ Name }}'
-                      TextTransformations:
+                    forwarded_ip: {}
+                    header:
+                      name: '{{ name }}'
+                      text_transformations:
                         - null
-                    HTTPMethod: {}
-                    IP: {}
-                    LabelNamespace:
-                      Namespace: '{{ Namespace }}'
-                    QueryArgument:
-                      Name: '{{ Name }}'
-                      TextTransformations:
+                    h_tt_pmethod: {}
+                    ip: {}
+                    label_namespace:
+                      namespace: '{{ namespace }}'
+                    query_argument:
+                      name: '{{ name }}'
+                      text_transformations:
                         - null
-                    QueryString:
-                      TextTransformations:
+                    query_string:
+                      text_transformations:
                         - null
-                    UriPath:
-                      TextTransformations:
+                    uri_path:
+                      text_transformations:
                         - null
-                    JA3Fingerprint:
-                      FallbackBehavior: '{{ FallbackBehavior }}'
-                    JA4Fingerprint:
-                      FallbackBehavior: '{{ FallbackBehavior }}'
-                    ASN: {}
-                ScopeDownStatement: null
-                ForwardedIPConfig: null
-              AndStatement:
-                Statements:
+                    j_a3_fingerprint:
+                      fallback_behavior: '{{ fallback_behavior }}'
+                    j_a4_fingerprint:
+                      fallback_behavior: '{{ fallback_behavior }}'
+                    a_sn: {}
+                scope_down_statement: null
+                forwarded_ip_config: null
+              and_statement:
+                statements:
                   - null
-              OrStatement:
-                Statements:
+              or_statement:
+                statements:
                   - null
-              NotStatement:
-                Statement: null
-              LabelMatchStatement:
-                Scope: '{{ Scope }}'
-                Key: '{{ Key }}'
-              RegexMatchStatement:
-                RegexString: '{{ RegexString }}'
-                FieldToMatch: null
-                TextTransformations:
+              not_statement:
+                statement: null
+              label_match_statement:
+                scope: '{{ scope }}'
+                key: '{{ key }}'
+              regex_match_statement:
+                regex_string: '{{ regex_string }}'
+                field_to_match: null
+                text_transformations:
                   - null
-              AsnMatchStatement:
-                AsnList:
-                  - '{{ AsnList[0] }}'
-                ForwardedIPConfig: null
-            Action: null
-            OverrideAction:
-              Count: {}
-              None: {}
-            RuleLabels:
-              - Name: '{{ Name }}'
-            VisibilityConfig:
-              SampledRequestsEnabled: '{{ SampledRequestsEnabled }}'
-              CloudWatchMetricsEnabled: '{{ CloudWatchMetricsEnabled }}'
-              MetricName: '{{ MetricName }}'
-            CaptchaConfig:
-              ImmunityTimeProperty:
-                ImmunityTime: '{{ ImmunityTime }}'
-            ChallengeConfig:
-              ImmunityTimeProperty: null
-      - name: VisibilityConfig
+              asn_match_statement:
+                asn_list:
+                  - '{{ asn_list[0] }}'
+                forwarded_ip_config: null
+            action: null
+            override_action:
+              count: {}
+              none: {}
+            rule_labels:
+              - name: '{{ name }}'
+            visibility_config:
+              sampled_requests_enabled: '{{ sampled_requests_enabled }}'
+              cloud_watch_metrics_enabled: '{{ cloud_watch_metrics_enabled }}'
+              metric_name: '{{ metric_name }}'
+            captcha_config:
+              immunity_time_property:
+                immunity_time: '{{ immunity_time }}'
+            challenge_config:
+              immunity_time_property: null
+      - name: visibility_config
         value: null
-      - name: Tags
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-      - name: CustomResponseBodies
+          - key: '{{ key }}'
+            value: '{{ value }}'
+      - name: custom_response_bodies
         value: {}
-      - name: AvailableLabels
+      - name: available_labels
         value:
-          - Name: null
-      - name: ConsumedLabels
+          - name: null
+      - name: consumed_labels
         value:
           - null
-
 ```
 </TabItem>
 </Tabs>
@@ -1111,7 +1110,7 @@ SET PatchDocument = string('{{ {
     "CustomResponseBodies": custom_response_bodies
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Name>|<Id>|<Scope>';
+AND Identifier = '{{ name }}|{{ id }}|{{ scope }}';
 ```
 
 
@@ -1120,7 +1119,7 @@ AND Identifier = '<Name>|<Id>|<Scope>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.wafv2.rule_groups
-WHERE Identifier = '<Name|Id|Scope>'
+WHERE Identifier = '{{ name }}|{{ id }}|{{ scope }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/wafv2/web_acls/index.md b/website/docs/services/wafv2/web_acls/index.md
index 46169694c..a5eb46a5c 100644
--- a/website/docs/services/wafv2/web_acls/index.md
+++ b/website/docs/services/wafv2/web_acls/index.md
@@ -888,7 +888,7 @@ token_domains,
 association_config,
 on_source_ddo_sprotection_config
 FROM awscc.wafv2.web_acls
-WHERE Identifier = '<Name>|<Id>|<Scope>';
+WHERE region = 'us-east-1' AND Identifier = '{{ name }}|{{ id }}|{{ scope }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -901,7 +901,7 @@ name,
 id,
 scope
 FROM awscc.wafv2.web_acls_list_only
-;
+WHERE region = 'us-east-1';
 ```
 </TabItem>
 </Tabs>
@@ -928,10 +928,10 @@ INSERT INTO awscc.wafv2.web_acls (
  VisibilityConfig,
  region
 )
-SELECT 
-'{{ DefaultAction }}',
- '{{ Scope }}',
- '{{ VisibilityConfig }}',
+SELECT
+'{{ default_action }}',
+ '{{ scope }}',
+ '{{ visibility_config }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -956,21 +956,21 @@ INSERT INTO awscc.wafv2.web_acls (
  OnSourceDDoSProtectionConfig,
  region
 )
-SELECT 
- '{{ DefaultAction }}',
- '{{ Description }}',
- '{{ Name }}',
- '{{ Scope }}',
- '{{ Rules }}',
- '{{ VisibilityConfig }}',
- '{{ DataProtectionConfig }}',
- '{{ Tags }}',
- '{{ CustomResponseBodies }}',
- '{{ CaptchaConfig }}',
- '{{ ChallengeConfig }}',
- '{{ TokenDomains }}',
- '{{ AssociationConfig }}',
- '{{ OnSourceDDoSProtectionConfig }}',
+SELECT
+ '{{ default_action }}',
+ '{{ description }}',
+ '{{ name }}',
+ '{{ scope }}',
+ '{{ rules }}',
+ '{{ visibility_config }}',
+ '{{ data_protection_config }}',
+ '{{ tags }}',
+ '{{ custom_response_bodies }}',
+ '{{ captcha_config }}',
+ '{{ challenge_config }}',
+ '{{ token_domains }}',
+ '{{ association_config }}',
+ '{{ on_source_ddo_sprotection_config }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -988,299 +988,298 @@ globals:
 resources:
   - name: web_acl
     props:
-      - name: DefaultAction
+      - name: default_action
         value:
-          Allow:
-            CustomRequestHandling:
-              InsertHeaders:
-                - Name: '{{ Name }}'
-                  Value: '{{ Value }}'
-          Block:
-            CustomResponse:
-              ResponseCode: '{{ ResponseCode }}'
-              CustomResponseBodyKey: '{{ CustomResponseBodyKey }}'
-              ResponseHeaders:
+          allow:
+            custom_request_handling:
+              insert_headers:
+                - name: '{{ name }}'
+                  value: '{{ value }}'
+          block:
+            custom_response:
+              response_code: '{{ response_code }}'
+              custom_response_body_key: '{{ custom_response_body_key }}'
+              response_headers:
                 - null
-      - name: Description
-        value: '{{ Description }}'
-      - name: Name
-        value: '{{ Name }}'
-      - name: Scope
-        value: '{{ Scope }}'
-      - name: Rules
+      - name: description
+        value: '{{ description }}'
+      - name: name
+        value: '{{ name }}'
+      - name: scope
+        value: '{{ scope }}'
+      - name: rules
         value:
-          - Name: null
-            Priority: '{{ Priority }}'
-            Statement:
-              ByteMatchStatement:
-                SearchString: '{{ SearchString }}'
-                SearchStringBase64: '{{ SearchStringBase64 }}'
-                FieldToMatch:
-                  SingleHeader:
-                    Name: '{{ Name }}'
-                  SingleQueryArgument:
-                    Name: '{{ Name }}'
-                  AllQueryArguments: {}
-                  UriPath: {}
-                  QueryString: {}
-                  Body:
-                    OversizeHandling: '{{ OversizeHandling }}'
-                  Method: {}
-                  JsonBody:
-                    MatchPattern:
-                      All: {}
-                      IncludedPaths:
-                        - '{{ IncludedPaths[0] }}'
-                    MatchScope: '{{ MatchScope }}'
-                    InvalidFallbackBehavior: '{{ InvalidFallbackBehavior }}'
-                    OversizeHandling: null
-                  Headers:
-                    MatchPattern:
-                      All: {}
-                      IncludedHeaders:
-                        - '{{ IncludedHeaders[0] }}'
-                      ExcludedHeaders:
-                        - '{{ ExcludedHeaders[0] }}'
-                    MatchScope: '{{ MatchScope }}'
-                    OversizeHandling: null
-                  Cookies:
-                    MatchPattern:
-                      All: {}
-                      IncludedCookies:
-                        - '{{ IncludedCookies[0] }}'
-                      ExcludedCookies:
-                        - '{{ ExcludedCookies[0] }}'
-                    MatchScope: null
-                    OversizeHandling: null
-                  JA3Fingerprint:
-                    FallbackBehavior: '{{ FallbackBehavior }}'
-                  JA4Fingerprint:
-                    FallbackBehavior: '{{ FallbackBehavior }}'
-                  UriFragment:
-                    FallbackBehavior: '{{ FallbackBehavior }}'
-                TextTransformations:
-                  - Priority: '{{ Priority }}'
-                    Type: '{{ Type }}'
-                PositionalConstraint: '{{ PositionalConstraint }}'
-              SqliMatchStatement:
-                FieldToMatch: null
-                TextTransformations:
+          - name: null
+            priority: '{{ priority }}'
+            statement:
+              byte_match_statement:
+                search_string: '{{ search_string }}'
+                search_string_base64: '{{ search_string_base64 }}'
+                field_to_match:
+                  single_header:
+                    name: '{{ name }}'
+                  single_query_argument:
+                    name: '{{ name }}'
+                  all_query_arguments: {}
+                  uri_path: {}
+                  query_string: {}
+                  body:
+                    oversize_handling: '{{ oversize_handling }}'
+                  method: {}
+                  json_body:
+                    match_pattern:
+                      all: {}
+                      included_paths:
+                        - '{{ included_paths[0] }}'
+                    match_scope: '{{ match_scope }}'
+                    invalid_fallback_behavior: '{{ invalid_fallback_behavior }}'
+                    oversize_handling: null
+                  headers:
+                    match_pattern:
+                      all: {}
+                      included_headers:
+                        - '{{ included_headers[0] }}'
+                      excluded_headers:
+                        - '{{ excluded_headers[0] }}'
+                    match_scope: '{{ match_scope }}'
+                    oversize_handling: null
+                  cookies:
+                    match_pattern:
+                      all: {}
+                      included_cookies:
+                        - '{{ included_cookies[0] }}'
+                      excluded_cookies:
+                        - '{{ excluded_cookies[0] }}'
+                    match_scope: null
+                    oversize_handling: null
+                  j_a3_fingerprint:
+                    fallback_behavior: '{{ fallback_behavior }}'
+                  j_a4_fingerprint:
+                    fallback_behavior: '{{ fallback_behavior }}'
+                  uri_fragment:
+                    fallback_behavior: '{{ fallback_behavior }}'
+                text_transformations:
+                  - priority: '{{ priority }}'
+                    type: '{{ type }}'
+                positional_constraint: '{{ positional_constraint }}'
+              sqli_match_statement:
+                field_to_match: null
+                text_transformations:
                   - null
-                SensitivityLevel: '{{ SensitivityLevel }}'
-              XssMatchStatement:
-                FieldToMatch: null
-                TextTransformations:
+                sensitivity_level: '{{ sensitivity_level }}'
+              xss_match_statement:
+                field_to_match: null
+                text_transformations:
                   - null
-              SizeConstraintStatement:
-                FieldToMatch: null
-                ComparisonOperator: '{{ ComparisonOperator }}'
-                Size: null
-                TextTransformations:
+              size_constraint_statement:
+                field_to_match: null
+                comparison_operator: '{{ comparison_operator }}'
+                size: null
+                text_transformations:
                   - null
-              GeoMatchStatement:
-                CountryCodes:
-                  - '{{ CountryCodes[0] }}'
-                ForwardedIPConfig:
-                  HeaderName: '{{ HeaderName }}'
-                  FallbackBehavior: '{{ FallbackBehavior }}'
-              RuleGroupReferenceStatement:
-                Arn: '{{ Arn }}'
-                ExcludedRules:
-                  - Name: null
-                RuleActionOverrides:
-                  - Name: null
-                    ActionToUse:
-                      Allow: null
-                      Block: null
-                      Count:
-                        CustomRequestHandling: null
-                      Captcha:
-                        CustomRequestHandling: null
-                      Challenge:
-                        CustomRequestHandling: null
-              IPSetReferenceStatement:
-                Arn: null
-                IPSetForwardedIPConfig:
-                  HeaderName: '{{ HeaderName }}'
-                  FallbackBehavior: '{{ FallbackBehavior }}'
-                  Position: '{{ Position }}'
-              RegexPatternSetReferenceStatement:
-                Arn: null
-                FieldToMatch: null
-                TextTransformations:
+              geo_match_statement:
+                country_codes:
+                  - '{{ country_codes[0] }}'
+                forwarded_ip_config:
+                  header_name: '{{ header_name }}'
+                  fallback_behavior: '{{ fallback_behavior }}'
+              rule_group_reference_statement:
+                arn: '{{ arn }}'
+                excluded_rules:
+                  - name: null
+                rule_action_overrides:
+                  - name: null
+                    action_to_use:
+                      allow: null
+                      block: null
+                      count:
+                        custom_request_handling: null
+                      captcha:
+                        custom_request_handling: null
+                      challenge:
+                        custom_request_handling: null
+              ip_set_reference_statement:
+                arn: null
+                ip_set_forwarded_ip_config:
+                  header_name: '{{ header_name }}'
+                  fallback_behavior: '{{ fallback_behavior }}'
+                  position: '{{ position }}'
+              regex_pattern_set_reference_statement:
+                arn: null
+                field_to_match: null
+                text_transformations:
                   - null
-              ManagedRuleGroupStatement:
-                Name: null
-                VendorName: '{{ VendorName }}'
-                Version: '{{ Version }}'
-                ExcludedRules:
+              managed_rule_group_statement:
+                name: null
+                vendor_name: '{{ vendor_name }}'
+                version: '{{ version }}'
+                excluded_rules:
                   - null
-                ScopeDownStatement: null
-                ManagedRuleGroupConfigs:
-                  - LoginPath: '{{ LoginPath }}'
-                    PayloadType: '{{ PayloadType }}'
-                    UsernameField:
-                      Identifier: '{{ Identifier }}'
-                    PasswordField: null
-                    AWSManagedRulesBotControlRuleSet:
-                      InspectionLevel: '{{ InspectionLevel }}'
-                      EnableMachineLearning: '{{ EnableMachineLearning }}'
-                    AWSManagedRulesATPRuleSet:
-                      LoginPath: '{{ LoginPath }}'
-                      EnableRegexInPath: '{{ EnableRegexInPath }}'
-                      RequestInspection:
-                        PayloadType: '{{ PayloadType }}'
-                        UsernameField: null
-                        PasswordField: null
-                      ResponseInspection:
-                        StatusCode:
-                          SuccessCodes:
-                            - '{{ SuccessCodes[0] }}'
-                          FailureCodes:
-                            - '{{ FailureCodes[0] }}'
-                        Header:
-                          Name: '{{ Name }}'
-                          SuccessValues:
-                            - '{{ SuccessValues[0] }}'
-                          FailureValues:
-                            - '{{ FailureValues[0] }}'
-                        BodyContains:
-                          SuccessStrings:
-                            - '{{ SuccessStrings[0] }}'
-                          FailureStrings:
-                            - '{{ FailureStrings[0] }}'
-                        Json:
-                          Identifier: '{{ Identifier }}'
-                          SuccessValues:
-                            - '{{ SuccessValues[0] }}'
-                          FailureValues:
-                            - '{{ FailureValues[0] }}'
-                    AWSManagedRulesACFPRuleSet:
-                      CreationPath: '{{ CreationPath }}'
-                      RegistrationPagePath: '{{ RegistrationPagePath }}'
-                      RequestInspection:
-                        PayloadType: '{{ PayloadType }}'
-                        UsernameField: null
-                        PasswordField: null
-                        EmailField: null
-                        PhoneNumberFields:
+                scope_down_statement: null
+                managed_rule_group_configs:
+                  - login_path: '{{ login_path }}'
+                    payload_type: '{{ payload_type }}'
+                    username_field:
+                      identifier: '{{ identifier }}'
+                    password_field: null
+                    aws_managed_rules_bot_control_rule_set:
+                      inspection_level: '{{ inspection_level }}'
+                      enable_machine_learning: '{{ enable_machine_learning }}'
+                    aws_managed_rules_at_prule_set:
+                      login_path: '{{ login_path }}'
+                      enable_regex_in_path: '{{ enable_regex_in_path }}'
+                      request_inspection:
+                        payload_type: '{{ payload_type }}'
+                        username_field: null
+                        password_field: null
+                      response_inspection:
+                        status_code:
+                          success_codes:
+                            - '{{ success_codes[0] }}'
+                          failure_codes:
+                            - '{{ failure_codes[0] }}'
+                        header:
+                          name: '{{ name }}'
+                          success_values:
+                            - '{{ success_values[0] }}'
+                          failure_values:
+                            - '{{ failure_values[0] }}'
+                        body_contains:
+                          success_strings:
+                            - '{{ success_strings[0] }}'
+                          failure_strings:
+                            - '{{ failure_strings[0] }}'
+                        json:
+                          identifier: '{{ identifier }}'
+                          success_values:
+                            - '{{ success_values[0] }}'
+                          failure_values:
+                            - '{{ failure_values[0] }}'
+                    aws_managed_rules_ac_fp_rule_set:
+                      creation_path: '{{ creation_path }}'
+                      registration_page_path: '{{ registration_page_path }}'
+                      request_inspection:
+                        payload_type: '{{ payload_type }}'
+                        username_field: null
+                        password_field: null
+                        email_field: null
+                        phone_number_fields:
                           - null
-                        AddressFields:
+                        address_fields:
                           - null
-                      ResponseInspection: null
-                      EnableRegexInPath: '{{ EnableRegexInPath }}'
-                    AWSManagedRulesAntiDDoSRuleSet:
-                      ClientSideActionConfig:
-                        Challenge:
-                          UsageOfAction: '{{ UsageOfAction }}'
-                          Sensitivity: '{{ Sensitivity }}'
-                          ExemptUriRegularExpressions:
-                            - RegexString: '{{ RegexString }}'
-                      SensitivityToBlock: null
-                RuleActionOverrides:
+                      response_inspection: null
+                      enable_regex_in_path: '{{ enable_regex_in_path }}'
+                    aws_managed_rules_anti_ddo_srule_set:
+                      client_side_action_config:
+                        challenge:
+                          usage_of_action: '{{ usage_of_action }}'
+                          sensitivity: '{{ sensitivity }}'
+                          exempt_uri_regular_expressions:
+                            - regex_string: '{{ regex_string }}'
+                      sensitivity_to_block: null
+                rule_action_overrides:
                   - null
-              RateBasedStatement:
-                Limit: '{{ Limit }}'
-                EvaluationWindowSec: '{{ EvaluationWindowSec }}'
-                AggregateKeyType: '{{ AggregateKeyType }}'
-                CustomKeys:
-                  - Cookie:
-                      Name: '{{ Name }}'
-                      TextTransformations:
+              rate_based_statement:
+                limit: '{{ limit }}'
+                evaluation_window_sec: '{{ evaluation_window_sec }}'
+                aggregate_key_type: '{{ aggregate_key_type }}'
+                custom_keys:
+                  - cookie:
+                      name: '{{ name }}'
+                      text_transformations:
                         - null
-                    ForwardedIP: {}
-                    Header:
-                      Name: '{{ Name }}'
-                      TextTransformations:
+                    forwarded_ip: {}
+                    header:
+                      name: '{{ name }}'
+                      text_transformations:
                         - null
-                    HTTPMethod: {}
-                    IP: {}
-                    LabelNamespace:
-                      Namespace: '{{ Namespace }}'
-                    QueryArgument:
-                      Name: '{{ Name }}'
-                      TextTransformations:
+                    h_tt_pmethod: {}
+                    ip: {}
+                    label_namespace:
+                      namespace: '{{ namespace }}'
+                    query_argument:
+                      name: '{{ name }}'
+                      text_transformations:
                         - null
-                    QueryString:
-                      TextTransformations:
+                    query_string:
+                      text_transformations:
                         - null
-                    UriPath:
-                      TextTransformations:
+                    uri_path:
+                      text_transformations:
                         - null
-                    JA3Fingerprint:
-                      FallbackBehavior: '{{ FallbackBehavior }}'
-                    JA4Fingerprint:
-                      FallbackBehavior: '{{ FallbackBehavior }}'
-                    ASN: {}
-                ScopeDownStatement: null
-                ForwardedIPConfig: null
-              AndStatement:
-                Statements:
+                    j_a3_fingerprint:
+                      fallback_behavior: '{{ fallback_behavior }}'
+                    j_a4_fingerprint:
+                      fallback_behavior: '{{ fallback_behavior }}'
+                    a_sn: {}
+                scope_down_statement: null
+                forwarded_ip_config: null
+              and_statement:
+                statements:
                   - null
-              OrStatement:
-                Statements:
+              or_statement:
+                statements:
                   - null
-              NotStatement:
-                Statement: null
-              LabelMatchStatement:
-                Scope: '{{ Scope }}'
-                Key: '{{ Key }}'
-              RegexMatchStatement:
-                RegexString: '{{ RegexString }}'
-                FieldToMatch: null
-                TextTransformations:
+              not_statement:
+                statement: null
+              label_match_statement:
+                scope: '{{ scope }}'
+                key: '{{ key }}'
+              regex_match_statement:
+                regex_string: '{{ regex_string }}'
+                field_to_match: null
+                text_transformations:
                   - null
-              AsnMatchStatement:
-                AsnList:
-                  - '{{ AsnList[0] }}'
-                ForwardedIPConfig: null
-            Action: null
-            OverrideAction:
-              Count: {}
-              None: {}
-            RuleLabels:
-              - Name: '{{ Name }}'
-            VisibilityConfig:
-              SampledRequestsEnabled: '{{ SampledRequestsEnabled }}'
-              CloudWatchMetricsEnabled: '{{ CloudWatchMetricsEnabled }}'
-              MetricName: '{{ MetricName }}'
-            CaptchaConfig:
-              ImmunityTimeProperty:
-                ImmunityTime: '{{ ImmunityTime }}'
-            ChallengeConfig:
-              ImmunityTimeProperty: null
-      - name: VisibilityConfig
+              asn_match_statement:
+                asn_list:
+                  - '{{ asn_list[0] }}'
+                forwarded_ip_config: null
+            action: null
+            override_action:
+              count: {}
+              none: {}
+            rule_labels:
+              - name: '{{ name }}'
+            visibility_config:
+              sampled_requests_enabled: '{{ sampled_requests_enabled }}'
+              cloud_watch_metrics_enabled: '{{ cloud_watch_metrics_enabled }}'
+              metric_name: '{{ metric_name }}'
+            captcha_config:
+              immunity_time_property:
+                immunity_time: '{{ immunity_time }}'
+            challenge_config:
+              immunity_time_property: null
+      - name: visibility_config
         value: null
-      - name: DataProtectionConfig
+      - name: data_protection_config
         value:
-          DataProtections:
-            - Field:
-                FieldType: '{{ FieldType }}'
-                FieldKeys:
-                  - '{{ FieldKeys[0] }}'
-              Action: '{{ Action }}'
-              ExcludeRuleMatchDetails: '{{ ExcludeRuleMatchDetails }}'
-              ExcludeRateBasedDetails: '{{ ExcludeRateBasedDetails }}'
-      - name: Tags
+          data_protections:
+            - field:
+                field_type: '{{ field_type }}'
+                field_keys:
+                  - '{{ field_keys[0] }}'
+              action: '{{ action }}'
+              exclude_rule_match_details: '{{ exclude_rule_match_details }}'
+              exclude_rate_based_details: '{{ exclude_rate_based_details }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-      - name: CustomResponseBodies
+          - key: '{{ key }}'
+            value: '{{ value }}'
+      - name: custom_response_bodies
         value: {}
-      - name: CaptchaConfig
+      - name: captcha_config
         value: null
-      - name: ChallengeConfig
+      - name: challenge_config
         value: null
-      - name: TokenDomains
+      - name: token_domains
         value:
-          - '{{ TokenDomains[0] }}'
-      - name: AssociationConfig
+          - '{{ token_domains[0] }}'
+      - name: association_config
         value:
-          RequestBody: {}
-      - name: OnSourceDDoSProtectionConfig
+          request_body: {}
+      - name: on_source_ddo_sprotection_config
         value:
-          ALBLowReputationMode: '{{ ALBLowReputationMode }}'
-
+          a_lb_low_reputation_mode: '{{ a_lb_low_reputation_mode }}'
 ```
 </TabItem>
 </Tabs>
@@ -1307,7 +1306,7 @@ SET PatchDocument = string('{{ {
     "OnSourceDDoSProtectionConfig": on_source_ddo_sprotection_config
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Name>|<Id>|<Scope>';
+AND Identifier = '{{ name }}|{{ id }}|{{ scope }}';
 ```
 
 
@@ -1316,7 +1315,7 @@ AND Identifier = '<Name>|<Id>|<Scope>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.wafv2.web_acls
-WHERE Identifier = '<Name|Id|Scope>'
+WHERE Identifier = '{{ name }}|{{ id }}|{{ scope }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/wafv2/webacl_associations/index.md b/website/docs/services/wafv2/webacl_associations/index.md
index f4961b694..7401fe8f4 100644
--- a/website/docs/services/wafv2/webacl_associations/index.md
+++ b/website/docs/services/wafv2/webacl_associations/index.md
@@ -89,7 +89,7 @@ region,
 resource_arn,
 web_acl_arn
 FROM awscc.wafv2.webacl_associations
-WHERE Identifier = '<ResourceArn>|<WebACLArn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ resource_arn }}|{{ web_acl_arn }}';
 ```
 
 ## `INSERT` example
@@ -113,9 +113,9 @@ INSERT INTO awscc.wafv2.webacl_associations (
  WebACLArn,
  region
 )
-SELECT 
-'{{ ResourceArn }}',
- '{{ WebACLArn }}',
+SELECT
+'{{ resource_arn }}',
+ '{{ web_acl_arn }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -128,9 +128,9 @@ INSERT INTO awscc.wafv2.webacl_associations (
  WebACLArn,
  region
 )
-SELECT 
- '{{ ResourceArn }}',
- '{{ WebACLArn }}',
+SELECT
+ '{{ resource_arn }}',
+ '{{ web_acl_arn }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -148,11 +148,10 @@ globals:
 resources:
   - name: webacl_association
     props:
-      - name: ResourceArn
-        value: '{{ ResourceArn }}'
-      - name: WebACLArn
+      - name: resource_arn
+        value: '{{ resource_arn }}'
+      - name: web_acl_arn
         value: null
-
 ```
 </TabItem>
 </Tabs>
@@ -163,7 +162,7 @@ resources:
 ```sql
 /*+ delete */
 DELETE FROM awscc.wafv2.webacl_associations
-WHERE Identifier = '<ResourceArn|WebACLArn>'
+WHERE Identifier = '{{ resource_arn }}|{{ web_acl_arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/wisdom/ai_agent_versions/index.md b/website/docs/services/wisdom/ai_agent_versions/index.md
index 04ed5442a..04f1fec95 100644
--- a/website/docs/services/wisdom/ai_agent_versions/index.md
+++ b/website/docs/services/wisdom/ai_agent_versions/index.md
@@ -180,7 +180,7 @@ a_iagent_version_id,
 version_number,
 modified_time_seconds
 FROM awscc.wisdom.ai_agent_versions
-WHERE region = 'us-east-1' AND Identifier = '<AssistantId>|<AIAgentId>|<VersionNumber>';
+WHERE region = 'us-east-1' AND Identifier = '{{ assistant_id }}|{{ a_iagent_id }}|{{ version_number }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -219,9 +219,9 @@ INSERT INTO awscc.wisdom.ai_agent_versions (
  AssistantId,
  region
 )
-SELECT 
-'{{ AIAgentId }}',
- '{{ AssistantId }}',
+SELECT
+'{{ a_iagent_id }}',
+ '{{ assistant_id }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -235,10 +235,10 @@ INSERT INTO awscc.wisdom.ai_agent_versions (
  ModifiedTimeSeconds,
  region
 )
-SELECT 
- '{{ AIAgentId }}',
- '{{ AssistantId }}',
- '{{ ModifiedTimeSeconds }}',
+SELECT
+ '{{ a_iagent_id }}',
+ '{{ assistant_id }}',
+ '{{ modified_time_seconds }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -256,13 +256,12 @@ globals:
 resources:
   - name: ai_agent_version
     props:
-      - name: AIAgentId
-        value: '{{ AIAgentId }}'
-      - name: AssistantId
-        value: '{{ AssistantId }}'
-      - name: ModifiedTimeSeconds
+      - name: a_iagent_id
+        value: '{{ a_iagent_id }}'
+      - name: assistant_id
+        value: '{{ assistant_id }}'
+      - name: modified_time_seconds
         value: null
-
 ```
 </TabItem>
 </Tabs>
@@ -273,7 +272,7 @@ resources:
 ```sql
 /*+ delete */
 DELETE FROM awscc.wisdom.ai_agent_versions
-WHERE Identifier = '<AssistantId|AIAgentId|VersionNumber>'
+WHERE Identifier = '{{ assistant_id }}|{{ a_iagent_id }}|{{ version_number }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/wisdom/ai_agents/index.md b/website/docs/services/wisdom/ai_agents/index.md
index 375fee8b6..ea6e55929 100644
--- a/website/docs/services/wisdom/ai_agents/index.md
+++ b/website/docs/services/wisdom/ai_agents/index.md
@@ -193,7 +193,7 @@ tags,
 type,
 modified_time_seconds
 FROM awscc.wisdom.ai_agents
-WHERE region = 'us-east-1' AND Identifier = '<AIAgentId>|<AssistantId>';
+WHERE region = 'us-east-1' AND Identifier = '{{ a_iagent_id }}|{{ assistant_id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -232,10 +232,10 @@ INSERT INTO awscc.wisdom.ai_agents (
  Type,
  region
 )
-SELECT 
-'{{ AssistantId }}',
- '{{ Configuration }}',
- '{{ Type }}',
+SELECT
+'{{ assistant_id }}',
+ '{{ configuration }}',
+ '{{ type }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -252,13 +252,13 @@ INSERT INTO awscc.wisdom.ai_agents (
  Type,
  region
 )
-SELECT 
- '{{ AssistantId }}',
- '{{ Configuration }}',
- '{{ Description }}',
- '{{ Name }}',
- '{{ Tags }}',
- '{{ Type }}',
+SELECT
+ '{{ assistant_id }}',
+ '{{ configuration }}',
+ '{{ description }}',
+ '{{ name }}',
+ '{{ tags }}',
+ '{{ type }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -276,19 +276,18 @@ globals:
 resources:
   - name: ai_agent
     props:
-      - name: AssistantId
-        value: '{{ AssistantId }}'
-      - name: Configuration
+      - name: assistant_id
+        value: '{{ assistant_id }}'
+      - name: configuration
         value: null
-      - name: Description
-        value: '{{ Description }}'
-      - name: Name
-        value: '{{ Name }}'
-      - name: Tags
+      - name: description
+        value: '{{ description }}'
+      - name: name
+        value: '{{ name }}'
+      - name: tags
         value: {}
-      - name: Type
-        value: '{{ Type }}'
-
+      - name: type
+        value: '{{ type }}'
 ```
 </TabItem>
 </Tabs>
@@ -305,7 +304,7 @@ SET PatchDocument = string('{{ {
     "Description": description
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<AIAgentId>|<AssistantId>';
+AND Identifier = '{{ a_iagent_id }}|{{ assistant_id }}';
 ```
 
 
@@ -314,7 +313,7 @@ AND Identifier = '<AIAgentId>|<AssistantId>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.wisdom.ai_agents
-WHERE Identifier = '<AIAgentId|AssistantId>'
+WHERE Identifier = '{{ a_iagent_id }}|{{ assistant_id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/wisdom/ai_guardrail_versions/index.md b/website/docs/services/wisdom/ai_guardrail_versions/index.md
index 68552ce6a..db4b18e5b 100644
--- a/website/docs/services/wisdom/ai_guardrail_versions/index.md
+++ b/website/docs/services/wisdom/ai_guardrail_versions/index.md
@@ -180,7 +180,7 @@ a_iguardrail_version_id,
 version_number,
 modified_time_seconds
 FROM awscc.wisdom.ai_guardrail_versions
-WHERE region = 'us-east-1' AND Identifier = '<AssistantId>|<AIGuardrailId>|<VersionNumber>';
+WHERE region = 'us-east-1' AND Identifier = '{{ assistant_id }}|{{ a_iguardrail_id }}|{{ version_number }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -219,9 +219,9 @@ INSERT INTO awscc.wisdom.ai_guardrail_versions (
  AssistantId,
  region
 )
-SELECT 
-'{{ AIGuardrailId }}',
- '{{ AssistantId }}',
+SELECT
+'{{ a_iguardrail_id }}',
+ '{{ assistant_id }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -235,10 +235,10 @@ INSERT INTO awscc.wisdom.ai_guardrail_versions (
  ModifiedTimeSeconds,
  region
 )
-SELECT 
- '{{ AIGuardrailId }}',
- '{{ AssistantId }}',
- '{{ ModifiedTimeSeconds }}',
+SELECT
+ '{{ a_iguardrail_id }}',
+ '{{ assistant_id }}',
+ '{{ modified_time_seconds }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -256,13 +256,12 @@ globals:
 resources:
   - name: ai_guardrail_version
     props:
-      - name: AIGuardrailId
-        value: '{{ AIGuardrailId }}'
-      - name: AssistantId
-        value: '{{ AssistantId }}'
-      - name: ModifiedTimeSeconds
+      - name: a_iguardrail_id
+        value: '{{ a_iguardrail_id }}'
+      - name: assistant_id
+        value: '{{ assistant_id }}'
+      - name: modified_time_seconds
         value: null
-
 ```
 </TabItem>
 </Tabs>
@@ -273,7 +272,7 @@ resources:
 ```sql
 /*+ delete */
 DELETE FROM awscc.wisdom.ai_guardrail_versions
-WHERE Identifier = '<AssistantId|AIGuardrailId|VersionNumber>'
+WHERE Identifier = '{{ assistant_id }}|{{ a_iguardrail_id }}|{{ version_number }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/wisdom/ai_guardrails/index.md b/website/docs/services/wisdom/ai_guardrails/index.md
index 91a2cc40a..25765ee34 100644
--- a/website/docs/services/wisdom/ai_guardrails/index.md
+++ b/website/docs/services/wisdom/ai_guardrails/index.md
@@ -356,7 +356,7 @@ sensitive_information_policy_config,
 contextual_grounding_policy_config,
 tags
 FROM awscc.wisdom.ai_guardrails
-WHERE region = 'us-east-1' AND Identifier = '<AIGuardrailId>|<AssistantId>';
+WHERE region = 'us-east-1' AND Identifier = '{{ a_iguardrail_id }}|{{ assistant_id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -395,10 +395,10 @@ INSERT INTO awscc.wisdom.ai_guardrails (
  BlockedOutputsMessaging,
  region
 )
-SELECT 
-'{{ AssistantId }}',
- '{{ BlockedInputMessaging }}',
- '{{ BlockedOutputsMessaging }}',
+SELECT
+'{{ assistant_id }}',
+ '{{ blocked_input_messaging }}',
+ '{{ blocked_outputs_messaging }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -420,18 +420,18 @@ INSERT INTO awscc.wisdom.ai_guardrails (
  Tags,
  region
 )
-SELECT 
- '{{ AssistantId }}',
- '{{ Name }}',
- '{{ BlockedInputMessaging }}',
- '{{ BlockedOutputsMessaging }}',
- '{{ Description }}',
- '{{ TopicPolicyConfig }}',
- '{{ ContentPolicyConfig }}',
- '{{ WordPolicyConfig }}',
- '{{ SensitiveInformationPolicyConfig }}',
- '{{ ContextualGroundingPolicyConfig }}',
- '{{ Tags }}',
+SELECT
+ '{{ assistant_id }}',
+ '{{ name }}',
+ '{{ blocked_input_messaging }}',
+ '{{ blocked_outputs_messaging }}',
+ '{{ description }}',
+ '{{ topic_policy_config }}',
+ '{{ content_policy_config }}',
+ '{{ word_policy_config }}',
+ '{{ sensitive_information_policy_config }}',
+ '{{ contextual_grounding_policy_config }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -449,54 +449,53 @@ globals:
 resources:
   - name: ai_guardrail
     props:
-      - name: AssistantId
-        value: '{{ AssistantId }}'
-      - name: Name
-        value: '{{ Name }}'
-      - name: BlockedInputMessaging
-        value: '{{ BlockedInputMessaging }}'
-      - name: BlockedOutputsMessaging
-        value: '{{ BlockedOutputsMessaging }}'
-      - name: Description
-        value: '{{ Description }}'
-      - name: TopicPolicyConfig
+      - name: assistant_id
+        value: '{{ assistant_id }}'
+      - name: name
+        value: '{{ name }}'
+      - name: blocked_input_messaging
+        value: '{{ blocked_input_messaging }}'
+      - name: blocked_outputs_messaging
+        value: '{{ blocked_outputs_messaging }}'
+      - name: description
+        value: '{{ description }}'
+      - name: topic_policy_config
         value:
-          TopicsConfig:
-            - Name: '{{ Name }}'
-              Definition: '{{ Definition }}'
-              Examples:
-                - '{{ Examples[0] }}'
-              Type: '{{ Type }}'
-      - name: ContentPolicyConfig
+          topics_config:
+            - name: '{{ name }}'
+              definition: '{{ definition }}'
+              examples:
+                - '{{ examples[0] }}'
+              type: '{{ type }}'
+      - name: content_policy_config
         value:
-          FiltersConfig:
-            - Type: '{{ Type }}'
-              InputStrength: '{{ InputStrength }}'
-              OutputStrength: null
-      - name: WordPolicyConfig
+          filters_config:
+            - type: '{{ type }}'
+              input_strength: '{{ input_strength }}'
+              output_strength: null
+      - name: word_policy_config
         value:
-          WordsConfig:
-            - Text: '{{ Text }}'
-          ManagedWordListsConfig:
-            - Type: '{{ Type }}'
-      - name: SensitiveInformationPolicyConfig
+          words_config:
+            - text: '{{ text }}'
+          managed_word_lists_config:
+            - type: '{{ type }}'
+      - name: sensitive_information_policy_config
         value:
-          PiiEntitiesConfig:
-            - Type: '{{ Type }}'
-              Action: '{{ Action }}'
-          RegexesConfig:
-            - Name: '{{ Name }}'
-              Description: '{{ Description }}'
-              Pattern: '{{ Pattern }}'
-              Action: null
-      - name: ContextualGroundingPolicyConfig
+          pii_entities_config:
+            - type: '{{ type }}'
+              action: '{{ action }}'
+          regexes_config:
+            - name: '{{ name }}'
+              description: '{{ description }}'
+              pattern: '{{ pattern }}'
+              action: null
+      - name: contextual_grounding_policy_config
         value:
-          FiltersConfig:
-            - Type: '{{ Type }}'
-              Threshold: null
-      - name: Tags
+          filters_config:
+            - type: '{{ type }}'
+              threshold: null
+      - name: tags
         value: {}
-
 ```
 </TabItem>
 </Tabs>
@@ -519,7 +518,7 @@ SET PatchDocument = string('{{ {
     "ContextualGroundingPolicyConfig": contextual_grounding_policy_config
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<AIGuardrailId>|<AssistantId>';
+AND Identifier = '{{ a_iguardrail_id }}|{{ assistant_id }}';
 ```
 
 
@@ -528,7 +527,7 @@ AND Identifier = '<AIGuardrailId>|<AssistantId>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.wisdom.ai_guardrails
-WHERE Identifier = '<AIGuardrailId|AssistantId>'
+WHERE Identifier = '{{ a_iguardrail_id }}|{{ assistant_id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/wisdom/ai_prompt_versions/index.md b/website/docs/services/wisdom/ai_prompt_versions/index.md
index 3c99cf2b5..903fb8047 100644
--- a/website/docs/services/wisdom/ai_prompt_versions/index.md
+++ b/website/docs/services/wisdom/ai_prompt_versions/index.md
@@ -180,7 +180,7 @@ a_iprompt_version_id,
 version_number,
 modified_time_seconds
 FROM awscc.wisdom.ai_prompt_versions
-WHERE region = 'us-east-1' AND Identifier = '<AssistantId>|<AIPromptId>|<VersionNumber>';
+WHERE region = 'us-east-1' AND Identifier = '{{ assistant_id }}|{{ a_iprompt_id }}|{{ version_number }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -219,9 +219,9 @@ INSERT INTO awscc.wisdom.ai_prompt_versions (
  AssistantId,
  region
 )
-SELECT 
-'{{ AIPromptId }}',
- '{{ AssistantId }}',
+SELECT
+'{{ a_iprompt_id }}',
+ '{{ assistant_id }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -235,10 +235,10 @@ INSERT INTO awscc.wisdom.ai_prompt_versions (
  ModifiedTimeSeconds,
  region
 )
-SELECT 
- '{{ AIPromptId }}',
- '{{ AssistantId }}',
- '{{ ModifiedTimeSeconds }}',
+SELECT
+ '{{ a_iprompt_id }}',
+ '{{ assistant_id }}',
+ '{{ modified_time_seconds }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -256,13 +256,12 @@ globals:
 resources:
   - name: ai_prompt_version
     props:
-      - name: AIPromptId
-        value: '{{ AIPromptId }}'
-      - name: AssistantId
-        value: '{{ AssistantId }}'
-      - name: ModifiedTimeSeconds
+      - name: a_iprompt_id
+        value: '{{ a_iprompt_id }}'
+      - name: assistant_id
+        value: '{{ assistant_id }}'
+      - name: modified_time_seconds
         value: null
-
 ```
 </TabItem>
 </Tabs>
@@ -273,7 +272,7 @@ resources:
 ```sql
 /*+ delete */
 DELETE FROM awscc.wisdom.ai_prompt_versions
-WHERE Identifier = '<AssistantId|AIPromptId|VersionNumber>'
+WHERE Identifier = '{{ assistant_id }}|{{ a_iprompt_id }}|{{ version_number }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/wisdom/ai_prompts/index.md b/website/docs/services/wisdom/ai_prompts/index.md
index b9f7f5737..566610789 100644
--- a/website/docs/services/wisdom/ai_prompts/index.md
+++ b/website/docs/services/wisdom/ai_prompts/index.md
@@ -211,7 +211,7 @@ template_type,
 type,
 modified_time_seconds
 FROM awscc.wisdom.ai_prompts
-WHERE region = 'us-east-1' AND Identifier = '<AIPromptId>|<AssistantId>';
+WHERE region = 'us-east-1' AND Identifier = '{{ a_iprompt_id }}|{{ assistant_id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -252,12 +252,12 @@ INSERT INTO awscc.wisdom.ai_prompts (
  Type,
  region
 )
-SELECT 
-'{{ ApiFormat }}',
- '{{ ModelId }}',
- '{{ TemplateConfiguration }}',
- '{{ TemplateType }}',
- '{{ Type }}',
+SELECT
+'{{ api_format }}',
+ '{{ model_id }}',
+ '{{ template_configuration }}',
+ '{{ template_type }}',
+ '{{ type }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -277,16 +277,16 @@ INSERT INTO awscc.wisdom.ai_prompts (
  Type,
  region
 )
-SELECT 
- '{{ ApiFormat }}',
- '{{ AssistantId }}',
- '{{ Description }}',
- '{{ ModelId }}',
- '{{ Name }}',
- '{{ Tags }}',
- '{{ TemplateConfiguration }}',
- '{{ TemplateType }}',
- '{{ Type }}',
+SELECT
+ '{{ api_format }}',
+ '{{ assistant_id }}',
+ '{{ description }}',
+ '{{ model_id }}',
+ '{{ name }}',
+ '{{ tags }}',
+ '{{ template_configuration }}',
+ '{{ template_type }}',
+ '{{ type }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -304,25 +304,24 @@ globals:
 resources:
   - name: ai_prompt
     props:
-      - name: ApiFormat
-        value: '{{ ApiFormat }}'
-      - name: AssistantId
-        value: '{{ AssistantId }}'
-      - name: Description
-        value: '{{ Description }}'
-      - name: ModelId
-        value: '{{ ModelId }}'
-      - name: Name
-        value: '{{ Name }}'
-      - name: Tags
+      - name: api_format
+        value: '{{ api_format }}'
+      - name: assistant_id
+        value: '{{ assistant_id }}'
+      - name: description
+        value: '{{ description }}'
+      - name: model_id
+        value: '{{ model_id }}'
+      - name: name
+        value: '{{ name }}'
+      - name: tags
         value: {}
-      - name: TemplateConfiguration
+      - name: template_configuration
         value: {}
-      - name: TemplateType
-        value: '{{ TemplateType }}'
-      - name: Type
-        value: '{{ Type }}'
-
+      - name: template_type
+        value: '{{ template_type }}'
+      - name: type
+        value: '{{ type }}'
 ```
 </TabItem>
 </Tabs>
@@ -340,7 +339,7 @@ SET PatchDocument = string('{{ {
     "TemplateConfiguration": template_configuration
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<AIPromptId>|<AssistantId>';
+AND Identifier = '{{ a_iprompt_id }}|{{ assistant_id }}';
 ```
 
 
@@ -349,7 +348,7 @@ AND Identifier = '<AIPromptId>|<AssistantId>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.wisdom.ai_prompts
-WHERE Identifier = '<AIPromptId|AssistantId>'
+WHERE Identifier = '{{ a_iprompt_id }}|{{ assistant_id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/wisdom/assistant_associations/index.md b/website/docs/services/wisdom/assistant_associations/index.md
index 9e7b23ee5..1621058de 100644
--- a/website/docs/services/wisdom/assistant_associations/index.md
+++ b/website/docs/services/wisdom/assistant_associations/index.md
@@ -206,7 +206,7 @@ association,
 association_type,
 tags
 FROM awscc.wisdom.assistant_associations
-WHERE region = 'us-east-1' AND Identifier = '<AssistantAssociationId>|<AssistantId>';
+WHERE region = 'us-east-1' AND Identifier = '{{ assistant_association_id }}|{{ assistant_id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -245,10 +245,10 @@ INSERT INTO awscc.wisdom.assistant_associations (
  AssociationType,
  region
 )
-SELECT 
-'{{ AssistantId }}',
- '{{ Association }}',
- '{{ AssociationType }}',
+SELECT
+'{{ assistant_id }}',
+ '{{ association }}',
+ '{{ association_type }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -263,11 +263,11 @@ INSERT INTO awscc.wisdom.assistant_associations (
  Tags,
  region
 )
-SELECT 
- '{{ AssistantId }}',
- '{{ Association }}',
- '{{ AssociationType }}',
- '{{ Tags }}',
+SELECT
+ '{{ assistant_id }}',
+ '{{ association }}',
+ '{{ association_type }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -285,18 +285,17 @@ globals:
 resources:
   - name: assistant_association
     props:
-      - name: AssistantId
-        value: '{{ AssistantId }}'
-      - name: Association
+      - name: assistant_id
+        value: '{{ assistant_id }}'
+      - name: association
         value:
-          KnowledgeBaseId: '{{ KnowledgeBaseId }}'
-      - name: AssociationType
-        value: '{{ AssociationType }}'
-      - name: Tags
+          knowledge_base_id: '{{ knowledge_base_id }}'
+      - name: association_type
+        value: '{{ association_type }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -307,7 +306,7 @@ resources:
 ```sql
 /*+ delete */
 DELETE FROM awscc.wisdom.assistant_associations
-WHERE Identifier = '<AssistantAssociationId|AssistantId>'
+WHERE Identifier = '{{ assistant_association_id }}|{{ assistant_id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/wisdom/assistants/index.md b/website/docs/services/wisdom/assistants/index.md
index eecbac19d..0587b89ea 100644
--- a/website/docs/services/wisdom/assistants/index.md
+++ b/website/docs/services/wisdom/assistants/index.md
@@ -189,7 +189,7 @@ server_side_encryption_configuration,
 tags,
 name
 FROM awscc.wisdom.assistants
-WHERE region = 'us-east-1' AND Identifier = '<AssistantId>';
+WHERE region = 'us-east-1' AND Identifier = '{{ assistant_id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -226,9 +226,9 @@ INSERT INTO awscc.wisdom.assistants (
  Name,
  region
 )
-SELECT 
-'{{ Type }}',
- '{{ Name }}',
+SELECT
+'{{ type }}',
+ '{{ name }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -244,12 +244,12 @@ INSERT INTO awscc.wisdom.assistants (
  Name,
  region
 )
-SELECT 
- '{{ Type }}',
- '{{ Description }}',
- '{{ ServerSideEncryptionConfiguration }}',
- '{{ Tags }}',
- '{{ Name }}',
+SELECT
+ '{{ type }}',
+ '{{ description }}',
+ '{{ server_side_encryption_configuration }}',
+ '{{ tags }}',
+ '{{ name }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -267,20 +267,19 @@ globals:
 resources:
   - name: assistant
     props:
-      - name: Type
-        value: '{{ Type }}'
-      - name: Description
-        value: '{{ Description }}'
-      - name: ServerSideEncryptionConfiguration
+      - name: type
+        value: '{{ type }}'
+      - name: description
+        value: '{{ description }}'
+      - name: server_side_encryption_configuration
         value:
-          KmsKeyId: '{{ KmsKeyId }}'
-      - name: Tags
+          kms_key_id: '{{ kms_key_id }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-      - name: Name
-        value: '{{ Name }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
+      - name: name
+        value: '{{ name }}'
 ```
 </TabItem>
 </Tabs>
@@ -291,7 +290,7 @@ resources:
 ```sql
 /*+ delete */
 DELETE FROM awscc.wisdom.assistants
-WHERE Identifier = '<AssistantId>'
+WHERE Identifier = '{{ assistant_id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/wisdom/knowledge_bases/index.md b/website/docs/services/wisdom/knowledge_bases/index.md
index bd394edc0..1ba3a5918 100644
--- a/website/docs/services/wisdom/knowledge_bases/index.md
+++ b/website/docs/services/wisdom/knowledge_bases/index.md
@@ -313,7 +313,7 @@ source_configuration,
 vector_ingestion_configuration,
 tags
 FROM awscc.wisdom.knowledge_bases
-WHERE region = 'us-east-1' AND Identifier = '<KnowledgeBaseId>';
+WHERE region = 'us-east-1' AND Identifier = '{{ knowledge_base_id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -350,9 +350,9 @@ INSERT INTO awscc.wisdom.knowledge_bases (
  Name,
  region
 )
-SELECT 
-'{{ KnowledgeBaseType }}',
- '{{ Name }}',
+SELECT
+'{{ knowledge_base_type }}',
+ '{{ name }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -371,15 +371,15 @@ INSERT INTO awscc.wisdom.knowledge_bases (
  Tags,
  region
 )
-SELECT 
- '{{ Description }}',
- '{{ KnowledgeBaseType }}',
- '{{ Name }}',
- '{{ RenderingConfiguration }}',
- '{{ ServerSideEncryptionConfiguration }}',
- '{{ SourceConfiguration }}',
- '{{ VectorIngestionConfiguration }}',
- '{{ Tags }}',
+SELECT
+ '{{ description }}',
+ '{{ knowledge_base_type }}',
+ '{{ name }}',
+ '{{ rendering_configuration }}',
+ '{{ server_side_encryption_configuration }}',
+ '{{ source_configuration }}',
+ '{{ vector_ingestion_configuration }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -397,46 +397,45 @@ globals:
 resources:
   - name: knowledge_base
     props:
-      - name: Description
-        value: '{{ Description }}'
-      - name: KnowledgeBaseType
-        value: '{{ KnowledgeBaseType }}'
-      - name: Name
-        value: '{{ Name }}'
-      - name: RenderingConfiguration
+      - name: description
+        value: '{{ description }}'
+      - name: knowledge_base_type
+        value: '{{ knowledge_base_type }}'
+      - name: name
+        value: '{{ name }}'
+      - name: rendering_configuration
         value:
-          TemplateUri: '{{ TemplateUri }}'
-      - name: ServerSideEncryptionConfiguration
+          template_uri: '{{ template_uri }}'
+      - name: server_side_encryption_configuration
         value:
-          KmsKeyId: '{{ KmsKeyId }}'
-      - name: SourceConfiguration
+          kms_key_id: '{{ kms_key_id }}'
+      - name: source_configuration
         value: null
-      - name: VectorIngestionConfiguration
+      - name: vector_ingestion_configuration
         value:
-          ChunkingConfiguration:
-            ChunkingStrategy: '{{ ChunkingStrategy }}'
-            FixedSizeChunkingConfiguration:
-              MaxTokens: null
-              OverlapPercentage: null
-            HierarchicalChunkingConfiguration:
-              LevelConfigurations:
-                - MaxTokens: null
-              OverlapTokens: null
-            SemanticChunkingConfiguration:
-              MaxTokens: null
-              BufferSize: null
-              BreakpointPercentileThreshold: null
-          ParsingConfiguration:
-            ParsingStrategy: '{{ ParsingStrategy }}'
-            BedrockFoundationModelConfiguration:
-              ModelArn: '{{ ModelArn }}'
-              ParsingPrompt:
-                ParsingPromptText: '{{ ParsingPromptText }}'
-      - name: Tags
+          chunking_configuration:
+            chunking_strategy: '{{ chunking_strategy }}'
+            fixed_size_chunking_configuration:
+              max_tokens: null
+              overlap_percentage: null
+            hierarchical_chunking_configuration:
+              level_configurations:
+                - max_tokens: null
+              overlap_tokens: null
+            semantic_chunking_configuration:
+              max_tokens: null
+              buffer_size: null
+              breakpoint_percentile_threshold: null
+          parsing_configuration:
+            parsing_strategy: '{{ parsing_strategy }}'
+            bedrock_foundation_model_configuration:
+              model_arn: '{{ model_arn }}'
+              parsing_prompt:
+                parsing_prompt_text: '{{ parsing_prompt_text }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -453,7 +452,7 @@ SET PatchDocument = string('{{ {
     "VectorIngestionConfiguration": vector_ingestion_configuration
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<KnowledgeBaseId>';
+AND Identifier = '{{ knowledge_base_id }}';
 ```
 
 
@@ -462,7 +461,7 @@ AND Identifier = '<KnowledgeBaseId>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.wisdom.knowledge_bases
-WHERE Identifier = '<KnowledgeBaseId>'
+WHERE Identifier = '{{ knowledge_base_id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/wisdom/message_template_versions/index.md b/website/docs/services/wisdom/message_template_versions/index.md
index 06009c3cf..93891797d 100644
--- a/website/docs/services/wisdom/message_template_versions/index.md
+++ b/website/docs/services/wisdom/message_template_versions/index.md
@@ -152,7 +152,7 @@ message_template_version_arn,
 message_template_content_sha256,
 message_template_version_number
 FROM awscc.wisdom.message_template_versions
-WHERE region = 'us-east-1' AND Identifier = '<MessageTemplateVersionArn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ message_template_version_arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -188,8 +188,8 @@ INSERT INTO awscc.wisdom.message_template_versions (
  MessageTemplateArn,
  region
 )
-SELECT 
-'{{ MessageTemplateArn }}',
+SELECT
+'{{ message_template_arn }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -202,9 +202,9 @@ INSERT INTO awscc.wisdom.message_template_versions (
  MessageTemplateContentSha256,
  region
 )
-SELECT 
- '{{ MessageTemplateArn }}',
- '{{ MessageTemplateContentSha256 }}',
+SELECT
+ '{{ message_template_arn }}',
+ '{{ message_template_content_sha256 }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -222,11 +222,10 @@ globals:
 resources:
   - name: message_template_version
     props:
-      - name: MessageTemplateArn
-        value: '{{ MessageTemplateArn }}'
-      - name: MessageTemplateContentSha256
-        value: '{{ MessageTemplateContentSha256 }}'
-
+      - name: message_template_arn
+        value: '{{ message_template_arn }}'
+      - name: message_template_content_sha256
+        value: '{{ message_template_content_sha256 }}'
 ```
 </TabItem>
 </Tabs>
@@ -242,7 +241,7 @@ SET PatchDocument = string('{{ {
     "MessageTemplateContentSha256": message_template_content_sha256
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<MessageTemplateVersionArn>';
+AND Identifier = '{{ message_template_version_arn }}';
 ```
 
 
@@ -251,7 +250,7 @@ AND Identifier = '<MessageTemplateVersionArn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.wisdom.message_template_versions
-WHERE Identifier = '<MessageTemplateVersionArn>'
+WHERE Identifier = '{{ message_template_version_arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/wisdom/message_templates/index.md b/website/docs/services/wisdom/message_templates/index.md
index f842c821a..c7ff2dde2 100644
--- a/website/docs/services/wisdom/message_templates/index.md
+++ b/website/docs/services/wisdom/message_templates/index.md
@@ -654,7 +654,7 @@ message_template_content_sha256,
 message_template_attachments,
 tags
 FROM awscc.wisdom.message_templates
-WHERE region = 'us-east-1' AND Identifier = '<MessageTemplateArn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ message_template_arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -693,11 +693,11 @@ INSERT INTO awscc.wisdom.message_templates (
  Content,
  region
 )
-SELECT 
-'{{ KnowledgeBaseArn }}',
- '{{ Name }}',
- '{{ ChannelSubtype }}',
- '{{ Content }}',
+SELECT
+'{{ knowledge_base_arn }}',
+ '{{ name }}',
+ '{{ channel_subtype }}',
+ '{{ content }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -718,17 +718,17 @@ INSERT INTO awscc.wisdom.message_templates (
  Tags,
  region
 )
-SELECT 
- '{{ KnowledgeBaseArn }}',
- '{{ Name }}',
- '{{ ChannelSubtype }}',
- '{{ Content }}',
- '{{ Description }}',
- '{{ Language }}',
- '{{ GroupingConfiguration }}',
- '{{ DefaultAttributes }}',
- '{{ MessageTemplateAttachments }}',
- '{{ Tags }}',
+SELECT
+ '{{ knowledge_base_arn }}',
+ '{{ name }}',
+ '{{ channel_subtype }}',
+ '{{ content }}',
+ '{{ description }}',
+ '{{ language }}',
+ '{{ grouping_configuration }}',
+ '{{ default_attributes }}',
+ '{{ message_template_attachments }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -746,115 +746,114 @@ globals:
 resources:
   - name: message_template
     props:
-      - name: KnowledgeBaseArn
-        value: '{{ KnowledgeBaseArn }}'
-      - name: Name
-        value: '{{ Name }}'
-      - name: ChannelSubtype
-        value: '{{ ChannelSubtype }}'
-      - name: Content
+      - name: knowledge_base_arn
+        value: '{{ knowledge_base_arn }}'
+      - name: name
+        value: '{{ name }}'
+      - name: channel_subtype
+        value: '{{ channel_subtype }}'
+      - name: content
         value:
-          EmailMessageTemplateContent:
-            Subject: '{{ Subject }}'
-            Body:
-              PlainText:
-                Content: '{{ Content }}'
-              Html: null
-            Headers:
-              - Name: '{{ Name }}'
-                Value: '{{ Value }}'
-          SmsMessageTemplateContent:
-            Body:
-              PlainText: null
-      - name: Description
-        value: '{{ Description }}'
-      - name: Language
-        value: '{{ Language }}'
-      - name: GroupingConfiguration
+          email_message_template_content:
+            subject: '{{ subject }}'
+            body:
+              plain_text:
+                content: '{{ content }}'
+              html: null
+            headers:
+              - name: '{{ name }}'
+                value: '{{ value }}'
+          sms_message_template_content:
+            body:
+              plain_text: null
+      - name: description
+        value: '{{ description }}'
+      - name: language
+        value: '{{ language }}'
+      - name: grouping_configuration
         value:
-          Criteria: '{{ Criteria }}'
-          Values:
-            - '{{ Values[0] }}'
-      - name: DefaultAttributes
+          criteria: '{{ criteria }}'
+          values:
+            - '{{ values[0] }}'
+      - name: default_attributes
         value:
-          SystemAttributes:
-            Name: '{{ Name }}'
-            CustomerEndpoint:
-              Address: '{{ Address }}'
-            SystemEndpoint: null
-          AgentAttributes:
-            FirstName: '{{ FirstName }}'
-            LastName: '{{ LastName }}'
-          CustomerProfileAttributes:
-            ProfileId: '{{ ProfileId }}'
-            ProfileARN: '{{ ProfileARN }}'
-            FirstName: '{{ FirstName }}'
-            MiddleName: '{{ MiddleName }}'
-            LastName: '{{ LastName }}'
-            AccountNumber: '{{ AccountNumber }}'
-            EmailAddress: '{{ EmailAddress }}'
-            PhoneNumber: '{{ PhoneNumber }}'
-            AdditionalInformation: '{{ AdditionalInformation }}'
-            PartyType: '{{ PartyType }}'
-            BusinessName: '{{ BusinessName }}'
-            BirthDate: '{{ BirthDate }}'
-            Gender: '{{ Gender }}'
-            MobilePhoneNumber: '{{ MobilePhoneNumber }}'
-            HomePhoneNumber: '{{ HomePhoneNumber }}'
-            BusinessPhoneNumber: '{{ BusinessPhoneNumber }}'
-            BusinessEmailAddress: '{{ BusinessEmailAddress }}'
-            Address1: '{{ Address1 }}'
-            Address2: '{{ Address2 }}'
-            Address3: '{{ Address3 }}'
-            Address4: '{{ Address4 }}'
-            City: '{{ City }}'
-            County: '{{ County }}'
-            Country: '{{ Country }}'
-            PostalCode: '{{ PostalCode }}'
-            Province: '{{ Province }}'
-            State: '{{ State }}'
-            ShippingAddress1: '{{ ShippingAddress1 }}'
-            ShippingAddress2: '{{ ShippingAddress2 }}'
-            ShippingAddress3: '{{ ShippingAddress3 }}'
-            ShippingAddress4: '{{ ShippingAddress4 }}'
-            ShippingCity: '{{ ShippingCity }}'
-            ShippingCounty: '{{ ShippingCounty }}'
-            ShippingCountry: '{{ ShippingCountry }}'
-            ShippingPostalCode: '{{ ShippingPostalCode }}'
-            ShippingProvince: '{{ ShippingProvince }}'
-            ShippingState: '{{ ShippingState }}'
-            MailingAddress1: '{{ MailingAddress1 }}'
-            MailingAddress2: '{{ MailingAddress2 }}'
-            MailingAddress3: '{{ MailingAddress3 }}'
-            MailingAddress4: '{{ MailingAddress4 }}'
-            MailingCity: '{{ MailingCity }}'
-            MailingCounty: '{{ MailingCounty }}'
-            MailingCountry: '{{ MailingCountry }}'
-            MailingPostalCode: '{{ MailingPostalCode }}'
-            MailingProvince: '{{ MailingProvince }}'
-            MailingState: '{{ MailingState }}'
-            BillingAddress1: '{{ BillingAddress1 }}'
-            BillingAddress2: '{{ BillingAddress2 }}'
-            BillingAddress3: '{{ BillingAddress3 }}'
-            BillingAddress4: '{{ BillingAddress4 }}'
-            BillingCity: '{{ BillingCity }}'
-            BillingCounty: '{{ BillingCounty }}'
-            BillingCountry: '{{ BillingCountry }}'
-            BillingPostalCode: '{{ BillingPostalCode }}'
-            BillingProvince: '{{ BillingProvince }}'
-            BillingState: '{{ BillingState }}'
-            Custom: {}
-          CustomAttributes: null
-      - name: MessageTemplateAttachments
+          system_attributes:
+            name: '{{ name }}'
+            customer_endpoint:
+              address: '{{ address }}'
+            system_endpoint: null
+          agent_attributes:
+            first_name: '{{ first_name }}'
+            last_name: '{{ last_name }}'
+          customer_profile_attributes:
+            profile_id: '{{ profile_id }}'
+            profile_arn: '{{ profile_arn }}'
+            first_name: '{{ first_name }}'
+            middle_name: '{{ middle_name }}'
+            last_name: '{{ last_name }}'
+            account_number: '{{ account_number }}'
+            email_address: '{{ email_address }}'
+            phone_number: '{{ phone_number }}'
+            additional_information: '{{ additional_information }}'
+            party_type: '{{ party_type }}'
+            business_name: '{{ business_name }}'
+            birth_date: '{{ birth_date }}'
+            gender: '{{ gender }}'
+            mobile_phone_number: '{{ mobile_phone_number }}'
+            home_phone_number: '{{ home_phone_number }}'
+            business_phone_number: '{{ business_phone_number }}'
+            business_email_address: '{{ business_email_address }}'
+            address1: '{{ address1 }}'
+            address2: '{{ address2 }}'
+            address3: '{{ address3 }}'
+            address4: '{{ address4 }}'
+            city: '{{ city }}'
+            county: '{{ county }}'
+            country: '{{ country }}'
+            postal_code: '{{ postal_code }}'
+            province: '{{ province }}'
+            state: '{{ state }}'
+            shipping_address1: '{{ shipping_address1 }}'
+            shipping_address2: '{{ shipping_address2 }}'
+            shipping_address3: '{{ shipping_address3 }}'
+            shipping_address4: '{{ shipping_address4 }}'
+            shipping_city: '{{ shipping_city }}'
+            shipping_county: '{{ shipping_county }}'
+            shipping_country: '{{ shipping_country }}'
+            shipping_postal_code: '{{ shipping_postal_code }}'
+            shipping_province: '{{ shipping_province }}'
+            shipping_state: '{{ shipping_state }}'
+            mailing_address1: '{{ mailing_address1 }}'
+            mailing_address2: '{{ mailing_address2 }}'
+            mailing_address3: '{{ mailing_address3 }}'
+            mailing_address4: '{{ mailing_address4 }}'
+            mailing_city: '{{ mailing_city }}'
+            mailing_county: '{{ mailing_county }}'
+            mailing_country: '{{ mailing_country }}'
+            mailing_postal_code: '{{ mailing_postal_code }}'
+            mailing_province: '{{ mailing_province }}'
+            mailing_state: '{{ mailing_state }}'
+            billing_address1: '{{ billing_address1 }}'
+            billing_address2: '{{ billing_address2 }}'
+            billing_address3: '{{ billing_address3 }}'
+            billing_address4: '{{ billing_address4 }}'
+            billing_city: '{{ billing_city }}'
+            billing_county: '{{ billing_county }}'
+            billing_country: '{{ billing_country }}'
+            billing_postal_code: '{{ billing_postal_code }}'
+            billing_province: '{{ billing_province }}'
+            billing_state: '{{ billing_state }}'
+            custom: {}
+          custom_attributes: null
+      - name: message_template_attachments
         value:
-          - AttachmentId: '{{ AttachmentId }}'
-            AttachmentName: '{{ AttachmentName }}'
-            S3PresignedUrl: '{{ S3PresignedUrl }}'
-      - name: Tags
+          - attachment_id: '{{ attachment_id }}'
+            attachment_name: '{{ attachment_name }}'
+            s3_presigned_url: '{{ s3_presigned_url }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -876,7 +875,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<MessageTemplateArn>';
+AND Identifier = '{{ message_template_arn }}';
 ```
 
 
@@ -885,7 +884,7 @@ AND Identifier = '<MessageTemplateArn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.wisdom.message_templates
-WHERE Identifier = '<MessageTemplateArn>'
+WHERE Identifier = '{{ message_template_arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/wisdom/quick_responses/index.md b/website/docs/services/wisdom/quick_responses/index.md
index c6f2b4198..3067145ef 100644
--- a/website/docs/services/wisdom/quick_responses/index.md
+++ b/website/docs/services/wisdom/quick_responses/index.md
@@ -249,7 +249,7 @@ shortcut_key,
 status,
 tags
 FROM awscc.wisdom.quick_responses
-WHERE region = 'us-east-1' AND Identifier = '<QuickResponseArn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ quick_response_arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -287,10 +287,10 @@ INSERT INTO awscc.wisdom.quick_responses (
  Content,
  region
 )
-SELECT 
-'{{ KnowledgeBaseArn }}',
- '{{ Name }}',
- '{{ Content }}',
+SELECT
+'{{ knowledge_base_arn }}',
+ '{{ name }}',
+ '{{ content }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -312,18 +312,18 @@ INSERT INTO awscc.wisdom.quick_responses (
  Tags,
  region
 )
-SELECT 
- '{{ ContentType }}',
- '{{ KnowledgeBaseArn }}',
- '{{ Name }}',
- '{{ Channels }}',
- '{{ Content }}',
- '{{ Description }}',
- '{{ GroupingConfiguration }}',
- '{{ IsActive }}',
- '{{ Language }}',
- '{{ ShortcutKey }}',
- '{{ Tags }}',
+SELECT
+ '{{ content_type }}',
+ '{{ knowledge_base_arn }}',
+ '{{ name }}',
+ '{{ channels }}',
+ '{{ content }}',
+ '{{ description }}',
+ '{{ grouping_configuration }}',
+ '{{ is_active }}',
+ '{{ language }}',
+ '{{ shortcut_key }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -341,36 +341,35 @@ globals:
 resources:
   - name: quick_response
     props:
-      - name: ContentType
-        value: '{{ ContentType }}'
-      - name: KnowledgeBaseArn
-        value: '{{ KnowledgeBaseArn }}'
-      - name: Name
-        value: '{{ Name }}'
-      - name: Channels
+      - name: content_type
+        value: '{{ content_type }}'
+      - name: knowledge_base_arn
+        value: '{{ knowledge_base_arn }}'
+      - name: name
+        value: '{{ name }}'
+      - name: channels
         value:
-          - '{{ Channels[0] }}'
-      - name: Content
+          - '{{ channels[0] }}'
+      - name: content
         value:
-          Content: '{{ Content }}'
-      - name: Description
-        value: '{{ Description }}'
-      - name: GroupingConfiguration
+          content: '{{ content }}'
+      - name: description
+        value: '{{ description }}'
+      - name: grouping_configuration
         value:
-          Criteria: '{{ Criteria }}'
-          Values:
-            - '{{ Values[0] }}'
-      - name: IsActive
-        value: '{{ IsActive }}'
-      - name: Language
-        value: '{{ Language }}'
-      - name: ShortcutKey
-        value: '{{ ShortcutKey }}'
-      - name: Tags
+          criteria: '{{ criteria }}'
+          values:
+            - '{{ values[0] }}'
+      - name: is_active
+        value: '{{ is_active }}'
+      - name: language
+        value: '{{ language }}'
+      - name: shortcut_key
+        value: '{{ shortcut_key }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -395,7 +394,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<QuickResponseArn>';
+AND Identifier = '{{ quick_response_arn }}';
 ```
 
 
@@ -404,7 +403,7 @@ AND Identifier = '<QuickResponseArn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.wisdom.quick_responses
-WHERE Identifier = '<QuickResponseArn>'
+WHERE Identifier = '{{ quick_response_arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/workspaces/connection_aliases/index.md b/website/docs/services/workspaces/connection_aliases/index.md
index 88f2754ac..ed874620a 100644
--- a/website/docs/services/workspaces/connection_aliases/index.md
+++ b/website/docs/services/workspaces/connection_aliases/index.md
@@ -141,7 +141,7 @@ connection_string,
 connection_alias_state,
 tags
 FROM awscc.workspaces.connection_aliases
-WHERE region = 'us-east-1' AND Identifier = '<AliasId>';
+WHERE region = 'us-east-1' AND Identifier = '{{ alias_id }}';
 ```
 
 ## `INSERT` example
@@ -164,8 +164,8 @@ INSERT INTO awscc.workspaces.connection_aliases (
  ConnectionString,
  region
 )
-SELECT 
-'{{ ConnectionString }}',
+SELECT
+'{{ connection_string }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -178,9 +178,9 @@ INSERT INTO awscc.workspaces.connection_aliases (
  Tags,
  region
 )
-SELECT 
- '{{ ConnectionString }}',
- '{{ Tags }}',
+SELECT
+ '{{ connection_string }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -198,13 +198,12 @@ globals:
 resources:
   - name: connection_alias
     props:
-      - name: ConnectionString
-        value: '{{ ConnectionString }}'
-      - name: Tags
+      - name: connection_string
+        value: '{{ connection_string }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -215,7 +214,7 @@ resources:
 ```sql
 /*+ delete */
 DELETE FROM awscc.workspaces.connection_aliases
-WHERE Identifier = '<AliasId>'
+WHERE Identifier = '{{ alias_id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/workspaces/workspaces_pools/index.md b/website/docs/services/workspaces/workspaces_pools/index.md
index fa015a379..f3db9af99 100644
--- a/website/docs/services/workspaces/workspaces_pools/index.md
+++ b/website/docs/services/workspaces/workspaces_pools/index.md
@@ -248,7 +248,7 @@ timeout_settings,
 running_mode,
 tags
 FROM awscc.workspaces.workspaces_pools
-WHERE region = 'us-east-1' AND Identifier = '<PoolId>';
+WHERE region = 'us-east-1' AND Identifier = '{{ pool_id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -287,11 +287,11 @@ INSERT INTO awscc.workspaces.workspaces_pools (
  DirectoryId,
  region
 )
-SELECT 
-'{{ Capacity }}',
- '{{ PoolName }}',
- '{{ BundleId }}',
- '{{ DirectoryId }}',
+SELECT
+'{{ capacity }}',
+ '{{ pool_name }}',
+ '{{ bundle_id }}',
+ '{{ directory_id }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -311,16 +311,16 @@ INSERT INTO awscc.workspaces.workspaces_pools (
  Tags,
  region
 )
-SELECT 
- '{{ Capacity }}',
- '{{ PoolName }}',
- '{{ Description }}',
- '{{ BundleId }}',
- '{{ DirectoryId }}',
- '{{ ApplicationSettings }}',
- '{{ TimeoutSettings }}',
- '{{ RunningMode }}',
- '{{ Tags }}',
+SELECT
+ '{{ capacity }}',
+ '{{ pool_name }}',
+ '{{ description }}',
+ '{{ bundle_id }}',
+ '{{ directory_id }}',
+ '{{ application_settings }}',
+ '{{ timeout_settings }}',
+ '{{ running_mode }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -338,33 +338,32 @@ globals:
 resources:
   - name: workspaces_pool
     props:
-      - name: Capacity
+      - name: capacity
         value:
-          DesiredUserSessions: '{{ DesiredUserSessions }}'
-      - name: PoolName
-        value: '{{ PoolName }}'
-      - name: Description
-        value: '{{ Description }}'
-      - name: BundleId
-        value: '{{ BundleId }}'
-      - name: DirectoryId
-        value: '{{ DirectoryId }}'
-      - name: ApplicationSettings
+          desired_user_sessions: '{{ desired_user_sessions }}'
+      - name: pool_name
+        value: '{{ pool_name }}'
+      - name: description
+        value: '{{ description }}'
+      - name: bundle_id
+        value: '{{ bundle_id }}'
+      - name: directory_id
+        value: '{{ directory_id }}'
+      - name: application_settings
         value:
-          Status: '{{ Status }}'
-          SettingsGroup: '{{ SettingsGroup }}'
-      - name: TimeoutSettings
+          status: '{{ status }}'
+          settings_group: '{{ settings_group }}'
+      - name: timeout_settings
         value:
-          DisconnectTimeoutInSeconds: '{{ DisconnectTimeoutInSeconds }}'
-          IdleDisconnectTimeoutInSeconds: '{{ IdleDisconnectTimeoutInSeconds }}'
-          MaxUserDurationInSeconds: '{{ MaxUserDurationInSeconds }}'
-      - name: RunningMode
-        value: '{{ RunningMode }}'
-      - name: Tags
+          disconnect_timeout_in_seconds: '{{ disconnect_timeout_in_seconds }}'
+          idle_disconnect_timeout_in_seconds: '{{ idle_disconnect_timeout_in_seconds }}'
+          max_user_duration_in_seconds: '{{ max_user_duration_in_seconds }}'
+      - name: running_mode
+        value: '{{ running_mode }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -387,7 +386,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<PoolId>';
+AND Identifier = '{{ pool_id }}';
 ```
 
 
@@ -396,7 +395,7 @@ AND Identifier = '<PoolId>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.workspaces.workspaces_pools
-WHERE Identifier = '<PoolId>'
+WHERE Identifier = '{{ pool_id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/workspacesinstances/volume_associations/index.md b/website/docs/services/workspacesinstances/volume_associations/index.md
index eabd5cbe2..15bcf7dd1 100644
--- a/website/docs/services/workspacesinstances/volume_associations/index.md
+++ b/website/docs/services/workspacesinstances/volume_associations/index.md
@@ -156,7 +156,7 @@ volume_id,
 device,
 disassociate_mode
 FROM awscc.workspacesinstances.volume_associations
-WHERE region = 'us-east-1' AND Identifier = '<WorkspaceInstanceId>|<VolumeId>|<Device>';
+WHERE region = 'us-east-1' AND Identifier = '{{ workspace_instance_id }}|{{ volume_id }}|{{ device }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -196,10 +196,10 @@ INSERT INTO awscc.workspacesinstances.volume_associations (
  Device,
  region
 )
-SELECT 
-'{{ WorkspaceInstanceId }}',
- '{{ VolumeId }}',
- '{{ Device }}',
+SELECT
+'{{ workspace_instance_id }}',
+ '{{ volume_id }}',
+ '{{ device }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -214,11 +214,11 @@ INSERT INTO awscc.workspacesinstances.volume_associations (
  DisassociateMode,
  region
 )
-SELECT 
- '{{ WorkspaceInstanceId }}',
- '{{ VolumeId }}',
- '{{ Device }}',
- '{{ DisassociateMode }}',
+SELECT
+ '{{ workspace_instance_id }}',
+ '{{ volume_id }}',
+ '{{ device }}',
+ '{{ disassociate_mode }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -236,15 +236,14 @@ globals:
 resources:
   - name: volume_association
     props:
-      - name: WorkspaceInstanceId
-        value: '{{ WorkspaceInstanceId }}'
-      - name: VolumeId
-        value: '{{ VolumeId }}'
-      - name: Device
-        value: '{{ Device }}'
-      - name: DisassociateMode
-        value: '{{ DisassociateMode }}'
-
+      - name: workspace_instance_id
+        value: '{{ workspace_instance_id }}'
+      - name: volume_id
+        value: '{{ volume_id }}'
+      - name: device
+        value: '{{ device }}'
+      - name: disassociate_mode
+        value: '{{ disassociate_mode }}'
 ```
 </TabItem>
 </Tabs>
@@ -255,7 +254,7 @@ resources:
 ```sql
 /*+ delete */
 DELETE FROM awscc.workspacesinstances.volume_associations
-WHERE Identifier = '<WorkspaceInstanceId|VolumeId|Device>'
+WHERE Identifier = '{{ workspace_instance_id }}|{{ volume_id }}|{{ device }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/workspacesinstances/volumes/index.md b/website/docs/services/workspacesinstances/volumes/index.md
index b125ccc6b..501bd6b8b 100644
--- a/website/docs/services/workspacesinstances/volumes/index.md
+++ b/website/docs/services/workspacesinstances/volumes/index.md
@@ -206,7 +206,7 @@ throughput,
 volume_type,
 tag_specifications
 FROM awscc.workspacesinstances.volumes
-WHERE region = 'us-east-1' AND Identifier = '<VolumeId>';
+WHERE region = 'us-east-1' AND Identifier = '{{ volume_id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -242,8 +242,8 @@ INSERT INTO awscc.workspacesinstances.volumes (
  AvailabilityZone,
  region
 )
-SELECT 
-'{{ AvailabilityZone }}',
+SELECT
+'{{ availability_zone }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -263,16 +263,16 @@ INSERT INTO awscc.workspacesinstances.volumes (
  TagSpecifications,
  region
 )
-SELECT 
- '{{ AvailabilityZone }}',
- '{{ Encrypted }}',
- '{{ Iops }}',
- '{{ KmsKeyId }}',
- '{{ SizeInGB }}',
- '{{ SnapshotId }}',
- '{{ Throughput }}',
- '{{ VolumeType }}',
- '{{ TagSpecifications }}',
+SELECT
+ '{{ availability_zone }}',
+ '{{ encrypted }}',
+ '{{ iops }}',
+ '{{ kms_key_id }}',
+ '{{ size_in_gb }}',
+ '{{ snapshot_id }}',
+ '{{ throughput }}',
+ '{{ volume_type }}',
+ '{{ tag_specifications }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -290,29 +290,28 @@ globals:
 resources:
   - name: volume
     props:
-      - name: AvailabilityZone
-        value: '{{ AvailabilityZone }}'
-      - name: Encrypted
-        value: '{{ Encrypted }}'
-      - name: Iops
-        value: '{{ Iops }}'
-      - name: KmsKeyId
-        value: '{{ KmsKeyId }}'
-      - name: SizeInGB
-        value: '{{ SizeInGB }}'
-      - name: SnapshotId
-        value: '{{ SnapshotId }}'
-      - name: Throughput
-        value: '{{ Throughput }}'
-      - name: VolumeType
-        value: '{{ VolumeType }}'
-      - name: TagSpecifications
+      - name: availability_zone
+        value: '{{ availability_zone }}'
+      - name: encrypted
+        value: '{{ encrypted }}'
+      - name: iops
+        value: '{{ iops }}'
+      - name: kms_key_id
+        value: '{{ kms_key_id }}'
+      - name: size_in_gb
+        value: '{{ size_in_gb }}'
+      - name: snapshot_id
+        value: '{{ snapshot_id }}'
+      - name: throughput
+        value: '{{ throughput }}'
+      - name: volume_type
+        value: '{{ volume_type }}'
+      - name: tag_specifications
         value:
-          - ResourceType: '{{ ResourceType }}'
-            Tags:
-              - Key: '{{ Key }}'
-                Value: '{{ Value }}'
-
+          - resource_type: '{{ resource_type }}'
+            tags:
+              - key: '{{ key }}'
+                value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -323,7 +322,7 @@ resources:
 ```sql
 /*+ delete */
 DELETE FROM awscc.workspacesinstances.volumes
-WHERE Identifier = '<VolumeId>'
+WHERE Identifier = '{{ volume_id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/workspacesinstances/workspace_instances/index.md b/website/docs/services/workspacesinstances/workspace_instances/index.md
index 2663b47e1..391a99388 100644
--- a/website/docs/services/workspacesinstances/workspace_instances/index.md
+++ b/website/docs/services/workspacesinstances/workspace_instances/index.md
@@ -611,7 +611,7 @@ workspace_instance_id,
 provision_state,
 e_c2_managed_instance
 FROM awscc.workspacesinstances.workspace_instances
-WHERE region = 'us-east-1' AND Identifier = '<WorkspaceInstanceId>';
+WHERE region = 'us-east-1' AND Identifier = '{{ workspace_instance_id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -647,7 +647,7 @@ INSERT INTO awscc.workspacesinstances.workspace_instances (
  ,
  region
 )
-SELECT 
+SELECT
 '{{  }}',
 '{{ region }}';
 ```
@@ -661,9 +661,9 @@ INSERT INTO awscc.workspacesinstances.workspace_instances (
  Tags,
  region
 )
-SELECT 
- '{{ ManagedInstance }}',
- '{{ Tags }}',
+SELECT
+ '{{ managed_instance }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -681,91 +681,90 @@ globals:
 resources:
   - name: workspace_instance
     props:
-      - name: ManagedInstance
+      - name: managed_instance
         value:
-          BlockDeviceMappings:
-            - DeviceName: '{{ DeviceName }}'
-              Ebs:
-                VolumeType: '{{ VolumeType }}'
-                Encrypted: '{{ Encrypted }}'
-                KmsKeyId: '{{ KmsKeyId }}'
-                Iops: '{{ Iops }}'
-                Throughput: '{{ Throughput }}'
-                VolumeSize: '{{ VolumeSize }}'
-              NoDevice: '{{ NoDevice }}'
-              VirtualName: '{{ VirtualName }}'
-          CapacityReservationSpecification:
-            CapacityReservationPreference: '{{ CapacityReservationPreference }}'
-            CapacityReservationTarget:
-              CapacityReservationId: '{{ CapacityReservationId }}'
-              CapacityReservationResourceGroupArn: '{{ CapacityReservationResourceGroupArn }}'
-          CpuOptions:
-            CoreCount: '{{ CoreCount }}'
-            ThreadsPerCore: '{{ ThreadsPerCore }}'
-          CreditSpecification:
-            CpuCredits: '{{ CpuCredits }}'
-          DisableApiStop: '{{ DisableApiStop }}'
-          EbsOptimized: '{{ EbsOptimized }}'
-          EnablePrimaryIpv6: '{{ EnablePrimaryIpv6 }}'
-          EnclaveOptions:
-            Enabled: '{{ Enabled }}'
-          HibernationOptions:
-            Configured: '{{ Configured }}'
-          IamInstanceProfile:
-            Arn: '{{ Arn }}'
-            Name: '{{ Name }}'
-          ImageId: '{{ ImageId }}'
-          InstanceMarketOptions:
-            MarketType: '{{ MarketType }}'
-            SpotOptions:
-              InstanceInterruptionBehavior: '{{ InstanceInterruptionBehavior }}'
-              MaxPrice: '{{ MaxPrice }}'
-              SpotInstanceType: '{{ SpotInstanceType }}'
-              ValidUntilUtc: '{{ ValidUntilUtc }}'
-          InstanceType: '{{ InstanceType }}'
-          Ipv6AddressCount: '{{ Ipv6AddressCount }}'
-          KeyName: '{{ KeyName }}'
-          LicenseSpecifications:
-            - LicenseConfigurationArn: '{{ LicenseConfigurationArn }}'
-          MaintenanceOptions:
-            AutoRecovery: '{{ AutoRecovery }}'
-          MetadataOptions:
-            HttpEndpoint: '{{ HttpEndpoint }}'
-            HttpProtocolIpv6: '{{ HttpProtocolIpv6 }}'
-            HttpPutResponseHopLimit: '{{ HttpPutResponseHopLimit }}'
-            HttpTokens: '{{ HttpTokens }}'
-            InstanceMetadataTags: '{{ InstanceMetadataTags }}'
-          Monitoring:
-            Enabled: '{{ Enabled }}'
-          NetworkInterfaces:
-            - Description: '{{ Description }}'
-              DeviceIndex: '{{ DeviceIndex }}'
-              Groups:
-                - '{{ Groups[0] }}'
-              SubnetId: '{{ SubnetId }}'
-          NetworkPerformanceOptions:
-            BandwidthWeighting: '{{ BandwidthWeighting }}'
-          Placement:
-            AvailabilityZone: '{{ AvailabilityZone }}'
-            GroupId: '{{ GroupId }}'
-            GroupName: '{{ GroupName }}'
-            PartitionNumber: '{{ PartitionNumber }}'
-            Tenancy: '{{ Tenancy }}'
-          PrivateDnsNameOptions:
-            HostnameType: '{{ HostnameType }}'
-            EnableResourceNameDnsARecord: '{{ EnableResourceNameDnsARecord }}'
-            EnableResourceNameDnsAAAARecord: '{{ EnableResourceNameDnsAAAARecord }}'
-          SubnetId: '{{ SubnetId }}'
-          TagSpecifications:
-            - ResourceType: '{{ ResourceType }}'
-              Tags:
-                - Key: '{{ Key }}'
-                  Value: '{{ Value }}'
-          UserData: '{{ UserData }}'
-      - name: Tags
+          block_device_mappings:
+            - device_name: '{{ device_name }}'
+              ebs:
+                volume_type: '{{ volume_type }}'
+                encrypted: '{{ encrypted }}'
+                kms_key_id: '{{ kms_key_id }}'
+                iops: '{{ iops }}'
+                throughput: '{{ throughput }}'
+                volume_size: '{{ volume_size }}'
+              no_device: '{{ no_device }}'
+              virtual_name: '{{ virtual_name }}'
+          capacity_reservation_specification:
+            capacity_reservation_preference: '{{ capacity_reservation_preference }}'
+            capacity_reservation_target:
+              capacity_reservation_id: '{{ capacity_reservation_id }}'
+              capacity_reservation_resource_group_arn: '{{ capacity_reservation_resource_group_arn }}'
+          cpu_options:
+            core_count: '{{ core_count }}'
+            threads_per_core: '{{ threads_per_core }}'
+          credit_specification:
+            cpu_credits: '{{ cpu_credits }}'
+          disable_api_stop: '{{ disable_api_stop }}'
+          ebs_optimized: '{{ ebs_optimized }}'
+          enable_primary_ipv6: '{{ enable_primary_ipv6 }}'
+          enclave_options:
+            enabled: '{{ enabled }}'
+          hibernation_options:
+            configured: '{{ configured }}'
+          iam_instance_profile:
+            arn: '{{ arn }}'
+            name: '{{ name }}'
+          image_id: '{{ image_id }}'
+          instance_market_options:
+            market_type: '{{ market_type }}'
+            spot_options:
+              instance_interruption_behavior: '{{ instance_interruption_behavior }}'
+              max_price: '{{ max_price }}'
+              spot_instance_type: '{{ spot_instance_type }}'
+              valid_until_utc: '{{ valid_until_utc }}'
+          instance_type: '{{ instance_type }}'
+          ipv6_address_count: '{{ ipv6_address_count }}'
+          key_name: '{{ key_name }}'
+          license_specifications:
+            - license_configuration_arn: '{{ license_configuration_arn }}'
+          maintenance_options:
+            auto_recovery: '{{ auto_recovery }}'
+          metadata_options:
+            http_endpoint: '{{ http_endpoint }}'
+            http_protocol_ipv6: '{{ http_protocol_ipv6 }}'
+            http_put_response_hop_limit: '{{ http_put_response_hop_limit }}'
+            http_tokens: '{{ http_tokens }}'
+            instance_metadata_tags: '{{ instance_metadata_tags }}'
+          monitoring:
+            enabled: '{{ enabled }}'
+          network_interfaces:
+            - description: '{{ description }}'
+              device_index: '{{ device_index }}'
+              groups:
+                - '{{ groups[0] }}'
+              subnet_id: '{{ subnet_id }}'
+          network_performance_options:
+            bandwidth_weighting: '{{ bandwidth_weighting }}'
+          placement:
+            availability_zone: '{{ availability_zone }}'
+            group_id: '{{ group_id }}'
+            group_name: '{{ group_name }}'
+            partition_number: '{{ partition_number }}'
+            tenancy: '{{ tenancy }}'
+          private_dns_name_options:
+            hostname_type: '{{ hostname_type }}'
+            enable_resource_name_dns_arecord: '{{ enable_resource_name_dns_arecord }}'
+            enable_resource_name_dns_aa_aa_record: '{{ enable_resource_name_dns_aa_aa_record }}'
+          subnet_id: '{{ subnet_id }}'
+          tag_specifications:
+            - resource_type: '{{ resource_type }}'
+              tags:
+                - key: '{{ key }}'
+                  value: '{{ value }}'
+          user_data: '{{ user_data }}'
+      - name: tags
         value:
           - null
-
 ```
 </TabItem>
 </Tabs>
@@ -781,7 +780,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<WorkspaceInstanceId>';
+AND Identifier = '{{ workspace_instance_id }}';
 ```
 
 
@@ -790,7 +789,7 @@ AND Identifier = '<WorkspaceInstanceId>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.workspacesinstances.workspace_instances
-WHERE Identifier = '<WorkspaceInstanceId>'
+WHERE Identifier = '{{ workspace_instance_id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/workspacesthinclient/environments/index.md b/website/docs/services/workspacesthinclient/environments/index.md
index 85aeb9b72..9fbf3ef79 100644
--- a/website/docs/services/workspacesthinclient/environments/index.md
+++ b/website/docs/services/workspacesthinclient/environments/index.md
@@ -287,7 +287,7 @@ kms_key_arn,
 tags,
 device_creation_tags
 FROM awscc.workspacesthinclient.environments
-WHERE region = 'us-east-1' AND Identifier = '<Id>';
+WHERE region = 'us-east-1' AND Identifier = '{{ id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -323,8 +323,8 @@ INSERT INTO awscc.workspacesthinclient.environments (
  DesktopArn,
  region
 )
-SELECT 
-'{{ DesktopArn }}',
+SELECT
+'{{ desktop_arn }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -345,17 +345,17 @@ INSERT INTO awscc.workspacesthinclient.environments (
  DeviceCreationTags,
  region
 )
-SELECT 
- '{{ Name }}',
- '{{ DesktopArn }}',
- '{{ DesktopEndpoint }}',
- '{{ SoftwareSetUpdateSchedule }}',
- '{{ MaintenanceWindow }}',
- '{{ SoftwareSetUpdateMode }}',
- '{{ DesiredSoftwareSetId }}',
- '{{ KmsKeyArn }}',
- '{{ Tags }}',
- '{{ DeviceCreationTags }}',
+SELECT
+ '{{ name }}',
+ '{{ desktop_arn }}',
+ '{{ desktop_endpoint }}',
+ '{{ software_set_update_schedule }}',
+ '{{ maintenance_window }}',
+ '{{ software_set_update_mode }}',
+ '{{ desired_software_set_id }}',
+ '{{ kms_key_arn }}',
+ '{{ tags }}',
+ '{{ device_creation_tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -373,38 +373,37 @@ globals:
 resources:
   - name: environment
     props:
-      - name: Name
-        value: '{{ Name }}'
-      - name: DesktopArn
-        value: '{{ DesktopArn }}'
-      - name: DesktopEndpoint
-        value: '{{ DesktopEndpoint }}'
-      - name: SoftwareSetUpdateSchedule
-        value: '{{ SoftwareSetUpdateSchedule }}'
-      - name: MaintenanceWindow
+      - name: name
+        value: '{{ name }}'
+      - name: desktop_arn
+        value: '{{ desktop_arn }}'
+      - name: desktop_endpoint
+        value: '{{ desktop_endpoint }}'
+      - name: software_set_update_schedule
+        value: '{{ software_set_update_schedule }}'
+      - name: maintenance_window
         value:
-          Type: '{{ Type }}'
-          StartTimeHour: '{{ StartTimeHour }}'
-          StartTimeMinute: '{{ StartTimeMinute }}'
-          EndTimeHour: null
-          EndTimeMinute: null
-          DaysOfTheWeek:
-            - '{{ DaysOfTheWeek[0] }}'
-          ApplyTimeOf: '{{ ApplyTimeOf }}'
-      - name: SoftwareSetUpdateMode
-        value: '{{ SoftwareSetUpdateMode }}'
-      - name: DesiredSoftwareSetId
-        value: '{{ DesiredSoftwareSetId }}'
-      - name: KmsKeyArn
-        value: '{{ KmsKeyArn }}'
-      - name: Tags
+          type: '{{ type }}'
+          start_time_hour: '{{ start_time_hour }}'
+          start_time_minute: '{{ start_time_minute }}'
+          end_time_hour: null
+          end_time_minute: null
+          days_of_the_week:
+            - '{{ days_of_the_week[0] }}'
+          apply_time_of: '{{ apply_time_of }}'
+      - name: software_set_update_mode
+        value: '{{ software_set_update_mode }}'
+      - name: desired_software_set_id
+        value: '{{ desired_software_set_id }}'
+      - name: kms_key_arn
+        value: '{{ kms_key_arn }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-      - name: DeviceCreationTags
+          - key: '{{ key }}'
+            value: '{{ value }}'
+      - name: device_creation_tags
         value:
           - null
-
 ```
 </TabItem>
 </Tabs>
@@ -427,7 +426,7 @@ SET PatchDocument = string('{{ {
     "DeviceCreationTags": device_creation_tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<Id>';
+AND Identifier = '{{ id }}';
 ```
 
 
@@ -436,7 +435,7 @@ AND Identifier = '<Id>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.workspacesthinclient.environments
-WHERE Identifier = '<Id>'
+WHERE Identifier = '{{ id }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/workspacesweb/browser_settings/index.md b/website/docs/services/workspacesweb/browser_settings/index.md
index 63a6f72d1..9958b8ec4 100644
--- a/website/docs/services/workspacesweb/browser_settings/index.md
+++ b/website/docs/services/workspacesweb/browser_settings/index.md
@@ -176,7 +176,7 @@ browser_settings_arn,
 customer_managed_key,
 tags
 FROM awscc.workspacesweb.browser_settings
-WHERE region = 'us-east-1' AND Identifier = '<BrowserSettingsArn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ browser_settings_arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -215,11 +215,11 @@ INSERT INTO awscc.workspacesweb.browser_settings (
  Tags,
  region
 )
-SELECT 
-'{{ AdditionalEncryptionContext }}',
- '{{ BrowserPolicy }}',
- '{{ CustomerManagedKey }}',
- '{{ Tags }}',
+SELECT
+'{{ additional_encryption_context }}',
+ '{{ browser_policy }}',
+ '{{ customer_managed_key }}',
+ '{{ tags }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -234,11 +234,11 @@ INSERT INTO awscc.workspacesweb.browser_settings (
  Tags,
  region
 )
-SELECT 
- '{{ AdditionalEncryptionContext }}',
- '{{ BrowserPolicy }}',
- '{{ CustomerManagedKey }}',
- '{{ Tags }}',
+SELECT
+ '{{ additional_encryption_context }}',
+ '{{ browser_policy }}',
+ '{{ customer_managed_key }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -256,17 +256,16 @@ globals:
 resources:
   - name: browser_setting
     props:
-      - name: AdditionalEncryptionContext
+      - name: additional_encryption_context
         value: {}
-      - name: BrowserPolicy
-        value: '{{ BrowserPolicy }}'
-      - name: CustomerManagedKey
-        value: '{{ CustomerManagedKey }}'
-      - name: Tags
+      - name: browser_policy
+        value: '{{ browser_policy }}'
+      - name: customer_managed_key
+        value: '{{ customer_managed_key }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -283,7 +282,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<BrowserSettingsArn>';
+AND Identifier = '{{ browser_settings_arn }}';
 ```
 
 
@@ -292,7 +291,7 @@ AND Identifier = '<BrowserSettingsArn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.workspacesweb.browser_settings
-WHERE Identifier = '<BrowserSettingsArn>'
+WHERE Identifier = '{{ browser_settings_arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/workspacesweb/data_protection_settings/index.md b/website/docs/services/workspacesweb/data_protection_settings/index.md
index 9b9a54b3f..e72cec5b3 100644
--- a/website/docs/services/workspacesweb/data_protection_settings/index.md
+++ b/website/docs/services/workspacesweb/data_protection_settings/index.md
@@ -282,7 +282,7 @@ display_name,
 inline_redaction_configuration,
 tags
 FROM awscc.workspacesweb.data_protection_settings
-WHERE region = 'us-east-1' AND Identifier = '<DataProtectionSettingsArn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ data_protection_settings_arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -323,13 +323,13 @@ INSERT INTO awscc.workspacesweb.data_protection_settings (
  Tags,
  region
 )
-SELECT 
-'{{ AdditionalEncryptionContext }}',
- '{{ CustomerManagedKey }}',
- '{{ Description }}',
- '{{ DisplayName }}',
- '{{ InlineRedactionConfiguration }}',
- '{{ Tags }}',
+SELECT
+'{{ additional_encryption_context }}',
+ '{{ customer_managed_key }}',
+ '{{ description }}',
+ '{{ display_name }}',
+ '{{ inline_redaction_configuration }}',
+ '{{ tags }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -346,13 +346,13 @@ INSERT INTO awscc.workspacesweb.data_protection_settings (
  Tags,
  region
 )
-SELECT 
- '{{ AdditionalEncryptionContext }}',
- '{{ CustomerManagedKey }}',
- '{{ Description }}',
- '{{ DisplayName }}',
- '{{ InlineRedactionConfiguration }}',
- '{{ Tags }}',
+SELECT
+ '{{ additional_encryption_context }}',
+ '{{ customer_managed_key }}',
+ '{{ description }}',
+ '{{ display_name }}',
+ '{{ inline_redaction_configuration }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -370,41 +370,40 @@ globals:
 resources:
   - name: data_protection_setting
     props:
-      - name: AdditionalEncryptionContext
+      - name: additional_encryption_context
         value: {}
-      - name: CustomerManagedKey
-        value: '{{ CustomerManagedKey }}'
-      - name: Description
-        value: '{{ Description }}'
-      - name: DisplayName
-        value: '{{ DisplayName }}'
-      - name: InlineRedactionConfiguration
+      - name: customer_managed_key
+        value: '{{ customer_managed_key }}'
+      - name: description
+        value: '{{ description }}'
+      - name: display_name
+        value: '{{ display_name }}'
+      - name: inline_redaction_configuration
         value:
-          InlineRedactionPatterns:
-            - BuiltInPatternId: '{{ BuiltInPatternId }}'
-              CustomPattern:
-                PatternName: '{{ PatternName }}'
-                PatternRegex: '{{ PatternRegex }}'
-                PatternDescription: '{{ PatternDescription }}'
-                KeywordRegex: '{{ KeywordRegex }}'
-              RedactionPlaceHolder:
-                RedactionPlaceHolderType: '{{ RedactionPlaceHolderType }}'
-                RedactionPlaceHolderText: '{{ RedactionPlaceHolderText }}'
-              EnforcedUrls:
-                - '{{ EnforcedUrls[0] }}'
-              ExemptUrls:
-                - '{{ ExemptUrls[0] }}'
-              ConfidenceLevel: null
-          GlobalEnforcedUrls:
-            - '{{ GlobalEnforcedUrls[0] }}'
-          GlobalExemptUrls:
-            - '{{ GlobalExemptUrls[0] }}'
-          GlobalConfidenceLevel: null
-      - name: Tags
+          inline_redaction_patterns:
+            - built_in_pattern_id: '{{ built_in_pattern_id }}'
+              custom_pattern:
+                pattern_name: '{{ pattern_name }}'
+                pattern_regex: '{{ pattern_regex }}'
+                pattern_description: '{{ pattern_description }}'
+                keyword_regex: '{{ keyword_regex }}'
+              redaction_place_holder:
+                redaction_place_holder_type: '{{ redaction_place_holder_type }}'
+                redaction_place_holder_text: '{{ redaction_place_holder_text }}'
+              enforced_urls:
+                - '{{ enforced_urls[0] }}'
+              exempt_urls:
+                - '{{ exempt_urls[0] }}'
+              confidence_level: null
+          global_enforced_urls:
+            - '{{ global_enforced_urls[0] }}'
+          global_exempt_urls:
+            - '{{ global_exempt_urls[0] }}'
+          global_confidence_level: null
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -423,7 +422,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<DataProtectionSettingsArn>';
+AND Identifier = '{{ data_protection_settings_arn }}';
 ```
 
 
@@ -432,7 +431,7 @@ AND Identifier = '<DataProtectionSettingsArn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.workspacesweb.data_protection_settings
-WHERE Identifier = '<DataProtectionSettingsArn>'
+WHERE Identifier = '{{ data_protection_settings_arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/workspacesweb/identity_providers/index.md b/website/docs/services/workspacesweb/identity_providers/index.md
index acbca6924..4bc5c8dc7 100644
--- a/website/docs/services/workspacesweb/identity_providers/index.md
+++ b/website/docs/services/workspacesweb/identity_providers/index.md
@@ -176,7 +176,7 @@ identity_provider_type,
 portal_arn,
 tags
 FROM awscc.workspacesweb.identity_providers
-WHERE region = 'us-east-1' AND Identifier = '<IdentityProviderArn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ identity_provider_arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -214,10 +214,10 @@ INSERT INTO awscc.workspacesweb.identity_providers (
  IdentityProviderType,
  region
 )
-SELECT 
-'{{ IdentityProviderDetails }}',
- '{{ IdentityProviderName }}',
- '{{ IdentityProviderType }}',
+SELECT
+'{{ identity_provider_details }}',
+ '{{ identity_provider_name }}',
+ '{{ identity_provider_type }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -233,12 +233,12 @@ INSERT INTO awscc.workspacesweb.identity_providers (
  Tags,
  region
 )
-SELECT 
- '{{ IdentityProviderDetails }}',
- '{{ IdentityProviderName }}',
- '{{ IdentityProviderType }}',
- '{{ PortalArn }}',
- '{{ Tags }}',
+SELECT
+ '{{ identity_provider_details }}',
+ '{{ identity_provider_name }}',
+ '{{ identity_provider_type }}',
+ '{{ portal_arn }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -256,19 +256,18 @@ globals:
 resources:
   - name: identity_provider
     props:
-      - name: IdentityProviderDetails
+      - name: identity_provider_details
         value: {}
-      - name: IdentityProviderName
-        value: '{{ IdentityProviderName }}'
-      - name: IdentityProviderType
-        value: '{{ IdentityProviderType }}'
-      - name: PortalArn
-        value: '{{ PortalArn }}'
-      - name: Tags
+      - name: identity_provider_name
+        value: '{{ identity_provider_name }}'
+      - name: identity_provider_type
+        value: '{{ identity_provider_type }}'
+      - name: portal_arn
+        value: '{{ portal_arn }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -287,7 +286,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<IdentityProviderArn>';
+AND Identifier = '{{ identity_provider_arn }}';
 ```
 
 
@@ -296,7 +295,7 @@ AND Identifier = '<IdentityProviderArn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.workspacesweb.identity_providers
-WHERE Identifier = '<IdentityProviderArn>'
+WHERE Identifier = '{{ identity_provider_arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/workspacesweb/ip_access_settings/index.md b/website/docs/services/workspacesweb/ip_access_settings/index.md
index 9c384fbdd..e01c559a7 100644
--- a/website/docs/services/workspacesweb/ip_access_settings/index.md
+++ b/website/docs/services/workspacesweb/ip_access_settings/index.md
@@ -206,7 +206,7 @@ ip_access_settings_arn,
 ip_rules,
 tags
 FROM awscc.workspacesweb.ip_access_settings
-WHERE region = 'us-east-1' AND Identifier = '<IpAccessSettingsArn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ ip_access_settings_arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -242,8 +242,8 @@ INSERT INTO awscc.workspacesweb.ip_access_settings (
  IpRules,
  region
 )
-SELECT 
-'{{ IpRules }}',
+SELECT
+'{{ ip_rules }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -260,13 +260,13 @@ INSERT INTO awscc.workspacesweb.ip_access_settings (
  Tags,
  region
 )
-SELECT 
- '{{ AdditionalEncryptionContext }}',
- '{{ CustomerManagedKey }}',
- '{{ Description }}',
- '{{ DisplayName }}',
- '{{ IpRules }}',
- '{{ Tags }}',
+SELECT
+ '{{ additional_encryption_context }}',
+ '{{ customer_managed_key }}',
+ '{{ description }}',
+ '{{ display_name }}',
+ '{{ ip_rules }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -284,23 +284,22 @@ globals:
 resources:
   - name: ip_access_setting
     props:
-      - name: AdditionalEncryptionContext
+      - name: additional_encryption_context
         value: {}
-      - name: CustomerManagedKey
-        value: '{{ CustomerManagedKey }}'
-      - name: Description
-        value: '{{ Description }}'
-      - name: DisplayName
-        value: '{{ DisplayName }}'
-      - name: IpRules
+      - name: customer_managed_key
+        value: '{{ customer_managed_key }}'
+      - name: description
+        value: '{{ description }}'
+      - name: display_name
+        value: '{{ display_name }}'
+      - name: ip_rules
         value:
-          - IpRange: '{{ IpRange }}'
-            Description: '{{ Description }}'
-      - name: Tags
+          - ip_range: '{{ ip_range }}'
+            description: '{{ description }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -319,7 +318,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<IpAccessSettingsArn>';
+AND Identifier = '{{ ip_access_settings_arn }}';
 ```
 
 
@@ -328,7 +327,7 @@ AND Identifier = '<IpAccessSettingsArn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.workspacesweb.ip_access_settings
-WHERE Identifier = '<IpAccessSettingsArn>'
+WHERE Identifier = '{{ ip_access_settings_arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/workspacesweb/network_settings/index.md b/website/docs/services/workspacesweb/network_settings/index.md
index 1576c8267..0f38d25c4 100644
--- a/website/docs/services/workspacesweb/network_settings/index.md
+++ b/website/docs/services/workspacesweb/network_settings/index.md
@@ -176,7 +176,7 @@ subnet_ids,
 tags,
 vpc_id
 FROM awscc.workspacesweb.network_settings
-WHERE region = 'us-east-1' AND Identifier = '<NetworkSettingsArn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ network_settings_arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -214,10 +214,10 @@ INSERT INTO awscc.workspacesweb.network_settings (
  VpcId,
  region
 )
-SELECT 
-'{{ SecurityGroupIds }}',
- '{{ SubnetIds }}',
- '{{ VpcId }}',
+SELECT
+'{{ security_group_ids }}',
+ '{{ subnet_ids }}',
+ '{{ vpc_id }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -232,11 +232,11 @@ INSERT INTO awscc.workspacesweb.network_settings (
  VpcId,
  region
 )
-SELECT 
- '{{ SecurityGroupIds }}',
- '{{ SubnetIds }}',
- '{{ Tags }}',
- '{{ VpcId }}',
+SELECT
+ '{{ security_group_ids }}',
+ '{{ subnet_ids }}',
+ '{{ tags }}',
+ '{{ vpc_id }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -254,19 +254,18 @@ globals:
 resources:
   - name: network_setting
     props:
-      - name: SecurityGroupIds
+      - name: security_group_ids
         value:
-          - '{{ SecurityGroupIds[0] }}'
-      - name: SubnetIds
+          - '{{ security_group_ids[0] }}'
+      - name: subnet_ids
         value:
-          - '{{ SubnetIds[0] }}'
-      - name: Tags
+          - '{{ subnet_ids[0] }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-      - name: VpcId
-        value: '{{ VpcId }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
+      - name: vpc_id
+        value: '{{ vpc_id }}'
 ```
 </TabItem>
 </Tabs>
@@ -285,7 +284,7 @@ SET PatchDocument = string('{{ {
     "VpcId": vpc_id
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<NetworkSettingsArn>';
+AND Identifier = '{{ network_settings_arn }}';
 ```
 
 
@@ -294,7 +293,7 @@ AND Identifier = '<NetworkSettingsArn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.workspacesweb.network_settings
-WHERE Identifier = '<NetworkSettingsArn>'
+WHERE Identifier = '{{ network_settings_arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/workspacesweb/portals/index.md b/website/docs/services/workspacesweb/portals/index.md
index 1cd89086f..f3a1a17fd 100644
--- a/website/docs/services/workspacesweb/portals/index.md
+++ b/website/docs/services/workspacesweb/portals/index.md
@@ -278,7 +278,7 @@ trust_store_arn,
 user_access_logging_settings_arn,
 user_settings_arn
 FROM awscc.workspacesweb.portals
-WHERE region = 'us-east-1' AND Identifier = '<PortalArn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ portal_arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -328,22 +328,22 @@ INSERT INTO awscc.workspacesweb.portals (
  UserSettingsArn,
  region
 )
-SELECT 
-'{{ AdditionalEncryptionContext }}',
- '{{ AuthenticationType }}',
- '{{ BrowserSettingsArn }}',
- '{{ CustomerManagedKey }}',
- '{{ DataProtectionSettingsArn }}',
- '{{ DisplayName }}',
- '{{ InstanceType }}',
- '{{ IpAccessSettingsArn }}',
- '{{ MaxConcurrentSessions }}',
- '{{ NetworkSettingsArn }}',
- '{{ SessionLoggerArn }}',
- '{{ Tags }}',
- '{{ TrustStoreArn }}',
- '{{ UserAccessLoggingSettingsArn }}',
- '{{ UserSettingsArn }}',
+SELECT
+'{{ additional_encryption_context }}',
+ '{{ authentication_type }}',
+ '{{ browser_settings_arn }}',
+ '{{ customer_managed_key }}',
+ '{{ data_protection_settings_arn }}',
+ '{{ display_name }}',
+ '{{ instance_type }}',
+ '{{ ip_access_settings_arn }}',
+ '{{ max_concurrent_sessions }}',
+ '{{ network_settings_arn }}',
+ '{{ session_logger_arn }}',
+ '{{ tags }}',
+ '{{ trust_store_arn }}',
+ '{{ user_access_logging_settings_arn }}',
+ '{{ user_settings_arn }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -369,22 +369,22 @@ INSERT INTO awscc.workspacesweb.portals (
  UserSettingsArn,
  region
 )
-SELECT 
- '{{ AdditionalEncryptionContext }}',
- '{{ AuthenticationType }}',
- '{{ BrowserSettingsArn }}',
- '{{ CustomerManagedKey }}',
- '{{ DataProtectionSettingsArn }}',
- '{{ DisplayName }}',
- '{{ InstanceType }}',
- '{{ IpAccessSettingsArn }}',
- '{{ MaxConcurrentSessions }}',
- '{{ NetworkSettingsArn }}',
- '{{ SessionLoggerArn }}',
- '{{ Tags }}',
- '{{ TrustStoreArn }}',
- '{{ UserAccessLoggingSettingsArn }}',
- '{{ UserSettingsArn }}',
+SELECT
+ '{{ additional_encryption_context }}',
+ '{{ authentication_type }}',
+ '{{ browser_settings_arn }}',
+ '{{ customer_managed_key }}',
+ '{{ data_protection_settings_arn }}',
+ '{{ display_name }}',
+ '{{ instance_type }}',
+ '{{ ip_access_settings_arn }}',
+ '{{ max_concurrent_sessions }}',
+ '{{ network_settings_arn }}',
+ '{{ session_logger_arn }}',
+ '{{ tags }}',
+ '{{ trust_store_arn }}',
+ '{{ user_access_logging_settings_arn }}',
+ '{{ user_settings_arn }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -402,39 +402,38 @@ globals:
 resources:
   - name: portal
     props:
-      - name: AdditionalEncryptionContext
+      - name: additional_encryption_context
         value: {}
-      - name: AuthenticationType
-        value: '{{ AuthenticationType }}'
-      - name: BrowserSettingsArn
-        value: '{{ BrowserSettingsArn }}'
-      - name: CustomerManagedKey
-        value: '{{ CustomerManagedKey }}'
-      - name: DataProtectionSettingsArn
-        value: '{{ DataProtectionSettingsArn }}'
-      - name: DisplayName
-        value: '{{ DisplayName }}'
-      - name: InstanceType
-        value: '{{ InstanceType }}'
-      - name: IpAccessSettingsArn
-        value: '{{ IpAccessSettingsArn }}'
-      - name: MaxConcurrentSessions
+      - name: authentication_type
+        value: '{{ authentication_type }}'
+      - name: browser_settings_arn
+        value: '{{ browser_settings_arn }}'
+      - name: customer_managed_key
+        value: '{{ customer_managed_key }}'
+      - name: data_protection_settings_arn
+        value: '{{ data_protection_settings_arn }}'
+      - name: display_name
+        value: '{{ display_name }}'
+      - name: instance_type
+        value: '{{ instance_type }}'
+      - name: ip_access_settings_arn
+        value: '{{ ip_access_settings_arn }}'
+      - name: max_concurrent_sessions
         value: null
-      - name: NetworkSettingsArn
-        value: '{{ NetworkSettingsArn }}'
-      - name: SessionLoggerArn
-        value: '{{ SessionLoggerArn }}'
-      - name: Tags
+      - name: network_settings_arn
+        value: '{{ network_settings_arn }}'
+      - name: session_logger_arn
+        value: '{{ session_logger_arn }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-      - name: TrustStoreArn
-        value: '{{ TrustStoreArn }}'
-      - name: UserAccessLoggingSettingsArn
-        value: '{{ UserAccessLoggingSettingsArn }}'
-      - name: UserSettingsArn
-        value: '{{ UserSettingsArn }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
+      - name: trust_store_arn
+        value: '{{ trust_store_arn }}'
+      - name: user_access_logging_settings_arn
+        value: '{{ user_access_logging_settings_arn }}'
+      - name: user_settings_arn
+        value: '{{ user_settings_arn }}'
 ```
 </TabItem>
 </Tabs>
@@ -462,7 +461,7 @@ SET PatchDocument = string('{{ {
     "UserSettingsArn": user_settings_arn
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<PortalArn>';
+AND Identifier = '{{ portal_arn }}';
 ```
 
 
@@ -471,7 +470,7 @@ AND Identifier = '<PortalArn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.workspacesweb.portals
-WHERE Identifier = '<PortalArn>'
+WHERE Identifier = '{{ portal_arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/workspacesweb/session_loggers/index.md b/website/docs/services/workspacesweb/session_loggers/index.md
index f8b6fa68d..7428ff216 100644
--- a/website/docs/services/workspacesweb/session_loggers/index.md
+++ b/website/docs/services/workspacesweb/session_loggers/index.md
@@ -228,7 +228,7 @@ log_configuration,
 session_logger_arn,
 tags
 FROM awscc.workspacesweb.session_loggers
-WHERE region = 'us-east-1' AND Identifier = '<SessionLoggerArn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ session_logger_arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -265,9 +265,9 @@ INSERT INTO awscc.workspacesweb.session_loggers (
  LogConfiguration,
  region
 )
-SELECT 
-'{{ EventFilter }}',
- '{{ LogConfiguration }}',
+SELECT
+'{{ event_filter }}',
+ '{{ log_configuration }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -284,13 +284,13 @@ INSERT INTO awscc.workspacesweb.session_loggers (
  Tags,
  region
 )
-SELECT 
- '{{ AdditionalEncryptionContext }}',
- '{{ CustomerManagedKey }}',
- '{{ DisplayName }}',
- '{{ EventFilter }}',
- '{{ LogConfiguration }}',
- '{{ Tags }}',
+SELECT
+ '{{ additional_encryption_context }}',
+ '{{ customer_managed_key }}',
+ '{{ display_name }}',
+ '{{ event_filter }}',
+ '{{ log_configuration }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -308,27 +308,26 @@ globals:
 resources:
   - name: session_logger
     props:
-      - name: AdditionalEncryptionContext
+      - name: additional_encryption_context
         value: {}
-      - name: CustomerManagedKey
-        value: '{{ CustomerManagedKey }}'
-      - name: DisplayName
-        value: '{{ DisplayName }}'
-      - name: EventFilter
+      - name: customer_managed_key
+        value: '{{ customer_managed_key }}'
+      - name: display_name
+        value: '{{ display_name }}'
+      - name: event_filter
         value: null
-      - name: LogConfiguration
+      - name: log_configuration
         value:
-          S3:
-            Bucket: '{{ Bucket }}'
-            KeyPrefix: '{{ KeyPrefix }}'
-            BucketOwner: '{{ BucketOwner }}'
-            LogFileFormat: '{{ LogFileFormat }}'
-            FolderStructure: '{{ FolderStructure }}'
-      - name: Tags
+          s3:
+            bucket: '{{ bucket }}'
+            key_prefix: '{{ key_prefix }}'
+            bucket_owner: '{{ bucket_owner }}'
+            log_file_format: '{{ log_file_format }}'
+            folder_structure: '{{ folder_structure }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -347,7 +346,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<SessionLoggerArn>';
+AND Identifier = '{{ session_logger_arn }}';
 ```
 
 
@@ -356,7 +355,7 @@ AND Identifier = '<SessionLoggerArn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.workspacesweb.session_loggers
-WHERE Identifier = '<SessionLoggerArn>'
+WHERE Identifier = '{{ session_logger_arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/workspacesweb/trust_stores/index.md b/website/docs/services/workspacesweb/trust_stores/index.md
index d86fa4ce6..97520b00b 100644
--- a/website/docs/services/workspacesweb/trust_stores/index.md
+++ b/website/docs/services/workspacesweb/trust_stores/index.md
@@ -164,7 +164,7 @@ certificate_list,
 tags,
 trust_store_arn
 FROM awscc.workspacesweb.trust_stores
-WHERE region = 'us-east-1' AND Identifier = '<TrustStoreArn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ trust_store_arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -200,8 +200,8 @@ INSERT INTO awscc.workspacesweb.trust_stores (
  CertificateList,
  region
 )
-SELECT 
-'{{ CertificateList }}',
+SELECT
+'{{ certificate_list }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -214,9 +214,9 @@ INSERT INTO awscc.workspacesweb.trust_stores (
  Tags,
  region
 )
-SELECT 
- '{{ CertificateList }}',
- '{{ Tags }}',
+SELECT
+ '{{ certificate_list }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -234,14 +234,13 @@ globals:
 resources:
   - name: trust_store
     props:
-      - name: CertificateList
+      - name: certificate_list
         value:
-          - '{{ CertificateList[0] }}'
-      - name: Tags
+          - '{{ certificate_list[0] }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -258,7 +257,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<TrustStoreArn>';
+AND Identifier = '{{ trust_store_arn }}';
 ```
 
 
@@ -267,7 +266,7 @@ AND Identifier = '<TrustStoreArn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.workspacesweb.trust_stores
-WHERE Identifier = '<TrustStoreArn>'
+WHERE Identifier = '{{ trust_store_arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/workspacesweb/user_access_logging_settings/index.md b/website/docs/services/workspacesweb/user_access_logging_settings/index.md
index 1fd636ede..5c0309dac 100644
--- a/website/docs/services/workspacesweb/user_access_logging_settings/index.md
+++ b/website/docs/services/workspacesweb/user_access_logging_settings/index.md
@@ -164,7 +164,7 @@ kinesis_stream_arn,
 tags,
 user_access_logging_settings_arn
 FROM awscc.workspacesweb.user_access_logging_settings
-WHERE region = 'us-east-1' AND Identifier = '<UserAccessLoggingSettingsArn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ user_access_logging_settings_arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -200,8 +200,8 @@ INSERT INTO awscc.workspacesweb.user_access_logging_settings (
  KinesisStreamArn,
  region
 )
-SELECT 
-'{{ KinesisStreamArn }}',
+SELECT
+'{{ kinesis_stream_arn }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -214,9 +214,9 @@ INSERT INTO awscc.workspacesweb.user_access_logging_settings (
  Tags,
  region
 )
-SELECT 
- '{{ KinesisStreamArn }}',
- '{{ Tags }}',
+SELECT
+ '{{ kinesis_stream_arn }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -234,13 +234,12 @@ globals:
 resources:
   - name: user_access_logging_setting
     props:
-      - name: KinesisStreamArn
-        value: '{{ KinesisStreamArn }}'
-      - name: Tags
+      - name: kinesis_stream_arn
+        value: '{{ kinesis_stream_arn }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -257,7 +256,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<UserAccessLoggingSettingsArn>';
+AND Identifier = '{{ user_access_logging_settings_arn }}';
 ```
 
 
@@ -266,7 +265,7 @@ AND Identifier = '<UserAccessLoggingSettingsArn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.workspacesweb.user_access_logging_settings
-WHERE Identifier = '<UserAccessLoggingSettingsArn>'
+WHERE Identifier = '{{ user_access_logging_settings_arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/workspacesweb/user_settings/index.md b/website/docs/services/workspacesweb/user_settings/index.md
index 6ed0fdfd4..3734e0af9 100644
--- a/website/docs/services/workspacesweb/user_settings/index.md
+++ b/website/docs/services/workspacesweb/user_settings/index.md
@@ -256,7 +256,7 @@ upload_allowed,
 user_settings_arn,
 deep_link_allowed
 FROM awscc.workspacesweb.user_settings
-WHERE region = 'us-east-1' AND Identifier = '<UserSettingsArn>';
+WHERE region = 'us-east-1' AND Identifier = '{{ user_settings_arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -296,12 +296,12 @@ INSERT INTO awscc.workspacesweb.user_settings (
  UploadAllowed,
  region
 )
-SELECT 
-'{{ CopyAllowed }}',
- '{{ DownloadAllowed }}',
- '{{ PasteAllowed }}',
- '{{ PrintAllowed }}',
- '{{ UploadAllowed }}',
+SELECT
+'{{ copy_allowed }}',
+ '{{ download_allowed }}',
+ '{{ paste_allowed }}',
+ '{{ print_allowed }}',
+ '{{ upload_allowed }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -325,20 +325,20 @@ INSERT INTO awscc.workspacesweb.user_settings (
  DeepLinkAllowed,
  region
 )
-SELECT 
- '{{ AdditionalEncryptionContext }}',
- '{{ CookieSynchronizationConfiguration }}',
- '{{ CopyAllowed }}',
- '{{ CustomerManagedKey }}',
- '{{ DisconnectTimeoutInMinutes }}',
- '{{ DownloadAllowed }}',
- '{{ IdleDisconnectTimeoutInMinutes }}',
- '{{ PasteAllowed }}',
- '{{ PrintAllowed }}',
- '{{ Tags }}',
- '{{ ToolbarConfiguration }}',
- '{{ UploadAllowed }}',
- '{{ DeepLinkAllowed }}',
+SELECT
+ '{{ additional_encryption_context }}',
+ '{{ cookie_synchronization_configuration }}',
+ '{{ copy_allowed }}',
+ '{{ customer_managed_key }}',
+ '{{ disconnect_timeout_in_minutes }}',
+ '{{ download_allowed }}',
+ '{{ idle_disconnect_timeout_in_minutes }}',
+ '{{ paste_allowed }}',
+ '{{ print_allowed }}',
+ '{{ tags }}',
+ '{{ toolbar_configuration }}',
+ '{{ upload_allowed }}',
+ '{{ deep_link_allowed }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -356,46 +356,45 @@ globals:
 resources:
   - name: user_setting
     props:
-      - name: AdditionalEncryptionContext
+      - name: additional_encryption_context
         value: {}
-      - name: CookieSynchronizationConfiguration
+      - name: cookie_synchronization_configuration
         value:
-          Allowlist:
-            - Domain: '{{ Domain }}'
-              Name: '{{ Name }}'
-              Path: '{{ Path }}'
-          Blocklist:
+          allowlist:
+            - domain: '{{ domain }}'
+              name: '{{ name }}'
+              path: '{{ path }}'
+          blocklist:
             - null
-      - name: CopyAllowed
-        value: '{{ CopyAllowed }}'
-      - name: CustomerManagedKey
-        value: '{{ CustomerManagedKey }}'
-      - name: DisconnectTimeoutInMinutes
+      - name: copy_allowed
+        value: '{{ copy_allowed }}'
+      - name: customer_managed_key
+        value: '{{ customer_managed_key }}'
+      - name: disconnect_timeout_in_minutes
         value: null
-      - name: DownloadAllowed
+      - name: download_allowed
         value: null
-      - name: IdleDisconnectTimeoutInMinutes
+      - name: idle_disconnect_timeout_in_minutes
         value: null
-      - name: PasteAllowed
+      - name: paste_allowed
         value: null
-      - name: PrintAllowed
+      - name: print_allowed
         value: null
-      - name: Tags
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-      - name: ToolbarConfiguration
+          - key: '{{ key }}'
+            value: '{{ value }}'
+      - name: toolbar_configuration
         value:
-          ToolbarType: '{{ ToolbarType }}'
-          VisualMode: '{{ VisualMode }}'
-          HiddenToolbarItems:
-            - '{{ HiddenToolbarItems[0] }}'
-          MaxDisplayResolution: '{{ MaxDisplayResolution }}'
-      - name: UploadAllowed
+          toolbar_type: '{{ toolbar_type }}'
+          visual_mode: '{{ visual_mode }}'
+          hidden_toolbar_items:
+            - '{{ hidden_toolbar_items[0] }}'
+          max_display_resolution: '{{ max_display_resolution }}'
+      - name: upload_allowed
         value: null
-      - name: DeepLinkAllowed
+      - name: deep_link_allowed
         value: null
-
 ```
 </TabItem>
 </Tabs>
@@ -423,7 +422,7 @@ SET PatchDocument = string('{{ {
     "DeepLinkAllowed": deep_link_allowed
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<UserSettingsArn>';
+AND Identifier = '{{ user_settings_arn }}';
 ```
 
 
@@ -432,7 +431,7 @@ AND Identifier = '<UserSettingsArn>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.workspacesweb.user_settings
-WHERE Identifier = '<UserSettingsArn>'
+WHERE Identifier = '{{ user_settings_arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/xray/groups/index.md b/website/docs/services/xray/groups/index.md
index 008b2fb91..6a5887399 100644
--- a/website/docs/services/xray/groups/index.md
+++ b/website/docs/services/xray/groups/index.md
@@ -182,7 +182,7 @@ group_arn,
 insights_configuration,
 tags
 FROM awscc.xray.groups
-WHERE region = 'us-east-1' AND Identifier = '<GroupARN>';
+WHERE region = 'us-east-1' AND Identifier = '{{ group_arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -218,8 +218,8 @@ INSERT INTO awscc.xray.groups (
  GroupName,
  region
 )
-SELECT 
-'{{ GroupName }}',
+SELECT
+'{{ group_name }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -234,11 +234,11 @@ INSERT INTO awscc.xray.groups (
  Tags,
  region
 )
-SELECT 
- '{{ FilterExpression }}',
- '{{ GroupName }}',
- '{{ InsightsConfiguration }}',
- '{{ Tags }}',
+SELECT
+ '{{ filter_expression }}',
+ '{{ group_name }}',
+ '{{ insights_configuration }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -256,19 +256,18 @@ globals:
 resources:
   - name: group
     props:
-      - name: FilterExpression
-        value: '{{ FilterExpression }}'
-      - name: GroupName
-        value: '{{ GroupName }}'
-      - name: InsightsConfiguration
+      - name: filter_expression
+        value: '{{ filter_expression }}'
+      - name: group_name
+        value: '{{ group_name }}'
+      - name: insights_configuration
         value:
-          InsightsEnabled: '{{ InsightsEnabled }}'
-          NotificationsEnabled: '{{ NotificationsEnabled }}'
-      - name: Tags
+          insights_enabled: '{{ insights_enabled }}'
+          notifications_enabled: '{{ notifications_enabled }}'
+      - name: tags
         value:
-          - Key: '{{ Key }}'
-            Value: '{{ Value }}'
-
+          - key: '{{ key }}'
+            value: '{{ value }}'
 ```
 </TabItem>
 </Tabs>
@@ -287,7 +286,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<GroupARN>';
+AND Identifier = '{{ group_arn }}';
 ```
 
 
@@ -296,7 +295,7 @@ AND Identifier = '<GroupARN>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.xray.groups
-WHERE Identifier = '<GroupARN>'
+WHERE Identifier = '{{ group_arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/xray/resource_policies/index.md b/website/docs/services/xray/resource_policies/index.md
index d07029cf3..e676d7380 100644
--- a/website/docs/services/xray/resource_policies/index.md
+++ b/website/docs/services/xray/resource_policies/index.md
@@ -146,7 +146,7 @@ policy_name,
 policy_document,
 bypass_policy_lockout_check
 FROM awscc.xray.resource_policies
-WHERE region = 'us-east-1' AND Identifier = '<PolicyName>';
+WHERE region = 'us-east-1' AND Identifier = '{{ policy_name }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -183,9 +183,9 @@ INSERT INTO awscc.xray.resource_policies (
  PolicyDocument,
  region
 )
-SELECT 
-'{{ PolicyName }}',
- '{{ PolicyDocument }}',
+SELECT
+'{{ policy_name }}',
+ '{{ policy_document }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -199,10 +199,10 @@ INSERT INTO awscc.xray.resource_policies (
  BypassPolicyLockoutCheck,
  region
 )
-SELECT 
- '{{ PolicyName }}',
- '{{ PolicyDocument }}',
- '{{ BypassPolicyLockoutCheck }}',
+SELECT
+ '{{ policy_name }}',
+ '{{ policy_document }}',
+ '{{ bypass_policy_lockout_check }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -220,13 +220,12 @@ globals:
 resources:
   - name: resource_policy
     props:
-      - name: PolicyName
-        value: '{{ PolicyName }}'
-      - name: PolicyDocument
-        value: '{{ PolicyDocument }}'
-      - name: BypassPolicyLockoutCheck
-        value: '{{ BypassPolicyLockoutCheck }}'
-
+      - name: policy_name
+        value: '{{ policy_name }}'
+      - name: policy_document
+        value: '{{ policy_document }}'
+      - name: bypass_policy_lockout_check
+        value: '{{ bypass_policy_lockout_check }}'
 ```
 </TabItem>
 </Tabs>
@@ -243,7 +242,7 @@ SET PatchDocument = string('{{ {
     "BypassPolicyLockoutCheck": bypass_policy_lockout_check
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<PolicyName>';
+AND Identifier = '{{ policy_name }}';
 ```
 
 
@@ -252,7 +251,7 @@ AND Identifier = '<PolicyName>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.xray.resource_policies
-WHERE Identifier = '<PolicyName>'
+WHERE Identifier = '{{ policy_name }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/xray/sampling_rules/index.md b/website/docs/services/xray/sampling_rules/index.md
index 2de497c16..1b71400f0 100644
--- a/website/docs/services/xray/sampling_rules/index.md
+++ b/website/docs/services/xray/sampling_rules/index.md
@@ -363,7 +363,7 @@ rule_arn,
 rule_name,
 tags
 FROM awscc.xray.sampling_rules
-WHERE region = 'us-east-1' AND Identifier = '<RuleARN>';
+WHERE region = 'us-east-1' AND Identifier = '{{ rule_arn }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -403,12 +403,12 @@ INSERT INTO awscc.xray.sampling_rules (
  Tags,
  region
 )
-SELECT 
-'{{ SamplingRule }}',
- '{{ SamplingRuleRecord }}',
- '{{ SamplingRuleUpdate }}',
- '{{ RuleName }}',
- '{{ Tags }}',
+SELECT
+'{{ sampling_rule }}',
+ '{{ sampling_rule_record }}',
+ '{{ sampling_rule_update }}',
+ '{{ rule_name }}',
+ '{{ tags }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -424,12 +424,12 @@ INSERT INTO awscc.xray.sampling_rules (
  Tags,
  region
 )
-SELECT 
- '{{ SamplingRule }}',
- '{{ SamplingRuleRecord }}',
- '{{ SamplingRuleUpdate }}',
- '{{ RuleName }}',
- '{{ Tags }}',
+SELECT
+ '{{ sampling_rule }}',
+ '{{ sampling_rule_record }}',
+ '{{ sampling_rule_update }}',
+ '{{ rule_name }}',
+ '{{ tags }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -447,39 +447,38 @@ globals:
 resources:
   - name: sampling_rule
     props:
-      - name: SamplingRule
+      - name: sampling_rule
         value:
-          SamplingRule: null
-          SamplingRuleRecord:
-            CreatedAt: '{{ CreatedAt }}'
-            ModifiedAt: '{{ ModifiedAt }}'
-            SamplingRule: null
-          SamplingRuleUpdate:
-            Attributes: {}
-            FixedRate: null
-            Host: '{{ Host }}'
-            HTTPMethod: '{{ HTTPMethod }}'
-            Priority: '{{ Priority }}'
-            ReservoirSize: '{{ ReservoirSize }}'
-            ResourceARN: '{{ ResourceARN }}'
-            RuleARN: '{{ RuleARN }}'
-            RuleName: '{{ RuleName }}'
-            ServiceName: '{{ ServiceName }}'
-            ServiceType: '{{ ServiceType }}'
-            URLPath: '{{ URLPath }}'
-          RuleName: null
-          Tags:
-            - Key: '{{ Key }}'
-              Value: '{{ Value }}'
-      - name: SamplingRuleRecord
+          sampling_rule: null
+          sampling_rule_record:
+            created_at: '{{ created_at }}'
+            modified_at: '{{ modified_at }}'
+            sampling_rule: null
+          sampling_rule_update:
+            attributes: {}
+            fixed_rate: null
+            host: '{{ host }}'
+            h_tt_pmethod: '{{ h_tt_pmethod }}'
+            priority: '{{ priority }}'
+            reservoir_size: '{{ reservoir_size }}'
+            resource_arn: '{{ resource_arn }}'
+            rule_arn: '{{ rule_arn }}'
+            rule_name: '{{ rule_name }}'
+            service_name: '{{ service_name }}'
+            service_type: '{{ service_type }}'
+            url_path: '{{ url_path }}'
+          rule_name: null
+          tags:
+            - key: '{{ key }}'
+              value: '{{ value }}'
+      - name: sampling_rule_record
         value: null
-      - name: SamplingRuleUpdate
+      - name: sampling_rule_update
         value: null
-      - name: RuleName
+      - name: rule_name
         value: null
-      - name: Tags
+      - name: tags
         value: null
-
 ```
 </TabItem>
 </Tabs>
@@ -498,7 +497,7 @@ SET PatchDocument = string('{{ {
     "Tags": tags
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<RuleARN>';
+AND Identifier = '{{ rule_arn }}';
 ```
 
 
@@ -507,7 +506,7 @@ AND Identifier = '<RuleARN>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.xray.sampling_rules
-WHERE Identifier = '<RuleARN>'
+WHERE Identifier = '{{ rule_arn }}'
 AND region = 'us-east-1';
 ```
 
diff --git a/website/docs/services/xray/transaction_search_configs/index.md b/website/docs/services/xray/transaction_search_configs/index.md
index 5c6653f5d..79525e9a7 100644
--- a/website/docs/services/xray/transaction_search_configs/index.md
+++ b/website/docs/services/xray/transaction_search_configs/index.md
@@ -140,7 +140,7 @@ region,
 account_id,
 indexing_percentage
 FROM awscc.xray.transaction_search_configs
-WHERE region = 'us-east-1' AND Identifier = '<AccountId>';
+WHERE region = 'us-east-1' AND Identifier = '{{ account_id }}';
 ```
 </TabItem>
 <TabItem value="list">
@@ -176,8 +176,8 @@ INSERT INTO awscc.xray.transaction_search_configs (
  IndexingPercentage,
  region
 )
-SELECT 
-'{{ IndexingPercentage }}',
+SELECT
+'{{ indexing_percentage }}',
 '{{ region }}';
 ```
 </TabItem>
@@ -189,8 +189,8 @@ INSERT INTO awscc.xray.transaction_search_configs (
  IndexingPercentage,
  region
 )
-SELECT 
- '{{ IndexingPercentage }}',
+SELECT
+ '{{ indexing_percentage }}',
  '{{ region }}';
 ```
 </TabItem>
@@ -208,9 +208,8 @@ globals:
 resources:
   - name: transaction_search_config
     props:
-      - name: IndexingPercentage
+      - name: indexing_percentage
         value: null
-
 ```
 </TabItem>
 </Tabs>
@@ -226,7 +225,7 @@ SET PatchDocument = string('{{ {
     "IndexingPercentage": indexing_percentage
 } | generate_patch_document }}')
 WHERE region = '{{ region }}'
-AND Identifier = '<AccountId>';
+AND Identifier = '{{ account_id }}';
 ```
 
 
@@ -235,7 +234,7 @@ AND Identifier = '<AccountId>';
 ```sql
 /*+ delete */
 DELETE FROM awscc.xray.transaction_search_configs
-WHERE Identifier = '<AccountId>'
+WHERE Identifier = '{{ account_id }}'
 AND region = 'us-east-1';
 ```