diff --git a/README.md b/README.md
--- a/README.md
+++ b/README.md
@@ -8,7 +8,7 @@
 
 ## Version
 
-`1.2.0.2`
+`1.3.0`
 
 
 ## Description
diff --git a/amazonka-dynamodb.cabal b/amazonka-dynamodb.cabal
--- a/amazonka-dynamodb.cabal
+++ b/amazonka-dynamodb.cabal
@@ -1,5 +1,5 @@
 name:                  amazonka-dynamodb
-version:               1.2.0.2
+version:               1.3.0
 synopsis:              Amazon DynamoDB SDK.
 homepage:              https://github.com/brendanhay/amazonka
 bug-reports:           https://github.com/brendanhay/amazonka/issues
@@ -176,7 +176,7 @@
         , Network.AWS.DynamoDB.Types.Sum
 
     build-depends:
-          amazonka-core == 1.2.0.*
+          amazonka-core == 1.3.0.*
         , base          >= 4.7     && < 5
 
 test-suite amazonka-dynamodb-test
@@ -196,9 +196,9 @@
         , Test.AWS.DynamoDB.Internal
 
     build-depends:
-          amazonka-core == 1.2.0.*
-        , amazonka-test == 1.2.0.*
-        , amazonka-dynamodb == 1.2.0.*
+          amazonka-core == 1.3.0.*
+        , amazonka-test == 1.3.0.*
+        , amazonka-dynamodb == 1.3.0.*
         , base
         , bytestring
         , lens
diff --git a/gen/Network/AWS/DynamoDB.hs b/gen/Network/AWS/DynamoDB.hs
--- a/gen/Network/AWS/DynamoDB.hs
+++ b/gen/Network/AWS/DynamoDB.hs
@@ -151,12 +151,12 @@
     -- ** ResourceNotFoundException
     , _ResourceNotFoundException
 
-    -- ** ResourceInUseException
-    , _ResourceInUseException
-
     -- ** LimitExceededException
     , _LimitExceededException
 
+    -- ** ResourceInUseException
+    , _ResourceInUseException
+
     -- * Waiters
     -- $waiters
 
@@ -169,14 +169,14 @@
     -- * Operations
     -- $operations
 
-    -- ** UpdateItem
-    , module Network.AWS.DynamoDB.UpdateItem
+    -- ** PutItem
+    , module Network.AWS.DynamoDB.PutItem
 
     -- ** DeleteItem
     , module Network.AWS.DynamoDB.DeleteItem
 
-    -- ** PutItem
-    , module Network.AWS.DynamoDB.PutItem
+    -- ** UpdateItem
+    , module Network.AWS.DynamoDB.UpdateItem
 
     -- ** DeleteTable
     , module Network.AWS.DynamoDB.DeleteTable
@@ -196,12 +196,12 @@
     -- ** BatchWriteItem
     , module Network.AWS.DynamoDB.BatchWriteItem
 
-    -- ** Scan (Paginated)
-    , module Network.AWS.DynamoDB.Scan
-
     -- ** ListTables (Paginated)
     , module Network.AWS.DynamoDB.ListTables
 
+    -- ** Scan (Paginated)
+    , module Network.AWS.DynamoDB.Scan
+
     -- ** Query (Paginated)
     , module Network.AWS.DynamoDB.Query
 
@@ -259,8 +259,8 @@
     , AttributeValue
     , attributeValue
     , avL
-    , avM
     , avNS
+    , avM
     , avNULL
     , avN
     , avBS
@@ -289,8 +289,8 @@
     -- ** ConsumedCapacity
     , ConsumedCapacity
     , consumedCapacity
-    , ccCapacityUnits
     , ccGlobalSecondaryIndexes
+    , ccCapacityUnits
     , ccLocalSecondaryIndexes
     , ccTable
     , ccTableName
@@ -333,9 +333,9 @@
     , GlobalSecondaryIndexDescription
     , globalSecondaryIndexDescription
     , gsidBackfilling
-    , gsidProvisionedThroughput
-    , gsidIndexStatus
     , gsidIndexSizeBytes
+    , gsidIndexStatus
+    , gsidProvisionedThroughput
     , gsidIndexARN
     , gsidKeySchema
     , gsidProjection
@@ -365,9 +365,9 @@
     , KeysAndAttributes
     , keysAndAttributes
     , kaaProjectionExpression
-    , kaaConsistentRead
-    , kaaExpressionAttributeNames
     , kaaAttributesToGet
+    , kaaExpressionAttributeNames
+    , kaaConsistentRead
     , kaaKeys
 
     -- ** LocalSecondaryIndex
@@ -416,21 +416,21 @@
     -- ** StreamSpecification
     , StreamSpecification
     , streamSpecification
-    , ssStreamEnabled
     , ssStreamViewType
+    , ssStreamEnabled
 
     -- ** TableDescription
     , TableDescription
     , tableDescription
-    , tdProvisionedThroughput
+    , tdTableSizeBytes
     , tdAttributeDefinitions
     , tdLatestStreamARN
-    , tdTableSizeBytes
+    , tdProvisionedThroughput
     , tdTableStatus
     , tdTableARN
     , tdKeySchema
-    , tdLatestStreamLabel
     , tdGlobalSecondaryIndexes
+    , tdLatestStreamLabel
     , tdLocalSecondaryIndexes
     , tdCreationDateTime
     , tdItemCount
@@ -446,8 +446,8 @@
     -- ** WriteRequest
     , WriteRequest
     , writeRequest
-    , wrPutRequest
     , wrDeleteRequest
+    , wrPutRequest
     ) where
 
 import           Network.AWS.DynamoDB.BatchGetItem
diff --git a/gen/Network/AWS/DynamoDB/BatchGetItem.hs b/gen/Network/AWS/DynamoDB/BatchGetItem.hs
--- a/gen/Network/AWS/DynamoDB/BatchGetItem.hs
+++ b/gen/Network/AWS/DynamoDB/BatchGetItem.hs
@@ -94,7 +94,7 @@
     , bgirsUnprocessedKeys
     , bgirsResponses
     , bgirsConsumedCapacity
-    , bgirsStatus
+    , bgirsResponseStatus
     ) where
 
 import           Network.AWS.DynamoDB.Types
@@ -265,7 +265,7 @@
     { _bgirsUnprocessedKeys  :: !(Maybe (Map Text KeysAndAttributes))
     , _bgirsResponses        :: !(Maybe (Map Text [Map Text AttributeValue]))
     , _bgirsConsumedCapacity :: !(Maybe [ConsumedCapacity])
-    , _bgirsStatus           :: !Int
+    , _bgirsResponseStatus   :: !Int
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'BatchGetItemResponse' with the minimum fields required to make a request.
@@ -278,16 +278,16 @@
 --
 -- * 'bgirsConsumedCapacity'
 --
--- * 'bgirsStatus'
+-- * 'bgirsResponseStatus'
 batchGetItemResponse
-    :: Int -- ^ 'bgirsStatus'
+    :: Int -- ^ 'bgirsResponseStatus'
     -> BatchGetItemResponse
-batchGetItemResponse pStatus_ =
+batchGetItemResponse pResponseStatus_ =
     BatchGetItemResponse'
     { _bgirsUnprocessedKeys = Nothing
     , _bgirsResponses = Nothing
     , _bgirsConsumedCapacity = Nothing
-    , _bgirsStatus = pStatus_
+    , _bgirsResponseStatus = pResponseStatus_
     }
 
 -- | A map of tables and their respective keys that were not processed with
@@ -332,5 +332,5 @@
 bgirsConsumedCapacity = lens _bgirsConsumedCapacity (\ s a -> s{_bgirsConsumedCapacity = a}) . _Default . _Coerce;
 
 -- | The response status code.
-bgirsStatus :: Lens' BatchGetItemResponse Int
-bgirsStatus = lens _bgirsStatus (\ s a -> s{_bgirsStatus = a});
+bgirsResponseStatus :: Lens' BatchGetItemResponse Int
+bgirsResponseStatus = lens _bgirsResponseStatus (\ s a -> s{_bgirsResponseStatus = a});
diff --git a/gen/Network/AWS/DynamoDB/BatchWriteItem.hs b/gen/Network/AWS/DynamoDB/BatchWriteItem.hs
--- a/gen/Network/AWS/DynamoDB/BatchWriteItem.hs
+++ b/gen/Network/AWS/DynamoDB/BatchWriteItem.hs
@@ -111,10 +111,10 @@
     , batchWriteItemResponse
     , BatchWriteItemResponse
     -- * Response Lenses
-    , bwirsConsumedCapacity
     , bwirsItemCollectionMetrics
+    , bwirsConsumedCapacity
     , bwirsUnprocessedItems
-    , bwirsStatus
+    , bwirsResponseStatus
     ) where
 
 import           Network.AWS.DynamoDB.Types
@@ -200,8 +200,8 @@
           = receiveJSON
               (\ s h x ->
                  BatchWriteItemResponse' <$>
-                   (x .?> "ConsumedCapacity" .!@ mempty) <*>
-                     (x .?> "ItemCollectionMetrics" .!@ mempty)
+                   (x .?> "ItemCollectionMetrics" .!@ mempty) <*>
+                     (x .?> "ConsumedCapacity" .!@ mempty)
                      <*> (x .?> "UnprocessedItems" .!@ mempty)
                      <*> (pure (fromEnum s)))
 
@@ -234,45 +234,34 @@
 --
 -- /See:/ 'batchWriteItemResponse' smart constructor.
 data BatchWriteItemResponse = BatchWriteItemResponse'
-    { _bwirsConsumedCapacity      :: !(Maybe [ConsumedCapacity])
-    , _bwirsItemCollectionMetrics :: !(Maybe (Map Text [ItemCollectionMetrics]))
+    { _bwirsItemCollectionMetrics :: !(Maybe (Map Text [ItemCollectionMetrics]))
+    , _bwirsConsumedCapacity      :: !(Maybe [ConsumedCapacity])
     , _bwirsUnprocessedItems      :: !(Maybe (Map Text (List1 WriteRequest)))
-    , _bwirsStatus                :: !Int
+    , _bwirsResponseStatus        :: !Int
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'BatchWriteItemResponse' with the minimum fields required to make a request.
 --
 -- Use one of the following lenses to modify other fields as desired:
 --
--- * 'bwirsConsumedCapacity'
---
 -- * 'bwirsItemCollectionMetrics'
 --
+-- * 'bwirsConsumedCapacity'
+--
 -- * 'bwirsUnprocessedItems'
 --
--- * 'bwirsStatus'
+-- * 'bwirsResponseStatus'
 batchWriteItemResponse
-    :: Int -- ^ 'bwirsStatus'
+    :: Int -- ^ 'bwirsResponseStatus'
     -> BatchWriteItemResponse
-batchWriteItemResponse pStatus_ =
+batchWriteItemResponse pResponseStatus_ =
     BatchWriteItemResponse'
-    { _bwirsConsumedCapacity = Nothing
-    , _bwirsItemCollectionMetrics = Nothing
+    { _bwirsItemCollectionMetrics = Nothing
+    , _bwirsConsumedCapacity = Nothing
     , _bwirsUnprocessedItems = Nothing
-    , _bwirsStatus = pStatus_
+    , _bwirsResponseStatus = pResponseStatus_
     }
 
--- | The capacity units consumed by the operation.
---
--- Each element consists of:
---
--- -   /TableName/ - The table that consumed the provisioned throughput.
---
--- -   /CapacityUnits/ - The total number of capacity units consumed.
---
-bwirsConsumedCapacity :: Lens' BatchWriteItemResponse [ConsumedCapacity]
-bwirsConsumedCapacity = lens _bwirsConsumedCapacity (\ s a -> s{_bwirsConsumedCapacity = a}) . _Default . _Coerce;
-
 -- | A list of tables that were processed by /BatchWriteItem/ and, for each
 -- table, information about any item collections that were affected by
 -- individual /DeleteItem/ or /PutItem/ operations.
@@ -296,6 +285,17 @@
 bwirsItemCollectionMetrics :: Lens' BatchWriteItemResponse (HashMap Text [ItemCollectionMetrics])
 bwirsItemCollectionMetrics = lens _bwirsItemCollectionMetrics (\ s a -> s{_bwirsItemCollectionMetrics = a}) . _Default . _Map;
 
+-- | The capacity units consumed by the operation.
+--
+-- Each element consists of:
+--
+-- -   /TableName/ - The table that consumed the provisioned throughput.
+--
+-- -   /CapacityUnits/ - The total number of capacity units consumed.
+--
+bwirsConsumedCapacity :: Lens' BatchWriteItemResponse [ConsumedCapacity]
+bwirsConsumedCapacity = lens _bwirsConsumedCapacity (\ s a -> s{_bwirsConsumedCapacity = a}) . _Default . _Coerce;
+
 -- | A map of tables and requests against those tables that were not
 -- processed. The /UnprocessedItems/ value is in the same form as
 -- /RequestItems/, so you can provide this value directly to a subsequent
@@ -333,5 +333,5 @@
 bwirsUnprocessedItems = lens _bwirsUnprocessedItems (\ s a -> s{_bwirsUnprocessedItems = a}) . _Default . _Map;
 
 -- | The response status code.
-bwirsStatus :: Lens' BatchWriteItemResponse Int
-bwirsStatus = lens _bwirsStatus (\ s a -> s{_bwirsStatus = a});
+bwirsResponseStatus :: Lens' BatchWriteItemResponse Int
+bwirsResponseStatus = lens _bwirsResponseStatus (\ s a -> s{_bwirsResponseStatus = a});
diff --git a/gen/Network/AWS/DynamoDB/CreateTable.hs b/gen/Network/AWS/DynamoDB/CreateTable.hs
--- a/gen/Network/AWS/DynamoDB/CreateTable.hs
+++ b/gen/Network/AWS/DynamoDB/CreateTable.hs
@@ -57,7 +57,7 @@
     , CreateTableResponse
     -- * Response Lenses
     , ctrsTableDescription
-    , ctrsStatus
+    , ctrsResponseStatus
     ) where
 
 import           Network.AWS.DynamoDB.Types
@@ -306,7 +306,7 @@
 -- /See:/ 'createTableResponse' smart constructor.
 data CreateTableResponse = CreateTableResponse'
     { _ctrsTableDescription :: !(Maybe TableDescription)
-    , _ctrsStatus           :: !Int
+    , _ctrsResponseStatus   :: !Int
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'CreateTableResponse' with the minimum fields required to make a request.
@@ -315,14 +315,14 @@
 --
 -- * 'ctrsTableDescription'
 --
--- * 'ctrsStatus'
+-- * 'ctrsResponseStatus'
 createTableResponse
-    :: Int -- ^ 'ctrsStatus'
+    :: Int -- ^ 'ctrsResponseStatus'
     -> CreateTableResponse
-createTableResponse pStatus_ =
+createTableResponse pResponseStatus_ =
     CreateTableResponse'
     { _ctrsTableDescription = Nothing
-    , _ctrsStatus = pStatus_
+    , _ctrsResponseStatus = pResponseStatus_
     }
 
 -- | Undocumented member.
@@ -330,5 +330,5 @@
 ctrsTableDescription = lens _ctrsTableDescription (\ s a -> s{_ctrsTableDescription = a});
 
 -- | The response status code.
-ctrsStatus :: Lens' CreateTableResponse Int
-ctrsStatus = lens _ctrsStatus (\ s a -> s{_ctrsStatus = a});
+ctrsResponseStatus :: Lens' CreateTableResponse Int
+ctrsResponseStatus = lens _ctrsResponseStatus (\ s a -> s{_ctrsResponseStatus = a});
diff --git a/gen/Network/AWS/DynamoDB/DeleteItem.hs b/gen/Network/AWS/DynamoDB/DeleteItem.hs
--- a/gen/Network/AWS/DynamoDB/DeleteItem.hs
+++ b/gen/Network/AWS/DynamoDB/DeleteItem.hs
@@ -41,10 +41,10 @@
       deleteItem
     , DeleteItem
     -- * Request Lenses
-    , diReturnValues
     , diExpressionAttributeNames
-    , diReturnConsumedCapacity
+    , diReturnValues
     , diExpressionAttributeValues
+    , diReturnConsumedCapacity
     , diReturnItemCollectionMetrics
     , diConditionExpression
     , diConditionalOperator
@@ -56,10 +56,10 @@
     , deleteItemResponse
     , DeleteItemResponse
     -- * Response Lenses
-    , dirsConsumedCapacity
     , dirsItemCollectionMetrics
+    , dirsConsumedCapacity
     , dirsAttributes
-    , dirsStatus
+    , dirsResponseStatus
     ) where
 
 import           Network.AWS.DynamoDB.Types
@@ -72,10 +72,10 @@
 --
 -- /See:/ 'deleteItem' smart constructor.
 data DeleteItem = DeleteItem'
-    { _diReturnValues                :: !(Maybe ReturnValue)
-    , _diExpressionAttributeNames    :: !(Maybe (Map Text Text))
-    , _diReturnConsumedCapacity      :: !(Maybe ReturnConsumedCapacity)
+    { _diExpressionAttributeNames    :: !(Maybe (Map Text Text))
+    , _diReturnValues                :: !(Maybe ReturnValue)
     , _diExpressionAttributeValues   :: !(Maybe (Map Text AttributeValue))
+    , _diReturnConsumedCapacity      :: !(Maybe ReturnConsumedCapacity)
     , _diReturnItemCollectionMetrics :: !(Maybe ReturnItemCollectionMetrics)
     , _diConditionExpression         :: !(Maybe Text)
     , _diConditionalOperator         :: !(Maybe ConditionalOperator)
@@ -88,14 +88,14 @@
 --
 -- Use one of the following lenses to modify other fields as desired:
 --
--- * 'diReturnValues'
---
 -- * 'diExpressionAttributeNames'
 --
--- * 'diReturnConsumedCapacity'
+-- * 'diReturnValues'
 --
 -- * 'diExpressionAttributeValues'
 --
+-- * 'diReturnConsumedCapacity'
+--
 -- * 'diReturnItemCollectionMetrics'
 --
 -- * 'diConditionExpression'
@@ -112,10 +112,10 @@
     -> DeleteItem
 deleteItem pTableName_ =
     DeleteItem'
-    { _diReturnValues = Nothing
-    , _diExpressionAttributeNames = Nothing
-    , _diReturnConsumedCapacity = Nothing
+    { _diExpressionAttributeNames = Nothing
+    , _diReturnValues = Nothing
     , _diExpressionAttributeValues = Nothing
+    , _diReturnConsumedCapacity = Nothing
     , _diReturnItemCollectionMetrics = Nothing
     , _diConditionExpression = Nothing
     , _diConditionalOperator = Nothing
@@ -124,19 +124,6 @@
     , _diKey = mempty
     }
 
--- | Use /ReturnValues/ if you want to get the item attributes as they
--- appeared before they were deleted. For /DeleteItem/, the valid values
--- are:
---
--- -   'NONE' - If /ReturnValues/ is not specified, or if its value is
---     'NONE', then nothing is returned. (This setting is the default for
---     /ReturnValues/.)
---
--- -   'ALL_OLD' - The content of the old item is returned.
---
-diReturnValues :: Lens' DeleteItem (Maybe ReturnValue)
-diReturnValues = lens _diReturnValues (\ s a -> s{_diReturnValues = a});
-
 -- | One or more substitution tokens for attribute names in an expression.
 -- The following are some use cases for using /ExpressionAttributeNames/:
 --
@@ -177,9 +164,18 @@
 diExpressionAttributeNames :: Lens' DeleteItem (HashMap Text Text)
 diExpressionAttributeNames = lens _diExpressionAttributeNames (\ s a -> s{_diExpressionAttributeNames = a}) . _Default . _Map;
 
--- | Undocumented member.
-diReturnConsumedCapacity :: Lens' DeleteItem (Maybe ReturnConsumedCapacity)
-diReturnConsumedCapacity = lens _diReturnConsumedCapacity (\ s a -> s{_diReturnConsumedCapacity = a});
+-- | Use /ReturnValues/ if you want to get the item attributes as they
+-- appeared before they were deleted. For /DeleteItem/, the valid values
+-- are:
+--
+-- -   'NONE' - If /ReturnValues/ is not specified, or if its value is
+--     'NONE', then nothing is returned. (This setting is the default for
+--     /ReturnValues/.)
+--
+-- -   'ALL_OLD' - The content of the old item is returned.
+--
+diReturnValues :: Lens' DeleteItem (Maybe ReturnValue)
+diReturnValues = lens _diReturnValues (\ s a -> s{_diReturnValues = a});
 
 -- | One or more values that can be substituted in an expression.
 --
@@ -203,6 +199,10 @@
 diExpressionAttributeValues :: Lens' DeleteItem (HashMap Text AttributeValue)
 diExpressionAttributeValues = lens _diExpressionAttributeValues (\ s a -> s{_diExpressionAttributeValues = a}) . _Default . _Map;
 
+-- | Undocumented member.
+diReturnConsumedCapacity :: Lens' DeleteItem (Maybe ReturnConsumedCapacity)
+diReturnConsumedCapacity = lens _diReturnConsumedCapacity (\ s a -> s{_diReturnConsumedCapacity = a});
+
 -- | Determines whether item collection metrics are returned. If set to
 -- 'SIZE', the response includes statistics about item collections, if any,
 -- that were modified during the operation are returned in the response. If
@@ -501,8 +501,8 @@
           = receiveJSON
               (\ s h x ->
                  DeleteItemResponse' <$>
-                   (x .?> "ConsumedCapacity") <*>
-                     (x .?> "ItemCollectionMetrics")
+                   (x .?> "ItemCollectionMetrics") <*>
+                     (x .?> "ConsumedCapacity")
                      <*> (x .?> "Attributes" .!@ mempty)
                      <*> (pure (fromEnum s)))
 
@@ -519,13 +519,13 @@
         toJSON DeleteItem'{..}
           = object
               (catMaybes
-                 [("ReturnValues" .=) <$> _diReturnValues,
-                  ("ExpressionAttributeNames" .=) <$>
+                 [("ExpressionAttributeNames" .=) <$>
                     _diExpressionAttributeNames,
-                  ("ReturnConsumedCapacity" .=) <$>
-                    _diReturnConsumedCapacity,
+                  ("ReturnValues" .=) <$> _diReturnValues,
                   ("ExpressionAttributeValues" .=) <$>
                     _diExpressionAttributeValues,
+                  ("ReturnConsumedCapacity" .=) <$>
+                    _diReturnConsumedCapacity,
                   ("ReturnItemCollectionMetrics" .=) <$>
                     _diReturnItemCollectionMetrics,
                   ("ConditionExpression" .=) <$>
@@ -546,38 +546,34 @@
 --
 -- /See:/ 'deleteItemResponse' smart constructor.
 data DeleteItemResponse = DeleteItemResponse'
-    { _dirsConsumedCapacity      :: !(Maybe ConsumedCapacity)
-    , _dirsItemCollectionMetrics :: !(Maybe ItemCollectionMetrics)
+    { _dirsItemCollectionMetrics :: !(Maybe ItemCollectionMetrics)
+    , _dirsConsumedCapacity      :: !(Maybe ConsumedCapacity)
     , _dirsAttributes            :: !(Maybe (Map Text AttributeValue))
-    , _dirsStatus                :: !Int
+    , _dirsResponseStatus        :: !Int
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'DeleteItemResponse' with the minimum fields required to make a request.
 --
 -- Use one of the following lenses to modify other fields as desired:
 --
--- * 'dirsConsumedCapacity'
---
 -- * 'dirsItemCollectionMetrics'
 --
+-- * 'dirsConsumedCapacity'
+--
 -- * 'dirsAttributes'
 --
--- * 'dirsStatus'
+-- * 'dirsResponseStatus'
 deleteItemResponse
-    :: Int -- ^ 'dirsStatus'
+    :: Int -- ^ 'dirsResponseStatus'
     -> DeleteItemResponse
-deleteItemResponse pStatus_ =
+deleteItemResponse pResponseStatus_ =
     DeleteItemResponse'
-    { _dirsConsumedCapacity = Nothing
-    , _dirsItemCollectionMetrics = Nothing
+    { _dirsItemCollectionMetrics = Nothing
+    , _dirsConsumedCapacity = Nothing
     , _dirsAttributes = Nothing
-    , _dirsStatus = pStatus_
+    , _dirsResponseStatus = pResponseStatus_
     }
 
--- | Undocumented member.
-dirsConsumedCapacity :: Lens' DeleteItemResponse (Maybe ConsumedCapacity)
-dirsConsumedCapacity = lens _dirsConsumedCapacity (\ s a -> s{_dirsConsumedCapacity = a});
-
 -- | Information about item collections, if any, that were affected by the
 -- operation. /ItemCollectionMetrics/ is only returned if the request asked
 -- for it. If the table does not have any local secondary indexes, this
@@ -602,6 +598,10 @@
 dirsItemCollectionMetrics :: Lens' DeleteItemResponse (Maybe ItemCollectionMetrics)
 dirsItemCollectionMetrics = lens _dirsItemCollectionMetrics (\ s a -> s{_dirsItemCollectionMetrics = a});
 
+-- | Undocumented member.
+dirsConsumedCapacity :: Lens' DeleteItemResponse (Maybe ConsumedCapacity)
+dirsConsumedCapacity = lens _dirsConsumedCapacity (\ s a -> s{_dirsConsumedCapacity = a});
+
 -- | A map of attribute names to /AttributeValue/ objects, representing the
 -- item as it appeared before the /DeleteItem/ operation. This map appears
 -- in the response only if /ReturnValues/ was specified as 'ALL_OLD' in the
@@ -610,5 +610,5 @@
 dirsAttributes = lens _dirsAttributes (\ s a -> s{_dirsAttributes = a}) . _Default . _Map;
 
 -- | The response status code.
-dirsStatus :: Lens' DeleteItemResponse Int
-dirsStatus = lens _dirsStatus (\ s a -> s{_dirsStatus = a});
+dirsResponseStatus :: Lens' DeleteItemResponse Int
+dirsResponseStatus = lens _dirsResponseStatus (\ s a -> s{_dirsResponseStatus = a});
diff --git a/gen/Network/AWS/DynamoDB/DeleteTable.hs b/gen/Network/AWS/DynamoDB/DeleteTable.hs
--- a/gen/Network/AWS/DynamoDB/DeleteTable.hs
+++ b/gen/Network/AWS/DynamoDB/DeleteTable.hs
@@ -53,7 +53,7 @@
     , DeleteTableResponse
     -- * Response Lenses
     , dtrsTableDescription
-    , dtrsStatus
+    , dtrsResponseStatus
     ) where
 
 import           Network.AWS.DynamoDB.Types
@@ -120,7 +120,7 @@
 -- /See:/ 'deleteTableResponse' smart constructor.
 data DeleteTableResponse = DeleteTableResponse'
     { _dtrsTableDescription :: !(Maybe TableDescription)
-    , _dtrsStatus           :: !Int
+    , _dtrsResponseStatus   :: !Int
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'DeleteTableResponse' with the minimum fields required to make a request.
@@ -129,14 +129,14 @@
 --
 -- * 'dtrsTableDescription'
 --
--- * 'dtrsStatus'
+-- * 'dtrsResponseStatus'
 deleteTableResponse
-    :: Int -- ^ 'dtrsStatus'
+    :: Int -- ^ 'dtrsResponseStatus'
     -> DeleteTableResponse
-deleteTableResponse pStatus_ =
+deleteTableResponse pResponseStatus_ =
     DeleteTableResponse'
     { _dtrsTableDescription = Nothing
-    , _dtrsStatus = pStatus_
+    , _dtrsResponseStatus = pResponseStatus_
     }
 
 -- | Undocumented member.
@@ -144,5 +144,5 @@
 dtrsTableDescription = lens _dtrsTableDescription (\ s a -> s{_dtrsTableDescription = a});
 
 -- | The response status code.
-dtrsStatus :: Lens' DeleteTableResponse Int
-dtrsStatus = lens _dtrsStatus (\ s a -> s{_dtrsStatus = a});
+dtrsResponseStatus :: Lens' DeleteTableResponse Int
+dtrsResponseStatus = lens _dtrsResponseStatus (\ s a -> s{_dtrsResponseStatus = a});
diff --git a/gen/Network/AWS/DynamoDB/DescribeTable.hs b/gen/Network/AWS/DynamoDB/DescribeTable.hs
--- a/gen/Network/AWS/DynamoDB/DescribeTable.hs
+++ b/gen/Network/AWS/DynamoDB/DescribeTable.hs
@@ -42,7 +42,7 @@
     , DescribeTableResponse
     -- * Response Lenses
     , drsTable
-    , drsStatus
+    , drsResponseStatus
     ) where
 
 import           Network.AWS.DynamoDB.Types
@@ -108,8 +108,8 @@
 --
 -- /See:/ 'describeTableResponse' smart constructor.
 data DescribeTableResponse = DescribeTableResponse'
-    { _drsTable  :: !(Maybe TableDescription)
-    , _drsStatus :: !Int
+    { _drsTable          :: !(Maybe TableDescription)
+    , _drsResponseStatus :: !Int
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'DescribeTableResponse' with the minimum fields required to make a request.
@@ -118,14 +118,14 @@
 --
 -- * 'drsTable'
 --
--- * 'drsStatus'
+-- * 'drsResponseStatus'
 describeTableResponse
-    :: Int -- ^ 'drsStatus'
+    :: Int -- ^ 'drsResponseStatus'
     -> DescribeTableResponse
-describeTableResponse pStatus_ =
+describeTableResponse pResponseStatus_ =
     DescribeTableResponse'
     { _drsTable = Nothing
-    , _drsStatus = pStatus_
+    , _drsResponseStatus = pResponseStatus_
     }
 
 -- | Undocumented member.
@@ -133,5 +133,5 @@
 drsTable = lens _drsTable (\ s a -> s{_drsTable = a});
 
 -- | The response status code.
-drsStatus :: Lens' DescribeTableResponse Int
-drsStatus = lens _drsStatus (\ s a -> s{_drsStatus = a});
+drsResponseStatus :: Lens' DescribeTableResponse Int
+drsResponseStatus = lens _drsResponseStatus (\ s a -> s{_drsResponseStatus = a});
diff --git a/gen/Network/AWS/DynamoDB/GetItem.hs b/gen/Network/AWS/DynamoDB/GetItem.hs
--- a/gen/Network/AWS/DynamoDB/GetItem.hs
+++ b/gen/Network/AWS/DynamoDB/GetItem.hs
@@ -35,9 +35,9 @@
     , GetItem
     -- * Request Lenses
     , giProjectionExpression
-    , giConsistentRead
-    , giExpressionAttributeNames
     , giAttributesToGet
+    , giExpressionAttributeNames
+    , giConsistentRead
     , giReturnConsumedCapacity
     , giTableName
     , giKey
@@ -48,7 +48,7 @@
     -- * Response Lenses
     , girsConsumedCapacity
     , girsItem
-    , girsStatus
+    , girsResponseStatus
     ) where
 
 import           Network.AWS.DynamoDB.Types
@@ -62,9 +62,9 @@
 -- /See:/ 'getItem' smart constructor.
 data GetItem = GetItem'
     { _giProjectionExpression     :: !(Maybe Text)
-    , _giConsistentRead           :: !(Maybe Bool)
-    , _giExpressionAttributeNames :: !(Maybe (Map Text Text))
     , _giAttributesToGet          :: !(Maybe (List1 Text))
+    , _giExpressionAttributeNames :: !(Maybe (Map Text Text))
+    , _giConsistentRead           :: !(Maybe Bool)
     , _giReturnConsumedCapacity   :: !(Maybe ReturnConsumedCapacity)
     , _giTableName                :: !Text
     , _giKey                      :: !(Map Text AttributeValue)
@@ -76,11 +76,11 @@
 --
 -- * 'giProjectionExpression'
 --
--- * 'giConsistentRead'
+-- * 'giAttributesToGet'
 --
 -- * 'giExpressionAttributeNames'
 --
--- * 'giAttributesToGet'
+-- * 'giConsistentRead'
 --
 -- * 'giReturnConsumedCapacity'
 --
@@ -93,9 +93,9 @@
 getItem pTableName_ =
     GetItem'
     { _giProjectionExpression = Nothing
-    , _giConsistentRead = Nothing
-    , _giExpressionAttributeNames = Nothing
     , _giAttributesToGet = Nothing
+    , _giExpressionAttributeNames = Nothing
+    , _giConsistentRead = Nothing
     , _giReturnConsumedCapacity = Nothing
     , _giTableName = pTableName_
     , _giKey = mempty
@@ -117,11 +117,23 @@
 giProjectionExpression :: Lens' GetItem (Maybe Text)
 giProjectionExpression = lens _giProjectionExpression (\ s a -> s{_giProjectionExpression = a});
 
--- | Determines the read consistency model: If set to 'true', then the
--- operation uses strongly consistent reads; otherwise, the operation uses
--- eventually consistent reads.
-giConsistentRead :: Lens' GetItem (Maybe Bool)
-giConsistentRead = lens _giConsistentRead (\ s a -> s{_giConsistentRead = a});
+-- | This is a legacy parameter, for backward compatibility. New applications
+-- should use /ProjectionExpression/ instead. Do not combine legacy
+-- parameters and expression parameters in a single API call; otherwise,
+-- DynamoDB will return a /ValidationException/ exception.
+--
+-- This parameter allows you to retrieve attributes of type List or Map;
+-- however, it cannot retrieve individual elements within a List or a Map.
+--
+-- The names of one or more attributes to retrieve. If no attribute names
+-- are provided, then all attributes will be returned. If any of the
+-- requested attributes are not found, they will not appear in the result.
+--
+-- Note that /AttributesToGet/ has no effect on provisioned throughput
+-- consumption. DynamoDB determines capacity units consumed based on item
+-- size, not on the amount of data that is returned to an application.
+giAttributesToGet :: Lens' GetItem (Maybe (NonEmpty Text))
+giAttributesToGet = lens _giAttributesToGet (\ s a -> s{_giAttributesToGet = a}) . mapping _List1;
 
 -- | One or more substitution tokens for attribute names in an expression.
 -- The following are some use cases for using /ExpressionAttributeNames/:
@@ -163,23 +175,11 @@
 giExpressionAttributeNames :: Lens' GetItem (HashMap Text Text)
 giExpressionAttributeNames = lens _giExpressionAttributeNames (\ s a -> s{_giExpressionAttributeNames = a}) . _Default . _Map;
 
--- | This is a legacy parameter, for backward compatibility. New applications
--- should use /ProjectionExpression/ instead. Do not combine legacy
--- parameters and expression parameters in a single API call; otherwise,
--- DynamoDB will return a /ValidationException/ exception.
---
--- This parameter allows you to retrieve attributes of type List or Map;
--- however, it cannot retrieve individual elements within a List or a Map.
---
--- The names of one or more attributes to retrieve. If no attribute names
--- are provided, then all attributes will be returned. If any of the
--- requested attributes are not found, they will not appear in the result.
---
--- Note that /AttributesToGet/ has no effect on provisioned throughput
--- consumption. DynamoDB determines capacity units consumed based on item
--- size, not on the amount of data that is returned to an application.
-giAttributesToGet :: Lens' GetItem (Maybe (NonEmpty Text))
-giAttributesToGet = lens _giAttributesToGet (\ s a -> s{_giAttributesToGet = a}) . mapping _List1;
+-- | Determines the read consistency model: If set to 'true', then the
+-- operation uses strongly consistent reads; otherwise, the operation uses
+-- eventually consistent reads.
+giConsistentRead :: Lens' GetItem (Maybe Bool)
+giConsistentRead = lens _giConsistentRead (\ s a -> s{_giConsistentRead = a});
 
 -- | Undocumented member.
 giReturnConsumedCapacity :: Lens' GetItem (Maybe ReturnConsumedCapacity)
@@ -225,10 +225,10 @@
               (catMaybes
                  [("ProjectionExpression" .=) <$>
                     _giProjectionExpression,
-                  ("ConsistentRead" .=) <$> _giConsistentRead,
+                  ("AttributesToGet" .=) <$> _giAttributesToGet,
                   ("ExpressionAttributeNames" .=) <$>
                     _giExpressionAttributeNames,
-                  ("AttributesToGet" .=) <$> _giAttributesToGet,
+                  ("ConsistentRead" .=) <$> _giConsistentRead,
                   ("ReturnConsumedCapacity" .=) <$>
                     _giReturnConsumedCapacity,
                   Just ("TableName" .= _giTableName),
@@ -246,7 +246,7 @@
 data GetItemResponse = GetItemResponse'
     { _girsConsumedCapacity :: !(Maybe ConsumedCapacity)
     , _girsItem             :: !(Maybe (Map Text AttributeValue))
-    , _girsStatus           :: !Int
+    , _girsResponseStatus   :: !Int
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'GetItemResponse' with the minimum fields required to make a request.
@@ -257,15 +257,15 @@
 --
 -- * 'girsItem'
 --
--- * 'girsStatus'
+-- * 'girsResponseStatus'
 getItemResponse
-    :: Int -- ^ 'girsStatus'
+    :: Int -- ^ 'girsResponseStatus'
     -> GetItemResponse
-getItemResponse pStatus_ =
+getItemResponse pResponseStatus_ =
     GetItemResponse'
     { _girsConsumedCapacity = Nothing
     , _girsItem = Nothing
-    , _girsStatus = pStatus_
+    , _girsResponseStatus = pResponseStatus_
     }
 
 -- | Undocumented member.
@@ -278,5 +278,5 @@
 girsItem = lens _girsItem (\ s a -> s{_girsItem = a}) . _Default . _Map;
 
 -- | The response status code.
-girsStatus :: Lens' GetItemResponse Int
-girsStatus = lens _girsStatus (\ s a -> s{_girsStatus = a});
+girsResponseStatus :: Lens' GetItemResponse Int
+girsResponseStatus = lens _girsResponseStatus (\ s a -> s{_girsResponseStatus = a});
diff --git a/gen/Network/AWS/DynamoDB/ListTables.hs b/gen/Network/AWS/DynamoDB/ListTables.hs
--- a/gen/Network/AWS/DynamoDB/ListTables.hs
+++ b/gen/Network/AWS/DynamoDB/ListTables.hs
@@ -40,7 +40,7 @@
     -- * Response Lenses
     , ltrsLastEvaluatedTableName
     , ltrsTableNames
-    , ltrsStatus
+    , ltrsResponseStatus
     ) where
 
 import           Network.AWS.DynamoDB.Types
@@ -133,7 +133,7 @@
 data ListTablesResponse = ListTablesResponse'
     { _ltrsLastEvaluatedTableName :: !(Maybe Text)
     , _ltrsTableNames             :: !(Maybe [Text])
-    , _ltrsStatus                 :: !Int
+    , _ltrsResponseStatus         :: !Int
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'ListTablesResponse' with the minimum fields required to make a request.
@@ -144,15 +144,15 @@
 --
 -- * 'ltrsTableNames'
 --
--- * 'ltrsStatus'
+-- * 'ltrsResponseStatus'
 listTablesResponse
-    :: Int -- ^ 'ltrsStatus'
+    :: Int -- ^ 'ltrsResponseStatus'
     -> ListTablesResponse
-listTablesResponse pStatus_ =
+listTablesResponse pResponseStatus_ =
     ListTablesResponse'
     { _ltrsLastEvaluatedTableName = Nothing
     , _ltrsTableNames = Nothing
-    , _ltrsStatus = pStatus_
+    , _ltrsResponseStatus = pResponseStatus_
     }
 
 -- | The name of the last table in the current page of results. Use this
@@ -174,5 +174,5 @@
 ltrsTableNames = lens _ltrsTableNames (\ s a -> s{_ltrsTableNames = a}) . _Default . _Coerce;
 
 -- | The response status code.
-ltrsStatus :: Lens' ListTablesResponse Int
-ltrsStatus = lens _ltrsStatus (\ s a -> s{_ltrsStatus = a});
+ltrsResponseStatus :: Lens' ListTablesResponse Int
+ltrsResponseStatus = lens _ltrsResponseStatus (\ s a -> s{_ltrsResponseStatus = a});
diff --git a/gen/Network/AWS/DynamoDB/PutItem.hs b/gen/Network/AWS/DynamoDB/PutItem.hs
--- a/gen/Network/AWS/DynamoDB/PutItem.hs
+++ b/gen/Network/AWS/DynamoDB/PutItem.hs
@@ -54,10 +54,10 @@
       putItem
     , PutItem
     -- * Request Lenses
-    , piReturnValues
     , piExpressionAttributeNames
-    , piReturnConsumedCapacity
+    , piReturnValues
     , piExpressionAttributeValues
+    , piReturnConsumedCapacity
     , piReturnItemCollectionMetrics
     , piConditionExpression
     , piConditionalOperator
@@ -69,10 +69,10 @@
     , putItemResponse
     , PutItemResponse
     -- * Response Lenses
-    , pirsConsumedCapacity
     , pirsItemCollectionMetrics
+    , pirsConsumedCapacity
     , pirsAttributes
-    , pirsStatus
+    , pirsResponseStatus
     ) where
 
 import           Network.AWS.DynamoDB.Types
@@ -85,10 +85,10 @@
 --
 -- /See:/ 'putItem' smart constructor.
 data PutItem = PutItem'
-    { _piReturnValues                :: !(Maybe ReturnValue)
-    , _piExpressionAttributeNames    :: !(Maybe (Map Text Text))
-    , _piReturnConsumedCapacity      :: !(Maybe ReturnConsumedCapacity)
+    { _piExpressionAttributeNames    :: !(Maybe (Map Text Text))
+    , _piReturnValues                :: !(Maybe ReturnValue)
     , _piExpressionAttributeValues   :: !(Maybe (Map Text AttributeValue))
+    , _piReturnConsumedCapacity      :: !(Maybe ReturnConsumedCapacity)
     , _piReturnItemCollectionMetrics :: !(Maybe ReturnItemCollectionMetrics)
     , _piConditionExpression         :: !(Maybe Text)
     , _piConditionalOperator         :: !(Maybe ConditionalOperator)
@@ -101,14 +101,14 @@
 --
 -- Use one of the following lenses to modify other fields as desired:
 --
--- * 'piReturnValues'
---
 -- * 'piExpressionAttributeNames'
 --
--- * 'piReturnConsumedCapacity'
+-- * 'piReturnValues'
 --
 -- * 'piExpressionAttributeValues'
 --
+-- * 'piReturnConsumedCapacity'
+--
 -- * 'piReturnItemCollectionMetrics'
 --
 -- * 'piConditionExpression'
@@ -125,10 +125,10 @@
     -> PutItem
 putItem pTableName_ =
     PutItem'
-    { _piReturnValues = Nothing
-    , _piExpressionAttributeNames = Nothing
-    , _piReturnConsumedCapacity = Nothing
+    { _piExpressionAttributeNames = Nothing
+    , _piReturnValues = Nothing
     , _piExpressionAttributeValues = Nothing
+    , _piReturnConsumedCapacity = Nothing
     , _piReturnItemCollectionMetrics = Nothing
     , _piConditionExpression = Nothing
     , _piConditionalOperator = Nothing
@@ -137,21 +137,6 @@
     , _piItem = mempty
     }
 
--- | Use /ReturnValues/ if you want to get the item attributes as they
--- appeared before they were updated with the /PutItem/ request. For
--- /PutItem/, the valid values are:
---
--- -   'NONE' - If /ReturnValues/ is not specified, or if its value is
---     'NONE', then nothing is returned. (This setting is the default for
---     /ReturnValues/.)
---
--- -   'ALL_OLD' - If /PutItem/ overwrote an attribute name-value pair,
---     then the content of the old item is returned.
---
--- Other \"Valid Values\" are not relevant to PutItem.
-piReturnValues :: Lens' PutItem (Maybe ReturnValue)
-piReturnValues = lens _piReturnValues (\ s a -> s{_piReturnValues = a});
-
 -- | One or more substitution tokens for attribute names in an expression.
 -- The following are some use cases for using /ExpressionAttributeNames/:
 --
@@ -192,9 +177,20 @@
 piExpressionAttributeNames :: Lens' PutItem (HashMap Text Text)
 piExpressionAttributeNames = lens _piExpressionAttributeNames (\ s a -> s{_piExpressionAttributeNames = a}) . _Default . _Map;
 
--- | Undocumented member.
-piReturnConsumedCapacity :: Lens' PutItem (Maybe ReturnConsumedCapacity)
-piReturnConsumedCapacity = lens _piReturnConsumedCapacity (\ s a -> s{_piReturnConsumedCapacity = a});
+-- | Use /ReturnValues/ if you want to get the item attributes as they
+-- appeared before they were updated with the /PutItem/ request. For
+-- /PutItem/, the valid values are:
+--
+-- -   'NONE' - If /ReturnValues/ is not specified, or if its value is
+--     'NONE', then nothing is returned. (This setting is the default for
+--     /ReturnValues/.)
+--
+-- -   'ALL_OLD' - If /PutItem/ overwrote an attribute name-value pair,
+--     then the content of the old item is returned.
+--
+-- Other \"Valid Values\" are not relevant to PutItem.
+piReturnValues :: Lens' PutItem (Maybe ReturnValue)
+piReturnValues = lens _piReturnValues (\ s a -> s{_piReturnValues = a});
 
 -- | One or more values that can be substituted in an expression.
 --
@@ -218,6 +214,10 @@
 piExpressionAttributeValues :: Lens' PutItem (HashMap Text AttributeValue)
 piExpressionAttributeValues = lens _piExpressionAttributeValues (\ s a -> s{_piExpressionAttributeValues = a}) . _Default . _Map;
 
+-- | Undocumented member.
+piReturnConsumedCapacity :: Lens' PutItem (Maybe ReturnConsumedCapacity)
+piReturnConsumedCapacity = lens _piReturnConsumedCapacity (\ s a -> s{_piReturnConsumedCapacity = a});
+
 -- | Determines whether item collection metrics are returned. If set to
 -- 'SIZE', the response includes statistics about item collections, if any,
 -- that were modified during the operation are returned in the response. If
@@ -527,8 +527,8 @@
           = receiveJSON
               (\ s h x ->
                  PutItemResponse' <$>
-                   (x .?> "ConsumedCapacity") <*>
-                     (x .?> "ItemCollectionMetrics")
+                   (x .?> "ItemCollectionMetrics") <*>
+                     (x .?> "ConsumedCapacity")
                      <*> (x .?> "Attributes" .!@ mempty)
                      <*> (pure (fromEnum s)))
 
@@ -545,13 +545,13 @@
         toJSON PutItem'{..}
           = object
               (catMaybes
-                 [("ReturnValues" .=) <$> _piReturnValues,
-                  ("ExpressionAttributeNames" .=) <$>
+                 [("ExpressionAttributeNames" .=) <$>
                     _piExpressionAttributeNames,
-                  ("ReturnConsumedCapacity" .=) <$>
-                    _piReturnConsumedCapacity,
+                  ("ReturnValues" .=) <$> _piReturnValues,
                   ("ExpressionAttributeValues" .=) <$>
                     _piExpressionAttributeValues,
+                  ("ReturnConsumedCapacity" .=) <$>
+                    _piReturnConsumedCapacity,
                   ("ReturnItemCollectionMetrics" .=) <$>
                     _piReturnItemCollectionMetrics,
                   ("ConditionExpression" .=) <$>
@@ -572,38 +572,34 @@
 --
 -- /See:/ 'putItemResponse' smart constructor.
 data PutItemResponse = PutItemResponse'
-    { _pirsConsumedCapacity      :: !(Maybe ConsumedCapacity)
-    , _pirsItemCollectionMetrics :: !(Maybe ItemCollectionMetrics)
+    { _pirsItemCollectionMetrics :: !(Maybe ItemCollectionMetrics)
+    , _pirsConsumedCapacity      :: !(Maybe ConsumedCapacity)
     , _pirsAttributes            :: !(Maybe (Map Text AttributeValue))
-    , _pirsStatus                :: !Int
+    , _pirsResponseStatus        :: !Int
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'PutItemResponse' with the minimum fields required to make a request.
 --
 -- Use one of the following lenses to modify other fields as desired:
 --
--- * 'pirsConsumedCapacity'
---
 -- * 'pirsItemCollectionMetrics'
 --
+-- * 'pirsConsumedCapacity'
+--
 -- * 'pirsAttributes'
 --
--- * 'pirsStatus'
+-- * 'pirsResponseStatus'
 putItemResponse
-    :: Int -- ^ 'pirsStatus'
+    :: Int -- ^ 'pirsResponseStatus'
     -> PutItemResponse
-putItemResponse pStatus_ =
+putItemResponse pResponseStatus_ =
     PutItemResponse'
-    { _pirsConsumedCapacity = Nothing
-    , _pirsItemCollectionMetrics = Nothing
+    { _pirsItemCollectionMetrics = Nothing
+    , _pirsConsumedCapacity = Nothing
     , _pirsAttributes = Nothing
-    , _pirsStatus = pStatus_
+    , _pirsResponseStatus = pResponseStatus_
     }
 
--- | Undocumented member.
-pirsConsumedCapacity :: Lens' PutItemResponse (Maybe ConsumedCapacity)
-pirsConsumedCapacity = lens _pirsConsumedCapacity (\ s a -> s{_pirsConsumedCapacity = a});
-
 -- | Information about item collections, if any, that were affected by the
 -- operation. /ItemCollectionMetrics/ is only returned if the request asked
 -- for it. If the table does not have any local secondary indexes, this
@@ -628,6 +624,10 @@
 pirsItemCollectionMetrics :: Lens' PutItemResponse (Maybe ItemCollectionMetrics)
 pirsItemCollectionMetrics = lens _pirsItemCollectionMetrics (\ s a -> s{_pirsItemCollectionMetrics = a});
 
+-- | Undocumented member.
+pirsConsumedCapacity :: Lens' PutItemResponse (Maybe ConsumedCapacity)
+pirsConsumedCapacity = lens _pirsConsumedCapacity (\ s a -> s{_pirsConsumedCapacity = a});
+
 -- | The attribute values as they appeared before the /PutItem/ operation,
 -- but only if /ReturnValues/ is specified as 'ALL_OLD' in the request.
 -- Each element consists of an attribute name and an attribute value.
@@ -635,5 +635,5 @@
 pirsAttributes = lens _pirsAttributes (\ s a -> s{_pirsAttributes = a}) . _Default . _Map;
 
 -- | The response status code.
-pirsStatus :: Lens' PutItemResponse Int
-pirsStatus = lens _pirsStatus (\ s a -> s{_pirsStatus = a});
+pirsResponseStatus :: Lens' PutItemResponse Int
+pirsResponseStatus = lens _pirsResponseStatus (\ s a -> s{_pirsResponseStatus = a});
diff --git a/gen/Network/AWS/DynamoDB/Query.hs b/gen/Network/AWS/DynamoDB/Query.hs
--- a/gen/Network/AWS/DynamoDB/Query.hs
+++ b/gen/Network/AWS/DynamoDB/Query.hs
@@ -56,20 +56,20 @@
       query
     , Query
     -- * Request Lenses
-    , qProjectionExpression
     , qKeyConditions
+    , qProjectionExpression
+    , qAttributesToGet
+    , qExpressionAttributeNames
     , qFilterExpression
     , qQueryFilter
     , qConsistentRead
-    , qExpressionAttributeNames
-    , qAttributesToGet
-    , qReturnConsumedCapacity
     , qExpressionAttributeValues
+    , qReturnConsumedCapacity
     , qScanIndexForward
     , qLimit
     , qSelect
-    , qConditionalOperator
     , qKeyConditionExpression
+    , qConditionalOperator
     , qExclusiveStartKey
     , qIndexName
     , qTableName
@@ -83,7 +83,7 @@
     , qrsScannedCount
     , qrsItems
     , qrsConsumedCapacity
-    , qrsStatus
+    , qrsResponseStatus
     ) where
 
 import           Network.AWS.DynamoDB.Types
@@ -97,20 +97,20 @@
 --
 -- /See:/ 'query' smart constructor.
 data Query = Query'
-    { _qProjectionExpression      :: !(Maybe Text)
-    , _qKeyConditions             :: !(Maybe (Map Text Condition))
+    { _qKeyConditions             :: !(Maybe (Map Text Condition))
+    , _qProjectionExpression      :: !(Maybe Text)
+    , _qAttributesToGet           :: !(Maybe (List1 Text))
+    , _qExpressionAttributeNames  :: !(Maybe (Map Text Text))
     , _qFilterExpression          :: !(Maybe Text)
     , _qQueryFilter               :: !(Maybe (Map Text Condition))
     , _qConsistentRead            :: !(Maybe Bool)
-    , _qExpressionAttributeNames  :: !(Maybe (Map Text Text))
-    , _qAttributesToGet           :: !(Maybe (List1 Text))
-    , _qReturnConsumedCapacity    :: !(Maybe ReturnConsumedCapacity)
     , _qExpressionAttributeValues :: !(Maybe (Map Text AttributeValue))
+    , _qReturnConsumedCapacity    :: !(Maybe ReturnConsumedCapacity)
     , _qScanIndexForward          :: !(Maybe Bool)
     , _qLimit                     :: !(Maybe Nat)
     , _qSelect                    :: !(Maybe Select)
-    , _qConditionalOperator       :: !(Maybe ConditionalOperator)
     , _qKeyConditionExpression    :: !(Maybe Text)
+    , _qConditionalOperator       :: !(Maybe ConditionalOperator)
     , _qExclusiveStartKey         :: !(Maybe (Map Text AttributeValue))
     , _qIndexName                 :: !(Maybe Text)
     , _qTableName                 :: !Text
@@ -120,34 +120,34 @@
 --
 -- Use one of the following lenses to modify other fields as desired:
 --
+-- * 'qKeyConditions'
+--
 -- * 'qProjectionExpression'
 --
--- * 'qKeyConditions'
+-- * 'qAttributesToGet'
 --
+-- * 'qExpressionAttributeNames'
+--
 -- * 'qFilterExpression'
 --
 -- * 'qQueryFilter'
 --
 -- * 'qConsistentRead'
 --
--- * 'qExpressionAttributeNames'
---
--- * 'qAttributesToGet'
+-- * 'qExpressionAttributeValues'
 --
 -- * 'qReturnConsumedCapacity'
 --
--- * 'qExpressionAttributeValues'
---
 -- * 'qScanIndexForward'
 --
 -- * 'qLimit'
 --
 -- * 'qSelect'
 --
--- * 'qConditionalOperator'
---
 -- * 'qKeyConditionExpression'
 --
+-- * 'qConditionalOperator'
+--
 -- * 'qExclusiveStartKey'
 --
 -- * 'qIndexName'
@@ -158,41 +158,25 @@
     -> Query
 query pTableName_ =
     Query'
-    { _qProjectionExpression = Nothing
-    , _qKeyConditions = Nothing
+    { _qKeyConditions = Nothing
+    , _qProjectionExpression = Nothing
+    , _qAttributesToGet = Nothing
+    , _qExpressionAttributeNames = Nothing
     , _qFilterExpression = Nothing
     , _qQueryFilter = Nothing
     , _qConsistentRead = Nothing
-    , _qExpressionAttributeNames = Nothing
-    , _qAttributesToGet = Nothing
-    , _qReturnConsumedCapacity = Nothing
     , _qExpressionAttributeValues = Nothing
+    , _qReturnConsumedCapacity = Nothing
     , _qScanIndexForward = Nothing
     , _qLimit = Nothing
     , _qSelect = Nothing
-    , _qConditionalOperator = Nothing
     , _qKeyConditionExpression = Nothing
+    , _qConditionalOperator = Nothing
     , _qExclusiveStartKey = Nothing
     , _qIndexName = Nothing
     , _qTableName = pTableName_
     }
 
--- | A string that identifies one or more attributes to retrieve from the
--- table. These attributes can include scalars, sets, or elements of a JSON
--- document. The attributes in the expression must be separated by commas.
---
--- If no attribute names are specified, then all attributes will be
--- returned. If any of the requested attributes are not found, they will
--- not appear in the result.
---
--- For more information, see
--- <http://docs.aws.amazon.com/amazondynamodb/latest/developerguide/Expressions.AccessingItemAttributes.html Accessing Item Attributes>
--- in the /Amazon DynamoDB Developer Guide/.
---
--- /ProjectionExpression/ replaces the legacy /AttributesToGet/ parameter.
-qProjectionExpression :: Lens' Query (Maybe Text)
-qProjectionExpression = lens _qProjectionExpression (\ s a -> s{_qProjectionExpression = a});
-
 -- | This is a legacy parameter, for backward compatibility. New applications
 -- should use /KeyConditionExpression/ instead. Do not combine legacy
 -- parameters and expression parameters in a single API call; otherwise,
@@ -315,6 +299,96 @@
 qKeyConditions :: Lens' Query (HashMap Text Condition)
 qKeyConditions = lens _qKeyConditions (\ s a -> s{_qKeyConditions = a}) . _Default . _Map;
 
+-- | A string that identifies one or more attributes to retrieve from the
+-- table. These attributes can include scalars, sets, or elements of a JSON
+-- document. The attributes in the expression must be separated by commas.
+--
+-- If no attribute names are specified, then all attributes will be
+-- returned. If any of the requested attributes are not found, they will
+-- not appear in the result.
+--
+-- For more information, see
+-- <http://docs.aws.amazon.com/amazondynamodb/latest/developerguide/Expressions.AccessingItemAttributes.html Accessing Item Attributes>
+-- in the /Amazon DynamoDB Developer Guide/.
+--
+-- /ProjectionExpression/ replaces the legacy /AttributesToGet/ parameter.
+qProjectionExpression :: Lens' Query (Maybe Text)
+qProjectionExpression = lens _qProjectionExpression (\ s a -> s{_qProjectionExpression = a});
+
+-- | This is a legacy parameter, for backward compatibility. New applications
+-- should use /ProjectionExpression/ instead. Do not combine legacy
+-- parameters and expression parameters in a single API call; otherwise,
+-- DynamoDB will return a /ValidationException/ exception.
+--
+-- This parameter allows you to retrieve attributes of type List or Map;
+-- however, it cannot retrieve individual elements within a List or a Map.
+--
+-- The names of one or more attributes to retrieve. If no attribute names
+-- are provided, then all attributes will be returned. If any of the
+-- requested attributes are not found, they will not appear in the result.
+--
+-- Note that /AttributesToGet/ has no effect on provisioned throughput
+-- consumption. DynamoDB determines capacity units consumed based on item
+-- size, not on the amount of data that is returned to an application.
+--
+-- You cannot use both /AttributesToGet/ and /Select/ together in a /Query/
+-- request, /unless/ the value for /Select/ is 'SPECIFIC_ATTRIBUTES'. (This
+-- usage is equivalent to specifying /AttributesToGet/ without any value
+-- for /Select/.)
+--
+-- If you query a local secondary index and request only attributes that
+-- are projected into that index, the operation will read only the index
+-- and not the table. If any of the requested attributes are not projected
+-- into the local secondary index, DynamoDB will fetch each of these
+-- attributes from the parent table. This extra fetching incurs additional
+-- throughput cost and latency.
+--
+-- If you query a global secondary index, you can only request attributes
+-- that are projected into the index. Global secondary index queries cannot
+-- fetch attributes from the parent table.
+qAttributesToGet :: Lens' Query (Maybe (NonEmpty Text))
+qAttributesToGet = lens _qAttributesToGet (\ s a -> s{_qAttributesToGet = a}) . mapping _List1;
+
+-- | One or more substitution tokens for attribute names in an expression.
+-- The following are some use cases for using /ExpressionAttributeNames/:
+--
+-- -   To access an attribute whose name conflicts with a DynamoDB reserved
+--     word.
+--
+-- -   To create a placeholder for repeating occurrences of an attribute
+--     name in an expression.
+--
+-- -   To prevent special characters in an attribute name from being
+--     misinterpreted in an expression.
+--
+-- Use the __#__ character in an expression to dereference an attribute
+-- name. For example, consider the following attribute name:
+--
+-- -   'Percentile'
+--
+-- The name of this attribute conflicts with a reserved word, so it cannot
+-- be used directly in an expression. (For the complete list of reserved
+-- words, see
+-- <http://docs.aws.amazon.com/amazondynamodb/latest/developerguide/ReservedWords.html Reserved Words>
+-- in the /Amazon DynamoDB Developer Guide/). To work around this, you
+-- could specify the following for /ExpressionAttributeNames/:
+--
+-- -   '{\"#P\":\"Percentile\"}'
+--
+-- You could then use this substitution in an expression, as in this
+-- example:
+--
+-- -   '#P = :val'
+--
+-- Tokens that begin with the __:__ character are /expression attribute
+-- values/, which are placeholders for the actual value at runtime.
+--
+-- For more information on expression attribute names, see
+-- <http://docs.aws.amazon.com/amazondynamodb/latest/developerguide/Expressions.AccessingItemAttributes.html Accessing Item Attributes>
+-- in the /Amazon DynamoDB Developer Guide/.
+qExpressionAttributeNames :: Lens' Query (HashMap Text Text)
+qExpressionAttributeNames = lens _qExpressionAttributeNames (\ s a -> s{_qExpressionAttributeNames = a}) . _Default . _Map;
+
 -- | A string that contains conditions that DynamoDB applies after the
 -- /Query/ operation, but before the data is returned to you. Items that do
 -- not satisfy the /FilterExpression/ criteria are not returned.
@@ -400,84 +474,6 @@
 qConsistentRead :: Lens' Query (Maybe Bool)
 qConsistentRead = lens _qConsistentRead (\ s a -> s{_qConsistentRead = a});
 
--- | One or more substitution tokens for attribute names in an expression.
--- The following are some use cases for using /ExpressionAttributeNames/:
---
--- -   To access an attribute whose name conflicts with a DynamoDB reserved
---     word.
---
--- -   To create a placeholder for repeating occurrences of an attribute
---     name in an expression.
---
--- -   To prevent special characters in an attribute name from being
---     misinterpreted in an expression.
---
--- Use the __#__ character in an expression to dereference an attribute
--- name. For example, consider the following attribute name:
---
--- -   'Percentile'
---
--- The name of this attribute conflicts with a reserved word, so it cannot
--- be used directly in an expression. (For the complete list of reserved
--- words, see
--- <http://docs.aws.amazon.com/amazondynamodb/latest/developerguide/ReservedWords.html Reserved Words>
--- in the /Amazon DynamoDB Developer Guide/). To work around this, you
--- could specify the following for /ExpressionAttributeNames/:
---
--- -   '{\"#P\":\"Percentile\"}'
---
--- You could then use this substitution in an expression, as in this
--- example:
---
--- -   '#P = :val'
---
--- Tokens that begin with the __:__ character are /expression attribute
--- values/, which are placeholders for the actual value at runtime.
---
--- For more information on expression attribute names, see
--- <http://docs.aws.amazon.com/amazondynamodb/latest/developerguide/Expressions.AccessingItemAttributes.html Accessing Item Attributes>
--- in the /Amazon DynamoDB Developer Guide/.
-qExpressionAttributeNames :: Lens' Query (HashMap Text Text)
-qExpressionAttributeNames = lens _qExpressionAttributeNames (\ s a -> s{_qExpressionAttributeNames = a}) . _Default . _Map;
-
--- | This is a legacy parameter, for backward compatibility. New applications
--- should use /ProjectionExpression/ instead. Do not combine legacy
--- parameters and expression parameters in a single API call; otherwise,
--- DynamoDB will return a /ValidationException/ exception.
---
--- This parameter allows you to retrieve attributes of type List or Map;
--- however, it cannot retrieve individual elements within a List or a Map.
---
--- The names of one or more attributes to retrieve. If no attribute names
--- are provided, then all attributes will be returned. If any of the
--- requested attributes are not found, they will not appear in the result.
---
--- Note that /AttributesToGet/ has no effect on provisioned throughput
--- consumption. DynamoDB determines capacity units consumed based on item
--- size, not on the amount of data that is returned to an application.
---
--- You cannot use both /AttributesToGet/ and /Select/ together in a /Query/
--- request, /unless/ the value for /Select/ is 'SPECIFIC_ATTRIBUTES'. (This
--- usage is equivalent to specifying /AttributesToGet/ without any value
--- for /Select/.)
---
--- If you query a local secondary index and request only attributes that
--- are projected into that index, the operation will read only the index
--- and not the table. If any of the requested attributes are not projected
--- into the local secondary index, DynamoDB will fetch each of these
--- attributes from the parent table. This extra fetching incurs additional
--- throughput cost and latency.
---
--- If you query a global secondary index, you can only request attributes
--- that are projected into the index. Global secondary index queries cannot
--- fetch attributes from the parent table.
-qAttributesToGet :: Lens' Query (Maybe (NonEmpty Text))
-qAttributesToGet = lens _qAttributesToGet (\ s a -> s{_qAttributesToGet = a}) . mapping _List1;
-
--- | Undocumented member.
-qReturnConsumedCapacity :: Lens' Query (Maybe ReturnConsumedCapacity)
-qReturnConsumedCapacity = lens _qReturnConsumedCapacity (\ s a -> s{_qReturnConsumedCapacity = a});
-
 -- | One or more values that can be substituted in an expression.
 --
 -- Use the __:__ (colon) character in an expression to dereference an
@@ -500,6 +496,10 @@
 qExpressionAttributeValues :: Lens' Query (HashMap Text AttributeValue)
 qExpressionAttributeValues = lens _qExpressionAttributeValues (\ s a -> s{_qExpressionAttributeValues = a}) . _Default . _Map;
 
+-- | Undocumented member.
+qReturnConsumedCapacity :: Lens' Query (Maybe ReturnConsumedCapacity)
+qReturnConsumedCapacity = lens _qReturnConsumedCapacity (\ s a -> s{_qReturnConsumedCapacity = a});
+
 -- | Specifies the order in which to return the query results - either
 -- ascending ('true') or descending ('false').
 --
@@ -581,27 +581,6 @@
 qSelect :: Lens' Query (Maybe Select)
 qSelect = lens _qSelect (\ s a -> s{_qSelect = a});
 
--- | This is a legacy parameter, for backward compatibility. New applications
--- should use /FilterExpression/ instead. Do not combine legacy parameters
--- and expression parameters in a single API call; otherwise, DynamoDB will
--- return a /ValidationException/ exception.
---
--- A logical operator to apply to the conditions in a /QueryFilter/ map:
---
--- -   'AND' - If all of the conditions evaluate to true, then the entire
---     map evaluates to true.
---
--- -   'OR' - If at least one of the conditions evaluate to true, then the
---     entire map evaluates to true.
---
--- If you omit /ConditionalOperator/, then 'AND' is the default.
---
--- The operation will succeed only if the entire map evaluates to true.
---
--- This parameter does not support attributes of type List or Map.
-qConditionalOperator :: Lens' Query (Maybe ConditionalOperator)
-qConditionalOperator = lens _qConditionalOperator (\ s a -> s{_qConditionalOperator = a});
-
 -- | The condition that specifies the key value(s) for items to be retrieved
 -- by the /Query/ action.
 --
@@ -679,6 +658,27 @@
 qKeyConditionExpression :: Lens' Query (Maybe Text)
 qKeyConditionExpression = lens _qKeyConditionExpression (\ s a -> s{_qKeyConditionExpression = a});
 
+-- | This is a legacy parameter, for backward compatibility. New applications
+-- should use /FilterExpression/ instead. Do not combine legacy parameters
+-- and expression parameters in a single API call; otherwise, DynamoDB will
+-- return a /ValidationException/ exception.
+--
+-- A logical operator to apply to the conditions in a /QueryFilter/ map:
+--
+-- -   'AND' - If all of the conditions evaluate to true, then the entire
+--     map evaluates to true.
+--
+-- -   'OR' - If at least one of the conditions evaluate to true, then the
+--     entire map evaluates to true.
+--
+-- If you omit /ConditionalOperator/, then 'AND' is the default.
+--
+-- The operation will succeed only if the entire map evaluates to true.
+--
+-- This parameter does not support attributes of type List or Map.
+qConditionalOperator :: Lens' Query (Maybe ConditionalOperator)
+qConditionalOperator = lens _qConditionalOperator (\ s a -> s{_qConditionalOperator = a});
+
 -- | The primary key of the first item that this operation will evaluate. Use
 -- the value that was returned for /LastEvaluatedKey/ in the previous
 -- operation.
@@ -733,24 +733,24 @@
         toJSON Query'{..}
           = object
               (catMaybes
-                 [("ProjectionExpression" .=) <$>
+                 [("KeyConditions" .=) <$> _qKeyConditions,
+                  ("ProjectionExpression" .=) <$>
                     _qProjectionExpression,
-                  ("KeyConditions" .=) <$> _qKeyConditions,
+                  ("AttributesToGet" .=) <$> _qAttributesToGet,
+                  ("ExpressionAttributeNames" .=) <$>
+                    _qExpressionAttributeNames,
                   ("FilterExpression" .=) <$> _qFilterExpression,
                   ("QueryFilter" .=) <$> _qQueryFilter,
                   ("ConsistentRead" .=) <$> _qConsistentRead,
-                  ("ExpressionAttributeNames" .=) <$>
-                    _qExpressionAttributeNames,
-                  ("AttributesToGet" .=) <$> _qAttributesToGet,
-                  ("ReturnConsumedCapacity" .=) <$>
-                    _qReturnConsumedCapacity,
                   ("ExpressionAttributeValues" .=) <$>
                     _qExpressionAttributeValues,
+                  ("ReturnConsumedCapacity" .=) <$>
+                    _qReturnConsumedCapacity,
                   ("ScanIndexForward" .=) <$> _qScanIndexForward,
                   ("Limit" .=) <$> _qLimit, ("Select" .=) <$> _qSelect,
-                  ("ConditionalOperator" .=) <$> _qConditionalOperator,
                   ("KeyConditionExpression" .=) <$>
                     _qKeyConditionExpression,
+                  ("ConditionalOperator" .=) <$> _qConditionalOperator,
                   ("ExclusiveStartKey" .=) <$> _qExclusiveStartKey,
                   ("IndexName" .=) <$> _qIndexName,
                   Just ("TableName" .= _qTableName)])
@@ -770,7 +770,7 @@
     , _qrsScannedCount     :: !(Maybe Int)
     , _qrsItems            :: !(Maybe [Map Text AttributeValue])
     , _qrsConsumedCapacity :: !(Maybe ConsumedCapacity)
-    , _qrsStatus           :: !Int
+    , _qrsResponseStatus   :: !Int
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'QueryResponse' with the minimum fields required to make a request.
@@ -787,18 +787,18 @@
 --
 -- * 'qrsConsumedCapacity'
 --
--- * 'qrsStatus'
+-- * 'qrsResponseStatus'
 queryResponse
-    :: Int -- ^ 'qrsStatus'
+    :: Int -- ^ 'qrsResponseStatus'
     -> QueryResponse
-queryResponse pStatus_ =
+queryResponse pResponseStatus_ =
     QueryResponse'
     { _qrsLastEvaluatedKey = Nothing
     , _qrsCount = Nothing
     , _qrsScannedCount = Nothing
     , _qrsItems = Nothing
     , _qrsConsumedCapacity = Nothing
-    , _qrsStatus = pStatus_
+    , _qrsResponseStatus = pResponseStatus_
     }
 
 -- | The primary key of the item where the operation stopped, inclusive of
@@ -847,5 +847,5 @@
 qrsConsumedCapacity = lens _qrsConsumedCapacity (\ s a -> s{_qrsConsumedCapacity = a});
 
 -- | The response status code.
-qrsStatus :: Lens' QueryResponse Int
-qrsStatus = lens _qrsStatus (\ s a -> s{_qrsStatus = a});
+qrsResponseStatus :: Lens' QueryResponse Int
+qrsResponseStatus = lens _qrsResponseStatus (\ s a -> s{_qrsResponseStatus = a});
diff --git a/gen/Network/AWS/DynamoDB/Scan.hs b/gen/Network/AWS/DynamoDB/Scan.hs
--- a/gen/Network/AWS/DynamoDB/Scan.hs
+++ b/gen/Network/AWS/DynamoDB/Scan.hs
@@ -51,13 +51,13 @@
     -- * Request Lenses
     , sProjectionExpression
     , sScanFilter
+    , sAttributesToGet
     , sTotalSegments
+    , sExpressionAttributeNames
     , sFilterExpression
     , sConsistentRead
-    , sExpressionAttributeNames
-    , sAttributesToGet
-    , sReturnConsumedCapacity
     , sExpressionAttributeValues
+    , sReturnConsumedCapacity
     , sLimit
     , sSelect
     , sSegment
@@ -75,7 +75,7 @@
     , srsScannedCount
     , srsItems
     , srsConsumedCapacity
-    , srsStatus
+    , srsResponseStatus
     ) where
 
 import           Network.AWS.DynamoDB.Types
@@ -91,13 +91,13 @@
 data Scan = Scan'
     { _sProjectionExpression      :: !(Maybe Text)
     , _sScanFilter                :: !(Maybe (Map Text Condition))
+    , _sAttributesToGet           :: !(Maybe (List1 Text))
     , _sTotalSegments             :: !(Maybe Nat)
+    , _sExpressionAttributeNames  :: !(Maybe (Map Text Text))
     , _sFilterExpression          :: !(Maybe Text)
     , _sConsistentRead            :: !(Maybe Bool)
-    , _sExpressionAttributeNames  :: !(Maybe (Map Text Text))
-    , _sAttributesToGet           :: !(Maybe (List1 Text))
-    , _sReturnConsumedCapacity    :: !(Maybe ReturnConsumedCapacity)
     , _sExpressionAttributeValues :: !(Maybe (Map Text AttributeValue))
+    , _sReturnConsumedCapacity    :: !(Maybe ReturnConsumedCapacity)
     , _sLimit                     :: !(Maybe Nat)
     , _sSelect                    :: !(Maybe Select)
     , _sSegment                   :: !(Maybe Nat)
@@ -115,20 +115,20 @@
 --
 -- * 'sScanFilter'
 --
+-- * 'sAttributesToGet'
+--
 -- * 'sTotalSegments'
 --
+-- * 'sExpressionAttributeNames'
+--
 -- * 'sFilterExpression'
 --
 -- * 'sConsistentRead'
 --
--- * 'sExpressionAttributeNames'
---
--- * 'sAttributesToGet'
+-- * 'sExpressionAttributeValues'
 --
 -- * 'sReturnConsumedCapacity'
 --
--- * 'sExpressionAttributeValues'
---
 -- * 'sLimit'
 --
 -- * 'sSelect'
@@ -149,13 +149,13 @@
     Scan'
     { _sProjectionExpression = Nothing
     , _sScanFilter = Nothing
+    , _sAttributesToGet = Nothing
     , _sTotalSegments = Nothing
+    , _sExpressionAttributeNames = Nothing
     , _sFilterExpression = Nothing
     , _sConsistentRead = Nothing
-    , _sExpressionAttributeNames = Nothing
-    , _sAttributesToGet = Nothing
-    , _sReturnConsumedCapacity = Nothing
     , _sExpressionAttributeValues = Nothing
+    , _sReturnConsumedCapacity = Nothing
     , _sLimit = Nothing
     , _sSelect = Nothing
     , _sSegment = Nothing
@@ -232,6 +232,24 @@
 sScanFilter :: Lens' Scan (HashMap Text Condition)
 sScanFilter = lens _sScanFilter (\ s a -> s{_sScanFilter = a}) . _Default . _Map;
 
+-- | This is a legacy parameter, for backward compatibility. New applications
+-- should use /ProjectionExpression/ instead. Do not combine legacy
+-- parameters and expression parameters in a single API call; otherwise,
+-- DynamoDB will return a /ValidationException/ exception.
+--
+-- This parameter allows you to retrieve attributes of type List or Map;
+-- however, it cannot retrieve individual elements within a List or a Map.
+--
+-- The names of one or more attributes to retrieve. If no attribute names
+-- are provided, then all attributes will be returned. If any of the
+-- requested attributes are not found, they will not appear in the result.
+--
+-- Note that /AttributesToGet/ has no effect on provisioned throughput
+-- consumption. DynamoDB determines capacity units consumed based on item
+-- size, not on the amount of data that is returned to an application.
+sAttributesToGet :: Lens' Scan (Maybe (NonEmpty Text))
+sAttributesToGet = lens _sAttributesToGet (\ s a -> s{_sAttributesToGet = a}) . mapping _List1;
+
 -- | For a parallel /Scan/ request, /TotalSegments/ represents the total
 -- number of segments into which the /Scan/ operation will be divided. The
 -- value of /TotalSegments/ corresponds to the number of application
@@ -247,46 +265,6 @@
 sTotalSegments :: Lens' Scan (Maybe Natural)
 sTotalSegments = lens _sTotalSegments (\ s a -> s{_sTotalSegments = a}) . mapping _Nat;
 
--- | A string that contains conditions that DynamoDB applies after the /Scan/
--- operation, but before the data is returned to you. Items that do not
--- satisfy the /FilterExpression/ criteria are not returned.
---
--- A /FilterExpression/ is applied after the items have already been read;
--- the process of filtering does not consume any additional read capacity
--- units.
---
--- For more information, see
--- <http://docs.aws.amazon.com/amazondynamodb/latest/developerguide/QueryAndScan.html#FilteringResults Filter Expressions>
--- in the /Amazon DynamoDB Developer Guide/.
---
--- /FilterExpression/ replaces the legacy /ScanFilter/ and
--- /ConditionalOperator/ parameters.
-sFilterExpression :: Lens' Scan (Maybe Text)
-sFilterExpression = lens _sFilterExpression (\ s a -> s{_sFilterExpression = a});
-
--- | A Boolean value that determines the read consistency model during the
--- scan:
---
--- -   If /ConsistentRead/ is 'false', then /Scan/ will use eventually
---     consistent reads. The data returned from /Scan/ might not contain
---     the results of other recently completed write operations (PutItem,
---     UpdateItem or DeleteItem). The /Scan/ response might include some
---     stale data.
---
--- -   If /ConsistentRead/ is 'true', then /Scan/ will use strongly
---     consistent reads. All of the write operations that completed before
---     the /Scan/ began are guaranteed to be contained in the /Scan/
---     response.
---
--- The default setting for /ConsistentRead/ is 'false', meaning that
--- eventually consistent reads will be used.
---
--- Strongly consistent reads are not supported on global secondary indexes.
--- If you scan a global secondary index with /ConsistentRead/ set to true,
--- you will receive a /ValidationException/.
-sConsistentRead :: Lens' Scan (Maybe Bool)
-sConsistentRead = lens _sConsistentRead (\ s a -> s{_sConsistentRead = a});
-
 -- | One or more substitution tokens for attribute names in an expression.
 -- The following are some use cases for using /ExpressionAttributeNames/:
 --
@@ -327,27 +305,45 @@
 sExpressionAttributeNames :: Lens' Scan (HashMap Text Text)
 sExpressionAttributeNames = lens _sExpressionAttributeNames (\ s a -> s{_sExpressionAttributeNames = a}) . _Default . _Map;
 
--- | This is a legacy parameter, for backward compatibility. New applications
--- should use /ProjectionExpression/ instead. Do not combine legacy
--- parameters and expression parameters in a single API call; otherwise,
--- DynamoDB will return a /ValidationException/ exception.
+-- | A string that contains conditions that DynamoDB applies after the /Scan/
+-- operation, but before the data is returned to you. Items that do not
+-- satisfy the /FilterExpression/ criteria are not returned.
 --
--- This parameter allows you to retrieve attributes of type List or Map;
--- however, it cannot retrieve individual elements within a List or a Map.
+-- A /FilterExpression/ is applied after the items have already been read;
+-- the process of filtering does not consume any additional read capacity
+-- units.
 --
--- The names of one or more attributes to retrieve. If no attribute names
--- are provided, then all attributes will be returned. If any of the
--- requested attributes are not found, they will not appear in the result.
+-- For more information, see
+-- <http://docs.aws.amazon.com/amazondynamodb/latest/developerguide/QueryAndScan.html#FilteringResults Filter Expressions>
+-- in the /Amazon DynamoDB Developer Guide/.
 --
--- Note that /AttributesToGet/ has no effect on provisioned throughput
--- consumption. DynamoDB determines capacity units consumed based on item
--- size, not on the amount of data that is returned to an application.
-sAttributesToGet :: Lens' Scan (Maybe (NonEmpty Text))
-sAttributesToGet = lens _sAttributesToGet (\ s a -> s{_sAttributesToGet = a}) . mapping _List1;
+-- /FilterExpression/ replaces the legacy /ScanFilter/ and
+-- /ConditionalOperator/ parameters.
+sFilterExpression :: Lens' Scan (Maybe Text)
+sFilterExpression = lens _sFilterExpression (\ s a -> s{_sFilterExpression = a});
 
--- | Undocumented member.
-sReturnConsumedCapacity :: Lens' Scan (Maybe ReturnConsumedCapacity)
-sReturnConsumedCapacity = lens _sReturnConsumedCapacity (\ s a -> s{_sReturnConsumedCapacity = a});
+-- | A Boolean value that determines the read consistency model during the
+-- scan:
+--
+-- -   If /ConsistentRead/ is 'false', then /Scan/ will use eventually
+--     consistent reads. The data returned from /Scan/ might not contain
+--     the results of other recently completed write operations (PutItem,
+--     UpdateItem or DeleteItem). The /Scan/ response might include some
+--     stale data.
+--
+-- -   If /ConsistentRead/ is 'true', then /Scan/ will use strongly
+--     consistent reads. All of the write operations that completed before
+--     the /Scan/ began are guaranteed to be contained in the /Scan/
+--     response.
+--
+-- The default setting for /ConsistentRead/ is 'false', meaning that
+-- eventually consistent reads will be used.
+--
+-- Strongly consistent reads are not supported on global secondary indexes.
+-- If you scan a global secondary index with /ConsistentRead/ set to true,
+-- you will receive a /ValidationException/.
+sConsistentRead :: Lens' Scan (Maybe Bool)
+sConsistentRead = lens _sConsistentRead (\ s a -> s{_sConsistentRead = a});
 
 -- | One or more values that can be substituted in an expression.
 --
@@ -371,6 +367,10 @@
 sExpressionAttributeValues :: Lens' Scan (HashMap Text AttributeValue)
 sExpressionAttributeValues = lens _sExpressionAttributeValues (\ s a -> s{_sExpressionAttributeValues = a}) . _Default . _Map;
 
+-- | Undocumented member.
+sReturnConsumedCapacity :: Lens' Scan (Maybe ReturnConsumedCapacity)
+sReturnConsumedCapacity = lens _sReturnConsumedCapacity (\ s a -> s{_sReturnConsumedCapacity = a});
+
 -- | The maximum number of items to evaluate (not necessarily the number of
 -- matching items). If DynamoDB processes the number of items up to the
 -- limit while processing the results, it stops the operation and returns
@@ -508,16 +508,16 @@
                  [("ProjectionExpression" .=) <$>
                     _sProjectionExpression,
                   ("ScanFilter" .=) <$> _sScanFilter,
+                  ("AttributesToGet" .=) <$> _sAttributesToGet,
                   ("TotalSegments" .=) <$> _sTotalSegments,
-                  ("FilterExpression" .=) <$> _sFilterExpression,
-                  ("ConsistentRead" .=) <$> _sConsistentRead,
                   ("ExpressionAttributeNames" .=) <$>
                     _sExpressionAttributeNames,
-                  ("AttributesToGet" .=) <$> _sAttributesToGet,
-                  ("ReturnConsumedCapacity" .=) <$>
-                    _sReturnConsumedCapacity,
+                  ("FilterExpression" .=) <$> _sFilterExpression,
+                  ("ConsistentRead" .=) <$> _sConsistentRead,
                   ("ExpressionAttributeValues" .=) <$>
                     _sExpressionAttributeValues,
+                  ("ReturnConsumedCapacity" .=) <$>
+                    _sReturnConsumedCapacity,
                   ("Limit" .=) <$> _sLimit, ("Select" .=) <$> _sSelect,
                   ("Segment" .=) <$> _sSegment,
                   ("ConditionalOperator" .=) <$> _sConditionalOperator,
@@ -540,7 +540,7 @@
     , _srsScannedCount     :: !(Maybe Int)
     , _srsItems            :: !(Maybe [Map Text AttributeValue])
     , _srsConsumedCapacity :: !(Maybe ConsumedCapacity)
-    , _srsStatus           :: !Int
+    , _srsResponseStatus   :: !Int
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'ScanResponse' with the minimum fields required to make a request.
@@ -557,18 +557,18 @@
 --
 -- * 'srsConsumedCapacity'
 --
--- * 'srsStatus'
+-- * 'srsResponseStatus'
 scanResponse
-    :: Int -- ^ 'srsStatus'
+    :: Int -- ^ 'srsResponseStatus'
     -> ScanResponse
-scanResponse pStatus_ =
+scanResponse pResponseStatus_ =
     ScanResponse'
     { _srsLastEvaluatedKey = Nothing
     , _srsCount = Nothing
     , _srsScannedCount = Nothing
     , _srsItems = Nothing
     , _srsConsumedCapacity = Nothing
-    , _srsStatus = pStatus_
+    , _srsResponseStatus = pResponseStatus_
     }
 
 -- | The primary key of the item where the operation stopped, inclusive of
@@ -617,5 +617,5 @@
 srsConsumedCapacity = lens _srsConsumedCapacity (\ s a -> s{_srsConsumedCapacity = a});
 
 -- | The response status code.
-srsStatus :: Lens' ScanResponse Int
-srsStatus = lens _srsStatus (\ s a -> s{_srsStatus = a});
+srsResponseStatus :: Lens' ScanResponse Int
+srsResponseStatus = lens _srsResponseStatus (\ s a -> s{_srsResponseStatus = a});
diff --git a/gen/Network/AWS/DynamoDB/Types.hs b/gen/Network/AWS/DynamoDB/Types.hs
--- a/gen/Network/AWS/DynamoDB/Types.hs
+++ b/gen/Network/AWS/DynamoDB/Types.hs
@@ -21,8 +21,8 @@
     , _ItemCollectionSizeLimitExceededException
     , _InternalServerError
     , _ResourceNotFoundException
-    , _ResourceInUseException
     , _LimitExceededException
+    , _ResourceInUseException
 
     -- * AttributeAction
     , AttributeAction (..)
@@ -73,8 +73,8 @@
     , AttributeValue
     , attributeValue
     , avL
-    , avM
     , avNS
+    , avM
     , avNULL
     , avN
     , avBS
@@ -103,8 +103,8 @@
     -- * ConsumedCapacity
     , ConsumedCapacity
     , consumedCapacity
-    , ccCapacityUnits
     , ccGlobalSecondaryIndexes
+    , ccCapacityUnits
     , ccLocalSecondaryIndexes
     , ccTable
     , ccTableName
@@ -147,9 +147,9 @@
     , GlobalSecondaryIndexDescription
     , globalSecondaryIndexDescription
     , gsidBackfilling
-    , gsidProvisionedThroughput
-    , gsidIndexStatus
     , gsidIndexSizeBytes
+    , gsidIndexStatus
+    , gsidProvisionedThroughput
     , gsidIndexARN
     , gsidKeySchema
     , gsidProjection
@@ -179,9 +179,9 @@
     , KeysAndAttributes
     , keysAndAttributes
     , kaaProjectionExpression
-    , kaaConsistentRead
-    , kaaExpressionAttributeNames
     , kaaAttributesToGet
+    , kaaExpressionAttributeNames
+    , kaaConsistentRead
     , kaaKeys
 
     -- * LocalSecondaryIndex
@@ -230,21 +230,21 @@
     -- * StreamSpecification
     , StreamSpecification
     , streamSpecification
-    , ssStreamEnabled
     , ssStreamViewType
+    , ssStreamEnabled
 
     -- * TableDescription
     , TableDescription
     , tableDescription
-    , tdProvisionedThroughput
+    , tdTableSizeBytes
     , tdAttributeDefinitions
     , tdLatestStreamARN
-    , tdTableSizeBytes
+    , tdProvisionedThroughput
     , tdTableStatus
     , tdTableARN
     , tdKeySchema
-    , tdLatestStreamLabel
     , tdGlobalSecondaryIndexes
+    , tdLatestStreamLabel
     , tdLocalSecondaryIndexes
     , tdCreationDateTime
     , tdItemCount
@@ -260,8 +260,8 @@
     -- * WriteRequest
     , WriteRequest
     , writeRequest
-    , wrPutRequest
     , wrDeleteRequest
+    , wrPutRequest
     ) where
 
 import           Network.AWS.DynamoDB.Types.Product
@@ -336,12 +336,6 @@
 _ResourceNotFoundException =
     _ServiceError . hasCode "ResourceNotFoundException"
 
--- | The operation conflicts with the resource\'s availability. For example,
--- you attempted to recreate an existing table, or tried to delete a table
--- currently in the 'CREATING' state.
-_ResourceInUseException :: AsError a => Getting (First ServiceError) a ServiceError
-_ResourceInUseException = _ServiceError . hasCode "ResourceInUseException"
-
 -- | The number of concurrent table requests (cumulative number of tables in
 -- the 'CREATING', 'DELETING' or 'UPDATING' state) exceeds the maximum
 -- allowed of 10.
@@ -353,3 +347,9 @@
 -- The total limit of tables in the 'ACTIVE' state is 250.
 _LimitExceededException :: AsError a => Getting (First ServiceError) a ServiceError
 _LimitExceededException = _ServiceError . hasCode "LimitExceededException"
+
+-- | The operation conflicts with the resource\'s availability. For example,
+-- you attempted to recreate an existing table, or tried to delete a table
+-- currently in the 'CREATING' state.
+_ResourceInUseException :: AsError a => Getting (First ServiceError) a ServiceError
+_ResourceInUseException = _ServiceError . hasCode "ResourceInUseException"
diff --git a/gen/Network/AWS/DynamoDB/Types/Product.hs b/gen/Network/AWS/DynamoDB/Types/Product.hs
--- a/gen/Network/AWS/DynamoDB/Types/Product.hs
+++ b/gen/Network/AWS/DynamoDB/Types/Product.hs
@@ -80,8 +80,8 @@
 -- /See:/ 'attributeValue' smart constructor.
 data AttributeValue = AttributeValue'
     { _avL    :: !(Maybe [AttributeValue])
-    , _avM    :: !(Maybe (Map Text AttributeValue))
     , _avNS   :: !(Maybe [Text])
+    , _avM    :: !(Maybe (Map Text AttributeValue))
     , _avNULL :: !(Maybe Bool)
     , _avN    :: !(Maybe Text)
     , _avBS   :: !(Maybe [Base64])
@@ -97,10 +97,10 @@
 --
 -- * 'avL'
 --
--- * 'avM'
---
 -- * 'avNS'
 --
+-- * 'avM'
+--
 -- * 'avNULL'
 --
 -- * 'avN'
@@ -119,8 +119,8 @@
 attributeValue =
     AttributeValue'
     { _avL = Nothing
-    , _avM = Nothing
     , _avNS = Nothing
+    , _avM = Nothing
     , _avNULL = Nothing
     , _avN = Nothing
     , _avBS = Nothing
@@ -134,14 +134,14 @@
 avL :: Lens' AttributeValue [AttributeValue]
 avL = lens _avL (\ s a -> s{_avL = a}) . _Default . _Coerce;
 
--- | A Map of attribute values.
-avM :: Lens' AttributeValue (HashMap Text AttributeValue)
-avM = lens _avM (\ s a -> s{_avM = a}) . _Default . _Map;
-
 -- | A Number Set data type.
 avNS :: Lens' AttributeValue [Text]
 avNS = lens _avNS (\ s a -> s{_avNS = a}) . _Default . _Coerce;
 
+-- | A Map of attribute values.
+avM :: Lens' AttributeValue (HashMap Text AttributeValue)
+avM = lens _avM (\ s a -> s{_avM = a}) . _Default . _Map;
+
 -- | A Null data type.
 avNULL :: Lens' AttributeValue (Maybe Bool)
 avNULL = lens _avNULL (\ s a -> s{_avNULL = a});
@@ -181,8 +181,8 @@
           = withObject "AttributeValue"
               (\ x ->
                  AttributeValue' <$>
-                   (x .:? "L" .!= mempty) <*> (x .:? "M" .!= mempty) <*>
-                     (x .:? "NS" .!= mempty)
+                   (x .:? "L" .!= mempty) <*> (x .:? "NS" .!= mempty)
+                     <*> (x .:? "M" .!= mempty)
                      <*> (x .:? "NULL")
                      <*> (x .:? "N")
                      <*> (x .:? "BS" .!= mempty)
@@ -195,8 +195,8 @@
         toJSON AttributeValue'{..}
           = object
               (catMaybes
-                 [("L" .=) <$> _avL, ("M" .=) <$> _avM,
-                  ("NS" .=) <$> _avNS, ("NULL" .=) <$> _avNULL,
+                 [("L" .=) <$> _avL, ("NS" .=) <$> _avNS,
+                  ("M" .=) <$> _avM, ("NULL" .=) <$> _avNULL,
                   ("N" .=) <$> _avN, ("BS" .=) <$> _avBS,
                   ("B" .=) <$> _avB, ("SS" .=) <$> _avSS,
                   ("S" .=) <$> _avS, ("BOOL" .=) <$> _avBOOL])
@@ -573,8 +573,8 @@
 --
 -- /See:/ 'consumedCapacity' smart constructor.
 data ConsumedCapacity = ConsumedCapacity'
-    { _ccCapacityUnits          :: !(Maybe Double)
-    , _ccGlobalSecondaryIndexes :: !(Maybe (Map Text Capacity))
+    { _ccGlobalSecondaryIndexes :: !(Maybe (Map Text Capacity))
+    , _ccCapacityUnits          :: !(Maybe Double)
     , _ccLocalSecondaryIndexes  :: !(Maybe (Map Text Capacity))
     , _ccTable                  :: !(Maybe Capacity)
     , _ccTableName              :: !(Maybe Text)
@@ -584,10 +584,10 @@
 --
 -- Use one of the following lenses to modify other fields as desired:
 --
--- * 'ccCapacityUnits'
---
 -- * 'ccGlobalSecondaryIndexes'
 --
+-- * 'ccCapacityUnits'
+--
 -- * 'ccLocalSecondaryIndexes'
 --
 -- * 'ccTable'
@@ -597,22 +597,22 @@
     :: ConsumedCapacity
 consumedCapacity =
     ConsumedCapacity'
-    { _ccCapacityUnits = Nothing
-    , _ccGlobalSecondaryIndexes = Nothing
+    { _ccGlobalSecondaryIndexes = Nothing
+    , _ccCapacityUnits = Nothing
     , _ccLocalSecondaryIndexes = Nothing
     , _ccTable = Nothing
     , _ccTableName = Nothing
     }
 
--- | The total number of capacity units consumed by the operation.
-ccCapacityUnits :: Lens' ConsumedCapacity (Maybe Double)
-ccCapacityUnits = lens _ccCapacityUnits (\ s a -> s{_ccCapacityUnits = a});
-
 -- | The amount of throughput consumed on each global index affected by the
 -- operation.
 ccGlobalSecondaryIndexes :: Lens' ConsumedCapacity (HashMap Text Capacity)
 ccGlobalSecondaryIndexes = lens _ccGlobalSecondaryIndexes (\ s a -> s{_ccGlobalSecondaryIndexes = a}) . _Default . _Map;
 
+-- | The total number of capacity units consumed by the operation.
+ccCapacityUnits :: Lens' ConsumedCapacity (Maybe Double)
+ccCapacityUnits = lens _ccCapacityUnits (\ s a -> s{_ccCapacityUnits = a});
+
 -- | The amount of throughput consumed on each local index affected by the
 -- operation.
 ccLocalSecondaryIndexes :: Lens' ConsumedCapacity (HashMap Text Capacity)
@@ -632,8 +632,8 @@
           = withObject "ConsumedCapacity"
               (\ x ->
                  ConsumedCapacity' <$>
-                   (x .:? "CapacityUnits") <*>
-                     (x .:? "GlobalSecondaryIndexes" .!= mempty)
+                   (x .:? "GlobalSecondaryIndexes" .!= mempty) <*>
+                     (x .:? "CapacityUnits")
                      <*> (x .:? "LocalSecondaryIndexes" .!= mempty)
                      <*> (x .:? "Table")
                      <*> (x .:? "TableName"))
@@ -1105,9 +1105,9 @@
 -- /See:/ 'globalSecondaryIndexDescription' smart constructor.
 data GlobalSecondaryIndexDescription = GlobalSecondaryIndexDescription'
     { _gsidBackfilling           :: !(Maybe Bool)
-    , _gsidProvisionedThroughput :: !(Maybe ProvisionedThroughputDescription)
-    , _gsidIndexStatus           :: !(Maybe IndexStatus)
     , _gsidIndexSizeBytes        :: !(Maybe Integer)
+    , _gsidIndexStatus           :: !(Maybe IndexStatus)
+    , _gsidProvisionedThroughput :: !(Maybe ProvisionedThroughputDescription)
     , _gsidIndexARN              :: !(Maybe Text)
     , _gsidKeySchema             :: !(Maybe (List1 KeySchemaElement))
     , _gsidProjection            :: !(Maybe Projection)
@@ -1121,11 +1121,11 @@
 --
 -- * 'gsidBackfilling'
 --
--- * 'gsidProvisionedThroughput'
+-- * 'gsidIndexSizeBytes'
 --
 -- * 'gsidIndexStatus'
 --
--- * 'gsidIndexSizeBytes'
+-- * 'gsidProvisionedThroughput'
 --
 -- * 'gsidIndexARN'
 --
@@ -1141,9 +1141,9 @@
 globalSecondaryIndexDescription =
     GlobalSecondaryIndexDescription'
     { _gsidBackfilling = Nothing
-    , _gsidProvisionedThroughput = Nothing
-    , _gsidIndexStatus = Nothing
     , _gsidIndexSizeBytes = Nothing
+    , _gsidIndexStatus = Nothing
+    , _gsidProvisionedThroughput = Nothing
     , _gsidIndexARN = Nothing
     , _gsidKeySchema = Nothing
     , _gsidProjection = Nothing
@@ -1163,9 +1163,11 @@
 gsidBackfilling :: Lens' GlobalSecondaryIndexDescription (Maybe Bool)
 gsidBackfilling = lens _gsidBackfilling (\ s a -> s{_gsidBackfilling = a});
 
--- | Undocumented member.
-gsidProvisionedThroughput :: Lens' GlobalSecondaryIndexDescription (Maybe ProvisionedThroughputDescription)
-gsidProvisionedThroughput = lens _gsidProvisionedThroughput (\ s a -> s{_gsidProvisionedThroughput = a});
+-- | The total size of the specified index, in bytes. DynamoDB updates this
+-- value approximately every six hours. Recent changes might not be
+-- reflected in this value.
+gsidIndexSizeBytes :: Lens' GlobalSecondaryIndexDescription (Maybe Integer)
+gsidIndexSizeBytes = lens _gsidIndexSizeBytes (\ s a -> s{_gsidIndexSizeBytes = a});
 
 -- | The current state of the global secondary index:
 --
@@ -1180,11 +1182,9 @@
 gsidIndexStatus :: Lens' GlobalSecondaryIndexDescription (Maybe IndexStatus)
 gsidIndexStatus = lens _gsidIndexStatus (\ s a -> s{_gsidIndexStatus = a});
 
--- | The total size of the specified index, in bytes. DynamoDB updates this
--- value approximately every six hours. Recent changes might not be
--- reflected in this value.
-gsidIndexSizeBytes :: Lens' GlobalSecondaryIndexDescription (Maybe Integer)
-gsidIndexSizeBytes = lens _gsidIndexSizeBytes (\ s a -> s{_gsidIndexSizeBytes = a});
+-- | Undocumented member.
+gsidProvisionedThroughput :: Lens' GlobalSecondaryIndexDescription (Maybe ProvisionedThroughputDescription)
+gsidProvisionedThroughput = lens _gsidProvisionedThroughput (\ s a -> s{_gsidProvisionedThroughput = a});
 
 -- | The Amazon Resource Name (ARN) that uniquely identifies the index.
 gsidIndexARN :: Lens' GlobalSecondaryIndexDescription (Maybe Text)
@@ -1215,10 +1215,9 @@
           = withObject "GlobalSecondaryIndexDescription"
               (\ x ->
                  GlobalSecondaryIndexDescription' <$>
-                   (x .:? "Backfilling") <*>
-                     (x .:? "ProvisionedThroughput")
+                   (x .:? "Backfilling") <*> (x .:? "IndexSizeBytes")
                      <*> (x .:? "IndexStatus")
-                     <*> (x .:? "IndexSizeBytes")
+                     <*> (x .:? "ProvisionedThroughput")
                      <*> (x .:? "IndexArn")
                      <*> (x .:? "KeySchema")
                      <*> (x .:? "Projection")
@@ -1412,9 +1411,9 @@
 -- /See:/ 'keysAndAttributes' smart constructor.
 data KeysAndAttributes = KeysAndAttributes'
     { _kaaProjectionExpression     :: !(Maybe Text)
-    , _kaaConsistentRead           :: !(Maybe Bool)
-    , _kaaExpressionAttributeNames :: !(Maybe (Map Text Text))
     , _kaaAttributesToGet          :: !(Maybe (List1 Text))
+    , _kaaExpressionAttributeNames :: !(Maybe (Map Text Text))
+    , _kaaConsistentRead           :: !(Maybe Bool)
     , _kaaKeys                     :: !(List1 (Map Text AttributeValue))
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
@@ -1424,11 +1423,11 @@
 --
 -- * 'kaaProjectionExpression'
 --
--- * 'kaaConsistentRead'
+-- * 'kaaAttributesToGet'
 --
 -- * 'kaaExpressionAttributeNames'
 --
--- * 'kaaAttributesToGet'
+-- * 'kaaConsistentRead'
 --
 -- * 'kaaKeys'
 keysAndAttributes
@@ -1437,9 +1436,9 @@
 keysAndAttributes pKeys_ =
     KeysAndAttributes'
     { _kaaProjectionExpression = Nothing
-    , _kaaConsistentRead = Nothing
-    , _kaaExpressionAttributeNames = Nothing
     , _kaaAttributesToGet = Nothing
+    , _kaaExpressionAttributeNames = Nothing
+    , _kaaConsistentRead = Nothing
     , _kaaKeys = _List1 # pKeys_
     }
 
@@ -1460,11 +1459,12 @@
 kaaProjectionExpression :: Lens' KeysAndAttributes (Maybe Text)
 kaaProjectionExpression = lens _kaaProjectionExpression (\ s a -> s{_kaaProjectionExpression = a});
 
--- | The consistency of a read operation. If set to 'true', then a strongly
--- consistent read is used; otherwise, an eventually consistent read is
--- used.
-kaaConsistentRead :: Lens' KeysAndAttributes (Maybe Bool)
-kaaConsistentRead = lens _kaaConsistentRead (\ s a -> s{_kaaConsistentRead = a});
+-- | One or more attributes to retrieve from the table or index. If no
+-- attribute names are specified then all attributes will be returned. If
+-- any of the specified attributes are not found, they will not appear in
+-- the result.
+kaaAttributesToGet :: Lens' KeysAndAttributes (Maybe (NonEmpty Text))
+kaaAttributesToGet = lens _kaaAttributesToGet (\ s a -> s{_kaaAttributesToGet = a}) . mapping _List1;
 
 -- | One or more substitution tokens for attribute names in an expression.
 -- The following are some use cases for using /ExpressionAttributeNames/:
@@ -1506,12 +1506,11 @@
 kaaExpressionAttributeNames :: Lens' KeysAndAttributes (HashMap Text Text)
 kaaExpressionAttributeNames = lens _kaaExpressionAttributeNames (\ s a -> s{_kaaExpressionAttributeNames = a}) . _Default . _Map;
 
--- | One or more attributes to retrieve from the table or index. If no
--- attribute names are specified then all attributes will be returned. If
--- any of the specified attributes are not found, they will not appear in
--- the result.
-kaaAttributesToGet :: Lens' KeysAndAttributes (Maybe (NonEmpty Text))
-kaaAttributesToGet = lens _kaaAttributesToGet (\ s a -> s{_kaaAttributesToGet = a}) . mapping _List1;
+-- | The consistency of a read operation. If set to 'true', then a strongly
+-- consistent read is used; otherwise, an eventually consistent read is
+-- used.
+kaaConsistentRead :: Lens' KeysAndAttributes (Maybe Bool)
+kaaConsistentRead = lens _kaaConsistentRead (\ s a -> s{_kaaConsistentRead = a});
 
 -- | The primary key attribute values that define the items and the
 -- attributes associated with the items.
@@ -1524,9 +1523,9 @@
               (\ x ->
                  KeysAndAttributes' <$>
                    (x .:? "ProjectionExpression") <*>
-                     (x .:? "ConsistentRead")
+                     (x .:? "AttributesToGet")
                      <*> (x .:? "ExpressionAttributeNames" .!= mempty)
-                     <*> (x .:? "AttributesToGet")
+                     <*> (x .:? "ConsistentRead")
                      <*> (x .: "Keys"))
 
 instance ToJSON KeysAndAttributes where
@@ -1535,10 +1534,10 @@
               (catMaybes
                  [("ProjectionExpression" .=) <$>
                     _kaaProjectionExpression,
-                  ("ConsistentRead" .=) <$> _kaaConsistentRead,
+                  ("AttributesToGet" .=) <$> _kaaAttributesToGet,
                   ("ExpressionAttributeNames" .=) <$>
                     _kaaExpressionAttributeNames,
-                  ("AttributesToGet" .=) <$> _kaaAttributesToGet,
+                  ("ConsistentRead" .=) <$> _kaaConsistentRead,
                   Just ("Keys" .= _kaaKeys)])
 
 -- | Represents the properties of a local secondary index.
@@ -1911,30 +1910,25 @@
 --
 -- /See:/ 'streamSpecification' smart constructor.
 data StreamSpecification = StreamSpecification'
-    { _ssStreamEnabled  :: !(Maybe Bool)
-    , _ssStreamViewType :: !(Maybe StreamViewType)
+    { _ssStreamViewType :: !(Maybe StreamViewType)
+    , _ssStreamEnabled  :: !(Maybe Bool)
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'StreamSpecification' with the minimum fields required to make a request.
 --
 -- Use one of the following lenses to modify other fields as desired:
 --
--- * 'ssStreamEnabled'
---
 -- * 'ssStreamViewType'
+--
+-- * 'ssStreamEnabled'
 streamSpecification
     :: StreamSpecification
 streamSpecification =
     StreamSpecification'
-    { _ssStreamEnabled = Nothing
-    , _ssStreamViewType = Nothing
+    { _ssStreamViewType = Nothing
+    , _ssStreamEnabled = Nothing
     }
 
--- | Indicates whether DynamoDB Streams is enabled (true) or disabled (false)
--- on the table.
-ssStreamEnabled :: Lens' StreamSpecification (Maybe Bool)
-ssStreamEnabled = lens _ssStreamEnabled (\ s a -> s{_ssStreamEnabled = a});
-
 -- | The DynamoDB Streams settings for the table. These settings consist of:
 --
 -- -   /StreamEnabled/ - Indicates whether DynamoDB Streams is enabled
@@ -1959,33 +1953,38 @@
 ssStreamViewType :: Lens' StreamSpecification (Maybe StreamViewType)
 ssStreamViewType = lens _ssStreamViewType (\ s a -> s{_ssStreamViewType = a});
 
+-- | Indicates whether DynamoDB Streams is enabled (true) or disabled (false)
+-- on the table.
+ssStreamEnabled :: Lens' StreamSpecification (Maybe Bool)
+ssStreamEnabled = lens _ssStreamEnabled (\ s a -> s{_ssStreamEnabled = a});
+
 instance FromJSON StreamSpecification where
         parseJSON
           = withObject "StreamSpecification"
               (\ x ->
                  StreamSpecification' <$>
-                   (x .:? "StreamEnabled") <*> (x .:? "StreamViewType"))
+                   (x .:? "StreamViewType") <*> (x .:? "StreamEnabled"))
 
 instance ToJSON StreamSpecification where
         toJSON StreamSpecification'{..}
           = object
               (catMaybes
-                 [("StreamEnabled" .=) <$> _ssStreamEnabled,
-                  ("StreamViewType" .=) <$> _ssStreamViewType])
+                 [("StreamViewType" .=) <$> _ssStreamViewType,
+                  ("StreamEnabled" .=) <$> _ssStreamEnabled])
 
 -- | Represents the properties of a table.
 --
 -- /See:/ 'tableDescription' smart constructor.
 data TableDescription = TableDescription'
-    { _tdProvisionedThroughput  :: !(Maybe ProvisionedThroughputDescription)
+    { _tdTableSizeBytes         :: !(Maybe Integer)
     , _tdAttributeDefinitions   :: !(Maybe [AttributeDefinition])
     , _tdLatestStreamARN        :: !(Maybe Text)
-    , _tdTableSizeBytes         :: !(Maybe Integer)
+    , _tdProvisionedThroughput  :: !(Maybe ProvisionedThroughputDescription)
     , _tdTableStatus            :: !(Maybe TableStatus)
     , _tdTableARN               :: !(Maybe Text)
     , _tdKeySchema              :: !(Maybe (List1 KeySchemaElement))
-    , _tdLatestStreamLabel      :: !(Maybe Text)
     , _tdGlobalSecondaryIndexes :: !(Maybe [GlobalSecondaryIndexDescription])
+    , _tdLatestStreamLabel      :: !(Maybe Text)
     , _tdLocalSecondaryIndexes  :: !(Maybe [LocalSecondaryIndexDescription])
     , _tdCreationDateTime       :: !(Maybe POSIX)
     , _tdItemCount              :: !(Maybe Integer)
@@ -1997,13 +1996,13 @@
 --
 -- Use one of the following lenses to modify other fields as desired:
 --
--- * 'tdProvisionedThroughput'
+-- * 'tdTableSizeBytes'
 --
 -- * 'tdAttributeDefinitions'
 --
 -- * 'tdLatestStreamARN'
 --
--- * 'tdTableSizeBytes'
+-- * 'tdProvisionedThroughput'
 --
 -- * 'tdTableStatus'
 --
@@ -2011,10 +2010,10 @@
 --
 -- * 'tdKeySchema'
 --
--- * 'tdLatestStreamLabel'
---
 -- * 'tdGlobalSecondaryIndexes'
 --
+-- * 'tdLatestStreamLabel'
+--
 -- * 'tdLocalSecondaryIndexes'
 --
 -- * 'tdCreationDateTime'
@@ -2028,15 +2027,15 @@
     :: TableDescription
 tableDescription =
     TableDescription'
-    { _tdProvisionedThroughput = Nothing
+    { _tdTableSizeBytes = Nothing
     , _tdAttributeDefinitions = Nothing
     , _tdLatestStreamARN = Nothing
-    , _tdTableSizeBytes = Nothing
+    , _tdProvisionedThroughput = Nothing
     , _tdTableStatus = Nothing
     , _tdTableARN = Nothing
     , _tdKeySchema = Nothing
-    , _tdLatestStreamLabel = Nothing
     , _tdGlobalSecondaryIndexes = Nothing
+    , _tdLatestStreamLabel = Nothing
     , _tdLocalSecondaryIndexes = Nothing
     , _tdCreationDateTime = Nothing
     , _tdItemCount = Nothing
@@ -2044,10 +2043,11 @@
     , _tdStreamSpecification = Nothing
     }
 
--- | The provisioned throughput settings for the table, consisting of read
--- and write capacity units, along with data about increases and decreases.
-tdProvisionedThroughput :: Lens' TableDescription (Maybe ProvisionedThroughputDescription)
-tdProvisionedThroughput = lens _tdProvisionedThroughput (\ s a -> s{_tdProvisionedThroughput = a});
+-- | The total size of the specified table, in bytes. DynamoDB updates this
+-- value approximately every six hours. Recent changes might not be
+-- reflected in this value.
+tdTableSizeBytes :: Lens' TableDescription (Maybe Integer)
+tdTableSizeBytes = lens _tdTableSizeBytes (\ s a -> s{_tdTableSizeBytes = a});
 
 -- | An array of /AttributeDefinition/ objects. Each of these objects
 -- describes one attribute in the table and index key schema.
@@ -2066,11 +2066,10 @@
 tdLatestStreamARN :: Lens' TableDescription (Maybe Text)
 tdLatestStreamARN = lens _tdLatestStreamARN (\ s a -> s{_tdLatestStreamARN = a});
 
--- | The total size of the specified table, in bytes. DynamoDB updates this
--- value approximately every six hours. Recent changes might not be
--- reflected in this value.
-tdTableSizeBytes :: Lens' TableDescription (Maybe Integer)
-tdTableSizeBytes = lens _tdTableSizeBytes (\ s a -> s{_tdTableSizeBytes = a});
+-- | The provisioned throughput settings for the table, consisting of read
+-- and write capacity units, along with data about increases and decreases.
+tdProvisionedThroughput :: Lens' TableDescription (Maybe ProvisionedThroughputDescription)
+tdProvisionedThroughput = lens _tdProvisionedThroughput (\ s a -> s{_tdProvisionedThroughput = a});
 
 -- | The current state of the table:
 --
@@ -2103,22 +2102,6 @@
 tdKeySchema :: Lens' TableDescription (Maybe (NonEmpty KeySchemaElement))
 tdKeySchema = lens _tdKeySchema (\ s a -> s{_tdKeySchema = a}) . mapping _List1;
 
--- | A timestamp, in ISO 8601 format, for this stream.
---
--- Note that /LatestStreamLabel/ is not a unique identifier for the stream,
--- because it is possible that a stream from another table might have the
--- same timestamp. However, the combination of the following three elements
--- is guaranteed to be unique:
---
--- -   the AWS customer ID.
---
--- -   the table name.
---
--- -   the /StreamLabel/.
---
-tdLatestStreamLabel :: Lens' TableDescription (Maybe Text)
-tdLatestStreamLabel = lens _tdLatestStreamLabel (\ s a -> s{_tdLatestStreamLabel = a});
-
 -- | The global secondary indexes, if any, on the table. Each index is scoped
 -- to a given hash key value. Each element is composed of:
 --
@@ -2187,6 +2170,22 @@
 tdGlobalSecondaryIndexes :: Lens' TableDescription [GlobalSecondaryIndexDescription]
 tdGlobalSecondaryIndexes = lens _tdGlobalSecondaryIndexes (\ s a -> s{_tdGlobalSecondaryIndexes = a}) . _Default . _Coerce;
 
+-- | A timestamp, in ISO 8601 format, for this stream.
+--
+-- Note that /LatestStreamLabel/ is not a unique identifier for the stream,
+-- because it is possible that a stream from another table might have the
+-- same timestamp. However, the combination of the following three elements
+-- is guaranteed to be unique:
+--
+-- -   the AWS customer ID.
+--
+-- -   the table name.
+--
+-- -   the /StreamLabel/.
+--
+tdLatestStreamLabel :: Lens' TableDescription (Maybe Text)
+tdLatestStreamLabel = lens _tdLatestStreamLabel (\ s a -> s{_tdLatestStreamLabel = a});
+
 -- | Represents one or more local secondary indexes on the table. Each index
 -- is scoped to a given hash key value. Tables with one or more local
 -- secondary indexes are subject to an item collection size limit, where
@@ -2261,15 +2260,15 @@
           = withObject "TableDescription"
               (\ x ->
                  TableDescription' <$>
-                   (x .:? "ProvisionedThroughput") <*>
+                   (x .:? "TableSizeBytes") <*>
                      (x .:? "AttributeDefinitions" .!= mempty)
                      <*> (x .:? "LatestStreamArn")
-                     <*> (x .:? "TableSizeBytes")
+                     <*> (x .:? "ProvisionedThroughput")
                      <*> (x .:? "TableStatus")
                      <*> (x .:? "TableArn")
                      <*> (x .:? "KeySchema")
-                     <*> (x .:? "LatestStreamLabel")
                      <*> (x .:? "GlobalSecondaryIndexes" .!= mempty)
+                     <*> (x .:? "LatestStreamLabel")
                      <*> (x .:? "LocalSecondaryIndexes" .!= mempty)
                      <*> (x .:? "CreationDateTime")
                      <*> (x .:? "ItemCount")
@@ -2327,43 +2326,43 @@
 --
 -- /See:/ 'writeRequest' smart constructor.
 data WriteRequest = WriteRequest'
-    { _wrPutRequest    :: !(Maybe PutRequest)
-    , _wrDeleteRequest :: !(Maybe DeleteRequest)
+    { _wrDeleteRequest :: !(Maybe DeleteRequest)
+    , _wrPutRequest    :: !(Maybe PutRequest)
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'WriteRequest' with the minimum fields required to make a request.
 --
 -- Use one of the following lenses to modify other fields as desired:
 --
--- * 'wrPutRequest'
---
 -- * 'wrDeleteRequest'
+--
+-- * 'wrPutRequest'
 writeRequest
     :: WriteRequest
 writeRequest =
     WriteRequest'
-    { _wrPutRequest = Nothing
-    , _wrDeleteRequest = Nothing
+    { _wrDeleteRequest = Nothing
+    , _wrPutRequest = Nothing
     }
 
--- | A request to perform a /PutItem/ operation.
-wrPutRequest :: Lens' WriteRequest (Maybe PutRequest)
-wrPutRequest = lens _wrPutRequest (\ s a -> s{_wrPutRequest = a});
-
 -- | A request to perform a /DeleteItem/ operation.
 wrDeleteRequest :: Lens' WriteRequest (Maybe DeleteRequest)
 wrDeleteRequest = lens _wrDeleteRequest (\ s a -> s{_wrDeleteRequest = a});
 
+-- | A request to perform a /PutItem/ operation.
+wrPutRequest :: Lens' WriteRequest (Maybe PutRequest)
+wrPutRequest = lens _wrPutRequest (\ s a -> s{_wrPutRequest = a});
+
 instance FromJSON WriteRequest where
         parseJSON
           = withObject "WriteRequest"
               (\ x ->
                  WriteRequest' <$>
-                   (x .:? "PutRequest") <*> (x .:? "DeleteRequest"))
+                   (x .:? "DeleteRequest") <*> (x .:? "PutRequest"))
 
 instance ToJSON WriteRequest where
         toJSON WriteRequest'{..}
           = object
               (catMaybes
-                 [("PutRequest" .=) <$> _wrPutRequest,
-                  ("DeleteRequest" .=) <$> _wrDeleteRequest])
+                 [("DeleteRequest" .=) <$> _wrDeleteRequest,
+                  ("PutRequest" .=) <$> _wrPutRequest])
diff --git a/gen/Network/AWS/DynamoDB/UpdateItem.hs b/gen/Network/AWS/DynamoDB/UpdateItem.hs
--- a/gen/Network/AWS/DynamoDB/UpdateItem.hs
+++ b/gen/Network/AWS/DynamoDB/UpdateItem.hs
@@ -36,12 +36,12 @@
       updateItem
     , UpdateItem
     -- * Request Lenses
-    , uiReturnValues
     , uiExpressionAttributeNames
+    , uiReturnValues
     , uiUpdateExpression
+    , uiExpressionAttributeValues
     , uiAttributeUpdates
     , uiReturnConsumedCapacity
-    , uiExpressionAttributeValues
     , uiReturnItemCollectionMetrics
     , uiConditionExpression
     , uiConditionalOperator
@@ -53,10 +53,10 @@
     , updateItemResponse
     , UpdateItemResponse
     -- * Response Lenses
-    , uirsConsumedCapacity
     , uirsItemCollectionMetrics
+    , uirsConsumedCapacity
     , uirsAttributes
-    , uirsStatus
+    , uirsResponseStatus
     ) where
 
 import           Network.AWS.DynamoDB.Types
@@ -69,12 +69,12 @@
 --
 -- /See:/ 'updateItem' smart constructor.
 data UpdateItem = UpdateItem'
-    { _uiReturnValues                :: !(Maybe ReturnValue)
-    , _uiExpressionAttributeNames    :: !(Maybe (Map Text Text))
+    { _uiExpressionAttributeNames    :: !(Maybe (Map Text Text))
+    , _uiReturnValues                :: !(Maybe ReturnValue)
     , _uiUpdateExpression            :: !(Maybe Text)
+    , _uiExpressionAttributeValues   :: !(Maybe (Map Text AttributeValue))
     , _uiAttributeUpdates            :: !(Maybe (Map Text AttributeValueUpdate))
     , _uiReturnConsumedCapacity      :: !(Maybe ReturnConsumedCapacity)
-    , _uiExpressionAttributeValues   :: !(Maybe (Map Text AttributeValue))
     , _uiReturnItemCollectionMetrics :: !(Maybe ReturnItemCollectionMetrics)
     , _uiConditionExpression         :: !(Maybe Text)
     , _uiConditionalOperator         :: !(Maybe ConditionalOperator)
@@ -87,18 +87,18 @@
 --
 -- Use one of the following lenses to modify other fields as desired:
 --
--- * 'uiReturnValues'
---
 -- * 'uiExpressionAttributeNames'
 --
+-- * 'uiReturnValues'
+--
 -- * 'uiUpdateExpression'
 --
+-- * 'uiExpressionAttributeValues'
+--
 -- * 'uiAttributeUpdates'
 --
 -- * 'uiReturnConsumedCapacity'
 --
--- * 'uiExpressionAttributeValues'
---
 -- * 'uiReturnItemCollectionMetrics'
 --
 -- * 'uiConditionExpression'
@@ -115,12 +115,12 @@
     -> UpdateItem
 updateItem pTableName_ =
     UpdateItem'
-    { _uiReturnValues = Nothing
-    , _uiExpressionAttributeNames = Nothing
+    { _uiExpressionAttributeNames = Nothing
+    , _uiReturnValues = Nothing
     , _uiUpdateExpression = Nothing
+    , _uiExpressionAttributeValues = Nothing
     , _uiAttributeUpdates = Nothing
     , _uiReturnConsumedCapacity = Nothing
-    , _uiExpressionAttributeValues = Nothing
     , _uiReturnItemCollectionMetrics = Nothing
     , _uiConditionExpression = Nothing
     , _uiConditionalOperator = Nothing
@@ -129,29 +129,6 @@
     , _uiKey = mempty
     }
 
--- | Use /ReturnValues/ if you want to get the item attributes as they
--- appeared either before or after they were updated. For /UpdateItem/, the
--- valid values are:
---
--- -   'NONE' - If /ReturnValues/ is not specified, or if its value is
---     'NONE', then nothing is returned. (This setting is the default for
---     /ReturnValues/.)
---
--- -   'ALL_OLD' - If /UpdateItem/ overwrote an attribute name-value pair,
---     then the content of the old item is returned.
---
--- -   'UPDATED_OLD' - The old versions of only the updated attributes are
---     returned.
---
--- -   'ALL_NEW' - All of the attributes of the new version of the item are
---     returned.
---
--- -   'UPDATED_NEW' - The new versions of only the updated attributes are
---     returned.
---
-uiReturnValues :: Lens' UpdateItem (Maybe ReturnValue)
-uiReturnValues = lens _uiReturnValues (\ s a -> s{_uiReturnValues = a});
-
 -- | One or more substitution tokens for attribute names in an expression.
 -- The following are some use cases for using /ExpressionAttributeNames/:
 --
@@ -192,6 +169,29 @@
 uiExpressionAttributeNames :: Lens' UpdateItem (HashMap Text Text)
 uiExpressionAttributeNames = lens _uiExpressionAttributeNames (\ s a -> s{_uiExpressionAttributeNames = a}) . _Default . _Map;
 
+-- | Use /ReturnValues/ if you want to get the item attributes as they
+-- appeared either before or after they were updated. For /UpdateItem/, the
+-- valid values are:
+--
+-- -   'NONE' - If /ReturnValues/ is not specified, or if its value is
+--     'NONE', then nothing is returned. (This setting is the default for
+--     /ReturnValues/.)
+--
+-- -   'ALL_OLD' - If /UpdateItem/ overwrote an attribute name-value pair,
+--     then the content of the old item is returned.
+--
+-- -   'UPDATED_OLD' - The old versions of only the updated attributes are
+--     returned.
+--
+-- -   'ALL_NEW' - All of the attributes of the new version of the item are
+--     returned.
+--
+-- -   'UPDATED_NEW' - The new versions of only the updated attributes are
+--     returned.
+--
+uiReturnValues :: Lens' UpdateItem (Maybe ReturnValue)
+uiReturnValues = lens _uiReturnValues (\ s a -> s{_uiReturnValues = a});
+
 -- | An expression that defines one or more attributes to be updated, the
 -- action to be performed on them, and new value(s) for them.
 --
@@ -280,6 +280,28 @@
 uiUpdateExpression :: Lens' UpdateItem (Maybe Text)
 uiUpdateExpression = lens _uiUpdateExpression (\ s a -> s{_uiUpdateExpression = a});
 
+-- | One or more values that can be substituted in an expression.
+--
+-- Use the __:__ (colon) character in an expression to dereference an
+-- attribute value. For example, suppose that you wanted to check whether
+-- the value of the /ProductStatus/ attribute was one of the following:
+--
+-- 'Available | Backordered | Discontinued'
+--
+-- You would first need to specify /ExpressionAttributeValues/ as follows:
+--
+-- '{ \":avail\":{\"S\":\"Available\"}, \":back\":{\"S\":\"Backordered\"}, \":disc\":{\"S\":\"Discontinued\"} }'
+--
+-- You could then use these values in an expression, such as this:
+--
+-- 'ProductStatus IN (:avail, :back, :disc)'
+--
+-- For more information on expression attribute values, see
+-- <http://docs.aws.amazon.com/amazondynamodb/latest/developerguide/Expressions.SpecifyingConditions.html Specifying Conditions>
+-- in the /Amazon DynamoDB Developer Guide/.
+uiExpressionAttributeValues :: Lens' UpdateItem (HashMap Text AttributeValue)
+uiExpressionAttributeValues = lens _uiExpressionAttributeValues (\ s a -> s{_uiExpressionAttributeValues = a}) . _Default . _Map;
+
 -- | This is a legacy parameter, for backward compatibility. New applications
 -- should use /UpdateExpression/ instead. Do not combine legacy parameters
 -- and expression parameters in a single API call; otherwise, DynamoDB will
@@ -384,28 +406,6 @@
 uiReturnConsumedCapacity :: Lens' UpdateItem (Maybe ReturnConsumedCapacity)
 uiReturnConsumedCapacity = lens _uiReturnConsumedCapacity (\ s a -> s{_uiReturnConsumedCapacity = a});
 
--- | One or more values that can be substituted in an expression.
---
--- Use the __:__ (colon) character in an expression to dereference an
--- attribute value. For example, suppose that you wanted to check whether
--- the value of the /ProductStatus/ attribute was one of the following:
---
--- 'Available | Backordered | Discontinued'
---
--- You would first need to specify /ExpressionAttributeValues/ as follows:
---
--- '{ \":avail\":{\"S\":\"Available\"}, \":back\":{\"S\":\"Backordered\"}, \":disc\":{\"S\":\"Discontinued\"} }'
---
--- You could then use these values in an expression, such as this:
---
--- 'ProductStatus IN (:avail, :back, :disc)'
---
--- For more information on expression attribute values, see
--- <http://docs.aws.amazon.com/amazondynamodb/latest/developerguide/Expressions.SpecifyingConditions.html Specifying Conditions>
--- in the /Amazon DynamoDB Developer Guide/.
-uiExpressionAttributeValues :: Lens' UpdateItem (HashMap Text AttributeValue)
-uiExpressionAttributeValues = lens _uiExpressionAttributeValues (\ s a -> s{_uiExpressionAttributeValues = a}) . _Default . _Map;
-
 -- | Determines whether item collection metrics are returned. If set to
 -- 'SIZE', the response includes statistics about item collections, if any,
 -- that were modified during the operation are returned in the response. If
@@ -704,8 +704,8 @@
           = receiveJSON
               (\ s h x ->
                  UpdateItemResponse' <$>
-                   (x .?> "ConsumedCapacity") <*>
-                     (x .?> "ItemCollectionMetrics")
+                   (x .?> "ItemCollectionMetrics") <*>
+                     (x .?> "ConsumedCapacity")
                      <*> (x .?> "Attributes" .!@ mempty)
                      <*> (pure (fromEnum s)))
 
@@ -722,15 +722,15 @@
         toJSON UpdateItem'{..}
           = object
               (catMaybes
-                 [("ReturnValues" .=) <$> _uiReturnValues,
-                  ("ExpressionAttributeNames" .=) <$>
+                 [("ExpressionAttributeNames" .=) <$>
                     _uiExpressionAttributeNames,
+                  ("ReturnValues" .=) <$> _uiReturnValues,
                   ("UpdateExpression" .=) <$> _uiUpdateExpression,
+                  ("ExpressionAttributeValues" .=) <$>
+                    _uiExpressionAttributeValues,
                   ("AttributeUpdates" .=) <$> _uiAttributeUpdates,
                   ("ReturnConsumedCapacity" .=) <$>
                     _uiReturnConsumedCapacity,
-                  ("ExpressionAttributeValues" .=) <$>
-                    _uiExpressionAttributeValues,
                   ("ReturnItemCollectionMetrics" .=) <$>
                     _uiReturnItemCollectionMetrics,
                   ("ConditionExpression" .=) <$>
@@ -751,42 +751,42 @@
 --
 -- /See:/ 'updateItemResponse' smart constructor.
 data UpdateItemResponse = UpdateItemResponse'
-    { _uirsConsumedCapacity      :: !(Maybe ConsumedCapacity)
-    , _uirsItemCollectionMetrics :: !(Maybe ItemCollectionMetrics)
+    { _uirsItemCollectionMetrics :: !(Maybe ItemCollectionMetrics)
+    , _uirsConsumedCapacity      :: !(Maybe ConsumedCapacity)
     , _uirsAttributes            :: !(Maybe (Map Text AttributeValue))
-    , _uirsStatus                :: !Int
+    , _uirsResponseStatus        :: !Int
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'UpdateItemResponse' with the minimum fields required to make a request.
 --
 -- Use one of the following lenses to modify other fields as desired:
 --
--- * 'uirsConsumedCapacity'
---
 -- * 'uirsItemCollectionMetrics'
 --
+-- * 'uirsConsumedCapacity'
+--
 -- * 'uirsAttributes'
 --
--- * 'uirsStatus'
+-- * 'uirsResponseStatus'
 updateItemResponse
-    :: Int -- ^ 'uirsStatus'
+    :: Int -- ^ 'uirsResponseStatus'
     -> UpdateItemResponse
-updateItemResponse pStatus_ =
+updateItemResponse pResponseStatus_ =
     UpdateItemResponse'
-    { _uirsConsumedCapacity = Nothing
-    , _uirsItemCollectionMetrics = Nothing
+    { _uirsItemCollectionMetrics = Nothing
+    , _uirsConsumedCapacity = Nothing
     , _uirsAttributes = Nothing
-    , _uirsStatus = pStatus_
+    , _uirsResponseStatus = pResponseStatus_
     }
 
 -- | Undocumented member.
-uirsConsumedCapacity :: Lens' UpdateItemResponse (Maybe ConsumedCapacity)
-uirsConsumedCapacity = lens _uirsConsumedCapacity (\ s a -> s{_uirsConsumedCapacity = a});
-
--- | Undocumented member.
 uirsItemCollectionMetrics :: Lens' UpdateItemResponse (Maybe ItemCollectionMetrics)
 uirsItemCollectionMetrics = lens _uirsItemCollectionMetrics (\ s a -> s{_uirsItemCollectionMetrics = a});
 
+-- | Undocumented member.
+uirsConsumedCapacity :: Lens' UpdateItemResponse (Maybe ConsumedCapacity)
+uirsConsumedCapacity = lens _uirsConsumedCapacity (\ s a -> s{_uirsConsumedCapacity = a});
+
 -- | A map of attribute values as they appeared before the /UpdateItem/
 -- operation. This map only appears if /ReturnValues/ was specified as
 -- something other than 'NONE' in the request. Each element represents one
@@ -795,5 +795,5 @@
 uirsAttributes = lens _uirsAttributes (\ s a -> s{_uirsAttributes = a}) . _Default . _Map;
 
 -- | The response status code.
-uirsStatus :: Lens' UpdateItemResponse Int
-uirsStatus = lens _uirsStatus (\ s a -> s{_uirsStatus = a});
+uirsResponseStatus :: Lens' UpdateItemResponse Int
+uirsResponseStatus = lens _uirsResponseStatus (\ s a -> s{_uirsResponseStatus = a});
diff --git a/gen/Network/AWS/DynamoDB/UpdateTable.hs b/gen/Network/AWS/DynamoDB/UpdateTable.hs
--- a/gen/Network/AWS/DynamoDB/UpdateTable.hs
+++ b/gen/Network/AWS/DynamoDB/UpdateTable.hs
@@ -46,8 +46,8 @@
       updateTable
     , UpdateTable
     -- * Request Lenses
-    , utProvisionedThroughput
     , utAttributeDefinitions
+    , utProvisionedThroughput
     , utGlobalSecondaryIndexUpdates
     , utStreamSpecification
     , utTableName
@@ -57,7 +57,7 @@
     , UpdateTableResponse
     -- * Response Lenses
     , utrsTableDescription
-    , utrsStatus
+    , utrsResponseStatus
     ) where
 
 import           Network.AWS.DynamoDB.Types
@@ -70,8 +70,8 @@
 --
 -- /See:/ 'updateTable' smart constructor.
 data UpdateTable = UpdateTable'
-    { _utProvisionedThroughput       :: !(Maybe ProvisionedThroughput)
-    , _utAttributeDefinitions        :: !(Maybe [AttributeDefinition])
+    { _utAttributeDefinitions        :: !(Maybe [AttributeDefinition])
+    , _utProvisionedThroughput       :: !(Maybe ProvisionedThroughput)
     , _utGlobalSecondaryIndexUpdates :: !(Maybe [GlobalSecondaryIndexUpdate])
     , _utStreamSpecification         :: !(Maybe StreamSpecification)
     , _utTableName                   :: !Text
@@ -81,10 +81,10 @@
 --
 -- Use one of the following lenses to modify other fields as desired:
 --
--- * 'utProvisionedThroughput'
---
 -- * 'utAttributeDefinitions'
 --
+-- * 'utProvisionedThroughput'
+--
 -- * 'utGlobalSecondaryIndexUpdates'
 --
 -- * 'utStreamSpecification'
@@ -95,23 +95,23 @@
     -> UpdateTable
 updateTable pTableName_ =
     UpdateTable'
-    { _utProvisionedThroughput = Nothing
-    , _utAttributeDefinitions = Nothing
+    { _utAttributeDefinitions = Nothing
+    , _utProvisionedThroughput = Nothing
     , _utGlobalSecondaryIndexUpdates = Nothing
     , _utStreamSpecification = Nothing
     , _utTableName = pTableName_
     }
 
--- | Undocumented member.
-utProvisionedThroughput :: Lens' UpdateTable (Maybe ProvisionedThroughput)
-utProvisionedThroughput = lens _utProvisionedThroughput (\ s a -> s{_utProvisionedThroughput = a});
-
 -- | An array of attributes that describe the key schema for the table and
 -- indexes. If you are adding a new global secondary index to the table,
 -- /AttributeDefinitions/ must include the key element(s) of the new index.
 utAttributeDefinitions :: Lens' UpdateTable [AttributeDefinition]
 utAttributeDefinitions = lens _utAttributeDefinitions (\ s a -> s{_utAttributeDefinitions = a}) . _Default . _Coerce;
 
+-- | Undocumented member.
+utProvisionedThroughput :: Lens' UpdateTable (Maybe ProvisionedThroughput)
+utProvisionedThroughput = lens _utProvisionedThroughput (\ s a -> s{_utProvisionedThroughput = a});
+
 -- | An array of one or more global secondary indexes for the table. For each
 -- index in the array, you can request one action:
 --
@@ -162,10 +162,10 @@
         toJSON UpdateTable'{..}
           = object
               (catMaybes
-                 [("ProvisionedThroughput" .=) <$>
-                    _utProvisionedThroughput,
-                  ("AttributeDefinitions" .=) <$>
+                 [("AttributeDefinitions" .=) <$>
                     _utAttributeDefinitions,
+                  ("ProvisionedThroughput" .=) <$>
+                    _utProvisionedThroughput,
                   ("GlobalSecondaryIndexUpdates" .=) <$>
                     _utGlobalSecondaryIndexUpdates,
                   ("StreamSpecification" .=) <$>
@@ -183,7 +183,7 @@
 -- /See:/ 'updateTableResponse' smart constructor.
 data UpdateTableResponse = UpdateTableResponse'
     { _utrsTableDescription :: !(Maybe TableDescription)
-    , _utrsStatus           :: !Int
+    , _utrsResponseStatus   :: !Int
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'UpdateTableResponse' with the minimum fields required to make a request.
@@ -192,14 +192,14 @@
 --
 -- * 'utrsTableDescription'
 --
--- * 'utrsStatus'
+-- * 'utrsResponseStatus'
 updateTableResponse
-    :: Int -- ^ 'utrsStatus'
+    :: Int -- ^ 'utrsResponseStatus'
     -> UpdateTableResponse
-updateTableResponse pStatus_ =
+updateTableResponse pResponseStatus_ =
     UpdateTableResponse'
     { _utrsTableDescription = Nothing
-    , _utrsStatus = pStatus_
+    , _utrsResponseStatus = pResponseStatus_
     }
 
 -- | Undocumented member.
@@ -207,5 +207,5 @@
 utrsTableDescription = lens _utrsTableDescription (\ s a -> s{_utrsTableDescription = a});
 
 -- | The response status code.
-utrsStatus :: Lens' UpdateTableResponse Int
-utrsStatus = lens _utrsStatus (\ s a -> s{_utrsStatus = a});
+utrsResponseStatus :: Lens' UpdateTableResponse Int
+utrsResponseStatus = lens _utrsResponseStatus (\ s a -> s{_utrsResponseStatus = a});
diff --git a/test/Test/AWS/Gen/DynamoDB.hs b/test/Test/AWS/Gen/DynamoDB.hs
--- a/test/Test/AWS/Gen/DynamoDB.hs
+++ b/test/Test/AWS/Gen/DynamoDB.hs
@@ -28,14 +28,14 @@
 -- fixtures :: TestTree
 -- fixtures =
 --     [ testGroup "request"
---         [ testUpdateItem $
---             updateItem
+--         [ testPutItem $
+--             putItem
 --
 --         , testDeleteItem $
 --             deleteItem
 --
---         , testPutItem $
---             putItem
+--         , testUpdateItem $
+--             updateItem
 --
 --         , testDeleteTable $
 --             deleteTable
@@ -55,12 +55,12 @@
 --         , testBatchWriteItem $
 --             batchWriteItem
 --
---         , testScan $
---             scan
---
 --         , testListTables $
 --             listTables
 --
+--         , testScan $
+--             scan
+--
 --         , testQuery $
 --             query
 --
@@ -70,14 +70,14 @@
 --           ]
 
 --     , testGroup "response"
---         [ testUpdateItemResponse $
---             updateItemResponse
+--         [ testPutItemResponse $
+--             putItemResponse
 --
 --         , testDeleteItemResponse $
 --             deleteItemResponse
 --
---         , testPutItemResponse $
---             putItemResponse
+--         , testUpdateItemResponse $
+--             updateItemResponse
 --
 --         , testDeleteTableResponse $
 --             deleteTableResponse
@@ -97,12 +97,12 @@
 --         , testBatchWriteItemResponse $
 --             batchWriteItemResponse
 --
---         , testScanResponse $
---             scanResponse
---
 --         , testListTablesResponse $
 --             listTablesResponse
 --
+--         , testScanResponse $
+--             scanResponse
+--
 --         , testQueryResponse $
 --             queryResponse
 --
@@ -114,20 +114,20 @@
 
 -- Requests
 
-testUpdateItem :: UpdateItem -> TestTree
-testUpdateItem = req
-    "UpdateItem"
-    "fixture/UpdateItem.yaml"
+testPutItem :: PutItem -> TestTree
+testPutItem = req
+    "PutItem"
+    "fixture/PutItem.yaml"
 
 testDeleteItem :: DeleteItem -> TestTree
 testDeleteItem = req
     "DeleteItem"
     "fixture/DeleteItem.yaml"
 
-testPutItem :: PutItem -> TestTree
-testPutItem = req
-    "PutItem"
-    "fixture/PutItem.yaml"
+testUpdateItem :: UpdateItem -> TestTree
+testUpdateItem = req
+    "UpdateItem"
+    "fixture/UpdateItem.yaml"
 
 testDeleteTable :: DeleteTable -> TestTree
 testDeleteTable = req
@@ -159,16 +159,16 @@
     "BatchWriteItem"
     "fixture/BatchWriteItem.yaml"
 
-testScan :: Scan -> TestTree
-testScan = req
-    "Scan"
-    "fixture/Scan.yaml"
-
 testListTables :: ListTables -> TestTree
 testListTables = req
     "ListTables"
     "fixture/ListTables.yaml"
 
+testScan :: Scan -> TestTree
+testScan = req
+    "Scan"
+    "fixture/Scan.yaml"
+
 testQuery :: Query -> TestTree
 testQuery = req
     "Query"
@@ -181,12 +181,12 @@
 
 -- Responses
 
-testUpdateItemResponse :: UpdateItemResponse -> TestTree
-testUpdateItemResponse = res
-    "UpdateItemResponse"
-    "fixture/UpdateItemResponse.proto"
+testPutItemResponse :: PutItemResponse -> TestTree
+testPutItemResponse = res
+    "PutItemResponse"
+    "fixture/PutItemResponse.proto"
     dynamoDB
-    (Proxy :: Proxy UpdateItem)
+    (Proxy :: Proxy PutItem)
 
 testDeleteItemResponse :: DeleteItemResponse -> TestTree
 testDeleteItemResponse = res
@@ -195,12 +195,12 @@
     dynamoDB
     (Proxy :: Proxy DeleteItem)
 
-testPutItemResponse :: PutItemResponse -> TestTree
-testPutItemResponse = res
-    "PutItemResponse"
-    "fixture/PutItemResponse.proto"
+testUpdateItemResponse :: UpdateItemResponse -> TestTree
+testUpdateItemResponse = res
+    "UpdateItemResponse"
+    "fixture/UpdateItemResponse.proto"
     dynamoDB
-    (Proxy :: Proxy PutItem)
+    (Proxy :: Proxy UpdateItem)
 
 testDeleteTableResponse :: DeleteTableResponse -> TestTree
 testDeleteTableResponse = res
@@ -244,19 +244,19 @@
     dynamoDB
     (Proxy :: Proxy BatchWriteItem)
 
-testScanResponse :: ScanResponse -> TestTree
-testScanResponse = res
-    "ScanResponse"
-    "fixture/ScanResponse.proto"
-    dynamoDB
-    (Proxy :: Proxy Scan)
-
 testListTablesResponse :: ListTablesResponse -> TestTree
 testListTablesResponse = res
     "ListTablesResponse"
     "fixture/ListTablesResponse.proto"
     dynamoDB
     (Proxy :: Proxy ListTables)
+
+testScanResponse :: ScanResponse -> TestTree
+testScanResponse = res
+    "ScanResponse"
+    "fixture/ScanResponse.proto"
+    dynamoDB
+    (Proxy :: Proxy Scan)
 
 testQueryResponse :: QueryResponse -> TestTree
 testQueryResponse = res
