diff --git a/README.md b/README.md
--- a/README.md
+++ b/README.md
@@ -29,3 +29,5 @@
 ## Licence
 
 `amazonka-redshift` 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-redshift.cabal b/amazonka-redshift.cabal
--- a/amazonka-redshift.cabal
+++ b/amazonka-redshift.cabal
@@ -1,5 +1,5 @@
 name:                  amazonka-redshift
-version:               0.0.4
+version:               0.0.5
 synopsis:              Amazon Redshift SDK.
 homepage:              https://github.com/brendanhay/amazonka
 license:               OtherLicense
@@ -99,5 +99,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/Redshift.hs b/gen/Network/AWS/Redshift.hs
--- a/gen/Network/AWS/Redshift.hs
+++ b/gen/Network/AWS/Redshift.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 Redshift is a fast, fully managed, petabyte-scale data warehouse
 -- service that makes it simple and cost-effective to efficiently analyze all
diff --git a/gen/Network/AWS/Redshift/AuthorizeClusterSecurityGroupIngress.hs b/gen/Network/AWS/Redshift/AuthorizeClusterSecurityGroupIngress.hs
--- a/gen/Network/AWS/Redshift/AuthorizeClusterSecurityGroupIngress.hs
+++ b/gen/Network/AWS/Redshift/AuthorizeClusterSecurityGroupIngress.hs
@@ -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 an inbound (ingress) rule to an Amazon Redshift security group.
 -- Depending on whether the application accessing your cluster is running on the
diff --git a/gen/Network/AWS/Redshift/AuthorizeSnapshotAccess.hs b/gen/Network/AWS/Redshift/AuthorizeSnapshotAccess.hs
--- a/gen/Network/AWS/Redshift/AuthorizeSnapshotAccess.hs
+++ b/gen/Network/AWS/Redshift/AuthorizeSnapshotAccess.hs
@@ -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.
 
 -- | Authorizes the specified AWS customer account to restore the specified
 -- snapshot.
diff --git a/gen/Network/AWS/Redshift/CopyClusterSnapshot.hs b/gen/Network/AWS/Redshift/CopyClusterSnapshot.hs
--- a/gen/Network/AWS/Redshift/CopyClusterSnapshot.hs
+++ b/gen/Network/AWS/Redshift/CopyClusterSnapshot.hs
@@ -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 automated cluster snapshot to a new manual cluster
 -- snapshot. The source must be an automated snapshot and it must be in the
diff --git a/gen/Network/AWS/Redshift/CreateCluster.hs b/gen/Network/AWS/Redshift/CreateCluster.hs
--- a/gen/Network/AWS/Redshift/CreateCluster.hs
+++ b/gen/Network/AWS/Redshift/CreateCluster.hs
@@ -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 cluster. To create the cluster in virtual private cloud (VPC),
 -- you must provide cluster subnet group name. If you don't provide a cluster
@@ -78,7 +80,7 @@
     , _ccAvailabilityZone                 :: Maybe Text
     , _ccClusterIdentifier                :: Text
     , _ccClusterParameterGroupName        :: Maybe Text
-    , _ccClusterSecurityGroups            :: List "ClusterSecurityGroupName" Text
+    , _ccClusterSecurityGroups            :: List "member" Text
     , _ccClusterSubnetGroupName           :: Maybe Text
     , _ccClusterType                      :: Maybe Text
     , _ccClusterVersion                   :: Maybe Text
@@ -95,8 +97,8 @@
     , _ccPort                             :: Maybe Int
     , _ccPreferredMaintenanceWindow       :: Maybe Text
     , _ccPubliclyAccessible               :: Maybe Bool
-    , _ccTags                             :: List "Tag" Tag
-    , _ccVpcSecurityGroupIds              :: List "VpcSecurityGroupId" Text
+    , _ccTags                             :: List "member" Tag
+    , _ccVpcSecurityGroupIds              :: List "member" Text
     } deriving (Eq, Show)
 
 -- | 'CreateCluster' constructor.
diff --git a/gen/Network/AWS/Redshift/CreateClusterParameterGroup.hs b/gen/Network/AWS/Redshift/CreateClusterParameterGroup.hs
--- a/gen/Network/AWS/Redshift/CreateClusterParameterGroup.hs
+++ b/gen/Network/AWS/Redshift/CreateClusterParameterGroup.hs
@@ -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 Amazon Redshift parameter group.
 --
@@ -61,7 +63,7 @@
     { _ccpgDescription          :: Text
     , _ccpgParameterGroupFamily :: Text
     , _ccpgParameterGroupName   :: Text
-    , _ccpgTags                 :: List "Tag" Tag
+    , _ccpgTags                 :: List "member" Tag
     } deriving (Eq, Show)
 
 -- | 'CreateClusterParameterGroup' constructor.
diff --git a/gen/Network/AWS/Redshift/CreateClusterSecurityGroup.hs b/gen/Network/AWS/Redshift/CreateClusterSecurityGroup.hs
--- a/gen/Network/AWS/Redshift/CreateClusterSecurityGroup.hs
+++ b/gen/Network/AWS/Redshift/CreateClusterSecurityGroup.hs
@@ -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 Amazon Redshift security group. You use security groups to
 -- control access to non-VPC clusters.
@@ -53,7 +55,7 @@
 data CreateClusterSecurityGroup = CreateClusterSecurityGroup
     { _ccsg1ClusterSecurityGroupName :: Text
     , _ccsg1Description              :: Text
-    , _ccsg1Tags                     :: List "Tag" Tag
+    , _ccsg1Tags                     :: List "member" Tag
     } deriving (Eq, Show)
 
 -- | 'CreateClusterSecurityGroup' constructor.
diff --git a/gen/Network/AWS/Redshift/CreateClusterSnapshot.hs b/gen/Network/AWS/Redshift/CreateClusterSnapshot.hs
--- a/gen/Network/AWS/Redshift/CreateClusterSnapshot.hs
+++ b/gen/Network/AWS/Redshift/CreateClusterSnapshot.hs
@@ -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 manual snapshot of the specified cluster. The cluster must be in
 -- the 'available' state.
@@ -53,7 +55,7 @@
 data CreateClusterSnapshot = CreateClusterSnapshot
     { _ccsClusterIdentifier  :: Text
     , _ccsSnapshotIdentifier :: Text
-    , _ccsTags               :: List "Tag" Tag
+    , _ccsTags               :: List "member" Tag
     } deriving (Eq, Show)
 
 -- | 'CreateClusterSnapshot' constructor.
diff --git a/gen/Network/AWS/Redshift/CreateClusterSubnetGroup.hs b/gen/Network/AWS/Redshift/CreateClusterSubnetGroup.hs
--- a/gen/Network/AWS/Redshift/CreateClusterSubnetGroup.hs
+++ b/gen/Network/AWS/Redshift/CreateClusterSubnetGroup.hs
@@ -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 Amazon Redshift subnet group. You must provide a list of one
 -- or more subnets in your existing Amazon Virtual Private Cloud (Amazon VPC)
@@ -55,8 +57,8 @@
 data CreateClusterSubnetGroup = CreateClusterSubnetGroup
     { _ccsgClusterSubnetGroupName :: Text
     , _ccsgDescription            :: Text
-    , _ccsgSubnetIds              :: List "SubnetIdentifier" Text
-    , _ccsgTags                   :: List "Tag" Tag
+    , _ccsgSubnetIds              :: List "member" Text
+    , _ccsgTags                   :: List "member" Tag
     } deriving (Eq, Show)
 
 -- | 'CreateClusterSubnetGroup' constructor.
diff --git a/gen/Network/AWS/Redshift/CreateEventSubscription.hs b/gen/Network/AWS/Redshift/CreateEventSubscription.hs
--- a/gen/Network/AWS/Redshift/CreateEventSubscription.hs
+++ b/gen/Network/AWS/Redshift/CreateEventSubscription.hs
@@ -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 Amazon Redshift event notification subscription. This action
 -- requires an ARN (Amazon Resource Name) of an Amazon SNS topic created by
@@ -75,13 +77,13 @@
 
 data CreateEventSubscription = CreateEventSubscription
     { _cesEnabled          :: Maybe Bool
-    , _cesEventCategories  :: List "EventCategory" Text
+    , _cesEventCategories  :: List "member" Text
     , _cesSeverity         :: Maybe 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/Redshift/CreateHsmClientCertificate.hs b/gen/Network/AWS/Redshift/CreateHsmClientCertificate.hs
--- a/gen/Network/AWS/Redshift/CreateHsmClientCertificate.hs
+++ b/gen/Network/AWS/Redshift/CreateHsmClientCertificate.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 HSM client certificate that an Amazon Redshift cluster will use to
 -- connect to the client's HSM in order to store and retrieve the keys used to
@@ -55,7 +57,7 @@
 
 data CreateHsmClientCertificate = CreateHsmClientCertificate
     { _chccHsmClientCertificateIdentifier :: Text
-    , _chccTags                           :: List "Tag" Tag
+    , _chccTags                           :: List "member" Tag
     } deriving (Eq, Show)
 
 -- | 'CreateHsmClientCertificate' constructor.
diff --git a/gen/Network/AWS/Redshift/CreateHsmConfiguration.hs b/gen/Network/AWS/Redshift/CreateHsmConfiguration.hs
--- a/gen/Network/AWS/Redshift/CreateHsmConfiguration.hs
+++ b/gen/Network/AWS/Redshift/CreateHsmConfiguration.hs
@@ -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 HSM configuration that contains the information required by an
 -- Amazon Redshift cluster to store and use database encryption keys in a
@@ -66,7 +68,7 @@
     , _chcHsmPartitionName           :: Text
     , _chcHsmPartitionPassword       :: Text
     , _chcHsmServerPublicCertificate :: Text
-    , _chcTags                       :: List "Tag" Tag
+    , _chcTags                       :: List "member" Tag
     } deriving (Eq, Show)
 
 -- | 'CreateHsmConfiguration' constructor.
diff --git a/gen/Network/AWS/Redshift/CreateTags.hs b/gen/Network/AWS/Redshift/CreateTags.hs
--- a/gen/Network/AWS/Redshift/CreateTags.hs
+++ b/gen/Network/AWS/Redshift/CreateTags.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 one or more tags to a specified resource.
 --
@@ -52,7 +54,7 @@
 
 data CreateTags = CreateTags
     { _ctResourceName :: Text
-    , _ctTags         :: List "Tag" Tag
+    , _ctTags         :: List "member" Tag
     } deriving (Eq, Show)
 
 -- | 'CreateTags' constructor.
diff --git a/gen/Network/AWS/Redshift/DeleteCluster.hs b/gen/Network/AWS/Redshift/DeleteCluster.hs
--- a/gen/Network/AWS/Redshift/DeleteCluster.hs
+++ b/gen/Network/AWS/Redshift/DeleteCluster.hs
@@ -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 previously provisioned cluster. A successful response from the web
 -- service indicates that the request was received correctly. Use 'DescribeClusters' to monitor the status of the deletion. The delete operation cannot be
diff --git a/gen/Network/AWS/Redshift/DeleteClusterParameterGroup.hs b/gen/Network/AWS/Redshift/DeleteClusterParameterGroup.hs
--- a/gen/Network/AWS/Redshift/DeleteClusterParameterGroup.hs
+++ b/gen/Network/AWS/Redshift/DeleteClusterParameterGroup.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 Amazon Redshift parameter group. You cannot delete a
 -- parameter group if it is associated with a cluster.
diff --git a/gen/Network/AWS/Redshift/DeleteClusterSecurityGroup.hs b/gen/Network/AWS/Redshift/DeleteClusterSecurityGroup.hs
--- a/gen/Network/AWS/Redshift/DeleteClusterSecurityGroup.hs
+++ b/gen/Network/AWS/Redshift/DeleteClusterSecurityGroup.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 Amazon Redshift security group.
 --
diff --git a/gen/Network/AWS/Redshift/DeleteClusterSnapshot.hs b/gen/Network/AWS/Redshift/DeleteClusterSnapshot.hs
--- a/gen/Network/AWS/Redshift/DeleteClusterSnapshot.hs
+++ b/gen/Network/AWS/Redshift/DeleteClusterSnapshot.hs
@@ -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 the specified manual snapshot. The snapshot must be in the 'available'
 -- state, with no other users authorized to access the snapshot.
diff --git a/gen/Network/AWS/Redshift/DeleteClusterSubnetGroup.hs b/gen/Network/AWS/Redshift/DeleteClusterSubnetGroup.hs
--- a/gen/Network/AWS/Redshift/DeleteClusterSubnetGroup.hs
+++ b/gen/Network/AWS/Redshift/DeleteClusterSubnetGroup.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 the specified cluster subnet group.
 --
diff --git a/gen/Network/AWS/Redshift/DeleteEventSubscription.hs b/gen/Network/AWS/Redshift/DeleteEventSubscription.hs
--- a/gen/Network/AWS/Redshift/DeleteEventSubscription.hs
+++ b/gen/Network/AWS/Redshift/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 Amazon Redshift event notification subscription.
 --
diff --git a/gen/Network/AWS/Redshift/DeleteHsmClientCertificate.hs b/gen/Network/AWS/Redshift/DeleteHsmClientCertificate.hs
--- a/gen/Network/AWS/Redshift/DeleteHsmClientCertificate.hs
+++ b/gen/Network/AWS/Redshift/DeleteHsmClientCertificate.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 the specified HSM client certificate.
 --
diff --git a/gen/Network/AWS/Redshift/DeleteHsmConfiguration.hs b/gen/Network/AWS/Redshift/DeleteHsmConfiguration.hs
--- a/gen/Network/AWS/Redshift/DeleteHsmConfiguration.hs
+++ b/gen/Network/AWS/Redshift/DeleteHsmConfiguration.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 the specified Amazon Redshift HSM configuration.
 --
diff --git a/gen/Network/AWS/Redshift/DeleteTags.hs b/gen/Network/AWS/Redshift/DeleteTags.hs
--- a/gen/Network/AWS/Redshift/DeleteTags.hs
+++ b/gen/Network/AWS/Redshift/DeleteTags.hs
@@ -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 tag or tags from a resource. You must provide the ARN of the
 -- resource from which you want to delete the tag or tags.
@@ -47,7 +49,7 @@
 
 data DeleteTags = DeleteTags
     { _dt1ResourceName :: Text
-    , _dt1TagKeys      :: List "TagKey" Text
+    , _dt1TagKeys      :: List "member" Text
     } deriving (Eq, Ord, Show)
 
 -- | 'DeleteTags' constructor.
diff --git a/gen/Network/AWS/Redshift/DescribeClusterParameterGroups.hs b/gen/Network/AWS/Redshift/DescribeClusterParameterGroups.hs
--- a/gen/Network/AWS/Redshift/DescribeClusterParameterGroups.hs
+++ b/gen/Network/AWS/Redshift/DescribeClusterParameterGroups.hs
@@ -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 Amazon Redshift parameter groups, including parameter
 -- groups you created and the default parameter group. For each parameter group,
@@ -70,8 +72,8 @@
     { _dcpgMarker             :: Maybe Text
     , _dcpgMaxRecords         :: Maybe Int
     , _dcpgParameterGroupName :: Maybe Text
-    , _dcpgTagKeys            :: List "TagKey" Text
-    , _dcpgTagValues          :: List "TagValue" Text
+    , _dcpgTagKeys            :: List "member" Text
+    , _dcpgTagValues          :: List "member" Text
     } deriving (Eq, Ord, Show)
 
 -- | 'DescribeClusterParameterGroups' constructor.
@@ -143,7 +145,7 @@
 
 data DescribeClusterParameterGroupsResponse = DescribeClusterParameterGroupsResponse
     { _dcpgrMarker          :: Maybe Text
-    , _dcpgrParameterGroups :: List "ClusterParameterGroup" ClusterParameterGroup
+    , _dcpgrParameterGroups :: List "member" ClusterParameterGroup
     } deriving (Eq, Show)
 
 -- | 'DescribeClusterParameterGroupsResponse' constructor.
diff --git a/gen/Network/AWS/Redshift/DescribeClusterParameters.hs b/gen/Network/AWS/Redshift/DescribeClusterParameters.hs
--- a/gen/Network/AWS/Redshift/DescribeClusterParameters.hs
+++ b/gen/Network/AWS/Redshift/DescribeClusterParameters.hs
@@ -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 detailed list of parameters contained within the specified Amazon
 -- Redshift parameter group. For each parameter the response includes
@@ -123,7 +125,7 @@
 
 data DescribeClusterParametersResponse = DescribeClusterParametersResponse
     { _dcprMarker     :: Maybe Text
-    , _dcprParameters :: List "Parameter" Parameter
+    , _dcprParameters :: List "member" Parameter
     } deriving (Eq, Show)
 
 -- | 'DescribeClusterParametersResponse' constructor.
diff --git a/gen/Network/AWS/Redshift/DescribeClusterSecurityGroups.hs b/gen/Network/AWS/Redshift/DescribeClusterSecurityGroups.hs
--- a/gen/Network/AWS/Redshift/DescribeClusterSecurityGroups.hs
+++ b/gen/Network/AWS/Redshift/DescribeClusterSecurityGroups.hs
@@ -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 Amazon Redshift security groups. If the name of a
 -- security group is specified, the response will contain only information about
@@ -68,8 +70,8 @@
     { _dcsgClusterSecurityGroupName :: Maybe Text
     , _dcsgMarker                   :: Maybe Text
     , _dcsgMaxRecords               :: Maybe Int
-    , _dcsgTagKeys                  :: List "TagKey" Text
-    , _dcsgTagValues                :: List "TagValue" Text
+    , _dcsgTagKeys                  :: List "member" Text
+    , _dcsgTagValues                :: List "member" Text
     } deriving (Eq, Ord, Show)
 
 -- | 'DescribeClusterSecurityGroups' constructor.
@@ -147,7 +149,7 @@
 dcsgTagValues = lens _dcsgTagValues (\s a -> s { _dcsgTagValues = a }) . _List
 
 data DescribeClusterSecurityGroupsResponse = DescribeClusterSecurityGroupsResponse
-    { _dcsgr1ClusterSecurityGroups :: List "ClusterSecurityGroup" ClusterSecurityGroup
+    { _dcsgr1ClusterSecurityGroups :: List "member" ClusterSecurityGroup
     , _dcsgr1Marker                :: Maybe Text
     } deriving (Eq, Show)
 
diff --git a/gen/Network/AWS/Redshift/DescribeClusterSnapshots.hs b/gen/Network/AWS/Redshift/DescribeClusterSnapshots.hs
--- a/gen/Network/AWS/Redshift/DescribeClusterSnapshots.hs
+++ b/gen/Network/AWS/Redshift/DescribeClusterSnapshots.hs
@@ -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 one or more snapshot objects, which contain metadata about your
 -- cluster snapshots. By default, this operation returns information about all
@@ -80,8 +82,8 @@
     , _dcs1SnapshotIdentifier :: Maybe Text
     , _dcs1SnapshotType       :: Maybe Text
     , _dcs1StartTime          :: Maybe ISO8601
-    , _dcs1TagKeys            :: List "TagKey" Text
-    , _dcs1TagValues          :: List "TagValue" Text
+    , _dcs1TagKeys            :: List "member" Text
+    , _dcs1TagValues          :: List "member" Text
     } deriving (Eq, Ord, Show)
 
 -- | 'DescribeClusterSnapshots' constructor.
@@ -202,7 +204,7 @@
 
 data DescribeClusterSnapshotsResponse = DescribeClusterSnapshotsResponse
     { _dcsrMarker    :: Maybe Text
-    , _dcsrSnapshots :: List "Snapshot" Snapshot
+    , _dcsrSnapshots :: List "member" Snapshot
     } deriving (Eq, Show)
 
 -- | 'DescribeClusterSnapshotsResponse' constructor.
diff --git a/gen/Network/AWS/Redshift/DescribeClusterSubnetGroups.hs b/gen/Network/AWS/Redshift/DescribeClusterSubnetGroups.hs
--- a/gen/Network/AWS/Redshift/DescribeClusterSubnetGroups.hs
+++ b/gen/Network/AWS/Redshift/DescribeClusterSubnetGroups.hs
@@ -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 one or more cluster subnet group objects, which contain metadata
 -- about your cluster subnet groups. By default, this operation returns
@@ -67,8 +69,8 @@
     { _dcsg1ClusterSubnetGroupName :: Maybe Text
     , _dcsg1Marker                 :: Maybe Text
     , _dcsg1MaxRecords             :: Maybe Int
-    , _dcsg1TagKeys                :: List "TagKey" Text
-    , _dcsg1TagValues              :: List "TagValue" Text
+    , _dcsg1TagKeys                :: List "member" Text
+    , _dcsg1TagValues              :: List "member" Text
     } deriving (Eq, Ord, Show)
 
 -- | 'DescribeClusterSubnetGroups' constructor.
@@ -139,7 +141,7 @@
 dcsg1TagValues = lens _dcsg1TagValues (\s a -> s { _dcsg1TagValues = a }) . _List
 
 data DescribeClusterSubnetGroupsResponse = DescribeClusterSubnetGroupsResponse
-    { _dcsgrClusterSubnetGroups :: List "ClusterSubnetGroup" ClusterSubnetGroup
+    { _dcsgrClusterSubnetGroups :: List "member" ClusterSubnetGroup
     , _dcsgrMarker              :: Maybe Text
     } deriving (Eq, Show)
 
diff --git a/gen/Network/AWS/Redshift/DescribeClusterVersions.hs b/gen/Network/AWS/Redshift/DescribeClusterVersions.hs
--- a/gen/Network/AWS/Redshift/DescribeClusterVersions.hs
+++ b/gen/Network/AWS/Redshift/DescribeClusterVersions.hs
@@ -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 descriptions of the available Amazon Redshift cluster versions. You
 -- can call this operation even before creating any clusters to learn more about
@@ -119,7 +121,7 @@
 dcvMaxRecords = lens _dcvMaxRecords (\s a -> s { _dcvMaxRecords = a })
 
 data DescribeClusterVersionsResponse = DescribeClusterVersionsResponse
-    { _dcvrClusterVersions :: List "ClusterVersion" ClusterVersion
+    { _dcvrClusterVersions :: List "member" ClusterVersion
     , _dcvrMarker          :: Maybe Text
     } deriving (Eq, Show)
 
diff --git a/gen/Network/AWS/Redshift/DescribeClusters.hs b/gen/Network/AWS/Redshift/DescribeClusters.hs
--- a/gen/Network/AWS/Redshift/DescribeClusters.hs
+++ b/gen/Network/AWS/Redshift/DescribeClusters.hs
@@ -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 properties of provisioned clusters including general cluster
 -- properties, cluster database properties, maintenance and backup properties,
@@ -68,8 +70,8 @@
     { _dcClusterIdentifier :: Maybe Text
     , _dcMarker            :: Maybe Text
     , _dcMaxRecords        :: Maybe Int
-    , _dcTagKeys           :: List "TagKey" Text
-    , _dcTagValues         :: List "TagValue" Text
+    , _dcTagKeys           :: List "member" Text
+    , _dcTagValues         :: List "member" Text
     } deriving (Eq, Ord, Show)
 
 -- | 'DescribeClusters' constructor.
@@ -144,7 +146,7 @@
 dcTagValues = lens _dcTagValues (\s a -> s { _dcTagValues = a }) . _List
 
 data DescribeClustersResponse = DescribeClustersResponse
-    { _dcrClusters :: List "Cluster" Cluster
+    { _dcrClusters :: List "member" Cluster
     , _dcrMarker   :: Maybe Text
     } deriving (Eq, Show)
 
diff --git a/gen/Network/AWS/Redshift/DescribeDefaultClusterParameters.hs b/gen/Network/AWS/Redshift/DescribeDefaultClusterParameters.hs
--- a/gen/Network/AWS/Redshift/DescribeDefaultClusterParameters.hs
+++ b/gen/Network/AWS/Redshift/DescribeDefaultClusterParameters.hs
@@ -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 parameter settings for the specified parameter group
 -- family.
diff --git a/gen/Network/AWS/Redshift/DescribeEventCategories.hs b/gen/Network/AWS/Redshift/DescribeEventCategories.hs
--- a/gen/Network/AWS/Redshift/DescribeEventCategories.hs
+++ b/gen/Network/AWS/Redshift/DescribeEventCategories.hs
@@ -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 event categories for all event source types, or for a
 -- specified source type. For a list of the event categories and source types,
@@ -70,7 +72,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/Redshift/DescribeEventSubscriptions.hs b/gen/Network/AWS/Redshift/DescribeEventSubscriptions.hs
--- a/gen/Network/AWS/Redshift/DescribeEventSubscriptions.hs
+++ b/gen/Network/AWS/Redshift/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 descriptions of all the Amazon Redshift event notifications
 -- subscription for a customer account. If you specify a subscription name,
@@ -100,7 +102,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/Redshift/DescribeEvents.hs b/gen/Network/AWS/Redshift/DescribeEvents.hs
--- a/gen/Network/AWS/Redshift/DescribeEvents.hs
+++ b/gen/Network/AWS/Redshift/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 clusters, security groups, snapshots, and
 -- parameter groups for the past 14 days. Events specific to a particular
@@ -165,7 +167,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/Redshift/DescribeHsmClientCertificates.hs b/gen/Network/AWS/Redshift/DescribeHsmClientCertificates.hs
--- a/gen/Network/AWS/Redshift/DescribeHsmClientCertificates.hs
+++ b/gen/Network/AWS/Redshift/DescribeHsmClientCertificates.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 the specified HSM client certificate. If no
 -- certificate ID is specified, returns information about all the HSM
@@ -66,8 +68,8 @@
     { _dhccHsmClientCertificateIdentifier :: Maybe Text
     , _dhccMarker                         :: Maybe Text
     , _dhccMaxRecords                     :: Maybe Int
-    , _dhccTagKeys                        :: List "TagKey" Text
-    , _dhccTagValues                      :: List "TagValue" Text
+    , _dhccTagKeys                        :: List "member" Text
+    , _dhccTagValues                      :: List "member" Text
     } deriving (Eq, Ord, Show)
 
 -- | 'DescribeHsmClientCertificates' constructor.
@@ -140,7 +142,7 @@
 dhccTagValues = lens _dhccTagValues (\s a -> s { _dhccTagValues = a }) . _List
 
 data DescribeHsmClientCertificatesResponse = DescribeHsmClientCertificatesResponse
-    { _dhccrHsmClientCertificates :: List "HsmClientCertificate" HsmClientCertificate
+    { _dhccrHsmClientCertificates :: List "member" HsmClientCertificate
     , _dhccrMarker                :: Maybe Text
     } deriving (Eq, Show)
 
diff --git a/gen/Network/AWS/Redshift/DescribeHsmConfigurations.hs b/gen/Network/AWS/Redshift/DescribeHsmConfigurations.hs
--- a/gen/Network/AWS/Redshift/DescribeHsmConfigurations.hs
+++ b/gen/Network/AWS/Redshift/DescribeHsmConfigurations.hs
@@ -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 the specified Amazon Redshift HSM configuration. If
 -- no configuration ID is specified, returns information about all the HSM
@@ -66,8 +68,8 @@
     { _dhc1HsmConfigurationIdentifier :: Maybe Text
     , _dhc1Marker                     :: Maybe Text
     , _dhc1MaxRecords                 :: Maybe Int
-    , _dhc1TagKeys                    :: List "TagKey" Text
-    , _dhc1TagValues                  :: List "TagValue" Text
+    , _dhc1TagKeys                    :: List "member" Text
+    , _dhc1TagValues                  :: List "member" Text
     } deriving (Eq, Ord, Show)
 
 -- | 'DescribeHsmConfigurations' constructor.
@@ -140,7 +142,7 @@
 dhc1TagValues = lens _dhc1TagValues (\s a -> s { _dhc1TagValues = a }) . _List
 
 data DescribeHsmConfigurationsResponse = DescribeHsmConfigurationsResponse
-    { _dhcrHsmConfigurations :: List "HsmConfiguration" HsmConfiguration
+    { _dhcrHsmConfigurations :: List "member" HsmConfiguration
     , _dhcrMarker            :: Maybe Text
     } deriving (Eq, Show)
 
diff --git a/gen/Network/AWS/Redshift/DescribeLoggingStatus.hs b/gen/Network/AWS/Redshift/DescribeLoggingStatus.hs
--- a/gen/Network/AWS/Redshift/DescribeLoggingStatus.hs
+++ b/gen/Network/AWS/Redshift/DescribeLoggingStatus.hs
@@ -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 whether information, such as queries and connection attempts, is
 -- being logged for the specified Amazon Redshift cluster.
diff --git a/gen/Network/AWS/Redshift/DescribeOrderableClusterOptions.hs b/gen/Network/AWS/Redshift/DescribeOrderableClusterOptions.hs
--- a/gen/Network/AWS/Redshift/DescribeOrderableClusterOptions.hs
+++ b/gen/Network/AWS/Redshift/DescribeOrderableClusterOptions.hs
@@ -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 cluster options. Before you create a new cluster
 -- you can use this operation to find what options are available, such as the
@@ -119,7 +121,7 @@
 
 data DescribeOrderableClusterOptionsResponse = DescribeOrderableClusterOptionsResponse
     { _docorMarker                  :: Maybe Text
-    , _docorOrderableClusterOptions :: List "OrderableClusterOption" OrderableClusterOption
+    , _docorOrderableClusterOptions :: List "member" OrderableClusterOption
     } deriving (Eq, Show)
 
 -- | 'DescribeOrderableClusterOptionsResponse' constructor.
diff --git a/gen/Network/AWS/Redshift/DescribeReservedNodeOfferings.hs b/gen/Network/AWS/Redshift/DescribeReservedNodeOfferings.hs
--- a/gen/Network/AWS/Redshift/DescribeReservedNodeOfferings.hs
+++ b/gen/Network/AWS/Redshift/DescribeReservedNodeOfferings.hs
@@ -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 reserved node offerings by Amazon Redshift
 -- with their descriptions including the node type, the fixed and recurring
@@ -105,7 +107,7 @@
 
 data DescribeReservedNodeOfferingsResponse = DescribeReservedNodeOfferingsResponse
     { _drnorMarker                :: Maybe Text
-    , _drnorReservedNodeOfferings :: List "ReservedNodeOffering" ReservedNodeOffering
+    , _drnorReservedNodeOfferings :: List "member" ReservedNodeOffering
     } deriving (Eq, Show)
 
 -- | 'DescribeReservedNodeOfferingsResponse' constructor.
diff --git a/gen/Network/AWS/Redshift/DescribeReservedNodes.hs b/gen/Network/AWS/Redshift/DescribeReservedNodes.hs
--- a/gen/Network/AWS/Redshift/DescribeReservedNodes.hs
+++ b/gen/Network/AWS/Redshift/DescribeReservedNodes.hs
@@ -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 descriptions of the reserved nodes.
 --
@@ -97,7 +99,7 @@
 
 data DescribeReservedNodesResponse = DescribeReservedNodesResponse
     { _drnrMarker        :: Maybe Text
-    , _drnrReservedNodes :: List "ReservedNode" ReservedNode
+    , _drnrReservedNodes :: List "member" ReservedNode
     } deriving (Eq, Show)
 
 -- | 'DescribeReservedNodesResponse' constructor.
diff --git a/gen/Network/AWS/Redshift/DescribeResize.hs b/gen/Network/AWS/Redshift/DescribeResize.hs
--- a/gen/Network/AWS/Redshift/DescribeResize.hs
+++ b/gen/Network/AWS/Redshift/DescribeResize.hs
@@ -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 the last resize operation for the specified
 -- cluster. If no resize operation has ever been initiated for the specified
@@ -92,9 +94,9 @@
     { _drrAvgResizeRateInMegaBytesPerSecond  :: Maybe Double
     , _drrElapsedTimeInSeconds               :: Maybe Integer
     , _drrEstimatedTimeToCompletionInSeconds :: Maybe Integer
-    , _drrImportTablesCompleted              :: List "ImportTablesCompleted" Text
-    , _drrImportTablesInProgress             :: List "ImportTablesInProgress" Text
-    , _drrImportTablesNotStarted             :: List "ImportTablesNotStarted" Text
+    , _drrImportTablesCompleted              :: List "member" Text
+    , _drrImportTablesInProgress             :: List "member" Text
+    , _drrImportTablesNotStarted             :: List "member" Text
     , _drrProgressInMegaBytes                :: Maybe Integer
     , _drrStatus                             :: Maybe Text
     , _drrTargetClusterType                  :: Maybe Text
diff --git a/gen/Network/AWS/Redshift/DescribeTags.hs b/gen/Network/AWS/Redshift/DescribeTags.hs
--- a/gen/Network/AWS/Redshift/DescribeTags.hs
+++ b/gen/Network/AWS/Redshift/DescribeTags.hs
@@ -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 tags. You can return tags from a specific resource by
 -- specifying an ARN, or you can return all tags for a given type of resource,
@@ -72,8 +74,8 @@
     , _dtMaxRecords   :: Maybe Int
     , _dtResourceName :: Maybe Text
     , _dtResourceType :: Maybe Text
-    , _dtTagKeys      :: List "TagKey" Text
-    , _dtTagValues    :: List "TagValue" Text
+    , _dtTagKeys      :: List "member" Text
+    , _dtTagValues    :: List "member" Text
     } deriving (Eq, Ord, Show)
 
 -- | 'DescribeTags' constructor.
@@ -152,7 +154,7 @@
 
 data DescribeTagsResponse = DescribeTagsResponse
     { _dtrMarker          :: Maybe Text
-    , _dtrTaggedResources :: List "TaggedResource" TaggedResource
+    , _dtrTaggedResources :: List "member" TaggedResource
     } deriving (Eq, Show)
 
 -- | 'DescribeTagsResponse' constructor.
diff --git a/gen/Network/AWS/Redshift/DisableLogging.hs b/gen/Network/AWS/Redshift/DisableLogging.hs
--- a/gen/Network/AWS/Redshift/DisableLogging.hs
+++ b/gen/Network/AWS/Redshift/DisableLogging.hs
@@ -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.
 
 -- | Stops logging information, such as queries and connection attempts, for the
 -- specified Amazon Redshift cluster.
diff --git a/gen/Network/AWS/Redshift/DisableSnapshotCopy.hs b/gen/Network/AWS/Redshift/DisableSnapshotCopy.hs
--- a/gen/Network/AWS/Redshift/DisableSnapshotCopy.hs
+++ b/gen/Network/AWS/Redshift/DisableSnapshotCopy.hs
@@ -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.
 
 -- | Disables the automatic copying of snapshots from one region to another region
 -- for a specified cluster.
diff --git a/gen/Network/AWS/Redshift/EnableLogging.hs b/gen/Network/AWS/Redshift/EnableLogging.hs
--- a/gen/Network/AWS/Redshift/EnableLogging.hs
+++ b/gen/Network/AWS/Redshift/EnableLogging.hs
@@ -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.
 
 -- | Starts logging information, such as queries and connection attempts, for the
 -- specified Amazon Redshift cluster.
diff --git a/gen/Network/AWS/Redshift/EnableSnapshotCopy.hs b/gen/Network/AWS/Redshift/EnableSnapshotCopy.hs
--- a/gen/Network/AWS/Redshift/EnableSnapshotCopy.hs
+++ b/gen/Network/AWS/Redshift/EnableSnapshotCopy.hs
@@ -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 the automatic copy of snapshots from one region to another region for
 -- a specified cluster.
diff --git a/gen/Network/AWS/Redshift/ModifyCluster.hs b/gen/Network/AWS/Redshift/ModifyCluster.hs
--- a/gen/Network/AWS/Redshift/ModifyCluster.hs
+++ b/gen/Network/AWS/Redshift/ModifyCluster.hs
@@ -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 settings for a cluster. For example, you can add another
 -- security or parameter group, update the preferred maintenance window, or
@@ -74,7 +76,7 @@
     , _mcAutomatedSnapshotRetentionPeriod :: Maybe Int
     , _mcClusterIdentifier                :: Text
     , _mcClusterParameterGroupName        :: Maybe Text
-    , _mcClusterSecurityGroups            :: List "ClusterSecurityGroupName" Text
+    , _mcClusterSecurityGroups            :: List "member" Text
     , _mcClusterType                      :: Maybe Text
     , _mcClusterVersion                   :: Maybe Text
     , _mcHsmClientCertificateIdentifier   :: Maybe Text
@@ -84,7 +86,7 @@
     , _mcNodeType                         :: Maybe Text
     , _mcNumberOfNodes                    :: Maybe Int
     , _mcPreferredMaintenanceWindow       :: Maybe Text
-    , _mcVpcSecurityGroupIds              :: List "VpcSecurityGroupId" Text
+    , _mcVpcSecurityGroupIds              :: List "member" Text
     } deriving (Eq, Ord, Show)
 
 -- | 'ModifyCluster' constructor.
diff --git a/gen/Network/AWS/Redshift/ModifyClusterParameterGroup.hs b/gen/Network/AWS/Redshift/ModifyClusterParameterGroup.hs
--- a/gen/Network/AWS/Redshift/ModifyClusterParameterGroup.hs
+++ b/gen/Network/AWS/Redshift/ModifyClusterParameterGroup.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 parameter group.
 --
@@ -51,7 +53,7 @@
 
 data ModifyClusterParameterGroup = ModifyClusterParameterGroup
     { _mcpgParameterGroupName :: Text
-    , _mcpgParameters         :: List "Parameter" Parameter
+    , _mcpgParameters         :: List "member" Parameter
     } deriving (Eq, Show)
 
 -- | 'ModifyClusterParameterGroup' constructor.
diff --git a/gen/Network/AWS/Redshift/ModifyClusterSubnetGroup.hs b/gen/Network/AWS/Redshift/ModifyClusterSubnetGroup.hs
--- a/gen/Network/AWS/Redshift/ModifyClusterSubnetGroup.hs
+++ b/gen/Network/AWS/Redshift/ModifyClusterSubnetGroup.hs
@@ -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 a cluster subnet group to include the specified list of VPC
 -- subnets. The operation replaces the existing list of subnets with the new
@@ -52,7 +54,7 @@
 data ModifyClusterSubnetGroup = ModifyClusterSubnetGroup
     { _mcsgClusterSubnetGroupName :: Text
     , _mcsgDescription            :: Maybe Text
-    , _mcsgSubnetIds              :: List "SubnetIdentifier" Text
+    , _mcsgSubnetIds              :: List "member" Text
     } deriving (Eq, Ord, Show)
 
 -- | 'ModifyClusterSubnetGroup' constructor.
diff --git a/gen/Network/AWS/Redshift/ModifyEventSubscription.hs b/gen/Network/AWS/Redshift/ModifyEventSubscription.hs
--- a/gen/Network/AWS/Redshift/ModifyEventSubscription.hs
+++ b/gen/Network/AWS/Redshift/ModifyEventSubscription.hs
@@ -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 Amazon Redshift event notification subscription.
 --
@@ -53,10 +55,10 @@
 
 data ModifyEventSubscription = ModifyEventSubscription
     { _mesEnabled          :: Maybe Bool
-    , _mesEventCategories  :: List "EventCategory" Text
+    , _mesEventCategories  :: List "member" Text
     , _mesSeverity         :: Maybe Text
     , _mesSnsTopicArn      :: Maybe Text
-    , _mesSourceIds        :: List "SourceId" Text
+    , _mesSourceIds        :: List "member" Text
     , _mesSourceType       :: Maybe Text
     , _mesSubscriptionName :: Text
     } deriving (Eq, Ord, Show)
diff --git a/gen/Network/AWS/Redshift/ModifySnapshotCopyRetentionPeriod.hs b/gen/Network/AWS/Redshift/ModifySnapshotCopyRetentionPeriod.hs
--- a/gen/Network/AWS/Redshift/ModifySnapshotCopyRetentionPeriod.hs
+++ b/gen/Network/AWS/Redshift/ModifySnapshotCopyRetentionPeriod.hs
@@ -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 number of days to retain automated snapshots in the destination
 -- region after they are copied from the source region.
diff --git a/gen/Network/AWS/Redshift/PurchaseReservedNodeOffering.hs b/gen/Network/AWS/Redshift/PurchaseReservedNodeOffering.hs
--- a/gen/Network/AWS/Redshift/PurchaseReservedNodeOffering.hs
+++ b/gen/Network/AWS/Redshift/PurchaseReservedNodeOffering.hs
@@ -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.
 
 -- | Allows you to purchase reserved nodes. Amazon Redshift offers a predefined
 -- set of reserved node offerings. You can purchase one of the offerings. You
diff --git a/gen/Network/AWS/Redshift/RebootCluster.hs b/gen/Network/AWS/Redshift/RebootCluster.hs
--- a/gen/Network/AWS/Redshift/RebootCluster.hs
+++ b/gen/Network/AWS/Redshift/RebootCluster.hs
@@ -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.
 
 -- | Reboots a cluster. This action is taken as soon as possible. It results in a
 -- momentary outage to the cluster, during which the cluster status is set to 'rebooting'. A cluster event is created when the reboot is completed. Any pending
diff --git a/gen/Network/AWS/Redshift/ResetClusterParameterGroup.hs b/gen/Network/AWS/Redshift/ResetClusterParameterGroup.hs
--- a/gen/Network/AWS/Redshift/ResetClusterParameterGroup.hs
+++ b/gen/Network/AWS/Redshift/ResetClusterParameterGroup.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.
 
 -- | Sets one or more parameters of the specified parameter group to their
 -- default values and sets the source values of the parameters to
@@ -53,7 +55,7 @@
 
 data ResetClusterParameterGroup = ResetClusterParameterGroup
     { _rcpgParameterGroupName :: Text
-    , _rcpgParameters         :: List "Parameter" Parameter
+    , _rcpgParameters         :: List "member" Parameter
     , _rcpgResetAllParameters :: Maybe Bool
     } deriving (Eq, Show)
 
diff --git a/gen/Network/AWS/Redshift/RestoreFromClusterSnapshot.hs b/gen/Network/AWS/Redshift/RestoreFromClusterSnapshot.hs
--- a/gen/Network/AWS/Redshift/RestoreFromClusterSnapshot.hs
+++ b/gen/Network/AWS/Redshift/RestoreFromClusterSnapshot.hs
@@ -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 cluster from a snapshot. Amazon Redshift creates the resulting
 -- cluster with the same configuration as the original cluster from which the
@@ -78,7 +80,7 @@
     , _rfcsAvailabilityZone                 :: Maybe Text
     , _rfcsClusterIdentifier                :: Text
     , _rfcsClusterParameterGroupName        :: Maybe Text
-    , _rfcsClusterSecurityGroups            :: List "ClusterSecurityGroupName" Text
+    , _rfcsClusterSecurityGroups            :: List "member" Text
     , _rfcsClusterSubnetGroupName           :: Maybe Text
     , _rfcsElasticIp                        :: Maybe Text
     , _rfcsHsmClientCertificateIdentifier   :: Maybe Text
@@ -90,7 +92,7 @@
     , _rfcsPubliclyAccessible               :: Maybe Bool
     , _rfcsSnapshotClusterIdentifier        :: Maybe Text
     , _rfcsSnapshotIdentifier               :: Text
-    , _rfcsVpcSecurityGroupIds              :: List "VpcSecurityGroupId" Text
+    , _rfcsVpcSecurityGroupIds              :: List "member" Text
     } deriving (Eq, Ord, Show)
 
 -- | 'RestoreFromClusterSnapshot' constructor.
diff --git a/gen/Network/AWS/Redshift/RevokeClusterSecurityGroupIngress.hs b/gen/Network/AWS/Redshift/RevokeClusterSecurityGroupIngress.hs
--- a/gen/Network/AWS/Redshift/RevokeClusterSecurityGroupIngress.hs
+++ b/gen/Network/AWS/Redshift/RevokeClusterSecurityGroupIngress.hs
@@ -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 an ingress rule in an Amazon Redshift security group for a
 -- previously authorized IP range or Amazon EC2 security group. To add an
diff --git a/gen/Network/AWS/Redshift/RevokeSnapshotAccess.hs b/gen/Network/AWS/Redshift/RevokeSnapshotAccess.hs
--- a/gen/Network/AWS/Redshift/RevokeSnapshotAccess.hs
+++ b/gen/Network/AWS/Redshift/RevokeSnapshotAccess.hs
@@ -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 the ability of the specified AWS customer account to restore the
 -- specified snapshot. If the account is currently restoring the snapshot, the
diff --git a/gen/Network/AWS/Redshift/RotateEncryptionKey.hs b/gen/Network/AWS/Redshift/RotateEncryptionKey.hs
--- a/gen/Network/AWS/Redshift/RotateEncryptionKey.hs
+++ b/gen/Network/AWS/Redshift/RotateEncryptionKey.hs
@@ -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.
 
 -- | Rotates the encryption keys for a cluster.
 --
diff --git a/gen/Network/AWS/Redshift/Types.hs b/gen/Network/AWS/Redshift/Types.hs
--- a/gen/Network/AWS/Redshift/Types.hs
+++ b/gen/Network/AWS/Redshift/Types.hs
@@ -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.Redshift.Types
     (
@@ -408,7 +410,7 @@
 ns = "http://redshift.amazonaws.com/doc/2012-12-01/"
 
 data Snapshot = Snapshot
-    { _sAccountsWithRestoreAccess              :: List "AccountWithRestoreAccess" AccountWithRestoreAccess
+    { _sAccountsWithRestoreAccess              :: List "member" AccountWithRestoreAccess
     , _sActualIncrementalBackupSizeInMegaBytes :: Maybe Double
     , _sAvailabilityZone                       :: Maybe Text
     , _sBackupProgressInMegaBytes              :: Maybe Double
@@ -432,7 +434,7 @@
     , _sSnapshotType                           :: Maybe Text
     , _sSourceRegion                           :: Maybe Text
     , _sStatus                                 :: Maybe Text
-    , _sTags                                   :: List "Tag" Tag
+    , _sTags                                   :: List "member" Tag
     , _sTotalBackupSizeInMegaBytes             :: Maybe Double
     , _sVpcId                                  :: Maybe Text
     } deriving (Eq, Show)
@@ -738,7 +740,7 @@
     { _cpgDescription          :: Maybe Text
     , _cpgParameterGroupFamily :: Maybe Text
     , _cpgParameterGroupName   :: Maybe Text
-    , _cpgTags                 :: List "Tag" Tag
+    , _cpgTags                 :: List "member" Tag
     } deriving (Eq, Show)
 
 -- | 'ClusterParameterGroup' constructor.
@@ -887,7 +889,7 @@
 
 data Event = Event
     { _eDate             :: Maybe ISO8601
-    , _eEventCategories  :: List "EventCategory" Text
+    , _eEventCategories  :: List "member" Text
     , _eEventId          :: Maybe Text
     , _eMessage          :: Maybe Text
     , _eSeverity         :: Maybe Text
@@ -1059,7 +1061,7 @@
 data HsmClientCertificate = HsmClientCertificate
     { _hccHsmClientCertificateIdentifier :: Maybe Text
     , _hccHsmClientCertificatePublicKey  :: Maybe Text
-    , _hccTags                           :: List "Tag" Tag
+    , _hccTags                           :: List "member" Tag
     } deriving (Eq, Show)
 
 -- | 'HsmClientCertificate' constructor.
@@ -1115,11 +1117,11 @@
     , _cAvailabilityZone                 :: Maybe Text
     , _cClusterCreateTime                :: Maybe ISO8601
     , _cClusterIdentifier                :: Maybe Text
-    , _cClusterNodes                     :: List "ClusterNodes" ClusterNode
-    , _cClusterParameterGroups           :: List "ClusterParameterGroup" ClusterParameterGroupStatus
+    , _cClusterNodes                     :: List "member" ClusterNode
+    , _cClusterParameterGroups           :: List "member" ClusterParameterGroupStatus
     , _cClusterPublicKey                 :: Maybe Text
     , _cClusterRevisionNumber            :: Maybe Text
-    , _cClusterSecurityGroups            :: List "ClusterSecurityGroup" ClusterSecurityGroupMembership
+    , _cClusterSecurityGroups            :: List "member" ClusterSecurityGroupMembership
     , _cClusterSnapshotCopyStatus        :: Maybe ClusterSnapshotCopyStatus
     , _cClusterStatus                    :: Maybe Text
     , _cClusterSubnetGroupName           :: Maybe Text
@@ -1138,9 +1140,9 @@
     , _cPreferredMaintenanceWindow       :: Maybe Text
     , _cPubliclyAccessible               :: Maybe Bool
     , _cRestoreStatus                    :: Maybe RestoreStatus
-    , _cTags                             :: List "Tag" Tag
+    , _cTags                             :: List "member" Tag
     , _cVpcId                            :: Maybe Text
-    , _cVpcSecurityGroups                :: List "VpcSecurityGroup" VpcSecurityGroupMembership
+    , _cVpcSecurityGroups                :: List "member" VpcSecurityGroupMembership
     } deriving (Eq, Show)
 
 -- | 'Cluster' constructor.
@@ -1532,7 +1534,7 @@
     { _ecsgEC2SecurityGroupName    :: Maybe Text
     , _ecsgEC2SecurityGroupOwnerId :: Maybe Text
     , _ecsgStatus                  :: Maybe Text
-    , _ecsgTags                    :: List "Tag" Tag
+    , _ecsgTags                    :: List "member" Tag
     } deriving (Eq, Show)
 
 -- | 'EC2SecurityGroup' constructor.
@@ -1591,7 +1593,7 @@
         ]
 
 data OrderableClusterOption = OrderableClusterOption
-    { _ocoAvailabilityZones :: List "AvailabilityZone" AvailabilityZone
+    { _ocoAvailabilityZones :: List "member" AvailabilityZone
     , _ocoClusterType       :: Maybe Text
     , _ocoClusterVersion    :: Maybe Text
     , _ocoNodeType          :: Maybe Text
@@ -1776,9 +1778,9 @@
 data ClusterSecurityGroup = ClusterSecurityGroup
     { _csgClusterSecurityGroupName :: Maybe Text
     , _csgDescription              :: Maybe Text
-    , _csgEC2SecurityGroups        :: List "EC2SecurityGroup" EC2SecurityGroup
-    , _csgIPRanges                 :: List "IPRange" IPRange
-    , _csgTags                     :: List "Tag" Tag
+    , _csgEC2SecurityGroups        :: List "member" EC2SecurityGroup
+    , _csgIPRanges                 :: List "member" IPRange
+    , _csgTags                     :: List "member" Tag
     } deriving (Eq, Show)
 
 -- | 'ClusterSecurityGroup' constructor.
@@ -1850,7 +1852,7 @@
 data DefaultClusterParameters = DefaultClusterParameters
     { _dcpMarker               :: Maybe Text
     , _dcpParameterGroupFamily :: Maybe Text
-    , _dcpParameters           :: List "Parameter" Parameter
+    , _dcpParameters           :: List "member" Parameter
     } deriving (Eq, Show)
 
 -- | 'DefaultClusterParameters' constructor.
@@ -1905,8 +1907,8 @@
     { _csg1ClusterSubnetGroupName :: Maybe Text
     , _csg1Description            :: Maybe Text
     , _csg1SubnetGroupStatus      :: Maybe Text
-    , _csg1Subnets                :: List "Subnet" Subnet
-    , _csg1Tags                   :: List "Tag" Tag
+    , _csg1Subnets                :: List "member" Subnet
+    , _csg1Tags                   :: List "member" Tag
     , _csg1VpcId                  :: Maybe Text
     } deriving (Eq, Show)
 
@@ -1983,7 +1985,7 @@
         ]
 
 data EventInfoMap = EventInfoMap
-    { _eimEventCategories  :: List "EventCategory" Text
+    { _eimEventCategories  :: List "member" Text
     , _eimEventDescription :: Maybe Text
     , _eimEventId          :: Maybe Text
     , _eimSeverity         :: Maybe Text
@@ -2091,7 +2093,7 @@
     , _rnoFixedPrice             :: Maybe Double
     , _rnoNodeType               :: Maybe Text
     , _rnoOfferingType           :: Maybe Text
-    , _rnoRecurringCharges       :: List "RecurringCharge" RecurringCharge
+    , _rnoRecurringCharges       :: List "member" RecurringCharge
     , _rnoReservedNodeOfferingId :: Maybe Text
     , _rnoUsagePrice             :: Maybe Double
     } deriving (Eq, Show)
@@ -2199,7 +2201,7 @@
     , _rnNodeCount              :: Maybe Int
     , _rnNodeType               :: Maybe Text
     , _rnOfferingType           :: Maybe Text
-    , _rnRecurringCharges       :: List "RecurringCharge" RecurringCharge
+    , _rnRecurringCharges       :: List "member" RecurringCharge
     , _rnReservedNodeId         :: Maybe Text
     , _rnReservedNodeOfferingId :: Maybe Text
     , _rnStartTime              :: Maybe ISO8601
@@ -2487,14 +2489,14 @@
     { _esCustSubscriptionId       :: Maybe Text
     , _esCustomerAwsId            :: Maybe Text
     , _esEnabled                  :: Maybe Bool
-    , _esEventCategoriesList      :: List "EventCategory" Text
+    , _esEventCategoriesList      :: List "member" Text
     , _esSeverity                 :: Maybe Text
     , _esSnsTopicArn              :: Maybe Text
-    , _esSourceIdsList            :: List "SourceId" Text
+    , _esSourceIdsList            :: List "member" Text
     , _esSourceType               :: Maybe Text
     , _esStatus                   :: Maybe Text
     , _esSubscriptionCreationTime :: Maybe ISO8601
-    , _esTags                     :: List "Tag" Tag
+    , _esTags                     :: List "member" Tag
     } deriving (Eq, Show)
 
 -- | 'EventSubscription' constructor.
@@ -2907,7 +2909,7 @@
 data IPRange = IPRange
     { _iprCIDRIP :: Maybe Text
     , _iprStatus :: Maybe Text
-    , _iprTags   :: List "Tag" Tag
+    , _iprTags   :: List "member" Tag
     } deriving (Eq, Show)
 
 -- | 'IPRange' constructor.
@@ -3007,7 +3009,7 @@
         ]
 
 data EventCategoriesMap = EventCategoriesMap
-    { _ecmEvents     :: List "EventInfoMap" EventInfoMap
+    { _ecmEvents     :: List "member" EventInfoMap
     , _ecmSourceType :: Maybe Text
     } deriving (Eq, Show)
 
@@ -3050,7 +3052,7 @@
     , _hcHsmConfigurationIdentifier :: Maybe Text
     , _hcHsmIpAddress               :: Maybe Text
     , _hcHsmPartitionName           :: Maybe Text
-    , _hcTags                       :: List "Tag" Tag
+    , _hcTags                       :: List "member" Tag
     } deriving (Eq, Show)
 
 -- | 'HsmConfiguration' constructor.
