diff --git a/README.md b/README.md
--- a/README.md
+++ b/README.md
@@ -28,3 +28,5 @@
 ## Licence
 
 `amazonka-rds` is released under the [Mozilla Public License Version 2.0](http://www.mozilla.org/MPL/).
+
+Parts of the code are derived from AWS service descriptions, licensed under Apache 2.0.
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:               0.0.4
+version:               0.0.5
 synopsis:              Amazon Relational Database Service SDK.
 homepage:              https://github.com/brendanhay/amazonka
 license:               OtherLicense
@@ -96,5 +96,5 @@
     other-modules:
 
     build-depends:
-          amazonka-core == 0.0.4.*
+          amazonka-core == 0.0.5.*
         , base          >= 4.7     && < 5
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
@@ -7,6 +7,8 @@
 -- Maintainer  : Brendan Hay <brendan.g.hay@gmail.com>
 -- Stability   : experimental
 -- Portability : non-portable (GHC extensions)
+--
+-- Derived from AWS service descriptions, licensed under Apache 2.0.
 
 -- | Amazon Relational Database Service (Amazon RDS) is a web service that makes
 -- it easy to set up, operate, and scale a relational database in the cloud. It
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
@@ -19,6 +19,8 @@
 -- Maintainer  : Brendan Hay <brendan.g.hay@gmail.com>
 -- Stability   : experimental
 -- Portability : non-portable (GHC extensions)
+--
+-- Derived from AWS service descriptions, licensed under Apache 2.0.
 
 -- | Adds a source identifier to an existing RDS event notification subscription.
 --
diff --git a/gen/Network/AWS/RDS/AddTagsToResource.hs b/gen/Network/AWS/RDS/AddTagsToResource.hs
--- a/gen/Network/AWS/RDS/AddTagsToResource.hs
+++ b/gen/Network/AWS/RDS/AddTagsToResource.hs
@@ -19,6 +19,8 @@
 -- Maintainer  : Brendan Hay <brendan.g.hay@gmail.com>
 -- Stability   : experimental
 -- Portability : non-portable (GHC extensions)
+--
+-- Derived from AWS service descriptions, licensed under Apache 2.0.
 
 -- | Adds metadata tags to an Amazon RDS resource. These tags can also be used
 -- with cost allocation reporting to track cost associated with Amazon RDS
@@ -50,7 +52,7 @@
 
 data AddTagsToResource = AddTagsToResource
     { _attrResourceName :: Text
-    , _attrTags         :: List "Tag" Tag
+    , _attrTags         :: List "member" Tag
     } deriving (Eq, Show)
 
 -- | 'AddTagsToResource' constructor.
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
@@ -19,6 +19,8 @@
 -- Maintainer  : Brendan Hay <brendan.g.hay@gmail.com>
 -- Stability   : experimental
 -- Portability : non-portable (GHC extensions)
+--
+-- Derived from AWS service descriptions, licensed under Apache 2.0.
 
 -- | Enables ingress to a DBSecurityGroup using one of two forms of
 -- authorization. First, EC2 or VPC security groups can be added to the
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
@@ -19,6 +19,8 @@
 -- Maintainer  : Brendan Hay <brendan.g.hay@gmail.com>
 -- Stability   : experimental
 -- Portability : non-portable (GHC extensions)
+--
+-- Derived from AWS service descriptions, licensed under Apache 2.0.
 
 -- | Copies the specified DBParameterGroup.
 --
@@ -50,7 +52,7 @@
 
 data CopyDBParameterGroup = CopyDBParameterGroup
     { _cdbpgSourceDBParameterGroupIdentifier  :: Text
-    , _cdbpgTags                              :: List "Tag" Tag
+    , _cdbpgTags                              :: List "member" Tag
     , _cdbpgTargetDBParameterGroupDescription :: Text
     , _cdbpgTargetDBParameterGroupIdentifier  :: Text
     } deriving (Eq, Show)
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
@@ -19,6 +19,8 @@
 -- Maintainer  : Brendan Hay <brendan.g.hay@gmail.com>
 -- Stability   : experimental
 -- Portability : non-portable (GHC extensions)
+--
+-- Derived from AWS service descriptions, licensed under Apache 2.0.
 
 -- | Copies the specified DBSnapshot. The source DBSnapshot must be in the
 -- "available" state.
@@ -50,7 +52,7 @@
 
 data CopyDBSnapshot = CopyDBSnapshot
     { _cdbsSourceDBSnapshotIdentifier :: Text
-    , _cdbsTags                       :: List "Tag" Tag
+    , _cdbsTags                       :: List "member" Tag
     , _cdbsTargetDBSnapshotIdentifier :: Text
     } deriving (Eq, Show)
 
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
@@ -19,6 +19,8 @@
 -- Maintainer  : Brendan Hay <brendan.g.hay@gmail.com>
 -- Stability   : experimental
 -- Portability : non-portable (GHC extensions)
+--
+-- Derived from AWS service descriptions, licensed under Apache 2.0.
 
 -- | Copies the specified Option Group.
 --
@@ -50,7 +52,7 @@
 
 data CopyOptionGroup = CopyOptionGroup
     { _cog1SourceOptionGroupIdentifier  :: Text
-    , _cog1Tags                         :: List "Tag" Tag
+    , _cog1Tags                         :: List "member" Tag
     , _cog1TargetOptionGroupDescription :: Text
     , _cog1TargetOptionGroupIdentifier  :: Text
     } deriving (Eq, Show)
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
@@ -19,6 +19,8 @@
 -- Maintainer  : Brendan Hay <brendan.g.hay@gmail.com>
 -- Stability   : experimental
 -- Portability : non-portable (GHC extensions)
+--
+-- Derived from AWS service descriptions, licensed under Apache 2.0.
 
 -- | Creates a new DB instance.
 --
@@ -82,7 +84,7 @@
     , _cdbiDBInstanceIdentifier       :: Text
     , _cdbiDBName                     :: Maybe Text
     , _cdbiDBParameterGroupName       :: Maybe Text
-    , _cdbiDBSecurityGroups           :: List "DBSecurityGroupName" Text
+    , _cdbiDBSecurityGroups           :: List "member" Text
     , _cdbiDBSubnetGroupName          :: Maybe Text
     , _cdbiEngine                     :: Text
     , _cdbiEngineVersion              :: Maybe Text
@@ -97,10 +99,10 @@
     , _cdbiPreferredMaintenanceWindow :: Maybe Text
     , _cdbiPubliclyAccessible         :: Maybe Bool
     , _cdbiStorageType                :: Maybe Text
-    , _cdbiTags                       :: List "Tag" Tag
+    , _cdbiTags                       :: List "member" Tag
     , _cdbiTdeCredentialArn           :: Maybe Text
     , _cdbiTdeCredentialPassword      :: Maybe Text
-    , _cdbiVpcSecurityGroupIds        :: List "VpcSecurityGroupId" Text
+    , _cdbiVpcSecurityGroupIds        :: List "member" Text
     } deriving (Eq, Show)
 
 -- | 'CreateDBInstance' constructor.
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
@@ -19,6 +19,8 @@
 -- Maintainer  : Brendan Hay <brendan.g.hay@gmail.com>
 -- Stability   : experimental
 -- Portability : non-portable (GHC extensions)
+--
+-- Derived from AWS service descriptions, licensed under Apache 2.0.
 
 -- | Creates a DB instance that acts as a read replica of a source DB instance.
 --
@@ -77,7 +79,7 @@
     , _cdbirrPubliclyAccessible         :: Maybe Bool
     , _cdbirrSourceDBInstanceIdentifier :: Text
     , _cdbirrStorageType                :: Maybe Text
-    , _cdbirrTags                       :: List "Tag" Tag
+    , _cdbirrTags                       :: List "member" Tag
     } deriving (Eq, Show)
 
 -- | 'CreateDBInstanceReadReplica' constructor.
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
@@ -19,6 +19,8 @@
 -- Maintainer  : Brendan Hay <brendan.g.hay@gmail.com>
 -- Stability   : experimental
 -- Portability : non-portable (GHC extensions)
+--
+-- Derived from AWS service descriptions, licensed under Apache 2.0.
 
 -- | Creates a new DB parameter group.
 --
@@ -71,7 +73,7 @@
     { _cdbpg1DBParameterGroupFamily :: Text
     , _cdbpg1DBParameterGroupName   :: Text
     , _cdbpg1Description            :: Text
-    , _cdbpg1Tags                   :: List "Tag" Tag
+    , _cdbpg1Tags                   :: List "member" Tag
     } deriving (Eq, Show)
 
 -- | 'CreateDBParameterGroup' constructor.
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
@@ -19,6 +19,8 @@
 -- Maintainer  : Brendan Hay <brendan.g.hay@gmail.com>
 -- Stability   : experimental
 -- Portability : non-portable (GHC extensions)
+--
+-- Derived from AWS service descriptions, licensed under Apache 2.0.
 
 -- | Creates a new DB security group. DB security groups control access to a DB
 -- instance.
@@ -51,7 +53,7 @@
 data CreateDBSecurityGroup = CreateDBSecurityGroup
     { _cdbsgDBSecurityGroupDescription :: Text
     , _cdbsgDBSecurityGroupName        :: Text
-    , _cdbsgTags                       :: List "Tag" Tag
+    , _cdbsgTags                       :: List "member" Tag
     } deriving (Eq, Show)
 
 -- | 'CreateDBSecurityGroup' constructor.
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
@@ -19,6 +19,8 @@
 -- Maintainer  : Brendan Hay <brendan.g.hay@gmail.com>
 -- Stability   : experimental
 -- Portability : non-portable (GHC extensions)
+--
+-- Derived from AWS service descriptions, licensed under Apache 2.0.
 
 -- | Creates a DBSnapshot. The source DBInstance must be in "available" state.
 --
@@ -50,7 +52,7 @@
 data CreateDBSnapshot = CreateDBSnapshot
     { _cdbs1DBInstanceIdentifier :: Text
     , _cdbs1DBSnapshotIdentifier :: Text
-    , _cdbs1Tags                 :: List "Tag" Tag
+    , _cdbs1Tags                 :: List "member" Tag
     } deriving (Eq, Show)
 
 -- | 'CreateDBSnapshot' constructor.
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
@@ -19,6 +19,8 @@
 -- Maintainer  : Brendan Hay <brendan.g.hay@gmail.com>
 -- Stability   : experimental
 -- Portability : non-portable (GHC extensions)
+--
+-- Derived from AWS service descriptions, licensed under Apache 2.0.
 
 -- | Creates a new DB subnet group. DB subnet groups must contain at least one
 -- subnet in at least two AZs in the region.
@@ -52,8 +54,8 @@
 data CreateDBSubnetGroup = CreateDBSubnetGroup
     { _cdbsg1DBSubnetGroupDescription :: Text
     , _cdbsg1DBSubnetGroupName        :: Text
-    , _cdbsg1SubnetIds                :: List "SubnetIdentifier" Text
-    , _cdbsg1Tags                     :: List "Tag" Tag
+    , _cdbsg1SubnetIds                :: List "member" Text
+    , _cdbsg1Tags                     :: List "member" Tag
     } deriving (Eq, Show)
 
 -- | 'CreateDBSubnetGroup' constructor.
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
@@ -19,6 +19,8 @@
 -- Maintainer  : Brendan Hay <brendan.g.hay@gmail.com>
 -- Stability   : experimental
 -- Portability : non-portable (GHC extensions)
+--
+-- Derived from AWS service descriptions, licensed under Apache 2.0.
 
 -- | Creates an RDS event notification subscription. This action requires a topic
 -- ARN (Amazon Resource Name) created by either the RDS console, the SNS
@@ -72,12 +74,12 @@
 
 data CreateEventSubscription = CreateEventSubscription
     { _cesEnabled          :: Maybe Bool
-    , _cesEventCategories  :: List "EventCategory" Text
+    , _cesEventCategories  :: List "member" Text
     , _cesSnsTopicArn      :: Text
-    , _cesSourceIds        :: List "SourceId" Text
+    , _cesSourceIds        :: List "member" Text
     , _cesSourceType       :: Maybe Text
     , _cesSubscriptionName :: Text
-    , _cesTags             :: List "Tag" Tag
+    , _cesTags             :: List "member" Tag
     } deriving (Eq, Show)
 
 -- | 'CreateEventSubscription' constructor.
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
@@ -19,6 +19,8 @@
 -- Maintainer  : Brendan Hay <brendan.g.hay@gmail.com>
 -- Stability   : experimental
 -- Portability : non-portable (GHC extensions)
+--
+-- Derived from AWS service descriptions, licensed under Apache 2.0.
 
 -- | Creates a new option group. You can create up to 20 option groups.
 --
@@ -54,7 +56,7 @@
     , _cogMajorEngineVersion     :: Text
     , _cogOptionGroupDescription :: Text
     , _cogOptionGroupName        :: Text
-    , _cogTags                   :: List "Tag" Tag
+    , _cogTags                   :: List "member" Tag
     } deriving (Eq, Show)
 
 -- | 'CreateOptionGroup' constructor.
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
@@ -19,6 +19,8 @@
 -- Maintainer  : Brendan Hay <brendan.g.hay@gmail.com>
 -- Stability   : experimental
 -- Portability : non-portable (GHC extensions)
+--
+-- Derived from AWS service descriptions, licensed under Apache 2.0.
 
 -- | The DeleteDBInstance action deletes a previously provisioned DB instance. A
 -- successful response from the web service indicates the request was received
diff --git a/gen/Network/AWS/RDS/DeleteDBParameterGroup.hs b/gen/Network/AWS/RDS/DeleteDBParameterGroup.hs
--- a/gen/Network/AWS/RDS/DeleteDBParameterGroup.hs
+++ b/gen/Network/AWS/RDS/DeleteDBParameterGroup.hs
@@ -19,6 +19,8 @@
 -- Maintainer  : Brendan Hay <brendan.g.hay@gmail.com>
 -- Stability   : experimental
 -- Portability : non-portable (GHC extensions)
+--
+-- Derived from AWS service descriptions, licensed under Apache 2.0.
 
 -- | Deletes a specified DBParameterGroup. The DBParameterGroup to be deleted
 -- cannot be associated with any DB instances.
diff --git a/gen/Network/AWS/RDS/DeleteDBSecurityGroup.hs b/gen/Network/AWS/RDS/DeleteDBSecurityGroup.hs
--- a/gen/Network/AWS/RDS/DeleteDBSecurityGroup.hs
+++ b/gen/Network/AWS/RDS/DeleteDBSecurityGroup.hs
@@ -19,6 +19,8 @@
 -- Maintainer  : Brendan Hay <brendan.g.hay@gmail.com>
 -- Stability   : experimental
 -- Portability : non-portable (GHC extensions)
+--
+-- Derived from AWS service descriptions, licensed under Apache 2.0.
 
 -- | Deletes a DB security group.
 --
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
@@ -19,6 +19,8 @@
 -- Maintainer  : Brendan Hay <brendan.g.hay@gmail.com>
 -- Stability   : experimental
 -- Portability : non-portable (GHC extensions)
+--
+-- Derived from AWS service descriptions, licensed under Apache 2.0.
 
 -- | Deletes a DBSnapshot. If the snapshot is being copied, the copy operation is
 -- terminated.
diff --git a/gen/Network/AWS/RDS/DeleteDBSubnetGroup.hs b/gen/Network/AWS/RDS/DeleteDBSubnetGroup.hs
--- a/gen/Network/AWS/RDS/DeleteDBSubnetGroup.hs
+++ b/gen/Network/AWS/RDS/DeleteDBSubnetGroup.hs
@@ -19,6 +19,8 @@
 -- Maintainer  : Brendan Hay <brendan.g.hay@gmail.com>
 -- Stability   : experimental
 -- Portability : non-portable (GHC extensions)
+--
+-- Derived from AWS service descriptions, licensed under Apache 2.0.
 
 -- | Deletes a DB subnet group.
 --
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
@@ -19,6 +19,8 @@
 -- Maintainer  : Brendan Hay <brendan.g.hay@gmail.com>
 -- Stability   : experimental
 -- Portability : non-portable (GHC extensions)
+--
+-- Derived from AWS service descriptions, licensed under Apache 2.0.
 
 -- | Deletes an RDS event notification subscription.
 --
diff --git a/gen/Network/AWS/RDS/DeleteOptionGroup.hs b/gen/Network/AWS/RDS/DeleteOptionGroup.hs
--- a/gen/Network/AWS/RDS/DeleteOptionGroup.hs
+++ b/gen/Network/AWS/RDS/DeleteOptionGroup.hs
@@ -19,6 +19,8 @@
 -- Maintainer  : Brendan Hay <brendan.g.hay@gmail.com>
 -- Stability   : experimental
 -- Portability : non-portable (GHC extensions)
+--
+-- Derived from AWS service descriptions, licensed under Apache 2.0.
 
 -- | Deletes an existing option group.
 --
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
@@ -19,6 +19,8 @@
 -- Maintainer  : Brendan Hay <brendan.g.hay@gmail.com>
 -- Stability   : experimental
 -- Portability : non-portable (GHC extensions)
+--
+-- Derived from AWS service descriptions, licensed under Apache 2.0.
 
 -- | Returns a list of the available DB engines.
 --
@@ -58,7 +60,7 @@
     , _ddbevDefaultOnly                :: Maybe Bool
     , _ddbevEngine                     :: Maybe Text
     , _ddbevEngineVersion              :: Maybe Text
-    , _ddbevFilters                    :: List "Filter" Filter
+    , _ddbevFilters                    :: List "member" Filter
     , _ddbevListSupportedCharacterSets :: Maybe Bool
     , _ddbevMarker                     :: Maybe Text
     , _ddbevMaxRecords                 :: Maybe Int
@@ -151,7 +153,7 @@
 ddbevMaxRecords = lens _ddbevMaxRecords (\s a -> s { _ddbevMaxRecords = a })
 
 data DescribeDBEngineVersionsResponse = DescribeDBEngineVersionsResponse
-    { _ddbevrDBEngineVersions :: List "DBEngineVersion" DBEngineVersion
+    { _ddbevrDBEngineVersions :: List "member" DBEngineVersion
     , _ddbevrMarker           :: Maybe Text
     } deriving (Eq, Show)
 
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
@@ -19,6 +19,8 @@
 -- Maintainer  : Brendan Hay <brendan.g.hay@gmail.com>
 -- Stability   : experimental
 -- Portability : non-portable (GHC extensions)
+--
+-- Derived from AWS service descriptions, licensed under Apache 2.0.
 
 -- | Returns information about provisioned RDS instances. This API supports
 -- pagination.
@@ -52,7 +54,7 @@
 
 data DescribeDBInstances = DescribeDBInstances
     { _ddbi1DBInstanceIdentifier :: Maybe Text
-    , _ddbi1Filters              :: List "Filter" Filter
+    , _ddbi1Filters              :: List "member" Filter
     , _ddbi1Marker               :: Maybe Text
     , _ddbi1MaxRecords           :: Maybe Int
     } deriving (Eq, Show)
@@ -112,7 +114,7 @@
 ddbi1MaxRecords = lens _ddbi1MaxRecords (\s a -> s { _ddbi1MaxRecords = a })
 
 data DescribeDBInstancesResponse = DescribeDBInstancesResponse
-    { _ddbirDBInstances :: List "DBInstance" DBInstance
+    { _ddbirDBInstances :: List "member" DBInstance
     , _ddbirMarker      :: Maybe Text
     } deriving (Eq, Show)
 
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
@@ -19,6 +19,8 @@
 -- Maintainer  : Brendan Hay <brendan.g.hay@gmail.com>
 -- Stability   : experimental
 -- Portability : non-portable (GHC extensions)
+--
+-- Derived from AWS service descriptions, licensed under Apache 2.0.
 
 -- | Returns a list of DB log files for the DB instance.
 --
@@ -57,7 +59,7 @@
     , _ddblfFileLastWritten      :: Maybe Integer
     , _ddblfFileSize             :: Maybe Integer
     , _ddblfFilenameContains     :: Maybe Text
-    , _ddblfFilters              :: List "Filter" Filter
+    , _ddblfFilters              :: List "member" Filter
     , _ddblfMarker               :: Maybe Text
     , _ddblfMaxRecords           :: Maybe Int
     } deriving (Eq, Show)
@@ -138,7 +140,7 @@
 ddblfMaxRecords = lens _ddblfMaxRecords (\s a -> s { _ddblfMaxRecords = a })
 
 data DescribeDBLogFilesResponse = DescribeDBLogFilesResponse
-    { _ddblfrDescribeDBLogFiles :: List "DescribeDBLogFilesDetails" DescribeDBLogFilesDetails
+    { _ddblfrDescribeDBLogFiles :: List "member" DescribeDBLogFilesDetails
     , _ddblfrMarker             :: Maybe Text
     } deriving (Eq, Show)
 
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
@@ -19,6 +19,8 @@
 -- Maintainer  : Brendan Hay <brendan.g.hay@gmail.com>
 -- Stability   : experimental
 -- Portability : non-portable (GHC extensions)
+--
+-- Derived from AWS service descriptions, licensed under Apache 2.0.
 
 -- | Returns a list of 'DBParameterGroup' descriptions. If a 'DBParameterGroupName'
 -- is specified, the list will contain only the description of the specified DB
@@ -53,7 +55,7 @@
 
 data DescribeDBParameterGroups = DescribeDBParameterGroups
     { _ddbpgDBParameterGroupName :: Maybe Text
-    , _ddbpgFilters              :: List "Filter" Filter
+    , _ddbpgFilters              :: List "member" Filter
     , _ddbpgMarker               :: Maybe Text
     , _ddbpgMaxRecords           :: Maybe Int
     } deriving (Eq, Show)
@@ -110,7 +112,7 @@
 ddbpgMaxRecords = lens _ddbpgMaxRecords (\s a -> s { _ddbpgMaxRecords = a })
 
 data DescribeDBParameterGroupsResponse = DescribeDBParameterGroupsResponse
-    { _ddbpgrDBParameterGroups :: List "DBParameterGroup" DBParameterGroup
+    { _ddbpgrDBParameterGroups :: List "member" DBParameterGroup
     , _ddbpgrMarker            :: Maybe Text
     } deriving (Eq, Show)
 
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
@@ -19,6 +19,8 @@
 -- Maintainer  : Brendan Hay <brendan.g.hay@gmail.com>
 -- Stability   : experimental
 -- Portability : non-portable (GHC extensions)
+--
+-- Derived from AWS service descriptions, licensed under Apache 2.0.
 
 -- | Returns the detailed parameter list for a particular DB parameter group.
 --
@@ -52,7 +54,7 @@
 
 data DescribeDBParameters = DescribeDBParameters
     { _ddbpDBParameterGroupName :: Text
-    , _ddbpFilters              :: List "Filter" Filter
+    , _ddbpFilters              :: List "member" Filter
     , _ddbpMarker               :: Maybe Text
     , _ddbpMaxRecords           :: Maybe Int
     , _ddbpSource               :: Maybe Text
@@ -123,7 +125,7 @@
 
 data DescribeDBParametersResponse = DescribeDBParametersResponse
     { _ddbprMarker     :: Maybe Text
-    , _ddbprParameters :: List "Parameter" Parameter
+    , _ddbprParameters :: List "member" Parameter
     } deriving (Eq, Show)
 
 -- | 'DescribeDBParametersResponse' constructor.
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
@@ -19,6 +19,8 @@
 -- Maintainer  : Brendan Hay <brendan.g.hay@gmail.com>
 -- Stability   : experimental
 -- Portability : non-portable (GHC extensions)
+--
+-- Derived from AWS service descriptions, licensed under Apache 2.0.
 
 -- | Returns a list of 'DBSecurityGroup' descriptions. If a 'DBSecurityGroupName' is
 -- specified, the list will contain only the descriptions of the specified DB
@@ -53,7 +55,7 @@
 
 data DescribeDBSecurityGroups = DescribeDBSecurityGroups
     { _ddbsg1DBSecurityGroupName :: Maybe Text
-    , _ddbsg1Filters             :: List "Filter" Filter
+    , _ddbsg1Filters             :: List "member" Filter
     , _ddbsg1Marker              :: Maybe Text
     , _ddbsg1MaxRecords          :: Maybe Int
     } deriving (Eq, Show)
@@ -105,7 +107,7 @@
 ddbsg1MaxRecords = lens _ddbsg1MaxRecords (\s a -> s { _ddbsg1MaxRecords = a })
 
 data DescribeDBSecurityGroupsResponse = DescribeDBSecurityGroupsResponse
-    { _ddbsgr1DBSecurityGroups :: List "DBSecurityGroup" DBSecurityGroup
+    { _ddbsgr1DBSecurityGroups :: List "member" DBSecurityGroup
     , _ddbsgr1Marker           :: Maybe Text
     } deriving (Eq, Show)
 
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
@@ -19,6 +19,8 @@
 -- Maintainer  : Brendan Hay <brendan.g.hay@gmail.com>
 -- Stability   : experimental
 -- Portability : non-portable (GHC extensions)
+--
+-- Derived from AWS service descriptions, licensed under Apache 2.0.
 
 -- | Returns information about DB snapshots. This API supports pagination.
 --
@@ -54,7 +56,7 @@
 data DescribeDBSnapshots = DescribeDBSnapshots
     { _ddbsDBInstanceIdentifier :: Maybe Text
     , _ddbsDBSnapshotIdentifier :: Maybe Text
-    , _ddbsFilters              :: List "Filter" Filter
+    , _ddbsFilters              :: List "member" Filter
     , _ddbsMarker               :: Maybe Text
     , _ddbsMaxRecords           :: Maybe Int
     , _ddbsSnapshotType         :: Maybe Text
@@ -140,7 +142,7 @@
 ddbsSnapshotType = lens _ddbsSnapshotType (\s a -> s { _ddbsSnapshotType = a })
 
 data DescribeDBSnapshotsResponse = DescribeDBSnapshotsResponse
-    { _ddbsrDBSnapshots :: List "DBSnapshot" DBSnapshot
+    { _ddbsrDBSnapshots :: List "member" DBSnapshot
     , _ddbsrMarker      :: Maybe Text
     } deriving (Eq, Show)
 
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
@@ -19,6 +19,8 @@
 -- Maintainer  : Brendan Hay <brendan.g.hay@gmail.com>
 -- Stability   : experimental
 -- Portability : non-portable (GHC extensions)
+--
+-- Derived from AWS service descriptions, licensed under Apache 2.0.
 
 -- | Returns a list of DBSubnetGroup descriptions. If a DBSubnetGroupName is
 -- specified, the list will contain only the descriptions of the specified
@@ -55,7 +57,7 @@
 
 data DescribeDBSubnetGroups = DescribeDBSubnetGroups
     { _ddbsgDBSubnetGroupName :: Maybe Text
-    , _ddbsgFilters           :: List "Filter" Filter
+    , _ddbsgFilters           :: List "member" Filter
     , _ddbsgMarker            :: Maybe Text
     , _ddbsgMaxRecords        :: Maybe Int
     } deriving (Eq, Show)
@@ -106,7 +108,7 @@
 ddbsgMaxRecords = lens _ddbsgMaxRecords (\s a -> s { _ddbsgMaxRecords = a })
 
 data DescribeDBSubnetGroupsResponse = DescribeDBSubnetGroupsResponse
-    { _ddbsgrDBSubnetGroups :: List "DBSubnetGroup" DBSubnetGroup
+    { _ddbsgrDBSubnetGroups :: List "member" DBSubnetGroup
     , _ddbsgrMarker         :: Maybe Text
     } deriving (Eq, Show)
 
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
@@ -19,6 +19,8 @@
 -- Maintainer  : Brendan Hay <brendan.g.hay@gmail.com>
 -- Stability   : experimental
 -- Portability : non-portable (GHC extensions)
+--
+-- Derived from AWS service descriptions, licensed under Apache 2.0.
 
 -- | Returns the default engine and system parameter information for the
 -- specified database engine.
@@ -51,7 +53,7 @@
 
 data DescribeEngineDefaultParameters = DescribeEngineDefaultParameters
     { _dedpDBParameterGroupFamily :: Text
-    , _dedpFilters                :: List "Filter" Filter
+    , _dedpFilters                :: List "member" Filter
     , _dedpMarker                 :: Maybe Text
     , _dedpMaxRecords             :: Maybe Int
     } deriving (Eq, Show)
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
@@ -19,6 +19,8 @@
 -- Maintainer  : Brendan Hay <brendan.g.hay@gmail.com>
 -- Stability   : experimental
 -- Portability : non-portable (GHC extensions)
+--
+-- Derived from AWS service descriptions, licensed under Apache 2.0.
 
 -- | Displays a list of categories for all event source types, or, if specified,
 -- for a specified source type. You can see a list of the event categories and
@@ -49,7 +51,7 @@
 import qualified GHC.Exts
 
 data DescribeEventCategories = DescribeEventCategories
-    { _decFilters    :: List "Filter" Filter
+    { _decFilters    :: List "member" Filter
     , _decSourceType :: Maybe Text
     } deriving (Eq, Show)
 
@@ -79,7 +81,7 @@
 decSourceType = lens _decSourceType (\s a -> s { _decSourceType = a })
 
 newtype DescribeEventCategoriesResponse = DescribeEventCategoriesResponse
-    { _decrEventCategoriesMapList :: List "EventCategoriesMap" EventCategoriesMap
+    { _decrEventCategoriesMapList :: List "member" EventCategoriesMap
     } deriving (Eq, Show, Monoid, Semigroup)
 
 instance GHC.Exts.IsList DescribeEventCategoriesResponse where
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
@@ -19,6 +19,8 @@
 -- Maintainer  : Brendan Hay <brendan.g.hay@gmail.com>
 -- Stability   : experimental
 -- Portability : non-portable (GHC extensions)
+--
+-- Derived from AWS service descriptions, licensed under Apache 2.0.
 
 -- | Lists all the subscription descriptions for a customer account. The
 -- description for a subscription includes SubscriptionName, SNSTopicARN,
@@ -55,7 +57,7 @@
 import qualified GHC.Exts
 
 data DescribeEventSubscriptions = DescribeEventSubscriptions
-    { _des1Filters          :: List "Filter" Filter
+    { _des1Filters          :: List "member" Filter
     , _des1Marker           :: Maybe Text
     , _des1MaxRecords       :: Maybe Int
     , _des1SubscriptionName :: Maybe Text
@@ -108,7 +110,7 @@
     lens _des1SubscriptionName (\s a -> s { _des1SubscriptionName = a })
 
 data DescribeEventSubscriptionsResponse = DescribeEventSubscriptionsResponse
-    { _desrEventSubscriptionsList :: List "EventSubscription" EventSubscription
+    { _desrEventSubscriptionsList :: List "member" EventSubscription
     , _desrMarker                 :: Maybe Text
     } deriving (Eq, Show)
 
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
@@ -19,6 +19,8 @@
 -- Maintainer  : Brendan Hay <brendan.g.hay@gmail.com>
 -- Stability   : experimental
 -- Portability : non-portable (GHC extensions)
+--
+-- Derived from AWS service descriptions, licensed under Apache 2.0.
 
 -- | Returns events related to DB instances, DB security groups, DB snapshots,
 -- and DB parameter groups for the past 14 days. Events specific to a particular
@@ -61,8 +63,8 @@
 data DescribeEvents = DescribeEvents
     { _deDuration         :: Maybe Int
     , _deEndTime          :: Maybe ISO8601
-    , _deEventCategories  :: List "EventCategory" Text
-    , _deFilters          :: List "Filter" Filter
+    , _deEventCategories  :: List "member" Text
+    , _deFilters          :: List "member" Filter
     , _deMarker           :: Maybe Text
     , _deMaxRecords       :: Maybe Int
     , _deSourceIdentifier :: Maybe Text
@@ -173,7 +175,7 @@
 deStartTime = lens _deStartTime (\s a -> s { _deStartTime = a }) . mapping _Time
 
 data DescribeEventsResponse = DescribeEventsResponse
-    { _derEvents :: List "Event" Event
+    { _derEvents :: List "member" Event
     , _derMarker :: Maybe Text
     } deriving (Eq, Show)
 
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
@@ -19,6 +19,8 @@
 -- Maintainer  : Brendan Hay <brendan.g.hay@gmail.com>
 -- Stability   : experimental
 -- Portability : non-portable (GHC extensions)
+--
+-- Derived from AWS service descriptions, licensed under Apache 2.0.
 
 -- | Describes all available options.
 --
@@ -52,7 +54,7 @@
 
 data DescribeOptionGroupOptions = DescribeOptionGroupOptions
     { _dogoEngineName         :: Text
-    , _dogoFilters            :: List "Filter" Filter
+    , _dogoFilters            :: List "member" Filter
     , _dogoMajorEngineVersion :: Maybe Text
     , _dogoMarker             :: Maybe Text
     , _dogoMaxRecords         :: Maybe Int
@@ -115,7 +117,7 @@
 
 data DescribeOptionGroupOptionsResponse = DescribeOptionGroupOptionsResponse
     { _dogorMarker             :: Maybe Text
-    , _dogorOptionGroupOptions :: List "OptionGroupOption" OptionGroupOption
+    , _dogorOptionGroupOptions :: List "member" OptionGroupOption
     } deriving (Eq, Show)
 
 -- | 'DescribeOptionGroupOptionsResponse' constructor.
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
@@ -19,6 +19,8 @@
 -- Maintainer  : Brendan Hay <brendan.g.hay@gmail.com>
 -- Stability   : experimental
 -- Portability : non-portable (GHC extensions)
+--
+-- Derived from AWS service descriptions, licensed under Apache 2.0.
 
 -- | Describes the available option groups.
 --
@@ -53,7 +55,7 @@
 
 data DescribeOptionGroups = DescribeOptionGroups
     { _dogEngineName         :: Maybe Text
-    , _dogFilters            :: List "Filter" Filter
+    , _dogFilters            :: List "member" Filter
     , _dogMajorEngineVersion :: Maybe Text
     , _dogMarker             :: Maybe Text
     , _dogMaxRecords         :: Maybe Int
@@ -126,7 +128,7 @@
 
 data DescribeOptionGroupsResponse = DescribeOptionGroupsResponse
     { _dogrMarker           :: Maybe Text
-    , _dogrOptionGroupsList :: List "OptionGroup" OptionGroup
+    , _dogrOptionGroupsList :: List "member" OptionGroup
     } deriving (Eq, Show)
 
 -- | 'DescribeOptionGroupsResponse' constructor.
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
@@ -19,6 +19,8 @@
 -- Maintainer  : Brendan Hay <brendan.g.hay@gmail.com>
 -- Stability   : experimental
 -- Portability : non-portable (GHC extensions)
+--
+-- Derived from AWS service descriptions, licensed under Apache 2.0.
 
 -- | Returns a list of orderable DB instance options for the specified engine.
 --
@@ -57,7 +59,7 @@
     { _dodbioDBInstanceClass :: Maybe Text
     , _dodbioEngine          :: Text
     , _dodbioEngineVersion   :: Maybe Text
-    , _dodbioFilters         :: List "Filter" Filter
+    , _dodbioFilters         :: List "member" Filter
     , _dodbioLicenseModel    :: Maybe Text
     , _dodbioMarker          :: Maybe Text
     , _dodbioMaxRecords      :: Maybe Int
@@ -147,7 +149,7 @@
 
 data DescribeOrderableDBInstanceOptionsResponse = DescribeOrderableDBInstanceOptionsResponse
     { _dodbiorMarker                     :: Maybe Text
-    , _dodbiorOrderableDBInstanceOptions :: List "OrderableDBInstanceOption" OrderableDBInstanceOption
+    , _dodbiorOrderableDBInstanceOptions :: List "member" OrderableDBInstanceOption
     } deriving (Eq, Show)
 
 -- | 'DescribeOrderableDBInstanceOptionsResponse' constructor.
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
@@ -19,6 +19,8 @@
 -- Maintainer  : Brendan Hay <brendan.g.hay@gmail.com>
 -- Stability   : experimental
 -- Portability : non-portable (GHC extensions)
+--
+-- Derived from AWS service descriptions, licensed under Apache 2.0.
 
 -- | Returns information about reserved DB instances for this account, or about a
 -- specified reserved DB instance.
@@ -59,7 +61,7 @@
 data DescribeReservedDBInstances = DescribeReservedDBInstances
     { _drdbiDBInstanceClass               :: Maybe Text
     , _drdbiDuration                      :: Maybe Text
-    , _drdbiFilters                       :: List "Filter" Filter
+    , _drdbiFilters                       :: List "member" Filter
     , _drdbiMarker                        :: Maybe Text
     , _drdbiMaxRecords                    :: Maybe Int
     , _drdbiMultiAZ                       :: Maybe Bool
@@ -174,7 +176,7 @@
 
 data DescribeReservedDBInstancesResponse = DescribeReservedDBInstancesResponse
     { _drdbirMarker              :: Maybe Text
-    , _drdbirReservedDBInstances :: List "ReservedDBInstance" ReservedDBInstance
+    , _drdbirReservedDBInstances :: List "member" ReservedDBInstance
     } deriving (Eq, Show)
 
 -- | 'DescribeReservedDBInstancesResponse' constructor.
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
@@ -19,6 +19,8 @@
 -- Maintainer  : Brendan Hay <brendan.g.hay@gmail.com>
 -- Stability   : experimental
 -- Portability : non-portable (GHC extensions)
+--
+-- Derived from AWS service descriptions, licensed under Apache 2.0.
 
 -- | Lists available reserved DB instance offerings.
 --
@@ -57,7 +59,7 @@
 data DescribeReservedDBInstancesOfferings = DescribeReservedDBInstancesOfferings
     { _drdbioDBInstanceClass               :: Maybe Text
     , _drdbioDuration                      :: Maybe Text
-    , _drdbioFilters                       :: List "Filter" Filter
+    , _drdbioFilters                       :: List "member" Filter
     , _drdbioMarker                        :: Maybe Text
     , _drdbioMaxRecords                    :: Maybe Int
     , _drdbioMultiAZ                       :: Maybe Bool
@@ -164,7 +166,7 @@
 
 data DescribeReservedDBInstancesOfferingsResponse = DescribeReservedDBInstancesOfferingsResponse
     { _drdbiorMarker                       :: Maybe Text
-    , _drdbiorReservedDBInstancesOfferings :: List "ReservedDBInstancesOffering" ReservedDBInstancesOffering
+    , _drdbiorReservedDBInstancesOfferings :: List "member" ReservedDBInstancesOffering
     } deriving (Eq, Show)
 
 -- | 'DescribeReservedDBInstancesOfferingsResponse' constructor.
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
@@ -19,6 +19,8 @@
 -- Maintainer  : Brendan Hay <brendan.g.hay@gmail.com>
 -- Stability   : experimental
 -- Portability : non-portable (GHC extensions)
+--
+-- Derived from AWS service descriptions, licensed under Apache 2.0.
 
 -- | Downloads all or a portion of the specified log file.
 --
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
@@ -19,6 +19,8 @@
 -- Maintainer  : Brendan Hay <brendan.g.hay@gmail.com>
 -- Stability   : experimental
 -- Portability : non-portable (GHC extensions)
+--
+-- Derived from AWS service descriptions, licensed under Apache 2.0.
 
 -- | Lists all tags on an Amazon RDS resource.
 --
@@ -49,7 +51,7 @@
 import qualified GHC.Exts
 
 data ListTagsForResource = ListTagsForResource
-    { _ltfrFilters      :: List "Filter" Filter
+    { _ltfrFilters      :: List "member" Filter
     , _ltfrResourceName :: Text
     } deriving (Eq, Show)
 
@@ -78,7 +80,7 @@
 ltfrResourceName = lens _ltfrResourceName (\s a -> s { _ltfrResourceName = a })
 
 newtype ListTagsForResourceResponse = ListTagsForResourceResponse
-    { _ltfrrTagList :: List "Tag" Tag
+    { _ltfrrTagList :: List "member" Tag
     } deriving (Eq, Show, Monoid, Semigroup)
 
 instance GHC.Exts.IsList ListTagsForResourceResponse where
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
@@ -19,6 +19,8 @@
 -- Maintainer  : Brendan Hay <brendan.g.hay@gmail.com>
 -- Stability   : experimental
 -- Portability : non-portable (GHC extensions)
+--
+-- Derived from AWS service descriptions, licensed under Apache 2.0.
 
 -- | Modify settings for a DB instance. You can change one or more database
 -- configuration parameters by specifying these parameters and the new values in
@@ -76,7 +78,7 @@
     , _mdbiDBInstanceClass            :: Maybe Text
     , _mdbiDBInstanceIdentifier       :: Text
     , _mdbiDBParameterGroupName       :: Maybe Text
-    , _mdbiDBSecurityGroups           :: List "DBSecurityGroupName" Text
+    , _mdbiDBSecurityGroups           :: List "member" Text
     , _mdbiEngineVersion              :: Maybe Text
     , _mdbiIops                       :: Maybe Int
     , _mdbiMasterUserPassword         :: Maybe Text
@@ -88,7 +90,7 @@
     , _mdbiStorageType                :: Maybe Text
     , _mdbiTdeCredentialArn           :: Maybe Text
     , _mdbiTdeCredentialPassword      :: Maybe Text
-    , _mdbiVpcSecurityGroupIds        :: List "VpcSecurityGroupId" Text
+    , _mdbiVpcSecurityGroupIds        :: List "member" Text
     } deriving (Eq, Ord, Show)
 
 -- | 'ModifyDBInstance' constructor.
diff --git a/gen/Network/AWS/RDS/ModifyDBParameterGroup.hs b/gen/Network/AWS/RDS/ModifyDBParameterGroup.hs
--- a/gen/Network/AWS/RDS/ModifyDBParameterGroup.hs
+++ b/gen/Network/AWS/RDS/ModifyDBParameterGroup.hs
@@ -19,6 +19,8 @@
 -- Maintainer  : Brendan Hay <brendan.g.hay@gmail.com>
 -- Stability   : experimental
 -- Portability : non-portable (GHC extensions)
+--
+-- Derived from AWS service descriptions, licensed under Apache 2.0.
 
 -- | Modifies the parameters of a DB parameter group. To modify more than one
 -- parameter, submit a list of the following: 'ParameterName', 'ParameterValue', and 'ApplyMethod'. A maximum of 20 parameters can be modified in a single request.
@@ -60,7 +62,7 @@
 
 data ModifyDBParameterGroup = ModifyDBParameterGroup
     { _mdbpgDBParameterGroupName :: Text
-    , _mdbpgParameters           :: List "Parameter" Parameter
+    , _mdbpgParameters           :: List "member" Parameter
     } deriving (Eq, Show)
 
 -- | 'ModifyDBParameterGroup' constructor.
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
@@ -19,6 +19,8 @@
 -- Maintainer  : Brendan Hay <brendan.g.hay@gmail.com>
 -- Stability   : experimental
 -- Portability : non-portable (GHC extensions)
+--
+-- Derived from AWS service descriptions, licensed under Apache 2.0.
 
 -- | Modifies an existing DB subnet group. DB subnet groups must contain at least
 -- one subnet in at least two AZs in the region.
@@ -51,7 +53,7 @@
 data ModifyDBSubnetGroup = ModifyDBSubnetGroup
     { _mdbsgDBSubnetGroupDescription :: Maybe Text
     , _mdbsgDBSubnetGroupName        :: Text
-    , _mdbsgSubnetIds                :: List "SubnetIdentifier" Text
+    , _mdbsgSubnetIds                :: List "member" Text
     } deriving (Eq, Ord, Show)
 
 -- | 'ModifyDBSubnetGroup' constructor.
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
@@ -19,6 +19,8 @@
 -- Maintainer  : Brendan Hay <brendan.g.hay@gmail.com>
 -- Stability   : experimental
 -- Portability : non-portable (GHC extensions)
+--
+-- Derived from AWS service descriptions, licensed under Apache 2.0.
 
 -- | Modifies an existing RDS event notification subscription. Note that you
 -- cannot modify the source identifiers using this call; to change source
@@ -56,7 +58,7 @@
 
 data ModifyEventSubscription = ModifyEventSubscription
     { _mesEnabled          :: Maybe Bool
-    , _mesEventCategories  :: List "EventCategory" Text
+    , _mesEventCategories  :: List "member" Text
     , _mesSnsTopicArn      :: Maybe Text
     , _mesSourceType       :: Maybe Text
     , _mesSubscriptionName :: Text
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
@@ -19,6 +19,8 @@
 -- Maintainer  : Brendan Hay <brendan.g.hay@gmail.com>
 -- Stability   : experimental
 -- Portability : non-portable (GHC extensions)
+--
+-- Derived from AWS service descriptions, licensed under Apache 2.0.
 
 -- | Modifies an existing option group.
 --
@@ -51,8 +53,8 @@
 data ModifyOptionGroup = ModifyOptionGroup
     { _mogApplyImmediately :: Maybe Bool
     , _mogOptionGroupName  :: Text
-    , _mogOptionsToInclude :: List "OptionConfiguration" OptionConfiguration
-    , _mogOptionsToRemove  :: List "OptionsToRemove" Text
+    , _mogOptionsToInclude :: List "member" OptionConfiguration
+    , _mogOptionsToRemove  :: List "member" Text
     } deriving (Eq, Show)
 
 -- | 'ModifyOptionGroup' constructor.
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
@@ -19,6 +19,8 @@
 -- Maintainer  : Brendan Hay <brendan.g.hay@gmail.com>
 -- Stability   : experimental
 -- Portability : non-portable (GHC extensions)
+--
+-- Derived from AWS service descriptions, licensed under Apache 2.0.
 
 -- | Promotes a read replica DB instance to a standalone DB instance.
 --
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
@@ -19,6 +19,8 @@
 -- Maintainer  : Brendan Hay <brendan.g.hay@gmail.com>
 -- Stability   : experimental
 -- Portability : non-portable (GHC extensions)
+--
+-- Derived from AWS service descriptions, licensed under Apache 2.0.
 
 -- | Purchases a reserved DB instance offering.
 --
@@ -52,7 +54,7 @@
     { _prdbioDBInstanceCount               :: Maybe Int
     , _prdbioReservedDBInstanceId          :: Maybe Text
     , _prdbioReservedDBInstancesOfferingId :: Text
-    , _prdbioTags                          :: List "Tag" Tag
+    , _prdbioTags                          :: List "member" Tag
     } deriving (Eq, Show)
 
 -- | 'PurchaseReservedDBInstancesOffering' constructor.
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
@@ -19,6 +19,8 @@
 -- Maintainer  : Brendan Hay <brendan.g.hay@gmail.com>
 -- Stability   : experimental
 -- Portability : non-portable (GHC extensions)
+--
+-- Derived from AWS service descriptions, licensed under Apache 2.0.
 
 -- | Rebooting a DB instance restarts the database engine service. A reboot also
 -- applies to the DB instance any modifications to the associated DB parameter
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
@@ -19,6 +19,8 @@
 -- Maintainer  : Brendan Hay <brendan.g.hay@gmail.com>
 -- Stability   : experimental
 -- Portability : non-portable (GHC extensions)
+--
+-- Derived from AWS service descriptions, licensed under Apache 2.0.
 
 -- | Removes a source identifier from an existing RDS event notification
 -- subscription.
diff --git a/gen/Network/AWS/RDS/RemoveTagsFromResource.hs b/gen/Network/AWS/RDS/RemoveTagsFromResource.hs
--- a/gen/Network/AWS/RDS/RemoveTagsFromResource.hs
+++ b/gen/Network/AWS/RDS/RemoveTagsFromResource.hs
@@ -19,6 +19,8 @@
 -- Maintainer  : Brendan Hay <brendan.g.hay@gmail.com>
 -- Stability   : experimental
 -- Portability : non-portable (GHC extensions)
+--
+-- Derived from AWS service descriptions, licensed under Apache 2.0.
 
 -- | Removes metadata tags from an Amazon RDS resource.
 --
@@ -48,7 +50,7 @@
 
 data RemoveTagsFromResource = RemoveTagsFromResource
     { _rtfrResourceName :: Text
-    , _rtfrTagKeys      :: List "TagKeys" Text
+    , _rtfrTagKeys      :: List "member" Text
     } deriving (Eq, Ord, Show)
 
 -- | 'RemoveTagsFromResource' constructor.
diff --git a/gen/Network/AWS/RDS/ResetDBParameterGroup.hs b/gen/Network/AWS/RDS/ResetDBParameterGroup.hs
--- a/gen/Network/AWS/RDS/ResetDBParameterGroup.hs
+++ b/gen/Network/AWS/RDS/ResetDBParameterGroup.hs
@@ -19,6 +19,8 @@
 -- Maintainer  : Brendan Hay <brendan.g.hay@gmail.com>
 -- Stability   : experimental
 -- Portability : non-portable (GHC extensions)
+--
+-- Derived from AWS service descriptions, licensed under Apache 2.0.
 
 -- | Modifies the parameters of a DB parameter group to the engine/system default
 -- value. To reset specific parameters submit a list of the following: 'ParameterName' and 'ApplyMethod'. To reset the entire DB parameter group, specify the 'DBParameterGroup' name and 'ResetAllParameters' parameters. When resetting the entire group,
@@ -51,7 +53,7 @@
 
 data ResetDBParameterGroup = ResetDBParameterGroup
     { _rdbpgDBParameterGroupName :: Text
-    , _rdbpgParameters           :: List "Parameter" Parameter
+    , _rdbpgParameters           :: List "member" Parameter
     , _rdbpgResetAllParameters   :: Maybe Bool
     } deriving (Eq, Show)
 
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
@@ -19,6 +19,8 @@
 -- Maintainer  : Brendan Hay <brendan.g.hay@gmail.com>
 -- Stability   : experimental
 -- Portability : non-portable (GHC extensions)
+--
+-- Derived from AWS service descriptions, licensed under Apache 2.0.
 
 -- | Creates a new DB instance from a DB snapshot. The target database is created
 -- from the source database restore point with the same configuration as the
@@ -81,7 +83,7 @@
     , _rdbifdbsPort                    :: Maybe Int
     , _rdbifdbsPubliclyAccessible      :: Maybe Bool
     , _rdbifdbsStorageType             :: Maybe Text
-    , _rdbifdbsTags                    :: List "Tag" Tag
+    , _rdbifdbsTags                    :: List "member" Tag
     , _rdbifdbsTdeCredentialArn        :: Maybe Text
     , _rdbifdbsTdeCredentialPassword   :: Maybe Text
     } deriving (Eq, Show)
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
@@ -19,6 +19,8 @@
 -- Maintainer  : Brendan Hay <brendan.g.hay@gmail.com>
 -- Stability   : experimental
 -- Portability : non-portable (GHC extensions)
+--
+-- Derived from AWS service descriptions, licensed under Apache 2.0.
 
 -- | Restores a DB instance to an arbitrary point-in-time. Users can restore to
 -- any point in time before the latestRestorableTime for up to
@@ -84,7 +86,7 @@
     , _rdbitpitRestoreTime                :: Maybe ISO8601
     , _rdbitpitSourceDBInstanceIdentifier :: Text
     , _rdbitpitStorageType                :: Maybe Text
-    , _rdbitpitTags                       :: List "Tag" Tag
+    , _rdbitpitTags                       :: List "member" Tag
     , _rdbitpitTargetDBInstanceIdentifier :: Text
     , _rdbitpitTdeCredentialArn           :: Maybe Text
     , _rdbitpitTdeCredentialPassword      :: Maybe Text
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
@@ -19,6 +19,8 @@
 -- Maintainer  : Brendan Hay <brendan.g.hay@gmail.com>
 -- Stability   : experimental
 -- Portability : non-portable (GHC extensions)
+--
+-- Derived from AWS service descriptions, licensed under Apache 2.0.
 
 -- | Revokes ingress from a DBSecurityGroup for previously authorized IP ranges
 -- or EC2 or VPC Security Groups. Required parameters for this API are one of
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
@@ -19,6 +19,8 @@
 -- Maintainer  : Brendan Hay <brendan.g.hay@gmail.com>
 -- Stability   : experimental
 -- Portability : non-portable (GHC extensions)
+--
+-- Derived from AWS service descriptions, licensed under Apache 2.0.
 
 module Network.AWS.RDS.Types
     (
@@ -444,7 +446,7 @@
     , _ogMajorEngineVersion                    :: Maybe Text
     , _ogOptionGroupDescription                :: Maybe Text
     , _ogOptionGroupName                       :: Maybe Text
-    , _ogOptions                               :: List "Option" Option
+    , _ogOptions                               :: List "member" Option
     , _ogVpcId                                 :: Maybe Text
     } deriving (Eq, Show)
 
@@ -582,7 +584,7 @@
 
 data Event = Event
     { _eDate             :: Maybe ISO8601
-    , _eEventCategories  :: List "EventCategory" Text
+    , _eEventCategories  :: List "member" Text
     , _eMessage          :: Maybe Text
     , _eSourceIdentifier :: Maybe Text
     , _eSourceType       :: Maybe SourceType
@@ -652,8 +654,8 @@
 data DBSecurityGroup = DBSecurityGroup
     { _dbsgDBSecurityGroupDescription :: Maybe Text
     , _dbsgDBSecurityGroupName        :: Maybe Text
-    , _dbsgEC2SecurityGroups          :: List "EC2SecurityGroup" EC2SecurityGroup
-    , _dbsgIPRanges                   :: List "IPRange" IPRange
+    , _dbsgEC2SecurityGroups          :: List "member" EC2SecurityGroup
+    , _dbsgIPRanges                   :: List "member" IPRange
     , _dbsgOwnerId                    :: Maybe Text
     , _dbsgVpcId                      :: Maybe Text
     } deriving (Eq, Show)
@@ -785,7 +787,7 @@
     , _dbevDefaultCharacterSet        :: Maybe CharacterSet
     , _dbevEngine                     :: Maybe Text
     , _dbevEngineVersion              :: Maybe Text
-    , _dbevSupportedCharacterSets     :: List "CharacterSet" CharacterSet
+    , _dbevSupportedCharacterSets     :: List "member" CharacterSet
     } deriving (Eq, Show)
 
 -- | 'DBEngineVersion' constructor.
@@ -1308,7 +1310,7 @@
     , _rdbioMultiAZ                       :: Maybe Bool
     , _rdbioOfferingType                  :: Maybe Text
     , _rdbioProductDescription            :: Maybe Text
-    , _rdbioRecurringCharges              :: List "RecurringCharge" RecurringCharge
+    , _rdbioRecurringCharges              :: List "member" RecurringCharge
     , _rdbioReservedDBInstancesOfferingId :: Maybe Text
     , _rdbioUsagePrice                    :: Maybe Double
     } deriving (Eq, Show)
@@ -1551,7 +1553,7 @@
     , _rdbiMultiAZ                       :: Maybe Bool
     , _rdbiOfferingType                  :: Maybe Text
     , _rdbiProductDescription            :: Maybe Text
-    , _rdbiRecurringCharges              :: List "RecurringCharge" RecurringCharge
+    , _rdbiRecurringCharges              :: List "member" RecurringCharge
     , _rdbiReservedDBInstanceId          :: Maybe Text
     , _rdbiReservedDBInstancesOfferingId :: Maybe Text
     , _rdbiStartTime                     :: Maybe ISO8601
@@ -1712,7 +1714,7 @@
 data EngineDefaults = EngineDefaults
     { _edDBParameterGroupFamily :: Maybe Text
     , _edMarker                 :: Maybe Text
-    , _edParameters             :: List "Parameter" Parameter
+    , _edParameters             :: List "member" Parameter
     } deriving (Eq, Show)
 
 -- | 'EngineDefaults' constructor.
@@ -1799,8 +1801,8 @@
     , _ogoMajorEngineVersion                :: Maybe Text
     , _ogoMinimumRequiredMinorEngineVersion :: Maybe Text
     , _ogoName                              :: Maybe Text
-    , _ogoOptionGroupOptionSettings         :: List "OptionGroupOptionSetting" OptionGroupOptionSetting
-    , _ogoOptionsDependedOn                 :: List "OptionName" Text
+    , _ogoOptionGroupOptionSettings         :: List "member" OptionGroupOptionSetting
+    , _ogoOptionsDependedOn                 :: List "member" Text
     , _ogoPermanent                         :: Maybe Bool
     , _ogoPersistent                        :: Maybe Bool
     , _ogoPortRequired                      :: Maybe Bool
@@ -1944,8 +1946,8 @@
     , _dbiDBInstanceIdentifier                  :: Maybe Text
     , _dbiDBInstanceStatus                      :: Maybe Text
     , _dbiDBName                                :: Maybe Text
-    , _dbiDBParameterGroups                     :: List "DBParameterGroup" DBParameterGroupStatus
-    , _dbiDBSecurityGroups                      :: List "DBSecurityGroup" DBSecurityGroupMembership
+    , _dbiDBParameterGroups                     :: List "member" DBParameterGroupStatus
+    , _dbiDBSecurityGroups                      :: List "member" DBSecurityGroupMembership
     , _dbiDBSubnetGroup                         :: Maybe DBSubnetGroup
     , _dbiEndpoint                              :: Maybe Endpoint
     , _dbiEngine                                :: Maybe Text
@@ -1956,18 +1958,18 @@
     , _dbiLicenseModel                          :: Maybe Text
     , _dbiMasterUsername                        :: Maybe Text
     , _dbiMultiAZ                               :: Maybe Bool
-    , _dbiOptionGroupMemberships                :: List "OptionGroupMembership" OptionGroupMembership
+    , _dbiOptionGroupMemberships                :: List "member" OptionGroupMembership
     , _dbiPendingModifiedValues                 :: Maybe PendingModifiedValues
     , _dbiPreferredBackupWindow                 :: Maybe Text
     , _dbiPreferredMaintenanceWindow            :: Maybe Text
     , _dbiPubliclyAccessible                    :: Maybe Bool
-    , _dbiReadReplicaDBInstanceIdentifiers      :: List "ReadReplicaDBInstanceIdentifier" Text
+    , _dbiReadReplicaDBInstanceIdentifiers      :: List "member" Text
     , _dbiReadReplicaSourceDBInstanceIdentifier :: Maybe Text
     , _dbiSecondaryAvailabilityZone             :: Maybe Text
-    , _dbiStatusInfos                           :: List "DBInstanceStatusInfo" DBInstanceStatusInfo
+    , _dbiStatusInfos                           :: List "member" DBInstanceStatusInfo
     , _dbiStorageType                           :: Maybe Text
     , _dbiTdeCredentialArn                      :: Maybe Text
-    , _dbiVpcSecurityGroups                     :: List "VpcSecurityGroupMembership" VpcSecurityGroupMembership
+    , _dbiVpcSecurityGroups                     :: List "member" VpcSecurityGroupMembership
     } deriving (Eq, Show)
 
 -- | 'DBInstance' constructor.
@@ -2396,9 +2398,9 @@
     { _esCustSubscriptionId       :: Maybe Text
     , _esCustomerAwsId            :: Maybe Text
     , _esEnabled                  :: Maybe Bool
-    , _esEventCategoriesList      :: List "EventCategory" Text
+    , _esEventCategoriesList      :: List "member" Text
     , _esSnsTopicArn              :: Maybe Text
-    , _esSourceIdsList            :: List "SourceId" Text
+    , _esSourceIdsList            :: List "member" Text
     , _esSourceType               :: Maybe Text
     , _esStatus                   :: Maybe Text
     , _esSubscriptionCreationTime :: Maybe Text
@@ -2520,7 +2522,7 @@
     { _dbsg1DBSubnetGroupDescription :: Maybe Text
     , _dbsg1DBSubnetGroupName        :: Maybe Text
     , _dbsg1SubnetGroupStatus        :: Maybe Text
-    , _dbsg1Subnets                  :: List "Subnet" Subnet
+    , _dbsg1Subnets                  :: List "member" Subnet
     , _dbsg1VpcId                    :: Maybe Text
     } deriving (Eq, Show)
 
@@ -2809,7 +2811,7 @@
         ]
 
 data OrderableDBInstanceOption = OrderableDBInstanceOption
-    { _odbioAvailabilityZones  :: List "AvailabilityZone" AvailabilityZone
+    { _odbioAvailabilityZones  :: List "member" AvailabilityZone
     , _odbioDBInstanceClass    :: Maybe Text
     , _odbioEngine             :: Maybe Text
     , _odbioEngineVersion      :: Maybe Text
@@ -2936,7 +2938,7 @@
 
 data Filter = Filter
     { _fName   :: Text
-    , _fValues :: List "Value" Text
+    , _fValues :: List "member" Text
     } deriving (Eq, Ord, Show)
 
 -- | 'Filter' constructor.
@@ -3053,11 +3055,11 @@
         ]
 
 data OptionConfiguration = OptionConfiguration
-    { _ocDBSecurityGroupMemberships  :: List "DBSecurityGroupName" Text
+    { _ocDBSecurityGroupMemberships  :: List "member" Text
     , _ocOptionName                  :: Text
-    , _ocOptionSettings              :: List "OptionSetting" OptionSetting
+    , _ocOptionSettings              :: List "member" OptionSetting
     , _ocPort                        :: Maybe Int
-    , _ocVpcSecurityGroupMemberships :: List "VpcSecurityGroupId" Text
+    , _ocVpcSecurityGroupMemberships :: List "member" Text
     } deriving (Eq, Show)
 
 -- | 'OptionConfiguration' constructor.
@@ -3128,14 +3130,14 @@
         ]
 
 data Option = Option
-    { _oDBSecurityGroupMemberships  :: List "DBSecurityGroup" DBSecurityGroupMembership
+    { _oDBSecurityGroupMemberships  :: List "member" DBSecurityGroupMembership
     , _oOptionDescription           :: Maybe Text
     , _oOptionName                  :: Maybe Text
-    , _oOptionSettings              :: List "OptionSetting" OptionSetting
+    , _oOptionSettings              :: List "member" OptionSetting
     , _oPermanent                   :: Maybe Bool
     , _oPersistent                  :: Maybe Bool
     , _oPort                        :: Maybe Int
-    , _oVpcSecurityGroupMemberships :: List "VpcSecurityGroupMembership" VpcSecurityGroupMembership
+    , _oVpcSecurityGroupMemberships :: List "member" VpcSecurityGroupMembership
     } deriving (Eq, Show)
 
 -- | 'Option' constructor.
@@ -3314,7 +3316,7 @@
         ]
 
 data EventCategoriesMap = EventCategoriesMap
-    { _ecmEventCategories :: List "EventCategory" Text
+    { _ecmEventCategories :: List "member" Text
     , _ecmSourceType      :: Maybe Text
     } deriving (Eq, Ord, Show)
 
