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-rds.cabal b/amazonka-rds.cabal
--- a/amazonka-rds.cabal
+++ b/amazonka-rds.cabal
@@ -1,5 +1,5 @@
 name:                  amazonka-rds
-version:               1.2.0.2
+version:               1.3.0
 synopsis:              Amazon Relational Database Service SDK.
 homepage:              https://github.com/brendanhay/amazonka
 bug-reports:           https://github.com/brendanhay/amazonka/issues
@@ -152,7 +152,7 @@
         , Network.AWS.RDS.Types.Sum
 
     build-depends:
-          amazonka-core == 1.2.0.*
+          amazonka-core == 1.3.0.*
         , base          >= 4.7     && < 5
 
 test-suite amazonka-rds-test
@@ -172,9 +172,9 @@
         , Test.AWS.RDS.Internal
 
     build-depends:
-          amazonka-core == 1.2.0.*
-        , amazonka-test == 1.2.0.*
-        , amazonka-rds == 1.2.0.*
+          amazonka-core == 1.3.0.*
+        , amazonka-test == 1.3.0.*
+        , amazonka-rds == 1.3.0.*
         , base
         , bytestring
         , lens
diff --git a/gen/Network/AWS/RDS.hs b/gen/Network/AWS/RDS.hs
--- a/gen/Network/AWS/RDS.hs
+++ b/gen/Network/AWS/RDS.hs
@@ -49,69 +49,66 @@
     -- * Errors
     -- $errors
 
-    -- ** CertificateNotFoundFault
-    , _CertificateNotFoundFault
+    -- ** PointInTimeRestoreNotEnabledFault
+    , _PointInTimeRestoreNotEnabledFault
 
+    -- ** InvalidDBParameterGroupStateFault
+    , _InvalidDBParameterGroupStateFault
+
     -- ** ReservedDBInstanceQuotaExceededFault
     , _ReservedDBInstanceQuotaExceededFault
 
-    -- ** DBClusterSnapshotAlreadyExistsFault
-    , _DBClusterSnapshotAlreadyExistsFault
+    -- ** SourceNotFoundFault
+    , _SourceNotFoundFault
 
+    -- ** CertificateNotFoundFault
+    , _CertificateNotFoundFault
+
     -- ** AuthorizationQuotaExceededFault
     , _AuthorizationQuotaExceededFault
 
-    -- ** SourceNotFoundFault
-    , _SourceNotFoundFault
-
-    -- ** InvalidDBParameterGroupStateFault
-    , _InvalidDBParameterGroupStateFault
+    -- ** DBClusterSnapshotAlreadyExistsFault
+    , _DBClusterSnapshotAlreadyExistsFault
 
     -- ** DBParameterGroupAlreadyExistsFault
     , _DBParameterGroupAlreadyExistsFault
 
-    -- ** PointInTimeRestoreNotEnabledFault
-    , _PointInTimeRestoreNotEnabledFault
-
     -- ** DBParameterGroupQuotaExceededFault
     , _DBParameterGroupQuotaExceededFault
 
-    -- ** ProvisionedIOPSNotAvailableInAZFault
-    , _ProvisionedIOPSNotAvailableInAZFault
-
-    -- ** AuthorizationAlreadyExistsFault
-    , _AuthorizationAlreadyExistsFault
-
     -- ** InsufficientDBClusterCapacityFault
     , _InsufficientDBClusterCapacityFault
 
     -- ** ReservedDBInstanceAlreadyExistsFault
     , _ReservedDBInstanceAlreadyExistsFault
 
+    -- ** ProvisionedIOPSNotAvailableInAZFault
+    , _ProvisionedIOPSNotAvailableInAZFault
+
+    -- ** AuthorizationAlreadyExistsFault
+    , _AuthorizationAlreadyExistsFault
+
     -- ** SubscriptionCategoryNotFoundFault
     , _SubscriptionCategoryNotFoundFault
 
-    -- ** DBSubnetQuotaExceededFault
-    , _DBSubnetQuotaExceededFault
-
     -- ** SubscriptionNotFoundFault
     , _SubscriptionNotFoundFault
 
     -- ** InvalidSubnet
     , _InvalidSubnet
 
-    -- ** DBClusterNotFoundFault
-    , _DBClusterNotFoundFault
+    -- ** DBSubnetQuotaExceededFault
+    , _DBSubnetQuotaExceededFault
 
     -- ** OptionGroupNotFoundFault
     , _OptionGroupNotFoundFault
 
+    -- ** DBClusterNotFoundFault
+    , _DBClusterNotFoundFault
+
     -- ** DBLogFileNotFoundFault
     , _DBLogFileNotFoundFault
 
-    -- ** OptionGroupAlreadyExistsFault
-    , _OptionGroupAlreadyExistsFault
-
     -- ** DBClusterAlreadyExistsFault
     , _DBClusterAlreadyExistsFault
 
@@ -121,14 +118,8 @@
     -- ** DBSecurityGroupQuotaExceededFault
     , _DBSecurityGroupQuotaExceededFault
 
-    -- ** DBSnapshotNotFoundFault
-    , _DBSnapshotNotFoundFault
-
-    -- ** InvalidEventSubscriptionStateFault
-    , _InvalidEventSubscriptionStateFault
-
-    -- ** KMSKeyNotAccessibleFault
-    , _KMSKeyNotAccessibleFault
+    -- ** OptionGroupAlreadyExistsFault
+    , _OptionGroupAlreadyExistsFault
 
     -- ** OptionGroupQuotaExceededFault
     , _OptionGroupQuotaExceededFault
@@ -136,24 +127,30 @@
     -- ** DBSecurityGroupAlreadyExistsFault
     , _DBSecurityGroupAlreadyExistsFault
 
-    -- ** SnapshotQuotaExceededFault
-    , _SnapshotQuotaExceededFault
-
     -- ** SNSTopicARNNotFoundFault
     , _SNSTopicARNNotFoundFault
 
-    -- ** DBClusterQuotaExceededFault
-    , _DBClusterQuotaExceededFault
+    -- ** InvalidEventSubscriptionStateFault
+    , _InvalidEventSubscriptionStateFault
 
+    -- ** KMSKeyNotAccessibleFault
+    , _KMSKeyNotAccessibleFault
+
+    -- ** DBSnapshotNotFoundFault
+    , _DBSnapshotNotFoundFault
+
     -- ** DBClusterParameterGroupNotFoundFault
     , _DBClusterParameterGroupNotFoundFault
 
+    -- ** DBClusterQuotaExceededFault
+    , _DBClusterQuotaExceededFault
+
+    -- ** SnapshotQuotaExceededFault
+    , _SnapshotQuotaExceededFault
+
     -- ** DBSubnetGroupAlreadyExistsFault
     , _DBSubnetGroupAlreadyExistsFault
 
-    -- ** InstanceQuotaExceededFault
-    , _InstanceQuotaExceededFault
-
     -- ** SNSNoAuthorizationFault
     , _SNSNoAuthorizationFault
 
@@ -163,35 +160,38 @@
     -- ** DBSecurityGroupNotSupportedFault
     , _DBSecurityGroupNotSupportedFault
 
+    -- ** InstanceQuotaExceededFault
+    , _InstanceQuotaExceededFault
+
     -- ** DomainNotFoundFault
     , _DomainNotFoundFault
 
-    -- ** DBClusterSnapshotNotFoundFault
-    , _DBClusterSnapshotNotFoundFault
-
-    -- ** ReservedDBInstancesOfferingNotFoundFault
-    , _ReservedDBInstancesOfferingNotFoundFault
+    -- ** DBParameterGroupNotFoundFault
+    , _DBParameterGroupNotFoundFault
 
     -- ** InvalidDBSubnetGroupFault
     , _InvalidDBSubnetGroupFault
 
+    -- ** ReservedDBInstancesOfferingNotFoundFault
+    , _ReservedDBInstancesOfferingNotFoundFault
+
     -- ** InvalidDBSubnetStateFault
     , _InvalidDBSubnetStateFault
 
-    -- ** DBParameterGroupNotFoundFault
-    , _DBParameterGroupNotFoundFault
+    -- ** DBClusterSnapshotNotFoundFault
+    , _DBClusterSnapshotNotFoundFault
 
     -- ** SNSInvalidTopicFault
     , _SNSInvalidTopicFault
 
-    -- ** SubscriptionAlreadyExistFault
-    , _SubscriptionAlreadyExistFault
+    -- ** InsufficientDBInstanceCapacityFault
+    , _InsufficientDBInstanceCapacityFault
 
     -- ** InvalidDBClusterSnapshotStateFault
     , _InvalidDBClusterSnapshotStateFault
 
-    -- ** InsufficientDBInstanceCapacityFault
-    , _InsufficientDBInstanceCapacityFault
+    -- ** SubscriptionAlreadyExistFault
+    , _SubscriptionAlreadyExistFault
 
     -- ** InvalidVPCNetworkStateFault
     , _InvalidVPCNetworkStateFault
@@ -211,60 +211,60 @@
     -- ** EventSubscriptionQuotaExceededFault
     , _EventSubscriptionQuotaExceededFault
 
+    -- ** InsufficientStorageClusterCapacityFault
+    , _InsufficientStorageClusterCapacityFault
+
     -- ** InvalidOptionGroupStateFault
     , _InvalidOptionGroupStateFault
 
     -- ** InvalidDBClusterStateFault
     , _InvalidDBClusterStateFault
 
-    -- ** InsufficientStorageClusterCapacityFault
-    , _InsufficientStorageClusterCapacityFault
-
     -- ** DBInstanceAlreadyExistsFault
     , _DBInstanceAlreadyExistsFault
 
-    -- ** ResourceNotFoundFault
-    , _ResourceNotFoundFault
-
-    -- ** DBUpgradeDependencyFailureFault
-    , _DBUpgradeDependencyFailureFault
+    -- ** InvalidRestoreFault
+    , _InvalidRestoreFault
 
     -- ** InvalidDBSecurityGroupStateFault
     , _InvalidDBSecurityGroupStateFault
 
+    -- ** ResourceNotFoundFault
+    , _ResourceNotFoundFault
+
     -- ** InsufficientDomainCapacityFault
     , _InsufficientDomainCapacityFault
 
     -- ** DBSubnetGroupNotFoundFault
     , _DBSubnetGroupNotFoundFault
 
-    -- ** InvalidRestoreFault
-    , _InvalidRestoreFault
+    -- ** DBUpgradeDependencyFailureFault
+    , _DBUpgradeDependencyFailureFault
 
     -- ** InvalidDBInstanceStateFault
     , _InvalidDBInstanceStateFault
 
-    -- ** InvalidDBSnapshotStateFault
-    , _InvalidDBSnapshotStateFault
-
-    -- ** InvalidDBSubnetGroupStateFault
-    , _InvalidDBSubnetGroupStateFault
-
-    -- ** StorageQuotaExceededFault
-    , _StorageQuotaExceededFault
-
     -- ** DBSnapshotAlreadyExistsFault
     , _DBSnapshotAlreadyExistsFault
 
     -- ** DBInstanceNotFoundFault
     , _DBInstanceNotFoundFault
 
-    -- ** SubnetAlreadyInUse
-    , _SubnetAlreadyInUse
+    -- ** StorageQuotaExceededFault
+    , _StorageQuotaExceededFault
 
+    -- ** InvalidDBSnapshotStateFault
+    , _InvalidDBSnapshotStateFault
+
+    -- ** InvalidDBSubnetGroupStateFault
+    , _InvalidDBSubnetGroupStateFault
+
     -- ** DBSubnetGroupDoesNotCoverEnoughAZs
     , _DBSubnetGroupDoesNotCoverEnoughAZs
 
+    -- ** SubnetAlreadyInUse
+    , _SubnetAlreadyInUse
+
     -- * Waiters
     -- $waiters
 
@@ -280,17 +280,14 @@
     -- * Operations
     -- $operations
 
-    -- ** DescribeDBEngineVersions (Paginated)
-    , module Network.AWS.RDS.DescribeDBEngineVersions
-
     -- ** DescribeDBClusterParameterGroups
     , module Network.AWS.RDS.DescribeDBClusterParameterGroups
 
     -- ** PromoteReadReplica
     , module Network.AWS.RDS.PromoteReadReplica
 
-    -- ** ModifyEventSubscription
-    , module Network.AWS.RDS.ModifyEventSubscription
+    -- ** DescribeDBEngineVersions (Paginated)
+    , module Network.AWS.RDS.DescribeDBEngineVersions
 
     -- ** CopyDBSnapshot
     , module Network.AWS.RDS.CopyDBSnapshot
@@ -301,6 +298,9 @@
     -- ** ModifyDBInstance
     , module Network.AWS.RDS.ModifyDBInstance
 
+    -- ** ModifyEventSubscription
+    , module Network.AWS.RDS.ModifyEventSubscription
+
     -- ** ResetDBClusterParameterGroup
     , module Network.AWS.RDS.ResetDBClusterParameterGroup
 
@@ -310,66 +310,72 @@
     -- ** DescribeEngineDefaultParameters (Paginated)
     , module Network.AWS.RDS.DescribeEngineDefaultParameters
 
+    -- ** DescribeOptionGroups (Paginated)
+    , module Network.AWS.RDS.DescribeOptionGroups
+
+    -- ** DescribeDBLogFiles (Paginated)
+    , module Network.AWS.RDS.DescribeDBLogFiles
+
     -- ** DescribeDBClusters
     , module Network.AWS.RDS.DescribeDBClusters
 
     -- ** ModifyDBSubnetGroup
     , module Network.AWS.RDS.ModifyDBSubnetGroup
 
-    -- ** DescribeDBLogFiles (Paginated)
-    , module Network.AWS.RDS.DescribeDBLogFiles
-
     -- ** ListTagsForResource
     , module Network.AWS.RDS.ListTagsForResource
 
-    -- ** DescribeOptionGroups (Paginated)
-    , module Network.AWS.RDS.DescribeOptionGroups
+    -- ** DeleteOptionGroup
+    , module Network.AWS.RDS.DeleteOptionGroup
 
     -- ** DeleteDBCluster
     , module Network.AWS.RDS.DeleteDBCluster
 
-    -- ** RemoveSourceIdentifierFromSubscription
-    , module Network.AWS.RDS.RemoveSourceIdentifierFromSubscription
+    -- ** DescribeReservedDBInstances (Paginated)
+    , module Network.AWS.RDS.DescribeReservedDBInstances
 
     -- ** CopyDBParameterGroup
     , module Network.AWS.RDS.CopyDBParameterGroup
 
-    -- ** DescribeReservedDBInstances (Paginated)
-    , module Network.AWS.RDS.DescribeReservedDBInstances
-
-    -- ** DeleteOptionGroup
-    , module Network.AWS.RDS.DeleteOptionGroup
+    -- ** RemoveSourceIdentifierFromSubscription
+    , module Network.AWS.RDS.RemoveSourceIdentifierFromSubscription
 
     -- ** DescribeEngineDefaultClusterParameters
     , module Network.AWS.RDS.DescribeEngineDefaultClusterParameters
 
-    -- ** CreateEventSubscription
-    , module Network.AWS.RDS.CreateEventSubscription
-
     -- ** RemoveTagsFromResource
     , module Network.AWS.RDS.RemoveTagsFromResource
 
-    -- ** CreateDBInstance
-    , module Network.AWS.RDS.CreateDBInstance
-
     -- ** RestoreDBInstanceFromDBSnapshot
     , module Network.AWS.RDS.RestoreDBInstanceFromDBSnapshot
 
-    -- ** AuthorizeDBSecurityGroupIngress
-    , module Network.AWS.RDS.AuthorizeDBSecurityGroupIngress
-
-    -- ** DeleteDBClusterParameterGroup
-    , module Network.AWS.RDS.DeleteDBClusterParameterGroup
+    -- ** CreateEventSubscription
+    , module Network.AWS.RDS.CreateEventSubscription
 
     -- ** PurchaseReservedDBInstancesOffering
     , module Network.AWS.RDS.PurchaseReservedDBInstancesOffering
 
+    -- ** CreateDBInstance
+    , module Network.AWS.RDS.CreateDBInstance
+
+    -- ** DeleteDBClusterParameterGroup
+    , module Network.AWS.RDS.DeleteDBClusterParameterGroup
+
     -- ** DescribeCertificates
     , module Network.AWS.RDS.DescribeCertificates
 
+    -- ** AuthorizeDBSecurityGroupIngress
+    , module Network.AWS.RDS.AuthorizeDBSecurityGroupIngress
+
     -- ** RestoreDBClusterFromSnapshot
     , module Network.AWS.RDS.RestoreDBClusterFromSnapshot
 
+    -- ** DescribeOrderableDBInstanceOptions (Paginated)
+    , module Network.AWS.RDS.DescribeOrderableDBInstanceOptions
+
+    -- ** CreateDBClusterParameterGroup
+    , module Network.AWS.RDS.CreateDBClusterParameterGroup
+
     -- ** CreateDBSnapshot
     , module Network.AWS.RDS.CreateDBSnapshot
 
@@ -379,11 +385,11 @@
     -- ** DescribeDBParameterGroups (Paginated)
     , module Network.AWS.RDS.DescribeDBParameterGroups
 
-    -- ** DescribeOrderableDBInstanceOptions (Paginated)
-    , module Network.AWS.RDS.DescribeOrderableDBInstanceOptions
+    -- ** DeleteDBClusterSnapshot
+    , module Network.AWS.RDS.DeleteDBClusterSnapshot
 
-    -- ** CreateDBClusterParameterGroup
-    , module Network.AWS.RDS.CreateDBClusterParameterGroup
+    -- ** DescribeOptionGroupOptions (Paginated)
+    , module Network.AWS.RDS.DescribeOptionGroupOptions
 
     -- ** DescribeEventSubscriptions (Paginated)
     , module Network.AWS.RDS.DescribeEventSubscriptions
@@ -391,14 +397,11 @@
     -- ** AddTagsToResource
     , module Network.AWS.RDS.AddTagsToResource
 
-    -- ** DescribeOptionGroupOptions (Paginated)
-    , module Network.AWS.RDS.DescribeOptionGroupOptions
-
     -- ** DescribeDBParameters (Paginated)
     , module Network.AWS.RDS.DescribeDBParameters
 
-    -- ** DeleteDBClusterSnapshot
-    , module Network.AWS.RDS.DeleteDBClusterSnapshot
+    -- ** CreateDBClusterSnapshot
+    , module Network.AWS.RDS.CreateDBClusterSnapshot
 
     -- ** DescribeDBSnapshots (Paginated)
     , module Network.AWS.RDS.DescribeDBSnapshots
@@ -406,15 +409,12 @@
     -- ** DescribeDBSubnetGroups (Paginated)
     , module Network.AWS.RDS.DescribeDBSubnetGroups
 
-    -- ** CreateDBParameterGroup
-    , module Network.AWS.RDS.CreateDBParameterGroup
-
-    -- ** CreateDBClusterSnapshot
-    , module Network.AWS.RDS.CreateDBClusterSnapshot
-
     -- ** ModifyOptionGroup
     , module Network.AWS.RDS.ModifyOptionGroup
 
+    -- ** CreateDBParameterGroup
+    , module Network.AWS.RDS.CreateDBParameterGroup
+
     -- ** ModifyDBCluster
     , module Network.AWS.RDS.ModifyDBCluster
 
@@ -424,90 +424,90 @@
     -- ** ModifyDBClusterParameterGroup
     , module Network.AWS.RDS.ModifyDBClusterParameterGroup
 
-    -- ** DescribePendingMaintenanceActions
-    , module Network.AWS.RDS.DescribePendingMaintenanceActions
-
     -- ** RestoreDBInstanceToPointInTime
     , module Network.AWS.RDS.RestoreDBInstanceToPointInTime
 
-    -- ** ResetDBParameterGroup
-    , module Network.AWS.RDS.ResetDBParameterGroup
+    -- ** DescribePendingMaintenanceActions
+    , module Network.AWS.RDS.DescribePendingMaintenanceActions
 
     -- ** CopyDBClusterSnapshot
     , module Network.AWS.RDS.CopyDBClusterSnapshot
 
-    -- ** ModifyDBParameterGroup
-    , module Network.AWS.RDS.ModifyDBParameterGroup
+    -- ** ResetDBParameterGroup
+    , module Network.AWS.RDS.ResetDBParameterGroup
 
+    -- ** CreateDBCluster
+    , module Network.AWS.RDS.CreateDBCluster
+
     -- ** FailoverDBCluster
     , module Network.AWS.RDS.FailoverDBCluster
 
-    -- ** CreateDBCluster
-    , module Network.AWS.RDS.CreateDBCluster
+    -- ** RevokeDBSecurityGroupIngress
+    , module Network.AWS.RDS.RevokeDBSecurityGroupIngress
 
-    -- ** CreateOptionGroup
-    , module Network.AWS.RDS.CreateOptionGroup
+    -- ** ModifyDBParameterGroup
+    , module Network.AWS.RDS.ModifyDBParameterGroup
 
     -- ** ApplyPendingMaintenanceAction
     , module Network.AWS.RDS.ApplyPendingMaintenanceAction
 
-    -- ** RevokeDBSecurityGroupIngress
-    , module Network.AWS.RDS.RevokeDBSecurityGroupIngress
+    -- ** CreateOptionGroup
+    , module Network.AWS.RDS.CreateOptionGroup
 
+    -- ** DescribeAccountAttributes
+    , module Network.AWS.RDS.DescribeAccountAttributes
+
     -- ** DeleteDBSnapshot
     , module Network.AWS.RDS.DeleteDBSnapshot
 
     -- ** DescribeDBClusterParameters
     , module Network.AWS.RDS.DescribeDBClusterParameters
 
-    -- ** CreateDBSecurityGroup
-    , module Network.AWS.RDS.CreateDBSecurityGroup
-
     -- ** DeleteDBSubnetGroup
     , module Network.AWS.RDS.DeleteDBSubnetGroup
 
-    -- ** DescribeAccountAttributes
-    , module Network.AWS.RDS.DescribeAccountAttributes
+    -- ** CreateDBSecurityGroup
+    , module Network.AWS.RDS.CreateDBSecurityGroup
 
-    -- ** DeleteDBSecurityGroup
-    , module Network.AWS.RDS.DeleteDBSecurityGroup
+    -- ** DescribeDBClusterSnapshots
+    , module Network.AWS.RDS.DescribeDBClusterSnapshots
 
     -- ** RebootDBInstance
     , module Network.AWS.RDS.RebootDBInstance
 
-    -- ** DescribeDBClusterSnapshots
-    , module Network.AWS.RDS.DescribeDBClusterSnapshots
-
     -- ** CreateDBSubnetGroup
     , module Network.AWS.RDS.CreateDBSubnetGroup
 
     -- ** DescribeReservedDBInstancesOfferings (Paginated)
     , module Network.AWS.RDS.DescribeReservedDBInstancesOfferings
 
+    -- ** DeleteDBSecurityGroup
+    , module Network.AWS.RDS.DeleteDBSecurityGroup
+
     -- ** DeleteDBInstance
     , module Network.AWS.RDS.DeleteDBInstance
 
-    -- ** DescribeDBInstances (Paginated)
-    , module Network.AWS.RDS.DescribeDBInstances
-
-    -- ** CopyOptionGroup
-    , module Network.AWS.RDS.CopyOptionGroup
-
-    -- ** DownloadDBLogFilePortion (Paginated)
-    , module Network.AWS.RDS.DownloadDBLogFilePortion
-
     -- ** CreateDBInstanceReadReplica
     , module Network.AWS.RDS.CreateDBInstanceReadReplica
 
-    -- ** RestoreDBClusterToPointInTime
-    , module Network.AWS.RDS.RestoreDBClusterToPointInTime
-
     -- ** DeleteDBParameterGroup
     , module Network.AWS.RDS.DeleteDBParameterGroup
 
     -- ** DescribeDBSecurityGroups (Paginated)
     , module Network.AWS.RDS.DescribeDBSecurityGroups
 
+    -- ** CopyOptionGroup
+    , module Network.AWS.RDS.CopyOptionGroup
+
+    -- ** RestoreDBClusterToPointInTime
+    , module Network.AWS.RDS.RestoreDBClusterToPointInTime
+
+    -- ** DescribeDBInstances (Paginated)
+    , module Network.AWS.RDS.DescribeDBInstances
+
+    -- ** DownloadDBLogFilePortion (Paginated)
+    , module Network.AWS.RDS.DownloadDBLogFilePortion
+
     -- * Types
 
     -- ** ApplyMethod
@@ -556,13 +556,13 @@
     , dcEngine
     , dcLatestRestorableTime
     , dcPreferredMaintenanceWindow
-    , dcCharacterSetName
     , dcAvailabilityZones
+    , dcCharacterSetName
     , dcPreferredBackupWindow
     , dcVPCSecurityGroups
     , dcBackupRetentionPeriod
-    , dcDatabaseName
     , dcDBSubnetGroup
+    , dcDatabaseName
     , dcAllocatedStorage
     , dcEndpoint
     , dcPercentProgress
@@ -605,8 +605,8 @@
     , dcsDBClusterSnapshotIdentifier
     , dcsEngine
     , dcsLicenseModel
-    , dcsSnapshotType
     , dcsAvailabilityZones
+    , dcsSnapshotType
     , dcsSnapshotCreateTime
     , dcsAllocatedStorage
     , dcsClusterCreateTime
@@ -616,24 +616,24 @@
     -- ** DBEngineVersion
     , DBEngineVersion
     , dbEngineVersion
-    , devDBEngineVersionDescription
     , devEngineVersion
+    , devDBEngineVersionDescription
     , devDefaultCharacterSet
-    , devSupportedCharacterSets
     , devEngine
     , devDBParameterGroupFamily
+    , devSupportedCharacterSets
     , devDBEngineDescription
 
     -- ** DBInstance
     , DBInstance
     , dbInstance
-    , diDBSecurityGroups
     , diEngineVersion
+    , diDBSecurityGroups
     , diStorageEncrypted
     , diDBClusterIdentifier
+    , diPubliclyAccessible
     , diAutoMinorVersionUpgrade
     , diMasterUsername
-    , diPubliclyAccessible
     , diReadReplicaDBInstanceIdentifiers
     , diIOPS
     , diInstanceCreateTime
@@ -643,31 +643,31 @@
     , diDBInstanceClass
     , diLicenseModel
     , diPreferredMaintenanceWindow
-    , diCharacterSetName
-    , diDBInstanceIdentifier
     , diCACertificateIdentifier
+    , diDBInstanceIdentifier
+    , diCharacterSetName
+    , diKMSKeyId
     , diPreferredBackupWindow
     , diAvailabilityZone
     , diVPCSecurityGroups
     , diBackupRetentionPeriod
-    , diKMSKeyId
     , diDBSubnetGroup
     , diMultiAZ
-    , diSecondaryAvailabilityZone
     , diOptionGroupMemberships
-    , diDBiResourceId
+    , diSecondaryAvailabilityZone
     , diAllocatedStorage
-    , diEndpoint
+    , diDBiResourceId
     , diDBParameterGroups
-    , diTDECredentialARN
     , diCopyTagsToSnapshot
+    , diTDECredentialARN
+    , diEndpoint
     , diDBInstanceStatus
     , diDBInstancePort
     , diPendingModifiedValues
+    , diStorageType
     , diStatusInfos
-    , diDBName
     , diDomainMemberships
-    , diStorageType
+    , diDBName
 
     -- ** DBInstanceStatusInfo
     , DBInstanceStatusInfo
@@ -698,12 +698,12 @@
     -- ** DBSecurityGroup
     , DBSecurityGroup
     , dbSecurityGroup
-    , dsgVPCId
-    , dsgOwnerId
-    , dsgIPRanges
-    , dsgDBSecurityGroupName
-    , dsgEC2SecurityGroups
-    , dsgDBSecurityGroupDescription
+    , dbsgVPCId
+    , dbsgOwnerId
+    , dbsgIPRanges
+    , dbsgDBSecurityGroupName
+    , dbsgEC2SecurityGroups
+    , dbsgDBSecurityGroupDescription
 
     -- ** DBSecurityGroupMembership
     , DBSecurityGroupMembership
@@ -719,21 +719,21 @@
     , dsMasterUsername
     , dsSourceRegion
     , dsIOPS
-    , dsInstanceCreateTime
     , dsVPCId
+    , dsInstanceCreateTime
     , dsEngine
     , dsEncrypted
     , dsDBSnapshotIdentifier
     , dsLicenseModel
+    , dsSourceDBSnapshotIdentifier
     , dsSnapshotType
     , dsDBInstanceIdentifier
-    , dsSourceDBSnapshotIdentifier
-    , dsAvailabilityZone
     , dsKMSKeyId
+    , dsAvailabilityZone
     , dsSnapshotCreateTime
     , dsAllocatedStorage
-    , dsTDECredentialARN
     , dsOptionGroupName
+    , dsTDECredentialARN
     , dsPercentProgress
     , dsPort
     , dsStorageType
@@ -741,11 +741,11 @@
     -- ** DBSubnetGroup
     , DBSubnetGroup
     , dbSubnetGroup
-    , dbsgDBSubnetGroupName
-    , dbsgVPCId
-    , dbsgSubnets
-    , dbsgDBSubnetGroupDescription
-    , dbsgSubnetGroupStatus
+    , dsgDBSubnetGroupName
+    , dsgVPCId
+    , dsgSubnets
+    , dsgDBSubnetGroupDescription
+    , dsgSubnetGroupStatus
 
     -- ** DescribeDBLogFilesDetails
     , DescribeDBLogFilesDetails
@@ -779,8 +779,8 @@
     , EngineDefaults
     , engineDefaults
     , edDBParameterGroupFamily
-    , edParameters
     , edMarker
+    , edParameters
 
     -- ** Event
     , Event
@@ -800,8 +800,8 @@
     -- ** EventSubscription
     , EventSubscription
     , eventSubscription
-    , esCustomerAWSId
     , esStatus
+    , esCustomerAWSId
     , esCustSubscriptionId
     , esSNSTopicARN
     , esEnabled
@@ -867,13 +867,13 @@
     , ogoPermanent
     , ogoPersistent
     , ogoEngineName
-    , ogoName
     , ogoMajorEngineVersion
+    , ogoName
     , ogoDefaultPort
     , ogoOptionGroupOptionSettings
     , ogoPortRequired
-    , ogoOptionsDependedOn
     , ogoDescription
+    , ogoOptionsDependedOn
 
     -- ** OptionGroupOptionSetting
     , OptionGroupOptionSetting
@@ -882,8 +882,8 @@
     , ogosSettingName
     , ogosDefaultValue
     , ogosIsModifiable
-    , ogosAllowedValues
     , ogosSettingDescription
+    , ogosAllowedValues
 
     -- ** OptionSetting
     , OptionSetting
@@ -894,8 +894,8 @@
     , osName
     , osDefaultValue
     , osIsModifiable
-    , osAllowedValues
     , osDataType
+    , osAllowedValues
     , osDescription
 
     -- ** OrderableDBInstanceOption
@@ -908,8 +908,8 @@
     , odioDBInstanceClass
     , odioLicenseModel
     , odioAvailabilityZones
-    , odioReadReplicaCapable
     , odioSupportsStorageEncryption
+    , odioReadReplicaCapable
     , odioVPC
     , odioStorageType
 
@@ -922,8 +922,8 @@
     , pMinimumEngineVersion
     , pSource
     , pIsModifiable
-    , pAllowedValues
     , pDataType
+    , pAllowedValues
     , pParameterName
     , pDescription
 
@@ -934,8 +934,8 @@
     , pmaAction
     , pmaOptInStatus
     , pmaDescription
-    , pmaCurrentApplyDate
     , pmaForcedApplyDate
+    , pmaCurrentApplyDate
 
     -- ** PendingModifiedValues
     , PendingModifiedValues
@@ -944,8 +944,8 @@
     , pmvMasterUserPassword
     , pmvIOPS
     , pmvDBInstanceClass
-    , pmvDBInstanceIdentifier
     , pmvCACertificateIdentifier
+    , pmvDBInstanceIdentifier
     , pmvBackupRetentionPeriod
     , pmvMultiAZ
     , pmvAllocatedStorage
@@ -964,15 +964,15 @@
     , rdiDBInstanceCount
     , rdiState
     , rdiCurrencyCode
-    , rdiProductDescription
     , rdiStartTime
+    , rdiProductDescription
     , rdiReservedDBInstanceId
     , rdiDBInstanceClass
     , rdiMultiAZ
     , rdiReservedDBInstancesOfferingId
+    , rdiRecurringCharges
     , rdiOfferingType
     , rdiUsagePrice
-    , rdiRecurringCharges
     , rdiFixedPrice
     , rdiDuration
 
@@ -984,9 +984,9 @@
     , rdioDBInstanceClass
     , rdioMultiAZ
     , rdioReservedDBInstancesOfferingId
+    , rdioRecurringCharges
     , rdioOfferingType
     , rdioUsagePrice
-    , rdioRecurringCharges
     , rdioFixedPrice
     , rdioDuration
 
diff --git a/gen/Network/AWS/RDS/AddSourceIdentifierToSubscription.hs b/gen/Network/AWS/RDS/AddSourceIdentifierToSubscription.hs
--- a/gen/Network/AWS/RDS/AddSourceIdentifierToSubscription.hs
+++ b/gen/Network/AWS/RDS/AddSourceIdentifierToSubscription.hs
@@ -36,7 +36,7 @@
     , AddSourceIdentifierToSubscriptionResponse
     -- * Response Lenses
     , asitsrsEventSubscription
-    , asitsrsStatus
+    , asitsrsResponseStatus
     ) where
 
 import           Network.AWS.Prelude
@@ -125,7 +125,7 @@
 -- | /See:/ 'addSourceIdentifierToSubscriptionResponse' smart constructor.
 data AddSourceIdentifierToSubscriptionResponse = AddSourceIdentifierToSubscriptionResponse'
     { _asitsrsEventSubscription :: !(Maybe EventSubscription)
-    , _asitsrsStatus            :: !Int
+    , _asitsrsResponseStatus    :: !Int
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'AddSourceIdentifierToSubscriptionResponse' with the minimum fields required to make a request.
@@ -134,14 +134,14 @@
 --
 -- * 'asitsrsEventSubscription'
 --
--- * 'asitsrsStatus'
+-- * 'asitsrsResponseStatus'
 addSourceIdentifierToSubscriptionResponse
-    :: Int -- ^ 'asitsrsStatus'
+    :: Int -- ^ 'asitsrsResponseStatus'
     -> AddSourceIdentifierToSubscriptionResponse
-addSourceIdentifierToSubscriptionResponse pStatus_ =
+addSourceIdentifierToSubscriptionResponse pResponseStatus_ =
     AddSourceIdentifierToSubscriptionResponse'
     { _asitsrsEventSubscription = Nothing
-    , _asitsrsStatus = pStatus_
+    , _asitsrsResponseStatus = pResponseStatus_
     }
 
 -- | Undocumented member.
@@ -149,5 +149,5 @@
 asitsrsEventSubscription = lens _asitsrsEventSubscription (\ s a -> s{_asitsrsEventSubscription = a});
 
 -- | The response status code.
-asitsrsStatus :: Lens' AddSourceIdentifierToSubscriptionResponse Int
-asitsrsStatus = lens _asitsrsStatus (\ s a -> s{_asitsrsStatus = a});
+asitsrsResponseStatus :: Lens' AddSourceIdentifierToSubscriptionResponse Int
+asitsrsResponseStatus = lens _asitsrsResponseStatus (\ s a -> s{_asitsrsResponseStatus = a});
diff --git a/gen/Network/AWS/RDS/ApplyPendingMaintenanceAction.hs b/gen/Network/AWS/RDS/ApplyPendingMaintenanceAction.hs
--- a/gen/Network/AWS/RDS/ApplyPendingMaintenanceAction.hs
+++ b/gen/Network/AWS/RDS/ApplyPendingMaintenanceAction.hs
@@ -37,7 +37,7 @@
     , ApplyPendingMaintenanceActionResponse
     -- * Response Lenses
     , apmarsResourcePendingMaintenanceActions
-    , apmarsStatus
+    , apmarsResponseStatus
     ) where
 
 import           Network.AWS.Prelude
@@ -133,7 +133,7 @@
 -- | /See:/ 'applyPendingMaintenanceActionResponse' smart constructor.
 data ApplyPendingMaintenanceActionResponse = ApplyPendingMaintenanceActionResponse'
     { _apmarsResourcePendingMaintenanceActions :: !(Maybe ResourcePendingMaintenanceActions)
-    , _apmarsStatus                            :: !Int
+    , _apmarsResponseStatus                    :: !Int
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'ApplyPendingMaintenanceActionResponse' with the minimum fields required to make a request.
@@ -142,14 +142,14 @@
 --
 -- * 'apmarsResourcePendingMaintenanceActions'
 --
--- * 'apmarsStatus'
+-- * 'apmarsResponseStatus'
 applyPendingMaintenanceActionResponse
-    :: Int -- ^ 'apmarsStatus'
+    :: Int -- ^ 'apmarsResponseStatus'
     -> ApplyPendingMaintenanceActionResponse
-applyPendingMaintenanceActionResponse pStatus_ =
+applyPendingMaintenanceActionResponse pResponseStatus_ =
     ApplyPendingMaintenanceActionResponse'
     { _apmarsResourcePendingMaintenanceActions = Nothing
-    , _apmarsStatus = pStatus_
+    , _apmarsResponseStatus = pResponseStatus_
     }
 
 -- | Undocumented member.
@@ -157,5 +157,5 @@
 apmarsResourcePendingMaintenanceActions = lens _apmarsResourcePendingMaintenanceActions (\ s a -> s{_apmarsResourcePendingMaintenanceActions = a});
 
 -- | The response status code.
-apmarsStatus :: Lens' ApplyPendingMaintenanceActionResponse Int
-apmarsStatus = lens _apmarsStatus (\ s a -> s{_apmarsStatus = a});
+apmarsResponseStatus :: Lens' ApplyPendingMaintenanceActionResponse Int
+apmarsResponseStatus = lens _apmarsResponseStatus (\ s a -> s{_apmarsResponseStatus = a});
diff --git a/gen/Network/AWS/RDS/AuthorizeDBSecurityGroupIngress.hs b/gen/Network/AWS/RDS/AuthorizeDBSecurityGroupIngress.hs
--- a/gen/Network/AWS/RDS/AuthorizeDBSecurityGroupIngress.hs
+++ b/gen/Network/AWS/RDS/AuthorizeDBSecurityGroupIngress.hs
@@ -52,7 +52,7 @@
     , AuthorizeDBSecurityGroupIngressResponse
     -- * Response Lenses
     , adsgirsDBSecurityGroup
-    , adsgirsStatus
+    , adsgirsResponseStatus
     ) where
 
 import           Network.AWS.Prelude
@@ -163,7 +163,7 @@
 -- | /See:/ 'authorizeDBSecurityGroupIngressResponse' smart constructor.
 data AuthorizeDBSecurityGroupIngressResponse = AuthorizeDBSecurityGroupIngressResponse'
     { _adsgirsDBSecurityGroup :: !(Maybe DBSecurityGroup)
-    , _adsgirsStatus          :: !Int
+    , _adsgirsResponseStatus  :: !Int
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'AuthorizeDBSecurityGroupIngressResponse' with the minimum fields required to make a request.
@@ -172,14 +172,14 @@
 --
 -- * 'adsgirsDBSecurityGroup'
 --
--- * 'adsgirsStatus'
+-- * 'adsgirsResponseStatus'
 authorizeDBSecurityGroupIngressResponse
-    :: Int -- ^ 'adsgirsStatus'
+    :: Int -- ^ 'adsgirsResponseStatus'
     -> AuthorizeDBSecurityGroupIngressResponse
-authorizeDBSecurityGroupIngressResponse pStatus_ =
+authorizeDBSecurityGroupIngressResponse pResponseStatus_ =
     AuthorizeDBSecurityGroupIngressResponse'
     { _adsgirsDBSecurityGroup = Nothing
-    , _adsgirsStatus = pStatus_
+    , _adsgirsResponseStatus = pResponseStatus_
     }
 
 -- | Undocumented member.
@@ -187,5 +187,5 @@
 adsgirsDBSecurityGroup = lens _adsgirsDBSecurityGroup (\ s a -> s{_adsgirsDBSecurityGroup = a});
 
 -- | The response status code.
-adsgirsStatus :: Lens' AuthorizeDBSecurityGroupIngressResponse Int
-adsgirsStatus = lens _adsgirsStatus (\ s a -> s{_adsgirsStatus = a});
+adsgirsResponseStatus :: Lens' AuthorizeDBSecurityGroupIngressResponse Int
+adsgirsResponseStatus = lens _adsgirsResponseStatus (\ s a -> s{_adsgirsResponseStatus = a});
diff --git a/gen/Network/AWS/RDS/CopyDBClusterSnapshot.hs b/gen/Network/AWS/RDS/CopyDBClusterSnapshot.hs
--- a/gen/Network/AWS/RDS/CopyDBClusterSnapshot.hs
+++ b/gen/Network/AWS/RDS/CopyDBClusterSnapshot.hs
@@ -39,7 +39,7 @@
     , CopyDBClusterSnapshotResponse
     -- * Response Lenses
     , cdcsrsDBClusterSnapshot
-    , cdcsrsStatus
+    , cdcsrsResponseStatus
     ) where
 
 import           Network.AWS.Prelude
@@ -137,7 +137,7 @@
 -- | /See:/ 'copyDBClusterSnapshotResponse' smart constructor.
 data CopyDBClusterSnapshotResponse = CopyDBClusterSnapshotResponse'
     { _cdcsrsDBClusterSnapshot :: !(Maybe DBClusterSnapshot)
-    , _cdcsrsStatus            :: !Int
+    , _cdcsrsResponseStatus    :: !Int
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'CopyDBClusterSnapshotResponse' with the minimum fields required to make a request.
@@ -146,14 +146,14 @@
 --
 -- * 'cdcsrsDBClusterSnapshot'
 --
--- * 'cdcsrsStatus'
+-- * 'cdcsrsResponseStatus'
 copyDBClusterSnapshotResponse
-    :: Int -- ^ 'cdcsrsStatus'
+    :: Int -- ^ 'cdcsrsResponseStatus'
     -> CopyDBClusterSnapshotResponse
-copyDBClusterSnapshotResponse pStatus_ =
+copyDBClusterSnapshotResponse pResponseStatus_ =
     CopyDBClusterSnapshotResponse'
     { _cdcsrsDBClusterSnapshot = Nothing
-    , _cdcsrsStatus = pStatus_
+    , _cdcsrsResponseStatus = pResponseStatus_
     }
 
 -- | Undocumented member.
@@ -161,5 +161,5 @@
 cdcsrsDBClusterSnapshot = lens _cdcsrsDBClusterSnapshot (\ s a -> s{_cdcsrsDBClusterSnapshot = a});
 
 -- | The response status code.
-cdcsrsStatus :: Lens' CopyDBClusterSnapshotResponse Int
-cdcsrsStatus = lens _cdcsrsStatus (\ s a -> s{_cdcsrsStatus = a});
+cdcsrsResponseStatus :: Lens' CopyDBClusterSnapshotResponse Int
+cdcsrsResponseStatus = lens _cdcsrsResponseStatus (\ s a -> s{_cdcsrsResponseStatus = a});
diff --git a/gen/Network/AWS/RDS/CopyDBParameterGroup.hs b/gen/Network/AWS/RDS/CopyDBParameterGroup.hs
--- a/gen/Network/AWS/RDS/CopyDBParameterGroup.hs
+++ b/gen/Network/AWS/RDS/CopyDBParameterGroup.hs
@@ -37,7 +37,7 @@
     , CopyDBParameterGroupResponse
     -- * Response Lenses
     , cdbpgrsDBParameterGroup
-    , cdbpgrsStatus
+    , cdbpgrsResponseStatus
     ) where
 
 import           Network.AWS.Prelude
@@ -149,7 +149,7 @@
 -- | /See:/ 'copyDBParameterGroupResponse' smart constructor.
 data CopyDBParameterGroupResponse = CopyDBParameterGroupResponse'
     { _cdbpgrsDBParameterGroup :: !(Maybe DBParameterGroup)
-    , _cdbpgrsStatus           :: !Int
+    , _cdbpgrsResponseStatus   :: !Int
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'CopyDBParameterGroupResponse' with the minimum fields required to make a request.
@@ -158,14 +158,14 @@
 --
 -- * 'cdbpgrsDBParameterGroup'
 --
--- * 'cdbpgrsStatus'
+-- * 'cdbpgrsResponseStatus'
 copyDBParameterGroupResponse
-    :: Int -- ^ 'cdbpgrsStatus'
+    :: Int -- ^ 'cdbpgrsResponseStatus'
     -> CopyDBParameterGroupResponse
-copyDBParameterGroupResponse pStatus_ =
+copyDBParameterGroupResponse pResponseStatus_ =
     CopyDBParameterGroupResponse'
     { _cdbpgrsDBParameterGroup = Nothing
-    , _cdbpgrsStatus = pStatus_
+    , _cdbpgrsResponseStatus = pResponseStatus_
     }
 
 -- | Undocumented member.
@@ -173,5 +173,5 @@
 cdbpgrsDBParameterGroup = lens _cdbpgrsDBParameterGroup (\ s a -> s{_cdbpgrsDBParameterGroup = a});
 
 -- | The response status code.
-cdbpgrsStatus :: Lens' CopyDBParameterGroupResponse Int
-cdbpgrsStatus = lens _cdbpgrsStatus (\ s a -> s{_cdbpgrsStatus = a});
+cdbpgrsResponseStatus :: Lens' CopyDBParameterGroupResponse Int
+cdbpgrsResponseStatus = lens _cdbpgrsResponseStatus (\ s a -> s{_cdbpgrsResponseStatus = a});
diff --git a/gen/Network/AWS/RDS/CopyDBSnapshot.hs b/gen/Network/AWS/RDS/CopyDBSnapshot.hs
--- a/gen/Network/AWS/RDS/CopyDBSnapshot.hs
+++ b/gen/Network/AWS/RDS/CopyDBSnapshot.hs
@@ -38,7 +38,7 @@
     , CopyDBSnapshotResponse
     -- * Response Lenses
     , cdsrsDBSnapshot
-    , cdsrsStatus
+    , cdsrsResponseStatus
     ) where
 
 import           Network.AWS.Prelude
@@ -148,8 +148,8 @@
 
 -- | /See:/ 'copyDBSnapshotResponse' smart constructor.
 data CopyDBSnapshotResponse = CopyDBSnapshotResponse'
-    { _cdsrsDBSnapshot :: !(Maybe DBSnapshot)
-    , _cdsrsStatus     :: !Int
+    { _cdsrsDBSnapshot     :: !(Maybe DBSnapshot)
+    , _cdsrsResponseStatus :: !Int
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'CopyDBSnapshotResponse' with the minimum fields required to make a request.
@@ -158,14 +158,14 @@
 --
 -- * 'cdsrsDBSnapshot'
 --
--- * 'cdsrsStatus'
+-- * 'cdsrsResponseStatus'
 copyDBSnapshotResponse
-    :: Int -- ^ 'cdsrsStatus'
+    :: Int -- ^ 'cdsrsResponseStatus'
     -> CopyDBSnapshotResponse
-copyDBSnapshotResponse pStatus_ =
+copyDBSnapshotResponse pResponseStatus_ =
     CopyDBSnapshotResponse'
     { _cdsrsDBSnapshot = Nothing
-    , _cdsrsStatus = pStatus_
+    , _cdsrsResponseStatus = pResponseStatus_
     }
 
 -- | Undocumented member.
@@ -173,5 +173,5 @@
 cdsrsDBSnapshot = lens _cdsrsDBSnapshot (\ s a -> s{_cdsrsDBSnapshot = a});
 
 -- | The response status code.
-cdsrsStatus :: Lens' CopyDBSnapshotResponse Int
-cdsrsStatus = lens _cdsrsStatus (\ s a -> s{_cdsrsStatus = a});
+cdsrsResponseStatus :: Lens' CopyDBSnapshotResponse Int
+cdsrsResponseStatus = lens _cdsrsResponseStatus (\ s a -> s{_cdsrsResponseStatus = a});
diff --git a/gen/Network/AWS/RDS/CopyOptionGroup.hs b/gen/Network/AWS/RDS/CopyOptionGroup.hs
--- a/gen/Network/AWS/RDS/CopyOptionGroup.hs
+++ b/gen/Network/AWS/RDS/CopyOptionGroup.hs
@@ -37,7 +37,7 @@
     , CopyOptionGroupResponse
     -- * Response Lenses
     , cogrsOptionGroup
-    , cogrsStatus
+    , cogrsResponseStatus
     ) where
 
 import           Network.AWS.Prelude
@@ -147,8 +147,8 @@
 
 -- | /See:/ 'copyOptionGroupResponse' smart constructor.
 data CopyOptionGroupResponse = CopyOptionGroupResponse'
-    { _cogrsOptionGroup :: !(Maybe OptionGroup)
-    , _cogrsStatus      :: !Int
+    { _cogrsOptionGroup    :: !(Maybe OptionGroup)
+    , _cogrsResponseStatus :: !Int
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'CopyOptionGroupResponse' with the minimum fields required to make a request.
@@ -157,14 +157,14 @@
 --
 -- * 'cogrsOptionGroup'
 --
--- * 'cogrsStatus'
+-- * 'cogrsResponseStatus'
 copyOptionGroupResponse
-    :: Int -- ^ 'cogrsStatus'
+    :: Int -- ^ 'cogrsResponseStatus'
     -> CopyOptionGroupResponse
-copyOptionGroupResponse pStatus_ =
+copyOptionGroupResponse pResponseStatus_ =
     CopyOptionGroupResponse'
     { _cogrsOptionGroup = Nothing
-    , _cogrsStatus = pStatus_
+    , _cogrsResponseStatus = pResponseStatus_
     }
 
 -- | Undocumented member.
@@ -172,5 +172,5 @@
 cogrsOptionGroup = lens _cogrsOptionGroup (\ s a -> s{_cogrsOptionGroup = a});
 
 -- | The response status code.
-cogrsStatus :: Lens' CopyOptionGroupResponse Int
-cogrsStatus = lens _cogrsStatus (\ s a -> s{_cogrsStatus = a});
+cogrsResponseStatus :: Lens' CopyOptionGroupResponse Int
+cogrsResponseStatus = lens _cogrsResponseStatus (\ s a -> s{_cogrsResponseStatus = a});
diff --git a/gen/Network/AWS/RDS/CreateDBCluster.hs b/gen/Network/AWS/RDS/CreateDBCluster.hs
--- a/gen/Network/AWS/RDS/CreateDBCluster.hs
+++ b/gen/Network/AWS/RDS/CreateDBCluster.hs
@@ -37,12 +37,12 @@
     , cdcDBSubnetGroupName
     , cdcEngine
     , cdcPreferredMaintenanceWindow
-    , cdcCharacterSetName
     , cdcAvailabilityZones
+    , cdcCharacterSetName
     , cdcPreferredBackupWindow
     , cdcBackupRetentionPeriod
-    , cdcDatabaseName
     , cdcVPCSecurityGroupIds
+    , cdcDatabaseName
     , cdcDBClusterParameterGroupName
     , cdcOptionGroupName
     , cdcTags
@@ -53,7 +53,7 @@
     , CreateDBClusterResponse
     -- * Response Lenses
     , cdcrsDBCluster
-    , cdcrsStatus
+    , cdcrsResponseStatus
     ) where
 
 import           Network.AWS.Prelude
@@ -73,12 +73,12 @@
     , _cdcDBSubnetGroupName           :: !(Maybe Text)
     , _cdcEngine                      :: !(Maybe Text)
     , _cdcPreferredMaintenanceWindow  :: !(Maybe Text)
-    , _cdcCharacterSetName            :: !(Maybe Text)
     , _cdcAvailabilityZones           :: !(Maybe [Text])
+    , _cdcCharacterSetName            :: !(Maybe Text)
     , _cdcPreferredBackupWindow       :: !(Maybe Text)
     , _cdcBackupRetentionPeriod       :: !(Maybe Int)
-    , _cdcDatabaseName                :: !(Maybe Text)
     , _cdcVPCSecurityGroupIds         :: !(Maybe [Text])
+    , _cdcDatabaseName                :: !(Maybe Text)
     , _cdcDBClusterParameterGroupName :: !(Maybe Text)
     , _cdcOptionGroupName             :: !(Maybe Text)
     , _cdcTags                        :: !(Maybe [Tag])
@@ -103,18 +103,18 @@
 --
 -- * 'cdcPreferredMaintenanceWindow'
 --
--- * 'cdcCharacterSetName'
---
 -- * 'cdcAvailabilityZones'
 --
+-- * 'cdcCharacterSetName'
+--
 -- * 'cdcPreferredBackupWindow'
 --
 -- * 'cdcBackupRetentionPeriod'
 --
--- * 'cdcDatabaseName'
---
 -- * 'cdcVPCSecurityGroupIds'
 --
+-- * 'cdcDatabaseName'
+--
 -- * 'cdcDBClusterParameterGroupName'
 --
 -- * 'cdcOptionGroupName'
@@ -133,12 +133,12 @@
     , _cdcDBSubnetGroupName = Nothing
     , _cdcEngine = Nothing
     , _cdcPreferredMaintenanceWindow = Nothing
-    , _cdcCharacterSetName = Nothing
     , _cdcAvailabilityZones = Nothing
+    , _cdcCharacterSetName = Nothing
     , _cdcPreferredBackupWindow = Nothing
     , _cdcBackupRetentionPeriod = Nothing
-    , _cdcDatabaseName = Nothing
     , _cdcVPCSecurityGroupIds = Nothing
+    , _cdcDatabaseName = Nothing
     , _cdcDBClusterParameterGroupName = Nothing
     , _cdcOptionGroupName = Nothing
     , _cdcTags = Nothing
@@ -210,17 +210,17 @@
 cdcPreferredMaintenanceWindow :: Lens' CreateDBCluster (Maybe Text)
 cdcPreferredMaintenanceWindow = lens _cdcPreferredMaintenanceWindow (\ s a -> s{_cdcPreferredMaintenanceWindow = a});
 
--- | A value that indicates that the DB cluster should be associated with the
--- specified CharacterSet.
-cdcCharacterSetName :: Lens' CreateDBCluster (Maybe Text)
-cdcCharacterSetName = lens _cdcCharacterSetName (\ s a -> s{_cdcCharacterSetName = a});
-
 -- | A list of EC2 Availability Zones that instances in the DB cluster can be
 -- created in. For information on regions and Availability Zones, see
 -- <http://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/Concepts.RegionsAndAvailabilityZones.html Regions and Availability Zones>.
 cdcAvailabilityZones :: Lens' CreateDBCluster [Text]
 cdcAvailabilityZones = lens _cdcAvailabilityZones (\ s a -> s{_cdcAvailabilityZones = a}) . _Default . _Coerce;
 
+-- | A value that indicates that the DB cluster should be associated with the
+-- specified CharacterSet.
+cdcCharacterSetName :: Lens' CreateDBCluster (Maybe Text)
+cdcCharacterSetName = lens _cdcCharacterSetName (\ s a -> s{_cdcCharacterSetName = a});
+
 -- | The daily time range during which automated backups are created if
 -- automated backups are enabled using the 'BackupRetentionPeriod'
 -- parameter.
@@ -251,16 +251,16 @@
 cdcBackupRetentionPeriod :: Lens' CreateDBCluster (Maybe Int)
 cdcBackupRetentionPeriod = lens _cdcBackupRetentionPeriod (\ s a -> s{_cdcBackupRetentionPeriod = a});
 
+-- | A list of EC2 VPC security groups to associate with this DB cluster.
+cdcVPCSecurityGroupIds :: Lens' CreateDBCluster [Text]
+cdcVPCSecurityGroupIds = lens _cdcVPCSecurityGroupIds (\ s a -> s{_cdcVPCSecurityGroupIds = a}) . _Default . _Coerce;
+
 -- | The name for your database of up to 8 alpha-numeric characters. If you
 -- do not provide a name, Amazon RDS will not create a database in the DB
 -- cluster you are creating.
 cdcDatabaseName :: Lens' CreateDBCluster (Maybe Text)
 cdcDatabaseName = lens _cdcDatabaseName (\ s a -> s{_cdcDatabaseName = a});
 
--- | A list of EC2 VPC security groups to associate with this DB cluster.
-cdcVPCSecurityGroupIds :: Lens' CreateDBCluster [Text]
-cdcVPCSecurityGroupIds = lens _cdcVPCSecurityGroupIds (\ s a -> s{_cdcVPCSecurityGroupIds = a}) . _Default . _Coerce;
-
 -- | The name of the DB cluster parameter group to associate with this DB
 -- cluster. If this argument is omitted, 'default.aurora5.6' for the
 -- specified engine will be used.
@@ -321,18 +321,18 @@
                "Engine" =: _cdcEngine,
                "PreferredMaintenanceWindow" =:
                  _cdcPreferredMaintenanceWindow,
-               "CharacterSetName" =: _cdcCharacterSetName,
                "AvailabilityZones" =:
                  toQuery
                    (toQueryList "AvailabilityZone" <$>
                       _cdcAvailabilityZones),
+               "CharacterSetName" =: _cdcCharacterSetName,
                "PreferredBackupWindow" =: _cdcPreferredBackupWindow,
                "BackupRetentionPeriod" =: _cdcBackupRetentionPeriod,
-               "DatabaseName" =: _cdcDatabaseName,
                "VpcSecurityGroupIds" =:
                  toQuery
                    (toQueryList "VpcSecurityGroupId" <$>
                       _cdcVPCSecurityGroupIds),
+               "DatabaseName" =: _cdcDatabaseName,
                "DBClusterParameterGroupName" =:
                  _cdcDBClusterParameterGroupName,
                "OptionGroupName" =: _cdcOptionGroupName,
@@ -341,8 +341,8 @@
 
 -- | /See:/ 'createDBClusterResponse' smart constructor.
 data CreateDBClusterResponse = CreateDBClusterResponse'
-    { _cdcrsDBCluster :: !(Maybe DBCluster)
-    , _cdcrsStatus    :: !Int
+    { _cdcrsDBCluster      :: !(Maybe DBCluster)
+    , _cdcrsResponseStatus :: !Int
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'CreateDBClusterResponse' with the minimum fields required to make a request.
@@ -351,14 +351,14 @@
 --
 -- * 'cdcrsDBCluster'
 --
--- * 'cdcrsStatus'
+-- * 'cdcrsResponseStatus'
 createDBClusterResponse
-    :: Int -- ^ 'cdcrsStatus'
+    :: Int -- ^ 'cdcrsResponseStatus'
     -> CreateDBClusterResponse
-createDBClusterResponse pStatus_ =
+createDBClusterResponse pResponseStatus_ =
     CreateDBClusterResponse'
     { _cdcrsDBCluster = Nothing
-    , _cdcrsStatus = pStatus_
+    , _cdcrsResponseStatus = pResponseStatus_
     }
 
 -- | Undocumented member.
@@ -366,5 +366,5 @@
 cdcrsDBCluster = lens _cdcrsDBCluster (\ s a -> s{_cdcrsDBCluster = a});
 
 -- | The response status code.
-cdcrsStatus :: Lens' CreateDBClusterResponse Int
-cdcrsStatus = lens _cdcrsStatus (\ s a -> s{_cdcrsStatus = a});
+cdcrsResponseStatus :: Lens' CreateDBClusterResponse Int
+cdcrsResponseStatus = lens _cdcrsResponseStatus (\ s a -> s{_cdcrsResponseStatus = a});
diff --git a/gen/Network/AWS/RDS/CreateDBClusterParameterGroup.hs b/gen/Network/AWS/RDS/CreateDBClusterParameterGroup.hs
--- a/gen/Network/AWS/RDS/CreateDBClusterParameterGroup.hs
+++ b/gen/Network/AWS/RDS/CreateDBClusterParameterGroup.hs
@@ -67,7 +67,7 @@
     , CreateDBClusterParameterGroupResponse
     -- * Response Lenses
     , cdcpgrsDBClusterParameterGroup
-    , cdcpgrsStatus
+    , cdcpgrsResponseStatus
     ) where
 
 import           Network.AWS.Prelude
@@ -174,7 +174,7 @@
 -- | /See:/ 'createDBClusterParameterGroupResponse' smart constructor.
 data CreateDBClusterParameterGroupResponse = CreateDBClusterParameterGroupResponse'
     { _cdcpgrsDBClusterParameterGroup :: !(Maybe DBClusterParameterGroup)
-    , _cdcpgrsStatus                  :: !Int
+    , _cdcpgrsResponseStatus          :: !Int
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'CreateDBClusterParameterGroupResponse' with the minimum fields required to make a request.
@@ -183,14 +183,14 @@
 --
 -- * 'cdcpgrsDBClusterParameterGroup'
 --
--- * 'cdcpgrsStatus'
+-- * 'cdcpgrsResponseStatus'
 createDBClusterParameterGroupResponse
-    :: Int -- ^ 'cdcpgrsStatus'
+    :: Int -- ^ 'cdcpgrsResponseStatus'
     -> CreateDBClusterParameterGroupResponse
-createDBClusterParameterGroupResponse pStatus_ =
+createDBClusterParameterGroupResponse pResponseStatus_ =
     CreateDBClusterParameterGroupResponse'
     { _cdcpgrsDBClusterParameterGroup = Nothing
-    , _cdcpgrsStatus = pStatus_
+    , _cdcpgrsResponseStatus = pResponseStatus_
     }
 
 -- | Undocumented member.
@@ -198,5 +198,5 @@
 cdcpgrsDBClusterParameterGroup = lens _cdcpgrsDBClusterParameterGroup (\ s a -> s{_cdcpgrsDBClusterParameterGroup = a});
 
 -- | The response status code.
-cdcpgrsStatus :: Lens' CreateDBClusterParameterGroupResponse Int
-cdcpgrsStatus = lens _cdcpgrsStatus (\ s a -> s{_cdcpgrsStatus = a});
+cdcpgrsResponseStatus :: Lens' CreateDBClusterParameterGroupResponse Int
+cdcpgrsResponseStatus = lens _cdcpgrsResponseStatus (\ s a -> s{_cdcpgrsResponseStatus = a});
diff --git a/gen/Network/AWS/RDS/CreateDBClusterSnapshot.hs b/gen/Network/AWS/RDS/CreateDBClusterSnapshot.hs
--- a/gen/Network/AWS/RDS/CreateDBClusterSnapshot.hs
+++ b/gen/Network/AWS/RDS/CreateDBClusterSnapshot.hs
@@ -39,7 +39,7 @@
     , CreateDBClusterSnapshotResponse
     -- * Response Lenses
     , cdbcsrsDBClusterSnapshot
-    , cdbcsrsStatus
+    , cdbcsrsResponseStatus
     ) where
 
 import           Network.AWS.Prelude
@@ -137,7 +137,7 @@
 -- | /See:/ 'createDBClusterSnapshotResponse' smart constructor.
 data CreateDBClusterSnapshotResponse = CreateDBClusterSnapshotResponse'
     { _cdbcsrsDBClusterSnapshot :: !(Maybe DBClusterSnapshot)
-    , _cdbcsrsStatus            :: !Int
+    , _cdbcsrsResponseStatus    :: !Int
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'CreateDBClusterSnapshotResponse' with the minimum fields required to make a request.
@@ -146,14 +146,14 @@
 --
 -- * 'cdbcsrsDBClusterSnapshot'
 --
--- * 'cdbcsrsStatus'
+-- * 'cdbcsrsResponseStatus'
 createDBClusterSnapshotResponse
-    :: Int -- ^ 'cdbcsrsStatus'
+    :: Int -- ^ 'cdbcsrsResponseStatus'
     -> CreateDBClusterSnapshotResponse
-createDBClusterSnapshotResponse pStatus_ =
+createDBClusterSnapshotResponse pResponseStatus_ =
     CreateDBClusterSnapshotResponse'
     { _cdbcsrsDBClusterSnapshot = Nothing
-    , _cdbcsrsStatus = pStatus_
+    , _cdbcsrsResponseStatus = pResponseStatus_
     }
 
 -- | Undocumented member.
@@ -161,5 +161,5 @@
 cdbcsrsDBClusterSnapshot = lens _cdbcsrsDBClusterSnapshot (\ s a -> s{_cdbcsrsDBClusterSnapshot = a});
 
 -- | The response status code.
-cdbcsrsStatus :: Lens' CreateDBClusterSnapshotResponse Int
-cdbcsrsStatus = lens _cdbcsrsStatus (\ s a -> s{_cdbcsrsStatus = a});
+cdbcsrsResponseStatus :: Lens' CreateDBClusterSnapshotResponse Int
+cdbcsrsResponseStatus = lens _cdbcsrsResponseStatus (\ s a -> s{_cdbcsrsResponseStatus = a});
diff --git a/gen/Network/AWS/RDS/CreateDBInstance.hs b/gen/Network/AWS/RDS/CreateDBInstance.hs
--- a/gen/Network/AWS/RDS/CreateDBInstance.hs
+++ b/gen/Network/AWS/RDS/CreateDBInstance.hs
@@ -27,14 +27,14 @@
       createDBInstance
     , CreateDBInstance
     -- * Request Lenses
-    , cdiDBSecurityGroups
     , cdiEngineVersion
+    , cdiDBSecurityGroups
     , cdiStorageEncrypted
     , cdiDBClusterIdentifier
-    , cdiAutoMinorVersionUpgrade
     , cdiMasterUserPassword
-    , cdiMasterUsername
     , cdiPubliclyAccessible
+    , cdiAutoMinorVersionUpgrade
+    , cdiMasterUsername
     , cdiDBSubnetGroupName
     , cdiIOPS
     , cdiDomain
@@ -42,21 +42,21 @@
     , cdiLicenseModel
     , cdiPreferredMaintenanceWindow
     , cdiCharacterSetName
+    , cdiKMSKeyId
+    , cdiDBParameterGroupName
     , cdiPreferredBackupWindow
     , cdiAvailabilityZone
     , cdiBackupRetentionPeriod
-    , cdiKMSKeyId
-    , cdiDBParameterGroupName
     , cdiVPCSecurityGroupIds
     , cdiMultiAZ
     , cdiAllocatedStorage
-    , cdiTDECredentialARN
     , cdiOptionGroupName
     , cdiCopyTagsToSnapshot
-    , cdiDBName
+    , cdiTDECredentialARN
     , cdiTags
     , cdiPort
     , cdiStorageType
+    , cdiDBName
     , cdiDBInstanceIdentifier
     , cdiDBInstanceClass
     , cdiEngine
@@ -66,7 +66,7 @@
     , CreateDBInstanceResponse
     -- * Response Lenses
     , cdirsDBInstance
-    , cdirsStatus
+    , cdirsResponseStatus
     ) where
 
 import           Network.AWS.Prelude
@@ -79,14 +79,14 @@
 --
 -- /See:/ 'createDBInstance' smart constructor.
 data CreateDBInstance = CreateDBInstance'
-    { _cdiDBSecurityGroups           :: !(Maybe [Text])
-    , _cdiEngineVersion              :: !(Maybe Text)
+    { _cdiEngineVersion              :: !(Maybe Text)
+    , _cdiDBSecurityGroups           :: !(Maybe [Text])
     , _cdiStorageEncrypted           :: !(Maybe Bool)
     , _cdiDBClusterIdentifier        :: !(Maybe Text)
-    , _cdiAutoMinorVersionUpgrade    :: !(Maybe Bool)
     , _cdiMasterUserPassword         :: !(Maybe Text)
-    , _cdiMasterUsername             :: !(Maybe Text)
     , _cdiPubliclyAccessible         :: !(Maybe Bool)
+    , _cdiAutoMinorVersionUpgrade    :: !(Maybe Bool)
+    , _cdiMasterUsername             :: !(Maybe Text)
     , _cdiDBSubnetGroupName          :: !(Maybe Text)
     , _cdiIOPS                       :: !(Maybe Int)
     , _cdiDomain                     :: !(Maybe Text)
@@ -94,21 +94,21 @@
     , _cdiLicenseModel               :: !(Maybe Text)
     , _cdiPreferredMaintenanceWindow :: !(Maybe Text)
     , _cdiCharacterSetName           :: !(Maybe Text)
+    , _cdiKMSKeyId                   :: !(Maybe Text)
+    , _cdiDBParameterGroupName       :: !(Maybe Text)
     , _cdiPreferredBackupWindow      :: !(Maybe Text)
     , _cdiAvailabilityZone           :: !(Maybe Text)
     , _cdiBackupRetentionPeriod      :: !(Maybe Int)
-    , _cdiKMSKeyId                   :: !(Maybe Text)
-    , _cdiDBParameterGroupName       :: !(Maybe Text)
     , _cdiVPCSecurityGroupIds        :: !(Maybe [Text])
     , _cdiMultiAZ                    :: !(Maybe Bool)
     , _cdiAllocatedStorage           :: !(Maybe Int)
-    , _cdiTDECredentialARN           :: !(Maybe Text)
     , _cdiOptionGroupName            :: !(Maybe Text)
     , _cdiCopyTagsToSnapshot         :: !(Maybe Bool)
-    , _cdiDBName                     :: !(Maybe Text)
+    , _cdiTDECredentialARN           :: !(Maybe Text)
     , _cdiTags                       :: !(Maybe [Tag])
     , _cdiPort                       :: !(Maybe Int)
     , _cdiStorageType                :: !(Maybe Text)
+    , _cdiDBName                     :: !(Maybe Text)
     , _cdiDBInstanceIdentifier       :: !Text
     , _cdiDBInstanceClass            :: !Text
     , _cdiEngine                     :: !Text
@@ -118,22 +118,22 @@
 --
 -- Use one of the following lenses to modify other fields as desired:
 --
--- * 'cdiDBSecurityGroups'
---
 -- * 'cdiEngineVersion'
 --
+-- * 'cdiDBSecurityGroups'
+--
 -- * 'cdiStorageEncrypted'
 --
 -- * 'cdiDBClusterIdentifier'
 --
--- * 'cdiAutoMinorVersionUpgrade'
---
 -- * 'cdiMasterUserPassword'
 --
--- * 'cdiMasterUsername'
---
 -- * 'cdiPubliclyAccessible'
 --
+-- * 'cdiAutoMinorVersionUpgrade'
+--
+-- * 'cdiMasterUsername'
+--
 -- * 'cdiDBSubnetGroupName'
 --
 -- * 'cdiIOPS'
@@ -148,29 +148,27 @@
 --
 -- * 'cdiCharacterSetName'
 --
+-- * 'cdiKMSKeyId'
+--
+-- * 'cdiDBParameterGroupName'
+--
 -- * 'cdiPreferredBackupWindow'
 --
 -- * 'cdiAvailabilityZone'
 --
 -- * 'cdiBackupRetentionPeriod'
 --
--- * 'cdiKMSKeyId'
---
--- * 'cdiDBParameterGroupName'
---
 -- * 'cdiVPCSecurityGroupIds'
 --
 -- * 'cdiMultiAZ'
 --
 -- * 'cdiAllocatedStorage'
 --
--- * 'cdiTDECredentialARN'
---
 -- * 'cdiOptionGroupName'
 --
 -- * 'cdiCopyTagsToSnapshot'
 --
--- * 'cdiDBName'
+-- * 'cdiTDECredentialARN'
 --
 -- * 'cdiTags'
 --
@@ -178,6 +176,8 @@
 --
 -- * 'cdiStorageType'
 --
+-- * 'cdiDBName'
+--
 -- * 'cdiDBInstanceIdentifier'
 --
 -- * 'cdiDBInstanceClass'
@@ -190,14 +190,14 @@
     -> CreateDBInstance
 createDBInstance pDBInstanceIdentifier_ pDBInstanceClass_ pEngine_ =
     CreateDBInstance'
-    { _cdiDBSecurityGroups = Nothing
-    , _cdiEngineVersion = Nothing
+    { _cdiEngineVersion = Nothing
+    , _cdiDBSecurityGroups = Nothing
     , _cdiStorageEncrypted = Nothing
     , _cdiDBClusterIdentifier = Nothing
-    , _cdiAutoMinorVersionUpgrade = Nothing
     , _cdiMasterUserPassword = Nothing
-    , _cdiMasterUsername = Nothing
     , _cdiPubliclyAccessible = Nothing
+    , _cdiAutoMinorVersionUpgrade = Nothing
+    , _cdiMasterUsername = Nothing
     , _cdiDBSubnetGroupName = Nothing
     , _cdiIOPS = Nothing
     , _cdiDomain = Nothing
@@ -205,32 +205,26 @@
     , _cdiLicenseModel = Nothing
     , _cdiPreferredMaintenanceWindow = Nothing
     , _cdiCharacterSetName = Nothing
+    , _cdiKMSKeyId = Nothing
+    , _cdiDBParameterGroupName = Nothing
     , _cdiPreferredBackupWindow = Nothing
     , _cdiAvailabilityZone = Nothing
     , _cdiBackupRetentionPeriod = Nothing
-    , _cdiKMSKeyId = Nothing
-    , _cdiDBParameterGroupName = Nothing
     , _cdiVPCSecurityGroupIds = Nothing
     , _cdiMultiAZ = Nothing
     , _cdiAllocatedStorage = Nothing
-    , _cdiTDECredentialARN = Nothing
     , _cdiOptionGroupName = Nothing
     , _cdiCopyTagsToSnapshot = Nothing
-    , _cdiDBName = Nothing
+    , _cdiTDECredentialARN = Nothing
     , _cdiTags = Nothing
     , _cdiPort = Nothing
     , _cdiStorageType = Nothing
+    , _cdiDBName = Nothing
     , _cdiDBInstanceIdentifier = pDBInstanceIdentifier_
     , _cdiDBInstanceClass = pDBInstanceClass_
     , _cdiEngine = pEngine_
     }
 
--- | A list of DB security groups to associate with this DB instance.
---
--- Default: The default DB security group for the database engine.
-cdiDBSecurityGroups :: Lens' CreateDBInstance [Text]
-cdiDBSecurityGroups = lens _cdiDBSecurityGroups (\ s a -> s{_cdiDBSecurityGroups = a}) . _Default . _Coerce;
-
 -- | The version number of the database engine to use.
 --
 -- The following are the database engines and major and minor versions that
@@ -455,6 +449,12 @@
 cdiEngineVersion :: Lens' CreateDBInstance (Maybe Text)
 cdiEngineVersion = lens _cdiEngineVersion (\ s a -> s{_cdiEngineVersion = a});
 
+-- | A list of DB security groups to associate with this DB instance.
+--
+-- Default: The default DB security group for the database engine.
+cdiDBSecurityGroups :: Lens' CreateDBInstance [Text]
+cdiDBSecurityGroups = lens _cdiDBSecurityGroups (\ s a -> s{_cdiDBSecurityGroups = a}) . _Default . _Coerce;
+
 -- | Specifies whether the DB instance is encrypted.
 --
 -- Default: false
@@ -469,13 +469,6 @@
 cdiDBClusterIdentifier :: Lens' CreateDBInstance (Maybe Text)
 cdiDBClusterIdentifier = lens _cdiDBClusterIdentifier (\ s a -> s{_cdiDBClusterIdentifier = a});
 
--- | Indicates that minor engine upgrades will be applied automatically to
--- the DB instance during the maintenance window.
---
--- Default: 'true'
-cdiAutoMinorVersionUpgrade :: Lens' CreateDBInstance (Maybe Bool)
-cdiAutoMinorVersionUpgrade = lens _cdiAutoMinorVersionUpgrade (\ s a -> s{_cdiAutoMinorVersionUpgrade = a});
-
 -- | The password for the master database user. Can be any printable ASCII
 -- character except \"\/\", \"\"\", or \"\'\".
 --
@@ -499,6 +492,34 @@
 cdiMasterUserPassword :: Lens' CreateDBInstance (Maybe Text)
 cdiMasterUserPassword = lens _cdiMasterUserPassword (\ s a -> s{_cdiMasterUserPassword = a});
 
+-- | Specifies the accessibility options for the DB instance. A value of true
+-- specifies an Internet-facing instance with a publicly resolvable DNS
+-- name, which resolves to a public IP address. A value of false specifies
+-- an internal instance with a DNS name that resolves to a private IP
+-- address.
+--
+-- Default: The default behavior varies depending on whether a VPC has been
+-- requested or not. The following list shows the default behavior in each
+-- case.
+--
+-- -   __Default VPC:__ true
+-- -   __VPC:__ false
+--
+-- If no DB subnet group has been specified as part of the request and the
+-- PubliclyAccessible value has not been set, the DB instance will be
+-- publicly accessible. If a specific DB subnet group has been specified as
+-- part of the request and the PubliclyAccessible value has not been set,
+-- the DB instance will be private.
+cdiPubliclyAccessible :: Lens' CreateDBInstance (Maybe Bool)
+cdiPubliclyAccessible = lens _cdiPubliclyAccessible (\ s a -> s{_cdiPubliclyAccessible = a});
+
+-- | Indicates that minor engine upgrades will be applied automatically to
+-- the DB instance during the maintenance window.
+--
+-- Default: 'true'
+cdiAutoMinorVersionUpgrade :: Lens' CreateDBInstance (Maybe Bool)
+cdiAutoMinorVersionUpgrade = lens _cdiAutoMinorVersionUpgrade (\ s a -> s{_cdiAutoMinorVersionUpgrade = a});
+
 -- | The name of master user for the client DB instance.
 --
 -- __MySQL__
@@ -537,27 +558,6 @@
 cdiMasterUsername :: Lens' CreateDBInstance (Maybe Text)
 cdiMasterUsername = lens _cdiMasterUsername (\ s a -> s{_cdiMasterUsername = a});
 
--- | Specifies the accessibility options for the DB instance. A value of true
--- specifies an Internet-facing instance with a publicly resolvable DNS
--- name, which resolves to a public IP address. A value of false specifies
--- an internal instance with a DNS name that resolves to a private IP
--- address.
---
--- Default: The default behavior varies depending on whether a VPC has been
--- requested or not. The following list shows the default behavior in each
--- case.
---
--- -   __Default VPC:__ true
--- -   __VPC:__ false
---
--- If no DB subnet group has been specified as part of the request and the
--- PubliclyAccessible value has not been set, the DB instance will be
--- publicly accessible. If a specific DB subnet group has been specified as
--- part of the request and the PubliclyAccessible value has not been set,
--- the DB instance will be private.
-cdiPubliclyAccessible :: Lens' CreateDBInstance (Maybe Bool)
-cdiPubliclyAccessible = lens _cdiPubliclyAccessible (\ s a -> s{_cdiPubliclyAccessible = a});
-
 -- | A DB subnet group to associate with this DB instance.
 --
 -- If there is no DB subnet group, then it is a non-VPC DB instance.
@@ -611,6 +611,34 @@
 cdiCharacterSetName :: Lens' CreateDBInstance (Maybe Text)
 cdiCharacterSetName = lens _cdiCharacterSetName (\ s a -> s{_cdiCharacterSetName = a});
 
+-- | The KMS key identifier for an encrypted DB instance.
+--
+-- The KMS key identifier is the Amazon Resoure Name (ARN) for the KMS
+-- encryption key. If you are creating a DB instance with the same AWS
+-- account that owns the KMS encryption key used to encrypt the new DB
+-- instance, then you can use the KMS key alias instead of the ARN for the
+-- KM encryption key.
+--
+-- If the 'StorageEncrypted' parameter is true, and you do not specify a
+-- value for the 'KmsKeyId' parameter, then Amazon RDS will use your
+-- default encryption key. AWS KMS creates the default encryption key for
+-- your AWS account. Your AWS account has a different default encryption
+-- key for each AWS region.
+cdiKMSKeyId :: Lens' CreateDBInstance (Maybe Text)
+cdiKMSKeyId = lens _cdiKMSKeyId (\ s a -> s{_cdiKMSKeyId = a});
+
+-- | The name of the DB parameter group to associate with this DB instance.
+-- If this argument is omitted, the default DBParameterGroup for the
+-- specified engine will be used.
+--
+-- Constraints:
+--
+-- -   Must be 1 to 255 alphanumeric characters
+-- -   First character must be a letter
+-- -   Cannot end with a hyphen or contain two consecutive hyphens
+cdiDBParameterGroupName :: Lens' CreateDBInstance (Maybe Text)
+cdiDBParameterGroupName = lens _cdiDBParameterGroupName (\ s a -> s{_cdiDBParameterGroupName = a});
+
 -- | The daily time range during which automated backups are created if
 -- automated backups are enabled, using the 'BackupRetentionPeriod'
 -- parameter. For more information, see
@@ -658,34 +686,6 @@
 cdiBackupRetentionPeriod :: Lens' CreateDBInstance (Maybe Int)
 cdiBackupRetentionPeriod = lens _cdiBackupRetentionPeriod (\ s a -> s{_cdiBackupRetentionPeriod = a});
 
--- | The KMS key identifier for an encrypted DB instance.
---
--- The KMS key identifier is the Amazon Resoure Name (ARN) for the KMS
--- encryption key. If you are creating a DB instance with the same AWS
--- account that owns the KMS encryption key used to encrypt the new DB
--- instance, then you can use the KMS key alias instead of the ARN for the
--- KM encryption key.
---
--- If the 'StorageEncrypted' parameter is true, and you do not specify a
--- value for the 'KmsKeyId' parameter, then Amazon RDS will use your
--- default encryption key. AWS KMS creates the default encryption key for
--- your AWS account. Your AWS account has a different default encryption
--- key for each AWS region.
-cdiKMSKeyId :: Lens' CreateDBInstance (Maybe Text)
-cdiKMSKeyId = lens _cdiKMSKeyId (\ s a -> s{_cdiKMSKeyId = a});
-
--- | The name of the DB parameter group to associate with this DB instance.
--- If this argument is omitted, the default DBParameterGroup for the
--- specified engine will be used.
---
--- Constraints:
---
--- -   Must be 1 to 255 alphanumeric characters
--- -   First character must be a letter
--- -   Cannot end with a hyphen or contain two consecutive hyphens
-cdiDBParameterGroupName :: Lens' CreateDBInstance (Maybe Text)
-cdiDBParameterGroupName = lens _cdiDBParameterGroupName (\ s a -> s{_cdiDBParameterGroupName = a});
-
 -- | A list of EC2 VPC security groups to associate with this DB instance.
 --
 -- Default: The default EC2 VPC security group for the DB subnet group\'s
@@ -725,11 +725,6 @@
 cdiAllocatedStorage :: Lens' CreateDBInstance (Maybe Int)
 cdiAllocatedStorage = lens _cdiAllocatedStorage (\ s a -> s{_cdiAllocatedStorage = a});
 
--- | The ARN from the Key Store with which to associate the instance for TDE
--- encryption.
-cdiTDECredentialARN :: Lens' CreateDBInstance (Maybe Text)
-cdiTDECredentialARN = lens _cdiTDECredentialARN (\ s a -> s{_cdiTDECredentialARN = a});
-
 -- | Indicates that the DB instance should be associated with the specified
 -- option group.
 --
@@ -744,50 +739,10 @@
 cdiCopyTagsToSnapshot :: Lens' CreateDBInstance (Maybe Bool)
 cdiCopyTagsToSnapshot = lens _cdiCopyTagsToSnapshot (\ s a -> s{_cdiCopyTagsToSnapshot = a});
 
--- | The meaning of this parameter differs according to the database engine
--- you use.
---
--- Type: String
---
--- __MySQL__
---
--- The name of the database to create when the DB instance is created. If
--- this parameter is not specified, no database is created in the DB
--- instance.
---
--- Constraints:
---
--- -   Must contain 1 to 64 alphanumeric characters
--- -   Cannot be a word reserved by the specified database engine
---
--- __PostgreSQL__
---
--- The name of the database to create when the DB instance is created. If
--- this parameter is not specified, the default \"postgres\" database is
--- created in the DB instance.
---
--- Constraints:
---
--- -   Must contain 1 to 63 alphanumeric characters
--- -   Must begin with a letter or an underscore. Subsequent characters can
---     be letters, underscores, or digits (0-9).
--- -   Cannot be a word reserved by the specified database engine
---
--- __Oracle__
---
--- The Oracle System ID (SID) of the created DB instance.
---
--- Default: 'ORCL'
---
--- Constraints:
---
--- -   Cannot be longer than 8 characters
---
--- __SQL Server__
---
--- Not applicable. Must be null.
-cdiDBName :: Lens' CreateDBInstance (Maybe Text)
-cdiDBName = lens _cdiDBName (\ s a -> s{_cdiDBName = a});
+-- | The ARN from the Key Store with which to associate the instance for TDE
+-- encryption.
+cdiTDECredentialARN :: Lens' CreateDBInstance (Maybe Text)
+cdiTDECredentialARN = lens _cdiTDECredentialARN (\ s a -> s{_cdiTDECredentialARN = a});
 
 -- | Undocumented member.
 cdiTags :: Lens' CreateDBInstance [Tag]
@@ -838,6 +793,51 @@
 cdiStorageType :: Lens' CreateDBInstance (Maybe Text)
 cdiStorageType = lens _cdiStorageType (\ s a -> s{_cdiStorageType = a});
 
+-- | The meaning of this parameter differs according to the database engine
+-- you use.
+--
+-- Type: String
+--
+-- __MySQL__
+--
+-- The name of the database to create when the DB instance is created. If
+-- this parameter is not specified, no database is created in the DB
+-- instance.
+--
+-- Constraints:
+--
+-- -   Must contain 1 to 64 alphanumeric characters
+-- -   Cannot be a word reserved by the specified database engine
+--
+-- __PostgreSQL__
+--
+-- The name of the database to create when the DB instance is created. If
+-- this parameter is not specified, the default \"postgres\" database is
+-- created in the DB instance.
+--
+-- Constraints:
+--
+-- -   Must contain 1 to 63 alphanumeric characters
+-- -   Must begin with a letter or an underscore. Subsequent characters can
+--     be letters, underscores, or digits (0-9).
+-- -   Cannot be a word reserved by the specified database engine
+--
+-- __Oracle__
+--
+-- The Oracle System ID (SID) of the created DB instance.
+--
+-- Default: 'ORCL'
+--
+-- Constraints:
+--
+-- -   Cannot be longer than 8 characters
+--
+-- __SQL Server__
+--
+-- Not applicable. Must be null.
+cdiDBName :: Lens' CreateDBInstance (Maybe Text)
+cdiDBName = lens _cdiDBName (\ s a -> s{_cdiDBName = a});
+
 -- | The DB instance identifier. This parameter is stored as a lowercase
 -- string.
 --
@@ -889,18 +889,18 @@
           = mconcat
               ["Action" =: ("CreateDBInstance" :: ByteString),
                "Version" =: ("2014-10-31" :: ByteString),
+               "EngineVersion" =: _cdiEngineVersion,
                "DBSecurityGroups" =:
                  toQuery
                    (toQueryList "DBSecurityGroupName" <$>
                       _cdiDBSecurityGroups),
-               "EngineVersion" =: _cdiEngineVersion,
                "StorageEncrypted" =: _cdiStorageEncrypted,
                "DBClusterIdentifier" =: _cdiDBClusterIdentifier,
+               "MasterUserPassword" =: _cdiMasterUserPassword,
+               "PubliclyAccessible" =: _cdiPubliclyAccessible,
                "AutoMinorVersionUpgrade" =:
                  _cdiAutoMinorVersionUpgrade,
-               "MasterUserPassword" =: _cdiMasterUserPassword,
                "MasterUsername" =: _cdiMasterUsername,
-               "PubliclyAccessible" =: _cdiPubliclyAccessible,
                "DBSubnetGroupName" =: _cdiDBSubnetGroupName,
                "Iops" =: _cdiIOPS, "Domain" =: _cdiDomain,
                "TdeCredentialPassword" =: _cdiTDECredentialPassword,
@@ -908,31 +908,31 @@
                "PreferredMaintenanceWindow" =:
                  _cdiPreferredMaintenanceWindow,
                "CharacterSetName" =: _cdiCharacterSetName,
+               "KmsKeyId" =: _cdiKMSKeyId,
+               "DBParameterGroupName" =: _cdiDBParameterGroupName,
                "PreferredBackupWindow" =: _cdiPreferredBackupWindow,
                "AvailabilityZone" =: _cdiAvailabilityZone,
                "BackupRetentionPeriod" =: _cdiBackupRetentionPeriod,
-               "KmsKeyId" =: _cdiKMSKeyId,
-               "DBParameterGroupName" =: _cdiDBParameterGroupName,
                "VpcSecurityGroupIds" =:
                  toQuery
                    (toQueryList "VpcSecurityGroupId" <$>
                       _cdiVPCSecurityGroupIds),
                "MultiAZ" =: _cdiMultiAZ,
                "AllocatedStorage" =: _cdiAllocatedStorage,
-               "TdeCredentialArn" =: _cdiTDECredentialARN,
                "OptionGroupName" =: _cdiOptionGroupName,
                "CopyTagsToSnapshot" =: _cdiCopyTagsToSnapshot,
-               "DBName" =: _cdiDBName,
+               "TdeCredentialArn" =: _cdiTDECredentialARN,
                "Tags" =: toQuery (toQueryList "Tag" <$> _cdiTags),
                "Port" =: _cdiPort, "StorageType" =: _cdiStorageType,
+               "DBName" =: _cdiDBName,
                "DBInstanceIdentifier" =: _cdiDBInstanceIdentifier,
                "DBInstanceClass" =: _cdiDBInstanceClass,
                "Engine" =: _cdiEngine]
 
 -- | /See:/ 'createDBInstanceResponse' smart constructor.
 data CreateDBInstanceResponse = CreateDBInstanceResponse'
-    { _cdirsDBInstance :: !(Maybe DBInstance)
-    , _cdirsStatus     :: !Int
+    { _cdirsDBInstance     :: !(Maybe DBInstance)
+    , _cdirsResponseStatus :: !Int
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'CreateDBInstanceResponse' with the minimum fields required to make a request.
@@ -941,14 +941,14 @@
 --
 -- * 'cdirsDBInstance'
 --
--- * 'cdirsStatus'
+-- * 'cdirsResponseStatus'
 createDBInstanceResponse
-    :: Int -- ^ 'cdirsStatus'
+    :: Int -- ^ 'cdirsResponseStatus'
     -> CreateDBInstanceResponse
-createDBInstanceResponse pStatus_ =
+createDBInstanceResponse pResponseStatus_ =
     CreateDBInstanceResponse'
     { _cdirsDBInstance = Nothing
-    , _cdirsStatus = pStatus_
+    , _cdirsResponseStatus = pResponseStatus_
     }
 
 -- | Undocumented member.
@@ -956,5 +956,5 @@
 cdirsDBInstance = lens _cdirsDBInstance (\ s a -> s{_cdirsDBInstance = a});
 
 -- | The response status code.
-cdirsStatus :: Lens' CreateDBInstanceResponse Int
-cdirsStatus = lens _cdirsStatus (\ s a -> s{_cdirsStatus = a});
+cdirsResponseStatus :: Lens' CreateDBInstanceResponse Int
+cdirsResponseStatus = lens _cdirsResponseStatus (\ s a -> s{_cdirsResponseStatus = a});
diff --git a/gen/Network/AWS/RDS/CreateDBInstanceReadReplica.hs b/gen/Network/AWS/RDS/CreateDBInstanceReadReplica.hs
--- a/gen/Network/AWS/RDS/CreateDBInstanceReadReplica.hs
+++ b/gen/Network/AWS/RDS/CreateDBInstanceReadReplica.hs
@@ -35,8 +35,8 @@
       createDBInstanceReadReplica
     , CreateDBInstanceReadReplica
     -- * Request Lenses
-    , cdirrAutoMinorVersionUpgrade
     , cdirrPubliclyAccessible
+    , cdirrAutoMinorVersionUpgrade
     , cdirrDBSubnetGroupName
     , cdirrIOPS
     , cdirrDBInstanceClass
@@ -54,7 +54,7 @@
     , CreateDBInstanceReadReplicaResponse
     -- * Response Lenses
     , cdirrrsDBInstance
-    , cdirrrsStatus
+    , cdirrrsResponseStatus
     ) where
 
 import           Network.AWS.Prelude
@@ -65,8 +65,8 @@
 
 -- | /See:/ 'createDBInstanceReadReplica' smart constructor.
 data CreateDBInstanceReadReplica = CreateDBInstanceReadReplica'
-    { _cdirrAutoMinorVersionUpgrade    :: !(Maybe Bool)
-    , _cdirrPubliclyAccessible         :: !(Maybe Bool)
+    { _cdirrPubliclyAccessible         :: !(Maybe Bool)
+    , _cdirrAutoMinorVersionUpgrade    :: !(Maybe Bool)
     , _cdirrDBSubnetGroupName          :: !(Maybe Text)
     , _cdirrIOPS                       :: !(Maybe Int)
     , _cdirrDBInstanceClass            :: !(Maybe Text)
@@ -84,10 +84,10 @@
 --
 -- Use one of the following lenses to modify other fields as desired:
 --
--- * 'cdirrAutoMinorVersionUpgrade'
---
 -- * 'cdirrPubliclyAccessible'
 --
+-- * 'cdirrAutoMinorVersionUpgrade'
+--
 -- * 'cdirrDBSubnetGroupName'
 --
 -- * 'cdirrIOPS'
@@ -115,8 +115,8 @@
     -> CreateDBInstanceReadReplica
 createDBInstanceReadReplica pDBInstanceIdentifier_ pSourceDBInstanceIdentifier_ =
     CreateDBInstanceReadReplica'
-    { _cdirrAutoMinorVersionUpgrade = Nothing
-    , _cdirrPubliclyAccessible = Nothing
+    { _cdirrPubliclyAccessible = Nothing
+    , _cdirrAutoMinorVersionUpgrade = Nothing
     , _cdirrDBSubnetGroupName = Nothing
     , _cdirrIOPS = Nothing
     , _cdirrDBInstanceClass = Nothing
@@ -130,13 +130,6 @@
     , _cdirrSourceDBInstanceIdentifier = pSourceDBInstanceIdentifier_
     }
 
--- | Indicates that minor engine upgrades will be applied automatically to
--- the Read Replica during the maintenance window.
---
--- Default: Inherits from the source DB instance
-cdirrAutoMinorVersionUpgrade :: Lens' CreateDBInstanceReadReplica (Maybe Bool)
-cdirrAutoMinorVersionUpgrade = lens _cdirrAutoMinorVersionUpgrade (\ s a -> s{_cdirrAutoMinorVersionUpgrade = a});
-
 -- | Specifies the accessibility options for the DB instance. A value of true
 -- specifies an Internet-facing instance with a publicly resolvable DNS
 -- name, which resolves to a public IP address. A value of false specifies
@@ -158,6 +151,13 @@
 cdirrPubliclyAccessible :: Lens' CreateDBInstanceReadReplica (Maybe Bool)
 cdirrPubliclyAccessible = lens _cdirrPubliclyAccessible (\ s a -> s{_cdirrPubliclyAccessible = a});
 
+-- | Indicates that minor engine upgrades will be applied automatically to
+-- the Read Replica during the maintenance window.
+--
+-- Default: Inherits from the source DB instance
+cdirrAutoMinorVersionUpgrade :: Lens' CreateDBInstanceReadReplica (Maybe Bool)
+cdirrAutoMinorVersionUpgrade = lens _cdirrAutoMinorVersionUpgrade (\ s a -> s{_cdirrAutoMinorVersionUpgrade = a});
+
 -- | Specifies a DB subnet group for the DB instance. The new DB instance
 -- will be created in the VPC associated with the DB subnet group. If no DB
 -- subnet group is specified, then the new DB instance is not created in a
@@ -285,9 +285,9 @@
               ["Action" =:
                  ("CreateDBInstanceReadReplica" :: ByteString),
                "Version" =: ("2014-10-31" :: ByteString),
+               "PubliclyAccessible" =: _cdirrPubliclyAccessible,
                "AutoMinorVersionUpgrade" =:
                  _cdirrAutoMinorVersionUpgrade,
-               "PubliclyAccessible" =: _cdirrPubliclyAccessible,
                "DBSubnetGroupName" =: _cdirrDBSubnetGroupName,
                "Iops" =: _cdirrIOPS,
                "DBInstanceClass" =: _cdirrDBInstanceClass,
@@ -303,8 +303,8 @@
 
 -- | /See:/ 'createDBInstanceReadReplicaResponse' smart constructor.
 data CreateDBInstanceReadReplicaResponse = CreateDBInstanceReadReplicaResponse'
-    { _cdirrrsDBInstance :: !(Maybe DBInstance)
-    , _cdirrrsStatus     :: !Int
+    { _cdirrrsDBInstance     :: !(Maybe DBInstance)
+    , _cdirrrsResponseStatus :: !Int
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'CreateDBInstanceReadReplicaResponse' with the minimum fields required to make a request.
@@ -313,14 +313,14 @@
 --
 -- * 'cdirrrsDBInstance'
 --
--- * 'cdirrrsStatus'
+-- * 'cdirrrsResponseStatus'
 createDBInstanceReadReplicaResponse
-    :: Int -- ^ 'cdirrrsStatus'
+    :: Int -- ^ 'cdirrrsResponseStatus'
     -> CreateDBInstanceReadReplicaResponse
-createDBInstanceReadReplicaResponse pStatus_ =
+createDBInstanceReadReplicaResponse pResponseStatus_ =
     CreateDBInstanceReadReplicaResponse'
     { _cdirrrsDBInstance = Nothing
-    , _cdirrrsStatus = pStatus_
+    , _cdirrrsResponseStatus = pResponseStatus_
     }
 
 -- | Undocumented member.
@@ -328,5 +328,5 @@
 cdirrrsDBInstance = lens _cdirrrsDBInstance (\ s a -> s{_cdirrrsDBInstance = a});
 
 -- | The response status code.
-cdirrrsStatus :: Lens' CreateDBInstanceReadReplicaResponse Int
-cdirrrsStatus = lens _cdirrrsStatus (\ s a -> s{_cdirrrsStatus = a});
+cdirrrsResponseStatus :: Lens' CreateDBInstanceReadReplicaResponse Int
+cdirrrsResponseStatus = lens _cdirrrsResponseStatus (\ s a -> s{_cdirrrsResponseStatus = a});
diff --git a/gen/Network/AWS/RDS/CreateDBParameterGroup.hs b/gen/Network/AWS/RDS/CreateDBParameterGroup.hs
--- a/gen/Network/AWS/RDS/CreateDBParameterGroup.hs
+++ b/gen/Network/AWS/RDS/CreateDBParameterGroup.hs
@@ -59,7 +59,7 @@
     , CreateDBParameterGroupResponse
     -- * Response Lenses
     , cdpgrsDBParameterGroup
-    , cdpgrsStatus
+    , cdpgrsResponseStatus
     ) where
 
 import           Network.AWS.Prelude
@@ -160,7 +160,7 @@
 -- | /See:/ 'createDBParameterGroupResponse' smart constructor.
 data CreateDBParameterGroupResponse = CreateDBParameterGroupResponse'
     { _cdpgrsDBParameterGroup :: !(Maybe DBParameterGroup)
-    , _cdpgrsStatus           :: !Int
+    , _cdpgrsResponseStatus   :: !Int
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'CreateDBParameterGroupResponse' with the minimum fields required to make a request.
@@ -169,14 +169,14 @@
 --
 -- * 'cdpgrsDBParameterGroup'
 --
--- * 'cdpgrsStatus'
+-- * 'cdpgrsResponseStatus'
 createDBParameterGroupResponse
-    :: Int -- ^ 'cdpgrsStatus'
+    :: Int -- ^ 'cdpgrsResponseStatus'
     -> CreateDBParameterGroupResponse
-createDBParameterGroupResponse pStatus_ =
+createDBParameterGroupResponse pResponseStatus_ =
     CreateDBParameterGroupResponse'
     { _cdpgrsDBParameterGroup = Nothing
-    , _cdpgrsStatus = pStatus_
+    , _cdpgrsResponseStatus = pResponseStatus_
     }
 
 -- | Undocumented member.
@@ -184,5 +184,5 @@
 cdpgrsDBParameterGroup = lens _cdpgrsDBParameterGroup (\ s a -> s{_cdpgrsDBParameterGroup = a});
 
 -- | The response status code.
-cdpgrsStatus :: Lens' CreateDBParameterGroupResponse Int
-cdpgrsStatus = lens _cdpgrsStatus (\ s a -> s{_cdpgrsStatus = a});
+cdpgrsResponseStatus :: Lens' CreateDBParameterGroupResponse Int
+cdpgrsResponseStatus = lens _cdpgrsResponseStatus (\ s a -> s{_cdpgrsResponseStatus = a});
diff --git a/gen/Network/AWS/RDS/CreateDBSecurityGroup.hs b/gen/Network/AWS/RDS/CreateDBSecurityGroup.hs
--- a/gen/Network/AWS/RDS/CreateDBSecurityGroup.hs
+++ b/gen/Network/AWS/RDS/CreateDBSecurityGroup.hs
@@ -37,7 +37,7 @@
     , CreateDBSecurityGroupResponse
     -- * Response Lenses
     , cdbsgrsDBSecurityGroup
-    , cdbsgrsStatus
+    , cdbsgrsResponseStatus
     ) where
 
 import           Network.AWS.Prelude
@@ -127,7 +127,7 @@
 -- | /See:/ 'createDBSecurityGroupResponse' smart constructor.
 data CreateDBSecurityGroupResponse = CreateDBSecurityGroupResponse'
     { _cdbsgrsDBSecurityGroup :: !(Maybe DBSecurityGroup)
-    , _cdbsgrsStatus          :: !Int
+    , _cdbsgrsResponseStatus  :: !Int
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'CreateDBSecurityGroupResponse' with the minimum fields required to make a request.
@@ -136,14 +136,14 @@
 --
 -- * 'cdbsgrsDBSecurityGroup'
 --
--- * 'cdbsgrsStatus'
+-- * 'cdbsgrsResponseStatus'
 createDBSecurityGroupResponse
-    :: Int -- ^ 'cdbsgrsStatus'
+    :: Int -- ^ 'cdbsgrsResponseStatus'
     -> CreateDBSecurityGroupResponse
-createDBSecurityGroupResponse pStatus_ =
+createDBSecurityGroupResponse pResponseStatus_ =
     CreateDBSecurityGroupResponse'
     { _cdbsgrsDBSecurityGroup = Nothing
-    , _cdbsgrsStatus = pStatus_
+    , _cdbsgrsResponseStatus = pResponseStatus_
     }
 
 -- | Undocumented member.
@@ -151,5 +151,5 @@
 cdbsgrsDBSecurityGroup = lens _cdbsgrsDBSecurityGroup (\ s a -> s{_cdbsgrsDBSecurityGroup = a});
 
 -- | The response status code.
-cdbsgrsStatus :: Lens' CreateDBSecurityGroupResponse Int
-cdbsgrsStatus = lens _cdbsgrsStatus (\ s a -> s{_cdbsgrsStatus = a});
+cdbsgrsResponseStatus :: Lens' CreateDBSecurityGroupResponse Int
+cdbsgrsResponseStatus = lens _cdbsgrsResponseStatus (\ s a -> s{_cdbsgrsResponseStatus = a});
diff --git a/gen/Network/AWS/RDS/CreateDBSnapshot.hs b/gen/Network/AWS/RDS/CreateDBSnapshot.hs
--- a/gen/Network/AWS/RDS/CreateDBSnapshot.hs
+++ b/gen/Network/AWS/RDS/CreateDBSnapshot.hs
@@ -37,7 +37,7 @@
     , CreateDBSnapshotResponse
     -- * Response Lenses
     , cdbsrsDBSnapshot
-    , cdbsrsStatus
+    , cdbsrsResponseStatus
     ) where
 
 import           Network.AWS.Prelude
@@ -129,8 +129,8 @@
 
 -- | /See:/ 'createDBSnapshotResponse' smart constructor.
 data CreateDBSnapshotResponse = CreateDBSnapshotResponse'
-    { _cdbsrsDBSnapshot :: !(Maybe DBSnapshot)
-    , _cdbsrsStatus     :: !Int
+    { _cdbsrsDBSnapshot     :: !(Maybe DBSnapshot)
+    , _cdbsrsResponseStatus :: !Int
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'CreateDBSnapshotResponse' with the minimum fields required to make a request.
@@ -139,14 +139,14 @@
 --
 -- * 'cdbsrsDBSnapshot'
 --
--- * 'cdbsrsStatus'
+-- * 'cdbsrsResponseStatus'
 createDBSnapshotResponse
-    :: Int -- ^ 'cdbsrsStatus'
+    :: Int -- ^ 'cdbsrsResponseStatus'
     -> CreateDBSnapshotResponse
-createDBSnapshotResponse pStatus_ =
+createDBSnapshotResponse pResponseStatus_ =
     CreateDBSnapshotResponse'
     { _cdbsrsDBSnapshot = Nothing
-    , _cdbsrsStatus = pStatus_
+    , _cdbsrsResponseStatus = pResponseStatus_
     }
 
 -- | Undocumented member.
@@ -154,5 +154,5 @@
 cdbsrsDBSnapshot = lens _cdbsrsDBSnapshot (\ s a -> s{_cdbsrsDBSnapshot = a});
 
 -- | The response status code.
-cdbsrsStatus :: Lens' CreateDBSnapshotResponse Int
-cdbsrsStatus = lens _cdbsrsStatus (\ s a -> s{_cdbsrsStatus = a});
+cdbsrsResponseStatus :: Lens' CreateDBSnapshotResponse Int
+cdbsrsResponseStatus = lens _cdbsrsResponseStatus (\ s a -> s{_cdbsrsResponseStatus = a});
diff --git a/gen/Network/AWS/RDS/CreateDBSubnetGroup.hs b/gen/Network/AWS/RDS/CreateDBSubnetGroup.hs
--- a/gen/Network/AWS/RDS/CreateDBSubnetGroup.hs
+++ b/gen/Network/AWS/RDS/CreateDBSubnetGroup.hs
@@ -38,7 +38,7 @@
     , CreateDBSubnetGroupResponse
     -- * Response Lenses
     , cdsgrsDBSubnetGroup
-    , cdsgrsStatus
+    , cdsgrsResponseStatus
     ) where
 
 import           Network.AWS.Prelude
@@ -132,8 +132,8 @@
 
 -- | /See:/ 'createDBSubnetGroupResponse' smart constructor.
 data CreateDBSubnetGroupResponse = CreateDBSubnetGroupResponse'
-    { _cdsgrsDBSubnetGroup :: !(Maybe DBSubnetGroup)
-    , _cdsgrsStatus        :: !Int
+    { _cdsgrsDBSubnetGroup  :: !(Maybe DBSubnetGroup)
+    , _cdsgrsResponseStatus :: !Int
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'CreateDBSubnetGroupResponse' with the minimum fields required to make a request.
@@ -142,14 +142,14 @@
 --
 -- * 'cdsgrsDBSubnetGroup'
 --
--- * 'cdsgrsStatus'
+-- * 'cdsgrsResponseStatus'
 createDBSubnetGroupResponse
-    :: Int -- ^ 'cdsgrsStatus'
+    :: Int -- ^ 'cdsgrsResponseStatus'
     -> CreateDBSubnetGroupResponse
-createDBSubnetGroupResponse pStatus_ =
+createDBSubnetGroupResponse pResponseStatus_ =
     CreateDBSubnetGroupResponse'
     { _cdsgrsDBSubnetGroup = Nothing
-    , _cdsgrsStatus = pStatus_
+    , _cdsgrsResponseStatus = pResponseStatus_
     }
 
 -- | Undocumented member.
@@ -157,5 +157,5 @@
 cdsgrsDBSubnetGroup = lens _cdsgrsDBSubnetGroup (\ s a -> s{_cdsgrsDBSubnetGroup = a});
 
 -- | The response status code.
-cdsgrsStatus :: Lens' CreateDBSubnetGroupResponse Int
-cdsgrsStatus = lens _cdsgrsStatus (\ s a -> s{_cdsgrsStatus = a});
+cdsgrsResponseStatus :: Lens' CreateDBSubnetGroupResponse Int
+cdsgrsResponseStatus = lens _cdsgrsResponseStatus (\ s a -> s{_cdsgrsResponseStatus = a});
diff --git a/gen/Network/AWS/RDS/CreateEventSubscription.hs b/gen/Network/AWS/RDS/CreateEventSubscription.hs
--- a/gen/Network/AWS/RDS/CreateEventSubscription.hs
+++ b/gen/Network/AWS/RDS/CreateEventSubscription.hs
@@ -60,7 +60,7 @@
     , CreateEventSubscriptionResponse
     -- * Response Lenses
     , cesrsEventSubscription
-    , cesrsStatus
+    , cesrsResponseStatus
     ) where
 
 import           Network.AWS.Prelude
@@ -210,7 +210,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.
@@ -219,14 +219,14 @@
 --
 -- * 'cesrsEventSubscription'
 --
--- * 'cesrsStatus'
+-- * 'cesrsResponseStatus'
 createEventSubscriptionResponse
-    :: Int -- ^ 'cesrsStatus'
+    :: Int -- ^ 'cesrsResponseStatus'
     -> CreateEventSubscriptionResponse
-createEventSubscriptionResponse pStatus_ =
+createEventSubscriptionResponse pResponseStatus_ =
     CreateEventSubscriptionResponse'
     { _cesrsEventSubscription = Nothing
-    , _cesrsStatus = pStatus_
+    , _cesrsResponseStatus = pResponseStatus_
     }
 
 -- | Undocumented member.
@@ -234,5 +234,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/RDS/CreateOptionGroup.hs b/gen/Network/AWS/RDS/CreateOptionGroup.hs
--- a/gen/Network/AWS/RDS/CreateOptionGroup.hs
+++ b/gen/Network/AWS/RDS/CreateOptionGroup.hs
@@ -38,7 +38,7 @@
     , CreateOptionGroupResponse
     -- * Response Lenses
     , crsOptionGroup
-    , crsStatus
+    , crsResponseStatus
     ) where
 
 import           Network.AWS.Prelude
@@ -145,8 +145,8 @@
 
 -- | /See:/ 'createOptionGroupResponse' smart constructor.
 data CreateOptionGroupResponse = CreateOptionGroupResponse'
-    { _crsOptionGroup :: !(Maybe OptionGroup)
-    , _crsStatus      :: !Int
+    { _crsOptionGroup    :: !(Maybe OptionGroup)
+    , _crsResponseStatus :: !Int
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'CreateOptionGroupResponse' with the minimum fields required to make a request.
@@ -155,14 +155,14 @@
 --
 -- * 'crsOptionGroup'
 --
--- * 'crsStatus'
+-- * 'crsResponseStatus'
 createOptionGroupResponse
-    :: Int -- ^ 'crsStatus'
+    :: Int -- ^ 'crsResponseStatus'
     -> CreateOptionGroupResponse
-createOptionGroupResponse pStatus_ =
+createOptionGroupResponse pResponseStatus_ =
     CreateOptionGroupResponse'
     { _crsOptionGroup = Nothing
-    , _crsStatus = pStatus_
+    , _crsResponseStatus = pResponseStatus_
     }
 
 -- | Undocumented member.
@@ -170,5 +170,5 @@
 crsOptionGroup = lens _crsOptionGroup (\ s a -> s{_crsOptionGroup = a});
 
 -- | The response status code.
-crsStatus :: Lens' CreateOptionGroupResponse Int
-crsStatus = lens _crsStatus (\ s a -> s{_crsStatus = a});
+crsResponseStatus :: Lens' CreateOptionGroupResponse Int
+crsResponseStatus = lens _crsResponseStatus (\ s a -> s{_crsResponseStatus = a});
diff --git a/gen/Network/AWS/RDS/DeleteDBCluster.hs b/gen/Network/AWS/RDS/DeleteDBCluster.hs
--- a/gen/Network/AWS/RDS/DeleteDBCluster.hs
+++ b/gen/Network/AWS/RDS/DeleteDBCluster.hs
@@ -44,7 +44,7 @@
     , DeleteDBClusterResponse
     -- * Response Lenses
     , ddbcrsDBCluster
-    , ddbcrsStatus
+    , ddbcrsResponseStatus
     ) where
 
 import           Network.AWS.Prelude
@@ -144,8 +144,8 @@
 
 -- | /See:/ 'deleteDBClusterResponse' smart constructor.
 data DeleteDBClusterResponse = DeleteDBClusterResponse'
-    { _ddbcrsDBCluster :: !(Maybe DBCluster)
-    , _ddbcrsStatus    :: !Int
+    { _ddbcrsDBCluster      :: !(Maybe DBCluster)
+    , _ddbcrsResponseStatus :: !Int
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'DeleteDBClusterResponse' with the minimum fields required to make a request.
@@ -154,14 +154,14 @@
 --
 -- * 'ddbcrsDBCluster'
 --
--- * 'ddbcrsStatus'
+-- * 'ddbcrsResponseStatus'
 deleteDBClusterResponse
-    :: Int -- ^ 'ddbcrsStatus'
+    :: Int -- ^ 'ddbcrsResponseStatus'
     -> DeleteDBClusterResponse
-deleteDBClusterResponse pStatus_ =
+deleteDBClusterResponse pResponseStatus_ =
     DeleteDBClusterResponse'
     { _ddbcrsDBCluster = Nothing
-    , _ddbcrsStatus = pStatus_
+    , _ddbcrsResponseStatus = pResponseStatus_
     }
 
 -- | Undocumented member.
@@ -169,5 +169,5 @@
 ddbcrsDBCluster = lens _ddbcrsDBCluster (\ s a -> s{_ddbcrsDBCluster = a});
 
 -- | The response status code.
-ddbcrsStatus :: Lens' DeleteDBClusterResponse Int
-ddbcrsStatus = lens _ddbcrsStatus (\ s a -> s{_ddbcrsStatus = a});
+ddbcrsResponseStatus :: Lens' DeleteDBClusterResponse Int
+ddbcrsResponseStatus = lens _ddbcrsResponseStatus (\ s a -> s{_ddbcrsResponseStatus = a});
diff --git a/gen/Network/AWS/RDS/DeleteDBClusterSnapshot.hs b/gen/Network/AWS/RDS/DeleteDBClusterSnapshot.hs
--- a/gen/Network/AWS/RDS/DeleteDBClusterSnapshot.hs
+++ b/gen/Network/AWS/RDS/DeleteDBClusterSnapshot.hs
@@ -41,7 +41,7 @@
     , DeleteDBClusterSnapshotResponse
     -- * Response Lenses
     , ddcsrsDBClusterSnapshot
-    , ddcsrsStatus
+    , ddcsrsResponseStatus
     ) where
 
 import           Network.AWS.Prelude
@@ -105,7 +105,7 @@
 -- | /See:/ 'deleteDBClusterSnapshotResponse' smart constructor.
 data DeleteDBClusterSnapshotResponse = DeleteDBClusterSnapshotResponse'
     { _ddcsrsDBClusterSnapshot :: !(Maybe DBClusterSnapshot)
-    , _ddcsrsStatus            :: !Int
+    , _ddcsrsResponseStatus    :: !Int
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'DeleteDBClusterSnapshotResponse' with the minimum fields required to make a request.
@@ -114,14 +114,14 @@
 --
 -- * 'ddcsrsDBClusterSnapshot'
 --
--- * 'ddcsrsStatus'
+-- * 'ddcsrsResponseStatus'
 deleteDBClusterSnapshotResponse
-    :: Int -- ^ 'ddcsrsStatus'
+    :: Int -- ^ 'ddcsrsResponseStatus'
     -> DeleteDBClusterSnapshotResponse
-deleteDBClusterSnapshotResponse pStatus_ =
+deleteDBClusterSnapshotResponse pResponseStatus_ =
     DeleteDBClusterSnapshotResponse'
     { _ddcsrsDBClusterSnapshot = Nothing
-    , _ddcsrsStatus = pStatus_
+    , _ddcsrsResponseStatus = pResponseStatus_
     }
 
 -- | Undocumented member.
@@ -129,5 +129,5 @@
 ddcsrsDBClusterSnapshot = lens _ddcsrsDBClusterSnapshot (\ s a -> s{_ddcsrsDBClusterSnapshot = a});
 
 -- | The response status code.
-ddcsrsStatus :: Lens' DeleteDBClusterSnapshotResponse Int
-ddcsrsStatus = lens _ddcsrsStatus (\ s a -> s{_ddcsrsStatus = a});
+ddcsrsResponseStatus :: Lens' DeleteDBClusterSnapshotResponse Int
+ddcsrsResponseStatus = lens _ddcsrsResponseStatus (\ s a -> s{_ddcsrsResponseStatus = a});
diff --git a/gen/Network/AWS/RDS/DeleteDBInstance.hs b/gen/Network/AWS/RDS/DeleteDBInstance.hs
--- a/gen/Network/AWS/RDS/DeleteDBInstance.hs
+++ b/gen/Network/AWS/RDS/DeleteDBInstance.hs
@@ -50,7 +50,7 @@
     , DeleteDBInstanceResponse
     -- * Response Lenses
     , ddirsDBInstance
-    , ddirsStatus
+    , ddirsResponseStatus
     ) where
 
 import           Network.AWS.Prelude
@@ -159,8 +159,8 @@
 
 -- | /See:/ 'deleteDBInstanceResponse' smart constructor.
 data DeleteDBInstanceResponse = DeleteDBInstanceResponse'
-    { _ddirsDBInstance :: !(Maybe DBInstance)
-    , _ddirsStatus     :: !Int
+    { _ddirsDBInstance     :: !(Maybe DBInstance)
+    , _ddirsResponseStatus :: !Int
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'DeleteDBInstanceResponse' with the minimum fields required to make a request.
@@ -169,14 +169,14 @@
 --
 -- * 'ddirsDBInstance'
 --
--- * 'ddirsStatus'
+-- * 'ddirsResponseStatus'
 deleteDBInstanceResponse
-    :: Int -- ^ 'ddirsStatus'
+    :: Int -- ^ 'ddirsResponseStatus'
     -> DeleteDBInstanceResponse
-deleteDBInstanceResponse pStatus_ =
+deleteDBInstanceResponse pResponseStatus_ =
     DeleteDBInstanceResponse'
     { _ddirsDBInstance = Nothing
-    , _ddirsStatus = pStatus_
+    , _ddirsResponseStatus = pResponseStatus_
     }
 
 -- | Undocumented member.
@@ -184,5 +184,5 @@
 ddirsDBInstance = lens _ddirsDBInstance (\ s a -> s{_ddirsDBInstance = a});
 
 -- | The response status code.
-ddirsStatus :: Lens' DeleteDBInstanceResponse Int
-ddirsStatus = lens _ddirsStatus (\ s a -> s{_ddirsStatus = a});
+ddirsResponseStatus :: Lens' DeleteDBInstanceResponse Int
+ddirsResponseStatus = lens _ddirsResponseStatus (\ s a -> s{_ddirsResponseStatus = a});
diff --git a/gen/Network/AWS/RDS/DeleteDBSnapshot.hs b/gen/Network/AWS/RDS/DeleteDBSnapshot.hs
--- a/gen/Network/AWS/RDS/DeleteDBSnapshot.hs
+++ b/gen/Network/AWS/RDS/DeleteDBSnapshot.hs
@@ -37,7 +37,7 @@
     , DeleteDBSnapshotResponse
     -- * Response Lenses
     , ddbsrsDBSnapshot
-    , ddbsrsStatus
+    , ddbsrsResponseStatus
     ) where
 
 import           Network.AWS.Prelude
@@ -97,8 +97,8 @@
 
 -- | /See:/ 'deleteDBSnapshotResponse' smart constructor.
 data DeleteDBSnapshotResponse = DeleteDBSnapshotResponse'
-    { _ddbsrsDBSnapshot :: !(Maybe DBSnapshot)
-    , _ddbsrsStatus     :: !Int
+    { _ddbsrsDBSnapshot     :: !(Maybe DBSnapshot)
+    , _ddbsrsResponseStatus :: !Int
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'DeleteDBSnapshotResponse' with the minimum fields required to make a request.
@@ -107,14 +107,14 @@
 --
 -- * 'ddbsrsDBSnapshot'
 --
--- * 'ddbsrsStatus'
+-- * 'ddbsrsResponseStatus'
 deleteDBSnapshotResponse
-    :: Int -- ^ 'ddbsrsStatus'
+    :: Int -- ^ 'ddbsrsResponseStatus'
     -> DeleteDBSnapshotResponse
-deleteDBSnapshotResponse pStatus_ =
+deleteDBSnapshotResponse pResponseStatus_ =
     DeleteDBSnapshotResponse'
     { _ddbsrsDBSnapshot = Nothing
-    , _ddbsrsStatus = pStatus_
+    , _ddbsrsResponseStatus = pResponseStatus_
     }
 
 -- | Undocumented member.
@@ -122,5 +122,5 @@
 ddbsrsDBSnapshot = lens _ddbsrsDBSnapshot (\ s a -> s{_ddbsrsDBSnapshot = a});
 
 -- | The response status code.
-ddbsrsStatus :: Lens' DeleteDBSnapshotResponse Int
-ddbsrsStatus = lens _ddbsrsStatus (\ s a -> s{_ddbsrsStatus = a});
+ddbsrsResponseStatus :: Lens' DeleteDBSnapshotResponse Int
+ddbsrsResponseStatus = lens _ddbsrsResponseStatus (\ s a -> s{_ddbsrsResponseStatus = a});
diff --git a/gen/Network/AWS/RDS/DeleteEventSubscription.hs b/gen/Network/AWS/RDS/DeleteEventSubscription.hs
--- a/gen/Network/AWS/RDS/DeleteEventSubscription.hs
+++ b/gen/Network/AWS/RDS/DeleteEventSubscription.hs
@@ -34,7 +34,7 @@
     , DeleteEventSubscriptionResponse
     -- * Response Lenses
     , drsEventSubscription
-    , drsStatus
+    , drsResponseStatus
     ) where
 
 import           Network.AWS.Prelude
@@ -94,7 +94,7 @@
 -- | /See:/ 'deleteEventSubscriptionResponse' smart constructor.
 data DeleteEventSubscriptionResponse = DeleteEventSubscriptionResponse'
     { _drsEventSubscription :: !(Maybe EventSubscription)
-    , _drsStatus            :: !Int
+    , _drsResponseStatus    :: !Int
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'DeleteEventSubscriptionResponse' with the minimum fields required to make a request.
@@ -103,14 +103,14 @@
 --
 -- * 'drsEventSubscription'
 --
--- * 'drsStatus'
+-- * 'drsResponseStatus'
 deleteEventSubscriptionResponse
-    :: Int -- ^ 'drsStatus'
+    :: Int -- ^ 'drsResponseStatus'
     -> DeleteEventSubscriptionResponse
-deleteEventSubscriptionResponse pStatus_ =
+deleteEventSubscriptionResponse pResponseStatus_ =
     DeleteEventSubscriptionResponse'
     { _drsEventSubscription = Nothing
-    , _drsStatus = pStatus_
+    , _drsResponseStatus = pResponseStatus_
     }
 
 -- | Undocumented member.
@@ -118,5 +118,5 @@
 drsEventSubscription = lens _drsEventSubscription (\ s a -> s{_drsEventSubscription = a});
 
 -- | The response status code.
-drsStatus :: Lens' DeleteEventSubscriptionResponse Int
-drsStatus = lens _drsStatus (\ s a -> s{_drsStatus = a});
+drsResponseStatus :: Lens' DeleteEventSubscriptionResponse Int
+drsResponseStatus = lens _drsResponseStatus (\ s a -> s{_drsResponseStatus = a});
diff --git a/gen/Network/AWS/RDS/DescribeAccountAttributes.hs b/gen/Network/AWS/RDS/DescribeAccountAttributes.hs
--- a/gen/Network/AWS/RDS/DescribeAccountAttributes.hs
+++ b/gen/Network/AWS/RDS/DescribeAccountAttributes.hs
@@ -37,7 +37,7 @@
     , DescribeAccountAttributesResponse
     -- * Response Lenses
     , daarsAccountQuotas
-    , daarsStatus
+    , daarsResponseStatus
     ) where
 
 import           Network.AWS.Prelude
@@ -89,8 +89,8 @@
 --
 -- /See:/ 'describeAccountAttributesResponse' smart constructor.
 data DescribeAccountAttributesResponse = DescribeAccountAttributesResponse'
-    { _daarsAccountQuotas :: !(Maybe [AccountQuota])
-    , _daarsStatus        :: !Int
+    { _daarsAccountQuotas  :: !(Maybe [AccountQuota])
+    , _daarsResponseStatus :: !Int
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'DescribeAccountAttributesResponse' with the minimum fields required to make a request.
@@ -99,14 +99,14 @@
 --
 -- * 'daarsAccountQuotas'
 --
--- * 'daarsStatus'
+-- * 'daarsResponseStatus'
 describeAccountAttributesResponse
-    :: Int -- ^ 'daarsStatus'
+    :: Int -- ^ 'daarsResponseStatus'
     -> DescribeAccountAttributesResponse
-describeAccountAttributesResponse pStatus_ =
+describeAccountAttributesResponse pResponseStatus_ =
     DescribeAccountAttributesResponse'
     { _daarsAccountQuotas = Nothing
-    , _daarsStatus = pStatus_
+    , _daarsResponseStatus = pResponseStatus_
     }
 
 -- | A list of AccountQuota objects. Within this list, each quota has a name,
@@ -116,5 +116,5 @@
 daarsAccountQuotas = lens _daarsAccountQuotas (\ s a -> s{_daarsAccountQuotas = a}) . _Default . _Coerce;
 
 -- | The response status code.
-daarsStatus :: Lens' DescribeAccountAttributesResponse Int
-daarsStatus = lens _daarsStatus (\ s a -> s{_daarsStatus = a});
+daarsResponseStatus :: Lens' DescribeAccountAttributesResponse Int
+daarsResponseStatus = lens _daarsResponseStatus (\ s a -> s{_daarsResponseStatus = a});
diff --git a/gen/Network/AWS/RDS/DescribeCertificates.hs b/gen/Network/AWS/RDS/DescribeCertificates.hs
--- a/gen/Network/AWS/RDS/DescribeCertificates.hs
+++ b/gen/Network/AWS/RDS/DescribeCertificates.hs
@@ -30,8 +30,8 @@
     -- * Request Lenses
     , dcFilters
     , dcCertificateIdentifier
-    , dcMaxRecords
     , dcMarker
+    , dcMaxRecords
 
     -- * Destructuring the Response
     , describeCertificatesResponse
@@ -39,7 +39,7 @@
     -- * Response Lenses
     , dcrsCertificates
     , dcrsMarker
-    , dcrsStatus
+    , dcrsResponseStatus
     ) where
 
 import           Network.AWS.Prelude
@@ -54,8 +54,8 @@
 data DescribeCertificates = DescribeCertificates'
     { _dcFilters               :: !(Maybe [Filter])
     , _dcCertificateIdentifier :: !(Maybe Text)
-    , _dcMaxRecords            :: !(Maybe Int)
     , _dcMarker                :: !(Maybe Text)
+    , _dcMaxRecords            :: !(Maybe Int)
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'DescribeCertificates' with the minimum fields required to make a request.
@@ -66,17 +66,17 @@
 --
 -- * 'dcCertificateIdentifier'
 --
--- * 'dcMaxRecords'
---
 -- * 'dcMarker'
+--
+-- * 'dcMaxRecords'
 describeCertificates
     :: DescribeCertificates
 describeCertificates =
     DescribeCertificates'
     { _dcFilters = Nothing
     , _dcCertificateIdentifier = Nothing
-    , _dcMaxRecords = Nothing
     , _dcMarker = Nothing
+    , _dcMaxRecords = Nothing
     }
 
 -- | This parameter is not currently supported.
@@ -95,6 +95,12 @@
 dcCertificateIdentifier :: Lens' DescribeCertificates (Maybe Text)
 dcCertificateIdentifier = lens _dcCertificateIdentifier (\ s a -> s{_dcCertificateIdentifier = a});
 
+-- | An optional pagination token provided by a previous DescribeCertificates
+-- request. If this parameter is specified, the response includes only
+-- records beyond the marker, up to the value specified by 'MaxRecords'.
+dcMarker :: Lens' DescribeCertificates (Maybe Text)
+dcMarker = lens _dcMarker (\ s a -> s{_dcMarker = a});
+
 -- | The maximum number of records to include in the response. If more
 -- records exist than the specified 'MaxRecords' value, a pagination token
 -- called a marker is included in the response so that the remaining
@@ -106,12 +112,6 @@
 dcMaxRecords :: Lens' DescribeCertificates (Maybe Int)
 dcMaxRecords = lens _dcMaxRecords (\ s a -> s{_dcMaxRecords = a});
 
--- | An optional pagination token provided by a previous DescribeCertificates
--- request. If this parameter is specified, the response includes only
--- records beyond the marker, up to the value specified by 'MaxRecords'.
-dcMarker :: Lens' DescribeCertificates (Maybe Text)
-dcMarker = lens _dcMarker (\ s a -> s{_dcMarker = a});
-
 instance AWSRequest DescribeCertificates where
         type Rs DescribeCertificates =
              DescribeCertificatesResponse
@@ -139,15 +139,15 @@
                "Filters" =:
                  toQuery (toQueryList "Filter" <$> _dcFilters),
                "CertificateIdentifier" =: _dcCertificateIdentifier,
-               "MaxRecords" =: _dcMaxRecords, "Marker" =: _dcMarker]
+               "Marker" =: _dcMarker, "MaxRecords" =: _dcMaxRecords]
 
 -- | Data returned by the __DescribeCertificates__ action.
 --
 -- /See:/ 'describeCertificatesResponse' smart constructor.
 data DescribeCertificatesResponse = DescribeCertificatesResponse'
-    { _dcrsCertificates :: !(Maybe [Certificate])
-    , _dcrsMarker       :: !(Maybe Text)
-    , _dcrsStatus       :: !Int
+    { _dcrsCertificates   :: !(Maybe [Certificate])
+    , _dcrsMarker         :: !(Maybe Text)
+    , _dcrsResponseStatus :: !Int
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'DescribeCertificatesResponse' with the minimum fields required to make a request.
@@ -158,15 +158,15 @@
 --
 -- * 'dcrsMarker'
 --
--- * 'dcrsStatus'
+-- * 'dcrsResponseStatus'
 describeCertificatesResponse
-    :: Int -- ^ 'dcrsStatus'
+    :: Int -- ^ 'dcrsResponseStatus'
     -> DescribeCertificatesResponse
-describeCertificatesResponse pStatus_ =
+describeCertificatesResponse pResponseStatus_ =
     DescribeCertificatesResponse'
     { _dcrsCertificates = Nothing
     , _dcrsMarker = Nothing
-    , _dcrsStatus = pStatus_
+    , _dcrsResponseStatus = pResponseStatus_
     }
 
 -- | The list of Certificate objects for the AWS account.
@@ -180,5 +180,5 @@
 dcrsMarker = lens _dcrsMarker (\ s a -> s{_dcrsMarker = a});
 
 -- | The response status code.
-dcrsStatus :: Lens' DescribeCertificatesResponse Int
-dcrsStatus = lens _dcrsStatus (\ s a -> s{_dcrsStatus = a});
+dcrsResponseStatus :: Lens' DescribeCertificatesResponse Int
+dcrsResponseStatus = lens _dcrsResponseStatus (\ s a -> s{_dcrsResponseStatus = a});
diff --git a/gen/Network/AWS/RDS/DescribeDBClusterParameterGroups.hs b/gen/Network/AWS/RDS/DescribeDBClusterParameterGroups.hs
--- a/gen/Network/AWS/RDS/DescribeDBClusterParameterGroups.hs
+++ b/gen/Network/AWS/RDS/DescribeDBClusterParameterGroups.hs
@@ -35,8 +35,8 @@
     , DescribeDBClusterParameterGroups
     -- * Request Lenses
     , ddcpgFilters
-    , ddcpgMaxRecords
     , ddcpgMarker
+    , ddcpgMaxRecords
     , ddcpgDBClusterParameterGroupName
 
     -- * Destructuring the Response
@@ -45,7 +45,7 @@
     -- * Response Lenses
     , ddcpgrsMarker
     , ddcpgrsDBClusterParameterGroups
-    , ddcpgrsStatus
+    , ddcpgrsResponseStatus
     ) where
 
 import           Network.AWS.Prelude
@@ -59,8 +59,8 @@
 -- /See:/ 'describeDBClusterParameterGroups' smart constructor.
 data DescribeDBClusterParameterGroups = DescribeDBClusterParameterGroups'
     { _ddcpgFilters                     :: !(Maybe [Filter])
-    , _ddcpgMaxRecords                  :: !(Maybe Int)
     , _ddcpgMarker                      :: !(Maybe Text)
+    , _ddcpgMaxRecords                  :: !(Maybe Int)
     , _ddcpgDBClusterParameterGroupName :: !(Maybe Text)
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
@@ -70,18 +70,18 @@
 --
 -- * 'ddcpgFilters'
 --
--- * 'ddcpgMaxRecords'
---
 -- * 'ddcpgMarker'
 --
+-- * 'ddcpgMaxRecords'
+--
 -- * 'ddcpgDBClusterParameterGroupName'
 describeDBClusterParameterGroups
     :: DescribeDBClusterParameterGroups
 describeDBClusterParameterGroups =
     DescribeDBClusterParameterGroups'
     { _ddcpgFilters = Nothing
-    , _ddcpgMaxRecords = Nothing
     , _ddcpgMarker = Nothing
+    , _ddcpgMaxRecords = Nothing
     , _ddcpgDBClusterParameterGroupName = Nothing
     }
 
@@ -89,6 +89,13 @@
 ddcpgFilters :: Lens' DescribeDBClusterParameterGroups [Filter]
 ddcpgFilters = lens _ddcpgFilters (\ s a -> s{_ddcpgFilters = a}) . _Default . _Coerce;
 
+-- | An optional pagination token provided by a previous
+-- 'DescribeDBClusterParameterGroups' request. If this parameter is
+-- specified, the response includes only records beyond the marker, up to
+-- the value specified by 'MaxRecords'.
+ddcpgMarker :: Lens' DescribeDBClusterParameterGroups (Maybe Text)
+ddcpgMarker = lens _ddcpgMarker (\ s a -> s{_ddcpgMarker = a});
+
 -- | The maximum number of records to include in the response. If more
 -- records exist than the specified 'MaxRecords' value, a pagination token
 -- called a marker is included in the response so that the remaining
@@ -100,13 +107,6 @@
 ddcpgMaxRecords :: Lens' DescribeDBClusterParameterGroups (Maybe Int)
 ddcpgMaxRecords = lens _ddcpgMaxRecords (\ s a -> s{_ddcpgMaxRecords = a});
 
--- | An optional pagination token provided by a previous
--- 'DescribeDBClusterParameterGroups' request. If this parameter is
--- specified, the response includes only records beyond the marker, up to
--- the value specified by 'MaxRecords'.
-ddcpgMarker :: Lens' DescribeDBClusterParameterGroups (Maybe Text)
-ddcpgMarker = lens _ddcpgMarker (\ s a -> s{_ddcpgMarker = a});
-
 -- | The name of a specific DB cluster parameter group to return details for.
 --
 -- Constraints:
@@ -149,8 +149,8 @@
                "Version" =: ("2014-10-31" :: ByteString),
                "Filters" =:
                  toQuery (toQueryList "Filter" <$> _ddcpgFilters),
-               "MaxRecords" =: _ddcpgMaxRecords,
                "Marker" =: _ddcpgMarker,
+               "MaxRecords" =: _ddcpgMaxRecords,
                "DBClusterParameterGroupName" =:
                  _ddcpgDBClusterParameterGroupName]
 
@@ -160,7 +160,7 @@
 data DescribeDBClusterParameterGroupsResponse = DescribeDBClusterParameterGroupsResponse'
     { _ddcpgrsMarker                   :: !(Maybe Text)
     , _ddcpgrsDBClusterParameterGroups :: !(Maybe [DBClusterParameterGroup])
-    , _ddcpgrsStatus                   :: !Int
+    , _ddcpgrsResponseStatus           :: !Int
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'DescribeDBClusterParameterGroupsResponse' with the minimum fields required to make a request.
@@ -171,15 +171,15 @@
 --
 -- * 'ddcpgrsDBClusterParameterGroups'
 --
--- * 'ddcpgrsStatus'
+-- * 'ddcpgrsResponseStatus'
 describeDBClusterParameterGroupsResponse
-    :: Int -- ^ 'ddcpgrsStatus'
+    :: Int -- ^ 'ddcpgrsResponseStatus'
     -> DescribeDBClusterParameterGroupsResponse
-describeDBClusterParameterGroupsResponse pStatus_ =
+describeDBClusterParameterGroupsResponse pResponseStatus_ =
     DescribeDBClusterParameterGroupsResponse'
     { _ddcpgrsMarker = Nothing
     , _ddcpgrsDBClusterParameterGroups = Nothing
-    , _ddcpgrsStatus = pStatus_
+    , _ddcpgrsResponseStatus = pResponseStatus_
     }
 
 -- | An optional pagination token provided by a previous
@@ -194,5 +194,5 @@
 ddcpgrsDBClusterParameterGroups = lens _ddcpgrsDBClusterParameterGroups (\ s a -> s{_ddcpgrsDBClusterParameterGroups = a}) . _Default . _Coerce;
 
 -- | The response status code.
-ddcpgrsStatus :: Lens' DescribeDBClusterParameterGroupsResponse Int
-ddcpgrsStatus = lens _ddcpgrsStatus (\ s a -> s{_ddcpgrsStatus = a});
+ddcpgrsResponseStatus :: Lens' DescribeDBClusterParameterGroupsResponse Int
+ddcpgrsResponseStatus = lens _ddcpgrsResponseStatus (\ s a -> s{_ddcpgrsResponseStatus = a});
diff --git a/gen/Network/AWS/RDS/DescribeDBClusterParameters.hs b/gen/Network/AWS/RDS/DescribeDBClusterParameters.hs
--- a/gen/Network/AWS/RDS/DescribeDBClusterParameters.hs
+++ b/gen/Network/AWS/RDS/DescribeDBClusterParameters.hs
@@ -33,8 +33,8 @@
     , DescribeDBClusterParameters
     -- * Request Lenses
     , ddcpFilters
-    , ddcpMaxRecords
     , ddcpMarker
+    , ddcpMaxRecords
     , ddcpSource
     , ddcpDBClusterParameterGroupName
 
@@ -42,9 +42,9 @@
     , describeDBClusterParametersResponse
     , DescribeDBClusterParametersResponse
     -- * Response Lenses
-    , ddcprsParameters
     , ddcprsMarker
-    , ddcprsStatus
+    , ddcprsParameters
+    , ddcprsResponseStatus
     ) where
 
 import           Network.AWS.Prelude
@@ -58,8 +58,8 @@
 -- /See:/ 'describeDBClusterParameters' smart constructor.
 data DescribeDBClusterParameters = DescribeDBClusterParameters'
     { _ddcpFilters                     :: !(Maybe [Filter])
-    , _ddcpMaxRecords                  :: !(Maybe Int)
     , _ddcpMarker                      :: !(Maybe Text)
+    , _ddcpMaxRecords                  :: !(Maybe Int)
     , _ddcpSource                      :: !(Maybe Text)
     , _ddcpDBClusterParameterGroupName :: !Text
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
@@ -70,10 +70,10 @@
 --
 -- * 'ddcpFilters'
 --
--- * 'ddcpMaxRecords'
---
 -- * 'ddcpMarker'
 --
+-- * 'ddcpMaxRecords'
+--
 -- * 'ddcpSource'
 --
 -- * 'ddcpDBClusterParameterGroupName'
@@ -83,8 +83,8 @@
 describeDBClusterParameters pDBClusterParameterGroupName_ =
     DescribeDBClusterParameters'
     { _ddcpFilters = Nothing
-    , _ddcpMaxRecords = Nothing
     , _ddcpMarker = Nothing
+    , _ddcpMaxRecords = Nothing
     , _ddcpSource = Nothing
     , _ddcpDBClusterParameterGroupName = pDBClusterParameterGroupName_
     }
@@ -93,6 +93,13 @@
 ddcpFilters :: Lens' DescribeDBClusterParameters [Filter]
 ddcpFilters = lens _ddcpFilters (\ s a -> s{_ddcpFilters = a}) . _Default . _Coerce;
 
+-- | An optional pagination token provided by a previous
+-- 'DescribeDBClusterParameters' request. If this parameter is specified,
+-- the response includes only records beyond the marker, up to the value
+-- specified by 'MaxRecords'.
+ddcpMarker :: Lens' DescribeDBClusterParameters (Maybe Text)
+ddcpMarker = lens _ddcpMarker (\ s a -> s{_ddcpMarker = a});
+
 -- | The maximum number of records to include in the response. If more
 -- records exist than the specified 'MaxRecords' value, a pagination token
 -- called a marker is included in the response so that the remaining
@@ -104,13 +111,6 @@
 ddcpMaxRecords :: Lens' DescribeDBClusterParameters (Maybe Int)
 ddcpMaxRecords = lens _ddcpMaxRecords (\ s a -> s{_ddcpMaxRecords = a});
 
--- | An optional pagination token provided by a previous
--- 'DescribeDBClusterParameters' request. If this parameter is specified,
--- the response includes only records beyond the marker, up to the value
--- specified by 'MaxRecords'.
-ddcpMarker :: Lens' DescribeDBClusterParameters (Maybe Text)
-ddcpMarker = lens _ddcpMarker (\ s a -> s{_ddcpMarker = a});
-
 -- | A value that indicates to return only parameters for a specific source.
 -- Parameter sources can be 'engine', 'service', or 'customer'.
 ddcpSource :: Lens' DescribeDBClusterParameters (Maybe Text)
@@ -136,9 +136,9 @@
               "DescribeDBClusterParametersResult"
               (\ s h x ->
                  DescribeDBClusterParametersResponse' <$>
-                   (x .@? "Parameters" .!@ mempty >>=
-                      may (parseXMLList "Parameter"))
-                     <*> (x .@? "Marker")
+                   (x .@? "Marker") <*>
+                     (x .@? "Parameters" .!@ mempty >>=
+                        may (parseXMLList "Parameter"))
                      <*> (pure (fromEnum s)))
 
 instance ToHeaders DescribeDBClusterParameters where
@@ -155,8 +155,9 @@
                "Version" =: ("2014-10-31" :: ByteString),
                "Filters" =:
                  toQuery (toQueryList "Filter" <$> _ddcpFilters),
+               "Marker" =: _ddcpMarker,
                "MaxRecords" =: _ddcpMaxRecords,
-               "Marker" =: _ddcpMarker, "Source" =: _ddcpSource,
+               "Source" =: _ddcpSource,
                "DBClusterParameterGroupName" =:
                  _ddcpDBClusterParameterGroupName]
 
@@ -165,34 +166,30 @@
 --
 -- /See:/ 'describeDBClusterParametersResponse' smart constructor.
 data DescribeDBClusterParametersResponse = DescribeDBClusterParametersResponse'
-    { _ddcprsParameters :: !(Maybe [Parameter])
-    , _ddcprsMarker     :: !(Maybe Text)
-    , _ddcprsStatus     :: !Int
+    { _ddcprsMarker         :: !(Maybe Text)
+    , _ddcprsParameters     :: !(Maybe [Parameter])
+    , _ddcprsResponseStatus :: !Int
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'DescribeDBClusterParametersResponse' with the minimum fields required to make a request.
 --
 -- Use one of the following lenses to modify other fields as desired:
 --
--- * 'ddcprsParameters'
---
 -- * 'ddcprsMarker'
 --
--- * 'ddcprsStatus'
+-- * 'ddcprsParameters'
+--
+-- * 'ddcprsResponseStatus'
 describeDBClusterParametersResponse
-    :: Int -- ^ 'ddcprsStatus'
+    :: Int -- ^ 'ddcprsResponseStatus'
     -> DescribeDBClusterParametersResponse
-describeDBClusterParametersResponse pStatus_ =
+describeDBClusterParametersResponse pResponseStatus_ =
     DescribeDBClusterParametersResponse'
-    { _ddcprsParameters = Nothing
-    , _ddcprsMarker = Nothing
-    , _ddcprsStatus = pStatus_
+    { _ddcprsMarker = Nothing
+    , _ddcprsParameters = Nothing
+    , _ddcprsResponseStatus = pResponseStatus_
     }
 
--- | Provides a list of parameters for the DB cluster parameter group.
-ddcprsParameters :: Lens' DescribeDBClusterParametersResponse [Parameter]
-ddcprsParameters = lens _ddcprsParameters (\ s a -> s{_ddcprsParameters = a}) . _Default . _Coerce;
-
 -- | An optional pagination token provided by a previous
 -- DescribeDBClusterParameters request. If this parameter is specified, the
 -- response includes only records beyond the marker, up to the value
@@ -200,6 +197,10 @@
 ddcprsMarker :: Lens' DescribeDBClusterParametersResponse (Maybe Text)
 ddcprsMarker = lens _ddcprsMarker (\ s a -> s{_ddcprsMarker = a});
 
+-- | Provides a list of parameters for the DB cluster parameter group.
+ddcprsParameters :: Lens' DescribeDBClusterParametersResponse [Parameter]
+ddcprsParameters = lens _ddcprsParameters (\ s a -> s{_ddcprsParameters = a}) . _Default . _Coerce;
+
 -- | The response status code.
-ddcprsStatus :: Lens' DescribeDBClusterParametersResponse Int
-ddcprsStatus = lens _ddcprsStatus (\ s a -> s{_ddcprsStatus = a});
+ddcprsResponseStatus :: Lens' DescribeDBClusterParametersResponse Int
+ddcprsResponseStatus = lens _ddcprsResponseStatus (\ s a -> s{_ddcprsResponseStatus = a});
diff --git a/gen/Network/AWS/RDS/DescribeDBClusterSnapshots.hs b/gen/Network/AWS/RDS/DescribeDBClusterSnapshots.hs
--- a/gen/Network/AWS/RDS/DescribeDBClusterSnapshots.hs
+++ b/gen/Network/AWS/RDS/DescribeDBClusterSnapshots.hs
@@ -36,8 +36,8 @@
     , ddbcsDBClusterSnapshotIdentifier
     , ddbcsFilters
     , ddbcsSnapshotType
-    , ddbcsMaxRecords
     , ddbcsMarker
+    , ddbcsMaxRecords
 
     -- * Destructuring the Response
     , describeDBClusterSnapshotsResponse
@@ -45,7 +45,7 @@
     -- * Response Lenses
     , ddbcsrsMarker
     , ddbcsrsDBClusterSnapshots
-    , ddbcsrsStatus
+    , ddbcsrsResponseStatus
     ) where
 
 import           Network.AWS.Prelude
@@ -62,8 +62,8 @@
     , _ddbcsDBClusterSnapshotIdentifier :: !(Maybe Text)
     , _ddbcsFilters                     :: !(Maybe [Filter])
     , _ddbcsSnapshotType                :: !(Maybe Text)
-    , _ddbcsMaxRecords                  :: !(Maybe Int)
     , _ddbcsMarker                      :: !(Maybe Text)
+    , _ddbcsMaxRecords                  :: !(Maybe Int)
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'DescribeDBClusterSnapshots' with the minimum fields required to make a request.
@@ -78,9 +78,9 @@
 --
 -- * 'ddbcsSnapshotType'
 --
--- * 'ddbcsMaxRecords'
---
 -- * 'ddbcsMarker'
+--
+-- * 'ddbcsMaxRecords'
 describeDBClusterSnapshots
     :: DescribeDBClusterSnapshots
 describeDBClusterSnapshots =
@@ -89,8 +89,8 @@
     , _ddbcsDBClusterSnapshotIdentifier = Nothing
     , _ddbcsFilters = Nothing
     , _ddbcsSnapshotType = Nothing
-    , _ddbcsMaxRecords = Nothing
     , _ddbcsMarker = Nothing
+    , _ddbcsMaxRecords = Nothing
     }
 
 -- | A DB cluster identifier to retrieve the list of DB cluster snapshots
@@ -130,6 +130,13 @@
 ddbcsSnapshotType :: Lens' DescribeDBClusterSnapshots (Maybe Text)
 ddbcsSnapshotType = lens _ddbcsSnapshotType (\ s a -> s{_ddbcsSnapshotType = a});
 
+-- | An optional pagination token provided by a previous
+-- 'DescribeDBClusterSnapshots' request. If this parameter is specified,
+-- the response includes only records beyond the marker, up to the value
+-- specified by 'MaxRecords'.
+ddbcsMarker :: Lens' DescribeDBClusterSnapshots (Maybe Text)
+ddbcsMarker = lens _ddbcsMarker (\ s a -> s{_ddbcsMarker = a});
+
 -- | The maximum number of records to include in the response. If more
 -- records exist than the specified 'MaxRecords' value, a pagination token
 -- called a marker is included in the response so that the remaining
@@ -141,13 +148,6 @@
 ddbcsMaxRecords :: Lens' DescribeDBClusterSnapshots (Maybe Int)
 ddbcsMaxRecords = lens _ddbcsMaxRecords (\ s a -> s{_ddbcsMaxRecords = a});
 
--- | An optional pagination token provided by a previous
--- 'DescribeDBClusterSnapshots' request. If this parameter is specified,
--- the response includes only records beyond the marker, up to the value
--- specified by 'MaxRecords'.
-ddbcsMarker :: Lens' DescribeDBClusterSnapshots (Maybe Text)
-ddbcsMarker = lens _ddbcsMarker (\ s a -> s{_ddbcsMarker = a});
-
 instance AWSRequest DescribeDBClusterSnapshots where
         type Rs DescribeDBClusterSnapshots =
              DescribeDBClusterSnapshotsResponse
@@ -180,8 +180,8 @@
                "Filters" =:
                  toQuery (toQueryList "Filter" <$> _ddbcsFilters),
                "SnapshotType" =: _ddbcsSnapshotType,
-               "MaxRecords" =: _ddbcsMaxRecords,
-               "Marker" =: _ddbcsMarker]
+               "Marker" =: _ddbcsMarker,
+               "MaxRecords" =: _ddbcsMaxRecords]
 
 -- | Provides a list of DB cluster snapshots for the user as the result of a
 -- call to the DescribeDBClusterSnapshots action.
@@ -190,7 +190,7 @@
 data DescribeDBClusterSnapshotsResponse = DescribeDBClusterSnapshotsResponse'
     { _ddbcsrsMarker             :: !(Maybe Text)
     , _ddbcsrsDBClusterSnapshots :: !(Maybe [DBClusterSnapshot])
-    , _ddbcsrsStatus             :: !Int
+    , _ddbcsrsResponseStatus     :: !Int
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'DescribeDBClusterSnapshotsResponse' with the minimum fields required to make a request.
@@ -201,15 +201,15 @@
 --
 -- * 'ddbcsrsDBClusterSnapshots'
 --
--- * 'ddbcsrsStatus'
+-- * 'ddbcsrsResponseStatus'
 describeDBClusterSnapshotsResponse
-    :: Int -- ^ 'ddbcsrsStatus'
+    :: Int -- ^ 'ddbcsrsResponseStatus'
     -> DescribeDBClusterSnapshotsResponse
-describeDBClusterSnapshotsResponse pStatus_ =
+describeDBClusterSnapshotsResponse pResponseStatus_ =
     DescribeDBClusterSnapshotsResponse'
     { _ddbcsrsMarker = Nothing
     , _ddbcsrsDBClusterSnapshots = Nothing
-    , _ddbcsrsStatus = pStatus_
+    , _ddbcsrsResponseStatus = pResponseStatus_
     }
 
 -- | An optional pagination token provided by a previous
@@ -224,5 +224,5 @@
 ddbcsrsDBClusterSnapshots = lens _ddbcsrsDBClusterSnapshots (\ s a -> s{_ddbcsrsDBClusterSnapshots = a}) . _Default . _Coerce;
 
 -- | The response status code.
-ddbcsrsStatus :: Lens' DescribeDBClusterSnapshotsResponse Int
-ddbcsrsStatus = lens _ddbcsrsStatus (\ s a -> s{_ddbcsrsStatus = a});
+ddbcsrsResponseStatus :: Lens' DescribeDBClusterSnapshotsResponse Int
+ddbcsrsResponseStatus = lens _ddbcsrsResponseStatus (\ s a -> s{_ddbcsrsResponseStatus = a});
diff --git a/gen/Network/AWS/RDS/DescribeDBClusters.hs b/gen/Network/AWS/RDS/DescribeDBClusters.hs
--- a/gen/Network/AWS/RDS/DescribeDBClusters.hs
+++ b/gen/Network/AWS/RDS/DescribeDBClusters.hs
@@ -34,8 +34,8 @@
     -- * Request Lenses
     , ddcDBClusterIdentifier
     , ddcFilters
-    , ddcMaxRecords
     , ddcMarker
+    , ddcMaxRecords
 
     -- * Destructuring the Response
     , describeDBClustersResponse
@@ -43,7 +43,7 @@
     -- * Response Lenses
     , ddcrsDBClusters
     , ddcrsMarker
-    , ddcrsStatus
+    , ddcrsResponseStatus
     ) where
 
 import           Network.AWS.Prelude
@@ -58,8 +58,8 @@
 data DescribeDBClusters = DescribeDBClusters'
     { _ddcDBClusterIdentifier :: !(Maybe Text)
     , _ddcFilters             :: !(Maybe [Filter])
-    , _ddcMaxRecords          :: !(Maybe Int)
     , _ddcMarker              :: !(Maybe Text)
+    , _ddcMaxRecords          :: !(Maybe Int)
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'DescribeDBClusters' with the minimum fields required to make a request.
@@ -70,17 +70,17 @@
 --
 -- * 'ddcFilters'
 --
--- * 'ddcMaxRecords'
---
 -- * 'ddcMarker'
+--
+-- * 'ddcMaxRecords'
 describeDBClusters
     :: DescribeDBClusters
 describeDBClusters =
     DescribeDBClusters'
     { _ddcDBClusterIdentifier = Nothing
     , _ddcFilters = Nothing
-    , _ddcMaxRecords = Nothing
     , _ddcMarker = Nothing
+    , _ddcMaxRecords = Nothing
     }
 
 -- | The user-supplied DB cluster identifier. If this parameter is specified,
@@ -99,6 +99,12 @@
 ddcFilters :: Lens' DescribeDBClusters [Filter]
 ddcFilters = lens _ddcFilters (\ s a -> s{_ddcFilters = a}) . _Default . _Coerce;
 
+-- | An optional pagination token provided by a previous DescribeDBClusters
+-- request. If this parameter is specified, the response includes only
+-- records beyond the marker, up to the value specified by 'MaxRecords'.
+ddcMarker :: Lens' DescribeDBClusters (Maybe Text)
+ddcMarker = lens _ddcMarker (\ s a -> s{_ddcMarker = a});
+
 -- | The maximum number of records to include in the response. If more
 -- records exist than the specified 'MaxRecords' value, a pagination token
 -- called a marker is included in the response so that the remaining
@@ -110,12 +116,6 @@
 ddcMaxRecords :: Lens' DescribeDBClusters (Maybe Int)
 ddcMaxRecords = lens _ddcMaxRecords (\ s a -> s{_ddcMaxRecords = a});
 
--- | An optional pagination token provided by a previous DescribeDBClusters
--- request. If this parameter is specified, the response includes only
--- records beyond the marker, up to the value specified by 'MaxRecords'.
-ddcMarker :: Lens' DescribeDBClusters (Maybe Text)
-ddcMarker = lens _ddcMarker (\ s a -> s{_ddcMarker = a});
-
 instance AWSRequest DescribeDBClusters where
         type Rs DescribeDBClusters =
              DescribeDBClustersResponse
@@ -143,17 +143,17 @@
                "DBClusterIdentifier" =: _ddcDBClusterIdentifier,
                "Filters" =:
                  toQuery (toQueryList "Filter" <$> _ddcFilters),
-               "MaxRecords" =: _ddcMaxRecords,
-               "Marker" =: _ddcMarker]
+               "Marker" =: _ddcMarker,
+               "MaxRecords" =: _ddcMaxRecords]
 
 -- | Contains the result of a successful invocation of the DescribeDBClusters
 -- action.
 --
 -- /See:/ 'describeDBClustersResponse' smart constructor.
 data DescribeDBClustersResponse = DescribeDBClustersResponse'
-    { _ddcrsDBClusters :: !(Maybe [DBCluster])
-    , _ddcrsMarker     :: !(Maybe Text)
-    , _ddcrsStatus     :: !Int
+    { _ddcrsDBClusters     :: !(Maybe [DBCluster])
+    , _ddcrsMarker         :: !(Maybe Text)
+    , _ddcrsResponseStatus :: !Int
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'DescribeDBClustersResponse' with the minimum fields required to make a request.
@@ -164,15 +164,15 @@
 --
 -- * 'ddcrsMarker'
 --
--- * 'ddcrsStatus'
+-- * 'ddcrsResponseStatus'
 describeDBClustersResponse
-    :: Int -- ^ 'ddcrsStatus'
+    :: Int -- ^ 'ddcrsResponseStatus'
     -> DescribeDBClustersResponse
-describeDBClustersResponse pStatus_ =
+describeDBClustersResponse pResponseStatus_ =
     DescribeDBClustersResponse'
     { _ddcrsDBClusters = Nothing
     , _ddcrsMarker = Nothing
-    , _ddcrsStatus = pStatus_
+    , _ddcrsResponseStatus = pResponseStatus_
     }
 
 -- | Contains a list of DB clusters for the user.
@@ -185,5 +185,5 @@
 ddcrsMarker = lens _ddcrsMarker (\ s a -> s{_ddcrsMarker = a});
 
 -- | The response status code.
-ddcrsStatus :: Lens' DescribeDBClustersResponse Int
-ddcrsStatus = lens _ddcrsStatus (\ s a -> s{_ddcrsStatus = a});
+ddcrsResponseStatus :: Lens' DescribeDBClustersResponse Int
+ddcrsResponseStatus = lens _ddcrsResponseStatus (\ s a -> s{_ddcrsResponseStatus = a});
diff --git a/gen/Network/AWS/RDS/DescribeDBEngineVersions.hs b/gen/Network/AWS/RDS/DescribeDBEngineVersions.hs
--- a/gen/Network/AWS/RDS/DescribeDBEngineVersions.hs
+++ b/gen/Network/AWS/RDS/DescribeDBEngineVersions.hs
@@ -35,8 +35,8 @@
     , ddevEngine
     , ddevDBParameterGroupFamily
     , ddevListSupportedCharacterSets
-    , ddevMaxRecords
     , ddevMarker
+    , ddevMaxRecords
 
     -- * Destructuring the Response
     , describeDBEngineVersionsResponse
@@ -44,7 +44,7 @@
     -- * Response Lenses
     , ddevrsMarker
     , ddevrsDBEngineVersions
-    , ddevrsStatus
+    , ddevrsResponseStatus
     ) where
 
 import           Network.AWS.Pager
@@ -62,8 +62,8 @@
     , _ddevEngine                     :: !(Maybe Text)
     , _ddevDBParameterGroupFamily     :: !(Maybe Text)
     , _ddevListSupportedCharacterSets :: !(Maybe Bool)
-    , _ddevMaxRecords                 :: !(Maybe Int)
     , _ddevMarker                     :: !(Maybe Text)
+    , _ddevMaxRecords                 :: !(Maybe Int)
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'DescribeDBEngineVersions' with the minimum fields required to make a request.
@@ -82,9 +82,9 @@
 --
 -- * 'ddevListSupportedCharacterSets'
 --
--- * 'ddevMaxRecords'
---
 -- * 'ddevMarker'
+--
+-- * 'ddevMaxRecords'
 describeDBEngineVersions
     :: DescribeDBEngineVersions
 describeDBEngineVersions =
@@ -95,8 +95,8 @@
     , _ddevEngine = Nothing
     , _ddevDBParameterGroupFamily = Nothing
     , _ddevListSupportedCharacterSets = Nothing
-    , _ddevMaxRecords = Nothing
     , _ddevMarker = Nothing
+    , _ddevMaxRecords = Nothing
     }
 
 -- | The database engine version to return.
@@ -134,6 +134,12 @@
 ddevListSupportedCharacterSets :: Lens' DescribeDBEngineVersions (Maybe Bool)
 ddevListSupportedCharacterSets = lens _ddevListSupportedCharacterSets (\ s a -> s{_ddevListSupportedCharacterSets = a});
 
+-- | An optional pagination token provided by a previous request. If this
+-- parameter is specified, the response includes only records beyond the
+-- marker, up to the value specified by 'MaxRecords'.
+ddevMarker :: Lens' DescribeDBEngineVersions (Maybe Text)
+ddevMarker = lens _ddevMarker (\ s a -> s{_ddevMarker = a});
+
 -- | The maximum number of records to include in the response. If more than
 -- the 'MaxRecords' value is available, a pagination token called a marker
 -- is included in the response so that the following results can be
@@ -145,12 +151,6 @@
 ddevMaxRecords :: Lens' DescribeDBEngineVersions (Maybe Int)
 ddevMaxRecords = lens _ddevMaxRecords (\ s a -> s{_ddevMaxRecords = a});
 
--- | An optional pagination token provided by a previous request. If this
--- parameter is specified, the response includes only records beyond the
--- marker, up to the value specified by 'MaxRecords'.
-ddevMarker :: Lens' DescribeDBEngineVersions (Maybe Text)
-ddevMarker = lens _ddevMarker (\ s a -> s{_ddevMarker = a});
-
 instance AWSPager DescribeDBEngineVersions where
         page rq rs
           | stop (rs ^. ddevrsMarker) = Nothing
@@ -192,8 +192,8 @@
                  _ddevDBParameterGroupFamily,
                "ListSupportedCharacterSets" =:
                  _ddevListSupportedCharacterSets,
-               "MaxRecords" =: _ddevMaxRecords,
-               "Marker" =: _ddevMarker]
+               "Marker" =: _ddevMarker,
+               "MaxRecords" =: _ddevMaxRecords]
 
 -- | Contains the result of a successful invocation of the
 -- DescribeDBEngineVersions action.
@@ -202,7 +202,7 @@
 data DescribeDBEngineVersionsResponse = DescribeDBEngineVersionsResponse'
     { _ddevrsMarker           :: !(Maybe Text)
     , _ddevrsDBEngineVersions :: !(Maybe [DBEngineVersion])
-    , _ddevrsStatus           :: !Int
+    , _ddevrsResponseStatus   :: !Int
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'DescribeDBEngineVersionsResponse' with the minimum fields required to make a request.
@@ -213,15 +213,15 @@
 --
 -- * 'ddevrsDBEngineVersions'
 --
--- * 'ddevrsStatus'
+-- * 'ddevrsResponseStatus'
 describeDBEngineVersionsResponse
-    :: Int -- ^ 'ddevrsStatus'
+    :: Int -- ^ 'ddevrsResponseStatus'
     -> DescribeDBEngineVersionsResponse
-describeDBEngineVersionsResponse pStatus_ =
+describeDBEngineVersionsResponse pResponseStatus_ =
     DescribeDBEngineVersionsResponse'
     { _ddevrsMarker = Nothing
     , _ddevrsDBEngineVersions = Nothing
-    , _ddevrsStatus = pStatus_
+    , _ddevrsResponseStatus = pResponseStatus_
     }
 
 -- | An optional pagination token provided by a previous request. If this
@@ -235,5 +235,5 @@
 ddevrsDBEngineVersions = lens _ddevrsDBEngineVersions (\ s a -> s{_ddevrsDBEngineVersions = a}) . _Default . _Coerce;
 
 -- | The response status code.
-ddevrsStatus :: Lens' DescribeDBEngineVersionsResponse Int
-ddevrsStatus = lens _ddevrsStatus (\ s a -> s{_ddevrsStatus = a});
+ddevrsResponseStatus :: Lens' DescribeDBEngineVersionsResponse Int
+ddevrsResponseStatus = lens _ddevrsResponseStatus (\ s a -> s{_ddevrsResponseStatus = a});
diff --git a/gen/Network/AWS/RDS/DescribeDBInstances.hs b/gen/Network/AWS/RDS/DescribeDBInstances.hs
--- a/gen/Network/AWS/RDS/DescribeDBInstances.hs
+++ b/gen/Network/AWS/RDS/DescribeDBInstances.hs
@@ -32,8 +32,8 @@
     -- * Request Lenses
     , ddbiFilters
     , ddbiDBInstanceIdentifier
-    , ddbiMaxRecords
     , ddbiMarker
+    , ddbiMaxRecords
 
     -- * Destructuring the Response
     , describeDBInstancesResponse
@@ -41,7 +41,7 @@
     -- * Response Lenses
     , ddbirsDBInstances
     , ddbirsMarker
-    , ddbirsStatus
+    , ddbirsResponseStatus
     ) where
 
 import           Network.AWS.Pager
@@ -57,8 +57,8 @@
 data DescribeDBInstances = DescribeDBInstances'
     { _ddbiFilters              :: !(Maybe [Filter])
     , _ddbiDBInstanceIdentifier :: !(Maybe Text)
-    , _ddbiMaxRecords           :: !(Maybe Int)
     , _ddbiMarker               :: !(Maybe Text)
+    , _ddbiMaxRecords           :: !(Maybe Int)
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'DescribeDBInstances' with the minimum fields required to make a request.
@@ -69,17 +69,17 @@
 --
 -- * 'ddbiDBInstanceIdentifier'
 --
--- * 'ddbiMaxRecords'
---
 -- * 'ddbiMarker'
+--
+-- * 'ddbiMaxRecords'
 describeDBInstances
     :: DescribeDBInstances
 describeDBInstances =
     DescribeDBInstances'
     { _ddbiFilters = Nothing
     , _ddbiDBInstanceIdentifier = Nothing
-    , _ddbiMaxRecords = Nothing
     , _ddbiMarker = Nothing
+    , _ddbiMaxRecords = Nothing
     }
 
 -- | This parameter is not currently supported.
@@ -98,6 +98,13 @@
 ddbiDBInstanceIdentifier :: Lens' DescribeDBInstances (Maybe Text)
 ddbiDBInstanceIdentifier = lens _ddbiDBInstanceIdentifier (\ s a -> s{_ddbiDBInstanceIdentifier = a});
 
+-- | An optional pagination token provided by a previous
+-- 'DescribeDBInstances' request. If this parameter is specified, the
+-- response includes only records beyond the marker, up to the value
+-- specified by 'MaxRecords'.
+ddbiMarker :: Lens' DescribeDBInstances (Maybe Text)
+ddbiMarker = lens _ddbiMarker (\ s a -> s{_ddbiMarker = a});
+
 -- | The maximum number of records to include in the response. If more
 -- records exist than the specified 'MaxRecords' value, a pagination token
 -- called a marker is included in the response so that the remaining
@@ -109,13 +116,6 @@
 ddbiMaxRecords :: Lens' DescribeDBInstances (Maybe Int)
 ddbiMaxRecords = lens _ddbiMaxRecords (\ s a -> s{_ddbiMaxRecords = a});
 
--- | An optional pagination token provided by a previous
--- 'DescribeDBInstances' request. If this parameter is specified, the
--- response includes only records beyond the marker, up to the value
--- specified by 'MaxRecords'.
-ddbiMarker :: Lens' DescribeDBInstances (Maybe Text)
-ddbiMarker = lens _ddbiMarker (\ s a -> s{_ddbiMarker = a});
-
 instance AWSPager DescribeDBInstances where
         page rq rs
           | stop (rs ^. ddbirsMarker) = Nothing
@@ -150,17 +150,17 @@
                "Filters" =:
                  toQuery (toQueryList "Filter" <$> _ddbiFilters),
                "DBInstanceIdentifier" =: _ddbiDBInstanceIdentifier,
-               "MaxRecords" =: _ddbiMaxRecords,
-               "Marker" =: _ddbiMarker]
+               "Marker" =: _ddbiMarker,
+               "MaxRecords" =: _ddbiMaxRecords]
 
 -- | Contains the result of a successful invocation of the
 -- DescribeDBInstances action.
 --
 -- /See:/ 'describeDBInstancesResponse' smart constructor.
 data DescribeDBInstancesResponse = DescribeDBInstancesResponse'
-    { _ddbirsDBInstances :: !(Maybe [DBInstance])
-    , _ddbirsMarker      :: !(Maybe Text)
-    , _ddbirsStatus      :: !Int
+    { _ddbirsDBInstances    :: !(Maybe [DBInstance])
+    , _ddbirsMarker         :: !(Maybe Text)
+    , _ddbirsResponseStatus :: !Int
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'DescribeDBInstancesResponse' with the minimum fields required to make a request.
@@ -171,15 +171,15 @@
 --
 -- * 'ddbirsMarker'
 --
--- * 'ddbirsStatus'
+-- * 'ddbirsResponseStatus'
 describeDBInstancesResponse
-    :: Int -- ^ 'ddbirsStatus'
+    :: Int -- ^ 'ddbirsResponseStatus'
     -> DescribeDBInstancesResponse
-describeDBInstancesResponse pStatus_ =
+describeDBInstancesResponse pResponseStatus_ =
     DescribeDBInstancesResponse'
     { _ddbirsDBInstances = Nothing
     , _ddbirsMarker = Nothing
-    , _ddbirsStatus = pStatus_
+    , _ddbirsResponseStatus = pResponseStatus_
     }
 
 -- | A list of DBInstance instances.
@@ -193,5 +193,5 @@
 ddbirsMarker = lens _ddbirsMarker (\ s a -> s{_ddbirsMarker = a});
 
 -- | The response status code.
-ddbirsStatus :: Lens' DescribeDBInstancesResponse Int
-ddbirsStatus = lens _ddbirsStatus (\ s a -> s{_ddbirsStatus = a});
+ddbirsResponseStatus :: Lens' DescribeDBInstancesResponse Int
+ddbirsResponseStatus = lens _ddbirsResponseStatus (\ s a -> s{_ddbirsResponseStatus = a});
diff --git a/gen/Network/AWS/RDS/DescribeDBLogFiles.hs b/gen/Network/AWS/RDS/DescribeDBLogFiles.hs
--- a/gen/Network/AWS/RDS/DescribeDBLogFiles.hs
+++ b/gen/Network/AWS/RDS/DescribeDBLogFiles.hs
@@ -30,11 +30,11 @@
     , DescribeDBLogFiles
     -- * Request Lenses
     , ddlfFilenameContains
+    , ddlfFilters
     , ddlfFileSize
     , ddlfFileLastWritten
-    , ddlfFilters
-    , ddlfMaxRecords
     , ddlfMarker
+    , ddlfMaxRecords
     , ddlfDBInstanceIdentifier
 
     -- * Destructuring the Response
@@ -43,7 +43,7 @@
     -- * Response Lenses
     , ddlfrsDescribeDBLogFiles
     , ddlfrsMarker
-    , ddlfrsStatus
+    , ddlfrsResponseStatus
     ) where
 
 import           Network.AWS.Pager
@@ -58,11 +58,11 @@
 -- /See:/ 'describeDBLogFiles' smart constructor.
 data DescribeDBLogFiles = DescribeDBLogFiles'
     { _ddlfFilenameContains     :: !(Maybe Text)
+    , _ddlfFilters              :: !(Maybe [Filter])
     , _ddlfFileSize             :: !(Maybe Integer)
     , _ddlfFileLastWritten      :: !(Maybe Integer)
-    , _ddlfFilters              :: !(Maybe [Filter])
-    , _ddlfMaxRecords           :: !(Maybe Int)
     , _ddlfMarker               :: !(Maybe Text)
+    , _ddlfMaxRecords           :: !(Maybe Int)
     , _ddlfDBInstanceIdentifier :: !Text
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
@@ -72,16 +72,16 @@
 --
 -- * 'ddlfFilenameContains'
 --
+-- * 'ddlfFilters'
+--
 -- * 'ddlfFileSize'
 --
 -- * 'ddlfFileLastWritten'
 --
--- * 'ddlfFilters'
+-- * 'ddlfMarker'
 --
 -- * 'ddlfMaxRecords'
 --
--- * 'ddlfMarker'
---
 -- * 'ddlfDBInstanceIdentifier'
 describeDBLogFiles
     :: Text -- ^ 'ddlfDBInstanceIdentifier'
@@ -89,11 +89,11 @@
 describeDBLogFiles pDBInstanceIdentifier_ =
     DescribeDBLogFiles'
     { _ddlfFilenameContains = Nothing
+    , _ddlfFilters = Nothing
     , _ddlfFileSize = Nothing
     , _ddlfFileLastWritten = Nothing
-    , _ddlfFilters = Nothing
-    , _ddlfMaxRecords = Nothing
     , _ddlfMarker = Nothing
+    , _ddlfMaxRecords = Nothing
     , _ddlfDBInstanceIdentifier = pDBInstanceIdentifier_
     }
 
@@ -102,6 +102,10 @@
 ddlfFilenameContains :: Lens' DescribeDBLogFiles (Maybe Text)
 ddlfFilenameContains = lens _ddlfFilenameContains (\ s a -> s{_ddlfFilenameContains = a});
 
+-- | This parameter is not currently supported.
+ddlfFilters :: Lens' DescribeDBLogFiles [Filter]
+ddlfFilters = lens _ddlfFilters (\ s a -> s{_ddlfFilters = a}) . _Default . _Coerce;
+
 -- | Filters the available log files for files larger than the specified
 -- size.
 ddlfFileSize :: Lens' DescribeDBLogFiles (Maybe Integer)
@@ -112,9 +116,11 @@
 ddlfFileLastWritten :: Lens' DescribeDBLogFiles (Maybe Integer)
 ddlfFileLastWritten = lens _ddlfFileLastWritten (\ s a -> s{_ddlfFileLastWritten = a});
 
--- | This parameter is not currently supported.
-ddlfFilters :: Lens' DescribeDBLogFiles [Filter]
-ddlfFilters = lens _ddlfFilters (\ s a -> s{_ddlfFilters = a}) . _Default . _Coerce;
+-- | The pagination token provided in the previous request. If this parameter
+-- is specified the response includes only records beyond the marker, up to
+-- MaxRecords.
+ddlfMarker :: Lens' DescribeDBLogFiles (Maybe Text)
+ddlfMarker = lens _ddlfMarker (\ s a -> s{_ddlfMarker = a});
 
 -- | The maximum number of records to include in the response. If more
 -- records exist than the specified MaxRecords value, a pagination token
@@ -123,12 +129,6 @@
 ddlfMaxRecords :: Lens' DescribeDBLogFiles (Maybe Int)
 ddlfMaxRecords = lens _ddlfMaxRecords (\ s a -> s{_ddlfMaxRecords = a});
 
--- | The pagination token provided in the previous request. If this parameter
--- is specified the response includes only records beyond the marker, up to
--- MaxRecords.
-ddlfMarker :: Lens' DescribeDBLogFiles (Maybe Text)
-ddlfMarker = lens _ddlfMarker (\ s a -> s{_ddlfMarker = a});
-
 -- | The customer-assigned name of the DB instance that contains the log
 -- files you want to list.
 --
@@ -172,12 +172,12 @@
               ["Action" =: ("DescribeDBLogFiles" :: ByteString),
                "Version" =: ("2014-10-31" :: ByteString),
                "FilenameContains" =: _ddlfFilenameContains,
-               "FileSize" =: _ddlfFileSize,
-               "FileLastWritten" =: _ddlfFileLastWritten,
                "Filters" =:
                  toQuery (toQueryList "Filter" <$> _ddlfFilters),
-               "MaxRecords" =: _ddlfMaxRecords,
+               "FileSize" =: _ddlfFileSize,
+               "FileLastWritten" =: _ddlfFileLastWritten,
                "Marker" =: _ddlfMarker,
+               "MaxRecords" =: _ddlfMaxRecords,
                "DBInstanceIdentifier" =: _ddlfDBInstanceIdentifier]
 
 -- | The response from a call to DescribeDBLogFiles.
@@ -186,7 +186,7 @@
 data DescribeDBLogFilesResponse = DescribeDBLogFilesResponse'
     { _ddlfrsDescribeDBLogFiles :: !(Maybe [DescribeDBLogFilesDetails])
     , _ddlfrsMarker             :: !(Maybe Text)
-    , _ddlfrsStatus             :: !Int
+    , _ddlfrsResponseStatus     :: !Int
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'DescribeDBLogFilesResponse' with the minimum fields required to make a request.
@@ -197,15 +197,15 @@
 --
 -- * 'ddlfrsMarker'
 --
--- * 'ddlfrsStatus'
+-- * 'ddlfrsResponseStatus'
 describeDBLogFilesResponse
-    :: Int -- ^ 'ddlfrsStatus'
+    :: Int -- ^ 'ddlfrsResponseStatus'
     -> DescribeDBLogFilesResponse
-describeDBLogFilesResponse pStatus_ =
+describeDBLogFilesResponse pResponseStatus_ =
     DescribeDBLogFilesResponse'
     { _ddlfrsDescribeDBLogFiles = Nothing
     , _ddlfrsMarker = Nothing
-    , _ddlfrsStatus = pStatus_
+    , _ddlfrsResponseStatus = pResponseStatus_
     }
 
 -- | The DB log files returned.
@@ -218,5 +218,5 @@
 ddlfrsMarker = lens _ddlfrsMarker (\ s a -> s{_ddlfrsMarker = a});
 
 -- | The response status code.
-ddlfrsStatus :: Lens' DescribeDBLogFilesResponse Int
-ddlfrsStatus = lens _ddlfrsStatus (\ s a -> s{_ddlfrsStatus = a});
+ddlfrsResponseStatus :: Lens' DescribeDBLogFilesResponse Int
+ddlfrsResponseStatus = lens _ddlfrsResponseStatus (\ s a -> s{_ddlfrsResponseStatus = a});
diff --git a/gen/Network/AWS/RDS/DescribeDBParameterGroups.hs b/gen/Network/AWS/RDS/DescribeDBParameterGroups.hs
--- a/gen/Network/AWS/RDS/DescribeDBParameterGroups.hs
+++ b/gen/Network/AWS/RDS/DescribeDBParameterGroups.hs
@@ -33,8 +33,8 @@
     -- * Request Lenses
     , ddpgFilters
     , ddpgDBParameterGroupName
-    , ddpgMaxRecords
     , ddpgMarker
+    , ddpgMaxRecords
 
     -- * Destructuring the Response
     , describeDBParameterGroupsResponse
@@ -42,7 +42,7 @@
     -- * Response Lenses
     , ddpgrsMarker
     , ddpgrsDBParameterGroups
-    , ddpgrsStatus
+    , ddpgrsResponseStatus
     ) where
 
 import           Network.AWS.Pager
@@ -58,8 +58,8 @@
 data DescribeDBParameterGroups = DescribeDBParameterGroups'
     { _ddpgFilters              :: !(Maybe [Filter])
     , _ddpgDBParameterGroupName :: !(Maybe Text)
-    , _ddpgMaxRecords           :: !(Maybe Int)
     , _ddpgMarker               :: !(Maybe Text)
+    , _ddpgMaxRecords           :: !(Maybe Int)
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'DescribeDBParameterGroups' with the minimum fields required to make a request.
@@ -70,17 +70,17 @@
 --
 -- * 'ddpgDBParameterGroupName'
 --
--- * 'ddpgMaxRecords'
---
 -- * 'ddpgMarker'
+--
+-- * 'ddpgMaxRecords'
 describeDBParameterGroups
     :: DescribeDBParameterGroups
 describeDBParameterGroups =
     DescribeDBParameterGroups'
     { _ddpgFilters = Nothing
     , _ddpgDBParameterGroupName = Nothing
-    , _ddpgMaxRecords = Nothing
     , _ddpgMarker = Nothing
+    , _ddpgMaxRecords = Nothing
     }
 
 -- | This parameter is not currently supported.
@@ -97,6 +97,13 @@
 ddpgDBParameterGroupName :: Lens' DescribeDBParameterGroups (Maybe Text)
 ddpgDBParameterGroupName = lens _ddpgDBParameterGroupName (\ s a -> s{_ddpgDBParameterGroupName = a});
 
+-- | An optional pagination token provided by a previous
+-- 'DescribeDBParameterGroups' request. If this parameter is specified, the
+-- response includes only records beyond the marker, up to the value
+-- specified by 'MaxRecords'.
+ddpgMarker :: Lens' DescribeDBParameterGroups (Maybe Text)
+ddpgMarker = lens _ddpgMarker (\ s a -> s{_ddpgMarker = a});
+
 -- | The maximum number of records to include in the response. If more
 -- records exist than the specified 'MaxRecords' value, a pagination token
 -- called a marker is included in the response so that the remaining
@@ -108,13 +115,6 @@
 ddpgMaxRecords :: Lens' DescribeDBParameterGroups (Maybe Int)
 ddpgMaxRecords = lens _ddpgMaxRecords (\ s a -> s{_ddpgMaxRecords = a});
 
--- | An optional pagination token provided by a previous
--- 'DescribeDBParameterGroups' request. If this parameter is specified, the
--- response includes only records beyond the marker, up to the value
--- specified by 'MaxRecords'.
-ddpgMarker :: Lens' DescribeDBParameterGroups (Maybe Text)
-ddpgMarker = lens _ddpgMarker (\ s a -> s{_ddpgMarker = a});
-
 instance AWSPager DescribeDBParameterGroups where
         page rq rs
           | stop (rs ^. ddpgrsMarker) = Nothing
@@ -150,8 +150,8 @@
                "Filters" =:
                  toQuery (toQueryList "Filter" <$> _ddpgFilters),
                "DBParameterGroupName" =: _ddpgDBParameterGroupName,
-               "MaxRecords" =: _ddpgMaxRecords,
-               "Marker" =: _ddpgMarker]
+               "Marker" =: _ddpgMarker,
+               "MaxRecords" =: _ddpgMaxRecords]
 
 -- | Contains the result of a successful invocation of the
 -- DescribeDBParameterGroups action.
@@ -160,7 +160,7 @@
 data DescribeDBParameterGroupsResponse = DescribeDBParameterGroupsResponse'
     { _ddpgrsMarker            :: !(Maybe Text)
     , _ddpgrsDBParameterGroups :: !(Maybe [DBParameterGroup])
-    , _ddpgrsStatus            :: !Int
+    , _ddpgrsResponseStatus    :: !Int
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'DescribeDBParameterGroupsResponse' with the minimum fields required to make a request.
@@ -171,15 +171,15 @@
 --
 -- * 'ddpgrsDBParameterGroups'
 --
--- * 'ddpgrsStatus'
+-- * 'ddpgrsResponseStatus'
 describeDBParameterGroupsResponse
-    :: Int -- ^ 'ddpgrsStatus'
+    :: Int -- ^ 'ddpgrsResponseStatus'
     -> DescribeDBParameterGroupsResponse
-describeDBParameterGroupsResponse pStatus_ =
+describeDBParameterGroupsResponse pResponseStatus_ =
     DescribeDBParameterGroupsResponse'
     { _ddpgrsMarker = Nothing
     , _ddpgrsDBParameterGroups = Nothing
-    , _ddpgrsStatus = pStatus_
+    , _ddpgrsResponseStatus = pResponseStatus_
     }
 
 -- | An optional pagination token provided by a previous request. If this
@@ -193,5 +193,5 @@
 ddpgrsDBParameterGroups = lens _ddpgrsDBParameterGroups (\ s a -> s{_ddpgrsDBParameterGroups = a}) . _Default . _Coerce;
 
 -- | The response status code.
-ddpgrsStatus :: Lens' DescribeDBParameterGroupsResponse Int
-ddpgrsStatus = lens _ddpgrsStatus (\ s a -> s{_ddpgrsStatus = a});
+ddpgrsResponseStatus :: Lens' DescribeDBParameterGroupsResponse Int
+ddpgrsResponseStatus = lens _ddpgrsResponseStatus (\ s a -> s{_ddpgrsResponseStatus = a});
diff --git a/gen/Network/AWS/RDS/DescribeDBParameters.hs b/gen/Network/AWS/RDS/DescribeDBParameters.hs
--- a/gen/Network/AWS/RDS/DescribeDBParameters.hs
+++ b/gen/Network/AWS/RDS/DescribeDBParameters.hs
@@ -30,8 +30,8 @@
     , DescribeDBParameters
     -- * Request Lenses
     , ddpFilters
-    , ddpMaxRecords
     , ddpMarker
+    , ddpMaxRecords
     , ddpSource
     , ddpDBParameterGroupName
 
@@ -39,9 +39,9 @@
     , describeDBParametersResponse
     , DescribeDBParametersResponse
     -- * Response Lenses
-    , ddprsParameters
     , ddprsMarker
-    , ddprsStatus
+    , ddprsParameters
+    , ddprsResponseStatus
     ) where
 
 import           Network.AWS.Pager
@@ -54,8 +54,8 @@
 -- | /See:/ 'describeDBParameters' smart constructor.
 data DescribeDBParameters = DescribeDBParameters'
     { _ddpFilters              :: !(Maybe [Filter])
-    , _ddpMaxRecords           :: !(Maybe Int)
     , _ddpMarker               :: !(Maybe Text)
+    , _ddpMaxRecords           :: !(Maybe Int)
     , _ddpSource               :: !(Maybe Text)
     , _ddpDBParameterGroupName :: !Text
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
@@ -66,10 +66,10 @@
 --
 -- * 'ddpFilters'
 --
--- * 'ddpMaxRecords'
---
 -- * 'ddpMarker'
 --
+-- * 'ddpMaxRecords'
+--
 -- * 'ddpSource'
 --
 -- * 'ddpDBParameterGroupName'
@@ -79,8 +79,8 @@
 describeDBParameters pDBParameterGroupName_ =
     DescribeDBParameters'
     { _ddpFilters = Nothing
-    , _ddpMaxRecords = Nothing
     , _ddpMarker = Nothing
+    , _ddpMaxRecords = Nothing
     , _ddpSource = Nothing
     , _ddpDBParameterGroupName = pDBParameterGroupName_
     }
@@ -89,6 +89,13 @@
 ddpFilters :: Lens' DescribeDBParameters [Filter]
 ddpFilters = lens _ddpFilters (\ s a -> s{_ddpFilters = a}) . _Default . _Coerce;
 
+-- | An optional pagination token provided by a previous
+-- 'DescribeDBParameters' request. If this parameter is specified, the
+-- response includes only records beyond the marker, up to the value
+-- specified by 'MaxRecords'.
+ddpMarker :: Lens' DescribeDBParameters (Maybe Text)
+ddpMarker = lens _ddpMarker (\ s a -> s{_ddpMarker = a});
+
 -- | The maximum number of records to include in the response. If more
 -- records exist than the specified 'MaxRecords' value, a pagination token
 -- called a marker is included in the response so that the remaining
@@ -100,13 +107,6 @@
 ddpMaxRecords :: Lens' DescribeDBParameters (Maybe Int)
 ddpMaxRecords = lens _ddpMaxRecords (\ s a -> s{_ddpMaxRecords = a});
 
--- | An optional pagination token provided by a previous
--- 'DescribeDBParameters' request. If this parameter is specified, the
--- response includes only records beyond the marker, up to the value
--- specified by 'MaxRecords'.
-ddpMarker :: Lens' DescribeDBParameters (Maybe Text)
-ddpMarker = lens _ddpMarker (\ s a -> s{_ddpMarker = a});
-
 -- | The parameter types to return.
 --
 -- Default: All parameter types returned
@@ -140,9 +140,9 @@
           = receiveXMLWrapper "DescribeDBParametersResult"
               (\ s h x ->
                  DescribeDBParametersResponse' <$>
-                   (x .@? "Parameters" .!@ mempty >>=
-                      may (parseXMLList "Parameter"))
-                     <*> (x .@? "Marker")
+                   (x .@? "Marker") <*>
+                     (x .@? "Parameters" .!@ mempty >>=
+                        may (parseXMLList "Parameter"))
                      <*> (pure (fromEnum s)))
 
 instance ToHeaders DescribeDBParameters where
@@ -158,8 +158,9 @@
                "Version" =: ("2014-10-31" :: ByteString),
                "Filters" =:
                  toQuery (toQueryList "Filter" <$> _ddpFilters),
+               "Marker" =: _ddpMarker,
                "MaxRecords" =: _ddpMaxRecords,
-               "Marker" =: _ddpMarker, "Source" =: _ddpSource,
+               "Source" =: _ddpSource,
                "DBParameterGroupName" =: _ddpDBParameterGroupName]
 
 -- | Contains the result of a successful invocation of the
@@ -167,40 +168,40 @@
 --
 -- /See:/ 'describeDBParametersResponse' smart constructor.
 data DescribeDBParametersResponse = DescribeDBParametersResponse'
-    { _ddprsParameters :: !(Maybe [Parameter])
-    , _ddprsMarker     :: !(Maybe Text)
-    , _ddprsStatus     :: !Int
+    { _ddprsMarker         :: !(Maybe Text)
+    , _ddprsParameters     :: !(Maybe [Parameter])
+    , _ddprsResponseStatus :: !Int
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'DescribeDBParametersResponse' with the minimum fields required to make a request.
 --
 -- Use one of the following lenses to modify other fields as desired:
 --
--- * 'ddprsParameters'
---
 -- * 'ddprsMarker'
 --
--- * 'ddprsStatus'
+-- * 'ddprsParameters'
+--
+-- * 'ddprsResponseStatus'
 describeDBParametersResponse
-    :: Int -- ^ 'ddprsStatus'
+    :: Int -- ^ 'ddprsResponseStatus'
     -> DescribeDBParametersResponse
-describeDBParametersResponse pStatus_ =
+describeDBParametersResponse pResponseStatus_ =
     DescribeDBParametersResponse'
-    { _ddprsParameters = Nothing
-    , _ddprsMarker = Nothing
-    , _ddprsStatus = pStatus_
+    { _ddprsMarker = Nothing
+    , _ddprsParameters = Nothing
+    , _ddprsResponseStatus = pResponseStatus_
     }
 
--- | A list of Parameter values.
-ddprsParameters :: Lens' DescribeDBParametersResponse [Parameter]
-ddprsParameters = lens _ddprsParameters (\ s a -> s{_ddprsParameters = a}) . _Default . _Coerce;
-
 -- | An optional pagination token provided by a previous request. If this
 -- parameter is specified, the response includes only records beyond the
 -- marker, up to the value specified by 'MaxRecords'.
 ddprsMarker :: Lens' DescribeDBParametersResponse (Maybe Text)
 ddprsMarker = lens _ddprsMarker (\ s a -> s{_ddprsMarker = a});
 
+-- | A list of Parameter values.
+ddprsParameters :: Lens' DescribeDBParametersResponse [Parameter]
+ddprsParameters = lens _ddprsParameters (\ s a -> s{_ddprsParameters = a}) . _Default . _Coerce;
+
 -- | The response status code.
-ddprsStatus :: Lens' DescribeDBParametersResponse Int
-ddprsStatus = lens _ddprsStatus (\ s a -> s{_ddprsStatus = a});
+ddprsResponseStatus :: Lens' DescribeDBParametersResponse Int
+ddprsResponseStatus = lens _ddprsResponseStatus (\ s a -> s{_ddprsResponseStatus = a});
diff --git a/gen/Network/AWS/RDS/DescribeDBSecurityGroups.hs b/gen/Network/AWS/RDS/DescribeDBSecurityGroups.hs
--- a/gen/Network/AWS/RDS/DescribeDBSecurityGroups.hs
+++ b/gen/Network/AWS/RDS/DescribeDBSecurityGroups.hs
@@ -32,8 +32,8 @@
     , DescribeDBSecurityGroups
     -- * Request Lenses
     , ddbsgFilters
-    , ddbsgMaxRecords
     , ddbsgMarker
+    , ddbsgMaxRecords
     , ddbsgDBSecurityGroupName
 
     -- * Destructuring the Response
@@ -42,7 +42,7 @@
     -- * Response Lenses
     , ddbsgrsDBSecurityGroups
     , ddbsgrsMarker
-    , ddbsgrsStatus
+    , ddbsgrsResponseStatus
     ) where
 
 import           Network.AWS.Pager
@@ -57,8 +57,8 @@
 -- /See:/ 'describeDBSecurityGroups' smart constructor.
 data DescribeDBSecurityGroups = DescribeDBSecurityGroups'
     { _ddbsgFilters             :: !(Maybe [Filter])
-    , _ddbsgMaxRecords          :: !(Maybe Int)
     , _ddbsgMarker              :: !(Maybe Text)
+    , _ddbsgMaxRecords          :: !(Maybe Int)
     , _ddbsgDBSecurityGroupName :: !(Maybe Text)
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
@@ -68,18 +68,18 @@
 --
 -- * 'ddbsgFilters'
 --
--- * 'ddbsgMaxRecords'
---
 -- * 'ddbsgMarker'
 --
+-- * 'ddbsgMaxRecords'
+--
 -- * 'ddbsgDBSecurityGroupName'
 describeDBSecurityGroups
     :: DescribeDBSecurityGroups
 describeDBSecurityGroups =
     DescribeDBSecurityGroups'
     { _ddbsgFilters = Nothing
-    , _ddbsgMaxRecords = Nothing
     , _ddbsgMarker = Nothing
+    , _ddbsgMaxRecords = Nothing
     , _ddbsgDBSecurityGroupName = Nothing
     }
 
@@ -87,6 +87,13 @@
 ddbsgFilters :: Lens' DescribeDBSecurityGroups [Filter]
 ddbsgFilters = lens _ddbsgFilters (\ s a -> s{_ddbsgFilters = a}) . _Default . _Coerce;
 
+-- | An optional pagination token provided by a previous
+-- 'DescribeDBSecurityGroups' request. If this parameter is specified, the
+-- response includes only records beyond the marker, up to the value
+-- specified by 'MaxRecords'.
+ddbsgMarker :: Lens' DescribeDBSecurityGroups (Maybe Text)
+ddbsgMarker = lens _ddbsgMarker (\ s a -> s{_ddbsgMarker = a});
+
 -- | The maximum number of records to include in the response. If more
 -- records exist than the specified 'MaxRecords' value, a pagination token
 -- called a marker is included in the response so that the remaining
@@ -98,13 +105,6 @@
 ddbsgMaxRecords :: Lens' DescribeDBSecurityGroups (Maybe Int)
 ddbsgMaxRecords = lens _ddbsgMaxRecords (\ s a -> s{_ddbsgMaxRecords = a});
 
--- | An optional pagination token provided by a previous
--- 'DescribeDBSecurityGroups' request. If this parameter is specified, the
--- response includes only records beyond the marker, up to the value
--- specified by 'MaxRecords'.
-ddbsgMarker :: Lens' DescribeDBSecurityGroups (Maybe Text)
-ddbsgMarker = lens _ddbsgMarker (\ s a -> s{_ddbsgMarker = a});
-
 -- | The name of the DB security group to return details for.
 ddbsgDBSecurityGroupName :: Lens' DescribeDBSecurityGroups (Maybe Text)
 ddbsgDBSecurityGroupName = lens _ddbsgDBSecurityGroupName (\ s a -> s{_ddbsgDBSecurityGroupName = a});
@@ -143,8 +143,8 @@
                "Version" =: ("2014-10-31" :: ByteString),
                "Filters" =:
                  toQuery (toQueryList "Filter" <$> _ddbsgFilters),
-               "MaxRecords" =: _ddbsgMaxRecords,
                "Marker" =: _ddbsgMarker,
+               "MaxRecords" =: _ddbsgMaxRecords,
                "DBSecurityGroupName" =: _ddbsgDBSecurityGroupName]
 
 -- | Contains the result of a successful invocation of the
@@ -154,7 +154,7 @@
 data DescribeDBSecurityGroupsResponse = DescribeDBSecurityGroupsResponse'
     { _ddbsgrsDBSecurityGroups :: !(Maybe [DBSecurityGroup])
     , _ddbsgrsMarker           :: !(Maybe Text)
-    , _ddbsgrsStatus           :: !Int
+    , _ddbsgrsResponseStatus   :: !Int
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'DescribeDBSecurityGroupsResponse' with the minimum fields required to make a request.
@@ -165,15 +165,15 @@
 --
 -- * 'ddbsgrsMarker'
 --
--- * 'ddbsgrsStatus'
+-- * 'ddbsgrsResponseStatus'
 describeDBSecurityGroupsResponse
-    :: Int -- ^ 'ddbsgrsStatus'
+    :: Int -- ^ 'ddbsgrsResponseStatus'
     -> DescribeDBSecurityGroupsResponse
-describeDBSecurityGroupsResponse pStatus_ =
+describeDBSecurityGroupsResponse pResponseStatus_ =
     DescribeDBSecurityGroupsResponse'
     { _ddbsgrsDBSecurityGroups = Nothing
     , _ddbsgrsMarker = Nothing
-    , _ddbsgrsStatus = pStatus_
+    , _ddbsgrsResponseStatus = pResponseStatus_
     }
 
 -- | A list of DBSecurityGroup instances.
@@ -187,5 +187,5 @@
 ddbsgrsMarker = lens _ddbsgrsMarker (\ s a -> s{_ddbsgrsMarker = a});
 
 -- | The response status code.
-ddbsgrsStatus :: Lens' DescribeDBSecurityGroupsResponse Int
-ddbsgrsStatus = lens _ddbsgrsStatus (\ s a -> s{_ddbsgrsStatus = a});
+ddbsgrsResponseStatus :: Lens' DescribeDBSecurityGroupsResponse Int
+ddbsgrsResponseStatus = lens _ddbsgrsResponseStatus (\ s a -> s{_ddbsgrsResponseStatus = a});
diff --git a/gen/Network/AWS/RDS/DescribeDBSnapshots.hs b/gen/Network/AWS/RDS/DescribeDBSnapshots.hs
--- a/gen/Network/AWS/RDS/DescribeDBSnapshots.hs
+++ b/gen/Network/AWS/RDS/DescribeDBSnapshots.hs
@@ -33,8 +33,8 @@
     , ddsDBSnapshotIdentifier
     , ddsSnapshotType
     , ddsDBInstanceIdentifier
-    , ddsMaxRecords
     , ddsMarker
+    , ddsMaxRecords
 
     -- * Destructuring the Response
     , describeDBSnapshotsResponse
@@ -42,7 +42,7 @@
     -- * Response Lenses
     , ddsrsMarker
     , ddsrsDBSnapshots
-    , ddsrsStatus
+    , ddsrsResponseStatus
     ) where
 
 import           Network.AWS.Pager
@@ -60,8 +60,8 @@
     , _ddsDBSnapshotIdentifier :: !(Maybe Text)
     , _ddsSnapshotType         :: !(Maybe Text)
     , _ddsDBInstanceIdentifier :: !(Maybe Text)
-    , _ddsMaxRecords           :: !(Maybe Int)
     , _ddsMarker               :: !(Maybe Text)
+    , _ddsMaxRecords           :: !(Maybe Int)
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'DescribeDBSnapshots' with the minimum fields required to make a request.
@@ -76,9 +76,9 @@
 --
 -- * 'ddsDBInstanceIdentifier'
 --
--- * 'ddsMaxRecords'
---
 -- * 'ddsMarker'
+--
+-- * 'ddsMaxRecords'
 describeDBSnapshots
     :: DescribeDBSnapshots
 describeDBSnapshots =
@@ -87,8 +87,8 @@
     , _ddsDBSnapshotIdentifier = Nothing
     , _ddsSnapshotType = Nothing
     , _ddsDBInstanceIdentifier = Nothing
-    , _ddsMaxRecords = Nothing
     , _ddsMarker = Nothing
+    , _ddsMaxRecords = Nothing
     }
 
 -- | This parameter is not currently supported.
@@ -127,6 +127,13 @@
 ddsDBInstanceIdentifier :: Lens' DescribeDBSnapshots (Maybe Text)
 ddsDBInstanceIdentifier = lens _ddsDBInstanceIdentifier (\ s a -> s{_ddsDBInstanceIdentifier = a});
 
+-- | An optional pagination token provided by a previous
+-- 'DescribeDBSnapshots' request. If this parameter is specified, the
+-- response includes only records beyond the marker, up to the value
+-- specified by 'MaxRecords'.
+ddsMarker :: Lens' DescribeDBSnapshots (Maybe Text)
+ddsMarker = lens _ddsMarker (\ s a -> s{_ddsMarker = a});
+
 -- | The maximum number of records to include in the response. If more
 -- records exist than the specified 'MaxRecords' value, a pagination token
 -- called a marker is included in the response so that the remaining
@@ -138,13 +145,6 @@
 ddsMaxRecords :: Lens' DescribeDBSnapshots (Maybe Int)
 ddsMaxRecords = lens _ddsMaxRecords (\ s a -> s{_ddsMaxRecords = a});
 
--- | An optional pagination token provided by a previous
--- 'DescribeDBSnapshots' request. If this parameter is specified, the
--- response includes only records beyond the marker, up to the value
--- specified by 'MaxRecords'.
-ddsMarker :: Lens' DescribeDBSnapshots (Maybe Text)
-ddsMarker = lens _ddsMarker (\ s a -> s{_ddsMarker = a});
-
 instance AWSPager DescribeDBSnapshots where
         page rq rs
           | stop (rs ^. ddsrsMarker) = Nothing
@@ -181,17 +181,17 @@
                "DBSnapshotIdentifier" =: _ddsDBSnapshotIdentifier,
                "SnapshotType" =: _ddsSnapshotType,
                "DBInstanceIdentifier" =: _ddsDBInstanceIdentifier,
-               "MaxRecords" =: _ddsMaxRecords,
-               "Marker" =: _ddsMarker]
+               "Marker" =: _ddsMarker,
+               "MaxRecords" =: _ddsMaxRecords]
 
 -- | Contains the result of a successful invocation of the
 -- DescribeDBSnapshots action.
 --
 -- /See:/ 'describeDBSnapshotsResponse' smart constructor.
 data DescribeDBSnapshotsResponse = DescribeDBSnapshotsResponse'
-    { _ddsrsMarker      :: !(Maybe Text)
-    , _ddsrsDBSnapshots :: !(Maybe [DBSnapshot])
-    , _ddsrsStatus      :: !Int
+    { _ddsrsMarker         :: !(Maybe Text)
+    , _ddsrsDBSnapshots    :: !(Maybe [DBSnapshot])
+    , _ddsrsResponseStatus :: !Int
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'DescribeDBSnapshotsResponse' with the minimum fields required to make a request.
@@ -202,15 +202,15 @@
 --
 -- * 'ddsrsDBSnapshots'
 --
--- * 'ddsrsStatus'
+-- * 'ddsrsResponseStatus'
 describeDBSnapshotsResponse
-    :: Int -- ^ 'ddsrsStatus'
+    :: Int -- ^ 'ddsrsResponseStatus'
     -> DescribeDBSnapshotsResponse
-describeDBSnapshotsResponse pStatus_ =
+describeDBSnapshotsResponse pResponseStatus_ =
     DescribeDBSnapshotsResponse'
     { _ddsrsMarker = Nothing
     , _ddsrsDBSnapshots = Nothing
-    , _ddsrsStatus = pStatus_
+    , _ddsrsResponseStatus = pResponseStatus_
     }
 
 -- | An optional pagination token provided by a previous request. If this
@@ -224,5 +224,5 @@
 ddsrsDBSnapshots = lens _ddsrsDBSnapshots (\ s a -> s{_ddsrsDBSnapshots = a}) . _Default . _Coerce;
 
 -- | The response status code.
-ddsrsStatus :: Lens' DescribeDBSnapshotsResponse Int
-ddsrsStatus = lens _ddsrsStatus (\ s a -> s{_ddsrsStatus = a});
+ddsrsResponseStatus :: Lens' DescribeDBSnapshotsResponse Int
+ddsrsResponseStatus = lens _ddsrsResponseStatus (\ s a -> s{_ddsrsResponseStatus = a});
diff --git a/gen/Network/AWS/RDS/DescribeDBSubnetGroups.hs b/gen/Network/AWS/RDS/DescribeDBSubnetGroups.hs
--- a/gen/Network/AWS/RDS/DescribeDBSubnetGroups.hs
+++ b/gen/Network/AWS/RDS/DescribeDBSubnetGroups.hs
@@ -36,8 +36,8 @@
     -- * Request Lenses
     , ddsgDBSubnetGroupName
     , ddsgFilters
-    , ddsgMaxRecords
     , ddsgMarker
+    , ddsgMaxRecords
 
     -- * Destructuring the Response
     , describeDBSubnetGroupsResponse
@@ -45,7 +45,7 @@
     -- * Response Lenses
     , ddsgrsDBSubnetGroups
     , ddsgrsMarker
-    , ddsgrsStatus
+    , ddsgrsResponseStatus
     ) where
 
 import           Network.AWS.Pager
@@ -61,8 +61,8 @@
 data DescribeDBSubnetGroups = DescribeDBSubnetGroups'
     { _ddsgDBSubnetGroupName :: !(Maybe Text)
     , _ddsgFilters           :: !(Maybe [Filter])
-    , _ddsgMaxRecords        :: !(Maybe Int)
     , _ddsgMarker            :: !(Maybe Text)
+    , _ddsgMaxRecords        :: !(Maybe Int)
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'DescribeDBSubnetGroups' with the minimum fields required to make a request.
@@ -73,17 +73,17 @@
 --
 -- * 'ddsgFilters'
 --
--- * 'ddsgMaxRecords'
---
 -- * 'ddsgMarker'
+--
+-- * 'ddsgMaxRecords'
 describeDBSubnetGroups
     :: DescribeDBSubnetGroups
 describeDBSubnetGroups =
     DescribeDBSubnetGroups'
     { _ddsgDBSubnetGroupName = Nothing
     , _ddsgFilters = Nothing
-    , _ddsgMaxRecords = Nothing
     , _ddsgMarker = Nothing
+    , _ddsgMaxRecords = Nothing
     }
 
 -- | The name of the DB subnet group to return details for.
@@ -94,6 +94,13 @@
 ddsgFilters :: Lens' DescribeDBSubnetGroups [Filter]
 ddsgFilters = lens _ddsgFilters (\ s a -> s{_ddsgFilters = a}) . _Default . _Coerce;
 
+-- | An optional pagination token provided by a previous
+-- DescribeDBSubnetGroups request. If this parameter is specified, the
+-- response includes only records beyond the marker, up to the value
+-- specified by 'MaxRecords'.
+ddsgMarker :: Lens' DescribeDBSubnetGroups (Maybe Text)
+ddsgMarker = lens _ddsgMarker (\ s a -> s{_ddsgMarker = a});
+
 -- | The maximum number of records to include in the response. If more
 -- records exist than the specified 'MaxRecords' value, a pagination token
 -- called a marker is included in the response so that the remaining
@@ -105,13 +112,6 @@
 ddsgMaxRecords :: Lens' DescribeDBSubnetGroups (Maybe Int)
 ddsgMaxRecords = lens _ddsgMaxRecords (\ s a -> s{_ddsgMaxRecords = a});
 
--- | An optional pagination token provided by a previous
--- DescribeDBSubnetGroups request. If this parameter is specified, the
--- response includes only records beyond the marker, up to the value
--- specified by 'MaxRecords'.
-ddsgMarker :: Lens' DescribeDBSubnetGroups (Maybe Text)
-ddsgMarker = lens _ddsgMarker (\ s a -> s{_ddsgMarker = a});
-
 instance AWSPager DescribeDBSubnetGroups where
         page rq rs
           | stop (rs ^. ddsgrsMarker) = Nothing
@@ -147,8 +147,8 @@
                "DBSubnetGroupName" =: _ddsgDBSubnetGroupName,
                "Filters" =:
                  toQuery (toQueryList "Filter" <$> _ddsgFilters),
-               "MaxRecords" =: _ddsgMaxRecords,
-               "Marker" =: _ddsgMarker]
+               "Marker" =: _ddsgMarker,
+               "MaxRecords" =: _ddsgMaxRecords]
 
 -- | Contains the result of a successful invocation of the
 -- DescribeDBSubnetGroups action.
@@ -157,7 +157,7 @@
 data DescribeDBSubnetGroupsResponse = DescribeDBSubnetGroupsResponse'
     { _ddsgrsDBSubnetGroups :: !(Maybe [DBSubnetGroup])
     , _ddsgrsMarker         :: !(Maybe Text)
-    , _ddsgrsStatus         :: !Int
+    , _ddsgrsResponseStatus :: !Int
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'DescribeDBSubnetGroupsResponse' with the minimum fields required to make a request.
@@ -168,15 +168,15 @@
 --
 -- * 'ddsgrsMarker'
 --
--- * 'ddsgrsStatus'
+-- * 'ddsgrsResponseStatus'
 describeDBSubnetGroupsResponse
-    :: Int -- ^ 'ddsgrsStatus'
+    :: Int -- ^ 'ddsgrsResponseStatus'
     -> DescribeDBSubnetGroupsResponse
-describeDBSubnetGroupsResponse pStatus_ =
+describeDBSubnetGroupsResponse pResponseStatus_ =
     DescribeDBSubnetGroupsResponse'
     { _ddsgrsDBSubnetGroups = Nothing
     , _ddsgrsMarker = Nothing
-    , _ddsgrsStatus = pStatus_
+    , _ddsgrsResponseStatus = pResponseStatus_
     }
 
 -- | A list of DBSubnetGroup instances.
@@ -190,5 +190,5 @@
 ddsgrsMarker = lens _ddsgrsMarker (\ s a -> s{_ddsgrsMarker = a});
 
 -- | The response status code.
-ddsgrsStatus :: Lens' DescribeDBSubnetGroupsResponse Int
-ddsgrsStatus = lens _ddsgrsStatus (\ s a -> s{_ddsgrsStatus = a});
+ddsgrsResponseStatus :: Lens' DescribeDBSubnetGroupsResponse Int
+ddsgrsResponseStatus = lens _ddsgrsResponseStatus (\ s a -> s{_ddsgrsResponseStatus = a});
diff --git a/gen/Network/AWS/RDS/DescribeEngineDefaultClusterParameters.hs b/gen/Network/AWS/RDS/DescribeEngineDefaultClusterParameters.hs
--- a/gen/Network/AWS/RDS/DescribeEngineDefaultClusterParameters.hs
+++ b/gen/Network/AWS/RDS/DescribeEngineDefaultClusterParameters.hs
@@ -33,8 +33,8 @@
     , DescribeEngineDefaultClusterParameters
     -- * Request Lenses
     , dedcpFilters
-    , dedcpMaxRecords
     , dedcpMarker
+    , dedcpMaxRecords
     , dedcpDBParameterGroupFamily
 
     -- * Destructuring the Response
@@ -42,7 +42,7 @@
     , DescribeEngineDefaultClusterParametersResponse
     -- * Response Lenses
     , dedcprsEngineDefaults
-    , dedcprsStatus
+    , dedcprsResponseStatus
     ) where
 
 import           Network.AWS.Prelude
@@ -56,8 +56,8 @@
 -- /See:/ 'describeEngineDefaultClusterParameters' smart constructor.
 data DescribeEngineDefaultClusterParameters = DescribeEngineDefaultClusterParameters'
     { _dedcpFilters                :: !(Maybe [Filter])
-    , _dedcpMaxRecords             :: !(Maybe Int)
     , _dedcpMarker                 :: !(Maybe Text)
+    , _dedcpMaxRecords             :: !(Maybe Int)
     , _dedcpDBParameterGroupFamily :: !Text
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
@@ -67,10 +67,10 @@
 --
 -- * 'dedcpFilters'
 --
--- * 'dedcpMaxRecords'
---
 -- * 'dedcpMarker'
 --
+-- * 'dedcpMaxRecords'
+--
 -- * 'dedcpDBParameterGroupFamily'
 describeEngineDefaultClusterParameters
     :: Text -- ^ 'dedcpDBParameterGroupFamily'
@@ -78,8 +78,8 @@
 describeEngineDefaultClusterParameters pDBParameterGroupFamily_ =
     DescribeEngineDefaultClusterParameters'
     { _dedcpFilters = Nothing
-    , _dedcpMaxRecords = Nothing
     , _dedcpMarker = Nothing
+    , _dedcpMaxRecords = Nothing
     , _dedcpDBParameterGroupFamily = pDBParameterGroupFamily_
     }
 
@@ -87,6 +87,13 @@
 dedcpFilters :: Lens' DescribeEngineDefaultClusterParameters [Filter]
 dedcpFilters = lens _dedcpFilters (\ s a -> s{_dedcpFilters = a}) . _Default . _Coerce;
 
+-- | An optional pagination token provided by a previous
+-- 'DescribeEngineDefaultClusterParameters' request. If this parameter is
+-- specified, the response includes only records beyond the marker, up to
+-- the value specified by 'MaxRecords'.
+dedcpMarker :: Lens' DescribeEngineDefaultClusterParameters (Maybe Text)
+dedcpMarker = lens _dedcpMarker (\ s a -> s{_dedcpMarker = a});
+
 -- | The maximum number of records to include in the response. If more
 -- records exist than the specified 'MaxRecords' value, a pagination token
 -- called a marker is included in the response so that the remaining
@@ -98,13 +105,6 @@
 dedcpMaxRecords :: Lens' DescribeEngineDefaultClusterParameters (Maybe Int)
 dedcpMaxRecords = lens _dedcpMaxRecords (\ s a -> s{_dedcpMaxRecords = a});
 
--- | An optional pagination token provided by a previous
--- 'DescribeEngineDefaultClusterParameters' request. If this parameter is
--- specified, the response includes only records beyond the marker, up to
--- the value specified by 'MaxRecords'.
-dedcpMarker :: Lens' DescribeEngineDefaultClusterParameters (Maybe Text)
-dedcpMarker = lens _dedcpMarker (\ s a -> s{_dedcpMarker = a});
-
 -- | The name of the DB cluster parameter group family to return engine
 -- parameter information for.
 dedcpDBParameterGroupFamily :: Lens' DescribeEngineDefaultClusterParameters Text
@@ -140,15 +140,15 @@
                "Version" =: ("2014-10-31" :: ByteString),
                "Filters" =:
                  toQuery (toQueryList "Filter" <$> _dedcpFilters),
-               "MaxRecords" =: _dedcpMaxRecords,
                "Marker" =: _dedcpMarker,
+               "MaxRecords" =: _dedcpMaxRecords,
                "DBParameterGroupFamily" =:
                  _dedcpDBParameterGroupFamily]
 
 -- | /See:/ 'describeEngineDefaultClusterParametersResponse' smart constructor.
 data DescribeEngineDefaultClusterParametersResponse = DescribeEngineDefaultClusterParametersResponse'
     { _dedcprsEngineDefaults :: !(Maybe EngineDefaults)
-    , _dedcprsStatus         :: !Int
+    , _dedcprsResponseStatus :: !Int
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'DescribeEngineDefaultClusterParametersResponse' with the minimum fields required to make a request.
@@ -157,14 +157,14 @@
 --
 -- * 'dedcprsEngineDefaults'
 --
--- * 'dedcprsStatus'
+-- * 'dedcprsResponseStatus'
 describeEngineDefaultClusterParametersResponse
-    :: Int -- ^ 'dedcprsStatus'
+    :: Int -- ^ 'dedcprsResponseStatus'
     -> DescribeEngineDefaultClusterParametersResponse
-describeEngineDefaultClusterParametersResponse pStatus_ =
+describeEngineDefaultClusterParametersResponse pResponseStatus_ =
     DescribeEngineDefaultClusterParametersResponse'
     { _dedcprsEngineDefaults = Nothing
-    , _dedcprsStatus = pStatus_
+    , _dedcprsResponseStatus = pResponseStatus_
     }
 
 -- | Undocumented member.
@@ -172,5 +172,5 @@
 dedcprsEngineDefaults = lens _dedcprsEngineDefaults (\ s a -> s{_dedcprsEngineDefaults = a});
 
 -- | The response status code.
-dedcprsStatus :: Lens' DescribeEngineDefaultClusterParametersResponse Int
-dedcprsStatus = lens _dedcprsStatus (\ s a -> s{_dedcprsStatus = a});
+dedcprsResponseStatus :: Lens' DescribeEngineDefaultClusterParametersResponse Int
+dedcprsResponseStatus = lens _dedcprsResponseStatus (\ s a -> s{_dedcprsResponseStatus = a});
diff --git a/gen/Network/AWS/RDS/DescribeEngineDefaultParameters.hs b/gen/Network/AWS/RDS/DescribeEngineDefaultParameters.hs
--- a/gen/Network/AWS/RDS/DescribeEngineDefaultParameters.hs
+++ b/gen/Network/AWS/RDS/DescribeEngineDefaultParameters.hs
@@ -31,15 +31,15 @@
     , DescribeEngineDefaultParameters
     -- * Request Lenses
     , dedpFilters
-    , dedpMaxRecords
     , dedpMarker
+    , dedpMaxRecords
     , dedpDBParameterGroupFamily
 
     -- * Destructuring the Response
     , describeEngineDefaultParametersResponse
     , DescribeEngineDefaultParametersResponse
     -- * Response Lenses
-    , dedprsStatus
+    , dedprsResponseStatus
     , dedprsEngineDefaults
     ) where
 
@@ -55,8 +55,8 @@
 -- /See:/ 'describeEngineDefaultParameters' smart constructor.
 data DescribeEngineDefaultParameters = DescribeEngineDefaultParameters'
     { _dedpFilters                :: !(Maybe [Filter])
-    , _dedpMaxRecords             :: !(Maybe Int)
     , _dedpMarker                 :: !(Maybe Text)
+    , _dedpMaxRecords             :: !(Maybe Int)
     , _dedpDBParameterGroupFamily :: !Text
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
@@ -66,10 +66,10 @@
 --
 -- * 'dedpFilters'
 --
--- * 'dedpMaxRecords'
---
 -- * 'dedpMarker'
 --
+-- * 'dedpMaxRecords'
+--
 -- * 'dedpDBParameterGroupFamily'
 describeEngineDefaultParameters
     :: Text -- ^ 'dedpDBParameterGroupFamily'
@@ -77,8 +77,8 @@
 describeEngineDefaultParameters pDBParameterGroupFamily_ =
     DescribeEngineDefaultParameters'
     { _dedpFilters = Nothing
-    , _dedpMaxRecords = Nothing
     , _dedpMarker = Nothing
+    , _dedpMaxRecords = Nothing
     , _dedpDBParameterGroupFamily = pDBParameterGroupFamily_
     }
 
@@ -86,6 +86,13 @@
 dedpFilters :: Lens' DescribeEngineDefaultParameters [Filter]
 dedpFilters = lens _dedpFilters (\ s a -> s{_dedpFilters = a}) . _Default . _Coerce;
 
+-- | An optional pagination token provided by a previous
+-- 'DescribeEngineDefaultParameters' request. If this parameter is
+-- specified, the response includes only records beyond the marker, up to
+-- the value specified by 'MaxRecords'.
+dedpMarker :: Lens' DescribeEngineDefaultParameters (Maybe Text)
+dedpMarker = lens _dedpMarker (\ s a -> s{_dedpMarker = a});
+
 -- | The maximum number of records to include in the response. If more
 -- records exist than the specified 'MaxRecords' value, a pagination token
 -- called a marker is included in the response so that the remaining
@@ -97,13 +104,6 @@
 dedpMaxRecords :: Lens' DescribeEngineDefaultParameters (Maybe Int)
 dedpMaxRecords = lens _dedpMaxRecords (\ s a -> s{_dedpMaxRecords = a});
 
--- | An optional pagination token provided by a previous
--- 'DescribeEngineDefaultParameters' request. If this parameter is
--- specified, the response includes only records beyond the marker, up to
--- the value specified by 'MaxRecords'.
-dedpMarker :: Lens' DescribeEngineDefaultParameters (Maybe Text)
-dedpMarker = lens _dedpMarker (\ s a -> s{_dedpMarker = a});
-
 -- | The name of the DB parameter group family.
 dedpDBParameterGroupFamily :: Lens' DescribeEngineDefaultParameters Text
 dedpDBParameterGroupFamily = lens _dedpDBParameterGroupFamily (\ s a -> s{_dedpDBParameterGroupFamily = a});
@@ -149,14 +149,14 @@
                "Version" =: ("2014-10-31" :: ByteString),
                "Filters" =:
                  toQuery (toQueryList "Filter" <$> _dedpFilters),
-               "MaxRecords" =: _dedpMaxRecords,
                "Marker" =: _dedpMarker,
+               "MaxRecords" =: _dedpMaxRecords,
                "DBParameterGroupFamily" =:
                  _dedpDBParameterGroupFamily]
 
 -- | /See:/ 'describeEngineDefaultParametersResponse' smart constructor.
 data DescribeEngineDefaultParametersResponse = DescribeEngineDefaultParametersResponse'
-    { _dedprsStatus         :: !Int
+    { _dedprsResponseStatus :: !Int
     , _dedprsEngineDefaults :: !EngineDefaults
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
@@ -164,22 +164,22 @@
 --
 -- Use one of the following lenses to modify other fields as desired:
 --
--- * 'dedprsStatus'
+-- * 'dedprsResponseStatus'
 --
 -- * 'dedprsEngineDefaults'
 describeEngineDefaultParametersResponse
-    :: Int -- ^ 'dedprsStatus'
+    :: Int -- ^ 'dedprsResponseStatus'
     -> EngineDefaults -- ^ 'dedprsEngineDefaults'
     -> DescribeEngineDefaultParametersResponse
-describeEngineDefaultParametersResponse pStatus_ pEngineDefaults_ =
+describeEngineDefaultParametersResponse pResponseStatus_ pEngineDefaults_ =
     DescribeEngineDefaultParametersResponse'
-    { _dedprsStatus = pStatus_
+    { _dedprsResponseStatus = pResponseStatus_
     , _dedprsEngineDefaults = pEngineDefaults_
     }
 
 -- | The response status code.
-dedprsStatus :: Lens' DescribeEngineDefaultParametersResponse Int
-dedprsStatus = lens _dedprsStatus (\ s a -> s{_dedprsStatus = a});
+dedprsResponseStatus :: Lens' DescribeEngineDefaultParametersResponse Int
+dedprsResponseStatus = lens _dedprsResponseStatus (\ s a -> s{_dedprsResponseStatus = a});
 
 -- | Undocumented member.
 dedprsEngineDefaults :: Lens' DescribeEngineDefaultParametersResponse EngineDefaults
diff --git a/gen/Network/AWS/RDS/DescribeEventCategories.hs b/gen/Network/AWS/RDS/DescribeEventCategories.hs
--- a/gen/Network/AWS/RDS/DescribeEventCategories.hs
+++ b/gen/Network/AWS/RDS/DescribeEventCategories.hs
@@ -39,7 +39,7 @@
     , DescribeEventCategoriesResponse
     -- * Response Lenses
     , decrsEventCategoriesMapList
-    , decrsStatus
+    , decrsResponseStatus
     ) where
 
 import           Network.AWS.Prelude
@@ -115,7 +115,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.
@@ -124,14 +124,14 @@
 --
 -- * 'decrsEventCategoriesMapList'
 --
--- * 'decrsStatus'
+-- * 'decrsResponseStatus'
 describeEventCategoriesResponse
-    :: Int -- ^ 'decrsStatus'
+    :: Int -- ^ 'decrsResponseStatus'
     -> DescribeEventCategoriesResponse
-describeEventCategoriesResponse pStatus_ =
+describeEventCategoriesResponse pResponseStatus_ =
     DescribeEventCategoriesResponse'
     { _decrsEventCategoriesMapList = Nothing
-    , _decrsStatus = pStatus_
+    , _decrsResponseStatus = pResponseStatus_
     }
 
 -- | A list of EventCategoriesMap data types.
@@ -139,5 +139,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/RDS/DescribeEventSubscriptions.hs b/gen/Network/AWS/RDS/DescribeEventSubscriptions.hs
--- a/gen/Network/AWS/RDS/DescribeEventSubscriptions.hs
+++ b/gen/Network/AWS/RDS/DescribeEventSubscriptions.hs
@@ -36,8 +36,8 @@
     -- * Request Lenses
     , dSubscriptionName
     , dFilters
-    , dMaxRecords
     , dMarker
+    , dMaxRecords
 
     -- * Destructuring the Response
     , describeEventSubscriptionsResponse
@@ -45,7 +45,7 @@
     -- * Response Lenses
     , desrsEventSubscriptionsList
     , desrsMarker
-    , desrsStatus
+    , desrsResponseStatus
     ) where
 
 import           Network.AWS.Pager
@@ -61,8 +61,8 @@
 data DescribeEventSubscriptions = DescribeEventSubscriptions'
     { _dSubscriptionName :: !(Maybe Text)
     , _dFilters          :: !(Maybe [Filter])
-    , _dMaxRecords       :: !(Maybe Int)
     , _dMarker           :: !(Maybe Text)
+    , _dMaxRecords       :: !(Maybe Int)
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'DescribeEventSubscriptions' with the minimum fields required to make a request.
@@ -73,17 +73,17 @@
 --
 -- * 'dFilters'
 --
--- * 'dMaxRecords'
---
 -- * 'dMarker'
+--
+-- * 'dMaxRecords'
 describeEventSubscriptions
     :: DescribeEventSubscriptions
 describeEventSubscriptions =
     DescribeEventSubscriptions'
     { _dSubscriptionName = Nothing
     , _dFilters = Nothing
-    , _dMaxRecords = Nothing
     , _dMarker = Nothing
+    , _dMaxRecords = Nothing
     }
 
 -- | The name of the RDS event notification subscription you want to
@@ -95,6 +95,13 @@
 dFilters :: Lens' DescribeEventSubscriptions [Filter]
 dFilters = lens _dFilters (\ s a -> s{_dFilters = a}) . _Default . _Coerce;
 
+-- | An optional pagination token provided by a previous
+-- DescribeOrderableDBInstanceOptions request. If this parameter is
+-- specified, the response includes only records beyond the marker, up to
+-- the value specified by 'MaxRecords' .
+dMarker :: Lens' DescribeEventSubscriptions (Maybe Text)
+dMarker = lens _dMarker (\ s a -> s{_dMarker = a});
+
 -- | The maximum number of records to include in the response. If more
 -- records exist than the specified 'MaxRecords' value, a pagination token
 -- called a marker is included in the response so that the remaining
@@ -106,13 +113,6 @@
 dMaxRecords :: Lens' DescribeEventSubscriptions (Maybe Int)
 dMaxRecords = lens _dMaxRecords (\ s a -> s{_dMaxRecords = a});
 
--- | An optional pagination token provided by a previous
--- DescribeOrderableDBInstanceOptions request. If this parameter is
--- specified, the response includes only records beyond the marker, up to
--- the value specified by 'MaxRecords' .
-dMarker :: Lens' DescribeEventSubscriptions (Maybe Text)
-dMarker = lens _dMarker (\ s a -> s{_dMarker = a});
-
 instance AWSPager DescribeEventSubscriptions where
         page rq rs
           | stop (rs ^. desrsMarker) = Nothing
@@ -149,7 +149,7 @@
                "SubscriptionName" =: _dSubscriptionName,
                "Filters" =:
                  toQuery (toQueryList "Filter" <$> _dFilters),
-               "MaxRecords" =: _dMaxRecords, "Marker" =: _dMarker]
+               "Marker" =: _dMarker, "MaxRecords" =: _dMaxRecords]
 
 -- | Data returned by the __DescribeEventSubscriptions__ action.
 --
@@ -157,7 +157,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.
@@ -168,15 +168,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 EventSubscriptions data types.
@@ -191,5 +191,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/RDS/DescribeEvents.hs b/gen/Network/AWS/RDS/DescribeEvents.hs
--- a/gen/Network/AWS/RDS/DescribeEvents.hs
+++ b/gen/Network/AWS/RDS/DescribeEvents.hs
@@ -37,10 +37,10 @@
     , deSourceType
     , deFilters
     , deSourceIdentifier
-    , deMaxRecords
     , deEventCategories
-    , deEndTime
     , deMarker
+    , deMaxRecords
+    , deEndTime
     , deDuration
 
     -- * Destructuring the Response
@@ -49,7 +49,7 @@
     -- * Response Lenses
     , dersEvents
     , dersMarker
-    , dersStatus
+    , dersResponseStatus
     ) where
 
 import           Network.AWS.Pager
@@ -67,10 +67,10 @@
     , _deSourceType       :: !(Maybe SourceType)
     , _deFilters          :: !(Maybe [Filter])
     , _deSourceIdentifier :: !(Maybe Text)
-    , _deMaxRecords       :: !(Maybe Int)
     , _deEventCategories  :: !(Maybe [Text])
-    , _deEndTime          :: !(Maybe ISO8601)
     , _deMarker           :: !(Maybe Text)
+    , _deMaxRecords       :: !(Maybe Int)
+    , _deEndTime          :: !(Maybe ISO8601)
     , _deDuration         :: !(Maybe Int)
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
@@ -86,14 +86,14 @@
 --
 -- * 'deSourceIdentifier'
 --
--- * 'deMaxRecords'
---
 -- * 'deEventCategories'
 --
--- * 'deEndTime'
---
 -- * 'deMarker'
 --
+-- * 'deMaxRecords'
+--
+-- * 'deEndTime'
+--
 -- * 'deDuration'
 describeEvents
     :: DescribeEvents
@@ -103,10 +103,10 @@
     , _deSourceType = Nothing
     , _deFilters = Nothing
     , _deSourceIdentifier = Nothing
-    , _deMaxRecords = Nothing
     , _deEventCategories = Nothing
-    , _deEndTime = Nothing
     , _deMarker = Nothing
+    , _deMaxRecords = Nothing
+    , _deEndTime = Nothing
     , _deDuration = Nothing
     }
 
@@ -145,6 +145,17 @@
 deSourceIdentifier :: Lens' DescribeEvents (Maybe Text)
 deSourceIdentifier = lens _deSourceIdentifier (\ s a -> s{_deSourceIdentifier = a});
 
+-- | A list of event categories that trigger notifications for a event
+-- notification subscription.
+deEventCategories :: Lens' DescribeEvents [Text]
+deEventCategories = lens _deEventCategories (\ s a -> s{_deEventCategories = a}) . _Default . _Coerce;
+
+-- | An optional pagination token provided by a previous DescribeEvents
+-- request. If this parameter is specified, the response includes only
+-- records beyond the marker, up to the value specified by 'MaxRecords'.
+deMarker :: Lens' DescribeEvents (Maybe Text)
+deMarker = lens _deMarker (\ s a -> s{_deMarker = a});
+
 -- | The maximum number of records to include in the response. If more
 -- records exist than the specified 'MaxRecords' value, a pagination token
 -- called a marker is included in the response so that the remaining
@@ -156,11 +167,6 @@
 deMaxRecords :: Lens' DescribeEvents (Maybe Int)
 deMaxRecords = lens _deMaxRecords (\ s a -> s{_deMaxRecords = a});
 
--- | A list of event categories that trigger notifications for a event
--- notification subscription.
-deEventCategories :: Lens' DescribeEvents [Text]
-deEventCategories = lens _deEventCategories (\ s a -> s{_deEventCategories = a}) . _Default . _Coerce;
-
 -- | The end of the time interval for which to retrieve events, specified in
 -- ISO 8601 format. For more information about ISO 8601, go to the
 -- <http://en.wikipedia.org/wiki/ISO_8601 ISO8601 Wikipedia page.>
@@ -169,12 +175,6 @@
 deEndTime :: Lens' DescribeEvents (Maybe UTCTime)
 deEndTime = lens _deEndTime (\ s a -> s{_deEndTime = a}) . mapping _Time;
 
--- | An optional pagination token provided by a previous DescribeEvents
--- request. If this parameter is specified, the response includes only
--- records beyond the marker, up to the value specified by 'MaxRecords'.
-deMarker :: Lens' DescribeEvents (Maybe Text)
-deMarker = lens _deMarker (\ s a -> s{_deMarker = a});
-
 -- | The number of minutes to retrieve events for.
 --
 -- Default: 60
@@ -216,21 +216,20 @@
                "Filters" =:
                  toQuery (toQueryList "Filter" <$> _deFilters),
                "SourceIdentifier" =: _deSourceIdentifier,
-               "MaxRecords" =: _deMaxRecords,
                "EventCategories" =:
                  toQuery
                    (toQueryList "EventCategory" <$> _deEventCategories),
-               "EndTime" =: _deEndTime, "Marker" =: _deMarker,
-               "Duration" =: _deDuration]
+               "Marker" =: _deMarker, "MaxRecords" =: _deMaxRecords,
+               "EndTime" =: _deEndTime, "Duration" =: _deDuration]
 
 -- | Contains the result of a successful invocation of 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.
@@ -241,15 +240,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.
@@ -263,5 +262,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/RDS/DescribeOptionGroupOptions.hs b/gen/Network/AWS/RDS/DescribeOptionGroupOptions.hs
--- a/gen/Network/AWS/RDS/DescribeOptionGroupOptions.hs
+++ b/gen/Network/AWS/RDS/DescribeOptionGroupOptions.hs
@@ -31,8 +31,8 @@
     -- * Request Lenses
     , dogoFilters
     , dogoMajorEngineVersion
-    , dogoMaxRecords
     , dogoMarker
+    , dogoMaxRecords
     , dogoEngineName
 
     -- * Destructuring the Response
@@ -41,7 +41,7 @@
     -- * Response Lenses
     , dogorsOptionGroupOptions
     , dogorsMarker
-    , dogorsStatus
+    , dogorsResponseStatus
     ) where
 
 import           Network.AWS.Pager
@@ -57,8 +57,8 @@
 data DescribeOptionGroupOptions = DescribeOptionGroupOptions'
     { _dogoFilters            :: !(Maybe [Filter])
     , _dogoMajorEngineVersion :: !(Maybe Text)
-    , _dogoMaxRecords         :: !(Maybe Int)
     , _dogoMarker             :: !(Maybe Text)
+    , _dogoMaxRecords         :: !(Maybe Int)
     , _dogoEngineName         :: !Text
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
@@ -70,10 +70,10 @@
 --
 -- * 'dogoMajorEngineVersion'
 --
--- * 'dogoMaxRecords'
---
 -- * 'dogoMarker'
 --
+-- * 'dogoMaxRecords'
+--
 -- * 'dogoEngineName'
 describeOptionGroupOptions
     :: Text -- ^ 'dogoEngineName'
@@ -82,8 +82,8 @@
     DescribeOptionGroupOptions'
     { _dogoFilters = Nothing
     , _dogoMajorEngineVersion = Nothing
-    , _dogoMaxRecords = Nothing
     , _dogoMarker = Nothing
+    , _dogoMaxRecords = Nothing
     , _dogoEngineName = pEngineName_
     }
 
@@ -96,6 +96,12 @@
 dogoMajorEngineVersion :: Lens' DescribeOptionGroupOptions (Maybe Text)
 dogoMajorEngineVersion = lens _dogoMajorEngineVersion (\ s a -> s{_dogoMajorEngineVersion = a});
 
+-- | An optional pagination token provided by a previous request. If this
+-- parameter is specified, the response includes only records beyond the
+-- marker, up to the value specified by 'MaxRecords'.
+dogoMarker :: Lens' DescribeOptionGroupOptions (Maybe Text)
+dogoMarker = lens _dogoMarker (\ s a -> s{_dogoMarker = a});
+
 -- | The maximum number of records to include in the response. If more
 -- records exist than the specified 'MaxRecords' value, a pagination token
 -- called a marker is included in the response so that the remaining
@@ -107,12 +113,6 @@
 dogoMaxRecords :: Lens' DescribeOptionGroupOptions (Maybe Int)
 dogoMaxRecords = lens _dogoMaxRecords (\ s a -> s{_dogoMaxRecords = a});
 
--- | An optional pagination token provided by a previous request. If this
--- parameter is specified, the response includes only records beyond the
--- marker, up to the value specified by 'MaxRecords'.
-dogoMarker :: Lens' DescribeOptionGroupOptions (Maybe Text)
-dogoMarker = lens _dogoMarker (\ s a -> s{_dogoMarker = a});
-
 -- | A required parameter. Options available for the given engine name will
 -- be described.
 dogoEngineName :: Lens' DescribeOptionGroupOptions Text
@@ -154,8 +154,8 @@
                "Filters" =:
                  toQuery (toQueryList "Filter" <$> _dogoFilters),
                "MajorEngineVersion" =: _dogoMajorEngineVersion,
-               "MaxRecords" =: _dogoMaxRecords,
                "Marker" =: _dogoMarker,
+               "MaxRecords" =: _dogoMaxRecords,
                "EngineName" =: _dogoEngineName]
 
 -- |
@@ -164,7 +164,7 @@
 data DescribeOptionGroupOptionsResponse = DescribeOptionGroupOptionsResponse'
     { _dogorsOptionGroupOptions :: !(Maybe [OptionGroupOption])
     , _dogorsMarker             :: !(Maybe Text)
-    , _dogorsStatus             :: !Int
+    , _dogorsResponseStatus     :: !Int
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'DescribeOptionGroupOptionsResponse' with the minimum fields required to make a request.
@@ -175,15 +175,15 @@
 --
 -- * 'dogorsMarker'
 --
--- * 'dogorsStatus'
+-- * 'dogorsResponseStatus'
 describeOptionGroupOptionsResponse
-    :: Int -- ^ 'dogorsStatus'
+    :: Int -- ^ 'dogorsResponseStatus'
     -> DescribeOptionGroupOptionsResponse
-describeOptionGroupOptionsResponse pStatus_ =
+describeOptionGroupOptionsResponse pResponseStatus_ =
     DescribeOptionGroupOptionsResponse'
     { _dogorsOptionGroupOptions = Nothing
     , _dogorsMarker = Nothing
-    , _dogorsStatus = pStatus_
+    , _dogorsResponseStatus = pResponseStatus_
     }
 
 -- | Undocumented member.
@@ -197,5 +197,5 @@
 dogorsMarker = lens _dogorsMarker (\ s a -> s{_dogorsMarker = a});
 
 -- | The response status code.
-dogorsStatus :: Lens' DescribeOptionGroupOptionsResponse Int
-dogorsStatus = lens _dogorsStatus (\ s a -> s{_dogorsStatus = a});
+dogorsResponseStatus :: Lens' DescribeOptionGroupOptionsResponse Int
+dogorsResponseStatus = lens _dogorsResponseStatus (\ s a -> s{_dogorsResponseStatus = a});
diff --git a/gen/Network/AWS/RDS/DescribeOptionGroups.hs b/gen/Network/AWS/RDS/DescribeOptionGroups.hs
--- a/gen/Network/AWS/RDS/DescribeOptionGroups.hs
+++ b/gen/Network/AWS/RDS/DescribeOptionGroups.hs
@@ -32,8 +32,8 @@
     , dogFilters
     , dogEngineName
     , dogMajorEngineVersion
-    , dogMaxRecords
     , dogMarker
+    , dogMaxRecords
     , dogOptionGroupName
 
     -- * Destructuring the Response
@@ -42,7 +42,7 @@
     -- * Response Lenses
     , dogrsMarker
     , dogrsOptionGroupsList
-    , dogrsStatus
+    , dogrsResponseStatus
     ) where
 
 import           Network.AWS.Pager
@@ -59,8 +59,8 @@
     { _dogFilters            :: !(Maybe [Filter])
     , _dogEngineName         :: !(Maybe Text)
     , _dogMajorEngineVersion :: !(Maybe Text)
-    , _dogMaxRecords         :: !(Maybe Int)
     , _dogMarker             :: !(Maybe Text)
+    , _dogMaxRecords         :: !(Maybe Int)
     , _dogOptionGroupName    :: !(Maybe Text)
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
@@ -74,10 +74,10 @@
 --
 -- * 'dogMajorEngineVersion'
 --
--- * 'dogMaxRecords'
---
 -- * 'dogMarker'
 --
+-- * 'dogMaxRecords'
+--
 -- * 'dogOptionGroupName'
 describeOptionGroups
     :: DescribeOptionGroups
@@ -86,8 +86,8 @@
     { _dogFilters = Nothing
     , _dogEngineName = Nothing
     , _dogMajorEngineVersion = Nothing
-    , _dogMaxRecords = Nothing
     , _dogMarker = Nothing
+    , _dogMaxRecords = Nothing
     , _dogOptionGroupName = Nothing
     }
 
@@ -106,6 +106,12 @@
 dogMajorEngineVersion :: Lens' DescribeOptionGroups (Maybe Text)
 dogMajorEngineVersion = lens _dogMajorEngineVersion (\ s a -> s{_dogMajorEngineVersion = a});
 
+-- | An optional pagination token provided by a previous DescribeOptionGroups
+-- request. If this parameter is specified, the response includes only
+-- records beyond the marker, up to the value specified by 'MaxRecords'.
+dogMarker :: Lens' DescribeOptionGroups (Maybe Text)
+dogMarker = lens _dogMarker (\ s a -> s{_dogMarker = a});
+
 -- | The maximum number of records to include in the response. If more
 -- records exist than the specified 'MaxRecords' value, a pagination token
 -- called a marker is included in the response so that the remaining
@@ -117,12 +123,6 @@
 dogMaxRecords :: Lens' DescribeOptionGroups (Maybe Int)
 dogMaxRecords = lens _dogMaxRecords (\ s a -> s{_dogMaxRecords = a});
 
--- | An optional pagination token provided by a previous DescribeOptionGroups
--- request. If this parameter is specified, the response includes only
--- records beyond the marker, up to the value specified by 'MaxRecords'.
-dogMarker :: Lens' DescribeOptionGroups (Maybe Text)
-dogMarker = lens _dogMarker (\ s a -> s{_dogMarker = a});
-
 -- | The name of the option group to describe. Cannot be supplied together
 -- with EngineName or MajorEngineVersion.
 dogOptionGroupName :: Lens' DescribeOptionGroups (Maybe Text)
@@ -163,8 +163,8 @@
                  toQuery (toQueryList "Filter" <$> _dogFilters),
                "EngineName" =: _dogEngineName,
                "MajorEngineVersion" =: _dogMajorEngineVersion,
-               "MaxRecords" =: _dogMaxRecords,
                "Marker" =: _dogMarker,
+               "MaxRecords" =: _dogMaxRecords,
                "OptionGroupName" =: _dogOptionGroupName]
 
 -- | List of option groups.
@@ -173,7 +173,7 @@
 data DescribeOptionGroupsResponse = DescribeOptionGroupsResponse'
     { _dogrsMarker           :: !(Maybe Text)
     , _dogrsOptionGroupsList :: !(Maybe [OptionGroup])
-    , _dogrsStatus           :: !Int
+    , _dogrsResponseStatus   :: !Int
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'DescribeOptionGroupsResponse' with the minimum fields required to make a request.
@@ -184,15 +184,15 @@
 --
 -- * 'dogrsOptionGroupsList'
 --
--- * 'dogrsStatus'
+-- * 'dogrsResponseStatus'
 describeOptionGroupsResponse
-    :: Int -- ^ 'dogrsStatus'
+    :: Int -- ^ 'dogrsResponseStatus'
     -> DescribeOptionGroupsResponse
-describeOptionGroupsResponse pStatus_ =
+describeOptionGroupsResponse pResponseStatus_ =
     DescribeOptionGroupsResponse'
     { _dogrsMarker = Nothing
     , _dogrsOptionGroupsList = Nothing
-    , _dogrsStatus = pStatus_
+    , _dogrsResponseStatus = pResponseStatus_
     }
 
 -- | An optional pagination token provided by a previous request. If this
@@ -206,5 +206,5 @@
 dogrsOptionGroupsList = lens _dogrsOptionGroupsList (\ s a -> s{_dogrsOptionGroupsList = a}) . _Default . _Coerce;
 
 -- | The response status code.
-dogrsStatus :: Lens' DescribeOptionGroupsResponse Int
-dogrsStatus = lens _dogrsStatus (\ s a -> s{_dogrsStatus = a});
+dogrsResponseStatus :: Lens' DescribeOptionGroupsResponse Int
+dogrsResponseStatus = lens _dogrsResponseStatus (\ s a -> s{_dogrsResponseStatus = a});
diff --git a/gen/Network/AWS/RDS/DescribeOrderableDBInstanceOptions.hs b/gen/Network/AWS/RDS/DescribeOrderableDBInstanceOptions.hs
--- a/gen/Network/AWS/RDS/DescribeOrderableDBInstanceOptions.hs
+++ b/gen/Network/AWS/RDS/DescribeOrderableDBInstanceOptions.hs
@@ -34,8 +34,8 @@
     , dodioFilters
     , dodioDBInstanceClass
     , dodioLicenseModel
-    , dodioMaxRecords
     , dodioMarker
+    , dodioMaxRecords
     , dodioVPC
     , dodioEngine
 
@@ -45,7 +45,7 @@
     -- * Response Lenses
     , dodiorsOrderableDBInstanceOptions
     , dodiorsMarker
-    , dodiorsStatus
+    , dodiorsResponseStatus
     ) where
 
 import           Network.AWS.Pager
@@ -63,8 +63,8 @@
     , _dodioFilters         :: !(Maybe [Filter])
     , _dodioDBInstanceClass :: !(Maybe Text)
     , _dodioLicenseModel    :: !(Maybe Text)
-    , _dodioMaxRecords      :: !(Maybe Int)
     , _dodioMarker          :: !(Maybe Text)
+    , _dodioMaxRecords      :: !(Maybe Int)
     , _dodioVPC             :: !(Maybe Bool)
     , _dodioEngine          :: !Text
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
@@ -81,10 +81,10 @@
 --
 -- * 'dodioLicenseModel'
 --
--- * 'dodioMaxRecords'
---
 -- * 'dodioMarker'
 --
+-- * 'dodioMaxRecords'
+--
 -- * 'dodioVPC'
 --
 -- * 'dodioEngine'
@@ -97,8 +97,8 @@
     , _dodioFilters = Nothing
     , _dodioDBInstanceClass = Nothing
     , _dodioLicenseModel = Nothing
-    , _dodioMaxRecords = Nothing
     , _dodioMarker = Nothing
+    , _dodioMaxRecords = Nothing
     , _dodioVPC = Nothing
     , _dodioEngine = pEngine_
     }
@@ -122,6 +122,13 @@
 dodioLicenseModel :: Lens' DescribeOrderableDBInstanceOptions (Maybe Text)
 dodioLicenseModel = lens _dodioLicenseModel (\ s a -> s{_dodioLicenseModel = a});
 
+-- | An optional pagination token provided by a previous
+-- DescribeOrderableDBInstanceOptions request. If this parameter is
+-- specified, the response includes only records beyond the marker, up to
+-- the value specified by 'MaxRecords' .
+dodioMarker :: Lens' DescribeOrderableDBInstanceOptions (Maybe Text)
+dodioMarker = lens _dodioMarker (\ s a -> s{_dodioMarker = a});
+
 -- | The maximum number of records to include in the response. If more
 -- records exist than the specified 'MaxRecords' value, a pagination token
 -- called a marker is included in the response so that the remaining
@@ -133,13 +140,6 @@
 dodioMaxRecords :: Lens' DescribeOrderableDBInstanceOptions (Maybe Int)
 dodioMaxRecords = lens _dodioMaxRecords (\ s a -> s{_dodioMaxRecords = a});
 
--- | An optional pagination token provided by a previous
--- DescribeOrderableDBInstanceOptions request. If this parameter is
--- specified, the response includes only records beyond the marker, up to
--- the value specified by 'MaxRecords' .
-dodioMarker :: Lens' DescribeOrderableDBInstanceOptions (Maybe Text)
-dodioMarker = lens _dodioMarker (\ s a -> s{_dodioMarker = a});
-
 -- | The VPC filter value. Specify this parameter to show only the available
 -- VPC or non-VPC offerings.
 dodioVPC :: Lens' DescribeOrderableDBInstanceOptions (Maybe Bool)
@@ -193,8 +193,8 @@
                  toQuery (toQueryList "Filter" <$> _dodioFilters),
                "DBInstanceClass" =: _dodioDBInstanceClass,
                "LicenseModel" =: _dodioLicenseModel,
-               "MaxRecords" =: _dodioMaxRecords,
-               "Marker" =: _dodioMarker, "Vpc" =: _dodioVPC,
+               "Marker" =: _dodioMarker,
+               "MaxRecords" =: _dodioMaxRecords, "Vpc" =: _dodioVPC,
                "Engine" =: _dodioEngine]
 
 -- | Contains the result of a successful invocation of the
@@ -204,7 +204,7 @@
 data DescribeOrderableDBInstanceOptionsResponse = DescribeOrderableDBInstanceOptionsResponse'
     { _dodiorsOrderableDBInstanceOptions :: !(Maybe [OrderableDBInstanceOption])
     , _dodiorsMarker                     :: !(Maybe Text)
-    , _dodiorsStatus                     :: !Int
+    , _dodiorsResponseStatus             :: !Int
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'DescribeOrderableDBInstanceOptionsResponse' with the minimum fields required to make a request.
@@ -215,15 +215,15 @@
 --
 -- * 'dodiorsMarker'
 --
--- * 'dodiorsStatus'
+-- * 'dodiorsResponseStatus'
 describeOrderableDBInstanceOptionsResponse
-    :: Int -- ^ 'dodiorsStatus'
+    :: Int -- ^ 'dodiorsResponseStatus'
     -> DescribeOrderableDBInstanceOptionsResponse
-describeOrderableDBInstanceOptionsResponse pStatus_ =
+describeOrderableDBInstanceOptionsResponse pResponseStatus_ =
     DescribeOrderableDBInstanceOptionsResponse'
     { _dodiorsOrderableDBInstanceOptions = Nothing
     , _dodiorsMarker = Nothing
-    , _dodiorsStatus = pStatus_
+    , _dodiorsResponseStatus = pResponseStatus_
     }
 
 -- | An OrderableDBInstanceOption structure containing information about
@@ -239,5 +239,5 @@
 dodiorsMarker = lens _dodiorsMarker (\ s a -> s{_dodiorsMarker = a});
 
 -- | The response status code.
-dodiorsStatus :: Lens' DescribeOrderableDBInstanceOptionsResponse Int
-dodiorsStatus = lens _dodiorsStatus (\ s a -> s{_dodiorsStatus = a});
+dodiorsResponseStatus :: Lens' DescribeOrderableDBInstanceOptionsResponse Int
+dodiorsResponseStatus = lens _dodiorsResponseStatus (\ s a -> s{_dodiorsResponseStatus = a});
diff --git a/gen/Network/AWS/RDS/DescribePendingMaintenanceActions.hs b/gen/Network/AWS/RDS/DescribePendingMaintenanceActions.hs
--- a/gen/Network/AWS/RDS/DescribePendingMaintenanceActions.hs
+++ b/gen/Network/AWS/RDS/DescribePendingMaintenanceActions.hs
@@ -29,8 +29,8 @@
     , DescribePendingMaintenanceActions
     -- * Request Lenses
     , dpmaFilters
-    , dpmaMaxRecords
     , dpmaMarker
+    , dpmaMaxRecords
     , dpmaResourceIdentifier
 
     -- * Destructuring the Response
@@ -39,7 +39,7 @@
     -- * Response Lenses
     , dpmarsPendingMaintenanceActions
     , dpmarsMarker
-    , dpmarsStatus
+    , dpmarsResponseStatus
     ) where
 
 import           Network.AWS.Prelude
@@ -53,8 +53,8 @@
 -- /See:/ 'describePendingMaintenanceActions' smart constructor.
 data DescribePendingMaintenanceActions = DescribePendingMaintenanceActions'
     { _dpmaFilters            :: !(Maybe [Filter])
-    , _dpmaMaxRecords         :: !(Maybe Int)
     , _dpmaMarker             :: !(Maybe Text)
+    , _dpmaMaxRecords         :: !(Maybe Int)
     , _dpmaResourceIdentifier :: !(Maybe Text)
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
@@ -64,18 +64,18 @@
 --
 -- * 'dpmaFilters'
 --
--- * 'dpmaMaxRecords'
---
 -- * 'dpmaMarker'
 --
+-- * 'dpmaMaxRecords'
+--
 -- * 'dpmaResourceIdentifier'
 describePendingMaintenanceActions
     :: DescribePendingMaintenanceActions
 describePendingMaintenanceActions =
     DescribePendingMaintenanceActions'
     { _dpmaFilters = Nothing
-    , _dpmaMaxRecords = Nothing
     , _dpmaMarker = Nothing
+    , _dpmaMaxRecords = Nothing
     , _dpmaResourceIdentifier = Nothing
     }
 
@@ -91,6 +91,13 @@
 dpmaFilters :: Lens' DescribePendingMaintenanceActions [Filter]
 dpmaFilters = lens _dpmaFilters (\ s a -> s{_dpmaFilters = a}) . _Default . _Coerce;
 
+-- | An optional pagination token provided by a previous
+-- 'DescribePendingMaintenanceActions' request. If this parameter is
+-- specified, the response includes only records beyond the marker, up to a
+-- number of records specified by 'MaxRecords'.
+dpmaMarker :: Lens' DescribePendingMaintenanceActions (Maybe Text)
+dpmaMarker = lens _dpmaMarker (\ s a -> s{_dpmaMarker = a});
+
 -- | The maximum number of records to include in the response. If more
 -- records exist than the specified 'MaxRecords' value, a pagination token
 -- called a marker is included in the response so that the remaining
@@ -102,13 +109,6 @@
 dpmaMaxRecords :: Lens' DescribePendingMaintenanceActions (Maybe Int)
 dpmaMaxRecords = lens _dpmaMaxRecords (\ s a -> s{_dpmaMaxRecords = a});
 
--- | An optional pagination token provided by a previous
--- 'DescribePendingMaintenanceActions' request. If this parameter is
--- specified, the response includes only records beyond the marker, up to a
--- number of records specified by 'MaxRecords'.
-dpmaMarker :: Lens' DescribePendingMaintenanceActions (Maybe Text)
-dpmaMarker = lens _dpmaMarker (\ s a -> s{_dpmaMarker = a});
-
 -- | The ARN of a resource to return pending maintenance actions for.
 dpmaResourceIdentifier :: Lens' DescribePendingMaintenanceActions (Maybe Text)
 dpmaResourceIdentifier = lens _dpmaResourceIdentifier (\ s a -> s{_dpmaResourceIdentifier = a});
@@ -146,8 +146,8 @@
                "Version" =: ("2014-10-31" :: ByteString),
                "Filters" =:
                  toQuery (toQueryList "Filter" <$> _dpmaFilters),
-               "MaxRecords" =: _dpmaMaxRecords,
                "Marker" =: _dpmaMarker,
+               "MaxRecords" =: _dpmaMaxRecords,
                "ResourceIdentifier" =: _dpmaResourceIdentifier]
 
 -- | Data returned from the __DescribePendingMaintenanceActions__ action.
@@ -156,7 +156,7 @@
 data DescribePendingMaintenanceActionsResponse = DescribePendingMaintenanceActionsResponse'
     { _dpmarsPendingMaintenanceActions :: !(Maybe [ResourcePendingMaintenanceActions])
     , _dpmarsMarker                    :: !(Maybe Text)
-    , _dpmarsStatus                    :: !Int
+    , _dpmarsResponseStatus            :: !Int
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'DescribePendingMaintenanceActionsResponse' with the minimum fields required to make a request.
@@ -167,15 +167,15 @@
 --
 -- * 'dpmarsMarker'
 --
--- * 'dpmarsStatus'
+-- * 'dpmarsResponseStatus'
 describePendingMaintenanceActionsResponse
-    :: Int -- ^ 'dpmarsStatus'
+    :: Int -- ^ 'dpmarsResponseStatus'
     -> DescribePendingMaintenanceActionsResponse
-describePendingMaintenanceActionsResponse pStatus_ =
+describePendingMaintenanceActionsResponse pResponseStatus_ =
     DescribePendingMaintenanceActionsResponse'
     { _dpmarsPendingMaintenanceActions = Nothing
     , _dpmarsMarker = Nothing
-    , _dpmarsStatus = pStatus_
+    , _dpmarsResponseStatus = pResponseStatus_
     }
 
 -- | A list of the pending maintenance actions for the resource.
@@ -190,5 +190,5 @@
 dpmarsMarker = lens _dpmarsMarker (\ s a -> s{_dpmarsMarker = a});
 
 -- | The response status code.
-dpmarsStatus :: Lens' DescribePendingMaintenanceActionsResponse Int
-dpmarsStatus = lens _dpmarsStatus (\ s a -> s{_dpmarsStatus = a});
+dpmarsResponseStatus :: Lens' DescribePendingMaintenanceActionsResponse Int
+dpmarsResponseStatus = lens _dpmarsResponseStatus (\ s a -> s{_dpmarsResponseStatus = a});
diff --git a/gen/Network/AWS/RDS/DescribeReservedDBInstances.hs b/gen/Network/AWS/RDS/DescribeReservedDBInstances.hs
--- a/gen/Network/AWS/RDS/DescribeReservedDBInstances.hs
+++ b/gen/Network/AWS/RDS/DescribeReservedDBInstances.hs
@@ -34,9 +34,9 @@
     , drdiFilters
     , drdiReservedDBInstanceId
     , drdiDBInstanceClass
+    , drdiMarker
     , drdiMaxRecords
     , drdiMultiAZ
-    , drdiMarker
     , drdiReservedDBInstancesOfferingId
     , drdiOfferingType
     , drdiDuration
@@ -47,7 +47,7 @@
     -- * Response Lenses
     , drdirsReservedDBInstances
     , drdirsMarker
-    , drdirsStatus
+    , drdirsResponseStatus
     ) where
 
 import           Network.AWS.Pager
@@ -65,9 +65,9 @@
     , _drdiFilters                       :: !(Maybe [Filter])
     , _drdiReservedDBInstanceId          :: !(Maybe Text)
     , _drdiDBInstanceClass               :: !(Maybe Text)
+    , _drdiMarker                        :: !(Maybe Text)
     , _drdiMaxRecords                    :: !(Maybe Int)
     , _drdiMultiAZ                       :: !(Maybe Bool)
-    , _drdiMarker                        :: !(Maybe Text)
     , _drdiReservedDBInstancesOfferingId :: !(Maybe Text)
     , _drdiOfferingType                  :: !(Maybe Text)
     , _drdiDuration                      :: !(Maybe Text)
@@ -85,12 +85,12 @@
 --
 -- * 'drdiDBInstanceClass'
 --
+-- * 'drdiMarker'
+--
 -- * 'drdiMaxRecords'
 --
 -- * 'drdiMultiAZ'
 --
--- * 'drdiMarker'
---
 -- * 'drdiReservedDBInstancesOfferingId'
 --
 -- * 'drdiOfferingType'
@@ -104,9 +104,9 @@
     , _drdiFilters = Nothing
     , _drdiReservedDBInstanceId = Nothing
     , _drdiDBInstanceClass = Nothing
+    , _drdiMarker = Nothing
     , _drdiMaxRecords = Nothing
     , _drdiMultiAZ = Nothing
-    , _drdiMarker = Nothing
     , _drdiReservedDBInstancesOfferingId = Nothing
     , _drdiOfferingType = Nothing
     , _drdiDuration = Nothing
@@ -131,6 +131,12 @@
 drdiDBInstanceClass :: Lens' DescribeReservedDBInstances (Maybe Text)
 drdiDBInstanceClass = lens _drdiDBInstanceClass (\ s a -> s{_drdiDBInstanceClass = a});
 
+-- | An optional pagination token provided by a previous request. If this
+-- parameter is specified, the response includes only records beyond the
+-- marker, up to the value specified by 'MaxRecords'.
+drdiMarker :: Lens' DescribeReservedDBInstances (Maybe Text)
+drdiMarker = lens _drdiMarker (\ s a -> s{_drdiMarker = a});
+
 -- | The maximum number of records to include in the response. If more than
 -- the 'MaxRecords' value is available, a pagination token called a marker
 -- is included in the response so that the following results can be
@@ -147,12 +153,6 @@
 drdiMultiAZ :: Lens' DescribeReservedDBInstances (Maybe Bool)
 drdiMultiAZ = lens _drdiMultiAZ (\ s a -> s{_drdiMultiAZ = a});
 
--- | An optional pagination token provided by a previous request. If this
--- parameter is specified, the response includes only records beyond the
--- marker, up to the value specified by 'MaxRecords'.
-drdiMarker :: Lens' DescribeReservedDBInstances (Maybe Text)
-drdiMarker = lens _drdiMarker (\ s a -> s{_drdiMarker = a});
-
 -- | The offering identifier filter value. Specify this parameter to show
 -- only purchased reservations matching the specified offering identifier.
 drdiReservedDBInstancesOfferingId :: Lens' DescribeReservedDBInstances (Maybe Text)
@@ -210,8 +210,9 @@
                  toQuery (toQueryList "Filter" <$> _drdiFilters),
                "ReservedDBInstanceId" =: _drdiReservedDBInstanceId,
                "DBInstanceClass" =: _drdiDBInstanceClass,
+               "Marker" =: _drdiMarker,
                "MaxRecords" =: _drdiMaxRecords,
-               "MultiAZ" =: _drdiMultiAZ, "Marker" =: _drdiMarker,
+               "MultiAZ" =: _drdiMultiAZ,
                "ReservedDBInstancesOfferingId" =:
                  _drdiReservedDBInstancesOfferingId,
                "OfferingType" =: _drdiOfferingType,
@@ -224,7 +225,7 @@
 data DescribeReservedDBInstancesResponse = DescribeReservedDBInstancesResponse'
     { _drdirsReservedDBInstances :: !(Maybe [ReservedDBInstance])
     , _drdirsMarker              :: !(Maybe Text)
-    , _drdirsStatus              :: !Int
+    , _drdirsResponseStatus      :: !Int
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'DescribeReservedDBInstancesResponse' with the minimum fields required to make a request.
@@ -235,15 +236,15 @@
 --
 -- * 'drdirsMarker'
 --
--- * 'drdirsStatus'
+-- * 'drdirsResponseStatus'
 describeReservedDBInstancesResponse
-    :: Int -- ^ 'drdirsStatus'
+    :: Int -- ^ 'drdirsResponseStatus'
     -> DescribeReservedDBInstancesResponse
-describeReservedDBInstancesResponse pStatus_ =
+describeReservedDBInstancesResponse pResponseStatus_ =
     DescribeReservedDBInstancesResponse'
     { _drdirsReservedDBInstances = Nothing
     , _drdirsMarker = Nothing
-    , _drdirsStatus = pStatus_
+    , _drdirsResponseStatus = pResponseStatus_
     }
 
 -- | A list of reserved DB instances.
@@ -257,5 +258,5 @@
 drdirsMarker = lens _drdirsMarker (\ s a -> s{_drdirsMarker = a});
 
 -- | The response status code.
-drdirsStatus :: Lens' DescribeReservedDBInstancesResponse Int
-drdirsStatus = lens _drdirsStatus (\ s a -> s{_drdirsStatus = a});
+drdirsResponseStatus :: Lens' DescribeReservedDBInstancesResponse Int
+drdirsResponseStatus = lens _drdirsResponseStatus (\ s a -> s{_drdirsResponseStatus = a});
diff --git a/gen/Network/AWS/RDS/DescribeReservedDBInstancesOfferings.hs b/gen/Network/AWS/RDS/DescribeReservedDBInstancesOfferings.hs
--- a/gen/Network/AWS/RDS/DescribeReservedDBInstancesOfferings.hs
+++ b/gen/Network/AWS/RDS/DescribeReservedDBInstancesOfferings.hs
@@ -32,9 +32,9 @@
     , drdioProductDescription
     , drdioFilters
     , drdioDBInstanceClass
+    , drdioMarker
     , drdioMaxRecords
     , drdioMultiAZ
-    , drdioMarker
     , drdioReservedDBInstancesOfferingId
     , drdioOfferingType
     , drdioDuration
@@ -45,7 +45,7 @@
     -- * Response Lenses
     , drdiorsMarker
     , drdiorsReservedDBInstancesOfferings
-    , drdiorsStatus
+    , drdiorsResponseStatus
     ) where
 
 import           Network.AWS.Pager
@@ -62,9 +62,9 @@
     { _drdioProductDescription            :: !(Maybe Text)
     , _drdioFilters                       :: !(Maybe [Filter])
     , _drdioDBInstanceClass               :: !(Maybe Text)
+    , _drdioMarker                        :: !(Maybe Text)
     , _drdioMaxRecords                    :: !(Maybe Int)
     , _drdioMultiAZ                       :: !(Maybe Bool)
-    , _drdioMarker                        :: !(Maybe Text)
     , _drdioReservedDBInstancesOfferingId :: !(Maybe Text)
     , _drdioOfferingType                  :: !(Maybe Text)
     , _drdioDuration                      :: !(Maybe Text)
@@ -80,12 +80,12 @@
 --
 -- * 'drdioDBInstanceClass'
 --
+-- * 'drdioMarker'
+--
 -- * 'drdioMaxRecords'
 --
 -- * 'drdioMultiAZ'
 --
--- * 'drdioMarker'
---
 -- * 'drdioReservedDBInstancesOfferingId'
 --
 -- * 'drdioOfferingType'
@@ -98,9 +98,9 @@
     { _drdioProductDescription = Nothing
     , _drdioFilters = Nothing
     , _drdioDBInstanceClass = Nothing
+    , _drdioMarker = Nothing
     , _drdioMaxRecords = Nothing
     , _drdioMultiAZ = Nothing
-    , _drdioMarker = Nothing
     , _drdioReservedDBInstancesOfferingId = Nothing
     , _drdioOfferingType = Nothing
     , _drdioDuration = Nothing
@@ -120,6 +120,12 @@
 drdioDBInstanceClass :: Lens' DescribeReservedDBInstancesOfferings (Maybe Text)
 drdioDBInstanceClass = lens _drdioDBInstanceClass (\ s a -> s{_drdioDBInstanceClass = a});
 
+-- | An optional pagination token provided by a previous request. If this
+-- parameter is specified, the response includes only records beyond the
+-- marker, up to the value specified by 'MaxRecords'.
+drdioMarker :: Lens' DescribeReservedDBInstancesOfferings (Maybe Text)
+drdioMarker = lens _drdioMarker (\ s a -> s{_drdioMarker = a});
+
 -- | The maximum number of records to include in the response. If more than
 -- the 'MaxRecords' value is available, a pagination token called a marker
 -- is included in the response so that the following results can be
@@ -136,12 +142,6 @@
 drdioMultiAZ :: Lens' DescribeReservedDBInstancesOfferings (Maybe Bool)
 drdioMultiAZ = lens _drdioMultiAZ (\ s a -> s{_drdioMultiAZ = a});
 
--- | An optional pagination token provided by a previous request. If this
--- parameter is specified, the response includes only records beyond the
--- marker, up to the value specified by 'MaxRecords'.
-drdioMarker :: Lens' DescribeReservedDBInstancesOfferings (Maybe Text)
-drdioMarker = lens _drdioMarker (\ s a -> s{_drdioMarker = a});
-
 -- | The offering identifier filter value. Specify this parameter to show
 -- only the available offering that matches the specified reservation
 -- identifier.
@@ -208,8 +208,9 @@
                "Filters" =:
                  toQuery (toQueryList "Filter" <$> _drdioFilters),
                "DBInstanceClass" =: _drdioDBInstanceClass,
+               "Marker" =: _drdioMarker,
                "MaxRecords" =: _drdioMaxRecords,
-               "MultiAZ" =: _drdioMultiAZ, "Marker" =: _drdioMarker,
+               "MultiAZ" =: _drdioMultiAZ,
                "ReservedDBInstancesOfferingId" =:
                  _drdioReservedDBInstancesOfferingId,
                "OfferingType" =: _drdioOfferingType,
@@ -222,7 +223,7 @@
 data DescribeReservedDBInstancesOfferingsResponse = DescribeReservedDBInstancesOfferingsResponse'
     { _drdiorsMarker                       :: !(Maybe Text)
     , _drdiorsReservedDBInstancesOfferings :: !(Maybe [ReservedDBInstancesOffering])
-    , _drdiorsStatus                       :: !Int
+    , _drdiorsResponseStatus               :: !Int
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'DescribeReservedDBInstancesOfferingsResponse' with the minimum fields required to make a request.
@@ -233,15 +234,15 @@
 --
 -- * 'drdiorsReservedDBInstancesOfferings'
 --
--- * 'drdiorsStatus'
+-- * 'drdiorsResponseStatus'
 describeReservedDBInstancesOfferingsResponse
-    :: Int -- ^ 'drdiorsStatus'
+    :: Int -- ^ 'drdiorsResponseStatus'
     -> DescribeReservedDBInstancesOfferingsResponse
-describeReservedDBInstancesOfferingsResponse pStatus_ =
+describeReservedDBInstancesOfferingsResponse pResponseStatus_ =
     DescribeReservedDBInstancesOfferingsResponse'
     { _drdiorsMarker = Nothing
     , _drdiorsReservedDBInstancesOfferings = Nothing
-    , _drdiorsStatus = pStatus_
+    , _drdiorsResponseStatus = pResponseStatus_
     }
 
 -- | An optional pagination token provided by a previous request. If this
@@ -255,5 +256,5 @@
 drdiorsReservedDBInstancesOfferings = lens _drdiorsReservedDBInstancesOfferings (\ s a -> s{_drdiorsReservedDBInstancesOfferings = a}) . _Default . _Coerce;
 
 -- | The response status code.
-drdiorsStatus :: Lens' DescribeReservedDBInstancesOfferingsResponse Int
-drdiorsStatus = lens _drdiorsStatus (\ s a -> s{_drdiorsStatus = a});
+drdiorsResponseStatus :: Lens' DescribeReservedDBInstancesOfferingsResponse Int
+drdiorsResponseStatus = lens _drdiorsResponseStatus (\ s a -> s{_drdiorsResponseStatus = a});
diff --git a/gen/Network/AWS/RDS/DownloadDBLogFilePortion.hs b/gen/Network/AWS/RDS/DownloadDBLogFilePortion.hs
--- a/gen/Network/AWS/RDS/DownloadDBLogFilePortion.hs
+++ b/gen/Network/AWS/RDS/DownloadDBLogFilePortion.hs
@@ -42,7 +42,7 @@
     , ddlfprsLogFileData
     , ddlfprsAdditionalDataPending
     , ddlfprsMarker
-    , ddlfprsStatus
+    , ddlfprsResponseStatus
     ) where
 
 import           Network.AWS.Pager
@@ -135,8 +135,8 @@
 
 instance AWSPager DownloadDBLogFilePortion where
         page rq rs
-          | stop (rs ^. ddlfprsAdditionalDataPending) = Nothing
-          | isNothing (rs ^. ddlfprsMarker) = Nothing
+          | stop (rs ^. ddlfprsMarker) = Nothing
+          | stop (rs ^. ddlfprsLogFileData) = Nothing
           | otherwise =
             Just $ rq & ddlfpMarker .~ rs ^. ddlfprsMarker
 
@@ -178,7 +178,7 @@
     { _ddlfprsLogFileData           :: !(Maybe Text)
     , _ddlfprsAdditionalDataPending :: !(Maybe Bool)
     , _ddlfprsMarker                :: !(Maybe Text)
-    , _ddlfprsStatus                :: !Int
+    , _ddlfprsResponseStatus        :: !Int
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'DownloadDBLogFilePortionResponse' with the minimum fields required to make a request.
@@ -191,16 +191,16 @@
 --
 -- * 'ddlfprsMarker'
 --
--- * 'ddlfprsStatus'
+-- * 'ddlfprsResponseStatus'
 downloadDBLogFilePortionResponse
-    :: Int -- ^ 'ddlfprsStatus'
+    :: Int -- ^ 'ddlfprsResponseStatus'
     -> DownloadDBLogFilePortionResponse
-downloadDBLogFilePortionResponse pStatus_ =
+downloadDBLogFilePortionResponse pResponseStatus_ =
     DownloadDBLogFilePortionResponse'
     { _ddlfprsLogFileData = Nothing
     , _ddlfprsAdditionalDataPending = Nothing
     , _ddlfprsMarker = Nothing
-    , _ddlfprsStatus = pStatus_
+    , _ddlfprsResponseStatus = pResponseStatus_
     }
 
 -- | Entries from the specified log file.
@@ -218,5 +218,5 @@
 ddlfprsMarker = lens _ddlfprsMarker (\ s a -> s{_ddlfprsMarker = a});
 
 -- | The response status code.
-ddlfprsStatus :: Lens' DownloadDBLogFilePortionResponse Int
-ddlfprsStatus = lens _ddlfprsStatus (\ s a -> s{_ddlfprsStatus = a});
+ddlfprsResponseStatus :: Lens' DownloadDBLogFilePortionResponse Int
+ddlfprsResponseStatus = lens _ddlfprsResponseStatus (\ s a -> s{_ddlfprsResponseStatus = a});
diff --git a/gen/Network/AWS/RDS/FailoverDBCluster.hs b/gen/Network/AWS/RDS/FailoverDBCluster.hs
--- a/gen/Network/AWS/RDS/FailoverDBCluster.hs
+++ b/gen/Network/AWS/RDS/FailoverDBCluster.hs
@@ -49,7 +49,7 @@
     , FailoverDBClusterResponse
     -- * Response Lenses
     , fdcrsDBCluster
-    , fdcrsStatus
+    , fdcrsResponseStatus
     ) where
 
 import           Network.AWS.Prelude
@@ -112,8 +112,8 @@
 
 -- | /See:/ 'failoverDBClusterResponse' smart constructor.
 data FailoverDBClusterResponse = FailoverDBClusterResponse'
-    { _fdcrsDBCluster :: !(Maybe DBCluster)
-    , _fdcrsStatus    :: !Int
+    { _fdcrsDBCluster      :: !(Maybe DBCluster)
+    , _fdcrsResponseStatus :: !Int
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'FailoverDBClusterResponse' with the minimum fields required to make a request.
@@ -122,14 +122,14 @@
 --
 -- * 'fdcrsDBCluster'
 --
--- * 'fdcrsStatus'
+-- * 'fdcrsResponseStatus'
 failoverDBClusterResponse
-    :: Int -- ^ 'fdcrsStatus'
+    :: Int -- ^ 'fdcrsResponseStatus'
     -> FailoverDBClusterResponse
-failoverDBClusterResponse pStatus_ =
+failoverDBClusterResponse pResponseStatus_ =
     FailoverDBClusterResponse'
     { _fdcrsDBCluster = Nothing
-    , _fdcrsStatus = pStatus_
+    , _fdcrsResponseStatus = pResponseStatus_
     }
 
 -- | Undocumented member.
@@ -137,5 +137,5 @@
 fdcrsDBCluster = lens _fdcrsDBCluster (\ s a -> s{_fdcrsDBCluster = a});
 
 -- | The response status code.
-fdcrsStatus :: Lens' FailoverDBClusterResponse Int
-fdcrsStatus = lens _fdcrsStatus (\ s a -> s{_fdcrsStatus = a});
+fdcrsResponseStatus :: Lens' FailoverDBClusterResponse Int
+fdcrsResponseStatus = lens _fdcrsResponseStatus (\ s a -> s{_fdcrsResponseStatus = a});
diff --git a/gen/Network/AWS/RDS/ListTagsForResource.hs b/gen/Network/AWS/RDS/ListTagsForResource.hs
--- a/gen/Network/AWS/RDS/ListTagsForResource.hs
+++ b/gen/Network/AWS/RDS/ListTagsForResource.hs
@@ -38,7 +38,7 @@
     , ListTagsForResourceResponse
     -- * Response Lenses
     , ltfrrsTagList
-    , ltfrrsStatus
+    , ltfrrsResponseStatus
     ) where
 
 import           Network.AWS.Prelude
@@ -112,8 +112,8 @@
 --
 -- /See:/ 'listTagsForResourceResponse' smart constructor.
 data ListTagsForResourceResponse = ListTagsForResourceResponse'
-    { _ltfrrsTagList :: !(Maybe [Tag])
-    , _ltfrrsStatus  :: !Int
+    { _ltfrrsTagList        :: !(Maybe [Tag])
+    , _ltfrrsResponseStatus :: !Int
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'ListTagsForResourceResponse' with the minimum fields required to make a request.
@@ -122,14 +122,14 @@
 --
 -- * 'ltfrrsTagList'
 --
--- * 'ltfrrsStatus'
+-- * 'ltfrrsResponseStatus'
 listTagsForResourceResponse
-    :: Int -- ^ 'ltfrrsStatus'
+    :: Int -- ^ 'ltfrrsResponseStatus'
     -> ListTagsForResourceResponse
-listTagsForResourceResponse pStatus_ =
+listTagsForResourceResponse pResponseStatus_ =
     ListTagsForResourceResponse'
     { _ltfrrsTagList = Nothing
-    , _ltfrrsStatus = pStatus_
+    , _ltfrrsResponseStatus = pResponseStatus_
     }
 
 -- | List of tags returned by the ListTagsForResource operation.
@@ -137,5 +137,5 @@
 ltfrrsTagList = lens _ltfrrsTagList (\ s a -> s{_ltfrrsTagList = a}) . _Default . _Coerce;
 
 -- | The response status code.
-ltfrrsStatus :: Lens' ListTagsForResourceResponse Int
-ltfrrsStatus = lens _ltfrrsStatus (\ s a -> s{_ltfrrsStatus = a});
+ltfrrsResponseStatus :: Lens' ListTagsForResourceResponse Int
+ltfrrsResponseStatus = lens _ltfrrsResponseStatus (\ s a -> s{_ltfrrsResponseStatus = a});
diff --git a/gen/Network/AWS/RDS/ModifyDBCluster.hs b/gen/Network/AWS/RDS/ModifyDBCluster.hs
--- a/gen/Network/AWS/RDS/ModifyDBCluster.hs
+++ b/gen/Network/AWS/RDS/ModifyDBCluster.hs
@@ -49,7 +49,7 @@
     , ModifyDBClusterResponse
     -- * Response Lenses
     , mdcrsDBCluster
-    , mdcrsStatus
+    , mdcrsResponseStatus
     ) where
 
 import           Network.AWS.Prelude
@@ -279,8 +279,8 @@
 
 -- | /See:/ 'modifyDBClusterResponse' smart constructor.
 data ModifyDBClusterResponse = ModifyDBClusterResponse'
-    { _mdcrsDBCluster :: !(Maybe DBCluster)
-    , _mdcrsStatus    :: !Int
+    { _mdcrsDBCluster      :: !(Maybe DBCluster)
+    , _mdcrsResponseStatus :: !Int
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'ModifyDBClusterResponse' with the minimum fields required to make a request.
@@ -289,14 +289,14 @@
 --
 -- * 'mdcrsDBCluster'
 --
--- * 'mdcrsStatus'
+-- * 'mdcrsResponseStatus'
 modifyDBClusterResponse
-    :: Int -- ^ 'mdcrsStatus'
+    :: Int -- ^ 'mdcrsResponseStatus'
     -> ModifyDBClusterResponse
-modifyDBClusterResponse pStatus_ =
+modifyDBClusterResponse pResponseStatus_ =
     ModifyDBClusterResponse'
     { _mdcrsDBCluster = Nothing
-    , _mdcrsStatus = pStatus_
+    , _mdcrsResponseStatus = pResponseStatus_
     }
 
 -- | Undocumented member.
@@ -304,5 +304,5 @@
 mdcrsDBCluster = lens _mdcrsDBCluster (\ s a -> s{_mdcrsDBCluster = a});
 
 -- | The response status code.
-mdcrsStatus :: Lens' ModifyDBClusterResponse Int
-mdcrsStatus = lens _mdcrsStatus (\ s a -> s{_mdcrsStatus = a});
+mdcrsResponseStatus :: Lens' ModifyDBClusterResponse Int
+mdcrsResponseStatus = lens _mdcrsResponseStatus (\ s a -> s{_mdcrsResponseStatus = a});
diff --git a/gen/Network/AWS/RDS/ModifyDBInstance.hs b/gen/Network/AWS/RDS/ModifyDBInstance.hs
--- a/gen/Network/AWS/RDS/ModifyDBInstance.hs
+++ b/gen/Network/AWS/RDS/ModifyDBInstance.hs
@@ -29,10 +29,10 @@
       modifyDBInstance
     , ModifyDBInstance
     -- * Request Lenses
-    , mdiDBSecurityGroups
     , mdiEngineVersion
-    , mdiAutoMinorVersionUpgrade
+    , mdiDBSecurityGroups
     , mdiMasterUserPassword
+    , mdiAutoMinorVersionUpgrade
     , mdiIOPS
     , mdiAllowMajorVersionUpgrade
     , mdiNewDBInstanceIdentifier
@@ -41,16 +41,16 @@
     , mdiDBInstanceClass
     , mdiPreferredMaintenanceWindow
     , mdiCACertificateIdentifier
+    , mdiDBParameterGroupName
     , mdiPreferredBackupWindow
     , mdiBackupRetentionPeriod
-    , mdiDBParameterGroupName
     , mdiVPCSecurityGroupIds
     , mdiMultiAZ
     , mdiAllocatedStorage
     , mdiApplyImmediately
-    , mdiTDECredentialARN
     , mdiOptionGroupName
     , mdiCopyTagsToSnapshot
+    , mdiTDECredentialARN
     , mdiStorageType
     , mdiDBInstanceIdentifier
 
@@ -59,7 +59,7 @@
     , ModifyDBInstanceResponse
     -- * Response Lenses
     , mdirsDBInstance
-    , mdirsStatus
+    , mdirsResponseStatus
     ) where
 
 import           Network.AWS.Prelude
@@ -72,10 +72,10 @@
 --
 -- /See:/ 'modifyDBInstance' smart constructor.
 data ModifyDBInstance = ModifyDBInstance'
-    { _mdiDBSecurityGroups           :: !(Maybe [Text])
-    , _mdiEngineVersion              :: !(Maybe Text)
-    , _mdiAutoMinorVersionUpgrade    :: !(Maybe Bool)
+    { _mdiEngineVersion              :: !(Maybe Text)
+    , _mdiDBSecurityGroups           :: !(Maybe [Text])
     , _mdiMasterUserPassword         :: !(Maybe Text)
+    , _mdiAutoMinorVersionUpgrade    :: !(Maybe Bool)
     , _mdiIOPS                       :: !(Maybe Int)
     , _mdiAllowMajorVersionUpgrade   :: !(Maybe Bool)
     , _mdiNewDBInstanceIdentifier    :: !(Maybe Text)
@@ -84,16 +84,16 @@
     , _mdiDBInstanceClass            :: !(Maybe Text)
     , _mdiPreferredMaintenanceWindow :: !(Maybe Text)
     , _mdiCACertificateIdentifier    :: !(Maybe Text)
+    , _mdiDBParameterGroupName       :: !(Maybe Text)
     , _mdiPreferredBackupWindow      :: !(Maybe Text)
     , _mdiBackupRetentionPeriod      :: !(Maybe Int)
-    , _mdiDBParameterGroupName       :: !(Maybe Text)
     , _mdiVPCSecurityGroupIds        :: !(Maybe [Text])
     , _mdiMultiAZ                    :: !(Maybe Bool)
     , _mdiAllocatedStorage           :: !(Maybe Int)
     , _mdiApplyImmediately           :: !(Maybe Bool)
-    , _mdiTDECredentialARN           :: !(Maybe Text)
     , _mdiOptionGroupName            :: !(Maybe Text)
     , _mdiCopyTagsToSnapshot         :: !(Maybe Bool)
+    , _mdiTDECredentialARN           :: !(Maybe Text)
     , _mdiStorageType                :: !(Maybe Text)
     , _mdiDBInstanceIdentifier       :: !Text
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
@@ -102,14 +102,14 @@
 --
 -- Use one of the following lenses to modify other fields as desired:
 --
--- * 'mdiDBSecurityGroups'
---
 -- * 'mdiEngineVersion'
 --
--- * 'mdiAutoMinorVersionUpgrade'
+-- * 'mdiDBSecurityGroups'
 --
 -- * 'mdiMasterUserPassword'
 --
+-- * 'mdiAutoMinorVersionUpgrade'
+--
 -- * 'mdiIOPS'
 --
 -- * 'mdiAllowMajorVersionUpgrade'
@@ -126,12 +126,12 @@
 --
 -- * 'mdiCACertificateIdentifier'
 --
+-- * 'mdiDBParameterGroupName'
+--
 -- * 'mdiPreferredBackupWindow'
 --
 -- * 'mdiBackupRetentionPeriod'
 --
--- * 'mdiDBParameterGroupName'
---
 -- * 'mdiVPCSecurityGroupIds'
 --
 -- * 'mdiMultiAZ'
@@ -140,12 +140,12 @@
 --
 -- * 'mdiApplyImmediately'
 --
--- * 'mdiTDECredentialARN'
---
 -- * 'mdiOptionGroupName'
 --
 -- * 'mdiCopyTagsToSnapshot'
 --
+-- * 'mdiTDECredentialARN'
+--
 -- * 'mdiStorageType'
 --
 -- * 'mdiDBInstanceIdentifier'
@@ -154,10 +154,10 @@
     -> ModifyDBInstance
 modifyDBInstance pDBInstanceIdentifier_ =
     ModifyDBInstance'
-    { _mdiDBSecurityGroups = Nothing
-    , _mdiEngineVersion = Nothing
-    , _mdiAutoMinorVersionUpgrade = Nothing
+    { _mdiEngineVersion = Nothing
+    , _mdiDBSecurityGroups = Nothing
     , _mdiMasterUserPassword = Nothing
+    , _mdiAutoMinorVersionUpgrade = Nothing
     , _mdiIOPS = Nothing
     , _mdiAllowMajorVersionUpgrade = Nothing
     , _mdiNewDBInstanceIdentifier = Nothing
@@ -166,32 +166,20 @@
     , _mdiDBInstanceClass = Nothing
     , _mdiPreferredMaintenanceWindow = Nothing
     , _mdiCACertificateIdentifier = Nothing
+    , _mdiDBParameterGroupName = Nothing
     , _mdiPreferredBackupWindow = Nothing
     , _mdiBackupRetentionPeriod = Nothing
-    , _mdiDBParameterGroupName = Nothing
     , _mdiVPCSecurityGroupIds = Nothing
     , _mdiMultiAZ = Nothing
     , _mdiAllocatedStorage = Nothing
     , _mdiApplyImmediately = Nothing
-    , _mdiTDECredentialARN = Nothing
     , _mdiOptionGroupName = Nothing
     , _mdiCopyTagsToSnapshot = Nothing
+    , _mdiTDECredentialARN = Nothing
     , _mdiStorageType = Nothing
     , _mdiDBInstanceIdentifier = pDBInstanceIdentifier_
     }
 
--- | A list of DB security groups to authorize on this DB instance. Changing
--- this setting does not result in an outage and the change is
--- asynchronously applied as soon as possible.
---
--- Constraints:
---
--- -   Must be 1 to 255 alphanumeric characters
--- -   First character must be a letter
--- -   Cannot end with a hyphen or contain two consecutive hyphens
-mdiDBSecurityGroups :: Lens' ModifyDBInstance [Text]
-mdiDBSecurityGroups = lens _mdiDBSecurityGroups (\ s a -> s{_mdiDBSecurityGroups = a}) . _Default . _Coerce;
-
 -- | The version number of the database engine to upgrade to. Changing this
 -- parameter results in an outage and the change is applied during the next
 -- maintenance window unless the 'ApplyImmediately' parameter is set to
@@ -206,15 +194,17 @@
 mdiEngineVersion :: Lens' ModifyDBInstance (Maybe Text)
 mdiEngineVersion = lens _mdiEngineVersion (\ s a -> s{_mdiEngineVersion = a});
 
--- | Indicates that minor version upgrades will be applied automatically to
--- the DB instance during the maintenance window. Changing this parameter
--- does not result in an outage except in the following case and the change
--- is asynchronously applied as soon as possible. An outage will result if
--- this parameter is set to 'true' during the maintenance window, and a
--- newer minor version is available, and RDS has enabled auto patching for
--- that engine version.
-mdiAutoMinorVersionUpgrade :: Lens' ModifyDBInstance (Maybe Bool)
-mdiAutoMinorVersionUpgrade = lens _mdiAutoMinorVersionUpgrade (\ s a -> s{_mdiAutoMinorVersionUpgrade = a});
+-- | A list of DB security groups to authorize on this DB instance. Changing
+-- this setting does not result in an outage and the change is
+-- asynchronously applied as soon as possible.
+--
+-- Constraints:
+--
+-- -   Must be 1 to 255 alphanumeric characters
+-- -   First character must be a letter
+-- -   Cannot end with a hyphen or contain two consecutive hyphens
+mdiDBSecurityGroups :: Lens' ModifyDBInstance [Text]
+mdiDBSecurityGroups = lens _mdiDBSecurityGroups (\ s a -> s{_mdiDBSecurityGroups = a}) . _Default . _Coerce;
 
 -- | The new password for the DB instance master user. Can be any printable
 -- ASCII character except \"\/\", \"\"\", or \"\'\".
@@ -238,6 +228,16 @@
 mdiMasterUserPassword :: Lens' ModifyDBInstance (Maybe Text)
 mdiMasterUserPassword = lens _mdiMasterUserPassword (\ s a -> s{_mdiMasterUserPassword = a});
 
+-- | Indicates that minor version upgrades will be applied automatically to
+-- the DB instance during the maintenance window. Changing this parameter
+-- does not result in an outage except in the following case and the change
+-- is asynchronously applied as soon as possible. An outage will result if
+-- this parameter is set to 'true' during the maintenance window, and a
+-- newer minor version is available, and RDS has enabled auto patching for
+-- that engine version.
+mdiAutoMinorVersionUpgrade :: Lens' ModifyDBInstance (Maybe Bool)
+mdiAutoMinorVersionUpgrade = lens _mdiAutoMinorVersionUpgrade (\ s a -> s{_mdiAutoMinorVersionUpgrade = a});
+
 -- | The new Provisioned IOPS (I\/O operations per second) value for the RDS
 -- instance. Changing this setting does not result in an outage and the
 -- change is applied during the next maintenance window unless the
@@ -351,6 +351,20 @@
 mdiCACertificateIdentifier :: Lens' ModifyDBInstance (Maybe Text)
 mdiCACertificateIdentifier = lens _mdiCACertificateIdentifier (\ s a -> s{_mdiCACertificateIdentifier = a});
 
+-- | The name of the DB parameter group to apply to the DB instance. Changing
+-- this setting does not result in an outage. The parameter group name
+-- itself is changed immediately, but the actual parameter changes are not
+-- applied until you reboot the instance without failover. The db instance
+-- will NOT be rebooted automatically and the parameter changes will NOT be
+-- applied during the next maintenance window.
+--
+-- Default: Uses existing setting
+--
+-- Constraints: The DB parameter group must be in the same DB parameter
+-- group family as this DB instance.
+mdiDBParameterGroupName :: Lens' ModifyDBInstance (Maybe Text)
+mdiDBParameterGroupName = lens _mdiDBParameterGroupName (\ s a -> s{_mdiDBParameterGroupName = a});
+
 -- | The daily time range during which automated backups are created if
 -- automated backups are enabled, as determined by the
 -- 'BackupRetentionPeriod' parameter. Changing this parameter does not
@@ -390,20 +404,6 @@
 mdiBackupRetentionPeriod :: Lens' ModifyDBInstance (Maybe Int)
 mdiBackupRetentionPeriod = lens _mdiBackupRetentionPeriod (\ s a -> s{_mdiBackupRetentionPeriod = a});
 
--- | The name of the DB parameter group to apply to the DB instance. Changing
--- this setting does not result in an outage. The parameter group name
--- itself is changed immediately, but the actual parameter changes are not
--- applied until you reboot the instance without failover. The db instance
--- will NOT be rebooted automatically and the parameter changes will NOT be
--- applied during the next maintenance window.
---
--- Default: Uses existing setting
---
--- Constraints: The DB parameter group must be in the same DB parameter
--- group family as this DB instance.
-mdiDBParameterGroupName :: Lens' ModifyDBInstance (Maybe Text)
-mdiDBParameterGroupName = lens _mdiDBParameterGroupName (\ s a -> s{_mdiDBParameterGroupName = a});
-
 -- | A list of EC2 VPC security groups to authorize on this DB instance. This
 -- change is asynchronously applied as soon as possible.
 --
@@ -508,11 +508,6 @@
 mdiApplyImmediately :: Lens' ModifyDBInstance (Maybe Bool)
 mdiApplyImmediately = lens _mdiApplyImmediately (\ s a -> s{_mdiApplyImmediately = a});
 
--- | The ARN from the Key Store with which to associate the instance for TDE
--- encryption.
-mdiTDECredentialARN :: Lens' ModifyDBInstance (Maybe Text)
-mdiTDECredentialARN = lens _mdiTDECredentialARN (\ s a -> s{_mdiTDECredentialARN = a});
-
 -- | Indicates that the DB instance should be associated with the specified
 -- option group. Changing this parameter does not result in an outage
 -- except in the following case and the change is applied during the next
@@ -533,6 +528,11 @@
 mdiCopyTagsToSnapshot :: Lens' ModifyDBInstance (Maybe Bool)
 mdiCopyTagsToSnapshot = lens _mdiCopyTagsToSnapshot (\ s a -> s{_mdiCopyTagsToSnapshot = a});
 
+-- | The ARN from the Key Store with which to associate the instance for TDE
+-- encryption.
+mdiTDECredentialARN :: Lens' ModifyDBInstance (Maybe Text)
+mdiTDECredentialARN = lens _mdiTDECredentialARN (\ s a -> s{_mdiTDECredentialARN = a});
+
 -- | Specifies the storage type to be associated with the DB instance.
 --
 -- Valid values: 'standard | gp2 | io1'
@@ -576,14 +576,14 @@
           = mconcat
               ["Action" =: ("ModifyDBInstance" :: ByteString),
                "Version" =: ("2014-10-31" :: ByteString),
+               "EngineVersion" =: _mdiEngineVersion,
                "DBSecurityGroups" =:
                  toQuery
                    (toQueryList "DBSecurityGroupName" <$>
                       _mdiDBSecurityGroups),
-               "EngineVersion" =: _mdiEngineVersion,
+               "MasterUserPassword" =: _mdiMasterUserPassword,
                "AutoMinorVersionUpgrade" =:
                  _mdiAutoMinorVersionUpgrade,
-               "MasterUserPassword" =: _mdiMasterUserPassword,
                "Iops" =: _mdiIOPS,
                "AllowMajorVersionUpgrade" =:
                  _mdiAllowMajorVersionUpgrade,
@@ -596,9 +596,9 @@
                  _mdiPreferredMaintenanceWindow,
                "CACertificateIdentifier" =:
                  _mdiCACertificateIdentifier,
+               "DBParameterGroupName" =: _mdiDBParameterGroupName,
                "PreferredBackupWindow" =: _mdiPreferredBackupWindow,
                "BackupRetentionPeriod" =: _mdiBackupRetentionPeriod,
-               "DBParameterGroupName" =: _mdiDBParameterGroupName,
                "VpcSecurityGroupIds" =:
                  toQuery
                    (toQueryList "VpcSecurityGroupId" <$>
@@ -606,16 +606,16 @@
                "MultiAZ" =: _mdiMultiAZ,
                "AllocatedStorage" =: _mdiAllocatedStorage,
                "ApplyImmediately" =: _mdiApplyImmediately,
-               "TdeCredentialArn" =: _mdiTDECredentialARN,
                "OptionGroupName" =: _mdiOptionGroupName,
                "CopyTagsToSnapshot" =: _mdiCopyTagsToSnapshot,
+               "TdeCredentialArn" =: _mdiTDECredentialARN,
                "StorageType" =: _mdiStorageType,
                "DBInstanceIdentifier" =: _mdiDBInstanceIdentifier]
 
 -- | /See:/ 'modifyDBInstanceResponse' smart constructor.
 data ModifyDBInstanceResponse = ModifyDBInstanceResponse'
-    { _mdirsDBInstance :: !(Maybe DBInstance)
-    , _mdirsStatus     :: !Int
+    { _mdirsDBInstance     :: !(Maybe DBInstance)
+    , _mdirsResponseStatus :: !Int
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'ModifyDBInstanceResponse' with the minimum fields required to make a request.
@@ -624,14 +624,14 @@
 --
 -- * 'mdirsDBInstance'
 --
--- * 'mdirsStatus'
+-- * 'mdirsResponseStatus'
 modifyDBInstanceResponse
-    :: Int -- ^ 'mdirsStatus'
+    :: Int -- ^ 'mdirsResponseStatus'
     -> ModifyDBInstanceResponse
-modifyDBInstanceResponse pStatus_ =
+modifyDBInstanceResponse pResponseStatus_ =
     ModifyDBInstanceResponse'
     { _mdirsDBInstance = Nothing
-    , _mdirsStatus = pStatus_
+    , _mdirsResponseStatus = pResponseStatus_
     }
 
 -- | Undocumented member.
@@ -639,5 +639,5 @@
 mdirsDBInstance = lens _mdirsDBInstance (\ s a -> s{_mdirsDBInstance = a});
 
 -- | The response status code.
-mdirsStatus :: Lens' ModifyDBInstanceResponse Int
-mdirsStatus = lens _mdirsStatus (\ s a -> s{_mdirsStatus = a});
+mdirsResponseStatus :: Lens' ModifyDBInstanceResponse Int
+mdirsResponseStatus = lens _mdirsResponseStatus (\ s a -> s{_mdirsResponseStatus = a});
diff --git a/gen/Network/AWS/RDS/ModifyDBSubnetGroup.hs b/gen/Network/AWS/RDS/ModifyDBSubnetGroup.hs
--- a/gen/Network/AWS/RDS/ModifyDBSubnetGroup.hs
+++ b/gen/Network/AWS/RDS/ModifyDBSubnetGroup.hs
@@ -37,7 +37,7 @@
     , ModifyDBSubnetGroupResponse
     -- * Response Lenses
     , mdsgrsDBSubnetGroup
-    , mdsgrsStatus
+    , mdsgrsResponseStatus
     ) where
 
 import           Network.AWS.Prelude
@@ -121,8 +121,8 @@
 
 -- | /See:/ 'modifyDBSubnetGroupResponse' smart constructor.
 data ModifyDBSubnetGroupResponse = ModifyDBSubnetGroupResponse'
-    { _mdsgrsDBSubnetGroup :: !(Maybe DBSubnetGroup)
-    , _mdsgrsStatus        :: !Int
+    { _mdsgrsDBSubnetGroup  :: !(Maybe DBSubnetGroup)
+    , _mdsgrsResponseStatus :: !Int
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'ModifyDBSubnetGroupResponse' with the minimum fields required to make a request.
@@ -131,14 +131,14 @@
 --
 -- * 'mdsgrsDBSubnetGroup'
 --
--- * 'mdsgrsStatus'
+-- * 'mdsgrsResponseStatus'
 modifyDBSubnetGroupResponse
-    :: Int -- ^ 'mdsgrsStatus'
+    :: Int -- ^ 'mdsgrsResponseStatus'
     -> ModifyDBSubnetGroupResponse
-modifyDBSubnetGroupResponse pStatus_ =
+modifyDBSubnetGroupResponse pResponseStatus_ =
     ModifyDBSubnetGroupResponse'
     { _mdsgrsDBSubnetGroup = Nothing
-    , _mdsgrsStatus = pStatus_
+    , _mdsgrsResponseStatus = pResponseStatus_
     }
 
 -- | Undocumented member.
@@ -146,5 +146,5 @@
 mdsgrsDBSubnetGroup = lens _mdsgrsDBSubnetGroup (\ s a -> s{_mdsgrsDBSubnetGroup = a});
 
 -- | The response status code.
-mdsgrsStatus :: Lens' ModifyDBSubnetGroupResponse Int
-mdsgrsStatus = lens _mdsgrsStatus (\ s a -> s{_mdsgrsStatus = a});
+mdsgrsResponseStatus :: Lens' ModifyDBSubnetGroupResponse Int
+mdsgrsResponseStatus = lens _mdsgrsResponseStatus (\ s a -> s{_mdsgrsResponseStatus = a});
diff --git a/gen/Network/AWS/RDS/ModifyEventSubscription.hs b/gen/Network/AWS/RDS/ModifyEventSubscription.hs
--- a/gen/Network/AWS/RDS/ModifyEventSubscription.hs
+++ b/gen/Network/AWS/RDS/ModifyEventSubscription.hs
@@ -47,7 +47,7 @@
     , ModifyEventSubscriptionResponse
     -- * Response Lenses
     , mesrsEventSubscription
-    , mesrsStatus
+    , mesrsResponseStatus
     ) where
 
 import           Network.AWS.Prelude
@@ -158,7 +158,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.
@@ -167,14 +167,14 @@
 --
 -- * 'mesrsEventSubscription'
 --
--- * 'mesrsStatus'
+-- * 'mesrsResponseStatus'
 modifyEventSubscriptionResponse
-    :: Int -- ^ 'mesrsStatus'
+    :: Int -- ^ 'mesrsResponseStatus'
     -> ModifyEventSubscriptionResponse
-modifyEventSubscriptionResponse pStatus_ =
+modifyEventSubscriptionResponse pResponseStatus_ =
     ModifyEventSubscriptionResponse'
     { _mesrsEventSubscription = Nothing
-    , _mesrsStatus = pStatus_
+    , _mesrsResponseStatus = pResponseStatus_
     }
 
 -- | Undocumented member.
@@ -182,5 +182,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/RDS/ModifyOptionGroup.hs b/gen/Network/AWS/RDS/ModifyOptionGroup.hs
--- a/gen/Network/AWS/RDS/ModifyOptionGroup.hs
+++ b/gen/Network/AWS/RDS/ModifyOptionGroup.hs
@@ -37,7 +37,7 @@
     , ModifyOptionGroupResponse
     -- * Response Lenses
     , mogrsOptionGroup
-    , mogrsStatus
+    , mogrsResponseStatus
     ) where
 
 import           Network.AWS.Prelude
@@ -135,8 +135,8 @@
 
 -- | /See:/ 'modifyOptionGroupResponse' smart constructor.
 data ModifyOptionGroupResponse = ModifyOptionGroupResponse'
-    { _mogrsOptionGroup :: !(Maybe OptionGroup)
-    , _mogrsStatus      :: !Int
+    { _mogrsOptionGroup    :: !(Maybe OptionGroup)
+    , _mogrsResponseStatus :: !Int
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'ModifyOptionGroupResponse' with the minimum fields required to make a request.
@@ -145,14 +145,14 @@
 --
 -- * 'mogrsOptionGroup'
 --
--- * 'mogrsStatus'
+-- * 'mogrsResponseStatus'
 modifyOptionGroupResponse
-    :: Int -- ^ 'mogrsStatus'
+    :: Int -- ^ 'mogrsResponseStatus'
     -> ModifyOptionGroupResponse
-modifyOptionGroupResponse pStatus_ =
+modifyOptionGroupResponse pResponseStatus_ =
     ModifyOptionGroupResponse'
     { _mogrsOptionGroup = Nothing
-    , _mogrsStatus = pStatus_
+    , _mogrsResponseStatus = pResponseStatus_
     }
 
 -- | Undocumented member.
@@ -160,5 +160,5 @@
 mogrsOptionGroup = lens _mogrsOptionGroup (\ s a -> s{_mogrsOptionGroup = a});
 
 -- | The response status code.
-mogrsStatus :: Lens' ModifyOptionGroupResponse Int
-mogrsStatus = lens _mogrsStatus (\ s a -> s{_mogrsStatus = a});
+mogrsResponseStatus :: Lens' ModifyOptionGroupResponse Int
+mogrsResponseStatus = lens _mogrsResponseStatus (\ s a -> s{_mogrsResponseStatus = a});
diff --git a/gen/Network/AWS/RDS/PromoteReadReplica.hs b/gen/Network/AWS/RDS/PromoteReadReplica.hs
--- a/gen/Network/AWS/RDS/PromoteReadReplica.hs
+++ b/gen/Network/AWS/RDS/PromoteReadReplica.hs
@@ -41,7 +41,7 @@
     , PromoteReadReplicaResponse
     -- * Response Lenses
     , prrrsDBInstance
-    , prrrsStatus
+    , prrrsResponseStatus
     ) where
 
 import           Network.AWS.Prelude
@@ -148,8 +148,8 @@
 
 -- | /See:/ 'promoteReadReplicaResponse' smart constructor.
 data PromoteReadReplicaResponse = PromoteReadReplicaResponse'
-    { _prrrsDBInstance :: !(Maybe DBInstance)
-    , _prrrsStatus     :: !Int
+    { _prrrsDBInstance     :: !(Maybe DBInstance)
+    , _prrrsResponseStatus :: !Int
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'PromoteReadReplicaResponse' with the minimum fields required to make a request.
@@ -158,14 +158,14 @@
 --
 -- * 'prrrsDBInstance'
 --
--- * 'prrrsStatus'
+-- * 'prrrsResponseStatus'
 promoteReadReplicaResponse
-    :: Int -- ^ 'prrrsStatus'
+    :: Int -- ^ 'prrrsResponseStatus'
     -> PromoteReadReplicaResponse
-promoteReadReplicaResponse pStatus_ =
+promoteReadReplicaResponse pResponseStatus_ =
     PromoteReadReplicaResponse'
     { _prrrsDBInstance = Nothing
-    , _prrrsStatus = pStatus_
+    , _prrrsResponseStatus = pResponseStatus_
     }
 
 -- | Undocumented member.
@@ -173,5 +173,5 @@
 prrrsDBInstance = lens _prrrsDBInstance (\ s a -> s{_prrrsDBInstance = a});
 
 -- | The response status code.
-prrrsStatus :: Lens' PromoteReadReplicaResponse Int
-prrrsStatus = lens _prrrsStatus (\ s a -> s{_prrrsStatus = a});
+prrrsResponseStatus :: Lens' PromoteReadReplicaResponse Int
+prrrsResponseStatus = lens _prrrsResponseStatus (\ s a -> s{_prrrsResponseStatus = a});
diff --git a/gen/Network/AWS/RDS/PurchaseReservedDBInstancesOffering.hs b/gen/Network/AWS/RDS/PurchaseReservedDBInstancesOffering.hs
--- a/gen/Network/AWS/RDS/PurchaseReservedDBInstancesOffering.hs
+++ b/gen/Network/AWS/RDS/PurchaseReservedDBInstancesOffering.hs
@@ -37,7 +37,7 @@
     , PurchaseReservedDBInstancesOfferingResponse
     -- * Response Lenses
     , prdiorsReservedDBInstance
-    , prdiorsStatus
+    , prdiorsResponseStatus
     ) where
 
 import           Network.AWS.Prelude
@@ -137,7 +137,7 @@
 -- | /See:/ 'purchaseReservedDBInstancesOfferingResponse' smart constructor.
 data PurchaseReservedDBInstancesOfferingResponse = PurchaseReservedDBInstancesOfferingResponse'
     { _prdiorsReservedDBInstance :: !(Maybe ReservedDBInstance)
-    , _prdiorsStatus             :: !Int
+    , _prdiorsResponseStatus     :: !Int
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'PurchaseReservedDBInstancesOfferingResponse' with the minimum fields required to make a request.
@@ -146,14 +146,14 @@
 --
 -- * 'prdiorsReservedDBInstance'
 --
--- * 'prdiorsStatus'
+-- * 'prdiorsResponseStatus'
 purchaseReservedDBInstancesOfferingResponse
-    :: Int -- ^ 'prdiorsStatus'
+    :: Int -- ^ 'prdiorsResponseStatus'
     -> PurchaseReservedDBInstancesOfferingResponse
-purchaseReservedDBInstancesOfferingResponse pStatus_ =
+purchaseReservedDBInstancesOfferingResponse pResponseStatus_ =
     PurchaseReservedDBInstancesOfferingResponse'
     { _prdiorsReservedDBInstance = Nothing
-    , _prdiorsStatus = pStatus_
+    , _prdiorsResponseStatus = pResponseStatus_
     }
 
 -- | Undocumented member.
@@ -161,5 +161,5 @@
 prdiorsReservedDBInstance = lens _prdiorsReservedDBInstance (\ s a -> s{_prdiorsReservedDBInstance = a});
 
 -- | The response status code.
-prdiorsStatus :: Lens' PurchaseReservedDBInstancesOfferingResponse Int
-prdiorsStatus = lens _prdiorsStatus (\ s a -> s{_prdiorsStatus = a});
+prdiorsResponseStatus :: Lens' PurchaseReservedDBInstancesOfferingResponse Int
+prdiorsResponseStatus = lens _prdiorsResponseStatus (\ s a -> s{_prdiorsResponseStatus = a});
diff --git a/gen/Network/AWS/RDS/RebootDBInstance.hs b/gen/Network/AWS/RDS/RebootDBInstance.hs
--- a/gen/Network/AWS/RDS/RebootDBInstance.hs
+++ b/gen/Network/AWS/RDS/RebootDBInstance.hs
@@ -52,7 +52,7 @@
     , RebootDBInstanceResponse
     -- * Response Lenses
     , rdirsDBInstance
-    , rdirsStatus
+    , rdirsResponseStatus
     ) where
 
 import           Network.AWS.Prelude
@@ -128,8 +128,8 @@
 
 -- | /See:/ 'rebootDBInstanceResponse' smart constructor.
 data RebootDBInstanceResponse = RebootDBInstanceResponse'
-    { _rdirsDBInstance :: !(Maybe DBInstance)
-    , _rdirsStatus     :: !Int
+    { _rdirsDBInstance     :: !(Maybe DBInstance)
+    , _rdirsResponseStatus :: !Int
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'RebootDBInstanceResponse' with the minimum fields required to make a request.
@@ -138,14 +138,14 @@
 --
 -- * 'rdirsDBInstance'
 --
--- * 'rdirsStatus'
+-- * 'rdirsResponseStatus'
 rebootDBInstanceResponse
-    :: Int -- ^ 'rdirsStatus'
+    :: Int -- ^ 'rdirsResponseStatus'
     -> RebootDBInstanceResponse
-rebootDBInstanceResponse pStatus_ =
+rebootDBInstanceResponse pResponseStatus_ =
     RebootDBInstanceResponse'
     { _rdirsDBInstance = Nothing
-    , _rdirsStatus = pStatus_
+    , _rdirsResponseStatus = pResponseStatus_
     }
 
 -- | Undocumented member.
@@ -153,5 +153,5 @@
 rdirsDBInstance = lens _rdirsDBInstance (\ s a -> s{_rdirsDBInstance = a});
 
 -- | The response status code.
-rdirsStatus :: Lens' RebootDBInstanceResponse Int
-rdirsStatus = lens _rdirsStatus (\ s a -> s{_rdirsStatus = a});
+rdirsResponseStatus :: Lens' RebootDBInstanceResponse Int
+rdirsResponseStatus = lens _rdirsResponseStatus (\ s a -> s{_rdirsResponseStatus = a});
diff --git a/gen/Network/AWS/RDS/RemoveSourceIdentifierFromSubscription.hs b/gen/Network/AWS/RDS/RemoveSourceIdentifierFromSubscription.hs
--- a/gen/Network/AWS/RDS/RemoveSourceIdentifierFromSubscription.hs
+++ b/gen/Network/AWS/RDS/RemoveSourceIdentifierFromSubscription.hs
@@ -36,7 +36,7 @@
     , RemoveSourceIdentifierFromSubscriptionResponse
     -- * Response Lenses
     , rsifsrsEventSubscription
-    , rsifsrsStatus
+    , rsifsrsResponseStatus
     ) where
 
 import           Network.AWS.Prelude
@@ -115,7 +115,7 @@
 -- | /See:/ 'removeSourceIdentifierFromSubscriptionResponse' smart constructor.
 data RemoveSourceIdentifierFromSubscriptionResponse = RemoveSourceIdentifierFromSubscriptionResponse'
     { _rsifsrsEventSubscription :: !(Maybe EventSubscription)
-    , _rsifsrsStatus            :: !Int
+    , _rsifsrsResponseStatus    :: !Int
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'RemoveSourceIdentifierFromSubscriptionResponse' with the minimum fields required to make a request.
@@ -124,14 +124,14 @@
 --
 -- * 'rsifsrsEventSubscription'
 --
--- * 'rsifsrsStatus'
+-- * 'rsifsrsResponseStatus'
 removeSourceIdentifierFromSubscriptionResponse
-    :: Int -- ^ 'rsifsrsStatus'
+    :: Int -- ^ 'rsifsrsResponseStatus'
     -> RemoveSourceIdentifierFromSubscriptionResponse
-removeSourceIdentifierFromSubscriptionResponse pStatus_ =
+removeSourceIdentifierFromSubscriptionResponse pResponseStatus_ =
     RemoveSourceIdentifierFromSubscriptionResponse'
     { _rsifsrsEventSubscription = Nothing
-    , _rsifsrsStatus = pStatus_
+    , _rsifsrsResponseStatus = pResponseStatus_
     }
 
 -- | Undocumented member.
@@ -139,5 +139,5 @@
 rsifsrsEventSubscription = lens _rsifsrsEventSubscription (\ s a -> s{_rsifsrsEventSubscription = a});
 
 -- | The response status code.
-rsifsrsStatus :: Lens' RemoveSourceIdentifierFromSubscriptionResponse Int
-rsifsrsStatus = lens _rsifsrsStatus (\ s a -> s{_rsifsrsStatus = a});
+rsifsrsResponseStatus :: Lens' RemoveSourceIdentifierFromSubscriptionResponse Int
+rsifsrsResponseStatus = lens _rsifsrsResponseStatus (\ s a -> s{_rsifsrsResponseStatus = a});
diff --git a/gen/Network/AWS/RDS/RestoreDBClusterFromSnapshot.hs b/gen/Network/AWS/RDS/RestoreDBClusterFromSnapshot.hs
--- a/gen/Network/AWS/RDS/RestoreDBClusterFromSnapshot.hs
+++ b/gen/Network/AWS/RDS/RestoreDBClusterFromSnapshot.hs
@@ -37,8 +37,8 @@
     , rdcfsEngineVersion
     , rdcfsDBSubnetGroupName
     , rdcfsAvailabilityZones
-    , rdcfsDatabaseName
     , rdcfsVPCSecurityGroupIds
+    , rdcfsDatabaseName
     , rdcfsOptionGroupName
     , rdcfsTags
     , rdcfsPort
@@ -51,7 +51,7 @@
     , RestoreDBClusterFromSnapshotResponse
     -- * Response Lenses
     , rdcfsrsDBCluster
-    , rdcfsrsStatus
+    , rdcfsrsResponseStatus
     ) where
 
 import           Network.AWS.Prelude
@@ -67,8 +67,8 @@
     { _rdcfsEngineVersion       :: !(Maybe Text)
     , _rdcfsDBSubnetGroupName   :: !(Maybe Text)
     , _rdcfsAvailabilityZones   :: !(Maybe [Text])
-    , _rdcfsDatabaseName        :: !(Maybe Text)
     , _rdcfsVPCSecurityGroupIds :: !(Maybe [Text])
+    , _rdcfsDatabaseName        :: !(Maybe Text)
     , _rdcfsOptionGroupName     :: !(Maybe Text)
     , _rdcfsTags                :: !(Maybe [Tag])
     , _rdcfsPort                :: !(Maybe Int)
@@ -87,10 +87,10 @@
 --
 -- * 'rdcfsAvailabilityZones'
 --
--- * 'rdcfsDatabaseName'
---
 -- * 'rdcfsVPCSecurityGroupIds'
 --
+-- * 'rdcfsDatabaseName'
+--
 -- * 'rdcfsOptionGroupName'
 --
 -- * 'rdcfsTags'
@@ -112,8 +112,8 @@
     { _rdcfsEngineVersion = Nothing
     , _rdcfsDBSubnetGroupName = Nothing
     , _rdcfsAvailabilityZones = Nothing
-    , _rdcfsDatabaseName = Nothing
     , _rdcfsVPCSecurityGroupIds = Nothing
+    , _rdcfsDatabaseName = Nothing
     , _rdcfsOptionGroupName = Nothing
     , _rdcfsTags = Nothing
     , _rdcfsPort = Nothing
@@ -135,14 +135,14 @@
 rdcfsAvailabilityZones :: Lens' RestoreDBClusterFromSnapshot [Text]
 rdcfsAvailabilityZones = lens _rdcfsAvailabilityZones (\ s a -> s{_rdcfsAvailabilityZones = a}) . _Default . _Coerce;
 
--- | The database name for the restored DB cluster.
-rdcfsDatabaseName :: Lens' RestoreDBClusterFromSnapshot (Maybe Text)
-rdcfsDatabaseName = lens _rdcfsDatabaseName (\ s a -> s{_rdcfsDatabaseName = a});
-
 -- | A list of VPC security groups that the new DB cluster will belong to.
 rdcfsVPCSecurityGroupIds :: Lens' RestoreDBClusterFromSnapshot [Text]
 rdcfsVPCSecurityGroupIds = lens _rdcfsVPCSecurityGroupIds (\ s a -> s{_rdcfsVPCSecurityGroupIds = a}) . _Default . _Coerce;
 
+-- | The database name for the restored DB cluster.
+rdcfsDatabaseName :: Lens' RestoreDBClusterFromSnapshot (Maybe Text)
+rdcfsDatabaseName = lens _rdcfsDatabaseName (\ s a -> s{_rdcfsDatabaseName = a});
+
 -- | The name of the option group to use for the restored DB cluster.
 rdcfsOptionGroupName :: Lens' RestoreDBClusterFromSnapshot (Maybe Text)
 rdcfsOptionGroupName = lens _rdcfsOptionGroupName (\ s a -> s{_rdcfsOptionGroupName = a});
@@ -220,11 +220,11 @@
                  toQuery
                    (toQueryList "AvailabilityZone" <$>
                       _rdcfsAvailabilityZones),
-               "DatabaseName" =: _rdcfsDatabaseName,
                "VpcSecurityGroupIds" =:
                  toQuery
                    (toQueryList "VpcSecurityGroupId" <$>
                       _rdcfsVPCSecurityGroupIds),
+               "DatabaseName" =: _rdcfsDatabaseName,
                "OptionGroupName" =: _rdcfsOptionGroupName,
                "Tags" =: toQuery (toQueryList "Tag" <$> _rdcfsTags),
                "Port" =: _rdcfsPort,
@@ -234,8 +234,8 @@
 
 -- | /See:/ 'restoreDBClusterFromSnapshotResponse' smart constructor.
 data RestoreDBClusterFromSnapshotResponse = RestoreDBClusterFromSnapshotResponse'
-    { _rdcfsrsDBCluster :: !(Maybe DBCluster)
-    , _rdcfsrsStatus    :: !Int
+    { _rdcfsrsDBCluster      :: !(Maybe DBCluster)
+    , _rdcfsrsResponseStatus :: !Int
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'RestoreDBClusterFromSnapshotResponse' with the minimum fields required to make a request.
@@ -244,14 +244,14 @@
 --
 -- * 'rdcfsrsDBCluster'
 --
--- * 'rdcfsrsStatus'
+-- * 'rdcfsrsResponseStatus'
 restoreDBClusterFromSnapshotResponse
-    :: Int -- ^ 'rdcfsrsStatus'
+    :: Int -- ^ 'rdcfsrsResponseStatus'
     -> RestoreDBClusterFromSnapshotResponse
-restoreDBClusterFromSnapshotResponse pStatus_ =
+restoreDBClusterFromSnapshotResponse pResponseStatus_ =
     RestoreDBClusterFromSnapshotResponse'
     { _rdcfsrsDBCluster = Nothing
-    , _rdcfsrsStatus = pStatus_
+    , _rdcfsrsResponseStatus = pResponseStatus_
     }
 
 -- | Undocumented member.
@@ -259,5 +259,5 @@
 rdcfsrsDBCluster = lens _rdcfsrsDBCluster (\ s a -> s{_rdcfsrsDBCluster = a});
 
 -- | The response status code.
-rdcfsrsStatus :: Lens' RestoreDBClusterFromSnapshotResponse Int
-rdcfsrsStatus = lens _rdcfsrsStatus (\ s a -> s{_rdcfsrsStatus = a});
+rdcfsrsResponseStatus :: Lens' RestoreDBClusterFromSnapshotResponse Int
+rdcfsrsResponseStatus = lens _rdcfsrsResponseStatus (\ s a -> s{_rdcfsrsResponseStatus = a});
diff --git a/gen/Network/AWS/RDS/RestoreDBClusterToPointInTime.hs b/gen/Network/AWS/RDS/RestoreDBClusterToPointInTime.hs
--- a/gen/Network/AWS/RDS/RestoreDBClusterToPointInTime.hs
+++ b/gen/Network/AWS/RDS/RestoreDBClusterToPointInTime.hs
@@ -51,7 +51,7 @@
     , RestoreDBClusterToPointInTimeResponse
     -- * Response Lenses
     , rdctpitrsDBCluster
-    , rdctpitrsStatus
+    , rdctpitrsResponseStatus
     ) where
 
 import           Network.AWS.Prelude
@@ -225,8 +225,8 @@
 
 -- | /See:/ 'restoreDBClusterToPointInTimeResponse' smart constructor.
 data RestoreDBClusterToPointInTimeResponse = RestoreDBClusterToPointInTimeResponse'
-    { _rdctpitrsDBCluster :: !(Maybe DBCluster)
-    , _rdctpitrsStatus    :: !Int
+    { _rdctpitrsDBCluster      :: !(Maybe DBCluster)
+    , _rdctpitrsResponseStatus :: !Int
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'RestoreDBClusterToPointInTimeResponse' with the minimum fields required to make a request.
@@ -235,14 +235,14 @@
 --
 -- * 'rdctpitrsDBCluster'
 --
--- * 'rdctpitrsStatus'
+-- * 'rdctpitrsResponseStatus'
 restoreDBClusterToPointInTimeResponse
-    :: Int -- ^ 'rdctpitrsStatus'
+    :: Int -- ^ 'rdctpitrsResponseStatus'
     -> RestoreDBClusterToPointInTimeResponse
-restoreDBClusterToPointInTimeResponse pStatus_ =
+restoreDBClusterToPointInTimeResponse pResponseStatus_ =
     RestoreDBClusterToPointInTimeResponse'
     { _rdctpitrsDBCluster = Nothing
-    , _rdctpitrsStatus = pStatus_
+    , _rdctpitrsResponseStatus = pResponseStatus_
     }
 
 -- | Undocumented member.
@@ -250,5 +250,5 @@
 rdctpitrsDBCluster = lens _rdctpitrsDBCluster (\ s a -> s{_rdctpitrsDBCluster = a});
 
 -- | The response status code.
-rdctpitrsStatus :: Lens' RestoreDBClusterToPointInTimeResponse Int
-rdctpitrsStatus = lens _rdctpitrsStatus (\ s a -> s{_rdctpitrsStatus = a});
+rdctpitrsResponseStatus :: Lens' RestoreDBClusterToPointInTimeResponse Int
+rdctpitrsResponseStatus = lens _rdctpitrsResponseStatus (\ s a -> s{_rdctpitrsResponseStatus = a});
diff --git a/gen/Network/AWS/RDS/RestoreDBInstanceFromDBSnapshot.hs b/gen/Network/AWS/RDS/RestoreDBInstanceFromDBSnapshot.hs
--- a/gen/Network/AWS/RDS/RestoreDBInstanceFromDBSnapshot.hs
+++ b/gen/Network/AWS/RDS/RestoreDBInstanceFromDBSnapshot.hs
@@ -46,8 +46,8 @@
     , RestoreDBInstanceFromDBSnapshot
     -- * Request Lenses
     , rdifdsDBSecurityGroups
-    , rdifdsAutoMinorVersionUpgrade
     , rdifdsPubliclyAccessible
+    , rdifdsAutoMinorVersionUpgrade
     , rdifdsDBSubnetGroupName
     , rdifdsIOPS
     , rdifdsDomain
@@ -58,13 +58,13 @@
     , rdifdsAvailabilityZone
     , rdifdsVPCSecurityGroupIds
     , rdifdsMultiAZ
-    , rdifdsTDECredentialARN
     , rdifdsOptionGroupName
     , rdifdsCopyTagsToSnapshot
-    , rdifdsDBName
+    , rdifdsTDECredentialARN
     , rdifdsTags
     , rdifdsPort
     , rdifdsStorageType
+    , rdifdsDBName
     , rdifdsDBInstanceIdentifier
     , rdifdsDBSnapshotIdentifier
 
@@ -73,7 +73,7 @@
     , RestoreDBInstanceFromDBSnapshotResponse
     -- * Response Lenses
     , rdifdsrsDBInstance
-    , rdifdsrsStatus
+    , rdifdsrsResponseStatus
     ) where
 
 import           Network.AWS.Prelude
@@ -87,8 +87,8 @@
 -- /See:/ 'restoreDBInstanceFromDBSnapshot' smart constructor.
 data RestoreDBInstanceFromDBSnapshot = RestoreDBInstanceFromDBSnapshot'
     { _rdifdsDBSecurityGroups        :: !(Maybe [Text])
-    , _rdifdsAutoMinorVersionUpgrade :: !(Maybe Bool)
     , _rdifdsPubliclyAccessible      :: !(Maybe Bool)
+    , _rdifdsAutoMinorVersionUpgrade :: !(Maybe Bool)
     , _rdifdsDBSubnetGroupName       :: !(Maybe Text)
     , _rdifdsIOPS                    :: !(Maybe Int)
     , _rdifdsDomain                  :: !(Maybe Text)
@@ -99,13 +99,13 @@
     , _rdifdsAvailabilityZone        :: !(Maybe Text)
     , _rdifdsVPCSecurityGroupIds     :: !(Maybe [Text])
     , _rdifdsMultiAZ                 :: !(Maybe Bool)
-    , _rdifdsTDECredentialARN        :: !(Maybe Text)
     , _rdifdsOptionGroupName         :: !(Maybe Text)
     , _rdifdsCopyTagsToSnapshot      :: !(Maybe Bool)
-    , _rdifdsDBName                  :: !(Maybe Text)
+    , _rdifdsTDECredentialARN        :: !(Maybe Text)
     , _rdifdsTags                    :: !(Maybe [Tag])
     , _rdifdsPort                    :: !(Maybe Int)
     , _rdifdsStorageType             :: !(Maybe Text)
+    , _rdifdsDBName                  :: !(Maybe Text)
     , _rdifdsDBInstanceIdentifier    :: !Text
     , _rdifdsDBSnapshotIdentifier    :: !Text
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
@@ -116,10 +116,10 @@
 --
 -- * 'rdifdsDBSecurityGroups'
 --
--- * 'rdifdsAutoMinorVersionUpgrade'
---
 -- * 'rdifdsPubliclyAccessible'
 --
+-- * 'rdifdsAutoMinorVersionUpgrade'
+--
 -- * 'rdifdsDBSubnetGroupName'
 --
 -- * 'rdifdsIOPS'
@@ -140,13 +140,11 @@
 --
 -- * 'rdifdsMultiAZ'
 --
--- * 'rdifdsTDECredentialARN'
---
 -- * 'rdifdsOptionGroupName'
 --
 -- * 'rdifdsCopyTagsToSnapshot'
 --
--- * 'rdifdsDBName'
+-- * 'rdifdsTDECredentialARN'
 --
 -- * 'rdifdsTags'
 --
@@ -154,6 +152,8 @@
 --
 -- * 'rdifdsStorageType'
 --
+-- * 'rdifdsDBName'
+--
 -- * 'rdifdsDBInstanceIdentifier'
 --
 -- * 'rdifdsDBSnapshotIdentifier'
@@ -164,8 +164,8 @@
 restoreDBInstanceFromDBSnapshot pDBInstanceIdentifier_ pDBSnapshotIdentifier_ =
     RestoreDBInstanceFromDBSnapshot'
     { _rdifdsDBSecurityGroups = Nothing
-    , _rdifdsAutoMinorVersionUpgrade = Nothing
     , _rdifdsPubliclyAccessible = Nothing
+    , _rdifdsAutoMinorVersionUpgrade = Nothing
     , _rdifdsDBSubnetGroupName = Nothing
     , _rdifdsIOPS = Nothing
     , _rdifdsDomain = Nothing
@@ -176,13 +176,13 @@
     , _rdifdsAvailabilityZone = Nothing
     , _rdifdsVPCSecurityGroupIds = Nothing
     , _rdifdsMultiAZ = Nothing
-    , _rdifdsTDECredentialARN = Nothing
     , _rdifdsOptionGroupName = Nothing
     , _rdifdsCopyTagsToSnapshot = Nothing
-    , _rdifdsDBName = Nothing
+    , _rdifdsTDECredentialARN = Nothing
     , _rdifdsTags = Nothing
     , _rdifdsPort = Nothing
     , _rdifdsStorageType = Nothing
+    , _rdifdsDBName = Nothing
     , _rdifdsDBInstanceIdentifier = pDBInstanceIdentifier_
     , _rdifdsDBSnapshotIdentifier = pDBSnapshotIdentifier_
     }
@@ -193,11 +193,6 @@
 rdifdsDBSecurityGroups :: Lens' RestoreDBInstanceFromDBSnapshot [Text]
 rdifdsDBSecurityGroups = lens _rdifdsDBSecurityGroups (\ s a -> s{_rdifdsDBSecurityGroups = a}) . _Default . _Coerce;
 
--- | Indicates that minor version upgrades will be applied automatically to
--- the DB instance during the maintenance window.
-rdifdsAutoMinorVersionUpgrade :: Lens' RestoreDBInstanceFromDBSnapshot (Maybe Bool)
-rdifdsAutoMinorVersionUpgrade = lens _rdifdsAutoMinorVersionUpgrade (\ s a -> s{_rdifdsAutoMinorVersionUpgrade = a});
-
 -- | Specifies the accessibility options for the DB instance. A value of true
 -- specifies an Internet-facing instance with a publicly resolvable DNS
 -- name, which resolves to a public IP address. A value of false specifies
@@ -219,6 +214,11 @@
 rdifdsPubliclyAccessible :: Lens' RestoreDBInstanceFromDBSnapshot (Maybe Bool)
 rdifdsPubliclyAccessible = lens _rdifdsPubliclyAccessible (\ s a -> s{_rdifdsPubliclyAccessible = a});
 
+-- | Indicates that minor version upgrades will be applied automatically to
+-- the DB instance during the maintenance window.
+rdifdsAutoMinorVersionUpgrade :: Lens' RestoreDBInstanceFromDBSnapshot (Maybe Bool)
+rdifdsAutoMinorVersionUpgrade = lens _rdifdsAutoMinorVersionUpgrade (\ s a -> s{_rdifdsAutoMinorVersionUpgrade = a});
+
 -- | The DB subnet group name to use for the new instance.
 rdifdsDBSubnetGroupName :: Lens' RestoreDBInstanceFromDBSnapshot (Maybe Text)
 rdifdsDBSubnetGroupName = lens _rdifdsDBSubnetGroupName (\ s a -> s{_rdifdsDBSubnetGroupName = a});
@@ -301,11 +301,6 @@
 rdifdsMultiAZ :: Lens' RestoreDBInstanceFromDBSnapshot (Maybe Bool)
 rdifdsMultiAZ = lens _rdifdsMultiAZ (\ s a -> s{_rdifdsMultiAZ = a});
 
--- | The ARN from the Key Store with which to associate the instance for TDE
--- encryption.
-rdifdsTDECredentialARN :: Lens' RestoreDBInstanceFromDBSnapshot (Maybe Text)
-rdifdsTDECredentialARN = lens _rdifdsTDECredentialARN (\ s a -> s{_rdifdsTDECredentialARN = a});
-
 -- | The name of the option group to be used for the restored DB instance.
 --
 -- Permanent options, such as the TDE option for Oracle Advanced Security
@@ -319,11 +314,10 @@
 rdifdsCopyTagsToSnapshot :: Lens' RestoreDBInstanceFromDBSnapshot (Maybe Bool)
 rdifdsCopyTagsToSnapshot = lens _rdifdsCopyTagsToSnapshot (\ s a -> s{_rdifdsCopyTagsToSnapshot = a});
 
--- | The database name for the restored DB instance.
---
--- This parameter doesn\'t apply to the MySQL engine.
-rdifdsDBName :: Lens' RestoreDBInstanceFromDBSnapshot (Maybe Text)
-rdifdsDBName = lens _rdifdsDBName (\ s a -> s{_rdifdsDBName = a});
+-- | The ARN from the Key Store with which to associate the instance for TDE
+-- encryption.
+rdifdsTDECredentialARN :: Lens' RestoreDBInstanceFromDBSnapshot (Maybe Text)
+rdifdsTDECredentialARN = lens _rdifdsTDECredentialARN (\ s a -> s{_rdifdsTDECredentialARN = a});
 
 -- | Undocumented member.
 rdifdsTags :: Lens' RestoreDBInstanceFromDBSnapshot [Tag]
@@ -349,6 +343,12 @@
 rdifdsStorageType :: Lens' RestoreDBInstanceFromDBSnapshot (Maybe Text)
 rdifdsStorageType = lens _rdifdsStorageType (\ s a -> s{_rdifdsStorageType = a});
 
+-- | The database name for the restored DB instance.
+--
+-- This parameter doesn\'t apply to the MySQL engine.
+rdifdsDBName :: Lens' RestoreDBInstanceFromDBSnapshot (Maybe Text)
+rdifdsDBName = lens _rdifdsDBName (\ s a -> s{_rdifdsDBName = a});
+
 -- | Name of the DB instance to create from the DB snapshot. This parameter
 -- isn\'t case-sensitive.
 --
@@ -402,9 +402,9 @@
                  toQuery
                    (toQueryList "DBSecurityGroupName" <$>
                       _rdifdsDBSecurityGroups),
+               "PubliclyAccessible" =: _rdifdsPubliclyAccessible,
                "AutoMinorVersionUpgrade" =:
                  _rdifdsAutoMinorVersionUpgrade,
-               "PubliclyAccessible" =: _rdifdsPubliclyAccessible,
                "DBSubnetGroupName" =: _rdifdsDBSubnetGroupName,
                "Iops" =: _rdifdsIOPS, "Domain" =: _rdifdsDomain,
                "Engine" =: _rdifdsEngine,
@@ -418,14 +418,14 @@
                    (toQueryList "VpcSecurityGroupId" <$>
                       _rdifdsVPCSecurityGroupIds),
                "MultiAZ" =: _rdifdsMultiAZ,
-               "TdeCredentialArn" =: _rdifdsTDECredentialARN,
                "OptionGroupName" =: _rdifdsOptionGroupName,
                "CopyTagsToSnapshot" =: _rdifdsCopyTagsToSnapshot,
-               "DBName" =: _rdifdsDBName,
+               "TdeCredentialArn" =: _rdifdsTDECredentialARN,
                "Tags" =:
                  toQuery (toQueryList "Tag" <$> _rdifdsTags),
                "Port" =: _rdifdsPort,
                "StorageType" =: _rdifdsStorageType,
+               "DBName" =: _rdifdsDBName,
                "DBInstanceIdentifier" =:
                  _rdifdsDBInstanceIdentifier,
                "DBSnapshotIdentifier" =:
@@ -433,8 +433,8 @@
 
 -- | /See:/ 'restoreDBInstanceFromDBSnapshotResponse' smart constructor.
 data RestoreDBInstanceFromDBSnapshotResponse = RestoreDBInstanceFromDBSnapshotResponse'
-    { _rdifdsrsDBInstance :: !(Maybe DBInstance)
-    , _rdifdsrsStatus     :: !Int
+    { _rdifdsrsDBInstance     :: !(Maybe DBInstance)
+    , _rdifdsrsResponseStatus :: !Int
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'RestoreDBInstanceFromDBSnapshotResponse' with the minimum fields required to make a request.
@@ -443,14 +443,14 @@
 --
 -- * 'rdifdsrsDBInstance'
 --
--- * 'rdifdsrsStatus'
+-- * 'rdifdsrsResponseStatus'
 restoreDBInstanceFromDBSnapshotResponse
-    :: Int -- ^ 'rdifdsrsStatus'
+    :: Int -- ^ 'rdifdsrsResponseStatus'
     -> RestoreDBInstanceFromDBSnapshotResponse
-restoreDBInstanceFromDBSnapshotResponse pStatus_ =
+restoreDBInstanceFromDBSnapshotResponse pResponseStatus_ =
     RestoreDBInstanceFromDBSnapshotResponse'
     { _rdifdsrsDBInstance = Nothing
-    , _rdifdsrsStatus = pStatus_
+    , _rdifdsrsResponseStatus = pResponseStatus_
     }
 
 -- | Undocumented member.
@@ -458,5 +458,5 @@
 rdifdsrsDBInstance = lens _rdifdsrsDBInstance (\ s a -> s{_rdifdsrsDBInstance = a});
 
 -- | The response status code.
-rdifdsrsStatus :: Lens' RestoreDBInstanceFromDBSnapshotResponse Int
-rdifdsrsStatus = lens _rdifdsrsStatus (\ s a -> s{_rdifdsrsStatus = a});
+rdifdsrsResponseStatus :: Lens' RestoreDBInstanceFromDBSnapshotResponse Int
+rdifdsrsResponseStatus = lens _rdifdsrsResponseStatus (\ s a -> s{_rdifdsrsResponseStatus = a});
diff --git a/gen/Network/AWS/RDS/RestoreDBInstanceToPointInTime.hs b/gen/Network/AWS/RDS/RestoreDBInstanceToPointInTime.hs
--- a/gen/Network/AWS/RDS/RestoreDBInstanceToPointInTime.hs
+++ b/gen/Network/AWS/RDS/RestoreDBInstanceToPointInTime.hs
@@ -38,8 +38,8 @@
     -- * Request Lenses
     , rditpitDBSecurityGroups
     , rditpitUseLatestRestorableTime
-    , rditpitAutoMinorVersionUpgrade
     , rditpitPubliclyAccessible
+    , rditpitAutoMinorVersionUpgrade
     , rditpitDBSubnetGroupName
     , rditpitRestoreTime
     , rditpitIOPS
@@ -51,13 +51,13 @@
     , rditpitAvailabilityZone
     , rditpitVPCSecurityGroupIds
     , rditpitMultiAZ
-    , rditpitTDECredentialARN
     , rditpitOptionGroupName
     , rditpitCopyTagsToSnapshot
-    , rditpitDBName
+    , rditpitTDECredentialARN
     , rditpitTags
     , rditpitPort
     , rditpitStorageType
+    , rditpitDBName
     , rditpitSourceDBInstanceIdentifier
     , rditpitTargetDBInstanceIdentifier
 
@@ -66,7 +66,7 @@
     , RestoreDBInstanceToPointInTimeResponse
     -- * Response Lenses
     , rditpitrsDBInstance
-    , rditpitrsStatus
+    , rditpitrsResponseStatus
     ) where
 
 import           Network.AWS.Prelude
@@ -81,8 +81,8 @@
 data RestoreDBInstanceToPointInTime = RestoreDBInstanceToPointInTime'
     { _rditpitDBSecurityGroups           :: !(Maybe [Text])
     , _rditpitUseLatestRestorableTime    :: !(Maybe Bool)
-    , _rditpitAutoMinorVersionUpgrade    :: !(Maybe Bool)
     , _rditpitPubliclyAccessible         :: !(Maybe Bool)
+    , _rditpitAutoMinorVersionUpgrade    :: !(Maybe Bool)
     , _rditpitDBSubnetGroupName          :: !(Maybe Text)
     , _rditpitRestoreTime                :: !(Maybe ISO8601)
     , _rditpitIOPS                       :: !(Maybe Int)
@@ -94,13 +94,13 @@
     , _rditpitAvailabilityZone           :: !(Maybe Text)
     , _rditpitVPCSecurityGroupIds        :: !(Maybe [Text])
     , _rditpitMultiAZ                    :: !(Maybe Bool)
-    , _rditpitTDECredentialARN           :: !(Maybe Text)
     , _rditpitOptionGroupName            :: !(Maybe Text)
     , _rditpitCopyTagsToSnapshot         :: !(Maybe Bool)
-    , _rditpitDBName                     :: !(Maybe Text)
+    , _rditpitTDECredentialARN           :: !(Maybe Text)
     , _rditpitTags                       :: !(Maybe [Tag])
     , _rditpitPort                       :: !(Maybe Int)
     , _rditpitStorageType                :: !(Maybe Text)
+    , _rditpitDBName                     :: !(Maybe Text)
     , _rditpitSourceDBInstanceIdentifier :: !Text
     , _rditpitTargetDBInstanceIdentifier :: !Text
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
@@ -113,10 +113,10 @@
 --
 -- * 'rditpitUseLatestRestorableTime'
 --
--- * 'rditpitAutoMinorVersionUpgrade'
---
 -- * 'rditpitPubliclyAccessible'
 --
+-- * 'rditpitAutoMinorVersionUpgrade'
+--
 -- * 'rditpitDBSubnetGroupName'
 --
 -- * 'rditpitRestoreTime'
@@ -139,13 +139,11 @@
 --
 -- * 'rditpitMultiAZ'
 --
--- * 'rditpitTDECredentialARN'
---
 -- * 'rditpitOptionGroupName'
 --
 -- * 'rditpitCopyTagsToSnapshot'
 --
--- * 'rditpitDBName'
+-- * 'rditpitTDECredentialARN'
 --
 -- * 'rditpitTags'
 --
@@ -153,6 +151,8 @@
 --
 -- * 'rditpitStorageType'
 --
+-- * 'rditpitDBName'
+--
 -- * 'rditpitSourceDBInstanceIdentifier'
 --
 -- * 'rditpitTargetDBInstanceIdentifier'
@@ -164,8 +164,8 @@
     RestoreDBInstanceToPointInTime'
     { _rditpitDBSecurityGroups = Nothing
     , _rditpitUseLatestRestorableTime = Nothing
-    , _rditpitAutoMinorVersionUpgrade = Nothing
     , _rditpitPubliclyAccessible = Nothing
+    , _rditpitAutoMinorVersionUpgrade = Nothing
     , _rditpitDBSubnetGroupName = Nothing
     , _rditpitRestoreTime = Nothing
     , _rditpitIOPS = Nothing
@@ -177,13 +177,13 @@
     , _rditpitAvailabilityZone = Nothing
     , _rditpitVPCSecurityGroupIds = Nothing
     , _rditpitMultiAZ = Nothing
-    , _rditpitTDECredentialARN = Nothing
     , _rditpitOptionGroupName = Nothing
     , _rditpitCopyTagsToSnapshot = Nothing
-    , _rditpitDBName = Nothing
+    , _rditpitTDECredentialARN = Nothing
     , _rditpitTags = Nothing
     , _rditpitPort = Nothing
     , _rditpitStorageType = Nothing
+    , _rditpitDBName = Nothing
     , _rditpitSourceDBInstanceIdentifier = pSourceDBInstanceIdentifier_
     , _rditpitTargetDBInstanceIdentifier = pTargetDBInstanceIdentifier_
     }
@@ -203,11 +203,6 @@
 rditpitUseLatestRestorableTime :: Lens' RestoreDBInstanceToPointInTime (Maybe Bool)
 rditpitUseLatestRestorableTime = lens _rditpitUseLatestRestorableTime (\ s a -> s{_rditpitUseLatestRestorableTime = a});
 
--- | Indicates that minor version upgrades will be applied automatically to
--- the DB instance during the maintenance window.
-rditpitAutoMinorVersionUpgrade :: Lens' RestoreDBInstanceToPointInTime (Maybe Bool)
-rditpitAutoMinorVersionUpgrade = lens _rditpitAutoMinorVersionUpgrade (\ s a -> s{_rditpitAutoMinorVersionUpgrade = a});
-
 -- | Specifies the accessibility options for the DB instance. A value of true
 -- specifies an Internet-facing instance with a publicly resolvable DNS
 -- name, which resolves to a public IP address. A value of false specifies
@@ -229,6 +224,11 @@
 rditpitPubliclyAccessible :: Lens' RestoreDBInstanceToPointInTime (Maybe Bool)
 rditpitPubliclyAccessible = lens _rditpitPubliclyAccessible (\ s a -> s{_rditpitPubliclyAccessible = a});
 
+-- | Indicates that minor version upgrades will be applied automatically to
+-- the DB instance during the maintenance window.
+rditpitAutoMinorVersionUpgrade :: Lens' RestoreDBInstanceToPointInTime (Maybe Bool)
+rditpitAutoMinorVersionUpgrade = lens _rditpitAutoMinorVersionUpgrade (\ s a -> s{_rditpitAutoMinorVersionUpgrade = a});
+
 -- | The DB subnet group name to use for the new instance.
 rditpitDBSubnetGroupName :: Lens' RestoreDBInstanceToPointInTime (Maybe Text)
 rditpitDBSubnetGroupName = lens _rditpitDBSubnetGroupName (\ s a -> s{_rditpitDBSubnetGroupName = a});
@@ -323,11 +323,6 @@
 rditpitMultiAZ :: Lens' RestoreDBInstanceToPointInTime (Maybe Bool)
 rditpitMultiAZ = lens _rditpitMultiAZ (\ s a -> s{_rditpitMultiAZ = a});
 
--- | The ARN from the Key Store with which to associate the instance for TDE
--- encryption.
-rditpitTDECredentialARN :: Lens' RestoreDBInstanceToPointInTime (Maybe Text)
-rditpitTDECredentialARN = lens _rditpitTDECredentialARN (\ s a -> s{_rditpitTDECredentialARN = a});
-
 -- | The name of the option group to be used for the restored DB instance.
 --
 -- Permanent options, such as the TDE option for Oracle Advanced Security
@@ -341,11 +336,10 @@
 rditpitCopyTagsToSnapshot :: Lens' RestoreDBInstanceToPointInTime (Maybe Bool)
 rditpitCopyTagsToSnapshot = lens _rditpitCopyTagsToSnapshot (\ s a -> s{_rditpitCopyTagsToSnapshot = a});
 
--- | The database name for the restored DB instance.
---
--- This parameter is not used for the MySQL engine.
-rditpitDBName :: Lens' RestoreDBInstanceToPointInTime (Maybe Text)
-rditpitDBName = lens _rditpitDBName (\ s a -> s{_rditpitDBName = a});
+-- | The ARN from the Key Store with which to associate the instance for TDE
+-- encryption.
+rditpitTDECredentialARN :: Lens' RestoreDBInstanceToPointInTime (Maybe Text)
+rditpitTDECredentialARN = lens _rditpitTDECredentialARN (\ s a -> s{_rditpitTDECredentialARN = a});
 
 -- | Undocumented member.
 rditpitTags :: Lens' RestoreDBInstanceToPointInTime [Tag]
@@ -371,6 +365,12 @@
 rditpitStorageType :: Lens' RestoreDBInstanceToPointInTime (Maybe Text)
 rditpitStorageType = lens _rditpitStorageType (\ s a -> s{_rditpitStorageType = a});
 
+-- | The database name for the restored DB instance.
+--
+-- This parameter is not used for the MySQL engine.
+rditpitDBName :: Lens' RestoreDBInstanceToPointInTime (Maybe Text)
+rditpitDBName = lens _rditpitDBName (\ s a -> s{_rditpitDBName = a});
+
 -- | The identifier of the source DB instance from which to restore.
 --
 -- Constraints:
@@ -423,9 +423,9 @@
                       _rditpitDBSecurityGroups),
                "UseLatestRestorableTime" =:
                  _rditpitUseLatestRestorableTime,
+               "PubliclyAccessible" =: _rditpitPubliclyAccessible,
                "AutoMinorVersionUpgrade" =:
                  _rditpitAutoMinorVersionUpgrade,
-               "PubliclyAccessible" =: _rditpitPubliclyAccessible,
                "DBSubnetGroupName" =: _rditpitDBSubnetGroupName,
                "RestoreTime" =: _rditpitRestoreTime,
                "Iops" =: _rditpitIOPS, "Domain" =: _rditpitDomain,
@@ -440,14 +440,14 @@
                    (toQueryList "VpcSecurityGroupId" <$>
                       _rditpitVPCSecurityGroupIds),
                "MultiAZ" =: _rditpitMultiAZ,
-               "TdeCredentialArn" =: _rditpitTDECredentialARN,
                "OptionGroupName" =: _rditpitOptionGroupName,
                "CopyTagsToSnapshot" =: _rditpitCopyTagsToSnapshot,
-               "DBName" =: _rditpitDBName,
+               "TdeCredentialArn" =: _rditpitTDECredentialARN,
                "Tags" =:
                  toQuery (toQueryList "Tag" <$> _rditpitTags),
                "Port" =: _rditpitPort,
                "StorageType" =: _rditpitStorageType,
+               "DBName" =: _rditpitDBName,
                "SourceDBInstanceIdentifier" =:
                  _rditpitSourceDBInstanceIdentifier,
                "TargetDBInstanceIdentifier" =:
@@ -455,8 +455,8 @@
 
 -- | /See:/ 'restoreDBInstanceToPointInTimeResponse' smart constructor.
 data RestoreDBInstanceToPointInTimeResponse = RestoreDBInstanceToPointInTimeResponse'
-    { _rditpitrsDBInstance :: !(Maybe DBInstance)
-    , _rditpitrsStatus     :: !Int
+    { _rditpitrsDBInstance     :: !(Maybe DBInstance)
+    , _rditpitrsResponseStatus :: !Int
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'RestoreDBInstanceToPointInTimeResponse' with the minimum fields required to make a request.
@@ -465,14 +465,14 @@
 --
 -- * 'rditpitrsDBInstance'
 --
--- * 'rditpitrsStatus'
+-- * 'rditpitrsResponseStatus'
 restoreDBInstanceToPointInTimeResponse
-    :: Int -- ^ 'rditpitrsStatus'
+    :: Int -- ^ 'rditpitrsResponseStatus'
     -> RestoreDBInstanceToPointInTimeResponse
-restoreDBInstanceToPointInTimeResponse pStatus_ =
+restoreDBInstanceToPointInTimeResponse pResponseStatus_ =
     RestoreDBInstanceToPointInTimeResponse'
     { _rditpitrsDBInstance = Nothing
-    , _rditpitrsStatus = pStatus_
+    , _rditpitrsResponseStatus = pResponseStatus_
     }
 
 -- | Undocumented member.
@@ -480,5 +480,5 @@
 rditpitrsDBInstance = lens _rditpitrsDBInstance (\ s a -> s{_rditpitrsDBInstance = a});
 
 -- | The response status code.
-rditpitrsStatus :: Lens' RestoreDBInstanceToPointInTimeResponse Int
-rditpitrsStatus = lens _rditpitrsStatus (\ s a -> s{_rditpitrsStatus = a});
+rditpitrsResponseStatus :: Lens' RestoreDBInstanceToPointInTimeResponse Int
+rditpitrsResponseStatus = lens _rditpitrsResponseStatus (\ s a -> s{_rditpitrsResponseStatus = a});
diff --git a/gen/Network/AWS/RDS/RevokeDBSecurityGroupIngress.hs b/gen/Network/AWS/RDS/RevokeDBSecurityGroupIngress.hs
--- a/gen/Network/AWS/RDS/RevokeDBSecurityGroupIngress.hs
+++ b/gen/Network/AWS/RDS/RevokeDBSecurityGroupIngress.hs
@@ -42,7 +42,7 @@
     , RevokeDBSecurityGroupIngressResponse
     -- * Response Lenses
     , rdsgirsDBSecurityGroup
-    , rdsgirsStatus
+    , rdsgirsResponseStatus
     ) where
 
 import           Network.AWS.Prelude
@@ -153,7 +153,7 @@
 -- | /See:/ 'revokeDBSecurityGroupIngressResponse' smart constructor.
 data RevokeDBSecurityGroupIngressResponse = RevokeDBSecurityGroupIngressResponse'
     { _rdsgirsDBSecurityGroup :: !(Maybe DBSecurityGroup)
-    , _rdsgirsStatus          :: !Int
+    , _rdsgirsResponseStatus  :: !Int
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'RevokeDBSecurityGroupIngressResponse' with the minimum fields required to make a request.
@@ -162,14 +162,14 @@
 --
 -- * 'rdsgirsDBSecurityGroup'
 --
--- * 'rdsgirsStatus'
+-- * 'rdsgirsResponseStatus'
 revokeDBSecurityGroupIngressResponse
-    :: Int -- ^ 'rdsgirsStatus'
+    :: Int -- ^ 'rdsgirsResponseStatus'
     -> RevokeDBSecurityGroupIngressResponse
-revokeDBSecurityGroupIngressResponse pStatus_ =
+revokeDBSecurityGroupIngressResponse pResponseStatus_ =
     RevokeDBSecurityGroupIngressResponse'
     { _rdsgirsDBSecurityGroup = Nothing
-    , _rdsgirsStatus = pStatus_
+    , _rdsgirsResponseStatus = pResponseStatus_
     }
 
 -- | Undocumented member.
@@ -177,5 +177,5 @@
 rdsgirsDBSecurityGroup = lens _rdsgirsDBSecurityGroup (\ s a -> s{_rdsgirsDBSecurityGroup = a});
 
 -- | The response status code.
-rdsgirsStatus :: Lens' RevokeDBSecurityGroupIngressResponse Int
-rdsgirsStatus = lens _rdsgirsStatus (\ s a -> s{_rdsgirsStatus = a});
+rdsgirsResponseStatus :: Lens' RevokeDBSecurityGroupIngressResponse Int
+rdsgirsResponseStatus = lens _rdsgirsResponseStatus (\ s a -> s{_rdsgirsResponseStatus = a});
diff --git a/gen/Network/AWS/RDS/Types.hs b/gen/Network/AWS/RDS/Types.hs
--- a/gen/Network/AWS/RDS/Types.hs
+++ b/gen/Network/AWS/RDS/Types.hs
@@ -16,78 +16,78 @@
       rDS
 
     -- * Errors
-    , _CertificateNotFoundFault
+    , _PointInTimeRestoreNotEnabledFault
+    , _InvalidDBParameterGroupStateFault
     , _ReservedDBInstanceQuotaExceededFault
-    , _DBClusterSnapshotAlreadyExistsFault
-    , _AuthorizationQuotaExceededFault
     , _SourceNotFoundFault
-    , _InvalidDBParameterGroupStateFault
+    , _CertificateNotFoundFault
+    , _AuthorizationQuotaExceededFault
+    , _DBClusterSnapshotAlreadyExistsFault
     , _DBParameterGroupAlreadyExistsFault
-    , _PointInTimeRestoreNotEnabledFault
     , _DBParameterGroupQuotaExceededFault
-    , _ProvisionedIOPSNotAvailableInAZFault
-    , _AuthorizationAlreadyExistsFault
     , _InsufficientDBClusterCapacityFault
     , _ReservedDBInstanceAlreadyExistsFault
+    , _ProvisionedIOPSNotAvailableInAZFault
+    , _AuthorizationAlreadyExistsFault
     , _SubscriptionCategoryNotFoundFault
-    , _DBSubnetQuotaExceededFault
     , _SubscriptionNotFoundFault
     , _InvalidSubnet
-    , _DBClusterNotFoundFault
+    , _DBSubnetQuotaExceededFault
     , _OptionGroupNotFoundFault
+    , _DBClusterNotFoundFault
     , _DBLogFileNotFoundFault
-    , _OptionGroupAlreadyExistsFault
     , _DBClusterAlreadyExistsFault
     , _StorageTypeNotSupportedFault
     , _DBSecurityGroupQuotaExceededFault
-    , _DBSnapshotNotFoundFault
-    , _InvalidEventSubscriptionStateFault
-    , _KMSKeyNotAccessibleFault
+    , _OptionGroupAlreadyExistsFault
     , _OptionGroupQuotaExceededFault
     , _DBSecurityGroupAlreadyExistsFault
-    , _SnapshotQuotaExceededFault
     , _SNSTopicARNNotFoundFault
-    , _DBClusterQuotaExceededFault
+    , _InvalidEventSubscriptionStateFault
+    , _KMSKeyNotAccessibleFault
+    , _DBSnapshotNotFoundFault
     , _DBClusterParameterGroupNotFoundFault
+    , _DBClusterQuotaExceededFault
+    , _SnapshotQuotaExceededFault
     , _DBSubnetGroupAlreadyExistsFault
-    , _InstanceQuotaExceededFault
     , _SNSNoAuthorizationFault
     , _DBSecurityGroupNotFoundFault
     , _DBSecurityGroupNotSupportedFault
+    , _InstanceQuotaExceededFault
     , _DomainNotFoundFault
-    , _DBClusterSnapshotNotFoundFault
-    , _ReservedDBInstancesOfferingNotFoundFault
+    , _DBParameterGroupNotFoundFault
     , _InvalidDBSubnetGroupFault
+    , _ReservedDBInstancesOfferingNotFoundFault
     , _InvalidDBSubnetStateFault
-    , _DBParameterGroupNotFoundFault
+    , _DBClusterSnapshotNotFoundFault
     , _SNSInvalidTopicFault
-    , _SubscriptionAlreadyExistFault
-    , _InvalidDBClusterSnapshotStateFault
     , _InsufficientDBInstanceCapacityFault
+    , _InvalidDBClusterSnapshotStateFault
+    , _SubscriptionAlreadyExistFault
     , _InvalidVPCNetworkStateFault
     , _AuthorizationNotFoundFault
     , _ReservedDBInstanceNotFoundFault
     , _DBSubnetGroupQuotaExceededFault
     , _DBSubnetGroupNotAllowedFault
     , _EventSubscriptionQuotaExceededFault
+    , _InsufficientStorageClusterCapacityFault
     , _InvalidOptionGroupStateFault
     , _InvalidDBClusterStateFault
-    , _InsufficientStorageClusterCapacityFault
     , _DBInstanceAlreadyExistsFault
-    , _ResourceNotFoundFault
-    , _DBUpgradeDependencyFailureFault
+    , _InvalidRestoreFault
     , _InvalidDBSecurityGroupStateFault
+    , _ResourceNotFoundFault
     , _InsufficientDomainCapacityFault
     , _DBSubnetGroupNotFoundFault
-    , _InvalidRestoreFault
+    , _DBUpgradeDependencyFailureFault
     , _InvalidDBInstanceStateFault
-    , _InvalidDBSnapshotStateFault
-    , _InvalidDBSubnetGroupStateFault
-    , _StorageQuotaExceededFault
     , _DBSnapshotAlreadyExistsFault
     , _DBInstanceNotFoundFault
-    , _SubnetAlreadyInUse
+    , _StorageQuotaExceededFault
+    , _InvalidDBSnapshotStateFault
+    , _InvalidDBSubnetGroupStateFault
     , _DBSubnetGroupDoesNotCoverEnoughAZs
+    , _SubnetAlreadyInUse
 
     -- * ApplyMethod
     , ApplyMethod (..)
@@ -135,13 +135,13 @@
     , dcEngine
     , dcLatestRestorableTime
     , dcPreferredMaintenanceWindow
-    , dcCharacterSetName
     , dcAvailabilityZones
+    , dcCharacterSetName
     , dcPreferredBackupWindow
     , dcVPCSecurityGroups
     , dcBackupRetentionPeriod
-    , dcDatabaseName
     , dcDBSubnetGroup
+    , dcDatabaseName
     , dcAllocatedStorage
     , dcEndpoint
     , dcPercentProgress
@@ -184,8 +184,8 @@
     , dcsDBClusterSnapshotIdentifier
     , dcsEngine
     , dcsLicenseModel
-    , dcsSnapshotType
     , dcsAvailabilityZones
+    , dcsSnapshotType
     , dcsSnapshotCreateTime
     , dcsAllocatedStorage
     , dcsClusterCreateTime
@@ -195,24 +195,24 @@
     -- * DBEngineVersion
     , DBEngineVersion
     , dbEngineVersion
-    , devDBEngineVersionDescription
     , devEngineVersion
+    , devDBEngineVersionDescription
     , devDefaultCharacterSet
-    , devSupportedCharacterSets
     , devEngine
     , devDBParameterGroupFamily
+    , devSupportedCharacterSets
     , devDBEngineDescription
 
     -- * DBInstance
     , DBInstance
     , dbInstance
-    , diDBSecurityGroups
     , diEngineVersion
+    , diDBSecurityGroups
     , diStorageEncrypted
     , diDBClusterIdentifier
+    , diPubliclyAccessible
     , diAutoMinorVersionUpgrade
     , diMasterUsername
-    , diPubliclyAccessible
     , diReadReplicaDBInstanceIdentifiers
     , diIOPS
     , diInstanceCreateTime
@@ -222,31 +222,31 @@
     , diDBInstanceClass
     , diLicenseModel
     , diPreferredMaintenanceWindow
-    , diCharacterSetName
-    , diDBInstanceIdentifier
     , diCACertificateIdentifier
+    , diDBInstanceIdentifier
+    , diCharacterSetName
+    , diKMSKeyId
     , diPreferredBackupWindow
     , diAvailabilityZone
     , diVPCSecurityGroups
     , diBackupRetentionPeriod
-    , diKMSKeyId
     , diDBSubnetGroup
     , diMultiAZ
-    , diSecondaryAvailabilityZone
     , diOptionGroupMemberships
-    , diDBiResourceId
+    , diSecondaryAvailabilityZone
     , diAllocatedStorage
-    , diEndpoint
+    , diDBiResourceId
     , diDBParameterGroups
-    , diTDECredentialARN
     , diCopyTagsToSnapshot
+    , diTDECredentialARN
+    , diEndpoint
     , diDBInstanceStatus
     , diDBInstancePort
     , diPendingModifiedValues
+    , diStorageType
     , diStatusInfos
-    , diDBName
     , diDomainMemberships
-    , diStorageType
+    , diDBName
 
     -- * DBInstanceStatusInfo
     , DBInstanceStatusInfo
@@ -277,12 +277,12 @@
     -- * DBSecurityGroup
     , DBSecurityGroup
     , dbSecurityGroup
-    , dsgVPCId
-    , dsgOwnerId
-    , dsgIPRanges
-    , dsgDBSecurityGroupName
-    , dsgEC2SecurityGroups
-    , dsgDBSecurityGroupDescription
+    , dbsgVPCId
+    , dbsgOwnerId
+    , dbsgIPRanges
+    , dbsgDBSecurityGroupName
+    , dbsgEC2SecurityGroups
+    , dbsgDBSecurityGroupDescription
 
     -- * DBSecurityGroupMembership
     , DBSecurityGroupMembership
@@ -298,21 +298,21 @@
     , dsMasterUsername
     , dsSourceRegion
     , dsIOPS
-    , dsInstanceCreateTime
     , dsVPCId
+    , dsInstanceCreateTime
     , dsEngine
     , dsEncrypted
     , dsDBSnapshotIdentifier
     , dsLicenseModel
+    , dsSourceDBSnapshotIdentifier
     , dsSnapshotType
     , dsDBInstanceIdentifier
-    , dsSourceDBSnapshotIdentifier
-    , dsAvailabilityZone
     , dsKMSKeyId
+    , dsAvailabilityZone
     , dsSnapshotCreateTime
     , dsAllocatedStorage
-    , dsTDECredentialARN
     , dsOptionGroupName
+    , dsTDECredentialARN
     , dsPercentProgress
     , dsPort
     , dsStorageType
@@ -320,11 +320,11 @@
     -- * DBSubnetGroup
     , DBSubnetGroup
     , dbSubnetGroup
-    , dbsgDBSubnetGroupName
-    , dbsgVPCId
-    , dbsgSubnets
-    , dbsgDBSubnetGroupDescription
-    , dbsgSubnetGroupStatus
+    , dsgDBSubnetGroupName
+    , dsgVPCId
+    , dsgSubnets
+    , dsgDBSubnetGroupDescription
+    , dsgSubnetGroupStatus
 
     -- * DescribeDBLogFilesDetails
     , DescribeDBLogFilesDetails
@@ -358,8 +358,8 @@
     , EngineDefaults
     , engineDefaults
     , edDBParameterGroupFamily
-    , edParameters
     , edMarker
+    , edParameters
 
     -- * Event
     , Event
@@ -379,8 +379,8 @@
     -- * EventSubscription
     , EventSubscription
     , eventSubscription
-    , esCustomerAWSId
     , esStatus
+    , esCustomerAWSId
     , esCustSubscriptionId
     , esSNSTopicARN
     , esEnabled
@@ -446,13 +446,13 @@
     , ogoPermanent
     , ogoPersistent
     , ogoEngineName
-    , ogoName
     , ogoMajorEngineVersion
+    , ogoName
     , ogoDefaultPort
     , ogoOptionGroupOptionSettings
     , ogoPortRequired
-    , ogoOptionsDependedOn
     , ogoDescription
+    , ogoOptionsDependedOn
 
     -- * OptionGroupOptionSetting
     , OptionGroupOptionSetting
@@ -461,8 +461,8 @@
     , ogosSettingName
     , ogosDefaultValue
     , ogosIsModifiable
-    , ogosAllowedValues
     , ogosSettingDescription
+    , ogosAllowedValues
 
     -- * OptionSetting
     , OptionSetting
@@ -473,8 +473,8 @@
     , osName
     , osDefaultValue
     , osIsModifiable
-    , osAllowedValues
     , osDataType
+    , osAllowedValues
     , osDescription
 
     -- * OrderableDBInstanceOption
@@ -487,8 +487,8 @@
     , odioDBInstanceClass
     , odioLicenseModel
     , odioAvailabilityZones
-    , odioReadReplicaCapable
     , odioSupportsStorageEncryption
+    , odioReadReplicaCapable
     , odioVPC
     , odioStorageType
 
@@ -501,8 +501,8 @@
     , pMinimumEngineVersion
     , pSource
     , pIsModifiable
-    , pAllowedValues
     , pDataType
+    , pAllowedValues
     , pParameterName
     , pDescription
 
@@ -513,8 +513,8 @@
     , pmaAction
     , pmaOptInStatus
     , pmaDescription
-    , pmaCurrentApplyDate
     , pmaForcedApplyDate
+    , pmaCurrentApplyDate
 
     -- * PendingModifiedValues
     , PendingModifiedValues
@@ -523,8 +523,8 @@
     , pmvMasterUserPassword
     , pmvIOPS
     , pmvDBInstanceClass
-    , pmvDBInstanceIdentifier
     , pmvCACertificateIdentifier
+    , pmvDBInstanceIdentifier
     , pmvBackupRetentionPeriod
     , pmvMultiAZ
     , pmvAllocatedStorage
@@ -543,15 +543,15 @@
     , rdiDBInstanceCount
     , rdiState
     , rdiCurrencyCode
-    , rdiProductDescription
     , rdiStartTime
+    , rdiProductDescription
     , rdiReservedDBInstanceId
     , rdiDBInstanceClass
     , rdiMultiAZ
     , rdiReservedDBInstancesOfferingId
+    , rdiRecurringCharges
     , rdiOfferingType
     , rdiUsagePrice
-    , rdiRecurringCharges
     , rdiFixedPrice
     , rdiDuration
 
@@ -563,9 +563,9 @@
     , rdioDBInstanceClass
     , rdioMultiAZ
     , rdioReservedDBInstancesOfferingId
+    , rdioRecurringCharges
     , rdioOfferingType
     , rdioUsagePrice
-    , rdioRecurringCharges
     , rdioFixedPrice
     , rdioDuration
 
@@ -631,53 +631,64 @@
       | has (hasStatus 509) e = Just "limit_exceeded"
       | otherwise = Nothing
 
--- | /CertificateIdentifier/ does not refer to an existing certificate.
-_CertificateNotFoundFault :: AsError a => Getting (First ServiceError) a ServiceError
-_CertificateNotFoundFault =
-    _ServiceError . hasStatus 404 . hasCode "CertificateNotFound"
+-- | /SourceDBInstanceIdentifier/ refers to a DB instance with
+-- /BackupRetentionPeriod/ equal to 0.
+_PointInTimeRestoreNotEnabledFault :: AsError a => Getting (First ServiceError) a ServiceError
+_PointInTimeRestoreNotEnabledFault =
+    _ServiceError . hasStatus 400 . hasCode "PointInTimeRestoreNotEnabled"
 
+-- | The DB parameter group cannot be deleted because it is in use.
+_InvalidDBParameterGroupStateFault :: AsError a => Getting (First ServiceError) a ServiceError
+_InvalidDBParameterGroupStateFault =
+    _ServiceError . hasStatus 400 . hasCode "InvalidDBParameterGroupState"
+
 -- | Request would exceed the user\'s DB Instance quota.
 _ReservedDBInstanceQuotaExceededFault :: AsError a => Getting (First ServiceError) a ServiceError
 _ReservedDBInstanceQuotaExceededFault =
     _ServiceError . hasStatus 400 . hasCode "ReservedDBInstanceQuotaExceeded"
 
--- | User already has a DB cluster snapshot with the given identifier.
-_DBClusterSnapshotAlreadyExistsFault :: AsError a => Getting (First ServiceError) a ServiceError
-_DBClusterSnapshotAlreadyExistsFault =
-    _ServiceError .
-    hasStatus 400 . hasCode "DBClusterSnapshotAlreadyExistsFault"
+-- | The requested source could not be found.
+_SourceNotFoundFault :: AsError a => Getting (First ServiceError) a ServiceError
+_SourceNotFoundFault = _ServiceError . hasStatus 404 . hasCode "SourceNotFound"
 
+-- | /CertificateIdentifier/ does not refer to an existing certificate.
+_CertificateNotFoundFault :: AsError a => Getting (First ServiceError) a ServiceError
+_CertificateNotFoundFault =
+    _ServiceError . hasStatus 404 . hasCode "CertificateNotFound"
+
 -- | DB security group authorization quota has been reached.
 _AuthorizationQuotaExceededFault :: AsError a => Getting (First ServiceError) a ServiceError
 _AuthorizationQuotaExceededFault =
     _ServiceError . hasStatus 400 . hasCode "AuthorizationQuotaExceeded"
 
--- | The requested source could not be found.
-_SourceNotFoundFault :: AsError a => Getting (First ServiceError) a ServiceError
-_SourceNotFoundFault = _ServiceError . hasStatus 404 . hasCode "SourceNotFound"
-
--- | The DB parameter group cannot be deleted because it is in use.
-_InvalidDBParameterGroupStateFault :: AsError a => Getting (First ServiceError) a ServiceError
-_InvalidDBParameterGroupStateFault =
-    _ServiceError . hasStatus 400 . hasCode "InvalidDBParameterGroupState"
+-- | User already has a DB cluster snapshot with the given identifier.
+_DBClusterSnapshotAlreadyExistsFault :: AsError a => Getting (First ServiceError) a ServiceError
+_DBClusterSnapshotAlreadyExistsFault =
+    _ServiceError .
+    hasStatus 400 . hasCode "DBClusterSnapshotAlreadyExistsFault"
 
 -- | A DB parameter group with the same name exists.
 _DBParameterGroupAlreadyExistsFault :: AsError a => Getting (First ServiceError) a ServiceError
 _DBParameterGroupAlreadyExistsFault =
     _ServiceError . hasStatus 400 . hasCode "DBParameterGroupAlreadyExists"
 
--- | /SourceDBInstanceIdentifier/ refers to a DB instance with
--- /BackupRetentionPeriod/ equal to 0.
-_PointInTimeRestoreNotEnabledFault :: AsError a => Getting (First ServiceError) a ServiceError
-_PointInTimeRestoreNotEnabledFault =
-    _ServiceError . hasStatus 400 . hasCode "PointInTimeRestoreNotEnabled"
-
 -- | Request would result in user exceeding the allowed number of DB
 -- parameter groups.
 _DBParameterGroupQuotaExceededFault :: AsError a => Getting (First ServiceError) a ServiceError
 _DBParameterGroupQuotaExceededFault =
     _ServiceError . hasStatus 400 . hasCode "DBParameterGroupQuotaExceeded"
 
+-- | The DB cluster does not have enough capacity for the current operation.
+_InsufficientDBClusterCapacityFault :: AsError a => Getting (First ServiceError) a ServiceError
+_InsufficientDBClusterCapacityFault =
+    _ServiceError .
+    hasStatus 403 . hasCode "InsufficientDBClusterCapacityFault"
+
+-- | User already has a reservation with the given identifier.
+_ReservedDBInstanceAlreadyExistsFault :: AsError a => Getting (First ServiceError) a ServiceError
+_ReservedDBInstanceAlreadyExistsFault =
+    _ServiceError . hasStatus 404 . hasCode "ReservedDBInstanceAlreadyExists"
+
 -- | Provisioned IOPS not available in the specified Availability Zone.
 _ProvisionedIOPSNotAvailableInAZFault :: AsError a => Getting (First ServiceError) a ServiceError
 _ProvisionedIOPSNotAvailableInAZFault =
@@ -690,28 +701,11 @@
 _AuthorizationAlreadyExistsFault =
     _ServiceError . hasStatus 400 . hasCode "AuthorizationAlreadyExists"
 
--- | The DB cluster does not have enough capacity for the current operation.
-_InsufficientDBClusterCapacityFault :: AsError a => Getting (First ServiceError) a ServiceError
-_InsufficientDBClusterCapacityFault =
-    _ServiceError .
-    hasStatus 403 . hasCode "InsufficientDBClusterCapacityFault"
-
--- | User already has a reservation with the given identifier.
-_ReservedDBInstanceAlreadyExistsFault :: AsError a => Getting (First ServiceError) a ServiceError
-_ReservedDBInstanceAlreadyExistsFault =
-    _ServiceError . hasStatus 404 . hasCode "ReservedDBInstanceAlreadyExists"
-
 -- | The supplied category does not exist.
 _SubscriptionCategoryNotFoundFault :: AsError a => Getting (First ServiceError) a ServiceError
 _SubscriptionCategoryNotFoundFault =
     _ServiceError . hasStatus 404 . hasCode "SubscriptionCategoryNotFound"
 
--- | Request would result in user exceeding the allowed number of subnets in
--- a DB subnet groups.
-_DBSubnetQuotaExceededFault :: AsError a => Getting (First ServiceError) a ServiceError
-_DBSubnetQuotaExceededFault =
-    _ServiceError . hasStatus 400 . hasCode "DBSubnetQuotaExceededFault"
-
 -- | The subscription name does not exist.
 _SubscriptionNotFoundFault :: AsError a => Getting (First ServiceError) a ServiceError
 _SubscriptionNotFoundFault =
@@ -722,26 +716,27 @@
 _InvalidSubnet :: AsError a => Getting (First ServiceError) a ServiceError
 _InvalidSubnet = _ServiceError . hasStatus 400 . hasCode "InvalidSubnet"
 
--- | /DBClusterIdentifier/ does not refer to an existing DB cluster.
-_DBClusterNotFoundFault :: AsError a => Getting (First ServiceError) a ServiceError
-_DBClusterNotFoundFault =
-    _ServiceError . hasStatus 404 . hasCode "DBClusterNotFoundFault"
+-- | Request would result in user exceeding the allowed number of subnets in
+-- a DB subnet groups.
+_DBSubnetQuotaExceededFault :: AsError a => Getting (First ServiceError) a ServiceError
+_DBSubnetQuotaExceededFault =
+    _ServiceError . hasStatus 400 . hasCode "DBSubnetQuotaExceededFault"
 
 -- | The specified option group could not be found.
 _OptionGroupNotFoundFault :: AsError a => Getting (First ServiceError) a ServiceError
 _OptionGroupNotFoundFault =
     _ServiceError . hasStatus 404 . hasCode "OptionGroupNotFoundFault"
 
+-- | /DBClusterIdentifier/ does not refer to an existing DB cluster.
+_DBClusterNotFoundFault :: AsError a => Getting (First ServiceError) a ServiceError
+_DBClusterNotFoundFault =
+    _ServiceError . hasStatus 404 . hasCode "DBClusterNotFoundFault"
+
 -- | /LogFileName/ does not refer to an existing DB log file.
 _DBLogFileNotFoundFault :: AsError a => Getting (First ServiceError) a ServiceError
 _DBLogFileNotFoundFault =
     _ServiceError . hasStatus 404 . hasCode "DBLogFileNotFoundFault"
 
--- | The option group you are trying to create already exists.
-_OptionGroupAlreadyExistsFault :: AsError a => Getting (First ServiceError) a ServiceError
-_OptionGroupAlreadyExistsFault =
-    _ServiceError . hasStatus 400 . hasCode "OptionGroupAlreadyExistsFault"
-
 -- | User already has a DB cluster with the given identifier.
 _DBClusterAlreadyExistsFault :: AsError a => Getting (First ServiceError) a ServiceError
 _DBClusterAlreadyExistsFault =
@@ -758,21 +753,10 @@
 _DBSecurityGroupQuotaExceededFault =
     _ServiceError . hasStatus 400 . hasCode "QuotaExceeded.DBSecurityGroup"
 
--- | /DBSnapshotIdentifier/ does not refer to an existing DB snapshot.
-_DBSnapshotNotFoundFault :: AsError a => Getting (First ServiceError) a ServiceError
-_DBSnapshotNotFoundFault =
-    _ServiceError . hasStatus 404 . hasCode "DBSnapshotNotFound"
-
--- | This error can occur if someone else is modifying a subscription. You
--- should retry the action.
-_InvalidEventSubscriptionStateFault :: AsError a => Getting (First ServiceError) a ServiceError
-_InvalidEventSubscriptionStateFault =
-    _ServiceError . hasStatus 400 . hasCode "InvalidEventSubscriptionState"
-
--- | Error accessing KMS key.
-_KMSKeyNotAccessibleFault :: AsError a => Getting (First ServiceError) a ServiceError
-_KMSKeyNotAccessibleFault =
-    _ServiceError . hasStatus 400 . hasCode "KMSKeyNotAccessibleFault"
+-- | The option group you are trying to create already exists.
+_OptionGroupAlreadyExistsFault :: AsError a => Getting (First ServiceError) a ServiceError
+_OptionGroupAlreadyExistsFault =
+    _ServiceError . hasStatus 400 . hasCode "OptionGroupAlreadyExistsFault"
 
 -- | The quota of 20 option groups was exceeded for this AWS account.
 _OptionGroupQuotaExceededFault :: AsError a => Getting (First ServiceError) a ServiceError
@@ -785,40 +769,50 @@
 _DBSecurityGroupAlreadyExistsFault =
     _ServiceError . hasStatus 400 . hasCode "DBSecurityGroupAlreadyExists"
 
--- | Request would result in user exceeding the allowed number of DB
--- snapshots.
-_SnapshotQuotaExceededFault :: AsError a => Getting (First ServiceError) a ServiceError
-_SnapshotQuotaExceededFault =
-    _ServiceError . hasStatus 400 . hasCode "SnapshotQuotaExceeded"
-
 -- | The SNS topic ARN does not exist.
 _SNSTopicARNNotFoundFault :: AsError a => Getting (First ServiceError) a ServiceError
 _SNSTopicARNNotFoundFault =
     _ServiceError . hasStatus 404 . hasCode "SNSTopicArnNotFound"
 
--- | User attempted to create a new DB cluster and the user has already
--- reached the maximum allowed DB cluster quota.
-_DBClusterQuotaExceededFault :: AsError a => Getting (First ServiceError) a ServiceError
-_DBClusterQuotaExceededFault =
-    _ServiceError . hasStatus 403 . hasCode "DBClusterQuotaExceededFault"
+-- | This error can occur if someone else is modifying a subscription. You
+-- should retry the action.
+_InvalidEventSubscriptionStateFault :: AsError a => Getting (First ServiceError) a ServiceError
+_InvalidEventSubscriptionStateFault =
+    _ServiceError . hasStatus 400 . hasCode "InvalidEventSubscriptionState"
 
+-- | Error accessing KMS key.
+_KMSKeyNotAccessibleFault :: AsError a => Getting (First ServiceError) a ServiceError
+_KMSKeyNotAccessibleFault =
+    _ServiceError . hasStatus 400 . hasCode "KMSKeyNotAccessibleFault"
+
+-- | /DBSnapshotIdentifier/ does not refer to an existing DB snapshot.
+_DBSnapshotNotFoundFault :: AsError a => Getting (First ServiceError) a ServiceError
+_DBSnapshotNotFoundFault =
+    _ServiceError . hasStatus 404 . hasCode "DBSnapshotNotFound"
+
 -- | /DBClusterParameterGroupName/ does not refer to an existing DB Cluster
 -- parameter group.
 _DBClusterParameterGroupNotFoundFault :: AsError a => Getting (First ServiceError) a ServiceError
 _DBClusterParameterGroupNotFoundFault =
     _ServiceError . hasStatus 404 . hasCode "DBClusterParameterGroupNotFound"
 
+-- | User attempted to create a new DB cluster and the user has already
+-- reached the maximum allowed DB cluster quota.
+_DBClusterQuotaExceededFault :: AsError a => Getting (First ServiceError) a ServiceError
+_DBClusterQuotaExceededFault =
+    _ServiceError . hasStatus 403 . hasCode "DBClusterQuotaExceededFault"
+
+-- | Request would result in user exceeding the allowed number of DB
+-- snapshots.
+_SnapshotQuotaExceededFault :: AsError a => Getting (First ServiceError) a ServiceError
+_SnapshotQuotaExceededFault =
+    _ServiceError . hasStatus 400 . hasCode "SnapshotQuotaExceeded"
+
 -- | /DBSubnetGroupName/ is already used by an existing DB subnet group.
 _DBSubnetGroupAlreadyExistsFault :: AsError a => Getting (First ServiceError) a ServiceError
 _DBSubnetGroupAlreadyExistsFault =
     _ServiceError . hasStatus 400 . hasCode "DBSubnetGroupAlreadyExists"
 
--- | Request would result in user exceeding the allowed number of DB
--- instances.
-_InstanceQuotaExceededFault :: AsError a => Getting (First ServiceError) a ServiceError
-_InstanceQuotaExceededFault =
-    _ServiceError . hasStatus 400 . hasCode "InstanceQuotaExceeded"
-
 -- | You do not have permission to publish to the SNS topic ARN.
 _SNSNoAuthorizationFault :: AsError a => Getting (First ServiceError) a ServiceError
 _SNSNoAuthorizationFault =
@@ -834,22 +828,21 @@
 _DBSecurityGroupNotSupportedFault =
     _ServiceError . hasStatus 400 . hasCode "DBSecurityGroupNotSupported"
 
+-- | Request would result in user exceeding the allowed number of DB
+-- instances.
+_InstanceQuotaExceededFault :: AsError a => Getting (First ServiceError) a ServiceError
+_InstanceQuotaExceededFault =
+    _ServiceError . hasStatus 400 . hasCode "InstanceQuotaExceeded"
+
 -- | /Domain/ does not refer to an existing Active Directory Domain.
 _DomainNotFoundFault :: AsError a => Getting (First ServiceError) a ServiceError
 _DomainNotFoundFault =
     _ServiceError . hasStatus 404 . hasCode "DomainNotFoundFault"
 
--- | /DBClusterSnapshotIdentifier/ does not refer to an existing DB cluster
--- snapshot.
-_DBClusterSnapshotNotFoundFault :: AsError a => Getting (First ServiceError) a ServiceError
-_DBClusterSnapshotNotFoundFault =
-    _ServiceError . hasStatus 404 . hasCode "DBClusterSnapshotNotFoundFault"
-
--- | Specified offering does not exist.
-_ReservedDBInstancesOfferingNotFoundFault :: AsError a => Getting (First ServiceError) a ServiceError
-_ReservedDBInstancesOfferingNotFoundFault =
-    _ServiceError .
-    hasStatus 404 . hasCode "ReservedDBInstancesOfferingNotFound"
+-- | /DBParameterGroupName/ does not refer to an existing DB parameter group.
+_DBParameterGroupNotFoundFault :: AsError a => Getting (First ServiceError) a ServiceError
+_DBParameterGroupNotFoundFault =
+    _ServiceError . hasStatus 404 . hasCode "DBParameterGroupNotFound"
 
 -- | Indicates the DBSubnetGroup does not belong to the same VPC as that of
 -- an existing cross region read replica of the same source instance.
@@ -857,25 +850,33 @@
 _InvalidDBSubnetGroupFault =
     _ServiceError . hasStatus 400 . hasCode "InvalidDBSubnetGroupFault"
 
+-- | Specified offering does not exist.
+_ReservedDBInstancesOfferingNotFoundFault :: AsError a => Getting (First ServiceError) a ServiceError
+_ReservedDBInstancesOfferingNotFoundFault =
+    _ServiceError .
+    hasStatus 404 . hasCode "ReservedDBInstancesOfferingNotFound"
+
 -- | The DB subnet is not in the /available/ state.
 _InvalidDBSubnetStateFault :: AsError a => Getting (First ServiceError) a ServiceError
 _InvalidDBSubnetStateFault =
     _ServiceError . hasStatus 400 . hasCode "InvalidDBSubnetStateFault"
 
--- | /DBParameterGroupName/ does not refer to an existing DB parameter group.
-_DBParameterGroupNotFoundFault :: AsError a => Getting (First ServiceError) a ServiceError
-_DBParameterGroupNotFoundFault =
-    _ServiceError . hasStatus 404 . hasCode "DBParameterGroupNotFound"
+-- | /DBClusterSnapshotIdentifier/ does not refer to an existing DB cluster
+-- snapshot.
+_DBClusterSnapshotNotFoundFault :: AsError a => Getting (First ServiceError) a ServiceError
+_DBClusterSnapshotNotFoundFault =
+    _ServiceError . hasStatus 404 . hasCode "DBClusterSnapshotNotFoundFault"
 
 -- | SNS has responded that there is a problem with the SND topic specified.
 _SNSInvalidTopicFault :: AsError a => Getting (First ServiceError) a ServiceError
 _SNSInvalidTopicFault =
     _ServiceError . hasStatus 400 . hasCode "SNSInvalidTopic"
 
--- | The supplied subscription name already exists.
-_SubscriptionAlreadyExistFault :: AsError a => Getting (First ServiceError) a ServiceError
-_SubscriptionAlreadyExistFault =
-    _ServiceError . hasStatus 400 . hasCode "SubscriptionAlreadyExist"
+-- | Specified DB instance class is not available in the specified
+-- Availability Zone.
+_InsufficientDBInstanceCapacityFault :: AsError a => Getting (First ServiceError) a ServiceError
+_InsufficientDBInstanceCapacityFault =
+    _ServiceError . hasStatus 400 . hasCode "InsufficientDBInstanceCapacity"
 
 -- | The supplied value is not a valid DB cluster snapshot state.
 _InvalidDBClusterSnapshotStateFault :: AsError a => Getting (First ServiceError) a ServiceError
@@ -883,11 +884,10 @@
     _ServiceError .
     hasStatus 400 . hasCode "InvalidDBClusterSnapshotStateFault"
 
--- | Specified DB instance class is not available in the specified
--- Availability Zone.
-_InsufficientDBInstanceCapacityFault :: AsError a => Getting (First ServiceError) a ServiceError
-_InsufficientDBInstanceCapacityFault =
-    _ServiceError . hasStatus 400 . hasCode "InsufficientDBInstanceCapacity"
+-- | The supplied subscription name already exists.
+_SubscriptionAlreadyExistFault :: AsError a => Getting (First ServiceError) a ServiceError
+_SubscriptionAlreadyExistFault =
+    _ServiceError . hasStatus 400 . hasCode "SubscriptionAlreadyExist"
 
 -- | DB subnet group does not cover all Availability Zones after it is
 -- created because users\' change.
@@ -926,6 +926,14 @@
 _EventSubscriptionQuotaExceededFault =
     _ServiceError . hasStatus 400 . hasCode "EventSubscriptionQuotaExceeded"
 
+-- | There is insufficient storage available for the current action. You may
+-- be able to resolve this error by updating your subnet group to use
+-- different Availability Zones that have more storage available.
+_InsufficientStorageClusterCapacityFault :: AsError a => Getting (First ServiceError) a ServiceError
+_InsufficientStorageClusterCapacityFault =
+    _ServiceError .
+    hasStatus 400 . hasCode "InsufficientStorageClusterCapacity"
+
 -- | The option group is not in the /available/ state.
 _InvalidOptionGroupStateFault :: AsError a => Getting (First ServiceError) a ServiceError
 _InvalidOptionGroupStateFault =
@@ -936,35 +944,26 @@
 _InvalidDBClusterStateFault =
     _ServiceError . hasStatus 400 . hasCode "InvalidDBClusterStateFault"
 
--- | There is insufficient storage available for the current action. You may
--- be able to resolve this error by updating your subnet group to use
--- different Availability Zones that have more storage available.
-_InsufficientStorageClusterCapacityFault :: AsError a => Getting (First ServiceError) a ServiceError
-_InsufficientStorageClusterCapacityFault =
-    _ServiceError .
-    hasStatus 400 . hasCode "InsufficientStorageClusterCapacity"
-
 -- | User already has a DB instance with the given identifier.
 _DBInstanceAlreadyExistsFault :: AsError a => Getting (First ServiceError) a ServiceError
 _DBInstanceAlreadyExistsFault =
     _ServiceError . hasStatus 400 . hasCode "DBInstanceAlreadyExists"
 
--- | The specified resource ID was not found.
-_ResourceNotFoundFault :: AsError a => Getting (First ServiceError) a ServiceError
-_ResourceNotFoundFault =
-    _ServiceError . hasStatus 404 . hasCode "ResourceNotFoundFault"
-
--- | The DB upgrade failed because a resource the DB depends on could not be
--- modified.
-_DBUpgradeDependencyFailureFault :: AsError a => Getting (First ServiceError) a ServiceError
-_DBUpgradeDependencyFailureFault =
-    _ServiceError . hasStatus 400 . hasCode "DBUpgradeDependencyFailure"
+-- | Cannot restore from vpc backup to non-vpc DB instance.
+_InvalidRestoreFault :: AsError a => Getting (First ServiceError) a ServiceError
+_InvalidRestoreFault =
+    _ServiceError . hasStatus 400 . hasCode "InvalidRestoreFault"
 
 -- | The state of the DB security group does not allow deletion.
 _InvalidDBSecurityGroupStateFault :: AsError a => Getting (First ServiceError) a ServiceError
 _InvalidDBSecurityGroupStateFault =
     _ServiceError . hasStatus 400 . hasCode "InvalidDBSecurityGroupState"
 
+-- | The specified resource ID was not found.
+_ResourceNotFoundFault :: AsError a => Getting (First ServiceError) a ServiceError
+_ResourceNotFoundFault =
+    _ServiceError . hasStatus 404 . hasCode "ResourceNotFoundFault"
+
 -- | Requested Active Directory Domain has reached maximum number of
 -- instances.
 _InsufficientDomainCapacityFault :: AsError a => Getting (First ServiceError) a ServiceError
@@ -976,32 +975,17 @@
 _DBSubnetGroupNotFoundFault =
     _ServiceError . hasStatus 404 . hasCode "DBSubnetGroupNotFoundFault"
 
--- | Cannot restore from vpc backup to non-vpc DB instance.
-_InvalidRestoreFault :: AsError a => Getting (First ServiceError) a ServiceError
-_InvalidRestoreFault =
-    _ServiceError . hasStatus 400 . hasCode "InvalidRestoreFault"
+-- | The DB upgrade failed because a resource the DB depends on could not be
+-- modified.
+_DBUpgradeDependencyFailureFault :: AsError a => Getting (First ServiceError) a ServiceError
+_DBUpgradeDependencyFailureFault =
+    _ServiceError . hasStatus 400 . hasCode "DBUpgradeDependencyFailure"
 
 -- | The specified DB instance is not in the /available/ state.
 _InvalidDBInstanceStateFault :: AsError a => Getting (First ServiceError) a ServiceError
 _InvalidDBInstanceStateFault =
     _ServiceError . hasStatus 400 . hasCode "InvalidDBInstanceState"
 
--- | The state of the DB snapshot does not allow deletion.
-_InvalidDBSnapshotStateFault :: AsError a => Getting (First ServiceError) a ServiceError
-_InvalidDBSnapshotStateFault =
-    _ServiceError . hasStatus 400 . hasCode "InvalidDBSnapshotState"
-
--- | The DB subnet group cannot be deleted because it is in use.
-_InvalidDBSubnetGroupStateFault :: AsError a => Getting (First ServiceError) a ServiceError
-_InvalidDBSubnetGroupStateFault =
-    _ServiceError . hasStatus 400 . hasCode "InvalidDBSubnetGroupStateFault"
-
--- | Request would result in user exceeding the allowed amount of storage
--- available across all DB instances.
-_StorageQuotaExceededFault :: AsError a => Getting (First ServiceError) a ServiceError
-_StorageQuotaExceededFault =
-    _ServiceError . hasStatus 400 . hasCode "StorageQuotaExceeded"
-
 -- | /DBSnapshotIdentifier/ is already used by an existing snapshot.
 _DBSnapshotAlreadyExistsFault :: AsError a => Getting (First ServiceError) a ServiceError
 _DBSnapshotAlreadyExistsFault =
@@ -1012,14 +996,30 @@
 _DBInstanceNotFoundFault =
     _ServiceError . hasStatus 404 . hasCode "DBInstanceNotFound"
 
--- | The DB subnet is already in use in the Availability Zone.
-_SubnetAlreadyInUse :: AsError a => Getting (First ServiceError) a ServiceError
-_SubnetAlreadyInUse =
-    _ServiceError . hasStatus 400 . hasCode "SubnetAlreadyInUse"
+-- | Request would result in user exceeding the allowed amount of storage
+-- available across all DB instances.
+_StorageQuotaExceededFault :: AsError a => Getting (First ServiceError) a ServiceError
+_StorageQuotaExceededFault =
+    _ServiceError . hasStatus 400 . hasCode "StorageQuotaExceeded"
 
+-- | The state of the DB snapshot does not allow deletion.
+_InvalidDBSnapshotStateFault :: AsError a => Getting (First ServiceError) a ServiceError
+_InvalidDBSnapshotStateFault =
+    _ServiceError . hasStatus 400 . hasCode "InvalidDBSnapshotState"
+
+-- | The DB subnet group cannot be deleted because it is in use.
+_InvalidDBSubnetGroupStateFault :: AsError a => Getting (First ServiceError) a ServiceError
+_InvalidDBSubnetGroupStateFault =
+    _ServiceError . hasStatus 400 . hasCode "InvalidDBSubnetGroupStateFault"
+
 -- | Subnets in the DB subnet group should cover at least two Availability
 -- Zones unless there is only one Availability Zone.
 _DBSubnetGroupDoesNotCoverEnoughAZs :: AsError a => Getting (First ServiceError) a ServiceError
 _DBSubnetGroupDoesNotCoverEnoughAZs =
     _ServiceError .
     hasStatus 400 . hasCode "DBSubnetGroupDoesNotCoverEnoughAZs"
+
+-- | The DB subnet is already in use in the Availability Zone.
+_SubnetAlreadyInUse :: AsError a => Getting (First ServiceError) a ServiceError
+_SubnetAlreadyInUse =
+    _ServiceError . hasStatus 400 . hasCode "SubnetAlreadyInUse"
diff --git a/gen/Network/AWS/RDS/Types/Product.hs b/gen/Network/AWS/RDS/Types/Product.hs
--- a/gen/Network/AWS/RDS/Types/Product.hs
+++ b/gen/Network/AWS/RDS/Types/Product.hs
@@ -220,13 +220,13 @@
     , _dcEngine                          :: !(Maybe Text)
     , _dcLatestRestorableTime            :: !(Maybe ISO8601)
     , _dcPreferredMaintenanceWindow      :: !(Maybe Text)
-    , _dcCharacterSetName                :: !(Maybe Text)
     , _dcAvailabilityZones               :: !(Maybe [Text])
+    , _dcCharacterSetName                :: !(Maybe Text)
     , _dcPreferredBackupWindow           :: !(Maybe Text)
     , _dcVPCSecurityGroups               :: !(Maybe [VPCSecurityGroupMembership])
     , _dcBackupRetentionPeriod           :: !(Maybe Int)
-    , _dcDatabaseName                    :: !(Maybe Text)
     , _dcDBSubnetGroup                   :: !(Maybe Text)
+    , _dcDatabaseName                    :: !(Maybe Text)
     , _dcAllocatedStorage                :: !(Maybe Int)
     , _dcEndpoint                        :: !(Maybe Text)
     , _dcPercentProgress                 :: !(Maybe Text)
@@ -258,20 +258,20 @@
 --
 -- * 'dcPreferredMaintenanceWindow'
 --
--- * 'dcCharacterSetName'
---
 -- * 'dcAvailabilityZones'
 --
+-- * 'dcCharacterSetName'
+--
 -- * 'dcPreferredBackupWindow'
 --
 -- * 'dcVPCSecurityGroups'
 --
 -- * 'dcBackupRetentionPeriod'
 --
--- * 'dcDatabaseName'
---
 -- * 'dcDBSubnetGroup'
 --
+-- * 'dcDatabaseName'
+--
 -- * 'dcAllocatedStorage'
 --
 -- * 'dcEndpoint'
@@ -295,13 +295,13 @@
     , _dcEngine = Nothing
     , _dcLatestRestorableTime = Nothing
     , _dcPreferredMaintenanceWindow = Nothing
-    , _dcCharacterSetName = Nothing
     , _dcAvailabilityZones = Nothing
+    , _dcCharacterSetName = Nothing
     , _dcPreferredBackupWindow = Nothing
     , _dcVPCSecurityGroups = Nothing
     , _dcBackupRetentionPeriod = Nothing
-    , _dcDatabaseName = Nothing
     , _dcDBSubnetGroup = Nothing
+    , _dcDatabaseName = Nothing
     , _dcAllocatedStorage = Nothing
     , _dcEndpoint = Nothing
     , _dcPercentProgress = Nothing
@@ -353,16 +353,16 @@
 dcPreferredMaintenanceWindow :: Lens' DBCluster (Maybe Text)
 dcPreferredMaintenanceWindow = lens _dcPreferredMaintenanceWindow (\ s a -> s{_dcPreferredMaintenanceWindow = a});
 
--- | If present, specifies the name of the character set that this cluster is
--- associated with.
-dcCharacterSetName :: Lens' DBCluster (Maybe Text)
-dcCharacterSetName = lens _dcCharacterSetName (\ s a -> s{_dcCharacterSetName = a});
-
 -- | Provides the list of EC2 Availability Zones that instances in the DB
 -- cluster can be created in.
 dcAvailabilityZones :: Lens' DBCluster [Text]
 dcAvailabilityZones = lens _dcAvailabilityZones (\ s a -> s{_dcAvailabilityZones = a}) . _Default . _Coerce;
 
+-- | If present, specifies the name of the character set that this cluster is
+-- associated with.
+dcCharacterSetName :: Lens' DBCluster (Maybe Text)
+dcCharacterSetName = lens _dcCharacterSetName (\ s a -> s{_dcCharacterSetName = a});
+
 -- | Specifies the daily time range during which automated backups are
 -- created if automated backups are enabled, as determined by the
 -- 'BackupRetentionPeriod'.
@@ -378,18 +378,18 @@
 dcBackupRetentionPeriod :: Lens' DBCluster (Maybe Int)
 dcBackupRetentionPeriod = lens _dcBackupRetentionPeriod (\ s a -> s{_dcBackupRetentionPeriod = a});
 
--- | Contains the name of the initial database of this DB cluster that was
--- provided at create time, if one was specified when the DB cluster was
--- created. This same name is returned for the life of the DB cluster.
-dcDatabaseName :: Lens' DBCluster (Maybe Text)
-dcDatabaseName = lens _dcDatabaseName (\ s a -> s{_dcDatabaseName = a});
-
 -- | Specifies information on the subnet group associated with the DB
 -- cluster, including the name, description, and subnets in the subnet
 -- group.
 dcDBSubnetGroup :: Lens' DBCluster (Maybe Text)
 dcDBSubnetGroup = lens _dcDBSubnetGroup (\ s a -> s{_dcDBSubnetGroup = a});
 
+-- | Contains the name of the initial database of this DB cluster that was
+-- provided at create time, if one was specified when the DB cluster was
+-- created. This same name is returned for the life of the DB cluster.
+dcDatabaseName :: Lens' DBCluster (Maybe Text)
+dcDatabaseName = lens _dcDatabaseName (\ s a -> s{_dcDatabaseName = a});
+
 -- | Specifies the allocated storage size in gigabytes (GB).
 dcAllocatedStorage :: Lens' DBCluster (Maybe Int)
 dcAllocatedStorage = lens _dcAllocatedStorage (\ s a -> s{_dcAllocatedStorage = a});
@@ -425,17 +425,17 @@
                 <*> (x .@? "Engine")
                 <*> (x .@? "LatestRestorableTime")
                 <*> (x .@? "PreferredMaintenanceWindow")
-                <*> (x .@? "CharacterSetName")
                 <*>
                 (x .@? "AvailabilityZones" .!@ mempty >>=
                    may (parseXMLList "AvailabilityZone"))
+                <*> (x .@? "CharacterSetName")
                 <*> (x .@? "PreferredBackupWindow")
                 <*>
                 (x .@? "VpcSecurityGroups" .!@ mempty >>=
                    may (parseXMLList "VpcSecurityGroupMembership"))
                 <*> (x .@? "BackupRetentionPeriod")
-                <*> (x .@? "DatabaseName")
                 <*> (x .@? "DBSubnetGroup")
+                <*> (x .@? "DatabaseName")
                 <*> (x .@? "AllocatedStorage")
                 <*> (x .@? "Endpoint")
                 <*> (x .@? "PercentProgress")
@@ -637,8 +637,8 @@
     , _dcsDBClusterSnapshotIdentifier :: !(Maybe Text)
     , _dcsEngine                      :: !(Maybe Text)
     , _dcsLicenseModel                :: !(Maybe Text)
-    , _dcsSnapshotType                :: !(Maybe Text)
     , _dcsAvailabilityZones           :: !(Maybe [Text])
+    , _dcsSnapshotType                :: !(Maybe Text)
     , _dcsSnapshotCreateTime          :: !(Maybe ISO8601)
     , _dcsAllocatedStorage            :: !(Maybe Int)
     , _dcsClusterCreateTime           :: !(Maybe ISO8601)
@@ -666,10 +666,10 @@
 --
 -- * 'dcsLicenseModel'
 --
--- * 'dcsSnapshotType'
---
 -- * 'dcsAvailabilityZones'
 --
+-- * 'dcsSnapshotType'
+--
 -- * 'dcsSnapshotCreateTime'
 --
 -- * 'dcsAllocatedStorage'
@@ -691,8 +691,8 @@
     , _dcsDBClusterSnapshotIdentifier = Nothing
     , _dcsEngine = Nothing
     , _dcsLicenseModel = Nothing
-    , _dcsSnapshotType = Nothing
     , _dcsAvailabilityZones = Nothing
+    , _dcsSnapshotType = Nothing
     , _dcsSnapshotCreateTime = Nothing
     , _dcsAllocatedStorage = Nothing
     , _dcsClusterCreateTime = Nothing
@@ -734,15 +734,15 @@
 dcsLicenseModel :: Lens' DBClusterSnapshot (Maybe Text)
 dcsLicenseModel = lens _dcsLicenseModel (\ s a -> s{_dcsLicenseModel = a});
 
--- | Provides the type of the DB cluster snapshot.
-dcsSnapshotType :: Lens' DBClusterSnapshot (Maybe Text)
-dcsSnapshotType = lens _dcsSnapshotType (\ s a -> s{_dcsSnapshotType = a});
-
 -- | Provides the list of EC2 Availability Zones that instances in the DB
 -- cluster snapshot can be restored in.
 dcsAvailabilityZones :: Lens' DBClusterSnapshot [Text]
 dcsAvailabilityZones = lens _dcsAvailabilityZones (\ s a -> s{_dcsAvailabilityZones = a}) . _Default . _Coerce;
 
+-- | Provides the type of the DB cluster snapshot.
+dcsSnapshotType :: Lens' DBClusterSnapshot (Maybe Text)
+dcsSnapshotType = lens _dcsSnapshotType (\ s a -> s{_dcsSnapshotType = a});
+
 -- | Provides the time when the snapshot was taken, in Universal Coordinated
 -- Time (UTC).
 dcsSnapshotCreateTime :: Lens' DBClusterSnapshot (Maybe UTCTime)
@@ -777,10 +777,10 @@
                 <*> (x .@? "DBClusterSnapshotIdentifier")
                 <*> (x .@? "Engine")
                 <*> (x .@? "LicenseModel")
-                <*> (x .@? "SnapshotType")
                 <*>
                 (x .@? "AvailabilityZones" .!@ mempty >>=
                    may (parseXMLList "AvailabilityZone"))
+                <*> (x .@? "SnapshotType")
                 <*> (x .@? "SnapshotCreateTime")
                 <*> (x .@? "AllocatedStorage")
                 <*> (x .@? "ClusterCreateTime")
@@ -792,12 +792,12 @@
 --
 -- /See:/ 'dbEngineVersion' smart constructor.
 data DBEngineVersion = DBEngineVersion'
-    { _devDBEngineVersionDescription :: !(Maybe Text)
-    , _devEngineVersion              :: !(Maybe Text)
+    { _devEngineVersion              :: !(Maybe Text)
+    , _devDBEngineVersionDescription :: !(Maybe Text)
     , _devDefaultCharacterSet        :: !(Maybe CharacterSet)
-    , _devSupportedCharacterSets     :: !(Maybe [CharacterSet])
     , _devEngine                     :: !(Maybe Text)
     , _devDBParameterGroupFamily     :: !(Maybe Text)
+    , _devSupportedCharacterSets     :: !(Maybe [CharacterSet])
     , _devDBEngineDescription        :: !(Maybe Text)
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
@@ -805,51 +805,46 @@
 --
 -- Use one of the following lenses to modify other fields as desired:
 --
--- * 'devDBEngineVersionDescription'
---
 -- * 'devEngineVersion'
 --
--- * 'devDefaultCharacterSet'
+-- * 'devDBEngineVersionDescription'
 --
--- * 'devSupportedCharacterSets'
+-- * 'devDefaultCharacterSet'
 --
 -- * 'devEngine'
 --
 -- * 'devDBParameterGroupFamily'
 --
+-- * 'devSupportedCharacterSets'
+--
 -- * 'devDBEngineDescription'
 dbEngineVersion
     :: DBEngineVersion
 dbEngineVersion =
     DBEngineVersion'
-    { _devDBEngineVersionDescription = Nothing
-    , _devEngineVersion = Nothing
+    { _devEngineVersion = Nothing
+    , _devDBEngineVersionDescription = Nothing
     , _devDefaultCharacterSet = Nothing
-    , _devSupportedCharacterSets = Nothing
     , _devEngine = Nothing
     , _devDBParameterGroupFamily = Nothing
+    , _devSupportedCharacterSets = Nothing
     , _devDBEngineDescription = Nothing
     }
 
--- | The description of the database engine version.
-devDBEngineVersionDescription :: Lens' DBEngineVersion (Maybe Text)
-devDBEngineVersionDescription = lens _devDBEngineVersionDescription (\ s a -> s{_devDBEngineVersionDescription = a});
-
 -- | The version number of the database engine.
 devEngineVersion :: Lens' DBEngineVersion (Maybe Text)
 devEngineVersion = lens _devEngineVersion (\ s a -> s{_devEngineVersion = a});
 
+-- | The description of the database engine version.
+devDBEngineVersionDescription :: Lens' DBEngineVersion (Maybe Text)
+devDBEngineVersionDescription = lens _devDBEngineVersionDescription (\ s a -> s{_devDBEngineVersionDescription = a});
+
 -- | The default character set for new instances of this engine version, if
 -- the 'CharacterSetName' parameter of the CreateDBInstance API is not
 -- specified.
 devDefaultCharacterSet :: Lens' DBEngineVersion (Maybe CharacterSet)
 devDefaultCharacterSet = lens _devDefaultCharacterSet (\ s a -> s{_devDefaultCharacterSet = a});
 
--- | A list of the character sets supported by this engine for the
--- 'CharacterSetName' parameter of the CreateDBInstance API.
-devSupportedCharacterSets :: Lens' DBEngineVersion [CharacterSet]
-devSupportedCharacterSets = lens _devSupportedCharacterSets (\ s a -> s{_devSupportedCharacterSets = a}) . _Default . _Coerce;
-
 -- | The name of the database engine.
 devEngine :: Lens' DBEngineVersion (Maybe Text)
 devEngine = lens _devEngine (\ s a -> s{_devEngine = a});
@@ -858,6 +853,11 @@
 devDBParameterGroupFamily :: Lens' DBEngineVersion (Maybe Text)
 devDBParameterGroupFamily = lens _devDBParameterGroupFamily (\ s a -> s{_devDBParameterGroupFamily = a});
 
+-- | A list of the character sets supported by this engine for the
+-- 'CharacterSetName' parameter of the CreateDBInstance API.
+devSupportedCharacterSets :: Lens' DBEngineVersion [CharacterSet]
+devSupportedCharacterSets = lens _devSupportedCharacterSets (\ s a -> s{_devSupportedCharacterSets = a}) . _Default . _Coerce;
+
 -- | The description of the database engine.
 devDBEngineDescription :: Lens' DBEngineVersion (Maybe Text)
 devDBEngineDescription = lens _devDBEngineDescription (\ s a -> s{_devDBEngineDescription = a});
@@ -865,14 +865,14 @@
 instance FromXML DBEngineVersion where
         parseXML x
           = DBEngineVersion' <$>
-              (x .@? "DBEngineVersionDescription") <*>
-                (x .@? "EngineVersion")
+              (x .@? "EngineVersion") <*>
+                (x .@? "DBEngineVersionDescription")
                 <*> (x .@? "DefaultCharacterSet")
+                <*> (x .@? "Engine")
+                <*> (x .@? "DBParameterGroupFamily")
                 <*>
                 (x .@? "SupportedCharacterSets" .!@ mempty >>=
                    may (parseXMLList "CharacterSet"))
-                <*> (x .@? "Engine")
-                <*> (x .@? "DBParameterGroupFamily")
                 <*> (x .@? "DBEngineDescription")
 
 -- | Contains the result of a successful invocation of the following actions:
@@ -886,13 +886,13 @@
 --
 -- /See:/ 'dbInstance' smart constructor.
 data DBInstance = DBInstance'
-    { _diDBSecurityGroups                      :: !(Maybe [DBSecurityGroupMembership])
-    , _diEngineVersion                         :: !(Maybe Text)
+    { _diEngineVersion                         :: !(Maybe Text)
+    , _diDBSecurityGroups                      :: !(Maybe [DBSecurityGroupMembership])
     , _diStorageEncrypted                      :: !(Maybe Bool)
     , _diDBClusterIdentifier                   :: !(Maybe Text)
+    , _diPubliclyAccessible                    :: !(Maybe Bool)
     , _diAutoMinorVersionUpgrade               :: !(Maybe Bool)
     , _diMasterUsername                        :: !(Maybe Text)
-    , _diPubliclyAccessible                    :: !(Maybe Bool)
     , _diReadReplicaDBInstanceIdentifiers      :: !(Maybe [Text])
     , _diIOPS                                  :: !(Maybe Int)
     , _diInstanceCreateTime                    :: !(Maybe ISO8601)
@@ -902,51 +902,51 @@
     , _diDBInstanceClass                       :: !(Maybe Text)
     , _diLicenseModel                          :: !(Maybe Text)
     , _diPreferredMaintenanceWindow            :: !(Maybe Text)
-    , _diCharacterSetName                      :: !(Maybe Text)
-    , _diDBInstanceIdentifier                  :: !(Maybe Text)
     , _diCACertificateIdentifier               :: !(Maybe Text)
+    , _diDBInstanceIdentifier                  :: !(Maybe Text)
+    , _diCharacterSetName                      :: !(Maybe Text)
+    , _diKMSKeyId                              :: !(Maybe Text)
     , _diPreferredBackupWindow                 :: !(Maybe Text)
     , _diAvailabilityZone                      :: !(Maybe Text)
     , _diVPCSecurityGroups                     :: !(Maybe [VPCSecurityGroupMembership])
     , _diBackupRetentionPeriod                 :: !(Maybe Int)
-    , _diKMSKeyId                              :: !(Maybe Text)
     , _diDBSubnetGroup                         :: !(Maybe DBSubnetGroup)
     , _diMultiAZ                               :: !(Maybe Bool)
-    , _diSecondaryAvailabilityZone             :: !(Maybe Text)
     , _diOptionGroupMemberships                :: !(Maybe [OptionGroupMembership])
-    , _diDBiResourceId                         :: !(Maybe Text)
+    , _diSecondaryAvailabilityZone             :: !(Maybe Text)
     , _diAllocatedStorage                      :: !(Maybe Int)
-    , _diEndpoint                              :: !(Maybe Endpoint)
+    , _diDBiResourceId                         :: !(Maybe Text)
     , _diDBParameterGroups                     :: !(Maybe [DBParameterGroupStatus])
-    , _diTDECredentialARN                      :: !(Maybe Text)
     , _diCopyTagsToSnapshot                    :: !(Maybe Bool)
+    , _diTDECredentialARN                      :: !(Maybe Text)
+    , _diEndpoint                              :: !(Maybe Endpoint)
     , _diDBInstanceStatus                      :: !(Maybe Text)
     , _diDBInstancePort                        :: !(Maybe Int)
     , _diPendingModifiedValues                 :: !(Maybe PendingModifiedValues)
+    , _diStorageType                           :: !(Maybe Text)
     , _diStatusInfos                           :: !(Maybe [DBInstanceStatusInfo])
-    , _diDBName                                :: !(Maybe Text)
     , _diDomainMemberships                     :: !(Maybe [DomainMembership])
-    , _diStorageType                           :: !(Maybe Text)
+    , _diDBName                                :: !(Maybe Text)
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'DBInstance' with the minimum fields required to make a request.
 --
 -- Use one of the following lenses to modify other fields as desired:
 --
--- * 'diDBSecurityGroups'
---
 -- * 'diEngineVersion'
 --
+-- * 'diDBSecurityGroups'
+--
 -- * 'diStorageEncrypted'
 --
 -- * 'diDBClusterIdentifier'
 --
+-- * 'diPubliclyAccessible'
+--
 -- * 'diAutoMinorVersionUpgrade'
 --
 -- * 'diMasterUsername'
 --
--- * 'diPubliclyAccessible'
---
 -- * 'diReadReplicaDBInstanceIdentifiers'
 --
 -- * 'diIOPS'
@@ -965,12 +965,14 @@
 --
 -- * 'diPreferredMaintenanceWindow'
 --
--- * 'diCharacterSetName'
+-- * 'diCACertificateIdentifier'
 --
 -- * 'diDBInstanceIdentifier'
 --
--- * 'diCACertificateIdentifier'
+-- * 'diCharacterSetName'
 --
+-- * 'diKMSKeyId'
+--
 -- * 'diPreferredBackupWindow'
 --
 -- * 'diAvailabilityZone'
@@ -979,27 +981,25 @@
 --
 -- * 'diBackupRetentionPeriod'
 --
--- * 'diKMSKeyId'
---
 -- * 'diDBSubnetGroup'
 --
 -- * 'diMultiAZ'
 --
--- * 'diSecondaryAvailabilityZone'
---
 -- * 'diOptionGroupMemberships'
 --
--- * 'diDBiResourceId'
+-- * 'diSecondaryAvailabilityZone'
 --
 -- * 'diAllocatedStorage'
 --
--- * 'diEndpoint'
+-- * 'diDBiResourceId'
 --
 -- * 'diDBParameterGroups'
 --
+-- * 'diCopyTagsToSnapshot'
+--
 -- * 'diTDECredentialARN'
 --
--- * 'diCopyTagsToSnapshot'
+-- * 'diEndpoint'
 --
 -- * 'diDBInstanceStatus'
 --
@@ -1007,24 +1007,24 @@
 --
 -- * 'diPendingModifiedValues'
 --
--- * 'diStatusInfos'
+-- * 'diStorageType'
 --
--- * 'diDBName'
+-- * 'diStatusInfos'
 --
 -- * 'diDomainMemberships'
 --
--- * 'diStorageType'
+-- * 'diDBName'
 dbInstance
     :: DBInstance
 dbInstance =
     DBInstance'
-    { _diDBSecurityGroups = Nothing
-    , _diEngineVersion = Nothing
+    { _diEngineVersion = Nothing
+    , _diDBSecurityGroups = Nothing
     , _diStorageEncrypted = Nothing
     , _diDBClusterIdentifier = Nothing
+    , _diPubliclyAccessible = Nothing
     , _diAutoMinorVersionUpgrade = Nothing
     , _diMasterUsername = Nothing
-    , _diPubliclyAccessible = Nothing
     , _diReadReplicaDBInstanceIdentifiers = Nothing
     , _diIOPS = Nothing
     , _diInstanceCreateTime = Nothing
@@ -1034,42 +1034,42 @@
     , _diDBInstanceClass = Nothing
     , _diLicenseModel = Nothing
     , _diPreferredMaintenanceWindow = Nothing
-    , _diCharacterSetName = Nothing
-    , _diDBInstanceIdentifier = Nothing
     , _diCACertificateIdentifier = Nothing
+    , _diDBInstanceIdentifier = Nothing
+    , _diCharacterSetName = Nothing
+    , _diKMSKeyId = Nothing
     , _diPreferredBackupWindow = Nothing
     , _diAvailabilityZone = Nothing
     , _diVPCSecurityGroups = Nothing
     , _diBackupRetentionPeriod = Nothing
-    , _diKMSKeyId = Nothing
     , _diDBSubnetGroup = Nothing
     , _diMultiAZ = Nothing
-    , _diSecondaryAvailabilityZone = Nothing
     , _diOptionGroupMemberships = Nothing
-    , _diDBiResourceId = Nothing
+    , _diSecondaryAvailabilityZone = Nothing
     , _diAllocatedStorage = Nothing
-    , _diEndpoint = Nothing
+    , _diDBiResourceId = Nothing
     , _diDBParameterGroups = Nothing
-    , _diTDECredentialARN = Nothing
     , _diCopyTagsToSnapshot = Nothing
+    , _diTDECredentialARN = Nothing
+    , _diEndpoint = Nothing
     , _diDBInstanceStatus = Nothing
     , _diDBInstancePort = Nothing
     , _diPendingModifiedValues = Nothing
+    , _diStorageType = Nothing
     , _diStatusInfos = Nothing
-    , _diDBName = Nothing
     , _diDomainMemberships = Nothing
-    , _diStorageType = Nothing
+    , _diDBName = Nothing
     }
 
+-- | Indicates the database engine version.
+diEngineVersion :: Lens' DBInstance (Maybe Text)
+diEngineVersion = lens _diEngineVersion (\ s a -> s{_diEngineVersion = a});
+
 -- | Provides List of DB security group elements containing only
 -- 'DBSecurityGroup.Name' and 'DBSecurityGroup.Status' subelements.
 diDBSecurityGroups :: Lens' DBInstance [DBSecurityGroupMembership]
 diDBSecurityGroups = lens _diDBSecurityGroups (\ s a -> s{_diDBSecurityGroups = a}) . _Default . _Coerce;
 
--- | Indicates the database engine version.
-diEngineVersion :: Lens' DBInstance (Maybe Text)
-diEngineVersion = lens _diEngineVersion (\ s a -> s{_diEngineVersion = a});
-
 -- | Specifies whether the DB instance is encrypted.
 diStorageEncrypted :: Lens' DBInstance (Maybe Bool)
 diStorageEncrypted = lens _diStorageEncrypted (\ s a -> s{_diStorageEncrypted = a});
@@ -1079,14 +1079,6 @@
 diDBClusterIdentifier :: Lens' DBInstance (Maybe Text)
 diDBClusterIdentifier = lens _diDBClusterIdentifier (\ s a -> s{_diDBClusterIdentifier = a});
 
--- | Indicates that minor version patches are applied automatically.
-diAutoMinorVersionUpgrade :: Lens' DBInstance (Maybe Bool)
-diAutoMinorVersionUpgrade = lens _diAutoMinorVersionUpgrade (\ s a -> s{_diAutoMinorVersionUpgrade = a});
-
--- | Contains the master username for the DB instance.
-diMasterUsername :: Lens' DBInstance (Maybe Text)
-diMasterUsername = lens _diMasterUsername (\ s a -> s{_diMasterUsername = a});
-
 -- | Specifies the accessibility options for the DB instance. A value of true
 -- specifies an Internet-facing instance with a publicly resolvable DNS
 -- name, which resolves to a public IP address. A value of false specifies
@@ -1108,6 +1100,14 @@
 diPubliclyAccessible :: Lens' DBInstance (Maybe Bool)
 diPubliclyAccessible = lens _diPubliclyAccessible (\ s a -> s{_diPubliclyAccessible = a});
 
+-- | Indicates that minor version patches are applied automatically.
+diAutoMinorVersionUpgrade :: Lens' DBInstance (Maybe Bool)
+diAutoMinorVersionUpgrade = lens _diAutoMinorVersionUpgrade (\ s a -> s{_diAutoMinorVersionUpgrade = a});
+
+-- | Contains the master username for the DB instance.
+diMasterUsername :: Lens' DBInstance (Maybe Text)
+diMasterUsername = lens _diMasterUsername (\ s a -> s{_diMasterUsername = a});
+
 -- | Contains one or more identifiers of the Read Replicas associated with
 -- this DB instance.
 diReadReplicaDBInstanceIdentifiers :: Lens' DBInstance [Text]
@@ -1150,20 +1150,25 @@
 diPreferredMaintenanceWindow :: Lens' DBInstance (Maybe Text)
 diPreferredMaintenanceWindow = lens _diPreferredMaintenanceWindow (\ s a -> s{_diPreferredMaintenanceWindow = a});
 
--- | If present, specifies the name of the character set that this instance
--- is associated with.
-diCharacterSetName :: Lens' DBInstance (Maybe Text)
-diCharacterSetName = lens _diCharacterSetName (\ s a -> s{_diCharacterSetName = a});
+-- | The identifier of the CA certificate for this DB instance.
+diCACertificateIdentifier :: Lens' DBInstance (Maybe Text)
+diCACertificateIdentifier = lens _diCACertificateIdentifier (\ s a -> s{_diCACertificateIdentifier = a});
 
 -- | Contains a user-supplied database identifier. This identifier is the
 -- unique key that identifies a DB instance.
 diDBInstanceIdentifier :: Lens' DBInstance (Maybe Text)
 diDBInstanceIdentifier = lens _diDBInstanceIdentifier (\ s a -> s{_diDBInstanceIdentifier = a});
 
--- | The identifier of the CA certificate for this DB instance.
-diCACertificateIdentifier :: Lens' DBInstance (Maybe Text)
-diCACertificateIdentifier = lens _diCACertificateIdentifier (\ s a -> s{_diCACertificateIdentifier = a});
+-- | If present, specifies the name of the character set that this instance
+-- is associated with.
+diCharacterSetName :: Lens' DBInstance (Maybe Text)
+diCharacterSetName = lens _diCharacterSetName (\ s a -> s{_diCharacterSetName = a});
 
+-- | If 'StorageEncrypted' is true, the KMS key identifier for the encrypted
+-- DB instance.
+diKMSKeyId :: Lens' DBInstance (Maybe Text)
+diKMSKeyId = lens _diKMSKeyId (\ s a -> s{_diKMSKeyId = a});
+
 -- | Specifies the daily time range during which automated backups are
 -- created if automated backups are enabled, as determined by the
 -- 'BackupRetentionPeriod'.
@@ -1185,11 +1190,6 @@
 diBackupRetentionPeriod :: Lens' DBInstance (Maybe Int)
 diBackupRetentionPeriod = lens _diBackupRetentionPeriod (\ s a -> s{_diBackupRetentionPeriod = a});
 
--- | If 'StorageEncrypted' is true, the KMS key identifier for the encrypted
--- DB instance.
-diKMSKeyId :: Lens' DBInstance (Maybe Text)
-diKMSKeyId = lens _diKMSKeyId (\ s a -> s{_diKMSKeyId = a});
-
 -- | Specifies information on the subnet group associated with the DB
 -- instance, including the name, description, and subnets in the subnet
 -- group.
@@ -1200,14 +1200,18 @@
 diMultiAZ :: Lens' DBInstance (Maybe Bool)
 diMultiAZ = lens _diMultiAZ (\ s a -> s{_diMultiAZ = a});
 
+-- | Provides the list of option group memberships for this DB instance.
+diOptionGroupMemberships :: Lens' DBInstance [OptionGroupMembership]
+diOptionGroupMemberships = lens _diOptionGroupMemberships (\ s a -> s{_diOptionGroupMemberships = a}) . _Default . _Coerce;
+
 -- | If present, specifies the name of the secondary Availability Zone for a
 -- DB instance with multi-AZ support.
 diSecondaryAvailabilityZone :: Lens' DBInstance (Maybe Text)
 diSecondaryAvailabilityZone = lens _diSecondaryAvailabilityZone (\ s a -> s{_diSecondaryAvailabilityZone = a});
 
--- | Provides the list of option group memberships for this DB instance.
-diOptionGroupMemberships :: Lens' DBInstance [OptionGroupMembership]
-diOptionGroupMemberships = lens _diOptionGroupMemberships (\ s a -> s{_diOptionGroupMemberships = a}) . _Default . _Coerce;
+-- | Specifies the allocated storage size specified in gigabytes.
+diAllocatedStorage :: Lens' DBInstance (Maybe Int)
+diAllocatedStorage = lens _diAllocatedStorage (\ s a -> s{_diAllocatedStorage = a});
 
 -- | If 'StorageEncrypted' is true, the region-unique, immutable identifier
 -- for the encrypted DB instance. This identifier is found in AWS
@@ -1216,26 +1220,22 @@
 diDBiResourceId :: Lens' DBInstance (Maybe Text)
 diDBiResourceId = lens _diDBiResourceId (\ s a -> s{_diDBiResourceId = a});
 
--- | Specifies the allocated storage size specified in gigabytes.
-diAllocatedStorage :: Lens' DBInstance (Maybe Int)
-diAllocatedStorage = lens _diAllocatedStorage (\ s a -> s{_diAllocatedStorage = a});
-
--- | Specifies the connection endpoint.
-diEndpoint :: Lens' DBInstance (Maybe Endpoint)
-diEndpoint = lens _diEndpoint (\ s a -> s{_diEndpoint = a});
-
 -- | Provides the list of DB parameter groups applied to this DB instance.
 diDBParameterGroups :: Lens' DBInstance [DBParameterGroupStatus]
 diDBParameterGroups = lens _diDBParameterGroups (\ s a -> s{_diDBParameterGroups = a}) . _Default . _Coerce;
 
+-- | This property is not currently implemented.
+diCopyTagsToSnapshot :: Lens' DBInstance (Maybe Bool)
+diCopyTagsToSnapshot = lens _diCopyTagsToSnapshot (\ s a -> s{_diCopyTagsToSnapshot = a});
+
 -- | The ARN from the Key Store with which the instance is associated for TDE
 -- encryption.
 diTDECredentialARN :: Lens' DBInstance (Maybe Text)
 diTDECredentialARN = lens _diTDECredentialARN (\ s a -> s{_diTDECredentialARN = a});
 
--- | This property is not currently implemented.
-diCopyTagsToSnapshot :: Lens' DBInstance (Maybe Bool)
-diCopyTagsToSnapshot = lens _diCopyTagsToSnapshot (\ s a -> s{_diCopyTagsToSnapshot = a});
+-- | Specifies the connection endpoint.
+diEndpoint :: Lens' DBInstance (Maybe Endpoint)
+diEndpoint = lens _diEndpoint (\ s a -> s{_diEndpoint = a});
 
 -- | Specifies the current state of this database.
 diDBInstanceStatus :: Lens' DBInstance (Maybe Text)
@@ -1253,11 +1253,20 @@
 diPendingModifiedValues :: Lens' DBInstance (Maybe PendingModifiedValues)
 diPendingModifiedValues = lens _diPendingModifiedValues (\ s a -> s{_diPendingModifiedValues = a});
 
+-- | Specifies the storage type associated with DB instance.
+diStorageType :: Lens' DBInstance (Maybe Text)
+diStorageType = lens _diStorageType (\ s a -> s{_diStorageType = a});
+
 -- | The status of a Read Replica. If the instance is not a Read Replica,
 -- this will be blank.
 diStatusInfos :: Lens' DBInstance [DBInstanceStatusInfo]
 diStatusInfos = lens _diStatusInfos (\ s a -> s{_diStatusInfos = a}) . _Default . _Coerce;
 
+-- | The Active Directory Domain membership records associated with the DB
+-- instance.
+diDomainMemberships :: Lens' DBInstance [DomainMembership]
+diDomainMemberships = lens _diDomainMemberships (\ s a -> s{_diDomainMemberships = a}) . _Default . _Coerce;
+
 -- | The meaning of this parameter differs according to the database engine
 -- you use. For example, this value returns either MySQL or PostgreSQL
 -- information when returning values from CreateDBInstanceReadReplica since
@@ -1279,26 +1288,17 @@
 diDBName :: Lens' DBInstance (Maybe Text)
 diDBName = lens _diDBName (\ s a -> s{_diDBName = a});
 
--- | The Active Directory Domain membership records associated with the DB
--- instance.
-diDomainMemberships :: Lens' DBInstance [DomainMembership]
-diDomainMemberships = lens _diDomainMemberships (\ s a -> s{_diDomainMemberships = a}) . _Default . _Coerce;
-
--- | Specifies the storage type associated with DB instance.
-diStorageType :: Lens' DBInstance (Maybe Text)
-diStorageType = lens _diStorageType (\ s a -> s{_diStorageType = a});
-
 instance FromXML DBInstance where
         parseXML x
           = DBInstance' <$>
-              (x .@? "DBSecurityGroups" .!@ mempty >>=
-                 may (parseXMLList "DBSecurityGroup"))
-                <*> (x .@? "EngineVersion")
+              (x .@? "EngineVersion") <*>
+                (x .@? "DBSecurityGroups" .!@ mempty >>=
+                   may (parseXMLList "DBSecurityGroup"))
                 <*> (x .@? "StorageEncrypted")
                 <*> (x .@? "DBClusterIdentifier")
+                <*> (x .@? "PubliclyAccessible")
                 <*> (x .@? "AutoMinorVersionUpgrade")
                 <*> (x .@? "MasterUsername")
-                <*> (x .@? "PubliclyAccessible")
                 <*>
                 (x .@? "ReadReplicaDBInstanceIdentifiers" .!@ mempty
                    >>=
@@ -1311,41 +1311,41 @@
                 <*> (x .@? "DBInstanceClass")
                 <*> (x .@? "LicenseModel")
                 <*> (x .@? "PreferredMaintenanceWindow")
-                <*> (x .@? "CharacterSetName")
-                <*> (x .@? "DBInstanceIdentifier")
                 <*> (x .@? "CACertificateIdentifier")
+                <*> (x .@? "DBInstanceIdentifier")
+                <*> (x .@? "CharacterSetName")
+                <*> (x .@? "KmsKeyId")
                 <*> (x .@? "PreferredBackupWindow")
                 <*> (x .@? "AvailabilityZone")
                 <*>
                 (x .@? "VpcSecurityGroups" .!@ mempty >>=
                    may (parseXMLList "VpcSecurityGroupMembership"))
                 <*> (x .@? "BackupRetentionPeriod")
-                <*> (x .@? "KmsKeyId")
                 <*> (x .@? "DBSubnetGroup")
                 <*> (x .@? "MultiAZ")
-                <*> (x .@? "SecondaryAvailabilityZone")
                 <*>
                 (x .@? "OptionGroupMemberships" .!@ mempty >>=
                    may (parseXMLList "OptionGroupMembership"))
-                <*> (x .@? "DbiResourceId")
+                <*> (x .@? "SecondaryAvailabilityZone")
                 <*> (x .@? "AllocatedStorage")
-                <*> (x .@? "Endpoint")
+                <*> (x .@? "DbiResourceId")
                 <*>
                 (x .@? "DBParameterGroups" .!@ mempty >>=
                    may (parseXMLList "DBParameterGroup"))
-                <*> (x .@? "TdeCredentialArn")
                 <*> (x .@? "CopyTagsToSnapshot")
+                <*> (x .@? "TdeCredentialArn")
+                <*> (x .@? "Endpoint")
                 <*> (x .@? "DBInstanceStatus")
                 <*> (x .@? "DbInstancePort")
                 <*> (x .@? "PendingModifiedValues")
+                <*> (x .@? "StorageType")
                 <*>
                 (x .@? "StatusInfos" .!@ mempty >>=
                    may (parseXMLList "DBInstanceStatusInfo"))
-                <*> (x .@? "DBName")
                 <*>
                 (x .@? "DomainMemberships" .!@ mempty >>=
                    may (parseXMLList "DomainMembership"))
-                <*> (x .@? "StorageType")
+                <*> (x .@? "DBName")
 
 -- | Provides a list of status information for a DB instance.
 --
@@ -1543,64 +1543,64 @@
 --
 -- /See:/ 'dbSecurityGroup' smart constructor.
 data DBSecurityGroup = DBSecurityGroup'
-    { _dsgVPCId                      :: !(Maybe Text)
-    , _dsgOwnerId                    :: !(Maybe Text)
-    , _dsgIPRanges                   :: !(Maybe [IPRange])
-    , _dsgDBSecurityGroupName        :: !(Maybe Text)
-    , _dsgEC2SecurityGroups          :: !(Maybe [EC2SecurityGroup])
-    , _dsgDBSecurityGroupDescription :: !(Maybe Text)
+    { _dbsgVPCId                      :: !(Maybe Text)
+    , _dbsgOwnerId                    :: !(Maybe Text)
+    , _dbsgIPRanges                   :: !(Maybe [IPRange])
+    , _dbsgDBSecurityGroupName        :: !(Maybe Text)
+    , _dbsgEC2SecurityGroups          :: !(Maybe [EC2SecurityGroup])
+    , _dbsgDBSecurityGroupDescription :: !(Maybe Text)
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'DBSecurityGroup' with the minimum fields required to make a request.
 --
 -- Use one of the following lenses to modify other fields as desired:
 --
--- * 'dsgVPCId'
+-- * 'dbsgVPCId'
 --
--- * 'dsgOwnerId'
+-- * 'dbsgOwnerId'
 --
--- * 'dsgIPRanges'
+-- * 'dbsgIPRanges'
 --
--- * 'dsgDBSecurityGroupName'
+-- * 'dbsgDBSecurityGroupName'
 --
--- * 'dsgEC2SecurityGroups'
+-- * 'dbsgEC2SecurityGroups'
 --
--- * 'dsgDBSecurityGroupDescription'
+-- * 'dbsgDBSecurityGroupDescription'
 dbSecurityGroup
     :: DBSecurityGroup
 dbSecurityGroup =
     DBSecurityGroup'
-    { _dsgVPCId = Nothing
-    , _dsgOwnerId = Nothing
-    , _dsgIPRanges = Nothing
-    , _dsgDBSecurityGroupName = Nothing
-    , _dsgEC2SecurityGroups = Nothing
-    , _dsgDBSecurityGroupDescription = Nothing
+    { _dbsgVPCId = Nothing
+    , _dbsgOwnerId = Nothing
+    , _dbsgIPRanges = Nothing
+    , _dbsgDBSecurityGroupName = Nothing
+    , _dbsgEC2SecurityGroups = Nothing
+    , _dbsgDBSecurityGroupDescription = Nothing
     }
 
 -- | Provides the VpcId of the DB security group.
-dsgVPCId :: Lens' DBSecurityGroup (Maybe Text)
-dsgVPCId = lens _dsgVPCId (\ s a -> s{_dsgVPCId = a});
+dbsgVPCId :: Lens' DBSecurityGroup (Maybe Text)
+dbsgVPCId = lens _dbsgVPCId (\ s a -> s{_dbsgVPCId = a});
 
 -- | Provides the AWS ID of the owner of a specific DB security group.
-dsgOwnerId :: Lens' DBSecurityGroup (Maybe Text)
-dsgOwnerId = lens _dsgOwnerId (\ s a -> s{_dsgOwnerId = a});
+dbsgOwnerId :: Lens' DBSecurityGroup (Maybe Text)
+dbsgOwnerId = lens _dbsgOwnerId (\ s a -> s{_dbsgOwnerId = a});
 
 -- | Contains a list of IPRange elements.
-dsgIPRanges :: Lens' DBSecurityGroup [IPRange]
-dsgIPRanges = lens _dsgIPRanges (\ s a -> s{_dsgIPRanges = a}) . _Default . _Coerce;
+dbsgIPRanges :: Lens' DBSecurityGroup [IPRange]
+dbsgIPRanges = lens _dbsgIPRanges (\ s a -> s{_dbsgIPRanges = a}) . _Default . _Coerce;
 
 -- | Specifies the name of the DB security group.
-dsgDBSecurityGroupName :: Lens' DBSecurityGroup (Maybe Text)
-dsgDBSecurityGroupName = lens _dsgDBSecurityGroupName (\ s a -> s{_dsgDBSecurityGroupName = a});
+dbsgDBSecurityGroupName :: Lens' DBSecurityGroup (Maybe Text)
+dbsgDBSecurityGroupName = lens _dbsgDBSecurityGroupName (\ s a -> s{_dbsgDBSecurityGroupName = a});
 
 -- | Contains a list of EC2SecurityGroup elements.
-dsgEC2SecurityGroups :: Lens' DBSecurityGroup [EC2SecurityGroup]
-dsgEC2SecurityGroups = lens _dsgEC2SecurityGroups (\ s a -> s{_dsgEC2SecurityGroups = a}) . _Default . _Coerce;
+dbsgEC2SecurityGroups :: Lens' DBSecurityGroup [EC2SecurityGroup]
+dbsgEC2SecurityGroups = lens _dbsgEC2SecurityGroups (\ s a -> s{_dbsgEC2SecurityGroups = a}) . _Default . _Coerce;
 
 -- | Provides the description of the DB security group.
-dsgDBSecurityGroupDescription :: Lens' DBSecurityGroup (Maybe Text)
-dsgDBSecurityGroupDescription = lens _dsgDBSecurityGroupDescription (\ s a -> s{_dsgDBSecurityGroupDescription = a});
+dbsgDBSecurityGroupDescription :: Lens' DBSecurityGroup (Maybe Text)
+dbsgDBSecurityGroupDescription = lens _dbsgDBSecurityGroupDescription (\ s a -> s{_dbsgDBSecurityGroupDescription = a});
 
 instance FromXML DBSecurityGroup where
         parseXML x
@@ -1670,21 +1670,21 @@
     , _dsMasterUsername             :: !(Maybe Text)
     , _dsSourceRegion               :: !(Maybe Text)
     , _dsIOPS                       :: !(Maybe Int)
-    , _dsInstanceCreateTime         :: !(Maybe ISO8601)
     , _dsVPCId                      :: !(Maybe Text)
+    , _dsInstanceCreateTime         :: !(Maybe ISO8601)
     , _dsEngine                     :: !(Maybe Text)
     , _dsEncrypted                  :: !(Maybe Bool)
     , _dsDBSnapshotIdentifier       :: !(Maybe Text)
     , _dsLicenseModel               :: !(Maybe Text)
+    , _dsSourceDBSnapshotIdentifier :: !(Maybe Text)
     , _dsSnapshotType               :: !(Maybe Text)
     , _dsDBInstanceIdentifier       :: !(Maybe Text)
-    , _dsSourceDBSnapshotIdentifier :: !(Maybe Text)
-    , _dsAvailabilityZone           :: !(Maybe Text)
     , _dsKMSKeyId                   :: !(Maybe Text)
+    , _dsAvailabilityZone           :: !(Maybe Text)
     , _dsSnapshotCreateTime         :: !(Maybe ISO8601)
     , _dsAllocatedStorage           :: !(Maybe Int)
-    , _dsTDECredentialARN           :: !(Maybe Text)
     , _dsOptionGroupName            :: !(Maybe Text)
+    , _dsTDECredentialARN           :: !(Maybe Text)
     , _dsPercentProgress            :: !(Maybe Int)
     , _dsPort                       :: !(Maybe Int)
     , _dsStorageType                :: !(Maybe Text)
@@ -1704,10 +1704,10 @@
 --
 -- * 'dsIOPS'
 --
--- * 'dsInstanceCreateTime'
---
 -- * 'dsVPCId'
 --
+-- * 'dsInstanceCreateTime'
+--
 -- * 'dsEngine'
 --
 -- * 'dsEncrypted'
@@ -1716,24 +1716,24 @@
 --
 -- * 'dsLicenseModel'
 --
+-- * 'dsSourceDBSnapshotIdentifier'
+--
 -- * 'dsSnapshotType'
 --
 -- * 'dsDBInstanceIdentifier'
 --
--- * 'dsSourceDBSnapshotIdentifier'
+-- * 'dsKMSKeyId'
 --
 -- * 'dsAvailabilityZone'
 --
--- * 'dsKMSKeyId'
---
 -- * 'dsSnapshotCreateTime'
 --
 -- * 'dsAllocatedStorage'
 --
--- * 'dsTDECredentialARN'
---
 -- * 'dsOptionGroupName'
 --
+-- * 'dsTDECredentialARN'
+--
 -- * 'dsPercentProgress'
 --
 -- * 'dsPort'
@@ -1748,21 +1748,21 @@
     , _dsMasterUsername = Nothing
     , _dsSourceRegion = Nothing
     , _dsIOPS = Nothing
-    , _dsInstanceCreateTime = Nothing
     , _dsVPCId = Nothing
+    , _dsInstanceCreateTime = Nothing
     , _dsEngine = Nothing
     , _dsEncrypted = Nothing
     , _dsDBSnapshotIdentifier = Nothing
     , _dsLicenseModel = Nothing
+    , _dsSourceDBSnapshotIdentifier = Nothing
     , _dsSnapshotType = Nothing
     , _dsDBInstanceIdentifier = Nothing
-    , _dsSourceDBSnapshotIdentifier = Nothing
-    , _dsAvailabilityZone = Nothing
     , _dsKMSKeyId = Nothing
+    , _dsAvailabilityZone = Nothing
     , _dsSnapshotCreateTime = Nothing
     , _dsAllocatedStorage = Nothing
-    , _dsTDECredentialARN = Nothing
     , _dsOptionGroupName = Nothing
+    , _dsTDECredentialARN = Nothing
     , _dsPercentProgress = Nothing
     , _dsPort = Nothing
     , _dsStorageType = Nothing
@@ -1789,15 +1789,15 @@
 dsIOPS :: Lens' DBSnapshot (Maybe Int)
 dsIOPS = lens _dsIOPS (\ s a -> s{_dsIOPS = a});
 
+-- | Provides the VPC ID associated with the DB snapshot.
+dsVPCId :: Lens' DBSnapshot (Maybe Text)
+dsVPCId = lens _dsVPCId (\ s a -> s{_dsVPCId = a});
+
 -- | Specifies the time when the snapshot was taken, in Universal Coordinated
 -- Time (UTC).
 dsInstanceCreateTime :: Lens' DBSnapshot (Maybe UTCTime)
 dsInstanceCreateTime = lens _dsInstanceCreateTime (\ s a -> s{_dsInstanceCreateTime = a}) . mapping _Time;
 
--- | Provides the VPC ID associated with the DB snapshot.
-dsVPCId :: Lens' DBSnapshot (Maybe Text)
-dsVPCId = lens _dsVPCId (\ s a -> s{_dsVPCId = a});
-
 -- | Specifies the name of the database engine.
 dsEngine :: Lens' DBSnapshot (Maybe Text)
 dsEngine = lens _dsEngine (\ s a -> s{_dsEngine = a});
@@ -1814,6 +1814,11 @@
 dsLicenseModel :: Lens' DBSnapshot (Maybe Text)
 dsLicenseModel = lens _dsLicenseModel (\ s a -> s{_dsLicenseModel = a});
 
+-- | The DB snapshot Arn that the DB snapshot was copied from. It only has
+-- value in case of cross customer or cross region copy.
+dsSourceDBSnapshotIdentifier :: Lens' DBSnapshot (Maybe Text)
+dsSourceDBSnapshotIdentifier = lens _dsSourceDBSnapshotIdentifier (\ s a -> s{_dsSourceDBSnapshotIdentifier = a});
+
 -- | Provides the type of the DB snapshot.
 dsSnapshotType :: Lens' DBSnapshot (Maybe Text)
 dsSnapshotType = lens _dsSnapshotType (\ s a -> s{_dsSnapshotType = a});
@@ -1823,21 +1828,16 @@
 dsDBInstanceIdentifier :: Lens' DBSnapshot (Maybe Text)
 dsDBInstanceIdentifier = lens _dsDBInstanceIdentifier (\ s a -> s{_dsDBInstanceIdentifier = a});
 
--- | The DB snapshot Arn that the DB snapshot was copied from. It only has
--- value in case of cross customer or cross region copy.
-dsSourceDBSnapshotIdentifier :: Lens' DBSnapshot (Maybe Text)
-dsSourceDBSnapshotIdentifier = lens _dsSourceDBSnapshotIdentifier (\ s a -> s{_dsSourceDBSnapshotIdentifier = a});
+-- | If 'Encrypted' is true, the KMS key identifier for the encrypted DB
+-- snapshot.
+dsKMSKeyId :: Lens' DBSnapshot (Maybe Text)
+dsKMSKeyId = lens _dsKMSKeyId (\ s a -> s{_dsKMSKeyId = a});
 
 -- | Specifies the name of the Availability Zone the DB instance was located
 -- in at the time of the DB snapshot.
 dsAvailabilityZone :: Lens' DBSnapshot (Maybe Text)
 dsAvailabilityZone = lens _dsAvailabilityZone (\ s a -> s{_dsAvailabilityZone = a});
 
--- | If 'Encrypted' is true, the KMS key identifier for the encrypted DB
--- snapshot.
-dsKMSKeyId :: Lens' DBSnapshot (Maybe Text)
-dsKMSKeyId = lens _dsKMSKeyId (\ s a -> s{_dsKMSKeyId = a});
-
 -- | Provides the time when the snapshot was taken, in Universal Coordinated
 -- Time (UTC).
 dsSnapshotCreateTime :: Lens' DBSnapshot (Maybe UTCTime)
@@ -1847,15 +1847,15 @@
 dsAllocatedStorage :: Lens' DBSnapshot (Maybe Int)
 dsAllocatedStorage = lens _dsAllocatedStorage (\ s a -> s{_dsAllocatedStorage = a});
 
+-- | Provides the option group name for the DB snapshot.
+dsOptionGroupName :: Lens' DBSnapshot (Maybe Text)
+dsOptionGroupName = lens _dsOptionGroupName (\ s a -> s{_dsOptionGroupName = a});
+
 -- | The ARN from the Key Store with which to associate the instance for TDE
 -- encryption.
 dsTDECredentialARN :: Lens' DBSnapshot (Maybe Text)
 dsTDECredentialARN = lens _dsTDECredentialARN (\ s a -> s{_dsTDECredentialARN = a});
 
--- | Provides the option group name for the DB snapshot.
-dsOptionGroupName :: Lens' DBSnapshot (Maybe Text)
-dsOptionGroupName = lens _dsOptionGroupName (\ s a -> s{_dsOptionGroupName = a});
-
 -- | The percentage of the estimated data that has been transferred.
 dsPercentProgress :: Lens' DBSnapshot (Maybe Int)
 dsPercentProgress = lens _dsPercentProgress (\ s a -> s{_dsPercentProgress = a});
@@ -1876,21 +1876,21 @@
                 (x .@? "MasterUsername")
                 <*> (x .@? "SourceRegion")
                 <*> (x .@? "Iops")
-                <*> (x .@? "InstanceCreateTime")
                 <*> (x .@? "VpcId")
+                <*> (x .@? "InstanceCreateTime")
                 <*> (x .@? "Engine")
                 <*> (x .@? "Encrypted")
                 <*> (x .@? "DBSnapshotIdentifier")
                 <*> (x .@? "LicenseModel")
+                <*> (x .@? "SourceDBSnapshotIdentifier")
                 <*> (x .@? "SnapshotType")
                 <*> (x .@? "DBInstanceIdentifier")
-                <*> (x .@? "SourceDBSnapshotIdentifier")
-                <*> (x .@? "AvailabilityZone")
                 <*> (x .@? "KmsKeyId")
+                <*> (x .@? "AvailabilityZone")
                 <*> (x .@? "SnapshotCreateTime")
                 <*> (x .@? "AllocatedStorage")
-                <*> (x .@? "TdeCredentialArn")
                 <*> (x .@? "OptionGroupName")
+                <*> (x .@? "TdeCredentialArn")
                 <*> (x .@? "PercentProgress")
                 <*> (x .@? "Port")
                 <*> (x .@? "StorageType")
@@ -1907,56 +1907,56 @@
 --
 -- /See:/ 'dbSubnetGroup' smart constructor.
 data DBSubnetGroup = DBSubnetGroup'
-    { _dbsgDBSubnetGroupName        :: !(Maybe Text)
-    , _dbsgVPCId                    :: !(Maybe Text)
-    , _dbsgSubnets                  :: !(Maybe [Subnet])
-    , _dbsgDBSubnetGroupDescription :: !(Maybe Text)
-    , _dbsgSubnetGroupStatus        :: !(Maybe Text)
+    { _dsgDBSubnetGroupName        :: !(Maybe Text)
+    , _dsgVPCId                    :: !(Maybe Text)
+    , _dsgSubnets                  :: !(Maybe [Subnet])
+    , _dsgDBSubnetGroupDescription :: !(Maybe Text)
+    , _dsgSubnetGroupStatus        :: !(Maybe Text)
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'DBSubnetGroup' with the minimum fields required to make a request.
 --
 -- Use one of the following lenses to modify other fields as desired:
 --
--- * 'dbsgDBSubnetGroupName'
+-- * 'dsgDBSubnetGroupName'
 --
--- * 'dbsgVPCId'
+-- * 'dsgVPCId'
 --
--- * 'dbsgSubnets'
+-- * 'dsgSubnets'
 --
--- * 'dbsgDBSubnetGroupDescription'
+-- * 'dsgDBSubnetGroupDescription'
 --
--- * 'dbsgSubnetGroupStatus'
+-- * 'dsgSubnetGroupStatus'
 dbSubnetGroup
     :: DBSubnetGroup
 dbSubnetGroup =
     DBSubnetGroup'
-    { _dbsgDBSubnetGroupName = Nothing
-    , _dbsgVPCId = Nothing
-    , _dbsgSubnets = Nothing
-    , _dbsgDBSubnetGroupDescription = Nothing
-    , _dbsgSubnetGroupStatus = Nothing
+    { _dsgDBSubnetGroupName = Nothing
+    , _dsgVPCId = Nothing
+    , _dsgSubnets = Nothing
+    , _dsgDBSubnetGroupDescription = Nothing
+    , _dsgSubnetGroupStatus = Nothing
     }
 
 -- | Specifies the name of the DB subnet group.
-dbsgDBSubnetGroupName :: Lens' DBSubnetGroup (Maybe Text)
-dbsgDBSubnetGroupName = lens _dbsgDBSubnetGroupName (\ s a -> s{_dbsgDBSubnetGroupName = a});
+dsgDBSubnetGroupName :: Lens' DBSubnetGroup (Maybe Text)
+dsgDBSubnetGroupName = lens _dsgDBSubnetGroupName (\ s a -> s{_dsgDBSubnetGroupName = a});
 
 -- | Provides the VpcId of the DB subnet group.
-dbsgVPCId :: Lens' DBSubnetGroup (Maybe Text)
-dbsgVPCId = lens _dbsgVPCId (\ s a -> s{_dbsgVPCId = a});
+dsgVPCId :: Lens' DBSubnetGroup (Maybe Text)
+dsgVPCId = lens _dsgVPCId (\ s a -> s{_dsgVPCId = a});
 
 -- | Contains a list of Subnet elements.
-dbsgSubnets :: Lens' DBSubnetGroup [Subnet]
-dbsgSubnets = lens _dbsgSubnets (\ s a -> s{_dbsgSubnets = a}) . _Default . _Coerce;
+dsgSubnets :: Lens' DBSubnetGroup [Subnet]
+dsgSubnets = lens _dsgSubnets (\ s a -> s{_dsgSubnets = a}) . _Default . _Coerce;
 
 -- | Provides the description of the DB subnet group.
-dbsgDBSubnetGroupDescription :: Lens' DBSubnetGroup (Maybe Text)
-dbsgDBSubnetGroupDescription = lens _dbsgDBSubnetGroupDescription (\ s a -> s{_dbsgDBSubnetGroupDescription = a});
+dsgDBSubnetGroupDescription :: Lens' DBSubnetGroup (Maybe Text)
+dsgDBSubnetGroupDescription = lens _dsgDBSubnetGroupDescription (\ s a -> s{_dsgDBSubnetGroupDescription = a});
 
 -- | Provides the status of the DB subnet group.
-dbsgSubnetGroupStatus :: Lens' DBSubnetGroup (Maybe Text)
-dbsgSubnetGroupStatus = lens _dbsgSubnetGroupStatus (\ s a -> s{_dbsgSubnetGroupStatus = a});
+dsgSubnetGroupStatus :: Lens' DBSubnetGroup (Maybe Text)
+dsgSubnetGroupStatus = lens _dsgSubnetGroupStatus (\ s a -> s{_dsgSubnetGroupStatus = a});
 
 instance FromXML DBSubnetGroup where
         parseXML x
@@ -2165,8 +2165,8 @@
 -- /See:/ 'engineDefaults' smart constructor.
 data EngineDefaults = EngineDefaults'
     { _edDBParameterGroupFamily :: !(Maybe Text)
-    , _edParameters             :: !(Maybe [Parameter])
     , _edMarker                 :: !(Maybe Text)
+    , _edParameters             :: !(Maybe [Parameter])
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'EngineDefaults' with the minimum fields required to make a request.
@@ -2175,16 +2175,16 @@
 --
 -- * 'edDBParameterGroupFamily'
 --
--- * 'edParameters'
---
 -- * 'edMarker'
+--
+-- * 'edParameters'
 engineDefaults
     :: EngineDefaults
 engineDefaults =
     EngineDefaults'
     { _edDBParameterGroupFamily = Nothing
-    , _edParameters = Nothing
     , _edMarker = Nothing
+    , _edParameters = Nothing
     }
 
 -- | Specifies the name of the DB parameter group family that the engine
@@ -2192,23 +2192,23 @@
 edDBParameterGroupFamily :: Lens' EngineDefaults (Maybe Text)
 edDBParameterGroupFamily = lens _edDBParameterGroupFamily (\ s a -> s{_edDBParameterGroupFamily = a});
 
--- | Contains a list of engine default parameters.
-edParameters :: Lens' EngineDefaults [Parameter]
-edParameters = lens _edParameters (\ s a -> s{_edParameters = a}) . _Default . _Coerce;
-
 -- | An optional pagination token provided by a previous EngineDefaults
 -- request. If this parameter is specified, the response includes only
 -- records beyond the marker, up to the value specified by 'MaxRecords' .
 edMarker :: Lens' EngineDefaults (Maybe Text)
 edMarker = lens _edMarker (\ s a -> s{_edMarker = a});
 
+-- | Contains a list of engine default parameters.
+edParameters :: Lens' EngineDefaults [Parameter]
+edParameters = lens _edParameters (\ s a -> s{_edParameters = a}) . _Default . _Coerce;
+
 instance FromXML EngineDefaults where
         parseXML x
           = EngineDefaults' <$>
-              (x .@? "DBParameterGroupFamily") <*>
+              (x .@? "DBParameterGroupFamily") <*> (x .@? "Marker")
+                <*>
                 (x .@? "Parameters" .!@ mempty >>=
                    may (parseXMLList "Parameter"))
-                <*> (x .@? "Marker")
 
 -- | This data type is used as a response element in the DescribeEvents
 -- action.
@@ -2320,8 +2320,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)
@@ -2335,10 +2335,10 @@
 --
 -- Use one of the following lenses to modify other fields as desired:
 --
--- * 'esCustomerAWSId'
---
 -- * 'esStatus'
 --
+-- * 'esCustomerAWSId'
+--
 -- * 'esCustSubscriptionId'
 --
 -- * 'esSNSTopicARN'
@@ -2356,8 +2356,8 @@
     :: EventSubscription
 eventSubscription =
     EventSubscription'
-    { _esCustomerAWSId = Nothing
-    , _esStatus = Nothing
+    { _esStatus = Nothing
+    , _esCustomerAWSId = Nothing
     , _esCustSubscriptionId = Nothing
     , _esSNSTopicARN = Nothing
     , _esEnabled = Nothing
@@ -2367,11 +2367,6 @@
     , _esSourceIdsList = Nothing
     }
 
--- | The AWS customer account associated with the RDS event notification
--- subscription.
-esCustomerAWSId :: Lens' EventSubscription (Maybe Text)
-esCustomerAWSId = lens _esCustomerAWSId (\ s a -> s{_esCustomerAWSId = a});
-
 -- | The status of the RDS event notification subscription.
 --
 -- Constraints:
@@ -2385,6 +2380,11 @@
 esStatus :: Lens' EventSubscription (Maybe Text)
 esStatus = lens _esStatus (\ s a -> s{_esStatus = a});
 
+-- | The AWS customer account associated with the RDS event notification
+-- subscription.
+esCustomerAWSId :: Lens' EventSubscription (Maybe Text)
+esCustomerAWSId = lens _esCustomerAWSId (\ s a -> s{_esCustomerAWSId = a});
+
 -- | The RDS event notification subscription Id.
 esCustSubscriptionId :: Lens' EventSubscription (Maybe Text)
 esCustSubscriptionId = lens _esCustSubscriptionId (\ s a -> s{_esCustSubscriptionId = a});
@@ -2417,7 +2417,7 @@
 instance FromXML EventSubscription where
         parseXML x
           = EventSubscription' <$>
-              (x .@? "CustomerAwsId") <*> (x .@? "Status") <*>
+              (x .@? "Status") <*> (x .@? "CustomerAwsId") <*>
                 (x .@? "CustSubscriptionId")
                 <*> (x .@? "SnsTopicArn")
                 <*> (x .@? "Enabled")
@@ -2810,13 +2810,13 @@
     , _ogoPermanent                         :: !(Maybe Bool)
     , _ogoPersistent                        :: !(Maybe Bool)
     , _ogoEngineName                        :: !(Maybe Text)
-    , _ogoName                              :: !(Maybe Text)
     , _ogoMajorEngineVersion                :: !(Maybe Text)
+    , _ogoName                              :: !(Maybe Text)
     , _ogoDefaultPort                       :: !(Maybe Int)
     , _ogoOptionGroupOptionSettings         :: !(Maybe [OptionGroupOptionSetting])
     , _ogoPortRequired                      :: !(Maybe Bool)
-    , _ogoOptionsDependedOn                 :: !(Maybe [Text])
     , _ogoDescription                       :: !(Maybe Text)
+    , _ogoOptionsDependedOn                 :: !(Maybe [Text])
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'OptionGroupOption' with the minimum fields required to make a request.
@@ -2831,19 +2831,19 @@
 --
 -- * 'ogoEngineName'
 --
--- * 'ogoName'
---
 -- * 'ogoMajorEngineVersion'
 --
+-- * 'ogoName'
+--
 -- * 'ogoDefaultPort'
 --
 -- * 'ogoOptionGroupOptionSettings'
 --
 -- * 'ogoPortRequired'
 --
--- * 'ogoOptionsDependedOn'
---
 -- * 'ogoDescription'
+--
+-- * 'ogoOptionsDependedOn'
 optionGroupOption
     :: OptionGroupOption
 optionGroupOption =
@@ -2852,13 +2852,13 @@
     , _ogoPermanent = Nothing
     , _ogoPersistent = Nothing
     , _ogoEngineName = Nothing
-    , _ogoName = Nothing
     , _ogoMajorEngineVersion = Nothing
+    , _ogoName = Nothing
     , _ogoDefaultPort = Nothing
     , _ogoOptionGroupOptionSettings = Nothing
     , _ogoPortRequired = Nothing
-    , _ogoOptionsDependedOn = Nothing
     , _ogoDescription = Nothing
+    , _ogoOptionsDependedOn = Nothing
     }
 
 -- | The minimum required engine version for the option to be applied.
@@ -2882,14 +2882,14 @@
 ogoEngineName :: Lens' OptionGroupOption (Maybe Text)
 ogoEngineName = lens _ogoEngineName (\ s a -> s{_ogoEngineName = a});
 
--- | The name of the option.
-ogoName :: Lens' OptionGroupOption (Maybe Text)
-ogoName = lens _ogoName (\ s a -> s{_ogoName = a});
-
 -- | Indicates the major engine version that the option is available for.
 ogoMajorEngineVersion :: Lens' OptionGroupOption (Maybe Text)
 ogoMajorEngineVersion = lens _ogoMajorEngineVersion (\ s a -> s{_ogoMajorEngineVersion = a});
 
+-- | The name of the option.
+ogoName :: Lens' OptionGroupOption (Maybe Text)
+ogoName = lens _ogoName (\ s a -> s{_ogoName = a});
+
 -- | If the option requires a port, specifies the default port for the
 -- option.
 ogoDefaultPort :: Lens' OptionGroupOption (Maybe Int)
@@ -2904,14 +2904,14 @@
 ogoPortRequired :: Lens' OptionGroupOption (Maybe Bool)
 ogoPortRequired = lens _ogoPortRequired (\ s a -> s{_ogoPortRequired = a});
 
--- | List of all options that are prerequisites for this option.
-ogoOptionsDependedOn :: Lens' OptionGroupOption [Text]
-ogoOptionsDependedOn = lens _ogoOptionsDependedOn (\ s a -> s{_ogoOptionsDependedOn = a}) . _Default . _Coerce;
-
 -- | The description of the option.
 ogoDescription :: Lens' OptionGroupOption (Maybe Text)
 ogoDescription = lens _ogoDescription (\ s a -> s{_ogoDescription = a});
 
+-- | List of all options that are prerequisites for this option.
+ogoOptionsDependedOn :: Lens' OptionGroupOption [Text]
+ogoOptionsDependedOn = lens _ogoOptionsDependedOn (\ s a -> s{_ogoOptionsDependedOn = a}) . _Default . _Coerce;
+
 instance FromXML OptionGroupOption where
         parseXML x
           = OptionGroupOption' <$>
@@ -2919,17 +2919,17 @@
                 (x .@? "Permanent")
                 <*> (x .@? "Persistent")
                 <*> (x .@? "EngineName")
-                <*> (x .@? "Name")
                 <*> (x .@? "MajorEngineVersion")
+                <*> (x .@? "Name")
                 <*> (x .@? "DefaultPort")
                 <*>
                 (x .@? "OptionGroupOptionSettings" .!@ mempty >>=
                    may (parseXMLList "OptionGroupOptionSetting"))
                 <*> (x .@? "PortRequired")
+                <*> (x .@? "Description")
                 <*>
                 (x .@? "OptionsDependedOn" .!@ mempty >>=
                    may (parseXMLList "OptionName"))
-                <*> (x .@? "Description")
 
 -- | Option group option settings are used to display settings available for
 -- each option with their default values and other information. These
@@ -2941,8 +2941,8 @@
     , _ogosSettingName        :: !(Maybe Text)
     , _ogosDefaultValue       :: !(Maybe Text)
     , _ogosIsModifiable       :: !(Maybe Bool)
-    , _ogosAllowedValues      :: !(Maybe Text)
     , _ogosSettingDescription :: !(Maybe Text)
+    , _ogosAllowedValues      :: !(Maybe Text)
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'OptionGroupOptionSetting' with the minimum fields required to make a request.
@@ -2957,9 +2957,9 @@
 --
 -- * 'ogosIsModifiable'
 --
--- * 'ogosAllowedValues'
---
 -- * 'ogosSettingDescription'
+--
+-- * 'ogosAllowedValues'
 optionGroupOptionSetting
     :: OptionGroupOptionSetting
 optionGroupOptionSetting =
@@ -2968,8 +2968,8 @@
     , _ogosSettingName = Nothing
     , _ogosDefaultValue = Nothing
     , _ogosIsModifiable = Nothing
-    , _ogosAllowedValues = Nothing
     , _ogosSettingDescription = Nothing
+    , _ogosAllowedValues = Nothing
     }
 
 -- | The DB engine specific parameter type for the option group option.
@@ -2989,22 +2989,22 @@
 ogosIsModifiable :: Lens' OptionGroupOptionSetting (Maybe Bool)
 ogosIsModifiable = lens _ogosIsModifiable (\ s a -> s{_ogosIsModifiable = a});
 
--- | Indicates the acceptable values for the option group option.
-ogosAllowedValues :: Lens' OptionGroupOptionSetting (Maybe Text)
-ogosAllowedValues = lens _ogosAllowedValues (\ s a -> s{_ogosAllowedValues = a});
-
 -- | The description of the option group option.
 ogosSettingDescription :: Lens' OptionGroupOptionSetting (Maybe Text)
 ogosSettingDescription = lens _ogosSettingDescription (\ s a -> s{_ogosSettingDescription = a});
 
+-- | Indicates the acceptable values for the option group option.
+ogosAllowedValues :: Lens' OptionGroupOptionSetting (Maybe Text)
+ogosAllowedValues = lens _ogosAllowedValues (\ s a -> s{_ogosAllowedValues = a});
+
 instance FromXML OptionGroupOptionSetting where
         parseXML x
           = OptionGroupOptionSetting' <$>
               (x .@? "ApplyType") <*> (x .@? "SettingName") <*>
                 (x .@? "DefaultValue")
                 <*> (x .@? "IsModifiable")
-                <*> (x .@? "AllowedValues")
                 <*> (x .@? "SettingDescription")
+                <*> (x .@? "AllowedValues")
 
 -- | Option settings are the actual settings being applied or configured for
 -- that option. It is used when you modify an option group or describe
@@ -3020,8 +3020,8 @@
     , _osName          :: !(Maybe Text)
     , _osDefaultValue  :: !(Maybe Text)
     , _osIsModifiable  :: !(Maybe Bool)
-    , _osAllowedValues :: !(Maybe Text)
     , _osDataType      :: !(Maybe Text)
+    , _osAllowedValues :: !(Maybe Text)
     , _osDescription   :: !(Maybe Text)
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
@@ -3041,10 +3041,10 @@
 --
 -- * 'osIsModifiable'
 --
--- * 'osAllowedValues'
---
 -- * 'osDataType'
 --
+-- * 'osAllowedValues'
+--
 -- * 'osDescription'
 optionSetting
     :: OptionSetting
@@ -3056,8 +3056,8 @@
     , _osName = Nothing
     , _osDefaultValue = Nothing
     , _osIsModifiable = Nothing
-    , _osAllowedValues = Nothing
     , _osDataType = Nothing
+    , _osAllowedValues = Nothing
     , _osDescription = Nothing
     }
 
@@ -3086,14 +3086,14 @@
 osIsModifiable :: Lens' OptionSetting (Maybe Bool)
 osIsModifiable = lens _osIsModifiable (\ s a -> s{_osIsModifiable = a});
 
--- | The allowed values of the option setting.
-osAllowedValues :: Lens' OptionSetting (Maybe Text)
-osAllowedValues = lens _osAllowedValues (\ s a -> s{_osAllowedValues = a});
-
 -- | The data type of the option setting.
 osDataType :: Lens' OptionSetting (Maybe Text)
 osDataType = lens _osDataType (\ s a -> s{_osDataType = a});
 
+-- | The allowed values of the option setting.
+osAllowedValues :: Lens' OptionSetting (Maybe Text)
+osAllowedValues = lens _osAllowedValues (\ s a -> s{_osAllowedValues = a});
+
 -- | The description of the option setting.
 osDescription :: Lens' OptionSetting (Maybe Text)
 osDescription = lens _osDescription (\ s a -> s{_osDescription = a});
@@ -3106,8 +3106,8 @@
                 <*> (x .@? "Name")
                 <*> (x .@? "DefaultValue")
                 <*> (x .@? "IsModifiable")
-                <*> (x .@? "AllowedValues")
                 <*> (x .@? "DataType")
+                <*> (x .@? "AllowedValues")
                 <*> (x .@? "Description")
 
 instance ToQuery OptionSetting where
@@ -3117,8 +3117,8 @@
                "ApplyType" =: _osApplyType, "Value" =: _osValue,
                "Name" =: _osName, "DefaultValue" =: _osDefaultValue,
                "IsModifiable" =: _osIsModifiable,
-               "AllowedValues" =: _osAllowedValues,
                "DataType" =: _osDataType,
+               "AllowedValues" =: _osAllowedValues,
                "Description" =: _osDescription]
 
 -- | Contains a list of available options for a DB instance
@@ -3135,8 +3135,8 @@
     , _odioDBInstanceClass           :: !(Maybe Text)
     , _odioLicenseModel              :: !(Maybe Text)
     , _odioAvailabilityZones         :: !(Maybe [AvailabilityZone])
-    , _odioReadReplicaCapable        :: !(Maybe Bool)
     , _odioSupportsStorageEncryption :: !(Maybe Bool)
+    , _odioReadReplicaCapable        :: !(Maybe Bool)
     , _odioVPC                       :: !(Maybe Bool)
     , _odioStorageType               :: !(Maybe Text)
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
@@ -3159,10 +3159,10 @@
 --
 -- * 'odioAvailabilityZones'
 --
--- * 'odioReadReplicaCapable'
---
 -- * 'odioSupportsStorageEncryption'
 --
+-- * 'odioReadReplicaCapable'
+--
 -- * 'odioVPC'
 --
 -- * 'odioStorageType'
@@ -3177,8 +3177,8 @@
     , _odioDBInstanceClass = Nothing
     , _odioLicenseModel = Nothing
     , _odioAvailabilityZones = Nothing
-    , _odioReadReplicaCapable = Nothing
     , _odioSupportsStorageEncryption = Nothing
+    , _odioReadReplicaCapable = Nothing
     , _odioVPC = Nothing
     , _odioStorageType = Nothing
     }
@@ -3211,14 +3211,14 @@
 odioAvailabilityZones :: Lens' OrderableDBInstanceOption [AvailabilityZone]
 odioAvailabilityZones = lens _odioAvailabilityZones (\ s a -> s{_odioAvailabilityZones = a}) . _Default . _Coerce;
 
--- | Indicates whether this orderable DB instance can have a Read Replica.
-odioReadReplicaCapable :: Lens' OrderableDBInstanceOption (Maybe Bool)
-odioReadReplicaCapable = lens _odioReadReplicaCapable (\ s a -> s{_odioReadReplicaCapable = a});
-
 -- | Indicates whether this orderable DB instance supports encrypted storage.
 odioSupportsStorageEncryption :: Lens' OrderableDBInstanceOption (Maybe Bool)
 odioSupportsStorageEncryption = lens _odioSupportsStorageEncryption (\ s a -> s{_odioSupportsStorageEncryption = a});
 
+-- | Indicates whether this orderable DB instance can have a Read Replica.
+odioReadReplicaCapable :: Lens' OrderableDBInstanceOption (Maybe Bool)
+odioReadReplicaCapable = lens _odioReadReplicaCapable (\ s a -> s{_odioReadReplicaCapable = a});
+
 -- | Indicates whether this is a VPC orderable DB instance.
 odioVPC :: Lens' OrderableDBInstanceOption (Maybe Bool)
 odioVPC = lens _odioVPC (\ s a -> s{_odioVPC = a});
@@ -3238,8 +3238,8 @@
                 <*>
                 (x .@? "AvailabilityZones" .!@ mempty >>=
                    may (parseXMLList "AvailabilityZone"))
-                <*> (x .@? "ReadReplicaCapable")
                 <*> (x .@? "SupportsStorageEncryption")
+                <*> (x .@? "ReadReplicaCapable")
                 <*> (x .@? "Vpc")
                 <*> (x .@? "StorageType")
 
@@ -3257,8 +3257,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)
@@ -3279,10 +3279,10 @@
 --
 -- * 'pIsModifiable'
 --
--- * 'pAllowedValues'
---
 -- * 'pDataType'
 --
+-- * 'pAllowedValues'
+--
 -- * 'pParameterName'
 --
 -- * 'pDescription'
@@ -3296,8 +3296,8 @@
     , _pMinimumEngineVersion = Nothing
     , _pSource = Nothing
     , _pIsModifiable = Nothing
-    , _pAllowedValues = Nothing
     , _pDataType = Nothing
+    , _pAllowedValues = Nothing
     , _pParameterName = Nothing
     , _pDescription = Nothing
     }
@@ -3328,14 +3328,14 @@
 pIsModifiable :: Lens' Parameter (Maybe Bool)
 pIsModifiable = lens _pIsModifiable (\ s a -> s{_pIsModifiable = a});
 
--- | Specifies the valid range of values for the parameter.
-pAllowedValues :: Lens' Parameter (Maybe Text)
-pAllowedValues = lens _pAllowedValues (\ s a -> s{_pAllowedValues = a});
-
 -- | Specifies the valid data type for the parameter.
 pDataType :: Lens' Parameter (Maybe Text)
 pDataType = lens _pDataType (\ s a -> s{_pDataType = a});
 
+-- | Specifies the valid range of values for the parameter.
+pAllowedValues :: Lens' Parameter (Maybe Text)
+pAllowedValues = lens _pAllowedValues (\ s a -> s{_pAllowedValues = a});
+
 -- | Specifies the name of the parameter.
 pParameterName :: Lens' Parameter (Maybe Text)
 pParameterName = lens _pParameterName (\ s a -> s{_pParameterName = a});
@@ -3352,8 +3352,8 @@
                 <*> (x .@? "MinimumEngineVersion")
                 <*> (x .@? "Source")
                 <*> (x .@? "IsModifiable")
-                <*> (x .@? "AllowedValues")
                 <*> (x .@? "DataType")
+                <*> (x .@? "AllowedValues")
                 <*> (x .@? "ParameterName")
                 <*> (x .@? "Description")
 
@@ -3366,8 +3366,8 @@
                "MinimumEngineVersion" =: _pMinimumEngineVersion,
                "Source" =: _pSource,
                "IsModifiable" =: _pIsModifiable,
-               "AllowedValues" =: _pAllowedValues,
                "DataType" =: _pDataType,
+               "AllowedValues" =: _pAllowedValues,
                "ParameterName" =: _pParameterName,
                "Description" =: _pDescription]
 
@@ -3379,8 +3379,8 @@
     , _pmaAction               :: !(Maybe Text)
     , _pmaOptInStatus          :: !(Maybe Text)
     , _pmaDescription          :: !(Maybe Text)
-    , _pmaCurrentApplyDate     :: !(Maybe ISO8601)
     , _pmaForcedApplyDate      :: !(Maybe ISO8601)
+    , _pmaCurrentApplyDate     :: !(Maybe ISO8601)
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'PendingMaintenanceAction' with the minimum fields required to make a request.
@@ -3395,9 +3395,9 @@
 --
 -- * 'pmaDescription'
 --
--- * 'pmaCurrentApplyDate'
---
 -- * 'pmaForcedApplyDate'
+--
+-- * 'pmaCurrentApplyDate'
 pendingMaintenanceAction
     :: PendingMaintenanceAction
 pendingMaintenanceAction =
@@ -3406,8 +3406,8 @@
     , _pmaAction = Nothing
     , _pmaOptInStatus = Nothing
     , _pmaDescription = Nothing
-    , _pmaCurrentApplyDate = Nothing
     , _pmaForcedApplyDate = Nothing
+    , _pmaCurrentApplyDate = Nothing
     }
 
 -- | The date of the maintenance window when the action will be applied. The
@@ -3431,6 +3431,13 @@
 pmaDescription :: Lens' PendingMaintenanceAction (Maybe Text)
 pmaDescription = lens _pmaDescription (\ s a -> s{_pmaDescription = a});
 
+-- | The date when the maintenance action will be automatically applied. The
+-- maintenance action will be applied to the resource on this date
+-- regardless of the maintenance window for the resource. If this date is
+-- specified, any 'immediate' opt-in requests are ignored.
+pmaForcedApplyDate :: Lens' PendingMaintenanceAction (Maybe UTCTime)
+pmaForcedApplyDate = lens _pmaForcedApplyDate (\ s a -> s{_pmaForcedApplyDate = a}) . mapping _Time;
+
 -- | The effective date when the pending maintenance action will be applied
 -- to the resource. This date takes into account opt-in requests received
 -- from the ApplyPendingMaintenanceAction API, the 'AutoAppliedAfterDate',
@@ -3440,21 +3447,14 @@
 pmaCurrentApplyDate :: Lens' PendingMaintenanceAction (Maybe UTCTime)
 pmaCurrentApplyDate = lens _pmaCurrentApplyDate (\ s a -> s{_pmaCurrentApplyDate = a}) . mapping _Time;
 
--- | The date when the maintenance action will be automatically applied. The
--- maintenance action will be applied to the resource on this date
--- regardless of the maintenance window for the resource. If this date is
--- specified, any 'immediate' opt-in requests are ignored.
-pmaForcedApplyDate :: Lens' PendingMaintenanceAction (Maybe UTCTime)
-pmaForcedApplyDate = lens _pmaForcedApplyDate (\ s a -> s{_pmaForcedApplyDate = a}) . mapping _Time;
-
 instance FromXML PendingMaintenanceAction where
         parseXML x
           = PendingMaintenanceAction' <$>
               (x .@? "AutoAppliedAfterDate") <*> (x .@? "Action")
                 <*> (x .@? "OptInStatus")
                 <*> (x .@? "Description")
-                <*> (x .@? "CurrentApplyDate")
                 <*> (x .@? "ForcedApplyDate")
+                <*> (x .@? "CurrentApplyDate")
 
 -- | This data type is used as a response element in the ModifyDBInstance
 -- action.
@@ -3465,8 +3465,8 @@
     , _pmvMasterUserPassword      :: !(Maybe Text)
     , _pmvIOPS                    :: !(Maybe Int)
     , _pmvDBInstanceClass         :: !(Maybe Text)
-    , _pmvDBInstanceIdentifier    :: !(Maybe Text)
     , _pmvCACertificateIdentifier :: !(Maybe Text)
+    , _pmvDBInstanceIdentifier    :: !(Maybe Text)
     , _pmvBackupRetentionPeriod   :: !(Maybe Int)
     , _pmvMultiAZ                 :: !(Maybe Bool)
     , _pmvAllocatedStorage        :: !(Maybe Int)
@@ -3486,10 +3486,10 @@
 --
 -- * 'pmvDBInstanceClass'
 --
--- * 'pmvDBInstanceIdentifier'
---
 -- * 'pmvCACertificateIdentifier'
 --
+-- * 'pmvDBInstanceIdentifier'
+--
 -- * 'pmvBackupRetentionPeriod'
 --
 -- * 'pmvMultiAZ'
@@ -3507,8 +3507,8 @@
     , _pmvMasterUserPassword = Nothing
     , _pmvIOPS = Nothing
     , _pmvDBInstanceClass = Nothing
-    , _pmvDBInstanceIdentifier = Nothing
     , _pmvCACertificateIdentifier = Nothing
+    , _pmvDBInstanceIdentifier = Nothing
     , _pmvBackupRetentionPeriod = Nothing
     , _pmvMultiAZ = Nothing
     , _pmvAllocatedStorage = Nothing
@@ -3535,15 +3535,15 @@
 pmvDBInstanceClass :: Lens' PendingModifiedValues (Maybe Text)
 pmvDBInstanceClass = lens _pmvDBInstanceClass (\ s a -> s{_pmvDBInstanceClass = a});
 
+-- | Specifies the identifier of the CA certificate for the DB instance.
+pmvCACertificateIdentifier :: Lens' PendingModifiedValues (Maybe Text)
+pmvCACertificateIdentifier = lens _pmvCACertificateIdentifier (\ s a -> s{_pmvCACertificateIdentifier = a});
+
 -- | Contains the new 'DBInstanceIdentifier' for the DB instance that will be
 -- applied or is in progress.
 pmvDBInstanceIdentifier :: Lens' PendingModifiedValues (Maybe Text)
 pmvDBInstanceIdentifier = lens _pmvDBInstanceIdentifier (\ s a -> s{_pmvDBInstanceIdentifier = a});
 
--- | Specifies the identifier of the CA certificate for the DB instance.
-pmvCACertificateIdentifier :: Lens' PendingModifiedValues (Maybe Text)
-pmvCACertificateIdentifier = lens _pmvCACertificateIdentifier (\ s a -> s{_pmvCACertificateIdentifier = a});
-
 -- | Specifies the pending number of days for which automated backups are
 -- retained.
 pmvBackupRetentionPeriod :: Lens' PendingModifiedValues (Maybe Int)
@@ -3574,8 +3574,8 @@
                 (x .@? "MasterUserPassword")
                 <*> (x .@? "Iops")
                 <*> (x .@? "DBInstanceClass")
-                <*> (x .@? "DBInstanceIdentifier")
                 <*> (x .@? "CACertificateIdentifier")
+                <*> (x .@? "DBInstanceIdentifier")
                 <*> (x .@? "BackupRetentionPeriod")
                 <*> (x .@? "MultiAZ")
                 <*> (x .@? "AllocatedStorage")
@@ -3630,15 +3630,15 @@
     { _rdiDBInstanceCount               :: !(Maybe Int)
     , _rdiState                         :: !(Maybe Text)
     , _rdiCurrencyCode                  :: !(Maybe Text)
-    , _rdiProductDescription            :: !(Maybe Text)
     , _rdiStartTime                     :: !(Maybe ISO8601)
+    , _rdiProductDescription            :: !(Maybe Text)
     , _rdiReservedDBInstanceId          :: !(Maybe Text)
     , _rdiDBInstanceClass               :: !(Maybe Text)
     , _rdiMultiAZ                       :: !(Maybe Bool)
     , _rdiReservedDBInstancesOfferingId :: !(Maybe Text)
+    , _rdiRecurringCharges              :: !(Maybe [RecurringCharge])
     , _rdiOfferingType                  :: !(Maybe Text)
     , _rdiUsagePrice                    :: !(Maybe Double)
-    , _rdiRecurringCharges              :: !(Maybe [RecurringCharge])
     , _rdiFixedPrice                    :: !(Maybe Double)
     , _rdiDuration                      :: !(Maybe Int)
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
@@ -3653,10 +3653,10 @@
 --
 -- * 'rdiCurrencyCode'
 --
--- * 'rdiProductDescription'
---
 -- * 'rdiStartTime'
 --
+-- * 'rdiProductDescription'
+--
 -- * 'rdiReservedDBInstanceId'
 --
 -- * 'rdiDBInstanceClass'
@@ -3665,12 +3665,12 @@
 --
 -- * 'rdiReservedDBInstancesOfferingId'
 --
+-- * 'rdiRecurringCharges'
+--
 -- * 'rdiOfferingType'
 --
 -- * 'rdiUsagePrice'
 --
--- * 'rdiRecurringCharges'
---
 -- * 'rdiFixedPrice'
 --
 -- * 'rdiDuration'
@@ -3681,15 +3681,15 @@
     { _rdiDBInstanceCount = Nothing
     , _rdiState = Nothing
     , _rdiCurrencyCode = Nothing
-    , _rdiProductDescription = Nothing
     , _rdiStartTime = Nothing
+    , _rdiProductDescription = Nothing
     , _rdiReservedDBInstanceId = Nothing
     , _rdiDBInstanceClass = Nothing
     , _rdiMultiAZ = Nothing
     , _rdiReservedDBInstancesOfferingId = Nothing
+    , _rdiRecurringCharges = Nothing
     , _rdiOfferingType = Nothing
     , _rdiUsagePrice = Nothing
-    , _rdiRecurringCharges = Nothing
     , _rdiFixedPrice = Nothing
     , _rdiDuration = Nothing
     }
@@ -3706,14 +3706,14 @@
 rdiCurrencyCode :: Lens' ReservedDBInstance (Maybe Text)
 rdiCurrencyCode = lens _rdiCurrencyCode (\ s a -> s{_rdiCurrencyCode = a});
 
--- | The description of the reserved DB instance.
-rdiProductDescription :: Lens' ReservedDBInstance (Maybe Text)
-rdiProductDescription = lens _rdiProductDescription (\ s a -> s{_rdiProductDescription = a});
-
 -- | The time the reservation started.
 rdiStartTime :: Lens' ReservedDBInstance (Maybe UTCTime)
 rdiStartTime = lens _rdiStartTime (\ s a -> s{_rdiStartTime = a}) . mapping _Time;
 
+-- | The description of the reserved DB instance.
+rdiProductDescription :: Lens' ReservedDBInstance (Maybe Text)
+rdiProductDescription = lens _rdiProductDescription (\ s a -> s{_rdiProductDescription = a});
+
 -- | The unique identifier for the reservation.
 rdiReservedDBInstanceId :: Lens' ReservedDBInstance (Maybe Text)
 rdiReservedDBInstanceId = lens _rdiReservedDBInstanceId (\ s a -> s{_rdiReservedDBInstanceId = a});
@@ -3730,6 +3730,10 @@
 rdiReservedDBInstancesOfferingId :: Lens' ReservedDBInstance (Maybe Text)
 rdiReservedDBInstancesOfferingId = lens _rdiReservedDBInstancesOfferingId (\ s a -> s{_rdiReservedDBInstancesOfferingId = a});
 
+-- | The recurring price charged to run this reserved DB instance.
+rdiRecurringCharges :: Lens' ReservedDBInstance [RecurringCharge]
+rdiRecurringCharges = lens _rdiRecurringCharges (\ s a -> s{_rdiRecurringCharges = a}) . _Default . _Coerce;
+
 -- | The offering type of this reserved DB instance.
 rdiOfferingType :: Lens' ReservedDBInstance (Maybe Text)
 rdiOfferingType = lens _rdiOfferingType (\ s a -> s{_rdiOfferingType = a});
@@ -3738,10 +3742,6 @@
 rdiUsagePrice :: Lens' ReservedDBInstance (Maybe Double)
 rdiUsagePrice = lens _rdiUsagePrice (\ s a -> s{_rdiUsagePrice = a});
 
--- | The recurring price charged to run this reserved DB instance.
-rdiRecurringCharges :: Lens' ReservedDBInstance [RecurringCharge]
-rdiRecurringCharges = lens _rdiRecurringCharges (\ s a -> s{_rdiRecurringCharges = a}) . _Default . _Coerce;
-
 -- | The fixed price charged for this reserved DB instance.
 rdiFixedPrice :: Lens' ReservedDBInstance (Maybe Double)
 rdiFixedPrice = lens _rdiFixedPrice (\ s a -> s{_rdiFixedPrice = a});
@@ -3755,17 +3755,17 @@
           = ReservedDBInstance' <$>
               (x .@? "DBInstanceCount") <*> (x .@? "State") <*>
                 (x .@? "CurrencyCode")
-                <*> (x .@? "ProductDescription")
                 <*> (x .@? "StartTime")
+                <*> (x .@? "ProductDescription")
                 <*> (x .@? "ReservedDBInstanceId")
                 <*> (x .@? "DBInstanceClass")
                 <*> (x .@? "MultiAZ")
                 <*> (x .@? "ReservedDBInstancesOfferingId")
-                <*> (x .@? "OfferingType")
-                <*> (x .@? "UsagePrice")
                 <*>
                 (x .@? "RecurringCharges" .!@ mempty >>=
                    may (parseXMLList "RecurringCharge"))
+                <*> (x .@? "OfferingType")
+                <*> (x .@? "UsagePrice")
                 <*> (x .@? "FixedPrice")
                 <*> (x .@? "Duration")
 
@@ -3779,9 +3779,9 @@
     , _rdioDBInstanceClass               :: !(Maybe Text)
     , _rdioMultiAZ                       :: !(Maybe Bool)
     , _rdioReservedDBInstancesOfferingId :: !(Maybe Text)
+    , _rdioRecurringCharges              :: !(Maybe [RecurringCharge])
     , _rdioOfferingType                  :: !(Maybe Text)
     , _rdioUsagePrice                    :: !(Maybe Double)
-    , _rdioRecurringCharges              :: !(Maybe [RecurringCharge])
     , _rdioFixedPrice                    :: !(Maybe Double)
     , _rdioDuration                      :: !(Maybe Int)
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
@@ -3800,12 +3800,12 @@
 --
 -- * 'rdioReservedDBInstancesOfferingId'
 --
+-- * 'rdioRecurringCharges'
+--
 -- * 'rdioOfferingType'
 --
 -- * 'rdioUsagePrice'
 --
--- * 'rdioRecurringCharges'
---
 -- * 'rdioFixedPrice'
 --
 -- * 'rdioDuration'
@@ -3818,9 +3818,9 @@
     , _rdioDBInstanceClass = Nothing
     , _rdioMultiAZ = Nothing
     , _rdioReservedDBInstancesOfferingId = Nothing
+    , _rdioRecurringCharges = Nothing
     , _rdioOfferingType = Nothing
     , _rdioUsagePrice = Nothing
-    , _rdioRecurringCharges = Nothing
     , _rdioFixedPrice = Nothing
     , _rdioDuration = Nothing
     }
@@ -3845,6 +3845,10 @@
 rdioReservedDBInstancesOfferingId :: Lens' ReservedDBInstancesOffering (Maybe Text)
 rdioReservedDBInstancesOfferingId = lens _rdioReservedDBInstancesOfferingId (\ s a -> s{_rdioReservedDBInstancesOfferingId = a});
 
+-- | The recurring price charged to run this reserved DB instance.
+rdioRecurringCharges :: Lens' ReservedDBInstancesOffering [RecurringCharge]
+rdioRecurringCharges = lens _rdioRecurringCharges (\ s a -> s{_rdioRecurringCharges = a}) . _Default . _Coerce;
+
 -- | The offering type.
 rdioOfferingType :: Lens' ReservedDBInstancesOffering (Maybe Text)
 rdioOfferingType = lens _rdioOfferingType (\ s a -> s{_rdioOfferingType = a});
@@ -3853,10 +3857,6 @@
 rdioUsagePrice :: Lens' ReservedDBInstancesOffering (Maybe Double)
 rdioUsagePrice = lens _rdioUsagePrice (\ s a -> s{_rdioUsagePrice = a});
 
--- | The recurring price charged to run this reserved DB instance.
-rdioRecurringCharges :: Lens' ReservedDBInstancesOffering [RecurringCharge]
-rdioRecurringCharges = lens _rdioRecurringCharges (\ s a -> s{_rdioRecurringCharges = a}) . _Default . _Coerce;
-
 -- | The fixed price charged for this offering.
 rdioFixedPrice :: Lens' ReservedDBInstancesOffering (Maybe Double)
 rdioFixedPrice = lens _rdioFixedPrice (\ s a -> s{_rdioFixedPrice = a});
@@ -3873,11 +3873,11 @@
                 <*> (x .@? "DBInstanceClass")
                 <*> (x .@? "MultiAZ")
                 <*> (x .@? "ReservedDBInstancesOfferingId")
-                <*> (x .@? "OfferingType")
-                <*> (x .@? "UsagePrice")
                 <*>
                 (x .@? "RecurringCharges" .!@ mempty >>=
                    may (parseXMLList "RecurringCharge"))
+                <*> (x .@? "OfferingType")
+                <*> (x .@? "UsagePrice")
                 <*> (x .@? "FixedPrice")
                 <*> (x .@? "Duration")
 
diff --git a/test/Test/AWS/Gen/RDS.hs b/test/Test/AWS/Gen/RDS.hs
--- a/test/Test/AWS/Gen/RDS.hs
+++ b/test/Test/AWS/Gen/RDS.hs
@@ -28,17 +28,14 @@
 -- fixtures :: TestTree
 -- fixtures =
 --     [ testGroup "request"
---         [ testDescribeDBEngineVersions $
---             describeDBEngineVersions
---
---         , testDescribeDBClusterParameterGroups $
+--         [ testDescribeDBClusterParameterGroups $
 --             describeDBClusterParameterGroups
 --
 --         , testPromoteReadReplica $
 --             promoteReadReplica
 --
---         , testModifyEventSubscription $
---             modifyEventSubscription
+--         , testDescribeDBEngineVersions $
+--             describeDBEngineVersions
 --
 --         , testCopyDBSnapshot $
 --             copyDBSnapshot
@@ -49,6 +46,9 @@
 --         , testModifyDBInstance $
 --             modifyDBInstance
 --
+--         , testModifyEventSubscription $
+--             modifyEventSubscription
+--
 --         , testResetDBClusterParameterGroup $
 --             resetDBClusterParameterGroup
 --
@@ -58,66 +58,72 @@
 --         , testDescribeEngineDefaultParameters $
 --             describeEngineDefaultParameters
 --
+--         , testDescribeOptionGroups $
+--             describeOptionGroups
+--
+--         , testDescribeDBLogFiles $
+--             describeDBLogFiles
+--
 --         , testDescribeDBClusters $
 --             describeDBClusters
 --
 --         , testModifyDBSubnetGroup $
 --             modifyDBSubnetGroup
 --
---         , testDescribeDBLogFiles $
---             describeDBLogFiles
---
 --         , testListTagsForResource $
 --             listTagsForResource
 --
---         , testDescribeOptionGroups $
---             describeOptionGroups
+--         , testDeleteOptionGroup $
+--             deleteOptionGroup
 --
 --         , testDeleteDBCluster $
 --             deleteDBCluster
 --
---         , testRemoveSourceIdentifierFromSubscription $
---             removeSourceIdentifierFromSubscription
+--         , testDescribeReservedDBInstances $
+--             describeReservedDBInstances
 --
 --         , testCopyDBParameterGroup $
 --             copyDBParameterGroup
 --
---         , testDescribeReservedDBInstances $
---             describeReservedDBInstances
---
---         , testDeleteOptionGroup $
---             deleteOptionGroup
+--         , testRemoveSourceIdentifierFromSubscription $
+--             removeSourceIdentifierFromSubscription
 --
 --         , testDescribeEngineDefaultClusterParameters $
 --             describeEngineDefaultClusterParameters
 --
---         , testCreateEventSubscription $
---             createEventSubscription
---
 --         , testRemoveTagsFromResource $
 --             removeTagsFromResource
 --
---         , testCreateDBInstance $
---             createDBInstance
---
 --         , testRestoreDBInstanceFromDBSnapshot $
 --             restoreDBInstanceFromDBSnapshot
 --
---         , testAuthorizeDBSecurityGroupIngress $
---             authorizeDBSecurityGroupIngress
---
---         , testDeleteDBClusterParameterGroup $
---             deleteDBClusterParameterGroup
+--         , testCreateEventSubscription $
+--             createEventSubscription
 --
 --         , testPurchaseReservedDBInstancesOffering $
 --             purchaseReservedDBInstancesOffering
 --
+--         , testCreateDBInstance $
+--             createDBInstance
+--
+--         , testDeleteDBClusterParameterGroup $
+--             deleteDBClusterParameterGroup
+--
 --         , testDescribeCertificates $
 --             describeCertificates
 --
+--         , testAuthorizeDBSecurityGroupIngress $
+--             authorizeDBSecurityGroupIngress
+--
 --         , testRestoreDBClusterFromSnapshot $
 --             restoreDBClusterFromSnapshot
 --
+--         , testDescribeOrderableDBInstanceOptions $
+--             describeOrderableDBInstanceOptions
+--
+--         , testCreateDBClusterParameterGroup $
+--             createDBClusterParameterGroup
+--
 --         , testCreateDBSnapshot $
 --             createDBSnapshot
 --
@@ -127,11 +133,11 @@
 --         , testDescribeDBParameterGroups $
 --             describeDBParameterGroups
 --
---         , testDescribeOrderableDBInstanceOptions $
---             describeOrderableDBInstanceOptions
+--         , testDeleteDBClusterSnapshot $
+--             deleteDBClusterSnapshot
 --
---         , testCreateDBClusterParameterGroup $
---             createDBClusterParameterGroup
+--         , testDescribeOptionGroupOptions $
+--             describeOptionGroupOptions
 --
 --         , testDescribeEventSubscriptions $
 --             describeEventSubscriptions
@@ -139,14 +145,11 @@
 --         , testAddTagsToResource $
 --             addTagsToResource
 --
---         , testDescribeOptionGroupOptions $
---             describeOptionGroupOptions
---
 --         , testDescribeDBParameters $
 --             describeDBParameters
 --
---         , testDeleteDBClusterSnapshot $
---             deleteDBClusterSnapshot
+--         , testCreateDBClusterSnapshot $
+--             createDBClusterSnapshot
 --
 --         , testDescribeDBSnapshots $
 --             describeDBSnapshots
@@ -154,15 +157,12 @@
 --         , testDescribeDBSubnetGroups $
 --             describeDBSubnetGroups
 --
---         , testCreateDBParameterGroup $
---             createDBParameterGroup
---
---         , testCreateDBClusterSnapshot $
---             createDBClusterSnapshot
---
 --         , testModifyOptionGroup $
 --             modifyOptionGroup
 --
+--         , testCreateDBParameterGroup $
+--             createDBParameterGroup
+--
 --         , testModifyDBCluster $
 --             modifyDBCluster
 --
@@ -172,104 +172,101 @@
 --         , testModifyDBClusterParameterGroup $
 --             modifyDBClusterParameterGroup
 --
---         , testDescribePendingMaintenanceActions $
---             describePendingMaintenanceActions
---
 --         , testRestoreDBInstanceToPointInTime $
 --             restoreDBInstanceToPointInTime
 --
---         , testResetDBParameterGroup $
---             resetDBParameterGroup
+--         , testDescribePendingMaintenanceActions $
+--             describePendingMaintenanceActions
 --
 --         , testCopyDBClusterSnapshot $
 --             copyDBClusterSnapshot
 --
---         , testModifyDBParameterGroup $
---             modifyDBParameterGroup
+--         , testResetDBParameterGroup $
+--             resetDBParameterGroup
 --
+--         , testCreateDBCluster $
+--             createDBCluster
+--
 --         , testFailoverDBCluster $
 --             failoverDBCluster
 --
---         , testCreateDBCluster $
---             createDBCluster
+--         , testRevokeDBSecurityGroupIngress $
+--             revokeDBSecurityGroupIngress
 --
---         , testCreateOptionGroup $
---             createOptionGroup
+--         , testModifyDBParameterGroup $
+--             modifyDBParameterGroup
 --
 --         , testApplyPendingMaintenanceAction $
 --             applyPendingMaintenanceAction
 --
---         , testRevokeDBSecurityGroupIngress $
---             revokeDBSecurityGroupIngress
+--         , testCreateOptionGroup $
+--             createOptionGroup
 --
+--         , testDescribeAccountAttributes $
+--             describeAccountAttributes
+--
 --         , testDeleteDBSnapshot $
 --             deleteDBSnapshot
 --
 --         , testDescribeDBClusterParameters $
 --             describeDBClusterParameters
 --
---         , testCreateDBSecurityGroup $
---             createDBSecurityGroup
---
 --         , testDeleteDBSubnetGroup $
 --             deleteDBSubnetGroup
 --
---         , testDescribeAccountAttributes $
---             describeAccountAttributes
+--         , testCreateDBSecurityGroup $
+--             createDBSecurityGroup
 --
---         , testDeleteDBSecurityGroup $
---             deleteDBSecurityGroup
+--         , testDescribeDBClusterSnapshots $
+--             describeDBClusterSnapshots
 --
 --         , testRebootDBInstance $
 --             rebootDBInstance
 --
---         , testDescribeDBClusterSnapshots $
---             describeDBClusterSnapshots
---
 --         , testCreateDBSubnetGroup $
 --             createDBSubnetGroup
 --
 --         , testDescribeReservedDBInstancesOfferings $
 --             describeReservedDBInstancesOfferings
 --
+--         , testDeleteDBSecurityGroup $
+--             deleteDBSecurityGroup
+--
 --         , testDeleteDBInstance $
 --             deleteDBInstance
 --
---         , testDescribeDBInstances $
---             describeDBInstances
---
---         , testCopyOptionGroup $
---             copyOptionGroup
---
---         , testDownloadDBLogFilePortion $
---             downloadDBLogFilePortion
---
 --         , testCreateDBInstanceReadReplica $
 --             createDBInstanceReadReplica
 --
---         , testRestoreDBClusterToPointInTime $
---             restoreDBClusterToPointInTime
---
 --         , testDeleteDBParameterGroup $
 --             deleteDBParameterGroup
 --
 --         , testDescribeDBSecurityGroups $
 --             describeDBSecurityGroups
 --
+--         , testCopyOptionGroup $
+--             copyOptionGroup
+--
+--         , testRestoreDBClusterToPointInTime $
+--             restoreDBClusterToPointInTime
+--
+--         , testDescribeDBInstances $
+--             describeDBInstances
+--
+--         , testDownloadDBLogFilePortion $
+--             downloadDBLogFilePortion
+--
 --           ]
 
 --     , testGroup "response"
---         [ testDescribeDBEngineVersionsResponse $
---             describeDBEngineVersionsResponse
---
---         , testDescribeDBClusterParameterGroupsResponse $
+--         [ testDescribeDBClusterParameterGroupsResponse $
 --             describeDBClusterParameterGroupsResponse
 --
 --         , testPromoteReadReplicaResponse $
 --             promoteReadReplicaResponse
 --
---         , testModifyEventSubscriptionResponse $
---             modifyEventSubscriptionResponse
+--         , testDescribeDBEngineVersionsResponse $
+--             describeDBEngineVersionsResponse
 --
 --         , testCopyDBSnapshotResponse $
 --             copyDBSnapshotResponse
@@ -280,6 +277,9 @@
 --         , testModifyDBInstanceResponse $
 --             modifyDBInstanceResponse
 --
+--         , testModifyEventSubscriptionResponse $
+--             modifyEventSubscriptionResponse
+--
 --         , testResetDBClusterParameterGroupResponse $
 --             dbClusterParameterGroupNameMessage
 --
@@ -289,66 +289,72 @@
 --         , testDescribeEngineDefaultParametersResponse $
 --             describeEngineDefaultParametersResponse
 --
+--         , testDescribeOptionGroupsResponse $
+--             describeOptionGroupsResponse
+--
+--         , testDescribeDBLogFilesResponse $
+--             describeDBLogFilesResponse
+--
 --         , testDescribeDBClustersResponse $
 --             describeDBClustersResponse
 --
 --         , testModifyDBSubnetGroupResponse $
 --             modifyDBSubnetGroupResponse
 --
---         , testDescribeDBLogFilesResponse $
---             describeDBLogFilesResponse
---
 --         , testListTagsForResourceResponse $
 --             listTagsForResourceResponse
 --
---         , testDescribeOptionGroupsResponse $
---             describeOptionGroupsResponse
+--         , testDeleteOptionGroupResponse $
+--             deleteOptionGroupResponse
 --
 --         , testDeleteDBClusterResponse $
 --             deleteDBClusterResponse
 --
---         , testRemoveSourceIdentifierFromSubscriptionResponse $
---             removeSourceIdentifierFromSubscriptionResponse
+--         , testDescribeReservedDBInstancesResponse $
+--             describeReservedDBInstancesResponse
 --
 --         , testCopyDBParameterGroupResponse $
 --             copyDBParameterGroupResponse
 --
---         , testDescribeReservedDBInstancesResponse $
---             describeReservedDBInstancesResponse
---
---         , testDeleteOptionGroupResponse $
---             deleteOptionGroupResponse
+--         , testRemoveSourceIdentifierFromSubscriptionResponse $
+--             removeSourceIdentifierFromSubscriptionResponse
 --
 --         , testDescribeEngineDefaultClusterParametersResponse $
 --             describeEngineDefaultClusterParametersResponse
 --
---         , testCreateEventSubscriptionResponse $
---             createEventSubscriptionResponse
---
 --         , testRemoveTagsFromResourceResponse $
 --             removeTagsFromResourceResponse
 --
---         , testCreateDBInstanceResponse $
---             createDBInstanceResponse
---
 --         , testRestoreDBInstanceFromDBSnapshotResponse $
 --             restoreDBInstanceFromDBSnapshotResponse
 --
---         , testAuthorizeDBSecurityGroupIngressResponse $
---             authorizeDBSecurityGroupIngressResponse
---
---         , testDeleteDBClusterParameterGroupResponse $
---             deleteDBClusterParameterGroupResponse
+--         , testCreateEventSubscriptionResponse $
+--             createEventSubscriptionResponse
 --
 --         , testPurchaseReservedDBInstancesOfferingResponse $
 --             purchaseReservedDBInstancesOfferingResponse
 --
+--         , testCreateDBInstanceResponse $
+--             createDBInstanceResponse
+--
+--         , testDeleteDBClusterParameterGroupResponse $
+--             deleteDBClusterParameterGroupResponse
+--
 --         , testDescribeCertificatesResponse $
 --             describeCertificatesResponse
 --
+--         , testAuthorizeDBSecurityGroupIngressResponse $
+--             authorizeDBSecurityGroupIngressResponse
+--
 --         , testRestoreDBClusterFromSnapshotResponse $
 --             restoreDBClusterFromSnapshotResponse
 --
+--         , testDescribeOrderableDBInstanceOptionsResponse $
+--             describeOrderableDBInstanceOptionsResponse
+--
+--         , testCreateDBClusterParameterGroupResponse $
+--             createDBClusterParameterGroupResponse
+--
 --         , testCreateDBSnapshotResponse $
 --             createDBSnapshotResponse
 --
@@ -358,11 +364,11 @@
 --         , testDescribeDBParameterGroupsResponse $
 --             describeDBParameterGroupsResponse
 --
---         , testDescribeOrderableDBInstanceOptionsResponse $
---             describeOrderableDBInstanceOptionsResponse
+--         , testDeleteDBClusterSnapshotResponse $
+--             deleteDBClusterSnapshotResponse
 --
---         , testCreateDBClusterParameterGroupResponse $
---             createDBClusterParameterGroupResponse
+--         , testDescribeOptionGroupOptionsResponse $
+--             describeOptionGroupOptionsResponse
 --
 --         , testDescribeEventSubscriptionsResponse $
 --             describeEventSubscriptionsResponse
@@ -370,14 +376,11 @@
 --         , testAddTagsToResourceResponse $
 --             addTagsToResourceResponse
 --
---         , testDescribeOptionGroupOptionsResponse $
---             describeOptionGroupOptionsResponse
---
 --         , testDescribeDBParametersResponse $
 --             describeDBParametersResponse
 --
---         , testDeleteDBClusterSnapshotResponse $
---             deleteDBClusterSnapshotResponse
+--         , testCreateDBClusterSnapshotResponse $
+--             createDBClusterSnapshotResponse
 --
 --         , testDescribeDBSnapshotsResponse $
 --             describeDBSnapshotsResponse
@@ -385,15 +388,12 @@
 --         , testDescribeDBSubnetGroupsResponse $
 --             describeDBSubnetGroupsResponse
 --
---         , testCreateDBParameterGroupResponse $
---             createDBParameterGroupResponse
---
---         , testCreateDBClusterSnapshotResponse $
---             createDBClusterSnapshotResponse
---
 --         , testModifyOptionGroupResponse $
 --             modifyOptionGroupResponse
 --
+--         , testCreateDBParameterGroupResponse $
+--             createDBParameterGroupResponse
+--
 --         , testModifyDBClusterResponse $
 --             modifyDBClusterResponse
 --
@@ -403,100 +403,95 @@
 --         , testModifyDBClusterParameterGroupResponse $
 --             dbClusterParameterGroupNameMessage
 --
---         , testDescribePendingMaintenanceActionsResponse $
---             describePendingMaintenanceActionsResponse
---
 --         , testRestoreDBInstanceToPointInTimeResponse $
 --             restoreDBInstanceToPointInTimeResponse
 --
---         , testResetDBParameterGroupResponse $
---             dbParameterGroupNameMessage
+--         , testDescribePendingMaintenanceActionsResponse $
+--             describePendingMaintenanceActionsResponse
 --
 --         , testCopyDBClusterSnapshotResponse $
 --             copyDBClusterSnapshotResponse
 --
---         , testModifyDBParameterGroupResponse $
+--         , testResetDBParameterGroupResponse $
 --             dbParameterGroupNameMessage
 --
+--         , testCreateDBClusterResponse $
+--             createDBClusterResponse
+--
 --         , testFailoverDBClusterResponse $
 --             failoverDBClusterResponse
 --
---         , testCreateDBClusterResponse $
---             createDBClusterResponse
+--         , testRevokeDBSecurityGroupIngressResponse $
+--             revokeDBSecurityGroupIngressResponse
 --
---         , testCreateOptionGroupResponse $
---             createOptionGroupResponse
+--         , testModifyDBParameterGroupResponse $
+--             dbParameterGroupNameMessage
 --
 --         , testApplyPendingMaintenanceActionResponse $
 --             applyPendingMaintenanceActionResponse
 --
---         , testRevokeDBSecurityGroupIngressResponse $
---             revokeDBSecurityGroupIngressResponse
+--         , testCreateOptionGroupResponse $
+--             createOptionGroupResponse
 --
+--         , testDescribeAccountAttributesResponse $
+--             describeAccountAttributesResponse
+--
 --         , testDeleteDBSnapshotResponse $
 --             deleteDBSnapshotResponse
 --
 --         , testDescribeDBClusterParametersResponse $
 --             describeDBClusterParametersResponse
 --
---         , testCreateDBSecurityGroupResponse $
---             createDBSecurityGroupResponse
---
 --         , testDeleteDBSubnetGroupResponse $
 --             deleteDBSubnetGroupResponse
 --
---         , testDescribeAccountAttributesResponse $
---             describeAccountAttributesResponse
+--         , testCreateDBSecurityGroupResponse $
+--             createDBSecurityGroupResponse
 --
---         , testDeleteDBSecurityGroupResponse $
---             deleteDBSecurityGroupResponse
+--         , testDescribeDBClusterSnapshotsResponse $
+--             describeDBClusterSnapshotsResponse
 --
 --         , testRebootDBInstanceResponse $
 --             rebootDBInstanceResponse
 --
---         , testDescribeDBClusterSnapshotsResponse $
---             describeDBClusterSnapshotsResponse
---
 --         , testCreateDBSubnetGroupResponse $
 --             createDBSubnetGroupResponse
 --
 --         , testDescribeReservedDBInstancesOfferingsResponse $
 --             describeReservedDBInstancesOfferingsResponse
 --
+--         , testDeleteDBSecurityGroupResponse $
+--             deleteDBSecurityGroupResponse
+--
 --         , testDeleteDBInstanceResponse $
 --             deleteDBInstanceResponse
 --
---         , testDescribeDBInstancesResponse $
---             describeDBInstancesResponse
---
---         , testCopyOptionGroupResponse $
---             copyOptionGroupResponse
---
---         , testDownloadDBLogFilePortionResponse $
---             downloadDBLogFilePortionResponse
---
 --         , testCreateDBInstanceReadReplicaResponse $
 --             createDBInstanceReadReplicaResponse
 --
---         , testRestoreDBClusterToPointInTimeResponse $
---             restoreDBClusterToPointInTimeResponse
---
 --         , testDeleteDBParameterGroupResponse $
 --             deleteDBParameterGroupResponse
 --
 --         , testDescribeDBSecurityGroupsResponse $
 --             describeDBSecurityGroupsResponse
 --
+--         , testCopyOptionGroupResponse $
+--             copyOptionGroupResponse
+--
+--         , testRestoreDBClusterToPointInTimeResponse $
+--             restoreDBClusterToPointInTimeResponse
+--
+--         , testDescribeDBInstancesResponse $
+--             describeDBInstancesResponse
+--
+--         , testDownloadDBLogFilePortionResponse $
+--             downloadDBLogFilePortionResponse
+--
 --           ]
 --     ]
 
 -- Requests
 
-testDescribeDBEngineVersions :: DescribeDBEngineVersions -> TestTree
-testDescribeDBEngineVersions = req
-    "DescribeDBEngineVersions"
-    "fixture/DescribeDBEngineVersions.yaml"
-
 testDescribeDBClusterParameterGroups :: DescribeDBClusterParameterGroups -> TestTree
 testDescribeDBClusterParameterGroups = req
     "DescribeDBClusterParameterGroups"
@@ -507,10 +502,10 @@
     "PromoteReadReplica"
     "fixture/PromoteReadReplica.yaml"
 
-testModifyEventSubscription :: ModifyEventSubscription -> TestTree
-testModifyEventSubscription = req
-    "ModifyEventSubscription"
-    "fixture/ModifyEventSubscription.yaml"
+testDescribeDBEngineVersions :: DescribeDBEngineVersions -> TestTree
+testDescribeDBEngineVersions = req
+    "DescribeDBEngineVersions"
+    "fixture/DescribeDBEngineVersions.yaml"
 
 testCopyDBSnapshot :: CopyDBSnapshot -> TestTree
 testCopyDBSnapshot = req
@@ -527,6 +522,11 @@
     "ModifyDBInstance"
     "fixture/ModifyDBInstance.yaml"
 
+testModifyEventSubscription :: ModifyEventSubscription -> TestTree
+testModifyEventSubscription = req
+    "ModifyEventSubscription"
+    "fixture/ModifyEventSubscription.yaml"
+
 testResetDBClusterParameterGroup :: ResetDBClusterParameterGroup -> TestTree
 testResetDBClusterParameterGroup = req
     "ResetDBClusterParameterGroup"
@@ -542,6 +542,16 @@
     "DescribeEngineDefaultParameters"
     "fixture/DescribeEngineDefaultParameters.yaml"
 
+testDescribeOptionGroups :: DescribeOptionGroups -> TestTree
+testDescribeOptionGroups = req
+    "DescribeOptionGroups"
+    "fixture/DescribeOptionGroups.yaml"
+
+testDescribeDBLogFiles :: DescribeDBLogFiles -> TestTree
+testDescribeDBLogFiles = req
+    "DescribeDBLogFiles"
+    "fixture/DescribeDBLogFiles.yaml"
+
 testDescribeDBClusters :: DescribeDBClusters -> TestTree
 testDescribeDBClusters = req
     "DescribeDBClusters"
@@ -552,96 +562,96 @@
     "ModifyDBSubnetGroup"
     "fixture/ModifyDBSubnetGroup.yaml"
 
-testDescribeDBLogFiles :: DescribeDBLogFiles -> TestTree
-testDescribeDBLogFiles = req
-    "DescribeDBLogFiles"
-    "fixture/DescribeDBLogFiles.yaml"
-
 testListTagsForResource :: ListTagsForResource -> TestTree
 testListTagsForResource = req
     "ListTagsForResource"
     "fixture/ListTagsForResource.yaml"
 
-testDescribeOptionGroups :: DescribeOptionGroups -> TestTree
-testDescribeOptionGroups = req
-    "DescribeOptionGroups"
-    "fixture/DescribeOptionGroups.yaml"
+testDeleteOptionGroup :: DeleteOptionGroup -> TestTree
+testDeleteOptionGroup = req
+    "DeleteOptionGroup"
+    "fixture/DeleteOptionGroup.yaml"
 
 testDeleteDBCluster :: DeleteDBCluster -> TestTree
 testDeleteDBCluster = req
     "DeleteDBCluster"
     "fixture/DeleteDBCluster.yaml"
 
-testRemoveSourceIdentifierFromSubscription :: RemoveSourceIdentifierFromSubscription -> TestTree
-testRemoveSourceIdentifierFromSubscription = req
-    "RemoveSourceIdentifierFromSubscription"
-    "fixture/RemoveSourceIdentifierFromSubscription.yaml"
+testDescribeReservedDBInstances :: DescribeReservedDBInstances -> TestTree
+testDescribeReservedDBInstances = req
+    "DescribeReservedDBInstances"
+    "fixture/DescribeReservedDBInstances.yaml"
 
 testCopyDBParameterGroup :: CopyDBParameterGroup -> TestTree
 testCopyDBParameterGroup = req
     "CopyDBParameterGroup"
     "fixture/CopyDBParameterGroup.yaml"
 
-testDescribeReservedDBInstances :: DescribeReservedDBInstances -> TestTree
-testDescribeReservedDBInstances = req
-    "DescribeReservedDBInstances"
-    "fixture/DescribeReservedDBInstances.yaml"
-
-testDeleteOptionGroup :: DeleteOptionGroup -> TestTree
-testDeleteOptionGroup = req
-    "DeleteOptionGroup"
-    "fixture/DeleteOptionGroup.yaml"
+testRemoveSourceIdentifierFromSubscription :: RemoveSourceIdentifierFromSubscription -> TestTree
+testRemoveSourceIdentifierFromSubscription = req
+    "RemoveSourceIdentifierFromSubscription"
+    "fixture/RemoveSourceIdentifierFromSubscription.yaml"
 
 testDescribeEngineDefaultClusterParameters :: DescribeEngineDefaultClusterParameters -> TestTree
 testDescribeEngineDefaultClusterParameters = req
     "DescribeEngineDefaultClusterParameters"
     "fixture/DescribeEngineDefaultClusterParameters.yaml"
 
-testCreateEventSubscription :: CreateEventSubscription -> TestTree
-testCreateEventSubscription = req
-    "CreateEventSubscription"
-    "fixture/CreateEventSubscription.yaml"
-
 testRemoveTagsFromResource :: RemoveTagsFromResource -> TestTree
 testRemoveTagsFromResource = req
     "RemoveTagsFromResource"
     "fixture/RemoveTagsFromResource.yaml"
 
-testCreateDBInstance :: CreateDBInstance -> TestTree
-testCreateDBInstance = req
-    "CreateDBInstance"
-    "fixture/CreateDBInstance.yaml"
-
 testRestoreDBInstanceFromDBSnapshot :: RestoreDBInstanceFromDBSnapshot -> TestTree
 testRestoreDBInstanceFromDBSnapshot = req
     "RestoreDBInstanceFromDBSnapshot"
     "fixture/RestoreDBInstanceFromDBSnapshot.yaml"
 
-testAuthorizeDBSecurityGroupIngress :: AuthorizeDBSecurityGroupIngress -> TestTree
-testAuthorizeDBSecurityGroupIngress = req
-    "AuthorizeDBSecurityGroupIngress"
-    "fixture/AuthorizeDBSecurityGroupIngress.yaml"
-
-testDeleteDBClusterParameterGroup :: DeleteDBClusterParameterGroup -> TestTree
-testDeleteDBClusterParameterGroup = req
-    "DeleteDBClusterParameterGroup"
-    "fixture/DeleteDBClusterParameterGroup.yaml"
+testCreateEventSubscription :: CreateEventSubscription -> TestTree
+testCreateEventSubscription = req
+    "CreateEventSubscription"
+    "fixture/CreateEventSubscription.yaml"
 
 testPurchaseReservedDBInstancesOffering :: PurchaseReservedDBInstancesOffering -> TestTree
 testPurchaseReservedDBInstancesOffering = req
     "PurchaseReservedDBInstancesOffering"
     "fixture/PurchaseReservedDBInstancesOffering.yaml"
 
+testCreateDBInstance :: CreateDBInstance -> TestTree
+testCreateDBInstance = req
+    "CreateDBInstance"
+    "fixture/CreateDBInstance.yaml"
+
+testDeleteDBClusterParameterGroup :: DeleteDBClusterParameterGroup -> TestTree
+testDeleteDBClusterParameterGroup = req
+    "DeleteDBClusterParameterGroup"
+    "fixture/DeleteDBClusterParameterGroup.yaml"
+
 testDescribeCertificates :: DescribeCertificates -> TestTree
 testDescribeCertificates = req
     "DescribeCertificates"
     "fixture/DescribeCertificates.yaml"
 
+testAuthorizeDBSecurityGroupIngress :: AuthorizeDBSecurityGroupIngress -> TestTree
+testAuthorizeDBSecurityGroupIngress = req
+    "AuthorizeDBSecurityGroupIngress"
+    "fixture/AuthorizeDBSecurityGroupIngress.yaml"
+
 testRestoreDBClusterFromSnapshot :: RestoreDBClusterFromSnapshot -> TestTree
 testRestoreDBClusterFromSnapshot = req
     "RestoreDBClusterFromSnapshot"
     "fixture/RestoreDBClusterFromSnapshot.yaml"
 
+testDescribeOrderableDBInstanceOptions :: DescribeOrderableDBInstanceOptions -> TestTree
+testDescribeOrderableDBInstanceOptions = req
+    "DescribeOrderableDBInstanceOptions"
+    "fixture/DescribeOrderableDBInstanceOptions.yaml"
+
+testCreateDBClusterParameterGroup :: CreateDBClusterParameterGroup -> TestTree
+testCreateDBClusterParameterGroup = req
+    "CreateDBClusterParameterGroup"
+    "fixture/CreateDBClusterParameterGroup.yaml"
+
 testCreateDBSnapshot :: CreateDBSnapshot -> TestTree
 testCreateDBSnapshot = req
     "CreateDBSnapshot"
@@ -657,15 +667,15 @@
     "DescribeDBParameterGroups"
     "fixture/DescribeDBParameterGroups.yaml"
 
-testDescribeOrderableDBInstanceOptions :: DescribeOrderableDBInstanceOptions -> TestTree
-testDescribeOrderableDBInstanceOptions = req
-    "DescribeOrderableDBInstanceOptions"
-    "fixture/DescribeOrderableDBInstanceOptions.yaml"
+testDeleteDBClusterSnapshot :: DeleteDBClusterSnapshot -> TestTree
+testDeleteDBClusterSnapshot = req
+    "DeleteDBClusterSnapshot"
+    "fixture/DeleteDBClusterSnapshot.yaml"
 
-testCreateDBClusterParameterGroup :: CreateDBClusterParameterGroup -> TestTree
-testCreateDBClusterParameterGroup = req
-    "CreateDBClusterParameterGroup"
-    "fixture/CreateDBClusterParameterGroup.yaml"
+testDescribeOptionGroupOptions :: DescribeOptionGroupOptions -> TestTree
+testDescribeOptionGroupOptions = req
+    "DescribeOptionGroupOptions"
+    "fixture/DescribeOptionGroupOptions.yaml"
 
 testDescribeEventSubscriptions :: DescribeEventSubscriptions -> TestTree
 testDescribeEventSubscriptions = req
@@ -677,20 +687,15 @@
     "AddTagsToResource"
     "fixture/AddTagsToResource.yaml"
 
-testDescribeOptionGroupOptions :: DescribeOptionGroupOptions -> TestTree
-testDescribeOptionGroupOptions = req
-    "DescribeOptionGroupOptions"
-    "fixture/DescribeOptionGroupOptions.yaml"
-
 testDescribeDBParameters :: DescribeDBParameters -> TestTree
 testDescribeDBParameters = req
     "DescribeDBParameters"
     "fixture/DescribeDBParameters.yaml"
 
-testDeleteDBClusterSnapshot :: DeleteDBClusterSnapshot -> TestTree
-testDeleteDBClusterSnapshot = req
-    "DeleteDBClusterSnapshot"
-    "fixture/DeleteDBClusterSnapshot.yaml"
+testCreateDBClusterSnapshot :: CreateDBClusterSnapshot -> TestTree
+testCreateDBClusterSnapshot = req
+    "CreateDBClusterSnapshot"
+    "fixture/CreateDBClusterSnapshot.yaml"
 
 testDescribeDBSnapshots :: DescribeDBSnapshots -> TestTree
 testDescribeDBSnapshots = req
@@ -702,21 +707,16 @@
     "DescribeDBSubnetGroups"
     "fixture/DescribeDBSubnetGroups.yaml"
 
-testCreateDBParameterGroup :: CreateDBParameterGroup -> TestTree
-testCreateDBParameterGroup = req
-    "CreateDBParameterGroup"
-    "fixture/CreateDBParameterGroup.yaml"
-
-testCreateDBClusterSnapshot :: CreateDBClusterSnapshot -> TestTree
-testCreateDBClusterSnapshot = req
-    "CreateDBClusterSnapshot"
-    "fixture/CreateDBClusterSnapshot.yaml"
-
 testModifyOptionGroup :: ModifyOptionGroup -> TestTree
 testModifyOptionGroup = req
     "ModifyOptionGroup"
     "fixture/ModifyOptionGroup.yaml"
 
+testCreateDBParameterGroup :: CreateDBParameterGroup -> TestTree
+testCreateDBParameterGroup = req
+    "CreateDBParameterGroup"
+    "fixture/CreateDBParameterGroup.yaml"
+
 testModifyDBCluster :: ModifyDBCluster -> TestTree
 testModifyDBCluster = req
     "ModifyDBCluster"
@@ -732,56 +732,61 @@
     "ModifyDBClusterParameterGroup"
     "fixture/ModifyDBClusterParameterGroup.yaml"
 
-testDescribePendingMaintenanceActions :: DescribePendingMaintenanceActions -> TestTree
-testDescribePendingMaintenanceActions = req
-    "DescribePendingMaintenanceActions"
-    "fixture/DescribePendingMaintenanceActions.yaml"
-
 testRestoreDBInstanceToPointInTime :: RestoreDBInstanceToPointInTime -> TestTree
 testRestoreDBInstanceToPointInTime = req
     "RestoreDBInstanceToPointInTime"
     "fixture/RestoreDBInstanceToPointInTime.yaml"
 
-testResetDBParameterGroup :: ResetDBParameterGroup -> TestTree
-testResetDBParameterGroup = req
-    "ResetDBParameterGroup"
-    "fixture/ResetDBParameterGroup.yaml"
+testDescribePendingMaintenanceActions :: DescribePendingMaintenanceActions -> TestTree
+testDescribePendingMaintenanceActions = req
+    "DescribePendingMaintenanceActions"
+    "fixture/DescribePendingMaintenanceActions.yaml"
 
 testCopyDBClusterSnapshot :: CopyDBClusterSnapshot -> TestTree
 testCopyDBClusterSnapshot = req
     "CopyDBClusterSnapshot"
     "fixture/CopyDBClusterSnapshot.yaml"
 
-testModifyDBParameterGroup :: ModifyDBParameterGroup -> TestTree
-testModifyDBParameterGroup = req
-    "ModifyDBParameterGroup"
-    "fixture/ModifyDBParameterGroup.yaml"
+testResetDBParameterGroup :: ResetDBParameterGroup -> TestTree
+testResetDBParameterGroup = req
+    "ResetDBParameterGroup"
+    "fixture/ResetDBParameterGroup.yaml"
 
+testCreateDBCluster :: CreateDBCluster -> TestTree
+testCreateDBCluster = req
+    "CreateDBCluster"
+    "fixture/CreateDBCluster.yaml"
+
 testFailoverDBCluster :: FailoverDBCluster -> TestTree
 testFailoverDBCluster = req
     "FailoverDBCluster"
     "fixture/FailoverDBCluster.yaml"
 
-testCreateDBCluster :: CreateDBCluster -> TestTree
-testCreateDBCluster = req
-    "CreateDBCluster"
-    "fixture/CreateDBCluster.yaml"
+testRevokeDBSecurityGroupIngress :: RevokeDBSecurityGroupIngress -> TestTree
+testRevokeDBSecurityGroupIngress = req
+    "RevokeDBSecurityGroupIngress"
+    "fixture/RevokeDBSecurityGroupIngress.yaml"
 
-testCreateOptionGroup :: CreateOptionGroup -> TestTree
-testCreateOptionGroup = req
-    "CreateOptionGroup"
-    "fixture/CreateOptionGroup.yaml"
+testModifyDBParameterGroup :: ModifyDBParameterGroup -> TestTree
+testModifyDBParameterGroup = req
+    "ModifyDBParameterGroup"
+    "fixture/ModifyDBParameterGroup.yaml"
 
 testApplyPendingMaintenanceAction :: ApplyPendingMaintenanceAction -> TestTree
 testApplyPendingMaintenanceAction = req
     "ApplyPendingMaintenanceAction"
     "fixture/ApplyPendingMaintenanceAction.yaml"
 
-testRevokeDBSecurityGroupIngress :: RevokeDBSecurityGroupIngress -> TestTree
-testRevokeDBSecurityGroupIngress = req
-    "RevokeDBSecurityGroupIngress"
-    "fixture/RevokeDBSecurityGroupIngress.yaml"
+testCreateOptionGroup :: CreateOptionGroup -> TestTree
+testCreateOptionGroup = req
+    "CreateOptionGroup"
+    "fixture/CreateOptionGroup.yaml"
 
+testDescribeAccountAttributes :: DescribeAccountAttributes -> TestTree
+testDescribeAccountAttributes = req
+    "DescribeAccountAttributes"
+    "fixture/DescribeAccountAttributes.yaml"
+
 testDeleteDBSnapshot :: DeleteDBSnapshot -> TestTree
 testDeleteDBSnapshot = req
     "DeleteDBSnapshot"
@@ -792,36 +797,26 @@
     "DescribeDBClusterParameters"
     "fixture/DescribeDBClusterParameters.yaml"
 
-testCreateDBSecurityGroup :: CreateDBSecurityGroup -> TestTree
-testCreateDBSecurityGroup = req
-    "CreateDBSecurityGroup"
-    "fixture/CreateDBSecurityGroup.yaml"
-
 testDeleteDBSubnetGroup :: DeleteDBSubnetGroup -> TestTree
 testDeleteDBSubnetGroup = req
     "DeleteDBSubnetGroup"
     "fixture/DeleteDBSubnetGroup.yaml"
 
-testDescribeAccountAttributes :: DescribeAccountAttributes -> TestTree
-testDescribeAccountAttributes = req
-    "DescribeAccountAttributes"
-    "fixture/DescribeAccountAttributes.yaml"
+testCreateDBSecurityGroup :: CreateDBSecurityGroup -> TestTree
+testCreateDBSecurityGroup = req
+    "CreateDBSecurityGroup"
+    "fixture/CreateDBSecurityGroup.yaml"
 
-testDeleteDBSecurityGroup :: DeleteDBSecurityGroup -> TestTree
-testDeleteDBSecurityGroup = req
-    "DeleteDBSecurityGroup"
-    "fixture/DeleteDBSecurityGroup.yaml"
+testDescribeDBClusterSnapshots :: DescribeDBClusterSnapshots -> TestTree
+testDescribeDBClusterSnapshots = req
+    "DescribeDBClusterSnapshots"
+    "fixture/DescribeDBClusterSnapshots.yaml"
 
 testRebootDBInstance :: RebootDBInstance -> TestTree
 testRebootDBInstance = req
     "RebootDBInstance"
     "fixture/RebootDBInstance.yaml"
 
-testDescribeDBClusterSnapshots :: DescribeDBClusterSnapshots -> TestTree
-testDescribeDBClusterSnapshots = req
-    "DescribeDBClusterSnapshots"
-    "fixture/DescribeDBClusterSnapshots.yaml"
-
 testCreateDBSubnetGroup :: CreateDBSubnetGroup -> TestTree
 testCreateDBSubnetGroup = req
     "CreateDBSubnetGroup"
@@ -832,36 +827,21 @@
     "DescribeReservedDBInstancesOfferings"
     "fixture/DescribeReservedDBInstancesOfferings.yaml"
 
+testDeleteDBSecurityGroup :: DeleteDBSecurityGroup -> TestTree
+testDeleteDBSecurityGroup = req
+    "DeleteDBSecurityGroup"
+    "fixture/DeleteDBSecurityGroup.yaml"
+
 testDeleteDBInstance :: DeleteDBInstance -> TestTree
 testDeleteDBInstance = req
     "DeleteDBInstance"
     "fixture/DeleteDBInstance.yaml"
 
-testDescribeDBInstances :: DescribeDBInstances -> TestTree
-testDescribeDBInstances = req
-    "DescribeDBInstances"
-    "fixture/DescribeDBInstances.yaml"
-
-testCopyOptionGroup :: CopyOptionGroup -> TestTree
-testCopyOptionGroup = req
-    "CopyOptionGroup"
-    "fixture/CopyOptionGroup.yaml"
-
-testDownloadDBLogFilePortion :: DownloadDBLogFilePortion -> TestTree
-testDownloadDBLogFilePortion = req
-    "DownloadDBLogFilePortion"
-    "fixture/DownloadDBLogFilePortion.yaml"
-
 testCreateDBInstanceReadReplica :: CreateDBInstanceReadReplica -> TestTree
 testCreateDBInstanceReadReplica = req
     "CreateDBInstanceReadReplica"
     "fixture/CreateDBInstanceReadReplica.yaml"
 
-testRestoreDBClusterToPointInTime :: RestoreDBClusterToPointInTime -> TestTree
-testRestoreDBClusterToPointInTime = req
-    "RestoreDBClusterToPointInTime"
-    "fixture/RestoreDBClusterToPointInTime.yaml"
-
 testDeleteDBParameterGroup :: DeleteDBParameterGroup -> TestTree
 testDeleteDBParameterGroup = req
     "DeleteDBParameterGroup"
@@ -872,15 +852,28 @@
     "DescribeDBSecurityGroups"
     "fixture/DescribeDBSecurityGroups.yaml"
 
--- Responses
+testCopyOptionGroup :: CopyOptionGroup -> TestTree
+testCopyOptionGroup = req
+    "CopyOptionGroup"
+    "fixture/CopyOptionGroup.yaml"
 
-testDescribeDBEngineVersionsResponse :: DescribeDBEngineVersionsResponse -> TestTree
-testDescribeDBEngineVersionsResponse = res
-    "DescribeDBEngineVersionsResponse"
-    "fixture/DescribeDBEngineVersionsResponse.proto"
-    rDS
-    (Proxy :: Proxy DescribeDBEngineVersions)
+testRestoreDBClusterToPointInTime :: RestoreDBClusterToPointInTime -> TestTree
+testRestoreDBClusterToPointInTime = req
+    "RestoreDBClusterToPointInTime"
+    "fixture/RestoreDBClusterToPointInTime.yaml"
 
+testDescribeDBInstances :: DescribeDBInstances -> TestTree
+testDescribeDBInstances = req
+    "DescribeDBInstances"
+    "fixture/DescribeDBInstances.yaml"
+
+testDownloadDBLogFilePortion :: DownloadDBLogFilePortion -> TestTree
+testDownloadDBLogFilePortion = req
+    "DownloadDBLogFilePortion"
+    "fixture/DownloadDBLogFilePortion.yaml"
+
+-- Responses
+
 testDescribeDBClusterParameterGroupsResponse :: DescribeDBClusterParameterGroupsResponse -> TestTree
 testDescribeDBClusterParameterGroupsResponse = res
     "DescribeDBClusterParameterGroupsResponse"
@@ -895,12 +888,12 @@
     rDS
     (Proxy :: Proxy PromoteReadReplica)
 
-testModifyEventSubscriptionResponse :: ModifyEventSubscriptionResponse -> TestTree
-testModifyEventSubscriptionResponse = res
-    "ModifyEventSubscriptionResponse"
-    "fixture/ModifyEventSubscriptionResponse.proto"
+testDescribeDBEngineVersionsResponse :: DescribeDBEngineVersionsResponse -> TestTree
+testDescribeDBEngineVersionsResponse = res
+    "DescribeDBEngineVersionsResponse"
+    "fixture/DescribeDBEngineVersionsResponse.proto"
     rDS
-    (Proxy :: Proxy ModifyEventSubscription)
+    (Proxy :: Proxy DescribeDBEngineVersions)
 
 testCopyDBSnapshotResponse :: CopyDBSnapshotResponse -> TestTree
 testCopyDBSnapshotResponse = res
@@ -923,6 +916,13 @@
     rDS
     (Proxy :: Proxy ModifyDBInstance)
 
+testModifyEventSubscriptionResponse :: ModifyEventSubscriptionResponse -> TestTree
+testModifyEventSubscriptionResponse = res
+    "ModifyEventSubscriptionResponse"
+    "fixture/ModifyEventSubscriptionResponse.proto"
+    rDS
+    (Proxy :: Proxy ModifyEventSubscription)
+
 testResetDBClusterParameterGroupResponse :: DBClusterParameterGroupNameMessage -> TestTree
 testResetDBClusterParameterGroupResponse = res
     "ResetDBClusterParameterGroupResponse"
@@ -944,6 +944,20 @@
     rDS
     (Proxy :: Proxy DescribeEngineDefaultParameters)
 
+testDescribeOptionGroupsResponse :: DescribeOptionGroupsResponse -> TestTree
+testDescribeOptionGroupsResponse = res
+    "DescribeOptionGroupsResponse"
+    "fixture/DescribeOptionGroupsResponse.proto"
+    rDS
+    (Proxy :: Proxy DescribeOptionGroups)
+
+testDescribeDBLogFilesResponse :: DescribeDBLogFilesResponse -> TestTree
+testDescribeDBLogFilesResponse = res
+    "DescribeDBLogFilesResponse"
+    "fixture/DescribeDBLogFilesResponse.proto"
+    rDS
+    (Proxy :: Proxy DescribeDBLogFiles)
+
 testDescribeDBClustersResponse :: DescribeDBClustersResponse -> TestTree
 testDescribeDBClustersResponse = res
     "DescribeDBClustersResponse"
@@ -958,13 +972,6 @@
     rDS
     (Proxy :: Proxy ModifyDBSubnetGroup)
 
-testDescribeDBLogFilesResponse :: DescribeDBLogFilesResponse -> TestTree
-testDescribeDBLogFilesResponse = res
-    "DescribeDBLogFilesResponse"
-    "fixture/DescribeDBLogFilesResponse.proto"
-    rDS
-    (Proxy :: Proxy DescribeDBLogFiles)
-
 testListTagsForResourceResponse :: ListTagsForResourceResponse -> TestTree
 testListTagsForResourceResponse = res
     "ListTagsForResourceResponse"
@@ -972,12 +979,12 @@
     rDS
     (Proxy :: Proxy ListTagsForResource)
 
-testDescribeOptionGroupsResponse :: DescribeOptionGroupsResponse -> TestTree
-testDescribeOptionGroupsResponse = res
-    "DescribeOptionGroupsResponse"
-    "fixture/DescribeOptionGroupsResponse.proto"
+testDeleteOptionGroupResponse :: DeleteOptionGroupResponse -> TestTree
+testDeleteOptionGroupResponse = res
+    "DeleteOptionGroupResponse"
+    "fixture/DeleteOptionGroupResponse.proto"
     rDS
-    (Proxy :: Proxy DescribeOptionGroups)
+    (Proxy :: Proxy DeleteOptionGroup)
 
 testDeleteDBClusterResponse :: DeleteDBClusterResponse -> TestTree
 testDeleteDBClusterResponse = res
@@ -986,12 +993,12 @@
     rDS
     (Proxy :: Proxy DeleteDBCluster)
 
-testRemoveSourceIdentifierFromSubscriptionResponse :: RemoveSourceIdentifierFromSubscriptionResponse -> TestTree
-testRemoveSourceIdentifierFromSubscriptionResponse = res
-    "RemoveSourceIdentifierFromSubscriptionResponse"
-    "fixture/RemoveSourceIdentifierFromSubscriptionResponse.proto"
+testDescribeReservedDBInstancesResponse :: DescribeReservedDBInstancesResponse -> TestTree
+testDescribeReservedDBInstancesResponse = res
+    "DescribeReservedDBInstancesResponse"
+    "fixture/DescribeReservedDBInstancesResponse.proto"
     rDS
-    (Proxy :: Proxy RemoveSourceIdentifierFromSubscription)
+    (Proxy :: Proxy DescribeReservedDBInstances)
 
 testCopyDBParameterGroupResponse :: CopyDBParameterGroupResponse -> TestTree
 testCopyDBParameterGroupResponse = res
@@ -1000,19 +1007,12 @@
     rDS
     (Proxy :: Proxy CopyDBParameterGroup)
 
-testDescribeReservedDBInstancesResponse :: DescribeReservedDBInstancesResponse -> TestTree
-testDescribeReservedDBInstancesResponse = res
-    "DescribeReservedDBInstancesResponse"
-    "fixture/DescribeReservedDBInstancesResponse.proto"
-    rDS
-    (Proxy :: Proxy DescribeReservedDBInstances)
-
-testDeleteOptionGroupResponse :: DeleteOptionGroupResponse -> TestTree
-testDeleteOptionGroupResponse = res
-    "DeleteOptionGroupResponse"
-    "fixture/DeleteOptionGroupResponse.proto"
+testRemoveSourceIdentifierFromSubscriptionResponse :: RemoveSourceIdentifierFromSubscriptionResponse -> TestTree
+testRemoveSourceIdentifierFromSubscriptionResponse = res
+    "RemoveSourceIdentifierFromSubscriptionResponse"
+    "fixture/RemoveSourceIdentifierFromSubscriptionResponse.proto"
     rDS
-    (Proxy :: Proxy DeleteOptionGroup)
+    (Proxy :: Proxy RemoveSourceIdentifierFromSubscription)
 
 testDescribeEngineDefaultClusterParametersResponse :: DescribeEngineDefaultClusterParametersResponse -> TestTree
 testDescribeEngineDefaultClusterParametersResponse = res
@@ -1021,13 +1021,6 @@
     rDS
     (Proxy :: Proxy DescribeEngineDefaultClusterParameters)
 
-testCreateEventSubscriptionResponse :: CreateEventSubscriptionResponse -> TestTree
-testCreateEventSubscriptionResponse = res
-    "CreateEventSubscriptionResponse"
-    "fixture/CreateEventSubscriptionResponse.proto"
-    rDS
-    (Proxy :: Proxy CreateEventSubscription)
-
 testRemoveTagsFromResourceResponse :: RemoveTagsFromResourceResponse -> TestTree
 testRemoveTagsFromResourceResponse = res
     "RemoveTagsFromResourceResponse"
@@ -1035,13 +1028,6 @@
     rDS
     (Proxy :: Proxy RemoveTagsFromResource)
 
-testCreateDBInstanceResponse :: CreateDBInstanceResponse -> TestTree
-testCreateDBInstanceResponse = res
-    "CreateDBInstanceResponse"
-    "fixture/CreateDBInstanceResponse.proto"
-    rDS
-    (Proxy :: Proxy CreateDBInstance)
-
 testRestoreDBInstanceFromDBSnapshotResponse :: RestoreDBInstanceFromDBSnapshotResponse -> TestTree
 testRestoreDBInstanceFromDBSnapshotResponse = res
     "RestoreDBInstanceFromDBSnapshotResponse"
@@ -1049,19 +1035,12 @@
     rDS
     (Proxy :: Proxy RestoreDBInstanceFromDBSnapshot)
 
-testAuthorizeDBSecurityGroupIngressResponse :: AuthorizeDBSecurityGroupIngressResponse -> TestTree
-testAuthorizeDBSecurityGroupIngressResponse = res
-    "AuthorizeDBSecurityGroupIngressResponse"
-    "fixture/AuthorizeDBSecurityGroupIngressResponse.proto"
-    rDS
-    (Proxy :: Proxy AuthorizeDBSecurityGroupIngress)
-
-testDeleteDBClusterParameterGroupResponse :: DeleteDBClusterParameterGroupResponse -> TestTree
-testDeleteDBClusterParameterGroupResponse = res
-    "DeleteDBClusterParameterGroupResponse"
-    "fixture/DeleteDBClusterParameterGroupResponse.proto"
+testCreateEventSubscriptionResponse :: CreateEventSubscriptionResponse -> TestTree
+testCreateEventSubscriptionResponse = res
+    "CreateEventSubscriptionResponse"
+    "fixture/CreateEventSubscriptionResponse.proto"
     rDS
-    (Proxy :: Proxy DeleteDBClusterParameterGroup)
+    (Proxy :: Proxy CreateEventSubscription)
 
 testPurchaseReservedDBInstancesOfferingResponse :: PurchaseReservedDBInstancesOfferingResponse -> TestTree
 testPurchaseReservedDBInstancesOfferingResponse = res
@@ -1070,6 +1049,20 @@
     rDS
     (Proxy :: Proxy PurchaseReservedDBInstancesOffering)
 
+testCreateDBInstanceResponse :: CreateDBInstanceResponse -> TestTree
+testCreateDBInstanceResponse = res
+    "CreateDBInstanceResponse"
+    "fixture/CreateDBInstanceResponse.proto"
+    rDS
+    (Proxy :: Proxy CreateDBInstance)
+
+testDeleteDBClusterParameterGroupResponse :: DeleteDBClusterParameterGroupResponse -> TestTree
+testDeleteDBClusterParameterGroupResponse = res
+    "DeleteDBClusterParameterGroupResponse"
+    "fixture/DeleteDBClusterParameterGroupResponse.proto"
+    rDS
+    (Proxy :: Proxy DeleteDBClusterParameterGroup)
+
 testDescribeCertificatesResponse :: DescribeCertificatesResponse -> TestTree
 testDescribeCertificatesResponse = res
     "DescribeCertificatesResponse"
@@ -1077,6 +1070,13 @@
     rDS
     (Proxy :: Proxy DescribeCertificates)
 
+testAuthorizeDBSecurityGroupIngressResponse :: AuthorizeDBSecurityGroupIngressResponse -> TestTree
+testAuthorizeDBSecurityGroupIngressResponse = res
+    "AuthorizeDBSecurityGroupIngressResponse"
+    "fixture/AuthorizeDBSecurityGroupIngressResponse.proto"
+    rDS
+    (Proxy :: Proxy AuthorizeDBSecurityGroupIngress)
+
 testRestoreDBClusterFromSnapshotResponse :: RestoreDBClusterFromSnapshotResponse -> TestTree
 testRestoreDBClusterFromSnapshotResponse = res
     "RestoreDBClusterFromSnapshotResponse"
@@ -1084,6 +1084,20 @@
     rDS
     (Proxy :: Proxy RestoreDBClusterFromSnapshot)
 
+testDescribeOrderableDBInstanceOptionsResponse :: DescribeOrderableDBInstanceOptionsResponse -> TestTree
+testDescribeOrderableDBInstanceOptionsResponse = res
+    "DescribeOrderableDBInstanceOptionsResponse"
+    "fixture/DescribeOrderableDBInstanceOptionsResponse.proto"
+    rDS
+    (Proxy :: Proxy DescribeOrderableDBInstanceOptions)
+
+testCreateDBClusterParameterGroupResponse :: CreateDBClusterParameterGroupResponse -> TestTree
+testCreateDBClusterParameterGroupResponse = res
+    "CreateDBClusterParameterGroupResponse"
+    "fixture/CreateDBClusterParameterGroupResponse.proto"
+    rDS
+    (Proxy :: Proxy CreateDBClusterParameterGroup)
+
 testCreateDBSnapshotResponse :: CreateDBSnapshotResponse -> TestTree
 testCreateDBSnapshotResponse = res
     "CreateDBSnapshotResponse"
@@ -1105,19 +1119,19 @@
     rDS
     (Proxy :: Proxy DescribeDBParameterGroups)
 
-testDescribeOrderableDBInstanceOptionsResponse :: DescribeOrderableDBInstanceOptionsResponse -> TestTree
-testDescribeOrderableDBInstanceOptionsResponse = res
-    "DescribeOrderableDBInstanceOptionsResponse"
-    "fixture/DescribeOrderableDBInstanceOptionsResponse.proto"
+testDeleteDBClusterSnapshotResponse :: DeleteDBClusterSnapshotResponse -> TestTree
+testDeleteDBClusterSnapshotResponse = res
+    "DeleteDBClusterSnapshotResponse"
+    "fixture/DeleteDBClusterSnapshotResponse.proto"
     rDS
-    (Proxy :: Proxy DescribeOrderableDBInstanceOptions)
+    (Proxy :: Proxy DeleteDBClusterSnapshot)
 
-testCreateDBClusterParameterGroupResponse :: CreateDBClusterParameterGroupResponse -> TestTree
-testCreateDBClusterParameterGroupResponse = res
-    "CreateDBClusterParameterGroupResponse"
-    "fixture/CreateDBClusterParameterGroupResponse.proto"
+testDescribeOptionGroupOptionsResponse :: DescribeOptionGroupOptionsResponse -> TestTree
+testDescribeOptionGroupOptionsResponse = res
+    "DescribeOptionGroupOptionsResponse"
+    "fixture/DescribeOptionGroupOptionsResponse.proto"
     rDS
-    (Proxy :: Proxy CreateDBClusterParameterGroup)
+    (Proxy :: Proxy DescribeOptionGroupOptions)
 
 testDescribeEventSubscriptionsResponse :: DescribeEventSubscriptionsResponse -> TestTree
 testDescribeEventSubscriptionsResponse = res
@@ -1133,13 +1147,6 @@
     rDS
     (Proxy :: Proxy AddTagsToResource)
 
-testDescribeOptionGroupOptionsResponse :: DescribeOptionGroupOptionsResponse -> TestTree
-testDescribeOptionGroupOptionsResponse = res
-    "DescribeOptionGroupOptionsResponse"
-    "fixture/DescribeOptionGroupOptionsResponse.proto"
-    rDS
-    (Proxy :: Proxy DescribeOptionGroupOptions)
-
 testDescribeDBParametersResponse :: DescribeDBParametersResponse -> TestTree
 testDescribeDBParametersResponse = res
     "DescribeDBParametersResponse"
@@ -1147,12 +1154,12 @@
     rDS
     (Proxy :: Proxy DescribeDBParameters)
 
-testDeleteDBClusterSnapshotResponse :: DeleteDBClusterSnapshotResponse -> TestTree
-testDeleteDBClusterSnapshotResponse = res
-    "DeleteDBClusterSnapshotResponse"
-    "fixture/DeleteDBClusterSnapshotResponse.proto"
+testCreateDBClusterSnapshotResponse :: CreateDBClusterSnapshotResponse -> TestTree
+testCreateDBClusterSnapshotResponse = res
+    "CreateDBClusterSnapshotResponse"
+    "fixture/CreateDBClusterSnapshotResponse.proto"
     rDS
-    (Proxy :: Proxy DeleteDBClusterSnapshot)
+    (Proxy :: Proxy CreateDBClusterSnapshot)
 
 testDescribeDBSnapshotsResponse :: DescribeDBSnapshotsResponse -> TestTree
 testDescribeDBSnapshotsResponse = res
@@ -1168,20 +1175,6 @@
     rDS
     (Proxy :: Proxy DescribeDBSubnetGroups)
 
-testCreateDBParameterGroupResponse :: CreateDBParameterGroupResponse -> TestTree
-testCreateDBParameterGroupResponse = res
-    "CreateDBParameterGroupResponse"
-    "fixture/CreateDBParameterGroupResponse.proto"
-    rDS
-    (Proxy :: Proxy CreateDBParameterGroup)
-
-testCreateDBClusterSnapshotResponse :: CreateDBClusterSnapshotResponse -> TestTree
-testCreateDBClusterSnapshotResponse = res
-    "CreateDBClusterSnapshotResponse"
-    "fixture/CreateDBClusterSnapshotResponse.proto"
-    rDS
-    (Proxy :: Proxy CreateDBClusterSnapshot)
-
 testModifyOptionGroupResponse :: ModifyOptionGroupResponse -> TestTree
 testModifyOptionGroupResponse = res
     "ModifyOptionGroupResponse"
@@ -1189,6 +1182,13 @@
     rDS
     (Proxy :: Proxy ModifyOptionGroup)
 
+testCreateDBParameterGroupResponse :: CreateDBParameterGroupResponse -> TestTree
+testCreateDBParameterGroupResponse = res
+    "CreateDBParameterGroupResponse"
+    "fixture/CreateDBParameterGroupResponse.proto"
+    rDS
+    (Proxy :: Proxy CreateDBParameterGroup)
+
 testModifyDBClusterResponse :: ModifyDBClusterResponse -> TestTree
 testModifyDBClusterResponse = res
     "ModifyDBClusterResponse"
@@ -1210,13 +1210,6 @@
     rDS
     (Proxy :: Proxy ModifyDBClusterParameterGroup)
 
-testDescribePendingMaintenanceActionsResponse :: DescribePendingMaintenanceActionsResponse -> TestTree
-testDescribePendingMaintenanceActionsResponse = res
-    "DescribePendingMaintenanceActionsResponse"
-    "fixture/DescribePendingMaintenanceActionsResponse.proto"
-    rDS
-    (Proxy :: Proxy DescribePendingMaintenanceActions)
-
 testRestoreDBInstanceToPointInTimeResponse :: RestoreDBInstanceToPointInTimeResponse -> TestTree
 testRestoreDBInstanceToPointInTimeResponse = res
     "RestoreDBInstanceToPointInTimeResponse"
@@ -1224,12 +1217,12 @@
     rDS
     (Proxy :: Proxy RestoreDBInstanceToPointInTime)
 
-testResetDBParameterGroupResponse :: DBParameterGroupNameMessage -> TestTree
-testResetDBParameterGroupResponse = res
-    "ResetDBParameterGroupResponse"
-    "fixture/ResetDBParameterGroupResponse.proto"
+testDescribePendingMaintenanceActionsResponse :: DescribePendingMaintenanceActionsResponse -> TestTree
+testDescribePendingMaintenanceActionsResponse = res
+    "DescribePendingMaintenanceActionsResponse"
+    "fixture/DescribePendingMaintenanceActionsResponse.proto"
     rDS
-    (Proxy :: Proxy ResetDBParameterGroup)
+    (Proxy :: Proxy DescribePendingMaintenanceActions)
 
 testCopyDBClusterSnapshotResponse :: CopyDBClusterSnapshotResponse -> TestTree
 testCopyDBClusterSnapshotResponse = res
@@ -1238,13 +1231,20 @@
     rDS
     (Proxy :: Proxy CopyDBClusterSnapshot)
 
-testModifyDBParameterGroupResponse :: DBParameterGroupNameMessage -> TestTree
-testModifyDBParameterGroupResponse = res
-    "ModifyDBParameterGroupResponse"
-    "fixture/ModifyDBParameterGroupResponse.proto"
+testResetDBParameterGroupResponse :: DBParameterGroupNameMessage -> TestTree
+testResetDBParameterGroupResponse = res
+    "ResetDBParameterGroupResponse"
+    "fixture/ResetDBParameterGroupResponse.proto"
     rDS
-    (Proxy :: Proxy ModifyDBParameterGroup)
+    (Proxy :: Proxy ResetDBParameterGroup)
 
+testCreateDBClusterResponse :: CreateDBClusterResponse -> TestTree
+testCreateDBClusterResponse = res
+    "CreateDBClusterResponse"
+    "fixture/CreateDBClusterResponse.proto"
+    rDS
+    (Proxy :: Proxy CreateDBCluster)
+
 testFailoverDBClusterResponse :: FailoverDBClusterResponse -> TestTree
 testFailoverDBClusterResponse = res
     "FailoverDBClusterResponse"
@@ -1252,19 +1252,19 @@
     rDS
     (Proxy :: Proxy FailoverDBCluster)
 
-testCreateDBClusterResponse :: CreateDBClusterResponse -> TestTree
-testCreateDBClusterResponse = res
-    "CreateDBClusterResponse"
-    "fixture/CreateDBClusterResponse.proto"
+testRevokeDBSecurityGroupIngressResponse :: RevokeDBSecurityGroupIngressResponse -> TestTree
+testRevokeDBSecurityGroupIngressResponse = res
+    "RevokeDBSecurityGroupIngressResponse"
+    "fixture/RevokeDBSecurityGroupIngressResponse.proto"
     rDS
-    (Proxy :: Proxy CreateDBCluster)
+    (Proxy :: Proxy RevokeDBSecurityGroupIngress)
 
-testCreateOptionGroupResponse :: CreateOptionGroupResponse -> TestTree
-testCreateOptionGroupResponse = res
-    "CreateOptionGroupResponse"
-    "fixture/CreateOptionGroupResponse.proto"
+testModifyDBParameterGroupResponse :: DBParameterGroupNameMessage -> TestTree
+testModifyDBParameterGroupResponse = res
+    "ModifyDBParameterGroupResponse"
+    "fixture/ModifyDBParameterGroupResponse.proto"
     rDS
-    (Proxy :: Proxy CreateOptionGroup)
+    (Proxy :: Proxy ModifyDBParameterGroup)
 
 testApplyPendingMaintenanceActionResponse :: ApplyPendingMaintenanceActionResponse -> TestTree
 testApplyPendingMaintenanceActionResponse = res
@@ -1273,13 +1273,20 @@
     rDS
     (Proxy :: Proxy ApplyPendingMaintenanceAction)
 
-testRevokeDBSecurityGroupIngressResponse :: RevokeDBSecurityGroupIngressResponse -> TestTree
-testRevokeDBSecurityGroupIngressResponse = res
-    "RevokeDBSecurityGroupIngressResponse"
-    "fixture/RevokeDBSecurityGroupIngressResponse.proto"
+testCreateOptionGroupResponse :: CreateOptionGroupResponse -> TestTree
+testCreateOptionGroupResponse = res
+    "CreateOptionGroupResponse"
+    "fixture/CreateOptionGroupResponse.proto"
     rDS
-    (Proxy :: Proxy RevokeDBSecurityGroupIngress)
+    (Proxy :: Proxy CreateOptionGroup)
 
+testDescribeAccountAttributesResponse :: DescribeAccountAttributesResponse -> TestTree
+testDescribeAccountAttributesResponse = res
+    "DescribeAccountAttributesResponse"
+    "fixture/DescribeAccountAttributesResponse.proto"
+    rDS
+    (Proxy :: Proxy DescribeAccountAttributes)
+
 testDeleteDBSnapshotResponse :: DeleteDBSnapshotResponse -> TestTree
 testDeleteDBSnapshotResponse = res
     "DeleteDBSnapshotResponse"
@@ -1294,13 +1301,6 @@
     rDS
     (Proxy :: Proxy DescribeDBClusterParameters)
 
-testCreateDBSecurityGroupResponse :: CreateDBSecurityGroupResponse -> TestTree
-testCreateDBSecurityGroupResponse = res
-    "CreateDBSecurityGroupResponse"
-    "fixture/CreateDBSecurityGroupResponse.proto"
-    rDS
-    (Proxy :: Proxy CreateDBSecurityGroup)
-
 testDeleteDBSubnetGroupResponse :: DeleteDBSubnetGroupResponse -> TestTree
 testDeleteDBSubnetGroupResponse = res
     "DeleteDBSubnetGroupResponse"
@@ -1308,19 +1308,19 @@
     rDS
     (Proxy :: Proxy DeleteDBSubnetGroup)
 
-testDescribeAccountAttributesResponse :: DescribeAccountAttributesResponse -> TestTree
-testDescribeAccountAttributesResponse = res
-    "DescribeAccountAttributesResponse"
-    "fixture/DescribeAccountAttributesResponse.proto"
+testCreateDBSecurityGroupResponse :: CreateDBSecurityGroupResponse -> TestTree
+testCreateDBSecurityGroupResponse = res
+    "CreateDBSecurityGroupResponse"
+    "fixture/CreateDBSecurityGroupResponse.proto"
     rDS
-    (Proxy :: Proxy DescribeAccountAttributes)
+    (Proxy :: Proxy CreateDBSecurityGroup)
 
-testDeleteDBSecurityGroupResponse :: DeleteDBSecurityGroupResponse -> TestTree
-testDeleteDBSecurityGroupResponse = res
-    "DeleteDBSecurityGroupResponse"
-    "fixture/DeleteDBSecurityGroupResponse.proto"
+testDescribeDBClusterSnapshotsResponse :: DescribeDBClusterSnapshotsResponse -> TestTree
+testDescribeDBClusterSnapshotsResponse = res
+    "DescribeDBClusterSnapshotsResponse"
+    "fixture/DescribeDBClusterSnapshotsResponse.proto"
     rDS
-    (Proxy :: Proxy DeleteDBSecurityGroup)
+    (Proxy :: Proxy DescribeDBClusterSnapshots)
 
 testRebootDBInstanceResponse :: RebootDBInstanceResponse -> TestTree
 testRebootDBInstanceResponse = res
@@ -1329,13 +1329,6 @@
     rDS
     (Proxy :: Proxy RebootDBInstance)
 
-testDescribeDBClusterSnapshotsResponse :: DescribeDBClusterSnapshotsResponse -> TestTree
-testDescribeDBClusterSnapshotsResponse = res
-    "DescribeDBClusterSnapshotsResponse"
-    "fixture/DescribeDBClusterSnapshotsResponse.proto"
-    rDS
-    (Proxy :: Proxy DescribeDBClusterSnapshots)
-
 testCreateDBSubnetGroupResponse :: CreateDBSubnetGroupResponse -> TestTree
 testCreateDBSubnetGroupResponse = res
     "CreateDBSubnetGroupResponse"
@@ -1350,6 +1343,13 @@
     rDS
     (Proxy :: Proxy DescribeReservedDBInstancesOfferings)
 
+testDeleteDBSecurityGroupResponse :: DeleteDBSecurityGroupResponse -> TestTree
+testDeleteDBSecurityGroupResponse = res
+    "DeleteDBSecurityGroupResponse"
+    "fixture/DeleteDBSecurityGroupResponse.proto"
+    rDS
+    (Proxy :: Proxy DeleteDBSecurityGroup)
+
 testDeleteDBInstanceResponse :: DeleteDBInstanceResponse -> TestTree
 testDeleteDBInstanceResponse = res
     "DeleteDBInstanceResponse"
@@ -1357,27 +1357,6 @@
     rDS
     (Proxy :: Proxy DeleteDBInstance)
 
-testDescribeDBInstancesResponse :: DescribeDBInstancesResponse -> TestTree
-testDescribeDBInstancesResponse = res
-    "DescribeDBInstancesResponse"
-    "fixture/DescribeDBInstancesResponse.proto"
-    rDS
-    (Proxy :: Proxy DescribeDBInstances)
-
-testCopyOptionGroupResponse :: CopyOptionGroupResponse -> TestTree
-testCopyOptionGroupResponse = res
-    "CopyOptionGroupResponse"
-    "fixture/CopyOptionGroupResponse.proto"
-    rDS
-    (Proxy :: Proxy CopyOptionGroup)
-
-testDownloadDBLogFilePortionResponse :: DownloadDBLogFilePortionResponse -> TestTree
-testDownloadDBLogFilePortionResponse = res
-    "DownloadDBLogFilePortionResponse"
-    "fixture/DownloadDBLogFilePortionResponse.proto"
-    rDS
-    (Proxy :: Proxy DownloadDBLogFilePortion)
-
 testCreateDBInstanceReadReplicaResponse :: CreateDBInstanceReadReplicaResponse -> TestTree
 testCreateDBInstanceReadReplicaResponse = res
     "CreateDBInstanceReadReplicaResponse"
@@ -1385,13 +1364,6 @@
     rDS
     (Proxy :: Proxy CreateDBInstanceReadReplica)
 
-testRestoreDBClusterToPointInTimeResponse :: RestoreDBClusterToPointInTimeResponse -> TestTree
-testRestoreDBClusterToPointInTimeResponse = res
-    "RestoreDBClusterToPointInTimeResponse"
-    "fixture/RestoreDBClusterToPointInTimeResponse.proto"
-    rDS
-    (Proxy :: Proxy RestoreDBClusterToPointInTime)
-
 testDeleteDBParameterGroupResponse :: DeleteDBParameterGroupResponse -> TestTree
 testDeleteDBParameterGroupResponse = res
     "DeleteDBParameterGroupResponse"
@@ -1405,3 +1377,31 @@
     "fixture/DescribeDBSecurityGroupsResponse.proto"
     rDS
     (Proxy :: Proxy DescribeDBSecurityGroups)
+
+testCopyOptionGroupResponse :: CopyOptionGroupResponse -> TestTree
+testCopyOptionGroupResponse = res
+    "CopyOptionGroupResponse"
+    "fixture/CopyOptionGroupResponse.proto"
+    rDS
+    (Proxy :: Proxy CopyOptionGroup)
+
+testRestoreDBClusterToPointInTimeResponse :: RestoreDBClusterToPointInTimeResponse -> TestTree
+testRestoreDBClusterToPointInTimeResponse = res
+    "RestoreDBClusterToPointInTimeResponse"
+    "fixture/RestoreDBClusterToPointInTimeResponse.proto"
+    rDS
+    (Proxy :: Proxy RestoreDBClusterToPointInTime)
+
+testDescribeDBInstancesResponse :: DescribeDBInstancesResponse -> TestTree
+testDescribeDBInstancesResponse = res
+    "DescribeDBInstancesResponse"
+    "fixture/DescribeDBInstancesResponse.proto"
+    rDS
+    (Proxy :: Proxy DescribeDBInstances)
+
+testDownloadDBLogFilePortionResponse :: DownloadDBLogFilePortionResponse -> TestTree
+testDownloadDBLogFilePortionResponse = res
+    "DownloadDBLogFilePortionResponse"
+    "fixture/DownloadDBLogFilePortionResponse.proto"
+    rDS
+    (Proxy :: Proxy DownloadDBLogFilePortion)
