diff --git a/README.md b/README.md
--- a/README.md
+++ b/README.md
@@ -8,17 +8,14 @@
 
 ## Version
 
-`1.4.2`
+`1.4.3`
 
 
 ## Description
 
-You can create a user pool in Amazon Cognito Identity to manage
-directories and users. You can authenticate a user to obtain tokens
-related to user identity and access policies.
+You can create a user pool in Amazon Cognito Identity to manage directories and users. You can authenticate a user to obtain tokens related to user identity and access policies.
 
-This API reference provides information about user pools in Amazon
-Cognito Identity, which is a new capability that is available as a beta.
+This API reference provides information about user pools in Amazon Cognito Identity, which is a new capability that is available as a beta.
 
 Documentation is available via [Hackage](http://hackage.haskell.org/package/amazonka-cognito-idp)
 and the [AWS API Reference](https://aws.amazon.com/documentation/).
diff --git a/amazonka-cognito-idp.cabal b/amazonka-cognito-idp.cabal
--- a/amazonka-cognito-idp.cabal
+++ b/amazonka-cognito-idp.cabal
@@ -1,5 +1,5 @@
 name:                  amazonka-cognito-idp
-version:               1.4.2
+version:               1.4.3
 synopsis:              Amazon Cognito Identity Provider SDK.
 homepage:              https://github.com/brendanhay/amazonka
 bug-reports:           https://github.com/brendanhay/amazonka/issues
@@ -13,12 +13,9 @@
 cabal-version:         >= 1.10
 extra-source-files:    README.md fixture/*.yaml fixture/*.proto
 description:
-    You can create a user pool in Amazon Cognito Identity to manage
-    directories and users. You can authenticate a user to obtain tokens
-    related to user identity and access policies.
+    You can create a user pool in Amazon Cognito Identity to manage directories and users. You can authenticate a user to obtain tokens related to user identity and access policies.
 
-    This API reference provides information about user pools in Amazon
-    Cognito Identity, which is a new capability that is available as a beta.
+    This API reference provides information about user pools in Amazon Cognito Identity, which is a new capability that is available as a beta.
     .
     The types from this library are intended to be used with
     <http://hackage.haskell.org/package/amazonka amazonka>, which provides
@@ -88,7 +85,7 @@
         , Network.AWS.CognitoIdentityProvider.Types.Sum
 
     build-depends:
-          amazonka-core == 1.4.2.*
+          amazonka-core == 1.4.3.*
         , base          >= 4.7     && < 5
 
 test-suite amazonka-cognito-idp-test
@@ -108,9 +105,9 @@
         , Test.AWS.CognitoIdentityProvider.Internal
 
     build-depends:
-          amazonka-core == 1.4.2.*
-        , amazonka-test == 1.4.2.*
-        , amazonka-cognito-idp == 1.4.2.*
+          amazonka-core == 1.4.3.*
+        , amazonka-test == 1.4.3.*
+        , amazonka-cognito-idp == 1.4.3.*
         , base
         , bytestring
         , tasty
diff --git a/gen/Network/AWS/CognitoIdentityProvider.hs b/gen/Network/AWS/CognitoIdentityProvider.hs
--- a/gen/Network/AWS/CognitoIdentityProvider.hs
+++ b/gen/Network/AWS/CognitoIdentityProvider.hs
@@ -11,12 +11,9 @@
 -- Stability   : auto-generated
 -- Portability : non-portable (GHC extensions)
 --
--- You can create a user pool in Amazon Cognito Identity to manage
--- directories and users. You can authenticate a user to obtain tokens
--- related to user identity and access policies.
+-- You can create a user pool in Amazon Cognito Identity to manage directories and users. You can authenticate a user to obtain tokens related to user identity and access policies.
 --
--- This API reference provides information about user pools in Amazon
--- Cognito Identity, which is a new capability that is available as a beta.
+-- This API reference provides information about user pools in Amazon Cognito Identity, which is a new capability that is available as a beta.
 module Network.AWS.CognitoIdentityProvider
     (
     -- * Service Configuration
diff --git a/gen/Network/AWS/CognitoIdentityProvider/AddCustomAttributes.hs b/gen/Network/AWS/CognitoIdentityProvider/AddCustomAttributes.hs
--- a/gen/Network/AWS/CognitoIdentityProvider/AddCustomAttributes.hs
+++ b/gen/Network/AWS/CognitoIdentityProvider/AddCustomAttributes.hs
@@ -67,8 +67,7 @@
     , _acaCustomAttributes = _List1 # pCustomAttributes_
     }
 
--- | The user pool ID for the user pool where you want to add custom
--- attributes.
+-- | The user pool ID for the user pool where you want to add custom attributes.
 acaUserPoolId :: Lens' AddCustomAttributes Text
 acaUserPoolId = lens _acaUserPoolId (\ s a -> s{_acaUserPoolId = a});
 
@@ -112,8 +111,7 @@
 instance ToQuery AddCustomAttributes where
         toQuery = const mempty
 
--- | Represents the response from the server for the request to add custom
--- attributes.
+-- | Represents the response from the server for the request to add custom attributes.
 --
 -- /See:/ 'addCustomAttributesResponse' smart constructor.
 newtype AddCustomAttributesResponse = AddCustomAttributesResponse'
diff --git a/gen/Network/AWS/CognitoIdentityProvider/AdminConfirmSignUp.hs b/gen/Network/AWS/CognitoIdentityProvider/AdminConfirmSignUp.hs
--- a/gen/Network/AWS/CognitoIdentityProvider/AdminConfirmSignUp.hs
+++ b/gen/Network/AWS/CognitoIdentityProvider/AdminConfirmSignUp.hs
@@ -18,8 +18,7 @@
 -- Stability   : auto-generated
 -- Portability : non-portable (GHC extensions)
 --
--- Confirms user registration as an admin without using a confirmation
--- code. Works on any user.
+-- Confirms user registration as an admin without using a confirmation code. Works on any user.
 module Network.AWS.CognitoIdentityProvider.AdminConfirmSignUp
     (
     -- * Creating a Request
@@ -112,8 +111,7 @@
 instance ToQuery AdminConfirmSignUp where
         toQuery = const mempty
 
--- | Represents the response from the server for the request to confirm
--- registration.
+-- | Represents the response from the server for the request to confirm registration.
 --
 -- /See:/ 'adminConfirmSignUpResponse' smart constructor.
 newtype AdminConfirmSignUpResponse = AdminConfirmSignUpResponse'
diff --git a/gen/Network/AWS/CognitoIdentityProvider/AdminDeleteUserAttributes.hs b/gen/Network/AWS/CognitoIdentityProvider/AdminDeleteUserAttributes.hs
--- a/gen/Network/AWS/CognitoIdentityProvider/AdminDeleteUserAttributes.hs
+++ b/gen/Network/AWS/CognitoIdentityProvider/AdminDeleteUserAttributes.hs
@@ -18,8 +18,7 @@
 -- Stability   : auto-generated
 -- Portability : non-portable (GHC extensions)
 --
--- Deletes the user attributes in a user pool as an administrator. Works on
--- any user.
+-- Deletes the user attributes in a user pool as an administrator. Works on any user.
 module Network.AWS.CognitoIdentityProvider.AdminDeleteUserAttributes
     (
     -- * Creating a Request
@@ -73,18 +72,15 @@
     , _aduaUserAttributeNames = mempty
     }
 
--- | The user pool ID for the user pool where you want to delete user
--- attributes.
+-- | The user pool ID for the user pool where you want to delete user attributes.
 aduaUserPoolId :: Lens' AdminDeleteUserAttributes Text
 aduaUserPoolId = lens _aduaUserPoolId (\ s a -> s{_aduaUserPoolId = a});
 
--- | The user name of the user from which you would like to delete
--- attributes.
+-- | The user name of the user from which you would like to delete attributes.
 aduaUsername :: Lens' AdminDeleteUserAttributes Text
 aduaUsername = lens _aduaUsername (\ s a -> s{_aduaUsername = a}) . _Sensitive;
 
--- | An array of strings representing the user attribute names you wish to
--- delete.
+-- | An array of strings representing the user attribute names you wish to delete.
 aduaUserAttributeNames :: Lens' AdminDeleteUserAttributes [Text]
 aduaUserAttributeNames = lens _aduaUserAttributeNames (\ s a -> s{_aduaUserAttributeNames = a}) . _Coerce;
 
@@ -127,8 +123,7 @@
 instance ToQuery AdminDeleteUserAttributes where
         toQuery = const mempty
 
--- | Represents the response received from the server for a request to delete
--- user attributes.
+-- | Represents the response received from the server for a request to delete user attributes.
 --
 -- /See:/ 'adminDeleteUserAttributesResponse' smart constructor.
 newtype AdminDeleteUserAttributesResponse = AdminDeleteUserAttributesResponse'
diff --git a/gen/Network/AWS/CognitoIdentityProvider/AdminDisableUser.hs b/gen/Network/AWS/CognitoIdentityProvider/AdminDisableUser.hs
--- a/gen/Network/AWS/CognitoIdentityProvider/AdminDisableUser.hs
+++ b/gen/Network/AWS/CognitoIdentityProvider/AdminDisableUser.hs
@@ -110,8 +110,7 @@
 instance ToQuery AdminDisableUser where
         toQuery = const mempty
 
--- | Represents the response received from the server to disable the user as
--- an administrator.
+-- | Represents the response received from the server to disable the user as an administrator.
 --
 -- /See:/ 'adminDisableUserResponse' smart constructor.
 newtype AdminDisableUserResponse = AdminDisableUserResponse'
diff --git a/gen/Network/AWS/CognitoIdentityProvider/AdminEnableUser.hs b/gen/Network/AWS/CognitoIdentityProvider/AdminEnableUser.hs
--- a/gen/Network/AWS/CognitoIdentityProvider/AdminEnableUser.hs
+++ b/gen/Network/AWS/CognitoIdentityProvider/AdminEnableUser.hs
@@ -110,8 +110,7 @@
 instance ToQuery AdminEnableUser where
         toQuery = const mempty
 
--- | Represents the response from the server for the request to enable a user
--- as an administrator.
+-- | Represents the response from the server for the request to enable a user as an administrator.
 --
 -- /See:/ 'adminEnableUserResponse' smart constructor.
 newtype AdminEnableUserResponse = AdminEnableUserResponse'
diff --git a/gen/Network/AWS/CognitoIdentityProvider/AdminGetUser.hs b/gen/Network/AWS/CognitoIdentityProvider/AdminGetUser.hs
--- a/gen/Network/AWS/CognitoIdentityProvider/AdminGetUser.hs
+++ b/gen/Network/AWS/CognitoIdentityProvider/AdminGetUser.hs
@@ -18,8 +18,7 @@
 -- Stability   : auto-generated
 -- Portability : non-portable (GHC extensions)
 --
--- Gets the specified user by user name in a user pool as an administrator.
--- Works on any user.
+-- Gets the specified user by user name in a user pool as an administrator. Works on any user.
 module Network.AWS.CognitoIdentityProvider.AdminGetUser
     (
     -- * Creating a Request
@@ -75,8 +74,7 @@
     , _aguUsername = _Sensitive # pUsername_
     }
 
--- | The user pool ID for the user pool where you want to get information
--- about the user.
+-- | The user pool ID for the user pool where you want to get information about the user.
 aguUserPoolId :: Lens' AdminGetUser Text
 aguUserPoolId = lens _aguUserPoolId (\ s a -> s{_aguUserPoolId = a});
 
@@ -126,8 +124,7 @@
 instance ToQuery AdminGetUser where
         toQuery = const mempty
 
--- | Represents the response from the server from the request to get the
--- specified user as an administrator.
+-- | Represents the response from the server from the request to get the specified user as an administrator.
 --
 -- /See:/ 'adminGetUserResponse' smart constructor.
 data AdminGetUserResponse = AdminGetUserResponse'
diff --git a/gen/Network/AWS/CognitoIdentityProvider/AdminResetUserPassword.hs b/gen/Network/AWS/CognitoIdentityProvider/AdminResetUserPassword.hs
--- a/gen/Network/AWS/CognitoIdentityProvider/AdminResetUserPassword.hs
+++ b/gen/Network/AWS/CognitoIdentityProvider/AdminResetUserPassword.hs
@@ -18,8 +18,7 @@
 -- Stability   : auto-generated
 -- Portability : non-portable (GHC extensions)
 --
--- Resets the specified user\'s password in a user pool as an
--- administrator. Works on any user.
+-- Resets the specified user\'s password in a user pool as an administrator. Works on any user.
 module Network.AWS.CognitoIdentityProvider.AdminResetUserPassword
     (
     -- * Creating a Request
@@ -68,8 +67,7 @@
     , _arupUsername = _Sensitive # pUsername_
     }
 
--- | The user pool ID for the user pool where you want to reset the user\'s
--- password.
+-- | The user pool ID for the user pool where you want to reset the user\'s password.
 arupUserPoolId :: Lens' AdminResetUserPassword Text
 arupUserPoolId = lens _arupUserPoolId (\ s a -> s{_arupUserPoolId = a});
 
@@ -114,8 +112,7 @@
 instance ToQuery AdminResetUserPassword where
         toQuery = const mempty
 
--- | Represents the response from the server to reset a user password as an
--- administrator.
+-- | Represents the response from the server to reset a user password as an administrator.
 --
 -- /See:/ 'adminResetUserPasswordResponse' smart constructor.
 newtype AdminResetUserPasswordResponse = AdminResetUserPasswordResponse'
diff --git a/gen/Network/AWS/CognitoIdentityProvider/AdminSetUserSettings.hs b/gen/Network/AWS/CognitoIdentityProvider/AdminSetUserSettings.hs
--- a/gen/Network/AWS/CognitoIdentityProvider/AdminSetUserSettings.hs
+++ b/gen/Network/AWS/CognitoIdentityProvider/AdminSetUserSettings.hs
@@ -72,8 +72,7 @@
     , _asusMFAOptions = mempty
     }
 
--- | The user pool ID for the user pool where you want to set the user\'s
--- settings, such as MFA options.
+-- | The user pool ID for the user pool where you want to set the user\'s settings, such as MFA options.
 asusUserPoolId :: Lens' AdminSetUserSettings Text
 asusUserPoolId = lens _asusUserPoolId (\ s a -> s{_asusUserPoolId = a});
 
@@ -123,8 +122,7 @@
 instance ToQuery AdminSetUserSettings where
         toQuery = const mempty
 
--- | Represents the response from the server to set user settings as an
--- administrator.
+-- | Represents the response from the server to set user settings as an administrator.
 --
 -- /See:/ 'adminSetUserSettingsResponse' smart constructor.
 newtype AdminSetUserSettingsResponse = AdminSetUserSettingsResponse'
diff --git a/gen/Network/AWS/CognitoIdentityProvider/AdminUpdateUserAttributes.hs b/gen/Network/AWS/CognitoIdentityProvider/AdminUpdateUserAttributes.hs
--- a/gen/Network/AWS/CognitoIdentityProvider/AdminUpdateUserAttributes.hs
+++ b/gen/Network/AWS/CognitoIdentityProvider/AdminUpdateUserAttributes.hs
@@ -18,8 +18,7 @@
 -- Stability   : auto-generated
 -- Portability : non-portable (GHC extensions)
 --
--- Updates the specified user\'s attributes, including developer
--- attributes, as an administrator. Works on any user.
+-- Updates the specified user\'s attributes, including developer attributes, as an administrator. Works on any user.
 module Network.AWS.CognitoIdentityProvider.AdminUpdateUserAttributes
     (
     -- * Creating a Request
@@ -44,8 +43,7 @@
 import           Network.AWS.Request
 import           Network.AWS.Response
 
--- | Represents the request to update the user\'s attributes as an
--- administrator.
+-- | Represents the request to update the user\'s attributes as an administrator.
 --
 -- /See:/ 'adminUpdateUserAttributes' smart constructor.
 data AdminUpdateUserAttributes = AdminUpdateUserAttributes'
@@ -74,8 +72,7 @@
     , _auuaUserAttributes = mempty
     }
 
--- | The user pool ID for the user pool where you want to update user
--- attributes.
+-- | The user pool ID for the user pool where you want to update user attributes.
 auuaUserPoolId :: Lens' AdminUpdateUserAttributes Text
 auuaUserPoolId = lens _auuaUserPoolId (\ s a -> s{_auuaUserPoolId = a});
 
@@ -125,8 +122,7 @@
 instance ToQuery AdminUpdateUserAttributes where
         toQuery = const mempty
 
--- | Represents the response from the server for the request to update user
--- attributes as an administrator.
+-- | Represents the response from the server for the request to update user attributes as an administrator.
 --
 -- /See:/ 'adminUpdateUserAttributesResponse' smart constructor.
 newtype AdminUpdateUserAttributesResponse = AdminUpdateUserAttributesResponse'
diff --git a/gen/Network/AWS/CognitoIdentityProvider/ConfirmForgotPassword.hs b/gen/Network/AWS/CognitoIdentityProvider/ConfirmForgotPassword.hs
--- a/gen/Network/AWS/CognitoIdentityProvider/ConfirmForgotPassword.hs
+++ b/gen/Network/AWS/CognitoIdentityProvider/ConfirmForgotPassword.hs
@@ -18,8 +18,7 @@
 -- Stability   : auto-generated
 -- Portability : non-portable (GHC extensions)
 --
--- Allows a user to enter a code provided when they reset their password to
--- update their password.
+-- Allows a user to enter a code provided when they reset their password to update their password.
 module Network.AWS.CognitoIdentityProvider.ConfirmForgotPassword
     (
     -- * Creating a Request
@@ -85,9 +84,7 @@
     , _cfpPassword = _Sensitive # pPassword_
     }
 
--- | A keyed-hash message authentication code (HMAC) calculated using the
--- secret key of a user pool client and username plus the client ID in the
--- message.
+-- | A keyed-hash message authentication code (HMAC) calculated using the secret key of a user pool client and username plus the client ID in the message.
 cfpSecretHash :: Lens' ConfirmForgotPassword (Maybe Text)
 cfpSecretHash = lens _cfpSecretHash (\ s a -> s{_cfpSecretHash = a}) . mapping _Sensitive;
 
@@ -95,18 +92,15 @@
 cfpClientId :: Lens' ConfirmForgotPassword Text
 cfpClientId = lens _cfpClientId (\ s a -> s{_cfpClientId = a}) . _Sensitive;
 
--- | The user name of the user for whom you want to enter a code to retrieve
--- a forgotten password.
+-- | The user name of the user for whom you want to enter a code to retrieve a forgotten password.
 cfpUsername :: Lens' ConfirmForgotPassword Text
 cfpUsername = lens _cfpUsername (\ s a -> s{_cfpUsername = a}) . _Sensitive;
 
--- | The confirmation code sent by a user\'s request to retrieve a forgotten
--- password.
+-- | The confirmation code sent by a user\'s request to retrieve a forgotten password.
 cfpConfirmationCode :: Lens' ConfirmForgotPassword Text
 cfpConfirmationCode = lens _cfpConfirmationCode (\ s a -> s{_cfpConfirmationCode = a});
 
--- | The password sent by sent by a user\'s request to retrieve a forgotten
--- password.
+-- | The password sent by sent by a user\'s request to retrieve a forgotten password.
 cfpPassword :: Lens' ConfirmForgotPassword Text
 cfpPassword = lens _cfpPassword (\ s a -> s{_cfpPassword = a}) . _Sensitive;
 
@@ -150,8 +144,7 @@
 instance ToQuery ConfirmForgotPassword where
         toQuery = const mempty
 
--- | The response from the server that results from a user\'s request to
--- retrieve a forgotten password.
+-- | The response from the server that results from a user\'s request to retrieve a forgotten password.
 --
 -- /See:/ 'confirmForgotPasswordResponse' smart constructor.
 newtype ConfirmForgotPasswordResponse = ConfirmForgotPasswordResponse'
diff --git a/gen/Network/AWS/CognitoIdentityProvider/ConfirmSignUp.hs b/gen/Network/AWS/CognitoIdentityProvider/ConfirmSignUp.hs
--- a/gen/Network/AWS/CognitoIdentityProvider/ConfirmSignUp.hs
+++ b/gen/Network/AWS/CognitoIdentityProvider/ConfirmSignUp.hs
@@ -18,8 +18,7 @@
 -- Stability   : auto-generated
 -- Portability : non-portable (GHC extensions)
 --
--- Confirms registration of a user and handles the existing alias from a
--- previous user.
+-- Confirms registration of a user and handles the existing alias from a previous user.
 module Network.AWS.CognitoIdentityProvider.ConfirmSignUp
     (
     -- * Creating a Request
@@ -84,18 +83,11 @@
     , _csuConfirmationCode = pConfirmationCode_
     }
 
--- | Boolean to be specified to force user confirmation irrespective of
--- existing alias. By default set to False. If this parameter is set to
--- True and the phone number\/email used for sign up confirmation already
--- exists as an alias with a different user, the API call will migrate the
--- alias from the previous user to the newly created user being confirmed.
--- If set to False, the API will throw an __AliasExistsException__ error.
+-- | Boolean to be specified to force user confirmation irrespective of existing alias. By default set to False. If this parameter is set to True and the phone number\/email used for sign up confirmation already exists as an alias with a different user, the API call will migrate the alias from the previous user to the newly created user being confirmed. If set to False, the API will throw an __AliasExistsException__ error.
 csuForceAliasCreation :: Lens' ConfirmSignUp (Maybe Bool)
 csuForceAliasCreation = lens _csuForceAliasCreation (\ s a -> s{_csuForceAliasCreation = a});
 
--- | A keyed-hash message authentication code (HMAC) calculated using the
--- secret key of a user pool client and username plus the client ID in the
--- message.
+-- | A keyed-hash message authentication code (HMAC) calculated using the secret key of a user pool client and username plus the client ID in the message.
 csuSecretHash :: Lens' ConfirmSignUp (Maybe Text)
 csuSecretHash = lens _csuSecretHash (\ s a -> s{_csuSecretHash = a}) . mapping _Sensitive;
 
@@ -150,8 +142,7 @@
 instance ToQuery ConfirmSignUp where
         toQuery = const mempty
 
--- | Represents the response from the server for the registration
--- confirmation.
+-- | Represents the response from the server for the registration confirmation.
 --
 -- /See:/ 'confirmSignUpResponse' smart constructor.
 newtype ConfirmSignUpResponse = ConfirmSignUpResponse'
diff --git a/gen/Network/AWS/CognitoIdentityProvider/CreateUserPool.hs b/gen/Network/AWS/CognitoIdentityProvider/CreateUserPool.hs
--- a/gen/Network/AWS/CognitoIdentityProvider/CreateUserPool.hs
+++ b/gen/Network/AWS/CognitoIdentityProvider/CreateUserPool.hs
@@ -18,8 +18,7 @@
 -- Stability   : auto-generated
 -- Portability : non-portable (GHC extensions)
 --
--- Creates a new Amazon Cognito user pool and sets the password policy for
--- the pool.
+-- Creates a new Amazon Cognito user pool and sets the password policy for the pool.
 module Network.AWS.CognitoIdentityProvider.CreateUserPool
     (
     -- * Creating a Request
@@ -120,8 +119,7 @@
 cupEmailVerificationSubject :: Lens' CreateUserPool (Maybe Text)
 cupEmailVerificationSubject = lens _cupEmailVerificationSubject (\ s a -> s{_cupEmailVerificationSubject = a});
 
--- | Attributes supported as an alias for this user pool. Possible values:
--- __phone_number__, __email__, or __preferred_username__.
+-- | Attributes supported as an alias for this user pool. Possible values: __phone_number__, __email__, or __preferred_username__.
 cupAliasAttributes :: Lens' CreateUserPool [AliasAttributeType]
 cupAliasAttributes = lens _cupAliasAttributes (\ s a -> s{_cupAliasAttributes = a}) . _Default . _Coerce;
 
@@ -137,8 +135,7 @@
 cupLambdaConfig :: Lens' CreateUserPool (Maybe LambdaConfigType)
 cupLambdaConfig = lens _cupLambdaConfig (\ s a -> s{_cupLambdaConfig = a});
 
--- | The attributes to be auto-verified. Possible values: __email__,
--- __phone_number__.
+-- | The attributes to be auto-verified. Possible values: __email__, __phone_number__.
 cupAutoVerifiedAttributes :: Lens' CreateUserPool [VerifiedAttributeType]
 cupAutoVerifiedAttributes = lens _cupAutoVerifiedAttributes (\ s a -> s{_cupAutoVerifiedAttributes = a}) . _Default . _Coerce;
 
@@ -199,8 +196,7 @@
 instance ToQuery CreateUserPool where
         toQuery = const mempty
 
--- | Represents the response from the server for the request to create a user
--- pool.
+-- | Represents the response from the server for the request to create a user pool.
 --
 -- /See:/ 'createUserPoolResponse' smart constructor.
 data CreateUserPoolResponse = CreateUserPoolResponse'
diff --git a/gen/Network/AWS/CognitoIdentityProvider/CreateUserPoolClient.hs b/gen/Network/AWS/CognitoIdentityProvider/CreateUserPoolClient.hs
--- a/gen/Network/AWS/CognitoIdentityProvider/CreateUserPoolClient.hs
+++ b/gen/Network/AWS/CognitoIdentityProvider/CreateUserPoolClient.hs
@@ -73,13 +73,11 @@
     , _cupcClientName = pClientName_
     }
 
--- | Boolean to specify whether you want to generate a secret for the user
--- pool client being created.
+-- | Boolean to specify whether you want to generate a secret for the user pool client being created.
 cupcGenerateSecret :: Lens' CreateUserPoolClient (Maybe Bool)
 cupcGenerateSecret = lens _cupcGenerateSecret (\ s a -> s{_cupcGenerateSecret = a});
 
--- | The user pool ID for the user pool where you want to create a user pool
--- client.
+-- | The user pool ID for the user pool where you want to create a user pool client.
 cupcUserPoolId :: Lens' CreateUserPoolClient Text
 cupcUserPoolId = lens _cupcUserPoolId (\ s a -> s{_cupcUserPoolId = a});
 
diff --git a/gen/Network/AWS/CognitoIdentityProvider/DeleteUserAttributes.hs b/gen/Network/AWS/CognitoIdentityProvider/DeleteUserAttributes.hs
--- a/gen/Network/AWS/CognitoIdentityProvider/DeleteUserAttributes.hs
+++ b/gen/Network/AWS/CognitoIdentityProvider/DeleteUserAttributes.hs
@@ -69,8 +69,7 @@
 duaAccessToken :: Lens' DeleteUserAttributes (Maybe Text)
 duaAccessToken = lens _duaAccessToken (\ s a -> s{_duaAccessToken = a}) . mapping _Sensitive;
 
--- | An array of strings representing the user attribute names you wish to
--- delete.
+-- | An array of strings representing the user attribute names you wish to delete.
 duaUserAttributeNames :: Lens' DeleteUserAttributes [Text]
 duaUserAttributeNames = lens _duaUserAttributeNames (\ s a -> s{_duaUserAttributeNames = a}) . _Coerce;
 
diff --git a/gen/Network/AWS/CognitoIdentityProvider/DescribeUserPool.hs b/gen/Network/AWS/CognitoIdentityProvider/DescribeUserPool.hs
--- a/gen/Network/AWS/CognitoIdentityProvider/DescribeUserPool.hs
+++ b/gen/Network/AWS/CognitoIdentityProvider/DescribeUserPool.hs
@@ -18,8 +18,7 @@
 -- Stability   : auto-generated
 -- Portability : non-portable (GHC extensions)
 --
--- Returns the configuration information and metadata of the specified user
--- pool.
+-- Returns the configuration information and metadata of the specified user pool.
 module Network.AWS.CognitoIdentityProvider.DescribeUserPool
     (
     -- * Creating a Request
diff --git a/gen/Network/AWS/CognitoIdentityProvider/DescribeUserPoolClient.hs b/gen/Network/AWS/CognitoIdentityProvider/DescribeUserPoolClient.hs
--- a/gen/Network/AWS/CognitoIdentityProvider/DescribeUserPoolClient.hs
+++ b/gen/Network/AWS/CognitoIdentityProvider/DescribeUserPoolClient.hs
@@ -18,8 +18,7 @@
 -- Stability   : auto-generated
 -- Portability : non-portable (GHC extensions)
 --
--- Client method for returning the configuration information and metadata
--- of the specified user pool client.
+-- Client method for returning the configuration information and metadata of the specified user pool client.
 module Network.AWS.CognitoIdentityProvider.DescribeUserPoolClient
     (
     -- * Creating a Request
@@ -114,8 +113,7 @@
 instance ToQuery DescribeUserPoolClient where
         toQuery = const mempty
 
--- | Represents the response from the server from a request to describe the
--- user pool client.
+-- | Represents the response from the server from a request to describe the user pool client.
 --
 -- /See:/ 'describeUserPoolClientResponse' smart constructor.
 data DescribeUserPoolClientResponse = DescribeUserPoolClientResponse'
@@ -139,8 +137,7 @@
     , _dupcrsResponseStatus = pResponseStatus_
     }
 
--- | The user pool client from a server response to describe the user pool
--- client.
+-- | The user pool client from a server response to describe the user pool client.
 dupcrsUserPoolClient :: Lens' DescribeUserPoolClientResponse (Maybe UserPoolClientType)
 dupcrsUserPoolClient = lens _dupcrsUserPoolClient (\ s a -> s{_dupcrsUserPoolClient = a});
 
diff --git a/gen/Network/AWS/CognitoIdentityProvider/ForgotPassword.hs b/gen/Network/AWS/CognitoIdentityProvider/ForgotPassword.hs
--- a/gen/Network/AWS/CognitoIdentityProvider/ForgotPassword.hs
+++ b/gen/Network/AWS/CognitoIdentityProvider/ForgotPassword.hs
@@ -73,9 +73,7 @@
     , _fpUsername = _Sensitive # pUsername_
     }
 
--- | A keyed-hash message authentication code (HMAC) calculated using the
--- secret key of a user pool client and username plus the client ID in the
--- message.
+-- | A keyed-hash message authentication code (HMAC) calculated using the secret key of a user pool client and username plus the client ID in the message.
 fpSecretHash :: Lens' ForgotPassword (Maybe Text)
 fpSecretHash = lens _fpSecretHash (\ s a -> s{_fpSecretHash = a}) . mapping _Sensitive;
 
@@ -83,8 +81,7 @@
 fpClientId :: Lens' ForgotPassword Text
 fpClientId = lens _fpClientId (\ s a -> s{_fpClientId = a}) . _Sensitive;
 
--- | The user name of the user for whom you want to enter a code to retrieve
--- a forgotten password.
+-- | The user name of the user for whom you want to enter a code to retrieve a forgotten password.
 fpUsername :: Lens' ForgotPassword Text
 fpUsername = lens _fpUsername (\ s a -> s{_fpUsername = a}) . _Sensitive;
 
@@ -126,8 +123,7 @@
 instance ToQuery ForgotPassword where
         toQuery = const mempty
 
--- | Respresents the response from the server regarding the request to reset
--- a password.
+-- | Respresents the response from the server regarding the request to reset a password.
 --
 -- /See:/ 'forgotPasswordResponse' smart constructor.
 data ForgotPasswordResponse = ForgotPasswordResponse'
diff --git a/gen/Network/AWS/CognitoIdentityProvider/GetUser.hs b/gen/Network/AWS/CognitoIdentityProvider/GetUser.hs
--- a/gen/Network/AWS/CognitoIdentityProvider/GetUser.hs
+++ b/gen/Network/AWS/CognitoIdentityProvider/GetUser.hs
@@ -63,8 +63,7 @@
     { _guAccessToken = Nothing
     }
 
--- | The access token returned by the server response to get information
--- about the user.
+-- | The access token returned by the server response to get information about the user.
 guAccessToken :: Lens' GetUser (Maybe Text)
 guAccessToken = lens _guAccessToken (\ s a -> s{_guAccessToken = a}) . mapping _Sensitive;
 
@@ -105,8 +104,7 @@
 instance ToQuery GetUser where
         toQuery = const mempty
 
--- | Represents the response from the server from the request to get
--- information about the user.
+-- | Represents the response from the server from the request to get information about the user.
 --
 -- /See:/ 'getUserResponse' smart constructor.
 data GetUserResponse = GetUserResponse'
@@ -147,8 +145,7 @@
 gursResponseStatus :: Lens' GetUserResponse Int
 gursResponseStatus = lens _gursResponseStatus (\ s a -> s{_gursResponseStatus = a});
 
--- | The user name of the user you wish to retrieve from the get user
--- request.
+-- | The user name of the user you wish to retrieve from the get user request.
 gursUsername :: Lens' GetUserResponse Text
 gursUsername = lens _gursUsername (\ s a -> s{_gursUsername = a}) . _Sensitive;
 
diff --git a/gen/Network/AWS/CognitoIdentityProvider/GetUserAttributeVerificationCode.hs b/gen/Network/AWS/CognitoIdentityProvider/GetUserAttributeVerificationCode.hs
--- a/gen/Network/AWS/CognitoIdentityProvider/GetUserAttributeVerificationCode.hs
+++ b/gen/Network/AWS/CognitoIdentityProvider/GetUserAttributeVerificationCode.hs
@@ -18,8 +18,7 @@
 -- Stability   : auto-generated
 -- Portability : non-portable (GHC extensions)
 --
--- Gets the user attribute verification code for the specified attribute
--- name.
+-- Gets the user attribute verification code for the specified attribute name.
 module Network.AWS.CognitoIdentityProvider.GetUserAttributeVerificationCode
     (
     -- * Creating a Request
@@ -68,13 +67,11 @@
     , _guavcAttributeName = pAttributeName_
     }
 
--- | The access token returned by the server response to get the user
--- attribute verification code.
+-- | The access token returned by the server response to get the user attribute verification code.
 guavcAccessToken :: Lens' GetUserAttributeVerificationCode (Maybe Text)
 guavcAccessToken = lens _guavcAccessToken (\ s a -> s{_guavcAccessToken = a}) . mapping _Sensitive;
 
--- | The attribute name returned by the server response to get the user
--- attribute verification code.
+-- | The attribute name returned by the server response to get the user attribute verification code.
 guavcAttributeName :: Lens' GetUserAttributeVerificationCode Text
 guavcAttributeName = lens _guavcAttributeName (\ s a -> s{_guavcAttributeName = a});
 
@@ -121,8 +118,7 @@
          where
         toQuery = const mempty
 
--- | The verification code response returned by the server response to get
--- the user attribute verification code.
+-- | The verification code response returned by the server response to get the user attribute verification code.
 --
 -- /See:/ 'getUserAttributeVerificationCodeResponse' smart constructor.
 data GetUserAttributeVerificationCodeResponse = GetUserAttributeVerificationCodeResponse'
@@ -146,8 +142,7 @@
     , _guavcrsResponseStatus = pResponseStatus_
     }
 
--- | The code delivery details returned by the server response to get the
--- user attribute verification code.
+-- | The code delivery details returned by the server response to get the user attribute verification code.
 guavcrsCodeDeliveryDetails :: Lens' GetUserAttributeVerificationCodeResponse (Maybe CodeDeliveryDetailsType)
 guavcrsCodeDeliveryDetails = lens _guavcrsCodeDeliveryDetails (\ s a -> s{_guavcrsCodeDeliveryDetails = a});
 
diff --git a/gen/Network/AWS/CognitoIdentityProvider/ListUserPoolClients.hs b/gen/Network/AWS/CognitoIdentityProvider/ListUserPoolClients.hs
--- a/gen/Network/AWS/CognitoIdentityProvider/ListUserPoolClients.hs
+++ b/gen/Network/AWS/CognitoIdentityProvider/ListUserPoolClients.hs
@@ -73,19 +73,15 @@
     , _lupcUserPoolId = pUserPoolId_
     }
 
--- | An identifier that was returned from the previous call to this
--- operation, which can be used to return the next set of items in the
--- list.
+-- | An identifier that was returned from the previous call to this operation, which can be used to return the next set of items in the list.
 lupcNextToken :: Lens' ListUserPoolClients (Maybe Text)
 lupcNextToken = lens _lupcNextToken (\ s a -> s{_lupcNextToken = a});
 
--- | The maximum number of results you want the request to return when
--- listing the user pool clients.
+-- | The maximum number of results you want the request to return when listing the user pool clients.
 lupcMaxResults :: Lens' ListUserPoolClients (Maybe Natural)
 lupcMaxResults = lens _lupcMaxResults (\ s a -> s{_lupcMaxResults = a}) . mapping _Nat;
 
--- | The user pool ID for the user pool where you want to list user pool
--- clients.
+-- | The user pool ID for the user pool where you want to list user pool clients.
 lupcUserPoolId :: Lens' ListUserPoolClients Text
 lupcUserPoolId = lens _lupcUserPoolId (\ s a -> s{_lupcUserPoolId = a});
 
@@ -157,9 +153,7 @@
     , _lupcrsResponseStatus = pResponseStatus_
     }
 
--- | An identifier that was returned from the previous call to this
--- operation, which can be used to return the next set of items in the
--- list.
+-- | An identifier that was returned from the previous call to this operation, which can be used to return the next set of items in the list.
 lupcrsNextToken :: Lens' ListUserPoolClientsResponse (Maybe Text)
 lupcrsNextToken = lens _lupcrsNextToken (\ s a -> s{_lupcrsNextToken = a});
 
diff --git a/gen/Network/AWS/CognitoIdentityProvider/ListUserPools.hs b/gen/Network/AWS/CognitoIdentityProvider/ListUserPools.hs
--- a/gen/Network/AWS/CognitoIdentityProvider/ListUserPools.hs
+++ b/gen/Network/AWS/CognitoIdentityProvider/ListUserPools.hs
@@ -68,14 +68,11 @@
     , _lupMaxResults = _Nat # pMaxResults_
     }
 
--- | An identifier that was returned from the previous call to this
--- operation, which can be used to return the next set of items in the
--- list.
+-- | An identifier that was returned from the previous call to this operation, which can be used to return the next set of items in the list.
 lupNextToken :: Lens' ListUserPools (Maybe Text)
 lupNextToken = lens _lupNextToken (\ s a -> s{_lupNextToken = a});
 
--- | The maximum number of results you want the request to return when
--- listing the user pools.
+-- | The maximum number of results you want the request to return when listing the user pools.
 lupMaxResults :: Lens' ListUserPools Natural
 lupMaxResults = lens _lupMaxResults (\ s a -> s{_lupMaxResults = a}) . _Nat;
 
@@ -149,9 +146,7 @@
 luprsUserPools :: Lens' ListUserPoolsResponse [UserPoolDescriptionType]
 luprsUserPools = lens _luprsUserPools (\ s a -> s{_luprsUserPools = a}) . _Default . _Coerce;
 
--- | An identifier that was returned from the previous call to this
--- operation, which can be used to return the next set of items in the
--- list.
+-- | An identifier that was returned from the previous call to this operation, which can be used to return the next set of items in the list.
 luprsNextToken :: Lens' ListUserPoolsResponse (Maybe Text)
 luprsNextToken = lens _luprsNextToken (\ s a -> s{_luprsNextToken = a});
 
diff --git a/gen/Network/AWS/CognitoIdentityProvider/ListUsers.hs b/gen/Network/AWS/CognitoIdentityProvider/ListUsers.hs
--- a/gen/Network/AWS/CognitoIdentityProvider/ListUsers.hs
+++ b/gen/Network/AWS/CognitoIdentityProvider/ListUsers.hs
@@ -83,9 +83,7 @@
     , _luUserPoolId = pUserPoolId_
     }
 
--- | An identifier that was returned from the previous call to this
--- operation, which can be used to return the next set of items in the
--- list.
+-- | An identifier that was returned from the previous call to this operation, which can be used to return the next set of items in the list.
 luPaginationToken :: Lens' ListUsers (Maybe Text)
 luPaginationToken = lens _luPaginationToken (\ s a -> s{_luPaginationToken = a});
 
@@ -180,9 +178,7 @@
     , _lursResponseStatus = pResponseStatus_
     }
 
--- | An identifier that was returned from the previous call to this
--- operation, which can be used to return the next set of items in the
--- list.
+-- | An identifier that was returned from the previous call to this operation, which can be used to return the next set of items in the list.
 lursPaginationToken :: Lens' ListUsersResponse (Maybe Text)
 lursPaginationToken = lens _lursPaginationToken (\ s a -> s{_lursPaginationToken = a});
 
diff --git a/gen/Network/AWS/CognitoIdentityProvider/ResendConfirmationCode.hs b/gen/Network/AWS/CognitoIdentityProvider/ResendConfirmationCode.hs
--- a/gen/Network/AWS/CognitoIdentityProvider/ResendConfirmationCode.hs
+++ b/gen/Network/AWS/CognitoIdentityProvider/ResendConfirmationCode.hs
@@ -18,8 +18,7 @@
 -- Stability   : auto-generated
 -- Portability : non-portable (GHC extensions)
 --
--- Resends the confirmation (for confirmation of registration) to a
--- specific user in the user pool.
+-- Resends the confirmation (for confirmation of registration) to a specific user in the user pool.
 module Network.AWS.CognitoIdentityProvider.ResendConfirmationCode
     (
     -- * Creating a Request
@@ -74,9 +73,7 @@
     , _rccUsername = _Sensitive # pUsername_
     }
 
--- | A keyed-hash message authentication code (HMAC) calculated using the
--- secret key of a user pool client and username plus the client ID in the
--- message.
+-- | A keyed-hash message authentication code (HMAC) calculated using the secret key of a user pool client and username plus the client ID in the message.
 rccSecretHash :: Lens' ResendConfirmationCode (Maybe Text)
 rccSecretHash = lens _rccSecretHash (\ s a -> s{_rccSecretHash = a}) . mapping _Sensitive;
 
@@ -84,8 +81,7 @@
 rccClientId :: Lens' ResendConfirmationCode Text
 rccClientId = lens _rccClientId (\ s a -> s{_rccClientId = a}) . _Sensitive;
 
--- | The user name of the user to whom you wish to resend a confirmation
--- code.
+-- | The user name of the user to whom you wish to resend a confirmation code.
 rccUsername :: Lens' ResendConfirmationCode Text
 rccUsername = lens _rccUsername (\ s a -> s{_rccUsername = a}) . _Sensitive;
 
@@ -128,8 +124,7 @@
 instance ToQuery ResendConfirmationCode where
         toQuery = const mempty
 
--- | The response from the server when the Amazon Cognito service makes the
--- request to resend a confirmation code.
+-- | The response from the server when the Amazon Cognito service makes the request to resend a confirmation code.
 --
 -- /See:/ 'resendConfirmationCodeResponse' smart constructor.
 data ResendConfirmationCodeResponse = ResendConfirmationCodeResponse'
diff --git a/gen/Network/AWS/CognitoIdentityProvider/SetUserSettings.hs b/gen/Network/AWS/CognitoIdentityProvider/SetUserSettings.hs
--- a/gen/Network/AWS/CognitoIdentityProvider/SetUserSettings.hs
+++ b/gen/Network/AWS/CognitoIdentityProvider/SetUserSettings.hs
@@ -18,9 +18,7 @@
 -- Stability   : auto-generated
 -- Portability : non-portable (GHC extensions)
 --
--- Sets the user settings like multi-factor authentication (MFA). If MFA is
--- to be removed for a particular attribute pass the attribute with code
--- delivery as null. If null list is passed, all MFA options are removed.
+-- Sets the user settings like multi-factor authentication (MFA). If MFA is to be removed for a particular attribute pass the attribute with code delivery as null. If null list is passed, all MFA options are removed.
 module Network.AWS.CognitoIdentityProvider.SetUserSettings
     (
     -- * Creating a Request
diff --git a/gen/Network/AWS/CognitoIdentityProvider/SignUp.hs b/gen/Network/AWS/CognitoIdentityProvider/SignUp.hs
--- a/gen/Network/AWS/CognitoIdentityProvider/SignUp.hs
+++ b/gen/Network/AWS/CognitoIdentityProvider/SignUp.hs
@@ -18,8 +18,7 @@
 -- Stability   : auto-generated
 -- Portability : non-portable (GHC extensions)
 --
--- Registers the user in the specified user pool and creates a user name,
--- password, and user attributes.
+-- Registers the user in the specified user pool and creates a user name, password, and user attributes.
 module Network.AWS.CognitoIdentityProvider.SignUp
     (
     -- * Creating a Request
@@ -95,9 +94,7 @@
 suUserAttributes :: Lens' SignUp [AttributeType]
 suUserAttributes = lens _suUserAttributes (\ s a -> s{_suUserAttributes = a}) . _Default . _Coerce;
 
--- | A keyed-hash message authentication code (HMAC) calculated using the
--- secret key of a user pool client and username plus the client ID in the
--- message.
+-- | A keyed-hash message authentication code (HMAC) calculated using the secret key of a user pool client and username plus the client ID in the message.
 suSecretHash :: Lens' SignUp (Maybe Text)
 suSecretHash = lens _suSecretHash (\ s a -> s{_suSecretHash = a}) . mapping _Sensitive;
 
@@ -187,8 +184,7 @@
     , _sursResponseStatus = pResponseStatus_
     }
 
--- | A response from the server indicating that a user registration has been
--- confirmed.
+-- | A response from the server indicating that a user registration has been confirmed.
 sursUserConfirmed :: Lens' SignUpResponse (Maybe Bool)
 sursUserConfirmed = lens _sursUserConfirmed (\ s a -> s{_sursUserConfirmed = a});
 
diff --git a/gen/Network/AWS/CognitoIdentityProvider/Types.hs b/gen/Network/AWS/CognitoIdentityProvider/Types.hs
--- a/gen/Network/AWS/CognitoIdentityProvider/Types.hs
+++ b/gen/Network/AWS/CognitoIdentityProvider/Types.hs
@@ -217,20 +217,17 @@
       | has (hasStatus 509) e = Just "limit_exceeded"
       | otherwise = Nothing
 
--- | This exception is thrown when the Amazon Cognito service encounters an
--- invalid parameter.
+-- | This exception is thrown when the Amazon Cognito service encounters an invalid parameter.
 _InvalidParameterException :: AsError a => Getting (First ServiceError) a ServiceError
 _InvalidParameterException =
     _ServiceError . hasCode "InvalidParameterException"
 
--- | This exception is thrown when the Amazon Cognito service encounters an
--- invalid AWS Lambda response.
+-- | This exception is thrown when the Amazon Cognito service encounters an invalid AWS Lambda response.
 _InvalidLambdaResponseException :: AsError a => Getting (First ServiceError) a ServiceError
 _InvalidLambdaResponseException =
     _ServiceError . hasCode "InvalidLambdaResponseException"
 
--- | This exception gets thrown when the Amazon Cognito service encounters an
--- unexpected exception with the AWS Lambda service.
+-- | This exception gets thrown when the Amazon Cognito service encounters an unexpected exception with the AWS Lambda service.
 _UnexpectedLambdaException :: AsError a => Getting (First ServiceError) a ServiceError
 _UnexpectedLambdaException =
     _ServiceError . hasCode "UnexpectedLambdaException"
@@ -239,29 +236,24 @@
 _NotAuthorizedException :: AsError a => Getting (First ServiceError) a ServiceError
 _NotAuthorizedException = _ServiceError . hasCode "NotAuthorizedException"
 
--- | This exception is thrown when Amazon Cognito encounters an internal
--- error.
+-- | This exception is thrown when Amazon Cognito encounters an internal error.
 _InternalErrorException :: AsError a => Getting (First ServiceError) a ServiceError
 _InternalErrorException = _ServiceError . hasCode "InternalErrorException"
 
--- | This exception is thrown if the provided code does not match what the
--- server was expecting.
+-- | This exception is thrown if the provided code does not match what the server was expecting.
 _CodeMismatchException :: AsError a => Getting (First ServiceError) a ServiceError
 _CodeMismatchException = _ServiceError . hasCode "CodeMismatchException"
 
--- | This exception gets thrown when the user has made too many requests for
--- a given operation.
+-- | This exception gets thrown when the user has made too many requests for a given operation.
 _TooManyRequestsException :: AsError a => Getting (First ServiceError) a ServiceError
 _TooManyRequestsException = _ServiceError . hasCode "TooManyRequestsException"
 
--- | This exception is thrown if two or more modifications are happening
--- concurrently.
+-- | This exception is thrown if two or more modifications are happening concurrently.
 _ConcurrentModificationException :: AsError a => Getting (First ServiceError) a ServiceError
 _ConcurrentModificationException =
     _ServiceError . hasCode "ConcurrentModificationException"
 
--- | This exception gets thrown when the Amazon Cognito service encounters a
--- user validation exception with the AWS Lambda service.
+-- | This exception gets thrown when the Amazon Cognito service encounters a user validation exception with the AWS Lambda service.
 _UserLambdaValidationException :: AsError a => Getting (First ServiceError) a ServiceError
 _UserLambdaValidationException =
     _ServiceError . hasCode "UserLambdaValidationException"
@@ -270,36 +262,28 @@
 _ExpiredCodeException :: AsError a => Getting (First ServiceError) a ServiceError
 _ExpiredCodeException = _ServiceError . hasCode "ExpiredCodeException"
 
--- | This exception gets thrown when the user has made too many failed
--- attempts for a given action (e.g., sign in).
+-- | This exception gets thrown when the user has made too many failed attempts for a given action (e.g., sign in).
 _TooManyFailedAttemptsException :: AsError a => Getting (First ServiceError) a ServiceError
 _TooManyFailedAttemptsException =
     _ServiceError . hasCode "TooManyFailedAttemptsException"
 
--- | This exception is thrown when the Amazon Cognito service cannot find the
--- requested resource.
+-- | This exception is thrown when the Amazon Cognito service cannot find the requested resource.
 _ResourceNotFoundException :: AsError a => Getting (First ServiceError) a ServiceError
 _ResourceNotFoundException =
     _ServiceError . hasCode "ResourceNotFoundException"
 
--- | This exception is thrown when a user tries to confirm the account with
--- an email or phone number that has already been supplied as an alias from
--- a different account. This exception tells user that an account with this
--- email or phone already exists.
+-- | This exception is thrown when a user tries to confirm the account with an email or phone number that has already been supplied as an alias from a different account. This exception tells user that an account with this email or phone already exists.
 _AliasExistsException :: AsError a => Getting (First ServiceError) a ServiceError
 _AliasExistsException = _ServiceError . hasCode "AliasExistsException"
 
--- | This exception is thrown when a user exceeds the limit for a requested
--- AWS resource.
+-- | This exception is thrown when a user exceeds the limit for a requested AWS resource.
 _LimitExceededException :: AsError a => Getting (First ServiceError) a ServiceError
 _LimitExceededException = _ServiceError . hasCode "LimitExceededException"
 
--- | This exception is thrown when the Amazon Cognito service encounters an
--- invalid password.
+-- | This exception is thrown when the Amazon Cognito service encounters an invalid password.
 _InvalidPasswordException :: AsError a => Getting (First ServiceError) a ServiceError
 _InvalidPasswordException = _ServiceError . hasCode "InvalidPasswordException"
 
--- | This exception is thrown when Amazon Cognito encounters a user name that
--- already exists in the user pool.
+-- | This exception is thrown when Amazon Cognito encounters a user name that already exists in the user pool.
 _UsernameExistsException :: AsError a => Getting (First ServiceError) a ServiceError
 _UsernameExistsException = _ServiceError . hasCode "UsernameExistsException"
diff --git a/gen/Network/AWS/CognitoIdentityProvider/Types/Product.hs b/gen/Network/AWS/CognitoIdentityProvider/Types/Product.hs
--- a/gen/Network/AWS/CognitoIdentityProvider/Types/Product.hs
+++ b/gen/Network/AWS/CognitoIdentityProvider/Types/Product.hs
@@ -250,8 +250,7 @@
                  [("DeliveryMedium" .=) <$> _motDeliveryMedium,
                   ("AttributeName" .=) <$> _motAttributeName])
 
--- | The minimum and maximum value of an attribute that is of the number data
--- type.
+-- | The minimum and maximum value of an attribute that is of the number data type.
 --
 -- /See:/ 'numberAttributeConstraintsType' smart constructor.
 data NumberAttributeConstraintsType = NumberAttributeConstraintsType'
@@ -336,28 +335,23 @@
     , _pptRequireSymbols = Nothing
     }
 
--- | In the password policy that you have set, refers to whether you have
--- required users to use at least one number in their password.
+-- | In the password policy that you have set, refers to whether you have required users to use at least one number in their password.
 pptRequireNumbers :: Lens' PasswordPolicyType (Maybe Bool)
 pptRequireNumbers = lens _pptRequireNumbers (\ s a -> s{_pptRequireNumbers = a});
 
--- | In the password policy that you have set, refers to whether you have
--- required users to use at least one uppercase letter in their password.
+-- | In the password policy that you have set, refers to whether you have required users to use at least one uppercase letter in their password.
 pptRequireUppercase :: Lens' PasswordPolicyType (Maybe Bool)
 pptRequireUppercase = lens _pptRequireUppercase (\ s a -> s{_pptRequireUppercase = a});
 
--- | In the password policy that you have set, refers to whether you have
--- required users to use at least one lowercase letter in their password.
+-- | In the password policy that you have set, refers to whether you have required users to use at least one lowercase letter in their password.
 pptRequireLowercase :: Lens' PasswordPolicyType (Maybe Bool)
 pptRequireLowercase = lens _pptRequireLowercase (\ s a -> s{_pptRequireLowercase = a});
 
--- | The minimum length of the password policy that you have set. Cannot be
--- less than 6.
+-- | The minimum length of the password policy that you have set. Cannot be less than 6.
 pptMinimumLength :: Lens' PasswordPolicyType (Maybe Natural)
 pptMinimumLength = lens _pptMinimumLength (\ s a -> s{_pptMinimumLength = a}) . mapping _Nat;
 
--- | In the password policy that you have set, refers to whether you have
--- required users to use at least one symbol in their password.
+-- | In the password policy that you have set, refers to whether you have required users to use at least one symbol in their password.
 pptRequireSymbols :: Lens' PasswordPolicyType (Maybe Bool)
 pptRequireSymbols = lens _pptRequireSymbols (\ s a -> s{_pptRequireSymbols = a});
 
@@ -433,9 +427,7 @@
 satNumberAttributeConstraints :: Lens' SchemaAttributeType (Maybe NumberAttributeConstraintsType)
 satNumberAttributeConstraints = lens _satNumberAttributeConstraints (\ s a -> s{_satNumberAttributeConstraints = a});
 
--- | Specifies whether a user pool attribute is required. If the attribute is
--- required and the user does not provide a value, registration or sign-in
--- will fail.
+-- | Specifies whether a user pool attribute is required. If the attribute is required and the user does not provide a value, registration or sign-in will fail.
 satRequired :: Lens' SchemaAttributeType (Maybe Bool)
 satRequired = lens _satRequired (\ s a -> s{_satRequired = a});
 
@@ -572,8 +564,7 @@
 upcdClientId :: Lens' UserPoolClientDescription (Maybe Text)
 upcdClientId = lens _upcdClientId (\ s a -> s{_upcdClientId = a}) . mapping _Sensitive;
 
--- | The user pool ID for the user pool where you want to describe the user
--- pool client.
+-- | The user pool ID for the user pool where you want to describe the user pool client.
 upcdUserPoolId :: Lens' UserPoolClientDescription (Maybe Text)
 upcdUserPoolId = lens _upcdUserPoolId (\ s a -> s{_upcdUserPoolId = a});
 
@@ -909,12 +900,9 @@
 
 -- | Can be one of the following values:
 --
--- -   'OFF' - MFA tokens are not required and cannot be specified during
---     user registration.
--- -   'ON' - MFA tokens are required for all user registrations. You can
---     only specify required when you are initially creating a user pool.
--- -   'OPTIONAL' - Users have the option when registering to create an MFA
---     token.
+-- -   'OFF' - MFA tokens are not required and cannot be specified during user registration.
+-- -   'ON' - MFA tokens are required for all user registrations. You can only specify required when you are initially creating a user pool.
+-- -   'OPTIONAL' - Users have the option when registering to create an MFA token.
 uptMFAConfiguration :: Lens' UserPoolType (Maybe UserPoolMFAType)
 uptMFAConfiguration = lens _uptMFAConfiguration (\ s a -> s{_uptMFAConfiguration = a});
 
@@ -926,8 +914,7 @@
 uptCreationDate :: Lens' UserPoolType (Maybe UTCTime)
 uptCreationDate = lens _uptCreationDate (\ s a -> s{_uptCreationDate = a}) . mapping _Time;
 
--- | A container describing the AWS Lambda triggers associated with a user
--- pool.
+-- | A container describing the AWS Lambda triggers associated with a user pool.
 uptLambdaConfig :: Lens' UserPoolType (Maybe LambdaConfigType)
 uptLambdaConfig = lens _uptLambdaConfig (\ s a -> s{_uptLambdaConfig = a});
 
diff --git a/gen/Network/AWS/CognitoIdentityProvider/UpdateUserAttributes.hs b/gen/Network/AWS/CognitoIdentityProvider/UpdateUserAttributes.hs
--- a/gen/Network/AWS/CognitoIdentityProvider/UpdateUserAttributes.hs
+++ b/gen/Network/AWS/CognitoIdentityProvider/UpdateUserAttributes.hs
@@ -112,8 +112,7 @@
 instance ToQuery UpdateUserAttributes where
         toQuery = const mempty
 
--- | Represents the response from the server for the request to update user
--- attributes.
+-- | Represents the response from the server for the request to update user attributes.
 --
 -- /See:/ 'updateUserAttributesResponse' smart constructor.
 data UpdateUserAttributesResponse = UpdateUserAttributesResponse'
@@ -137,8 +136,7 @@
     , _uuarsResponseStatus = pResponseStatus_
     }
 
--- | The code delivery details list from the server for the request to update
--- user attributes.
+-- | The code delivery details list from the server for the request to update user attributes.
 uuarsCodeDeliveryDetailsList :: Lens' UpdateUserAttributesResponse [CodeDeliveryDetailsType]
 uuarsCodeDeliveryDetailsList = lens _uuarsCodeDeliveryDetailsList (\ s a -> s{_uuarsCodeDeliveryDetailsList = a}) . _Default . _Coerce;
 
diff --git a/gen/Network/AWS/CognitoIdentityProvider/UpdateUserPool.hs b/gen/Network/AWS/CognitoIdentityProvider/UpdateUserPool.hs
--- a/gen/Network/AWS/CognitoIdentityProvider/UpdateUserPool.hs
+++ b/gen/Network/AWS/CognitoIdentityProvider/UpdateUserPool.hs
@@ -119,22 +119,17 @@
 
 -- | Can be one of the following values:
 --
--- -   'OFF' - MFA tokens are not required and cannot be specified during
---     user registration.
--- -   'ON' - MFA tokens are required for all user registrations. You can
---     only specify required when you are initially creating a user pool.
--- -   'OPTIONAL' - Users have the option when registering to create an MFA
---     token.
+-- -   'OFF' - MFA tokens are not required and cannot be specified during user registration.
+-- -   'ON' - MFA tokens are required for all user registrations. You can only specify required when you are initially creating a user pool.
+-- -   'OPTIONAL' - Users have the option when registering to create an MFA token.
 uupMFAConfiguration :: Lens' UpdateUserPool (Maybe UserPoolMFAType)
 uupMFAConfiguration = lens _uupMFAConfiguration (\ s a -> s{_uupMFAConfiguration = a});
 
--- | The AWS Lambda configuration information from the request to update the
--- user pool.
+-- | The AWS Lambda configuration information from the request to update the user pool.
 uupLambdaConfig :: Lens' UpdateUserPool (Maybe LambdaConfigType)
 uupLambdaConfig = lens _uupLambdaConfig (\ s a -> s{_uupLambdaConfig = a});
 
--- | The attributes that are automatically verified when the Amazon Cognito
--- service makes a request to update user pools.
+-- | The attributes that are automatically verified when the Amazon Cognito service makes a request to update user pools.
 uupAutoVerifiedAttributes :: Lens' UpdateUserPool [VerifiedAttributeType]
 uupAutoVerifiedAttributes = lens _uupAutoVerifiedAttributes (\ s a -> s{_uupAutoVerifiedAttributes = a}) . _Default . _Coerce;
 
@@ -193,8 +188,7 @@
 instance ToQuery UpdateUserPool where
         toQuery = const mempty
 
--- | Represents the response from the server when you make a request to
--- update the user pool.
+-- | Represents the response from the server when you make a request to update the user pool.
 --
 -- /See:/ 'updateUserPoolResponse' smart constructor.
 newtype UpdateUserPoolResponse = UpdateUserPoolResponse'
diff --git a/gen/Network/AWS/CognitoIdentityProvider/UpdateUserPoolClient.hs b/gen/Network/AWS/CognitoIdentityProvider/UpdateUserPoolClient.hs
--- a/gen/Network/AWS/CognitoIdentityProvider/UpdateUserPoolClient.hs
+++ b/gen/Network/AWS/CognitoIdentityProvider/UpdateUserPoolClient.hs
@@ -18,8 +18,7 @@
 -- Stability   : auto-generated
 -- Portability : non-portable (GHC extensions)
 --
--- Allows the developer to update the specified user pool client and
--- password policy.
+-- Allows the developer to update the specified user pool client and password policy.
 module Network.AWS.CognitoIdentityProvider.UpdateUserPoolClient
     (
     -- * Creating a Request
@@ -78,8 +77,7 @@
 uupcClientName :: Lens' UpdateUserPoolClient (Maybe Text)
 uupcClientName = lens _uupcClientName (\ s a -> s{_uupcClientName = a});
 
--- | The user pool ID for the user pool where you want to update the user
--- pool client.
+-- | The user pool ID for the user pool where you want to update the user pool client.
 uupcUserPoolId :: Lens' UpdateUserPoolClient Text
 uupcUserPoolId = lens _uupcUserPoolId (\ s a -> s{_uupcUserPoolId = a});
 
@@ -125,8 +123,7 @@
 instance ToQuery UpdateUserPoolClient where
         toQuery = const mempty
 
--- | Represents the response from the server to the request to update the
--- user pool client.
+-- | Represents the response from the server to the request to update the user pool client.
 --
 -- /See:/ 'updateUserPoolClientResponse' smart constructor.
 data UpdateUserPoolClientResponse = UpdateUserPoolClientResponse'
@@ -150,8 +147,7 @@
     , _uupcrsResponseStatus = pResponseStatus_
     }
 
--- | The user pool client value from the response from the server when an
--- update user pool client request is made.
+-- | The user pool client value from the response from the server when an update user pool client request is made.
 uupcrsUserPoolClient :: Lens' UpdateUserPoolClientResponse (Maybe UserPoolClientType)
 uupcrsUserPoolClient = lens _uupcrsUserPoolClient (\ s a -> s{_uupcrsUserPoolClient = a});
 
diff --git a/gen/Network/AWS/CognitoIdentityProvider/VerifyUserAttribute.hs b/gen/Network/AWS/CognitoIdentityProvider/VerifyUserAttribute.hs
--- a/gen/Network/AWS/CognitoIdentityProvider/VerifyUserAttribute.hs
+++ b/gen/Network/AWS/CognitoIdentityProvider/VerifyUserAttribute.hs
@@ -121,8 +121,7 @@
 instance ToQuery VerifyUserAttribute where
         toQuery = const mempty
 
--- | A container representing the response from the server from the request
--- to verify user attributes.
+-- | A container representing the response from the server from the request to verify user attributes.
 --
 -- /See:/ 'verifyUserAttributeResponse' smart constructor.
 newtype VerifyUserAttributeResponse = VerifyUserAttributeResponse'
diff --git a/test/Test/AWS/Gen/CognitoIdentityProvider.hs b/test/Test/AWS/Gen/CognitoIdentityProvider.hs
--- a/test/Test/AWS/Gen/CognitoIdentityProvider.hs
+++ b/test/Test/AWS/Gen/CognitoIdentityProvider.hs
@@ -28,211 +28,211 @@
 -- fixtures :: TestTree
 -- fixtures =
 --     [ testGroup "request"
---         [ testDeleteUserPool $
+--         [ requestDeleteUserPool $
 --             deleteUserPool
 --
---         , testUpdateUserPool $
+--         , requestUpdateUserPool $
 --             updateUserPool
 --
---         , testAdminEnableUser $
+--         , requestAdminEnableUser $
 --             adminEnableUser
 --
---         , testGetUserAttributeVerificationCode $
+--         , requestGetUserAttributeVerificationCode $
 --             getUserAttributeVerificationCode
 --
---         , testUpdateUserAttributes $
+--         , requestUpdateUserAttributes $
 --             updateUserAttributes
 --
---         , testDeleteUserAttributes $
+--         , requestDeleteUserAttributes $
 --             deleteUserAttributes
 --
---         , testVerifyUserAttribute $
+--         , requestVerifyUserAttribute $
 --             verifyUserAttribute
 --
---         , testAdminDisableUser $
+--         , requestAdminDisableUser $
 --             adminDisableUser
 --
---         , testConfirmForgotPassword $
+--         , requestConfirmForgotPassword $
 --             confirmForgotPassword
 --
---         , testListUsers $
+--         , requestListUsers $
 --             listUsers
 --
---         , testAdminDeleteUserAttributes $
+--         , requestAdminDeleteUserAttributes $
 --             adminDeleteUserAttributes
 --
---         , testAdminUpdateUserAttributes $
+--         , requestAdminUpdateUserAttributes $
 --             adminUpdateUserAttributes
 --
---         , testAdminGetUser $
+--         , requestAdminGetUser $
 --             adminGetUser
 --
---         , testForgotPassword $
+--         , requestForgotPassword $
 --             forgotPassword
 --
---         , testDescribeUserPool $
+--         , requestDescribeUserPool $
 --             describeUserPool
 --
---         , testAdminConfirmSignUp $
+--         , requestAdminConfirmSignUp $
 --             adminConfirmSignUp
 --
---         , testSignUp $
+--         , requestSignUp $
 --             signUp
 --
---         , testChangePassword $
+--         , requestChangePassword $
 --             changePassword
 --
---         , testCreateUserPool $
+--         , requestCreateUserPool $
 --             createUserPool
 --
---         , testConfirmSignUp $
+--         , requestConfirmSignUp $
 --             confirmSignUp
 --
---         , testListUserPools $
+--         , requestListUserPools $
 --             listUserPools
 --
---         , testAdminResetUserPassword $
+--         , requestAdminResetUserPassword $
 --             adminResetUserPassword
 --
---         , testGetUser $
+--         , requestGetUser $
 --             getUser
 --
---         , testAdminDeleteUser $
+--         , requestAdminDeleteUser $
 --             adminDeleteUser
 --
---         , testAddCustomAttributes $
+--         , requestAddCustomAttributes $
 --             addCustomAttributes
 --
---         , testListUserPoolClients $
+--         , requestListUserPoolClients $
 --             listUserPoolClients
 --
---         , testUpdateUserPoolClient $
+--         , requestUpdateUserPoolClient $
 --             updateUserPoolClient
 --
---         , testDeleteUserPoolClient $
+--         , requestDeleteUserPoolClient $
 --             deleteUserPoolClient
 --
---         , testDeleteUser $
+--         , requestDeleteUser $
 --             deleteUser
 --
---         , testCreateUserPoolClient $
+--         , requestCreateUserPoolClient $
 --             createUserPoolClient
 --
---         , testSetUserSettings $
+--         , requestSetUserSettings $
 --             setUserSettings
 --
---         , testDescribeUserPoolClient $
+--         , requestDescribeUserPoolClient $
 --             describeUserPoolClient
 --
---         , testResendConfirmationCode $
+--         , requestResendConfirmationCode $
 --             resendConfirmationCode
 --
---         , testAdminSetUserSettings $
+--         , requestAdminSetUserSettings $
 --             adminSetUserSettings
 --
 --           ]
 
 --     , testGroup "response"
---         [ testDeleteUserPoolResponse $
+--         [ responseDeleteUserPool $
 --             deleteUserPoolResponse
 --
---         , testUpdateUserPoolResponse $
+--         , responseUpdateUserPool $
 --             updateUserPoolResponse
 --
---         , testAdminEnableUserResponse $
+--         , responseAdminEnableUser $
 --             adminEnableUserResponse
 --
---         , testGetUserAttributeVerificationCodeResponse $
+--         , responseGetUserAttributeVerificationCode $
 --             getUserAttributeVerificationCodeResponse
 --
---         , testUpdateUserAttributesResponse $
+--         , responseUpdateUserAttributes $
 --             updateUserAttributesResponse
 --
---         , testDeleteUserAttributesResponse $
+--         , responseDeleteUserAttributes $
 --             deleteUserAttributesResponse
 --
---         , testVerifyUserAttributeResponse $
+--         , responseVerifyUserAttribute $
 --             verifyUserAttributeResponse
 --
---         , testAdminDisableUserResponse $
+--         , responseAdminDisableUser $
 --             adminDisableUserResponse
 --
---         , testConfirmForgotPasswordResponse $
+--         , responseConfirmForgotPassword $
 --             confirmForgotPasswordResponse
 --
---         , testListUsersResponse $
+--         , responseListUsers $
 --             listUsersResponse
 --
---         , testAdminDeleteUserAttributesResponse $
+--         , responseAdminDeleteUserAttributes $
 --             adminDeleteUserAttributesResponse
 --
---         , testAdminUpdateUserAttributesResponse $
+--         , responseAdminUpdateUserAttributes $
 --             adminUpdateUserAttributesResponse
 --
---         , testAdminGetUserResponse $
+--         , responseAdminGetUser $
 --             adminGetUserResponse
 --
---         , testForgotPasswordResponse $
+--         , responseForgotPassword $
 --             forgotPasswordResponse
 --
---         , testDescribeUserPoolResponse $
+--         , responseDescribeUserPool $
 --             describeUserPoolResponse
 --
---         , testAdminConfirmSignUpResponse $
+--         , responseAdminConfirmSignUp $
 --             adminConfirmSignUpResponse
 --
---         , testSignUpResponse $
+--         , responseSignUp $
 --             signUpResponse
 --
---         , testChangePasswordResponse $
+--         , responseChangePassword $
 --             changePasswordResponse
 --
---         , testCreateUserPoolResponse $
+--         , responseCreateUserPool $
 --             createUserPoolResponse
 --
---         , testConfirmSignUpResponse $
+--         , responseConfirmSignUp $
 --             confirmSignUpResponse
 --
---         , testListUserPoolsResponse $
+--         , responseListUserPools $
 --             listUserPoolsResponse
 --
---         , testAdminResetUserPasswordResponse $
+--         , responseAdminResetUserPassword $
 --             adminResetUserPasswordResponse
 --
---         , testGetUserResponse $
+--         , responseGetUser $
 --             getUserResponse
 --
---         , testAdminDeleteUserResponse $
+--         , responseAdminDeleteUser $
 --             adminDeleteUserResponse
 --
---         , testAddCustomAttributesResponse $
+--         , responseAddCustomAttributes $
 --             addCustomAttributesResponse
 --
---         , testListUserPoolClientsResponse $
+--         , responseListUserPoolClients $
 --             listUserPoolClientsResponse
 --
---         , testUpdateUserPoolClientResponse $
+--         , responseUpdateUserPoolClient $
 --             updateUserPoolClientResponse
 --
---         , testDeleteUserPoolClientResponse $
+--         , responseDeleteUserPoolClient $
 --             deleteUserPoolClientResponse
 --
---         , testDeleteUserResponse $
+--         , responseDeleteUser $
 --             deleteUserResponse
 --
---         , testCreateUserPoolClientResponse $
+--         , responseCreateUserPoolClient $
 --             createUserPoolClientResponse
 --
---         , testSetUserSettingsResponse $
+--         , responseSetUserSettings $
 --             setUserSettingsResponse
 --
---         , testDescribeUserPoolClientResponse $
+--         , responseDescribeUserPoolClient $
 --             describeUserPoolClientResponse
 --
---         , testResendConfirmationCodeResponse $
+--         , responseResendConfirmationCode $
 --             resendConfirmationCodeResponse
 --
---         , testAdminSetUserSettingsResponse $
+--         , responseAdminSetUserSettings $
 --             adminSetUserSettingsResponse
 --
 --           ]
@@ -240,411 +240,411 @@
 
 -- Requests
 
-testDeleteUserPool :: DeleteUserPool -> TestTree
-testDeleteUserPool = req
+requestDeleteUserPool :: DeleteUserPool -> TestTree
+requestDeleteUserPool = req
     "DeleteUserPool"
     "fixture/DeleteUserPool.yaml"
 
-testUpdateUserPool :: UpdateUserPool -> TestTree
-testUpdateUserPool = req
+requestUpdateUserPool :: UpdateUserPool -> TestTree
+requestUpdateUserPool = req
     "UpdateUserPool"
     "fixture/UpdateUserPool.yaml"
 
-testAdminEnableUser :: AdminEnableUser -> TestTree
-testAdminEnableUser = req
+requestAdminEnableUser :: AdminEnableUser -> TestTree
+requestAdminEnableUser = req
     "AdminEnableUser"
     "fixture/AdminEnableUser.yaml"
 
-testGetUserAttributeVerificationCode :: GetUserAttributeVerificationCode -> TestTree
-testGetUserAttributeVerificationCode = req
+requestGetUserAttributeVerificationCode :: GetUserAttributeVerificationCode -> TestTree
+requestGetUserAttributeVerificationCode = req
     "GetUserAttributeVerificationCode"
     "fixture/GetUserAttributeVerificationCode.yaml"
 
-testUpdateUserAttributes :: UpdateUserAttributes -> TestTree
-testUpdateUserAttributes = req
+requestUpdateUserAttributes :: UpdateUserAttributes -> TestTree
+requestUpdateUserAttributes = req
     "UpdateUserAttributes"
     "fixture/UpdateUserAttributes.yaml"
 
-testDeleteUserAttributes :: DeleteUserAttributes -> TestTree
-testDeleteUserAttributes = req
+requestDeleteUserAttributes :: DeleteUserAttributes -> TestTree
+requestDeleteUserAttributes = req
     "DeleteUserAttributes"
     "fixture/DeleteUserAttributes.yaml"
 
-testVerifyUserAttribute :: VerifyUserAttribute -> TestTree
-testVerifyUserAttribute = req
+requestVerifyUserAttribute :: VerifyUserAttribute -> TestTree
+requestVerifyUserAttribute = req
     "VerifyUserAttribute"
     "fixture/VerifyUserAttribute.yaml"
 
-testAdminDisableUser :: AdminDisableUser -> TestTree
-testAdminDisableUser = req
+requestAdminDisableUser :: AdminDisableUser -> TestTree
+requestAdminDisableUser = req
     "AdminDisableUser"
     "fixture/AdminDisableUser.yaml"
 
-testConfirmForgotPassword :: ConfirmForgotPassword -> TestTree
-testConfirmForgotPassword = req
+requestConfirmForgotPassword :: ConfirmForgotPassword -> TestTree
+requestConfirmForgotPassword = req
     "ConfirmForgotPassword"
     "fixture/ConfirmForgotPassword.yaml"
 
-testListUsers :: ListUsers -> TestTree
-testListUsers = req
+requestListUsers :: ListUsers -> TestTree
+requestListUsers = req
     "ListUsers"
     "fixture/ListUsers.yaml"
 
-testAdminDeleteUserAttributes :: AdminDeleteUserAttributes -> TestTree
-testAdminDeleteUserAttributes = req
+requestAdminDeleteUserAttributes :: AdminDeleteUserAttributes -> TestTree
+requestAdminDeleteUserAttributes = req
     "AdminDeleteUserAttributes"
     "fixture/AdminDeleteUserAttributes.yaml"
 
-testAdminUpdateUserAttributes :: AdminUpdateUserAttributes -> TestTree
-testAdminUpdateUserAttributes = req
+requestAdminUpdateUserAttributes :: AdminUpdateUserAttributes -> TestTree
+requestAdminUpdateUserAttributes = req
     "AdminUpdateUserAttributes"
     "fixture/AdminUpdateUserAttributes.yaml"
 
-testAdminGetUser :: AdminGetUser -> TestTree
-testAdminGetUser = req
+requestAdminGetUser :: AdminGetUser -> TestTree
+requestAdminGetUser = req
     "AdminGetUser"
     "fixture/AdminGetUser.yaml"
 
-testForgotPassword :: ForgotPassword -> TestTree
-testForgotPassword = req
+requestForgotPassword :: ForgotPassword -> TestTree
+requestForgotPassword = req
     "ForgotPassword"
     "fixture/ForgotPassword.yaml"
 
-testDescribeUserPool :: DescribeUserPool -> TestTree
-testDescribeUserPool = req
+requestDescribeUserPool :: DescribeUserPool -> TestTree
+requestDescribeUserPool = req
     "DescribeUserPool"
     "fixture/DescribeUserPool.yaml"
 
-testAdminConfirmSignUp :: AdminConfirmSignUp -> TestTree
-testAdminConfirmSignUp = req
+requestAdminConfirmSignUp :: AdminConfirmSignUp -> TestTree
+requestAdminConfirmSignUp = req
     "AdminConfirmSignUp"
     "fixture/AdminConfirmSignUp.yaml"
 
-testSignUp :: SignUp -> TestTree
-testSignUp = req
+requestSignUp :: SignUp -> TestTree
+requestSignUp = req
     "SignUp"
     "fixture/SignUp.yaml"
 
-testChangePassword :: ChangePassword -> TestTree
-testChangePassword = req
+requestChangePassword :: ChangePassword -> TestTree
+requestChangePassword = req
     "ChangePassword"
     "fixture/ChangePassword.yaml"
 
-testCreateUserPool :: CreateUserPool -> TestTree
-testCreateUserPool = req
+requestCreateUserPool :: CreateUserPool -> TestTree
+requestCreateUserPool = req
     "CreateUserPool"
     "fixture/CreateUserPool.yaml"
 
-testConfirmSignUp :: ConfirmSignUp -> TestTree
-testConfirmSignUp = req
+requestConfirmSignUp :: ConfirmSignUp -> TestTree
+requestConfirmSignUp = req
     "ConfirmSignUp"
     "fixture/ConfirmSignUp.yaml"
 
-testListUserPools :: ListUserPools -> TestTree
-testListUserPools = req
+requestListUserPools :: ListUserPools -> TestTree
+requestListUserPools = req
     "ListUserPools"
     "fixture/ListUserPools.yaml"
 
-testAdminResetUserPassword :: AdminResetUserPassword -> TestTree
-testAdminResetUserPassword = req
+requestAdminResetUserPassword :: AdminResetUserPassword -> TestTree
+requestAdminResetUserPassword = req
     "AdminResetUserPassword"
     "fixture/AdminResetUserPassword.yaml"
 
-testGetUser :: GetUser -> TestTree
-testGetUser = req
+requestGetUser :: GetUser -> TestTree
+requestGetUser = req
     "GetUser"
     "fixture/GetUser.yaml"
 
-testAdminDeleteUser :: AdminDeleteUser -> TestTree
-testAdminDeleteUser = req
+requestAdminDeleteUser :: AdminDeleteUser -> TestTree
+requestAdminDeleteUser = req
     "AdminDeleteUser"
     "fixture/AdminDeleteUser.yaml"
 
-testAddCustomAttributes :: AddCustomAttributes -> TestTree
-testAddCustomAttributes = req
+requestAddCustomAttributes :: AddCustomAttributes -> TestTree
+requestAddCustomAttributes = req
     "AddCustomAttributes"
     "fixture/AddCustomAttributes.yaml"
 
-testListUserPoolClients :: ListUserPoolClients -> TestTree
-testListUserPoolClients = req
+requestListUserPoolClients :: ListUserPoolClients -> TestTree
+requestListUserPoolClients = req
     "ListUserPoolClients"
     "fixture/ListUserPoolClients.yaml"
 
-testUpdateUserPoolClient :: UpdateUserPoolClient -> TestTree
-testUpdateUserPoolClient = req
+requestUpdateUserPoolClient :: UpdateUserPoolClient -> TestTree
+requestUpdateUserPoolClient = req
     "UpdateUserPoolClient"
     "fixture/UpdateUserPoolClient.yaml"
 
-testDeleteUserPoolClient :: DeleteUserPoolClient -> TestTree
-testDeleteUserPoolClient = req
+requestDeleteUserPoolClient :: DeleteUserPoolClient -> TestTree
+requestDeleteUserPoolClient = req
     "DeleteUserPoolClient"
     "fixture/DeleteUserPoolClient.yaml"
 
-testDeleteUser :: DeleteUser -> TestTree
-testDeleteUser = req
+requestDeleteUser :: DeleteUser -> TestTree
+requestDeleteUser = req
     "DeleteUser"
     "fixture/DeleteUser.yaml"
 
-testCreateUserPoolClient :: CreateUserPoolClient -> TestTree
-testCreateUserPoolClient = req
+requestCreateUserPoolClient :: CreateUserPoolClient -> TestTree
+requestCreateUserPoolClient = req
     "CreateUserPoolClient"
     "fixture/CreateUserPoolClient.yaml"
 
-testSetUserSettings :: SetUserSettings -> TestTree
-testSetUserSettings = req
+requestSetUserSettings :: SetUserSettings -> TestTree
+requestSetUserSettings = req
     "SetUserSettings"
     "fixture/SetUserSettings.yaml"
 
-testDescribeUserPoolClient :: DescribeUserPoolClient -> TestTree
-testDescribeUserPoolClient = req
+requestDescribeUserPoolClient :: DescribeUserPoolClient -> TestTree
+requestDescribeUserPoolClient = req
     "DescribeUserPoolClient"
     "fixture/DescribeUserPoolClient.yaml"
 
-testResendConfirmationCode :: ResendConfirmationCode -> TestTree
-testResendConfirmationCode = req
+requestResendConfirmationCode :: ResendConfirmationCode -> TestTree
+requestResendConfirmationCode = req
     "ResendConfirmationCode"
     "fixture/ResendConfirmationCode.yaml"
 
-testAdminSetUserSettings :: AdminSetUserSettings -> TestTree
-testAdminSetUserSettings = req
+requestAdminSetUserSettings :: AdminSetUserSettings -> TestTree
+requestAdminSetUserSettings = req
     "AdminSetUserSettings"
     "fixture/AdminSetUserSettings.yaml"
 
 -- Responses
 
-testDeleteUserPoolResponse :: DeleteUserPoolResponse -> TestTree
-testDeleteUserPoolResponse = res
+responseDeleteUserPool :: DeleteUserPoolResponse -> TestTree
+responseDeleteUserPool = res
     "DeleteUserPoolResponse"
     "fixture/DeleteUserPoolResponse.proto"
     cognitoIdentityProvider
     (Proxy :: Proxy DeleteUserPool)
 
-testUpdateUserPoolResponse :: UpdateUserPoolResponse -> TestTree
-testUpdateUserPoolResponse = res
+responseUpdateUserPool :: UpdateUserPoolResponse -> TestTree
+responseUpdateUserPool = res
     "UpdateUserPoolResponse"
     "fixture/UpdateUserPoolResponse.proto"
     cognitoIdentityProvider
     (Proxy :: Proxy UpdateUserPool)
 
-testAdminEnableUserResponse :: AdminEnableUserResponse -> TestTree
-testAdminEnableUserResponse = res
+responseAdminEnableUser :: AdminEnableUserResponse -> TestTree
+responseAdminEnableUser = res
     "AdminEnableUserResponse"
     "fixture/AdminEnableUserResponse.proto"
     cognitoIdentityProvider
     (Proxy :: Proxy AdminEnableUser)
 
-testGetUserAttributeVerificationCodeResponse :: GetUserAttributeVerificationCodeResponse -> TestTree
-testGetUserAttributeVerificationCodeResponse = res
+responseGetUserAttributeVerificationCode :: GetUserAttributeVerificationCodeResponse -> TestTree
+responseGetUserAttributeVerificationCode = res
     "GetUserAttributeVerificationCodeResponse"
     "fixture/GetUserAttributeVerificationCodeResponse.proto"
     cognitoIdentityProvider
     (Proxy :: Proxy GetUserAttributeVerificationCode)
 
-testUpdateUserAttributesResponse :: UpdateUserAttributesResponse -> TestTree
-testUpdateUserAttributesResponse = res
+responseUpdateUserAttributes :: UpdateUserAttributesResponse -> TestTree
+responseUpdateUserAttributes = res
     "UpdateUserAttributesResponse"
     "fixture/UpdateUserAttributesResponse.proto"
     cognitoIdentityProvider
     (Proxy :: Proxy UpdateUserAttributes)
 
-testDeleteUserAttributesResponse :: DeleteUserAttributesResponse -> TestTree
-testDeleteUserAttributesResponse = res
+responseDeleteUserAttributes :: DeleteUserAttributesResponse -> TestTree
+responseDeleteUserAttributes = res
     "DeleteUserAttributesResponse"
     "fixture/DeleteUserAttributesResponse.proto"
     cognitoIdentityProvider
     (Proxy :: Proxy DeleteUserAttributes)
 
-testVerifyUserAttributeResponse :: VerifyUserAttributeResponse -> TestTree
-testVerifyUserAttributeResponse = res
+responseVerifyUserAttribute :: VerifyUserAttributeResponse -> TestTree
+responseVerifyUserAttribute = res
     "VerifyUserAttributeResponse"
     "fixture/VerifyUserAttributeResponse.proto"
     cognitoIdentityProvider
     (Proxy :: Proxy VerifyUserAttribute)
 
-testAdminDisableUserResponse :: AdminDisableUserResponse -> TestTree
-testAdminDisableUserResponse = res
+responseAdminDisableUser :: AdminDisableUserResponse -> TestTree
+responseAdminDisableUser = res
     "AdminDisableUserResponse"
     "fixture/AdminDisableUserResponse.proto"
     cognitoIdentityProvider
     (Proxy :: Proxy AdminDisableUser)
 
-testConfirmForgotPasswordResponse :: ConfirmForgotPasswordResponse -> TestTree
-testConfirmForgotPasswordResponse = res
+responseConfirmForgotPassword :: ConfirmForgotPasswordResponse -> TestTree
+responseConfirmForgotPassword = res
     "ConfirmForgotPasswordResponse"
     "fixture/ConfirmForgotPasswordResponse.proto"
     cognitoIdentityProvider
     (Proxy :: Proxy ConfirmForgotPassword)
 
-testListUsersResponse :: ListUsersResponse -> TestTree
-testListUsersResponse = res
+responseListUsers :: ListUsersResponse -> TestTree
+responseListUsers = res
     "ListUsersResponse"
     "fixture/ListUsersResponse.proto"
     cognitoIdentityProvider
     (Proxy :: Proxy ListUsers)
 
-testAdminDeleteUserAttributesResponse :: AdminDeleteUserAttributesResponse -> TestTree
-testAdminDeleteUserAttributesResponse = res
+responseAdminDeleteUserAttributes :: AdminDeleteUserAttributesResponse -> TestTree
+responseAdminDeleteUserAttributes = res
     "AdminDeleteUserAttributesResponse"
     "fixture/AdminDeleteUserAttributesResponse.proto"
     cognitoIdentityProvider
     (Proxy :: Proxy AdminDeleteUserAttributes)
 
-testAdminUpdateUserAttributesResponse :: AdminUpdateUserAttributesResponse -> TestTree
-testAdminUpdateUserAttributesResponse = res
+responseAdminUpdateUserAttributes :: AdminUpdateUserAttributesResponse -> TestTree
+responseAdminUpdateUserAttributes = res
     "AdminUpdateUserAttributesResponse"
     "fixture/AdminUpdateUserAttributesResponse.proto"
     cognitoIdentityProvider
     (Proxy :: Proxy AdminUpdateUserAttributes)
 
-testAdminGetUserResponse :: AdminGetUserResponse -> TestTree
-testAdminGetUserResponse = res
+responseAdminGetUser :: AdminGetUserResponse -> TestTree
+responseAdminGetUser = res
     "AdminGetUserResponse"
     "fixture/AdminGetUserResponse.proto"
     cognitoIdentityProvider
     (Proxy :: Proxy AdminGetUser)
 
-testForgotPasswordResponse :: ForgotPasswordResponse -> TestTree
-testForgotPasswordResponse = res
+responseForgotPassword :: ForgotPasswordResponse -> TestTree
+responseForgotPassword = res
     "ForgotPasswordResponse"
     "fixture/ForgotPasswordResponse.proto"
     cognitoIdentityProvider
     (Proxy :: Proxy ForgotPassword)
 
-testDescribeUserPoolResponse :: DescribeUserPoolResponse -> TestTree
-testDescribeUserPoolResponse = res
+responseDescribeUserPool :: DescribeUserPoolResponse -> TestTree
+responseDescribeUserPool = res
     "DescribeUserPoolResponse"
     "fixture/DescribeUserPoolResponse.proto"
     cognitoIdentityProvider
     (Proxy :: Proxy DescribeUserPool)
 
-testAdminConfirmSignUpResponse :: AdminConfirmSignUpResponse -> TestTree
-testAdminConfirmSignUpResponse = res
+responseAdminConfirmSignUp :: AdminConfirmSignUpResponse -> TestTree
+responseAdminConfirmSignUp = res
     "AdminConfirmSignUpResponse"
     "fixture/AdminConfirmSignUpResponse.proto"
     cognitoIdentityProvider
     (Proxy :: Proxy AdminConfirmSignUp)
 
-testSignUpResponse :: SignUpResponse -> TestTree
-testSignUpResponse = res
+responseSignUp :: SignUpResponse -> TestTree
+responseSignUp = res
     "SignUpResponse"
     "fixture/SignUpResponse.proto"
     cognitoIdentityProvider
     (Proxy :: Proxy SignUp)
 
-testChangePasswordResponse :: ChangePasswordResponse -> TestTree
-testChangePasswordResponse = res
+responseChangePassword :: ChangePasswordResponse -> TestTree
+responseChangePassword = res
     "ChangePasswordResponse"
     "fixture/ChangePasswordResponse.proto"
     cognitoIdentityProvider
     (Proxy :: Proxy ChangePassword)
 
-testCreateUserPoolResponse :: CreateUserPoolResponse -> TestTree
-testCreateUserPoolResponse = res
+responseCreateUserPool :: CreateUserPoolResponse -> TestTree
+responseCreateUserPool = res
     "CreateUserPoolResponse"
     "fixture/CreateUserPoolResponse.proto"
     cognitoIdentityProvider
     (Proxy :: Proxy CreateUserPool)
 
-testConfirmSignUpResponse :: ConfirmSignUpResponse -> TestTree
-testConfirmSignUpResponse = res
+responseConfirmSignUp :: ConfirmSignUpResponse -> TestTree
+responseConfirmSignUp = res
     "ConfirmSignUpResponse"
     "fixture/ConfirmSignUpResponse.proto"
     cognitoIdentityProvider
     (Proxy :: Proxy ConfirmSignUp)
 
-testListUserPoolsResponse :: ListUserPoolsResponse -> TestTree
-testListUserPoolsResponse = res
+responseListUserPools :: ListUserPoolsResponse -> TestTree
+responseListUserPools = res
     "ListUserPoolsResponse"
     "fixture/ListUserPoolsResponse.proto"
     cognitoIdentityProvider
     (Proxy :: Proxy ListUserPools)
 
-testAdminResetUserPasswordResponse :: AdminResetUserPasswordResponse -> TestTree
-testAdminResetUserPasswordResponse = res
+responseAdminResetUserPassword :: AdminResetUserPasswordResponse -> TestTree
+responseAdminResetUserPassword = res
     "AdminResetUserPasswordResponse"
     "fixture/AdminResetUserPasswordResponse.proto"
     cognitoIdentityProvider
     (Proxy :: Proxy AdminResetUserPassword)
 
-testGetUserResponse :: GetUserResponse -> TestTree
-testGetUserResponse = res
+responseGetUser :: GetUserResponse -> TestTree
+responseGetUser = res
     "GetUserResponse"
     "fixture/GetUserResponse.proto"
     cognitoIdentityProvider
     (Proxy :: Proxy GetUser)
 
-testAdminDeleteUserResponse :: AdminDeleteUserResponse -> TestTree
-testAdminDeleteUserResponse = res
+responseAdminDeleteUser :: AdminDeleteUserResponse -> TestTree
+responseAdminDeleteUser = res
     "AdminDeleteUserResponse"
     "fixture/AdminDeleteUserResponse.proto"
     cognitoIdentityProvider
     (Proxy :: Proxy AdminDeleteUser)
 
-testAddCustomAttributesResponse :: AddCustomAttributesResponse -> TestTree
-testAddCustomAttributesResponse = res
+responseAddCustomAttributes :: AddCustomAttributesResponse -> TestTree
+responseAddCustomAttributes = res
     "AddCustomAttributesResponse"
     "fixture/AddCustomAttributesResponse.proto"
     cognitoIdentityProvider
     (Proxy :: Proxy AddCustomAttributes)
 
-testListUserPoolClientsResponse :: ListUserPoolClientsResponse -> TestTree
-testListUserPoolClientsResponse = res
+responseListUserPoolClients :: ListUserPoolClientsResponse -> TestTree
+responseListUserPoolClients = res
     "ListUserPoolClientsResponse"
     "fixture/ListUserPoolClientsResponse.proto"
     cognitoIdentityProvider
     (Proxy :: Proxy ListUserPoolClients)
 
-testUpdateUserPoolClientResponse :: UpdateUserPoolClientResponse -> TestTree
-testUpdateUserPoolClientResponse = res
+responseUpdateUserPoolClient :: UpdateUserPoolClientResponse -> TestTree
+responseUpdateUserPoolClient = res
     "UpdateUserPoolClientResponse"
     "fixture/UpdateUserPoolClientResponse.proto"
     cognitoIdentityProvider
     (Proxy :: Proxy UpdateUserPoolClient)
 
-testDeleteUserPoolClientResponse :: DeleteUserPoolClientResponse -> TestTree
-testDeleteUserPoolClientResponse = res
+responseDeleteUserPoolClient :: DeleteUserPoolClientResponse -> TestTree
+responseDeleteUserPoolClient = res
     "DeleteUserPoolClientResponse"
     "fixture/DeleteUserPoolClientResponse.proto"
     cognitoIdentityProvider
     (Proxy :: Proxy DeleteUserPoolClient)
 
-testDeleteUserResponse :: DeleteUserResponse -> TestTree
-testDeleteUserResponse = res
+responseDeleteUser :: DeleteUserResponse -> TestTree
+responseDeleteUser = res
     "DeleteUserResponse"
     "fixture/DeleteUserResponse.proto"
     cognitoIdentityProvider
     (Proxy :: Proxy DeleteUser)
 
-testCreateUserPoolClientResponse :: CreateUserPoolClientResponse -> TestTree
-testCreateUserPoolClientResponse = res
+responseCreateUserPoolClient :: CreateUserPoolClientResponse -> TestTree
+responseCreateUserPoolClient = res
     "CreateUserPoolClientResponse"
     "fixture/CreateUserPoolClientResponse.proto"
     cognitoIdentityProvider
     (Proxy :: Proxy CreateUserPoolClient)
 
-testSetUserSettingsResponse :: SetUserSettingsResponse -> TestTree
-testSetUserSettingsResponse = res
+responseSetUserSettings :: SetUserSettingsResponse -> TestTree
+responseSetUserSettings = res
     "SetUserSettingsResponse"
     "fixture/SetUserSettingsResponse.proto"
     cognitoIdentityProvider
     (Proxy :: Proxy SetUserSettings)
 
-testDescribeUserPoolClientResponse :: DescribeUserPoolClientResponse -> TestTree
-testDescribeUserPoolClientResponse = res
+responseDescribeUserPoolClient :: DescribeUserPoolClientResponse -> TestTree
+responseDescribeUserPoolClient = res
     "DescribeUserPoolClientResponse"
     "fixture/DescribeUserPoolClientResponse.proto"
     cognitoIdentityProvider
     (Proxy :: Proxy DescribeUserPoolClient)
 
-testResendConfirmationCodeResponse :: ResendConfirmationCodeResponse -> TestTree
-testResendConfirmationCodeResponse = res
+responseResendConfirmationCode :: ResendConfirmationCodeResponse -> TestTree
+responseResendConfirmationCode = res
     "ResendConfirmationCodeResponse"
     "fixture/ResendConfirmationCodeResponse.proto"
     cognitoIdentityProvider
     (Proxy :: Proxy ResendConfirmationCode)
 
-testAdminSetUserSettingsResponse :: AdminSetUserSettingsResponse -> TestTree
-testAdminSetUserSettingsResponse = res
+responseAdminSetUserSettings :: AdminSetUserSettingsResponse -> TestTree
+responseAdminSetUserSettings = res
     "AdminSetUserSettingsResponse"
     "fixture/AdminSetUserSettingsResponse.proto"
     cognitoIdentityProvider