@aws-sdk/client-kms 3.28.0 → 3.32.0

package/models/models_0.ts

@@ -22,7 +22,7 @@ export interface AliasListEntry {
   AliasArn?: string;
 
   /**
-   * <p>String that contains the key identifier of the CMK associated with the alias.</p>
+   * <p>String that contains the key identifier of the KMS key associated with the alias.</p>
    */
   TargetKeyId?: string;
 
@@ -32,7 +32,7 @@ export interface AliasListEntry {
   CreationDate?: Date;
 
   /**
-   * <p>Date and time that the alias was most recently associated with a CMK in the account and Region. Formatted as Unix time.</p>
+   * <p>Date and time that the alias was most recently associated with a KMS key in the account and Region. Formatted as Unix time.</p>
    */
   LastUpdatedDate?: Date;
 }
@@ -67,8 +67,8 @@ export namespace AlreadyExistsException {
 
 export interface CancelKeyDeletionRequest {
   /**
-   * <p>Identifies the customer master key (CMK) whose deletion is being canceled.</p>
-   *          <p>Specify the key ID or key ARN of the CMK.</p>
+   * <p>Identifies the KMS key whose deletion is being canceled.</p>
+   *          <p>Specify the key ID or key ARN of the KMS key.</p>
    *          <p>For example:</p>
    *          <ul>
    *             <li>
@@ -80,7 +80,7 @@ export interface CancelKeyDeletionRequest {
    *                </p>
    *             </li>
    *          </ul>
-   *          <p>To get the key ID and key ARN for a CMK, use <a>ListKeys</a> or <a>DescribeKey</a>.</p>
+   *          <p>To get the key ID and key ARN for a KMS key, use <a>ListKeys</a> or <a>DescribeKey</a>.</p>
    */
   KeyId: string | undefined;
 }
@@ -96,7 +96,7 @@ export namespace CancelKeyDeletionRequest {
 
 export interface CancelKeyDeletionResponse {
   /**
-   * <p>The Amazon Resource Name (<a href="https://docs.aws.amazon.com/kms/latest/developerguide/concepts.html#key-id-key-ARN">key ARN</a>) of the CMK whose deletion is canceled.</p>
+   * <p>The Amazon Resource Name (<a href="https://docs.aws.amazon.com/kms/latest/developerguide/concepts.html#key-id-key-ARN">key ARN</a>) of the KMS key whose deletion is canceled.</p>
    */
   KeyId?: string;
 }
@@ -170,9 +170,8 @@ export namespace KMSInternalException {
 /**
  * <p>The request was rejected because the state of the specified resource is not valid for this
  *       request.</p>
- *          <p>For more information about how key state affects the use of a CMK, see <a href="https://docs.aws.amazon.com/kms/latest/developerguide/key-state.html">How Key State Affects Use of a
- *         Customer Master Key</a> in the <i>
- *                <i>AWS Key Management Service Developer Guide</i>
+ *          <p>For more information about how key state affects the use of a KMS key, see <a href="https://docs.aws.amazon.com/kms/latest/developerguide/key-state.html">Key state: Effect on your KMS key</a> in the <i>
+ *                <i>Key Management Service Developer Guide</i>
  *             </i>.</p>
  */
 export interface KMSInvalidStateException extends __SmithyException, $MetadataBearer {
@@ -210,9 +209,9 @@ export namespace NotFoundException {
 }
 
 /**
- * <p>The request was rejected because the specified AWS CloudHSM cluster is already associated with a
+ * <p>The request was rejected because the specified CloudHSM cluster is already associated with a
  *       custom key store or it shares a backup history with a cluster that is associated with a custom
- *       key store. Each custom key store must be associated with a different AWS CloudHSM cluster.</p>
+ *       key store. Each custom key store must be associated with a different CloudHSM cluster.</p>
  *          <p>Clusters that share a backup history have the same cluster certificate. To view the
  *       cluster certificate of a cluster, use the <a href="https://docs.aws.amazon.com/cloudhsm/latest/APIReference/API_DescribeClusters.html">DescribeClusters</a> operation.</p>
  */
@@ -232,7 +231,7 @@ export namespace CloudHsmClusterInUseException {
 }
 
 /**
- * <p>The request was rejected because the associated AWS CloudHSM cluster did not meet the
+ * <p>The request was rejected because the associated CloudHSM cluster did not meet the
  *       configuration requirements for a custom key store.</p>
  *
  *          <ul>
@@ -250,20 +249,20 @@ export namespace CloudHsmClusterInUseException {
  *             </li>
  *             <li>
  *                <p>The cluster must contain at least as many HSMs as the operation requires. To add HSMs,
- *           use the AWS CloudHSM <a href="https://docs.aws.amazon.com/cloudhsm/latest/APIReference/API_CreateHsm.html">CreateHsm</a> operation.</p>
- *                <p>For the <a>CreateCustomKeyStore</a>, <a>UpdateCustomKeyStore</a>, and <a>CreateKey</a> operations, the AWS CloudHSM cluster must have at least two
- *           active HSMs, each in a different Availability Zone. For the <a>ConnectCustomKeyStore</a> operation, the AWS CloudHSM must contain at least one active
+ *           use the CloudHSM <a href="https://docs.aws.amazon.com/cloudhsm/latest/APIReference/API_CreateHsm.html">CreateHsm</a> operation.</p>
+ *                <p>For the <a>CreateCustomKeyStore</a>, <a>UpdateCustomKeyStore</a>, and <a>CreateKey</a> operations, the CloudHSM cluster must have at least two
+ *           active HSMs, each in a different Availability Zone. For the <a>ConnectCustomKeyStore</a> operation, the CloudHSM must contain at least one active
  *           HSM.</p>
  *             </li>
  *          </ul>
- *          <p>For information about the requirements for an AWS CloudHSM cluster that is associated with a
+ *          <p>For information about the requirements for an CloudHSM cluster that is associated with a
  *       custom key store, see <a href="https://docs.aws.amazon.com/kms/latest/developerguide/create-keystore.html#before-keystore">Assemble the Prerequisites</a>
- *       in the <i>AWS Key Management Service Developer Guide</i>. For information about creating a private subnet for an AWS CloudHSM cluster,
+ *       in the <i>Key Management Service Developer Guide</i>. For information about creating a private subnet for an CloudHSM cluster,
  *       see <a href="https://docs.aws.amazon.com/cloudhsm/latest/userguide/create-subnets.html">Create a Private
- *         Subnet</a> in the <i>AWS CloudHSM User Guide</i>. For information about cluster security groups, see
+ *         Subnet</a> in the <i>CloudHSM User Guide</i>. For information about cluster security groups, see
  *         <a href="https://docs.aws.amazon.com/cloudhsm/latest/userguide/configure-sg.html">Configure a Default Security
  *         Group</a> in the <i>
- *                <i>AWS CloudHSM User Guide</i>
+ *                <i>CloudHSM User Guide</i>
  *             </i>. </p>
  */
 export interface CloudHsmClusterInvalidConfigurationException extends __SmithyException, $MetadataBearer {
@@ -282,9 +281,9 @@ export namespace CloudHsmClusterInvalidConfigurationException {
 }
 
 /**
- * <p>The request was rejected because the AWS CloudHSM cluster that is associated with the custom key
+ * <p>The request was rejected because the CloudHSM cluster that is associated with the custom key
  *       store is not active. Initialize and activate the cluster and try the command again. For
- *       detailed instructions, see <a href="https://docs.aws.amazon.com/cloudhsm/latest/userguide/getting-started.html">Getting Started</a> in the <i>AWS CloudHSM User Guide</i>.</p>
+ *       detailed instructions, see <a href="https://docs.aws.amazon.com/cloudhsm/latest/userguide/getting-started.html">Getting Started</a> in the <i>CloudHSM User Guide</i>.</p>
  */
 export interface CloudHsmClusterNotActiveException extends __SmithyException, $MetadataBearer {
   name: "CloudHsmClusterNotActiveException";
@@ -302,7 +301,7 @@ export namespace CloudHsmClusterNotActiveException {
 }
 
 /**
- * <p>The request was rejected because AWS KMS cannot find the AWS CloudHSM cluster with the specified
+ * <p>The request was rejected because KMS cannot find the CloudHSM cluster with the specified
  *       cluster ID. Retry the request with a different cluster ID.</p>
  */
 export interface CloudHsmClusterNotFoundException extends __SmithyException, $MetadataBearer {
@@ -321,7 +320,7 @@ export namespace CloudHsmClusterNotFoundException {
 }
 
 /**
- * <p>The request was rejected because the specified AWS CloudHSM cluster has a different cluster
+ * <p>The request was rejected because the specified CloudHSM cluster has a different cluster
  *       certificate than the original cluster. You cannot use the operation to specify an unrelated
  *       cluster.</p>
  *          <p>Specify a cluster that shares a backup history with the original cluster. This includes
@@ -412,7 +411,7 @@ export namespace CustomKeyStoreInvalidStateException {
 }
 
 /**
- * <p>The request was rejected because AWS KMS cannot find a custom key store with the specified
+ * <p>The request was rejected because KMS cannot find a custom key store with the specified
  *       key store name or ID.</p>
  */
 export interface CustomKeyStoreNotFoundException extends __SmithyException, $MetadataBearer {
@@ -456,19 +455,21 @@ export interface CreateAliasRequest {
    *       name, such as <code>alias/ExampleAlias</code>. </p>
    *          <p>The <code>AliasName</code> value must be string of 1-256 characters. It can contain only alphanumeric characters,
    *       forward slashes (/), underscores (_), and dashes (-). The alias name cannot begin with <code>alias/aws/</code>. The <code>alias/aws/</code> prefix is reserved
-   *       for <a href="https://docs.aws.amazon.com/kms/latest/developerguide/concepts.html#aws-managed-cmk">AWS managed CMKs</a>.</p>
+   *       for <a href="https://docs.aws.amazon.com/kms/latest/developerguide/concepts.html#aws-managed-cmk">Amazon Web Services managed keys</a>.</p>
    */
   AliasName: string | undefined;
 
   /**
-   * <p>Associates the alias with the specified <a href="https://docs.aws.amazon.com/kms/latest/developerguide/concepts.html#customer-cmk">customer managed CMK</a>. The CMK must be
-   *       in the same AWS Region. </p>
-   *          <p>A valid CMK ID is required. If you supply a null or empty string value, this operation
+   * <p>Associates the alias with the specified <a href="https://docs.aws.amazon.com/kms/latest/developerguide/concepts.html#customer-cmk">customer managed key</a>. The KMS key must be
+   *       in the same Amazon Web Services Region. </p>
+   *          <p>A valid key ID is required. If you supply a null or empty string value, this operation
    *       returns an error.</p>
    *          <p>For help finding the key ID and ARN, see <a href="https://docs.aws.amazon.com/kms/latest/developerguide/viewing-keys.html#find-cmk-id-arn">Finding the Key ID and
-   *         ARN</a> in the <i>AWS Key Management Service Developer Guide</i>.</p>
+   *         ARN</a> in the <i>
+   *                <i>Key Management Service Developer Guide</i>
+   *             </i>.</p>
    *
-   *          <p>Specify the key ID or key ARN of the CMK.</p>
+   *          <p>Specify the key ID or key ARN of the KMS key.</p>
    *          <p>For example:</p>
    *          <ul>
    *             <li>
@@ -480,7 +481,7 @@ export interface CreateAliasRequest {
    *                </p>
    *             </li>
    *          </ul>
-   *          <p>To get the key ID and key ARN for a CMK, use <a>ListKeys</a> or <a>DescribeKey</a>.</p>
+   *          <p>To get the key ID and key ARN for a KMS key, use <a>ListKeys</a> or <a>DescribeKey</a>.</p>
    */
   TargetKeyId: string | undefined;
 }
@@ -514,7 +515,7 @@ export namespace InvalidAliasNameException {
 
 /**
  * <p>The request was rejected because a quota was exceeded. For more information, see <a href="https://docs.aws.amazon.com/kms/latest/developerguide/limits.html">Quotas</a> in the
- *       <i>AWS Key Management Service Developer Guide</i>.</p>
+ *       <i>Key Management Service Developer Guide</i>.</p>
  */
 export interface LimitExceededException extends __SmithyException, $MetadataBearer {
   name: "LimitExceededException";
@@ -533,14 +534,13 @@ export namespace LimitExceededException {
 
 export interface CreateCustomKeyStoreRequest {
   /**
-   * <p>Specifies a friendly name for the custom key store. The name must be unique in your AWS
-   *       account.</p>
+   * <p>Specifies a friendly name for the custom key store. The name must be unique in your Amazon Web Services account.</p>
    */
   CustomKeyStoreName: string | undefined;
 
   /**
-   * <p>Identifies the AWS CloudHSM cluster for the custom key store. Enter the cluster ID of any active
-   *       AWS CloudHSM cluster that is not already associated with a custom key store. To find the cluster ID,
+   * <p>Identifies the CloudHSM cluster for the custom key store. Enter the cluster ID of any active
+   *       CloudHSM cluster that is not already associated with a custom key store. To find the cluster ID,
    *       use the <a href="https://docs.aws.amazon.com/cloudhsm/latest/APIReference/API_DescribeClusters.html">DescribeClusters</a> operation.</p>
    */
   CloudHsmClusterId: string | undefined;
@@ -554,11 +554,11 @@ export interface CreateCustomKeyStoreRequest {
   /**
    * <p>Enter the password of the <a href="https://docs.aws.amazon.com/kms/latest/developerguide/key-store-concepts.html#concept-kmsuser">
    *                <code>kmsuser</code> crypto user
-   *         (CU) account</a> in the specified AWS CloudHSM cluster. AWS KMS logs into the cluster as this
+   *         (CU) account</a> in the specified CloudHSM cluster. KMS logs into the cluster as this
    *       user to manage key material on your behalf.</p>
    *          <p>The password must be a string of 7 to 32 characters. Its value is case sensitive.</p>
-   *          <p>This parameter tells AWS KMS the <code>kmsuser</code> account password; it does not change
-   *       the password in the AWS CloudHSM cluster.</p>
+   *          <p>This parameter tells KMS the <code>kmsuser</code> account password; it does not change
+   *       the password in the CloudHSM cluster.</p>
    */
   KeyStorePassword: string | undefined;
 }
@@ -611,7 +611,7 @@ export namespace CustomKeyStoreNameInUseException {
 
 /**
  * <p>The request was rejected because the trust anchor certificate in the request is not the
- *       trust anchor certificate for the specified AWS CloudHSM cluster.</p>
+ *       trust anchor certificate for the specified CloudHSM cluster.</p>
  *          <p>When you <a href="https://docs.aws.amazon.com/cloudhsm/latest/userguide/initialize-cluster.html#sign-csr">initialize the cluster</a>, you create the trust anchor certificate and save it in the
  *         <code>customerCA.crt</code> file.</p>
  */
@@ -633,10 +633,10 @@ export namespace IncorrectTrustAnchorException {
 /**
  * <p>Use this structure to allow <a href="https://docs.aws.amazon.com/kms/latest/developerguide/concepts.html#cryptographic-operations">cryptographic operations</a> in the grant only when the operation request
  *       includes the specified <a href="https://docs.aws.amazon.com/kms/latest/developerguide/concepts.html#encrypt_context">encryption context</a>. </p>
- *          <p>AWS KMS applies the grant constraints only to cryptographic operations that support an
- *       encryption context, that is, all cryptographic operations with a <a href="https://docs.aws.amazon.com/kms/latest/developerguide/symm-asymm-concepts.html#symmetric-cmks">symmetric CMK</a>. Grant
+ *          <p>KMS applies the grant constraints only to cryptographic operations that support an
+ *       encryption context, that is, all cryptographic operations with a <a href="https://docs.aws.amazon.com/kms/latest/developerguide/symm-asymm-concepts.html#symmetric-cmks">symmetric KMS key</a>. Grant
  *       constraints are not applied to operations that do not support an encryption context, such as
- *       cryptographic operations with asymmetric CMKs and management operations, such as <a>DescribeKey</a> or <a>RetireGrant</a>.</p>
+ *       cryptographic operations with asymmetric KMS keys and management operations, such as <a>DescribeKey</a> or <a>RetireGrant</a>.</p>
  *          <important>
  *             <p>In a cryptographic operation, the encryption context in the decryption operation must be
  *         an exact, case-sensitive match for the keys and values in the encryption context of the
@@ -647,7 +647,7 @@ export namespace IncorrectTrustAnchorException {
  *         case. To require a fully case-sensitive encryption context, use the
  *           <code>kms:EncryptionContext:</code> and <code>kms:EncryptionContextKeys</code> conditions
  *         in an IAM or key policy. For details, see <a href="https://docs.aws.amazon.com/kms/latest/developerguide/policy-conditions.html#conditions-kms-encryption-context">kms:EncryptionContext:</a> in the <i>
- *                   <i>AWS Key Management Service Developer Guide</i>
+ *                   <i>Key Management Service Developer Guide</i>
  *                </i>.</p>
  *          </important>
  */
@@ -696,10 +696,10 @@ export enum GrantOperation {
 
 export interface CreateGrantRequest {
   /**
-   * <p>Identifies the customer master key (CMK) for the grant. The grant gives principals permission to use this CMK.</p>
+   * <p>Identifies the KMS key for the grant. The grant gives principals permission to use this KMS key.</p>
    *
-   *          <p>Specify the key ID or key ARN of the CMK. To specify a CMK in a
-   * different AWS account, you must use the key ARN.</p>
+   *          <p>Specify the key ID or key ARN of the KMS key. To specify a KMS key in a
+   * different Amazon Web Services account, you must use the key ARN.</p>
    *          <p>For example:</p>
    *          <ul>
    *             <li>
@@ -711,65 +711,67 @@ export interface CreateGrantRequest {
    *                </p>
    *             </li>
    *          </ul>
-   *          <p>To get the key ID and key ARN for a CMK, use <a>ListKeys</a> or <a>DescribeKey</a>.</p>
+   *          <p>To get the key ID and key ARN for a KMS key, use <a>ListKeys</a> or <a>DescribeKey</a>.</p>
    */
   KeyId: string | undefined;
 
   /**
    * <p>The identity that gets the permissions specified in the grant.</p>
-   *          <p>To specify the principal, use the <a href="https://docs.aws.amazon.com/general/latest/gr/aws-arns-and-namespaces.html">Amazon Resource Name (ARN)</a> of an AWS
-   *       principal. Valid AWS principals include AWS accounts (root), IAM users, IAM roles, federated
+   *          <p>To specify the principal, use the <a href="https://docs.aws.amazon.com/general/latest/gr/aws-arns-and-namespaces.html">Amazon Resource Name (ARN)</a> of an Amazon Web Services principal. Valid Amazon Web Services principals include Amazon Web Services accounts (root), IAM users, IAM roles, federated
    *       users, and assumed role users. For examples of the ARN syntax to use for specifying a
-   *       principal, see <a href="https://docs.aws.amazon.com/general/latest/gr/aws-arns-and-namespaces.html#arn-syntax-iam">AWS Identity and Access
-   *         Management (IAM)</a> in the Example ARNs section of the <i>AWS General
-   *         Reference</i>.</p>
+   *       principal, see <a href="https://docs.aws.amazon.com/general/latest/gr/aws-arns-and-namespaces.html#arn-syntax-iam">Amazon Web Services Identity and Access
+   *         Management (IAM)</a> in the Example ARNs section of the <i>Amazon Web Services General
+   *           Reference</i>.</p>
    */
   GranteePrincipal: string | undefined;
 
   /**
-   * <p>The principal that is given permission to retire the grant by using <a>RetireGrant</a> operation.</p>
-   *          <p>To specify the principal, use the <a href="https://docs.aws.amazon.com/general/latest/gr/aws-arns-and-namespaces.html">Amazon Resource Name (ARN)</a> of an AWS
-   *       principal. Valid AWS principals include AWS accounts (root), IAM users, federated users, and
+   * <p>The principal that has permission to use the <a>RetireGrant</a> operation to
+   *       retire the grant. </p>
+   *          <p>To specify the principal, use the <a href="https://docs.aws.amazon.com/general/latest/gr/aws-arns-and-namespaces.html">Amazon Resource Name (ARN)</a> of an Amazon Web Services principal. Valid Amazon Web Services principals include Amazon Web Services accounts (root), IAM users, federated users, and
    *       assumed role users. For examples of the ARN syntax to use for specifying a principal, see
-   *         <a href="https://docs.aws.amazon.com/general/latest/gr/aws-arns-and-namespaces.html#arn-syntax-iam">AWS Identity and Access Management (IAM)</a> in the Example ARNs section of the
-   *         <i>AWS General Reference</i>.</p>
+   *       <a href="https://docs.aws.amazon.com/general/latest/gr/aws-arns-and-namespaces.html#arn-syntax-iam">Amazon Web Services Identity and Access Management (IAM)</a> in the Example ARNs section of the
+   *       <i>Amazon Web Services General Reference</i>.</p>
+   *          <p>The grant determines the retiring principal. Other principals might have permission to
+   *       retire the grant or revoke the grant. For details, see <a>RevokeGrant</a> and
+   *       <a href="https://docs.aws.amazon.com/kms/latest/developerguide/grant-manage.html#grant-delete">Retiring and revoking grants</a> in the <i>Key Management Service Developer Guide</i>. </p>
    */
   RetiringPrincipal?: string;
 
   /**
    * <p>A list of operations that the grant permits. </p>
-   *          <p>The operation must be supported on the CMK. For example, you cannot create a grant for a
-   *       symmetric CMK that allows the <a>Sign</a> operation, or a grant for an asymmetric
-   *       CMK that allows the <a>GenerateDataKey</a> operation. If you try, AWS KMS returns a
-   *         <code>ValidationError</code> exception. For details, see <a href="https://docs.aws.amazon.com/kms/latest/developerguide/grants.html#terms-grant-operations">Grant operations</a> in the
-   *       <i>AWS Key Management Service Developer Guide</i>.</p>
+   *          <p>The operation must be supported on the KMS key. For example, you cannot create a grant for a
+   *       symmetric KMS key that allows the <a>Sign</a> operation, or a grant for an asymmetric KMS key that allows the <a>GenerateDataKey</a> operation. If you try, KMS returns a
+   *       <code>ValidationError</code> exception. For details, see <a href="https://docs.aws.amazon.com/kms/latest/developerguide/grants.html#terms-grant-operations">Grant operations</a> in the
+   *       <i>Key Management Service Developer Guide</i>.</p>
    */
   Operations: (GrantOperation | string)[] | undefined;
 
   /**
    * <p>Specifies a grant constraint. </p>
-   *          <p>AWS KMS supports the <code>EncryptionContextEquals</code> and
-   *         <code>EncryptionContextSubset</code> grant constraints. Each constraint value can include up
+   *          <p>KMS supports the <code>EncryptionContextEquals</code> and
+   *       <code>EncryptionContextSubset</code> grant constraints. Each constraint value can include up
    *       to 8 encryption context pairs. The encryption context value in each constraint cannot exceed
    *       384 characters.</p>
-   *          <p>These grant constraints allow a <a href="https://docs.aws.amazon.com/kms/latest/developerguide/concepts.html#cryptographic-operations">cryptographic operation</a> only when the encryption context in the
-   *       request matches (<code>EncryptionContextEquals</code>) or includes
-   *         (<code>EncryptionContextSubset</code>) the encryption context specified in this structure.
-   *       For more information about encryption context, see <a href="https://docs.aws.amazon.com/kms/latest/developerguide/concepts.html#encrypt_context">Encryption Context</a> in the
-   *         <i>
-   *                <i>AWS Key Management Service Developer Guide</i>
-   *             </i>. For information about grant constraints, see <a href="https://docs.aws.amazon.com/kms/latest/developerguide/create-grant-overview.html#grant-constraints">Using
-   *         grant constraints</a> in the <i>AWS Key Management Service Developer Guide</i>.</p>
+   *          <p>These grant constraints allow the permissions in the grant only when the encryption
+   *       context in the request matches (<code>EncryptionContextEquals</code>) or includes
+   *       (<code>EncryptionContextSubset</code>) the encryption context specified in this structure.
+   *       For information about grant constraints, see <a href="https://docs.aws.amazon.com/kms/latest/developerguide/create-grant-overview.html#grant-constraints">Using grant
+   *         constraints</a> in the <i>Key Management Service Developer Guide</i>. For more information about encryption context,
+   *       see <a href="https://docs.aws.amazon.com/kms/latest/developerguide/concepts.html#encrypt_context">Encryption
+   *         Context</a> in the <i>
+   *                <i>Key Management Service Developer Guide</i>
+   *             </i>. </p>
    *          <p>The encryption context grant constraints are supported only on operations that include an
    *       encryption context. You cannot use an encryption context grant constraint for cryptographic
-   *       operations with asymmetric CMKs or for management operations, such as <a>DescribeKey</a> or <a>RetireGrant</a>.</p>
+   *       operations with asymmetric KMS keys or for management operations, such as <a>DescribeKey</a> or <a>RetireGrant</a>.</p>
    */
   Constraints?: GrantConstraints;
 
   /**
    * <p>A list of grant tokens. </p>
-   *          <p>Use a grant token when your permission to call this operation comes from a new grant that has not yet achieved <i>eventual consistency</i>. For more information, see <a href="https://docs.aws.amazon.com/kms/latest/developerguide/concepts.html#grant_token">Grant token</a> in the
-   *     <i>AWS Key Management Service Developer Guide</i>.</p>
+   *          <p>Use a grant token when your permission to call this operation comes from a new grant that has not yet achieved <i>eventual consistency</i>. For more information, see <a href="https://docs.aws.amazon.com/kms/latest/developerguide/grants.html#grant_token">Grant token</a> and <a href="https://docs.aws.amazon.com/kms/latest/developerguide/grant-manage.html#using-grant-token">Using a grant token</a> in the
+   *     <i>Key Management Service Developer Guide</i>.</p>
    */
   GrantTokens?: string[];
 
@@ -782,7 +784,7 @@ export interface CreateGrantRequest {
    *          <p>When this value is present, you can retry a <code>CreateGrant</code> request with
    *       identical parameters; if the grant already exists, the original <code>GrantId</code> is
    *       returned without creating a new grant. Note that the returned grant token is unique with every
-   *         <code>CreateGrant</code> request, even when a duplicate <code>GrantId</code> is returned.
+   *       <code>CreateGrant</code> request, even when a duplicate <code>GrantId</code> is returned.
    *       All grant tokens for the same grant ID can be used interchangeably.</p>
    */
   Name?: string;
@@ -800,8 +802,8 @@ export namespace CreateGrantRequest {
 export interface CreateGrantResponse {
   /**
    * <p>The grant token.</p>
-   *          <p>Use a grant token when your permission to call this operation comes from a new grant that has not yet achieved <i>eventual consistency</i>. For more information, see <a href="https://docs.aws.amazon.com/kms/latest/developerguide/concepts.html#grant_token">Grant token</a> in the
-   *     <i>AWS Key Management Service Developer Guide</i>.</p>
+   *          <p>Use a grant token when your permission to call this operation comes from a new grant that has not yet achieved <i>eventual consistency</i>. For more information, see <a href="https://docs.aws.amazon.com/kms/latest/developerguide/grants.html#grant_token">Grant token</a> and <a href="https://docs.aws.amazon.com/kms/latest/developerguide/grant-manage.html#using-grant-token">Using a grant token</a> in the
+   *     <i>Key Management Service Developer Guide</i>.</p>
    */
   GrantToken?: string;
 
@@ -822,7 +824,7 @@ export namespace CreateGrantResponse {
 }
 
 /**
- * <p>The request was rejected because the specified CMK is not enabled.</p>
+ * <p>The request was rejected because the specified KMS key is not enabled.</p>
  */
 export interface DisabledException extends __SmithyException, $MetadataBearer {
   name: "DisabledException";
@@ -868,6 +870,17 @@ export enum CustomerMasterKeySpec {
   SYMMETRIC_DEFAULT = "SYMMETRIC_DEFAULT",
 }
 
+export enum KeySpec {
+  ECC_NIST_P256 = "ECC_NIST_P256",
+  ECC_NIST_P384 = "ECC_NIST_P384",
+  ECC_NIST_P521 = "ECC_NIST_P521",
+  ECC_SECG_P256K1 = "ECC_SECG_P256K1",
+  RSA_2048 = "RSA_2048",
+  RSA_3072 = "RSA_3072",
+  RSA_4096 = "RSA_4096",
+  SYMMETRIC_DEFAULT = "SYMMETRIC_DEFAULT",
+}
+
 export enum KeyUsageType {
   ENCRYPT_DECRYPT = "ENCRYPT_DECRYPT",
   SIGN_VERIFY = "SIGN_VERIFY",
@@ -882,7 +895,7 @@ export enum OriginType {
 /**
  * <p>A key-value pair. A tag consists of a tag key and a tag value. Tag keys and tag values are
  *       both required, but tag values can be empty (null) strings.</p>
- *          <p>For information about the rules that apply to tag keys and tag values, see <a href="https://docs.aws.amazon.com/awsaccountbilling/latest/aboutv2/allocation-tag-restrictions.html">User-Defined Tag Restrictions</a> in the <i>AWS Billing and Cost Management User
+ *          <p>For information about the rules that apply to tag keys and tag values, see <a href="https://docs.aws.amazon.com/awsaccountbilling/latest/aboutv2/allocation-tag-restrictions.html">User-Defined Tag Restrictions</a> in the <i>Amazon Web Services Billing and Cost Management User
  *         Guide</i>.</p>
  */
 export interface Tag {
@@ -908,85 +921,94 @@ export namespace Tag {
 
 export interface CreateKeyRequest {
   /**
-   * <p>The key policy to attach to the CMK.</p>
+   * <p>The key policy to attach to the KMS key.</p>
    *          <p>If you provide a key policy, it must meet the following criteria:</p>
    *          <ul>
    *             <li>
    *                <p>If you don't set <code>BypassPolicyLockoutSafetyCheck</code> to true, the key policy
    *           must allow the principal that is making the <code>CreateKey</code> request to make a
-   *           subsequent <a>PutKeyPolicy</a> request on the CMK. This reduces the risk that
-   *           the CMK becomes unmanageable. For more information, refer to the scenario in the <a href="https://docs.aws.amazon.com/kms/latest/developerguide/key-policies.html#key-policy-default-allow-root-enable-iam">Default Key Policy</a> section of the <i>
-   *                      <i>AWS Key Management Service Developer Guide</i>
+   *           subsequent <a>PutKeyPolicy</a> request on the KMS key. This reduces the risk that
+   *           the KMS key becomes unmanageable. For more information, refer to the scenario in the <a href="https://docs.aws.amazon.com/kms/latest/developerguide/key-policies.html#key-policy-default-allow-root-enable-iam">Default Key Policy</a> section of the <i>
+   *                      <i>Key Management Service Developer Guide</i>
    *                   </i>.</p>
    *             </li>
    *             <li>
    *                <p>Each statement in the key policy must contain one or more principals. The principals
-   *           in the key policy must exist and be visible to AWS KMS. When you create a new AWS principal
+   *           in the key policy must exist and be visible to KMS. When you create a new Amazon Web Services principal
    *           (for example, an IAM user or role), you might need to enforce a delay before including the
    *           new principal in a key policy because the new principal might not be immediately visible
-   *           to AWS KMS. For more information, see <a href="https://docs.aws.amazon.com/IAM/latest/UserGuide/troubleshoot_general.html#troubleshoot_general_eventual-consistency">Changes that I make are not always immediately visible</a> in the <i>AWS
-   *             Identity and Access Management User Guide</i>.</p>
+   *           to KMS. For more information, see <a href="https://docs.aws.amazon.com/IAM/latest/UserGuide/troubleshoot_general.html#troubleshoot_general_eventual-consistency">Changes that I make are not always immediately visible</a> in the <i>Amazon Web Services Identity and Access Management User Guide</i>.</p>
    *             </li>
    *          </ul>
-   *          <p>If you do not provide a key policy, AWS KMS attaches a default key policy to the CMK. For
+   *          <p>If you do not provide a key policy, KMS attaches a default key policy to the KMS key. For
    *       more information, see <a href="https://docs.aws.amazon.com/kms/latest/developerguide/key-policies.html#key-policy-default">Default Key Policy</a> in the
-   *       <i>AWS Key Management Service Developer Guide</i>. </p>
+   *       <i>Key Management Service Developer Guide</i>. </p>
    *          <p>The key policy size quota is 32 kilobytes (32768 bytes).</p>
    *          <p>For help writing and formatting a JSON policy document, see the <a href="https://docs.aws.amazon.com/IAM/latest/UserGuide/reference_policies.html">IAM JSON Policy Reference</a> in the <i>
-   *                <i>IAM User Guide</i>
+   *                <i>Identity and Access Management User Guide</i>
    *             </i>.</p>
    */
   Policy?: string;
 
   /**
-   * <p>A description of the CMK.</p>
-   *          <p>Use a description that helps you decide whether the CMK is
+   * <p>A description of the KMS key.</p>
+   *          <p>Use a description that helps you decide whether the KMS key is
    *       appropriate for a task. The default value is an empty string (no description).</p>
+   *          <p>To set or change the description after the key is created, use <a>UpdateKeyDescription</a>.</p>
    */
   Description?: string;
 
   /**
-   * <p>Determines the <a href="https://docs.aws.amazon.com/kms/latest/developerguide/concepts.html#cryptographic-operations">cryptographic operations</a> for which you can use the CMK. The default value is
-   *         <code>ENCRYPT_DECRYPT</code>. This parameter is required only for asymmetric CMKs. You can't
-   *       change the <code>KeyUsage</code> value after the CMK is created.</p>
+   * <p>Determines the <a href="https://docs.aws.amazon.com/kms/latest/developerguide/concepts.html#cryptographic-operations">cryptographic operations</a> for which you can use the KMS key. The default value is
+   *         <code>ENCRYPT_DECRYPT</code>. This parameter is required only for asymmetric KMS keys. You can't
+   *       change the <code>KeyUsage</code> value after the KMS key is created.</p>
    *          <p>Select only one valid value.</p>
    *          <ul>
    *             <li>
-   *                <p>For symmetric CMKs, omit the parameter or specify <code>ENCRYPT_DECRYPT</code>.</p>
+   *                <p>For symmetric KMS keys, omit the parameter or specify <code>ENCRYPT_DECRYPT</code>.</p>
    *             </li>
    *             <li>
-   *                <p>For asymmetric CMKs with RSA key material, specify <code>ENCRYPT_DECRYPT</code> or
+   *                <p>For asymmetric KMS keys with RSA key material, specify <code>ENCRYPT_DECRYPT</code> or
    *             <code>SIGN_VERIFY</code>.</p>
    *             </li>
    *             <li>
-   *                <p>For asymmetric CMKs with ECC key material, specify <code>SIGN_VERIFY</code>.</p>
+   *                <p>For asymmetric KMS keys with ECC key material, specify <code>SIGN_VERIFY</code>.</p>
    *             </li>
    *          </ul>
    */
   KeyUsage?: KeyUsageType | string;
 
   /**
-   * <p>Specifies the type of CMK to create. The default value, <code>SYMMETRIC_DEFAULT</code>,
-   *       creates a CMK with a 256-bit symmetric key for encryption and decryption. For help choosing a
-   *       key spec for your CMK, see <a href="https://docs.aws.amazon.com/kms/latest/developerguide/symm-asymm-choose.html">How to Choose Your CMK
-   *         Configuration</a> in the <i>AWS Key Management Service Developer
-   *       Guide</i>.</p>
-   *          <p>The <code>CustomerMasterKeySpec</code> determines whether the CMK contains a symmetric key
-   *       or an asymmetric key pair. It also determines the encryption algorithms or signing algorithms
-   *       that the CMK supports. You can't change the <code>CustomerMasterKeySpec</code> after the CMK
-   *       is created. To further restrict the algorithms that can be used with the CMK, use a condition
-   *       key in its key policy or IAM policy. For more information, see <a href="https://docs.aws.amazon.com/kms/latest/developerguide/policy-conditions.html#conditions-kms-encryption-algorithm">kms:EncryptionAlgorithm</a> or <a href="https://docs.aws.amazon.com/kms/latest/developerguide/policy-conditions.html#conditions-kms-signing-algorithm">kms:Signing Algorithm</a> in the <i>AWS Key Management Service Developer
-   *         Guide</i>.</p>
+   * @deprecated
+   *
+   * <p>Instead, use the <code>KeySpec</code> parameter.</p>
+   *          <p>The <code>KeySpec</code> and <code>CustomerMasterKeySpec</code> parameters work the same way. Only the names differ. We recommend that you use <code>KeySpec</code> parameter in your code. However, to avoid breaking changes, KMS will support both parameters.</p>
+   */
+  CustomerMasterKeySpec?: CustomerMasterKeySpec | string;
+
+  /**
+   * <p>Specifies the type of KMS key to create. The default value, <code>SYMMETRIC_DEFAULT</code>,
+   *       creates a KMS key with a 256-bit symmetric key for encryption and decryption. For help choosing a
+   *       key spec for your KMS key, see <a href="https://docs.aws.amazon.com/kms/latest/developerguide/symm-asymm-choose.html">How to Choose Your KMS key
+   *         Configuration</a> in the <i>
+   *                <i>Key Management Service Developer Guide</i>
+   *             </i>.</p>
+   *          <p>The <code>KeySpec</code> determines whether the KMS key contains a symmetric key or an
+   *       asymmetric key pair. It also determines the encryption algorithms or signing algorithms that
+   *       the KMS key supports. You can't change the <code>KeySpec</code> after the KMS key is created.
+   *       To further restrict the algorithms that can be used with the KMS key, use a condition key in
+   *       its key policy or IAM policy. For more information, see <a href="https://docs.aws.amazon.com/kms/latest/developerguide/policy-conditions.html#conditions-kms-encryption-algorithm">kms:EncryptionAlgorithm</a> or <a href="https://docs.aws.amazon.com/kms/latest/developerguide/policy-conditions.html#conditions-kms-signing-algorithm">kms:Signing Algorithm</a> in the <i>
+   *                <i>Key Management Service Developer Guide</i>
+   *             </i>.</p>
    *          <important>
    *             <p>
-   *                <a href="http://aws.amazon.com/kms/features/#AWS_Service_Integration">AWS services that
-   *           are integrated with AWS KMS</a> use symmetric CMKs to protect your data. These
-   *         services do not support asymmetric CMKs. For help determining whether a CMK is symmetric or
-   *         asymmetric, see <a href="https://docs.aws.amazon.com/kms/latest/developerguide/find-symm-asymm.html">Identifying Symmetric and Asymmetric
-   *           CMKs</a> in the <i>AWS Key Management Service Developer
-   *         Guide</i>.</p>
+   *                <a href="http://aws.amazon.com/kms/features/#AWS_Service_Integration">Amazon Web Services services that
+   *         are integrated with KMS</a> use symmetric KMS keys to protect your data. These
+   *         services do not support asymmetric KMS keys. For help determining whether a KMS key is symmetric or
+   *         asymmetric, see <a href="https://docs.aws.amazon.com/kms/latest/developerguide/find-symm-asymm.html">Identifying Symmetric and Asymmetric KMS keys</a> in the <i>Key Management Service Developer
+   *             Guide</i>.</p>
    *          </important>
-   *          <p>AWS KMS supports the following key specs for CMKs:</p>
+   *          <p>KMS supports the following key specs for KMS keys:</p>
    *          <ul>
    *             <li>
    *                <p>Symmetric key (default)</p>
@@ -1046,35 +1068,35 @@ export interface CreateKeyRequest {
    *             </li>
    *          </ul>
    */
-  CustomerMasterKeySpec?: CustomerMasterKeySpec | string;
+  KeySpec?: KeySpec | string;
 
   /**
-   * <p>The source of the key material for the CMK. You cannot change the origin after you create
-   *       the CMK. The default is <code>AWS_KMS</code>, which means that AWS KMS creates the key
+   * <p>The source of the key material for the KMS key. You cannot change the origin after you create
+   *       the KMS key. The default is <code>AWS_KMS</code>, which means that KMS creates the key
    *       material.</p>
-   *          <p>To create a CMK with no key material (for imported key material), set the value to
-   *         <code>EXTERNAL</code>. For more information about importing key material into AWS KMS, see
+   *          <p>To create a KMS key with no key material (for imported key material), set the value to
+   *         <code>EXTERNAL</code>. For more information about importing key material into KMS, see
    *         <a href="https://docs.aws.amazon.com/kms/latest/developerguide/importing-keys.html">Importing Key
-   *         Material</a> in the <i>AWS Key Management Service Developer Guide</i>. This value is valid only for symmetric CMKs.</p>
-   *          <p>To create a CMK in an AWS KMS <a href="https://docs.aws.amazon.com/kms/latest/developerguide/custom-key-store-overview.html">custom key store</a> and create its key material in the associated
-   *       AWS CloudHSM cluster, set this value to <code>AWS_CLOUDHSM</code>. You must also use the
+   *         Material</a> in the <i>Key Management Service Developer Guide</i>. This value is valid only for symmetric KMS keys.</p>
+   *          <p>To create a KMS key in an KMS <a href="https://docs.aws.amazon.com/kms/latest/developerguide/custom-key-store-overview.html">custom key store</a> and create its key material in the associated
+   *       CloudHSM cluster, set this value to <code>AWS_CLOUDHSM</code>. You must also use the
    *         <code>CustomKeyStoreId</code> parameter to identify the custom key store. This value is
-   *       valid only for symmetric CMKs.</p>
+   *       valid only for symmetric KMS keys.</p>
    */
   Origin?: OriginType | string;
 
   /**
-   * <p>Creates the CMK in the specified <a href="https://docs.aws.amazon.com/kms/latest/developerguide/custom-key-store-overview.html">custom key store</a> and the key material in its associated
-   *       AWS CloudHSM cluster. To create a CMK in a custom key store, you must also specify the
-   *         <code>Origin</code> parameter with a value of <code>AWS_CLOUDHSM</code>. The AWS CloudHSM cluster
+   * <p>Creates the KMS key in the specified <a href="https://docs.aws.amazon.com/kms/latest/developerguide/custom-key-store-overview.html">custom key store</a> and the key material in its associated
+   *       CloudHSM cluster. To create a KMS key in a custom key store, you must also specify the
+   *         <code>Origin</code> parameter with a value of <code>AWS_CLOUDHSM</code>. The CloudHSM cluster
    *       that is associated with the custom key store must have at least two active HSMs, each in a
    *       different Availability Zone in the Region.</p>
-   *          <p>This parameter is valid only for symmetric CMKs and regional CMKs. You cannot create an
-   *       asymmetric CMK or a multi-Region CMK in a custom key store.</p>
+   *          <p>This parameter is valid only for symmetric KMS keys and regional KMS keys. You cannot create an
+   *       asymmetric KMS key or a multi-Region key in a custom key store.</p>
    *          <p>To find the ID of a custom key store, use the <a>DescribeCustomKeyStores</a> operation.</p>
-   *          <p>The response includes the custom key store ID and the ID of the AWS CloudHSM cluster.</p>
-   *          <p>This operation is part of the <a href="https://docs.aws.amazon.com/kms/latest/developerguide/custom-key-store-overview.html">Custom Key Store feature</a> feature in AWS KMS, which
-   * combines the convenience and extensive integration of AWS KMS with the isolation and control of a
+   *          <p>The response includes the custom key store ID and the ID of the CloudHSM cluster.</p>
+   *          <p>This operation is part of the <a href="https://docs.aws.amazon.com/kms/latest/developerguide/custom-key-store-overview.html">Custom Key Store feature</a> feature in KMS, which
+   * combines the convenience and extensive integration of KMS with the isolation and control of a
    * single-tenant key store.</p>
    */
   CustomKeyStoreId?: string;
@@ -1082,50 +1104,49 @@ export interface CreateKeyRequest {
   /**
    * <p>A flag to indicate whether to bypass the key policy lockout safety check.</p>
    *          <important>
-   *             <p>Setting this value to true increases the risk that the CMK becomes unmanageable. Do not
+   *             <p>Setting this value to true increases the risk that the KMS key becomes unmanageable. Do not
    *         set this value to true indiscriminately.</p>
    *             <p>For more information, refer to the scenario in the <a href="https://docs.aws.amazon.com/kms/latest/developerguide/key-policies.html#key-policy-default-allow-root-enable-iam">Default Key Policy</a> section in the <i>
-   *                   <i>AWS Key Management Service Developer Guide</i>
+   *                   <i>Key Management Service Developer Guide</i>
    *                </i>.</p>
    *          </important>
    *          <p>Use this parameter only when you include a policy in the request and you intend to prevent
-   *       the principal that is making the request from making a subsequent <a>PutKeyPolicy</a> request on the CMK.</p>
+   *       the principal that is making the request from making a subsequent <a>PutKeyPolicy</a> request on the KMS key.</p>
    *          <p>The default value is false.</p>
    */
   BypassPolicyLockoutSafetyCheck?: boolean;
 
   /**
-   * <p>Assigns one or more tags to the CMK. Use this parameter to tag the CMK when it is created.
-   *       To tag an existing CMK, use the <a>TagResource</a> operation.</p>
+   * <p>Assigns one or more tags to the KMS key. Use this parameter to tag the KMS key when it is created.
+   *       To tag an existing KMS key, use the <a>TagResource</a> operation.</p>
    *          <note>
-   *             <p>Tagging or untagging a CMK can allow or deny permission to the
-   *                 CMK. For details, see <a href="https://docs.aws.amazon.com/kms/latest/developerguide/abac.html">Using ABAC in AWS KMS</a> in the <i>AWS Key Management Service Developer Guide</i>.</p>
+   *             <p>Tagging or untagging a KMS key can allow or deny permission to the KMS key. For details, see <a href="https://docs.aws.amazon.com/kms/latest/developerguide/abac.html">Using ABAC in KMS</a> in the <i>Key Management Service Developer Guide</i>.</p>
    *          </note>
    *          <p>To use this parameter, you must have <a href="https://docs.aws.amazon.com/kms/latest/developerguide/kms-api-permissions-reference.html">kms:TagResource</a> permission in an IAM policy.</p>
    *          <p>Each tag consists of a tag key and a tag value. Both the tag key and the tag value are
    *       required, but the tag value can be an empty (null) string. You cannot have more than one tag
-   *       on a CMK with the same tag key. If you specify an existing tag key with a different tag value,
-   *       AWS KMS replaces the current tag value with the specified one.</p>
-   *          <p>When you assign tags to an AWS resource, AWS generates a cost allocation
-   *               report with usage and costs aggregated by tags. Tags can also be used to control access to a CMK. For details,
+   *       on a KMS key with the same tag key. If you specify an existing tag key with a different tag value,
+   *       KMS replaces the current tag value with the specified one.</p>
+   *          <p>When you add tags to an Amazon Web Services resource, Amazon Web Services generates a cost allocation
+   *               report with usage and costs aggregated by tags. Tags can also be used to control access to a KMS key. For details,
    *               see <a href="https://docs.aws.amazon.com/kms/latest/developerguide/tagging-keys.html">Tagging Keys</a>.</p>
    */
   Tags?: Tag[];
 
   /**
-   * <p>Creates a multi-Region primary key that you can replicate into other AWS Regions. You
-   *       cannot change this value after you create the CMK. </p>
-   *          <p>For a multi-Region key, set this parameter to <code>True</code>. For a single-Region CMK,
+   * <p>Creates a multi-Region primary key that you can replicate into other Amazon Web Services Regions. You
+   *       cannot change this value after you create the KMS key. </p>
+   *          <p>For a multi-Region key, set this parameter to <code>True</code>. For a single-Region KMS key,
    *       omit this parameter or set it to <code>False</code>. The default value is
    *       <code>False</code>.</p>
-   *          <p>This operation supports <i>multi-Region keys</i>, an AWS KMS feature that lets you create multiple
-   *       interoperable CMKs in different AWS Regions. Because these CMKs have the same key ID, key
-   *       material, and other metadata, you can use them to encrypt data in one AWS Region and decrypt
-   *       it in a different AWS Region without making a cross-Region call or exposing the plaintext data. For more information about multi-Region keys, see <a href="https://docs.aws.amazon.com/kms/latest/developerguide/multi-region-keys-overview.html">Using multi-Region keys</a> in the <i>AWS Key Management Service Developer Guide</i>.</p>
+   *          <p>This operation supports <i>multi-Region keys</i>, an KMS feature that lets you create multiple
+   *       interoperable KMS keys in different Amazon Web Services Regions. Because these KMS keys have the same key ID, key
+   *       material, and other metadata, you can use them interchangeably to encrypt data in one Amazon Web Services Region and decrypt
+   *       it in a different Amazon Web Services Region without re-encrypting the data or making a cross-Region call. For more information about multi-Region keys, see <a href="https://docs.aws.amazon.com/kms/latest/developerguide/multi-region-keys-overview.html">Using multi-Region keys</a> in the <i>Key Management Service Developer Guide</i>.</p>
    *          <p>This value creates a <i>primary key</i>, not a replica. To create a
    *         <i>replica key</i>, use the <a>ReplicateKey</a> operation. </p>
-   *          <p>You can create a symmetric or asymmetric multi-Region CMK, and you can create a
-   *       multi-Region CMK with imported key material. However, you cannot create a multi-Region CMK in
+   *          <p>You can create a symmetric or asymmetric multi-Region key, and you can create a
+   *       multi-Region key with imported key material. However, you cannot create a multi-Region key in
    *       a custom key store.</p>
    */
   MultiRegion?: boolean;
@@ -1182,7 +1203,7 @@ export interface MultiRegionKey {
   Arn?: string;
 
   /**
-   * <p>Displays the AWS Region of a primary or replica key in a multi-Region key.</p>
+   * <p>Displays the Amazon Web Services Region of a primary or replica key in a multi-Region key.</p>
    */
   Region?: string;
 }
@@ -1197,25 +1218,25 @@ export namespace MultiRegionKey {
 }
 
 /**
- * <p>Describes the configuration of this multi-Region CMK. This field appears only when the CMK
- *       is a primary or replica of a multi-Region CMK.</p>
- *          <p>For more information about any listed CMK, use the <a>DescribeKey</a>
+ * <p>Describes the configuration of this multi-Region key. This field appears only when the KMS key
+ *       is a primary or replica of a multi-Region key.</p>
+ *          <p>For more information about any listed KMS key, use the <a>DescribeKey</a>
  *       operation.</p>
  */
 export interface MultiRegionConfiguration {
   /**
-   * <p>Indicates whether the CMK is a <code>PRIMARY</code> or <code>REPLICA</code> key.</p>
+   * <p>Indicates whether the KMS key is a <code>PRIMARY</code> or <code>REPLICA</code> key.</p>
    */
   MultiRegionKeyType?: MultiRegionKeyType | string;
 
   /**
-   * <p>Displays the key ARN and Region of the primary key. This field includes the current CMK if
+   * <p>Displays the key ARN and Region of the primary key. This field includes the current KMS key if
    *       it is the primary key.</p>
    */
   PrimaryKey?: MultiRegionKey;
 
   /**
-   * <p>displays the key ARNs and Regions of all replica keys. This field includes the current CMK
+   * <p>displays the key ARNs and Regions of all replica keys. This field includes the current KMS key
    *       if it is a replica key.</p>
    */
   ReplicaKeys?: MultiRegionKey[];
@@ -1243,58 +1264,57 @@ export enum SigningAlgorithmSpec {
 }
 
 /**
- * <p>Contains metadata about a customer master key (CMK).</p>
+ * <p>Contains metadata about a KMS key.</p>
  *          <p>This data type is used as a response element for the <a>CreateKey</a> and <a>DescribeKey</a> operations.</p>
  */
 export interface KeyMetadata {
   /**
-   * <p>The twelve-digit account ID of the AWS account that owns the CMK.</p>
+   * <p>The twelve-digit account ID of the Amazon Web Services account that owns the KMS key.</p>
    */
   AWSAccountId?: string;
 
   /**
-   * <p>The globally unique identifier for the CMK.</p>
+   * <p>The globally unique identifier for the KMS key.</p>
    */
   KeyId: string | undefined;
 
   /**
-   * <p>The Amazon Resource Name (ARN) of the CMK. For examples, see <a href="https://docs.aws.amazon.com/general/latest/gr/aws-arns-and-namespaces.html#arn-syntax-kms">AWS Key Management Service
-   *         (AWS KMS)</a> in the Example ARNs section of the <i>AWS General
+   * <p>The Amazon Resource Name (ARN) of the KMS key. For examples, see <a href="https://docs.aws.amazon.com/general/latest/gr/aws-arns-and-namespaces.html#arn-syntax-kms">Key Management Service
+   *         (KMS)</a> in the Example ARNs section of the <i>Amazon Web Services General
    *         Reference</i>.</p>
    */
   Arn?: string;
 
   /**
-   * <p>The date and time when the CMK was created.</p>
+   * <p>The date and time when the KMS key was created.</p>
    */
   CreationDate?: Date;
 
   /**
-   * <p>Specifies whether the CMK is enabled. When <code>KeyState</code> is <code>Enabled</code>
+   * <p>Specifies whether the KMS key is enabled. When <code>KeyState</code> is <code>Enabled</code>
    *       this value is true, otherwise it is false.</p>
    */
   Enabled?: boolean;
 
   /**
-   * <p>The description of the CMK.</p>
+   * <p>The description of the KMS key.</p>
    */
   Description?: string;
 
   /**
-   * <p>The <a href="https://docs.aws.amazon.com/kms/latest/developerguide/concepts.html#cryptographic-operations">cryptographic operations</a> for which you can use the CMK.</p>
+   * <p>The <a href="https://docs.aws.amazon.com/kms/latest/developerguide/concepts.html#cryptographic-operations">cryptographic operations</a> for which you can use the KMS key.</p>
    */
   KeyUsage?: KeyUsageType | string;
 
   /**
-   * <p>The current status of the CMK.</p>
-   *          <p>For more information about how key state affects the use of a CMK, see <a href="https://docs.aws.amazon.com/kms/latest/developerguide/key-state.html">Key state: Effect on your CMK</a>
-   *       in the <i>AWS Key Management Service Developer Guide</i>.</p>
+   * <p>The current status of the KMS key.</p>
+   *          <p>For more information about how key state affects the use of a KMS key, see <a href="https://docs.aws.amazon.com/kms/latest/developerguide/key-state.html">Key state: Effect on your KMS key</a>
+   *       in the <i>Key Management Service Developer Guide</i>.</p>
    */
   KeyState?: KeyState | string;
 
   /**
-   * <p>The date and time after which AWS KMS deletes this CMK. This value is present only when the
-   *       CMK is scheduled for deletion, that is, when its <code>KeyState</code> is
+   * <p>The date and time after which KMS deletes this KMS key. This value is present only when the KMS key is scheduled for deletion, that is, when its <code>KeyState</code> is
    *         <code>PendingDeletion</code>.</p>
    *          <p>When the primary key in a multi-Region key is scheduled for deletion but still has replica
    *       keys, its key state is <code>PendingReplicaDeletion</code> and the length of its waiting
@@ -1303,98 +1323,105 @@ export interface KeyMetadata {
   DeletionDate?: Date;
 
   /**
-   * <p>The time at which the imported key material expires. When the key material expires, AWS KMS
-   *       deletes the key material and the CMK becomes unusable. This value is present only for CMKs
+   * <p>The time at which the imported key material expires. When the key material expires, KMS
+   *       deletes the key material and the KMS key becomes unusable. This value is present only for KMS keys
    *       whose <code>Origin</code> is <code>EXTERNAL</code> and whose <code>ExpirationModel</code> is
    *         <code>KEY_MATERIAL_EXPIRES</code>, otherwise this value is omitted.</p>
    */
   ValidTo?: Date;
 
   /**
-   * <p>The source of the CMK's key material. When this value is <code>AWS_KMS</code>, AWS KMS
+   * <p>The source of the key material for the KMS key. When this value is <code>AWS_KMS</code>, KMS
    *       created the key material. When this value is <code>EXTERNAL</code>, the key material was
-   *       imported from your existing key management infrastructure or the CMK lacks key material. When
-   *       this value is <code>AWS_CLOUDHSM</code>, the key material was created in the AWS CloudHSM cluster
+   *       imported or the KMS key doesn't have any key material. When
+   *       this value is <code>AWS_CLOUDHSM</code>, the key material was created in the CloudHSM cluster
    *       associated with a custom key store.</p>
    */
   Origin?: OriginType | string;
 
   /**
-   * <p>A unique identifier for the <a href="https://docs.aws.amazon.com/kms/latest/developerguide/custom-key-store-overview.html">custom key store</a> that contains the CMK. This value is present
-   *       only when the CMK is created in a custom key store.</p>
+   * <p>A unique identifier for the <a href="https://docs.aws.amazon.com/kms/latest/developerguide/custom-key-store-overview.html">custom key store</a> that contains the KMS key. This value is present
+   *       only when the KMS key is created in a custom key store.</p>
    */
   CustomKeyStoreId?: string;
 
   /**
-   * <p>The cluster ID of the AWS CloudHSM cluster that contains the key material for the CMK. When you
-   *       create a CMK in a <a href="https://docs.aws.amazon.com/kms/latest/developerguide/custom-key-store-overview.html">custom key store</a>, AWS KMS creates the key material for the CMK in the
-   *       associated AWS CloudHSM cluster. This value is present only when the CMK is created in a custom key
+   * <p>The cluster ID of the CloudHSM cluster that contains the key material for the KMS key. When you
+   *       create a KMS key in a <a href="https://docs.aws.amazon.com/kms/latest/developerguide/custom-key-store-overview.html">custom key store</a>, KMS creates the key material for the KMS key in the
+   *       associated CloudHSM cluster. This value is present only when the KMS key is created in a custom key
    *       store.</p>
    */
   CloudHsmClusterId?: string;
 
   /**
-   * <p>Specifies whether the CMK's key material expires. This value is present only when
+   * <p>Specifies whether the KMS key's key material expires. This value is present only when
    *         <code>Origin</code> is <code>EXTERNAL</code>, otherwise this value is omitted.</p>
    */
   ExpirationModel?: ExpirationModelType | string;
 
   /**
-   * <p>The manager of the CMK. CMKs in your AWS account are either customer managed or AWS
-   *       managed. For more information about the difference, see <a href="https://docs.aws.amazon.com/kms/latest/developerguide/concepts.html#master_keys">Customer Master Keys</a> in the
-   *       <i>AWS Key Management Service Developer Guide</i>.</p>
+   * <p>The manager of the KMS key. KMS keys in your Amazon Web Services account are either customer managed or Amazon Web Services managed. For more information about the difference, see <a href="https://docs.aws.amazon.com/kms/latest/developerguide/concepts.html#kms_keys">KMS keys</a> in the
+   *       <i>Key Management Service Developer Guide</i>.</p>
    */
   KeyManager?: KeyManagerType | string;
 
   /**
-   * <p>Describes the type of key material in the CMK.</p>
+   * @deprecated
+   *
+   * <p>Instead, use the <code>KeySpec</code> field.</p>
+   *          <p>The <code>KeySpec</code> and <code>CustomerMasterKeySpec</code> fields have the same value. We recommend that you use the <code>KeySpec</code> field in your code. However, to avoid breaking changes, KMS will support both fields.</p>
    */
   CustomerMasterKeySpec?: CustomerMasterKeySpec | string;
 
   /**
-   * <p>The encryption algorithms that the CMK supports. You cannot use the CMK with other
-   *       encryption algorithms within AWS KMS.</p>
-   *          <p>This value is present only when the <code>KeyUsage</code> of the CMK is
+   * <p>Describes the type of key material in the KMS key.</p>
+   */
+  KeySpec?: KeySpec | string;
+
+  /**
+   * <p>The encryption algorithms that the KMS key supports. You cannot use the KMS key with other
+   *       encryption algorithms within KMS.</p>
+   *          <p>This value is present only when the <code>KeyUsage</code> of the KMS key is
    *         <code>ENCRYPT_DECRYPT</code>.</p>
    */
   EncryptionAlgorithms?: (EncryptionAlgorithmSpec | string)[];
 
   /**
-   * <p>The signing algorithms that the CMK supports. You cannot use the CMK with other signing
-   *       algorithms within AWS KMS.</p>
-   *          <p>This field appears only when the <code>KeyUsage</code> of the CMK is
+   * <p>The signing algorithms that the KMS key supports. You cannot use the KMS key with other signing
+   *       algorithms within KMS.</p>
+   *          <p>This field appears only when the <code>KeyUsage</code> of the KMS key is
    *         <code>SIGN_VERIFY</code>.</p>
    */
   SigningAlgorithms?: (SigningAlgorithmSpec | string)[];
 
   /**
-   * <p>Indicates whether the CMK is a multi-Region (<code>True</code>) or regional
+   * <p>Indicates whether the KMS key is a multi-Region (<code>True</code>) or regional
    *         (<code>False</code>) key. This value is <code>True</code> for multi-Region primary and
-   *       replica CMKs and <code>False</code> for regional CMKs.</p>
-   *          <p>For more information about multi-Region keys, see <a href="https://docs.aws.amazon.com/kms/latest/developerguide/multi-region-keys-overview.html">Using multi-Region keys</a> in the <i>AWS Key Management Service Developer Guide</i>.</p>
+   *       replica keys and <code>False</code> for regional KMS keys.</p>
+   *          <p>For more information about multi-Region keys, see <a href="https://docs.aws.amazon.com/kms/latest/developerguide/multi-region-keys-overview.html">Using multi-Region keys</a> in the <i>Key Management Service Developer Guide</i>.</p>
    */
   MultiRegion?: boolean;
 
   /**
-   * <p>Lists the primary and replica CMKs in same multi-Region CMK. This field is present only
+   * <p>Lists the primary and replica keys in same multi-Region key. This field is present only
    *       when the value of the <code>MultiRegion</code> field is <code>True</code>.</p>
-   *          <p>For more information about any listed CMK, use the <a>DescribeKey</a>
+   *          <p>For more information about any listed KMS key, use the <a>DescribeKey</a>
    *       operation.</p>
    *          <ul>
    *             <li>
    *                <p>
-   *                   <code>MultiRegionKeyType</code> indicates whether the CMK is a <code>PRIMARY</code> or
+   *                   <code>MultiRegionKeyType</code> indicates whether the KMS key is a <code>PRIMARY</code> or
    *             <code>REPLICA</code> key.</p>
    *             </li>
    *             <li>
    *                <p>
    *                   <code>PrimaryKey</code> displays the key ARN and Region of the primary key. This field
-   *           displays the current CMK if it is the primary key.</p>
+   *           displays the current KMS key if it is the primary key.</p>
    *             </li>
    *             <li>
    *                <p>
    *                   <code>ReplicaKeys</code> displays the key ARNs and Regions of all replica keys. This
-   *           field includes the current CMK if it is a replica key.</p>
+   *           field includes the current KMS key if it is a replica key.</p>
    *             </li>
    *          </ul>
    */
@@ -1403,10 +1430,10 @@ export interface KeyMetadata {
   /**
    * <p>The waiting period before the primary key in a multi-Region key is deleted. This waiting
    *       period begins when the last of its replica keys is deleted. This value is present only when
-   *       the <code>KeyState</code> of the CMK is <code>PendingReplicaDeletion</code>. That indicates
-   *       that the CMK is the primary key in a multi-Region key, it is scheduled for deletion, and it
+   *       the <code>KeyState</code> of the KMS key is <code>PendingReplicaDeletion</code>. That indicates
+   *       that the KMS key is the primary key in a multi-Region key, it is scheduled for deletion, and it
    *       still has existing replica keys.</p>
-   *          <p>When a regional CMK or a replica key in a multi-Region key is scheduled for deletion, its
+   *          <p>When a single-Region KMS key or a multi-Region replica key is scheduled for deletion, its
    *       deletion date is displayed in the <code>DeletionDate</code> field. However, when the primary
    *       key in a multi-Region key is scheduled for deletion, its waiting period doesn't begin until
    *       all of its replica keys are deleted. This value displays that waiting period. When the last
@@ -1428,7 +1455,7 @@ export namespace KeyMetadata {
 
 export interface CreateKeyResponse {
   /**
-   * <p>Metadata associated with the CMK.</p>
+   * <p>Metadata associated with the KMS key.</p>
    */
   KeyMetadata?: KeyMetadata;
 }
@@ -1499,8 +1526,7 @@ export namespace UnsupportedOperationException {
 }
 
 /**
- * <p>The request was rejected because the custom key store contains AWS KMS customer master keys
- *       (CMKs). After verifying that you do not need to use the CMKs, use the <a>ScheduleKeyDeletion</a> operation to delete the CMKs. After they are deleted, you
+ * <p>The request was rejected because the custom key store contains KMS keys. After verifying that you do not need to use the KMS keys, use the <a>ScheduleKeyDeletion</a> operation to delete the KMS keys. After they are deleted, you
  *       can delete the custom key store.</p>
  */
 export interface CustomKeyStoreHasCMKsException extends __SmithyException, $MetadataBearer {
@@ -1533,30 +1559,30 @@ export interface CustomKeyStoresListEntry {
   CustomKeyStoreName?: string;
 
   /**
-   * <p>A unique identifier for the AWS CloudHSM cluster that is associated with the custom key
+   * <p>A unique identifier for the CloudHSM cluster that is associated with the custom key
    *       store.</p>
    */
   CloudHsmClusterId?: string;
 
   /**
-   * <p>The trust anchor certificate of the associated AWS CloudHSM cluster. When you <a href="https://docs.aws.amazon.com/cloudhsm/latest/userguide/initialize-cluster.html#sign-csr">initialize the
+   * <p>The trust anchor certificate of the associated CloudHSM cluster. When you <a href="https://docs.aws.amazon.com/cloudhsm/latest/userguide/initialize-cluster.html#sign-csr">initialize the
    *         cluster</a>, you create this certificate and save it in the <code>customerCA.crt</code>
    *       file.</p>
    */
   TrustAnchorCertificate?: string;
 
   /**
-   * <p>Indicates whether the custom key store is connected to its AWS CloudHSM cluster.</p>
-   *          <p>You can create and use CMKs in your custom key stores only when its connection state is
+   * <p>Indicates whether the custom key store is connected to its CloudHSM cluster.</p>
+   *          <p>You can create and use KMS keys in your custom key stores only when its connection state is
    *         <code>CONNECTED</code>.</p>
    *          <p>The value is <code>DISCONNECTED</code> if the key store has never been connected or you
    *       use the <a>DisconnectCustomKeyStore</a> operation to disconnect it. If the value is
    *         <code>CONNECTED</code> but you are having trouble using the custom key store, make sure that
-   *       its associated AWS CloudHSM cluster is active and contains at least one active HSM.</p>
+   *       its associated CloudHSM cluster is active and contains at least one active HSM.</p>
    *          <p>A value of <code>FAILED</code> indicates that an attempt to connect was unsuccessful. The
    *         <code>ConnectionErrorCode</code> field in the response indicates the cause of the failure.
    *       For help resolving a connection failure, see <a href="https://docs.aws.amazon.com/kms/latest/developerguide/fix-keystore.html">Troubleshooting a Custom Key Store</a> in the
-   *       <i>AWS Key Management Service Developer Guide</i>.</p>
+   *       <i>Key Management Service Developer Guide</i>.</p>
    */
   ConnectionState?: ConnectionStateType | string;
 
@@ -1564,70 +1590,70 @@ export interface CustomKeyStoresListEntry {
    * <p>Describes the connection error. This field appears in the response only when the
    *         <code>ConnectionState</code> is <code>FAILED</code>. For help resolving these errors, see
    *         <a href="https://docs.aws.amazon.com/kms/latest/developerguide/fix-keystore.html#fix-keystore-failed">How to
-   *         Fix a Connection Failure</a> in <i>AWS Key Management Service Developer Guide</i>.</p>
+   *         Fix a Connection Failure</a> in <i>Key Management Service Developer Guide</i>.</p>
    *          <p>Valid values are:</p>
    *          <ul>
    *             <li>
    *                <p>
-   *                   <code>CLUSTER_NOT_FOUND</code> - AWS KMS cannot find the AWS CloudHSM cluster with the
+   *                   <code>CLUSTER_NOT_FOUND</code> - KMS cannot find the CloudHSM cluster with the
    *           specified cluster ID.</p>
    *             </li>
    *             <li>
    *                <p>
-   *                   <code>INSUFFICIENT_CLOUDHSM_HSMS</code> - The associated AWS CloudHSM cluster does not
-   *           contain any active HSMs. To connect a custom key store to its AWS CloudHSM cluster, the cluster
+   *                   <code>INSUFFICIENT_CLOUDHSM_HSMS</code> - The associated CloudHSM cluster does not
+   *           contain any active HSMs. To connect a custom key store to its CloudHSM cluster, the cluster
    *           must contain at least one active HSM.</p>
    *             </li>
    *             <li>
    *                <p>
-   *                   <code>INTERNAL_ERROR</code> - AWS KMS could not complete the request due to an internal
+   *                   <code>INTERNAL_ERROR</code> - KMS could not complete the request due to an internal
    *           error. Retry the request. For <code>ConnectCustomKeyStore</code> requests, disconnect the
    *           custom key store before trying to connect again.</p>
    *             </li>
    *             <li>
    *                <p>
-   *                   <code>INVALID_CREDENTIALS</code> - AWS KMS does not have the correct password for the
-   *             <code>kmsuser</code> crypto user in the AWS CloudHSM cluster. Before you can connect your
-   *           custom key store to its AWS CloudHSM cluster, you must change the <code>kmsuser</code> account
+   *                   <code>INVALID_CREDENTIALS</code> - KMS does not have the correct password for the
+   *             <code>kmsuser</code> crypto user in the CloudHSM cluster. Before you can connect your
+   *           custom key store to its CloudHSM cluster, you must change the <code>kmsuser</code> account
    *           password and update the key store password value for the custom key store.</p>
    *             </li>
    *             <li>
    *                <p>
-   *                   <code>NETWORK_ERRORS</code> - Network errors are preventing AWS KMS from connecting to
+   *                   <code>NETWORK_ERRORS</code> - Network errors are preventing KMS from connecting to
    *           the custom key store.</p>
    *             </li>
    *             <li>
    *                <p>
-   *                   <code>SUBNET_NOT_FOUND</code> - A subnet in the AWS CloudHSM cluster configuration was
-   *           deleted. If AWS KMS cannot find all of the subnets in the cluster configuration, attempts to
-   *           connect the custom key store to the AWS CloudHSM cluster fail. To fix this error, create a
+   *                   <code>SUBNET_NOT_FOUND</code> - A subnet in the CloudHSM cluster configuration was
+   *           deleted. If KMS cannot find all of the subnets in the cluster configuration, attempts to
+   *           connect the custom key store to the CloudHSM cluster fail. To fix this error, create a
    *           cluster from a recent backup and associate it with your custom key store. (This process
    *           creates a new cluster configuration with a VPC and private subnets.) For details, see
    *             <a href="https://docs.aws.amazon.com/kms/latest/developerguide/fix-keystore.html#fix-keystore-failed">How
-   *             to Fix a Connection Failure</a> in the <i>AWS Key Management Service Developer Guide</i>.</p>
+   *             to Fix a Connection Failure</a> in the <i>Key Management Service Developer Guide</i>.</p>
    *             </li>
    *             <li>
    *                <p>
    *                   <code>USER_LOCKED_OUT</code> - The <code>kmsuser</code> CU account is locked out of
-   *           the associated AWS CloudHSM cluster due to too many failed password attempts. Before you can
-   *           connect your custom key store to its AWS CloudHSM cluster, you must change the
+   *           the associated CloudHSM cluster due to too many failed password attempts. Before you can
+   *           connect your custom key store to its CloudHSM cluster, you must change the
    *             <code>kmsuser</code> account password and update the key store password value for the
    *           custom key store.</p>
    *             </li>
    *             <li>
    *                <p>
    *                   <code>USER_LOGGED_IN</code> - The <code>kmsuser</code> CU account is logged into the
-   *           the associated AWS CloudHSM cluster. This prevents AWS KMS from rotating the <code>kmsuser</code>
+   *           the associated CloudHSM cluster. This prevents KMS from rotating the <code>kmsuser</code>
    *           account password and logging into the cluster. Before you can connect your custom key
-   *           store to its AWS CloudHSM cluster, you must log the <code>kmsuser</code> CU out of the cluster.
+   *           store to its CloudHSM cluster, you must log the <code>kmsuser</code> CU out of the cluster.
    *           If you changed the <code>kmsuser</code> password to log into the cluster, you must also
    *           and update the key store password value for the custom key store. For help, see <a href="https://docs.aws.amazon.com/kms/latest/developerguide/fix-keystore.html#login-kmsuser-2">How to Log Out
-   *             and Reconnect</a> in the <i>AWS Key Management Service Developer Guide</i>.</p>
+   *             and Reconnect</a> in the <i>Key Management Service Developer Guide</i>.</p>
    *             </li>
    *             <li>
    *                <p>
-   *                   <code>USER_NOT_FOUND</code> - AWS KMS cannot find a <code>kmsuser</code> CU account in
-   *           the associated AWS CloudHSM cluster. Before you can connect your custom key store to its AWS CloudHSM
+   *                   <code>USER_NOT_FOUND</code> - KMS cannot find a <code>kmsuser</code> CU account in
+   *           the associated CloudHSM cluster. Before you can connect your custom key store to its CloudHSM
    *           cluster, you must create a <code>kmsuser</code> CU account in the cluster, and then update
    *           the key store password value for the custom key store.</p>
    *             </li>
@@ -1673,31 +1699,31 @@ export interface DecryptRequest {
 
   /**
    * <p>Specifies the encryption context to use when decrypting the data.
-   *       An encryption context is valid only for <a href="https://docs.aws.amazon.com/kms/latest/developerguide/concepts.html#cryptographic-operations">cryptographic operations</a> with a symmetric CMK. The standard asymmetric encryption algorithms that AWS KMS uses do not support an encryption context.</p>
-   *          <p>An <i>encryption context</i> is a collection of non-secret key-value pairs that represents additional authenticated data. When you use an encryption context to encrypt data, you must specify the same (an exact case-sensitive match) encryption context to decrypt the data. An encryption context is optional when encrypting with a symmetric CMK, but it is highly recommended.</p>
+   *       An encryption context is valid only for <a href="https://docs.aws.amazon.com/kms/latest/developerguide/concepts.html#cryptographic-operations">cryptographic operations</a> with a symmetric KMS key. The standard asymmetric encryption algorithms that KMS uses do not support an encryption context.</p>
+   *          <p>An <i>encryption context</i> is a collection of non-secret key-value pairs that represents additional authenticated data. When you use an encryption context to encrypt data, you must specify the same (an exact case-sensitive match) encryption context to decrypt the data. An encryption context is optional when encrypting with a symmetric KMS key, but it is highly recommended.</p>
    *          <p>For more information, see
    *         <a href="https://docs.aws.amazon.com/kms/latest/developerguide/concepts.html#encrypt_context">Encryption
-   *         Context</a> in the <i>AWS Key Management Service Developer Guide</i>.</p>
+   *         Context</a> in the <i>Key Management Service Developer Guide</i>.</p>
    */
   EncryptionContext?: { [key: string]: string };
 
   /**
    * <p>A list of grant tokens. </p>
-   *          <p>Use a grant token when your permission to call this operation comes from a newly created
-   *       grant that has not yet achieved eventual consistency. Use a grant token when your permission to call this operation comes from a new grant that has not yet achieved <i>eventual consistency</i>. For more information, see <a href="https://docs.aws.amazon.com/kms/latest/developerguide/concepts.html#grant_token">Grant token</a> in the
-   *     <i>AWS Key Management Service Developer Guide</i>.</p>
+   *          <p>Use a grant token when your permission to call this operation comes from a new grant that has not yet achieved <i>eventual consistency</i>. For more information, see <a href="https://docs.aws.amazon.com/kms/latest/developerguide/grants.html#grant_token">Grant token</a> and <a href="https://docs.aws.amazon.com/kms/latest/developerguide/grant-manage.html#using-grant-token">Using a grant token</a> in the
+   *     <i>Key Management Service Developer Guide</i>.</p>
    */
   GrantTokens?: string[];
 
   /**
-   * <p>Specifies the customer master key (CMK) that AWS KMS uses to decrypt the ciphertext. Enter a
-   *       key ID of the CMK that was used to encrypt the ciphertext.</p>
-   *          <p>This parameter is required only when the ciphertext was encrypted under an asymmetric CMK.
-   *       If you used a symmetric CMK, AWS KMS can get the CMK from metadata that it adds to the
+   * <p>Specifies the KMS key that KMS uses to decrypt the ciphertext. Enter a
+   *       key ID of the KMS key that was used to encrypt the ciphertext. </p>
+   *
+   *          <p>This parameter is required only when the ciphertext was encrypted under an asymmetric KMS key.
+   *       If you used a symmetric KMS key, KMS can get the KMS key from metadata that it adds to the
    *       symmetric ciphertext blob. However, it is always recommended as a best practice. This practice
-   *       ensures that you use the CMK that you intend.</p>
+   *       ensures that you use the KMS key that you intend.</p>
    *
-   *          <p>To specify a CMK, use its key ID, key ARN, alias name, or alias ARN. When using an alias name, prefix it with <code>"alias/"</code>. To specify a CMK in a different AWS account, you must use the key ARN or alias ARN.</p>
+   *          <p>To specify a KMS key, use its key ID, key ARN, alias name, or alias ARN. When using an alias name, prefix it with <code>"alias/"</code>. To specify a KMS key in a different Amazon Web Services account, you must use the key ARN or alias ARN.</p>
    *          <p>For example:</p>
    *          <ul>
    *             <li>
@@ -1717,7 +1743,7 @@ export interface DecryptRequest {
    *                </p>
    *             </li>
    *          </ul>
-   *          <p>To get the key ID and key ARN for a CMK, use <a>ListKeys</a> or <a>DescribeKey</a>. To get the alias name and alias ARN, use <a>ListAliases</a>.</p>
+   *          <p>To get the key ID and key ARN for a KMS key, use <a>ListKeys</a> or <a>DescribeKey</a>. To get the alias name and alias ARN, use <a>ListAliases</a>.</p>
    */
   KeyId?: string;
 
@@ -1725,9 +1751,9 @@ export interface DecryptRequest {
    * <p>Specifies the encryption algorithm that will be used to decrypt the ciphertext. Specify
    *       the same algorithm that was used to encrypt the data. If you specify a different algorithm,
    *       the <code>Decrypt</code> operation fails.</p>
-   *          <p>This parameter is required only when the ciphertext was encrypted under an asymmetric CMK.
+   *          <p>This parameter is required only when the ciphertext was encrypted under an asymmetric KMS key.
    *       The default value, <code>SYMMETRIC_DEFAULT</code>, represents the only supported algorithm
-   *       that is valid for symmetric CMKs.</p>
+   *       that is valid for symmetric KMS keys.</p>
    */
   EncryptionAlgorithm?: EncryptionAlgorithmSpec | string;
 }
@@ -1743,12 +1769,12 @@ export namespace DecryptRequest {
 
 export interface DecryptResponse {
   /**
-   * <p>The Amazon Resource Name (<a href="https://docs.aws.amazon.com/kms/latest/developerguide/concepts.html#key-id-key-ARN">key ARN</a>) of the CMK that was used to decrypt the ciphertext.</p>
+   * <p>The Amazon Resource Name (<a href="https://docs.aws.amazon.com/kms/latest/developerguide/concepts.html#key-id-key-ARN">key ARN</a>) of the KMS key that was used to decrypt the ciphertext.</p>
    */
   KeyId?: string;
 
   /**
-   * <p>Decrypted plaintext data. When you use the HTTP API or the AWS CLI, the value is Base64-encoded. Otherwise, it is not Base64-encoded.</p>
+   * <p>Decrypted plaintext data. When you use the HTTP API or the Amazon Web Services CLI, the value is Base64-encoded. Otherwise, it is not Base64-encoded.</p>
    */
   Plaintext?: Uint8Array;
 
@@ -1769,9 +1795,9 @@ export namespace DecryptResponse {
 }
 
 /**
- * <p>The request was rejected because the specified CMK cannot decrypt the data. The
+ * <p>The request was rejected because the specified KMS key cannot decrypt the data. The
  *         <code>KeyId</code> in a <a>Decrypt</a> request and the <code>SourceKeyId</code>
- *       in a <a>ReEncrypt</a> request must identify the same CMK that was used to encrypt
+ *       in a <a>ReEncrypt</a> request must identify the same KMS key that was used to encrypt
  *       the ciphertext.</p>
  */
 export interface IncorrectKeyException extends __SmithyException, $MetadataBearer {
@@ -1795,7 +1821,7 @@ export namespace IncorrectKeyException {
  *       into the ciphertext, such as the encryption context, is corrupted, missing, or otherwise
  *       invalid.</p>
  *          <p>From the <a>ImportKeyMaterial</a> operation, the request was rejected because
- *       AWS KMS could not decrypt the encrypted (wrapped) key material. </p>
+ *       KMS could not decrypt the encrypted (wrapped) key material. </p>
  */
 export interface InvalidCiphertextException extends __SmithyException, $MetadataBearer {
   name: "InvalidCiphertextException";
@@ -1816,20 +1842,20 @@ export namespace InvalidCiphertextException {
  * <p>The request was rejected for one of the following reasons: </p>
  *          <ul>
  *             <li>
- *                <p>The <code>KeyUsage</code> value of the CMK is incompatible with the API
+ *                <p>The <code>KeyUsage</code> value of the KMS key is incompatible with the API
  *           operation.</p>
  *             </li>
  *             <li>
  *                <p>The encryption algorithm or signing algorithm specified for the operation is
- *           incompatible with the type of key material in the CMK
- *           <code>(CustomerMasterKeySpec</code>).</p>
+ *           incompatible with the type of key material in the KMS key
+ *           <code>(KeySpec</code>).</p>
  *             </li>
  *          </ul>
  *          <p>For encrypting, decrypting, re-encrypting, and generating data keys, the
  *         <code>KeyUsage</code> must be <code>ENCRYPT_DECRYPT</code>. For signing and verifying, the
  *         <code>KeyUsage</code> must be <code>SIGN_VERIFY</code>. To find the <code>KeyUsage</code> of
- *       a CMK, use the <a>DescribeKey</a> operation.</p>
- *          <p>To find the encryption or signing algorithms supported for a particular CMK, use the <a>DescribeKey</a> operation.</p>
+ *       a KMS key, use the <a>DescribeKey</a> operation.</p>
+ *          <p>To find the encryption or signing algorithms supported for a particular KMS key, use the <a>DescribeKey</a> operation.</p>
  */
 export interface InvalidKeyUsageException extends __SmithyException, $MetadataBearer {
   name: "InvalidKeyUsageException";
@@ -1847,7 +1873,7 @@ export namespace InvalidKeyUsageException {
 }
 
 /**
- * <p>The request was rejected because the specified CMK was not available. You can retry the
+ * <p>The request was rejected because the specified KMS key was not available. You can retry the
  *       request.</p>
  */
 export interface KeyUnavailableException extends __SmithyException, $MetadataBearer {
@@ -1911,9 +1937,9 @@ export namespace DeleteCustomKeyStoreResponse {
 
 export interface DeleteImportedKeyMaterialRequest {
   /**
-   * <p>Identifies the CMK from which you are deleting imported key material. The
-   *         <code>Origin</code> of the CMK must be <code>EXTERNAL</code>.</p>
-   *          <p>Specify the key ID or key ARN of the CMK.</p>
+   * <p>Identifies the KMS key from which you are deleting imported key material. The
+   *         <code>Origin</code> of the KMS key must be <code>EXTERNAL</code>.</p>
+   *          <p>Specify the key ID or key ARN of the KMS key.</p>
    *          <p>For example:</p>
    *          <ul>
    *             <li>
@@ -1925,7 +1951,7 @@ export interface DeleteImportedKeyMaterialRequest {
    *                </p>
    *             </li>
    *          </ul>
-   *          <p>To get the key ID and key ARN for a CMK, use <a>ListKeys</a> or <a>DescribeKey</a>.</p>
+   *          <p>To get the key ID and key ARN for a KMS key, use <a>ListKeys</a> or <a>DescribeKey</a>.</p>
    */
   KeyId: string | undefined;
 }
@@ -1961,7 +1987,7 @@ export interface DescribeCustomKeyStoresRequest {
 
   /**
    * <p>Use this parameter to specify the maximum number of items to return. When this
-   *     value is present, AWS KMS does not return more than the specified number of items, but it might
+   *     value is present, KMS does not return more than the specified number of items, but it might
    *     return fewer.</p>
    */
   Limit?: number;
@@ -2034,12 +2060,11 @@ export namespace InvalidMarkerException {
 
 export interface DescribeKeyRequest {
   /**
-   * <p>Describes the specified customer master key (CMK). </p>
-   *          <p>If you specify a predefined AWS alias (an AWS alias with no key ID), KMS associates the
-   *       alias with an <a href="https://docs.aws.amazon.com/kms/latest/developerguide/concepts.html#master_keys">AWS
-   *         managed CMK</a> and returns its <code>KeyId</code> and <code>Arn</code> in the
+   * <p>Describes the specified KMS key. </p>
+   *          <p>If you specify a predefined Amazon Web Services alias (an Amazon Web Services alias with no key ID), KMS associates the
+   *       alias with an <a href="https://docs.aws.amazon.com/kms/latest/developerguide/concepts.html##aws-managed-cmk">Amazon Web Services managed key</a> and returns its <code>KeyId</code> and <code>Arn</code> in the
    *       response.</p>
-   *          <p>To specify a CMK, use its key ID, key ARN, alias name, or alias ARN. When using an alias name, prefix it with <code>"alias/"</code>. To specify a CMK in a different AWS account, you must use the key ARN or alias ARN.</p>
+   *          <p>To specify a KMS key, use its key ID, key ARN, alias name, or alias ARN. When using an alias name, prefix it with <code>"alias/"</code>. To specify a KMS key in a different Amazon Web Services account, you must use the key ARN or alias ARN.</p>
    *          <p>For example:</p>
    *          <ul>
    *             <li>
@@ -2059,14 +2084,14 @@ export interface DescribeKeyRequest {
    *                </p>
    *             </li>
    *          </ul>
-   *          <p>To get the key ID and key ARN for a CMK, use <a>ListKeys</a> or <a>DescribeKey</a>. To get the alias name and alias ARN, use <a>ListAliases</a>.</p>
+   *          <p>To get the key ID and key ARN for a KMS key, use <a>ListKeys</a> or <a>DescribeKey</a>. To get the alias name and alias ARN, use <a>ListAliases</a>.</p>
    */
   KeyId: string | undefined;
 
   /**
    * <p>A list of grant tokens.</p>
-   *          <p>Use a grant token when your permission to call this operation comes from a new grant that has not yet achieved <i>eventual consistency</i>. For more information, see <a href="https://docs.aws.amazon.com/kms/latest/developerguide/concepts.html#grant_token">Grant token</a> in the
-   *     <i>AWS Key Management Service Developer Guide</i>.</p>
+   *          <p>Use a grant token when your permission to call this operation comes from a new grant that has not yet achieved <i>eventual consistency</i>. For more information, see <a href="https://docs.aws.amazon.com/kms/latest/developerguide/grants.html#grant_token">Grant token</a> and <a href="https://docs.aws.amazon.com/kms/latest/developerguide/grant-manage.html#using-grant-token">Using a grant token</a> in the
+   *     <i>Key Management Service Developer Guide</i>.</p>
    */
   GrantTokens?: string[];
 }
@@ -2098,8 +2123,8 @@ export namespace DescribeKeyResponse {
 
 export interface DisableKeyRequest {
   /**
-   * <p>Identifies the customer master key (CMK) to disable.</p>
-   *          <p>Specify the key ID or key ARN of the CMK.</p>
+   * <p>Identifies the KMS key to disable.</p>
+   *          <p>Specify the key ID or key ARN of the KMS key.</p>
    *          <p>For example:</p>
    *          <ul>
    *             <li>
@@ -2111,7 +2136,7 @@ export interface DisableKeyRequest {
    *                </p>
    *             </li>
    *          </ul>
-   *          <p>To get the key ID and key ARN for a CMK, use <a>ListKeys</a> or <a>DescribeKey</a>.</p>
+   *          <p>To get the key ID and key ARN for a KMS key, use <a>ListKeys</a> or <a>DescribeKey</a>.</p>
    */
   KeyId: string | undefined;
 }
@@ -2127,11 +2152,11 @@ export namespace DisableKeyRequest {
 
 export interface DisableKeyRotationRequest {
   /**
-   * <p>Identifies a symmetric customer master key (CMK). You cannot enable or disable automatic
-   *       rotation of <a href="https://docs.aws.amazon.com/kms/latest/developerguide/symmetric-asymmetric.html#asymmetric-cmks">asymmetric CMKs</a>, CMKs
+   * <p>Identifies a symmetric KMS key. You cannot enable or disable automatic
+   *       rotation of <a href="https://docs.aws.amazon.com/kms/latest/developerguide/symmetric-asymmetric.html#asymmetric-cmks">asymmetric KMS keys</a>, KMS keys
    *       with <a href="https://docs.aws.amazon.com/kms/latest/developerguide/importing-keys.html">imported key
-   *         material</a>, or CMKs in a <a href="https://docs.aws.amazon.com/kms/latest/developerguide/custom-key-store-overview.html">custom key store</a>.</p>
-   *          <p>Specify the key ID or key ARN of the CMK.</p>
+   *         material</a>, or KMS keys in a <a href="https://docs.aws.amazon.com/kms/latest/developerguide/custom-key-store-overview.html">custom key store</a>.</p>
+   *          <p>Specify the key ID or key ARN of the KMS key.</p>
    *          <p>For example:</p>
    *          <ul>
    *             <li>
@@ -2143,7 +2168,7 @@ export interface DisableKeyRotationRequest {
    *                </p>
    *             </li>
    *          </ul>
-   *          <p>To get the key ID and key ARN for a CMK, use <a>ListKeys</a> or <a>DescribeKey</a>.</p>
+   *          <p>To get the key ID and key ARN for a KMS key, use <a>ListKeys</a> or <a>DescribeKey</a>.</p>
    */
   KeyId: string | undefined;
 }
@@ -2186,8 +2211,8 @@ export namespace DisconnectCustomKeyStoreResponse {
 
 export interface EnableKeyRequest {
   /**
-   * <p>Identifies the customer master key (CMK) to enable.</p>
-   *          <p>Specify the key ID or key ARN of the CMK.</p>
+   * <p>Identifies the KMS key to enable.</p>
+   *          <p>Specify the key ID or key ARN of the KMS key.</p>
    *          <p>For example:</p>
    *          <ul>
    *             <li>
@@ -2199,7 +2224,7 @@ export interface EnableKeyRequest {
    *                </p>
    *             </li>
    *          </ul>
-   *          <p>To get the key ID and key ARN for a CMK, use <a>ListKeys</a> or <a>DescribeKey</a>.</p>
+   *          <p>To get the key ID and key ARN for a KMS key, use <a>ListKeys</a> or <a>DescribeKey</a>.</p>
    */
   KeyId: string | undefined;
 }
@@ -2215,9 +2240,9 @@ export namespace EnableKeyRequest {
 
 export interface EnableKeyRotationRequest {
   /**
-   * <p>Identifies a symmetric customer master key (CMK). You cannot enable automatic rotation of <a href="https://docs.aws.amazon.com/kms/latest/developerguide/symm-asymm-concepts.html#asymmetric-cmks">asymmetric CMKs</a>, CMKs with <a href="https://docs.aws.amazon.com/kms/latest/developerguide/importing-keys.html">imported key material</a>, or CMKs in a <a href="https://docs.aws.amazon.com/kms/latest/developerguide/custom-key-store-overview.html">custom key store</a>. To enable or disable automatic rotation of a set of related <a href="https://docs.aws.amazon.com/kms/latest/developerguide/multi-region-keys-overview.html#mrk-replica-key">multi-Region keys</a>, set the property on the primary key.</p>
+   * <p>Identifies a symmetric KMS key. You cannot enable automatic rotation of <a href="https://docs.aws.amazon.com/kms/latest/developerguide/symm-asymm-concepts.html#asymmetric-cmks">asymmetric KMS keys</a>, KMS keys with <a href="https://docs.aws.amazon.com/kms/latest/developerguide/importing-keys.html">imported key material</a>, or KMS keys in a <a href="https://docs.aws.amazon.com/kms/latest/developerguide/custom-key-store-overview.html">custom key store</a>. To enable or disable automatic rotation of a set of related <a href="https://docs.aws.amazon.com/kms/latest/developerguide/multi-region-keys-overview.html#mrk-replica-key">multi-Region keys</a>, set the property on the primary key.</p>
    *
-   *          <p>Specify the key ID or key ARN of the CMK.</p>
+   *          <p>Specify the key ID or key ARN of the KMS key.</p>
    *          <p>For example:</p>
    *          <ul>
    *             <li>
@@ -2229,7 +2254,7 @@ export interface EnableKeyRotationRequest {
    *                </p>
    *             </li>
    *          </ul>
-   *          <p>To get the key ID and key ARN for a CMK, use <a>ListKeys</a> or <a>DescribeKey</a>.</p>
+   *          <p>To get the key ID and key ARN for a KMS key, use <a>ListKeys</a> or <a>DescribeKey</a>.</p>
    */
   KeyId: string | undefined;
 }
@@ -2245,8 +2270,8 @@ export namespace EnableKeyRotationRequest {
 
 export interface EncryptRequest {
   /**
-   * <p>Identifies the customer master key (CMK) to use in the encryption operation.</p>
-   *          <p>To specify a CMK, use its key ID, key ARN, alias name, or alias ARN. When using an alias name, prefix it with <code>"alias/"</code>. To specify a CMK in a different AWS account, you must use the key ARN or alias ARN.</p>
+   * <p>Identifies the KMS key to use in the encryption operation.</p>
+   *          <p>To specify a KMS key, use its key ID, key ARN, alias name, or alias ARN. When using an alias name, prefix it with <code>"alias/"</code>. To specify a KMS key in a different Amazon Web Services account, you must use the key ARN or alias ARN.</p>
    *          <p>For example:</p>
    *          <ul>
    *             <li>
@@ -2266,7 +2291,7 @@ export interface EncryptRequest {
    *                </p>
    *             </li>
    *          </ul>
-   *          <p>To get the key ID and key ARN for a CMK, use <a>ListKeys</a> or <a>DescribeKey</a>. To get the alias name and alias ARN, use <a>ListAliases</a>.</p>
+   *          <p>To get the key ID and key ARN for a KMS key, use <a>ListKeys</a> or <a>DescribeKey</a>. To get the alias name and alias ARN, use <a>ListAliases</a>.</p>
    */
   KeyId: string | undefined;
 
@@ -2277,27 +2302,27 @@ export interface EncryptRequest {
 
   /**
    * <p>Specifies the encryption context that will be used to encrypt the data.
-   *       An encryption context is valid only for <a href="https://docs.aws.amazon.com/kms/latest/developerguide/concepts.html#cryptographic-operations">cryptographic operations</a> with a symmetric CMK. The standard asymmetric encryption algorithms that AWS KMS uses do not support an encryption context. </p>
-   *          <p>An <i>encryption context</i> is a collection of non-secret key-value pairs that represents additional authenticated data. When you use an encryption context to encrypt data, you must specify the same (an exact case-sensitive match) encryption context to decrypt the data. An encryption context is optional when encrypting with a symmetric CMK, but it is highly recommended.</p>
+   *       An encryption context is valid only for <a href="https://docs.aws.amazon.com/kms/latest/developerguide/concepts.html#cryptographic-operations">cryptographic operations</a> with a symmetric KMS key. The standard asymmetric encryption algorithms that KMS uses do not support an encryption context. </p>
+   *          <p>An <i>encryption context</i> is a collection of non-secret key-value pairs that represents additional authenticated data. When you use an encryption context to encrypt data, you must specify the same (an exact case-sensitive match) encryption context to decrypt the data. An encryption context is optional when encrypting with a symmetric KMS key, but it is highly recommended.</p>
    *          <p>For more information, see
    *         <a href="https://docs.aws.amazon.com/kms/latest/developerguide/concepts.html#encrypt_context">Encryption
-   *         Context</a> in the <i>AWS Key Management Service Developer Guide</i>.</p>
+   *         Context</a> in the <i>Key Management Service Developer Guide</i>.</p>
    */
   EncryptionContext?: { [key: string]: string };
 
   /**
    * <p>A list of grant tokens.</p>
-   *          <p>Use a grant token when your permission to call this operation comes from a new grant that has not yet achieved <i>eventual consistency</i>. For more information, see <a href="https://docs.aws.amazon.com/kms/latest/developerguide/concepts.html#grant_token">Grant token</a> in the
-   *     <i>AWS Key Management Service Developer Guide</i>.</p>
+   *          <p>Use a grant token when your permission to call this operation comes from a new grant that has not yet achieved <i>eventual consistency</i>. For more information, see <a href="https://docs.aws.amazon.com/kms/latest/developerguide/grants.html#grant_token">Grant token</a> and <a href="https://docs.aws.amazon.com/kms/latest/developerguide/grant-manage.html#using-grant-token">Using a grant token</a> in the
+   *     <i>Key Management Service Developer Guide</i>.</p>
    */
   GrantTokens?: string[];
 
   /**
-   * <p>Specifies the encryption algorithm that AWS KMS will use to encrypt the plaintext message.
-   *       The algorithm must be compatible with the CMK that you specify.</p>
-   *          <p>This parameter is required only for asymmetric CMKs. The default value,
-   *         <code>SYMMETRIC_DEFAULT</code>, is the algorithm used for symmetric CMKs. If you are using
-   *       an asymmetric CMK, we recommend RSAES_OAEP_SHA_256.</p>
+   * <p>Specifies the encryption algorithm that KMS will use to encrypt the plaintext message.
+   *       The algorithm must be compatible with the KMS key that you specify.</p>
+   *          <p>This parameter is required only for asymmetric KMS keys. The default value,
+   *         <code>SYMMETRIC_DEFAULT</code>, is the algorithm used for symmetric KMS keys. If you are using
+   *       an asymmetric KMS key, we recommend RSAES_OAEP_SHA_256.</p>
    */
   EncryptionAlgorithm?: EncryptionAlgorithmSpec | string;
 }
@@ -2314,12 +2339,12 @@ export namespace EncryptRequest {
 
 export interface EncryptResponse {
   /**
-   * <p>The encrypted plaintext. When you use the HTTP API or the AWS CLI, the value is Base64-encoded. Otherwise, it is not Base64-encoded.</p>
+   * <p>The encrypted plaintext. When you use the HTTP API or the Amazon Web Services CLI, the value is Base64-encoded. Otherwise, it is not Base64-encoded.</p>
    */
   CiphertextBlob?: Uint8Array;
 
   /**
-   * <p>The Amazon Resource Name (<a href="https://docs.aws.amazon.com/kms/latest/developerguide/concepts.html#key-id-key-ARN">key ARN</a>) of the CMK that was used to encrypt the plaintext.</p>
+   * <p>The Amazon Resource Name (<a href="https://docs.aws.amazon.com/kms/latest/developerguide/concepts.html#key-id-key-ARN">key ARN</a>) of the KMS key that was used to encrypt the plaintext.</p>
    */
   KeyId?: string;
 
@@ -2359,9 +2384,9 @@ export namespace ExpiredImportTokenException {
 
 export interface GenerateDataKeyRequest {
   /**
-   * <p>Identifies the symmetric CMK that encrypts the data key.</p>
+   * <p>Identifies the symmetric KMS key that encrypts the data key.</p>
    *
-   *          <p>To specify a CMK, use its key ID, key ARN, alias name, or alias ARN. When using an alias name, prefix it with <code>"alias/"</code>. To specify a CMK in a different AWS account, you must use the key ARN or alias ARN.</p>
+   *          <p>To specify a KMS key, use its key ID, key ARN, alias name, or alias ARN. When using an alias name, prefix it with <code>"alias/"</code>. To specify a KMS key in a different Amazon Web Services account, you must use the key ARN or alias ARN.</p>
    *          <p>For example:</p>
    *          <ul>
    *             <li>
@@ -2381,16 +2406,16 @@ export interface GenerateDataKeyRequest {
    *                </p>
    *             </li>
    *          </ul>
-   *          <p>To get the key ID and key ARN for a CMK, use <a>ListKeys</a> or <a>DescribeKey</a>. To get the alias name and alias ARN, use <a>ListAliases</a>.</p>
+   *          <p>To get the key ID and key ARN for a KMS key, use <a>ListKeys</a> or <a>DescribeKey</a>. To get the alias name and alias ARN, use <a>ListAliases</a>.</p>
    */
   KeyId: string | undefined;
 
   /**
    * <p>Specifies the encryption context that will be used when encrypting the data key.</p>
-   *          <p>An <i>encryption context</i> is a collection of non-secret key-value pairs that represents additional authenticated data. When you use an encryption context to encrypt data, you must specify the same (an exact case-sensitive match) encryption context to decrypt the data. An encryption context is optional when encrypting with a symmetric CMK, but it is highly recommended.</p>
+   *          <p>An <i>encryption context</i> is a collection of non-secret key-value pairs that represents additional authenticated data. When you use an encryption context to encrypt data, you must specify the same (an exact case-sensitive match) encryption context to decrypt the data. An encryption context is optional when encrypting with a symmetric KMS key, but it is highly recommended.</p>
    *          <p>For more information, see
    *         <a href="https://docs.aws.amazon.com/kms/latest/developerguide/concepts.html#encrypt_context">Encryption
-   *         Context</a> in the <i>AWS Key Management Service Developer Guide</i>.</p>
+   *         Context</a> in the <i>Key Management Service Developer Guide</i>.</p>
    */
   EncryptionContext?: { [key: string]: string };
 
@@ -2413,8 +2438,8 @@ export interface GenerateDataKeyRequest {
 
   /**
    * <p>A list of grant tokens.</p>
-   *          <p>Use a grant token when your permission to call this operation comes from a new grant that has not yet achieved <i>eventual consistency</i>. For more information, see <a href="https://docs.aws.amazon.com/kms/latest/developerguide/concepts.html#grant_token">Grant token</a> in the
-   *     <i>AWS Key Management Service Developer Guide</i>.</p>
+   *          <p>Use a grant token when your permission to call this operation comes from a new grant that has not yet achieved <i>eventual consistency</i>. For more information, see <a href="https://docs.aws.amazon.com/kms/latest/developerguide/grants.html#grant_token">Grant token</a> and <a href="https://docs.aws.amazon.com/kms/latest/developerguide/grant-manage.html#using-grant-token">Using a grant token</a> in the
+   *     <i>Key Management Service Developer Guide</i>.</p>
    */
   GrantTokens?: string[];
 }
@@ -2430,18 +2455,18 @@ export namespace GenerateDataKeyRequest {
 
 export interface GenerateDataKeyResponse {
   /**
-   * <p>The encrypted copy of the data key. When you use the HTTP API or the AWS CLI, the value is Base64-encoded. Otherwise, it is not Base64-encoded.</p>
+   * <p>The encrypted copy of the data key. When you use the HTTP API or the Amazon Web Services CLI, the value is Base64-encoded. Otherwise, it is not Base64-encoded.</p>
    */
   CiphertextBlob?: Uint8Array;
 
   /**
-   * <p>The plaintext data key. When you use the HTTP API or the AWS CLI, the value is Base64-encoded. Otherwise, it is not Base64-encoded. Use this data key to encrypt your data outside of
+   * <p>The plaintext data key. When you use the HTTP API or the Amazon Web Services CLI, the value is Base64-encoded. Otherwise, it is not Base64-encoded. Use this data key to encrypt your data outside of
    *       KMS. Then, remove it from memory as soon as possible.</p>
    */
   Plaintext?: Uint8Array;
 
   /**
-   * <p>The Amazon Resource Name (<a href="https://docs.aws.amazon.com/kms/latest/developerguide/concepts.html#key-id-key-ARN">key ARN</a>) of the CMK that encrypted the data key.</p>
+   * <p>The Amazon Resource Name (<a href="https://docs.aws.amazon.com/kms/latest/developerguide/concepts.html#key-id-key-ARN">key ARN</a>) of the KMS key that encrypted the data key.</p>
    */
   KeyId?: string;
 }
@@ -2460,19 +2485,18 @@ export interface GenerateDataKeyPairRequest {
   /**
    * <p>Specifies the encryption context that will be used when encrypting the private key in the
    *       data key pair.</p>
-   *          <p>An <i>encryption context</i> is a collection of non-secret key-value pairs that represents additional authenticated data. When you use an encryption context to encrypt data, you must specify the same (an exact case-sensitive match) encryption context to decrypt the data. An encryption context is optional when encrypting with a symmetric CMK, but it is highly recommended.</p>
+   *          <p>An <i>encryption context</i> is a collection of non-secret key-value pairs that represents additional authenticated data. When you use an encryption context to encrypt data, you must specify the same (an exact case-sensitive match) encryption context to decrypt the data. An encryption context is optional when encrypting with a symmetric KMS key, but it is highly recommended.</p>
    *          <p>For more information, see
    *         <a href="https://docs.aws.amazon.com/kms/latest/developerguide/concepts.html#encrypt_context">Encryption
-   *         Context</a> in the <i>AWS Key Management Service Developer Guide</i>.</p>
+   *         Context</a> in the <i>Key Management Service Developer Guide</i>.</p>
    */
   EncryptionContext?: { [key: string]: string };
 
   /**
-   * <p>Specifies the symmetric CMK that encrypts the private key in the data key pair. You cannot
-   *       specify an asymmetric CMK or a CMK in a custom key store. To get the type and origin of your
-   *       CMK, use the <a>DescribeKey</a> operation.</p>
+   * <p>Specifies the symmetric KMS key that encrypts the private key in the data key pair. You cannot
+   *       specify an asymmetric KMS key or a KMS key in a custom key store. To get the type and origin of your KMS key, use the <a>DescribeKey</a> operation.</p>
    *
-   *          <p>To specify a CMK, use its key ID, key ARN, alias name, or alias ARN. When using an alias name, prefix it with <code>"alias/"</code>. To specify a CMK in a different AWS account, you must use the key ARN or alias ARN.</p>
+   *          <p>To specify a KMS key, use its key ID, key ARN, alias name, or alias ARN. When using an alias name, prefix it with <code>"alias/"</code>. To specify a KMS key in a different Amazon Web Services account, you must use the key ARN or alias ARN.</p>
    *          <p>For example:</p>
    *          <ul>
    *             <li>
@@ -2492,20 +2516,20 @@ export interface GenerateDataKeyPairRequest {
    *                </p>
    *             </li>
    *          </ul>
-   *          <p>To get the key ID and key ARN for a CMK, use <a>ListKeys</a> or <a>DescribeKey</a>. To get the alias name and alias ARN, use <a>ListAliases</a>.</p>
+   *          <p>To get the key ID and key ARN for a KMS key, use <a>ListKeys</a> or <a>DescribeKey</a>. To get the alias name and alias ARN, use <a>ListAliases</a>.</p>
    */
   KeyId: string | undefined;
 
   /**
    * <p>Determines the type of data key pair that is generated. </p>
-   *          <p>The AWS KMS rule that restricts the use of asymmetric RSA CMKs to encrypt and decrypt or to sign and verify (but not both), and the rule that permits you to use ECC CMKs only to sign and verify, are not effective outside of AWS KMS.</p>
+   *          <p>The KMS rule that restricts the use of asymmetric RSA KMS keys to encrypt and decrypt or to sign and verify (but not both), and the rule that permits you to use ECC KMS keys only to sign and verify, are not effective on data key pairs, which are used outside of KMS.</p>
    */
   KeyPairSpec: DataKeyPairSpec | string | undefined;
 
   /**
    * <p>A list of grant tokens.</p>
-   *          <p>Use a grant token when your permission to call this operation comes from a new grant that has not yet achieved <i>eventual consistency</i>. For more information, see <a href="https://docs.aws.amazon.com/kms/latest/developerguide/concepts.html#grant_token">Grant token</a> in the
-   *     <i>AWS Key Management Service Developer Guide</i>.</p>
+   *          <p>Use a grant token when your permission to call this operation comes from a new grant that has not yet achieved <i>eventual consistency</i>. For more information, see <a href="https://docs.aws.amazon.com/kms/latest/developerguide/grants.html#grant_token">Grant token</a> and <a href="https://docs.aws.amazon.com/kms/latest/developerguide/grant-manage.html#using-grant-token">Using a grant token</a> in the
+   *     <i>Key Management Service Developer Guide</i>.</p>
    */
   GrantTokens?: string[];
 }
@@ -2521,12 +2545,12 @@ export namespace GenerateDataKeyPairRequest {
 
 export interface GenerateDataKeyPairResponse {
   /**
-   * <p>The encrypted copy of the private key. When you use the HTTP API or the AWS CLI, the value is Base64-encoded. Otherwise, it is not Base64-encoded.</p>
+   * <p>The encrypted copy of the private key. When you use the HTTP API or the Amazon Web Services CLI, the value is Base64-encoded. Otherwise, it is not Base64-encoded.</p>
    */
   PrivateKeyCiphertextBlob?: Uint8Array;
 
   /**
-   * <p>The plaintext copy of the private key. When you use the HTTP API or the AWS CLI, the value is Base64-encoded. Otherwise, it is not Base64-encoded.</p>
+   * <p>The plaintext copy of the private key. When you use the HTTP API or the Amazon Web Services CLI, the value is Base64-encoded. Otherwise, it is not Base64-encoded.</p>
    */
   PrivateKeyPlaintext?: Uint8Array;
 
@@ -2536,7 +2560,7 @@ export interface GenerateDataKeyPairResponse {
   PublicKey?: Uint8Array;
 
   /**
-   * <p>The Amazon Resource Name (<a href="https://docs.aws.amazon.com/kms/latest/developerguide/concepts.html#key-id-key-ARN">key ARN</a>) of the CMK that encrypted the private key.</p>
+   * <p>The Amazon Resource Name (<a href="https://docs.aws.amazon.com/kms/latest/developerguide/concepts.html#key-id-key-ARN">key ARN</a>) of the KMS key that encrypted the private key.</p>
    */
   KeyId?: string;
 
@@ -2560,18 +2584,18 @@ export interface GenerateDataKeyPairWithoutPlaintextRequest {
   /**
    * <p>Specifies the encryption context that will be used when encrypting the private key in the
    *       data key pair.</p>
-   *          <p>An <i>encryption context</i> is a collection of non-secret key-value pairs that represents additional authenticated data. When you use an encryption context to encrypt data, you must specify the same (an exact case-sensitive match) encryption context to decrypt the data. An encryption context is optional when encrypting with a symmetric CMK, but it is highly recommended.</p>
+   *          <p>An <i>encryption context</i> is a collection of non-secret key-value pairs that represents additional authenticated data. When you use an encryption context to encrypt data, you must specify the same (an exact case-sensitive match) encryption context to decrypt the data. An encryption context is optional when encrypting with a symmetric KMS key, but it is highly recommended.</p>
    *          <p>For more information, see
    *         <a href="https://docs.aws.amazon.com/kms/latest/developerguide/concepts.html#encrypt_context">Encryption
-   *         Context</a> in the <i>AWS Key Management Service Developer Guide</i>.</p>
+   *         Context</a> in the <i>Key Management Service Developer Guide</i>.</p>
    */
   EncryptionContext?: { [key: string]: string };
 
   /**
-   * <p>Specifies the CMK that encrypts the private key in the data key pair. You must specify a
-   *       symmetric CMK. You cannot use an asymmetric CMK or a CMK in a custom key store. To get the
-   *       type and origin of your CMK, use the <a>DescribeKey</a> operation. </p>
-   *          <p>To specify a CMK, use its key ID, key ARN, alias name, or alias ARN. When using an alias name, prefix it with <code>"alias/"</code>. To specify a CMK in a different AWS account, you must use the key ARN or alias ARN.</p>
+   * <p>Specifies the KMS key that encrypts the private key in the data key pair. You must specify a
+   *       symmetric KMS key. You cannot use an asymmetric KMS key or a KMS key in a custom key store. To get the
+   *       type and origin of your KMS key, use the <a>DescribeKey</a> operation. </p>
+   *          <p>To specify a KMS key, use its key ID, key ARN, alias name, or alias ARN. When using an alias name, prefix it with <code>"alias/"</code>. To specify a KMS key in a different Amazon Web Services account, you must use the key ARN or alias ARN.</p>
    *          <p>For example:</p>
    *          <ul>
    *             <li>
@@ -2591,20 +2615,20 @@ export interface GenerateDataKeyPairWithoutPlaintextRequest {
    *                </p>
    *             </li>
    *          </ul>
-   *          <p>To get the key ID and key ARN for a CMK, use <a>ListKeys</a> or <a>DescribeKey</a>. To get the alias name and alias ARN, use <a>ListAliases</a>.</p>
+   *          <p>To get the key ID and key ARN for a KMS key, use <a>ListKeys</a> or <a>DescribeKey</a>. To get the alias name and alias ARN, use <a>ListAliases</a>.</p>
    */
   KeyId: string | undefined;
 
   /**
    * <p>Determines the type of data key pair that is generated.</p>
-   *          <p>The AWS KMS rule that restricts the use of asymmetric RSA CMKs to encrypt and decrypt or to sign and verify (but not both), and the rule that permits you to use ECC CMKs only to sign and verify, are not effective outside of AWS KMS.</p>
+   *          <p>The KMS rule that restricts the use of asymmetric RSA KMS keys to encrypt and decrypt or to sign and verify (but not both), and the rule that permits you to use ECC KMS keys only to sign and verify, are not effective on data key pairs, which are used outside of KMS.</p>
    */
   KeyPairSpec: DataKeyPairSpec | string | undefined;
 
   /**
    * <p>A list of grant tokens.</p>
-   *          <p>Use a grant token when your permission to call this operation comes from a new grant that has not yet achieved <i>eventual consistency</i>. For more information, see <a href="https://docs.aws.amazon.com/kms/latest/developerguide/concepts.html#grant_token">Grant token</a> in the
-   *     <i>AWS Key Management Service Developer Guide</i>.</p>
+   *          <p>Use a grant token when your permission to call this operation comes from a new grant that has not yet achieved <i>eventual consistency</i>. For more information, see <a href="https://docs.aws.amazon.com/kms/latest/developerguide/grants.html#grant_token">Grant token</a> and <a href="https://docs.aws.amazon.com/kms/latest/developerguide/grant-manage.html#using-grant-token">Using a grant token</a> in the
+   *     <i>Key Management Service Developer Guide</i>.</p>
    */
   GrantTokens?: string[];
 }
@@ -2620,7 +2644,7 @@ export namespace GenerateDataKeyPairWithoutPlaintextRequest {
 
 export interface GenerateDataKeyPairWithoutPlaintextResponse {
   /**
-   * <p>The encrypted copy of the private key. When you use the HTTP API or the AWS CLI, the value is Base64-encoded. Otherwise, it is not Base64-encoded.</p>
+   * <p>The encrypted copy of the private key. When you use the HTTP API or the Amazon Web Services CLI, the value is Base64-encoded. Otherwise, it is not Base64-encoded.</p>
    */
   PrivateKeyCiphertextBlob?: Uint8Array;
 
@@ -2630,7 +2654,7 @@ export interface GenerateDataKeyPairWithoutPlaintextResponse {
   PublicKey?: Uint8Array;
 
   /**
-   * <p>The Amazon Resource Name (<a href="https://docs.aws.amazon.com/kms/latest/developerguide/concepts.html#key-id-key-ARN">key ARN</a>) of the CMK that encrypted the private key.</p>
+   * <p>The Amazon Resource Name (<a href="https://docs.aws.amazon.com/kms/latest/developerguide/concepts.html#key-id-key-ARN">key ARN</a>) of the KMS key that encrypted the private key.</p>
    */
   KeyId?: string;
 
@@ -2651,9 +2675,9 @@ export namespace GenerateDataKeyPairWithoutPlaintextResponse {
 
 export interface GenerateDataKeyWithoutPlaintextRequest {
   /**
-   * <p>The identifier of the symmetric customer master key (CMK) that encrypts the data
+   * <p>The identifier of the symmetric KMS key that encrypts the data
    *       key.</p>
-   *          <p>To specify a CMK, use its key ID, key ARN, alias name, or alias ARN. When using an alias name, prefix it with <code>"alias/"</code>. To specify a CMK in a different AWS account, you must use the key ARN or alias ARN.</p>
+   *          <p>To specify a KMS key, use its key ID, key ARN, alias name, or alias ARN. When using an alias name, prefix it with <code>"alias/"</code>. To specify a KMS key in a different Amazon Web Services account, you must use the key ARN or alias ARN.</p>
    *          <p>For example:</p>
    *          <ul>
    *             <li>
@@ -2673,16 +2697,16 @@ export interface GenerateDataKeyWithoutPlaintextRequest {
    *                </p>
    *             </li>
    *          </ul>
-   *          <p>To get the key ID and key ARN for a CMK, use <a>ListKeys</a> or <a>DescribeKey</a>. To get the alias name and alias ARN, use <a>ListAliases</a>.</p>
+   *          <p>To get the key ID and key ARN for a KMS key, use <a>ListKeys</a> or <a>DescribeKey</a>. To get the alias name and alias ARN, use <a>ListAliases</a>.</p>
    */
   KeyId: string | undefined;
 
   /**
    * <p>Specifies the encryption context that will be used when encrypting the data key.</p>
-   *          <p>An <i>encryption context</i> is a collection of non-secret key-value pairs that represents additional authenticated data. When you use an encryption context to encrypt data, you must specify the same (an exact case-sensitive match) encryption context to decrypt the data. An encryption context is optional when encrypting with a symmetric CMK, but it is highly recommended.</p>
+   *          <p>An <i>encryption context</i> is a collection of non-secret key-value pairs that represents additional authenticated data. When you use an encryption context to encrypt data, you must specify the same (an exact case-sensitive match) encryption context to decrypt the data. An encryption context is optional when encrypting with a symmetric KMS key, but it is highly recommended.</p>
    *          <p>For more information, see
    *         <a href="https://docs.aws.amazon.com/kms/latest/developerguide/concepts.html#encrypt_context">Encryption
-   *         Context</a> in the <i>AWS Key Management Service Developer Guide</i>.</p>
+   *         Context</a> in the <i>Key Management Service Developer Guide</i>.</p>
    */
   EncryptionContext?: { [key: string]: string };
 
@@ -2701,8 +2725,8 @@ export interface GenerateDataKeyWithoutPlaintextRequest {
 
   /**
    * <p>A list of grant tokens.</p>
-   *          <p>Use a grant token when your permission to call this operation comes from a new grant that has not yet achieved <i>eventual consistency</i>. For more information, see <a href="https://docs.aws.amazon.com/kms/latest/developerguide/concepts.html#grant_token">Grant token</a> in the
-   *     <i>AWS Key Management Service Developer Guide</i>.</p>
+   *          <p>Use a grant token when your permission to call this operation comes from a new grant that has not yet achieved <i>eventual consistency</i>. For more information, see <a href="https://docs.aws.amazon.com/kms/latest/developerguide/grants.html#grant_token">Grant token</a> and <a href="https://docs.aws.amazon.com/kms/latest/developerguide/grant-manage.html#using-grant-token">Using a grant token</a> in the
+   *     <i>Key Management Service Developer Guide</i>.</p>
    */
   GrantTokens?: string[];
 }
@@ -2718,12 +2742,12 @@ export namespace GenerateDataKeyWithoutPlaintextRequest {
 
 export interface GenerateDataKeyWithoutPlaintextResponse {
   /**
-   * <p>The encrypted data key. When you use the HTTP API or the AWS CLI, the value is Base64-encoded. Otherwise, it is not Base64-encoded.</p>
+   * <p>The encrypted data key. When you use the HTTP API or the Amazon Web Services CLI, the value is Base64-encoded. Otherwise, it is not Base64-encoded.</p>
    */
   CiphertextBlob?: Uint8Array;
 
   /**
-   * <p>The Amazon Resource Name (<a href="https://docs.aws.amazon.com/kms/latest/developerguide/concepts.html#key-id-key-ARN">key ARN</a>) of the CMK that encrypted the data key.</p>
+   * <p>The Amazon Resource Name (<a href="https://docs.aws.amazon.com/kms/latest/developerguide/concepts.html#key-id-key-ARN">key ARN</a>) of the KMS key that encrypted the data key.</p>
    */
   KeyId?: string;
 }
@@ -2744,7 +2768,7 @@ export interface GenerateRandomRequest {
   NumberOfBytes?: number;
 
   /**
-   * <p>Generates the random byte string in the AWS CloudHSM cluster that is associated with the
+   * <p>Generates the random byte string in the CloudHSM cluster that is associated with the
    *       specified <a href="https://docs.aws.amazon.com/kms/latest/developerguide/custom-key-store-overview.html">custom key store</a>. To find the ID of a custom key store, use the <a>DescribeCustomKeyStores</a> operation.</p>
    */
   CustomKeyStoreId?: string;
@@ -2761,7 +2785,7 @@ export namespace GenerateRandomRequest {
 
 export interface GenerateRandomResponse {
   /**
-   * <p>The random byte string. When you use the HTTP API or the AWS CLI, the value is Base64-encoded. Otherwise, it is not Base64-encoded.</p>
+   * <p>The random byte string. When you use the HTTP API or the Amazon Web Services CLI, the value is Base64-encoded. Otherwise, it is not Base64-encoded.</p>
    */
   Plaintext?: Uint8Array;
 }
@@ -2778,8 +2802,8 @@ export namespace GenerateRandomResponse {
 
 export interface GetKeyPolicyRequest {
   /**
-   * <p>Gets the key policy for the specified customer master key (CMK).</p>
-   *          <p>Specify the key ID or key ARN of the CMK.</p>
+   * <p>Gets the key policy for the specified KMS key.</p>
+   *          <p>Specify the key ID or key ARN of the KMS key.</p>
    *          <p>For example:</p>
    *          <ul>
    *             <li>
@@ -2791,7 +2815,7 @@ export interface GetKeyPolicyRequest {
    *                </p>
    *             </li>
    *          </ul>
-   *          <p>To get the key ID and key ARN for a CMK, use <a>ListKeys</a> or <a>DescribeKey</a>.</p>
+   *          <p>To get the key ID and key ARN for a KMS key, use <a>ListKeys</a> or <a>DescribeKey</a>.</p>
    */
   KeyId: string | undefined;
 
@@ -2829,9 +2853,9 @@ export namespace GetKeyPolicyResponse {
 
 export interface GetKeyRotationStatusRequest {
   /**
-   * <p>Gets the rotation status for the specified customer master key (CMK).</p>
-   *          <p>Specify the key ID or key ARN of the CMK. To specify a CMK in a
-   * different AWS account, you must use the key ARN.</p>
+   * <p>Gets the rotation status for the specified KMS key.</p>
+   *          <p>Specify the key ID or key ARN of the KMS key. To specify a KMS key in a
+   * different Amazon Web Services account, you must use the key ARN.</p>
    *          <p>For example:</p>
    *          <ul>
    *             <li>
@@ -2843,7 +2867,7 @@ export interface GetKeyRotationStatusRequest {
    *                </p>
    *             </li>
    *          </ul>
-   *          <p>To get the key ID and key ARN for a CMK, use <a>ListKeys</a> or <a>DescribeKey</a>.</p>
+   *          <p>To get the key ID and key ARN for a KMS key, use <a>ListKeys</a> or <a>DescribeKey</a>.</p>
    */
   KeyId: string | undefined;
 }
@@ -2879,9 +2903,9 @@ export enum WrappingKeySpec {
 
 export interface GetParametersForImportRequest {
   /**
-   * <p>The identifier of the symmetric CMK into which you will import key material. The
-   *         <code>Origin</code> of the CMK must be <code>EXTERNAL</code>.</p>
-   *          <p>Specify the key ID or key ARN of the CMK.</p>
+   * <p>The identifier of the symmetric KMS key into which you will import key material. The
+   *         <code>Origin</code> of the KMS key must be <code>EXTERNAL</code>.</p>
+   *          <p>Specify the key ID or key ARN of the KMS key.</p>
    *          <p>For example:</p>
    *          <ul>
    *             <li>
@@ -2893,13 +2917,13 @@ export interface GetParametersForImportRequest {
    *                </p>
    *             </li>
    *          </ul>
-   *          <p>To get the key ID and key ARN for a CMK, use <a>ListKeys</a> or <a>DescribeKey</a>.</p>
+   *          <p>To get the key ID and key ARN for a KMS key, use <a>ListKeys</a> or <a>DescribeKey</a>.</p>
    */
   KeyId: string | undefined;
 
   /**
    * <p>The algorithm you will use to encrypt the key material before importing it with <a>ImportKeyMaterial</a>. For more information, see <a href="https://docs.aws.amazon.com/kms/latest/developerguide/importing-keys-encrypt-key-material.html">Encrypt the Key Material</a>
-   *       in the <i>AWS Key Management Service Developer Guide</i>.</p>
+   *       in the <i>Key Management Service Developer Guide</i>.</p>
    */
   WrappingAlgorithm: AlgorithmSpec | string | undefined;
 
@@ -2921,8 +2945,8 @@ export namespace GetParametersForImportRequest {
 
 export interface GetParametersForImportResponse {
   /**
-   * <p>The Amazon Resource Name (<a href="https://docs.aws.amazon.com/kms/latest/developerguide/concepts.html#key-id-key-ARN">key ARN</a>) of the CMK to use in a subsequent <a>ImportKeyMaterial</a>
-   *       request. This is the same CMK specified in the <code>GetParametersForImport</code>
+   * <p>The Amazon Resource Name (<a href="https://docs.aws.amazon.com/kms/latest/developerguide/concepts.html#key-id-key-ARN">key ARN</a>) of the KMS key to use in a subsequent <a>ImportKeyMaterial</a>
+   *       request. This is the same KMS key specified in the <code>GetParametersForImport</code>
    *       request.</p>
    */
   KeyId?: string;
@@ -2958,9 +2982,9 @@ export namespace GetParametersForImportResponse {
 
 export interface GetPublicKeyRequest {
   /**
-   * <p>Identifies the asymmetric CMK that includes the public key.</p>
+   * <p>Identifies the asymmetric KMS key that includes the public key.</p>
    *
-   *          <p>To specify a CMK, use its key ID, key ARN, alias name, or alias ARN. When using an alias name, prefix it with <code>"alias/"</code>. To specify a CMK in a different AWS account, you must use the key ARN or alias ARN.</p>
+   *          <p>To specify a KMS key, use its key ID, key ARN, alias name, or alias ARN. When using an alias name, prefix it with <code>"alias/"</code>. To specify a KMS key in a different Amazon Web Services account, you must use the key ARN or alias ARN.</p>
    *          <p>For example:</p>
    *          <ul>
    *             <li>
@@ -2980,14 +3004,14 @@ export interface GetPublicKeyRequest {
    *                </p>
    *             </li>
    *          </ul>
-   *          <p>To get the key ID and key ARN for a CMK, use <a>ListKeys</a> or <a>DescribeKey</a>. To get the alias name and alias ARN, use <a>ListAliases</a>.</p>
+   *          <p>To get the key ID and key ARN for a KMS key, use <a>ListKeys</a> or <a>DescribeKey</a>. To get the alias name and alias ARN, use <a>ListAliases</a>.</p>
    */
   KeyId: string | undefined;
 
   /**
    * <p>A list of grant tokens.</p>
-   *          <p>Use a grant token when your permission to call this operation comes from a new grant that has not yet achieved <i>eventual consistency</i>. For more information, see <a href="https://docs.aws.amazon.com/kms/latest/developerguide/concepts.html#grant_token">Grant token</a> in the
-   *     <i>AWS Key Management Service Developer Guide</i>.</p>
+   *          <p>Use a grant token when your permission to call this operation comes from a new grant that has not yet achieved <i>eventual consistency</i>. For more information, see <a href="https://docs.aws.amazon.com/kms/latest/developerguide/grants.html#grant_token">Grant token</a> and <a href="https://docs.aws.amazon.com/kms/latest/developerguide/grant-manage.html#using-grant-token">Using a grant token</a> in the
+   *     <i>Key Management Service Developer Guide</i>.</p>
    */
   GrantTokens?: string[];
 }
@@ -3003,34 +3027,42 @@ export namespace GetPublicKeyRequest {
 
 export interface GetPublicKeyResponse {
   /**
-   * <p>The Amazon Resource Name (<a href="https://docs.aws.amazon.com/kms/latest/developerguide/concepts.html#key-id-key-ARN">key ARN</a>) of the asymmetric CMK from which the public key was downloaded.</p>
+   * <p>The Amazon Resource Name (<a href="https://docs.aws.amazon.com/kms/latest/developerguide/concepts.html#key-id-key-ARN">key ARN</a>) of the asymmetric KMS key from which the public key was downloaded.</p>
    */
   KeyId?: string;
 
   /**
    * <p>The exported public key. </p>
    *          <p>The value is a DER-encoded X.509 public key, also known as
-   *         <code>SubjectPublicKeyInfo</code> (SPKI), as defined in <a href="https://tools.ietf.org/html/rfc5280">RFC 5280</a>. When you use the HTTP API or the AWS CLI, the value is Base64-encoded. Otherwise, it is not Base64-encoded.</p>
+   *         <code>SubjectPublicKeyInfo</code> (SPKI), as defined in <a href="https://tools.ietf.org/html/rfc5280">RFC 5280</a>. When you use the HTTP API or the Amazon Web Services CLI, the value is Base64-encoded. Otherwise, it is not Base64-encoded.</p>
    *          <p></p>
    */
   PublicKey?: Uint8Array;
 
   /**
-   * <p>The type of the of the public key that was downloaded.</p>
+   * @deprecated
+   *
+   * <p>Instead, use the <code>KeySpec</code> field in the <code>GetPublicKey</code> response.</p>
+   *          <p>The <code>KeySpec</code> and <code>CustomerMasterKeySpec</code> fields have the same value. We recommend that you use the <code>KeySpec</code> field in your code. However, to avoid breaking changes, KMS will support both fields.</p>
    */
   CustomerMasterKeySpec?: CustomerMasterKeySpec | string;
 
+  /**
+   * <p>The type of the of the public key that was downloaded.</p>
+   */
+  KeySpec?: KeySpec | string;
+
   /**
    * <p>The permitted use of the public key. Valid values are <code>ENCRYPT_DECRYPT</code> or
    *         <code>SIGN_VERIFY</code>. </p>
    *          <p>This information is critical. If a public key with <code>SIGN_VERIFY</code> key usage
-   *       encrypts data outside of AWS KMS, the ciphertext cannot be decrypted. </p>
+   *       encrypts data outside of KMS, the ciphertext cannot be decrypted. </p>
    */
   KeyUsage?: KeyUsageType | string;
 
   /**
-   * <p>The encryption algorithms that AWS KMS supports for this key. </p>
-   *          <p>This information is critical. If a public key encrypts data outside of AWS KMS by using an
+   * <p>The encryption algorithms that KMS supports for this key. </p>
+   *          <p>This information is critical. If a public key encrypts data outside of KMS by using an
    *       unsupported encryption algorithm, the ciphertext cannot be decrypted. </p>
    *          <p>This field appears in the response only when the <code>KeyUsage</code> of the public key
    *       is <code>ENCRYPT_DECRYPT</code>.</p>
@@ -3038,7 +3070,7 @@ export interface GetPublicKeyResponse {
   EncryptionAlgorithms?: (EncryptionAlgorithmSpec | string)[];
 
   /**
-   * <p>The signing algorithms that AWS KMS supports for this key.</p>
+   * <p>The signing algorithms that KMS supports for this key.</p>
    *          <p>This field appears in the response only when the <code>KeyUsage</code> of the public key
    *       is <code>SIGN_VERIFY</code>.</p>
    */
@@ -3059,7 +3091,7 @@ export namespace GetPublicKeyResponse {
  */
 export interface GrantListEntry {
   /**
-   * <p>The unique identifier for the customer master key (CMK) to which the grant applies.</p>
+   * <p>The unique identifier for the KMS key to which the grant applies.</p>
    */
   KeyId?: string;
 
@@ -3082,7 +3114,7 @@ export interface GrantListEntry {
    * <p>The identity that gets the permissions in the grant.</p>
    *          <p>The <code>GranteePrincipal</code> field in the <code>ListGrants</code> response usually contains the
    *         user or role designated as the grantee principal in the grant. However, when the grantee
-   *         principal in the grant is an AWS service, the <code>GranteePrincipal</code> field contains
+   *         principal in the grant is an Amazon Web Services service, the <code>GranteePrincipal</code> field contains
    *         the <a href="https://docs.aws.amazon.com/IAM/latest/UserGuide/reference_policies_elements_principal.html#principal-services">service
    *           principal</a>, which might represent several different grantee principals.</p>
    */
@@ -3094,7 +3126,7 @@ export interface GrantListEntry {
   RetiringPrincipal?: string;
 
   /**
-   * <p>The AWS account under which the grant was issued.</p>
+   * <p>The Amazon Web Services account under which the grant was issued.</p>
    */
   IssuingAccount?: string;
 
@@ -3121,11 +3153,11 @@ export namespace GrantListEntry {
 
 export interface ImportKeyMaterialRequest {
   /**
-   * <p>The identifier of the symmetric CMK that receives the imported key material. The CMK's
-   *         <code>Origin</code> must be <code>EXTERNAL</code>. This must be the same CMK specified in
+   * <p>The identifier of the symmetric KMS key that receives the imported key material. The KMS key's
+   *         <code>Origin</code> must be <code>EXTERNAL</code>. This must be the same KMS key specified in
    *       the <code>KeyID</code> parameter of the corresponding <a>GetParametersForImport</a>
    *       request.</p>
-   *          <p>Specify the key ID or key ARN of the CMK.</p>
+   *          <p>Specify the key ID or key ARN of the KMS key.</p>
    *          <p>For example:</p>
    *          <ul>
    *             <li>
@@ -3137,7 +3169,7 @@ export interface ImportKeyMaterialRequest {
    *                </p>
    *             </li>
    *          </ul>
-   *          <p>To get the key ID and key ARN for a CMK, use <a>ListKeys</a> or <a>DescribeKey</a>.</p>
+   *          <p>To get the key ID and key ARN for a KMS key, use <a>ListKeys</a> or <a>DescribeKey</a>.</p>
    */
   KeyId: string | undefined;
 
@@ -3155,8 +3187,8 @@ export interface ImportKeyMaterialRequest {
   EncryptedKeyMaterial: Uint8Array | undefined;
 
   /**
-   * <p>The time at which the imported key material expires. When the key material expires, AWS KMS
-   *       deletes the key material and the CMK becomes unusable. You must omit this parameter when the
+   * <p>The time at which the imported key material expires. When the key material expires, KMS
+   *       deletes the key material and the KMS key becomes unusable. You must omit this parameter when the
    *         <code>ExpirationModel</code> parameter is set to <code>KEY_MATERIAL_DOES_NOT_EXPIRE</code>.
    *       Otherwise it is required.</p>
    */
@@ -3193,8 +3225,7 @@ export namespace ImportKeyMaterialResponse {
 
 /**
  * <p>The request was rejected because the key material in the request is, expired, invalid, or
- *       is not the same key material that was previously imported into this customer master key
- *       (CMK).</p>
+ *       is not the same key material that was previously imported into this KMS key.</p>
  */
 export interface IncorrectKeyMaterialException extends __SmithyException, $MetadataBearer {
   name: "IncorrectKeyMaterialException";
@@ -3213,7 +3244,7 @@ export namespace IncorrectKeyMaterialException {
 
 /**
  * <p>The request was rejected because the provided import token is invalid or is associated
- *       with a different customer master key (CMK).</p>
+ *       with a different KMS key.</p>
  */
 export interface InvalidImportTokenException extends __SmithyException, $MetadataBearer {
   name: "InvalidImportTokenException";
@@ -3275,7 +3306,7 @@ export namespace KeyListEntry {
 /**
  * <p>The request was rejected because the signature verification failed. Signature verification
  *       fails when it cannot confirm that signature was produced by signing the specified message with
- *       the specified CMK and signing algorithm.</p>
+ *       the specified KMS key and signing algorithm.</p>
  */
 export interface KMSInvalidSignatureException extends __SmithyException, $MetadataBearer {
   name: "KMSInvalidSignatureException";
@@ -3294,12 +3325,11 @@ export namespace KMSInvalidSignatureException {
 
 export interface ListAliasesRequest {
   /**
-   * <p>Lists only aliases that are associated with the specified CMK. Enter a CMK in your AWS
-   *       account. </p>
+   * <p>Lists only aliases that are associated with the specified KMS key. Enter a KMS key in your Amazon Web Services account. </p>
    *          <p>This parameter is optional. If you omit it, <code>ListAliases</code> returns all aliases
    *       in the account and Region.</p>
    *
-   *          <p>Specify the key ID or key ARN of the CMK.</p>
+   *          <p>Specify the key ID or key ARN of the KMS key.</p>
    *          <p>For example:</p>
    *          <ul>
    *             <li>
@@ -3311,13 +3341,13 @@ export interface ListAliasesRequest {
    *                </p>
    *             </li>
    *          </ul>
-   *          <p>To get the key ID and key ARN for a CMK, use <a>ListKeys</a> or <a>DescribeKey</a>.</p>
+   *          <p>To get the key ID and key ARN for a KMS key, use <a>ListKeys</a> or <a>DescribeKey</a>.</p>
    */
   KeyId?: string;
 
   /**
    * <p>Use this parameter to specify the maximum number of items to return. When this
-   *     value is present, AWS KMS does not return more than the specified number of items, but it might
+   *     value is present, KMS does not return more than the specified number of items, but it might
    *     return fewer.</p>
    *          <p>This value is optional. If you include a value, it must be between 1
    *     and 100, inclusive. If you do not include a value, it defaults to 50.</p>
@@ -3374,7 +3404,7 @@ export namespace ListAliasesResponse {
 export interface ListGrantsRequest {
   /**
    * <p>Use this parameter to specify the maximum number of items to return. When this
-   *     value is present, AWS KMS does not return more than the specified number of items, but it might
+   *     value is present, KMS does not return more than the specified number of items, but it might
    *     return fewer.</p>
    *          <p>This value is optional. If you include a value, it must be between 1
    *     and 100, inclusive. If you do not include a value, it defaults to 50.</p>
@@ -3389,10 +3419,10 @@ export interface ListGrantsRequest {
   Marker?: string;
 
   /**
-   * <p>Returns only grants for the specified customer master key (CMK). This parameter is
+   * <p>Returns only grants for the specified KMS key. This parameter is
    *       required.</p>
-   *          <p>Specify the key ID or key ARN of the CMK. To specify a CMK in a
-   * different AWS account, you must use the key ARN.</p>
+   *          <p>Specify the key ID or key ARN of the KMS key. To specify a KMS key in a
+   * different Amazon Web Services account, you must use the key ARN.</p>
    *          <p>For example:</p>
    *          <ul>
    *             <li>
@@ -3404,7 +3434,7 @@ export interface ListGrantsRequest {
    *                </p>
    *             </li>
    *          </ul>
-   *          <p>To get the key ID and key ARN for a CMK, use <a>ListKeys</a> or <a>DescribeKey</a>.</p>
+   *          <p>To get the key ID and key ARN for a KMS key, use <a>ListKeys</a> or <a>DescribeKey</a>.</p>
    */
   KeyId: string | undefined;
 
@@ -3462,8 +3492,8 @@ export namespace ListGrantsResponse {
 
 export interface ListKeyPoliciesRequest {
   /**
-   * <p>Gets the names of key policies for the specified customer master key (CMK).</p>
-   *          <p>Specify the key ID or key ARN of the CMK.</p>
+   * <p>Gets the names of key policies for the specified KMS key.</p>
+   *          <p>Specify the key ID or key ARN of the KMS key.</p>
    *          <p>For example:</p>
    *          <ul>
    *             <li>
@@ -3475,13 +3505,13 @@ export interface ListKeyPoliciesRequest {
    *                </p>
    *             </li>
    *          </ul>
-   *          <p>To get the key ID and key ARN for a CMK, use <a>ListKeys</a> or <a>DescribeKey</a>.</p>
+   *          <p>To get the key ID and key ARN for a KMS key, use <a>ListKeys</a> or <a>DescribeKey</a>.</p>
    */
   KeyId: string | undefined;
 
   /**
    * <p>Use this parameter to specify the maximum number of items to return. When this
-   *     value is present, AWS KMS does not return more than the specified number of items, but it might
+   *     value is present, KMS does not return more than the specified number of items, but it might
    *     return fewer.</p>
    *          <p>This value is optional. If you include a value, it must be between
    *     1 and 1000, inclusive. If you do not include a value, it defaults to 100.</p>
@@ -3539,7 +3569,7 @@ export namespace ListKeyPoliciesResponse {
 export interface ListKeysRequest {
   /**
    * <p>Use this parameter to specify the maximum number of items to return. When this
-   *     value is present, AWS KMS does not return more than the specified number of items, but it might
+   *     value is present, KMS does not return more than the specified number of items, but it might
    *     return fewer.</p>
    *          <p>This value is optional. If you include a value, it must be between
    *     1 and 1000, inclusive. If you do not include a value, it defaults to 100.</p>
@@ -3565,7 +3595,7 @@ export namespace ListKeysRequest {
 
 export interface ListKeysResponse {
   /**
-   * <p>A list of customer master keys (CMKs).</p>
+   * <p>A list of KMS keys.</p>
    */
   Keys?: KeyListEntry[];
 
@@ -3595,8 +3625,8 @@ export namespace ListKeysResponse {
 
 export interface ListResourceTagsRequest {
   /**
-   * <p>Gets tags on the specified customer master key (CMK).</p>
-   *          <p>Specify the key ID or key ARN of the CMK.</p>
+   * <p>Gets tags on the specified KMS key.</p>
+   *          <p>Specify the key ID or key ARN of the KMS key.</p>
    *          <p>For example:</p>
    *          <ul>
    *             <li>
@@ -3608,13 +3638,13 @@ export interface ListResourceTagsRequest {
    *                </p>
    *             </li>
    *          </ul>
-   *          <p>To get the key ID and key ARN for a CMK, use <a>ListKeys</a> or <a>DescribeKey</a>.</p>
+   *          <p>To get the key ID and key ARN for a KMS key, use <a>ListKeys</a> or <a>DescribeKey</a>.</p>
    */
   KeyId: string | undefined;
 
   /**
    * <p>Use this parameter to specify the maximum number of items to return. When this
-   *     value is present, AWS KMS does not return more than the specified number of items, but it might
+   *     value is present, KMS does not return more than the specified number of items, but it might
    *     return fewer.</p>
    *          <p>This value is optional. If you include a value, it must be between 1 and 50, inclusive. If
    *       you do not include a value, it defaults to 50.</p>
@@ -3644,8 +3674,7 @@ export interface ListResourceTagsResponse {
   /**
    * <p>A list of tags. Each tag consists of a tag key and a tag value.</p>
    *          <note>
-   *             <p>Tagging or untagging a CMK can allow or deny permission to the
-   *                 CMK. For details, see <a href="https://docs.aws.amazon.com/kms/latest/developerguide/abac.html">Using ABAC in AWS KMS</a> in the <i>AWS Key Management Service Developer Guide</i>.</p>
+   *             <p>Tagging or untagging a KMS key can allow or deny permission to the KMS key. For details, see <a href="https://docs.aws.amazon.com/kms/latest/developerguide/abac.html">Using ABAC in KMS</a> in the <i>Key Management Service Developer Guide</i>.</p>
    *          </note>
    */
   Tags?: Tag[];
@@ -3678,7 +3707,7 @@ export namespace ListResourceTagsResponse {
 export interface ListRetirableGrantsRequest {
   /**
    * <p>Use this parameter to specify the maximum number of items to return. When this
-   *     value is present, AWS KMS does not return more than the specified number of items, but it might
+   *     value is present, KMS does not return more than the specified number of items, but it might
    *     return fewer.</p>
    *          <p>This value is optional. If you include a value, it must be between 1
    *     and 100, inclusive. If you do not include a value, it defaults to 50.</p>
@@ -3693,13 +3722,10 @@ export interface ListRetirableGrantsRequest {
   Marker?: string;
 
   /**
-   * <p>The retiring principal for which to list grants. Enter a principal in your AWS
-   *       account.</p>
-   *          <p>To specify the retiring principal, use the <a href="https://docs.aws.amazon.com/general/latest/gr/aws-arns-and-namespaces.html">Amazon Resource Name (ARN)</a> of an AWS
-   *       principal. Valid AWS principals include AWS accounts (root), IAM users, federated users, and
-   *       assumed role users. For examples of the ARN syntax for specifying a principal, see <a href="https://docs.aws.amazon.com/general/latest/gr/aws-arns-and-namespaces.html#arn-syntax-iam">AWS
-   *         Identity and Access Management (IAM)</a> in the Example ARNs section of the
-   *         <i>Amazon Web Services General Reference</i>.</p>
+   * <p>The retiring principal for which to list grants. Enter a principal in your Amazon Web Services account.</p>
+   *          <p>To specify the retiring principal, use the <a href="https://docs.aws.amazon.com/general/latest/gr/aws-arns-and-namespaces.html">Amazon Resource Name (ARN)</a> of an Amazon Web Services principal. Valid Amazon Web Services principals include Amazon Web Services accounts (root), IAM users, federated users, and
+   *       assumed role users. For examples of the ARN syntax for specifying a principal, see <a href="https://docs.aws.amazon.com/general/latest/gr/aws-arns-and-namespaces.html#arn-syntax-iam">Amazon Web Services Identity and Access Management (IAM)</a> in the Example ARNs section of the
+   *       <i>Amazon Web Services General Reference</i>.</p>
    */
   RetiringPrincipal: string | undefined;
 }
@@ -3720,8 +3746,8 @@ export enum MessageType {
 
 export interface PutKeyPolicyRequest {
   /**
-   * <p>Sets the key policy on the specified customer master key (CMK).</p>
-   *          <p>Specify the key ID or key ARN of the CMK.</p>
+   * <p>Sets the key policy on the specified KMS key.</p>
+   *          <p>Specify the key ID or key ARN of the KMS key.</p>
    *          <p>For example:</p>
    *          <ul>
    *             <li>
@@ -3733,7 +3759,7 @@ export interface PutKeyPolicyRequest {
    *                </p>
    *             </li>
    *          </ul>
-   *          <p>To get the key ID and key ARN for a CMK, use <a>ListKeys</a> or <a>DescribeKey</a>.</p>
+   *          <p>To get the key ID and key ARN for a KMS key, use <a>ListKeys</a> or <a>DescribeKey</a>.</p>
    */
   KeyId: string | undefined;
 
@@ -3743,38 +3769,36 @@ export interface PutKeyPolicyRequest {
   PolicyName: string | undefined;
 
   /**
-   * <p>The key policy to attach to the CMK.</p>
+   * <p>The key policy to attach to the KMS key.</p>
    *          <p>The key policy must meet the following criteria:</p>
    *          <ul>
    *             <li>
    *                <p>If you don't set <code>BypassPolicyLockoutSafetyCheck</code> to true, the key policy
    *           must allow the principal that is making the <code>PutKeyPolicy</code> request to make a
-   *           subsequent <code>PutKeyPolicy</code> request on the CMK. This reduces the risk that the
-   *           CMK becomes unmanageable. For more information, refer to the scenario in the <a href="https://docs.aws.amazon.com/kms/latest/developerguide/key-policies.html#key-policy-default-allow-root-enable-iam">Default Key Policy</a> section of the <i>AWS Key Management Service Developer Guide</i>.</p>
+   *           subsequent <code>PutKeyPolicy</code> request on the KMS key. This reduces the risk that the KMS key becomes unmanageable. For more information, refer to the scenario in the <a href="https://docs.aws.amazon.com/kms/latest/developerguide/key-policies.html#key-policy-default-allow-root-enable-iam">Default Key Policy</a> section of the <i>Key Management Service Developer Guide</i>.</p>
    *             </li>
    *             <li>
    *                <p>Each statement in the key policy must contain one or more principals. The principals
-   *           in the key policy must exist and be visible to AWS KMS. When you create a new AWS principal
+   *           in the key policy must exist and be visible to KMS. When you create a new Amazon Web Services principal
    *           (for example, an IAM user or role), you might need to enforce a delay before including the
    *           new principal in a key policy because the new principal might not be immediately visible
-   *           to AWS KMS. For more information, see <a href="https://docs.aws.amazon.com/IAM/latest/UserGuide/troubleshoot_general.html#troubleshoot_general_eventual-consistency">Changes that I make are not always immediately visible</a> in the <i>AWS
-   *             Identity and Access Management User Guide</i>.</p>
+   *           to KMS. For more information, see <a href="https://docs.aws.amazon.com/IAM/latest/UserGuide/troubleshoot_general.html#troubleshoot_general_eventual-consistency">Changes that I make are not always immediately visible</a> in the <i>Amazon Web Services Identity and Access Management User Guide</i>.</p>
    *             </li>
    *          </ul>
    *          <p>The key policy cannot exceed 32 kilobytes (32768 bytes). For more information, see <a href="https://docs.aws.amazon.com/kms/latest/developerguide/resource-limits.html">Resource Quotas</a> in the
-   *       <i>AWS Key Management Service Developer Guide</i>.</p>
+   *       <i>Key Management Service Developer Guide</i>.</p>
    */
   Policy: string | undefined;
 
   /**
    * <p>A flag to indicate whether to bypass the key policy lockout safety check.</p>
    *          <important>
-   *             <p>Setting this value to true increases the risk that the CMK becomes unmanageable. Do not
+   *             <p>Setting this value to true increases the risk that the KMS key becomes unmanageable. Do not
    *         set this value to true indiscriminately.</p>
-   *             <p>For more information, refer to the scenario in the <a href="https://docs.aws.amazon.com/kms/latest/developerguide/key-policies.html#key-policy-default-allow-root-enable-iam">Default Key Policy</a> section in the <i>AWS Key Management Service Developer Guide</i>.</p>
+   *             <p>For more information, refer to the scenario in the <a href="https://docs.aws.amazon.com/kms/latest/developerguide/key-policies.html#key-policy-default-allow-root-enable-iam">Default Key Policy</a> section in the <i>Key Management Service Developer Guide</i>.</p>
    *          </important>
    *          <p>Use this parameter only when you intend to prevent the principal that is making the
-   *       request from making a subsequent <code>PutKeyPolicy</code> request on the CMK.</p>
+   *       request from making a subsequent <code>PutKeyPolicy</code> request on the KMS key.</p>
    *          <p>The default value is false.</p>
    */
   BypassPolicyLockoutSafetyCheck?: boolean;
@@ -3798,23 +3822,23 @@ export interface ReEncryptRequest {
   /**
    * <p>Specifies the encryption context to use to decrypt the ciphertext. Enter the same
    *       encryption context that was used to encrypt the ciphertext.</p>
-   *          <p>An <i>encryption context</i> is a collection of non-secret key-value pairs that represents additional authenticated data. When you use an encryption context to encrypt data, you must specify the same (an exact case-sensitive match) encryption context to decrypt the data. An encryption context is optional when encrypting with a symmetric CMK, but it is highly recommended.</p>
+   *          <p>An <i>encryption context</i> is a collection of non-secret key-value pairs that represents additional authenticated data. When you use an encryption context to encrypt data, you must specify the same (an exact case-sensitive match) encryption context to decrypt the data. An encryption context is optional when encrypting with a symmetric KMS key, but it is highly recommended.</p>
    *          <p>For more information, see
    *         <a href="https://docs.aws.amazon.com/kms/latest/developerguide/concepts.html#encrypt_context">Encryption
-   *         Context</a> in the <i>AWS Key Management Service Developer Guide</i>.</p>
+   *         Context</a> in the <i>Key Management Service Developer Guide</i>.</p>
    */
   SourceEncryptionContext?: { [key: string]: string };
 
   /**
-   * <p>Specifies the customer master key (CMK) that
-   *     AWS KMS will use to decrypt the ciphertext before it is re-encrypted. Enter a key ID of the CMK
+   * <p>Specifies the KMS key that
+   *     KMS will use to decrypt the ciphertext before it is re-encrypted. Enter a key ID of the KMS key
    *     that was used to encrypt the ciphertext.</p>
-   *          <p>This parameter is required only when the ciphertext was encrypted under an asymmetric CMK.
-   *       If you used a symmetric CMK, AWS KMS can get the CMK from metadata that it adds to the
+   *          <p>This parameter is required only when the ciphertext was encrypted under an asymmetric KMS key.
+   *       If you used a symmetric KMS key, KMS can get the KMS key from metadata that it adds to the
    *       symmetric ciphertext blob. However, it is always recommended as a best practice. This practice
-   *       ensures that you use the CMK that you intend.</p>
+   *       ensures that you use the KMS key that you intend.</p>
    *
-   *          <p>To specify a CMK, use its key ID, key ARN, alias name, or alias ARN. When using an alias name, prefix it with <code>"alias/"</code>. To specify a CMK in a different AWS account, you must use the key ARN or alias ARN.</p>
+   *          <p>To specify a KMS key, use its key ID, key ARN, alias name, or alias ARN. When using an alias name, prefix it with <code>"alias/"</code>. To specify a KMS key in a different Amazon Web Services account, you must use the key ARN or alias ARN.</p>
    *          <p>For example:</p>
    *          <ul>
    *             <li>
@@ -3834,16 +3858,16 @@ export interface ReEncryptRequest {
    *                </p>
    *             </li>
    *          </ul>
-   *          <p>To get the key ID and key ARN for a CMK, use <a>ListKeys</a> or <a>DescribeKey</a>. To get the alias name and alias ARN, use <a>ListAliases</a>.</p>
+   *          <p>To get the key ID and key ARN for a KMS key, use <a>ListKeys</a> or <a>DescribeKey</a>. To get the alias name and alias ARN, use <a>ListAliases</a>.</p>
    */
   SourceKeyId?: string;
 
   /**
-   * <p>A unique identifier for the CMK that is used to reencrypt the data. Specify a symmetric or
-   *       asymmetric CMK with a <code>KeyUsage</code> value of <code>ENCRYPT_DECRYPT</code>. To find the
-   *         <code>KeyUsage</code> value of a CMK, use the <a>DescribeKey</a>
+   * <p>A unique identifier for the KMS key that is used to reencrypt the data. Specify a symmetric or
+   *       asymmetric KMS key with a <code>KeyUsage</code> value of <code>ENCRYPT_DECRYPT</code>. To find the
+   *         <code>KeyUsage</code> value of a KMS key, use the <a>DescribeKey</a>
    *       operation.</p>
-   *          <p>To specify a CMK, use its key ID, key ARN, alias name, or alias ARN. When using an alias name, prefix it with <code>"alias/"</code>. To specify a CMK in a different AWS account, you must use the key ARN or alias ARN.</p>
+   *          <p>To specify a KMS key, use its key ID, key ARN, alias name, or alias ARN. When using an alias name, prefix it with <code>"alias/"</code>. To specify a KMS key in a different Amazon Web Services account, you must use the key ARN or alias ARN.</p>
    *          <p>For example:</p>
    *          <ul>
    *             <li>
@@ -3863,45 +3887,43 @@ export interface ReEncryptRequest {
    *                </p>
    *             </li>
    *          </ul>
-   *          <p>To get the key ID and key ARN for a CMK, use <a>ListKeys</a> or <a>DescribeKey</a>. To get the alias name and alias ARN, use <a>ListAliases</a>.</p>
+   *          <p>To get the key ID and key ARN for a KMS key, use <a>ListKeys</a> or <a>DescribeKey</a>. To get the alias name and alias ARN, use <a>ListAliases</a>.</p>
    */
   DestinationKeyId: string | undefined;
 
   /**
    * <p>Specifies that encryption context to use when the reencrypting the data.</p>
-   *          <p>A destination encryption context is valid only when the destination CMK is a symmetric
-   *       CMK. The standard ciphertext format for asymmetric CMKs does not include fields for
+   *          <p>A destination encryption context is valid only when the destination KMS key is a symmetric KMS key. The standard ciphertext format for asymmetric KMS keys does not include fields for
    *       metadata.</p>
-   *          <p>An <i>encryption context</i> is a collection of non-secret key-value pairs that represents additional authenticated data. When you use an encryption context to encrypt data, you must specify the same (an exact case-sensitive match) encryption context to decrypt the data. An encryption context is optional when encrypting with a symmetric CMK, but it is highly recommended.</p>
+   *          <p>An <i>encryption context</i> is a collection of non-secret key-value pairs that represents additional authenticated data. When you use an encryption context to encrypt data, you must specify the same (an exact case-sensitive match) encryption context to decrypt the data. An encryption context is optional when encrypting with a symmetric KMS key, but it is highly recommended.</p>
    *          <p>For more information, see
    *         <a href="https://docs.aws.amazon.com/kms/latest/developerguide/concepts.html#encrypt_context">Encryption
-   *         Context</a> in the <i>AWS Key Management Service Developer Guide</i>.</p>
+   *         Context</a> in the <i>Key Management Service Developer Guide</i>.</p>
    */
   DestinationEncryptionContext?: { [key: string]: string };
 
   /**
-   * <p>Specifies the encryption algorithm that AWS KMS will use to decrypt the ciphertext before it
+   * <p>Specifies the encryption algorithm that KMS will use to decrypt the ciphertext before it
    *       is reencrypted. The default value, <code>SYMMETRIC_DEFAULT</code>, represents the algorithm
-   *       used for symmetric CMKs.</p>
+   *       used for symmetric KMS keys.</p>
    *          <p>Specify the same algorithm that was used to encrypt the ciphertext. If you specify a
    *       different algorithm, the decrypt attempt fails.</p>
-   *          <p>This parameter is required only when the ciphertext was encrypted under an asymmetric
-   *       CMK.</p>
+   *          <p>This parameter is required only when the ciphertext was encrypted under an asymmetric KMS key.</p>
    */
   SourceEncryptionAlgorithm?: EncryptionAlgorithmSpec | string;
 
   /**
-   * <p>Specifies the encryption algorithm that AWS KMS will use to reecrypt the data after it has
+   * <p>Specifies the encryption algorithm that KMS will use to reecrypt the data after it has
    *       decrypted it. The default value, <code>SYMMETRIC_DEFAULT</code>, represents the encryption
-   *       algorithm used for symmetric CMKs.</p>
-   *          <p>This parameter is required only when the destination CMK is an asymmetric CMK.</p>
+   *       algorithm used for symmetric KMS keys.</p>
+   *          <p>This parameter is required only when the destination KMS key is an asymmetric KMS key.</p>
    */
   DestinationEncryptionAlgorithm?: EncryptionAlgorithmSpec | string;
 
   /**
    * <p>A list of grant tokens.</p>
-   *          <p>Use a grant token when your permission to call this operation comes from a new grant that has not yet achieved <i>eventual consistency</i>. For more information, see <a href="https://docs.aws.amazon.com/kms/latest/developerguide/concepts.html#grant_token">Grant token</a> in the
-   *     <i>AWS Key Management Service Developer Guide</i>.</p>
+   *          <p>Use a grant token when your permission to call this operation comes from a new grant that has not yet achieved <i>eventual consistency</i>. For more information, see <a href="https://docs.aws.amazon.com/kms/latest/developerguide/grants.html#grant_token">Grant token</a> and <a href="https://docs.aws.amazon.com/kms/latest/developerguide/grant-manage.html#using-grant-token">Using a grant token</a> in the
+   *     <i>Key Management Service Developer Guide</i>.</p>
    */
   GrantTokens?: string[];
 }
@@ -3917,17 +3939,17 @@ export namespace ReEncryptRequest {
 
 export interface ReEncryptResponse {
   /**
-   * <p>The reencrypted data. When you use the HTTP API or the AWS CLI, the value is Base64-encoded. Otherwise, it is not Base64-encoded.</p>
+   * <p>The reencrypted data. When you use the HTTP API or the Amazon Web Services CLI, the value is Base64-encoded. Otherwise, it is not Base64-encoded.</p>
    */
   CiphertextBlob?: Uint8Array;
 
   /**
-   * <p>Unique identifier of the CMK used to originally encrypt the data.</p>
+   * <p>Unique identifier of the KMS key used to originally encrypt the data.</p>
    */
   SourceKeyId?: string;
 
   /**
-   * <p>The Amazon Resource Name (<a href="https://docs.aws.amazon.com/kms/latest/developerguide/concepts.html#key-id-key-ARN">key ARN</a>) of the CMK that was used to reencrypt the data.</p>
+   * <p>The Amazon Resource Name (<a href="https://docs.aws.amazon.com/kms/latest/developerguide/concepts.html#key-id-key-ARN">key ARN</a>) of the KMS key that was used to reencrypt the data.</p>
    */
   KeyId?: string;
 
@@ -3954,8 +3976,7 @@ export namespace ReEncryptResponse {
 
 export interface ReplicateKeyRequest {
   /**
-   * <p>Identifies the multi-Region primary key that is being replicated. To determine whether a
-   *       CMK is a multi-Region primary key, use the <a>DescribeKey</a> operation to check
+   * <p>Identifies the multi-Region primary key that is being replicated. To determine whether a KMS key is a multi-Region primary key, use the <a>DescribeKey</a> operation to check
    *       the value of the <code>MultiRegionKeyType</code> property.</p>
    *
    *          <p>Specify the key ID or key ARN of a multi-Region primary key.</p>
@@ -3970,20 +3991,20 @@ export interface ReplicateKeyRequest {
    *                </p>
    *             </li>
    *          </ul>
-   *          <p>To get the key ID and key ARN for a CMK, use <a>ListKeys</a> or <a>DescribeKey</a>.</p>
+   *          <p>To get the key ID and key ARN for a KMS key, use <a>ListKeys</a> or <a>DescribeKey</a>.</p>
    */
   KeyId: string | undefined;
 
   /**
-   * <p>The Region ID of the AWS Region for this replica key. </p>
+   * <p>The Region ID of the Amazon Web Services Region for this replica key. </p>
    *          <p>Enter the Region ID, such as <code>us-east-1</code> or <code>ap-southeast-2</code>. For a
-   *       list of AWS Regions in which AWS KMS is supported, see <a href="https://docs.aws.amazon.com/general/latest/gr/kms.html#kms_region">AWS KMS service endpoints</a> in the
+   *       list of Amazon Web Services Regions in which KMS is supported, see <a href="https://docs.aws.amazon.com/general/latest/gr/kms.html#kms_region">KMS service endpoints</a> in the
    *       <i>Amazon Web Services General Reference</i>.</p>
-   *          <p>The replica must be in a different AWS Region than its primary key and other replicas of
-   *       that primary key, but in the same AWS partition. AWS KMS must be available in the replica
-   *       Region. If the Region is not enabled by default, the AWS account must be enabled in the
+   *          <p>The replica must be in a different Amazon Web Services Region than its primary key and other replicas of
+   *       that primary key, but in the same Amazon Web Services partition. KMS must be available in the replica
+   *       Region. If the Region is not enabled by default, the Amazon Web Services account must be enabled in the
    *       Region. </p>
-   *          <p>For information about AWS partitions, see <a href="https://docs.aws.amazon.com/general/latest/gr/aws-arns-and-namespaces.html">Amazon Resource Names (ARNs) in the
+   *          <p>For information about Amazon Web Services partitions, see <a href="https://docs.aws.amazon.com/general/latest/gr/aws-arns-and-namespaces.html">Amazon Resource Names (ARNs) in the
    *         <i>Amazon Web Services General Reference</i>.</a> For information about enabling and disabling Regions, see <a href="https://docs.aws.amazon.com/general/latest/gr/rande-manage.html#rande-manage-enable">Enabling a
    *         Region</a> and <a href="https://docs.aws.amazon.com/general/latest/gr/rande-manage.html#rande-manage-disable">Disabling a Region</a> in the
    *       <i>Amazon Web Services General Reference</i>.</p>
@@ -3991,27 +4012,28 @@ export interface ReplicateKeyRequest {
   ReplicaRegion: string | undefined;
 
   /**
-   * <p>The key policy to attach to the CMK. This parameter is optional. If you do not provide a key policy, AWS KMS attaches the <a href="https://docs.aws.amazon.com/kms/latest/developerguide/key-policies.html#key-policy-default">default key policy</a> to the CMK.</p>
+   * <p>The key policy to attach to the KMS key. This parameter is optional. If you do not provide a key policy, KMS attaches the <a href="https://docs.aws.amazon.com/kms/latest/developerguide/key-policies.html#key-policy-default">default key policy</a> to the KMS key.</p>
    *          <p>The key policy is not a shared property of multi-Region keys. You can specify the same key
-   *       policy or a different key policy for each key in a set of related multi-Region keys. AWS KMS
+   *       policy or a different key policy for each key in a set of related multi-Region keys. KMS
    *       does not synchronize this property.</p>
    *          <p>If you provide a key policy, it must meet the following criteria:</p>
    *          <ul>
    *             <li>
    *                <p>If you don't set <code>BypassPolicyLockoutSafetyCheck</code> to true, the key policy
-   *           must give the caller <code>kms:PutKeyPolicy</code> permission on the replica CMK. This reduces the
-   *           risk that the CMK becomes unmanageable. For more information, refer to the scenario in the
+   *           must give the caller <code>kms:PutKeyPolicy</code> permission on the replica key. This reduces the
+   *           risk that the KMS key becomes unmanageable. For more information, refer to the scenario in the
    *             <a href="https://docs.aws.amazon.com/kms/latest/developerguide/key-policies.html#key-policy-default-allow-root-enable-iam">Default Key Policy</a> section of the <i>
-   *                      <i>AWS Key Management Service Developer Guide</i>
+   *                      <i>Key Management Service Developer Guide</i>
    *                   </i>.</p>
    *             </li>
    *             <li>
    *                <p>Each statement in the key policy must contain one or more principals. The principals
-   *           in the key policy must exist and be visible to AWS KMS. When you create a new AWS principal
+   *           in the key policy must exist and be visible to KMS. When you create a new Amazon Web Services principal
    *           (for example, an IAM user or role), you might need to enforce a delay before including the
    *           new principal in a key policy because the new principal might not be immediately visible
-   *           to AWS KMS. For more information, see <a href="https://docs.aws.amazon.com/IAM/latest/UserGuide/troubleshoot_general.html#troubleshoot_general_eventual-consistency">Changes that I make are not always immediately visible</a> in the <i>AWS
-   *             Identity and Access Management User Guide</i>.</p>
+   *           to KMS. For more information, see <a href="https://docs.aws.amazon.com/IAM/latest/UserGuide/troubleshoot_general.html#troubleshoot_general_eventual-consistency">Changes that I make are not always immediately visible</a> in the <i>
+   *                      <i>Identity and Access Management User Guide</i>
+   *                   </i>.</p>
    *             </li>
    *             <li>
    *                <p>The key policy size quota is 32 kilobytes (32768 bytes).</p>
@@ -4023,42 +4045,39 @@ export interface ReplicateKeyRequest {
   /**
    * <p>A flag to indicate whether to bypass the key policy lockout safety check.</p>
    *          <important>
-   *             <p>Setting this value to true increases the risk that the CMK becomes unmanageable. Do not
+   *             <p>Setting this value to true increases the risk that the KMS key becomes unmanageable. Do not
    *         set this value to true indiscriminately.</p>
-   *             <p>For more information, refer to the scenario in the <a href="https://docs.aws.amazon.com/kms/latest/developerguide/key-policies.html#key-policy-default-allow-root-enable-iam">Default Key Policy</a> section in the <i>AWS Key Management Service Developer Guide</i>.</p>
+   *             <p>For more information, refer to the scenario in the <a href="https://docs.aws.amazon.com/kms/latest/developerguide/key-policies.html#key-policy-default-allow-root-enable-iam">Default Key Policy</a> section in the <i>Key Management Service Developer Guide</i>.</p>
    *          </important>
    *          <p>Use this parameter only when you intend to prevent the principal that is making the
-   *       request from making a subsequent <code>PutKeyPolicy</code> request on the CMK.</p>
+   *       request from making a subsequent <code>PutKeyPolicy</code> request on the KMS key.</p>
    *          <p>The default value is false.</p>
    */
   BypassPolicyLockoutSafetyCheck?: boolean;
 
   /**
-   * <p>A description of the CMK. Use a description that helps you decide whether the CMK is
-   *       appropriate for a task. The default value is an empty string (no description).</p>
+   * <p>A description of the KMS key. The default value is an empty string (no description).</p>
    *          <p>The description is not a shared property of multi-Region keys. You can specify the same
-   *       description or a different description for each key in a set of related multi-Region keys. AWS
-   *       KMS does not synchronize this property.</p>
+   *       description or a different description for each key in a set of related multi-Region keys. KMS does not synchronize this property.</p>
    */
   Description?: string;
 
   /**
-   * <p>Assigns one or more tags to the replica key. Use this parameter to tag the CMK when it is created.
-   *           To tag an existing CMK, use the <a>TagResource</a> operation.</p>
+   * <p>Assigns one or more tags to the replica key. Use this parameter to tag the KMS key when it is created.
+   *           To tag an existing KMS key, use the <a>TagResource</a> operation.</p>
    *         <note>
-   *             <p>Tagging or untagging a CMK can allow or deny permission to the
-   *                 CMK. For details, see <a href="https://docs.aws.amazon.com/kms/latest/developerguide/abac.html">Using ABAC in AWS KMS</a> in the <i>AWS Key Management Service Developer Guide</i>.</p>
+   *             <p>Tagging or untagging a KMS key can allow or deny permission to the KMS key. For details, see <a href="https://docs.aws.amazon.com/kms/latest/developerguide/abac.html">Using ABAC in KMS</a> in the <i>Key Management Service Developer Guide</i>.</p>
    *          </note>
    *         <p>To use this parameter, you must have <a href="https://docs.aws.amazon.com/kms/latest/developerguide/kms-api-permissions-reference.html">kms:TagResource</a> permission in an IAM policy.</p>
    *          <p>Tags are not a shared property of multi-Region keys. You can specify the same tags or
-   *       different tags for each key in a set of related multi-Region keys. AWS KMS does not
+   *       different tags for each key in a set of related multi-Region keys. KMS does not
    *       synchronize this property.</p>
    *         <p>Each tag consists of a tag key and a tag value. Both the tag key and the tag value are
    *           required, but the tag value can be an empty (null) string. You cannot have more than one tag
-   *           on a CMK with the same tag key. If you specify an existing tag key with a different tag value,
-   *           AWS KMS replaces the current tag value with the specified one.</p>
-   *         <p>When you assign tags to an AWS resource, AWS generates a cost allocation
-   *               report with usage and costs aggregated by tags. Tags can also be used to control access to a CMK. For details,
+   *           on a KMS key with the same tag key. If you specify an existing tag key with a different tag value,
+   *           KMS replaces the current tag value with the specified one.</p>
+   *         <p>When you add tags to an Amazon Web Services resource, Amazon Web Services generates a cost allocation
+   *               report with usage and costs aggregated by tags. Tags can also be used to control access to a KMS key. For details,
    *               see <a href="https://docs.aws.amazon.com/kms/latest/developerguide/tagging-keys.html">Tagging Keys</a>.</p>
    */
   Tags?: Tag[];
@@ -4075,8 +4094,8 @@ export namespace ReplicateKeyRequest {
 
 export interface ReplicateKeyResponse {
   /**
-   * <p>Displays details about the new replica CMK, including its Amazon Resource Name (<a href="https://docs.aws.amazon.com/kms/latest/developerguide/concepts.html#key-id-key-ARN">key
-   *       ARN</a>) and <a href="https://docs.aws.amazon.com/kms/latest/developerguide/key-state.html">key state</a>. It also includes the ARN and AWS Region of its primary key and other
+   * <p>Displays details about the new replica key, including its Amazon Resource Name (<a href="https://docs.aws.amazon.com/kms/latest/developerguide/concepts.html#key-id-key-ARN">key
+   *       ARN</a>) and <a href="https://docs.aws.amazon.com/kms/latest/developerguide/key-state.html">key state</a>. It also includes the ARN and Amazon Web Services Region of its primary key and other
    *       replica keys.</p>
    */
   ReplicaKeyMetadata?: KeyMetadata;
@@ -4108,13 +4127,13 @@ export interface RetireGrantRequest {
    * <p>Identifies the grant to be retired. You can use a grant token to identify a new grant even
    *       before it has achieved eventual consistency.</p>
    *          <p>Only the <a>CreateGrant</a> operation returns a grant token. For details, see
-   *         <a href="https://docs.aws.amazon.com/kms/latest/developerguide/grants.html#grant_token">Grant token</a>
-   *       and <a href="https://docs.aws.amazon.com/kms/latest/developerguide/grants.html#terms-eventual-consistency">Eventual consistency</a> in the <i>AWS Key Management Service Developer Guide</i>.</p>
+   *       <a href="https://docs.aws.amazon.com/kms/latest/developerguide/grants.html#grant_token">Grant token</a>
+   *       and <a href="https://docs.aws.amazon.com/kms/latest/developerguide/grants.html#terms-eventual-consistency">Eventual consistency</a> in the <i>Key Management Service Developer Guide</i>.</p>
    */
   GrantToken?: string;
 
   /**
-   * <p>The key ARN CMK associated with the grant. To find the key ARN, use the <a>ListKeys</a> operation.</p>
+   * <p>The key ARN KMS key associated with the grant. To find the key ARN, use the <a>ListKeys</a> operation.</p>
    *          <p>For example: <code>arn:aws:kms:us-east-2:444455556666:key/1234abcd-12ab-34cd-56ef-1234567890ab</code>
    *          </p>
    */
@@ -4122,7 +4141,7 @@ export interface RetireGrantRequest {
 
   /**
    * <p>Identifies the grant to retire. To get the grant ID, use <a>CreateGrant</a>,
-   *         <a>ListGrants</a>, or <a>ListRetirableGrants</a>.</p>
+   *       <a>ListGrants</a>, or <a>ListRetirableGrants</a>.</p>
    *          <ul>
    *             <li>
    *                <p>Grant ID Example -
@@ -4144,11 +4163,11 @@ export namespace RetireGrantRequest {
 
 export interface RevokeGrantRequest {
   /**
-   * <p>A unique identifier for the customer master key (CMK) associated with the grant. To get
-   *       the key ID and key ARN for a CMK, use <a>ListKeys</a> or <a>DescribeKey</a>.</p>
+   * <p>A unique identifier for the KMS key associated with the grant. To get
+   *       the key ID and key ARN for a KMS key, use <a>ListKeys</a> or <a>DescribeKey</a>.</p>
    *
-   *          <p>Specify the key ID or key ARN of the CMK. To specify a CMK in a
-   * different AWS account, you must use the key ARN.</p>
+   *          <p>Specify the key ID or key ARN of the KMS key. To specify a KMS key in a
+   * different Amazon Web Services account, you must use the key ARN.</p>
    *          <p>For example:</p>
    *          <ul>
    *             <li>
@@ -4160,13 +4179,13 @@ export interface RevokeGrantRequest {
    *                </p>
    *             </li>
    *          </ul>
-   *          <p>To get the key ID and key ARN for a CMK, use <a>ListKeys</a> or <a>DescribeKey</a>.</p>
+   *          <p>To get the key ID and key ARN for a KMS key, use <a>ListKeys</a> or <a>DescribeKey</a>.</p>
    */
   KeyId: string | undefined;
 
   /**
    * <p>Identifies the grant to revoke. To get the grant ID, use <a>CreateGrant</a>,
-   *         <a>ListGrants</a>, or <a>ListRetirableGrants</a>.</p>
+   *       <a>ListGrants</a>, or <a>ListRetirableGrants</a>.</p>
    */
   GrantId: string | undefined;
 }
@@ -4182,9 +4201,9 @@ export namespace RevokeGrantRequest {
 
 export interface ScheduleKeyDeletionRequest {
   /**
-   * <p>The unique identifier of the customer master key (CMK) to delete.</p>
+   * <p>The unique identifier of the KMS key to delete.</p>
    *
-   *          <p>Specify the key ID or key ARN of the CMK.</p>
+   *          <p>Specify the key ID or key ARN of the KMS key.</p>
    *          <p>For example:</p>
    *          <ul>
    *             <li>
@@ -4196,14 +4215,14 @@ export interface ScheduleKeyDeletionRequest {
    *                </p>
    *             </li>
    *          </ul>
-   *          <p>To get the key ID and key ARN for a CMK, use <a>ListKeys</a> or <a>DescribeKey</a>.</p>
+   *          <p>To get the key ID and key ARN for a KMS key, use <a>ListKeys</a> or <a>DescribeKey</a>.</p>
    */
   KeyId: string | undefined;
 
   /**
-   * <p>The waiting period, specified in number of days. After the waiting period ends, AWS KMS
-   *       deletes the customer master key (CMK).</p>
-   *          <p>If the CMK is a multi-Region primary key with replicas, the waiting period begins when the
+   * <p>The waiting period, specified in number of days. After the waiting period ends, KMS
+   *       deletes the KMS key.</p>
+   *          <p>If the KMS key is a multi-Region primary key with replicas, the waiting period begins when the
    *       last of its replica keys is deleted. Otherwise, the waiting period begins immediately.</p>
    *          <p>This value is optional. If you include a value, it must be between 7 and 30, inclusive. If
    *       you do not include a value, it defaults to 30.</p>
@@ -4222,28 +4241,28 @@ export namespace ScheduleKeyDeletionRequest {
 
 export interface ScheduleKeyDeletionResponse {
   /**
-   * <p>The Amazon Resource Name (<a href="https://docs.aws.amazon.com/kms/latest/developerguide/concepts.html#key-id-key-ARN">key ARN</a>) of the CMK whose deletion is scheduled.</p>
+   * <p>The Amazon Resource Name (<a href="https://docs.aws.amazon.com/kms/latest/developerguide/concepts.html#key-id-key-ARN">key ARN</a>) of the KMS key whose deletion is scheduled.</p>
    */
   KeyId?: string;
 
   /**
-   * <p>The date and time after which AWS KMS deletes the customer master key (CMK).</p>
-   *          <p>If the CMK is a multi-Region primary key with replica keys, this field does not appear.
+   * <p>The date and time after which KMS deletes the KMS key.</p>
+   *          <p>If the KMS key is a multi-Region primary key with replica keys, this field does not appear.
    *       The deletion date for the primary key isn't known until its last replica key is
    *       deleted.</p>
    */
   DeletionDate?: Date;
 
   /**
-   * <p>The current status of the CMK.</p>
-   *          <p>For more information about how key state affects the use of a CMK, see <a href="https://docs.aws.amazon.com/kms/latest/developerguide/key-state.html">Key state: Effect on your CMK</a>
-   *       in the <i>AWS Key Management Service Developer Guide</i>.</p>
+   * <p>The current status of the KMS key.</p>
+   *          <p>For more information about how key state affects the use of a KMS key, see <a href="https://docs.aws.amazon.com/kms/latest/developerguide/key-state.html">Key state: Effect on your KMS key</a>
+   *       in the <i>Key Management Service Developer Guide</i>.</p>
    */
   KeyState?: KeyState | string;
 
   /**
-   * <p>The waiting period before the CMK is deleted. </p>
-   *          <p>If the CMK is a multi-Region primary key with replicas, the waiting period begins when the
+   * <p>The waiting period before the KMS key is deleted. </p>
+   *          <p>If the KMS key is a multi-Region primary key with replicas, the waiting period begins when the
    *       last of its replica keys is deleted. Otherwise, the waiting period begins immediately.</p>
    */
   PendingWindowInDays?: number;
@@ -4260,11 +4279,11 @@ export namespace ScheduleKeyDeletionResponse {
 
 export interface SignRequest {
   /**
-   * <p>Identifies an asymmetric CMK. AWS KMS uses the private key in the asymmetric CMK to sign the
-   *       message. The <code>KeyUsage</code> type of the CMK must be <code>SIGN_VERIFY</code>. To find
-   *       the <code>KeyUsage</code> of a CMK, use the <a>DescribeKey</a> operation.</p>
+   * <p>Identifies an asymmetric KMS key. KMS uses the private key in the asymmetric KMS key to sign the
+   *       message. The <code>KeyUsage</code> type of the KMS key must be <code>SIGN_VERIFY</code>. To find
+   *       the <code>KeyUsage</code> of a KMS key, use the <a>DescribeKey</a> operation.</p>
    *
-   *          <p>To specify a CMK, use its key ID, key ARN, alias name, or alias ARN. When using an alias name, prefix it with <code>"alias/"</code>. To specify a CMK in a different AWS account, you must use the key ARN or alias ARN.</p>
+   *          <p>To specify a KMS key, use its key ID, key ARN, alias name, or alias ARN. When using an alias name, prefix it with <code>"alias/"</code>. To specify a KMS key in a different Amazon Web Services account, you must use the key ARN or alias ARN.</p>
    *          <p>For example:</p>
    *          <ul>
    *             <li>
@@ -4284,20 +4303,20 @@ export interface SignRequest {
    *                </p>
    *             </li>
    *          </ul>
-   *          <p>To get the key ID and key ARN for a CMK, use <a>ListKeys</a> or <a>DescribeKey</a>. To get the alias name and alias ARN, use <a>ListAliases</a>.</p>
+   *          <p>To get the key ID and key ARN for a KMS key, use <a>ListKeys</a> or <a>DescribeKey</a>. To get the alias name and alias ARN, use <a>ListAliases</a>.</p>
    */
   KeyId: string | undefined;
 
   /**
    * <p>Specifies the message or message digest to sign. Messages can be 0-4096 bytes. To sign a
    *       larger message, provide the message digest.</p>
-   *          <p>If you provide a message, AWS KMS generates a hash digest of the message and then signs
+   *          <p>If you provide a message, KMS generates a hash digest of the message and then signs
    *       it.</p>
    */
   Message: Uint8Array | undefined;
 
   /**
-   * <p>Tells AWS KMS whether the value of the <code>Message</code> parameter is a message or
+   * <p>Tells KMS whether the value of the <code>Message</code> parameter is a message or
    *       message digest. The default value, RAW, indicates a message. To indicate a message digest,
    *       enter <code>DIGEST</code>.</p>
    */
@@ -4305,15 +4324,14 @@ export interface SignRequest {
 
   /**
    * <p>A list of grant tokens.</p>
-   *          <p>Use a grant token when your permission to call this operation comes from a new grant that has not yet achieved <i>eventual consistency</i>. For more information, see <a href="https://docs.aws.amazon.com/kms/latest/developerguide/concepts.html#grant_token">Grant token</a> in the
-   *     <i>AWS Key Management Service Developer Guide</i>.</p>
+   *          <p>Use a grant token when your permission to call this operation comes from a new grant that has not yet achieved <i>eventual consistency</i>. For more information, see <a href="https://docs.aws.amazon.com/kms/latest/developerguide/grants.html#grant_token">Grant token</a> and <a href="https://docs.aws.amazon.com/kms/latest/developerguide/grant-manage.html#using-grant-token">Using a grant token</a> in the
+   *     <i>Key Management Service Developer Guide</i>.</p>
    */
   GrantTokens?: string[];
 
   /**
    * <p>Specifies the signing algorithm to use when signing the message. </p>
-   *          <p>Choose an algorithm that is compatible with the type and size of the specified asymmetric
-   *       CMK.</p>
+   *          <p>Choose an algorithm that is compatible with the type and size of the specified asymmetric KMS key.</p>
    */
   SigningAlgorithm: SigningAlgorithmSpec | string | undefined;
 }
@@ -4330,7 +4348,7 @@ export namespace SignRequest {
 
 export interface SignResponse {
   /**
-   * <p>The Amazon Resource Name (<a href="https://docs.aws.amazon.com/kms/latest/developerguide/concepts.html#key-id-key-ARN">key ARN</a>) of the asymmetric CMK that was used to sign the message.</p>
+   * <p>The Amazon Resource Name (<a href="https://docs.aws.amazon.com/kms/latest/developerguide/concepts.html#key-id-key-ARN">key ARN</a>) of the asymmetric KMS key that was used to sign the message.</p>
    */
   KeyId?: string;
 
@@ -4350,7 +4368,7 @@ export interface SignResponse {
    *           </p>
    *             </li>
    *          </ul>
-   *          <p>When you use the HTTP API or the AWS CLI, the value is Base64-encoded. Otherwise, it is not Base64-encoded.</p>
+   *          <p>When you use the HTTP API or the Amazon Web Services CLI, the value is Base64-encoded. Otherwise, it is not Base64-encoded.</p>
    */
   Signature?: Uint8Array;
 
@@ -4371,9 +4389,9 @@ export namespace SignResponse {
 
 export interface TagResourceRequest {
   /**
-   * <p>Identifies a customer managed CMK in the account and Region.</p>
+   * <p>Identifies a customer managed key in the account and Region.</p>
    *
-   *          <p>Specify the key ID or key ARN of the CMK.</p>
+   *          <p>Specify the key ID or key ARN of the KMS key.</p>
    *          <p>For example:</p>
    *          <ul>
    *             <li>
@@ -4385,7 +4403,7 @@ export interface TagResourceRequest {
    *                </p>
    *             </li>
    *          </ul>
-   *          <p>To get the key ID and key ARN for a CMK, use <a>ListKeys</a> or <a>DescribeKey</a>.</p>
+   *          <p>To get the key ID and key ARN for a KMS key, use <a>ListKeys</a> or <a>DescribeKey</a>.</p>
    */
   KeyId: string | undefined;
 
@@ -4393,8 +4411,8 @@ export interface TagResourceRequest {
    * <p>One or more tags. </p>
    *          <p>Each tag consists of a tag key and a tag value. The tag value can be an empty (null)
    *       string. </p>
-   *          <p>You cannot have more than one tag on a CMK with the same tag key. If you specify an
-   *       existing tag key with a different tag value, AWS KMS replaces the current tag value with the
+   *          <p>You cannot have more than one tag on a KMS key with the same tag key. If you specify an
+   *       existing tag key with a different tag value, KMS replaces the current tag value with the
    *       specified one.</p>
    */
   Tags: Tag[] | undefined;
@@ -4411,9 +4429,9 @@ export namespace TagResourceRequest {
 
 export interface UntagResourceRequest {
   /**
-   * <p>Identifies the CMK from which you are removing tags.</p>
+   * <p>Identifies the KMS key from which you are removing tags.</p>
    *
-   *          <p>Specify the key ID or key ARN of the CMK.</p>
+   *          <p>Specify the key ID or key ARN of the KMS key.</p>
    *          <p>For example:</p>
    *          <ul>
    *             <li>
@@ -4425,7 +4443,7 @@ export interface UntagResourceRequest {
    *                </p>
    *             </li>
    *          </ul>
-   *          <p>To get the key ID and key ARN for a CMK, use <a>ListKeys</a> or <a>DescribeKey</a>.</p>
+   *          <p>To get the key ID and key ARN for a KMS key, use <a>ListKeys</a> or <a>DescribeKey</a>.</p>
    */
   KeyId: string | undefined;
 
@@ -4446,19 +4464,19 @@ export namespace UntagResourceRequest {
 
 export interface UpdateAliasRequest {
   /**
-   * <p>Identifies the alias that is changing its CMK. This value must begin with
+   * <p>Identifies the alias that is changing its KMS key. This value must begin with
    *         <code>alias/</code> followed by the alias name, such as <code>alias/ExampleAlias</code>. You
    *       cannot use UpdateAlias to change the alias name.</p>
    */
   AliasName: string | undefined;
 
   /**
-   * <p>Identifies the <a href="https://docs.aws.amazon.com/kms/latest/developerguide/concepts.html#customer-cmk">customer managed CMK</a> to associate with the alias. You don't have permission to
-   *       associate an alias with an <a href="https://docs.aws.amazon.com/kms/latest/developerguide/concepts.html#aws-managed-cmk">AWS managed CMK</a>.</p>
-   *          <p>The CMK must be in the same AWS account and Region as the alias. Also, the new target CMK
-   *       must be the same type as the current target CMK (both symmetric or both asymmetric) and they
+   * <p>Identifies the <a href="https://docs.aws.amazon.com/kms/latest/developerguide/concepts.html#customer-cmk">customer managed key</a> to associate with the alias. You don't have permission
+   *       to associate an alias with an <a href="https://docs.aws.amazon.com/kms/latest/developerguide/concepts.html#aws-managed-cmk">Amazon Web Services managed key</a>.</p>
+   *          <p>The KMS key must be in the same Amazon Web Services account and Region as the alias. Also, the new target KMS key
+   *       must be the same type as the current target KMS key (both symmetric or both asymmetric) and they
    *       must have the same key usage. </p>
-   *          <p>Specify the key ID or key ARN of the CMK.</p>
+   *          <p>Specify the key ID or key ARN of the KMS key.</p>
    *          <p>For example:</p>
    *          <ul>
    *             <li>
@@ -4470,9 +4488,9 @@ export interface UpdateAliasRequest {
    *                </p>
    *             </li>
    *          </ul>
-   *          <p>To get the key ID and key ARN for a CMK, use <a>ListKeys</a> or <a>DescribeKey</a>.</p>
+   *          <p>To get the key ID and key ARN for a KMS key, use <a>ListKeys</a> or <a>DescribeKey</a>.</p>
    *          <p>To verify that the alias
-   *       is mapped to the correct CMK, use <a>ListAliases</a>.</p>
+   *       is mapped to the correct KMS key, use <a>ListAliases</a>.</p>
    */
   TargetKeyId: string | undefined;
 }
@@ -4495,20 +4513,20 @@ export interface UpdateCustomKeyStoreRequest {
 
   /**
    * <p>Changes the friendly name of the custom key store to the value that you specify. The
-   *       custom key store name must be unique in the AWS account.</p>
+   *       custom key store name must be unique in the Amazon Web Services account.</p>
    */
   NewCustomKeyStoreName?: string;
 
   /**
-   * <p>Enter the current password of the <code>kmsuser</code> crypto user (CU) in the AWS CloudHSM
+   * <p>Enter the current password of the <code>kmsuser</code> crypto user (CU) in the CloudHSM
    *       cluster that is associated with the custom key store.</p>
-   *          <p>This parameter tells AWS KMS the current password of the <code>kmsuser</code> crypto user
-   *       (CU). It does not set or change the password of any users in the AWS CloudHSM cluster.</p>
+   *          <p>This parameter tells KMS the current password of the <code>kmsuser</code> crypto user
+   *       (CU). It does not set or change the password of any users in the CloudHSM cluster.</p>
    */
   KeyStorePassword?: string;
 
   /**
-   * <p>Associates the custom key store with a related AWS CloudHSM cluster. </p>
+   * <p>Associates the custom key store with a related CloudHSM cluster. </p>
    *          <p>Enter the cluster ID of the cluster that you used to create the custom key store or a
    *       cluster that shares a backup history and has the same cluster certificate as the original
    *       cluster. You cannot use this parameter to associate a custom key store with an unrelated
@@ -4542,8 +4560,8 @@ export namespace UpdateCustomKeyStoreResponse {
 
 export interface UpdateKeyDescriptionRequest {
   /**
-   * <p>Updates the description of the specified customer master key (CMK).</p>
-   *          <p>Specify the key ID or key ARN of the CMK.</p>
+   * <p>Updates the description of the specified KMS key.</p>
+   *          <p>Specify the key ID or key ARN of the KMS key.</p>
    *          <p>For example:</p>
    *          <ul>
    *             <li>
@@ -4555,12 +4573,12 @@ export interface UpdateKeyDescriptionRequest {
    *                </p>
    *             </li>
    *          </ul>
-   *          <p>To get the key ID and key ARN for a CMK, use <a>ListKeys</a> or <a>DescribeKey</a>.</p>
+   *          <p>To get the key ID and key ARN for a KMS key, use <a>ListKeys</a> or <a>DescribeKey</a>.</p>
    */
   KeyId: string | undefined;
 
   /**
-   * <p>New description for the CMK.</p>
+   * <p>New description for the KMS key.</p>
    */
   Description: string | undefined;
 }
@@ -4576,7 +4594,7 @@ export namespace UpdateKeyDescriptionRequest {
 
 export interface UpdatePrimaryRegionRequest {
   /**
-   * <p>Identifies the current primary key. When the operation completes, this CMK will be a
+   * <p>Identifies the current primary key. When the operation completes, this KMS key will be a
    *       replica key.</p>
    *
    *          <p>Specify the key ID or key ARN of a multi-Region primary key.</p>
@@ -4591,12 +4609,12 @@ export interface UpdatePrimaryRegionRequest {
    *                </p>
    *             </li>
    *          </ul>
-   *          <p>To get the key ID and key ARN for a CMK, use <a>ListKeys</a> or <a>DescribeKey</a>.</p>
+   *          <p>To get the key ID and key ARN for a KMS key, use <a>ListKeys</a> or <a>DescribeKey</a>.</p>
    */
   KeyId: string | undefined;
 
   /**
-   * <p>The AWS Region of the new primary key. Enter the Region ID, such as <code>us-east-1</code>
+   * <p>The Amazon Web Services Region of the new primary key. Enter the Region ID, such as <code>us-east-1</code>
    *       or <code>ap-southeast-2</code>. There must be an existing replica key in this Region. </p>
    *          <p>When the operation completes, the multi-Region key in this Region will be the primary
    *       key.</p>
@@ -4615,10 +4633,10 @@ export namespace UpdatePrimaryRegionRequest {
 
 export interface VerifyRequest {
   /**
-   * <p>Identifies the asymmetric CMK that will be used to verify the signature. This must be the
-   *       same CMK that was used to generate the signature. If you specify a different CMK, the
+   * <p>Identifies the asymmetric KMS key that will be used to verify the signature. This must be the
+   *       same KMS key that was used to generate the signature. If you specify a different KMS key, the
    *       signature verification fails.</p>
-   *          <p>To specify a CMK, use its key ID, key ARN, alias name, or alias ARN. When using an alias name, prefix it with <code>"alias/"</code>. To specify a CMK in a different AWS account, you must use the key ARN or alias ARN.</p>
+   *          <p>To specify a KMS key, use its key ID, key ARN, alias name, or alias ARN. When using an alias name, prefix it with <code>"alias/"</code>. To specify a KMS key in a different Amazon Web Services account, you must use the key ARN or alias ARN.</p>
    *          <p>For example:</p>
    *          <ul>
    *             <li>
@@ -4638,7 +4656,7 @@ export interface VerifyRequest {
    *                </p>
    *             </li>
    *          </ul>
-   *          <p>To get the key ID and key ARN for a CMK, use <a>ListKeys</a> or <a>DescribeKey</a>. To get the alias name and alias ARN, use <a>ListAliases</a>.</p>
+   *          <p>To get the key ID and key ARN for a KMS key, use <a>ListKeys</a> or <a>DescribeKey</a>. To get the alias name and alias ARN, use <a>ListAliases</a>.</p>
    */
   KeyId: string | undefined;
 
@@ -4653,7 +4671,7 @@ export interface VerifyRequest {
   Message: Uint8Array | undefined;
 
   /**
-   * <p>Tells AWS KMS whether the value of the <code>Message</code> parameter is a message or
+   * <p>Tells KMS whether the value of the <code>Message</code> parameter is a message or
    *       message digest. The default value, RAW, indicates a message. To indicate a message digest,
    *       enter <code>DIGEST</code>.</p>
    *          <important>
@@ -4677,8 +4695,8 @@ export interface VerifyRequest {
 
   /**
    * <p>A list of grant tokens.</p>
-   *          <p>Use a grant token when your permission to call this operation comes from a new grant that has not yet achieved <i>eventual consistency</i>. For more information, see <a href="https://docs.aws.amazon.com/kms/latest/developerguide/concepts.html#grant_token">Grant token</a> in the
-   *     <i>AWS Key Management Service Developer Guide</i>.</p>
+   *          <p>Use a grant token when your permission to call this operation comes from a new grant that has not yet achieved <i>eventual consistency</i>. For more information, see <a href="https://docs.aws.amazon.com/kms/latest/developerguide/grants.html#grant_token">Grant token</a> and <a href="https://docs.aws.amazon.com/kms/latest/developerguide/grant-manage.html#using-grant-token">Using a grant token</a> in the
+   *     <i>Key Management Service Developer Guide</i>.</p>
    */
   GrantTokens?: string[];
 }
@@ -4695,7 +4713,7 @@ export namespace VerifyRequest {
 
 export interface VerifyResponse {
   /**
-   * <p>The Amazon Resource Name (<a href="https://docs.aws.amazon.com/kms/latest/developerguide/concepts.html#key-id-key-ARN">key ARN</a>) of the asymmetric CMK that was used to verify the signature.</p>
+   * <p>The Amazon Resource Name (<a href="https://docs.aws.amazon.com/kms/latest/developerguide/concepts.html#key-id-key-ARN">key ARN</a>) of the asymmetric KMS key that was used to verify the signature.</p>
    */
   KeyId?: string;