diff --git a/README.md b/README.md
--- a/README.md
+++ b/README.md
@@ -30,3 +30,5 @@
 ## Licence
 
 `amazonka-sqs` 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-sqs.cabal b/amazonka-sqs.cabal
--- a/amazonka-sqs.cabal
+++ b/amazonka-sqs.cabal
@@ -1,5 +1,5 @@
 name:                  amazonka-sqs
-version:               0.0.4
+version:               0.0.5
 synopsis:              Amazon Simple Queue Service SDK.
 homepage:              https://github.com/brendanhay/amazonka
 license:               OtherLicense
@@ -60,5 +60,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/SQS.hs b/gen/Network/AWS/SQS.hs
--- a/gen/Network/AWS/SQS.hs
+++ b/gen/Network/AWS/SQS.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 Simple Queue Service (SQS) is a fast, reliable, scalable, fully
 -- managed message queuing service. SQS makes it simple and cost-effective to
diff --git a/gen/Network/AWS/SQS/AddPermission.hs b/gen/Network/AWS/SQS/AddPermission.hs
--- a/gen/Network/AWS/SQS/AddPermission.hs
+++ b/gen/Network/AWS/SQS/AddPermission.hs
@@ -19,6 +19,8 @@
 -- Maintainer  : Brendan Hay <brendan.g.hay@gmail.com>
 -- Stability   : experimental
 -- Portability : non-portable (GHC extensions)
+--
+-- Derived from AWS service descriptions, licensed under Apache 2.0.
 
 -- | Adds a permission to a queue for a specific <http://docs.aws.amazon.com/general/latest/gr/glos-chap.html#P principal>. This allows for
 -- sharing access to the queue.
@@ -56,8 +58,8 @@
 import qualified GHC.Exts
 
 data AddPermission = AddPermission
-    { _apAWSAccountIds :: List "AWSAccountId" Text
-    , _apActions       :: List "ActionName" Text
+    { _apAWSAccountIds :: List "member" Text
+    , _apActions       :: List "member" Text
     , _apLabel         :: Text
     , _apQueueUrl      :: Text
     } deriving (Eq, Ord, Show)
diff --git a/gen/Network/AWS/SQS/ChangeMessageVisibility.hs b/gen/Network/AWS/SQS/ChangeMessageVisibility.hs
--- a/gen/Network/AWS/SQS/ChangeMessageVisibility.hs
+++ b/gen/Network/AWS/SQS/ChangeMessageVisibility.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.
 
 -- | Changes the visibility timeout of a specified message in a queue to a new
 -- value. The maximum allowed timeout value you can set the value to is 12
diff --git a/gen/Network/AWS/SQS/ChangeMessageVisibilityBatch.hs b/gen/Network/AWS/SQS/ChangeMessageVisibilityBatch.hs
--- a/gen/Network/AWS/SQS/ChangeMessageVisibilityBatch.hs
+++ b/gen/Network/AWS/SQS/ChangeMessageVisibilityBatch.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.
 
 -- | Changes the visibility timeout of multiple messages. This is a batch version
 -- of 'ChangeMessageVisibility'. The result of the action on each message is
@@ -56,7 +58,7 @@
 import qualified GHC.Exts
 
 data ChangeMessageVisibilityBatch = ChangeMessageVisibilityBatch
-    { _cmvbEntries  :: List "ChangeMessageVisibilityBatchRequestEntry" ChangeMessageVisibilityBatchRequestEntry
+    { _cmvbEntries  :: List "member" ChangeMessageVisibilityBatchRequestEntry
     , _cmvbQueueUrl :: Text
     } deriving (Eq, Show)
 
@@ -85,8 +87,8 @@
 cmvbQueueUrl = lens _cmvbQueueUrl (\s a -> s { _cmvbQueueUrl = a })
 
 data ChangeMessageVisibilityBatchResponse = ChangeMessageVisibilityBatchResponse
-    { _cmvbrFailed     :: List "BatchResultErrorEntry" BatchResultErrorEntry
-    , _cmvbrSuccessful :: List "ChangeMessageVisibilityBatchResultEntry" ChangeMessageVisibilityBatchResultEntry
+    { _cmvbrFailed     :: List "member" BatchResultErrorEntry
+    , _cmvbrSuccessful :: List "member" ChangeMessageVisibilityBatchResultEntry
     } deriving (Eq, Show)
 
 -- | 'ChangeMessageVisibilityBatchResponse' constructor.
diff --git a/gen/Network/AWS/SQS/CreateQueue.hs b/gen/Network/AWS/SQS/CreateQueue.hs
--- a/gen/Network/AWS/SQS/CreateQueue.hs
+++ b/gen/Network/AWS/SQS/CreateQueue.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 queue, or returns the URL of an existing one. When you request 'CreateQueue', you provide a name for the queue. To successfully create a new queue, you
 -- must provide a name that is unique within the scope of your own queues.
@@ -61,7 +63,7 @@
 import qualified GHC.Exts
 
 data CreateQueue = CreateQueue
-    { _cqAttributes :: EMap "Attribute" "Name" "Value" Text Text
+    { _cqAttributes :: EMap "entry" "Name" "Value" Text Text
     , _cqQueueName  :: Text
     } deriving (Eq, Show)
 
diff --git a/gen/Network/AWS/SQS/DeleteMessage.hs b/gen/Network/AWS/SQS/DeleteMessage.hs
--- a/gen/Network/AWS/SQS/DeleteMessage.hs
+++ b/gen/Network/AWS/SQS/DeleteMessage.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 message from the specified queue. You specify the
 -- message by using the message's 'receipt handle' and not the 'message ID' you
diff --git a/gen/Network/AWS/SQS/DeleteMessageBatch.hs b/gen/Network/AWS/SQS/DeleteMessageBatch.hs
--- a/gen/Network/AWS/SQS/DeleteMessageBatch.hs
+++ b/gen/Network/AWS/SQS/DeleteMessageBatch.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 multiple messages. This is a batch version of 'DeleteMessage'. The
 -- result of the delete action on each message is reported individually in the
@@ -58,7 +60,7 @@
 import qualified GHC.Exts
 
 data DeleteMessageBatch = DeleteMessageBatch
-    { _dmbEntries  :: List "DeleteMessageBatchRequestEntry" DeleteMessageBatchRequestEntry
+    { _dmbEntries  :: List "member" DeleteMessageBatchRequestEntry
     , _dmbQueueUrl :: Text
     } deriving (Eq, Show)
 
@@ -86,8 +88,8 @@
 dmbQueueUrl = lens _dmbQueueUrl (\s a -> s { _dmbQueueUrl = a })
 
 data DeleteMessageBatchResponse = DeleteMessageBatchResponse
-    { _dmbrFailed     :: List "BatchResultErrorEntry" BatchResultErrorEntry
-    , _dmbrSuccessful :: List "DeleteMessageBatchResultEntry" DeleteMessageBatchResultEntry
+    { _dmbrFailed     :: List "member" BatchResultErrorEntry
+    , _dmbrSuccessful :: List "member" DeleteMessageBatchResultEntry
     } deriving (Eq, Show)
 
 -- | 'DeleteMessageBatchResponse' constructor.
diff --git a/gen/Network/AWS/SQS/DeleteQueue.hs b/gen/Network/AWS/SQS/DeleteQueue.hs
--- a/gen/Network/AWS/SQS/DeleteQueue.hs
+++ b/gen/Network/AWS/SQS/DeleteQueue.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 queue specified by the queue URL, regardless of whether the
 -- queue is empty. If the specified queue does not exist, Amazon SQS returns a
diff --git a/gen/Network/AWS/SQS/GetQueueAttributes.hs b/gen/Network/AWS/SQS/GetQueueAttributes.hs
--- a/gen/Network/AWS/SQS/GetQueueAttributes.hs
+++ b/gen/Network/AWS/SQS/GetQueueAttributes.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.
 
 -- | Gets attributes for the specified queue. The following attributes are
 -- supported:   'All' - returns all values.  'ApproximateNumberOfMessages' - returns
@@ -65,7 +67,7 @@
 import qualified GHC.Exts
 
 data GetQueueAttributes = GetQueueAttributes
-    { _gqaAttributeNames :: List "AttributeName" Text
+    { _gqaAttributeNames :: List "member" Text
     , _gqaQueueUrl       :: Text
     } deriving (Eq, Show)
 
@@ -95,7 +97,7 @@
 gqaQueueUrl = lens _gqaQueueUrl (\s a -> s { _gqaQueueUrl = a })
 
 newtype GetQueueAttributesResponse = GetQueueAttributesResponse
-    { _gqarAttributes :: EMap "Attribute" "Name" "Value" Text Text
+    { _gqarAttributes :: EMap "entry" "Name" "Value" Text Text
     } deriving (Eq, Show, Monoid, Semigroup)
 
 -- | 'GetQueueAttributesResponse' constructor.
diff --git a/gen/Network/AWS/SQS/GetQueueUrl.hs b/gen/Network/AWS/SQS/GetQueueUrl.hs
--- a/gen/Network/AWS/SQS/GetQueueUrl.hs
+++ b/gen/Network/AWS/SQS/GetQueueUrl.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 URL of an existing queue. This action provides a simple way to
 -- retrieve the URL of an Amazon SQS queue.
diff --git a/gen/Network/AWS/SQS/ListDeadLetterSourceQueues.hs b/gen/Network/AWS/SQS/ListDeadLetterSourceQueues.hs
--- a/gen/Network/AWS/SQS/ListDeadLetterSourceQueues.hs
+++ b/gen/Network/AWS/SQS/ListDeadLetterSourceQueues.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 your queues that have the RedrivePolicy queue attribute
 -- configured with a dead letter queue.
@@ -69,7 +71,7 @@
 ldlsqQueueUrl = lens _ldlsqQueueUrl (\s a -> s { _ldlsqQueueUrl = a })
 
 newtype ListDeadLetterSourceQueuesResponse = ListDeadLetterSourceQueuesResponse
-    { _ldlsqrQueueUrls :: List "QueueUrl" Text
+    { _ldlsqrQueueUrls :: List "member" Text
     } deriving (Eq, Ord, Show, Monoid, Semigroup)
 
 -- | 'ListDeadLetterSourceQueuesResponse' constructor.
diff --git a/gen/Network/AWS/SQS/ListQueues.hs b/gen/Network/AWS/SQS/ListQueues.hs
--- a/gen/Network/AWS/SQS/ListQueues.hs
+++ b/gen/Network/AWS/SQS/ListQueues.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 your queues. The maximum number of queues that can be
 -- returned is 1000. If you specify a value for the optional 'QueueNamePrefix'
@@ -70,7 +72,7 @@
     lens _lqQueueNamePrefix (\s a -> s { _lqQueueNamePrefix = a })
 
 newtype ListQueuesResponse = ListQueuesResponse
-    { _lqrQueueUrls :: List "QueueUrl" Text
+    { _lqrQueueUrls :: List "member" Text
     } deriving (Eq, Ord, Show, Monoid, Semigroup)
 
 -- | 'ListQueuesResponse' constructor.
diff --git a/gen/Network/AWS/SQS/ReceiveMessage.hs b/gen/Network/AWS/SQS/ReceiveMessage.hs
--- a/gen/Network/AWS/SQS/ReceiveMessage.hs
+++ b/gen/Network/AWS/SQS/ReceiveMessage.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 one or more messages, with a maximum limit of 10 messages, from
 -- the specified queue. Long poll support is enabled by using the 'WaitTimeSeconds'
@@ -83,9 +85,9 @@
 import qualified GHC.Exts
 
 data ReceiveMessage = ReceiveMessage
-    { _rmAttributeNames        :: List "AttributeName" Text
+    { _rmAttributeNames        :: List "member" Text
     , _rmMaxNumberOfMessages   :: Maybe Int
-    , _rmMessageAttributeNames :: List "MessageAttributeName" Text
+    , _rmMessageAttributeNames :: List "member" Text
     , _rmQueueUrl              :: Text
     , _rmVisibilityTimeout     :: Maybe Int
     , _rmWaitTimeSeconds       :: Maybe Int
@@ -170,7 +172,7 @@
     lens _rmWaitTimeSeconds (\s a -> s { _rmWaitTimeSeconds = a })
 
 newtype ReceiveMessageResponse = ReceiveMessageResponse
-    { _rmrMessages :: List "Message" Message
+    { _rmrMessages :: List "member" Message
     } deriving (Eq, Show, Monoid, Semigroup)
 
 -- | 'ReceiveMessageResponse' constructor.
diff --git a/gen/Network/AWS/SQS/RemovePermission.hs b/gen/Network/AWS/SQS/RemovePermission.hs
--- a/gen/Network/AWS/SQS/RemovePermission.hs
+++ b/gen/Network/AWS/SQS/RemovePermission.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 any permissions in the queue policy that matches the specified 'Label'
 -- parameter. Only the owner of the queue can remove permissions.
diff --git a/gen/Network/AWS/SQS/SendMessage.hs b/gen/Network/AWS/SQS/SendMessage.hs
--- a/gen/Network/AWS/SQS/SendMessage.hs
+++ b/gen/Network/AWS/SQS/SendMessage.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.
 
 -- | Delivers a message to the specified queue. With Amazon SQS, you now have the
 -- ability to send large payload messages that are up to 256KB (262,144 bytes)
@@ -65,7 +67,7 @@
 
 data SendMessage = SendMessage
     { _smDelaySeconds      :: Maybe Int
-    , _smMessageAttributes :: EMap "MessageAttribute" "Name" "Value" Text MessageAttributeValue
+    , _smMessageAttributes :: EMap "entry" "Name" "Value" Text MessageAttributeValue
     , _smMessageBody       :: Text
     , _smQueueUrl          :: Text
     } deriving (Eq, Show)
diff --git a/gen/Network/AWS/SQS/SendMessageBatch.hs b/gen/Network/AWS/SQS/SendMessageBatch.hs
--- a/gen/Network/AWS/SQS/SendMessageBatch.hs
+++ b/gen/Network/AWS/SQS/SendMessageBatch.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.
 
 -- | Delivers up to ten messages to the specified queue. This is a batch version
 -- of 'SendMessage'. The result of the send action on each message is reported
@@ -69,7 +71,7 @@
 import qualified GHC.Exts
 
 data SendMessageBatch = SendMessageBatch
-    { _smbEntries  :: List "SendMessageBatchRequestEntry" SendMessageBatchRequestEntry
+    { _smbEntries  :: List "member" SendMessageBatchRequestEntry
     , _smbQueueUrl :: Text
     } deriving (Eq, Show)
 
@@ -97,8 +99,8 @@
 smbQueueUrl = lens _smbQueueUrl (\s a -> s { _smbQueueUrl = a })
 
 data SendMessageBatchResponse = SendMessageBatchResponse
-    { _smbrFailed     :: List "BatchResultErrorEntry" BatchResultErrorEntry
-    , _smbrSuccessful :: List "SendMessageBatchResultEntry" SendMessageBatchResultEntry
+    { _smbrFailed     :: List "member" BatchResultErrorEntry
+    , _smbrSuccessful :: List "member" SendMessageBatchResultEntry
     } deriving (Eq, Show)
 
 -- | 'SendMessageBatchResponse' constructor.
diff --git a/gen/Network/AWS/SQS/SetQueueAttributes.hs b/gen/Network/AWS/SQS/SetQueueAttributes.hs
--- a/gen/Network/AWS/SQS/SetQueueAttributes.hs
+++ b/gen/Network/AWS/SQS/SetQueueAttributes.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 the value of one or more queue attributes. When you change a queue's
 -- attributes, the change can take up to 60 seconds for most of the attributes
@@ -47,7 +49,7 @@
 import qualified GHC.Exts
 
 data SetQueueAttributes = SetQueueAttributes
-    { _sqaAttributes :: EMap "Attribute" "Name" "Value" Text Text
+    { _sqaAttributes :: EMap "entry" "Name" "Value" Text Text
     , _sqaQueueUrl   :: Text
     } deriving (Eq, Show)
 
diff --git a/gen/Network/AWS/SQS/Types.hs b/gen/Network/AWS/SQS/Types.hs
--- a/gen/Network/AWS/SQS/Types.hs
+++ b/gen/Network/AWS/SQS/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.SQS.Types
     (
@@ -166,10 +168,10 @@
         ]
 
 data MessageAttributeValue = MessageAttributeValue
-    { _mavBinaryListValues :: List "BinaryListValue" Base64
+    { _mavBinaryListValues :: List "member" Base64
     , _mavBinaryValue      :: Maybe Base64
     , _mavDataType         :: Text
-    , _mavStringListValues :: List "StringListValue" Text
+    , _mavStringListValues :: List "member" Text
     , _mavStringValue      :: Maybe Text
     } deriving (Eq, Show)
 
@@ -355,11 +357,11 @@
         ]
 
 data Message = Message
-    { _mAttributes             :: EMap "Attribute" "Name" "Value" Text Text
+    { _mAttributes             :: EMap "entry" "Name" "Value" Text Text
     , _mBody                   :: Maybe Text
     , _mMD5OfBody              :: Maybe Text
     , _mMD5OfMessageAttributes :: Maybe Text
-    , _mMessageAttributes      :: EMap "MessageAttribute" "Name" "Value" Text MessageAttributeValue
+    , _mMessageAttributes      :: EMap "entry" "Name" "Value" Text MessageAttributeValue
     , _mMessageId              :: Maybe Text
     , _mReceiptHandle          :: Maybe Text
     } deriving (Eq, Show)
@@ -456,7 +458,7 @@
 data SendMessageBatchRequestEntry = SendMessageBatchRequestEntry
     { _smbreDelaySeconds      :: Maybe Int
     , _smbreId                :: Text
-    , _smbreMessageAttributes :: EMap "MessageAttribute" "Name" "Value" Text MessageAttributeValue
+    , _smbreMessageAttributes :: EMap "entry" "Name" "Value" Text MessageAttributeValue
     , _smbreMessageBody       :: Text
     } deriving (Eq, Show)