diff --git a/README.md b/README.md
--- a/README.md
+++ b/README.md
@@ -33,3 +33,5 @@
 ## Licence
 
 `amazonka-elasticbeanstalk` 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-elasticbeanstalk.cabal b/amazonka-elasticbeanstalk.cabal
--- a/amazonka-elasticbeanstalk.cabal
+++ b/amazonka-elasticbeanstalk.cabal
@@ -1,5 +1,5 @@
 name:                  amazonka-elasticbeanstalk
-version:               0.0.4
+version:               0.0.5
 synopsis:              Amazon Elastic Beanstalk SDK.
 homepage:              https://github.com/brendanhay/amazonka
 license:               OtherLicense
@@ -76,5 +76,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/ElasticBeanstalk.hs b/gen/Network/AWS/ElasticBeanstalk.hs
--- a/gen/Network/AWS/ElasticBeanstalk.hs
+++ b/gen/Network/AWS/ElasticBeanstalk.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.
 
 -- | AWS Elastic Beanstalk is an easy-to-use service for deploying and scaling web
 -- applications and services developed with Java, .NET, PHP, Node.js, Python,
diff --git a/gen/Network/AWS/ElasticBeanstalk/CheckDNSAvailability.hs b/gen/Network/AWS/ElasticBeanstalk/CheckDNSAvailability.hs
--- a/gen/Network/AWS/ElasticBeanstalk/CheckDNSAvailability.hs
+++ b/gen/Network/AWS/ElasticBeanstalk/CheckDNSAvailability.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.
 
 -- | Checks if the specified CNAME is available.
 --
diff --git a/gen/Network/AWS/ElasticBeanstalk/CreateApplication.hs b/gen/Network/AWS/ElasticBeanstalk/CreateApplication.hs
--- a/gen/Network/AWS/ElasticBeanstalk/CreateApplication.hs
+++ b/gen/Network/AWS/ElasticBeanstalk/CreateApplication.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 application that has one configuration template named 'default' and
 -- no application versions.
diff --git a/gen/Network/AWS/ElasticBeanstalk/CreateApplicationVersion.hs b/gen/Network/AWS/ElasticBeanstalk/CreateApplicationVersion.hs
--- a/gen/Network/AWS/ElasticBeanstalk/CreateApplicationVersion.hs
+++ b/gen/Network/AWS/ElasticBeanstalk/CreateApplicationVersion.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 application version for the specified application.
 --
diff --git a/gen/Network/AWS/ElasticBeanstalk/CreateConfigurationTemplate.hs b/gen/Network/AWS/ElasticBeanstalk/CreateConfigurationTemplate.hs
--- a/gen/Network/AWS/ElasticBeanstalk/CreateConfigurationTemplate.hs
+++ b/gen/Network/AWS/ElasticBeanstalk/CreateConfigurationTemplate.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 configuration template. Templates are associated with a specific
 -- application and are used to deploy different versions of the application with
@@ -69,7 +71,7 @@
     { _cctApplicationName     :: Text
     , _cctDescription         :: Maybe Text
     , _cctEnvironmentId       :: Maybe Text
-    , _cctOptionSettings      :: List "OptionSettings" ConfigurationOptionSetting
+    , _cctOptionSettings      :: List "member" ConfigurationOptionSetting
     , _cctSolutionStackName   :: Maybe Text
     , _cctSourceConfiguration :: Maybe SourceConfiguration
     , _cctTemplateName        :: Text
@@ -180,7 +182,7 @@
     , _cctrDeploymentStatus  :: Maybe ConfigurationDeploymentStatus
     , _cctrDescription       :: Maybe Text
     , _cctrEnvironmentName   :: Maybe Text
-    , _cctrOptionSettings    :: List "OptionSettings" ConfigurationOptionSetting
+    , _cctrOptionSettings    :: List "member" ConfigurationOptionSetting
     , _cctrSolutionStackName :: Maybe Text
     , _cctrTemplateName      :: Maybe Text
     } deriving (Eq, Show)
diff --git a/gen/Network/AWS/ElasticBeanstalk/CreateEnvironment.hs b/gen/Network/AWS/ElasticBeanstalk/CreateEnvironment.hs
--- a/gen/Network/AWS/ElasticBeanstalk/CreateEnvironment.hs
+++ b/gen/Network/AWS/ElasticBeanstalk/CreateEnvironment.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.
 
 -- | Launches an environment for the specified application using the specified
 -- configuration.
@@ -75,10 +77,10 @@
     , _ceCNAMEPrefix       :: Maybe Text
     , _ceDescription       :: Maybe Text
     , _ceEnvironmentName   :: Text
-    , _ceOptionSettings    :: List "OptionSettings" ConfigurationOptionSetting
-    , _ceOptionsToRemove   :: List "OptionsToRemove" OptionSpecification
+    , _ceOptionSettings    :: List "member" ConfigurationOptionSetting
+    , _ceOptionsToRemove   :: List "member" OptionSpecification
     , _ceSolutionStackName :: Maybe Text
-    , _ceTags              :: List "Tags" Tag
+    , _ceTags              :: List "member" Tag
     , _ceTemplateName      :: Maybe Text
     , _ceTier              :: Maybe EnvironmentTier
     , _ceVersionLabel      :: Maybe Text
diff --git a/gen/Network/AWS/ElasticBeanstalk/CreateStorageLocation.hs b/gen/Network/AWS/ElasticBeanstalk/CreateStorageLocation.hs
--- a/gen/Network/AWS/ElasticBeanstalk/CreateStorageLocation.hs
+++ b/gen/Network/AWS/ElasticBeanstalk/CreateStorageLocation.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 the Amazon S3 storage location for the account.
 --
diff --git a/gen/Network/AWS/ElasticBeanstalk/DeleteApplication.hs b/gen/Network/AWS/ElasticBeanstalk/DeleteApplication.hs
--- a/gen/Network/AWS/ElasticBeanstalk/DeleteApplication.hs
+++ b/gen/Network/AWS/ElasticBeanstalk/DeleteApplication.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 application along with all associated versions and
 -- configurations. The application versions will not be deleted from your Amazon
diff --git a/gen/Network/AWS/ElasticBeanstalk/DeleteApplicationVersion.hs b/gen/Network/AWS/ElasticBeanstalk/DeleteApplicationVersion.hs
--- a/gen/Network/AWS/ElasticBeanstalk/DeleteApplicationVersion.hs
+++ b/gen/Network/AWS/ElasticBeanstalk/DeleteApplicationVersion.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 version from the specified application.
 --
diff --git a/gen/Network/AWS/ElasticBeanstalk/DeleteConfigurationTemplate.hs b/gen/Network/AWS/ElasticBeanstalk/DeleteConfigurationTemplate.hs
--- a/gen/Network/AWS/ElasticBeanstalk/DeleteConfigurationTemplate.hs
+++ b/gen/Network/AWS/ElasticBeanstalk/DeleteConfigurationTemplate.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 configuration template.
 --
diff --git a/gen/Network/AWS/ElasticBeanstalk/DeleteEnvironmentConfiguration.hs b/gen/Network/AWS/ElasticBeanstalk/DeleteEnvironmentConfiguration.hs
--- a/gen/Network/AWS/ElasticBeanstalk/DeleteEnvironmentConfiguration.hs
+++ b/gen/Network/AWS/ElasticBeanstalk/DeleteEnvironmentConfiguration.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 draft configuration associated with the running environment.
 --
diff --git a/gen/Network/AWS/ElasticBeanstalk/DescribeApplicationVersions.hs b/gen/Network/AWS/ElasticBeanstalk/DescribeApplicationVersions.hs
--- a/gen/Network/AWS/ElasticBeanstalk/DescribeApplicationVersions.hs
+++ b/gen/Network/AWS/ElasticBeanstalk/DescribeApplicationVersions.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 for existing application versions.
 --
@@ -48,7 +50,7 @@
 
 data DescribeApplicationVersions = DescribeApplicationVersions
     { _dav1ApplicationName :: Maybe Text
-    , _dav1VersionLabels   :: List "Versions" Text
+    , _dav1VersionLabels   :: List "member" Text
     } deriving (Eq, Ord, Show)
 
 -- | 'DescribeApplicationVersions' constructor.
@@ -79,7 +81,7 @@
         . _List
 
 newtype DescribeApplicationVersionsResponse = DescribeApplicationVersionsResponse
-    { _davrApplicationVersions :: List "ApplicationVersions" ApplicationVersionDescription
+    { _davrApplicationVersions :: List "member" ApplicationVersionDescription
     } deriving (Eq, Show, Monoid, Semigroup)
 
 instance GHC.Exts.IsList DescribeApplicationVersionsResponse where
diff --git a/gen/Network/AWS/ElasticBeanstalk/DescribeApplications.hs b/gen/Network/AWS/ElasticBeanstalk/DescribeApplications.hs
--- a/gen/Network/AWS/ElasticBeanstalk/DescribeApplications.hs
+++ b/gen/Network/AWS/ElasticBeanstalk/DescribeApplications.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 existing applications.
 --
@@ -46,7 +48,7 @@
 import qualified GHC.Exts
 
 newtype DescribeApplications = DescribeApplications
-    { _daApplicationNames :: List "ApplicationNames" Text
+    { _daApplicationNames :: List "member" Text
     } deriving (Eq, Ord, Show, Monoid, Semigroup)
 
 instance GHC.Exts.IsList DescribeApplications where
@@ -74,7 +76,7 @@
         . _List
 
 newtype DescribeApplicationsResponse = DescribeApplicationsResponse
-    { _darApplications :: List "Applications" ApplicationDescription
+    { _darApplications :: List "member" ApplicationDescription
     } deriving (Eq, Show, Monoid, Semigroup)
 
 instance GHC.Exts.IsList DescribeApplicationsResponse where
diff --git a/gen/Network/AWS/ElasticBeanstalk/DescribeConfigurationOptions.hs b/gen/Network/AWS/ElasticBeanstalk/DescribeConfigurationOptions.hs
--- a/gen/Network/AWS/ElasticBeanstalk/DescribeConfigurationOptions.hs
+++ b/gen/Network/AWS/ElasticBeanstalk/DescribeConfigurationOptions.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 configuration options that are used in a particular
 -- configuration template or environment, or that a specified solution stack
@@ -57,7 +59,7 @@
 data DescribeConfigurationOptions = DescribeConfigurationOptions
     { _dcoApplicationName   :: Maybe Text
     , _dcoEnvironmentName   :: Maybe Text
-    , _dcoOptions           :: List "OptionsToRemove" OptionSpecification
+    , _dcoOptions           :: List "member" OptionSpecification
     , _dcoSolutionStackName :: Maybe Text
     , _dcoTemplateName      :: Maybe Text
     } deriving (Eq, Show)
@@ -114,7 +116,7 @@
 dcoTemplateName = lens _dcoTemplateName (\s a -> s { _dcoTemplateName = a })
 
 data DescribeConfigurationOptionsResponse = DescribeConfigurationOptionsResponse
-    { _dcorOptions           :: List "Options" ConfigurationOptionDescription
+    { _dcorOptions           :: List "member" ConfigurationOptionDescription
     , _dcorSolutionStackName :: Maybe Text
     } deriving (Eq, Show)
 
diff --git a/gen/Network/AWS/ElasticBeanstalk/DescribeConfigurationSettings.hs b/gen/Network/AWS/ElasticBeanstalk/DescribeConfigurationSettings.hs
--- a/gen/Network/AWS/ElasticBeanstalk/DescribeConfigurationSettings.hs
+++ b/gen/Network/AWS/ElasticBeanstalk/DescribeConfigurationSettings.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 description of the settings for the specified configuration set,
 -- that is, either a configuration template or the configuration set associated
@@ -105,7 +107,7 @@
 dcsTemplateName = lens _dcsTemplateName (\s a -> s { _dcsTemplateName = a })
 
 newtype DescribeConfigurationSettingsResponse = DescribeConfigurationSettingsResponse
-    { _dcsrConfigurationSettings :: List "ConfigurationSettings" ConfigurationSettingsDescription
+    { _dcsrConfigurationSettings :: List "member" ConfigurationSettingsDescription
     } deriving (Eq, Show, Monoid, Semigroup)
 
 instance GHC.Exts.IsList DescribeConfigurationSettingsResponse where
diff --git a/gen/Network/AWS/ElasticBeanstalk/DescribeEnvironmentResources.hs b/gen/Network/AWS/ElasticBeanstalk/DescribeEnvironmentResources.hs
--- a/gen/Network/AWS/ElasticBeanstalk/DescribeEnvironmentResources.hs
+++ b/gen/Network/AWS/ElasticBeanstalk/DescribeEnvironmentResources.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 AWS resources for this environment.
 --
diff --git a/gen/Network/AWS/ElasticBeanstalk/DescribeEnvironments.hs b/gen/Network/AWS/ElasticBeanstalk/DescribeEnvironments.hs
--- a/gen/Network/AWS/ElasticBeanstalk/DescribeEnvironments.hs
+++ b/gen/Network/AWS/ElasticBeanstalk/DescribeEnvironments.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 for existing environments.
 --
@@ -52,8 +54,8 @@
 
 data DescribeEnvironments = DescribeEnvironments
     { _de1ApplicationName       :: Maybe Text
-    , _de1EnvironmentIds        :: List "EnvironmentIds" Text
-    , _de1EnvironmentNames      :: List "EnvironmentNames" Text
+    , _de1EnvironmentIds        :: List "member" Text
+    , _de1EnvironmentNames      :: List "member" Text
     , _de1IncludeDeleted        :: Maybe Bool
     , _de1IncludedDeletedBackTo :: Maybe ISO8601
     , _de1VersionLabel          :: Maybe Text
@@ -129,7 +131,7 @@
 de1VersionLabel = lens _de1VersionLabel (\s a -> s { _de1VersionLabel = a })
 
 newtype DescribeEnvironmentsResponse = DescribeEnvironmentsResponse
-    { _derEnvironments :: List "Environments" EnvironmentDescription
+    { _derEnvironments :: List "member" EnvironmentDescription
     } deriving (Eq, Show, Monoid, Semigroup)
 
 instance GHC.Exts.IsList DescribeEnvironmentsResponse where
diff --git a/gen/Network/AWS/ElasticBeanstalk/DescribeEvents.hs b/gen/Network/AWS/ElasticBeanstalk/DescribeEvents.hs
--- a/gen/Network/AWS/ElasticBeanstalk/DescribeEvents.hs
+++ b/gen/Network/AWS/ElasticBeanstalk/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 list of event descriptions matching criteria up to the last 6 weeks.
 --
@@ -168,7 +170,7 @@
 deVersionLabel = lens _deVersionLabel (\s a -> s { _deVersionLabel = a })
 
 data DescribeEventsResponse = DescribeEventsResponse
-    { _derEvents    :: List "Events" EventDescription
+    { _derEvents    :: List "member" EventDescription
     , _derNextToken :: Maybe Text
     } deriving (Eq, Show)
 
diff --git a/gen/Network/AWS/ElasticBeanstalk/ListAvailableSolutionStacks.hs b/gen/Network/AWS/ElasticBeanstalk/ListAvailableSolutionStacks.hs
--- a/gen/Network/AWS/ElasticBeanstalk/ListAvailableSolutionStacks.hs
+++ b/gen/Network/AWS/ElasticBeanstalk/ListAvailableSolutionStacks.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 solution stack names.
 --
@@ -52,8 +54,8 @@
 listAvailableSolutionStacks = ListAvailableSolutionStacks
 
 data ListAvailableSolutionStacksResponse = ListAvailableSolutionStacksResponse
-    { _lassrSolutionStackDetails :: List "SolutionStackDetails" SolutionStackDescription
-    , _lassrSolutionStacks       :: List "SolutionStacks" Text
+    { _lassrSolutionStackDetails :: List "member" SolutionStackDescription
+    , _lassrSolutionStacks       :: List "member" Text
     } deriving (Eq, Show)
 
 -- | 'ListAvailableSolutionStacksResponse' constructor.
diff --git a/gen/Network/AWS/ElasticBeanstalk/RebuildEnvironment.hs b/gen/Network/AWS/ElasticBeanstalk/RebuildEnvironment.hs
--- a/gen/Network/AWS/ElasticBeanstalk/RebuildEnvironment.hs
+++ b/gen/Network/AWS/ElasticBeanstalk/RebuildEnvironment.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 and recreates all of the AWS resources (for example: the Auto
 -- Scaling group, load balancer, etc.) for a specified environment and forces a
diff --git a/gen/Network/AWS/ElasticBeanstalk/RequestEnvironmentInfo.hs b/gen/Network/AWS/ElasticBeanstalk/RequestEnvironmentInfo.hs
--- a/gen/Network/AWS/ElasticBeanstalk/RequestEnvironmentInfo.hs
+++ b/gen/Network/AWS/ElasticBeanstalk/RequestEnvironmentInfo.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.
 
 -- | Initiates a request to compile the specified type of information of the
 -- deployed environment.
diff --git a/gen/Network/AWS/ElasticBeanstalk/RestartAppServer.hs b/gen/Network/AWS/ElasticBeanstalk/RestartAppServer.hs
--- a/gen/Network/AWS/ElasticBeanstalk/RestartAppServer.hs
+++ b/gen/Network/AWS/ElasticBeanstalk/RestartAppServer.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.
 
 -- | Causes the environment to restart the application container server running
 -- on each Amazon EC2 instance.
diff --git a/gen/Network/AWS/ElasticBeanstalk/RetrieveEnvironmentInfo.hs b/gen/Network/AWS/ElasticBeanstalk/RetrieveEnvironmentInfo.hs
--- a/gen/Network/AWS/ElasticBeanstalk/RetrieveEnvironmentInfo.hs
+++ b/gen/Network/AWS/ElasticBeanstalk/RetrieveEnvironmentInfo.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.
 
 -- | Retrieves the compiled information from a 'RequestEnvironmentInfo' request.
 --
@@ -100,7 +102,7 @@
 rei1InfoType = lens _rei1InfoType (\s a -> s { _rei1InfoType = a })
 
 newtype RetrieveEnvironmentInfoResponse = RetrieveEnvironmentInfoResponse
-    { _reirEnvironmentInfo :: List "EnvironmentInfo" EnvironmentInfoDescription
+    { _reirEnvironmentInfo :: List "member" EnvironmentInfoDescription
     } deriving (Eq, Show, Monoid, Semigroup)
 
 instance GHC.Exts.IsList RetrieveEnvironmentInfoResponse where
diff --git a/gen/Network/AWS/ElasticBeanstalk/SwapEnvironmentCNAMEs.hs b/gen/Network/AWS/ElasticBeanstalk/SwapEnvironmentCNAMEs.hs
--- a/gen/Network/AWS/ElasticBeanstalk/SwapEnvironmentCNAMEs.hs
+++ b/gen/Network/AWS/ElasticBeanstalk/SwapEnvironmentCNAMEs.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.
 
 -- | Swaps the CNAMEs of two environments.
 --
diff --git a/gen/Network/AWS/ElasticBeanstalk/TerminateEnvironment.hs b/gen/Network/AWS/ElasticBeanstalk/TerminateEnvironment.hs
--- a/gen/Network/AWS/ElasticBeanstalk/TerminateEnvironment.hs
+++ b/gen/Network/AWS/ElasticBeanstalk/TerminateEnvironment.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.
 
 -- | Terminates the specified environment.
 --
diff --git a/gen/Network/AWS/ElasticBeanstalk/Types.hs b/gen/Network/AWS/ElasticBeanstalk/Types.hs
--- a/gen/Network/AWS/ElasticBeanstalk/Types.hs
+++ b/gen/Network/AWS/ElasticBeanstalk/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.ElasticBeanstalk.Types
     (
@@ -293,11 +295,11 @@
 
 data ApplicationDescription = ApplicationDescription
     { _adApplicationName        :: Maybe Text
-    , _adConfigurationTemplates :: List "ConfigurationTemplates" Text
+    , _adConfigurationTemplates :: List "member" Text
     , _adDateCreated            :: Maybe ISO8601
     , _adDateUpdated            :: Maybe ISO8601
     , _adDescription            :: Maybe Text
-    , _adVersions               :: List "Versions" Text
+    , _adVersions               :: List "member" Text
     } deriving (Eq, Ord, Show)
 
 -- | 'ApplicationDescription' constructor.
@@ -744,7 +746,7 @@
     , _csdDeploymentStatus  :: Maybe ConfigurationDeploymentStatus
     , _csdDescription       :: Maybe Text
     , _csdEnvironmentName   :: Maybe Text
-    , _csdOptionSettings    :: List "OptionSettings" ConfigurationOptionSetting
+    , _csdOptionSettings    :: List "member" ConfigurationOptionSetting
     , _csdSolutionStackName :: Maybe Text
     , _csdTemplateName      :: Maybe Text
     } deriving (Eq, Show)
@@ -988,13 +990,13 @@
         ]
 
 data EnvironmentResourceDescription = EnvironmentResourceDescription
-    { _erdAutoScalingGroups    :: List "AutoScalingGroups" AutoScalingGroup
+    { _erdAutoScalingGroups    :: List "member" AutoScalingGroup
     , _erdEnvironmentName      :: Maybe Text
-    , _erdInstances            :: List "Instances" Instance
-    , _erdLaunchConfigurations :: List "LaunchConfigurations" LaunchConfiguration
-    , _erdLoadBalancers        :: List "LoadBalancers" LoadBalancer
-    , _erdQueues               :: List "Queues" Queue
-    , _erdTriggers             :: List "Triggers" Trigger
+    , _erdInstances            :: List "member" Instance
+    , _erdLaunchConfigurations :: List "member" LaunchConfiguration
+    , _erdLoadBalancers        :: List "member" LoadBalancer
+    , _erdQueues               :: List "member" Queue
+    , _erdTriggers             :: List "member" Trigger
     } deriving (Eq, Show)
 
 -- | 'EnvironmentResourceDescription' constructor.
@@ -1155,7 +1157,7 @@
 
 data LoadBalancerDescription = LoadBalancerDescription
     { _lbdDomain           :: Maybe Text
-    , _lbdListeners        :: List "Listeners" Listener
+    , _lbdListeners        :: List "member" Listener
     , _lbdLoadBalancerName :: Maybe Text
     } deriving (Eq, Show)
 
@@ -1383,7 +1385,7 @@
     , _codNamespace      :: Maybe Text
     , _codRegex          :: Maybe OptionRestrictionRegex
     , _codUserDefined    :: Maybe Bool
-    , _codValueOptions   :: List "ValueOptions" Text
+    , _codValueOptions   :: List "member" Text
     , _codValueType      :: Maybe ConfigurationOptionValueType
     } deriving (Eq, Show)
 
@@ -2130,7 +2132,7 @@
         ]
 
 data SolutionStackDescription = SolutionStackDescription
-    { _ssdPermittedFileTypes :: List "PermittedFileTypes" Text
+    { _ssdPermittedFileTypes :: List "member" Text
     , _ssdSolutionStackName  :: Maybe Text
     } deriving (Eq, Ord, Show)
 
diff --git a/gen/Network/AWS/ElasticBeanstalk/UpdateApplication.hs b/gen/Network/AWS/ElasticBeanstalk/UpdateApplication.hs
--- a/gen/Network/AWS/ElasticBeanstalk/UpdateApplication.hs
+++ b/gen/Network/AWS/ElasticBeanstalk/UpdateApplication.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.
 
 -- | Updates the specified application to have the specified properties.
 --
diff --git a/gen/Network/AWS/ElasticBeanstalk/UpdateApplicationVersion.hs b/gen/Network/AWS/ElasticBeanstalk/UpdateApplicationVersion.hs
--- a/gen/Network/AWS/ElasticBeanstalk/UpdateApplicationVersion.hs
+++ b/gen/Network/AWS/ElasticBeanstalk/UpdateApplicationVersion.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.
 
 -- | Updates the specified application version to have the specified properties.
 --
diff --git a/gen/Network/AWS/ElasticBeanstalk/UpdateConfigurationTemplate.hs b/gen/Network/AWS/ElasticBeanstalk/UpdateConfigurationTemplate.hs
--- a/gen/Network/AWS/ElasticBeanstalk/UpdateConfigurationTemplate.hs
+++ b/gen/Network/AWS/ElasticBeanstalk/UpdateConfigurationTemplate.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.
 
 -- | Updates the specified configuration template to have the specified
 -- properties or configuration option values.
@@ -65,8 +67,8 @@
 data UpdateConfigurationTemplate = UpdateConfigurationTemplate
     { _uctApplicationName :: Text
     , _uctDescription     :: Maybe Text
-    , _uctOptionSettings  :: List "OptionSettings" ConfigurationOptionSetting
-    , _uctOptionsToRemove :: List "OptionsToRemove" OptionSpecification
+    , _uctOptionSettings  :: List "member" ConfigurationOptionSetting
+    , _uctOptionsToRemove :: List "member" OptionSpecification
     , _uctTemplateName    :: Text
     } deriving (Eq, Show)
 
@@ -136,7 +138,7 @@
     , _uctrDeploymentStatus  :: Maybe ConfigurationDeploymentStatus
     , _uctrDescription       :: Maybe Text
     , _uctrEnvironmentName   :: Maybe Text
-    , _uctrOptionSettings    :: List "OptionSettings" ConfigurationOptionSetting
+    , _uctrOptionSettings    :: List "member" ConfigurationOptionSetting
     , _uctrSolutionStackName :: Maybe Text
     , _uctrTemplateName      :: Maybe Text
     } deriving (Eq, Show)
diff --git a/gen/Network/AWS/ElasticBeanstalk/UpdateEnvironment.hs b/gen/Network/AWS/ElasticBeanstalk/UpdateEnvironment.hs
--- a/gen/Network/AWS/ElasticBeanstalk/UpdateEnvironment.hs
+++ b/gen/Network/AWS/ElasticBeanstalk/UpdateEnvironment.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.
 
 -- | Updates the environment description, deploys a new application version,
 -- updates the configuration settings to an entirely new configuration template,
@@ -79,8 +81,8 @@
     { _ueDescription     :: Maybe Text
     , _ueEnvironmentId   :: Maybe Text
     , _ueEnvironmentName :: Maybe Text
-    , _ueOptionSettings  :: List "OptionSettings" ConfigurationOptionSetting
-    , _ueOptionsToRemove :: List "OptionsToRemove" OptionSpecification
+    , _ueOptionSettings  :: List "member" ConfigurationOptionSetting
+    , _ueOptionsToRemove :: List "member" OptionSpecification
     , _ueTemplateName    :: Maybe Text
     , _ueTier            :: Maybe EnvironmentTier
     , _ueVersionLabel    :: Maybe Text
diff --git a/gen/Network/AWS/ElasticBeanstalk/ValidateConfigurationSettings.hs b/gen/Network/AWS/ElasticBeanstalk/ValidateConfigurationSettings.hs
--- a/gen/Network/AWS/ElasticBeanstalk/ValidateConfigurationSettings.hs
+++ b/gen/Network/AWS/ElasticBeanstalk/ValidateConfigurationSettings.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.
 
 -- | Takes a set of configuration settings and either a configuration template or
 -- environment, and determines whether those values are valid.
@@ -55,7 +57,7 @@
 data ValidateConfigurationSettings = ValidateConfigurationSettings
     { _vcsApplicationName :: Text
     , _vcsEnvironmentName :: Maybe Text
-    , _vcsOptionSettings  :: List "OptionSettings" ConfigurationOptionSetting
+    , _vcsOptionSettings  :: List "member" ConfigurationOptionSetting
     , _vcsTemplateName    :: Maybe Text
     } deriving (Eq, Show)
 
@@ -106,7 +108,7 @@
 vcsTemplateName = lens _vcsTemplateName (\s a -> s { _vcsTemplateName = a })
 
 newtype ValidateConfigurationSettingsResponse = ValidateConfigurationSettingsResponse
-    { _vcsrMessages :: List "Messages" ValidationMessage
+    { _vcsrMessages :: List "member" ValidationMessage
     } deriving (Eq, Show, Monoid, Semigroup)
 
 instance GHC.Exts.IsList ValidateConfigurationSettingsResponse where