diff --git a/README.md b/README.md
--- a/README.md
+++ b/README.md
@@ -8,7 +8,7 @@
 
 ## Version
 
-`1.2.0.2`
+`1.3.0`
 
 
 ## Description
diff --git a/amazonka-redshift.cabal b/amazonka-redshift.cabal
--- a/amazonka-redshift.cabal
+++ b/amazonka-redshift.cabal
@@ -1,5 +1,5 @@
 name:                  amazonka-redshift
-version:               1.2.0.2
+version:               1.3.0
 synopsis:              Amazon Redshift SDK.
 homepage:              https://github.com/brendanhay/amazonka
 bug-reports:           https://github.com/brendanhay/amazonka/issues
@@ -134,7 +134,7 @@
         , Network.AWS.Redshift.Types.Sum
 
     build-depends:
-          amazonka-core == 1.2.0.*
+          amazonka-core == 1.3.0.*
         , base          >= 4.7     && < 5
 
 test-suite amazonka-redshift-test
@@ -154,9 +154,9 @@
         , Test.AWS.Redshift.Internal
 
     build-depends:
-          amazonka-core == 1.2.0.*
-        , amazonka-test == 1.2.0.*
-        , amazonka-redshift == 1.2.0.*
+          amazonka-core == 1.3.0.*
+        , amazonka-test == 1.3.0.*
+        , amazonka-redshift == 1.3.0.*
         , base
         , bytestring
         , lens
diff --git a/gen/Network/AWS/Redshift.hs b/gen/Network/AWS/Redshift.hs
--- a/gen/Network/AWS/Redshift.hs
+++ b/gen/Network/AWS/Redshift.hs
@@ -48,119 +48,116 @@
     -- * Errors
     -- $errors
 
-    -- ** LimitExceededFault
-    , _LimitExceededFault
-
     -- ** ClusterSecurityGroupQuotaExceededFault
     , _ClusterSecurityGroupQuotaExceededFault
 
-    -- ** CopyToRegionDisabledFault
-    , _CopyToRegionDisabledFault
-
-    -- ** AuthorizationQuotaExceededFault
-    , _AuthorizationQuotaExceededFault
+    -- ** InvalidS3KeyPrefixFault
+    , _InvalidS3KeyPrefixFault
 
     -- ** SourceNotFoundFault
     , _SourceNotFoundFault
 
-    -- ** InvalidS3KeyPrefixFault
-    , _InvalidS3KeyPrefixFault
+    -- ** AuthorizationQuotaExceededFault
+    , _AuthorizationQuotaExceededFault
 
-    -- ** AuthorizationAlreadyExistsFault
-    , _AuthorizationAlreadyExistsFault
+    -- ** CopyToRegionDisabledFault
+    , _CopyToRegionDisabledFault
 
+    -- ** LimitExceededFault
+    , _LimitExceededFault
+
     -- ** InvalidClusterSecurityGroupStateFault
     , _InvalidClusterSecurityGroupStateFault
 
     -- ** ClusterSecurityGroupAlreadyExistsFault
     , _ClusterSecurityGroupAlreadyExistsFault
 
-    -- ** InvalidElasticIPFault
-    , _InvalidElasticIPFault
-
     -- ** ClusterSnapshotNotFoundFault
     , _ClusterSnapshotNotFoundFault
 
+    -- ** InvalidElasticIPFault
+    , _InvalidElasticIPFault
+
     -- ** HSMConfigurationNotFoundFault
     , _HSMConfigurationNotFoundFault
 
-    -- ** InvalidHSMConfigurationStateFault
-    , _InvalidHSMConfigurationStateFault
+    -- ** AuthorizationAlreadyExistsFault
+    , _AuthorizationAlreadyExistsFault
 
-    -- ** ClusterSnapshotAlreadyExistsFault
-    , _ClusterSnapshotAlreadyExistsFault
+    -- ** SubscriptionCategoryNotFoundFault
+    , _SubscriptionCategoryNotFoundFault
 
     -- ** HSMConfigurationAlreadyExistsFault
     , _HSMConfigurationAlreadyExistsFault
 
-    -- ** SubscriptionCategoryNotFoundFault
-    , _SubscriptionCategoryNotFoundFault
-
     -- ** SubscriptionNotFoundFault
     , _SubscriptionNotFoundFault
 
-    -- ** InvalidSubnet
-    , _InvalidSubnet
-
     -- ** InvalidS3BucketNameFault
     , _InvalidS3BucketNameFault
 
-    -- ** ClusterQuotaExceededFault
-    , _ClusterQuotaExceededFault
+    -- ** ClusterSnapshotAlreadyExistsFault
+    , _ClusterSnapshotAlreadyExistsFault
 
+    -- ** InvalidSubnet
+    , _InvalidSubnet
+
+    -- ** InvalidHSMConfigurationStateFault
+    , _InvalidHSMConfigurationStateFault
+
     -- ** SnapshotCopyAlreadyDisabledFault
     , _SnapshotCopyAlreadyDisabledFault
 
-    -- ** ClusterParameterGroupNotFoundFault
-    , _ClusterParameterGroupNotFoundFault
+    -- ** ClusterQuotaExceededFault
+    , _ClusterQuotaExceededFault
 
     -- ** HSMClientCertificateQuotaExceededFault
     , _HSMClientCertificateQuotaExceededFault
 
+    -- ** ClusterParameterGroupNotFoundFault
+    , _ClusterParameterGroupNotFoundFault
+
     -- ** SnapshotCopyGrantQuotaExceededFault
     , _SnapshotCopyGrantQuotaExceededFault
 
+    -- ** NumberOfNodesPerClusterLimitExceededFault
+    , _NumberOfNodesPerClusterLimitExceededFault
+
     -- ** SnapshotCopyAlreadyEnabledFault
     , _SnapshotCopyAlreadyEnabledFault
 
     -- ** ClusterParameterGroupAlreadyExistsFault
     , _ClusterParameterGroupAlreadyExistsFault
 
-    -- ** NumberOfNodesPerClusterLimitExceededFault
-    , _NumberOfNodesPerClusterLimitExceededFault
-
     -- ** SnapshotCopyDisabledFault
     , _SnapshotCopyDisabledFault
 
     -- ** ResizeNotFoundFault
     , _ResizeNotFoundFault
 
-    -- ** ClusterParameterGroupQuotaExceededFault
-    , _ClusterParameterGroupQuotaExceededFault
+    -- ** HSMClientCertificateNotFoundFault
+    , _HSMClientCertificateNotFoundFault
 
     -- ** SNSTopicARNNotFoundFault
     , _SNSTopicARNNotFoundFault
 
-    -- ** HSMClientCertificateNotFoundFault
-    , _HSMClientCertificateNotFoundFault
+    -- ** ClusterNotFoundFault
+    , _ClusterNotFoundFault
 
+    -- ** ClusterParameterGroupQuotaExceededFault
+    , _ClusterParameterGroupQuotaExceededFault
+
     -- ** SnapshotCopyGrantAlreadyExistsFault
     , _SnapshotCopyGrantAlreadyExistsFault
 
-    -- ** ClusterNotFoundFault
-    , _ClusterNotFoundFault
-
     -- ** SNSNoAuthorizationFault
     , _SNSNoAuthorizationFault
 
-    -- ** SnapshotCopyGrantNotFoundFault
-    , _SnapshotCopyGrantNotFoundFault
-
     -- ** InvalidClusterStateFault
     , _InvalidClusterStateFault
 
-    -- ** InsufficientClusterCapacityFault
-    , _InsufficientClusterCapacityFault
+    -- ** SnapshotCopyGrantNotFoundFault
+    , _SnapshotCopyGrantNotFoundFault
 
     -- ** HSMConfigurationQuotaExceededFault
     , _HSMConfigurationQuotaExceededFault
@@ -168,6 +165,9 @@
     -- ** ClusterSnapshotQuotaExceededFault
     , _ClusterSnapshotQuotaExceededFault
 
+    -- ** InsufficientClusterCapacityFault
+    , _InsufficientClusterCapacityFault
+
     -- ** SNSInvalidTopicFault
     , _SNSInvalidTopicFault
 
@@ -189,26 +189,26 @@
     -- ** InvalidSubscriptionStateFault
     , _InvalidSubscriptionStateFault
 
-    -- ** UnsupportedOperationFault
-    , _UnsupportedOperationFault
-
     -- ** AuthorizationNotFoundFault
     , _AuthorizationNotFoundFault
 
     -- ** InvalidClusterSubnetGroupStateFault
     , _InvalidClusterSubnetGroupStateFault
 
-    -- ** InvalidClusterSnapshotStateFault
-    , _InvalidClusterSnapshotStateFault
+    -- ** UnsupportedOperationFault
+    , _UnsupportedOperationFault
 
     -- ** ClusterSubnetGroupAlreadyExistsFault
     , _ClusterSubnetGroupAlreadyExistsFault
 
+    -- ** InvalidClusterSnapshotStateFault
+    , _InvalidClusterSnapshotStateFault
+
     -- ** ClusterSecurityGroupNotFoundFault
     , _ClusterSecurityGroupNotFoundFault
 
-    -- ** IncompatibleOrderableOptions
-    , _IncompatibleOrderableOptions
+    -- ** ReservedNodeNotFoundFault
+    , _ReservedNodeNotFoundFault
 
     -- ** ReservedNodeOfferingNotFoundFault
     , _ReservedNodeOfferingNotFoundFault
@@ -216,8 +216,8 @@
     -- ** InvalidClusterSubnetStateFault
     , _InvalidClusterSubnetStateFault
 
-    -- ** ReservedNodeNotFoundFault
-    , _ReservedNodeNotFoundFault
+    -- ** IncompatibleOrderableOptions
+    , _IncompatibleOrderableOptions
 
     -- ** EventSubscriptionQuotaExceededFault
     , _EventSubscriptionQuotaExceededFault
@@ -228,48 +228,54 @@
     -- ** ReservedNodeAlreadyExistsFault
     , _ReservedNodeAlreadyExistsFault
 
-    -- ** ReservedNodeQuotaExceededFault
-    , _ReservedNodeQuotaExceededFault
-
-    -- ** SubscriptionEventIdNotFoundFault
-    , _SubscriptionEventIdNotFoundFault
+    -- ** InvalidRestoreFault
+    , _InvalidRestoreFault
 
     -- ** ResourceNotFoundFault
     , _ResourceNotFoundFault
 
+    -- ** SubscriptionEventIdNotFoundFault
+    , _SubscriptionEventIdNotFoundFault
+
     -- ** InvalidSnapshotCopyGrantStateFault
     , _InvalidSnapshotCopyGrantStateFault
 
-    -- ** InvalidRestoreFault
-    , _InvalidRestoreFault
-
     -- ** UnknownSnapshotCopyRegionFault
     , _UnknownSnapshotCopyRegionFault
 
-    -- ** AccessToSnapshotDeniedFault
-    , _AccessToSnapshotDeniedFault
+    -- ** ReservedNodeQuotaExceededFault
+    , _ReservedNodeQuotaExceededFault
 
+    -- ** ClusterSubnetQuotaExceededFault
+    , _ClusterSubnetQuotaExceededFault
+
     -- ** ClusterAlreadyExistsFault
     , _ClusterAlreadyExistsFault
 
-    -- ** HSMClientCertificateAlreadyExistsFault
-    , _HSMClientCertificateAlreadyExistsFault
+    -- ** AccessToSnapshotDeniedFault
+    , _AccessToSnapshotDeniedFault
 
-    -- ** InvalidHSMClientCertificateStateFault
-    , _InvalidHSMClientCertificateStateFault
+    -- ** TagLimitExceededFault
+    , _TagLimitExceededFault
 
     -- ** NumberOfNodesQuotaExceededFault
     , _NumberOfNodesQuotaExceededFault
 
-    -- ** TagLimitExceededFault
-    , _TagLimitExceededFault
+    -- ** HSMClientCertificateAlreadyExistsFault
+    , _HSMClientCertificateAlreadyExistsFault
 
-    -- ** ClusterSubnetQuotaExceededFault
-    , _ClusterSubnetQuotaExceededFault
+    -- ** InvalidHSMClientCertificateStateFault
+    , _InvalidHSMClientCertificateStateFault
 
     -- ** SubnetAlreadyInUse
     , _SubnetAlreadyInUse
 
+    -- ** SubscriptionSeverityNotFoundFault
+    , _SubscriptionSeverityNotFoundFault
+
+    -- ** UnauthorizedOperation
+    , _UnauthorizedOperation
+
     -- ** InvalidTagFault
     , _InvalidTagFault
 
@@ -279,12 +285,6 @@
     -- ** ClusterSubnetGroupQuotaExceededFault
     , _ClusterSubnetGroupQuotaExceededFault
 
-    -- ** SubscriptionSeverityNotFoundFault
-    , _SubscriptionSeverityNotFoundFault
-
-    -- ** UnauthorizedOperation
-    , _UnauthorizedOperation
-
     -- * Waiters
     -- $waiters
 
@@ -306,83 +306,77 @@
     -- ** DescribeTags
     , module Network.AWS.Redshift.DescribeTags
 
-    -- ** ModifyEventSubscription
-    , module Network.AWS.Redshift.ModifyEventSubscription
+    -- ** DeleteClusterSubnetGroup
+    , module Network.AWS.Redshift.DeleteClusterSubnetGroup
 
     -- ** DisableLogging
     , module Network.AWS.Redshift.DisableLogging
 
-    -- ** PurchaseReservedNodeOffering
-    , module Network.AWS.Redshift.PurchaseReservedNodeOffering
-
-    -- ** DeleteClusterSubnetGroup
-    , module Network.AWS.Redshift.DeleteClusterSubnetGroup
+    -- ** ModifyEventSubscription
+    , module Network.AWS.Redshift.ModifyEventSubscription
 
     -- ** DeleteClusterSnapshot
     , module Network.AWS.Redshift.DeleteClusterSnapshot
 
-    -- ** DescribeEvents (Paginated)
-    , module Network.AWS.Redshift.DescribeEvents
+    -- ** PurchaseReservedNodeOffering
+    , module Network.AWS.Redshift.PurchaseReservedNodeOffering
 
     -- ** DescribeReservedNodeOfferings (Paginated)
     , module Network.AWS.Redshift.DescribeReservedNodeOfferings
 
-    -- ** DescribeClusterParameterGroups (Paginated)
-    , module Network.AWS.Redshift.DescribeClusterParameterGroups
-
-    -- ** CreateClusterSubnetGroup
-    , module Network.AWS.Redshift.CreateClusterSubnetGroup
+    -- ** DescribeEvents (Paginated)
+    , module Network.AWS.Redshift.DescribeEvents
 
     -- ** DescribeReservedNodes (Paginated)
     , module Network.AWS.Redshift.DescribeReservedNodes
 
+    -- ** DescribeClusterParameterGroups (Paginated)
+    , module Network.AWS.Redshift.DescribeClusterParameterGroups
+
     -- ** EnableLogging
     , module Network.AWS.Redshift.EnableLogging
 
-    -- ** CreateTags
-    , module Network.AWS.Redshift.CreateTags
-
-    -- ** DescribeClusterSecurityGroups (Paginated)
-    , module Network.AWS.Redshift.DescribeClusterSecurityGroups
+    -- ** CreateClusterSubnetGroup
+    , module Network.AWS.Redshift.CreateClusterSubnetGroup
 
     -- ** DeleteClusterParameterGroup
     , module Network.AWS.Redshift.DeleteClusterParameterGroup
 
-    -- ** DeleteTags
-    , module Network.AWS.Redshift.DeleteTags
+    -- ** DescribeClusterSecurityGroups (Paginated)
+    , module Network.AWS.Redshift.DescribeClusterSecurityGroups
 
+    -- ** CreateTags
+    , module Network.AWS.Redshift.CreateTags
+
     -- ** EnableSnapshotCopy
     , module Network.AWS.Redshift.EnableSnapshotCopy
 
-    -- ** ModifySnapshotCopyRetentionPeriod
-    , module Network.AWS.Redshift.ModifySnapshotCopyRetentionPeriod
-
     -- ** DescribeClusterSnapshots (Paginated)
     , module Network.AWS.Redshift.DescribeClusterSnapshots
 
+    -- ** DeleteTags
+    , module Network.AWS.Redshift.DeleteTags
+
     -- ** DescribeClusterSubnetGroups (Paginated)
     , module Network.AWS.Redshift.DescribeClusterSubnetGroups
 
+    -- ** ModifySnapshotCopyRetentionPeriod
+    , module Network.AWS.Redshift.ModifySnapshotCopyRetentionPeriod
+
     -- ** AuthorizeSnapshotAccess
     , module Network.AWS.Redshift.AuthorizeSnapshotAccess
 
-    -- ** CreateEventSubscription
-    , module Network.AWS.Redshift.CreateEventSubscription
-
     -- ** RebootCluster
     , module Network.AWS.Redshift.RebootCluster
 
-    -- ** DescribeOrderableClusterOptions (Paginated)
-    , module Network.AWS.Redshift.DescribeOrderableClusterOptions
-
     -- ** DeleteCluster
     , module Network.AWS.Redshift.DeleteCluster
 
-    -- ** DeleteEventSubscription
-    , module Network.AWS.Redshift.DeleteEventSubscription
+    -- ** CreateEventSubscription
+    , module Network.AWS.Redshift.CreateEventSubscription
 
-    -- ** DescribeDefaultClusterParameters (Paginated)
-    , module Network.AWS.Redshift.DescribeDefaultClusterParameters
+    -- ** DescribeOrderableClusterOptions (Paginated)
+    , module Network.AWS.Redshift.DescribeOrderableClusterOptions
 
     -- ** CreateCluster
     , module Network.AWS.Redshift.CreateCluster
@@ -390,71 +384,74 @@
     -- ** CreateHSMClientCertificate
     , module Network.AWS.Redshift.CreateHSMClientCertificate
 
+    -- ** DescribeDefaultClusterParameters (Paginated)
+    , module Network.AWS.Redshift.DescribeDefaultClusterParameters
+
+    -- ** DeleteEventSubscription
+    , module Network.AWS.Redshift.DeleteEventSubscription
+
     -- ** ResetClusterParameterGroup
     , module Network.AWS.Redshift.ResetClusterParameterGroup
 
     -- ** DescribeEventSubscriptions (Paginated)
     , module Network.AWS.Redshift.DescribeEventSubscriptions
 
+    -- ** RevokeClusterSecurityGroupIngress
+    , module Network.AWS.Redshift.RevokeClusterSecurityGroupIngress
+
     -- ** DescribeHSMClientCertificates (Paginated)
     , module Network.AWS.Redshift.DescribeHSMClientCertificates
 
     -- ** ModifyClusterParameterGroup
     , module Network.AWS.Redshift.ModifyClusterParameterGroup
 
-    -- ** RevokeClusterSecurityGroupIngress
-    , module Network.AWS.Redshift.RevokeClusterSecurityGroupIngress
-
-    -- ** AuthorizeClusterSecurityGroupIngress
-    , module Network.AWS.Redshift.AuthorizeClusterSecurityGroupIngress
-
     -- ** CreateClusterSecurityGroup
     , module Network.AWS.Redshift.CreateClusterSecurityGroup
 
-    -- ** DescribeResize
-    , module Network.AWS.Redshift.DescribeResize
-
     -- ** DescribeEventCategories
     , module Network.AWS.Redshift.DescribeEventCategories
 
+    -- ** DescribeResize
+    , module Network.AWS.Redshift.DescribeResize
+
     -- ** DeleteHSMConfiguration
     , module Network.AWS.Redshift.DeleteHSMConfiguration
 
-    -- ** DeleteClusterSecurityGroup
-    , module Network.AWS.Redshift.DeleteClusterSecurityGroup
+    -- ** AuthorizeClusterSecurityGroupIngress
+    , module Network.AWS.Redshift.AuthorizeClusterSecurityGroupIngress
 
+    -- ** CreateClusterSnapshot
+    , module Network.AWS.Redshift.CreateClusterSnapshot
+
     -- ** CreateHSMConfiguration
     , module Network.AWS.Redshift.CreateHSMConfiguration
 
+    -- ** DescribeLoggingStatus
+    , module Network.AWS.Redshift.DescribeLoggingStatus
+
     -- ** ModifyCluster
     , module Network.AWS.Redshift.ModifyCluster
 
-    -- ** CreateClusterSnapshot
-    , module Network.AWS.Redshift.CreateClusterSnapshot
+    -- ** DeleteClusterSecurityGroup
+    , module Network.AWS.Redshift.DeleteClusterSecurityGroup
 
-    -- ** DescribeLoggingStatus
-    , module Network.AWS.Redshift.DescribeLoggingStatus
+    -- ** DisableSnapshotCopy
+    , module Network.AWS.Redshift.DisableSnapshotCopy
 
     -- ** DescribeClusterParameters (Paginated)
     , module Network.AWS.Redshift.DescribeClusterParameters
 
-    -- ** DisableSnapshotCopy
-    , module Network.AWS.Redshift.DisableSnapshotCopy
-
     -- ** RestoreFromClusterSnapshot
     , module Network.AWS.Redshift.RestoreFromClusterSnapshot
 
-    -- ** DescribeHSMConfigurations (Paginated)
-    , module Network.AWS.Redshift.DescribeHSMConfigurations
-
     -- ** CreateClusterParameterGroup
     , module Network.AWS.Redshift.CreateClusterParameterGroup
 
     -- ** RevokeSnapshotAccess
     , module Network.AWS.Redshift.RevokeSnapshotAccess
 
-    -- ** DeleteHSMClientCertificate
-    , module Network.AWS.Redshift.DeleteHSMClientCertificate
+    -- ** DescribeHSMConfigurations (Paginated)
+    , module Network.AWS.Redshift.DescribeHSMConfigurations
 
     -- ** CreateSnapshotCopyGrant
     , module Network.AWS.Redshift.CreateSnapshotCopyGrant
@@ -462,21 +459,24 @@
     -- ** CopyClusterSnapshot
     , module Network.AWS.Redshift.CopyClusterSnapshot
 
+    -- ** DeleteHSMClientCertificate
+    , module Network.AWS.Redshift.DeleteHSMClientCertificate
+
+    -- ** DeleteSnapshotCopyGrant
+    , module Network.AWS.Redshift.DeleteSnapshotCopyGrant
+
     -- ** DescribeClusterVersions (Paginated)
     , module Network.AWS.Redshift.DescribeClusterVersions
 
     -- ** ModifyClusterSubnetGroup
     , module Network.AWS.Redshift.ModifyClusterSubnetGroup
 
-    -- ** DeleteSnapshotCopyGrant
-    , module Network.AWS.Redshift.DeleteSnapshotCopyGrant
+    -- ** RotateEncryptionKey
+    , module Network.AWS.Redshift.RotateEncryptionKey
 
     -- ** DescribeSnapshotCopyGrants
     , module Network.AWS.Redshift.DescribeSnapshotCopyGrants
 
-    -- ** RotateEncryptionKey
-    , module Network.AWS.Redshift.RotateEncryptionKey
-
     -- * Types
 
     -- ** ParameterApplyType
@@ -501,34 +501,34 @@
     , cRestoreStatus
     , cClusterSnapshotCopyStatus
     , cClusterRevisionNumber
-    , cMasterUsername
     , cPubliclyAccessible
+    , cMasterUsername
     , cVPCId
     , cClusterSecurityGroups
     , cAutomatedSnapshotRetentionPeriod
     , cEncrypted
+    , cClusterSubnetGroupName
     , cClusterIdentifier
     , cNumberOfNodes
-    , cClusterSubnetGroupName
+    , cClusterPublicKey
     , cPreferredMaintenanceWindow
     , cModifyStatus
-    , cClusterPublicKey
+    , cKMSKeyId
     , cClusterParameterGroups
     , cAvailabilityZone
     , cVPCSecurityGroups
-    , cKMSKeyId
     , cHSMStatus
     , cElasticIPStatus
     , cClusterVersion
     , cNodeType
-    , cEndpoint
     , cClusterCreateTime
+    , cEndpoint
     , cAllowVersionUpgrade
-    , cPendingModifiedValues
     , cClusterStatus
-    , cDBName
+    , cPendingModifiedValues
     , cTags
     , cClusterNodes
+    , cDBName
 
     -- ** ClusterNode
     , ClusterNode
@@ -542,8 +542,8 @@
     , clusterParameterGroup
     , cpgParameterGroupFamily
     , cpgDescription
-    , cpgParameterGroupName
     , cpgTags
+    , cpgParameterGroupName
 
     -- ** ClusterParameterGroupNameMessage
     , ClusterParameterGroupNameMessage
@@ -607,8 +607,8 @@
     -- ** DefaultClusterParameters
     , DefaultClusterParameters
     , defaultClusterParameters
-    , dcpParameters
     , dcpMarker
+    , dcpParameters
     , dcpParameterGroupFamily
 
     -- ** EC2SecurityGroup
@@ -659,8 +659,8 @@
     -- ** EventSubscription
     , EventSubscription
     , eventSubscription
-    , esCustomerAWSId
     , esStatus
+    , esCustomerAWSId
     , esCustSubscriptionId
     , esSNSTopicARN
     , esEnabled
@@ -668,8 +668,8 @@
     , esSeverity
     , esSubscriptionCreationTime
     , esEventCategoriesList
-    , esSourceIdsList
     , esTags
+    , esSourceIdsList
 
     -- ** HSMClientCertificate
     , HSMClientCertificate
@@ -684,8 +684,8 @@
     , hcHSMConfigurationIdentifier
     , hcHSMPartitionName
     , hcDescription
-    , hcHSMIPAddress
     , hcTags
+    , hcHSMIPAddress
 
     -- ** HSMStatus
     , HSMStatus
@@ -704,8 +704,8 @@
     -- ** LoggingStatus
     , LoggingStatus
     , loggingStatus
-    , lsLastSuccessfulDeliveryTime
     , lsLastFailureTime
+    , lsLastSuccessfulDeliveryTime
     , lsS3KeyPrefix
     , lsBucketName
     , lsLoggingEnabled
@@ -727,8 +727,8 @@
     , pMinimumEngineVersion
     , pSource
     , pIsModifiable
-    , pAllowedValues
     , pDataType
+    , pAllowedValues
     , pParameterName
     , pDescription
 
@@ -756,12 +756,12 @@
     , rnCurrencyCode
     , rnStartTime
     , rnNodeCount
-    , rnReservedNodeOfferingId
     , rnReservedNodeId
+    , rnReservedNodeOfferingId
+    , rnRecurringCharges
     , rnOfferingType
     , rnUsagePrice
     , rnNodeType
-    , rnRecurringCharges
     , rnFixedPrice
     , rnDuration
 
@@ -770,18 +770,18 @@
     , reservedNodeOffering
     , rnoCurrencyCode
     , rnoReservedNodeOfferingId
+    , rnoRecurringCharges
     , rnoOfferingType
     , rnoUsagePrice
     , rnoNodeType
-    , rnoRecurringCharges
     , rnoFixedPrice
     , rnoDuration
 
     -- ** RestoreStatus
     , RestoreStatus
     , restoreStatus
-    , rsEstimatedTimeToCompletionInSeconds
     , rsStatus
+    , rsEstimatedTimeToCompletionInSeconds
     , rsCurrentRestoreRateInMegaBytesPerSecond
     , rsProgressInMegaBytes
     , rsElapsedTimeInSeconds
@@ -790,8 +790,8 @@
     -- ** Snapshot
     , Snapshot
     , snapshot
-    , sRestorableNodeTypes
     , sStatus
+    , sRestorableNodeTypes
     , sAccountsWithRestoreAccess
     , sSnapshotIdentifier
     , sEncryptedWithHSM
@@ -803,21 +803,21 @@
     , sClusterIdentifier
     , sNumberOfNodes
     , sSnapshotType
-    , sAvailabilityZone
     , sKMSKeyId
+    , sAvailabilityZone
     , sCurrentBackupRateInMegaBytesPerSecond
     , sSnapshotCreateTime
     , sClusterVersion
     , sOwnerAccount
     , sNodeType
-    , sClusterCreateTime
     , sElapsedTimeInSeconds
+    , sClusterCreateTime
     , sEstimatedSecondsToCompletion
-    , sTotalBackupSizeInMegaBytes
-    , sDBName
-    , sTags
     , sActualIncrementalBackupSizeInMegaBytes
+    , sTags
     , sPort
+    , sTotalBackupSizeInMegaBytes
+    , sDBName
 
     -- ** SnapshotCopyGrant
     , SnapshotCopyGrant
@@ -842,8 +842,8 @@
     -- ** TaggedResource
     , TaggedResource
     , taggedResource
-    , trResourceType
     , trTag
+    , trResourceType
     , trResourceName
 
     -- ** VPCSecurityGroupMembership
diff --git a/gen/Network/AWS/Redshift/AuthorizeClusterSecurityGroupIngress.hs b/gen/Network/AWS/Redshift/AuthorizeClusterSecurityGroupIngress.hs
--- a/gen/Network/AWS/Redshift/AuthorizeClusterSecurityGroupIngress.hs
+++ b/gen/Network/AWS/Redshift/AuthorizeClusterSecurityGroupIngress.hs
@@ -55,7 +55,7 @@
     , AuthorizeClusterSecurityGroupIngressResponse
     -- * Response Lenses
     , acsgirsClusterSecurityGroup
-    , acsgirsStatus
+    , acsgirsResponseStatus
     ) where
 
 import           Network.AWS.Prelude
@@ -155,7 +155,7 @@
 -- | /See:/ 'authorizeClusterSecurityGroupIngressResponse' smart constructor.
 data AuthorizeClusterSecurityGroupIngressResponse = AuthorizeClusterSecurityGroupIngressResponse'
     { _acsgirsClusterSecurityGroup :: !(Maybe ClusterSecurityGroup)
-    , _acsgirsStatus               :: !Int
+    , _acsgirsResponseStatus       :: !Int
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'AuthorizeClusterSecurityGroupIngressResponse' with the minimum fields required to make a request.
@@ -164,14 +164,14 @@
 --
 -- * 'acsgirsClusterSecurityGroup'
 --
--- * 'acsgirsStatus'
+-- * 'acsgirsResponseStatus'
 authorizeClusterSecurityGroupIngressResponse
-    :: Int -- ^ 'acsgirsStatus'
+    :: Int -- ^ 'acsgirsResponseStatus'
     -> AuthorizeClusterSecurityGroupIngressResponse
-authorizeClusterSecurityGroupIngressResponse pStatus_ =
+authorizeClusterSecurityGroupIngressResponse pResponseStatus_ =
     AuthorizeClusterSecurityGroupIngressResponse'
     { _acsgirsClusterSecurityGroup = Nothing
-    , _acsgirsStatus = pStatus_
+    , _acsgirsResponseStatus = pResponseStatus_
     }
 
 -- | Undocumented member.
@@ -179,5 +179,5 @@
 acsgirsClusterSecurityGroup = lens _acsgirsClusterSecurityGroup (\ s a -> s{_acsgirsClusterSecurityGroup = a});
 
 -- | The response status code.
-acsgirsStatus :: Lens' AuthorizeClusterSecurityGroupIngressResponse Int
-acsgirsStatus = lens _acsgirsStatus (\ s a -> s{_acsgirsStatus = a});
+acsgirsResponseStatus :: Lens' AuthorizeClusterSecurityGroupIngressResponse Int
+acsgirsResponseStatus = lens _acsgirsResponseStatus (\ s a -> s{_acsgirsResponseStatus = a});
diff --git a/gen/Network/AWS/Redshift/AuthorizeSnapshotAccess.hs b/gen/Network/AWS/Redshift/AuthorizeSnapshotAccess.hs
--- a/gen/Network/AWS/Redshift/AuthorizeSnapshotAccess.hs
+++ b/gen/Network/AWS/Redshift/AuthorizeSnapshotAccess.hs
@@ -41,7 +41,7 @@
     , AuthorizeSnapshotAccessResponse
     -- * Response Lenses
     , asarsSnapshot
-    , asarsStatus
+    , asarsResponseStatus
     ) where
 
 import           Network.AWS.Prelude
@@ -125,8 +125,8 @@
 
 -- | /See:/ 'authorizeSnapshotAccessResponse' smart constructor.
 data AuthorizeSnapshotAccessResponse = AuthorizeSnapshotAccessResponse'
-    { _asarsSnapshot :: !(Maybe Snapshot)
-    , _asarsStatus   :: !Int
+    { _asarsSnapshot       :: !(Maybe Snapshot)
+    , _asarsResponseStatus :: !Int
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'AuthorizeSnapshotAccessResponse' with the minimum fields required to make a request.
@@ -135,14 +135,14 @@
 --
 -- * 'asarsSnapshot'
 --
--- * 'asarsStatus'
+-- * 'asarsResponseStatus'
 authorizeSnapshotAccessResponse
-    :: Int -- ^ 'asarsStatus'
+    :: Int -- ^ 'asarsResponseStatus'
     -> AuthorizeSnapshotAccessResponse
-authorizeSnapshotAccessResponse pStatus_ =
+authorizeSnapshotAccessResponse pResponseStatus_ =
     AuthorizeSnapshotAccessResponse'
     { _asarsSnapshot = Nothing
-    , _asarsStatus = pStatus_
+    , _asarsResponseStatus = pResponseStatus_
     }
 
 -- | Undocumented member.
@@ -150,5 +150,5 @@
 asarsSnapshot = lens _asarsSnapshot (\ s a -> s{_asarsSnapshot = a});
 
 -- | The response status code.
-asarsStatus :: Lens' AuthorizeSnapshotAccessResponse Int
-asarsStatus = lens _asarsStatus (\ s a -> s{_asarsStatus = a});
+asarsResponseStatus :: Lens' AuthorizeSnapshotAccessResponse Int
+asarsResponseStatus = lens _asarsResponseStatus (\ s a -> s{_asarsResponseStatus = a});
diff --git a/gen/Network/AWS/Redshift/CopyClusterSnapshot.hs b/gen/Network/AWS/Redshift/CopyClusterSnapshot.hs
--- a/gen/Network/AWS/Redshift/CopyClusterSnapshot.hs
+++ b/gen/Network/AWS/Redshift/CopyClusterSnapshot.hs
@@ -49,7 +49,7 @@
     , CopyClusterSnapshotResponse
     -- * Response Lenses
     , ccsrsSnapshot
-    , ccsrsStatus
+    , ccsrsResponseStatus
     ) where
 
 import           Network.AWS.Prelude
@@ -149,8 +149,8 @@
 
 -- | /See:/ 'copyClusterSnapshotResponse' smart constructor.
 data CopyClusterSnapshotResponse = CopyClusterSnapshotResponse'
-    { _ccsrsSnapshot :: !(Maybe Snapshot)
-    , _ccsrsStatus   :: !Int
+    { _ccsrsSnapshot       :: !(Maybe Snapshot)
+    , _ccsrsResponseStatus :: !Int
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'CopyClusterSnapshotResponse' with the minimum fields required to make a request.
@@ -159,14 +159,14 @@
 --
 -- * 'ccsrsSnapshot'
 --
--- * 'ccsrsStatus'
+-- * 'ccsrsResponseStatus'
 copyClusterSnapshotResponse
-    :: Int -- ^ 'ccsrsStatus'
+    :: Int -- ^ 'ccsrsResponseStatus'
     -> CopyClusterSnapshotResponse
-copyClusterSnapshotResponse pStatus_ =
+copyClusterSnapshotResponse pResponseStatus_ =
     CopyClusterSnapshotResponse'
     { _ccsrsSnapshot = Nothing
-    , _ccsrsStatus = pStatus_
+    , _ccsrsResponseStatus = pResponseStatus_
     }
 
 -- | Undocumented member.
@@ -174,5 +174,5 @@
 ccsrsSnapshot = lens _ccsrsSnapshot (\ s a -> s{_ccsrsSnapshot = a});
 
 -- | The response status code.
-ccsrsStatus :: Lens' CopyClusterSnapshotResponse Int
-ccsrsStatus = lens _ccsrsStatus (\ s a -> s{_ccsrsStatus = a});
+ccsrsResponseStatus :: Lens' CopyClusterSnapshotResponse Int
+ccsrsResponseStatus = lens _ccsrsResponseStatus (\ s a -> s{_ccsrsResponseStatus = a});
diff --git a/gen/Network/AWS/Redshift/CreateCluster.hs b/gen/Network/AWS/Redshift/CreateCluster.hs
--- a/gen/Network/AWS/Redshift/CreateCluster.hs
+++ b/gen/Network/AWS/Redshift/CreateCluster.hs
@@ -39,21 +39,21 @@
     , ccClusterSecurityGroups
     , ccAutomatedSnapshotRetentionPeriod
     , ccEncrypted
-    , ccNumberOfNodes
-    , ccHSMClientCertificateIdentifier
     , ccClusterSubnetGroupName
+    , ccHSMClientCertificateIdentifier
+    , ccNumberOfNodes
     , ccElasticIP
     , ccPreferredMaintenanceWindow
-    , ccAvailabilityZone
     , ccKMSKeyId
+    , ccAvailabilityZone
     , ccVPCSecurityGroupIds
     , ccClusterType
     , ccClusterVersion
     , ccAllowVersionUpgrade
     , ccClusterParameterGroupName
-    , ccDBName
     , ccTags
     , ccPort
+    , ccDBName
     , ccClusterIdentifier
     , ccNodeType
     , ccMasterUsername
@@ -64,7 +64,7 @@
     , CreateClusterResponse
     -- * Response Lenses
     , ccrsCluster
-    , ccrsStatus
+    , ccrsResponseStatus
     ) where
 
 import           Network.AWS.Prelude
@@ -82,21 +82,21 @@
     , _ccClusterSecurityGroups            :: !(Maybe [Text])
     , _ccAutomatedSnapshotRetentionPeriod :: !(Maybe Int)
     , _ccEncrypted                        :: !(Maybe Bool)
-    , _ccNumberOfNodes                    :: !(Maybe Int)
-    , _ccHSMClientCertificateIdentifier   :: !(Maybe Text)
     , _ccClusterSubnetGroupName           :: !(Maybe Text)
+    , _ccHSMClientCertificateIdentifier   :: !(Maybe Text)
+    , _ccNumberOfNodes                    :: !(Maybe Int)
     , _ccElasticIP                        :: !(Maybe Text)
     , _ccPreferredMaintenanceWindow       :: !(Maybe Text)
-    , _ccAvailabilityZone                 :: !(Maybe Text)
     , _ccKMSKeyId                         :: !(Maybe Text)
+    , _ccAvailabilityZone                 :: !(Maybe Text)
     , _ccVPCSecurityGroupIds              :: !(Maybe [Text])
     , _ccClusterType                      :: !(Maybe Text)
     , _ccClusterVersion                   :: !(Maybe Text)
     , _ccAllowVersionUpgrade              :: !(Maybe Bool)
     , _ccClusterParameterGroupName        :: !(Maybe Text)
-    , _ccDBName                           :: !(Maybe Text)
     , _ccTags                             :: !(Maybe [Tag])
     , _ccPort                             :: !(Maybe Int)
+    , _ccDBName                           :: !(Maybe Text)
     , _ccClusterIdentifier                :: !Text
     , _ccNodeType                         :: !Text
     , _ccMasterUsername                   :: !Text
@@ -117,20 +117,20 @@
 --
 -- * 'ccEncrypted'
 --
--- * 'ccNumberOfNodes'
+-- * 'ccClusterSubnetGroupName'
 --
 -- * 'ccHSMClientCertificateIdentifier'
 --
--- * 'ccClusterSubnetGroupName'
+-- * 'ccNumberOfNodes'
 --
 -- * 'ccElasticIP'
 --
 -- * 'ccPreferredMaintenanceWindow'
 --
--- * 'ccAvailabilityZone'
---
 -- * 'ccKMSKeyId'
 --
+-- * 'ccAvailabilityZone'
+--
 -- * 'ccVPCSecurityGroupIds'
 --
 -- * 'ccClusterType'
@@ -141,12 +141,12 @@
 --
 -- * 'ccClusterParameterGroupName'
 --
--- * 'ccDBName'
---
 -- * 'ccTags'
 --
 -- * 'ccPort'
 --
+-- * 'ccDBName'
+--
 -- * 'ccClusterIdentifier'
 --
 -- * 'ccNodeType'
@@ -167,21 +167,21 @@
     , _ccClusterSecurityGroups = Nothing
     , _ccAutomatedSnapshotRetentionPeriod = Nothing
     , _ccEncrypted = Nothing
-    , _ccNumberOfNodes = Nothing
-    , _ccHSMClientCertificateIdentifier = Nothing
     , _ccClusterSubnetGroupName = Nothing
+    , _ccHSMClientCertificateIdentifier = Nothing
+    , _ccNumberOfNodes = Nothing
     , _ccElasticIP = Nothing
     , _ccPreferredMaintenanceWindow = Nothing
-    , _ccAvailabilityZone = Nothing
     , _ccKMSKeyId = Nothing
+    , _ccAvailabilityZone = Nothing
     , _ccVPCSecurityGroupIds = Nothing
     , _ccClusterType = Nothing
     , _ccClusterVersion = Nothing
     , _ccAllowVersionUpgrade = Nothing
     , _ccClusterParameterGroupName = Nothing
-    , _ccDBName = Nothing
     , _ccTags = Nothing
     , _ccPort = Nothing
+    , _ccDBName = Nothing
     , _ccClusterIdentifier = pClusterIdentifier_
     , _ccNodeType = pNodeType_
     , _ccMasterUsername = pMasterUsername_
@@ -221,6 +221,18 @@
 ccEncrypted :: Lens' CreateCluster (Maybe Bool)
 ccEncrypted = lens _ccEncrypted (\ s a -> s{_ccEncrypted = a});
 
+-- | The name of a cluster subnet group to be associated with this cluster.
+--
+-- If this parameter is not provided the resulting cluster will be deployed
+-- outside virtual private cloud (VPC).
+ccClusterSubnetGroupName :: Lens' CreateCluster (Maybe Text)
+ccClusterSubnetGroupName = lens _ccClusterSubnetGroupName (\ s a -> s{_ccClusterSubnetGroupName = a});
+
+-- | Specifies the name of the HSM client certificate the Amazon Redshift
+-- cluster uses to retrieve the data encryption keys stored in an HSM.
+ccHSMClientCertificateIdentifier :: Lens' CreateCluster (Maybe Text)
+ccHSMClientCertificateIdentifier = lens _ccHSMClientCertificateIdentifier (\ s a -> s{_ccHSMClientCertificateIdentifier = a});
+
 -- | The number of compute nodes in the cluster. This parameter is required
 -- when the __ClusterType__ parameter is specified as 'multi-node'.
 --
@@ -238,18 +250,6 @@
 ccNumberOfNodes :: Lens' CreateCluster (Maybe Int)
 ccNumberOfNodes = lens _ccNumberOfNodes (\ s a -> s{_ccNumberOfNodes = a});
 
--- | Specifies the name of the HSM client certificate the Amazon Redshift
--- cluster uses to retrieve the data encryption keys stored in an HSM.
-ccHSMClientCertificateIdentifier :: Lens' CreateCluster (Maybe Text)
-ccHSMClientCertificateIdentifier = lens _ccHSMClientCertificateIdentifier (\ s a -> s{_ccHSMClientCertificateIdentifier = a});
-
--- | The name of a cluster subnet group to be associated with this cluster.
---
--- If this parameter is not provided the resulting cluster will be deployed
--- outside virtual private cloud (VPC).
-ccClusterSubnetGroupName :: Lens' CreateCluster (Maybe Text)
-ccClusterSubnetGroupName = lens _ccClusterSubnetGroupName (\ s a -> s{_ccClusterSubnetGroupName = a});
-
 -- | The Elastic IP (EIP) address for the cluster.
 --
 -- Constraints: The cluster must be provisioned in EC2-VPC and
@@ -277,6 +277,11 @@
 ccPreferredMaintenanceWindow :: Lens' CreateCluster (Maybe Text)
 ccPreferredMaintenanceWindow = lens _ccPreferredMaintenanceWindow (\ s a -> s{_ccPreferredMaintenanceWindow = a});
 
+-- | The AWS Key Management Service (KMS) key ID of the encryption key that
+-- you want to use to encrypt data in the cluster.
+ccKMSKeyId :: Lens' CreateCluster (Maybe Text)
+ccKMSKeyId = lens _ccKMSKeyId (\ s a -> s{_ccKMSKeyId = a});
+
 -- | The EC2 Availability Zone (AZ) in which you want Amazon Redshift to
 -- provision the cluster. For example, if you have several EC2 instances
 -- running in a specific Availability Zone, then you might want the cluster
@@ -292,11 +297,6 @@
 ccAvailabilityZone :: Lens' CreateCluster (Maybe Text)
 ccAvailabilityZone = lens _ccAvailabilityZone (\ s a -> s{_ccAvailabilityZone = a});
 
--- | The AWS Key Management Service (KMS) key ID of the encryption key that
--- you want to use to encrypt data in the cluster.
-ccKMSKeyId :: Lens' CreateCluster (Maybe Text)
-ccKMSKeyId = lens _ccKMSKeyId (\ s a -> s{_ccKMSKeyId = a});
-
 -- | A list of Virtual Private Cloud (VPC) security groups to be associated
 -- with the cluster.
 --
@@ -352,6 +352,22 @@
 ccClusterParameterGroupName :: Lens' CreateCluster (Maybe Text)
 ccClusterParameterGroupName = lens _ccClusterParameterGroupName (\ s a -> s{_ccClusterParameterGroupName = a});
 
+-- | A list of tag instances.
+ccTags :: Lens' CreateCluster [Tag]
+ccTags = lens _ccTags (\ s a -> s{_ccTags = a}) . _Default . _Coerce;
+
+-- | The port number on which the cluster accepts incoming connections.
+--
+-- The cluster is accessible only via the JDBC and ODBC connection strings.
+-- Part of the connection string requires the port on which the cluster
+-- will listen for incoming connections.
+--
+-- Default: '5439'
+--
+-- Valid Values: '1150-65535'
+ccPort :: Lens' CreateCluster (Maybe Int)
+ccPort = lens _ccPort (\ s a -> s{_ccPort = a});
+
 -- | The name of the first database to be created when the cluster is
 -- created.
 --
@@ -374,22 +390,6 @@
 ccDBName :: Lens' CreateCluster (Maybe Text)
 ccDBName = lens _ccDBName (\ s a -> s{_ccDBName = a});
 
--- | A list of tag instances.
-ccTags :: Lens' CreateCluster [Tag]
-ccTags = lens _ccTags (\ s a -> s{_ccTags = a}) . _Default . _Coerce;
-
--- | The port number on which the cluster accepts incoming connections.
---
--- The cluster is accessible only via the JDBC and ODBC connection strings.
--- Part of the connection string requires the port on which the cluster
--- will listen for incoming connections.
---
--- Default: '5439'
---
--- Valid Values: '1150-65535'
-ccPort :: Lens' CreateCluster (Maybe Int)
-ccPort = lens _ccPort (\ s a -> s{_ccPort = a});
-
 -- | A unique identifier for the cluster. You use this identifier to refer to
 -- the cluster for any subsequent cluster operations such as deleting or
 -- modifying. The identifier also appears in the Amazon Redshift console.
@@ -473,16 +473,16 @@
                "AutomatedSnapshotRetentionPeriod" =:
                  _ccAutomatedSnapshotRetentionPeriod,
                "Encrypted" =: _ccEncrypted,
-               "NumberOfNodes" =: _ccNumberOfNodes,
-               "HsmClientCertificateIdentifier" =:
-                 _ccHSMClientCertificateIdentifier,
                "ClusterSubnetGroupName" =:
                  _ccClusterSubnetGroupName,
+               "HsmClientCertificateIdentifier" =:
+                 _ccHSMClientCertificateIdentifier,
+               "NumberOfNodes" =: _ccNumberOfNodes,
                "ElasticIp" =: _ccElasticIP,
                "PreferredMaintenanceWindow" =:
                  _ccPreferredMaintenanceWindow,
-               "AvailabilityZone" =: _ccAvailabilityZone,
                "KmsKeyId" =: _ccKMSKeyId,
+               "AvailabilityZone" =: _ccAvailabilityZone,
                "VpcSecurityGroupIds" =:
                  toQuery
                    (toQueryList "VpcSecurityGroupId" <$>
@@ -492,9 +492,8 @@
                "AllowVersionUpgrade" =: _ccAllowVersionUpgrade,
                "ClusterParameterGroupName" =:
                  _ccClusterParameterGroupName,
-               "DBName" =: _ccDBName,
                "Tags" =: toQuery (toQueryList "Tag" <$> _ccTags),
-               "Port" =: _ccPort,
+               "Port" =: _ccPort, "DBName" =: _ccDBName,
                "ClusterIdentifier" =: _ccClusterIdentifier,
                "NodeType" =: _ccNodeType,
                "MasterUsername" =: _ccMasterUsername,
@@ -502,8 +501,8 @@
 
 -- | /See:/ 'createClusterResponse' smart constructor.
 data CreateClusterResponse = CreateClusterResponse'
-    { _ccrsCluster :: !(Maybe Cluster)
-    , _ccrsStatus  :: !Int
+    { _ccrsCluster        :: !(Maybe Cluster)
+    , _ccrsResponseStatus :: !Int
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'CreateClusterResponse' with the minimum fields required to make a request.
@@ -512,14 +511,14 @@
 --
 -- * 'ccrsCluster'
 --
--- * 'ccrsStatus'
+-- * 'ccrsResponseStatus'
 createClusterResponse
-    :: Int -- ^ 'ccrsStatus'
+    :: Int -- ^ 'ccrsResponseStatus'
     -> CreateClusterResponse
-createClusterResponse pStatus_ =
+createClusterResponse pResponseStatus_ =
     CreateClusterResponse'
     { _ccrsCluster = Nothing
-    , _ccrsStatus = pStatus_
+    , _ccrsResponseStatus = pResponseStatus_
     }
 
 -- | Undocumented member.
@@ -527,5 +526,5 @@
 ccrsCluster = lens _ccrsCluster (\ s a -> s{_ccrsCluster = a});
 
 -- | The response status code.
-ccrsStatus :: Lens' CreateClusterResponse Int
-ccrsStatus = lens _ccrsStatus (\ s a -> s{_ccrsStatus = a});
+ccrsResponseStatus :: Lens' CreateClusterResponse Int
+ccrsResponseStatus = lens _ccrsResponseStatus (\ s a -> s{_ccrsResponseStatus = a});
diff --git a/gen/Network/AWS/Redshift/CreateClusterParameterGroup.hs b/gen/Network/AWS/Redshift/CreateClusterParameterGroup.hs
--- a/gen/Network/AWS/Redshift/CreateClusterParameterGroup.hs
+++ b/gen/Network/AWS/Redshift/CreateClusterParameterGroup.hs
@@ -48,7 +48,7 @@
     , CreateClusterParameterGroupResponse
     -- * Response Lenses
     , ccpgrsClusterParameterGroup
-    , ccpgrsStatus
+    , ccpgrsResponseStatus
     ) where
 
 import           Network.AWS.Prelude
@@ -157,7 +157,7 @@
 -- | /See:/ 'createClusterParameterGroupResponse' smart constructor.
 data CreateClusterParameterGroupResponse = CreateClusterParameterGroupResponse'
     { _ccpgrsClusterParameterGroup :: !(Maybe ClusterParameterGroup)
-    , _ccpgrsStatus                :: !Int
+    , _ccpgrsResponseStatus        :: !Int
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'CreateClusterParameterGroupResponse' with the minimum fields required to make a request.
@@ -166,14 +166,14 @@
 --
 -- * 'ccpgrsClusterParameterGroup'
 --
--- * 'ccpgrsStatus'
+-- * 'ccpgrsResponseStatus'
 createClusterParameterGroupResponse
-    :: Int -- ^ 'ccpgrsStatus'
+    :: Int -- ^ 'ccpgrsResponseStatus'
     -> CreateClusterParameterGroupResponse
-createClusterParameterGroupResponse pStatus_ =
+createClusterParameterGroupResponse pResponseStatus_ =
     CreateClusterParameterGroupResponse'
     { _ccpgrsClusterParameterGroup = Nothing
-    , _ccpgrsStatus = pStatus_
+    , _ccpgrsResponseStatus = pResponseStatus_
     }
 
 -- | Undocumented member.
@@ -181,5 +181,5 @@
 ccpgrsClusterParameterGroup = lens _ccpgrsClusterParameterGroup (\ s a -> s{_ccpgrsClusterParameterGroup = a});
 
 -- | The response status code.
-ccpgrsStatus :: Lens' CreateClusterParameterGroupResponse Int
-ccpgrsStatus = lens _ccpgrsStatus (\ s a -> s{_ccpgrsStatus = a});
+ccpgrsResponseStatus :: Lens' CreateClusterParameterGroupResponse Int
+ccpgrsResponseStatus = lens _ccpgrsResponseStatus (\ s a -> s{_ccpgrsResponseStatus = a});
diff --git a/gen/Network/AWS/Redshift/CreateClusterSecurityGroup.hs b/gen/Network/AWS/Redshift/CreateClusterSecurityGroup.hs
--- a/gen/Network/AWS/Redshift/CreateClusterSecurityGroup.hs
+++ b/gen/Network/AWS/Redshift/CreateClusterSecurityGroup.hs
@@ -41,7 +41,7 @@
     , CreateClusterSecurityGroupResponse
     -- * Response Lenses
     , crsClusterSecurityGroup
-    , crsStatus
+    , crsResponseStatus
     ) where
 
 import           Network.AWS.Prelude
@@ -133,7 +133,7 @@
 -- | /See:/ 'createClusterSecurityGroupResponse' smart constructor.
 data CreateClusterSecurityGroupResponse = CreateClusterSecurityGroupResponse'
     { _crsClusterSecurityGroup :: !(Maybe ClusterSecurityGroup)
-    , _crsStatus               :: !Int
+    , _crsResponseStatus       :: !Int
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'CreateClusterSecurityGroupResponse' with the minimum fields required to make a request.
@@ -142,14 +142,14 @@
 --
 -- * 'crsClusterSecurityGroup'
 --
--- * 'crsStatus'
+-- * 'crsResponseStatus'
 createClusterSecurityGroupResponse
-    :: Int -- ^ 'crsStatus'
+    :: Int -- ^ 'crsResponseStatus'
     -> CreateClusterSecurityGroupResponse
-createClusterSecurityGroupResponse pStatus_ =
+createClusterSecurityGroupResponse pResponseStatus_ =
     CreateClusterSecurityGroupResponse'
     { _crsClusterSecurityGroup = Nothing
-    , _crsStatus = pStatus_
+    , _crsResponseStatus = pResponseStatus_
     }
 
 -- | Undocumented member.
@@ -157,5 +157,5 @@
 crsClusterSecurityGroup = lens _crsClusterSecurityGroup (\ s a -> s{_crsClusterSecurityGroup = a});
 
 -- | The response status code.
-crsStatus :: Lens' CreateClusterSecurityGroupResponse Int
-crsStatus = lens _crsStatus (\ s a -> s{_crsStatus = a});
+crsResponseStatus :: Lens' CreateClusterSecurityGroupResponse Int
+crsResponseStatus = lens _crsResponseStatus (\ s a -> s{_crsResponseStatus = a});
diff --git a/gen/Network/AWS/Redshift/CreateClusterSnapshot.hs b/gen/Network/AWS/Redshift/CreateClusterSnapshot.hs
--- a/gen/Network/AWS/Redshift/CreateClusterSnapshot.hs
+++ b/gen/Network/AWS/Redshift/CreateClusterSnapshot.hs
@@ -41,7 +41,7 @@
     , CreateClusterSnapshotResponse
     -- * Response Lenses
     , crersSnapshot
-    , crersStatus
+    , crersResponseStatus
     ) where
 
 import           Network.AWS.Prelude
@@ -128,8 +128,8 @@
 
 -- | /See:/ 'createClusterSnapshotResponse' smart constructor.
 data CreateClusterSnapshotResponse = CreateClusterSnapshotResponse'
-    { _crersSnapshot :: !(Maybe Snapshot)
-    , _crersStatus   :: !Int
+    { _crersSnapshot       :: !(Maybe Snapshot)
+    , _crersResponseStatus :: !Int
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'CreateClusterSnapshotResponse' with the minimum fields required to make a request.
@@ -138,14 +138,14 @@
 --
 -- * 'crersSnapshot'
 --
--- * 'crersStatus'
+-- * 'crersResponseStatus'
 createClusterSnapshotResponse
-    :: Int -- ^ 'crersStatus'
+    :: Int -- ^ 'crersResponseStatus'
     -> CreateClusterSnapshotResponse
-createClusterSnapshotResponse pStatus_ =
+createClusterSnapshotResponse pResponseStatus_ =
     CreateClusterSnapshotResponse'
     { _crersSnapshot = Nothing
-    , _crersStatus = pStatus_
+    , _crersResponseStatus = pResponseStatus_
     }
 
 -- | Undocumented member.
@@ -153,5 +153,5 @@
 crersSnapshot = lens _crersSnapshot (\ s a -> s{_crersSnapshot = a});
 
 -- | The response status code.
-crersStatus :: Lens' CreateClusterSnapshotResponse Int
-crersStatus = lens _crersStatus (\ s a -> s{_crersStatus = a});
+crersResponseStatus :: Lens' CreateClusterSnapshotResponse Int
+crersResponseStatus = lens _crersResponseStatus (\ s a -> s{_crersResponseStatus = a});
diff --git a/gen/Network/AWS/Redshift/CreateClusterSubnetGroup.hs b/gen/Network/AWS/Redshift/CreateClusterSubnetGroup.hs
--- a/gen/Network/AWS/Redshift/CreateClusterSubnetGroup.hs
+++ b/gen/Network/AWS/Redshift/CreateClusterSubnetGroup.hs
@@ -43,7 +43,7 @@
     , CreateClusterSubnetGroupResponse
     -- * Response Lenses
     , ccsgrsClusterSubnetGroup
-    , ccsgrsStatus
+    , ccsgrsResponseStatus
     ) where
 
 import           Network.AWS.Prelude
@@ -144,7 +144,7 @@
 -- | /See:/ 'createClusterSubnetGroupResponse' smart constructor.
 data CreateClusterSubnetGroupResponse = CreateClusterSubnetGroupResponse'
     { _ccsgrsClusterSubnetGroup :: !(Maybe ClusterSubnetGroup)
-    , _ccsgrsStatus             :: !Int
+    , _ccsgrsResponseStatus     :: !Int
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'CreateClusterSubnetGroupResponse' with the minimum fields required to make a request.
@@ -153,14 +153,14 @@
 --
 -- * 'ccsgrsClusterSubnetGroup'
 --
--- * 'ccsgrsStatus'
+-- * 'ccsgrsResponseStatus'
 createClusterSubnetGroupResponse
-    :: Int -- ^ 'ccsgrsStatus'
+    :: Int -- ^ 'ccsgrsResponseStatus'
     -> CreateClusterSubnetGroupResponse
-createClusterSubnetGroupResponse pStatus_ =
+createClusterSubnetGroupResponse pResponseStatus_ =
     CreateClusterSubnetGroupResponse'
     { _ccsgrsClusterSubnetGroup = Nothing
-    , _ccsgrsStatus = pStatus_
+    , _ccsgrsResponseStatus = pResponseStatus_
     }
 
 -- | Undocumented member.
@@ -168,5 +168,5 @@
 ccsgrsClusterSubnetGroup = lens _ccsgrsClusterSubnetGroup (\ s a -> s{_ccsgrsClusterSubnetGroup = a});
 
 -- | The response status code.
-ccsgrsStatus :: Lens' CreateClusterSubnetGroupResponse Int
-ccsgrsStatus = lens _ccsgrsStatus (\ s a -> s{_ccsgrsStatus = a});
+ccsgrsResponseStatus :: Lens' CreateClusterSubnetGroupResponse Int
+ccsgrsResponseStatus = lens _ccsgrsResponseStatus (\ s a -> s{_ccsgrsResponseStatus = a});
diff --git a/gen/Network/AWS/Redshift/CreateEventSubscription.hs b/gen/Network/AWS/Redshift/CreateEventSubscription.hs
--- a/gen/Network/AWS/Redshift/CreateEventSubscription.hs
+++ b/gen/Network/AWS/Redshift/CreateEventSubscription.hs
@@ -64,7 +64,7 @@
     , CreateEventSubscriptionResponse
     -- * Response Lenses
     , cesrsEventSubscription
-    , cesrsStatus
+    , cesrsResponseStatus
     ) where
 
 import           Network.AWS.Prelude
@@ -223,7 +223,7 @@
 -- | /See:/ 'createEventSubscriptionResponse' smart constructor.
 data CreateEventSubscriptionResponse = CreateEventSubscriptionResponse'
     { _cesrsEventSubscription :: !(Maybe EventSubscription)
-    , _cesrsStatus            :: !Int
+    , _cesrsResponseStatus    :: !Int
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'CreateEventSubscriptionResponse' with the minimum fields required to make a request.
@@ -232,14 +232,14 @@
 --
 -- * 'cesrsEventSubscription'
 --
--- * 'cesrsStatus'
+-- * 'cesrsResponseStatus'
 createEventSubscriptionResponse
-    :: Int -- ^ 'cesrsStatus'
+    :: Int -- ^ 'cesrsResponseStatus'
     -> CreateEventSubscriptionResponse
-createEventSubscriptionResponse pStatus_ =
+createEventSubscriptionResponse pResponseStatus_ =
     CreateEventSubscriptionResponse'
     { _cesrsEventSubscription = Nothing
-    , _cesrsStatus = pStatus_
+    , _cesrsResponseStatus = pResponseStatus_
     }
 
 -- | Undocumented member.
@@ -247,5 +247,5 @@
 cesrsEventSubscription = lens _cesrsEventSubscription (\ s a -> s{_cesrsEventSubscription = a});
 
 -- | The response status code.
-cesrsStatus :: Lens' CreateEventSubscriptionResponse Int
-cesrsStatus = lens _cesrsStatus (\ s a -> s{_cesrsStatus = a});
+cesrsResponseStatus :: Lens' CreateEventSubscriptionResponse Int
+cesrsResponseStatus = lens _cesrsResponseStatus (\ s a -> s{_cesrsResponseStatus = a});
diff --git a/gen/Network/AWS/Redshift/CreateHSMClientCertificate.hs b/gen/Network/AWS/Redshift/CreateHSMClientCertificate.hs
--- a/gen/Network/AWS/Redshift/CreateHSMClientCertificate.hs
+++ b/gen/Network/AWS/Redshift/CreateHSMClientCertificate.hs
@@ -45,7 +45,7 @@
     , CreateHSMClientCertificateResponse
     -- * Response Lenses
     , chccrsHSMClientCertificate
-    , chccrsStatus
+    , chccrsResponseStatus
     ) where
 
 import           Network.AWS.Prelude
@@ -119,7 +119,7 @@
 -- | /See:/ 'createHSMClientCertificateResponse' smart constructor.
 data CreateHSMClientCertificateResponse = CreateHSMClientCertificateResponse'
     { _chccrsHSMClientCertificate :: !(Maybe HSMClientCertificate)
-    , _chccrsStatus               :: !Int
+    , _chccrsResponseStatus       :: !Int
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'CreateHSMClientCertificateResponse' with the minimum fields required to make a request.
@@ -128,14 +128,14 @@
 --
 -- * 'chccrsHSMClientCertificate'
 --
--- * 'chccrsStatus'
+-- * 'chccrsResponseStatus'
 createHSMClientCertificateResponse
-    :: Int -- ^ 'chccrsStatus'
+    :: Int -- ^ 'chccrsResponseStatus'
     -> CreateHSMClientCertificateResponse
-createHSMClientCertificateResponse pStatus_ =
+createHSMClientCertificateResponse pResponseStatus_ =
     CreateHSMClientCertificateResponse'
     { _chccrsHSMClientCertificate = Nothing
-    , _chccrsStatus = pStatus_
+    , _chccrsResponseStatus = pResponseStatus_
     }
 
 -- | Undocumented member.
@@ -143,5 +143,5 @@
 chccrsHSMClientCertificate = lens _chccrsHSMClientCertificate (\ s a -> s{_chccrsHSMClientCertificate = a});
 
 -- | The response status code.
-chccrsStatus :: Lens' CreateHSMClientCertificateResponse Int
-chccrsStatus = lens _chccrsStatus (\ s a -> s{_chccrsStatus = a});
+chccrsResponseStatus :: Lens' CreateHSMClientCertificateResponse Int
+chccrsResponseStatus = lens _chccrsResponseStatus (\ s a -> s{_chccrsResponseStatus = a});
diff --git a/gen/Network/AWS/Redshift/CreateHSMConfiguration.hs b/gen/Network/AWS/Redshift/CreateHSMConfiguration.hs
--- a/gen/Network/AWS/Redshift/CreateHSMConfiguration.hs
+++ b/gen/Network/AWS/Redshift/CreateHSMConfiguration.hs
@@ -49,7 +49,7 @@
     , CreateHSMConfigurationResponse
     -- * Response Lenses
     , chcrsHSMConfiguration
-    , chcrsStatus
+    , chcrsResponseStatus
     ) where
 
 import           Network.AWS.Prelude
@@ -174,7 +174,7 @@
 -- | /See:/ 'createHSMConfigurationResponse' smart constructor.
 data CreateHSMConfigurationResponse = CreateHSMConfigurationResponse'
     { _chcrsHSMConfiguration :: !(Maybe HSMConfiguration)
-    , _chcrsStatus           :: !Int
+    , _chcrsResponseStatus   :: !Int
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'CreateHSMConfigurationResponse' with the minimum fields required to make a request.
@@ -183,14 +183,14 @@
 --
 -- * 'chcrsHSMConfiguration'
 --
--- * 'chcrsStatus'
+-- * 'chcrsResponseStatus'
 createHSMConfigurationResponse
-    :: Int -- ^ 'chcrsStatus'
+    :: Int -- ^ 'chcrsResponseStatus'
     -> CreateHSMConfigurationResponse
-createHSMConfigurationResponse pStatus_ =
+createHSMConfigurationResponse pResponseStatus_ =
     CreateHSMConfigurationResponse'
     { _chcrsHSMConfiguration = Nothing
-    , _chcrsStatus = pStatus_
+    , _chcrsResponseStatus = pResponseStatus_
     }
 
 -- | Undocumented member.
@@ -198,5 +198,5 @@
 chcrsHSMConfiguration = lens _chcrsHSMConfiguration (\ s a -> s{_chcrsHSMConfiguration = a});
 
 -- | The response status code.
-chcrsStatus :: Lens' CreateHSMConfigurationResponse Int
-chcrsStatus = lens _chcrsStatus (\ s a -> s{_chcrsStatus = a});
+chcrsResponseStatus :: Lens' CreateHSMConfigurationResponse Int
+chcrsResponseStatus = lens _chcrsResponseStatus (\ s a -> s{_chcrsResponseStatus = a});
diff --git a/gen/Network/AWS/Redshift/CreateSnapshotCopyGrant.hs b/gen/Network/AWS/Redshift/CreateSnapshotCopyGrant.hs
--- a/gen/Network/AWS/Redshift/CreateSnapshotCopyGrant.hs
+++ b/gen/Network/AWS/Redshift/CreateSnapshotCopyGrant.hs
@@ -42,7 +42,7 @@
     , CreateSnapshotCopyGrantResponse
     -- * Response Lenses
     , cscgrsSnapshotCopyGrant
-    , cscgrsStatus
+    , cscgrsResponseStatus
     ) where
 
 import           Network.AWS.Prelude
@@ -132,7 +132,7 @@
 -- | /See:/ 'createSnapshotCopyGrantResponse' smart constructor.
 data CreateSnapshotCopyGrantResponse = CreateSnapshotCopyGrantResponse'
     { _cscgrsSnapshotCopyGrant :: !(Maybe SnapshotCopyGrant)
-    , _cscgrsStatus            :: !Int
+    , _cscgrsResponseStatus    :: !Int
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'CreateSnapshotCopyGrantResponse' with the minimum fields required to make a request.
@@ -141,14 +141,14 @@
 --
 -- * 'cscgrsSnapshotCopyGrant'
 --
--- * 'cscgrsStatus'
+-- * 'cscgrsResponseStatus'
 createSnapshotCopyGrantResponse
-    :: Int -- ^ 'cscgrsStatus'
+    :: Int -- ^ 'cscgrsResponseStatus'
     -> CreateSnapshotCopyGrantResponse
-createSnapshotCopyGrantResponse pStatus_ =
+createSnapshotCopyGrantResponse pResponseStatus_ =
     CreateSnapshotCopyGrantResponse'
     { _cscgrsSnapshotCopyGrant = Nothing
-    , _cscgrsStatus = pStatus_
+    , _cscgrsResponseStatus = pResponseStatus_
     }
 
 -- | Undocumented member.
@@ -156,5 +156,5 @@
 cscgrsSnapshotCopyGrant = lens _cscgrsSnapshotCopyGrant (\ s a -> s{_cscgrsSnapshotCopyGrant = a});
 
 -- | The response status code.
-cscgrsStatus :: Lens' CreateSnapshotCopyGrantResponse Int
-cscgrsStatus = lens _cscgrsStatus (\ s a -> s{_cscgrsStatus = a});
+cscgrsResponseStatus :: Lens' CreateSnapshotCopyGrantResponse Int
+cscgrsResponseStatus = lens _cscgrsResponseStatus (\ s a -> s{_cscgrsResponseStatus = a});
diff --git a/gen/Network/AWS/Redshift/DeleteCluster.hs b/gen/Network/AWS/Redshift/DeleteCluster.hs
--- a/gen/Network/AWS/Redshift/DeleteCluster.hs
+++ b/gen/Network/AWS/Redshift/DeleteCluster.hs
@@ -45,16 +45,16 @@
       deleteCluster
     , DeleteCluster
     -- * Request Lenses
-    , dSkipFinalClusterSnapshot
-    , dFinalClusterSnapshotIdentifier
-    , dClusterIdentifier
+    , delSkipFinalClusterSnapshot
+    , delFinalClusterSnapshotIdentifier
+    , delClusterIdentifier
 
     -- * Destructuring the Response
     , deleteClusterResponse
     , DeleteClusterResponse
     -- * Response Lenses
     , drsCluster
-    , drsStatus
+    , drsResponseStatus
     ) where
 
 import           Network.AWS.Prelude
@@ -67,28 +67,28 @@
 --
 -- /See:/ 'deleteCluster' smart constructor.
 data DeleteCluster = DeleteCluster'
-    { _dSkipFinalClusterSnapshot       :: !(Maybe Bool)
-    , _dFinalClusterSnapshotIdentifier :: !(Maybe Text)
-    , _dClusterIdentifier              :: !Text
+    { _delSkipFinalClusterSnapshot       :: !(Maybe Bool)
+    , _delFinalClusterSnapshotIdentifier :: !(Maybe Text)
+    , _delClusterIdentifier              :: !Text
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'DeleteCluster' with the minimum fields required to make a request.
 --
 -- Use one of the following lenses to modify other fields as desired:
 --
--- * 'dSkipFinalClusterSnapshot'
+-- * 'delSkipFinalClusterSnapshot'
 --
--- * 'dFinalClusterSnapshotIdentifier'
+-- * 'delFinalClusterSnapshotIdentifier'
 --
--- * 'dClusterIdentifier'
+-- * 'delClusterIdentifier'
 deleteCluster
-    :: Text -- ^ 'dClusterIdentifier'
+    :: Text -- ^ 'delClusterIdentifier'
     -> DeleteCluster
 deleteCluster pClusterIdentifier_ =
     DeleteCluster'
-    { _dSkipFinalClusterSnapshot = Nothing
-    , _dFinalClusterSnapshotIdentifier = Nothing
-    , _dClusterIdentifier = pClusterIdentifier_
+    { _delSkipFinalClusterSnapshot = Nothing
+    , _delFinalClusterSnapshotIdentifier = Nothing
+    , _delClusterIdentifier = pClusterIdentifier_
     }
 
 -- | Determines whether a final snapshot of the cluster is created before
@@ -100,8 +100,8 @@
 -- /SkipFinalClusterSnapshot/ is 'false'.
 --
 -- Default: 'false'
-dSkipFinalClusterSnapshot :: Lens' DeleteCluster (Maybe Bool)
-dSkipFinalClusterSnapshot = lens _dSkipFinalClusterSnapshot (\ s a -> s{_dSkipFinalClusterSnapshot = a});
+delSkipFinalClusterSnapshot :: Lens' DeleteCluster (Maybe Bool)
+delSkipFinalClusterSnapshot = lens _delSkipFinalClusterSnapshot (\ s a -> s{_delSkipFinalClusterSnapshot = a});
 
 -- | The identifier of the final snapshot that is to be created immediately
 -- before deleting the cluster. If this parameter is provided,
@@ -112,8 +112,8 @@
 -- -   Must be 1 to 255 alphanumeric characters.
 -- -   First character must be a letter.
 -- -   Cannot end with a hyphen or contain two consecutive hyphens.
-dFinalClusterSnapshotIdentifier :: Lens' DeleteCluster (Maybe Text)
-dFinalClusterSnapshotIdentifier = lens _dFinalClusterSnapshotIdentifier (\ s a -> s{_dFinalClusterSnapshotIdentifier = a});
+delFinalClusterSnapshotIdentifier :: Lens' DeleteCluster (Maybe Text)
+delFinalClusterSnapshotIdentifier = lens _delFinalClusterSnapshotIdentifier (\ s a -> s{_delFinalClusterSnapshotIdentifier = a});
 
 -- | The identifier of the cluster to be deleted.
 --
@@ -123,8 +123,8 @@
 -- -   Must contain from 1 to 63 alphanumeric characters or hyphens.
 -- -   First character must be a letter.
 -- -   Cannot end with a hyphen or contain two consecutive hyphens.
-dClusterIdentifier :: Lens' DeleteCluster Text
-dClusterIdentifier = lens _dClusterIdentifier (\ s a -> s{_dClusterIdentifier = a});
+delClusterIdentifier :: Lens' DeleteCluster Text
+delClusterIdentifier = lens _delClusterIdentifier (\ s a -> s{_delClusterIdentifier = a});
 
 instance AWSRequest DeleteCluster where
         type Rs DeleteCluster = DeleteClusterResponse
@@ -147,15 +147,15 @@
               ["Action" =: ("DeleteCluster" :: ByteString),
                "Version" =: ("2012-12-01" :: ByteString),
                "SkipFinalClusterSnapshot" =:
-                 _dSkipFinalClusterSnapshot,
+                 _delSkipFinalClusterSnapshot,
                "FinalClusterSnapshotIdentifier" =:
-                 _dFinalClusterSnapshotIdentifier,
-               "ClusterIdentifier" =: _dClusterIdentifier]
+                 _delFinalClusterSnapshotIdentifier,
+               "ClusterIdentifier" =: _delClusterIdentifier]
 
 -- | /See:/ 'deleteClusterResponse' smart constructor.
 data DeleteClusterResponse = DeleteClusterResponse'
-    { _drsCluster :: !(Maybe Cluster)
-    , _drsStatus  :: !Int
+    { _drsCluster        :: !(Maybe Cluster)
+    , _drsResponseStatus :: !Int
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'DeleteClusterResponse' with the minimum fields required to make a request.
@@ -164,14 +164,14 @@
 --
 -- * 'drsCluster'
 --
--- * 'drsStatus'
+-- * 'drsResponseStatus'
 deleteClusterResponse
-    :: Int -- ^ 'drsStatus'
+    :: Int -- ^ 'drsResponseStatus'
     -> DeleteClusterResponse
-deleteClusterResponse pStatus_ =
+deleteClusterResponse pResponseStatus_ =
     DeleteClusterResponse'
     { _drsCluster = Nothing
-    , _drsStatus = pStatus_
+    , _drsResponseStatus = pResponseStatus_
     }
 
 -- | Undocumented member.
@@ -179,5 +179,5 @@
 drsCluster = lens _drsCluster (\ s a -> s{_drsCluster = a});
 
 -- | The response status code.
-drsStatus :: Lens' DeleteClusterResponse Int
-drsStatus = lens _drsStatus (\ s a -> s{_drsStatus = a});
+drsResponseStatus :: Lens' DeleteClusterResponse Int
+drsResponseStatus = lens _drsResponseStatus (\ s a -> s{_drsResponseStatus = a});
diff --git a/gen/Network/AWS/Redshift/DeleteClusterSnapshot.hs b/gen/Network/AWS/Redshift/DeleteClusterSnapshot.hs
--- a/gen/Network/AWS/Redshift/DeleteClusterSnapshot.hs
+++ b/gen/Network/AWS/Redshift/DeleteClusterSnapshot.hs
@@ -44,7 +44,7 @@
     , DeleteClusterSnapshotResponse
     -- * Response Lenses
     , dcsrsSnapshot
-    , dcsrsStatus
+    , dcsrsResponseStatus
     ) where
 
 import           Network.AWS.Prelude
@@ -120,8 +120,8 @@
 
 -- | /See:/ 'deleteClusterSnapshotResponse' smart constructor.
 data DeleteClusterSnapshotResponse = DeleteClusterSnapshotResponse'
-    { _dcsrsSnapshot :: !(Maybe Snapshot)
-    , _dcsrsStatus   :: !Int
+    { _dcsrsSnapshot       :: !(Maybe Snapshot)
+    , _dcsrsResponseStatus :: !Int
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'DeleteClusterSnapshotResponse' with the minimum fields required to make a request.
@@ -130,14 +130,14 @@
 --
 -- * 'dcsrsSnapshot'
 --
--- * 'dcsrsStatus'
+-- * 'dcsrsResponseStatus'
 deleteClusterSnapshotResponse
-    :: Int -- ^ 'dcsrsStatus'
+    :: Int -- ^ 'dcsrsResponseStatus'
     -> DeleteClusterSnapshotResponse
-deleteClusterSnapshotResponse pStatus_ =
+deleteClusterSnapshotResponse pResponseStatus_ =
     DeleteClusterSnapshotResponse'
     { _dcsrsSnapshot = Nothing
-    , _dcsrsStatus = pStatus_
+    , _dcsrsResponseStatus = pResponseStatus_
     }
 
 -- | Undocumented member.
@@ -145,5 +145,5 @@
 dcsrsSnapshot = lens _dcsrsSnapshot (\ s a -> s{_dcsrsSnapshot = a});
 
 -- | The response status code.
-dcsrsStatus :: Lens' DeleteClusterSnapshotResponse Int
-dcsrsStatus = lens _dcsrsStatus (\ s a -> s{_dcsrsStatus = a});
+dcsrsResponseStatus :: Lens' DeleteClusterSnapshotResponse Int
+dcsrsResponseStatus = lens _dcsrsResponseStatus (\ s a -> s{_dcsrsResponseStatus = a});
diff --git a/gen/Network/AWS/Redshift/DeleteTags.hs b/gen/Network/AWS/Redshift/DeleteTags.hs
--- a/gen/Network/AWS/Redshift/DeleteTags.hs
+++ b/gen/Network/AWS/Redshift/DeleteTags.hs
@@ -28,8 +28,8 @@
       deleteTags
     , DeleteTags
     -- * Request Lenses
-    , dResourceName
-    , dTagKeys
+    , dtsResourceName
+    , dtsTagKeys
 
     -- * Destructuring the Response
     , deleteTagsResponse
@@ -46,34 +46,34 @@
 --
 -- /See:/ 'deleteTags' smart constructor.
 data DeleteTags = DeleteTags'
-    { _dResourceName :: !Text
-    , _dTagKeys      :: ![Text]
+    { _dtsResourceName :: !Text
+    , _dtsTagKeys      :: ![Text]
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'DeleteTags' with the minimum fields required to make a request.
 --
 -- Use one of the following lenses to modify other fields as desired:
 --
--- * 'dResourceName'
+-- * 'dtsResourceName'
 --
--- * 'dTagKeys'
+-- * 'dtsTagKeys'
 deleteTags
-    :: Text -- ^ 'dResourceName'
+    :: Text -- ^ 'dtsResourceName'
     -> DeleteTags
 deleteTags pResourceName_ =
     DeleteTags'
-    { _dResourceName = pResourceName_
-    , _dTagKeys = mempty
+    { _dtsResourceName = pResourceName_
+    , _dtsTagKeys = mempty
     }
 
 -- | The Amazon Resource Name (ARN) from which you want to remove the tag or
 -- tags. For example, 'arn:aws:redshift:us-east-1:123456789:cluster:t1'.
-dResourceName :: Lens' DeleteTags Text
-dResourceName = lens _dResourceName (\ s a -> s{_dResourceName = a});
+dtsResourceName :: Lens' DeleteTags Text
+dtsResourceName = lens _dtsResourceName (\ s a -> s{_dtsResourceName = a});
 
 -- | The tag key that you want to delete.
-dTagKeys :: Lens' DeleteTags [Text]
-dTagKeys = lens _dTagKeys (\ s a -> s{_dTagKeys = a}) . _Coerce;
+dtsTagKeys :: Lens' DeleteTags [Text]
+dtsTagKeys = lens _dtsTagKeys (\ s a -> s{_dtsTagKeys = a}) . _Coerce;
 
 instance AWSRequest DeleteTags where
         type Rs DeleteTags = DeleteTagsResponse
@@ -91,8 +91,8 @@
           = mconcat
               ["Action" =: ("DeleteTags" :: ByteString),
                "Version" =: ("2012-12-01" :: ByteString),
-               "ResourceName" =: _dResourceName,
-               "TagKeys" =: toQueryList "TagKey" _dTagKeys]
+               "ResourceName" =: _dtsResourceName,
+               "TagKeys" =: toQueryList "TagKey" _dtsTagKeys]
 
 -- | /See:/ 'deleteTagsResponse' smart constructor.
 data DeleteTagsResponse =
diff --git a/gen/Network/AWS/Redshift/DescribeClusterParameterGroups.hs b/gen/Network/AWS/Redshift/DescribeClusterParameterGroups.hs
--- a/gen/Network/AWS/Redshift/DescribeClusterParameterGroups.hs
+++ b/gen/Network/AWS/Redshift/DescribeClusterParameterGroups.hs
@@ -49,8 +49,8 @@
     -- * Request Lenses
     , dcpgTagValues
     , dcpgTagKeys
-    , dcpgMaxRecords
     , dcpgMarker
+    , dcpgMaxRecords
     , dcpgParameterGroupName
 
     -- * Destructuring the Response
@@ -59,7 +59,7 @@
     -- * Response Lenses
     , dcpgrsMarker
     , dcpgrsParameterGroups
-    , dcpgrsStatus
+    , dcpgrsResponseStatus
     ) where
 
 import           Network.AWS.Pager
@@ -75,8 +75,8 @@
 data DescribeClusterParameterGroups = DescribeClusterParameterGroups'
     { _dcpgTagValues          :: !(Maybe [Text])
     , _dcpgTagKeys            :: !(Maybe [Text])
-    , _dcpgMaxRecords         :: !(Maybe Int)
     , _dcpgMarker             :: !(Maybe Text)
+    , _dcpgMaxRecords         :: !(Maybe Int)
     , _dcpgParameterGroupName :: !(Maybe Text)
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
@@ -88,10 +88,10 @@
 --
 -- * 'dcpgTagKeys'
 --
--- * 'dcpgMaxRecords'
---
 -- * 'dcpgMarker'
 --
+-- * 'dcpgMaxRecords'
+--
 -- * 'dcpgParameterGroupName'
 describeClusterParameterGroups
     :: DescribeClusterParameterGroups
@@ -99,8 +99,8 @@
     DescribeClusterParameterGroups'
     { _dcpgTagValues = Nothing
     , _dcpgTagKeys = Nothing
-    , _dcpgMaxRecords = Nothing
     , _dcpgMarker = Nothing
+    , _dcpgMaxRecords = Nothing
     , _dcpgParameterGroupName = Nothing
     }
 
@@ -124,6 +124,16 @@
 dcpgTagKeys :: Lens' DescribeClusterParameterGroups [Text]
 dcpgTagKeys = lens _dcpgTagKeys (\ s a -> s{_dcpgTagKeys = a}) . _Default . _Coerce;
 
+-- | An optional parameter that specifies the starting point to return a set
+-- of response records. When the results of a
+-- DescribeClusterParameterGroups request exceed the value specified in
+-- 'MaxRecords', AWS returns a value in the 'Marker' field of the response.
+-- You can retrieve the next set of response records by providing the
+-- returned marker value in the 'Marker' parameter and retrying the
+-- request.
+dcpgMarker :: Lens' DescribeClusterParameterGroups (Maybe Text)
+dcpgMarker = lens _dcpgMarker (\ s a -> s{_dcpgMarker = a});
+
 -- | The maximum number of response records to return in each call. If the
 -- number of remaining response records exceeds the specified 'MaxRecords'
 -- value, a value is returned in a 'marker' field of the response. You can
@@ -136,16 +146,6 @@
 dcpgMaxRecords :: Lens' DescribeClusterParameterGroups (Maybe Int)
 dcpgMaxRecords = lens _dcpgMaxRecords (\ s a -> s{_dcpgMaxRecords = a});
 
--- | An optional parameter that specifies the starting point to return a set
--- of response records. When the results of a
--- DescribeClusterParameterGroups request exceed the value specified in
--- 'MaxRecords', AWS returns a value in the 'Marker' field of the response.
--- You can retrieve the next set of response records by providing the
--- returned marker value in the 'Marker' parameter and retrying the
--- request.
-dcpgMarker :: Lens' DescribeClusterParameterGroups (Maybe Text)
-dcpgMarker = lens _dcpgMarker (\ s a -> s{_dcpgMarker = a});
-
 -- | The name of a specific parameter group for which to return details. By
 -- default, details about all parameter groups and the default parameter
 -- group are returned.
@@ -192,8 +192,8 @@
                  toQuery (toQueryList "TagValue" <$> _dcpgTagValues),
                "TagKeys" =:
                  toQuery (toQueryList "TagKey" <$> _dcpgTagKeys),
-               "MaxRecords" =: _dcpgMaxRecords,
                "Marker" =: _dcpgMarker,
+               "MaxRecords" =: _dcpgMaxRecords,
                "ParameterGroupName" =: _dcpgParameterGroupName]
 
 -- | Contains the output from the DescribeClusterParameterGroups action.
@@ -202,7 +202,7 @@
 data DescribeClusterParameterGroupsResponse = DescribeClusterParameterGroupsResponse'
     { _dcpgrsMarker          :: !(Maybe Text)
     , _dcpgrsParameterGroups :: !(Maybe [ClusterParameterGroup])
-    , _dcpgrsStatus          :: !Int
+    , _dcpgrsResponseStatus  :: !Int
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'DescribeClusterParameterGroupsResponse' with the minimum fields required to make a request.
@@ -213,15 +213,15 @@
 --
 -- * 'dcpgrsParameterGroups'
 --
--- * 'dcpgrsStatus'
+-- * 'dcpgrsResponseStatus'
 describeClusterParameterGroupsResponse
-    :: Int -- ^ 'dcpgrsStatus'
+    :: Int -- ^ 'dcpgrsResponseStatus'
     -> DescribeClusterParameterGroupsResponse
-describeClusterParameterGroupsResponse pStatus_ =
+describeClusterParameterGroupsResponse pResponseStatus_ =
     DescribeClusterParameterGroupsResponse'
     { _dcpgrsMarker = Nothing
     , _dcpgrsParameterGroups = Nothing
-    , _dcpgrsStatus = pStatus_
+    , _dcpgrsResponseStatus = pResponseStatus_
     }
 
 -- | A value that indicates the starting point for the next set of response
@@ -239,5 +239,5 @@
 dcpgrsParameterGroups = lens _dcpgrsParameterGroups (\ s a -> s{_dcpgrsParameterGroups = a}) . _Default . _Coerce;
 
 -- | The response status code.
-dcpgrsStatus :: Lens' DescribeClusterParameterGroupsResponse Int
-dcpgrsStatus = lens _dcpgrsStatus (\ s a -> s{_dcpgrsStatus = a});
+dcpgrsResponseStatus :: Lens' DescribeClusterParameterGroupsResponse Int
+dcpgrsResponseStatus = lens _dcpgrsResponseStatus (\ s a -> s{_dcpgrsResponseStatus = a});
diff --git a/gen/Network/AWS/Redshift/DescribeClusterParameters.hs b/gen/Network/AWS/Redshift/DescribeClusterParameters.hs
--- a/gen/Network/AWS/Redshift/DescribeClusterParameters.hs
+++ b/gen/Network/AWS/Redshift/DescribeClusterParameters.hs
@@ -41,8 +41,8 @@
       describeClusterParameters
     , DescribeClusterParameters
     -- * Request Lenses
-    , dcpsMaxRecords
     , dcpsMarker
+    , dcpsMaxRecords
     , dcpsSource
     , dcpsParameterGroupName
 
@@ -50,9 +50,9 @@
     , describeClusterParametersResponse
     , DescribeClusterParametersResponse
     -- * Response Lenses
-    , dcprsParameters
     , dcprsMarker
-    , dcprsStatus
+    , dcprsParameters
+    , dcprsResponseStatus
     ) where
 
 import           Network.AWS.Pager
@@ -64,8 +64,8 @@
 
 -- | /See:/ 'describeClusterParameters' smart constructor.
 data DescribeClusterParameters = DescribeClusterParameters'
-    { _dcpsMaxRecords         :: !(Maybe Int)
-    , _dcpsMarker             :: !(Maybe Text)
+    { _dcpsMarker             :: !(Maybe Text)
+    , _dcpsMaxRecords         :: !(Maybe Int)
     , _dcpsSource             :: !(Maybe Text)
     , _dcpsParameterGroupName :: !Text
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
@@ -74,10 +74,10 @@
 --
 -- Use one of the following lenses to modify other fields as desired:
 --
--- * 'dcpsMaxRecords'
---
 -- * 'dcpsMarker'
 --
+-- * 'dcpsMaxRecords'
+--
 -- * 'dcpsSource'
 --
 -- * 'dcpsParameterGroupName'
@@ -86,12 +86,21 @@
     -> DescribeClusterParameters
 describeClusterParameters pParameterGroupName_ =
     DescribeClusterParameters'
-    { _dcpsMaxRecords = Nothing
-    , _dcpsMarker = Nothing
+    { _dcpsMarker = Nothing
+    , _dcpsMaxRecords = Nothing
     , _dcpsSource = Nothing
     , _dcpsParameterGroupName = pParameterGroupName_
     }
 
+-- | An optional parameter that specifies the starting point to return a set
+-- of response records. When the results of a DescribeClusterParameters
+-- request exceed the value specified in 'MaxRecords', AWS returns a value
+-- in the 'Marker' field of the response. You can retrieve the next set of
+-- response records by providing the returned marker value in the 'Marker'
+-- parameter and retrying the request.
+dcpsMarker :: Lens' DescribeClusterParameters (Maybe Text)
+dcpsMarker = lens _dcpsMarker (\ s a -> s{_dcpsMarker = a});
+
 -- | The maximum number of response records to return in each call. If the
 -- number of remaining response records exceeds the specified 'MaxRecords'
 -- value, a value is returned in a 'marker' field of the response. You can
@@ -104,15 +113,6 @@
 dcpsMaxRecords :: Lens' DescribeClusterParameters (Maybe Int)
 dcpsMaxRecords = lens _dcpsMaxRecords (\ s a -> s{_dcpsMaxRecords = a});
 
--- | An optional parameter that specifies the starting point to return a set
--- of response records. When the results of a DescribeClusterParameters
--- request exceed the value specified in 'MaxRecords', AWS returns a value
--- in the 'Marker' field of the response. You can retrieve the next set of
--- response records by providing the returned marker value in the 'Marker'
--- parameter and retrying the request.
-dcpsMarker :: Lens' DescribeClusterParameters (Maybe Text)
-dcpsMarker = lens _dcpsMarker (\ s a -> s{_dcpsMarker = a});
-
 -- | The parameter types to return. Specify 'user' to show parameters that
 -- are different form the default. Similarly, specify 'engine-default' to
 -- show parameters that are the same as the default parameter group.
@@ -142,9 +142,9 @@
           = receiveXMLWrapper "DescribeClusterParametersResult"
               (\ s h x ->
                  DescribeClusterParametersResponse' <$>
-                   (x .@? "Parameters" .!@ mempty >>=
-                      may (parseXMLList "Parameter"))
-                     <*> (x .@? "Marker")
+                   (x .@? "Marker") <*>
+                     (x .@? "Parameters" .!@ mempty >>=
+                        may (parseXMLList "Parameter"))
                      <*> (pure (fromEnum s)))
 
 instance ToHeaders DescribeClusterParameters where
@@ -159,43 +159,39 @@
               ["Action" =:
                  ("DescribeClusterParameters" :: ByteString),
                "Version" =: ("2012-12-01" :: ByteString),
+               "Marker" =: _dcpsMarker,
                "MaxRecords" =: _dcpsMaxRecords,
-               "Marker" =: _dcpsMarker, "Source" =: _dcpsSource,
+               "Source" =: _dcpsSource,
                "ParameterGroupName" =: _dcpsParameterGroupName]
 
 -- | Contains the output from the DescribeClusterParameters action.
 --
 -- /See:/ 'describeClusterParametersResponse' smart constructor.
 data DescribeClusterParametersResponse = DescribeClusterParametersResponse'
-    { _dcprsParameters :: !(Maybe [Parameter])
-    , _dcprsMarker     :: !(Maybe Text)
-    , _dcprsStatus     :: !Int
+    { _dcprsMarker         :: !(Maybe Text)
+    , _dcprsParameters     :: !(Maybe [Parameter])
+    , _dcprsResponseStatus :: !Int
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'DescribeClusterParametersResponse' with the minimum fields required to make a request.
 --
 -- Use one of the following lenses to modify other fields as desired:
 --
--- * 'dcprsParameters'
---
 -- * 'dcprsMarker'
 --
--- * 'dcprsStatus'
+-- * 'dcprsParameters'
+--
+-- * 'dcprsResponseStatus'
 describeClusterParametersResponse
-    :: Int -- ^ 'dcprsStatus'
+    :: Int -- ^ 'dcprsResponseStatus'
     -> DescribeClusterParametersResponse
-describeClusterParametersResponse pStatus_ =
+describeClusterParametersResponse pResponseStatus_ =
     DescribeClusterParametersResponse'
-    { _dcprsParameters = Nothing
-    , _dcprsMarker = Nothing
-    , _dcprsStatus = pStatus_
+    { _dcprsMarker = Nothing
+    , _dcprsParameters = Nothing
+    , _dcprsResponseStatus = pResponseStatus_
     }
 
--- | A list of Parameter instances. Each instance lists the parameters of one
--- cluster parameter group.
-dcprsParameters :: Lens' DescribeClusterParametersResponse [Parameter]
-dcprsParameters = lens _dcprsParameters (\ s a -> s{_dcprsParameters = a}) . _Default . _Coerce;
-
 -- | A value that indicates the starting point for the next set of response
 -- records in a subsequent request. If a value is returned in a response,
 -- you can retrieve the next set of records by providing this returned
@@ -205,6 +201,11 @@
 dcprsMarker :: Lens' DescribeClusterParametersResponse (Maybe Text)
 dcprsMarker = lens _dcprsMarker (\ s a -> s{_dcprsMarker = a});
 
+-- | A list of Parameter instances. Each instance lists the parameters of one
+-- cluster parameter group.
+dcprsParameters :: Lens' DescribeClusterParametersResponse [Parameter]
+dcprsParameters = lens _dcprsParameters (\ s a -> s{_dcprsParameters = a}) . _Default . _Coerce;
+
 -- | The response status code.
-dcprsStatus :: Lens' DescribeClusterParametersResponse Int
-dcprsStatus = lens _dcprsStatus (\ s a -> s{_dcprsStatus = a});
+dcprsResponseStatus :: Lens' DescribeClusterParametersResponse Int
+dcprsResponseStatus = lens _dcprsResponseStatus (\ s a -> s{_dcprsResponseStatus = a});
diff --git a/gen/Network/AWS/Redshift/DescribeClusterSecurityGroups.hs b/gen/Network/AWS/Redshift/DescribeClusterSecurityGroups.hs
--- a/gen/Network/AWS/Redshift/DescribeClusterSecurityGroups.hs
+++ b/gen/Network/AWS/Redshift/DescribeClusterSecurityGroups.hs
@@ -48,8 +48,8 @@
     , dcsgTagValues
     , dcsgTagKeys
     , dcsgClusterSecurityGroupName
-    , dcsgMaxRecords
     , dcsgMarker
+    , dcsgMaxRecords
 
     -- * Destructuring the Response
     , describeClusterSecurityGroupsResponse
@@ -57,7 +57,7 @@
     -- * Response Lenses
     , dcsgsrsClusterSecurityGroups
     , dcsgsrsMarker
-    , dcsgsrsStatus
+    , dcsgsrsResponseStatus
     ) where
 
 import           Network.AWS.Pager
@@ -74,8 +74,8 @@
     { _dcsgTagValues                :: !(Maybe [Text])
     , _dcsgTagKeys                  :: !(Maybe [Text])
     , _dcsgClusterSecurityGroupName :: !(Maybe Text)
-    , _dcsgMaxRecords               :: !(Maybe Int)
     , _dcsgMarker                   :: !(Maybe Text)
+    , _dcsgMaxRecords               :: !(Maybe Int)
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'DescribeClusterSecurityGroups' with the minimum fields required to make a request.
@@ -88,9 +88,9 @@
 --
 -- * 'dcsgClusterSecurityGroupName'
 --
--- * 'dcsgMaxRecords'
---
 -- * 'dcsgMarker'
+--
+-- * 'dcsgMaxRecords'
 describeClusterSecurityGroups
     :: DescribeClusterSecurityGroups
 describeClusterSecurityGroups =
@@ -98,8 +98,8 @@
     { _dcsgTagValues = Nothing
     , _dcsgTagKeys = Nothing
     , _dcsgClusterSecurityGroupName = Nothing
-    , _dcsgMaxRecords = Nothing
     , _dcsgMarker = Nothing
+    , _dcsgMaxRecords = Nothing
     }
 
 -- | A tag value or values for which you want to return all matching cluster
@@ -129,18 +129,6 @@
 dcsgClusterSecurityGroupName :: Lens' DescribeClusterSecurityGroups (Maybe Text)
 dcsgClusterSecurityGroupName = lens _dcsgClusterSecurityGroupName (\ s a -> s{_dcsgClusterSecurityGroupName = a});
 
--- | The maximum number of response records to return in each call. If the
--- number of remaining response records exceeds the specified 'MaxRecords'
--- value, a value is returned in a 'marker' field of the response. You can
--- retrieve the next set of records by retrying the command with the
--- returned marker value.
---
--- Default: '100'
---
--- Constraints: minimum 20, maximum 100.
-dcsgMaxRecords :: Lens' DescribeClusterSecurityGroups (Maybe Int)
-dcsgMaxRecords = lens _dcsgMaxRecords (\ s a -> s{_dcsgMaxRecords = a});
-
 -- | An optional parameter that specifies the starting point to return a set
 -- of response records. When the results of a DescribeClusterSecurityGroups
 -- request exceed the value specified in 'MaxRecords', AWS returns a value
@@ -153,6 +141,18 @@
 dcsgMarker :: Lens' DescribeClusterSecurityGroups (Maybe Text)
 dcsgMarker = lens _dcsgMarker (\ s a -> s{_dcsgMarker = a});
 
+-- | The maximum number of response records to return in each call. If the
+-- number of remaining response records exceeds the specified 'MaxRecords'
+-- value, a value is returned in a 'marker' field of the response. You can
+-- retrieve the next set of records by retrying the command with the
+-- returned marker value.
+--
+-- Default: '100'
+--
+-- Constraints: minimum 20, maximum 100.
+dcsgMaxRecords :: Lens' DescribeClusterSecurityGroups (Maybe Int)
+dcsgMaxRecords = lens _dcsgMaxRecords (\ s a -> s{_dcsgMaxRecords = a});
+
 instance AWSPager DescribeClusterSecurityGroups where
         page rq rs
           | stop (rs ^. dcsgsrsMarker) = Nothing
@@ -194,8 +194,8 @@
                  toQuery (toQueryList "TagKey" <$> _dcsgTagKeys),
                "ClusterSecurityGroupName" =:
                  _dcsgClusterSecurityGroupName,
-               "MaxRecords" =: _dcsgMaxRecords,
-               "Marker" =: _dcsgMarker]
+               "Marker" =: _dcsgMarker,
+               "MaxRecords" =: _dcsgMaxRecords]
 
 -- | Contains the output from the DescribeClusterSecurityGroups action.
 --
@@ -203,7 +203,7 @@
 data DescribeClusterSecurityGroupsResponse = DescribeClusterSecurityGroupsResponse'
     { _dcsgsrsClusterSecurityGroups :: !(Maybe [ClusterSecurityGroup])
     , _dcsgsrsMarker                :: !(Maybe Text)
-    , _dcsgsrsStatus                :: !Int
+    , _dcsgsrsResponseStatus        :: !Int
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'DescribeClusterSecurityGroupsResponse' with the minimum fields required to make a request.
@@ -214,15 +214,15 @@
 --
 -- * 'dcsgsrsMarker'
 --
--- * 'dcsgsrsStatus'
+-- * 'dcsgsrsResponseStatus'
 describeClusterSecurityGroupsResponse
-    :: Int -- ^ 'dcsgsrsStatus'
+    :: Int -- ^ 'dcsgsrsResponseStatus'
     -> DescribeClusterSecurityGroupsResponse
-describeClusterSecurityGroupsResponse pStatus_ =
+describeClusterSecurityGroupsResponse pResponseStatus_ =
     DescribeClusterSecurityGroupsResponse'
     { _dcsgsrsClusterSecurityGroups = Nothing
     , _dcsgsrsMarker = Nothing
-    , _dcsgsrsStatus = pStatus_
+    , _dcsgsrsResponseStatus = pResponseStatus_
     }
 
 -- | A list of ClusterSecurityGroup instances.
@@ -239,5 +239,5 @@
 dcsgsrsMarker = lens _dcsgsrsMarker (\ s a -> s{_dcsgsrsMarker = a});
 
 -- | The response status code.
-dcsgsrsStatus :: Lens' DescribeClusterSecurityGroupsResponse Int
-dcsgsrsStatus = lens _dcsgsrsStatus (\ s a -> s{_dcsgsrsStatus = a});
+dcsgsrsResponseStatus :: Lens' DescribeClusterSecurityGroupsResponse Int
+dcsgsrsResponseStatus = lens _dcsgsrsResponseStatus (\ s a -> s{_dcsgsrsResponseStatus = a});
diff --git a/gen/Network/AWS/Redshift/DescribeClusterSnapshots.hs b/gen/Network/AWS/Redshift/DescribeClusterSnapshots.hs
--- a/gen/Network/AWS/Redshift/DescribeClusterSnapshots.hs
+++ b/gen/Network/AWS/Redshift/DescribeClusterSnapshots.hs
@@ -45,16 +45,16 @@
       describeClusterSnapshots
     , DescribeClusterSnapshots
     -- * Request Lenses
-    , dcssSnapshotIdentifier
-    , dcssTagValues
-    , dcssStartTime
-    , dcssTagKeys
-    , dcssClusterIdentifier
-    , dcssSnapshotType
-    , dcssMaxRecords
-    , dcssEndTime
-    , dcssMarker
-    , dcssOwnerAccount
+    , dSnapshotIdentifier
+    , dTagValues
+    , dStartTime
+    , dTagKeys
+    , dClusterIdentifier
+    , dSnapshotType
+    , dMarker
+    , dMaxRecords
+    , dEndTime
+    , dOwnerAccount
 
     -- * Destructuring the Response
     , describeClusterSnapshotsResponse
@@ -62,7 +62,7 @@
     -- * Response Lenses
     , dcssrsSnapshots
     , dcssrsMarker
-    , dcssrsStatus
+    , dcssrsResponseStatus
     ) where
 
 import           Network.AWS.Pager
@@ -76,61 +76,61 @@
 --
 -- /See:/ 'describeClusterSnapshots' smart constructor.
 data DescribeClusterSnapshots = DescribeClusterSnapshots'
-    { _dcssSnapshotIdentifier :: !(Maybe Text)
-    , _dcssTagValues          :: !(Maybe [Text])
-    , _dcssStartTime          :: !(Maybe ISO8601)
-    , _dcssTagKeys            :: !(Maybe [Text])
-    , _dcssClusterIdentifier  :: !(Maybe Text)
-    , _dcssSnapshotType       :: !(Maybe Text)
-    , _dcssMaxRecords         :: !(Maybe Int)
-    , _dcssEndTime            :: !(Maybe ISO8601)
-    , _dcssMarker             :: !(Maybe Text)
-    , _dcssOwnerAccount       :: !(Maybe Text)
+    { _dSnapshotIdentifier :: !(Maybe Text)
+    , _dTagValues          :: !(Maybe [Text])
+    , _dStartTime          :: !(Maybe ISO8601)
+    , _dTagKeys            :: !(Maybe [Text])
+    , _dClusterIdentifier  :: !(Maybe Text)
+    , _dSnapshotType       :: !(Maybe Text)
+    , _dMarker             :: !(Maybe Text)
+    , _dMaxRecords         :: !(Maybe Int)
+    , _dEndTime            :: !(Maybe ISO8601)
+    , _dOwnerAccount       :: !(Maybe Text)
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'DescribeClusterSnapshots' with the minimum fields required to make a request.
 --
 -- Use one of the following lenses to modify other fields as desired:
 --
--- * 'dcssSnapshotIdentifier'
+-- * 'dSnapshotIdentifier'
 --
--- * 'dcssTagValues'
+-- * 'dTagValues'
 --
--- * 'dcssStartTime'
+-- * 'dStartTime'
 --
--- * 'dcssTagKeys'
+-- * 'dTagKeys'
 --
--- * 'dcssClusterIdentifier'
+-- * 'dClusterIdentifier'
 --
--- * 'dcssSnapshotType'
+-- * 'dSnapshotType'
 --
--- * 'dcssMaxRecords'
+-- * 'dMarker'
 --
--- * 'dcssEndTime'
+-- * 'dMaxRecords'
 --
--- * 'dcssMarker'
+-- * 'dEndTime'
 --
--- * 'dcssOwnerAccount'
+-- * 'dOwnerAccount'
 describeClusterSnapshots
     :: DescribeClusterSnapshots
 describeClusterSnapshots =
     DescribeClusterSnapshots'
-    { _dcssSnapshotIdentifier = Nothing
-    , _dcssTagValues = Nothing
-    , _dcssStartTime = Nothing
-    , _dcssTagKeys = Nothing
-    , _dcssClusterIdentifier = Nothing
-    , _dcssSnapshotType = Nothing
-    , _dcssMaxRecords = Nothing
-    , _dcssEndTime = Nothing
-    , _dcssMarker = Nothing
-    , _dcssOwnerAccount = Nothing
+    { _dSnapshotIdentifier = Nothing
+    , _dTagValues = Nothing
+    , _dStartTime = Nothing
+    , _dTagKeys = Nothing
+    , _dClusterIdentifier = Nothing
+    , _dSnapshotType = Nothing
+    , _dMarker = Nothing
+    , _dMaxRecords = Nothing
+    , _dEndTime = Nothing
+    , _dOwnerAccount = Nothing
     }
 
 -- | The snapshot identifier of the snapshot about which to return
 -- information.
-dcssSnapshotIdentifier :: Lens' DescribeClusterSnapshots (Maybe Text)
-dcssSnapshotIdentifier = lens _dcssSnapshotIdentifier (\ s a -> s{_dcssSnapshotIdentifier = a});
+dSnapshotIdentifier :: Lens' DescribeClusterSnapshots (Maybe Text)
+dSnapshotIdentifier = lens _dSnapshotIdentifier (\ s a -> s{_dSnapshotIdentifier = a});
 
 -- | A tag value or values for which you want to return all matching cluster
 -- snapshots that are associated with the specified tag value or values.
@@ -138,8 +138,8 @@
 -- called 'admin' and 'test'. If you specify both of these tag values in
 -- the request, Amazon Redshift returns a response with the snapshots that
 -- have either or both of these tag values associated with them.
-dcssTagValues :: Lens' DescribeClusterSnapshots [Text]
-dcssTagValues = lens _dcssTagValues (\ s a -> s{_dcssTagValues = a}) . _Default . _Coerce;
+dTagValues :: Lens' DescribeClusterSnapshots [Text]
+dTagValues = lens _dTagValues (\ s a -> s{_dTagValues = a}) . _Default . _Coerce;
 
 -- | A value that requests only snapshots created at or after the specified
 -- time. The time value is specified in ISO 8601 format. For more
@@ -147,8 +147,8 @@
 -- <http://en.wikipedia.org/wiki/ISO_8601 ISO8601 Wikipedia page.>
 --
 -- Example: '2012-07-16T18:00:00Z'
-dcssStartTime :: Lens' DescribeClusterSnapshots (Maybe UTCTime)
-dcssStartTime = lens _dcssStartTime (\ s a -> s{_dcssStartTime = a}) . mapping _Time;
+dStartTime :: Lens' DescribeClusterSnapshots (Maybe UTCTime)
+dStartTime = lens _dStartTime (\ s a -> s{_dStartTime = a}) . mapping _Time;
 
 -- | A tag key or keys for which you want to return all matching cluster
 -- snapshots that are associated with the specified key or keys. For
@@ -156,21 +156,30 @@
 -- called 'owner' and 'environment'. If you specify both of these tag keys
 -- in the request, Amazon Redshift returns a response with the snapshots
 -- that have either or both of these tag keys associated with them.
-dcssTagKeys :: Lens' DescribeClusterSnapshots [Text]
-dcssTagKeys = lens _dcssTagKeys (\ s a -> s{_dcssTagKeys = a}) . _Default . _Coerce;
+dTagKeys :: Lens' DescribeClusterSnapshots [Text]
+dTagKeys = lens _dTagKeys (\ s a -> s{_dTagKeys = a}) . _Default . _Coerce;
 
 -- | The identifier of the cluster for which information about snapshots is
 -- requested.
-dcssClusterIdentifier :: Lens' DescribeClusterSnapshots (Maybe Text)
-dcssClusterIdentifier = lens _dcssClusterIdentifier (\ s a -> s{_dcssClusterIdentifier = a});
+dClusterIdentifier :: Lens' DescribeClusterSnapshots (Maybe Text)
+dClusterIdentifier = lens _dClusterIdentifier (\ s a -> s{_dClusterIdentifier = a});
 
 -- | The type of snapshots for which you are requesting information. By
 -- default, snapshots of all types are returned.
 --
 -- Valid Values: 'automated' | 'manual'
-dcssSnapshotType :: Lens' DescribeClusterSnapshots (Maybe Text)
-dcssSnapshotType = lens _dcssSnapshotType (\ s a -> s{_dcssSnapshotType = a});
+dSnapshotType :: Lens' DescribeClusterSnapshots (Maybe Text)
+dSnapshotType = lens _dSnapshotType (\ s a -> s{_dSnapshotType = a});
 
+-- | An optional parameter that specifies the starting point to return a set
+-- of response records. When the results of a DescribeClusterSnapshots
+-- request exceed the value specified in 'MaxRecords', AWS returns a value
+-- in the 'Marker' field of the response. You can retrieve the next set of
+-- response records by providing the returned marker value in the 'Marker'
+-- parameter and retrying the request.
+dMarker :: Lens' DescribeClusterSnapshots (Maybe Text)
+dMarker = lens _dMarker (\ s a -> s{_dMarker = a});
+
 -- | The maximum number of response records to return in each call. If the
 -- number of remaining response records exceeds the specified 'MaxRecords'
 -- value, a value is returned in a 'marker' field of the response. You can
@@ -180,8 +189,8 @@
 -- Default: '100'
 --
 -- Constraints: minimum 20, maximum 100.
-dcssMaxRecords :: Lens' DescribeClusterSnapshots (Maybe Int)
-dcssMaxRecords = lens _dcssMaxRecords (\ s a -> s{_dcssMaxRecords = a});
+dMaxRecords :: Lens' DescribeClusterSnapshots (Maybe Int)
+dMaxRecords = lens _dMaxRecords (\ s a -> s{_dMaxRecords = a});
 
 -- | A time value that requests only snapshots created at or before the
 -- specified time. The time value is specified in ISO 8601 format. For more
@@ -189,31 +198,22 @@
 -- <http://en.wikipedia.org/wiki/ISO_8601 ISO8601 Wikipedia page.>
 --
 -- Example: '2012-07-16T18:00:00Z'
-dcssEndTime :: Lens' DescribeClusterSnapshots (Maybe UTCTime)
-dcssEndTime = lens _dcssEndTime (\ s a -> s{_dcssEndTime = a}) . mapping _Time;
-
--- | An optional parameter that specifies the starting point to return a set
--- of response records. When the results of a DescribeClusterSnapshots
--- request exceed the value specified in 'MaxRecords', AWS returns a value
--- in the 'Marker' field of the response. You can retrieve the next set of
--- response records by providing the returned marker value in the 'Marker'
--- parameter and retrying the request.
-dcssMarker :: Lens' DescribeClusterSnapshots (Maybe Text)
-dcssMarker = lens _dcssMarker (\ s a -> s{_dcssMarker = a});
+dEndTime :: Lens' DescribeClusterSnapshots (Maybe UTCTime)
+dEndTime = lens _dEndTime (\ s a -> s{_dEndTime = a}) . mapping _Time;
 
 -- | The AWS customer account used to create or copy the snapshot. Use this
 -- field to filter the results to snapshots owned by a particular account.
 -- To describe snapshots you own, either specify your AWS customer account,
 -- or do not specify the parameter.
-dcssOwnerAccount :: Lens' DescribeClusterSnapshots (Maybe Text)
-dcssOwnerAccount = lens _dcssOwnerAccount (\ s a -> s{_dcssOwnerAccount = a});
+dOwnerAccount :: Lens' DescribeClusterSnapshots (Maybe Text)
+dOwnerAccount = lens _dOwnerAccount (\ s a -> s{_dOwnerAccount = a});
 
 instance AWSPager DescribeClusterSnapshots where
         page rq rs
           | stop (rs ^. dcssrsMarker) = Nothing
           | stop (rs ^. dcssrsSnapshots) = Nothing
           | otherwise =
-            Just $ rq & dcssMarker .~ rs ^. dcssrsMarker
+            Just $ rq & dMarker .~ rs ^. dcssrsMarker
 
 instance AWSRequest DescribeClusterSnapshots where
         type Rs DescribeClusterSnapshots =
@@ -240,25 +240,25 @@
               ["Action" =:
                  ("DescribeClusterSnapshots" :: ByteString),
                "Version" =: ("2012-12-01" :: ByteString),
-               "SnapshotIdentifier" =: _dcssSnapshotIdentifier,
+               "SnapshotIdentifier" =: _dSnapshotIdentifier,
                "TagValues" =:
-                 toQuery (toQueryList "TagValue" <$> _dcssTagValues),
-               "StartTime" =: _dcssStartTime,
+                 toQuery (toQueryList "TagValue" <$> _dTagValues),
+               "StartTime" =: _dStartTime,
                "TagKeys" =:
-                 toQuery (toQueryList "TagKey" <$> _dcssTagKeys),
-               "ClusterIdentifier" =: _dcssClusterIdentifier,
-               "SnapshotType" =: _dcssSnapshotType,
-               "MaxRecords" =: _dcssMaxRecords,
-               "EndTime" =: _dcssEndTime, "Marker" =: _dcssMarker,
-               "OwnerAccount" =: _dcssOwnerAccount]
+                 toQuery (toQueryList "TagKey" <$> _dTagKeys),
+               "ClusterIdentifier" =: _dClusterIdentifier,
+               "SnapshotType" =: _dSnapshotType,
+               "Marker" =: _dMarker, "MaxRecords" =: _dMaxRecords,
+               "EndTime" =: _dEndTime,
+               "OwnerAccount" =: _dOwnerAccount]
 
 -- | Contains the output from the DescribeClusterSnapshots action.
 --
 -- /See:/ 'describeClusterSnapshotsResponse' smart constructor.
 data DescribeClusterSnapshotsResponse = DescribeClusterSnapshotsResponse'
-    { _dcssrsSnapshots :: !(Maybe [Snapshot])
-    , _dcssrsMarker    :: !(Maybe Text)
-    , _dcssrsStatus    :: !Int
+    { _dcssrsSnapshots      :: !(Maybe [Snapshot])
+    , _dcssrsMarker         :: !(Maybe Text)
+    , _dcssrsResponseStatus :: !Int
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'DescribeClusterSnapshotsResponse' with the minimum fields required to make a request.
@@ -269,15 +269,15 @@
 --
 -- * 'dcssrsMarker'
 --
--- * 'dcssrsStatus'
+-- * 'dcssrsResponseStatus'
 describeClusterSnapshotsResponse
-    :: Int -- ^ 'dcssrsStatus'
+    :: Int -- ^ 'dcssrsResponseStatus'
     -> DescribeClusterSnapshotsResponse
-describeClusterSnapshotsResponse pStatus_ =
+describeClusterSnapshotsResponse pResponseStatus_ =
     DescribeClusterSnapshotsResponse'
     { _dcssrsSnapshots = Nothing
     , _dcssrsMarker = Nothing
-    , _dcssrsStatus = pStatus_
+    , _dcssrsResponseStatus = pResponseStatus_
     }
 
 -- | A list of Snapshot instances.
@@ -294,5 +294,5 @@
 dcssrsMarker = lens _dcssrsMarker (\ s a -> s{_dcssrsMarker = a});
 
 -- | The response status code.
-dcssrsStatus :: Lens' DescribeClusterSnapshotsResponse Int
-dcssrsStatus = lens _dcssrsStatus (\ s a -> s{_dcssrsStatus = a});
+dcssrsResponseStatus :: Lens' DescribeClusterSnapshotsResponse Int
+dcssrsResponseStatus = lens _dcssrsResponseStatus (\ s a -> s{_dcssrsResponseStatus = a});
diff --git a/gen/Network/AWS/Redshift/DescribeClusterSubnetGroups.hs b/gen/Network/AWS/Redshift/DescribeClusterSubnetGroups.hs
--- a/gen/Network/AWS/Redshift/DescribeClusterSubnetGroups.hs
+++ b/gen/Network/AWS/Redshift/DescribeClusterSubnetGroups.hs
@@ -45,8 +45,8 @@
     , dcsgsTagValues
     , dcsgsTagKeys
     , dcsgsClusterSubnetGroupName
-    , dcsgsMaxRecords
     , dcsgsMarker
+    , dcsgsMaxRecords
 
     -- * Destructuring the Response
     , describeClusterSubnetGroupsResponse
@@ -54,7 +54,7 @@
     -- * Response Lenses
     , dcsgrsClusterSubnetGroups
     , dcsgrsMarker
-    , dcsgrsStatus
+    , dcsgrsResponseStatus
     ) where
 
 import           Network.AWS.Pager
@@ -71,8 +71,8 @@
     { _dcsgsTagValues              :: !(Maybe [Text])
     , _dcsgsTagKeys                :: !(Maybe [Text])
     , _dcsgsClusterSubnetGroupName :: !(Maybe Text)
-    , _dcsgsMaxRecords             :: !(Maybe Int)
     , _dcsgsMarker                 :: !(Maybe Text)
+    , _dcsgsMaxRecords             :: !(Maybe Int)
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'DescribeClusterSubnetGroups' with the minimum fields required to make a request.
@@ -85,9 +85,9 @@
 --
 -- * 'dcsgsClusterSubnetGroupName'
 --
--- * 'dcsgsMaxRecords'
---
 -- * 'dcsgsMarker'
+--
+-- * 'dcsgsMaxRecords'
 describeClusterSubnetGroups
     :: DescribeClusterSubnetGroups
 describeClusterSubnetGroups =
@@ -95,8 +95,8 @@
     { _dcsgsTagValues = Nothing
     , _dcsgsTagKeys = Nothing
     , _dcsgsClusterSubnetGroupName = Nothing
-    , _dcsgsMaxRecords = Nothing
     , _dcsgsMarker = Nothing
+    , _dcsgsMaxRecords = Nothing
     }
 
 -- | A tag value or values for which you want to return all matching cluster
@@ -122,6 +122,15 @@
 dcsgsClusterSubnetGroupName :: Lens' DescribeClusterSubnetGroups (Maybe Text)
 dcsgsClusterSubnetGroupName = lens _dcsgsClusterSubnetGroupName (\ s a -> s{_dcsgsClusterSubnetGroupName = a});
 
+-- | An optional parameter that specifies the starting point to return a set
+-- of response records. When the results of a DescribeClusterSubnetGroups
+-- request exceed the value specified in 'MaxRecords', AWS returns a value
+-- in the 'Marker' field of the response. You can retrieve the next set of
+-- response records by providing the returned marker value in the 'Marker'
+-- parameter and retrying the request.
+dcsgsMarker :: Lens' DescribeClusterSubnetGroups (Maybe Text)
+dcsgsMarker = lens _dcsgsMarker (\ s a -> s{_dcsgsMarker = a});
+
 -- | The maximum number of response records to return in each call. If the
 -- number of remaining response records exceeds the specified 'MaxRecords'
 -- value, a value is returned in a 'marker' field of the response. You can
@@ -134,15 +143,6 @@
 dcsgsMaxRecords :: Lens' DescribeClusterSubnetGroups (Maybe Int)
 dcsgsMaxRecords = lens _dcsgsMaxRecords (\ s a -> s{_dcsgsMaxRecords = a});
 
--- | An optional parameter that specifies the starting point to return a set
--- of response records. When the results of a DescribeClusterSubnetGroups
--- request exceed the value specified in 'MaxRecords', AWS returns a value
--- in the 'Marker' field of the response. You can retrieve the next set of
--- response records by providing the returned marker value in the 'Marker'
--- parameter and retrying the request.
-dcsgsMarker :: Lens' DescribeClusterSubnetGroups (Maybe Text)
-dcsgsMarker = lens _dcsgsMarker (\ s a -> s{_dcsgsMarker = a});
-
 instance AWSPager DescribeClusterSubnetGroups where
         page rq rs
           | stop (rs ^. dcsgrsMarker) = Nothing
@@ -182,8 +182,8 @@
                  toQuery (toQueryList "TagKey" <$> _dcsgsTagKeys),
                "ClusterSubnetGroupName" =:
                  _dcsgsClusterSubnetGroupName,
-               "MaxRecords" =: _dcsgsMaxRecords,
-               "Marker" =: _dcsgsMarker]
+               "Marker" =: _dcsgsMarker,
+               "MaxRecords" =: _dcsgsMaxRecords]
 
 -- | Contains the output from the DescribeClusterSubnetGroups action.
 --
@@ -191,7 +191,7 @@
 data DescribeClusterSubnetGroupsResponse = DescribeClusterSubnetGroupsResponse'
     { _dcsgrsClusterSubnetGroups :: !(Maybe [ClusterSubnetGroup])
     , _dcsgrsMarker              :: !(Maybe Text)
-    , _dcsgrsStatus              :: !Int
+    , _dcsgrsResponseStatus      :: !Int
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'DescribeClusterSubnetGroupsResponse' with the minimum fields required to make a request.
@@ -202,15 +202,15 @@
 --
 -- * 'dcsgrsMarker'
 --
--- * 'dcsgrsStatus'
+-- * 'dcsgrsResponseStatus'
 describeClusterSubnetGroupsResponse
-    :: Int -- ^ 'dcsgrsStatus'
+    :: Int -- ^ 'dcsgrsResponseStatus'
     -> DescribeClusterSubnetGroupsResponse
-describeClusterSubnetGroupsResponse pStatus_ =
+describeClusterSubnetGroupsResponse pResponseStatus_ =
     DescribeClusterSubnetGroupsResponse'
     { _dcsgrsClusterSubnetGroups = Nothing
     , _dcsgrsMarker = Nothing
-    , _dcsgrsStatus = pStatus_
+    , _dcsgrsResponseStatus = pResponseStatus_
     }
 
 -- | A list of ClusterSubnetGroup instances.
@@ -227,5 +227,5 @@
 dcsgrsMarker = lens _dcsgrsMarker (\ s a -> s{_dcsgrsMarker = a});
 
 -- | The response status code.
-dcsgrsStatus :: Lens' DescribeClusterSubnetGroupsResponse Int
-dcsgrsStatus = lens _dcsgrsStatus (\ s a -> s{_dcsgrsStatus = a});
+dcsgrsResponseStatus :: Lens' DescribeClusterSubnetGroupsResponse Int
+dcsgrsResponseStatus = lens _dcsgrsResponseStatus (\ s a -> s{_dcsgrsResponseStatus = a});
diff --git a/gen/Network/AWS/Redshift/DescribeClusterVersions.hs b/gen/Network/AWS/Redshift/DescribeClusterVersions.hs
--- a/gen/Network/AWS/Redshift/DescribeClusterVersions.hs
+++ b/gen/Network/AWS/Redshift/DescribeClusterVersions.hs
@@ -34,9 +34,9 @@
       describeClusterVersions
     , DescribeClusterVersions
     -- * Request Lenses
-    , dcvMaxRecords
-    , dcvMarker
     , dcvClusterParameterGroupFamily
+    , dcvMarker
+    , dcvMaxRecords
     , dcvClusterVersion
 
     -- * Destructuring the Response
@@ -45,7 +45,7 @@
     -- * Response Lenses
     , dcvrsClusterVersions
     , dcvrsMarker
-    , dcvrsStatus
+    , dcvrsResponseStatus
     ) where
 
 import           Network.AWS.Pager
@@ -57,9 +57,9 @@
 
 -- | /See:/ 'describeClusterVersions' smart constructor.
 data DescribeClusterVersions = DescribeClusterVersions'
-    { _dcvMaxRecords                  :: !(Maybe Int)
+    { _dcvClusterParameterGroupFamily :: !(Maybe Text)
     , _dcvMarker                      :: !(Maybe Text)
-    , _dcvClusterParameterGroupFamily :: !(Maybe Text)
+    , _dcvMaxRecords                  :: !(Maybe Int)
     , _dcvClusterVersion              :: !(Maybe Text)
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
@@ -67,34 +67,33 @@
 --
 -- Use one of the following lenses to modify other fields as desired:
 --
--- * 'dcvMaxRecords'
+-- * 'dcvClusterParameterGroupFamily'
 --
 -- * 'dcvMarker'
 --
--- * 'dcvClusterParameterGroupFamily'
+-- * 'dcvMaxRecords'
 --
 -- * 'dcvClusterVersion'
 describeClusterVersions
     :: DescribeClusterVersions
 describeClusterVersions =
     DescribeClusterVersions'
-    { _dcvMaxRecords = Nothing
+    { _dcvClusterParameterGroupFamily = Nothing
     , _dcvMarker = Nothing
-    , _dcvClusterParameterGroupFamily = Nothing
+    , _dcvMaxRecords = Nothing
     , _dcvClusterVersion = Nothing
     }
 
--- | The maximum number of response records to return in each call. If the
--- number of remaining response records exceeds the specified 'MaxRecords'
--- value, a value is returned in a 'marker' field of the response. You can
--- retrieve the next set of records by retrying the command with the
--- returned marker value.
+-- | The name of a specific cluster parameter group family to return details
+-- for.
 --
--- Default: '100'
+-- Constraints:
 --
--- Constraints: minimum 20, maximum 100.
-dcvMaxRecords :: Lens' DescribeClusterVersions (Maybe Int)
-dcvMaxRecords = lens _dcvMaxRecords (\ s a -> s{_dcvMaxRecords = a});
+-- -   Must be 1 to 255 alphanumeric characters
+-- -   First character must be a letter
+-- -   Cannot end with a hyphen or contain two consecutive hyphens
+dcvClusterParameterGroupFamily :: Lens' DescribeClusterVersions (Maybe Text)
+dcvClusterParameterGroupFamily = lens _dcvClusterParameterGroupFamily (\ s a -> s{_dcvClusterParameterGroupFamily = a});
 
 -- | An optional parameter that specifies the starting point to return a set
 -- of response records. When the results of a DescribeClusterVersions
@@ -105,16 +104,17 @@
 dcvMarker :: Lens' DescribeClusterVersions (Maybe Text)
 dcvMarker = lens _dcvMarker (\ s a -> s{_dcvMarker = a});
 
--- | The name of a specific cluster parameter group family to return details
--- for.
+-- | The maximum number of response records to return in each call. If the
+-- number of remaining response records exceeds the specified 'MaxRecords'
+-- value, a value is returned in a 'marker' field of the response. You can
+-- retrieve the next set of records by retrying the command with the
+-- returned marker value.
 --
--- Constraints:
+-- Default: '100'
 --
--- -   Must be 1 to 255 alphanumeric characters
--- -   First character must be a letter
--- -   Cannot end with a hyphen or contain two consecutive hyphens
-dcvClusterParameterGroupFamily :: Lens' DescribeClusterVersions (Maybe Text)
-dcvClusterParameterGroupFamily = lens _dcvClusterParameterGroupFamily (\ s a -> s{_dcvClusterParameterGroupFamily = a});
+-- Constraints: minimum 20, maximum 100.
+dcvMaxRecords :: Lens' DescribeClusterVersions (Maybe Int)
+dcvMaxRecords = lens _dcvMaxRecords (\ s a -> s{_dcvMaxRecords = a});
 
 -- | The specific cluster version to return.
 --
@@ -154,10 +154,10 @@
               ["Action" =:
                  ("DescribeClusterVersions" :: ByteString),
                "Version" =: ("2012-12-01" :: ByteString),
-               "MaxRecords" =: _dcvMaxRecords,
-               "Marker" =: _dcvMarker,
                "ClusterParameterGroupFamily" =:
                  _dcvClusterParameterGroupFamily,
+               "Marker" =: _dcvMarker,
+               "MaxRecords" =: _dcvMaxRecords,
                "ClusterVersion" =: _dcvClusterVersion]
 
 -- | Contains the output from the DescribeClusterVersions action.
@@ -166,7 +166,7 @@
 data DescribeClusterVersionsResponse = DescribeClusterVersionsResponse'
     { _dcvrsClusterVersions :: !(Maybe [ClusterVersion])
     , _dcvrsMarker          :: !(Maybe Text)
-    , _dcvrsStatus          :: !Int
+    , _dcvrsResponseStatus  :: !Int
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'DescribeClusterVersionsResponse' with the minimum fields required to make a request.
@@ -177,15 +177,15 @@
 --
 -- * 'dcvrsMarker'
 --
--- * 'dcvrsStatus'
+-- * 'dcvrsResponseStatus'
 describeClusterVersionsResponse
-    :: Int -- ^ 'dcvrsStatus'
+    :: Int -- ^ 'dcvrsResponseStatus'
     -> DescribeClusterVersionsResponse
-describeClusterVersionsResponse pStatus_ =
+describeClusterVersionsResponse pResponseStatus_ =
     DescribeClusterVersionsResponse'
     { _dcvrsClusterVersions = Nothing
     , _dcvrsMarker = Nothing
-    , _dcvrsStatus = pStatus_
+    , _dcvrsResponseStatus = pResponseStatus_
     }
 
 -- | A list of 'Version' elements.
@@ -202,5 +202,5 @@
 dcvrsMarker = lens _dcvrsMarker (\ s a -> s{_dcvrsMarker = a});
 
 -- | The response status code.
-dcvrsStatus :: Lens' DescribeClusterVersionsResponse Int
-dcvrsStatus = lens _dcvrsStatus (\ s a -> s{_dcvrsStatus = a});
+dcvrsResponseStatus :: Lens' DescribeClusterVersionsResponse Int
+dcvrsResponseStatus = lens _dcvrsResponseStatus (\ s a -> s{_dcvrsResponseStatus = a});
diff --git a/gen/Network/AWS/Redshift/DescribeClusters.hs b/gen/Network/AWS/Redshift/DescribeClusters.hs
--- a/gen/Network/AWS/Redshift/DescribeClusters.hs
+++ b/gen/Network/AWS/Redshift/DescribeClusters.hs
@@ -47,8 +47,8 @@
     , dcTagValues
     , dcTagKeys
     , dcClusterIdentifier
-    , dcMaxRecords
     , dcMarker
+    , dcMaxRecords
 
     -- * Destructuring the Response
     , describeClustersResponse
@@ -56,7 +56,7 @@
     -- * Response Lenses
     , dcrsMarker
     , dcrsClusters
-    , dcrsStatus
+    , dcrsResponseStatus
     ) where
 
 import           Network.AWS.Pager
@@ -73,8 +73,8 @@
     { _dcTagValues         :: !(Maybe [Text])
     , _dcTagKeys           :: !(Maybe [Text])
     , _dcClusterIdentifier :: !(Maybe Text)
-    , _dcMaxRecords        :: !(Maybe Int)
     , _dcMarker            :: !(Maybe Text)
+    , _dcMaxRecords        :: !(Maybe Int)
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'DescribeClusters' with the minimum fields required to make a request.
@@ -87,9 +87,9 @@
 --
 -- * 'dcClusterIdentifier'
 --
--- * 'dcMaxRecords'
---
 -- * 'dcMarker'
+--
+-- * 'dcMaxRecords'
 describeClusters
     :: DescribeClusters
 describeClusters =
@@ -97,8 +97,8 @@
     { _dcTagValues = Nothing
     , _dcTagKeys = Nothing
     , _dcClusterIdentifier = Nothing
-    , _dcMaxRecords = Nothing
     , _dcMarker = Nothing
+    , _dcMaxRecords = Nothing
     }
 
 -- | A tag value or values for which you want to return all matching clusters
@@ -126,18 +126,6 @@
 dcClusterIdentifier :: Lens' DescribeClusters (Maybe Text)
 dcClusterIdentifier = lens _dcClusterIdentifier (\ s a -> s{_dcClusterIdentifier = a});
 
--- | The maximum number of response records to return in each call. If the
--- number of remaining response records exceeds the specified 'MaxRecords'
--- value, a value is returned in a 'marker' field of the response. You can
--- retrieve the next set of records by retrying the command with the
--- returned marker value.
---
--- Default: '100'
---
--- Constraints: minimum 20, maximum 100.
-dcMaxRecords :: Lens' DescribeClusters (Maybe Int)
-dcMaxRecords = lens _dcMaxRecords (\ s a -> s{_dcMaxRecords = a});
-
 -- | An optional parameter that specifies the starting point to return a set
 -- of response records. When the results of a DescribeClusters request
 -- exceed the value specified in 'MaxRecords', AWS returns a value in the
@@ -150,6 +138,18 @@
 dcMarker :: Lens' DescribeClusters (Maybe Text)
 dcMarker = lens _dcMarker (\ s a -> s{_dcMarker = a});
 
+-- | The maximum number of response records to return in each call. If the
+-- number of remaining response records exceeds the specified 'MaxRecords'
+-- value, a value is returned in a 'marker' field of the response. You can
+-- retrieve the next set of records by retrying the command with the
+-- returned marker value.
+--
+-- Default: '100'
+--
+-- Constraints: minimum 20, maximum 100.
+dcMaxRecords :: Lens' DescribeClusters (Maybe Int)
+dcMaxRecords = lens _dcMaxRecords (\ s a -> s{_dcMaxRecords = a});
+
 instance AWSPager DescribeClusters where
         page rq rs
           | stop (rs ^. dcrsMarker) = Nothing
@@ -185,15 +185,15 @@
                "TagKeys" =:
                  toQuery (toQueryList "TagKey" <$> _dcTagKeys),
                "ClusterIdentifier" =: _dcClusterIdentifier,
-               "MaxRecords" =: _dcMaxRecords, "Marker" =: _dcMarker]
+               "Marker" =: _dcMarker, "MaxRecords" =: _dcMaxRecords]
 
 -- | Contains the output from the DescribeClusters action.
 --
 -- /See:/ 'describeClustersResponse' smart constructor.
 data DescribeClustersResponse = DescribeClustersResponse'
-    { _dcrsMarker   :: !(Maybe Text)
-    , _dcrsClusters :: !(Maybe [Cluster])
-    , _dcrsStatus   :: !Int
+    { _dcrsMarker         :: !(Maybe Text)
+    , _dcrsClusters       :: !(Maybe [Cluster])
+    , _dcrsResponseStatus :: !Int
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'DescribeClustersResponse' with the minimum fields required to make a request.
@@ -204,15 +204,15 @@
 --
 -- * 'dcrsClusters'
 --
--- * 'dcrsStatus'
+-- * 'dcrsResponseStatus'
 describeClustersResponse
-    :: Int -- ^ 'dcrsStatus'
+    :: Int -- ^ 'dcrsResponseStatus'
     -> DescribeClustersResponse
-describeClustersResponse pStatus_ =
+describeClustersResponse pResponseStatus_ =
     DescribeClustersResponse'
     { _dcrsMarker = Nothing
     , _dcrsClusters = Nothing
-    , _dcrsStatus = pStatus_
+    , _dcrsResponseStatus = pResponseStatus_
     }
 
 -- | A value that indicates the starting point for the next set of response
@@ -229,5 +229,5 @@
 dcrsClusters = lens _dcrsClusters (\ s a -> s{_dcrsClusters = a}) . _Default . _Coerce;
 
 -- | The response status code.
-dcrsStatus :: Lens' DescribeClustersResponse Int
-dcrsStatus = lens _dcrsStatus (\ s a -> s{_dcrsStatus = a});
+dcrsResponseStatus :: Lens' DescribeClustersResponse Int
+dcrsResponseStatus = lens _dcrsResponseStatus (\ s a -> s{_dcrsResponseStatus = a});
diff --git a/gen/Network/AWS/Redshift/DescribeDefaultClusterParameters.hs b/gen/Network/AWS/Redshift/DescribeDefaultClusterParameters.hs
--- a/gen/Network/AWS/Redshift/DescribeDefaultClusterParameters.hs
+++ b/gen/Network/AWS/Redshift/DescribeDefaultClusterParameters.hs
@@ -34,15 +34,15 @@
       describeDefaultClusterParameters
     , DescribeDefaultClusterParameters
     -- * Request Lenses
-    , ddcpMaxRecords
     , ddcpMarker
+    , ddcpMaxRecords
     , ddcpParameterGroupFamily
 
     -- * Destructuring the Response
     , describeDefaultClusterParametersResponse
     , DescribeDefaultClusterParametersResponse
     -- * Response Lenses
-    , ddcprsStatus
+    , ddcprsResponseStatus
     , ddcprsDefaultClusterParameters
     ) where
 
@@ -57,8 +57,8 @@
 --
 -- /See:/ 'describeDefaultClusterParameters' smart constructor.
 data DescribeDefaultClusterParameters = DescribeDefaultClusterParameters'
-    { _ddcpMaxRecords           :: !(Maybe Int)
-    , _ddcpMarker               :: !(Maybe Text)
+    { _ddcpMarker               :: !(Maybe Text)
+    , _ddcpMaxRecords           :: !(Maybe Int)
     , _ddcpParameterGroupFamily :: !Text
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
@@ -66,21 +66,31 @@
 --
 -- Use one of the following lenses to modify other fields as desired:
 --
--- * 'ddcpMaxRecords'
---
 -- * 'ddcpMarker'
 --
+-- * 'ddcpMaxRecords'
+--
 -- * 'ddcpParameterGroupFamily'
 describeDefaultClusterParameters
     :: Text -- ^ 'ddcpParameterGroupFamily'
     -> DescribeDefaultClusterParameters
 describeDefaultClusterParameters pParameterGroupFamily_ =
     DescribeDefaultClusterParameters'
-    { _ddcpMaxRecords = Nothing
-    , _ddcpMarker = Nothing
+    { _ddcpMarker = Nothing
+    , _ddcpMaxRecords = Nothing
     , _ddcpParameterGroupFamily = pParameterGroupFamily_
     }
 
+-- | An optional parameter that specifies the starting point to return a set
+-- of response records. When the results of a
+-- DescribeDefaultClusterParameters request exceed the value specified in
+-- 'MaxRecords', AWS returns a value in the 'Marker' field of the response.
+-- You can retrieve the next set of response records by providing the
+-- returned marker value in the 'Marker' parameter and retrying the
+-- request.
+ddcpMarker :: Lens' DescribeDefaultClusterParameters (Maybe Text)
+ddcpMarker = lens _ddcpMarker (\ s a -> s{_ddcpMarker = a});
+
 -- | The maximum number of response records to return in each call. If the
 -- number of remaining response records exceeds the specified 'MaxRecords'
 -- value, a value is returned in a 'marker' field of the response. You can
@@ -93,16 +103,6 @@
 ddcpMaxRecords :: Lens' DescribeDefaultClusterParameters (Maybe Int)
 ddcpMaxRecords = lens _ddcpMaxRecords (\ s a -> s{_ddcpMaxRecords = a});
 
--- | An optional parameter that specifies the starting point to return a set
--- of response records. When the results of a
--- DescribeDefaultClusterParameters request exceed the value specified in
--- 'MaxRecords', AWS returns a value in the 'Marker' field of the response.
--- You can retrieve the next set of response records by providing the
--- returned marker value in the 'Marker' parameter and retrying the
--- request.
-ddcpMarker :: Lens' DescribeDefaultClusterParameters (Maybe Text)
-ddcpMarker = lens _ddcpMarker (\ s a -> s{_ddcpMarker = a});
-
 -- | The name of the cluster parameter group family.
 ddcpParameterGroupFamily :: Lens' DescribeDefaultClusterParameters Text
 ddcpParameterGroupFamily = lens _ddcpParameterGroupFamily (\ s a -> s{_ddcpParameterGroupFamily = a});
@@ -152,13 +152,13 @@
               ["Action" =:
                  ("DescribeDefaultClusterParameters" :: ByteString),
                "Version" =: ("2012-12-01" :: ByteString),
-               "MaxRecords" =: _ddcpMaxRecords,
                "Marker" =: _ddcpMarker,
+               "MaxRecords" =: _ddcpMaxRecords,
                "ParameterGroupFamily" =: _ddcpParameterGroupFamily]
 
 -- | /See:/ 'describeDefaultClusterParametersResponse' smart constructor.
 data DescribeDefaultClusterParametersResponse = DescribeDefaultClusterParametersResponse'
-    { _ddcprsStatus                   :: !Int
+    { _ddcprsResponseStatus           :: !Int
     , _ddcprsDefaultClusterParameters :: !DefaultClusterParameters
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
@@ -166,22 +166,22 @@
 --
 -- Use one of the following lenses to modify other fields as desired:
 --
--- * 'ddcprsStatus'
+-- * 'ddcprsResponseStatus'
 --
 -- * 'ddcprsDefaultClusterParameters'
 describeDefaultClusterParametersResponse
-    :: Int -- ^ 'ddcprsStatus'
+    :: Int -- ^ 'ddcprsResponseStatus'
     -> DefaultClusterParameters -- ^ 'ddcprsDefaultClusterParameters'
     -> DescribeDefaultClusterParametersResponse
-describeDefaultClusterParametersResponse pStatus_ pDefaultClusterParameters_ =
+describeDefaultClusterParametersResponse pResponseStatus_ pDefaultClusterParameters_ =
     DescribeDefaultClusterParametersResponse'
-    { _ddcprsStatus = pStatus_
+    { _ddcprsResponseStatus = pResponseStatus_
     , _ddcprsDefaultClusterParameters = pDefaultClusterParameters_
     }
 
 -- | The response status code.
-ddcprsStatus :: Lens' DescribeDefaultClusterParametersResponse Int
-ddcprsStatus = lens _ddcprsStatus (\ s a -> s{_ddcprsStatus = a});
+ddcprsResponseStatus :: Lens' DescribeDefaultClusterParametersResponse Int
+ddcprsResponseStatus = lens _ddcprsResponseStatus (\ s a -> s{_ddcprsResponseStatus = a});
 
 -- | Undocumented member.
 ddcprsDefaultClusterParameters :: Lens' DescribeDefaultClusterParametersResponse DefaultClusterParameters
diff --git a/gen/Network/AWS/Redshift/DescribeEventCategories.hs b/gen/Network/AWS/Redshift/DescribeEventCategories.hs
--- a/gen/Network/AWS/Redshift/DescribeEventCategories.hs
+++ b/gen/Network/AWS/Redshift/DescribeEventCategories.hs
@@ -37,7 +37,7 @@
     , DescribeEventCategoriesResponse
     -- * Response Lenses
     , decrsEventCategoriesMapList
-    , decrsStatus
+    , decrsResponseStatus
     ) where
 
 import           Network.AWS.Prelude
@@ -103,7 +103,7 @@
 -- /See:/ 'describeEventCategoriesResponse' smart constructor.
 data DescribeEventCategoriesResponse = DescribeEventCategoriesResponse'
     { _decrsEventCategoriesMapList :: !(Maybe [EventCategoriesMap])
-    , _decrsStatus                 :: !Int
+    , _decrsResponseStatus         :: !Int
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'DescribeEventCategoriesResponse' with the minimum fields required to make a request.
@@ -112,14 +112,14 @@
 --
 -- * 'decrsEventCategoriesMapList'
 --
--- * 'decrsStatus'
+-- * 'decrsResponseStatus'
 describeEventCategoriesResponse
-    :: Int -- ^ 'decrsStatus'
+    :: Int -- ^ 'decrsResponseStatus'
     -> DescribeEventCategoriesResponse
-describeEventCategoriesResponse pStatus_ =
+describeEventCategoriesResponse pResponseStatus_ =
     DescribeEventCategoriesResponse'
     { _decrsEventCategoriesMapList = Nothing
-    , _decrsStatus = pStatus_
+    , _decrsResponseStatus = pResponseStatus_
     }
 
 -- | A list of event categories descriptions.
@@ -127,5 +127,5 @@
 decrsEventCategoriesMapList = lens _decrsEventCategoriesMapList (\ s a -> s{_decrsEventCategoriesMapList = a}) . _Default . _Coerce;
 
 -- | The response status code.
-decrsStatus :: Lens' DescribeEventCategoriesResponse Int
-decrsStatus = lens _decrsStatus (\ s a -> s{_decrsStatus = a});
+decrsResponseStatus :: Lens' DescribeEventCategoriesResponse Int
+decrsResponseStatus = lens _decrsResponseStatus (\ s a -> s{_decrsResponseStatus = a});
diff --git a/gen/Network/AWS/Redshift/DescribeEventSubscriptions.hs b/gen/Network/AWS/Redshift/DescribeEventSubscriptions.hs
--- a/gen/Network/AWS/Redshift/DescribeEventSubscriptions.hs
+++ b/gen/Network/AWS/Redshift/DescribeEventSubscriptions.hs
@@ -31,9 +31,9 @@
       describeEventSubscriptions
     , DescribeEventSubscriptions
     -- * Request Lenses
-    , dSubscriptionName
-    , dMaxRecords
-    , dMarker
+    , dessSubscriptionName
+    , dessMarker
+    , dessMaxRecords
 
     -- * Destructuring the Response
     , describeEventSubscriptionsResponse
@@ -41,7 +41,7 @@
     -- * Response Lenses
     , desrsEventSubscriptionsList
     , desrsMarker
-    , desrsStatus
+    , desrsResponseStatus
     ) where
 
 import           Network.AWS.Pager
@@ -55,34 +55,43 @@
 --
 -- /See:/ 'describeEventSubscriptions' smart constructor.
 data DescribeEventSubscriptions = DescribeEventSubscriptions'
-    { _dSubscriptionName :: !(Maybe Text)
-    , _dMaxRecords       :: !(Maybe Int)
-    , _dMarker           :: !(Maybe Text)
+    { _dessSubscriptionName :: !(Maybe Text)
+    , _dessMarker           :: !(Maybe Text)
+    , _dessMaxRecords       :: !(Maybe Int)
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'DescribeEventSubscriptions' with the minimum fields required to make a request.
 --
 -- Use one of the following lenses to modify other fields as desired:
 --
--- * 'dSubscriptionName'
+-- * 'dessSubscriptionName'
 --
--- * 'dMaxRecords'
+-- * 'dessMarker'
 --
--- * 'dMarker'
+-- * 'dessMaxRecords'
 describeEventSubscriptions
     :: DescribeEventSubscriptions
 describeEventSubscriptions =
     DescribeEventSubscriptions'
-    { _dSubscriptionName = Nothing
-    , _dMaxRecords = Nothing
-    , _dMarker = Nothing
+    { _dessSubscriptionName = Nothing
+    , _dessMarker = Nothing
+    , _dessMaxRecords = Nothing
     }
 
 -- | The name of the Amazon Redshift event notification subscription to be
 -- described.
-dSubscriptionName :: Lens' DescribeEventSubscriptions (Maybe Text)
-dSubscriptionName = lens _dSubscriptionName (\ s a -> s{_dSubscriptionName = a});
+dessSubscriptionName :: Lens' DescribeEventSubscriptions (Maybe Text)
+dessSubscriptionName = lens _dessSubscriptionName (\ s a -> s{_dessSubscriptionName = a});
 
+-- | An optional parameter that specifies the starting point to return a set
+-- of response records. When the results of a DescribeEventSubscriptions
+-- request exceed the value specified in 'MaxRecords', AWS returns a value
+-- in the 'Marker' field of the response. You can retrieve the next set of
+-- response records by providing the returned marker value in the 'Marker'
+-- parameter and retrying the request.
+dessMarker :: Lens' DescribeEventSubscriptions (Maybe Text)
+dessMarker = lens _dessMarker (\ s a -> s{_dessMarker = a});
+
 -- | The maximum number of response records to return in each call. If the
 -- number of remaining response records exceeds the specified 'MaxRecords'
 -- value, a value is returned in a 'marker' field of the response. You can
@@ -92,24 +101,15 @@
 -- Default: '100'
 --
 -- Constraints: minimum 20, maximum 100.
-dMaxRecords :: Lens' DescribeEventSubscriptions (Maybe Int)
-dMaxRecords = lens _dMaxRecords (\ s a -> s{_dMaxRecords = a});
-
--- | An optional parameter that specifies the starting point to return a set
--- of response records. When the results of a DescribeEventSubscriptions
--- request exceed the value specified in 'MaxRecords', AWS returns a value
--- in the 'Marker' field of the response. You can retrieve the next set of
--- response records by providing the returned marker value in the 'Marker'
--- parameter and retrying the request.
-dMarker :: Lens' DescribeEventSubscriptions (Maybe Text)
-dMarker = lens _dMarker (\ s a -> s{_dMarker = a});
+dessMaxRecords :: Lens' DescribeEventSubscriptions (Maybe Int)
+dessMaxRecords = lens _dessMaxRecords (\ s a -> s{_dessMaxRecords = a});
 
 instance AWSPager DescribeEventSubscriptions where
         page rq rs
           | stop (rs ^. desrsMarker) = Nothing
           | stop (rs ^. desrsEventSubscriptionsList) = Nothing
           | otherwise =
-            Just $ rq & dMarker .~ rs ^. desrsMarker
+            Just $ rq & dessMarker .~ rs ^. desrsMarker
 
 instance AWSRequest DescribeEventSubscriptions where
         type Rs DescribeEventSubscriptions =
@@ -137,8 +137,9 @@
               ["Action" =:
                  ("DescribeEventSubscriptions" :: ByteString),
                "Version" =: ("2012-12-01" :: ByteString),
-               "SubscriptionName" =: _dSubscriptionName,
-               "MaxRecords" =: _dMaxRecords, "Marker" =: _dMarker]
+               "SubscriptionName" =: _dessSubscriptionName,
+               "Marker" =: _dessMarker,
+               "MaxRecords" =: _dessMaxRecords]
 
 -- |
 --
@@ -146,7 +147,7 @@
 data DescribeEventSubscriptionsResponse = DescribeEventSubscriptionsResponse'
     { _desrsEventSubscriptionsList :: !(Maybe [EventSubscription])
     , _desrsMarker                 :: !(Maybe Text)
-    , _desrsStatus                 :: !Int
+    , _desrsResponseStatus         :: !Int
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'DescribeEventSubscriptionsResponse' with the minimum fields required to make a request.
@@ -157,15 +158,15 @@
 --
 -- * 'desrsMarker'
 --
--- * 'desrsStatus'
+-- * 'desrsResponseStatus'
 describeEventSubscriptionsResponse
-    :: Int -- ^ 'desrsStatus'
+    :: Int -- ^ 'desrsResponseStatus'
     -> DescribeEventSubscriptionsResponse
-describeEventSubscriptionsResponse pStatus_ =
+describeEventSubscriptionsResponse pResponseStatus_ =
     DescribeEventSubscriptionsResponse'
     { _desrsEventSubscriptionsList = Nothing
     , _desrsMarker = Nothing
-    , _desrsStatus = pStatus_
+    , _desrsResponseStatus = pResponseStatus_
     }
 
 -- | A list of event subscriptions.
@@ -182,5 +183,5 @@
 desrsMarker = lens _desrsMarker (\ s a -> s{_desrsMarker = a});
 
 -- | The response status code.
-desrsStatus :: Lens' DescribeEventSubscriptionsResponse Int
-desrsStatus = lens _desrsStatus (\ s a -> s{_desrsStatus = a});
+desrsResponseStatus :: Lens' DescribeEventSubscriptionsResponse Int
+desrsResponseStatus = lens _desrsResponseStatus (\ s a -> s{_desrsResponseStatus = a});
diff --git a/gen/Network/AWS/Redshift/DescribeEvents.hs b/gen/Network/AWS/Redshift/DescribeEvents.hs
--- a/gen/Network/AWS/Redshift/DescribeEvents.hs
+++ b/gen/Network/AWS/Redshift/DescribeEvents.hs
@@ -36,9 +36,9 @@
     , deStartTime
     , deSourceType
     , deSourceIdentifier
+    , deMarker
     , deMaxRecords
     , deEndTime
-    , deMarker
     , deDuration
 
     -- * Destructuring the Response
@@ -47,7 +47,7 @@
     -- * Response Lenses
     , dersEvents
     , dersMarker
-    , dersStatus
+    , dersResponseStatus
     ) where
 
 import           Network.AWS.Pager
@@ -64,9 +64,9 @@
     { _deStartTime        :: !(Maybe ISO8601)
     , _deSourceType       :: !(Maybe SourceType)
     , _deSourceIdentifier :: !(Maybe Text)
+    , _deMarker           :: !(Maybe Text)
     , _deMaxRecords       :: !(Maybe Int)
     , _deEndTime          :: !(Maybe ISO8601)
-    , _deMarker           :: !(Maybe Text)
     , _deDuration         :: !(Maybe Int)
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
@@ -80,12 +80,12 @@
 --
 -- * 'deSourceIdentifier'
 --
+-- * 'deMarker'
+--
 -- * 'deMaxRecords'
 --
 -- * 'deEndTime'
 --
--- * 'deMarker'
---
 -- * 'deDuration'
 describeEvents
     :: DescribeEvents
@@ -94,9 +94,9 @@
     { _deStartTime = Nothing
     , _deSourceType = Nothing
     , _deSourceIdentifier = Nothing
+    , _deMarker = Nothing
     , _deMaxRecords = Nothing
     , _deEndTime = Nothing
-    , _deMarker = Nothing
     , _deDuration = Nothing
     }
 
@@ -143,6 +143,15 @@
 deSourceIdentifier :: Lens' DescribeEvents (Maybe Text)
 deSourceIdentifier = lens _deSourceIdentifier (\ s a -> s{_deSourceIdentifier = a});
 
+-- | An optional parameter that specifies the starting point to return a set
+-- of response records. When the results of a DescribeEvents request exceed
+-- the value specified in 'MaxRecords', AWS returns a value in the 'Marker'
+-- field of the response. You can retrieve the next set of response records
+-- by providing the returned marker value in the 'Marker' parameter and
+-- retrying the request.
+deMarker :: Lens' DescribeEvents (Maybe Text)
+deMarker = lens _deMarker (\ s a -> s{_deMarker = a});
+
 -- | The maximum number of response records to return in each call. If the
 -- number of remaining response records exceeds the specified 'MaxRecords'
 -- value, a value is returned in a 'marker' field of the response. You can
@@ -163,15 +172,6 @@
 deEndTime :: Lens' DescribeEvents (Maybe UTCTime)
 deEndTime = lens _deEndTime (\ s a -> s{_deEndTime = a}) . mapping _Time;
 
--- | An optional parameter that specifies the starting point to return a set
--- of response records. When the results of a DescribeEvents request exceed
--- the value specified in 'MaxRecords', AWS returns a value in the 'Marker'
--- field of the response. You can retrieve the next set of response records
--- by providing the returned marker value in the 'Marker' parameter and
--- retrying the request.
-deMarker :: Lens' DescribeEvents (Maybe Text)
-deMarker = lens _deMarker (\ s a -> s{_deMarker = a});
-
 -- | The number of minutes prior to the time of the request for which to
 -- retrieve events. For example, if the request is sent at 18:00 and you
 -- specify a duration of 60, then only events which have occurred after
@@ -214,17 +214,16 @@
                "StartTime" =: _deStartTime,
                "SourceType" =: _deSourceType,
                "SourceIdentifier" =: _deSourceIdentifier,
-               "MaxRecords" =: _deMaxRecords,
-               "EndTime" =: _deEndTime, "Marker" =: _deMarker,
-               "Duration" =: _deDuration]
+               "Marker" =: _deMarker, "MaxRecords" =: _deMaxRecords,
+               "EndTime" =: _deEndTime, "Duration" =: _deDuration]
 
 -- | Contains the output from the DescribeEvents action.
 --
 -- /See:/ 'describeEventsResponse' smart constructor.
 data DescribeEventsResponse = DescribeEventsResponse'
-    { _dersEvents :: !(Maybe [Event])
-    , _dersMarker :: !(Maybe Text)
-    , _dersStatus :: !Int
+    { _dersEvents         :: !(Maybe [Event])
+    , _dersMarker         :: !(Maybe Text)
+    , _dersResponseStatus :: !Int
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'DescribeEventsResponse' with the minimum fields required to make a request.
@@ -235,15 +234,15 @@
 --
 -- * 'dersMarker'
 --
--- * 'dersStatus'
+-- * 'dersResponseStatus'
 describeEventsResponse
-    :: Int -- ^ 'dersStatus'
+    :: Int -- ^ 'dersResponseStatus'
     -> DescribeEventsResponse
-describeEventsResponse pStatus_ =
+describeEventsResponse pResponseStatus_ =
     DescribeEventsResponse'
     { _dersEvents = Nothing
     , _dersMarker = Nothing
-    , _dersStatus = pStatus_
+    , _dersResponseStatus = pResponseStatus_
     }
 
 -- | A list of Event instances.
@@ -260,5 +259,5 @@
 dersMarker = lens _dersMarker (\ s a -> s{_dersMarker = a});
 
 -- | The response status code.
-dersStatus :: Lens' DescribeEventsResponse Int
-dersStatus = lens _dersStatus (\ s a -> s{_dersStatus = a});
+dersResponseStatus :: Lens' DescribeEventsResponse Int
+dersResponseStatus = lens _dersResponseStatus (\ s a -> s{_dersResponseStatus = a});
diff --git a/gen/Network/AWS/Redshift/DescribeHSMClientCertificates.hs b/gen/Network/AWS/Redshift/DescribeHSMClientCertificates.hs
--- a/gen/Network/AWS/Redshift/DescribeHSMClientCertificates.hs
+++ b/gen/Network/AWS/Redshift/DescribeHSMClientCertificates.hs
@@ -45,8 +45,8 @@
     , dhccTagValues
     , dhccTagKeys
     , dhccHSMClientCertificateIdentifier
-    , dhccMaxRecords
     , dhccMarker
+    , dhccMaxRecords
 
     -- * Destructuring the Response
     , describeHSMClientCertificatesResponse
@@ -54,7 +54,7 @@
     -- * Response Lenses
     , dhccrsMarker
     , dhccrsHSMClientCertificates
-    , dhccrsStatus
+    , dhccrsResponseStatus
     ) where
 
 import           Network.AWS.Pager
@@ -71,8 +71,8 @@
     { _dhccTagValues                      :: !(Maybe [Text])
     , _dhccTagKeys                        :: !(Maybe [Text])
     , _dhccHSMClientCertificateIdentifier :: !(Maybe Text)
-    , _dhccMaxRecords                     :: !(Maybe Int)
     , _dhccMarker                         :: !(Maybe Text)
+    , _dhccMaxRecords                     :: !(Maybe Int)
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'DescribeHSMClientCertificates' with the minimum fields required to make a request.
@@ -85,9 +85,9 @@
 --
 -- * 'dhccHSMClientCertificateIdentifier'
 --
--- * 'dhccMaxRecords'
---
 -- * 'dhccMarker'
+--
+-- * 'dhccMaxRecords'
 describeHSMClientCertificates
     :: DescribeHSMClientCertificates
 describeHSMClientCertificates =
@@ -95,8 +95,8 @@
     { _dhccTagValues = Nothing
     , _dhccTagKeys = Nothing
     , _dhccHSMClientCertificateIdentifier = Nothing
-    , _dhccMaxRecords = Nothing
     , _dhccMarker = Nothing
+    , _dhccMaxRecords = Nothing
     }
 
 -- | A tag value or values for which you want to return all matching HSM
@@ -125,6 +125,15 @@
 dhccHSMClientCertificateIdentifier :: Lens' DescribeHSMClientCertificates (Maybe Text)
 dhccHSMClientCertificateIdentifier = lens _dhccHSMClientCertificateIdentifier (\ s a -> s{_dhccHSMClientCertificateIdentifier = a});
 
+-- | An optional parameter that specifies the starting point to return a set
+-- of response records. When the results of a DescribeHsmClientCertificates
+-- request exceed the value specified in 'MaxRecords', AWS returns a value
+-- in the 'Marker' field of the response. You can retrieve the next set of
+-- response records by providing the returned marker value in the 'Marker'
+-- parameter and retrying the request.
+dhccMarker :: Lens' DescribeHSMClientCertificates (Maybe Text)
+dhccMarker = lens _dhccMarker (\ s a -> s{_dhccMarker = a});
+
 -- | The maximum number of response records to return in each call. If the
 -- number of remaining response records exceeds the specified 'MaxRecords'
 -- value, a value is returned in a 'marker' field of the response. You can
@@ -137,15 +146,6 @@
 dhccMaxRecords :: Lens' DescribeHSMClientCertificates (Maybe Int)
 dhccMaxRecords = lens _dhccMaxRecords (\ s a -> s{_dhccMaxRecords = a});
 
--- | An optional parameter that specifies the starting point to return a set
--- of response records. When the results of a DescribeHsmClientCertificates
--- request exceed the value specified in 'MaxRecords', AWS returns a value
--- in the 'Marker' field of the response. You can retrieve the next set of
--- response records by providing the returned marker value in the 'Marker'
--- parameter and retrying the request.
-dhccMarker :: Lens' DescribeHSMClientCertificates (Maybe Text)
-dhccMarker = lens _dhccMarker (\ s a -> s{_dhccMarker = a});
-
 instance AWSPager DescribeHSMClientCertificates where
         page rq rs
           | stop (rs ^. dhccrsMarker) = Nothing
@@ -187,8 +187,8 @@
                  toQuery (toQueryList "TagKey" <$> _dhccTagKeys),
                "HsmClientCertificateIdentifier" =:
                  _dhccHSMClientCertificateIdentifier,
-               "MaxRecords" =: _dhccMaxRecords,
-               "Marker" =: _dhccMarker]
+               "Marker" =: _dhccMarker,
+               "MaxRecords" =: _dhccMaxRecords]
 
 -- |
 --
@@ -196,7 +196,7 @@
 data DescribeHSMClientCertificatesResponse = DescribeHSMClientCertificatesResponse'
     { _dhccrsMarker                :: !(Maybe Text)
     , _dhccrsHSMClientCertificates :: !(Maybe [HSMClientCertificate])
-    , _dhccrsStatus                :: !Int
+    , _dhccrsResponseStatus        :: !Int
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'DescribeHSMClientCertificatesResponse' with the minimum fields required to make a request.
@@ -207,15 +207,15 @@
 --
 -- * 'dhccrsHSMClientCertificates'
 --
--- * 'dhccrsStatus'
+-- * 'dhccrsResponseStatus'
 describeHSMClientCertificatesResponse
-    :: Int -- ^ 'dhccrsStatus'
+    :: Int -- ^ 'dhccrsResponseStatus'
     -> DescribeHSMClientCertificatesResponse
-describeHSMClientCertificatesResponse pStatus_ =
+describeHSMClientCertificatesResponse pResponseStatus_ =
     DescribeHSMClientCertificatesResponse'
     { _dhccrsMarker = Nothing
     , _dhccrsHSMClientCertificates = Nothing
-    , _dhccrsStatus = pStatus_
+    , _dhccrsResponseStatus = pResponseStatus_
     }
 
 -- | A value that indicates the starting point for the next set of response
@@ -234,5 +234,5 @@
 dhccrsHSMClientCertificates = lens _dhccrsHSMClientCertificates (\ s a -> s{_dhccrsHSMClientCertificates = a}) . _Default . _Coerce;
 
 -- | The response status code.
-dhccrsStatus :: Lens' DescribeHSMClientCertificatesResponse Int
-dhccrsStatus = lens _dhccrsStatus (\ s a -> s{_dhccrsStatus = a});
+dhccrsResponseStatus :: Lens' DescribeHSMClientCertificatesResponse Int
+dhccrsResponseStatus = lens _dhccrsResponseStatus (\ s a -> s{_dhccrsResponseStatus = a});
diff --git a/gen/Network/AWS/Redshift/DescribeHSMConfigurations.hs b/gen/Network/AWS/Redshift/DescribeHSMConfigurations.hs
--- a/gen/Network/AWS/Redshift/DescribeHSMConfigurations.hs
+++ b/gen/Network/AWS/Redshift/DescribeHSMConfigurations.hs
@@ -44,8 +44,8 @@
     , dhsmcTagValues
     , dhsmcHSMConfigurationIdentifier
     , dhsmcTagKeys
-    , dhsmcMaxRecords
     , dhsmcMarker
+    , dhsmcMaxRecords
 
     -- * Destructuring the Response
     , describeHSMConfigurationsResponse
@@ -53,7 +53,7 @@
     -- * Response Lenses
     , dhcrsMarker
     , dhcrsHSMConfigurations
-    , dhcrsStatus
+    , dhcrsResponseStatus
     ) where
 
 import           Network.AWS.Pager
@@ -70,8 +70,8 @@
     { _dhsmcTagValues                  :: !(Maybe [Text])
     , _dhsmcHSMConfigurationIdentifier :: !(Maybe Text)
     , _dhsmcTagKeys                    :: !(Maybe [Text])
-    , _dhsmcMaxRecords                 :: !(Maybe Int)
     , _dhsmcMarker                     :: !(Maybe Text)
+    , _dhsmcMaxRecords                 :: !(Maybe Int)
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'DescribeHSMConfigurations' with the minimum fields required to make a request.
@@ -84,9 +84,9 @@
 --
 -- * 'dhsmcTagKeys'
 --
--- * 'dhsmcMaxRecords'
---
 -- * 'dhsmcMarker'
+--
+-- * 'dhsmcMaxRecords'
 describeHSMConfigurations
     :: DescribeHSMConfigurations
 describeHSMConfigurations =
@@ -94,8 +94,8 @@
     { _dhsmcTagValues = Nothing
     , _dhsmcHSMConfigurationIdentifier = Nothing
     , _dhsmcTagKeys = Nothing
-    , _dhsmcMaxRecords = Nothing
     , _dhsmcMarker = Nothing
+    , _dhsmcMaxRecords = Nothing
     }
 
 -- | A tag value or values for which you want to return all matching HSM
@@ -124,6 +124,15 @@
 dhsmcTagKeys :: Lens' DescribeHSMConfigurations [Text]
 dhsmcTagKeys = lens _dhsmcTagKeys (\ s a -> s{_dhsmcTagKeys = a}) . _Default . _Coerce;
 
+-- | An optional parameter that specifies the starting point to return a set
+-- of response records. When the results of a DescribeHsmConfigurations
+-- request exceed the value specified in 'MaxRecords', AWS returns a value
+-- in the 'Marker' field of the response. You can retrieve the next set of
+-- response records by providing the returned marker value in the 'Marker'
+-- parameter and retrying the request.
+dhsmcMarker :: Lens' DescribeHSMConfigurations (Maybe Text)
+dhsmcMarker = lens _dhsmcMarker (\ s a -> s{_dhsmcMarker = a});
+
 -- | The maximum number of response records to return in each call. If the
 -- number of remaining response records exceeds the specified 'MaxRecords'
 -- value, a value is returned in a 'marker' field of the response. You can
@@ -136,15 +145,6 @@
 dhsmcMaxRecords :: Lens' DescribeHSMConfigurations (Maybe Int)
 dhsmcMaxRecords = lens _dhsmcMaxRecords (\ s a -> s{_dhsmcMaxRecords = a});
 
--- | An optional parameter that specifies the starting point to return a set
--- of response records. When the results of a DescribeHsmConfigurations
--- request exceed the value specified in 'MaxRecords', AWS returns a value
--- in the 'Marker' field of the response. You can retrieve the next set of
--- response records by providing the returned marker value in the 'Marker'
--- parameter and retrying the request.
-dhsmcMarker :: Lens' DescribeHSMConfigurations (Maybe Text)
-dhsmcMarker = lens _dhsmcMarker (\ s a -> s{_dhsmcMarker = a});
-
 instance AWSPager DescribeHSMConfigurations where
         page rq rs
           | stop (rs ^. dhcrsMarker) = Nothing
@@ -183,8 +183,8 @@
                  _dhsmcHSMConfigurationIdentifier,
                "TagKeys" =:
                  toQuery (toQueryList "TagKey" <$> _dhsmcTagKeys),
-               "MaxRecords" =: _dhsmcMaxRecords,
-               "Marker" =: _dhsmcMarker]
+               "Marker" =: _dhsmcMarker,
+               "MaxRecords" =: _dhsmcMaxRecords]
 
 -- |
 --
@@ -192,7 +192,7 @@
 data DescribeHSMConfigurationsResponse = DescribeHSMConfigurationsResponse'
     { _dhcrsMarker            :: !(Maybe Text)
     , _dhcrsHSMConfigurations :: !(Maybe [HSMConfiguration])
-    , _dhcrsStatus            :: !Int
+    , _dhcrsResponseStatus    :: !Int
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'DescribeHSMConfigurationsResponse' with the minimum fields required to make a request.
@@ -203,15 +203,15 @@
 --
 -- * 'dhcrsHSMConfigurations'
 --
--- * 'dhcrsStatus'
+-- * 'dhcrsResponseStatus'
 describeHSMConfigurationsResponse
-    :: Int -- ^ 'dhcrsStatus'
+    :: Int -- ^ 'dhcrsResponseStatus'
     -> DescribeHSMConfigurationsResponse
-describeHSMConfigurationsResponse pStatus_ =
+describeHSMConfigurationsResponse pResponseStatus_ =
     DescribeHSMConfigurationsResponse'
     { _dhcrsMarker = Nothing
     , _dhcrsHSMConfigurations = Nothing
-    , _dhcrsStatus = pStatus_
+    , _dhcrsResponseStatus = pResponseStatus_
     }
 
 -- | A value that indicates the starting point for the next set of response
@@ -228,5 +228,5 @@
 dhcrsHSMConfigurations = lens _dhcrsHSMConfigurations (\ s a -> s{_dhcrsHSMConfigurations = a}) . _Default . _Coerce;
 
 -- | The response status code.
-dhcrsStatus :: Lens' DescribeHSMConfigurationsResponse Int
-dhcrsStatus = lens _dhcrsStatus (\ s a -> s{_dhcrsStatus = a});
+dhcrsResponseStatus :: Lens' DescribeHSMConfigurationsResponse Int
+dhcrsResponseStatus = lens _dhcrsResponseStatus (\ s a -> s{_dhcrsResponseStatus = a});
diff --git a/gen/Network/AWS/Redshift/DescribeLoggingStatus.hs b/gen/Network/AWS/Redshift/DescribeLoggingStatus.hs
--- a/gen/Network/AWS/Redshift/DescribeLoggingStatus.hs
+++ b/gen/Network/AWS/Redshift/DescribeLoggingStatus.hs
@@ -34,8 +34,8 @@
     , loggingStatus
     , LoggingStatus
     -- * Response Lenses
-    , lsLastSuccessfulDeliveryTime
     , lsLastFailureTime
+    , lsLastSuccessfulDeliveryTime
     , lsS3KeyPrefix
     , lsBucketName
     , lsLoggingEnabled
diff --git a/gen/Network/AWS/Redshift/DescribeOrderableClusterOptions.hs b/gen/Network/AWS/Redshift/DescribeOrderableClusterOptions.hs
--- a/gen/Network/AWS/Redshift/DescribeOrderableClusterOptions.hs
+++ b/gen/Network/AWS/Redshift/DescribeOrderableClusterOptions.hs
@@ -38,8 +38,8 @@
       describeOrderableClusterOptions
     , DescribeOrderableClusterOptions
     -- * Request Lenses
-    , docoMaxRecords
     , docoMarker
+    , docoMaxRecords
     , docoClusterVersion
     , docoNodeType
 
@@ -49,7 +49,7 @@
     -- * Response Lenses
     , docorsMarker
     , docorsOrderableClusterOptions
-    , docorsStatus
+    , docorsResponseStatus
     ) where
 
 import           Network.AWS.Pager
@@ -63,8 +63,8 @@
 --
 -- /See:/ 'describeOrderableClusterOptions' smart constructor.
 data DescribeOrderableClusterOptions = DescribeOrderableClusterOptions'
-    { _docoMaxRecords     :: !(Maybe Int)
-    , _docoMarker         :: !(Maybe Text)
+    { _docoMarker         :: !(Maybe Text)
+    , _docoMaxRecords     :: !(Maybe Int)
     , _docoClusterVersion :: !(Maybe Text)
     , _docoNodeType       :: !(Maybe Text)
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
@@ -73,10 +73,10 @@
 --
 -- Use one of the following lenses to modify other fields as desired:
 --
--- * 'docoMaxRecords'
---
 -- * 'docoMarker'
 --
+-- * 'docoMaxRecords'
+--
 -- * 'docoClusterVersion'
 --
 -- * 'docoNodeType'
@@ -84,12 +84,22 @@
     :: DescribeOrderableClusterOptions
 describeOrderableClusterOptions =
     DescribeOrderableClusterOptions'
-    { _docoMaxRecords = Nothing
-    , _docoMarker = Nothing
+    { _docoMarker = Nothing
+    , _docoMaxRecords = Nothing
     , _docoClusterVersion = Nothing
     , _docoNodeType = Nothing
     }
 
+-- | An optional parameter that specifies the starting point to return a set
+-- of response records. When the results of a
+-- DescribeOrderableClusterOptions request exceed the value specified in
+-- 'MaxRecords', AWS returns a value in the 'Marker' field of the response.
+-- You can retrieve the next set of response records by providing the
+-- returned marker value in the 'Marker' parameter and retrying the
+-- request.
+docoMarker :: Lens' DescribeOrderableClusterOptions (Maybe Text)
+docoMarker = lens _docoMarker (\ s a -> s{_docoMarker = a});
+
 -- | The maximum number of response records to return in each call. If the
 -- number of remaining response records exceeds the specified 'MaxRecords'
 -- value, a value is returned in a 'marker' field of the response. You can
@@ -102,16 +112,6 @@
 docoMaxRecords :: Lens' DescribeOrderableClusterOptions (Maybe Int)
 docoMaxRecords = lens _docoMaxRecords (\ s a -> s{_docoMaxRecords = a});
 
--- | An optional parameter that specifies the starting point to return a set
--- of response records. When the results of a
--- DescribeOrderableClusterOptions request exceed the value specified in
--- 'MaxRecords', AWS returns a value in the 'Marker' field of the response.
--- You can retrieve the next set of response records by providing the
--- returned marker value in the 'Marker' parameter and retrying the
--- request.
-docoMarker :: Lens' DescribeOrderableClusterOptions (Maybe Text)
-docoMarker = lens _docoMarker (\ s a -> s{_docoMarker = a});
-
 -- | The version filter value. Specify this parameter to show only the
 -- available offerings matching the specified version.
 --
@@ -165,8 +165,8 @@
               ["Action" =:
                  ("DescribeOrderableClusterOptions" :: ByteString),
                "Version" =: ("2012-12-01" :: ByteString),
-               "MaxRecords" =: _docoMaxRecords,
                "Marker" =: _docoMarker,
+               "MaxRecords" =: _docoMaxRecords,
                "ClusterVersion" =: _docoClusterVersion,
                "NodeType" =: _docoNodeType]
 
@@ -176,7 +176,7 @@
 data DescribeOrderableClusterOptionsResponse = DescribeOrderableClusterOptionsResponse'
     { _docorsMarker                  :: !(Maybe Text)
     , _docorsOrderableClusterOptions :: !(Maybe [OrderableClusterOption])
-    , _docorsStatus                  :: !Int
+    , _docorsResponseStatus          :: !Int
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'DescribeOrderableClusterOptionsResponse' with the minimum fields required to make a request.
@@ -187,15 +187,15 @@
 --
 -- * 'docorsOrderableClusterOptions'
 --
--- * 'docorsStatus'
+-- * 'docorsResponseStatus'
 describeOrderableClusterOptionsResponse
-    :: Int -- ^ 'docorsStatus'
+    :: Int -- ^ 'docorsResponseStatus'
     -> DescribeOrderableClusterOptionsResponse
-describeOrderableClusterOptionsResponse pStatus_ =
+describeOrderableClusterOptionsResponse pResponseStatus_ =
     DescribeOrderableClusterOptionsResponse'
     { _docorsMarker = Nothing
     , _docorsOrderableClusterOptions = Nothing
-    , _docorsStatus = pStatus_
+    , _docorsResponseStatus = pResponseStatus_
     }
 
 -- | A value that indicates the starting point for the next set of response
@@ -213,5 +213,5 @@
 docorsOrderableClusterOptions = lens _docorsOrderableClusterOptions (\ s a -> s{_docorsOrderableClusterOptions = a}) . _Default . _Coerce;
 
 -- | The response status code.
-docorsStatus :: Lens' DescribeOrderableClusterOptionsResponse Int
-docorsStatus = lens _docorsStatus (\ s a -> s{_docorsStatus = a});
+docorsResponseStatus :: Lens' DescribeOrderableClusterOptionsResponse Int
+docorsResponseStatus = lens _docorsResponseStatus (\ s a -> s{_docorsResponseStatus = a});
diff --git a/gen/Network/AWS/Redshift/DescribeReservedNodeOfferings.hs b/gen/Network/AWS/Redshift/DescribeReservedNodeOfferings.hs
--- a/gen/Network/AWS/Redshift/DescribeReservedNodeOfferings.hs
+++ b/gen/Network/AWS/Redshift/DescribeReservedNodeOfferings.hs
@@ -40,8 +40,8 @@
     , DescribeReservedNodeOfferings
     -- * Request Lenses
     , drnoReservedNodeOfferingId
-    , drnoMaxRecords
     , drnoMarker
+    , drnoMaxRecords
 
     -- * Destructuring the Response
     , describeReservedNodeOfferingsResponse
@@ -49,7 +49,7 @@
     -- * Response Lenses
     , drnorsReservedNodeOfferings
     , drnorsMarker
-    , drnorsStatus
+    , drnorsResponseStatus
     ) where
 
 import           Network.AWS.Pager
@@ -64,8 +64,8 @@
 -- /See:/ 'describeReservedNodeOfferings' smart constructor.
 data DescribeReservedNodeOfferings = DescribeReservedNodeOfferings'
     { _drnoReservedNodeOfferingId :: !(Maybe Text)
-    , _drnoMaxRecords             :: !(Maybe Int)
     , _drnoMarker                 :: !(Maybe Text)
+    , _drnoMaxRecords             :: !(Maybe Int)
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'DescribeReservedNodeOfferings' with the minimum fields required to make a request.
@@ -74,22 +74,31 @@
 --
 -- * 'drnoReservedNodeOfferingId'
 --
--- * 'drnoMaxRecords'
---
 -- * 'drnoMarker'
+--
+-- * 'drnoMaxRecords'
 describeReservedNodeOfferings
     :: DescribeReservedNodeOfferings
 describeReservedNodeOfferings =
     DescribeReservedNodeOfferings'
     { _drnoReservedNodeOfferingId = Nothing
-    , _drnoMaxRecords = Nothing
     , _drnoMarker = Nothing
+    , _drnoMaxRecords = Nothing
     }
 
 -- | The unique identifier for the offering.
 drnoReservedNodeOfferingId :: Lens' DescribeReservedNodeOfferings (Maybe Text)
 drnoReservedNodeOfferingId = lens _drnoReservedNodeOfferingId (\ s a -> s{_drnoReservedNodeOfferingId = a});
 
+-- | An optional parameter that specifies the starting point to return a set
+-- of response records. When the results of a DescribeReservedNodeOfferings
+-- request exceed the value specified in 'MaxRecords', AWS returns a value
+-- in the 'Marker' field of the response. You can retrieve the next set of
+-- response records by providing the returned marker value in the 'Marker'
+-- parameter and retrying the request.
+drnoMarker :: Lens' DescribeReservedNodeOfferings (Maybe Text)
+drnoMarker = lens _drnoMarker (\ s a -> s{_drnoMarker = a});
+
 -- | The maximum number of response records to return in each call. If the
 -- number of remaining response records exceeds the specified 'MaxRecords'
 -- value, a value is returned in a 'marker' field of the response. You can
@@ -102,15 +111,6 @@
 drnoMaxRecords :: Lens' DescribeReservedNodeOfferings (Maybe Int)
 drnoMaxRecords = lens _drnoMaxRecords (\ s a -> s{_drnoMaxRecords = a});
 
--- | An optional parameter that specifies the starting point to return a set
--- of response records. When the results of a DescribeReservedNodeOfferings
--- request exceed the value specified in 'MaxRecords', AWS returns a value
--- in the 'Marker' field of the response. You can retrieve the next set of
--- response records by providing the returned marker value in the 'Marker'
--- parameter and retrying the request.
-drnoMarker :: Lens' DescribeReservedNodeOfferings (Maybe Text)
-drnoMarker = lens _drnoMarker (\ s a -> s{_drnoMarker = a});
-
 instance AWSPager DescribeReservedNodeOfferings where
         page rq rs
           | stop (rs ^. drnorsMarker) = Nothing
@@ -148,8 +148,8 @@
                "Version" =: ("2012-12-01" :: ByteString),
                "ReservedNodeOfferingId" =:
                  _drnoReservedNodeOfferingId,
-               "MaxRecords" =: _drnoMaxRecords,
-               "Marker" =: _drnoMarker]
+               "Marker" =: _drnoMarker,
+               "MaxRecords" =: _drnoMaxRecords]
 
 -- | Contains the output from the DescribeReservedNodeOfferings action.
 --
@@ -157,7 +157,7 @@
 data DescribeReservedNodeOfferingsResponse = DescribeReservedNodeOfferingsResponse'
     { _drnorsReservedNodeOfferings :: !(Maybe [ReservedNodeOffering])
     , _drnorsMarker                :: !(Maybe Text)
-    , _drnorsStatus                :: !Int
+    , _drnorsResponseStatus        :: !Int
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'DescribeReservedNodeOfferingsResponse' with the minimum fields required to make a request.
@@ -168,15 +168,15 @@
 --
 -- * 'drnorsMarker'
 --
--- * 'drnorsStatus'
+-- * 'drnorsResponseStatus'
 describeReservedNodeOfferingsResponse
-    :: Int -- ^ 'drnorsStatus'
+    :: Int -- ^ 'drnorsResponseStatus'
     -> DescribeReservedNodeOfferingsResponse
-describeReservedNodeOfferingsResponse pStatus_ =
+describeReservedNodeOfferingsResponse pResponseStatus_ =
     DescribeReservedNodeOfferingsResponse'
     { _drnorsReservedNodeOfferings = Nothing
     , _drnorsMarker = Nothing
-    , _drnorsStatus = pStatus_
+    , _drnorsResponseStatus = pResponseStatus_
     }
 
 -- | A list of reserved node offerings.
@@ -193,5 +193,5 @@
 drnorsMarker = lens _drnorsMarker (\ s a -> s{_drnorsMarker = a});
 
 -- | The response status code.
-drnorsStatus :: Lens' DescribeReservedNodeOfferingsResponse Int
-drnorsStatus = lens _drnorsStatus (\ s a -> s{_drnorsStatus = a});
+drnorsResponseStatus :: Lens' DescribeReservedNodeOfferingsResponse Int
+drnorsResponseStatus = lens _drnorsResponseStatus (\ s a -> s{_drnorsResponseStatus = a});
diff --git a/gen/Network/AWS/Redshift/DescribeReservedNodes.hs b/gen/Network/AWS/Redshift/DescribeReservedNodes.hs
--- a/gen/Network/AWS/Redshift/DescribeReservedNodes.hs
+++ b/gen/Network/AWS/Redshift/DescribeReservedNodes.hs
@@ -30,8 +30,8 @@
     , DescribeReservedNodes
     -- * Request Lenses
     , drnReservedNodeId
-    , drnMaxRecords
     , drnMarker
+    , drnMaxRecords
 
     -- * Destructuring the Response
     , describeReservedNodesResponse
@@ -39,7 +39,7 @@
     -- * Response Lenses
     , drnrsReservedNodes
     , drnrsMarker
-    , drnrsStatus
+    , drnrsResponseStatus
     ) where
 
 import           Network.AWS.Pager
@@ -54,8 +54,8 @@
 -- /See:/ 'describeReservedNodes' smart constructor.
 data DescribeReservedNodes = DescribeReservedNodes'
     { _drnReservedNodeId :: !(Maybe Text)
-    , _drnMaxRecords     :: !(Maybe Int)
     , _drnMarker         :: !(Maybe Text)
+    , _drnMaxRecords     :: !(Maybe Int)
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'DescribeReservedNodes' with the minimum fields required to make a request.
@@ -64,22 +64,31 @@
 --
 -- * 'drnReservedNodeId'
 --
--- * 'drnMaxRecords'
---
 -- * 'drnMarker'
+--
+-- * 'drnMaxRecords'
 describeReservedNodes
     :: DescribeReservedNodes
 describeReservedNodes =
     DescribeReservedNodes'
     { _drnReservedNodeId = Nothing
-    , _drnMaxRecords = Nothing
     , _drnMarker = Nothing
+    , _drnMaxRecords = Nothing
     }
 
 -- | Identifier for the node reservation.
 drnReservedNodeId :: Lens' DescribeReservedNodes (Maybe Text)
 drnReservedNodeId = lens _drnReservedNodeId (\ s a -> s{_drnReservedNodeId = a});
 
+-- | An optional parameter that specifies the starting point to return a set
+-- of response records. When the results of a DescribeReservedNodes request
+-- exceed the value specified in 'MaxRecords', AWS returns a value in the
+-- 'Marker' field of the response. You can retrieve the next set of
+-- response records by providing the returned marker value in the 'Marker'
+-- parameter and retrying the request.
+drnMarker :: Lens' DescribeReservedNodes (Maybe Text)
+drnMarker = lens _drnMarker (\ s a -> s{_drnMarker = a});
+
 -- | The maximum number of response records to return in each call. If the
 -- number of remaining response records exceeds the specified 'MaxRecords'
 -- value, a value is returned in a 'marker' field of the response. You can
@@ -92,15 +101,6 @@
 drnMaxRecords :: Lens' DescribeReservedNodes (Maybe Int)
 drnMaxRecords = lens _drnMaxRecords (\ s a -> s{_drnMaxRecords = a});
 
--- | An optional parameter that specifies the starting point to return a set
--- of response records. When the results of a DescribeReservedNodes request
--- exceed the value specified in 'MaxRecords', AWS returns a value in the
--- 'Marker' field of the response. You can retrieve the next set of
--- response records by providing the returned marker value in the 'Marker'
--- parameter and retrying the request.
-drnMarker :: Lens' DescribeReservedNodes (Maybe Text)
-drnMarker = lens _drnMarker (\ s a -> s{_drnMarker = a});
-
 instance AWSPager DescribeReservedNodes where
         page rq rs
           | stop (rs ^. drnrsMarker) = Nothing
@@ -133,16 +133,16 @@
               ["Action" =: ("DescribeReservedNodes" :: ByteString),
                "Version" =: ("2012-12-01" :: ByteString),
                "ReservedNodeId" =: _drnReservedNodeId,
-               "MaxRecords" =: _drnMaxRecords,
-               "Marker" =: _drnMarker]
+               "Marker" =: _drnMarker,
+               "MaxRecords" =: _drnMaxRecords]
 
 -- | Contains the output from the DescribeReservedNodes action.
 --
 -- /See:/ 'describeReservedNodesResponse' smart constructor.
 data DescribeReservedNodesResponse = DescribeReservedNodesResponse'
-    { _drnrsReservedNodes :: !(Maybe [ReservedNode])
-    , _drnrsMarker        :: !(Maybe Text)
-    , _drnrsStatus        :: !Int
+    { _drnrsReservedNodes  :: !(Maybe [ReservedNode])
+    , _drnrsMarker         :: !(Maybe Text)
+    , _drnrsResponseStatus :: !Int
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'DescribeReservedNodesResponse' with the minimum fields required to make a request.
@@ -153,15 +153,15 @@
 --
 -- * 'drnrsMarker'
 --
--- * 'drnrsStatus'
+-- * 'drnrsResponseStatus'
 describeReservedNodesResponse
-    :: Int -- ^ 'drnrsStatus'
+    :: Int -- ^ 'drnrsResponseStatus'
     -> DescribeReservedNodesResponse
-describeReservedNodesResponse pStatus_ =
+describeReservedNodesResponse pResponseStatus_ =
     DescribeReservedNodesResponse'
     { _drnrsReservedNodes = Nothing
     , _drnrsMarker = Nothing
-    , _drnrsStatus = pStatus_
+    , _drnrsResponseStatus = pResponseStatus_
     }
 
 -- | The list of reserved nodes.
@@ -178,5 +178,5 @@
 drnrsMarker = lens _drnrsMarker (\ s a -> s{_drnrsMarker = a});
 
 -- | The response status code.
-drnrsStatus :: Lens' DescribeReservedNodesResponse Int
-drnrsStatus = lens _drnrsStatus (\ s a -> s{_drnrsStatus = a});
+drnrsResponseStatus :: Lens' DescribeReservedNodesResponse Int
+drnrsResponseStatus = lens _drnrsResponseStatus (\ s a -> s{_drnrsResponseStatus = a});
diff --git a/gen/Network/AWS/Redshift/DescribeResize.hs b/gen/Network/AWS/Redshift/DescribeResize.hs
--- a/gen/Network/AWS/Redshift/DescribeResize.hs
+++ b/gen/Network/AWS/Redshift/DescribeResize.hs
@@ -40,8 +40,9 @@
     , describeResizeResponse
     , DescribeResizeResponse
     -- * Response Lenses
-    , drrsEstimatedTimeToCompletionInSeconds
     , drrsImportTablesNotStarted
+    , drrsStatus
+    , drrsEstimatedTimeToCompletionInSeconds
     , drrsAvgResizeRateInMegaBytesPerSecond
     , drrsTargetNumberOfNodes
     , drrsTargetNodeType
@@ -49,9 +50,9 @@
     , drrsImportTablesCompleted
     , drrsProgressInMegaBytes
     , drrsTotalResizeDataInMegaBytes
-    , drrsElapsedTimeInSeconds
     , drrsTargetClusterType
-    , drrsStatus
+    , drrsElapsedTimeInSeconds
+    , drrsResponseStatus
     ) where
 
 import           Network.AWS.Prelude
@@ -95,9 +96,10 @@
           = receiveXMLWrapper "DescribeResizeResult"
               (\ s h x ->
                  DescribeResizeResponse' <$>
-                   (x .@? "EstimatedTimeToCompletionInSeconds") <*>
-                     (x .@? "ImportTablesNotStarted" .!@ mempty >>=
-                        may (parseXMLList "member"))
+                   (x .@? "ImportTablesNotStarted" .!@ mempty >>=
+                      may (parseXMLList "member"))
+                     <*> (x .@? "Status")
+                     <*> (x .@? "EstimatedTimeToCompletionInSeconds")
                      <*> (x .@? "AvgResizeRateInMegaBytesPerSecond")
                      <*> (x .@? "TargetNumberOfNodes")
                      <*> (x .@? "TargetNodeType")
@@ -109,8 +111,8 @@
                         may (parseXMLList "member"))
                      <*> (x .@? "ProgressInMegaBytes")
                      <*> (x .@? "TotalResizeDataInMegaBytes")
-                     <*> (x .@? "ElapsedTimeInSeconds")
                      <*> (x .@? "TargetClusterType")
+                     <*> (x .@? "ElapsedTimeInSeconds")
                      <*> (pure (fromEnum s)))
 
 instance ToHeaders DescribeResize where
@@ -130,8 +132,9 @@
 --
 -- /See:/ 'describeResizeResponse' smart constructor.
 data DescribeResizeResponse = DescribeResizeResponse'
-    { _drrsEstimatedTimeToCompletionInSeconds :: !(Maybe Integer)
-    , _drrsImportTablesNotStarted             :: !(Maybe [Text])
+    { _drrsImportTablesNotStarted             :: !(Maybe [Text])
+    , _drrsStatus                             :: !(Maybe Text)
+    , _drrsEstimatedTimeToCompletionInSeconds :: !(Maybe Integer)
     , _drrsAvgResizeRateInMegaBytesPerSecond  :: !(Maybe Double)
     , _drrsTargetNumberOfNodes                :: !(Maybe Int)
     , _drrsTargetNodeType                     :: !(Maybe Text)
@@ -139,19 +142,21 @@
     , _drrsImportTablesCompleted              :: !(Maybe [Text])
     , _drrsProgressInMegaBytes                :: !(Maybe Integer)
     , _drrsTotalResizeDataInMegaBytes         :: !(Maybe Integer)
-    , _drrsElapsedTimeInSeconds               :: !(Maybe Integer)
     , _drrsTargetClusterType                  :: !(Maybe Text)
-    , _drrsStatus                             :: !Int
+    , _drrsElapsedTimeInSeconds               :: !(Maybe Integer)
+    , _drrsResponseStatus                     :: !Int
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'DescribeResizeResponse' with the minimum fields required to make a request.
 --
 -- Use one of the following lenses to modify other fields as desired:
 --
--- * 'drrsEstimatedTimeToCompletionInSeconds'
---
 -- * 'drrsImportTablesNotStarted'
 --
+-- * 'drrsStatus'
+--
+-- * 'drrsEstimatedTimeToCompletionInSeconds'
+--
 -- * 'drrsAvgResizeRateInMegaBytesPerSecond'
 --
 -- * 'drrsTargetNumberOfNodes'
@@ -166,18 +171,19 @@
 --
 -- * 'drrsTotalResizeDataInMegaBytes'
 --
--- * 'drrsElapsedTimeInSeconds'
---
 -- * 'drrsTargetClusterType'
 --
--- * 'drrsStatus'
+-- * 'drrsElapsedTimeInSeconds'
+--
+-- * 'drrsResponseStatus'
 describeResizeResponse
-    :: Int -- ^ 'drrsStatus'
+    :: Int -- ^ 'drrsResponseStatus'
     -> DescribeResizeResponse
-describeResizeResponse pStatus_ =
+describeResizeResponse pResponseStatus_ =
     DescribeResizeResponse'
-    { _drrsEstimatedTimeToCompletionInSeconds = Nothing
-    , _drrsImportTablesNotStarted = Nothing
+    { _drrsImportTablesNotStarted = Nothing
+    , _drrsStatus = Nothing
+    , _drrsEstimatedTimeToCompletionInSeconds = Nothing
     , _drrsAvgResizeRateInMegaBytesPerSecond = Nothing
     , _drrsTargetNumberOfNodes = Nothing
     , _drrsTargetNodeType = Nothing
@@ -185,11 +191,23 @@
     , _drrsImportTablesCompleted = Nothing
     , _drrsProgressInMegaBytes = Nothing
     , _drrsTotalResizeDataInMegaBytes = Nothing
-    , _drrsElapsedTimeInSeconds = Nothing
     , _drrsTargetClusterType = Nothing
-    , _drrsStatus = pStatus_
+    , _drrsElapsedTimeInSeconds = Nothing
+    , _drrsResponseStatus = pResponseStatus_
     }
 
+-- | The names of tables that have not been yet imported.
+--
+-- Valid Values: List of table names
+drrsImportTablesNotStarted :: Lens' DescribeResizeResponse [Text]
+drrsImportTablesNotStarted = lens _drrsImportTablesNotStarted (\ s a -> s{_drrsImportTablesNotStarted = a}) . _Default . _Coerce;
+
+-- | The status of the resize operation.
+--
+-- Valid Values: 'NONE' | 'IN_PROGRESS' | 'FAILED' | 'SUCCEEDED'
+drrsStatus :: Lens' DescribeResizeResponse (Maybe Text)
+drrsStatus = lens _drrsStatus (\ s a -> s{_drrsStatus = a});
+
 -- | The estimated time remaining, in seconds, until the resize operation is
 -- complete. This value is calculated based on the average resize rate and
 -- the estimated amount of data remaining to be processed. Once the resize
@@ -197,12 +215,6 @@
 drrsEstimatedTimeToCompletionInSeconds :: Lens' DescribeResizeResponse (Maybe Integer)
 drrsEstimatedTimeToCompletionInSeconds = lens _drrsEstimatedTimeToCompletionInSeconds (\ s a -> s{_drrsEstimatedTimeToCompletionInSeconds = a});
 
--- | The names of tables that have not been yet imported.
---
--- Valid Values: List of table names
-drrsImportTablesNotStarted :: Lens' DescribeResizeResponse [Text]
-drrsImportTablesNotStarted = lens _drrsImportTablesNotStarted (\ s a -> s{_drrsImportTablesNotStarted = a}) . _Default . _Coerce;
-
 -- | The average rate of the resize operation over the last few minutes,
 -- measured in megabytes per second. After the resize operation completes,
 -- this value shows the average rate of the entire resize operation.
@@ -245,18 +257,18 @@
 drrsTotalResizeDataInMegaBytes :: Lens' DescribeResizeResponse (Maybe Integer)
 drrsTotalResizeDataInMegaBytes = lens _drrsTotalResizeDataInMegaBytes (\ s a -> s{_drrsTotalResizeDataInMegaBytes = a});
 
--- | The amount of seconds that have elapsed since the resize operation
--- began. After the resize operation completes, this value shows the total
--- actual time, in seconds, for the resize operation.
-drrsElapsedTimeInSeconds :: Lens' DescribeResizeResponse (Maybe Integer)
-drrsElapsedTimeInSeconds = lens _drrsElapsedTimeInSeconds (\ s a -> s{_drrsElapsedTimeInSeconds = a});
-
 -- | The cluster type after the resize operation is complete.
 --
 -- Valid Values: 'multi-node' | 'single-node'
 drrsTargetClusterType :: Lens' DescribeResizeResponse (Maybe Text)
 drrsTargetClusterType = lens _drrsTargetClusterType (\ s a -> s{_drrsTargetClusterType = a});
 
+-- | The amount of seconds that have elapsed since the resize operation
+-- began. After the resize operation completes, this value shows the total
+-- actual time, in seconds, for the resize operation.
+drrsElapsedTimeInSeconds :: Lens' DescribeResizeResponse (Maybe Integer)
+drrsElapsedTimeInSeconds = lens _drrsElapsedTimeInSeconds (\ s a -> s{_drrsElapsedTimeInSeconds = a});
+
 -- | The response status code.
-drrsStatus :: Lens' DescribeResizeResponse Int
-drrsStatus = lens _drrsStatus (\ s a -> s{_drrsStatus = a});
+drrsResponseStatus :: Lens' DescribeResizeResponse Int
+drrsResponseStatus = lens _drrsResponseStatus (\ s a -> s{_drrsResponseStatus = a});
diff --git a/gen/Network/AWS/Redshift/DescribeSnapshotCopyGrants.hs b/gen/Network/AWS/Redshift/DescribeSnapshotCopyGrants.hs
--- a/gen/Network/AWS/Redshift/DescribeSnapshotCopyGrants.hs
+++ b/gen/Network/AWS/Redshift/DescribeSnapshotCopyGrants.hs
@@ -34,8 +34,8 @@
     -- * Request Lenses
     , dscgsTagValues
     , dscgsTagKeys
-    , dscgsMaxRecords
     , dscgsMarker
+    , dscgsMaxRecords
     , dscgsSnapshotCopyGrantName
 
     -- * Destructuring the Response
@@ -44,7 +44,7 @@
     -- * Response Lenses
     , dscgrsSnapshotCopyGrants
     , dscgrsMarker
-    , dscgrsStatus
+    , dscgrsResponseStatus
     ) where
 
 import           Network.AWS.Prelude
@@ -59,8 +59,8 @@
 data DescribeSnapshotCopyGrants = DescribeSnapshotCopyGrants'
     { _dscgsTagValues             :: !(Maybe [Text])
     , _dscgsTagKeys               :: !(Maybe [Text])
-    , _dscgsMaxRecords            :: !(Maybe Int)
     , _dscgsMarker                :: !(Maybe Text)
+    , _dscgsMaxRecords            :: !(Maybe Int)
     , _dscgsSnapshotCopyGrantName :: !(Maybe Text)
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
@@ -72,10 +72,10 @@
 --
 -- * 'dscgsTagKeys'
 --
--- * 'dscgsMaxRecords'
---
 -- * 'dscgsMarker'
 --
+-- * 'dscgsMaxRecords'
+--
 -- * 'dscgsSnapshotCopyGrantName'
 describeSnapshotCopyGrants
     :: DescribeSnapshotCopyGrants
@@ -83,8 +83,8 @@
     DescribeSnapshotCopyGrants'
     { _dscgsTagValues = Nothing
     , _dscgsTagKeys = Nothing
-    , _dscgsMaxRecords = Nothing
     , _dscgsMarker = Nothing
+    , _dscgsMaxRecords = Nothing
     , _dscgsSnapshotCopyGrantName = Nothing
     }
 
@@ -106,18 +106,6 @@
 dscgsTagKeys :: Lens' DescribeSnapshotCopyGrants [Text]
 dscgsTagKeys = lens _dscgsTagKeys (\ s a -> s{_dscgsTagKeys = a}) . _Default . _Coerce;
 
--- | The maximum number of response records to return in each call. If the
--- number of remaining response records exceeds the specified 'MaxRecords'
--- value, a value is returned in a 'marker' field of the response. You can
--- retrieve the next set of records by retrying the command with the
--- returned marker value.
---
--- Default: '100'
---
--- Constraints: minimum 20, maximum 100.
-dscgsMaxRecords :: Lens' DescribeSnapshotCopyGrants (Maybe Int)
-dscgsMaxRecords = lens _dscgsMaxRecords (\ s a -> s{_dscgsMaxRecords = a});
-
 -- | An optional parameter that specifies the starting point to return a set
 -- of response records. When the results of a 'DescribeSnapshotCopyGrant'
 -- request exceed the value specified in 'MaxRecords', AWS returns a value
@@ -130,6 +118,18 @@
 dscgsMarker :: Lens' DescribeSnapshotCopyGrants (Maybe Text)
 dscgsMarker = lens _dscgsMarker (\ s a -> s{_dscgsMarker = a});
 
+-- | The maximum number of response records to return in each call. If the
+-- number of remaining response records exceeds the specified 'MaxRecords'
+-- value, a value is returned in a 'marker' field of the response. You can
+-- retrieve the next set of records by retrying the command with the
+-- returned marker value.
+--
+-- Default: '100'
+--
+-- Constraints: minimum 20, maximum 100.
+dscgsMaxRecords :: Lens' DescribeSnapshotCopyGrants (Maybe Int)
+dscgsMaxRecords = lens _dscgsMaxRecords (\ s a -> s{_dscgsMaxRecords = a});
+
 -- | The name of the snapshot copy grant.
 dscgsSnapshotCopyGrantName :: Lens' DescribeSnapshotCopyGrants (Maybe Text)
 dscgsSnapshotCopyGrantName = lens _dscgsSnapshotCopyGrantName (\ s a -> s{_dscgsSnapshotCopyGrantName = a});
@@ -164,8 +164,8 @@
                  toQuery (toQueryList "TagValue" <$> _dscgsTagValues),
                "TagKeys" =:
                  toQuery (toQueryList "TagKey" <$> _dscgsTagKeys),
-               "MaxRecords" =: _dscgsMaxRecords,
                "Marker" =: _dscgsMarker,
+               "MaxRecords" =: _dscgsMaxRecords,
                "SnapshotCopyGrantName" =:
                  _dscgsSnapshotCopyGrantName]
 
@@ -175,7 +175,7 @@
 data DescribeSnapshotCopyGrantsResponse = DescribeSnapshotCopyGrantsResponse'
     { _dscgrsSnapshotCopyGrants :: !(Maybe [SnapshotCopyGrant])
     , _dscgrsMarker             :: !(Maybe Text)
-    , _dscgrsStatus             :: !Int
+    , _dscgrsResponseStatus     :: !Int
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'DescribeSnapshotCopyGrantsResponse' with the minimum fields required to make a request.
@@ -186,15 +186,15 @@
 --
 -- * 'dscgrsMarker'
 --
--- * 'dscgrsStatus'
+-- * 'dscgrsResponseStatus'
 describeSnapshotCopyGrantsResponse
-    :: Int -- ^ 'dscgrsStatus'
+    :: Int -- ^ 'dscgrsResponseStatus'
     -> DescribeSnapshotCopyGrantsResponse
-describeSnapshotCopyGrantsResponse pStatus_ =
+describeSnapshotCopyGrantsResponse pResponseStatus_ =
     DescribeSnapshotCopyGrantsResponse'
     { _dscgrsSnapshotCopyGrants = Nothing
     , _dscgrsMarker = Nothing
-    , _dscgrsStatus = pStatus_
+    , _dscgrsResponseStatus = pResponseStatus_
     }
 
 -- | The list of snapshot copy grants.
@@ -214,5 +214,5 @@
 dscgrsMarker = lens _dscgrsMarker (\ s a -> s{_dscgrsMarker = a});
 
 -- | The response status code.
-dscgrsStatus :: Lens' DescribeSnapshotCopyGrantsResponse Int
-dscgrsStatus = lens _dscgrsStatus (\ s a -> s{_dscgrsStatus = a});
+dscgrsResponseStatus :: Lens' DescribeSnapshotCopyGrantsResponse Int
+dscgrsResponseStatus = lens _dscgrsResponseStatus (\ s a -> s{_dscgrsResponseStatus = a});
diff --git a/gen/Network/AWS/Redshift/DescribeTags.hs b/gen/Network/AWS/Redshift/DescribeTags.hs
--- a/gen/Network/AWS/Redshift/DescribeTags.hs
+++ b/gen/Network/AWS/Redshift/DescribeTags.hs
@@ -48,12 +48,12 @@
       describeTags
     , DescribeTags
     -- * Request Lenses
-    , dtResourceType
     , dtTagValues
+    , dtResourceType
     , dtResourceName
     , dtTagKeys
-    , dtMaxRecords
     , dtMarker
+    , dtMaxRecords
 
     -- * Destructuring the Response
     , describeTagsResponse
@@ -61,7 +61,7 @@
     -- * Response Lenses
     , dtrsMarker
     , dtrsTaggedResources
-    , dtrsStatus
+    , dtrsResponseStatus
     ) where
 
 import           Network.AWS.Prelude
@@ -74,41 +74,50 @@
 --
 -- /See:/ 'describeTags' smart constructor.
 data DescribeTags = DescribeTags'
-    { _dtResourceType :: !(Maybe Text)
-    , _dtTagValues    :: !(Maybe [Text])
+    { _dtTagValues    :: !(Maybe [Text])
+    , _dtResourceType :: !(Maybe Text)
     , _dtResourceName :: !(Maybe Text)
     , _dtTagKeys      :: !(Maybe [Text])
-    , _dtMaxRecords   :: !(Maybe Int)
     , _dtMarker       :: !(Maybe Text)
+    , _dtMaxRecords   :: !(Maybe Int)
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'DescribeTags' with the minimum fields required to make a request.
 --
 -- Use one of the following lenses to modify other fields as desired:
 --
--- * 'dtResourceType'
---
 -- * 'dtTagValues'
 --
+-- * 'dtResourceType'
+--
 -- * 'dtResourceName'
 --
 -- * 'dtTagKeys'
 --
--- * 'dtMaxRecords'
---
 -- * 'dtMarker'
+--
+-- * 'dtMaxRecords'
 describeTags
     :: DescribeTags
 describeTags =
     DescribeTags'
-    { _dtResourceType = Nothing
-    , _dtTagValues = Nothing
+    { _dtTagValues = Nothing
+    , _dtResourceType = Nothing
     , _dtResourceName = Nothing
     , _dtTagKeys = Nothing
-    , _dtMaxRecords = Nothing
     , _dtMarker = Nothing
+    , _dtMaxRecords = Nothing
     }
 
+-- | A tag value or values for which you want to return all matching
+-- resources that are associated with the specified value or values. For
+-- example, suppose that you have resources tagged with values called
+-- 'admin' and 'test'. If you specify both of these tag values in the
+-- request, Amazon Redshift returns a response with all resources that have
+-- either or both of these tag values associated with them.
+dtTagValues :: Lens' DescribeTags [Text]
+dtTagValues = lens _dtTagValues (\ s a -> s{_dtTagValues = a}) . _Default . _Coerce;
+
 -- | The type of resource with which you want to view tags. Valid resource
 -- types are:
 --
@@ -130,15 +139,6 @@
 dtResourceType :: Lens' DescribeTags (Maybe Text)
 dtResourceType = lens _dtResourceType (\ s a -> s{_dtResourceType = a});
 
--- | A tag value or values for which you want to return all matching
--- resources that are associated with the specified value or values. For
--- example, suppose that you have resources tagged with values called
--- 'admin' and 'test'. If you specify both of these tag values in the
--- request, Amazon Redshift returns a response with all resources that have
--- either or both of these tag values associated with them.
-dtTagValues :: Lens' DescribeTags [Text]
-dtTagValues = lens _dtTagValues (\ s a -> s{_dtTagValues = a}) . _Default . _Coerce;
-
 -- | The Amazon Resource Name (ARN) for which you want to describe the tag or
 -- tags. For example, 'arn:aws:redshift:us-east-1:123456789:cluster:t1'.
 dtResourceName :: Lens' DescribeTags (Maybe Text)
@@ -153,14 +153,6 @@
 dtTagKeys :: Lens' DescribeTags [Text]
 dtTagKeys = lens _dtTagKeys (\ s a -> s{_dtTagKeys = a}) . _Default . _Coerce;
 
--- | The maximum number or response records to return in each call. If the
--- number of remaining response records exceeds the specified 'MaxRecords'
--- value, a value is returned in a 'marker' field of the response. You can
--- retrieve the next set of records by retrying the command with the
--- returned 'marker' value.
-dtMaxRecords :: Lens' DescribeTags (Maybe Int)
-dtMaxRecords = lens _dtMaxRecords (\ s a -> s{_dtMaxRecords = a});
-
 -- | A value that indicates the starting point for the next set of response
 -- records in a subsequent request. If a value is returned in a response,
 -- you can retrieve the next set of records by providing this returned
@@ -170,6 +162,14 @@
 dtMarker :: Lens' DescribeTags (Maybe Text)
 dtMarker = lens _dtMarker (\ s a -> s{_dtMarker = a});
 
+-- | The maximum number or response records to return in each call. If the
+-- number of remaining response records exceeds the specified 'MaxRecords'
+-- value, a value is returned in a 'marker' field of the response. You can
+-- retrieve the next set of records by retrying the command with the
+-- returned 'marker' value.
+dtMaxRecords :: Lens' DescribeTags (Maybe Int)
+dtMaxRecords = lens _dtMaxRecords (\ s a -> s{_dtMaxRecords = a});
+
 instance AWSRequest DescribeTags where
         type Rs DescribeTags = DescribeTagsResponse
         request = postQuery redshift
@@ -193,13 +193,13 @@
           = mconcat
               ["Action" =: ("DescribeTags" :: ByteString),
                "Version" =: ("2012-12-01" :: ByteString),
-               "ResourceType" =: _dtResourceType,
                "TagValues" =:
                  toQuery (toQueryList "TagValue" <$> _dtTagValues),
+               "ResourceType" =: _dtResourceType,
                "ResourceName" =: _dtResourceName,
                "TagKeys" =:
                  toQuery (toQueryList "TagKey" <$> _dtTagKeys),
-               "MaxRecords" =: _dtMaxRecords, "Marker" =: _dtMarker]
+               "Marker" =: _dtMarker, "MaxRecords" =: _dtMaxRecords]
 
 -- | Contains the output from the 'DescribeTags' action.
 --
@@ -207,7 +207,7 @@
 data DescribeTagsResponse = DescribeTagsResponse'
     { _dtrsMarker          :: !(Maybe Text)
     , _dtrsTaggedResources :: !(Maybe [TaggedResource])
-    , _dtrsStatus          :: !Int
+    , _dtrsResponseStatus  :: !Int
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'DescribeTagsResponse' with the minimum fields required to make a request.
@@ -218,15 +218,15 @@
 --
 -- * 'dtrsTaggedResources'
 --
--- * 'dtrsStatus'
+-- * 'dtrsResponseStatus'
 describeTagsResponse
-    :: Int -- ^ 'dtrsStatus'
+    :: Int -- ^ 'dtrsResponseStatus'
     -> DescribeTagsResponse
-describeTagsResponse pStatus_ =
+describeTagsResponse pResponseStatus_ =
     DescribeTagsResponse'
     { _dtrsMarker = Nothing
     , _dtrsTaggedResources = Nothing
-    , _dtrsStatus = pStatus_
+    , _dtrsResponseStatus = pResponseStatus_
     }
 
 -- | A value that indicates the starting point for the next set of response
@@ -243,5 +243,5 @@
 dtrsTaggedResources = lens _dtrsTaggedResources (\ s a -> s{_dtrsTaggedResources = a}) . _Default . _Coerce;
 
 -- | The response status code.
-dtrsStatus :: Lens' DescribeTagsResponse Int
-dtrsStatus = lens _dtrsStatus (\ s a -> s{_dtrsStatus = a});
+dtrsResponseStatus :: Lens' DescribeTagsResponse Int
+dtrsResponseStatus = lens _dtrsResponseStatus (\ s a -> s{_dtrsResponseStatus = a});
diff --git a/gen/Network/AWS/Redshift/DisableLogging.hs b/gen/Network/AWS/Redshift/DisableLogging.hs
--- a/gen/Network/AWS/Redshift/DisableLogging.hs
+++ b/gen/Network/AWS/Redshift/DisableLogging.hs
@@ -34,8 +34,8 @@
     , loggingStatus
     , LoggingStatus
     -- * Response Lenses
-    , lsLastSuccessfulDeliveryTime
     , lsLastFailureTime
+    , lsLastSuccessfulDeliveryTime
     , lsS3KeyPrefix
     , lsBucketName
     , lsLoggingEnabled
diff --git a/gen/Network/AWS/Redshift/DisableSnapshotCopy.hs b/gen/Network/AWS/Redshift/DisableSnapshotCopy.hs
--- a/gen/Network/AWS/Redshift/DisableSnapshotCopy.hs
+++ b/gen/Network/AWS/Redshift/DisableSnapshotCopy.hs
@@ -40,7 +40,7 @@
     , DisableSnapshotCopyResponse
     -- * Response Lenses
     , dscrsCluster
-    , dscrsStatus
+    , dscrsResponseStatus
     ) where
 
 import           Network.AWS.Prelude
@@ -102,8 +102,8 @@
 
 -- | /See:/ 'disableSnapshotCopyResponse' smart constructor.
 data DisableSnapshotCopyResponse = DisableSnapshotCopyResponse'
-    { _dscrsCluster :: !(Maybe Cluster)
-    , _dscrsStatus  :: !Int
+    { _dscrsCluster        :: !(Maybe Cluster)
+    , _dscrsResponseStatus :: !Int
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'DisableSnapshotCopyResponse' with the minimum fields required to make a request.
@@ -112,14 +112,14 @@
 --
 -- * 'dscrsCluster'
 --
--- * 'dscrsStatus'
+-- * 'dscrsResponseStatus'
 disableSnapshotCopyResponse
-    :: Int -- ^ 'dscrsStatus'
+    :: Int -- ^ 'dscrsResponseStatus'
     -> DisableSnapshotCopyResponse
-disableSnapshotCopyResponse pStatus_ =
+disableSnapshotCopyResponse pResponseStatus_ =
     DisableSnapshotCopyResponse'
     { _dscrsCluster = Nothing
-    , _dscrsStatus = pStatus_
+    , _dscrsResponseStatus = pResponseStatus_
     }
 
 -- | Undocumented member.
@@ -127,5 +127,5 @@
 dscrsCluster = lens _dscrsCluster (\ s a -> s{_dscrsCluster = a});
 
 -- | The response status code.
-dscrsStatus :: Lens' DisableSnapshotCopyResponse Int
-dscrsStatus = lens _dscrsStatus (\ s a -> s{_dscrsStatus = a});
+dscrsResponseStatus :: Lens' DisableSnapshotCopyResponse Int
+dscrsResponseStatus = lens _dscrsResponseStatus (\ s a -> s{_dscrsResponseStatus = a});
diff --git a/gen/Network/AWS/Redshift/EnableLogging.hs b/gen/Network/AWS/Redshift/EnableLogging.hs
--- a/gen/Network/AWS/Redshift/EnableLogging.hs
+++ b/gen/Network/AWS/Redshift/EnableLogging.hs
@@ -36,8 +36,8 @@
     , loggingStatus
     , LoggingStatus
     -- * Response Lenses
-    , lsLastSuccessfulDeliveryTime
     , lsLastFailureTime
+    , lsLastSuccessfulDeliveryTime
     , lsS3KeyPrefix
     , lsBucketName
     , lsLoggingEnabled
diff --git a/gen/Network/AWS/Redshift/EnableSnapshotCopy.hs b/gen/Network/AWS/Redshift/EnableSnapshotCopy.hs
--- a/gen/Network/AWS/Redshift/EnableSnapshotCopy.hs
+++ b/gen/Network/AWS/Redshift/EnableSnapshotCopy.hs
@@ -38,7 +38,7 @@
     , EnableSnapshotCopyResponse
     -- * Response Lenses
     , escrsCluster
-    , escrsStatus
+    , escrsResponseStatus
     ) where
 
 import           Network.AWS.Prelude
@@ -138,8 +138,8 @@
 
 -- | /See:/ 'enableSnapshotCopyResponse' smart constructor.
 data EnableSnapshotCopyResponse = EnableSnapshotCopyResponse'
-    { _escrsCluster :: !(Maybe Cluster)
-    , _escrsStatus  :: !Int
+    { _escrsCluster        :: !(Maybe Cluster)
+    , _escrsResponseStatus :: !Int
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'EnableSnapshotCopyResponse' with the minimum fields required to make a request.
@@ -148,14 +148,14 @@
 --
 -- * 'escrsCluster'
 --
--- * 'escrsStatus'
+-- * 'escrsResponseStatus'
 enableSnapshotCopyResponse
-    :: Int -- ^ 'escrsStatus'
+    :: Int -- ^ 'escrsResponseStatus'
     -> EnableSnapshotCopyResponse
-enableSnapshotCopyResponse pStatus_ =
+enableSnapshotCopyResponse pResponseStatus_ =
     EnableSnapshotCopyResponse'
     { _escrsCluster = Nothing
-    , _escrsStatus = pStatus_
+    , _escrsResponseStatus = pResponseStatus_
     }
 
 -- | Undocumented member.
@@ -163,5 +163,5 @@
 escrsCluster = lens _escrsCluster (\ s a -> s{_escrsCluster = a});
 
 -- | The response status code.
-escrsStatus :: Lens' EnableSnapshotCopyResponse Int
-escrsStatus = lens _escrsStatus (\ s a -> s{_escrsStatus = a});
+escrsResponseStatus :: Lens' EnableSnapshotCopyResponse Int
+escrsResponseStatus = lens _escrsResponseStatus (\ s a -> s{_escrsResponseStatus = a});
diff --git a/gen/Network/AWS/Redshift/ModifyCluster.hs b/gen/Network/AWS/Redshift/ModifyCluster.hs
--- a/gen/Network/AWS/Redshift/ModifyCluster.hs
+++ b/gen/Network/AWS/Redshift/ModifyCluster.hs
@@ -44,8 +44,8 @@
     , mcHSMConfigurationIdentifier
     , mcClusterSecurityGroups
     , mcAutomatedSnapshotRetentionPeriod
-    , mcNumberOfNodes
     , mcHSMClientCertificateIdentifier
+    , mcNumberOfNodes
     , mcPreferredMaintenanceWindow
     , mcVPCSecurityGroupIds
     , mcClusterType
@@ -61,7 +61,7 @@
     , ModifyClusterResponse
     -- * Response Lenses
     , mcrsCluster
-    , mcrsStatus
+    , mcrsResponseStatus
     ) where
 
 import           Network.AWS.Prelude
@@ -78,8 +78,8 @@
     , _mcHSMConfigurationIdentifier       :: !(Maybe Text)
     , _mcClusterSecurityGroups            :: !(Maybe [Text])
     , _mcAutomatedSnapshotRetentionPeriod :: !(Maybe Int)
-    , _mcNumberOfNodes                    :: !(Maybe Int)
     , _mcHSMClientCertificateIdentifier   :: !(Maybe Text)
+    , _mcNumberOfNodes                    :: !(Maybe Int)
     , _mcPreferredMaintenanceWindow       :: !(Maybe Text)
     , _mcVPCSecurityGroupIds              :: !(Maybe [Text])
     , _mcClusterType                      :: !(Maybe Text)
@@ -103,10 +103,10 @@
 --
 -- * 'mcAutomatedSnapshotRetentionPeriod'
 --
--- * 'mcNumberOfNodes'
---
 -- * 'mcHSMClientCertificateIdentifier'
 --
+-- * 'mcNumberOfNodes'
+--
 -- * 'mcPreferredMaintenanceWindow'
 --
 -- * 'mcVPCSecurityGroupIds'
@@ -133,8 +133,8 @@
     , _mcHSMConfigurationIdentifier = Nothing
     , _mcClusterSecurityGroups = Nothing
     , _mcAutomatedSnapshotRetentionPeriod = Nothing
-    , _mcNumberOfNodes = Nothing
     , _mcHSMClientCertificateIdentifier = Nothing
+    , _mcNumberOfNodes = Nothing
     , _mcPreferredMaintenanceWindow = Nothing
     , _mcVPCSecurityGroupIds = Nothing
     , _mcClusterType = Nothing
@@ -204,6 +204,11 @@
 mcAutomatedSnapshotRetentionPeriod :: Lens' ModifyCluster (Maybe Int)
 mcAutomatedSnapshotRetentionPeriod = lens _mcAutomatedSnapshotRetentionPeriod (\ s a -> s{_mcAutomatedSnapshotRetentionPeriod = a});
 
+-- | Specifies the name of the HSM client certificate the Amazon Redshift
+-- cluster uses to retrieve the data encryption keys stored in an HSM.
+mcHSMClientCertificateIdentifier :: Lens' ModifyCluster (Maybe Text)
+mcHSMClientCertificateIdentifier = lens _mcHSMClientCertificateIdentifier (\ s a -> s{_mcHSMClientCertificateIdentifier = a});
+
 -- | The new number of nodes of the cluster. If you specify a new number of
 -- nodes, you must also specify the node type parameter.
 --
@@ -219,11 +224,6 @@
 mcNumberOfNodes :: Lens' ModifyCluster (Maybe Int)
 mcNumberOfNodes = lens _mcNumberOfNodes (\ s a -> s{_mcNumberOfNodes = a});
 
--- | Specifies the name of the HSM client certificate the Amazon Redshift
--- cluster uses to retrieve the data encryption keys stored in an HSM.
-mcHSMClientCertificateIdentifier :: Lens' ModifyCluster (Maybe Text)
-mcHSMClientCertificateIdentifier = lens _mcHSMClientCertificateIdentifier (\ s a -> s{_mcHSMClientCertificateIdentifier = a});
-
 -- | The weekly time range (in UTC) during which system maintenance can
 -- occur, if necessary. If system maintenance is necessary during the
 -- window, it may result in an outage.
@@ -359,9 +359,9 @@
                       _mcClusterSecurityGroups),
                "AutomatedSnapshotRetentionPeriod" =:
                  _mcAutomatedSnapshotRetentionPeriod,
-               "NumberOfNodes" =: _mcNumberOfNodes,
                "HsmClientCertificateIdentifier" =:
                  _mcHSMClientCertificateIdentifier,
+               "NumberOfNodes" =: _mcNumberOfNodes,
                "PreferredMaintenanceWindow" =:
                  _mcPreferredMaintenanceWindow,
                "VpcSecurityGroupIds" =:
@@ -379,8 +379,8 @@
 
 -- | /See:/ 'modifyClusterResponse' smart constructor.
 data ModifyClusterResponse = ModifyClusterResponse'
-    { _mcrsCluster :: !(Maybe Cluster)
-    , _mcrsStatus  :: !Int
+    { _mcrsCluster        :: !(Maybe Cluster)
+    , _mcrsResponseStatus :: !Int
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'ModifyClusterResponse' with the minimum fields required to make a request.
@@ -389,14 +389,14 @@
 --
 -- * 'mcrsCluster'
 --
--- * 'mcrsStatus'
+-- * 'mcrsResponseStatus'
 modifyClusterResponse
-    :: Int -- ^ 'mcrsStatus'
+    :: Int -- ^ 'mcrsResponseStatus'
     -> ModifyClusterResponse
-modifyClusterResponse pStatus_ =
+modifyClusterResponse pResponseStatus_ =
     ModifyClusterResponse'
     { _mcrsCluster = Nothing
-    , _mcrsStatus = pStatus_
+    , _mcrsResponseStatus = pResponseStatus_
     }
 
 -- | Undocumented member.
@@ -404,5 +404,5 @@
 mcrsCluster = lens _mcrsCluster (\ s a -> s{_mcrsCluster = a});
 
 -- | The response status code.
-mcrsStatus :: Lens' ModifyClusterResponse Int
-mcrsStatus = lens _mcrsStatus (\ s a -> s{_mcrsStatus = a});
+mcrsResponseStatus :: Lens' ModifyClusterResponse Int
+mcrsResponseStatus = lens _mcrsResponseStatus (\ s a -> s{_mcrsResponseStatus = a});
diff --git a/gen/Network/AWS/Redshift/ModifyClusterSubnetGroup.hs b/gen/Network/AWS/Redshift/ModifyClusterSubnetGroup.hs
--- a/gen/Network/AWS/Redshift/ModifyClusterSubnetGroup.hs
+++ b/gen/Network/AWS/Redshift/ModifyClusterSubnetGroup.hs
@@ -38,7 +38,7 @@
     , ModifyClusterSubnetGroupResponse
     -- * Response Lenses
     , mcsgrsClusterSubnetGroup
-    , mcsgrsStatus
+    , mcsgrsResponseStatus
     ) where
 
 import           Network.AWS.Prelude
@@ -119,7 +119,7 @@
 -- | /See:/ 'modifyClusterSubnetGroupResponse' smart constructor.
 data ModifyClusterSubnetGroupResponse = ModifyClusterSubnetGroupResponse'
     { _mcsgrsClusterSubnetGroup :: !(Maybe ClusterSubnetGroup)
-    , _mcsgrsStatus             :: !Int
+    , _mcsgrsResponseStatus     :: !Int
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'ModifyClusterSubnetGroupResponse' with the minimum fields required to make a request.
@@ -128,14 +128,14 @@
 --
 -- * 'mcsgrsClusterSubnetGroup'
 --
--- * 'mcsgrsStatus'
+-- * 'mcsgrsResponseStatus'
 modifyClusterSubnetGroupResponse
-    :: Int -- ^ 'mcsgrsStatus'
+    :: Int -- ^ 'mcsgrsResponseStatus'
     -> ModifyClusterSubnetGroupResponse
-modifyClusterSubnetGroupResponse pStatus_ =
+modifyClusterSubnetGroupResponse pResponseStatus_ =
     ModifyClusterSubnetGroupResponse'
     { _mcsgrsClusterSubnetGroup = Nothing
-    , _mcsgrsStatus = pStatus_
+    , _mcsgrsResponseStatus = pResponseStatus_
     }
 
 -- | Undocumented member.
@@ -143,5 +143,5 @@
 mcsgrsClusterSubnetGroup = lens _mcsgrsClusterSubnetGroup (\ s a -> s{_mcsgrsClusterSubnetGroup = a});
 
 -- | The response status code.
-mcsgrsStatus :: Lens' ModifyClusterSubnetGroupResponse Int
-mcsgrsStatus = lens _mcsgrsStatus (\ s a -> s{_mcsgrsStatus = a});
+mcsgrsResponseStatus :: Lens' ModifyClusterSubnetGroupResponse Int
+mcsgrsResponseStatus = lens _mcsgrsResponseStatus (\ s a -> s{_mcsgrsResponseStatus = a});
diff --git a/gen/Network/AWS/Redshift/ModifyEventSubscription.hs b/gen/Network/AWS/Redshift/ModifyEventSubscription.hs
--- a/gen/Network/AWS/Redshift/ModifyEventSubscription.hs
+++ b/gen/Network/AWS/Redshift/ModifyEventSubscription.hs
@@ -40,7 +40,7 @@
     , ModifyEventSubscriptionResponse
     -- * Response Lenses
     , mesrsEventSubscription
-    , mesrsStatus
+    , mesrsResponseStatus
     ) where
 
 import           Network.AWS.Prelude
@@ -182,7 +182,7 @@
 -- | /See:/ 'modifyEventSubscriptionResponse' smart constructor.
 data ModifyEventSubscriptionResponse = ModifyEventSubscriptionResponse'
     { _mesrsEventSubscription :: !(Maybe EventSubscription)
-    , _mesrsStatus            :: !Int
+    , _mesrsResponseStatus    :: !Int
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'ModifyEventSubscriptionResponse' with the minimum fields required to make a request.
@@ -191,14 +191,14 @@
 --
 -- * 'mesrsEventSubscription'
 --
--- * 'mesrsStatus'
+-- * 'mesrsResponseStatus'
 modifyEventSubscriptionResponse
-    :: Int -- ^ 'mesrsStatus'
+    :: Int -- ^ 'mesrsResponseStatus'
     -> ModifyEventSubscriptionResponse
-modifyEventSubscriptionResponse pStatus_ =
+modifyEventSubscriptionResponse pResponseStatus_ =
     ModifyEventSubscriptionResponse'
     { _mesrsEventSubscription = Nothing
-    , _mesrsStatus = pStatus_
+    , _mesrsResponseStatus = pResponseStatus_
     }
 
 -- | Undocumented member.
@@ -206,5 +206,5 @@
 mesrsEventSubscription = lens _mesrsEventSubscription (\ s a -> s{_mesrsEventSubscription = a});
 
 -- | The response status code.
-mesrsStatus :: Lens' ModifyEventSubscriptionResponse Int
-mesrsStatus = lens _mesrsStatus (\ s a -> s{_mesrsStatus = a});
+mesrsResponseStatus :: Lens' ModifyEventSubscriptionResponse Int
+mesrsResponseStatus = lens _mesrsResponseStatus (\ s a -> s{_mesrsResponseStatus = a});
diff --git a/gen/Network/AWS/Redshift/ModifySnapshotCopyRetentionPeriod.hs b/gen/Network/AWS/Redshift/ModifySnapshotCopyRetentionPeriod.hs
--- a/gen/Network/AWS/Redshift/ModifySnapshotCopyRetentionPeriod.hs
+++ b/gen/Network/AWS/Redshift/ModifySnapshotCopyRetentionPeriod.hs
@@ -36,7 +36,7 @@
     , ModifySnapshotCopyRetentionPeriodResponse
     -- * Response Lenses
     , mscrprsCluster
-    , mscrprsStatus
+    , mscrprsResponseStatus
     ) where
 
 import           Network.AWS.Prelude
@@ -123,8 +123,8 @@
 
 -- | /See:/ 'modifySnapshotCopyRetentionPeriodResponse' smart constructor.
 data ModifySnapshotCopyRetentionPeriodResponse = ModifySnapshotCopyRetentionPeriodResponse'
-    { _mscrprsCluster :: !(Maybe Cluster)
-    , _mscrprsStatus  :: !Int
+    { _mscrprsCluster        :: !(Maybe Cluster)
+    , _mscrprsResponseStatus :: !Int
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'ModifySnapshotCopyRetentionPeriodResponse' with the minimum fields required to make a request.
@@ -133,14 +133,14 @@
 --
 -- * 'mscrprsCluster'
 --
--- * 'mscrprsStatus'
+-- * 'mscrprsResponseStatus'
 modifySnapshotCopyRetentionPeriodResponse
-    :: Int -- ^ 'mscrprsStatus'
+    :: Int -- ^ 'mscrprsResponseStatus'
     -> ModifySnapshotCopyRetentionPeriodResponse
-modifySnapshotCopyRetentionPeriodResponse pStatus_ =
+modifySnapshotCopyRetentionPeriodResponse pResponseStatus_ =
     ModifySnapshotCopyRetentionPeriodResponse'
     { _mscrprsCluster = Nothing
-    , _mscrprsStatus = pStatus_
+    , _mscrprsResponseStatus = pResponseStatus_
     }
 
 -- | Undocumented member.
@@ -148,5 +148,5 @@
 mscrprsCluster = lens _mscrprsCluster (\ s a -> s{_mscrprsCluster = a});
 
 -- | The response status code.
-mscrprsStatus :: Lens' ModifySnapshotCopyRetentionPeriodResponse Int
-mscrprsStatus = lens _mscrprsStatus (\ s a -> s{_mscrprsStatus = a});
+mscrprsResponseStatus :: Lens' ModifySnapshotCopyRetentionPeriodResponse Int
+mscrprsResponseStatus = lens _mscrprsResponseStatus (\ s a -> s{_mscrprsResponseStatus = a});
diff --git a/gen/Network/AWS/Redshift/PurchaseReservedNodeOffering.hs b/gen/Network/AWS/Redshift/PurchaseReservedNodeOffering.hs
--- a/gen/Network/AWS/Redshift/PurchaseReservedNodeOffering.hs
+++ b/gen/Network/AWS/Redshift/PurchaseReservedNodeOffering.hs
@@ -44,7 +44,7 @@
     , PurchaseReservedNodeOfferingResponse
     -- * Response Lenses
     , prnorsReservedNode
-    , prnorsStatus
+    , prnorsResponseStatus
     ) where
 
 import           Network.AWS.Prelude
@@ -118,8 +118,8 @@
 
 -- | /See:/ 'purchaseReservedNodeOfferingResponse' smart constructor.
 data PurchaseReservedNodeOfferingResponse = PurchaseReservedNodeOfferingResponse'
-    { _prnorsReservedNode :: !(Maybe ReservedNode)
-    , _prnorsStatus       :: !Int
+    { _prnorsReservedNode   :: !(Maybe ReservedNode)
+    , _prnorsResponseStatus :: !Int
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'PurchaseReservedNodeOfferingResponse' with the minimum fields required to make a request.
@@ -128,14 +128,14 @@
 --
 -- * 'prnorsReservedNode'
 --
--- * 'prnorsStatus'
+-- * 'prnorsResponseStatus'
 purchaseReservedNodeOfferingResponse
-    :: Int -- ^ 'prnorsStatus'
+    :: Int -- ^ 'prnorsResponseStatus'
     -> PurchaseReservedNodeOfferingResponse
-purchaseReservedNodeOfferingResponse pStatus_ =
+purchaseReservedNodeOfferingResponse pResponseStatus_ =
     PurchaseReservedNodeOfferingResponse'
     { _prnorsReservedNode = Nothing
-    , _prnorsStatus = pStatus_
+    , _prnorsResponseStatus = pResponseStatus_
     }
 
 -- | Undocumented member.
@@ -143,5 +143,5 @@
 prnorsReservedNode = lens _prnorsReservedNode (\ s a -> s{_prnorsReservedNode = a});
 
 -- | The response status code.
-prnorsStatus :: Lens' PurchaseReservedNodeOfferingResponse Int
-prnorsStatus = lens _prnorsStatus (\ s a -> s{_prnorsStatus = a});
+prnorsResponseStatus :: Lens' PurchaseReservedNodeOfferingResponse Int
+prnorsResponseStatus = lens _prnorsResponseStatus (\ s a -> s{_prnorsResponseStatus = a});
diff --git a/gen/Network/AWS/Redshift/RebootCluster.hs b/gen/Network/AWS/Redshift/RebootCluster.hs
--- a/gen/Network/AWS/Redshift/RebootCluster.hs
+++ b/gen/Network/AWS/Redshift/RebootCluster.hs
@@ -41,7 +41,7 @@
     , RebootClusterResponse
     -- * Response Lenses
     , rcrsCluster
-    , rcrsStatus
+    , rcrsResponseStatus
     ) where
 
 import           Network.AWS.Prelude
@@ -98,8 +98,8 @@
 
 -- | /See:/ 'rebootClusterResponse' smart constructor.
 data RebootClusterResponse = RebootClusterResponse'
-    { _rcrsCluster :: !(Maybe Cluster)
-    , _rcrsStatus  :: !Int
+    { _rcrsCluster        :: !(Maybe Cluster)
+    , _rcrsResponseStatus :: !Int
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'RebootClusterResponse' with the minimum fields required to make a request.
@@ -108,14 +108,14 @@
 --
 -- * 'rcrsCluster'
 --
--- * 'rcrsStatus'
+-- * 'rcrsResponseStatus'
 rebootClusterResponse
-    :: Int -- ^ 'rcrsStatus'
+    :: Int -- ^ 'rcrsResponseStatus'
     -> RebootClusterResponse
-rebootClusterResponse pStatus_ =
+rebootClusterResponse pResponseStatus_ =
     RebootClusterResponse'
     { _rcrsCluster = Nothing
-    , _rcrsStatus = pStatus_
+    , _rcrsResponseStatus = pResponseStatus_
     }
 
 -- | Undocumented member.
@@ -123,5 +123,5 @@
 rcrsCluster = lens _rcrsCluster (\ s a -> s{_rcrsCluster = a});
 
 -- | The response status code.
-rcrsStatus :: Lens' RebootClusterResponse Int
-rcrsStatus = lens _rcrsStatus (\ s a -> s{_rcrsStatus = a});
+rcrsResponseStatus :: Lens' RebootClusterResponse Int
+rcrsResponseStatus = lens _rcrsResponseStatus (\ s a -> s{_rcrsResponseStatus = a});
diff --git a/gen/Network/AWS/Redshift/RestoreFromClusterSnapshot.hs b/gen/Network/AWS/Redshift/RestoreFromClusterSnapshot.hs
--- a/gen/Network/AWS/Redshift/RestoreFromClusterSnapshot.hs
+++ b/gen/Network/AWS/Redshift/RestoreFromClusterSnapshot.hs
@@ -43,16 +43,16 @@
     , RestoreFromClusterSnapshot
     -- * Request Lenses
     , rfcsPubliclyAccessible
-    , rfcsHSMConfigurationIdentifier
     , rfcsSnapshotClusterIdentifier
+    , rfcsHSMConfigurationIdentifier
     , rfcsClusterSecurityGroups
     , rfcsAutomatedSnapshotRetentionPeriod
-    , rfcsHSMClientCertificateIdentifier
     , rfcsClusterSubnetGroupName
+    , rfcsHSMClientCertificateIdentifier
     , rfcsElasticIP
     , rfcsPreferredMaintenanceWindow
-    , rfcsAvailabilityZone
     , rfcsKMSKeyId
+    , rfcsAvailabilityZone
     , rfcsVPCSecurityGroupIds
     , rfcsOwnerAccount
     , rfcsNodeType
@@ -67,7 +67,7 @@
     , RestoreFromClusterSnapshotResponse
     -- * Response Lenses
     , rfcsrsCluster
-    , rfcsrsStatus
+    , rfcsrsResponseStatus
     ) where
 
 import           Network.AWS.Prelude
@@ -81,16 +81,16 @@
 -- /See:/ 'restoreFromClusterSnapshot' smart constructor.
 data RestoreFromClusterSnapshot = RestoreFromClusterSnapshot'
     { _rfcsPubliclyAccessible               :: !(Maybe Bool)
-    , _rfcsHSMConfigurationIdentifier       :: !(Maybe Text)
     , _rfcsSnapshotClusterIdentifier        :: !(Maybe Text)
+    , _rfcsHSMConfigurationIdentifier       :: !(Maybe Text)
     , _rfcsClusterSecurityGroups            :: !(Maybe [Text])
     , _rfcsAutomatedSnapshotRetentionPeriod :: !(Maybe Int)
-    , _rfcsHSMClientCertificateIdentifier   :: !(Maybe Text)
     , _rfcsClusterSubnetGroupName           :: !(Maybe Text)
+    , _rfcsHSMClientCertificateIdentifier   :: !(Maybe Text)
     , _rfcsElasticIP                        :: !(Maybe Text)
     , _rfcsPreferredMaintenanceWindow       :: !(Maybe Text)
-    , _rfcsAvailabilityZone                 :: !(Maybe Text)
     , _rfcsKMSKeyId                         :: !(Maybe Text)
+    , _rfcsAvailabilityZone                 :: !(Maybe Text)
     , _rfcsVPCSecurityGroupIds              :: !(Maybe [Text])
     , _rfcsOwnerAccount                     :: !(Maybe Text)
     , _rfcsNodeType                         :: !(Maybe Text)
@@ -107,26 +107,26 @@
 --
 -- * 'rfcsPubliclyAccessible'
 --
--- * 'rfcsHSMConfigurationIdentifier'
---
 -- * 'rfcsSnapshotClusterIdentifier'
 --
+-- * 'rfcsHSMConfigurationIdentifier'
+--
 -- * 'rfcsClusterSecurityGroups'
 --
 -- * 'rfcsAutomatedSnapshotRetentionPeriod'
 --
--- * 'rfcsHSMClientCertificateIdentifier'
---
 -- * 'rfcsClusterSubnetGroupName'
 --
+-- * 'rfcsHSMClientCertificateIdentifier'
+--
 -- * 'rfcsElasticIP'
 --
 -- * 'rfcsPreferredMaintenanceWindow'
 --
--- * 'rfcsAvailabilityZone'
---
 -- * 'rfcsKMSKeyId'
 --
+-- * 'rfcsAvailabilityZone'
+--
 -- * 'rfcsVPCSecurityGroupIds'
 --
 -- * 'rfcsOwnerAccount'
@@ -149,16 +149,16 @@
 restoreFromClusterSnapshot pClusterIdentifier_ pSnapshotIdentifier_ =
     RestoreFromClusterSnapshot'
     { _rfcsPubliclyAccessible = Nothing
-    , _rfcsHSMConfigurationIdentifier = Nothing
     , _rfcsSnapshotClusterIdentifier = Nothing
+    , _rfcsHSMConfigurationIdentifier = Nothing
     , _rfcsClusterSecurityGroups = Nothing
     , _rfcsAutomatedSnapshotRetentionPeriod = Nothing
-    , _rfcsHSMClientCertificateIdentifier = Nothing
     , _rfcsClusterSubnetGroupName = Nothing
+    , _rfcsHSMClientCertificateIdentifier = Nothing
     , _rfcsElasticIP = Nothing
     , _rfcsPreferredMaintenanceWindow = Nothing
-    , _rfcsAvailabilityZone = Nothing
     , _rfcsKMSKeyId = Nothing
+    , _rfcsAvailabilityZone = Nothing
     , _rfcsVPCSecurityGroupIds = Nothing
     , _rfcsOwnerAccount = Nothing
     , _rfcsNodeType = Nothing
@@ -173,12 +173,6 @@
 rfcsPubliclyAccessible :: Lens' RestoreFromClusterSnapshot (Maybe Bool)
 rfcsPubliclyAccessible = lens _rfcsPubliclyAccessible (\ s a -> s{_rfcsPubliclyAccessible = a});
 
--- | Specifies the name of the HSM configuration that contains the
--- information the Amazon Redshift cluster can use to retrieve and store
--- keys in an HSM.
-rfcsHSMConfigurationIdentifier :: Lens' RestoreFromClusterSnapshot (Maybe Text)
-rfcsHSMConfigurationIdentifier = lens _rfcsHSMConfigurationIdentifier (\ s a -> s{_rfcsHSMConfigurationIdentifier = a});
-
 -- | The name of the cluster the source snapshot was created from. This
 -- parameter is required if your IAM user has a policy containing a
 -- snapshot resource element that specifies anything other than * for the
@@ -186,6 +180,12 @@
 rfcsSnapshotClusterIdentifier :: Lens' RestoreFromClusterSnapshot (Maybe Text)
 rfcsSnapshotClusterIdentifier = lens _rfcsSnapshotClusterIdentifier (\ s a -> s{_rfcsSnapshotClusterIdentifier = a});
 
+-- | Specifies the name of the HSM configuration that contains the
+-- information the Amazon Redshift cluster can use to retrieve and store
+-- keys in an HSM.
+rfcsHSMConfigurationIdentifier :: Lens' RestoreFromClusterSnapshot (Maybe Text)
+rfcsHSMConfigurationIdentifier = lens _rfcsHSMConfigurationIdentifier (\ s a -> s{_rfcsHSMConfigurationIdentifier = a});
+
 -- | A list of security groups to be associated with this cluster.
 --
 -- Default: The default cluster security group for Amazon Redshift.
@@ -206,11 +206,6 @@
 rfcsAutomatedSnapshotRetentionPeriod :: Lens' RestoreFromClusterSnapshot (Maybe Int)
 rfcsAutomatedSnapshotRetentionPeriod = lens _rfcsAutomatedSnapshotRetentionPeriod (\ s a -> s{_rfcsAutomatedSnapshotRetentionPeriod = a});
 
--- | Specifies the name of the HSM client certificate the Amazon Redshift
--- cluster uses to retrieve the data encryption keys stored in an HSM.
-rfcsHSMClientCertificateIdentifier :: Lens' RestoreFromClusterSnapshot (Maybe Text)
-rfcsHSMClientCertificateIdentifier = lens _rfcsHSMClientCertificateIdentifier (\ s a -> s{_rfcsHSMClientCertificateIdentifier = a});
-
 -- | The name of the subnet group where you want to cluster restored.
 --
 -- A snapshot of cluster in VPC can be restored only in VPC. Therefore, you
@@ -218,6 +213,11 @@
 rfcsClusterSubnetGroupName :: Lens' RestoreFromClusterSnapshot (Maybe Text)
 rfcsClusterSubnetGroupName = lens _rfcsClusterSubnetGroupName (\ s a -> s{_rfcsClusterSubnetGroupName = a});
 
+-- | Specifies the name of the HSM client certificate the Amazon Redshift
+-- cluster uses to retrieve the data encryption keys stored in an HSM.
+rfcsHSMClientCertificateIdentifier :: Lens' RestoreFromClusterSnapshot (Maybe Text)
+rfcsHSMClientCertificateIdentifier = lens _rfcsHSMClientCertificateIdentifier (\ s a -> s{_rfcsHSMClientCertificateIdentifier = a});
+
 -- | The elastic IP (EIP) address for the cluster.
 rfcsElasticIP :: Lens' RestoreFromClusterSnapshot (Maybe Text)
 rfcsElasticIP = lens _rfcsElasticIP (\ s a -> s{_rfcsElasticIP = a});
@@ -238,6 +238,12 @@
 rfcsPreferredMaintenanceWindow :: Lens' RestoreFromClusterSnapshot (Maybe Text)
 rfcsPreferredMaintenanceWindow = lens _rfcsPreferredMaintenanceWindow (\ s a -> s{_rfcsPreferredMaintenanceWindow = a});
 
+-- | The AWS Key Management Service (KMS) key ID of the encryption key that
+-- you want to use to encrypt data in the cluster that you restore from a
+-- shared snapshot.
+rfcsKMSKeyId :: Lens' RestoreFromClusterSnapshot (Maybe Text)
+rfcsKMSKeyId = lens _rfcsKMSKeyId (\ s a -> s{_rfcsKMSKeyId = a});
+
 -- | The Amazon EC2 Availability Zone in which to restore the cluster.
 --
 -- Default: A random, system-chosen Availability Zone.
@@ -246,12 +252,6 @@
 rfcsAvailabilityZone :: Lens' RestoreFromClusterSnapshot (Maybe Text)
 rfcsAvailabilityZone = lens _rfcsAvailabilityZone (\ s a -> s{_rfcsAvailabilityZone = a});
 
--- | The AWS Key Management Service (KMS) key ID of the encryption key that
--- you want to use to encrypt data in the cluster that you restore from a
--- shared snapshot.
-rfcsKMSKeyId :: Lens' RestoreFromClusterSnapshot (Maybe Text)
-rfcsKMSKeyId = lens _rfcsKMSKeyId (\ s a -> s{_rfcsKMSKeyId = a});
-
 -- | A list of Virtual Private Cloud (VPC) security groups to be associated
 -- with the cluster.
 --
@@ -355,25 +355,25 @@
                  ("RestoreFromClusterSnapshot" :: ByteString),
                "Version" =: ("2012-12-01" :: ByteString),
                "PubliclyAccessible" =: _rfcsPubliclyAccessible,
-               "HsmConfigurationIdentifier" =:
-                 _rfcsHSMConfigurationIdentifier,
                "SnapshotClusterIdentifier" =:
                  _rfcsSnapshotClusterIdentifier,
+               "HsmConfigurationIdentifier" =:
+                 _rfcsHSMConfigurationIdentifier,
                "ClusterSecurityGroups" =:
                  toQuery
                    (toQueryList "ClusterSecurityGroupName" <$>
                       _rfcsClusterSecurityGroups),
                "AutomatedSnapshotRetentionPeriod" =:
                  _rfcsAutomatedSnapshotRetentionPeriod,
-               "HsmClientCertificateIdentifier" =:
-                 _rfcsHSMClientCertificateIdentifier,
                "ClusterSubnetGroupName" =:
                  _rfcsClusterSubnetGroupName,
+               "HsmClientCertificateIdentifier" =:
+                 _rfcsHSMClientCertificateIdentifier,
                "ElasticIp" =: _rfcsElasticIP,
                "PreferredMaintenanceWindow" =:
                  _rfcsPreferredMaintenanceWindow,
-               "AvailabilityZone" =: _rfcsAvailabilityZone,
                "KmsKeyId" =: _rfcsKMSKeyId,
+               "AvailabilityZone" =: _rfcsAvailabilityZone,
                "VpcSecurityGroupIds" =:
                  toQuery
                    (toQueryList "VpcSecurityGroupId" <$>
@@ -389,8 +389,8 @@
 
 -- | /See:/ 'restoreFromClusterSnapshotResponse' smart constructor.
 data RestoreFromClusterSnapshotResponse = RestoreFromClusterSnapshotResponse'
-    { _rfcsrsCluster :: !(Maybe Cluster)
-    , _rfcsrsStatus  :: !Int
+    { _rfcsrsCluster        :: !(Maybe Cluster)
+    , _rfcsrsResponseStatus :: !Int
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'RestoreFromClusterSnapshotResponse' with the minimum fields required to make a request.
@@ -399,14 +399,14 @@
 --
 -- * 'rfcsrsCluster'
 --
--- * 'rfcsrsStatus'
+-- * 'rfcsrsResponseStatus'
 restoreFromClusterSnapshotResponse
-    :: Int -- ^ 'rfcsrsStatus'
+    :: Int -- ^ 'rfcsrsResponseStatus'
     -> RestoreFromClusterSnapshotResponse
-restoreFromClusterSnapshotResponse pStatus_ =
+restoreFromClusterSnapshotResponse pResponseStatus_ =
     RestoreFromClusterSnapshotResponse'
     { _rfcsrsCluster = Nothing
-    , _rfcsrsStatus = pStatus_
+    , _rfcsrsResponseStatus = pResponseStatus_
     }
 
 -- | Undocumented member.
@@ -414,5 +414,5 @@
 rfcsrsCluster = lens _rfcsrsCluster (\ s a -> s{_rfcsrsCluster = a});
 
 -- | The response status code.
-rfcsrsStatus :: Lens' RestoreFromClusterSnapshotResponse Int
-rfcsrsStatus = lens _rfcsrsStatus (\ s a -> s{_rfcsrsStatus = a});
+rfcsrsResponseStatus :: Lens' RestoreFromClusterSnapshotResponse Int
+rfcsrsResponseStatus = lens _rfcsrsResponseStatus (\ s a -> s{_rfcsrsResponseStatus = a});
diff --git a/gen/Network/AWS/Redshift/RevokeClusterSecurityGroupIngress.hs b/gen/Network/AWS/Redshift/RevokeClusterSecurityGroupIngress.hs
--- a/gen/Network/AWS/Redshift/RevokeClusterSecurityGroupIngress.hs
+++ b/gen/Network/AWS/Redshift/RevokeClusterSecurityGroupIngress.hs
@@ -42,7 +42,7 @@
     , RevokeClusterSecurityGroupIngressResponse
     -- * Response Lenses
     , rcsgirsClusterSecurityGroup
-    , rcsgirsStatus
+    , rcsgirsResponseStatus
     ) where
 
 import           Network.AWS.Prelude
@@ -148,7 +148,7 @@
 -- | /See:/ 'revokeClusterSecurityGroupIngressResponse' smart constructor.
 data RevokeClusterSecurityGroupIngressResponse = RevokeClusterSecurityGroupIngressResponse'
     { _rcsgirsClusterSecurityGroup :: !(Maybe ClusterSecurityGroup)
-    , _rcsgirsStatus               :: !Int
+    , _rcsgirsResponseStatus       :: !Int
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'RevokeClusterSecurityGroupIngressResponse' with the minimum fields required to make a request.
@@ -157,14 +157,14 @@
 --
 -- * 'rcsgirsClusterSecurityGroup'
 --
--- * 'rcsgirsStatus'
+-- * 'rcsgirsResponseStatus'
 revokeClusterSecurityGroupIngressResponse
-    :: Int -- ^ 'rcsgirsStatus'
+    :: Int -- ^ 'rcsgirsResponseStatus'
     -> RevokeClusterSecurityGroupIngressResponse
-revokeClusterSecurityGroupIngressResponse pStatus_ =
+revokeClusterSecurityGroupIngressResponse pResponseStatus_ =
     RevokeClusterSecurityGroupIngressResponse'
     { _rcsgirsClusterSecurityGroup = Nothing
-    , _rcsgirsStatus = pStatus_
+    , _rcsgirsResponseStatus = pResponseStatus_
     }
 
 -- | Undocumented member.
@@ -172,5 +172,5 @@
 rcsgirsClusterSecurityGroup = lens _rcsgirsClusterSecurityGroup (\ s a -> s{_rcsgirsClusterSecurityGroup = a});
 
 -- | The response status code.
-rcsgirsStatus :: Lens' RevokeClusterSecurityGroupIngressResponse Int
-rcsgirsStatus = lens _rcsgirsStatus (\ s a -> s{_rcsgirsStatus = a});
+rcsgirsResponseStatus :: Lens' RevokeClusterSecurityGroupIngressResponse Int
+rcsgirsResponseStatus = lens _rcsgirsResponseStatus (\ s a -> s{_rcsgirsResponseStatus = a});
diff --git a/gen/Network/AWS/Redshift/RevokeSnapshotAccess.hs b/gen/Network/AWS/Redshift/RevokeSnapshotAccess.hs
--- a/gen/Network/AWS/Redshift/RevokeSnapshotAccess.hs
+++ b/gen/Network/AWS/Redshift/RevokeSnapshotAccess.hs
@@ -42,7 +42,7 @@
     , RevokeSnapshotAccessResponse
     -- * Response Lenses
     , rsarsSnapshot
-    , rsarsStatus
+    , rsarsResponseStatus
     ) where
 
 import           Network.AWS.Prelude
@@ -125,8 +125,8 @@
 
 -- | /See:/ 'revokeSnapshotAccessResponse' smart constructor.
 data RevokeSnapshotAccessResponse = RevokeSnapshotAccessResponse'
-    { _rsarsSnapshot :: !(Maybe Snapshot)
-    , _rsarsStatus   :: !Int
+    { _rsarsSnapshot       :: !(Maybe Snapshot)
+    , _rsarsResponseStatus :: !Int
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'RevokeSnapshotAccessResponse' with the minimum fields required to make a request.
@@ -135,14 +135,14 @@
 --
 -- * 'rsarsSnapshot'
 --
--- * 'rsarsStatus'
+-- * 'rsarsResponseStatus'
 revokeSnapshotAccessResponse
-    :: Int -- ^ 'rsarsStatus'
+    :: Int -- ^ 'rsarsResponseStatus'
     -> RevokeSnapshotAccessResponse
-revokeSnapshotAccessResponse pStatus_ =
+revokeSnapshotAccessResponse pResponseStatus_ =
     RevokeSnapshotAccessResponse'
     { _rsarsSnapshot = Nothing
-    , _rsarsStatus = pStatus_
+    , _rsarsResponseStatus = pResponseStatus_
     }
 
 -- | Undocumented member.
@@ -150,5 +150,5 @@
 rsarsSnapshot = lens _rsarsSnapshot (\ s a -> s{_rsarsSnapshot = a});
 
 -- | The response status code.
-rsarsStatus :: Lens' RevokeSnapshotAccessResponse Int
-rsarsStatus = lens _rsarsStatus (\ s a -> s{_rsarsStatus = a});
+rsarsResponseStatus :: Lens' RevokeSnapshotAccessResponse Int
+rsarsResponseStatus = lens _rsarsResponseStatus (\ s a -> s{_rsarsResponseStatus = a});
diff --git a/gen/Network/AWS/Redshift/RotateEncryptionKey.hs b/gen/Network/AWS/Redshift/RotateEncryptionKey.hs
--- a/gen/Network/AWS/Redshift/RotateEncryptionKey.hs
+++ b/gen/Network/AWS/Redshift/RotateEncryptionKey.hs
@@ -34,7 +34,7 @@
     , RotateEncryptionKeyResponse
     -- * Response Lenses
     , rekrsCluster
-    , rekrsStatus
+    , rekrsResponseStatus
     ) where
 
 import           Network.AWS.Prelude
@@ -96,8 +96,8 @@
 
 -- | /See:/ 'rotateEncryptionKeyResponse' smart constructor.
 data RotateEncryptionKeyResponse = RotateEncryptionKeyResponse'
-    { _rekrsCluster :: !(Maybe Cluster)
-    , _rekrsStatus  :: !Int
+    { _rekrsCluster        :: !(Maybe Cluster)
+    , _rekrsResponseStatus :: !Int
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'RotateEncryptionKeyResponse' with the minimum fields required to make a request.
@@ -106,14 +106,14 @@
 --
 -- * 'rekrsCluster'
 --
--- * 'rekrsStatus'
+-- * 'rekrsResponseStatus'
 rotateEncryptionKeyResponse
-    :: Int -- ^ 'rekrsStatus'
+    :: Int -- ^ 'rekrsResponseStatus'
     -> RotateEncryptionKeyResponse
-rotateEncryptionKeyResponse pStatus_ =
+rotateEncryptionKeyResponse pResponseStatus_ =
     RotateEncryptionKeyResponse'
     { _rekrsCluster = Nothing
-    , _rekrsStatus = pStatus_
+    , _rekrsResponseStatus = pResponseStatus_
     }
 
 -- | Undocumented member.
@@ -121,5 +121,5 @@
 rekrsCluster = lens _rekrsCluster (\ s a -> s{_rekrsCluster = a});
 
 -- | The response status code.
-rekrsStatus :: Lens' RotateEncryptionKeyResponse Int
-rekrsStatus = lens _rekrsStatus (\ s a -> s{_rekrsStatus = a});
+rekrsResponseStatus :: Lens' RotateEncryptionKeyResponse Int
+rekrsResponseStatus = lens _rekrsResponseStatus (\ s a -> s{_rekrsResponseStatus = a});
diff --git a/gen/Network/AWS/Redshift/Types.hs b/gen/Network/AWS/Redshift/Types.hs
--- a/gen/Network/AWS/Redshift/Types.hs
+++ b/gen/Network/AWS/Redshift/Types.hs
@@ -16,46 +16,46 @@
       redshift
 
     -- * Errors
-    , _LimitExceededFault
     , _ClusterSecurityGroupQuotaExceededFault
-    , _CopyToRegionDisabledFault
-    , _AuthorizationQuotaExceededFault
-    , _SourceNotFoundFault
     , _InvalidS3KeyPrefixFault
-    , _AuthorizationAlreadyExistsFault
+    , _SourceNotFoundFault
+    , _AuthorizationQuotaExceededFault
+    , _CopyToRegionDisabledFault
+    , _LimitExceededFault
     , _InvalidClusterSecurityGroupStateFault
     , _ClusterSecurityGroupAlreadyExistsFault
-    , _InvalidElasticIPFault
     , _ClusterSnapshotNotFoundFault
+    , _InvalidElasticIPFault
     , _HSMConfigurationNotFoundFault
-    , _InvalidHSMConfigurationStateFault
-    , _ClusterSnapshotAlreadyExistsFault
-    , _HSMConfigurationAlreadyExistsFault
+    , _AuthorizationAlreadyExistsFault
     , _SubscriptionCategoryNotFoundFault
+    , _HSMConfigurationAlreadyExistsFault
     , _SubscriptionNotFoundFault
-    , _InvalidSubnet
     , _InvalidS3BucketNameFault
-    , _ClusterQuotaExceededFault
+    , _ClusterSnapshotAlreadyExistsFault
+    , _InvalidSubnet
+    , _InvalidHSMConfigurationStateFault
     , _SnapshotCopyAlreadyDisabledFault
-    , _ClusterParameterGroupNotFoundFault
+    , _ClusterQuotaExceededFault
     , _HSMClientCertificateQuotaExceededFault
+    , _ClusterParameterGroupNotFoundFault
     , _SnapshotCopyGrantQuotaExceededFault
+    , _NumberOfNodesPerClusterLimitExceededFault
     , _SnapshotCopyAlreadyEnabledFault
     , _ClusterParameterGroupAlreadyExistsFault
-    , _NumberOfNodesPerClusterLimitExceededFault
     , _SnapshotCopyDisabledFault
     , _ResizeNotFoundFault
-    , _ClusterParameterGroupQuotaExceededFault
-    , _SNSTopicARNNotFoundFault
     , _HSMClientCertificateNotFoundFault
-    , _SnapshotCopyGrantAlreadyExistsFault
+    , _SNSTopicARNNotFoundFault
     , _ClusterNotFoundFault
+    , _ClusterParameterGroupQuotaExceededFault
+    , _SnapshotCopyGrantAlreadyExistsFault
     , _SNSNoAuthorizationFault
-    , _SnapshotCopyGrantNotFoundFault
     , _InvalidClusterStateFault
-    , _InsufficientClusterCapacityFault
+    , _SnapshotCopyGrantNotFoundFault
     , _HSMConfigurationQuotaExceededFault
     , _ClusterSnapshotQuotaExceededFault
+    , _InsufficientClusterCapacityFault
     , _SNSInvalidTopicFault
     , _UnsupportedOptionFault
     , _SubscriptionAlreadyExistFault
@@ -63,38 +63,38 @@
     , _ClusterSubnetGroupNotFoundFault
     , _BucketNotFoundFault
     , _InvalidSubscriptionStateFault
-    , _UnsupportedOperationFault
     , _AuthorizationNotFoundFault
     , _InvalidClusterSubnetGroupStateFault
-    , _InvalidClusterSnapshotStateFault
+    , _UnsupportedOperationFault
     , _ClusterSubnetGroupAlreadyExistsFault
+    , _InvalidClusterSnapshotStateFault
     , _ClusterSecurityGroupNotFoundFault
-    , _IncompatibleOrderableOptions
+    , _ReservedNodeNotFoundFault
     , _ReservedNodeOfferingNotFoundFault
     , _InvalidClusterSubnetStateFault
-    , _ReservedNodeNotFoundFault
+    , _IncompatibleOrderableOptions
     , _EventSubscriptionQuotaExceededFault
     , _InvalidClusterParameterGroupStateFault
     , _ReservedNodeAlreadyExistsFault
-    , _ReservedNodeQuotaExceededFault
-    , _SubscriptionEventIdNotFoundFault
+    , _InvalidRestoreFault
     , _ResourceNotFoundFault
+    , _SubscriptionEventIdNotFoundFault
     , _InvalidSnapshotCopyGrantStateFault
-    , _InvalidRestoreFault
     , _UnknownSnapshotCopyRegionFault
-    , _AccessToSnapshotDeniedFault
+    , _ReservedNodeQuotaExceededFault
+    , _ClusterSubnetQuotaExceededFault
     , _ClusterAlreadyExistsFault
+    , _AccessToSnapshotDeniedFault
+    , _TagLimitExceededFault
+    , _NumberOfNodesQuotaExceededFault
     , _HSMClientCertificateAlreadyExistsFault
     , _InvalidHSMClientCertificateStateFault
-    , _NumberOfNodesQuotaExceededFault
-    , _TagLimitExceededFault
-    , _ClusterSubnetQuotaExceededFault
     , _SubnetAlreadyInUse
+    , _SubscriptionSeverityNotFoundFault
+    , _UnauthorizedOperation
     , _InvalidTagFault
     , _InsufficientS3BucketPolicyFault
     , _ClusterSubnetGroupQuotaExceededFault
-    , _SubscriptionSeverityNotFoundFault
-    , _UnauthorizedOperation
 
     -- * ParameterApplyType
     , ParameterApplyType (..)
@@ -118,34 +118,34 @@
     , cRestoreStatus
     , cClusterSnapshotCopyStatus
     , cClusterRevisionNumber
-    , cMasterUsername
     , cPubliclyAccessible
+    , cMasterUsername
     , cVPCId
     , cClusterSecurityGroups
     , cAutomatedSnapshotRetentionPeriod
     , cEncrypted
+    , cClusterSubnetGroupName
     , cClusterIdentifier
     , cNumberOfNodes
-    , cClusterSubnetGroupName
+    , cClusterPublicKey
     , cPreferredMaintenanceWindow
     , cModifyStatus
-    , cClusterPublicKey
+    , cKMSKeyId
     , cClusterParameterGroups
     , cAvailabilityZone
     , cVPCSecurityGroups
-    , cKMSKeyId
     , cHSMStatus
     , cElasticIPStatus
     , cClusterVersion
     , cNodeType
-    , cEndpoint
     , cClusterCreateTime
+    , cEndpoint
     , cAllowVersionUpgrade
-    , cPendingModifiedValues
     , cClusterStatus
-    , cDBName
+    , cPendingModifiedValues
     , cTags
     , cClusterNodes
+    , cDBName
 
     -- * ClusterNode
     , ClusterNode
@@ -159,8 +159,8 @@
     , clusterParameterGroup
     , cpgParameterGroupFamily
     , cpgDescription
-    , cpgParameterGroupName
     , cpgTags
+    , cpgParameterGroupName
 
     -- * ClusterParameterGroupNameMessage
     , ClusterParameterGroupNameMessage
@@ -224,8 +224,8 @@
     -- * DefaultClusterParameters
     , DefaultClusterParameters
     , defaultClusterParameters
-    , dcpParameters
     , dcpMarker
+    , dcpParameters
     , dcpParameterGroupFamily
 
     -- * EC2SecurityGroup
@@ -276,8 +276,8 @@
     -- * EventSubscription
     , EventSubscription
     , eventSubscription
-    , esCustomerAWSId
     , esStatus
+    , esCustomerAWSId
     , esCustSubscriptionId
     , esSNSTopicARN
     , esEnabled
@@ -285,8 +285,8 @@
     , esSeverity
     , esSubscriptionCreationTime
     , esEventCategoriesList
-    , esSourceIdsList
     , esTags
+    , esSourceIdsList
 
     -- * HSMClientCertificate
     , HSMClientCertificate
@@ -301,8 +301,8 @@
     , hcHSMConfigurationIdentifier
     , hcHSMPartitionName
     , hcDescription
-    , hcHSMIPAddress
     , hcTags
+    , hcHSMIPAddress
 
     -- * HSMStatus
     , HSMStatus
@@ -321,8 +321,8 @@
     -- * LoggingStatus
     , LoggingStatus
     , loggingStatus
-    , lsLastSuccessfulDeliveryTime
     , lsLastFailureTime
+    , lsLastSuccessfulDeliveryTime
     , lsS3KeyPrefix
     , lsBucketName
     , lsLoggingEnabled
@@ -344,8 +344,8 @@
     , pMinimumEngineVersion
     , pSource
     , pIsModifiable
-    , pAllowedValues
     , pDataType
+    , pAllowedValues
     , pParameterName
     , pDescription
 
@@ -373,12 +373,12 @@
     , rnCurrencyCode
     , rnStartTime
     , rnNodeCount
-    , rnReservedNodeOfferingId
     , rnReservedNodeId
+    , rnReservedNodeOfferingId
+    , rnRecurringCharges
     , rnOfferingType
     , rnUsagePrice
     , rnNodeType
-    , rnRecurringCharges
     , rnFixedPrice
     , rnDuration
 
@@ -387,18 +387,18 @@
     , reservedNodeOffering
     , rnoCurrencyCode
     , rnoReservedNodeOfferingId
+    , rnoRecurringCharges
     , rnoOfferingType
     , rnoUsagePrice
     , rnoNodeType
-    , rnoRecurringCharges
     , rnoFixedPrice
     , rnoDuration
 
     -- * RestoreStatus
     , RestoreStatus
     , restoreStatus
-    , rsEstimatedTimeToCompletionInSeconds
     , rsStatus
+    , rsEstimatedTimeToCompletionInSeconds
     , rsCurrentRestoreRateInMegaBytesPerSecond
     , rsProgressInMegaBytes
     , rsElapsedTimeInSeconds
@@ -407,8 +407,8 @@
     -- * Snapshot
     , Snapshot
     , snapshot
-    , sRestorableNodeTypes
     , sStatus
+    , sRestorableNodeTypes
     , sAccountsWithRestoreAccess
     , sSnapshotIdentifier
     , sEncryptedWithHSM
@@ -420,21 +420,21 @@
     , sClusterIdentifier
     , sNumberOfNodes
     , sSnapshotType
-    , sAvailabilityZone
     , sKMSKeyId
+    , sAvailabilityZone
     , sCurrentBackupRateInMegaBytesPerSecond
     , sSnapshotCreateTime
     , sClusterVersion
     , sOwnerAccount
     , sNodeType
-    , sClusterCreateTime
     , sElapsedTimeInSeconds
+    , sClusterCreateTime
     , sEstimatedSecondsToCompletion
-    , sTotalBackupSizeInMegaBytes
-    , sDBName
-    , sTags
     , sActualIncrementalBackupSizeInMegaBytes
+    , sTags
     , sPort
+    , sTotalBackupSizeInMegaBytes
+    , sDBName
 
     -- * SnapshotCopyGrant
     , SnapshotCopyGrant
@@ -459,8 +459,8 @@
     -- * TaggedResource
     , TaggedResource
     , taggedResource
-    , trResourceType
     , trTag
+    , trResourceType
     , trResourceName
 
     -- * VPCSecurityGroupMembership
@@ -506,11 +506,6 @@
       | has (hasStatus 509) e = Just "limit_exceeded"
       | otherwise = Nothing
 
--- | The encryption key has exceeded its grant limit in AWS KMS.
-_LimitExceededFault :: AsError a => Getting (First ServiceError) a ServiceError
-_LimitExceededFault =
-    _ServiceError . hasStatus 400 . hasCode "LimitExceededFault"
-
 -- | The request would result in the user exceeding the allowed number of
 -- cluster security groups. For information about increasing your quota, go
 -- to
@@ -521,32 +516,31 @@
     _ServiceError .
     hasStatus 400 . hasCode "QuotaExceeded.ClusterSecurityGroup"
 
--- | Cross-region snapshot copy was temporarily disabled. Try your request
--- again.
-_CopyToRegionDisabledFault :: AsError a => Getting (First ServiceError) a ServiceError
-_CopyToRegionDisabledFault =
-    _ServiceError . hasStatus 400 . hasCode "CopyToRegionDisabledFault"
+-- | The string specified for the logging S3 key prefix does not comply with
+-- the documented constraints.
+_InvalidS3KeyPrefixFault :: AsError a => Getting (First ServiceError) a ServiceError
+_InvalidS3KeyPrefixFault =
+    _ServiceError . hasStatus 400 . hasCode "InvalidS3KeyPrefixFault"
 
+-- | The specified Amazon Redshift event source could not be found.
+_SourceNotFoundFault :: AsError a => Getting (First ServiceError) a ServiceError
+_SourceNotFoundFault = _ServiceError . hasStatus 404 . hasCode "SourceNotFound"
+
 -- | The authorization quota for the cluster security group has been reached.
 _AuthorizationQuotaExceededFault :: AsError a => Getting (First ServiceError) a ServiceError
 _AuthorizationQuotaExceededFault =
     _ServiceError . hasStatus 400 . hasCode "AuthorizationQuotaExceeded"
 
--- | The specified Amazon Redshift event source could not be found.
-_SourceNotFoundFault :: AsError a => Getting (First ServiceError) a ServiceError
-_SourceNotFoundFault = _ServiceError . hasStatus 404 . hasCode "SourceNotFound"
-
--- | The string specified for the logging S3 key prefix does not comply with
--- the documented constraints.
-_InvalidS3KeyPrefixFault :: AsError a => Getting (First ServiceError) a ServiceError
-_InvalidS3KeyPrefixFault =
-    _ServiceError . hasStatus 400 . hasCode "InvalidS3KeyPrefixFault"
+-- | Cross-region snapshot copy was temporarily disabled. Try your request
+-- again.
+_CopyToRegionDisabledFault :: AsError a => Getting (First ServiceError) a ServiceError
+_CopyToRegionDisabledFault =
+    _ServiceError . hasStatus 400 . hasCode "CopyToRegionDisabledFault"
 
--- | The specified CIDR block or EC2 security group is already authorized for
--- the specified cluster security group.
-_AuthorizationAlreadyExistsFault :: AsError a => Getting (First ServiceError) a ServiceError
-_AuthorizationAlreadyExistsFault =
-    _ServiceError . hasStatus 400 . hasCode "AuthorizationAlreadyExists"
+-- | The encryption key has exceeded its grant limit in AWS KMS.
+_LimitExceededFault :: AsError a => Getting (First ServiceError) a ServiceError
+_LimitExceededFault =
+    _ServiceError . hasStatus 400 . hasCode "LimitExceededFault"
 
 -- | The state of the cluster security group is not 'available'.
 _InvalidClusterSecurityGroupStateFault :: AsError a => Getting (First ServiceError) a ServiceError
@@ -558,40 +552,27 @@
 _ClusterSecurityGroupAlreadyExistsFault =
     _ServiceError . hasStatus 400 . hasCode "ClusterSecurityGroupAlreadyExists"
 
--- | The Elastic IP (EIP) is invalid or cannot be found.
-_InvalidElasticIPFault :: AsError a => Getting (First ServiceError) a ServiceError
-_InvalidElasticIPFault =
-    _ServiceError . hasStatus 400 . hasCode "InvalidElasticIpFault"
-
 -- | The snapshot identifier does not refer to an existing cluster snapshot.
 _ClusterSnapshotNotFoundFault :: AsError a => Getting (First ServiceError) a ServiceError
 _ClusterSnapshotNotFoundFault =
     _ServiceError . hasStatus 404 . hasCode "ClusterSnapshotNotFound"
 
+-- | The Elastic IP (EIP) is invalid or cannot be found.
+_InvalidElasticIPFault :: AsError a => Getting (First ServiceError) a ServiceError
+_InvalidElasticIPFault =
+    _ServiceError . hasStatus 400 . hasCode "InvalidElasticIpFault"
+
 -- | There is no Amazon Redshift HSM configuration with the specified
 -- identifier.
 _HSMConfigurationNotFoundFault :: AsError a => Getting (First ServiceError) a ServiceError
 _HSMConfigurationNotFoundFault =
     _ServiceError . hasStatus 400 . hasCode "HsmConfigurationNotFoundFault"
 
--- | The specified HSM configuration is not in the 'available' state, or it
--- is still in use by one or more Amazon Redshift clusters.
-_InvalidHSMConfigurationStateFault :: AsError a => Getting (First ServiceError) a ServiceError
-_InvalidHSMConfigurationStateFault =
-    _ServiceError . hasStatus 400 . hasCode "InvalidHsmConfigurationStateFault"
-
--- | The value specified as a snapshot identifier is already used by an
--- existing snapshot.
-_ClusterSnapshotAlreadyExistsFault :: AsError a => Getting (First ServiceError) a ServiceError
-_ClusterSnapshotAlreadyExistsFault =
-    _ServiceError . hasStatus 400 . hasCode "ClusterSnapshotAlreadyExists"
-
--- | There is already an existing Amazon Redshift HSM configuration with the
--- specified identifier.
-_HSMConfigurationAlreadyExistsFault :: AsError a => Getting (First ServiceError) a ServiceError
-_HSMConfigurationAlreadyExistsFault =
-    _ServiceError .
-    hasStatus 400 . hasCode "HsmConfigurationAlreadyExistsFault"
+-- | The specified CIDR block or EC2 security group is already authorized for
+-- the specified cluster security group.
+_AuthorizationAlreadyExistsFault :: AsError a => Getting (First ServiceError) a ServiceError
+_AuthorizationAlreadyExistsFault =
+    _ServiceError . hasStatus 400 . hasCode "AuthorizationAlreadyExists"
 
 -- | The value specified for the event category was not one of the allowed
 -- values, or it specified a category that does not apply to the specified
@@ -601,17 +582,19 @@
 _SubscriptionCategoryNotFoundFault =
     _ServiceError . hasStatus 404 . hasCode "SubscriptionCategoryNotFound"
 
+-- | There is already an existing Amazon Redshift HSM configuration with the
+-- specified identifier.
+_HSMConfigurationAlreadyExistsFault :: AsError a => Getting (First ServiceError) a ServiceError
+_HSMConfigurationAlreadyExistsFault =
+    _ServiceError .
+    hasStatus 400 . hasCode "HsmConfigurationAlreadyExistsFault"
+
 -- | An Amazon Redshift event notification subscription with the specified
 -- name does not exist.
 _SubscriptionNotFoundFault :: AsError a => Getting (First ServiceError) a ServiceError
 _SubscriptionNotFoundFault =
     _ServiceError . hasStatus 404 . hasCode "SubscriptionNotFound"
 
--- | The requested subnet is not valid, or not all of the subnets are in the
--- same VPC.
-_InvalidSubnet :: AsError a => Getting (First ServiceError) a ServiceError
-_InvalidSubnet = _ServiceError . hasStatus 400 . hasCode "InvalidSubnet"
-
 -- | The S3 bucket name is invalid. For more information about naming rules,
 -- go to
 -- <http://docs.aws.amazon.com/AmazonS3/latest/dev/BucketRestrictions.html Bucket Restrictions and Limitations>
@@ -620,6 +603,28 @@
 _InvalidS3BucketNameFault =
     _ServiceError . hasStatus 400 . hasCode "InvalidS3BucketNameFault"
 
+-- | The value specified as a snapshot identifier is already used by an
+-- existing snapshot.
+_ClusterSnapshotAlreadyExistsFault :: AsError a => Getting (First ServiceError) a ServiceError
+_ClusterSnapshotAlreadyExistsFault =
+    _ServiceError . hasStatus 400 . hasCode "ClusterSnapshotAlreadyExists"
+
+-- | The requested subnet is not valid, or not all of the subnets are in the
+-- same VPC.
+_InvalidSubnet :: AsError a => Getting (First ServiceError) a ServiceError
+_InvalidSubnet = _ServiceError . hasStatus 400 . hasCode "InvalidSubnet"
+
+-- | The specified HSM configuration is not in the 'available' state, or it
+-- is still in use by one or more Amazon Redshift clusters.
+_InvalidHSMConfigurationStateFault :: AsError a => Getting (First ServiceError) a ServiceError
+_InvalidHSMConfigurationStateFault =
+    _ServiceError . hasStatus 400 . hasCode "InvalidHsmConfigurationStateFault"
+
+-- | The cluster already has cross-region snapshot copy disabled.
+_SnapshotCopyAlreadyDisabledFault :: AsError a => Getting (First ServiceError) a ServiceError
+_SnapshotCopyAlreadyDisabledFault =
+    _ServiceError . hasStatus 400 . hasCode "SnapshotCopyAlreadyDisabledFault"
+
 -- | The request would exceed the allowed number of cluster instances for
 -- this account. For information about increasing your quota, go to
 -- <http://docs.aws.amazon.com/redshift/latest/mgmt/amazon-redshift-limits.html Limits in Amazon Redshift>
@@ -628,16 +633,6 @@
 _ClusterQuotaExceededFault =
     _ServiceError . hasStatus 400 . hasCode "ClusterQuotaExceeded"
 
--- | The cluster already has cross-region snapshot copy disabled.
-_SnapshotCopyAlreadyDisabledFault :: AsError a => Getting (First ServiceError) a ServiceError
-_SnapshotCopyAlreadyDisabledFault =
-    _ServiceError . hasStatus 400 . hasCode "SnapshotCopyAlreadyDisabledFault"
-
--- | The parameter group name does not refer to an existing parameter group.
-_ClusterParameterGroupNotFoundFault :: AsError a => Getting (First ServiceError) a ServiceError
-_ClusterParameterGroupNotFoundFault =
-    _ServiceError . hasStatus 404 . hasCode "ClusterParameterGroupNotFound"
-
 -- | The quota for HSM client certificates has been reached. For information
 -- about increasing your quota, go to
 -- <http://docs.aws.amazon.com/redshift/latest/mgmt/amazon-redshift-limits.html Limits in Amazon Redshift>
@@ -647,6 +642,11 @@
     _ServiceError .
     hasStatus 400 . hasCode "HsmClientCertificateQuotaExceededFault"
 
+-- | The parameter group name does not refer to an existing parameter group.
+_ClusterParameterGroupNotFoundFault :: AsError a => Getting (First ServiceError) a ServiceError
+_ClusterParameterGroupNotFoundFault =
+    _ServiceError . hasStatus 404 . hasCode "ClusterParameterGroupNotFound"
+
 -- | The AWS account has exceeded the maximum number of snapshot copy grants
 -- in this region.
 _SnapshotCopyGrantQuotaExceededFault :: AsError a => Getting (First ServiceError) a ServiceError
@@ -654,6 +654,12 @@
     _ServiceError .
     hasStatus 400 . hasCode "SnapshotCopyGrantQuotaExceededFault"
 
+-- | The operation would exceed the number of nodes allowed for a cluster.
+_NumberOfNodesPerClusterLimitExceededFault :: AsError a => Getting (First ServiceError) a ServiceError
+_NumberOfNodesPerClusterLimitExceededFault =
+    _ServiceError .
+    hasStatus 400 . hasCode "NumberOfNodesPerClusterLimitExceeded"
+
 -- | The cluster already has cross-region snapshot copy enabled.
 _SnapshotCopyAlreadyEnabledFault :: AsError a => Getting (First ServiceError) a ServiceError
 _SnapshotCopyAlreadyEnabledFault =
@@ -665,12 +671,6 @@
     _ServiceError .
     hasStatus 400 . hasCode "ClusterParameterGroupAlreadyExists"
 
--- | The operation would exceed the number of nodes allowed for a cluster.
-_NumberOfNodesPerClusterLimitExceededFault :: AsError a => Getting (First ServiceError) a ServiceError
-_NumberOfNodesPerClusterLimitExceededFault =
-    _ServiceError .
-    hasStatus 400 . hasCode "NumberOfNodesPerClusterLimitExceeded"
-
 -- | Cross-region snapshot copy was temporarily disabled. Try your request
 -- again.
 _SnapshotCopyDisabledFault :: AsError a => Getting (First ServiceError) a ServiceError
@@ -681,6 +681,23 @@
 _ResizeNotFoundFault :: AsError a => Getting (First ServiceError) a ServiceError
 _ResizeNotFoundFault = _ServiceError . hasStatus 404 . hasCode "ResizeNotFound"
 
+-- | There is no Amazon Redshift HSM client certificate with the specified
+-- identifier.
+_HSMClientCertificateNotFoundFault :: AsError a => Getting (First ServiceError) a ServiceError
+_HSMClientCertificateNotFoundFault =
+    _ServiceError . hasStatus 400 . hasCode "HsmClientCertificateNotFoundFault"
+
+-- | An Amazon SNS topic with the specified Amazon Resource Name (ARN) does
+-- not exist.
+_SNSTopicARNNotFoundFault :: AsError a => Getting (First ServiceError) a ServiceError
+_SNSTopicARNNotFoundFault =
+    _ServiceError . hasStatus 404 . hasCode "SNSTopicArnNotFound"
+
+-- | The /ClusterIdentifier/ parameter does not refer to an existing cluster.
+_ClusterNotFoundFault :: AsError a => Getting (First ServiceError) a ServiceError
+_ClusterNotFoundFault =
+    _ServiceError . hasStatus 404 . hasCode "ClusterNotFound"
+
 -- | The request would result in the user exceeding the allowed number of
 -- cluster parameter groups. For information about increasing your quota,
 -- go to
@@ -691,18 +708,6 @@
     _ServiceError .
     hasStatus 400 . hasCode "ClusterParameterGroupQuotaExceeded"
 
--- | An Amazon SNS topic with the specified Amazon Resource Name (ARN) does
--- not exist.
-_SNSTopicARNNotFoundFault :: AsError a => Getting (First ServiceError) a ServiceError
-_SNSTopicARNNotFoundFault =
-    _ServiceError . hasStatus 404 . hasCode "SNSTopicArnNotFound"
-
--- | There is no Amazon Redshift HSM client certificate with the specified
--- identifier.
-_HSMClientCertificateNotFoundFault :: AsError a => Getting (First ServiceError) a ServiceError
-_HSMClientCertificateNotFoundFault =
-    _ServiceError . hasStatus 400 . hasCode "HsmClientCertificateNotFoundFault"
-
 -- | The snapshot copy grant can\'t be created because a grant with the same
 -- name already exists.
 _SnapshotCopyGrantAlreadyExistsFault :: AsError a => Getting (First ServiceError) a ServiceError
@@ -710,16 +715,16 @@
     _ServiceError .
     hasStatus 400 . hasCode "SnapshotCopyGrantAlreadyExistsFault"
 
--- | The /ClusterIdentifier/ parameter does not refer to an existing cluster.
-_ClusterNotFoundFault :: AsError a => Getting (First ServiceError) a ServiceError
-_ClusterNotFoundFault =
-    _ServiceError . hasStatus 404 . hasCode "ClusterNotFound"
-
 -- | You do not have permission to publish to the specified Amazon SNS topic.
 _SNSNoAuthorizationFault :: AsError a => Getting (First ServiceError) a ServiceError
 _SNSNoAuthorizationFault =
     _ServiceError . hasStatus 400 . hasCode "SNSNoAuthorization"
 
+-- | The specified cluster is not in the 'available' state.
+_InvalidClusterStateFault :: AsError a => Getting (First ServiceError) a ServiceError
+_InvalidClusterStateFault =
+    _ServiceError . hasStatus 400 . hasCode "InvalidClusterState"
+
 -- | The specified snapshot copy grant can\'t be found. Make sure that the
 -- name is typed correctly and that the grant exists in the destination
 -- region.
@@ -727,17 +732,6 @@
 _SnapshotCopyGrantNotFoundFault =
     _ServiceError . hasStatus 400 . hasCode "SnapshotCopyGrantNotFoundFault"
 
--- | The specified cluster is not in the 'available' state.
-_InvalidClusterStateFault :: AsError a => Getting (First ServiceError) a ServiceError
-_InvalidClusterStateFault =
-    _ServiceError . hasStatus 400 . hasCode "InvalidClusterState"
-
--- | The number of nodes specified exceeds the allotted capacity of the
--- cluster.
-_InsufficientClusterCapacityFault :: AsError a => Getting (First ServiceError) a ServiceError
-_InsufficientClusterCapacityFault =
-    _ServiceError . hasStatus 400 . hasCode "InsufficientClusterCapacity"
-
 -- | The quota for HSM configurations has been reached. For information about
 -- increasing your quota, go to
 -- <http://docs.aws.amazon.com/redshift/latest/mgmt/amazon-redshift-limits.html Limits in Amazon Redshift>
@@ -753,6 +747,12 @@
 _ClusterSnapshotQuotaExceededFault =
     _ServiceError . hasStatus 400 . hasCode "ClusterSnapshotQuotaExceeded"
 
+-- | The number of nodes specified exceeds the allotted capacity of the
+-- cluster.
+_InsufficientClusterCapacityFault :: AsError a => Getting (First ServiceError) a ServiceError
+_InsufficientClusterCapacityFault =
+    _ServiceError . hasStatus 400 . hasCode "InsufficientClusterCapacity"
+
 -- | Amazon SNS has responded that there is a problem with the specified
 -- Amazon SNS topic.
 _SNSInvalidTopicFault :: AsError a => Getting (First ServiceError) a ServiceError
@@ -792,11 +792,6 @@
 _InvalidSubscriptionStateFault =
     _ServiceError . hasStatus 400 . hasCode "InvalidSubscriptionStateFault"
 
--- | The requested operation isn\'t supported.
-_UnsupportedOperationFault :: AsError a => Getting (First ServiceError) a ServiceError
-_UnsupportedOperationFault =
-    _ServiceError . hasStatus 400 . hasCode "UnsupportedOperation"
-
 -- | The specified CIDR IP range or EC2 security group is not authorized for
 -- the specified cluster security group.
 _AuthorizationNotFoundFault :: AsError a => Getting (First ServiceError) a ServiceError
@@ -809,11 +804,10 @@
     _ServiceError .
     hasStatus 400 . hasCode "InvalidClusterSubnetGroupStateFault"
 
--- | The state of the cluster snapshot is not 'available', or other accounts
--- are authorized to access the snapshot.
-_InvalidClusterSnapshotStateFault :: AsError a => Getting (First ServiceError) a ServiceError
-_InvalidClusterSnapshotStateFault =
-    _ServiceError . hasStatus 400 . hasCode "InvalidClusterSnapshotState"
+-- | The requested operation isn\'t supported.
+_UnsupportedOperationFault :: AsError a => Getting (First ServiceError) a ServiceError
+_UnsupportedOperationFault =
+    _ServiceError . hasStatus 400 . hasCode "UnsupportedOperation"
 
 -- | A /ClusterSubnetGroupName/ is already used by an existing cluster subnet
 -- group.
@@ -821,16 +815,22 @@
 _ClusterSubnetGroupAlreadyExistsFault =
     _ServiceError . hasStatus 400 . hasCode "ClusterSubnetGroupAlreadyExists"
 
+-- | The state of the cluster snapshot is not 'available', or other accounts
+-- are authorized to access the snapshot.
+_InvalidClusterSnapshotStateFault :: AsError a => Getting (First ServiceError) a ServiceError
+_InvalidClusterSnapshotStateFault =
+    _ServiceError . hasStatus 400 . hasCode "InvalidClusterSnapshotState"
+
 -- | The cluster security group name does not refer to an existing cluster
 -- security group.
 _ClusterSecurityGroupNotFoundFault :: AsError a => Getting (First ServiceError) a ServiceError
 _ClusterSecurityGroupNotFoundFault =
     _ServiceError . hasStatus 404 . hasCode "ClusterSecurityGroupNotFound"
 
--- | The specified options are incompatible.
-_IncompatibleOrderableOptions :: AsError a => Getting (First ServiceError) a ServiceError
-_IncompatibleOrderableOptions =
-    _ServiceError . hasStatus 400 . hasCode "IncompatibleOrderableOptions"
+-- | The specified reserved compute node not found.
+_ReservedNodeNotFoundFault :: AsError a => Getting (First ServiceError) a ServiceError
+_ReservedNodeNotFoundFault =
+    _ServiceError . hasStatus 404 . hasCode "ReservedNodeNotFound"
 
 -- | Specified offering does not exist.
 _ReservedNodeOfferingNotFoundFault :: AsError a => Getting (First ServiceError) a ServiceError
@@ -842,10 +842,10 @@
 _InvalidClusterSubnetStateFault =
     _ServiceError . hasStatus 400 . hasCode "InvalidClusterSubnetStateFault"
 
--- | The specified reserved compute node not found.
-_ReservedNodeNotFoundFault :: AsError a => Getting (First ServiceError) a ServiceError
-_ReservedNodeNotFoundFault =
-    _ServiceError . hasStatus 404 . hasCode "ReservedNodeNotFound"
+-- | The specified options are incompatible.
+_IncompatibleOrderableOptions :: AsError a => Getting (First ServiceError) a ServiceError
+_IncompatibleOrderableOptions =
+    _ServiceError . hasStatus 400 . hasCode "IncompatibleOrderableOptions"
 
 -- | The request would exceed the allowed number of event subscriptions for
 -- this account. For information about increasing your quota, go to
@@ -867,24 +867,20 @@
 _ReservedNodeAlreadyExistsFault =
     _ServiceError . hasStatus 404 . hasCode "ReservedNodeAlreadyExists"
 
--- | Request would exceed the user\'s compute node quota. For information
--- about increasing your quota, go to
--- <http://docs.aws.amazon.com/redshift/latest/mgmt/amazon-redshift-limits.html Limits in Amazon Redshift>
--- in the /Amazon Redshift Cluster Management Guide/.
-_ReservedNodeQuotaExceededFault :: AsError a => Getting (First ServiceError) a ServiceError
-_ReservedNodeQuotaExceededFault =
-    _ServiceError . hasStatus 400 . hasCode "ReservedNodeQuotaExceeded"
-
--- | An Amazon Redshift event with the specified event ID does not exist.
-_SubscriptionEventIdNotFoundFault :: AsError a => Getting (First ServiceError) a ServiceError
-_SubscriptionEventIdNotFoundFault =
-    _ServiceError . hasStatus 404 . hasCode "SubscriptionEventIdNotFound"
+-- | The restore is invalid.
+_InvalidRestoreFault :: AsError a => Getting (First ServiceError) a ServiceError
+_InvalidRestoreFault = _ServiceError . hasStatus 406 . hasCode "InvalidRestore"
 
 -- | The resource could not be found.
 _ResourceNotFoundFault :: AsError a => Getting (First ServiceError) a ServiceError
 _ResourceNotFoundFault =
     _ServiceError . hasStatus 404 . hasCode "ResourceNotFoundFault"
 
+-- | An Amazon Redshift event with the specified event ID does not exist.
+_SubscriptionEventIdNotFoundFault :: AsError a => Getting (First ServiceError) a ServiceError
+_SubscriptionEventIdNotFoundFault =
+    _ServiceError . hasStatus 404 . hasCode "SubscriptionEventIdNotFound"
+
 -- | The snapshot copy grant can\'t be deleted because it is used by one or
 -- more clusters.
 _InvalidSnapshotCopyGrantStateFault :: AsError a => Getting (First ServiceError) a ServiceError
@@ -892,26 +888,52 @@
     _ServiceError .
     hasStatus 400 . hasCode "InvalidSnapshotCopyGrantStateFault"
 
--- | The restore is invalid.
-_InvalidRestoreFault :: AsError a => Getting (First ServiceError) a ServiceError
-_InvalidRestoreFault = _ServiceError . hasStatus 406 . hasCode "InvalidRestore"
-
 -- | The specified region is incorrect or does not exist.
 _UnknownSnapshotCopyRegionFault :: AsError a => Getting (First ServiceError) a ServiceError
 _UnknownSnapshotCopyRegionFault =
     _ServiceError . hasStatus 404 . hasCode "UnknownSnapshotCopyRegionFault"
 
+-- | Request would exceed the user\'s compute node quota. For information
+-- about increasing your quota, go to
+-- <http://docs.aws.amazon.com/redshift/latest/mgmt/amazon-redshift-limits.html Limits in Amazon Redshift>
+-- in the /Amazon Redshift Cluster Management Guide/.
+_ReservedNodeQuotaExceededFault :: AsError a => Getting (First ServiceError) a ServiceError
+_ReservedNodeQuotaExceededFault =
+    _ServiceError . hasStatus 400 . hasCode "ReservedNodeQuotaExceeded"
+
+-- | The request would result in user exceeding the allowed number of subnets
+-- in a cluster subnet groups. For information about increasing your quota,
+-- go to
+-- <http://docs.aws.amazon.com/redshift/latest/mgmt/amazon-redshift-limits.html Limits in Amazon Redshift>
+-- in the /Amazon Redshift Cluster Management Guide/.
+_ClusterSubnetQuotaExceededFault :: AsError a => Getting (First ServiceError) a ServiceError
+_ClusterSubnetQuotaExceededFault =
+    _ServiceError . hasStatus 400 . hasCode "ClusterSubnetQuotaExceededFault"
+
+-- | The account already has a cluster with the given identifier.
+_ClusterAlreadyExistsFault :: AsError a => Getting (First ServiceError) a ServiceError
+_ClusterAlreadyExistsFault =
+    _ServiceError . hasStatus 400 . hasCode "ClusterAlreadyExists"
+
 -- | The owner of the specified snapshot has not authorized your account to
 -- access the snapshot.
 _AccessToSnapshotDeniedFault :: AsError a => Getting (First ServiceError) a ServiceError
 _AccessToSnapshotDeniedFault =
     _ServiceError . hasStatus 400 . hasCode "AccessToSnapshotDenied"
 
--- | The account already has a cluster with the given identifier.
-_ClusterAlreadyExistsFault :: AsError a => Getting (First ServiceError) a ServiceError
-_ClusterAlreadyExistsFault =
-    _ServiceError . hasStatus 400 . hasCode "ClusterAlreadyExists"
+-- | The request exceeds the limit of 10 tags for the resource.
+_TagLimitExceededFault :: AsError a => Getting (First ServiceError) a ServiceError
+_TagLimitExceededFault =
+    _ServiceError . hasStatus 400 . hasCode "TagLimitExceededFault"
 
+-- | The operation would exceed the number of nodes allotted to the account.
+-- For information about increasing your quota, go to
+-- <http://docs.aws.amazon.com/redshift/latest/mgmt/amazon-redshift-limits.html Limits in Amazon Redshift>
+-- in the /Amazon Redshift Cluster Management Guide/.
+_NumberOfNodesQuotaExceededFault :: AsError a => Getting (First ServiceError) a ServiceError
+_NumberOfNodesQuotaExceededFault =
+    _ServiceError . hasStatus 400 . hasCode "NumberOfNodesQuotaExceeded"
+
 -- | There is already an existing Amazon Redshift HSM client certificate with
 -- the specified identifier.
 _HSMClientCertificateAlreadyExistsFault :: AsError a => Getting (First ServiceError) a ServiceError
@@ -926,33 +948,23 @@
     _ServiceError .
     hasStatus 400 . hasCode "InvalidHsmClientCertificateStateFault"
 
--- | The operation would exceed the number of nodes allotted to the account.
--- For information about increasing your quota, go to
--- <http://docs.aws.amazon.com/redshift/latest/mgmt/amazon-redshift-limits.html Limits in Amazon Redshift>
--- in the /Amazon Redshift Cluster Management Guide/.
-_NumberOfNodesQuotaExceededFault :: AsError a => Getting (First ServiceError) a ServiceError
-_NumberOfNodesQuotaExceededFault =
-    _ServiceError . hasStatus 400 . hasCode "NumberOfNodesQuotaExceeded"
-
--- | The request exceeds the limit of 10 tags for the resource.
-_TagLimitExceededFault :: AsError a => Getting (First ServiceError) a ServiceError
-_TagLimitExceededFault =
-    _ServiceError . hasStatus 400 . hasCode "TagLimitExceededFault"
-
--- | The request would result in user exceeding the allowed number of subnets
--- in a cluster subnet groups. For information about increasing your quota,
--- go to
--- <http://docs.aws.amazon.com/redshift/latest/mgmt/amazon-redshift-limits.html Limits in Amazon Redshift>
--- in the /Amazon Redshift Cluster Management Guide/.
-_ClusterSubnetQuotaExceededFault :: AsError a => Getting (First ServiceError) a ServiceError
-_ClusterSubnetQuotaExceededFault =
-    _ServiceError . hasStatus 400 . hasCode "ClusterSubnetQuotaExceededFault"
-
 -- | A specified subnet is already in use by another cluster.
 _SubnetAlreadyInUse :: AsError a => Getting (First ServiceError) a ServiceError
 _SubnetAlreadyInUse =
     _ServiceError . hasStatus 400 . hasCode "SubnetAlreadyInUse"
 
+-- | The value specified for the event severity was not one of the allowed
+-- values, or it specified a severity that does not apply to the specified
+-- source type. The allowed values are ERROR and INFO.
+_SubscriptionSeverityNotFoundFault :: AsError a => Getting (First ServiceError) a ServiceError
+_SubscriptionSeverityNotFoundFault =
+    _ServiceError . hasStatus 404 . hasCode "SubscriptionSeverityNotFound"
+
+-- | Your account is not authorized to perform the requested operation.
+_UnauthorizedOperation :: AsError a => Getting (First ServiceError) a ServiceError
+_UnauthorizedOperation =
+    _ServiceError . hasStatus 400 . hasCode "UnauthorizedOperation"
+
 -- | The tag is invalid.
 _InvalidTagFault :: AsError a => Getting (First ServiceError) a ServiceError
 _InvalidTagFault = _ServiceError . hasStatus 400 . hasCode "InvalidTagFault"
@@ -970,15 +982,3 @@
 _ClusterSubnetGroupQuotaExceededFault :: AsError a => Getting (First ServiceError) a ServiceError
 _ClusterSubnetGroupQuotaExceededFault =
     _ServiceError . hasStatus 400 . hasCode "ClusterSubnetGroupQuotaExceeded"
-
--- | The value specified for the event severity was not one of the allowed
--- values, or it specified a severity that does not apply to the specified
--- source type. The allowed values are ERROR and INFO.
-_SubscriptionSeverityNotFoundFault :: AsError a => Getting (First ServiceError) a ServiceError
-_SubscriptionSeverityNotFoundFault =
-    _ServiceError . hasStatus 404 . hasCode "SubscriptionSeverityNotFound"
-
--- | Your account is not authorized to perform the requested operation.
-_UnauthorizedOperation :: AsError a => Getting (First ServiceError) a ServiceError
-_UnauthorizedOperation =
-    _ServiceError . hasStatus 400 . hasCode "UnauthorizedOperation"
diff --git a/gen/Network/AWS/Redshift/Types/Product.hs b/gen/Network/AWS/Redshift/Types/Product.hs
--- a/gen/Network/AWS/Redshift/Types/Product.hs
+++ b/gen/Network/AWS/Redshift/Types/Product.hs
@@ -81,34 +81,34 @@
     { _cRestoreStatus                    :: !(Maybe RestoreStatus)
     , _cClusterSnapshotCopyStatus        :: !(Maybe ClusterSnapshotCopyStatus)
     , _cClusterRevisionNumber            :: !(Maybe Text)
-    , _cMasterUsername                   :: !(Maybe Text)
     , _cPubliclyAccessible               :: !(Maybe Bool)
+    , _cMasterUsername                   :: !(Maybe Text)
     , _cVPCId                            :: !(Maybe Text)
     , _cClusterSecurityGroups            :: !(Maybe [ClusterSecurityGroupMembership])
     , _cAutomatedSnapshotRetentionPeriod :: !(Maybe Int)
     , _cEncrypted                        :: !(Maybe Bool)
+    , _cClusterSubnetGroupName           :: !(Maybe Text)
     , _cClusterIdentifier                :: !(Maybe Text)
     , _cNumberOfNodes                    :: !(Maybe Int)
-    , _cClusterSubnetGroupName           :: !(Maybe Text)
+    , _cClusterPublicKey                 :: !(Maybe Text)
     , _cPreferredMaintenanceWindow       :: !(Maybe Text)
     , _cModifyStatus                     :: !(Maybe Text)
-    , _cClusterPublicKey                 :: !(Maybe Text)
+    , _cKMSKeyId                         :: !(Maybe Text)
     , _cClusterParameterGroups           :: !(Maybe [ClusterParameterGroupStatus])
     , _cAvailabilityZone                 :: !(Maybe Text)
     , _cVPCSecurityGroups                :: !(Maybe [VPCSecurityGroupMembership])
-    , _cKMSKeyId                         :: !(Maybe Text)
     , _cHSMStatus                        :: !(Maybe HSMStatus)
     , _cElasticIPStatus                  :: !(Maybe ElasticIPStatus)
     , _cClusterVersion                   :: !(Maybe Text)
     , _cNodeType                         :: !(Maybe Text)
-    , _cEndpoint                         :: !(Maybe Endpoint)
     , _cClusterCreateTime                :: !(Maybe ISO8601)
+    , _cEndpoint                         :: !(Maybe Endpoint)
     , _cAllowVersionUpgrade              :: !(Maybe Bool)
-    , _cPendingModifiedValues            :: !(Maybe PendingModifiedValues)
     , _cClusterStatus                    :: !(Maybe Text)
-    , _cDBName                           :: !(Maybe Text)
+    , _cPendingModifiedValues            :: !(Maybe PendingModifiedValues)
     , _cTags                             :: !(Maybe [Tag])
     , _cClusterNodes                     :: !(Maybe [ClusterNode])
+    , _cDBName                           :: !(Maybe Text)
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'Cluster' with the minimum fields required to make a request.
@@ -121,10 +121,10 @@
 --
 -- * 'cClusterRevisionNumber'
 --
--- * 'cMasterUsername'
---
 -- * 'cPubliclyAccessible'
 --
+-- * 'cMasterUsername'
+--
 -- * 'cVPCId'
 --
 -- * 'cClusterSecurityGroups'
@@ -133,17 +133,19 @@
 --
 -- * 'cEncrypted'
 --
+-- * 'cClusterSubnetGroupName'
+--
 -- * 'cClusterIdentifier'
 --
 -- * 'cNumberOfNodes'
 --
--- * 'cClusterSubnetGroupName'
+-- * 'cClusterPublicKey'
 --
 -- * 'cPreferredMaintenanceWindow'
 --
 -- * 'cModifyStatus'
 --
--- * 'cClusterPublicKey'
+-- * 'cKMSKeyId'
 --
 -- * 'cClusterParameterGroups'
 --
@@ -151,8 +153,6 @@
 --
 -- * 'cVPCSecurityGroups'
 --
--- * 'cKMSKeyId'
---
 -- * 'cHSMStatus'
 --
 -- * 'cElasticIPStatus'
@@ -161,21 +161,21 @@
 --
 -- * 'cNodeType'
 --
--- * 'cEndpoint'
---
 -- * 'cClusterCreateTime'
 --
--- * 'cAllowVersionUpgrade'
+-- * 'cEndpoint'
 --
--- * 'cPendingModifiedValues'
+-- * 'cAllowVersionUpgrade'
 --
 -- * 'cClusterStatus'
 --
--- * 'cDBName'
+-- * 'cPendingModifiedValues'
 --
 -- * 'cTags'
 --
 -- * 'cClusterNodes'
+--
+-- * 'cDBName'
 cluster
     :: Cluster
 cluster =
@@ -183,34 +183,34 @@
     { _cRestoreStatus = Nothing
     , _cClusterSnapshotCopyStatus = Nothing
     , _cClusterRevisionNumber = Nothing
-    , _cMasterUsername = Nothing
     , _cPubliclyAccessible = Nothing
+    , _cMasterUsername = Nothing
     , _cVPCId = Nothing
     , _cClusterSecurityGroups = Nothing
     , _cAutomatedSnapshotRetentionPeriod = Nothing
     , _cEncrypted = Nothing
+    , _cClusterSubnetGroupName = Nothing
     , _cClusterIdentifier = Nothing
     , _cNumberOfNodes = Nothing
-    , _cClusterSubnetGroupName = Nothing
+    , _cClusterPublicKey = Nothing
     , _cPreferredMaintenanceWindow = Nothing
     , _cModifyStatus = Nothing
-    , _cClusterPublicKey = Nothing
+    , _cKMSKeyId = Nothing
     , _cClusterParameterGroups = Nothing
     , _cAvailabilityZone = Nothing
     , _cVPCSecurityGroups = Nothing
-    , _cKMSKeyId = Nothing
     , _cHSMStatus = Nothing
     , _cElasticIPStatus = Nothing
     , _cClusterVersion = Nothing
     , _cNodeType = Nothing
-    , _cEndpoint = Nothing
     , _cClusterCreateTime = Nothing
+    , _cEndpoint = Nothing
     , _cAllowVersionUpgrade = Nothing
-    , _cPendingModifiedValues = Nothing
     , _cClusterStatus = Nothing
-    , _cDBName = Nothing
+    , _cPendingModifiedValues = Nothing
     , _cTags = Nothing
     , _cClusterNodes = Nothing
+    , _cDBName = Nothing
     }
 
 -- | Describes the status of a cluster restore action. Returns null if the
@@ -227,15 +227,15 @@
 cClusterRevisionNumber :: Lens' Cluster (Maybe Text)
 cClusterRevisionNumber = lens _cClusterRevisionNumber (\ s a -> s{_cClusterRevisionNumber = a});
 
+-- | If 'true', the cluster can be accessed from a public network.
+cPubliclyAccessible :: Lens' Cluster (Maybe Bool)
+cPubliclyAccessible = lens _cPubliclyAccessible (\ s a -> s{_cPubliclyAccessible = a});
+
 -- | The master user name for the cluster. This name is used to connect to
 -- the database that is specified in __DBName__.
 cMasterUsername :: Lens' Cluster (Maybe Text)
 cMasterUsername = lens _cMasterUsername (\ s a -> s{_cMasterUsername = a});
 
--- | If 'true', the cluster can be accessed from a public network.
-cPubliclyAccessible :: Lens' Cluster (Maybe Bool)
-cPubliclyAccessible = lens _cPubliclyAccessible (\ s a -> s{_cPubliclyAccessible = a});
-
 -- | The identifier of the VPC the cluster is in, if the cluster is in a VPC.
 cVPCId :: Lens' Cluster (Maybe Text)
 cVPCId = lens _cVPCId (\ s a -> s{_cVPCId = a});
@@ -259,6 +259,11 @@
 cEncrypted :: Lens' Cluster (Maybe Bool)
 cEncrypted = lens _cEncrypted (\ s a -> s{_cEncrypted = a});
 
+-- | The name of the subnet group that is associated with the cluster. This
+-- parameter is valid only when the cluster is in a VPC.
+cClusterSubnetGroupName :: Lens' Cluster (Maybe Text)
+cClusterSubnetGroupName = lens _cClusterSubnetGroupName (\ s a -> s{_cClusterSubnetGroupName = a});
+
 -- | The unique identifier of the cluster.
 cClusterIdentifier :: Lens' Cluster (Maybe Text)
 cClusterIdentifier = lens _cClusterIdentifier (\ s a -> s{_cClusterIdentifier = a});
@@ -267,10 +272,9 @@
 cNumberOfNodes :: Lens' Cluster (Maybe Int)
 cNumberOfNodes = lens _cNumberOfNodes (\ s a -> s{_cNumberOfNodes = a});
 
--- | The name of the subnet group that is associated with the cluster. This
--- parameter is valid only when the cluster is in a VPC.
-cClusterSubnetGroupName :: Lens' Cluster (Maybe Text)
-cClusterSubnetGroupName = lens _cClusterSubnetGroupName (\ s a -> s{_cClusterSubnetGroupName = a});
+-- | The public key for the cluster.
+cClusterPublicKey :: Lens' Cluster (Maybe Text)
+cClusterPublicKey = lens _cClusterPublicKey (\ s a -> s{_cClusterPublicKey = a});
 
 -- | The weekly time range (in UTC) during which system maintenance can
 -- occur.
@@ -281,9 +285,10 @@
 cModifyStatus :: Lens' Cluster (Maybe Text)
 cModifyStatus = lens _cModifyStatus (\ s a -> s{_cModifyStatus = a});
 
--- | The public key for the cluster.
-cClusterPublicKey :: Lens' Cluster (Maybe Text)
-cClusterPublicKey = lens _cClusterPublicKey (\ s a -> s{_cClusterPublicKey = a});
+-- | The AWS Key Management Service (KMS) key ID of the encryption key used
+-- to encrypt data in the cluster.
+cKMSKeyId :: Lens' Cluster (Maybe Text)
+cKMSKeyId = lens _cKMSKeyId (\ s a -> s{_cKMSKeyId = a});
 
 -- | The list of cluster parameter groups that are associated with this
 -- cluster. Each parameter group in the list is returned with its status.
@@ -300,11 +305,6 @@
 cVPCSecurityGroups :: Lens' Cluster [VPCSecurityGroupMembership]
 cVPCSecurityGroups = lens _cVPCSecurityGroups (\ s a -> s{_cVPCSecurityGroups = a}) . _Default . _Coerce;
 
--- | The AWS Key Management Service (KMS) key ID of the encryption key used
--- to encrypt data in the cluster.
-cKMSKeyId :: Lens' Cluster (Maybe Text)
-cKMSKeyId = lens _cKMSKeyId (\ s a -> s{_cKMSKeyId = a});
-
 -- | Reports whether the Amazon Redshift cluster has finished applying any
 -- HSM settings changes specified in a modify cluster command.
 --
@@ -325,35 +325,28 @@
 cNodeType :: Lens' Cluster (Maybe Text)
 cNodeType = lens _cNodeType (\ s a -> s{_cNodeType = a});
 
--- | The connection endpoint.
-cEndpoint :: Lens' Cluster (Maybe Endpoint)
-cEndpoint = lens _cEndpoint (\ s a -> s{_cEndpoint = a});
-
 -- | The date and time that the cluster was created.
 cClusterCreateTime :: Lens' Cluster (Maybe UTCTime)
 cClusterCreateTime = lens _cClusterCreateTime (\ s a -> s{_cClusterCreateTime = a}) . mapping _Time;
 
+-- | The connection endpoint.
+cEndpoint :: Lens' Cluster (Maybe Endpoint)
+cEndpoint = lens _cEndpoint (\ s a -> s{_cEndpoint = a});
+
 -- | If 'true', major version upgrades will be applied automatically to the
 -- cluster during the maintenance window.
 cAllowVersionUpgrade :: Lens' Cluster (Maybe Bool)
 cAllowVersionUpgrade = lens _cAllowVersionUpgrade (\ s a -> s{_cAllowVersionUpgrade = a});
 
--- | If present, changes to the cluster are pending. Specific pending changes
--- are identified by subelements.
-cPendingModifiedValues :: Lens' Cluster (Maybe PendingModifiedValues)
-cPendingModifiedValues = lens _cPendingModifiedValues (\ s a -> s{_cPendingModifiedValues = a});
-
 -- | The current state of this cluster. Possible values include 'available',
 -- 'creating', 'deleting', 'rebooting', 'renaming', and 'resizing'.
 cClusterStatus :: Lens' Cluster (Maybe Text)
 cClusterStatus = lens _cClusterStatus (\ s a -> s{_cClusterStatus = a});
 
--- | The name of the initial database that was created when the cluster was
--- created. This same name is returned for the life of the cluster. If an
--- initial database was not specified, a database named \"dev\" was created
--- by default.
-cDBName :: Lens' Cluster (Maybe Text)
-cDBName = lens _cDBName (\ s a -> s{_cDBName = a});
+-- | If present, changes to the cluster are pending. Specific pending changes
+-- are identified by subelements.
+cPendingModifiedValues :: Lens' Cluster (Maybe PendingModifiedValues)
+cPendingModifiedValues = lens _cPendingModifiedValues (\ s a -> s{_cPendingModifiedValues = a});
 
 -- | The list of tags for the cluster.
 cTags :: Lens' Cluster [Tag]
@@ -363,26 +356,34 @@
 cClusterNodes :: Lens' Cluster [ClusterNode]
 cClusterNodes = lens _cClusterNodes (\ s a -> s{_cClusterNodes = a}) . _Default . _Coerce;
 
+-- | The name of the initial database that was created when the cluster was
+-- created. This same name is returned for the life of the cluster. If an
+-- initial database was not specified, a database named \"dev\" was created
+-- by default.
+cDBName :: Lens' Cluster (Maybe Text)
+cDBName = lens _cDBName (\ s a -> s{_cDBName = a});
+
 instance FromXML Cluster where
         parseXML x
           = Cluster' <$>
               (x .@? "RestoreStatus") <*>
                 (x .@? "ClusterSnapshotCopyStatus")
                 <*> (x .@? "ClusterRevisionNumber")
-                <*> (x .@? "MasterUsername")
                 <*> (x .@? "PubliclyAccessible")
+                <*> (x .@? "MasterUsername")
                 <*> (x .@? "VpcId")
                 <*>
                 (x .@? "ClusterSecurityGroups" .!@ mempty >>=
                    may (parseXMLList "ClusterSecurityGroup"))
                 <*> (x .@? "AutomatedSnapshotRetentionPeriod")
                 <*> (x .@? "Encrypted")
+                <*> (x .@? "ClusterSubnetGroupName")
                 <*> (x .@? "ClusterIdentifier")
                 <*> (x .@? "NumberOfNodes")
-                <*> (x .@? "ClusterSubnetGroupName")
+                <*> (x .@? "ClusterPublicKey")
                 <*> (x .@? "PreferredMaintenanceWindow")
                 <*> (x .@? "ModifyStatus")
-                <*> (x .@? "ClusterPublicKey")
+                <*> (x .@? "KmsKeyId")
                 <*>
                 (x .@? "ClusterParameterGroups" .!@ mempty >>=
                    may (parseXMLList "ClusterParameterGroup"))
@@ -390,23 +391,22 @@
                 <*>
                 (x .@? "VpcSecurityGroups" .!@ mempty >>=
                    may (parseXMLList "VpcSecurityGroup"))
-                <*> (x .@? "KmsKeyId")
                 <*> (x .@? "HsmStatus")
                 <*> (x .@? "ElasticIpStatus")
                 <*> (x .@? "ClusterVersion")
                 <*> (x .@? "NodeType")
-                <*> (x .@? "Endpoint")
                 <*> (x .@? "ClusterCreateTime")
+                <*> (x .@? "Endpoint")
                 <*> (x .@? "AllowVersionUpgrade")
-                <*> (x .@? "PendingModifiedValues")
                 <*> (x .@? "ClusterStatus")
-                <*> (x .@? "DBName")
+                <*> (x .@? "PendingModifiedValues")
                 <*>
                 (x .@? "Tags" .!@ mempty >>=
                    may (parseXMLList "Tag"))
                 <*>
                 (x .@? "ClusterNodes" .!@ mempty >>=
                    may (parseXMLList "member"))
+                <*> (x .@? "DBName")
 
 -- | The identifier of a node in a cluster.
 --
@@ -459,8 +459,8 @@
 data ClusterParameterGroup = ClusterParameterGroup'
     { _cpgParameterGroupFamily :: !(Maybe Text)
     , _cpgDescription          :: !(Maybe Text)
-    , _cpgParameterGroupName   :: !(Maybe Text)
     , _cpgTags                 :: !(Maybe [Tag])
+    , _cpgParameterGroupName   :: !(Maybe Text)
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'ClusterParameterGroup' with the minimum fields required to make a request.
@@ -471,17 +471,17 @@
 --
 -- * 'cpgDescription'
 --
--- * 'cpgParameterGroupName'
---
 -- * 'cpgTags'
+--
+-- * 'cpgParameterGroupName'
 clusterParameterGroup
     :: ClusterParameterGroup
 clusterParameterGroup =
     ClusterParameterGroup'
     { _cpgParameterGroupFamily = Nothing
     , _cpgDescription = Nothing
-    , _cpgParameterGroupName = Nothing
     , _cpgTags = Nothing
+    , _cpgParameterGroupName = Nothing
     }
 
 -- | The name of the cluster parameter group family that this cluster
@@ -493,23 +493,23 @@
 cpgDescription :: Lens' ClusterParameterGroup (Maybe Text)
 cpgDescription = lens _cpgDescription (\ s a -> s{_cpgDescription = a});
 
--- | The name of the cluster parameter group.
-cpgParameterGroupName :: Lens' ClusterParameterGroup (Maybe Text)
-cpgParameterGroupName = lens _cpgParameterGroupName (\ s a -> s{_cpgParameterGroupName = a});
-
 -- | The list of tags for the cluster parameter group.
 cpgTags :: Lens' ClusterParameterGroup [Tag]
 cpgTags = lens _cpgTags (\ s a -> s{_cpgTags = a}) . _Default . _Coerce;
 
+-- | The name of the cluster parameter group.
+cpgParameterGroupName :: Lens' ClusterParameterGroup (Maybe Text)
+cpgParameterGroupName = lens _cpgParameterGroupName (\ s a -> s{_cpgParameterGroupName = a});
+
 instance FromXML ClusterParameterGroup where
         parseXML x
           = ClusterParameterGroup' <$>
               (x .@? "ParameterGroupFamily") <*>
                 (x .@? "Description")
-                <*> (x .@? "ParameterGroupName")
                 <*>
                 (x .@? "Tags" .!@ mempty >>=
                    may (parseXMLList "Tag"))
+                <*> (x .@? "ParameterGroupName")
 
 -- | Contains the output from the ModifyClusterParameterGroup and
 -- ResetClusterParameterGroup actions and indicate the parameter group
@@ -954,8 +954,8 @@
 --
 -- /See:/ 'defaultClusterParameters' smart constructor.
 data DefaultClusterParameters = DefaultClusterParameters'
-    { _dcpParameters           :: !(Maybe [Parameter])
-    , _dcpMarker               :: !(Maybe Text)
+    { _dcpMarker               :: !(Maybe Text)
+    , _dcpParameters           :: !(Maybe [Parameter])
     , _dcpParameterGroupFamily :: !(Maybe Text)
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
@@ -963,24 +963,20 @@
 --
 -- Use one of the following lenses to modify other fields as desired:
 --
--- * 'dcpParameters'
---
 -- * 'dcpMarker'
 --
+-- * 'dcpParameters'
+--
 -- * 'dcpParameterGroupFamily'
 defaultClusterParameters
     :: DefaultClusterParameters
 defaultClusterParameters =
     DefaultClusterParameters'
-    { _dcpParameters = Nothing
-    , _dcpMarker = Nothing
+    { _dcpMarker = Nothing
+    , _dcpParameters = Nothing
     , _dcpParameterGroupFamily = Nothing
     }
 
--- | The list of cluster default parameters.
-dcpParameters :: Lens' DefaultClusterParameters [Parameter]
-dcpParameters = lens _dcpParameters (\ s a -> s{_dcpParameters = a}) . _Default . _Coerce;
-
 -- | A value that indicates the starting point for the next set of response
 -- records in a subsequent request. If a value is returned in a response,
 -- you can retrieve the next set of records by providing this returned
@@ -990,6 +986,10 @@
 dcpMarker :: Lens' DefaultClusterParameters (Maybe Text)
 dcpMarker = lens _dcpMarker (\ s a -> s{_dcpMarker = a});
 
+-- | The list of cluster default parameters.
+dcpParameters :: Lens' DefaultClusterParameters [Parameter]
+dcpParameters = lens _dcpParameters (\ s a -> s{_dcpParameters = a}) . _Default . _Coerce;
+
 -- | The name of the cluster parameter group family to which the engine
 -- default parameters apply.
 dcpParameterGroupFamily :: Lens' DefaultClusterParameters (Maybe Text)
@@ -998,9 +998,9 @@
 instance FromXML DefaultClusterParameters where
         parseXML x
           = DefaultClusterParameters' <$>
-              (x .@? "Parameters" .!@ mempty >>=
-                 may (parseXMLList "Parameter"))
-                <*> (x .@? "Marker")
+              (x .@? "Marker") <*>
+                (x .@? "Parameters" .!@ mempty >>=
+                   may (parseXMLList "Parameter"))
                 <*> (x .@? "ParameterGroupFamily")
 
 -- | Describes an Amazon EC2 security group.
@@ -1313,8 +1313,8 @@
 
 -- | /See:/ 'eventSubscription' smart constructor.
 data EventSubscription = EventSubscription'
-    { _esCustomerAWSId            :: !(Maybe Text)
-    , _esStatus                   :: !(Maybe Text)
+    { _esStatus                   :: !(Maybe Text)
+    , _esCustomerAWSId            :: !(Maybe Text)
     , _esCustSubscriptionId       :: !(Maybe Text)
     , _esSNSTopicARN              :: !(Maybe Text)
     , _esEnabled                  :: !(Maybe Bool)
@@ -1322,18 +1322,18 @@
     , _esSeverity                 :: !(Maybe Text)
     , _esSubscriptionCreationTime :: !(Maybe ISO8601)
     , _esEventCategoriesList      :: !(Maybe [Text])
-    , _esSourceIdsList            :: !(Maybe [Text])
     , _esTags                     :: !(Maybe [Tag])
+    , _esSourceIdsList            :: !(Maybe [Text])
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'EventSubscription' with the minimum fields required to make a request.
 --
 -- Use one of the following lenses to modify other fields as desired:
 --
--- * 'esCustomerAWSId'
---
 -- * 'esStatus'
 --
+-- * 'esCustomerAWSId'
+--
 -- * 'esCustSubscriptionId'
 --
 -- * 'esSNSTopicARN'
@@ -1348,15 +1348,15 @@
 --
 -- * 'esEventCategoriesList'
 --
--- * 'esSourceIdsList'
---
 -- * 'esTags'
+--
+-- * 'esSourceIdsList'
 eventSubscription
     :: EventSubscription
 eventSubscription =
     EventSubscription'
-    { _esCustomerAWSId = Nothing
-    , _esStatus = Nothing
+    { _esStatus = Nothing
+    , _esCustomerAWSId = Nothing
     , _esCustSubscriptionId = Nothing
     , _esSNSTopicARN = Nothing
     , _esEnabled = Nothing
@@ -1364,15 +1364,10 @@
     , _esSeverity = Nothing
     , _esSubscriptionCreationTime = Nothing
     , _esEventCategoriesList = Nothing
-    , _esSourceIdsList = Nothing
     , _esTags = Nothing
+    , _esSourceIdsList = Nothing
     }
 
--- | The AWS customer account associated with the Amazon Redshift event
--- notification subscription.
-esCustomerAWSId :: Lens' EventSubscription (Maybe Text)
-esCustomerAWSId = lens _esCustomerAWSId (\ s a -> s{_esCustomerAWSId = a});
-
 -- | The status of the Amazon Redshift event notification subscription.
 --
 -- Constraints:
@@ -1386,6 +1381,11 @@
 esStatus :: Lens' EventSubscription (Maybe Text)
 esStatus = lens _esStatus (\ s a -> s{_esStatus = a});
 
+-- | The AWS customer account associated with the Amazon Redshift event
+-- notification subscription.
+esCustomerAWSId :: Lens' EventSubscription (Maybe Text)
+esCustomerAWSId = lens _esCustomerAWSId (\ s a -> s{_esCustomerAWSId = a});
+
 -- | The name of the Amazon Redshift event notification subscription.
 esCustSubscriptionId :: Lens' EventSubscription (Maybe Text)
 esCustSubscriptionId = lens _esCustSubscriptionId (\ s a -> s{_esCustSubscriptionId = a});
@@ -1424,19 +1424,19 @@
 esEventCategoriesList :: Lens' EventSubscription [Text]
 esEventCategoriesList = lens _esEventCategoriesList (\ s a -> s{_esEventCategoriesList = a}) . _Default . _Coerce;
 
+-- | The list of tags for the event subscription.
+esTags :: Lens' EventSubscription [Tag]
+esTags = lens _esTags (\ s a -> s{_esTags = a}) . _Default . _Coerce;
+
 -- | A list of the sources that publish events to the Amazon Redshift event
 -- notification subscription.
 esSourceIdsList :: Lens' EventSubscription [Text]
 esSourceIdsList = lens _esSourceIdsList (\ s a -> s{_esSourceIdsList = a}) . _Default . _Coerce;
 
--- | The list of tags for the event subscription.
-esTags :: Lens' EventSubscription [Tag]
-esTags = lens _esTags (\ s a -> s{_esTags = a}) . _Default . _Coerce;
-
 instance FromXML EventSubscription where
         parseXML x
           = EventSubscription' <$>
-              (x .@? "CustomerAwsId") <*> (x .@? "Status") <*>
+              (x .@? "Status") <*> (x .@? "CustomerAwsId") <*>
                 (x .@? "CustSubscriptionId")
                 <*> (x .@? "SnsTopicArn")
                 <*> (x .@? "Enabled")
@@ -1447,11 +1447,11 @@
                 (x .@? "EventCategoriesList" .!@ mempty >>=
                    may (parseXMLList "EventCategory"))
                 <*>
-                (x .@? "SourceIdsList" .!@ mempty >>=
-                   may (parseXMLList "SourceId"))
-                <*>
                 (x .@? "Tags" .!@ mempty >>=
                    may (parseXMLList "Tag"))
+                <*>
+                (x .@? "SourceIdsList" .!@ mempty >>=
+                   may (parseXMLList "SourceId"))
 
 -- | Returns information about an HSM client certificate. The certificate is
 -- stored in a secure Hardware Storage Module (HSM), and used by the Amazon
@@ -1513,8 +1513,8 @@
     { _hcHSMConfigurationIdentifier :: !(Maybe Text)
     , _hcHSMPartitionName           :: !(Maybe Text)
     , _hcDescription                :: !(Maybe Text)
-    , _hcHSMIPAddress               :: !(Maybe Text)
     , _hcTags                       :: !(Maybe [Tag])
+    , _hcHSMIPAddress               :: !(Maybe Text)
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'HSMConfiguration' with the minimum fields required to make a request.
@@ -1527,9 +1527,9 @@
 --
 -- * 'hcDescription'
 --
--- * 'hcHSMIPAddress'
---
 -- * 'hcTags'
+--
+-- * 'hcHSMIPAddress'
 hsmConfiguration
     :: HSMConfiguration
 hsmConfiguration =
@@ -1537,8 +1537,8 @@
     { _hcHSMConfigurationIdentifier = Nothing
     , _hcHSMPartitionName = Nothing
     , _hcDescription = Nothing
-    , _hcHSMIPAddress = Nothing
     , _hcTags = Nothing
+    , _hcHSMIPAddress = Nothing
     }
 
 -- | The name of the Amazon Redshift HSM configuration.
@@ -1554,25 +1554,25 @@
 hcDescription :: Lens' HSMConfiguration (Maybe Text)
 hcDescription = lens _hcDescription (\ s a -> s{_hcDescription = a});
 
+-- | The list of tags for the HSM configuration.
+hcTags :: Lens' HSMConfiguration [Tag]
+hcTags = lens _hcTags (\ s a -> s{_hcTags = a}) . _Default . _Coerce;
+
 -- | The IP address that the Amazon Redshift cluster must use to access the
 -- HSM.
 hcHSMIPAddress :: Lens' HSMConfiguration (Maybe Text)
 hcHSMIPAddress = lens _hcHSMIPAddress (\ s a -> s{_hcHSMIPAddress = a});
 
--- | The list of tags for the HSM configuration.
-hcTags :: Lens' HSMConfiguration [Tag]
-hcTags = lens _hcTags (\ s a -> s{_hcTags = a}) . _Default . _Coerce;
-
 instance FromXML HSMConfiguration where
         parseXML x
           = HSMConfiguration' <$>
               (x .@? "HsmConfigurationIdentifier") <*>
                 (x .@? "HsmPartitionName")
                 <*> (x .@? "Description")
-                <*> (x .@? "HsmIpAddress")
                 <*>
                 (x .@? "Tags" .!@ mempty >>=
                    may (parseXMLList "Tag"))
+                <*> (x .@? "HsmIpAddress")
 
 -- |
 --
@@ -1676,8 +1676,8 @@
 --
 -- /See:/ 'loggingStatus' smart constructor.
 data LoggingStatus = LoggingStatus'
-    { _lsLastSuccessfulDeliveryTime :: !(Maybe ISO8601)
-    , _lsLastFailureTime            :: !(Maybe ISO8601)
+    { _lsLastFailureTime            :: !(Maybe ISO8601)
+    , _lsLastSuccessfulDeliveryTime :: !(Maybe ISO8601)
     , _lsS3KeyPrefix                :: !(Maybe Text)
     , _lsBucketName                 :: !(Maybe Text)
     , _lsLoggingEnabled             :: !(Maybe Bool)
@@ -1688,10 +1688,10 @@
 --
 -- Use one of the following lenses to modify other fields as desired:
 --
--- * 'lsLastSuccessfulDeliveryTime'
---
 -- * 'lsLastFailureTime'
 --
+-- * 'lsLastSuccessfulDeliveryTime'
+--
 -- * 'lsS3KeyPrefix'
 --
 -- * 'lsBucketName'
@@ -1703,22 +1703,22 @@
     :: LoggingStatus
 loggingStatus =
     LoggingStatus'
-    { _lsLastSuccessfulDeliveryTime = Nothing
-    , _lsLastFailureTime = Nothing
+    { _lsLastFailureTime = Nothing
+    , _lsLastSuccessfulDeliveryTime = Nothing
     , _lsS3KeyPrefix = Nothing
     , _lsBucketName = Nothing
     , _lsLoggingEnabled = Nothing
     , _lsLastFailureMessage = Nothing
     }
 
--- | The last time when logs were delivered.
-lsLastSuccessfulDeliveryTime :: Lens' LoggingStatus (Maybe UTCTime)
-lsLastSuccessfulDeliveryTime = lens _lsLastSuccessfulDeliveryTime (\ s a -> s{_lsLastSuccessfulDeliveryTime = a}) . mapping _Time;
-
 -- | The last time when logs failed to be delivered.
 lsLastFailureTime :: Lens' LoggingStatus (Maybe UTCTime)
 lsLastFailureTime = lens _lsLastFailureTime (\ s a -> s{_lsLastFailureTime = a}) . mapping _Time;
 
+-- | The last time when logs were delivered.
+lsLastSuccessfulDeliveryTime :: Lens' LoggingStatus (Maybe UTCTime)
+lsLastSuccessfulDeliveryTime = lens _lsLastSuccessfulDeliveryTime (\ s a -> s{_lsLastSuccessfulDeliveryTime = a}) . mapping _Time;
+
 -- | The prefix applied to the log file names.
 lsS3KeyPrefix :: Lens' LoggingStatus (Maybe Text)
 lsS3KeyPrefix = lens _lsS3KeyPrefix (\ s a -> s{_lsS3KeyPrefix = a});
@@ -1738,8 +1738,8 @@
 instance FromXML LoggingStatus where
         parseXML x
           = LoggingStatus' <$>
-              (x .@? "LastSuccessfulDeliveryTime") <*>
-                (x .@? "LastFailureTime")
+              (x .@? "LastFailureTime") <*>
+                (x .@? "LastSuccessfulDeliveryTime")
                 <*> (x .@? "S3KeyPrefix")
                 <*> (x .@? "BucketName")
                 <*> (x .@? "LoggingEnabled")
@@ -1810,8 +1810,8 @@
     , _pMinimumEngineVersion :: !(Maybe Text)
     , _pSource               :: !(Maybe Text)
     , _pIsModifiable         :: !(Maybe Bool)
-    , _pAllowedValues        :: !(Maybe Text)
     , _pDataType             :: !(Maybe Text)
+    , _pAllowedValues        :: !(Maybe Text)
     , _pParameterName        :: !(Maybe Text)
     , _pDescription          :: !(Maybe Text)
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
@@ -1830,10 +1830,10 @@
 --
 -- * 'pIsModifiable'
 --
--- * 'pAllowedValues'
---
 -- * 'pDataType'
 --
+-- * 'pAllowedValues'
+--
 -- * 'pParameterName'
 --
 -- * 'pDescription'
@@ -1846,8 +1846,8 @@
     , _pMinimumEngineVersion = Nothing
     , _pSource = Nothing
     , _pIsModifiable = Nothing
-    , _pAllowedValues = Nothing
     , _pDataType = Nothing
+    , _pAllowedValues = Nothing
     , _pParameterName = Nothing
     , _pDescription = Nothing
     }
@@ -1874,14 +1874,14 @@
 pIsModifiable :: Lens' Parameter (Maybe Bool)
 pIsModifiable = lens _pIsModifiable (\ s a -> s{_pIsModifiable = a});
 
--- | The valid range of values for the parameter.
-pAllowedValues :: Lens' Parameter (Maybe Text)
-pAllowedValues = lens _pAllowedValues (\ s a -> s{_pAllowedValues = a});
-
 -- | The data type of the parameter.
 pDataType :: Lens' Parameter (Maybe Text)
 pDataType = lens _pDataType (\ s a -> s{_pDataType = a});
 
+-- | The valid range of values for the parameter.
+pAllowedValues :: Lens' Parameter (Maybe Text)
+pAllowedValues = lens _pAllowedValues (\ s a -> s{_pAllowedValues = a});
+
 -- | The name of the parameter.
 pParameterName :: Lens' Parameter (Maybe Text)
 pParameterName = lens _pParameterName (\ s a -> s{_pParameterName = a});
@@ -1897,8 +1897,8 @@
                 (x .@? "MinimumEngineVersion")
                 <*> (x .@? "Source")
                 <*> (x .@? "IsModifiable")
-                <*> (x .@? "AllowedValues")
                 <*> (x .@? "DataType")
+                <*> (x .@? "AllowedValues")
                 <*> (x .@? "ParameterName")
                 <*> (x .@? "Description")
 
@@ -1910,8 +1910,8 @@
                "MinimumEngineVersion" =: _pMinimumEngineVersion,
                "Source" =: _pSource,
                "IsModifiable" =: _pIsModifiable,
-               "AllowedValues" =: _pAllowedValues,
                "DataType" =: _pDataType,
+               "AllowedValues" =: _pAllowedValues,
                "ParameterName" =: _pParameterName,
                "Description" =: _pDescription]
 
@@ -2049,12 +2049,12 @@
     , _rnCurrencyCode           :: !(Maybe Text)
     , _rnStartTime              :: !(Maybe ISO8601)
     , _rnNodeCount              :: !(Maybe Int)
-    , _rnReservedNodeOfferingId :: !(Maybe Text)
     , _rnReservedNodeId         :: !(Maybe Text)
+    , _rnReservedNodeOfferingId :: !(Maybe Text)
+    , _rnRecurringCharges       :: !(Maybe [RecurringCharge])
     , _rnOfferingType           :: !(Maybe Text)
     , _rnUsagePrice             :: !(Maybe Double)
     , _rnNodeType               :: !(Maybe Text)
-    , _rnRecurringCharges       :: !(Maybe [RecurringCharge])
     , _rnFixedPrice             :: !(Maybe Double)
     , _rnDuration               :: !(Maybe Int)
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
@@ -2071,9 +2071,11 @@
 --
 -- * 'rnNodeCount'
 --
+-- * 'rnReservedNodeId'
+--
 -- * 'rnReservedNodeOfferingId'
 --
--- * 'rnReservedNodeId'
+-- * 'rnRecurringCharges'
 --
 -- * 'rnOfferingType'
 --
@@ -2081,8 +2083,6 @@
 --
 -- * 'rnNodeType'
 --
--- * 'rnRecurringCharges'
---
 -- * 'rnFixedPrice'
 --
 -- * 'rnDuration'
@@ -2094,12 +2094,12 @@
     , _rnCurrencyCode = Nothing
     , _rnStartTime = Nothing
     , _rnNodeCount = Nothing
-    , _rnReservedNodeOfferingId = Nothing
     , _rnReservedNodeId = Nothing
+    , _rnReservedNodeOfferingId = Nothing
+    , _rnRecurringCharges = Nothing
     , _rnOfferingType = Nothing
     , _rnUsagePrice = Nothing
     , _rnNodeType = Nothing
-    , _rnRecurringCharges = Nothing
     , _rnFixedPrice = Nothing
     , _rnDuration = Nothing
     }
@@ -2129,13 +2129,17 @@
 rnNodeCount :: Lens' ReservedNode (Maybe Int)
 rnNodeCount = lens _rnNodeCount (\ s a -> s{_rnNodeCount = a});
 
+-- | The unique identifier for the reservation.
+rnReservedNodeId :: Lens' ReservedNode (Maybe Text)
+rnReservedNodeId = lens _rnReservedNodeId (\ s a -> s{_rnReservedNodeId = a});
+
 -- | The identifier for the reserved node offering.
 rnReservedNodeOfferingId :: Lens' ReservedNode (Maybe Text)
 rnReservedNodeOfferingId = lens _rnReservedNodeOfferingId (\ s a -> s{_rnReservedNodeOfferingId = a});
 
--- | The unique identifier for the reservation.
-rnReservedNodeId :: Lens' ReservedNode (Maybe Text)
-rnReservedNodeId = lens _rnReservedNodeId (\ s a -> s{_rnReservedNodeId = a});
+-- | The recurring charges for the reserved node.
+rnRecurringCharges :: Lens' ReservedNode [RecurringCharge]
+rnRecurringCharges = lens _rnRecurringCharges (\ s a -> s{_rnRecurringCharges = a}) . _Default . _Coerce;
 
 -- | The anticipated utilization of the reserved node, as defined in the
 -- reserved node offering.
@@ -2150,10 +2154,6 @@
 rnNodeType :: Lens' ReservedNode (Maybe Text)
 rnNodeType = lens _rnNodeType (\ s a -> s{_rnNodeType = a});
 
--- | The recurring charges for the reserved node.
-rnRecurringCharges :: Lens' ReservedNode [RecurringCharge]
-rnRecurringCharges = lens _rnRecurringCharges (\ s a -> s{_rnRecurringCharges = a}) . _Default . _Coerce;
-
 -- | The fixed cost Amazon Redshift charges you for this reserved node.
 rnFixedPrice :: Lens' ReservedNode (Maybe Double)
 rnFixedPrice = lens _rnFixedPrice (\ s a -> s{_rnFixedPrice = a});
@@ -2168,14 +2168,14 @@
               (x .@? "State") <*> (x .@? "CurrencyCode") <*>
                 (x .@? "StartTime")
                 <*> (x .@? "NodeCount")
-                <*> (x .@? "ReservedNodeOfferingId")
                 <*> (x .@? "ReservedNodeId")
-                <*> (x .@? "OfferingType")
-                <*> (x .@? "UsagePrice")
-                <*> (x .@? "NodeType")
+                <*> (x .@? "ReservedNodeOfferingId")
                 <*>
                 (x .@? "RecurringCharges" .!@ mempty >>=
                    may (parseXMLList "RecurringCharge"))
+                <*> (x .@? "OfferingType")
+                <*> (x .@? "UsagePrice")
+                <*> (x .@? "NodeType")
                 <*> (x .@? "FixedPrice")
                 <*> (x .@? "Duration")
 
@@ -2185,10 +2185,10 @@
 data ReservedNodeOffering = ReservedNodeOffering'
     { _rnoCurrencyCode           :: !(Maybe Text)
     , _rnoReservedNodeOfferingId :: !(Maybe Text)
+    , _rnoRecurringCharges       :: !(Maybe [RecurringCharge])
     , _rnoOfferingType           :: !(Maybe Text)
     , _rnoUsagePrice             :: !(Maybe Double)
     , _rnoNodeType               :: !(Maybe Text)
-    , _rnoRecurringCharges       :: !(Maybe [RecurringCharge])
     , _rnoFixedPrice             :: !(Maybe Double)
     , _rnoDuration               :: !(Maybe Int)
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
@@ -2201,14 +2201,14 @@
 --
 -- * 'rnoReservedNodeOfferingId'
 --
+-- * 'rnoRecurringCharges'
+--
 -- * 'rnoOfferingType'
 --
 -- * 'rnoUsagePrice'
 --
 -- * 'rnoNodeType'
 --
--- * 'rnoRecurringCharges'
---
 -- * 'rnoFixedPrice'
 --
 -- * 'rnoDuration'
@@ -2218,10 +2218,10 @@
     ReservedNodeOffering'
     { _rnoCurrencyCode = Nothing
     , _rnoReservedNodeOfferingId = Nothing
+    , _rnoRecurringCharges = Nothing
     , _rnoOfferingType = Nothing
     , _rnoUsagePrice = Nothing
     , _rnoNodeType = Nothing
-    , _rnoRecurringCharges = Nothing
     , _rnoFixedPrice = Nothing
     , _rnoDuration = Nothing
     }
@@ -2234,6 +2234,12 @@
 rnoReservedNodeOfferingId :: Lens' ReservedNodeOffering (Maybe Text)
 rnoReservedNodeOfferingId = lens _rnoReservedNodeOfferingId (\ s a -> s{_rnoReservedNodeOfferingId = a});
 
+-- | The charge to your account regardless of whether you are creating any
+-- clusters using the node offering. Recurring charges are only in effect
+-- for heavy-utilization reserved nodes.
+rnoRecurringCharges :: Lens' ReservedNodeOffering [RecurringCharge]
+rnoRecurringCharges = lens _rnoRecurringCharges (\ s a -> s{_rnoRecurringCharges = a}) . _Default . _Coerce;
+
 -- | The anticipated utilization of the reserved node, as defined in the
 -- reserved node offering.
 rnoOfferingType :: Lens' ReservedNodeOffering (Maybe Text)
@@ -2248,12 +2254,6 @@
 rnoNodeType :: Lens' ReservedNodeOffering (Maybe Text)
 rnoNodeType = lens _rnoNodeType (\ s a -> s{_rnoNodeType = a});
 
--- | The charge to your account regardless of whether you are creating any
--- clusters using the node offering. Recurring charges are only in effect
--- for heavy-utilization reserved nodes.
-rnoRecurringCharges :: Lens' ReservedNodeOffering [RecurringCharge]
-rnoRecurringCharges = lens _rnoRecurringCharges (\ s a -> s{_rnoRecurringCharges = a}) . _Default . _Coerce;
-
 -- | The upfront fixed charge you will pay to purchase the specific reserved
 -- node offering.
 rnoFixedPrice :: Lens' ReservedNodeOffering (Maybe Double)
@@ -2268,12 +2268,12 @@
           = ReservedNodeOffering' <$>
               (x .@? "CurrencyCode") <*>
                 (x .@? "ReservedNodeOfferingId")
-                <*> (x .@? "OfferingType")
-                <*> (x .@? "UsagePrice")
-                <*> (x .@? "NodeType")
                 <*>
                 (x .@? "RecurringCharges" .!@ mempty >>=
                    may (parseXMLList "RecurringCharge"))
+                <*> (x .@? "OfferingType")
+                <*> (x .@? "UsagePrice")
+                <*> (x .@? "NodeType")
                 <*> (x .@? "FixedPrice")
                 <*> (x .@? "Duration")
 
@@ -2282,8 +2282,8 @@
 --
 -- /See:/ 'restoreStatus' smart constructor.
 data RestoreStatus = RestoreStatus'
-    { _rsEstimatedTimeToCompletionInSeconds     :: !(Maybe Integer)
-    , _rsStatus                                 :: !(Maybe Text)
+    { _rsStatus                                 :: !(Maybe Text)
+    , _rsEstimatedTimeToCompletionInSeconds     :: !(Maybe Integer)
     , _rsCurrentRestoreRateInMegaBytesPerSecond :: !(Maybe Double)
     , _rsProgressInMegaBytes                    :: !(Maybe Integer)
     , _rsElapsedTimeInSeconds                   :: !(Maybe Integer)
@@ -2294,10 +2294,10 @@
 --
 -- Use one of the following lenses to modify other fields as desired:
 --
--- * 'rsEstimatedTimeToCompletionInSeconds'
---
 -- * 'rsStatus'
 --
+-- * 'rsEstimatedTimeToCompletionInSeconds'
+--
 -- * 'rsCurrentRestoreRateInMegaBytesPerSecond'
 --
 -- * 'rsProgressInMegaBytes'
@@ -2309,24 +2309,24 @@
     :: RestoreStatus
 restoreStatus =
     RestoreStatus'
-    { _rsEstimatedTimeToCompletionInSeconds = Nothing
-    , _rsStatus = Nothing
+    { _rsStatus = Nothing
+    , _rsEstimatedTimeToCompletionInSeconds = Nothing
     , _rsCurrentRestoreRateInMegaBytesPerSecond = Nothing
     , _rsProgressInMegaBytes = Nothing
     , _rsElapsedTimeInSeconds = Nothing
     , _rsSnapshotSizeInMegaBytes = Nothing
     }
 
--- | The estimate of the time remaining before the restore will complete.
--- Returns 0 for a completed restore.
-rsEstimatedTimeToCompletionInSeconds :: Lens' RestoreStatus (Maybe Integer)
-rsEstimatedTimeToCompletionInSeconds = lens _rsEstimatedTimeToCompletionInSeconds (\ s a -> s{_rsEstimatedTimeToCompletionInSeconds = a});
-
 -- | The status of the restore action. Returns starting, restoring,
 -- completed, or failed.
 rsStatus :: Lens' RestoreStatus (Maybe Text)
 rsStatus = lens _rsStatus (\ s a -> s{_rsStatus = a});
 
+-- | The estimate of the time remaining before the restore will complete.
+-- Returns 0 for a completed restore.
+rsEstimatedTimeToCompletionInSeconds :: Lens' RestoreStatus (Maybe Integer)
+rsEstimatedTimeToCompletionInSeconds = lens _rsEstimatedTimeToCompletionInSeconds (\ s a -> s{_rsEstimatedTimeToCompletionInSeconds = a});
+
 -- | The number of megabytes per second being transferred from the backup
 -- storage. Returns the average rate for a completed backup.
 rsCurrentRestoreRateInMegaBytesPerSecond :: Lens' RestoreStatus (Maybe Double)
@@ -2349,8 +2349,8 @@
 instance FromXML RestoreStatus where
         parseXML x
           = RestoreStatus' <$>
-              (x .@? "EstimatedTimeToCompletionInSeconds") <*>
-                (x .@? "Status")
+              (x .@? "Status") <*>
+                (x .@? "EstimatedTimeToCompletionInSeconds")
                 <*> (x .@? "CurrentRestoreRateInMegaBytesPerSecond")
                 <*> (x .@? "ProgressInMegaBytes")
                 <*> (x .@? "ElapsedTimeInSeconds")
@@ -2360,8 +2360,8 @@
 --
 -- /See:/ 'snapshot' smart constructor.
 data Snapshot = Snapshot'
-    { _sRestorableNodeTypes                    :: !(Maybe [Text])
-    , _sStatus                                 :: !(Maybe Text)
+    { _sStatus                                 :: !(Maybe Text)
+    , _sRestorableNodeTypes                    :: !(Maybe [Text])
     , _sAccountsWithRestoreAccess              :: !(Maybe [AccountWithRestoreAccess])
     , _sSnapshotIdentifier                     :: !(Maybe Text)
     , _sEncryptedWithHSM                       :: !(Maybe Bool)
@@ -2373,31 +2373,31 @@
     , _sClusterIdentifier                      :: !(Maybe Text)
     , _sNumberOfNodes                          :: !(Maybe Int)
     , _sSnapshotType                           :: !(Maybe Text)
-    , _sAvailabilityZone                       :: !(Maybe Text)
     , _sKMSKeyId                               :: !(Maybe Text)
+    , _sAvailabilityZone                       :: !(Maybe Text)
     , _sCurrentBackupRateInMegaBytesPerSecond  :: !(Maybe Double)
     , _sSnapshotCreateTime                     :: !(Maybe ISO8601)
     , _sClusterVersion                         :: !(Maybe Text)
     , _sOwnerAccount                           :: !(Maybe Text)
     , _sNodeType                               :: !(Maybe Text)
-    , _sClusterCreateTime                      :: !(Maybe ISO8601)
     , _sElapsedTimeInSeconds                   :: !(Maybe Integer)
+    , _sClusterCreateTime                      :: !(Maybe ISO8601)
     , _sEstimatedSecondsToCompletion           :: !(Maybe Integer)
-    , _sTotalBackupSizeInMegaBytes             :: !(Maybe Double)
-    , _sDBName                                 :: !(Maybe Text)
-    , _sTags                                   :: !(Maybe [Tag])
     , _sActualIncrementalBackupSizeInMegaBytes :: !(Maybe Double)
+    , _sTags                                   :: !(Maybe [Tag])
     , _sPort                                   :: !(Maybe Int)
+    , _sTotalBackupSizeInMegaBytes             :: !(Maybe Double)
+    , _sDBName                                 :: !(Maybe Text)
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'Snapshot' with the minimum fields required to make a request.
 --
 -- Use one of the following lenses to modify other fields as desired:
 --
--- * 'sRestorableNodeTypes'
---
 -- * 'sStatus'
 --
+-- * 'sRestorableNodeTypes'
+--
 -- * 'sAccountsWithRestoreAccess'
 --
 -- * 'sSnapshotIdentifier'
@@ -2420,10 +2420,10 @@
 --
 -- * 'sSnapshotType'
 --
--- * 'sAvailabilityZone'
---
 -- * 'sKMSKeyId'
 --
+-- * 'sAvailabilityZone'
+--
 -- * 'sCurrentBackupRateInMegaBytesPerSecond'
 --
 -- * 'sSnapshotCreateTime'
@@ -2434,27 +2434,27 @@
 --
 -- * 'sNodeType'
 --
--- * 'sClusterCreateTime'
---
 -- * 'sElapsedTimeInSeconds'
 --
--- * 'sEstimatedSecondsToCompletion'
+-- * 'sClusterCreateTime'
 --
--- * 'sTotalBackupSizeInMegaBytes'
+-- * 'sEstimatedSecondsToCompletion'
 --
--- * 'sDBName'
+-- * 'sActualIncrementalBackupSizeInMegaBytes'
 --
 -- * 'sTags'
 --
--- * 'sActualIncrementalBackupSizeInMegaBytes'
---
 -- * 'sPort'
+--
+-- * 'sTotalBackupSizeInMegaBytes'
+--
+-- * 'sDBName'
 snapshot
     :: Snapshot
 snapshot =
     Snapshot'
-    { _sRestorableNodeTypes = Nothing
-    , _sStatus = Nothing
+    { _sStatus = Nothing
+    , _sRestorableNodeTypes = Nothing
     , _sAccountsWithRestoreAccess = Nothing
     , _sSnapshotIdentifier = Nothing
     , _sEncryptedWithHSM = Nothing
@@ -2466,28 +2466,23 @@
     , _sClusterIdentifier = Nothing
     , _sNumberOfNodes = Nothing
     , _sSnapshotType = Nothing
-    , _sAvailabilityZone = Nothing
     , _sKMSKeyId = Nothing
+    , _sAvailabilityZone = Nothing
     , _sCurrentBackupRateInMegaBytesPerSecond = Nothing
     , _sSnapshotCreateTime = Nothing
     , _sClusterVersion = Nothing
     , _sOwnerAccount = Nothing
     , _sNodeType = Nothing
-    , _sClusterCreateTime = Nothing
     , _sElapsedTimeInSeconds = Nothing
+    , _sClusterCreateTime = Nothing
     , _sEstimatedSecondsToCompletion = Nothing
-    , _sTotalBackupSizeInMegaBytes = Nothing
-    , _sDBName = Nothing
-    , _sTags = Nothing
     , _sActualIncrementalBackupSizeInMegaBytes = Nothing
+    , _sTags = Nothing
     , _sPort = Nothing
+    , _sTotalBackupSizeInMegaBytes = Nothing
+    , _sDBName = Nothing
     }
 
--- | The list of node types that this cluster snapshot is able to restore
--- into.
-sRestorableNodeTypes :: Lens' Snapshot [Text]
-sRestorableNodeTypes = lens _sRestorableNodeTypes (\ s a -> s{_sRestorableNodeTypes = a}) . _Default . _Coerce;
-
 -- | The snapshot status. The value of the status depends on the API
 -- operation used.
 --
@@ -2499,6 +2494,11 @@
 sStatus :: Lens' Snapshot (Maybe Text)
 sStatus = lens _sStatus (\ s a -> s{_sStatus = a});
 
+-- | The list of node types that this cluster snapshot is able to restore
+-- into.
+sRestorableNodeTypes :: Lens' Snapshot [Text]
+sRestorableNodeTypes = lens _sRestorableNodeTypes (\ s a -> s{_sRestorableNodeTypes = a}) . _Default . _Coerce;
+
 -- | A list of the AWS customer accounts authorized to restore the snapshot.
 -- Returns 'null' if no accounts are authorized. Visible only to the
 -- snapshot owner.
@@ -2550,16 +2550,16 @@
 sSnapshotType :: Lens' Snapshot (Maybe Text)
 sSnapshotType = lens _sSnapshotType (\ s a -> s{_sSnapshotType = a});
 
--- | The Availability Zone in which the cluster was created.
-sAvailabilityZone :: Lens' Snapshot (Maybe Text)
-sAvailabilityZone = lens _sAvailabilityZone (\ s a -> s{_sAvailabilityZone = a});
-
 -- | The AWS Key Management Service (KMS) key ID of the encryption key that
 -- was used to encrypt data in the cluster from which the snapshot was
 -- taken.
 sKMSKeyId :: Lens' Snapshot (Maybe Text)
 sKMSKeyId = lens _sKMSKeyId (\ s a -> s{_sKMSKeyId = a});
 
+-- | The Availability Zone in which the cluster was created.
+sAvailabilityZone :: Lens' Snapshot (Maybe Text)
+sAvailabilityZone = lens _sAvailabilityZone (\ s a -> s{_sAvailabilityZone = a});
+
 -- | The number of megabytes per second being transferred to the snapshot
 -- backup. Returns '0' for a completed backup.
 sCurrentBackupRateInMegaBytesPerSecond :: Lens' Snapshot (Maybe Double)
@@ -2586,47 +2586,47 @@
 sNodeType :: Lens' Snapshot (Maybe Text)
 sNodeType = lens _sNodeType (\ s a -> s{_sNodeType = a});
 
--- | The time (UTC) when the cluster was originally created.
-sClusterCreateTime :: Lens' Snapshot (Maybe UTCTime)
-sClusterCreateTime = lens _sClusterCreateTime (\ s a -> s{_sClusterCreateTime = a}) . mapping _Time;
-
 -- | The amount of time an in-progress snapshot backup has been running, or
 -- the amount of time it took a completed backup to finish.
 sElapsedTimeInSeconds :: Lens' Snapshot (Maybe Integer)
 sElapsedTimeInSeconds = lens _sElapsedTimeInSeconds (\ s a -> s{_sElapsedTimeInSeconds = a});
 
+-- | The time (UTC) when the cluster was originally created.
+sClusterCreateTime :: Lens' Snapshot (Maybe UTCTime)
+sClusterCreateTime = lens _sClusterCreateTime (\ s a -> s{_sClusterCreateTime = a}) . mapping _Time;
+
 -- | The estimate of the time remaining before the snapshot backup will
 -- complete. Returns '0' for a completed backup.
 sEstimatedSecondsToCompletion :: Lens' Snapshot (Maybe Integer)
 sEstimatedSecondsToCompletion = lens _sEstimatedSecondsToCompletion (\ s a -> s{_sEstimatedSecondsToCompletion = a});
 
--- | The size of the complete set of backup data that would be used to
--- restore the cluster.
-sTotalBackupSizeInMegaBytes :: Lens' Snapshot (Maybe Double)
-sTotalBackupSizeInMegaBytes = lens _sTotalBackupSizeInMegaBytes (\ s a -> s{_sTotalBackupSizeInMegaBytes = a});
-
--- | The name of the database that was created when the cluster was created.
-sDBName :: Lens' Snapshot (Maybe Text)
-sDBName = lens _sDBName (\ s a -> s{_sDBName = a});
+-- | The size of the incremental backup.
+sActualIncrementalBackupSizeInMegaBytes :: Lens' Snapshot (Maybe Double)
+sActualIncrementalBackupSizeInMegaBytes = lens _sActualIncrementalBackupSizeInMegaBytes (\ s a -> s{_sActualIncrementalBackupSizeInMegaBytes = a});
 
 -- | The list of tags for the cluster snapshot.
 sTags :: Lens' Snapshot [Tag]
 sTags = lens _sTags (\ s a -> s{_sTags = a}) . _Default . _Coerce;
 
--- | The size of the incremental backup.
-sActualIncrementalBackupSizeInMegaBytes :: Lens' Snapshot (Maybe Double)
-sActualIncrementalBackupSizeInMegaBytes = lens _sActualIncrementalBackupSizeInMegaBytes (\ s a -> s{_sActualIncrementalBackupSizeInMegaBytes = a});
-
 -- | The port that the cluster is listening on.
 sPort :: Lens' Snapshot (Maybe Int)
 sPort = lens _sPort (\ s a -> s{_sPort = a});
 
+-- | The size of the complete set of backup data that would be used to
+-- restore the cluster.
+sTotalBackupSizeInMegaBytes :: Lens' Snapshot (Maybe Double)
+sTotalBackupSizeInMegaBytes = lens _sTotalBackupSizeInMegaBytes (\ s a -> s{_sTotalBackupSizeInMegaBytes = a});
+
+-- | The name of the database that was created when the cluster was created.
+sDBName :: Lens' Snapshot (Maybe Text)
+sDBName = lens _sDBName (\ s a -> s{_sDBName = a});
+
 instance FromXML Snapshot where
         parseXML x
           = Snapshot' <$>
-              (x .@? "RestorableNodeTypes" .!@ mempty >>=
-                 may (parseXMLList "NodeType"))
-                <*> (x .@? "Status")
+              (x .@? "Status") <*>
+                (x .@? "RestorableNodeTypes" .!@ mempty >>=
+                   may (parseXMLList "NodeType"))
                 <*>
                 (x .@? "AccountsWithRestoreAccess" .!@ mempty >>=
                    may (parseXMLList "AccountWithRestoreAccess"))
@@ -2640,23 +2640,23 @@
                 <*> (x .@? "ClusterIdentifier")
                 <*> (x .@? "NumberOfNodes")
                 <*> (x .@? "SnapshotType")
-                <*> (x .@? "AvailabilityZone")
                 <*> (x .@? "KmsKeyId")
+                <*> (x .@? "AvailabilityZone")
                 <*> (x .@? "CurrentBackupRateInMegaBytesPerSecond")
                 <*> (x .@? "SnapshotCreateTime")
                 <*> (x .@? "ClusterVersion")
                 <*> (x .@? "OwnerAccount")
                 <*> (x .@? "NodeType")
-                <*> (x .@? "ClusterCreateTime")
                 <*> (x .@? "ElapsedTimeInSeconds")
+                <*> (x .@? "ClusterCreateTime")
                 <*> (x .@? "EstimatedSecondsToCompletion")
-                <*> (x .@? "TotalBackupSizeInMegaBytes")
-                <*> (x .@? "DBName")
+                <*> (x .@? "ActualIncrementalBackupSizeInMegaBytes")
                 <*>
                 (x .@? "Tags" .!@ mempty >>=
                    may (parseXMLList "Tag"))
-                <*> (x .@? "ActualIncrementalBackupSizeInMegaBytes")
                 <*> (x .@? "Port")
+                <*> (x .@? "TotalBackupSizeInMegaBytes")
+                <*> (x .@? "DBName")
 
 -- | The snapshot copy grant that grants Amazon Redshift permission to
 -- encrypt copied snapshots with the specified customer master key (CMK)
@@ -2801,8 +2801,8 @@
 --
 -- /See:/ 'taggedResource' smart constructor.
 data TaggedResource = TaggedResource'
-    { _trResourceType :: !(Maybe Text)
-    , _trTag          :: !(Maybe Tag)
+    { _trTag          :: !(Maybe Tag)
+    , _trResourceType :: !(Maybe Text)
     , _trResourceName :: !(Maybe Text)
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
@@ -2810,20 +2810,24 @@
 --
 -- Use one of the following lenses to modify other fields as desired:
 --
--- * 'trResourceType'
---
 -- * 'trTag'
 --
+-- * 'trResourceType'
+--
 -- * 'trResourceName'
 taggedResource
     :: TaggedResource
 taggedResource =
     TaggedResource'
-    { _trResourceType = Nothing
-    , _trTag = Nothing
+    { _trTag = Nothing
+    , _trResourceType = Nothing
     , _trResourceName = Nothing
     }
 
+-- | The tag for the resource.
+trTag :: Lens' TaggedResource (Maybe Tag)
+trTag = lens _trTag (\ s a -> s{_trTag = a});
+
 -- | The type of resource with which the tag is associated. Valid resource
 -- types are:
 --
@@ -2844,10 +2848,6 @@
 trResourceType :: Lens' TaggedResource (Maybe Text)
 trResourceType = lens _trResourceType (\ s a -> s{_trResourceType = a});
 
--- | The tag for the resource.
-trTag :: Lens' TaggedResource (Maybe Tag)
-trTag = lens _trTag (\ s a -> s{_trTag = a});
-
 -- | The Amazon Resource Name (ARN) with which the tag is associated. For
 -- example, 'arn:aws:redshift:us-east-1:123456789:cluster:t1'.
 trResourceName :: Lens' TaggedResource (Maybe Text)
@@ -2856,7 +2856,7 @@
 instance FromXML TaggedResource where
         parseXML x
           = TaggedResource' <$>
-              (x .@? "ResourceType") <*> (x .@? "Tag") <*>
+              (x .@? "Tag") <*> (x .@? "ResourceType") <*>
                 (x .@? "ResourceName")
 
 -- | Describes the members of a VPC security group.
diff --git a/test/Test/AWS/Gen/Redshift.hs b/test/Test/AWS/Gen/Redshift.hs
--- a/test/Test/AWS/Gen/Redshift.hs
+++ b/test/Test/AWS/Gen/Redshift.hs
@@ -34,83 +34,77 @@
 --         , testDescribeTags $
 --             describeTags
 --
---         , testModifyEventSubscription $
---             modifyEventSubscription
+--         , testDeleteClusterSubnetGroup $
+--             deleteClusterSubnetGroup
 --
 --         , testDisableLogging $
 --             disableLogging
 --
---         , testPurchaseReservedNodeOffering $
---             purchaseReservedNodeOffering
---
---         , testDeleteClusterSubnetGroup $
---             deleteClusterSubnetGroup
+--         , testModifyEventSubscription $
+--             modifyEventSubscription
 --
 --         , testDeleteClusterSnapshot $
 --             deleteClusterSnapshot
 --
---         , testDescribeEvents $
---             describeEvents
+--         , testPurchaseReservedNodeOffering $
+--             purchaseReservedNodeOffering
 --
 --         , testDescribeReservedNodeOfferings $
 --             describeReservedNodeOfferings
 --
---         , testDescribeClusterParameterGroups $
---             describeClusterParameterGroups
---
---         , testCreateClusterSubnetGroup $
---             createClusterSubnetGroup
+--         , testDescribeEvents $
+--             describeEvents
 --
 --         , testDescribeReservedNodes $
 --             describeReservedNodes
 --
+--         , testDescribeClusterParameterGroups $
+--             describeClusterParameterGroups
+--
 --         , testEnableLogging $
 --             enableLogging
 --
---         , testCreateTags $
---             createTags
---
---         , testDescribeClusterSecurityGroups $
---             describeClusterSecurityGroups
+--         , testCreateClusterSubnetGroup $
+--             createClusterSubnetGroup
 --
 --         , testDeleteClusterParameterGroup $
 --             deleteClusterParameterGroup
 --
---         , testDeleteTags $
---             deleteTags
+--         , testDescribeClusterSecurityGroups $
+--             describeClusterSecurityGroups
 --
+--         , testCreateTags $
+--             createTags
+--
 --         , testEnableSnapshotCopy $
 --             enableSnapshotCopy
 --
---         , testModifySnapshotCopyRetentionPeriod $
---             modifySnapshotCopyRetentionPeriod
---
 --         , testDescribeClusterSnapshots $
 --             describeClusterSnapshots
 --
+--         , testDeleteTags $
+--             deleteTags
+--
 --         , testDescribeClusterSubnetGroups $
 --             describeClusterSubnetGroups
 --
+--         , testModifySnapshotCopyRetentionPeriod $
+--             modifySnapshotCopyRetentionPeriod
+--
 --         , testAuthorizeSnapshotAccess $
 --             authorizeSnapshotAccess
 --
---         , testCreateEventSubscription $
---             createEventSubscription
---
 --         , testRebootCluster $
 --             rebootCluster
 --
---         , testDescribeOrderableClusterOptions $
---             describeOrderableClusterOptions
---
 --         , testDeleteCluster $
 --             deleteCluster
 --
---         , testDeleteEventSubscription $
---             deleteEventSubscription
+--         , testCreateEventSubscription $
+--             createEventSubscription
 --
---         , testDescribeDefaultClusterParameters $
---             describeDefaultClusterParameters
+--         , testDescribeOrderableClusterOptions $
+--             describeOrderableClusterOptions
 --
 --         , testCreateCluster $
 --             createCluster
@@ -118,71 +112,74 @@
 --         , testCreateHSMClientCertificate $
 --             createHSMClientCertificate
 --
+--         , testDescribeDefaultClusterParameters $
+--             describeDefaultClusterParameters
+--
+--         , testDeleteEventSubscription $
+--             deleteEventSubscription
+--
 --         , testResetClusterParameterGroup $
 --             resetClusterParameterGroup
 --
 --         , testDescribeEventSubscriptions $
 --             describeEventSubscriptions
 --
+--         , testRevokeClusterSecurityGroupIngress $
+--             revokeClusterSecurityGroupIngress
+--
 --         , testDescribeHSMClientCertificates $
 --             describeHSMClientCertificates
 --
 --         , testModifyClusterParameterGroup $
 --             modifyClusterParameterGroup
 --
---         , testRevokeClusterSecurityGroupIngress $
---             revokeClusterSecurityGroupIngress
---
---         , testAuthorizeClusterSecurityGroupIngress $
---             authorizeClusterSecurityGroupIngress
---
 --         , testCreateClusterSecurityGroup $
 --             createClusterSecurityGroup
 --
---         , testDescribeResize $
---             describeResize
---
 --         , testDescribeEventCategories $
 --             describeEventCategories
 --
+--         , testDescribeResize $
+--             describeResize
+--
 --         , testDeleteHSMConfiguration $
 --             deleteHSMConfiguration
 --
---         , testDeleteClusterSecurityGroup $
---             deleteClusterSecurityGroup
+--         , testAuthorizeClusterSecurityGroupIngress $
+--             authorizeClusterSecurityGroupIngress
 --
+--         , testCreateClusterSnapshot $
+--             createClusterSnapshot
+--
 --         , testCreateHSMConfiguration $
 --             createHSMConfiguration
 --
+--         , testDescribeLoggingStatus $
+--             describeLoggingStatus
+--
 --         , testModifyCluster $
 --             modifyCluster
 --
---         , testCreateClusterSnapshot $
---             createClusterSnapshot
+--         , testDeleteClusterSecurityGroup $
+--             deleteClusterSecurityGroup
 --
---         , testDescribeLoggingStatus $
---             describeLoggingStatus
+--         , testDisableSnapshotCopy $
+--             disableSnapshotCopy
 --
 --         , testDescribeClusterParameters $
 --             describeClusterParameters
 --
---         , testDisableSnapshotCopy $
---             disableSnapshotCopy
---
 --         , testRestoreFromClusterSnapshot $
 --             restoreFromClusterSnapshot
 --
---         , testDescribeHSMConfigurations $
---             describeHSMConfigurations
---
 --         , testCreateClusterParameterGroup $
 --             createClusterParameterGroup
 --
 --         , testRevokeSnapshotAccess $
 --             revokeSnapshotAccess
 --
---         , testDeleteHSMClientCertificate $
---             deleteHSMClientCertificate
+--         , testDescribeHSMConfigurations $
+--             describeHSMConfigurations
 --
 --         , testCreateSnapshotCopyGrant $
 --             createSnapshotCopyGrant
@@ -190,21 +187,24 @@
 --         , testCopyClusterSnapshot $
 --             copyClusterSnapshot
 --
+--         , testDeleteHSMClientCertificate $
+--             deleteHSMClientCertificate
+--
+--         , testDeleteSnapshotCopyGrant $
+--             deleteSnapshotCopyGrant
+--
 --         , testDescribeClusterVersions $
 --             describeClusterVersions
 --
 --         , testModifyClusterSubnetGroup $
 --             modifyClusterSubnetGroup
 --
---         , testDeleteSnapshotCopyGrant $
---             deleteSnapshotCopyGrant
+--         , testRotateEncryptionKey $
+--             rotateEncryptionKey
 --
 --         , testDescribeSnapshotCopyGrants $
 --             describeSnapshotCopyGrants
 --
---         , testRotateEncryptionKey $
---             rotateEncryptionKey
---
 --           ]
 
 --     , testGroup "response"
@@ -214,83 +214,77 @@
 --         , testDescribeTagsResponse $
 --             describeTagsResponse
 --
---         , testModifyEventSubscriptionResponse $
---             modifyEventSubscriptionResponse
+--         , testDeleteClusterSubnetGroupResponse $
+--             deleteClusterSubnetGroupResponse
 --
 --         , testDisableLoggingResponse $
 --             loggingStatus
 --
---         , testPurchaseReservedNodeOfferingResponse $
---             purchaseReservedNodeOfferingResponse
---
---         , testDeleteClusterSubnetGroupResponse $
---             deleteClusterSubnetGroupResponse
+--         , testModifyEventSubscriptionResponse $
+--             modifyEventSubscriptionResponse
 --
 --         , testDeleteClusterSnapshotResponse $
 --             deleteClusterSnapshotResponse
 --
---         , testDescribeEventsResponse $
---             describeEventsResponse
+--         , testPurchaseReservedNodeOfferingResponse $
+--             purchaseReservedNodeOfferingResponse
 --
 --         , testDescribeReservedNodeOfferingsResponse $
 --             describeReservedNodeOfferingsResponse
 --
---         , testDescribeClusterParameterGroupsResponse $
---             describeClusterParameterGroupsResponse
---
---         , testCreateClusterSubnetGroupResponse $
---             createClusterSubnetGroupResponse
+--         , testDescribeEventsResponse $
+--             describeEventsResponse
 --
 --         , testDescribeReservedNodesResponse $
 --             describeReservedNodesResponse
 --
+--         , testDescribeClusterParameterGroupsResponse $
+--             describeClusterParameterGroupsResponse
+--
 --         , testEnableLoggingResponse $
 --             loggingStatus
 --
---         , testCreateTagsResponse $
---             createTagsResponse
---
---         , testDescribeClusterSecurityGroupsResponse $
---             describeClusterSecurityGroupsResponse
+--         , testCreateClusterSubnetGroupResponse $
+--             createClusterSubnetGroupResponse
 --
 --         , testDeleteClusterParameterGroupResponse $
 --             deleteClusterParameterGroupResponse
 --
---         , testDeleteTagsResponse $
---             deleteTagsResponse
+--         , testDescribeClusterSecurityGroupsResponse $
+--             describeClusterSecurityGroupsResponse
 --
+--         , testCreateTagsResponse $
+--             createTagsResponse
+--
 --         , testEnableSnapshotCopyResponse $
 --             enableSnapshotCopyResponse
 --
---         , testModifySnapshotCopyRetentionPeriodResponse $
---             modifySnapshotCopyRetentionPeriodResponse
---
 --         , testDescribeClusterSnapshotsResponse $
 --             describeClusterSnapshotsResponse
 --
+--         , testDeleteTagsResponse $
+--             deleteTagsResponse
+--
 --         , testDescribeClusterSubnetGroupsResponse $
 --             describeClusterSubnetGroupsResponse
 --
+--         , testModifySnapshotCopyRetentionPeriodResponse $
+--             modifySnapshotCopyRetentionPeriodResponse
+--
 --         , testAuthorizeSnapshotAccessResponse $
 --             authorizeSnapshotAccessResponse
 --
---         , testCreateEventSubscriptionResponse $
---             createEventSubscriptionResponse
---
 --         , testRebootClusterResponse $
 --             rebootClusterResponse
 --
---         , testDescribeOrderableClusterOptionsResponse $
---             describeOrderableClusterOptionsResponse
---
 --         , testDeleteClusterResponse $
 --             deleteClusterResponse
 --
---         , testDeleteEventSubscriptionResponse $
---             deleteEventSubscriptionResponse
+--         , testCreateEventSubscriptionResponse $
+--             createEventSubscriptionResponse
 --
---         , testDescribeDefaultClusterParametersResponse $
---             describeDefaultClusterParametersResponse
+--         , testDescribeOrderableClusterOptionsResponse $
+--             describeOrderableClusterOptionsResponse
 --
 --         , testCreateClusterResponse $
 --             createClusterResponse
@@ -298,71 +292,74 @@
 --         , testCreateHSMClientCertificateResponse $
 --             createHSMClientCertificateResponse
 --
+--         , testDescribeDefaultClusterParametersResponse $
+--             describeDefaultClusterParametersResponse
+--
+--         , testDeleteEventSubscriptionResponse $
+--             deleteEventSubscriptionResponse
+--
 --         , testResetClusterParameterGroupResponse $
 --             clusterParameterGroupNameMessage
 --
 --         , testDescribeEventSubscriptionsResponse $
 --             describeEventSubscriptionsResponse
 --
+--         , testRevokeClusterSecurityGroupIngressResponse $
+--             revokeClusterSecurityGroupIngressResponse
+--
 --         , testDescribeHSMClientCertificatesResponse $
 --             describeHSMClientCertificatesResponse
 --
 --         , testModifyClusterParameterGroupResponse $
 --             clusterParameterGroupNameMessage
 --
---         , testRevokeClusterSecurityGroupIngressResponse $
---             revokeClusterSecurityGroupIngressResponse
---
---         , testAuthorizeClusterSecurityGroupIngressResponse $
---             authorizeClusterSecurityGroupIngressResponse
---
 --         , testCreateClusterSecurityGroupResponse $
 --             createClusterSecurityGroupResponse
 --
---         , testDescribeResizeResponse $
---             describeResizeResponse
---
 --         , testDescribeEventCategoriesResponse $
 --             describeEventCategoriesResponse
 --
+--         , testDescribeResizeResponse $
+--             describeResizeResponse
+--
 --         , testDeleteHSMConfigurationResponse $
 --             deleteHSMConfigurationResponse
 --
---         , testDeleteClusterSecurityGroupResponse $
---             deleteClusterSecurityGroupResponse
+--         , testAuthorizeClusterSecurityGroupIngressResponse $
+--             authorizeClusterSecurityGroupIngressResponse
 --
+--         , testCreateClusterSnapshotResponse $
+--             createClusterSnapshotResponse
+--
 --         , testCreateHSMConfigurationResponse $
 --             createHSMConfigurationResponse
 --
+--         , testDescribeLoggingStatusResponse $
+--             loggingStatus
+--
 --         , testModifyClusterResponse $
 --             modifyClusterResponse
 --
---         , testCreateClusterSnapshotResponse $
---             createClusterSnapshotResponse
+--         , testDeleteClusterSecurityGroupResponse $
+--             deleteClusterSecurityGroupResponse
 --
---         , testDescribeLoggingStatusResponse $
---             loggingStatus
+--         , testDisableSnapshotCopyResponse $
+--             disableSnapshotCopyResponse
 --
 --         , testDescribeClusterParametersResponse $
 --             describeClusterParametersResponse
 --
---         , testDisableSnapshotCopyResponse $
---             disableSnapshotCopyResponse
---
 --         , testRestoreFromClusterSnapshotResponse $
 --             restoreFromClusterSnapshotResponse
 --
---         , testDescribeHSMConfigurationsResponse $
---             describeHSMConfigurationsResponse
---
 --         , testCreateClusterParameterGroupResponse $
 --             createClusterParameterGroupResponse
 --
 --         , testRevokeSnapshotAccessResponse $
 --             revokeSnapshotAccessResponse
 --
---         , testDeleteHSMClientCertificateResponse $
---             deleteHSMClientCertificateResponse
+--         , testDescribeHSMConfigurationsResponse $
+--             describeHSMConfigurationsResponse
 --
 --         , testCreateSnapshotCopyGrantResponse $
 --             createSnapshotCopyGrantResponse
@@ -370,21 +367,24 @@
 --         , testCopyClusterSnapshotResponse $
 --             copyClusterSnapshotResponse
 --
+--         , testDeleteHSMClientCertificateResponse $
+--             deleteHSMClientCertificateResponse
+--
+--         , testDeleteSnapshotCopyGrantResponse $
+--             deleteSnapshotCopyGrantResponse
+--
 --         , testDescribeClusterVersionsResponse $
 --             describeClusterVersionsResponse
 --
 --         , testModifyClusterSubnetGroupResponse $
 --             modifyClusterSubnetGroupResponse
 --
---         , testDeleteSnapshotCopyGrantResponse $
---             deleteSnapshotCopyGrantResponse
+--         , testRotateEncryptionKeyResponse $
+--             rotateEncryptionKeyResponse
 --
 --         , testDescribeSnapshotCopyGrantsResponse $
 --             describeSnapshotCopyGrantsResponse
 --
---         , testRotateEncryptionKeyResponse $
---             rotateEncryptionKeyResponse
---
 --           ]
 --     ]
 
@@ -400,135 +400,125 @@
     "DescribeTags"
     "fixture/DescribeTags.yaml"
 
-testModifyEventSubscription :: ModifyEventSubscription -> TestTree
-testModifyEventSubscription = req
-    "ModifyEventSubscription"
-    "fixture/ModifyEventSubscription.yaml"
+testDeleteClusterSubnetGroup :: DeleteClusterSubnetGroup -> TestTree
+testDeleteClusterSubnetGroup = req
+    "DeleteClusterSubnetGroup"
+    "fixture/DeleteClusterSubnetGroup.yaml"
 
 testDisableLogging :: DisableLogging -> TestTree
 testDisableLogging = req
     "DisableLogging"
     "fixture/DisableLogging.yaml"
 
-testPurchaseReservedNodeOffering :: PurchaseReservedNodeOffering -> TestTree
-testPurchaseReservedNodeOffering = req
-    "PurchaseReservedNodeOffering"
-    "fixture/PurchaseReservedNodeOffering.yaml"
-
-testDeleteClusterSubnetGroup :: DeleteClusterSubnetGroup -> TestTree
-testDeleteClusterSubnetGroup = req
-    "DeleteClusterSubnetGroup"
-    "fixture/DeleteClusterSubnetGroup.yaml"
+testModifyEventSubscription :: ModifyEventSubscription -> TestTree
+testModifyEventSubscription = req
+    "ModifyEventSubscription"
+    "fixture/ModifyEventSubscription.yaml"
 
 testDeleteClusterSnapshot :: DeleteClusterSnapshot -> TestTree
 testDeleteClusterSnapshot = req
     "DeleteClusterSnapshot"
     "fixture/DeleteClusterSnapshot.yaml"
 
-testDescribeEvents :: DescribeEvents -> TestTree
-testDescribeEvents = req
-    "DescribeEvents"
-    "fixture/DescribeEvents.yaml"
+testPurchaseReservedNodeOffering :: PurchaseReservedNodeOffering -> TestTree
+testPurchaseReservedNodeOffering = req
+    "PurchaseReservedNodeOffering"
+    "fixture/PurchaseReservedNodeOffering.yaml"
 
 testDescribeReservedNodeOfferings :: DescribeReservedNodeOfferings -> TestTree
 testDescribeReservedNodeOfferings = req
     "DescribeReservedNodeOfferings"
     "fixture/DescribeReservedNodeOfferings.yaml"
 
-testDescribeClusterParameterGroups :: DescribeClusterParameterGroups -> TestTree
-testDescribeClusterParameterGroups = req
-    "DescribeClusterParameterGroups"
-    "fixture/DescribeClusterParameterGroups.yaml"
-
-testCreateClusterSubnetGroup :: CreateClusterSubnetGroup -> TestTree
-testCreateClusterSubnetGroup = req
-    "CreateClusterSubnetGroup"
-    "fixture/CreateClusterSubnetGroup.yaml"
+testDescribeEvents :: DescribeEvents -> TestTree
+testDescribeEvents = req
+    "DescribeEvents"
+    "fixture/DescribeEvents.yaml"
 
 testDescribeReservedNodes :: DescribeReservedNodes -> TestTree
 testDescribeReservedNodes = req
     "DescribeReservedNodes"
     "fixture/DescribeReservedNodes.yaml"
 
+testDescribeClusterParameterGroups :: DescribeClusterParameterGroups -> TestTree
+testDescribeClusterParameterGroups = req
+    "DescribeClusterParameterGroups"
+    "fixture/DescribeClusterParameterGroups.yaml"
+
 testEnableLogging :: EnableLogging -> TestTree
 testEnableLogging = req
     "EnableLogging"
     "fixture/EnableLogging.yaml"
 
-testCreateTags :: CreateTags -> TestTree
-testCreateTags = req
-    "CreateTags"
-    "fixture/CreateTags.yaml"
-
-testDescribeClusterSecurityGroups :: DescribeClusterSecurityGroups -> TestTree
-testDescribeClusterSecurityGroups = req
-    "DescribeClusterSecurityGroups"
-    "fixture/DescribeClusterSecurityGroups.yaml"
+testCreateClusterSubnetGroup :: CreateClusterSubnetGroup -> TestTree
+testCreateClusterSubnetGroup = req
+    "CreateClusterSubnetGroup"
+    "fixture/CreateClusterSubnetGroup.yaml"
 
 testDeleteClusterParameterGroup :: DeleteClusterParameterGroup -> TestTree
 testDeleteClusterParameterGroup = req
     "DeleteClusterParameterGroup"
     "fixture/DeleteClusterParameterGroup.yaml"
 
-testDeleteTags :: DeleteTags -> TestTree
-testDeleteTags = req
-    "DeleteTags"
-    "fixture/DeleteTags.yaml"
+testDescribeClusterSecurityGroups :: DescribeClusterSecurityGroups -> TestTree
+testDescribeClusterSecurityGroups = req
+    "DescribeClusterSecurityGroups"
+    "fixture/DescribeClusterSecurityGroups.yaml"
 
+testCreateTags :: CreateTags -> TestTree
+testCreateTags = req
+    "CreateTags"
+    "fixture/CreateTags.yaml"
+
 testEnableSnapshotCopy :: EnableSnapshotCopy -> TestTree
 testEnableSnapshotCopy = req
     "EnableSnapshotCopy"
     "fixture/EnableSnapshotCopy.yaml"
 
-testModifySnapshotCopyRetentionPeriod :: ModifySnapshotCopyRetentionPeriod -> TestTree
-testModifySnapshotCopyRetentionPeriod = req
-    "ModifySnapshotCopyRetentionPeriod"
-    "fixture/ModifySnapshotCopyRetentionPeriod.yaml"
-
 testDescribeClusterSnapshots :: DescribeClusterSnapshots -> TestTree
 testDescribeClusterSnapshots = req
     "DescribeClusterSnapshots"
     "fixture/DescribeClusterSnapshots.yaml"
 
+testDeleteTags :: DeleteTags -> TestTree
+testDeleteTags = req
+    "DeleteTags"
+    "fixture/DeleteTags.yaml"
+
 testDescribeClusterSubnetGroups :: DescribeClusterSubnetGroups -> TestTree
 testDescribeClusterSubnetGroups = req
     "DescribeClusterSubnetGroups"
     "fixture/DescribeClusterSubnetGroups.yaml"
 
+testModifySnapshotCopyRetentionPeriod :: ModifySnapshotCopyRetentionPeriod -> TestTree
+testModifySnapshotCopyRetentionPeriod = req
+    "ModifySnapshotCopyRetentionPeriod"
+    "fixture/ModifySnapshotCopyRetentionPeriod.yaml"
+
 testAuthorizeSnapshotAccess :: AuthorizeSnapshotAccess -> TestTree
 testAuthorizeSnapshotAccess = req
     "AuthorizeSnapshotAccess"
     "fixture/AuthorizeSnapshotAccess.yaml"
 
-testCreateEventSubscription :: CreateEventSubscription -> TestTree
-testCreateEventSubscription = req
-    "CreateEventSubscription"
-    "fixture/CreateEventSubscription.yaml"
-
 testRebootCluster :: RebootCluster -> TestTree
 testRebootCluster = req
     "RebootCluster"
     "fixture/RebootCluster.yaml"
 
-testDescribeOrderableClusterOptions :: DescribeOrderableClusterOptions -> TestTree
-testDescribeOrderableClusterOptions = req
-    "DescribeOrderableClusterOptions"
-    "fixture/DescribeOrderableClusterOptions.yaml"
-
 testDeleteCluster :: DeleteCluster -> TestTree
 testDeleteCluster = req
     "DeleteCluster"
     "fixture/DeleteCluster.yaml"
 
-testDeleteEventSubscription :: DeleteEventSubscription -> TestTree
-testDeleteEventSubscription = req
-    "DeleteEventSubscription"
-    "fixture/DeleteEventSubscription.yaml"
+testCreateEventSubscription :: CreateEventSubscription -> TestTree
+testCreateEventSubscription = req
+    "CreateEventSubscription"
+    "fixture/CreateEventSubscription.yaml"
 
-testDescribeDefaultClusterParameters :: DescribeDefaultClusterParameters -> TestTree
-testDescribeDefaultClusterParameters = req
-    "DescribeDefaultClusterParameters"
-    "fixture/DescribeDefaultClusterParameters.yaml"
+testDescribeOrderableClusterOptions :: DescribeOrderableClusterOptions -> TestTree
+testDescribeOrderableClusterOptions = req
+    "DescribeOrderableClusterOptions"
+    "fixture/DescribeOrderableClusterOptions.yaml"
 
 testCreateCluster :: CreateCluster -> TestTree
 testCreateCluster = req
@@ -540,6 +530,16 @@
     "CreateHSMClientCertificate"
     "fixture/CreateHSMClientCertificate.yaml"
 
+testDescribeDefaultClusterParameters :: DescribeDefaultClusterParameters -> TestTree
+testDescribeDefaultClusterParameters = req
+    "DescribeDefaultClusterParameters"
+    "fixture/DescribeDefaultClusterParameters.yaml"
+
+testDeleteEventSubscription :: DeleteEventSubscription -> TestTree
+testDeleteEventSubscription = req
+    "DeleteEventSubscription"
+    "fixture/DeleteEventSubscription.yaml"
+
 testResetClusterParameterGroup :: ResetClusterParameterGroup -> TestTree
 testResetClusterParameterGroup = req
     "ResetClusterParameterGroup"
@@ -550,6 +550,11 @@
     "DescribeEventSubscriptions"
     "fixture/DescribeEventSubscriptions.yaml"
 
+testRevokeClusterSecurityGroupIngress :: RevokeClusterSecurityGroupIngress -> TestTree
+testRevokeClusterSecurityGroupIngress = req
+    "RevokeClusterSecurityGroupIngress"
+    "fixture/RevokeClusterSecurityGroupIngress.yaml"
+
 testDescribeHSMClientCertificates :: DescribeHSMClientCertificates -> TestTree
 testDescribeHSMClientCertificates = req
     "DescribeHSMClientCertificates"
@@ -560,81 +565,71 @@
     "ModifyClusterParameterGroup"
     "fixture/ModifyClusterParameterGroup.yaml"
 
-testRevokeClusterSecurityGroupIngress :: RevokeClusterSecurityGroupIngress -> TestTree
-testRevokeClusterSecurityGroupIngress = req
-    "RevokeClusterSecurityGroupIngress"
-    "fixture/RevokeClusterSecurityGroupIngress.yaml"
-
-testAuthorizeClusterSecurityGroupIngress :: AuthorizeClusterSecurityGroupIngress -> TestTree
-testAuthorizeClusterSecurityGroupIngress = req
-    "AuthorizeClusterSecurityGroupIngress"
-    "fixture/AuthorizeClusterSecurityGroupIngress.yaml"
-
 testCreateClusterSecurityGroup :: CreateClusterSecurityGroup -> TestTree
 testCreateClusterSecurityGroup = req
     "CreateClusterSecurityGroup"
     "fixture/CreateClusterSecurityGroup.yaml"
 
-testDescribeResize :: DescribeResize -> TestTree
-testDescribeResize = req
-    "DescribeResize"
-    "fixture/DescribeResize.yaml"
-
 testDescribeEventCategories :: DescribeEventCategories -> TestTree
 testDescribeEventCategories = req
     "DescribeEventCategories"
     "fixture/DescribeEventCategories.yaml"
 
+testDescribeResize :: DescribeResize -> TestTree
+testDescribeResize = req
+    "DescribeResize"
+    "fixture/DescribeResize.yaml"
+
 testDeleteHSMConfiguration :: DeleteHSMConfiguration -> TestTree
 testDeleteHSMConfiguration = req
     "DeleteHSMConfiguration"
     "fixture/DeleteHSMConfiguration.yaml"
 
-testDeleteClusterSecurityGroup :: DeleteClusterSecurityGroup -> TestTree
-testDeleteClusterSecurityGroup = req
-    "DeleteClusterSecurityGroup"
-    "fixture/DeleteClusterSecurityGroup.yaml"
+testAuthorizeClusterSecurityGroupIngress :: AuthorizeClusterSecurityGroupIngress -> TestTree
+testAuthorizeClusterSecurityGroupIngress = req
+    "AuthorizeClusterSecurityGroupIngress"
+    "fixture/AuthorizeClusterSecurityGroupIngress.yaml"
 
+testCreateClusterSnapshot :: CreateClusterSnapshot -> TestTree
+testCreateClusterSnapshot = req
+    "CreateClusterSnapshot"
+    "fixture/CreateClusterSnapshot.yaml"
+
 testCreateHSMConfiguration :: CreateHSMConfiguration -> TestTree
 testCreateHSMConfiguration = req
     "CreateHSMConfiguration"
     "fixture/CreateHSMConfiguration.yaml"
 
+testDescribeLoggingStatus :: DescribeLoggingStatus -> TestTree
+testDescribeLoggingStatus = req
+    "DescribeLoggingStatus"
+    "fixture/DescribeLoggingStatus.yaml"
+
 testModifyCluster :: ModifyCluster -> TestTree
 testModifyCluster = req
     "ModifyCluster"
     "fixture/ModifyCluster.yaml"
 
-testCreateClusterSnapshot :: CreateClusterSnapshot -> TestTree
-testCreateClusterSnapshot = req
-    "CreateClusterSnapshot"
-    "fixture/CreateClusterSnapshot.yaml"
+testDeleteClusterSecurityGroup :: DeleteClusterSecurityGroup -> TestTree
+testDeleteClusterSecurityGroup = req
+    "DeleteClusterSecurityGroup"
+    "fixture/DeleteClusterSecurityGroup.yaml"
 
-testDescribeLoggingStatus :: DescribeLoggingStatus -> TestTree
-testDescribeLoggingStatus = req
-    "DescribeLoggingStatus"
-    "fixture/DescribeLoggingStatus.yaml"
+testDisableSnapshotCopy :: DisableSnapshotCopy -> TestTree
+testDisableSnapshotCopy = req
+    "DisableSnapshotCopy"
+    "fixture/DisableSnapshotCopy.yaml"
 
 testDescribeClusterParameters :: DescribeClusterParameters -> TestTree
 testDescribeClusterParameters = req
     "DescribeClusterParameters"
     "fixture/DescribeClusterParameters.yaml"
 
-testDisableSnapshotCopy :: DisableSnapshotCopy -> TestTree
-testDisableSnapshotCopy = req
-    "DisableSnapshotCopy"
-    "fixture/DisableSnapshotCopy.yaml"
-
 testRestoreFromClusterSnapshot :: RestoreFromClusterSnapshot -> TestTree
 testRestoreFromClusterSnapshot = req
     "RestoreFromClusterSnapshot"
     "fixture/RestoreFromClusterSnapshot.yaml"
 
-testDescribeHSMConfigurations :: DescribeHSMConfigurations -> TestTree
-testDescribeHSMConfigurations = req
-    "DescribeHSMConfigurations"
-    "fixture/DescribeHSMConfigurations.yaml"
-
 testCreateClusterParameterGroup :: CreateClusterParameterGroup -> TestTree
 testCreateClusterParameterGroup = req
     "CreateClusterParameterGroup"
@@ -645,10 +640,10 @@
     "RevokeSnapshotAccess"
     "fixture/RevokeSnapshotAccess.yaml"
 
-testDeleteHSMClientCertificate :: DeleteHSMClientCertificate -> TestTree
-testDeleteHSMClientCertificate = req
-    "DeleteHSMClientCertificate"
-    "fixture/DeleteHSMClientCertificate.yaml"
+testDescribeHSMConfigurations :: DescribeHSMConfigurations -> TestTree
+testDescribeHSMConfigurations = req
+    "DescribeHSMConfigurations"
+    "fixture/DescribeHSMConfigurations.yaml"
 
 testCreateSnapshotCopyGrant :: CreateSnapshotCopyGrant -> TestTree
 testCreateSnapshotCopyGrant = req
@@ -660,6 +655,16 @@
     "CopyClusterSnapshot"
     "fixture/CopyClusterSnapshot.yaml"
 
+testDeleteHSMClientCertificate :: DeleteHSMClientCertificate -> TestTree
+testDeleteHSMClientCertificate = req
+    "DeleteHSMClientCertificate"
+    "fixture/DeleteHSMClientCertificate.yaml"
+
+testDeleteSnapshotCopyGrant :: DeleteSnapshotCopyGrant -> TestTree
+testDeleteSnapshotCopyGrant = req
+    "DeleteSnapshotCopyGrant"
+    "fixture/DeleteSnapshotCopyGrant.yaml"
+
 testDescribeClusterVersions :: DescribeClusterVersions -> TestTree
 testDescribeClusterVersions = req
     "DescribeClusterVersions"
@@ -670,21 +675,16 @@
     "ModifyClusterSubnetGroup"
     "fixture/ModifyClusterSubnetGroup.yaml"
 
-testDeleteSnapshotCopyGrant :: DeleteSnapshotCopyGrant -> TestTree
-testDeleteSnapshotCopyGrant = req
-    "DeleteSnapshotCopyGrant"
-    "fixture/DeleteSnapshotCopyGrant.yaml"
+testRotateEncryptionKey :: RotateEncryptionKey -> TestTree
+testRotateEncryptionKey = req
+    "RotateEncryptionKey"
+    "fixture/RotateEncryptionKey.yaml"
 
 testDescribeSnapshotCopyGrants :: DescribeSnapshotCopyGrants -> TestTree
 testDescribeSnapshotCopyGrants = req
     "DescribeSnapshotCopyGrants"
     "fixture/DescribeSnapshotCopyGrants.yaml"
 
-testRotateEncryptionKey :: RotateEncryptionKey -> TestTree
-testRotateEncryptionKey = req
-    "RotateEncryptionKey"
-    "fixture/RotateEncryptionKey.yaml"
-
 -- Responses
 
 testDescribeClustersResponse :: DescribeClustersResponse -> TestTree
@@ -701,12 +701,12 @@
     redshift
     (Proxy :: Proxy DescribeTags)
 
-testModifyEventSubscriptionResponse :: ModifyEventSubscriptionResponse -> TestTree
-testModifyEventSubscriptionResponse = res
-    "ModifyEventSubscriptionResponse"
-    "fixture/ModifyEventSubscriptionResponse.proto"
+testDeleteClusterSubnetGroupResponse :: DeleteClusterSubnetGroupResponse -> TestTree
+testDeleteClusterSubnetGroupResponse = res
+    "DeleteClusterSubnetGroupResponse"
+    "fixture/DeleteClusterSubnetGroupResponse.proto"
     redshift
-    (Proxy :: Proxy ModifyEventSubscription)
+    (Proxy :: Proxy DeleteClusterSubnetGroup)
 
 testDisableLoggingResponse :: LoggingStatus -> TestTree
 testDisableLoggingResponse = res
@@ -715,19 +715,12 @@
     redshift
     (Proxy :: Proxy DisableLogging)
 
-testPurchaseReservedNodeOfferingResponse :: PurchaseReservedNodeOfferingResponse -> TestTree
-testPurchaseReservedNodeOfferingResponse = res
-    "PurchaseReservedNodeOfferingResponse"
-    "fixture/PurchaseReservedNodeOfferingResponse.proto"
-    redshift
-    (Proxy :: Proxy PurchaseReservedNodeOffering)
-
-testDeleteClusterSubnetGroupResponse :: DeleteClusterSubnetGroupResponse -> TestTree
-testDeleteClusterSubnetGroupResponse = res
-    "DeleteClusterSubnetGroupResponse"
-    "fixture/DeleteClusterSubnetGroupResponse.proto"
+testModifyEventSubscriptionResponse :: ModifyEventSubscriptionResponse -> TestTree
+testModifyEventSubscriptionResponse = res
+    "ModifyEventSubscriptionResponse"
+    "fixture/ModifyEventSubscriptionResponse.proto"
     redshift
-    (Proxy :: Proxy DeleteClusterSubnetGroup)
+    (Proxy :: Proxy ModifyEventSubscription)
 
 testDeleteClusterSnapshotResponse :: DeleteClusterSnapshotResponse -> TestTree
 testDeleteClusterSnapshotResponse = res
@@ -736,12 +729,12 @@
     redshift
     (Proxy :: Proxy DeleteClusterSnapshot)
 
-testDescribeEventsResponse :: DescribeEventsResponse -> TestTree
-testDescribeEventsResponse = res
-    "DescribeEventsResponse"
-    "fixture/DescribeEventsResponse.proto"
+testPurchaseReservedNodeOfferingResponse :: PurchaseReservedNodeOfferingResponse -> TestTree
+testPurchaseReservedNodeOfferingResponse = res
+    "PurchaseReservedNodeOfferingResponse"
+    "fixture/PurchaseReservedNodeOfferingResponse.proto"
     redshift
-    (Proxy :: Proxy DescribeEvents)
+    (Proxy :: Proxy PurchaseReservedNodeOffering)
 
 testDescribeReservedNodeOfferingsResponse :: DescribeReservedNodeOfferingsResponse -> TestTree
 testDescribeReservedNodeOfferingsResponse = res
@@ -750,19 +743,12 @@
     redshift
     (Proxy :: Proxy DescribeReservedNodeOfferings)
 
-testDescribeClusterParameterGroupsResponse :: DescribeClusterParameterGroupsResponse -> TestTree
-testDescribeClusterParameterGroupsResponse = res
-    "DescribeClusterParameterGroupsResponse"
-    "fixture/DescribeClusterParameterGroupsResponse.proto"
-    redshift
-    (Proxy :: Proxy DescribeClusterParameterGroups)
-
-testCreateClusterSubnetGroupResponse :: CreateClusterSubnetGroupResponse -> TestTree
-testCreateClusterSubnetGroupResponse = res
-    "CreateClusterSubnetGroupResponse"
-    "fixture/CreateClusterSubnetGroupResponse.proto"
+testDescribeEventsResponse :: DescribeEventsResponse -> TestTree
+testDescribeEventsResponse = res
+    "DescribeEventsResponse"
+    "fixture/DescribeEventsResponse.proto"
     redshift
-    (Proxy :: Proxy CreateClusterSubnetGroup)
+    (Proxy :: Proxy DescribeEvents)
 
 testDescribeReservedNodesResponse :: DescribeReservedNodesResponse -> TestTree
 testDescribeReservedNodesResponse = res
@@ -771,6 +757,13 @@
     redshift
     (Proxy :: Proxy DescribeReservedNodes)
 
+testDescribeClusterParameterGroupsResponse :: DescribeClusterParameterGroupsResponse -> TestTree
+testDescribeClusterParameterGroupsResponse = res
+    "DescribeClusterParameterGroupsResponse"
+    "fixture/DescribeClusterParameterGroupsResponse.proto"
+    redshift
+    (Proxy :: Proxy DescribeClusterParameterGroups)
+
 testEnableLoggingResponse :: LoggingStatus -> TestTree
 testEnableLoggingResponse = res
     "EnableLoggingResponse"
@@ -778,19 +771,12 @@
     redshift
     (Proxy :: Proxy EnableLogging)
 
-testCreateTagsResponse :: CreateTagsResponse -> TestTree
-testCreateTagsResponse = res
-    "CreateTagsResponse"
-    "fixture/CreateTagsResponse.proto"
-    redshift
-    (Proxy :: Proxy CreateTags)
-
-testDescribeClusterSecurityGroupsResponse :: DescribeClusterSecurityGroupsResponse -> TestTree
-testDescribeClusterSecurityGroupsResponse = res
-    "DescribeClusterSecurityGroupsResponse"
-    "fixture/DescribeClusterSecurityGroupsResponse.proto"
+testCreateClusterSubnetGroupResponse :: CreateClusterSubnetGroupResponse -> TestTree
+testCreateClusterSubnetGroupResponse = res
+    "CreateClusterSubnetGroupResponse"
+    "fixture/CreateClusterSubnetGroupResponse.proto"
     redshift
-    (Proxy :: Proxy DescribeClusterSecurityGroups)
+    (Proxy :: Proxy CreateClusterSubnetGroup)
 
 testDeleteClusterParameterGroupResponse :: DeleteClusterParameterGroupResponse -> TestTree
 testDeleteClusterParameterGroupResponse = res
@@ -799,13 +785,20 @@
     redshift
     (Proxy :: Proxy DeleteClusterParameterGroup)
 
-testDeleteTagsResponse :: DeleteTagsResponse -> TestTree
-testDeleteTagsResponse = res
-    "DeleteTagsResponse"
-    "fixture/DeleteTagsResponse.proto"
+testDescribeClusterSecurityGroupsResponse :: DescribeClusterSecurityGroupsResponse -> TestTree
+testDescribeClusterSecurityGroupsResponse = res
+    "DescribeClusterSecurityGroupsResponse"
+    "fixture/DescribeClusterSecurityGroupsResponse.proto"
     redshift
-    (Proxy :: Proxy DeleteTags)
+    (Proxy :: Proxy DescribeClusterSecurityGroups)
 
+testCreateTagsResponse :: CreateTagsResponse -> TestTree
+testCreateTagsResponse = res
+    "CreateTagsResponse"
+    "fixture/CreateTagsResponse.proto"
+    redshift
+    (Proxy :: Proxy CreateTags)
+
 testEnableSnapshotCopyResponse :: EnableSnapshotCopyResponse -> TestTree
 testEnableSnapshotCopyResponse = res
     "EnableSnapshotCopyResponse"
@@ -813,13 +806,6 @@
     redshift
     (Proxy :: Proxy EnableSnapshotCopy)
 
-testModifySnapshotCopyRetentionPeriodResponse :: ModifySnapshotCopyRetentionPeriodResponse -> TestTree
-testModifySnapshotCopyRetentionPeriodResponse = res
-    "ModifySnapshotCopyRetentionPeriodResponse"
-    "fixture/ModifySnapshotCopyRetentionPeriodResponse.proto"
-    redshift
-    (Proxy :: Proxy ModifySnapshotCopyRetentionPeriod)
-
 testDescribeClusterSnapshotsResponse :: DescribeClusterSnapshotsResponse -> TestTree
 testDescribeClusterSnapshotsResponse = res
     "DescribeClusterSnapshotsResponse"
@@ -827,6 +813,13 @@
     redshift
     (Proxy :: Proxy DescribeClusterSnapshots)
 
+testDeleteTagsResponse :: DeleteTagsResponse -> TestTree
+testDeleteTagsResponse = res
+    "DeleteTagsResponse"
+    "fixture/DeleteTagsResponse.proto"
+    redshift
+    (Proxy :: Proxy DeleteTags)
+
 testDescribeClusterSubnetGroupsResponse :: DescribeClusterSubnetGroupsResponse -> TestTree
 testDescribeClusterSubnetGroupsResponse = res
     "DescribeClusterSubnetGroupsResponse"
@@ -834,6 +827,13 @@
     redshift
     (Proxy :: Proxy DescribeClusterSubnetGroups)
 
+testModifySnapshotCopyRetentionPeriodResponse :: ModifySnapshotCopyRetentionPeriodResponse -> TestTree
+testModifySnapshotCopyRetentionPeriodResponse = res
+    "ModifySnapshotCopyRetentionPeriodResponse"
+    "fixture/ModifySnapshotCopyRetentionPeriodResponse.proto"
+    redshift
+    (Proxy :: Proxy ModifySnapshotCopyRetentionPeriod)
+
 testAuthorizeSnapshotAccessResponse :: AuthorizeSnapshotAccessResponse -> TestTree
 testAuthorizeSnapshotAccessResponse = res
     "AuthorizeSnapshotAccessResponse"
@@ -841,13 +841,6 @@
     redshift
     (Proxy :: Proxy AuthorizeSnapshotAccess)
 
-testCreateEventSubscriptionResponse :: CreateEventSubscriptionResponse -> TestTree
-testCreateEventSubscriptionResponse = res
-    "CreateEventSubscriptionResponse"
-    "fixture/CreateEventSubscriptionResponse.proto"
-    redshift
-    (Proxy :: Proxy CreateEventSubscription)
-
 testRebootClusterResponse :: RebootClusterResponse -> TestTree
 testRebootClusterResponse = res
     "RebootClusterResponse"
@@ -855,13 +848,6 @@
     redshift
     (Proxy :: Proxy RebootCluster)
 
-testDescribeOrderableClusterOptionsResponse :: DescribeOrderableClusterOptionsResponse -> TestTree
-testDescribeOrderableClusterOptionsResponse = res
-    "DescribeOrderableClusterOptionsResponse"
-    "fixture/DescribeOrderableClusterOptionsResponse.proto"
-    redshift
-    (Proxy :: Proxy DescribeOrderableClusterOptions)
-
 testDeleteClusterResponse :: DeleteClusterResponse -> TestTree
 testDeleteClusterResponse = res
     "DeleteClusterResponse"
@@ -869,19 +855,19 @@
     redshift
     (Proxy :: Proxy DeleteCluster)
 
-testDeleteEventSubscriptionResponse :: DeleteEventSubscriptionResponse -> TestTree
-testDeleteEventSubscriptionResponse = res
-    "DeleteEventSubscriptionResponse"
-    "fixture/DeleteEventSubscriptionResponse.proto"
+testCreateEventSubscriptionResponse :: CreateEventSubscriptionResponse -> TestTree
+testCreateEventSubscriptionResponse = res
+    "CreateEventSubscriptionResponse"
+    "fixture/CreateEventSubscriptionResponse.proto"
     redshift
-    (Proxy :: Proxy DeleteEventSubscription)
+    (Proxy :: Proxy CreateEventSubscription)
 
-testDescribeDefaultClusterParametersResponse :: DescribeDefaultClusterParametersResponse -> TestTree
-testDescribeDefaultClusterParametersResponse = res
-    "DescribeDefaultClusterParametersResponse"
-    "fixture/DescribeDefaultClusterParametersResponse.proto"
+testDescribeOrderableClusterOptionsResponse :: DescribeOrderableClusterOptionsResponse -> TestTree
+testDescribeOrderableClusterOptionsResponse = res
+    "DescribeOrderableClusterOptionsResponse"
+    "fixture/DescribeOrderableClusterOptionsResponse.proto"
     redshift
-    (Proxy :: Proxy DescribeDefaultClusterParameters)
+    (Proxy :: Proxy DescribeOrderableClusterOptions)
 
 testCreateClusterResponse :: CreateClusterResponse -> TestTree
 testCreateClusterResponse = res
@@ -897,6 +883,20 @@
     redshift
     (Proxy :: Proxy CreateHSMClientCertificate)
 
+testDescribeDefaultClusterParametersResponse :: DescribeDefaultClusterParametersResponse -> TestTree
+testDescribeDefaultClusterParametersResponse = res
+    "DescribeDefaultClusterParametersResponse"
+    "fixture/DescribeDefaultClusterParametersResponse.proto"
+    redshift
+    (Proxy :: Proxy DescribeDefaultClusterParameters)
+
+testDeleteEventSubscriptionResponse :: DeleteEventSubscriptionResponse -> TestTree
+testDeleteEventSubscriptionResponse = res
+    "DeleteEventSubscriptionResponse"
+    "fixture/DeleteEventSubscriptionResponse.proto"
+    redshift
+    (Proxy :: Proxy DeleteEventSubscription)
+
 testResetClusterParameterGroupResponse :: ClusterParameterGroupNameMessage -> TestTree
 testResetClusterParameterGroupResponse = res
     "ResetClusterParameterGroupResponse"
@@ -911,6 +911,13 @@
     redshift
     (Proxy :: Proxy DescribeEventSubscriptions)
 
+testRevokeClusterSecurityGroupIngressResponse :: RevokeClusterSecurityGroupIngressResponse -> TestTree
+testRevokeClusterSecurityGroupIngressResponse = res
+    "RevokeClusterSecurityGroupIngressResponse"
+    "fixture/RevokeClusterSecurityGroupIngressResponse.proto"
+    redshift
+    (Proxy :: Proxy RevokeClusterSecurityGroupIngress)
+
 testDescribeHSMClientCertificatesResponse :: DescribeHSMClientCertificatesResponse -> TestTree
 testDescribeHSMClientCertificatesResponse = res
     "DescribeHSMClientCertificatesResponse"
@@ -925,20 +932,6 @@
     redshift
     (Proxy :: Proxy ModifyClusterParameterGroup)
 
-testRevokeClusterSecurityGroupIngressResponse :: RevokeClusterSecurityGroupIngressResponse -> TestTree
-testRevokeClusterSecurityGroupIngressResponse = res
-    "RevokeClusterSecurityGroupIngressResponse"
-    "fixture/RevokeClusterSecurityGroupIngressResponse.proto"
-    redshift
-    (Proxy :: Proxy RevokeClusterSecurityGroupIngress)
-
-testAuthorizeClusterSecurityGroupIngressResponse :: AuthorizeClusterSecurityGroupIngressResponse -> TestTree
-testAuthorizeClusterSecurityGroupIngressResponse = res
-    "AuthorizeClusterSecurityGroupIngressResponse"
-    "fixture/AuthorizeClusterSecurityGroupIngressResponse.proto"
-    redshift
-    (Proxy :: Proxy AuthorizeClusterSecurityGroupIngress)
-
 testCreateClusterSecurityGroupResponse :: CreateClusterSecurityGroupResponse -> TestTree
 testCreateClusterSecurityGroupResponse = res
     "CreateClusterSecurityGroupResponse"
@@ -946,13 +939,6 @@
     redshift
     (Proxy :: Proxy CreateClusterSecurityGroup)
 
-testDescribeResizeResponse :: DescribeResizeResponse -> TestTree
-testDescribeResizeResponse = res
-    "DescribeResizeResponse"
-    "fixture/DescribeResizeResponse.proto"
-    redshift
-    (Proxy :: Proxy DescribeResize)
-
 testDescribeEventCategoriesResponse :: DescribeEventCategoriesResponse -> TestTree
 testDescribeEventCategoriesResponse = res
     "DescribeEventCategoriesResponse"
@@ -960,6 +946,13 @@
     redshift
     (Proxy :: Proxy DescribeEventCategories)
 
+testDescribeResizeResponse :: DescribeResizeResponse -> TestTree
+testDescribeResizeResponse = res
+    "DescribeResizeResponse"
+    "fixture/DescribeResizeResponse.proto"
+    redshift
+    (Proxy :: Proxy DescribeResize)
+
 testDeleteHSMConfigurationResponse :: DeleteHSMConfigurationResponse -> TestTree
 testDeleteHSMConfigurationResponse = res
     "DeleteHSMConfigurationResponse"
@@ -967,13 +960,20 @@
     redshift
     (Proxy :: Proxy DeleteHSMConfiguration)
 
-testDeleteClusterSecurityGroupResponse :: DeleteClusterSecurityGroupResponse -> TestTree
-testDeleteClusterSecurityGroupResponse = res
-    "DeleteClusterSecurityGroupResponse"
-    "fixture/DeleteClusterSecurityGroupResponse.proto"
+testAuthorizeClusterSecurityGroupIngressResponse :: AuthorizeClusterSecurityGroupIngressResponse -> TestTree
+testAuthorizeClusterSecurityGroupIngressResponse = res
+    "AuthorizeClusterSecurityGroupIngressResponse"
+    "fixture/AuthorizeClusterSecurityGroupIngressResponse.proto"
     redshift
-    (Proxy :: Proxy DeleteClusterSecurityGroup)
+    (Proxy :: Proxy AuthorizeClusterSecurityGroupIngress)
 
+testCreateClusterSnapshotResponse :: CreateClusterSnapshotResponse -> TestTree
+testCreateClusterSnapshotResponse = res
+    "CreateClusterSnapshotResponse"
+    "fixture/CreateClusterSnapshotResponse.proto"
+    redshift
+    (Proxy :: Proxy CreateClusterSnapshot)
+
 testCreateHSMConfigurationResponse :: CreateHSMConfigurationResponse -> TestTree
 testCreateHSMConfigurationResponse = res
     "CreateHSMConfigurationResponse"
@@ -981,6 +981,13 @@
     redshift
     (Proxy :: Proxy CreateHSMConfiguration)
 
+testDescribeLoggingStatusResponse :: LoggingStatus -> TestTree
+testDescribeLoggingStatusResponse = res
+    "DescribeLoggingStatusResponse"
+    "fixture/DescribeLoggingStatusResponse.proto"
+    redshift
+    (Proxy :: Proxy DescribeLoggingStatus)
+
 testModifyClusterResponse :: ModifyClusterResponse -> TestTree
 testModifyClusterResponse = res
     "ModifyClusterResponse"
@@ -988,19 +995,19 @@
     redshift
     (Proxy :: Proxy ModifyCluster)
 
-testCreateClusterSnapshotResponse :: CreateClusterSnapshotResponse -> TestTree
-testCreateClusterSnapshotResponse = res
-    "CreateClusterSnapshotResponse"
-    "fixture/CreateClusterSnapshotResponse.proto"
+testDeleteClusterSecurityGroupResponse :: DeleteClusterSecurityGroupResponse -> TestTree
+testDeleteClusterSecurityGroupResponse = res
+    "DeleteClusterSecurityGroupResponse"
+    "fixture/DeleteClusterSecurityGroupResponse.proto"
     redshift
-    (Proxy :: Proxy CreateClusterSnapshot)
+    (Proxy :: Proxy DeleteClusterSecurityGroup)
 
-testDescribeLoggingStatusResponse :: LoggingStatus -> TestTree
-testDescribeLoggingStatusResponse = res
-    "DescribeLoggingStatusResponse"
-    "fixture/DescribeLoggingStatusResponse.proto"
+testDisableSnapshotCopyResponse :: DisableSnapshotCopyResponse -> TestTree
+testDisableSnapshotCopyResponse = res
+    "DisableSnapshotCopyResponse"
+    "fixture/DisableSnapshotCopyResponse.proto"
     redshift
-    (Proxy :: Proxy DescribeLoggingStatus)
+    (Proxy :: Proxy DisableSnapshotCopy)
 
 testDescribeClusterParametersResponse :: DescribeClusterParametersResponse -> TestTree
 testDescribeClusterParametersResponse = res
@@ -1009,13 +1016,6 @@
     redshift
     (Proxy :: Proxy DescribeClusterParameters)
 
-testDisableSnapshotCopyResponse :: DisableSnapshotCopyResponse -> TestTree
-testDisableSnapshotCopyResponse = res
-    "DisableSnapshotCopyResponse"
-    "fixture/DisableSnapshotCopyResponse.proto"
-    redshift
-    (Proxy :: Proxy DisableSnapshotCopy)
-
 testRestoreFromClusterSnapshotResponse :: RestoreFromClusterSnapshotResponse -> TestTree
 testRestoreFromClusterSnapshotResponse = res
     "RestoreFromClusterSnapshotResponse"
@@ -1023,13 +1023,6 @@
     redshift
     (Proxy :: Proxy RestoreFromClusterSnapshot)
 
-testDescribeHSMConfigurationsResponse :: DescribeHSMConfigurationsResponse -> TestTree
-testDescribeHSMConfigurationsResponse = res
-    "DescribeHSMConfigurationsResponse"
-    "fixture/DescribeHSMConfigurationsResponse.proto"
-    redshift
-    (Proxy :: Proxy DescribeHSMConfigurations)
-
 testCreateClusterParameterGroupResponse :: CreateClusterParameterGroupResponse -> TestTree
 testCreateClusterParameterGroupResponse = res
     "CreateClusterParameterGroupResponse"
@@ -1044,12 +1037,12 @@
     redshift
     (Proxy :: Proxy RevokeSnapshotAccess)
 
-testDeleteHSMClientCertificateResponse :: DeleteHSMClientCertificateResponse -> TestTree
-testDeleteHSMClientCertificateResponse = res
-    "DeleteHSMClientCertificateResponse"
-    "fixture/DeleteHSMClientCertificateResponse.proto"
+testDescribeHSMConfigurationsResponse :: DescribeHSMConfigurationsResponse -> TestTree
+testDescribeHSMConfigurationsResponse = res
+    "DescribeHSMConfigurationsResponse"
+    "fixture/DescribeHSMConfigurationsResponse.proto"
     redshift
-    (Proxy :: Proxy DeleteHSMClientCertificate)
+    (Proxy :: Proxy DescribeHSMConfigurations)
 
 testCreateSnapshotCopyGrantResponse :: CreateSnapshotCopyGrantResponse -> TestTree
 testCreateSnapshotCopyGrantResponse = res
@@ -1065,6 +1058,20 @@
     redshift
     (Proxy :: Proxy CopyClusterSnapshot)
 
+testDeleteHSMClientCertificateResponse :: DeleteHSMClientCertificateResponse -> TestTree
+testDeleteHSMClientCertificateResponse = res
+    "DeleteHSMClientCertificateResponse"
+    "fixture/DeleteHSMClientCertificateResponse.proto"
+    redshift
+    (Proxy :: Proxy DeleteHSMClientCertificate)
+
+testDeleteSnapshotCopyGrantResponse :: DeleteSnapshotCopyGrantResponse -> TestTree
+testDeleteSnapshotCopyGrantResponse = res
+    "DeleteSnapshotCopyGrantResponse"
+    "fixture/DeleteSnapshotCopyGrantResponse.proto"
+    redshift
+    (Proxy :: Proxy DeleteSnapshotCopyGrant)
+
 testDescribeClusterVersionsResponse :: DescribeClusterVersionsResponse -> TestTree
 testDescribeClusterVersionsResponse = res
     "DescribeClusterVersionsResponse"
@@ -1079,12 +1086,12 @@
     redshift
     (Proxy :: Proxy ModifyClusterSubnetGroup)
 
-testDeleteSnapshotCopyGrantResponse :: DeleteSnapshotCopyGrantResponse -> TestTree
-testDeleteSnapshotCopyGrantResponse = res
-    "DeleteSnapshotCopyGrantResponse"
-    "fixture/DeleteSnapshotCopyGrantResponse.proto"
+testRotateEncryptionKeyResponse :: RotateEncryptionKeyResponse -> TestTree
+testRotateEncryptionKeyResponse = res
+    "RotateEncryptionKeyResponse"
+    "fixture/RotateEncryptionKeyResponse.proto"
     redshift
-    (Proxy :: Proxy DeleteSnapshotCopyGrant)
+    (Proxy :: Proxy RotateEncryptionKey)
 
 testDescribeSnapshotCopyGrantsResponse :: DescribeSnapshotCopyGrantsResponse -> TestTree
 testDescribeSnapshotCopyGrantsResponse = res
@@ -1092,10 +1099,3 @@
     "fixture/DescribeSnapshotCopyGrantsResponse.proto"
     redshift
     (Proxy :: Proxy DescribeSnapshotCopyGrants)
-
-testRotateEncryptionKeyResponse :: RotateEncryptionKeyResponse -> TestTree
-testRotateEncryptionKeyResponse = res
-    "RotateEncryptionKeyResponse"
-    "fixture/RotateEncryptionKeyResponse.proto"
-    redshift
-    (Proxy :: Proxy RotateEncryptionKey)
