diff --git a/clients/client-finspace-data/src/commands/AssociateUserToPermissionGroupCommand.ts b/clients/client-finspace-data/src/commands/AssociateUserToPermissionGroupCommand.ts
index e94054f091ed..e3ed712ca3ad 100644
--- a/clients/client-finspace-data/src/commands/AssociateUserToPermissionGroupCommand.ts
+++ b/clients/client-finspace-data/src/commands/AssociateUserToPermissionGroupCommand.ts
@@ -42,7 +42,7 @@ export interface AssociateUserToPermissionGroupCommandOutput
 
 /**
  * @public
- * <p>Adds a user account to a permission group to grant permissions for actions a user can perform in FinSpace.</p>
+ * <p>Adds a user to a permission group to grant permissions for actions a user can perform in FinSpace.</p>
  * @example
  * Use a bare-bones client and the command you need to make an API call.
  * ```javascript
diff --git a/clients/client-finspace-data/src/commands/CreateUserCommand.ts b/clients/client-finspace-data/src/commands/CreateUserCommand.ts
index ef8a08889db0..b72213668424 100644
--- a/clients/client-finspace-data/src/commands/CreateUserCommand.ts
+++ b/clients/client-finspace-data/src/commands/CreateUserCommand.ts
@@ -49,7 +49,7 @@ export interface CreateUserCommandOutput extends CreateUserResponse, __MetadataB
  *   type: "SUPER_USER" || "APP_USER", // required
  *   firstName: "STRING_VALUE",
  *   lastName: "STRING_VALUE",
- *   ApiAccess: "ENABLED" || "DISABLED",
+ *   apiAccess: "ENABLED" || "DISABLED",
  *   apiAccessPrincipalArn: "STRING_VALUE",
  *   clientToken: "STRING_VALUE",
  * };
diff --git a/clients/client-finspace-data/src/commands/DisassociateUserFromPermissionGroupCommand.ts b/clients/client-finspace-data/src/commands/DisassociateUserFromPermissionGroupCommand.ts
index 2463753aea08..0e374a37e2ed 100644
--- a/clients/client-finspace-data/src/commands/DisassociateUserFromPermissionGroupCommand.ts
+++ b/clients/client-finspace-data/src/commands/DisassociateUserFromPermissionGroupCommand.ts
@@ -45,7 +45,7 @@ export interface DisassociateUserFromPermissionGroupCommandOutput
 
 /**
  * @public
- * <p>Removes a user account from a permission group.</p>
+ * <p>Removes a user from a permission group.</p>
  * @example
  * Use a bare-bones client and the command you need to make an API call.
  * ```javascript
diff --git a/clients/client-finspace-data/src/commands/GetProgrammaticAccessCredentialsCommand.ts b/clients/client-finspace-data/src/commands/GetProgrammaticAccessCredentialsCommand.ts
index 343a276ec0f0..e5b915da927b 100644
--- a/clients/client-finspace-data/src/commands/GetProgrammaticAccessCredentialsCommand.ts
+++ b/clients/client-finspace-data/src/commands/GetProgrammaticAccessCredentialsCommand.ts
@@ -15,7 +15,11 @@ import {
 } from "@smithy/types";
 
 import { FinspaceDataClientResolvedConfig, ServiceInputTypes, ServiceOutputTypes } from "../FinspaceDataClient";
-import { GetProgrammaticAccessCredentialsRequest, GetProgrammaticAccessCredentialsResponse } from "../models/models_0";
+import {
+  GetProgrammaticAccessCredentialsRequest,
+  GetProgrammaticAccessCredentialsResponse,
+  GetProgrammaticAccessCredentialsResponseFilterSensitiveLog,
+} from "../models/models_0";
 import {
   de_GetProgrammaticAccessCredentialsCommand,
   se_GetProgrammaticAccessCredentialsCommand,
@@ -42,7 +46,7 @@ export interface GetProgrammaticAccessCredentialsCommandOutput
 
 /**
  * @public
- * <p>Request programmatic credentials to use with FinSpace SDK.</p>
+ * <p>Request programmatic credentials to use with FinSpace SDK. For more information, see <a href="https://docs.aws.amazon.com/finspace/latest/data-api/fs-using-the-finspace-api.html#accessing-credentials">Step 2. Access credentials programmatically using IAM access key id and secret access key</a>.</p>
  * @example
  * Use a bare-bones client and the command you need to make an API call.
  * ```javascript
@@ -138,7 +142,7 @@ export class GetProgrammaticAccessCredentialsCommand extends $Command<
       clientName,
       commandName,
       inputFilterSensitiveLog: (_: any) => _,
-      outputFilterSensitiveLog: (_: any) => _,
+      outputFilterSensitiveLog: GetProgrammaticAccessCredentialsResponseFilterSensitiveLog,
       [SMITHY_CONTEXT_KEY]: {
         service: "AWSHabaneroPublicAPI",
         operation: "GetProgrammaticAccessCredentials",
diff --git a/clients/client-finspace-data/src/commands/ListPermissionGroupsByUserCommand.ts b/clients/client-finspace-data/src/commands/ListPermissionGroupsByUserCommand.ts
index 1cfa671f909a..3cdebf097cbb 100644
--- a/clients/client-finspace-data/src/commands/ListPermissionGroupsByUserCommand.ts
+++ b/clients/client-finspace-data/src/commands/ListPermissionGroupsByUserCommand.ts
@@ -41,7 +41,7 @@ export interface ListPermissionGroupsByUserCommandOutput extends ListPermissionG
 
 /**
  * @public
- * <p>Lists all the permission groups that are associated with a specific user account.</p>
+ * <p>Lists all the permission groups that are associated with a specific user.</p>
  * @example
  * Use a bare-bones client and the command you need to make an API call.
  * ```javascript
diff --git a/clients/client-finspace-data/src/commands/ListUsersCommand.ts b/clients/client-finspace-data/src/commands/ListUsersCommand.ts
index 150e8018c243..84da3ad1a696 100644
--- a/clients/client-finspace-data/src/commands/ListUsersCommand.ts
+++ b/clients/client-finspace-data/src/commands/ListUsersCommand.ts
@@ -37,7 +37,7 @@ export interface ListUsersCommandOutput extends ListUsersResponse, __MetadataBea
 
 /**
  * @public
- * <p>Lists all available user accounts in FinSpace.</p>
+ * <p>Lists all available users in FinSpace.</p>
  * @example
  * Use a bare-bones client and the command you need to make an API call.
  * ```javascript
diff --git a/clients/client-finspace-data/src/commands/UpdateUserCommand.ts b/clients/client-finspace-data/src/commands/UpdateUserCommand.ts
index 149020ed4a9c..84b465cb143f 100644
--- a/clients/client-finspace-data/src/commands/UpdateUserCommand.ts
+++ b/clients/client-finspace-data/src/commands/UpdateUserCommand.ts
@@ -37,7 +37,7 @@ export interface UpdateUserCommandOutput extends UpdateUserResponse, __MetadataB
 
 /**
  * @public
- * <p>Modifies the details of the specified user account. You cannot update the <code>userId</code> for a user.</p>
+ * <p>Modifies the details of the specified user. You cannot update the <code>userId</code> for a user.</p>
  * @example
  * Use a bare-bones client and the command you need to make an API call.
  * ```javascript
diff --git a/clients/client-finspace-data/src/models/models_0.ts b/clients/client-finspace-data/src/models/models_0.ts
index ccec5c234ac2..1a19fa819be8 100644
--- a/clients/client-finspace-data/src/models/models_0.ts
+++ b/clients/client-finspace-data/src/models/models_0.ts
@@ -962,7 +962,7 @@ export interface CreateUserRequest {
    *             </li>
    *          </ul>
    */
-  ApiAccess?: ApiAccess | string;
+  apiAccess?: ApiAccess | string;
 
   /**
    * @public
@@ -1052,7 +1052,7 @@ export interface DeletePermissionGroupResponse {
 export interface DisableUserRequest {
   /**
    * @public
-   * <p>The unique identifier for the user account that you want to disable.</p>
+   * <p>The unique identifier for the user that you want to deactivate.</p>
    */
   userId: string | undefined;
 
@@ -1069,7 +1069,7 @@ export interface DisableUserRequest {
 export interface DisableUserResponse {
   /**
    * @public
-   * <p>The unique identifier for the disabled user account.</p>
+   * <p>The unique identifier for the deactivated user.</p>
    */
   userId?: string;
 }
@@ -1114,7 +1114,7 @@ export interface DisassociateUserFromPermissionGroupResponse {
 export interface EnableUserRequest {
   /**
    * @public
-   * <p>The unique identifier for the user account that you want to enable.</p>
+   * <p>The unique identifier for the user that you want to activate.</p>
    */
   userId: string | undefined;
 
@@ -1131,7 +1131,7 @@ export interface EnableUserRequest {
 export interface EnableUserResponse {
   /**
    * @public
-   * <p>The unique identifier for the enabled user account.</p>
+   * <p>The unique identifier for the active user.</p>
    */
   userId?: string;
 }
@@ -1832,15 +1832,15 @@ export interface PermissionGroup {
 
   /**
    * @public
-   * <p>Indicates the status of the user account within a permission group.</p>
+   * <p>Indicates the status of the user within a permission group.</p>
    *          <ul>
    *             <li>
    *                <p>
-   *                   <code>ADDITION_IN_PROGRESS</code> – The user account is currently being added to the permission group.</p>
+   *                   <code>ADDITION_IN_PROGRESS</code> – The user is currently being added to the permission group.</p>
    *             </li>
    *             <li>
    *                <p>
-   *                   <code>ADDITION_SUCCESS</code> – The user account is successfully added to the permission group.</p>
+   *                   <code>ADDITION_SUCCESS</code> – The user is successfully added to the permission group.</p>
    *             </li>
    *             <li>
    *                <p>
@@ -1954,25 +1954,25 @@ export type UserStatus = (typeof UserStatus)[keyof typeof UserStatus];
 export interface GetUserResponse {
   /**
    * @public
-   * <p>The unique identifier for the user account that is retrieved.</p>
+   * <p>The unique identifier for the user that is retrieved.</p>
    */
   userId?: string;
 
   /**
    * @public
-   * <p>The current status of the user account. </p>
+   * <p>The current status of the user. </p>
    *          <ul>
    *             <li>
    *                <p>
-   *                   <code>CREATING</code> – The user account creation is in progress.</p>
+   *                   <code>CREATING</code> – The creation is in progress.</p>
    *             </li>
    *             <li>
    *                <p>
-   *                   <code>ENABLED</code> – The user account is created and is currently active.</p>
+   *                   <code>ENABLED</code> – The user is created and is currently active.</p>
    *             </li>
    *             <li>
    *                <p>
-   *                   <code>DISABLED</code> – The user account is currently inactive.</p>
+   *                   <code>DISABLED</code> – The user is currently inactive.</p>
    *             </li>
    *          </ul>
    */
@@ -2038,25 +2038,25 @@ export interface GetUserResponse {
 
   /**
    * @public
-   * <p>The timestamp at which the user account was created in FinSpace. The value is determined as epoch time in milliseconds. </p>
+   * <p>The timestamp at which the user was created in FinSpace. The value is determined as epoch time in milliseconds. </p>
    */
   createTime?: number;
 
   /**
    * @public
-   * <p>Describes the last time the user account was enabled. The value is determined as epoch time in milliseconds.</p>
+   * <p>Describes the last time the user was activated. The value is determined as epoch time in milliseconds.</p>
    */
   lastEnabledTime?: number;
 
   /**
    * @public
-   * <p>Describes the last time the user account was disabled. The value is determined as epoch time in milliseconds.</p>
+   * <p>Describes the last time the user was deactivated. The value is determined as epoch time in milliseconds.</p>
    */
   lastDisabledTime?: number;
 
   /**
    * @public
-   * <p>Describes the last time the user account was updated. The value is determined as epoch time in milliseconds.</p>
+   * <p>Describes the last time the user details were updated. The value is determined as epoch time in milliseconds.</p>
    */
   lastModifiedTime?: number;
 
@@ -2616,7 +2616,7 @@ export interface ListPermissionGroupsByUserRequest {
 
 /**
  * @public
- * <p>The structure of a permission group associated with a user account.</p>
+ * <p>The structure of a permission group associated with a user.</p>
  */
 export interface PermissionGroupByUser {
   /**
@@ -2633,15 +2633,15 @@ export interface PermissionGroupByUser {
 
   /**
    * @public
-   * <p>Indicates the status of the user account within a permission group.</p>
+   * <p>Indicates the status of the user within a permission group.</p>
    *          <ul>
    *             <li>
    *                <p>
-   *                   <code>ADDITION_IN_PROGRESS</code> – The user account is currently being added to the permission group.</p>
+   *                   <code>ADDITION_IN_PROGRESS</code> – The user is currently being added to the permission group.</p>
    *             </li>
    *             <li>
    *                <p>
-   *                   <code>ADDITION_SUCCESS</code> – The user account is successfully added to the permission group.</p>
+   *                   <code>ADDITION_SUCCESS</code> – The user is successfully added to the permission group.</p>
    *             </li>
    *             <li>
    *                <p>
@@ -2688,7 +2688,7 @@ export interface ListUsersRequest {
 
 /**
  * @public
- * <p>The details of the user account.</p>
+ * <p>The details of the user.</p>
  */
 export interface User {
   /**
@@ -2699,19 +2699,19 @@ export interface User {
 
   /**
    * @public
-   * <p>The current status of the user account. </p>
+   * <p>The current status of the user. </p>
    *          <ul>
    *             <li>
    *                <p>
-   *                   <code>CREATING</code> – The user account creation is in progress.</p>
+   *                   <code>CREATING</code> – The user creation is in progress.</p>
    *             </li>
    *             <li>
    *                <p>
-   *                   <code>ENABLED</code> – The user account is created and is currently active.</p>
+   *                   <code>ENABLED</code> – The user is created and is currently active.</p>
    *             </li>
    *             <li>
    *                <p>
-   *                   <code>DISABLED</code> – The user account is currently inactive.</p>
+   *                   <code>DISABLED</code> – The user is currently inactive.</p>
    *             </li>
    *          </ul>
    */
@@ -2775,26 +2775,26 @@ export interface User {
 
   /**
    * @public
-   * <p>The timestamp at which the user account was created in FinSpace. The value is determined as epoch time in milliseconds. </p>
+   * <p>The timestamp at which the user was created in FinSpace. The value is determined as epoch time in milliseconds. </p>
    */
   createTime?: number;
 
   /**
    * @public
-   * <p> Describes the last time the user account was enabled. The value is determined as epoch time in milliseconds.
+   * <p> Describes the last time the user was activated. The value is determined as epoch time in milliseconds.
    *     </p>
    */
   lastEnabledTime?: number;
 
   /**
    * @public
-   * <p>Describes the last time the user account was disabled. The value is determined as epoch time in milliseconds.</p>
+   * <p>Describes the last time the user was deactivated. The value is determined as epoch time in milliseconds.</p>
    */
   lastDisabledTime?: number;
 
   /**
    * @public
-   * <p>Describes the last time the user account was updated. The value is determined as epoch time in milliseconds.
+   * <p>Describes the last time the user was updated. The value is determined as epoch time in milliseconds.
    *     </p>
    */
   lastModifiedTime?: number;
@@ -2813,7 +2813,7 @@ export interface User {
 export interface ListUsersResponse {
   /**
    * @public
-   * <p>A list of all the user accounts.</p>
+   * <p>A list of all the users.</p>
    */
   users?: User[];
 
@@ -2849,7 +2849,7 @@ export interface ListUsersByPermissionGroupRequest {
 
 /**
  * @public
- * <p>The structure of a user account associated with a permission group.</p>
+ * <p>The structure of a user associated with a permission group.</p>
  */
 export interface UserByPermissionGroup {
   /**
@@ -2860,19 +2860,19 @@ export interface UserByPermissionGroup {
 
   /**
    * @public
-   * <p>The current status of the user account. </p>
+   * <p>The current status of the user. </p>
    *          <ul>
    *             <li>
    *                <p>
-   *                   <code>CREATING</code> – The user account creation is in progress.</p>
+   *                   <code>CREATING</code> – The user creation is in progress.</p>
    *             </li>
    *             <li>
    *                <p>
-   *                   <code>ENABLED</code> – The user account is created and is currently active.</p>
+   *                   <code>ENABLED</code> – The user is created and is currently active.</p>
    *             </li>
    *             <li>
    *                <p>
-   *                   <code>DISABLED</code> – The user account is currently inactive.</p>
+   *                   <code>DISABLED</code> – The user is currently inactive.</p>
    *             </li>
    *          </ul>
    */
@@ -2936,15 +2936,15 @@ export interface UserByPermissionGroup {
 
   /**
    * @public
-   * <p>Indicates the status of the user account within a permission group.</p>
+   * <p>Indicates the status of the user within a permission group.</p>
    *          <ul>
    *             <li>
    *                <p>
-   *                   <code>ADDITION_IN_PROGRESS</code> – The user account is currently being added to the permission group.</p>
+   *                   <code>ADDITION_IN_PROGRESS</code> – The user is currently being added to the permission group.</p>
    *             </li>
    *             <li>
    *                <p>
-   *                   <code>ADDITION_SUCCESS</code> – The user account is successfully added to the permission group.</p>
+   *                   <code>ADDITION_SUCCESS</code> – The user is successfully added to the permission group.</p>
    *             </li>
    *             <li>
    *                <p>
@@ -3001,7 +3001,7 @@ export interface ResetUserPasswordResponse {
 
   /**
    * @public
-   * <p>A randomly generated temporary password for the requested user account. This password expires in 7 days.</p>
+   * <p>A randomly generated temporary password for the requested user. This password expires in 7 days.</p>
    */
   temporaryPassword?: string;
 }
@@ -3271,7 +3271,7 @@ export interface UpdatePermissionGroupResponse {
 export interface UpdateUserRequest {
   /**
    * @public
-   * <p>The unique identifier for the user account to update.</p>
+   * <p>The unique identifier for the user that you want to update.</p>
    */
   userId: string | undefined;
 
@@ -3338,7 +3338,7 @@ export interface UpdateUserRequest {
 export interface UpdateUserResponse {
   /**
    * @public
-   * <p>The unique identifier of the updated user account.</p>
+   * <p>The unique identifier of the updated user.</p>
    */
   userId?: string;
 }
@@ -3394,7 +3394,7 @@ export const GetExternalDataViewAccessDetailsResponseFilterSensitiveLog = (
   obj: GetExternalDataViewAccessDetailsResponse
 ): any => ({
   ...obj,
-  ...(obj.credentials && { credentials: AwsCredentialsFilterSensitiveLog(obj.credentials) }),
+  ...(obj.credentials && { credentials: SENSITIVE_STRING }),
 });
 
 /**
@@ -3414,6 +3414,23 @@ export const GetPermissionGroupResponseFilterSensitiveLog = (obj: GetPermissionG
   ...(obj.permissionGroup && { permissionGroup: PermissionGroupFilterSensitiveLog(obj.permissionGroup) }),
 });
 
+/**
+ * @internal
+ */
+export const CredentialsFilterSensitiveLog = (obj: Credentials): any => ({
+  ...obj,
+});
+
+/**
+ * @internal
+ */
+export const GetProgrammaticAccessCredentialsResponseFilterSensitiveLog = (
+  obj: GetProgrammaticAccessCredentialsResponse
+): any => ({
+  ...obj,
+  ...(obj.credentials && { credentials: SENSITIVE_STRING }),
+});
+
 /**
  * @internal
  */
diff --git a/clients/client-finspace-data/src/protocols/Aws_restJson1.ts b/clients/client-finspace-data/src/protocols/Aws_restJson1.ts
index 1ed903ab0a26..cfb6652f53e4 100644
--- a/clients/client-finspace-data/src/protocols/Aws_restJson1.ts
+++ b/clients/client-finspace-data/src/protocols/Aws_restJson1.ts
@@ -295,7 +295,7 @@ export const se_CreateUserCommand = async (
   let body: any;
   body = JSON.stringify(
     take(input, {
-      ApiAccess: [],
+      apiAccess: [],
       apiAccessPrincipalArn: [],
       clientToken: [true, (_) => _ ?? generateIdempotencyToken()],
       emailAddress: [],
diff --git a/codegen/sdk-codegen/aws-models/finspace-data.json b/codegen/sdk-codegen/aws-models/finspace-data.json
index 2ac6eb7f240d..5d1fedf5057f 100644
--- a/codegen/sdk-codegen/aws-models/finspace-data.json
+++ b/codegen/sdk-codegen/aws-models/finspace-data.json
@@ -956,7 +956,7 @@
         }
       ],
       "traits": {
-        "smithy.api#documentation": "<p>Adds a user account to a permission group to grant permissions for actions a user can perform in FinSpace.</p>",
+        "smithy.api#documentation": "<p>Adds a user to a permission group to grant permissions for actions a user can perform in FinSpace.</p>",
         "smithy.api#http": {
           "method": "POST",
           "uri": "/permission-group/{permissionGroupId}/users/{userId}",
@@ -1041,7 +1041,8 @@
         }
       },
       "traits": {
-        "smithy.api#documentation": "<p> The credentials required to access the external Dataview from the S3 location.</p>"
+        "smithy.api#documentation": "<p> The credentials required to access the external Dataview from the S3 location.</p>",
+        "smithy.api#sensitive": {}
       }
     },
     "com.amazonaws.finspacedata#Boolean": {
@@ -1873,7 +1874,7 @@
             "smithy.api#documentation": "<p>The last name of the user that you want to register.</p>"
           }
         },
-        "ApiAccess": {
+        "apiAccess": {
           "target": "com.amazonaws.finspacedata#ApiAccess",
           "traits": {
             "smithy.api#documentation": "<p>The option to indicate whether the user can use the <code>GetProgrammaticAccessCredentials</code> API to obtain credentials that can then be used to access other FinSpace Data API operations.</p>\n         <ul>\n            <li>\n               <p>\n                  <code>ENABLED</code> – The user has permissions to use the APIs.</p>\n            </li>\n            <li>\n               <p>\n                  <code>DISABLED</code> – The user does not have permissions to use any APIs.</p>\n            </li>\n         </ul>"
@@ -1934,7 +1935,8 @@
         }
       },
       "traits": {
-        "smithy.api#documentation": "<p>Short term API credentials.</p>"
+        "smithy.api#documentation": "<p>Short term API credentials.</p>",
+        "smithy.api#sensitive": {}
       }
     },
     "com.amazonaws.finspacedata#DataViewArn": {
@@ -2551,7 +2553,7 @@
         "userId": {
           "target": "com.amazonaws.finspacedata#UserId",
           "traits": {
-            "smithy.api#documentation": "<p>The unique identifier for the user account that you want to disable.</p>",
+            "smithy.api#documentation": "<p>The unique identifier for the user that you want to deactivate.</p>",
             "smithy.api#httpLabel": {},
             "smithy.api#required": {}
           }
@@ -2574,7 +2576,7 @@
         "userId": {
           "target": "com.amazonaws.finspacedata#UserId",
           "traits": {
-            "smithy.api#documentation": "<p>The unique identifier for the disabled user account.</p>"
+            "smithy.api#documentation": "<p>The unique identifier for the deactivated user.</p>"
           }
         }
       },
@@ -2611,7 +2613,7 @@
         }
       ],
       "traits": {
-        "smithy.api#documentation": "<p>Removes a user account from a permission group.</p>",
+        "smithy.api#documentation": "<p>Removes a user from a permission group.</p>",
         "smithy.api#http": {
           "method": "DELETE",
           "uri": "/permission-group/{permissionGroupId}/users/{userId}",
@@ -2724,7 +2726,7 @@
         "userId": {
           "target": "com.amazonaws.finspacedata#UserId",
           "traits": {
-            "smithy.api#documentation": "<p>The unique identifier for the user account that you want to enable.</p>",
+            "smithy.api#documentation": "<p>The unique identifier for the user that you want to activate.</p>",
             "smithy.api#httpLabel": {},
             "smithy.api#required": {}
           }
@@ -2747,7 +2749,7 @@
         "userId": {
           "target": "com.amazonaws.finspacedata#UserId",
           "traits": {
-            "smithy.api#documentation": "<p>The unique identifier for the enabled user account.</p>"
+            "smithy.api#documentation": "<p>The unique identifier for the active user.</p>"
           }
         }
       },
@@ -3450,7 +3452,7 @@
         }
       ],
       "traits": {
-        "smithy.api#documentation": "<p>Request programmatic credentials to use with FinSpace SDK.</p>",
+        "smithy.api#documentation": "<p>Request programmatic credentials to use with FinSpace SDK. For more information, see <a href=\"https://docs.aws.amazon.com/finspace/latest/data-api/fs-using-the-finspace-api.html#accessing-credentials\">Step 2. Access credentials programmatically using IAM access key id and secret access key</a>.</p>",
         "smithy.api#http": {
           "method": "GET",
           "uri": "/credentials/programmatic",
@@ -3561,13 +3563,13 @@
         "userId": {
           "target": "com.amazonaws.finspacedata#UserId",
           "traits": {
-            "smithy.api#documentation": "<p>The unique identifier for the user account that is retrieved.</p>"
+            "smithy.api#documentation": "<p>The unique identifier for the user that is retrieved.</p>"
           }
         },
         "status": {
           "target": "com.amazonaws.finspacedata#UserStatus",
           "traits": {
-            "smithy.api#documentation": "<p>The current status of the user account. </p>\n         <ul>\n            <li>\n               <p>\n                  <code>CREATING</code> – The user account creation is in progress.</p>\n            </li>\n            <li>\n               <p>\n                  <code>ENABLED</code> – The user account is created and is currently active.</p>\n            </li>\n            <li>\n               <p>\n                  <code>DISABLED</code> – The user account is currently inactive.</p>\n            </li>\n         </ul>"
+            "smithy.api#documentation": "<p>The current status of the user. </p>\n         <ul>\n            <li>\n               <p>\n                  <code>CREATING</code> – The creation is in progress.</p>\n            </li>\n            <li>\n               <p>\n                  <code>ENABLED</code> – The user is created and is currently active.</p>\n            </li>\n            <li>\n               <p>\n                  <code>DISABLED</code> – The user is currently inactive.</p>\n            </li>\n         </ul>"
           }
         },
         "firstName": {
@@ -3610,28 +3612,28 @@
           "target": "com.amazonaws.finspacedata#TimestampEpoch",
           "traits": {
             "smithy.api#default": 0,
-            "smithy.api#documentation": "<p>The timestamp at which the user account was created in FinSpace. The value is determined as epoch time in milliseconds. </p>"
+            "smithy.api#documentation": "<p>The timestamp at which the user was created in FinSpace. The value is determined as epoch time in milliseconds. </p>"
           }
         },
         "lastEnabledTime": {
           "target": "com.amazonaws.finspacedata#TimestampEpoch",
           "traits": {
             "smithy.api#default": 0,
-            "smithy.api#documentation": "<p>Describes the last time the user account was enabled. The value is determined as epoch time in milliseconds.</p>"
+            "smithy.api#documentation": "<p>Describes the last time the user was activated. The value is determined as epoch time in milliseconds.</p>"
           }
         },
         "lastDisabledTime": {
           "target": "com.amazonaws.finspacedata#TimestampEpoch",
           "traits": {
             "smithy.api#default": 0,
-            "smithy.api#documentation": "<p>Describes the last time the user account was disabled. The value is determined as epoch time in milliseconds.</p>"
+            "smithy.api#documentation": "<p>Describes the last time the user was deactivated. The value is determined as epoch time in milliseconds.</p>"
           }
         },
         "lastModifiedTime": {
           "target": "com.amazonaws.finspacedata#TimestampEpoch",
           "traits": {
             "smithy.api#default": 0,
-            "smithy.api#documentation": "<p>Describes the last time the user account was updated. The value is determined as epoch time in milliseconds.</p>"
+            "smithy.api#documentation": "<p>Describes the last time the user details were updated. The value is determined as epoch time in milliseconds.</p>"
           }
         },
         "lastLoginTime": {
@@ -4137,7 +4139,7 @@
         }
       ],
       "traits": {
-        "smithy.api#documentation": "<p>Lists all the permission groups that are associated with a specific user account.</p>",
+        "smithy.api#documentation": "<p>Lists all the permission groups that are associated with a specific user.</p>",
         "smithy.api#http": {
           "method": "GET",
           "uri": "/user/{userId}/permission-groups",
@@ -4264,7 +4266,7 @@
         }
       ],
       "traits": {
-        "smithy.api#documentation": "<p>Lists all available user accounts in FinSpace.</p>",
+        "smithy.api#documentation": "<p>Lists all available users in FinSpace.</p>",
         "smithy.api#http": {
           "method": "GET",
           "uri": "/user",
@@ -4394,7 +4396,7 @@
         "users": {
           "target": "com.amazonaws.finspacedata#UserList",
           "traits": {
-            "smithy.api#documentation": "<p>A list of all the user accounts.</p>"
+            "smithy.api#documentation": "<p>A list of all the users.</p>"
           }
         },
         "nextToken": {
@@ -4486,7 +4488,7 @@
         "membershipStatus": {
           "target": "com.amazonaws.finspacedata#PermissionGroupMembershipStatus",
           "traits": {
-            "smithy.api#documentation": "<p>Indicates the status of the user account within a permission group.</p>\n         <ul>\n            <li>\n               <p>\n                  <code>ADDITION_IN_PROGRESS</code> – The user account is currently being added to the permission group.</p>\n            </li>\n            <li>\n               <p>\n                  <code>ADDITION_SUCCESS</code> – The user account is successfully added to the permission group.</p>\n            </li>\n            <li>\n               <p>\n                  <code>REMOVAL_IN_PROGRESS</code> – The user is currently being removed from the permission group.</p>\n            </li>\n         </ul>"
+            "smithy.api#documentation": "<p>Indicates the status of the user within a permission group.</p>\n         <ul>\n            <li>\n               <p>\n                  <code>ADDITION_IN_PROGRESS</code> – The user is currently being added to the permission group.</p>\n            </li>\n            <li>\n               <p>\n                  <code>ADDITION_SUCCESS</code> – The user is successfully added to the permission group.</p>\n            </li>\n            <li>\n               <p>\n                  <code>REMOVAL_IN_PROGRESS</code> – The user is currently being removed from the permission group.</p>\n            </li>\n         </ul>"
           }
         }
       },
@@ -4512,12 +4514,12 @@
         "membershipStatus": {
           "target": "com.amazonaws.finspacedata#PermissionGroupMembershipStatus",
           "traits": {
-            "smithy.api#documentation": "<p>Indicates the status of the user account within a permission group.</p>\n         <ul>\n            <li>\n               <p>\n                  <code>ADDITION_IN_PROGRESS</code> – The user account is currently being added to the permission group.</p>\n            </li>\n            <li>\n               <p>\n                  <code>ADDITION_SUCCESS</code> – The user account is successfully added to the permission group.</p>\n            </li>\n            <li>\n               <p>\n                  <code>REMOVAL_IN_PROGRESS</code> – The user is currently being removed from the permission group.</p>\n            </li>\n         </ul>"
+            "smithy.api#documentation": "<p>Indicates the status of the user within a permission group.</p>\n         <ul>\n            <li>\n               <p>\n                  <code>ADDITION_IN_PROGRESS</code> – The user is currently being added to the permission group.</p>\n            </li>\n            <li>\n               <p>\n                  <code>ADDITION_SUCCESS</code> – The user is successfully added to the permission group.</p>\n            </li>\n            <li>\n               <p>\n                  <code>REMOVAL_IN_PROGRESS</code> – The user is currently being removed from the permission group.</p>\n            </li>\n         </ul>"
           }
         }
       },
       "traits": {
-        "smithy.api#documentation": "<p>The structure of a permission group associated with a user account.</p>"
+        "smithy.api#documentation": "<p>The structure of a permission group associated with a user.</p>"
       }
     },
     "com.amazonaws.finspacedata#PermissionGroupByUserList": {
@@ -4690,7 +4692,7 @@
         "temporaryPassword": {
           "target": "com.amazonaws.finspacedata#Password",
           "traits": {
-            "smithy.api#documentation": "<p>A randomly generated temporary password for the requested user account. This password expires in 7 days.</p>"
+            "smithy.api#documentation": "<p>A randomly generated temporary password for the requested user. This password expires in 7 days.</p>"
           }
         }
       },
@@ -4858,8 +4860,8 @@
       "traits": {
         "smithy.api#default": 0,
         "smithy.api#range": {
-          "min": 60,
-          "max": 720
+          "min": 1,
+          "max": 60
         }
       }
     },
@@ -5301,7 +5303,7 @@
         }
       ],
       "traits": {
-        "smithy.api#documentation": "<p>Modifies the details of the specified user account. You cannot update the <code>userId</code> for a user.</p>",
+        "smithy.api#documentation": "<p>Modifies the details of the specified user. You cannot update the <code>userId</code> for a user.</p>",
         "smithy.api#http": {
           "method": "PUT",
           "uri": "/user/{userId}",
@@ -5315,7 +5317,7 @@
         "userId": {
           "target": "com.amazonaws.finspacedata#UserId",
           "traits": {
-            "smithy.api#documentation": "<p>The unique identifier for the user account to update.</p>",
+            "smithy.api#documentation": "<p>The unique identifier for the user that you want to update.</p>",
             "smithy.api#httpLabel": {},
             "smithy.api#required": {}
           }
@@ -5368,7 +5370,7 @@
         "userId": {
           "target": "com.amazonaws.finspacedata#UserId",
           "traits": {
-            "smithy.api#documentation": "<p>The unique identifier of the updated user account.</p>"
+            "smithy.api#documentation": "<p>The unique identifier of the updated user.</p>"
           }
         }
       },
@@ -5388,7 +5390,7 @@
         "status": {
           "target": "com.amazonaws.finspacedata#UserStatus",
           "traits": {
-            "smithy.api#documentation": "<p>The current status of the user account. </p>\n         <ul>\n            <li>\n               <p>\n                  <code>CREATING</code> – The user account creation is in progress.</p>\n            </li>\n            <li>\n               <p>\n                  <code>ENABLED</code> – The user account is created and is currently active.</p>\n            </li>\n            <li>\n               <p>\n                  <code>DISABLED</code> – The user account is currently inactive.</p>\n            </li>\n         </ul>"
+            "smithy.api#documentation": "<p>The current status of the user. </p>\n         <ul>\n            <li>\n               <p>\n                  <code>CREATING</code> – The user creation is in progress.</p>\n            </li>\n            <li>\n               <p>\n                  <code>ENABLED</code> – The user is created and is currently active.</p>\n            </li>\n            <li>\n               <p>\n                  <code>DISABLED</code> – The user is currently inactive.</p>\n            </li>\n         </ul>"
           }
         },
         "firstName": {
@@ -5431,28 +5433,28 @@
           "target": "com.amazonaws.finspacedata#TimestampEpoch",
           "traits": {
             "smithy.api#default": 0,
-            "smithy.api#documentation": "<p>The timestamp at which the user account was created in FinSpace. The value is determined as epoch time in milliseconds. </p>"
+            "smithy.api#documentation": "<p>The timestamp at which the user was created in FinSpace. The value is determined as epoch time in milliseconds. </p>"
           }
         },
         "lastEnabledTime": {
           "target": "com.amazonaws.finspacedata#TimestampEpoch",
           "traits": {
             "smithy.api#default": 0,
-            "smithy.api#documentation": "<p> Describes the last time the user account was enabled. The value is determined as epoch time in milliseconds.\n    </p>"
+            "smithy.api#documentation": "<p> Describes the last time the user was activated. The value is determined as epoch time in milliseconds.\n    </p>"
           }
         },
         "lastDisabledTime": {
           "target": "com.amazonaws.finspacedata#TimestampEpoch",
           "traits": {
             "smithy.api#default": 0,
-            "smithy.api#documentation": "<p>Describes the last time the user account was disabled. The value is determined as epoch time in milliseconds.</p>"
+            "smithy.api#documentation": "<p>Describes the last time the user was deactivated. The value is determined as epoch time in milliseconds.</p>"
           }
         },
         "lastModifiedTime": {
           "target": "com.amazonaws.finspacedata#TimestampEpoch",
           "traits": {
             "smithy.api#default": 0,
-            "smithy.api#documentation": "<p>Describes the last time the user account was updated. The value is determined as epoch time in milliseconds.\n    </p>"
+            "smithy.api#documentation": "<p>Describes the last time the user was updated. The value is determined as epoch time in milliseconds.\n    </p>"
           }
         },
         "lastLoginTime": {
@@ -5464,7 +5466,7 @@
         }
       },
       "traits": {
-        "smithy.api#documentation": "<p>The details of the user account.</p>"
+        "smithy.api#documentation": "<p>The details of the user.</p>"
       }
     },
     "com.amazonaws.finspacedata#UserByPermissionGroup": {
@@ -5479,7 +5481,7 @@
         "status": {
           "target": "com.amazonaws.finspacedata#UserStatus",
           "traits": {
-            "smithy.api#documentation": "<p>The current status of the user account. </p>\n         <ul>\n            <li>\n               <p>\n                  <code>CREATING</code> – The user account creation is in progress.</p>\n            </li>\n            <li>\n               <p>\n                  <code>ENABLED</code> – The user account is created and is currently active.</p>\n            </li>\n            <li>\n               <p>\n                  <code>DISABLED</code> – The user account is currently inactive.</p>\n            </li>\n         </ul>"
+            "smithy.api#documentation": "<p>The current status of the user. </p>\n         <ul>\n            <li>\n               <p>\n                  <code>CREATING</code> – The user creation is in progress.</p>\n            </li>\n            <li>\n               <p>\n                  <code>ENABLED</code> – The user is created and is currently active.</p>\n            </li>\n            <li>\n               <p>\n                  <code>DISABLED</code> – The user is currently inactive.</p>\n            </li>\n         </ul>"
           }
         },
         "firstName": {
@@ -5521,12 +5523,12 @@
         "membershipStatus": {
           "target": "com.amazonaws.finspacedata#PermissionGroupMembershipStatus",
           "traits": {
-            "smithy.api#documentation": "<p>Indicates the status of the user account within a permission group.</p>\n         <ul>\n            <li>\n               <p>\n                  <code>ADDITION_IN_PROGRESS</code> – The user account is currently being added to the permission group.</p>\n            </li>\n            <li>\n               <p>\n                  <code>ADDITION_SUCCESS</code> – The user account is successfully added to the permission group.</p>\n            </li>\n            <li>\n               <p>\n                  <code>REMOVAL_IN_PROGRESS</code> – The user is currently being removed from the permission group.</p>\n            </li>\n         </ul>"
+            "smithy.api#documentation": "<p>Indicates the status of the user within a permission group.</p>\n         <ul>\n            <li>\n               <p>\n                  <code>ADDITION_IN_PROGRESS</code> – The user is currently being added to the permission group.</p>\n            </li>\n            <li>\n               <p>\n                  <code>ADDITION_SUCCESS</code> – The user is successfully added to the permission group.</p>\n            </li>\n            <li>\n               <p>\n                  <code>REMOVAL_IN_PROGRESS</code> – The user is currently being removed from the permission group.</p>\n            </li>\n         </ul>"
           }
         }
       },
       "traits": {
-        "smithy.api#documentation": "<p>The structure of a user account associated with a permission group.</p>"
+        "smithy.api#documentation": "<p>The structure of a user associated with a permission group.</p>"
       }
     },
     "com.amazonaws.finspacedata#UserByPermissionGroupList": {
@@ -5654,4 +5656,4 @@
       }
     }
   }
-}
\ No newline at end of file
+}