diff --git a/amazonka-s3.cabal b/amazonka-s3.cabal
--- a/amazonka-s3.cabal
+++ b/amazonka-s3.cabal
@@ -1,5 +1,5 @@
 name:                  amazonka-s3
-version:               0.0.6
+version:               0.0.7
 synopsis:              Amazon Simple Storage Service SDK.
 homepage:              https://github.com/brendanhay/amazonka
 license:               OtherLicense
@@ -94,5 +94,5 @@
           Network.AWS.S3.Internal
 
     build-depends:
-          amazonka-core == 0.0.6.*
+          amazonka-core == 0.0.7.*
         , base          >= 4.7     && < 5
diff --git a/gen/Network/AWS/S3/CompleteMultipartUpload.hs b/gen/Network/AWS/S3/CompleteMultipartUpload.hs
--- a/gen/Network/AWS/S3/CompleteMultipartUpload.hs
+++ b/gen/Network/AWS/S3/CompleteMultipartUpload.hs
@@ -161,7 +161,8 @@
 cmur1Location :: Lens' CompleteMultipartUploadResponse (Maybe Text)
 cmur1Location = lens _cmur1Location (\s a -> s { _cmur1Location = a })
 
--- | If present, specifies the AWS KMS key used to encrypt the object.
+-- | If present, specifies the ID of the AWS Key Management Service (KMS) master
+-- encryption key that was used for the object.
 cmur1SSEKMSKeyId :: Lens' CompleteMultipartUploadResponse (Maybe Text)
 cmur1SSEKMSKeyId = lens _cmur1SSEKMSKeyId (\s a -> s { _cmur1SSEKMSKeyId = a }) . mapping _Sensitive
 
diff --git a/gen/Network/AWS/S3/CopyObject.hs b/gen/Network/AWS/S3/CopyObject.hs
--- a/gen/Network/AWS/S3/CopyObject.hs
+++ b/gen/Network/AWS/S3/CopyObject.hs
@@ -47,7 +47,6 @@
     , coCopySourceSSECustomerAlgorithm
     , coCopySourceSSECustomerKey
     , coCopySourceSSECustomerKeyMD5
-    , coCopySourceSSEKMSKeyId
     , coExpires
     , coGrantFullControl
     , coGrantRead
@@ -59,6 +58,7 @@
     , coSSECustomerAlgorithm
     , coSSECustomerKey
     , coSSECustomerKeyMD5
+    , coSSEKMSKeyId
     , coServerSideEncryption
     , coStorageClass
     , coWebsiteRedirectLocation
@@ -98,7 +98,6 @@
     , _coCopySourceSSECustomerAlgorithm :: Maybe Text
     , _coCopySourceSSECustomerKey       :: Maybe (Sensitive Text)
     , _coCopySourceSSECustomerKeyMD5    :: Maybe Text
-    , _coCopySourceSSEKMSKeyId          :: Maybe (Sensitive Text)
     , _coExpires                        :: Maybe RFC822
     , _coGrantFullControl               :: Maybe Text
     , _coGrantRead                      :: Maybe Text
@@ -110,6 +109,7 @@
     , _coSSECustomerAlgorithm           :: Maybe Text
     , _coSSECustomerKey                 :: Maybe (Sensitive Text)
     , _coSSECustomerKeyMD5              :: Maybe Text
+    , _coSSEKMSKeyId                    :: Maybe (Sensitive Text)
     , _coServerSideEncryption           :: Maybe ServerSideEncryption
     , _coStorageClass                   :: Maybe StorageClass
     , _coWebsiteRedirectLocation        :: Maybe Text
@@ -149,8 +149,6 @@
 --
 -- * 'coCopySourceSSECustomerKeyMD5' @::@ 'Maybe' 'Text'
 --
--- * 'coCopySourceSSEKMSKeyId' @::@ 'Maybe' 'Text'
---
 -- * 'coExpires' @::@ 'Maybe' 'UTCTime'
 --
 -- * 'coGrantFullControl' @::@ 'Maybe' 'Text'
@@ -173,6 +171,8 @@
 --
 -- * 'coSSECustomerKeyMD5' @::@ 'Maybe' 'Text'
 --
+-- * 'coSSEKMSKeyId' @::@ 'Maybe' 'Text'
+--
 -- * 'coServerSideEncryption' @::@ 'Maybe' 'ServerSideEncryption'
 --
 -- * 'coStorageClass' @::@ 'Maybe' 'StorageClass'
@@ -210,10 +210,10 @@
     , _coSSECustomerAlgorithm           = Nothing
     , _coSSECustomerKey                 = Nothing
     , _coSSECustomerKeyMD5              = Nothing
+    , _coSSEKMSKeyId                    = Nothing
     , _coCopySourceSSECustomerAlgorithm = Nothing
     , _coCopySourceSSECustomerKey       = Nothing
     , _coCopySourceSSECustomerKeyMD5    = Nothing
-    , _coCopySourceSSEKMSKeyId          = Nothing
     }
 
 -- | The canned ACL to apply to the object.
@@ -302,12 +302,6 @@
     lens _coCopySourceSSECustomerKeyMD5
         (\s a -> s { _coCopySourceSSECustomerKeyMD5 = a })
 
--- | Specifies the AWS KMS key ID to use for object encryption.
-coCopySourceSSEKMSKeyId :: Lens' CopyObject (Maybe Text)
-coCopySourceSSEKMSKeyId =
-    lens _coCopySourceSSEKMSKeyId (\s a -> s { _coCopySourceSSEKMSKeyId = a })
-        . mapping _Sensitive
-
 -- | The date and time at which the object is no longer cacheable.
 coExpires :: Lens' CopyObject (Maybe UTCTime)
 coExpires = lens _coExpires (\s a -> s { _coExpires = a }) . mapping _Time
@@ -363,6 +357,14 @@
 coSSECustomerKeyMD5 =
     lens _coSSECustomerKeyMD5 (\s a -> s { _coSSECustomerKeyMD5 = a })
 
+-- | Specifies the AWS KMS key ID to use for object encryption. All GET and PUT
+-- requests for an object protected by AWS KMS will fail if not made via SSL or
+-- using SigV4. Documentation on configuring any of the officially supported AWS
+-- SDKs and CLI can be found at
+-- http://docs.aws.amazon.com/AmazonS3/latest/dev/UsingAWSSDK.html#specify-signature-version
+coSSEKMSKeyId :: Lens' CopyObject (Maybe Text)
+coSSEKMSKeyId = lens _coSSEKMSKeyId (\s a -> s { _coSSEKMSKeyId = a }) . mapping _Sensitive
+
 -- | The Server-side encryption algorithm used when storing this object in S3
 -- (e.g., AES256, aws:kms).
 coServerSideEncryption :: Lens' CopyObject (Maybe ServerSideEncryption)
@@ -446,7 +448,8 @@
 corSSECustomerKeyMD5 =
     lens _corSSECustomerKeyMD5 (\s a -> s { _corSSECustomerKeyMD5 = a })
 
--- | If present, specifies the AWS KMS key used to encrypt the object.
+-- | If present, specifies the ID of the AWS Key Management Service (KMS) master
+-- encryption key that was used for the object.
 corSSEKMSKeyId :: Lens' CopyObjectResponse (Maybe Text)
 corSSEKMSKeyId = lens _corSSEKMSKeyId (\s a -> s { _corSSEKMSKeyId = a }) . mapping _Sensitive
 
@@ -493,10 +496,10 @@
         , "x-amz-server-side-encryption-customer-algorithm"             =: _coSSECustomerAlgorithm
         , "x-amz-server-side-encryption-customer-key"                   =: _coSSECustomerKey
         , "x-amz-server-side-encryption-customer-key-MD5"               =: _coSSECustomerKeyMD5
+        , "x-amz-server-side-encryption-aws-kms-key-id"                 =: _coSSEKMSKeyId
         , "x-amz-copy-source-server-side-encryption-customer-algorithm" =: _coCopySourceSSECustomerAlgorithm
         , "x-amz-copy-source-server-side-encryption-customer-key"       =: _coCopySourceSSECustomerKey
         , "x-amz-copy-source-server-side-encryption-customer-key-MD5"   =: _coCopySourceSSECustomerKeyMD5
-        , "x-amz-copy-source-server-side-encryption-aws-kms-key-id"     =: _coCopySourceSSEKMSKeyId
         ]
 
 instance ToXMLRoot CopyObject where
diff --git a/gen/Network/AWS/S3/CreateMultipartUpload.hs b/gen/Network/AWS/S3/CreateMultipartUpload.hs
--- a/gen/Network/AWS/S3/CreateMultipartUpload.hs
+++ b/gen/Network/AWS/S3/CreateMultipartUpload.hs
@@ -259,7 +259,11 @@
 cmuSSECustomerKeyMD5 =
     lens _cmuSSECustomerKeyMD5 (\s a -> s { _cmuSSECustomerKeyMD5 = a })
 
--- | Specifies the AWS KMS key ID to use for object encryption.
+-- | Specifies the AWS KMS key ID to use for object encryption. All GET and PUT
+-- requests for an object protected by AWS KMS will fail if not made via SSL or
+-- using SigV4. Documentation on configuring any of the officially supported AWS
+-- SDKs and CLI can be found at
+-- http://docs.aws.amazon.com/AmazonS3/latest/dev/UsingAWSSDK.html#specify-signature-version
 cmuSSEKMSKeyId :: Lens' CreateMultipartUpload (Maybe Text)
 cmuSSEKMSKeyId = lens _cmuSSEKMSKeyId (\s a -> s { _cmuSSEKMSKeyId = a }) . mapping _Sensitive
 
@@ -343,7 +347,8 @@
 cmurSSECustomerKeyMD5 =
     lens _cmurSSECustomerKeyMD5 (\s a -> s { _cmurSSECustomerKeyMD5 = a })
 
--- | If present, specifies the AWS KMS key used to encrypt the object.
+-- | If present, specifies the ID of the AWS Key Management Service (KMS) master
+-- encryption key that was used for the object.
 cmurSSEKMSKeyId :: Lens' CreateMultipartUploadResponse (Maybe Text)
 cmurSSEKMSKeyId = lens _cmurSSEKMSKeyId (\s a -> s { _cmurSSEKMSKeyId = a }) . mapping _Sensitive
 
diff --git a/gen/Network/AWS/S3/GetBucketAcl.hs b/gen/Network/AWS/S3/GetBucketAcl.hs
--- a/gen/Network/AWS/S3/GetBucketAcl.hs
+++ b/gen/Network/AWS/S3/GetBucketAcl.hs
@@ -118,5 +118,5 @@
 
 instance FromXML GetBucketAclResponse where
     parseXML x = GetBucketAclResponse
-        <$> x .@  "AccessControlList"
+        <$> x .@? "AccessControlList" .!@ mempty
         <*> x .@? "Owner"
diff --git a/gen/Network/AWS/S3/GetBucketTagging.hs b/gen/Network/AWS/S3/GetBucketTagging.hs
--- a/gen/Network/AWS/S3/GetBucketTagging.hs
+++ b/gen/Network/AWS/S3/GetBucketTagging.hs
@@ -115,4 +115,4 @@
 
 instance FromXML GetBucketTaggingResponse where
     parseXML x = GetBucketTaggingResponse
-        <$> x .@  "TagSet"
+        <$> x .@? "TagSet" .!@ mempty
diff --git a/gen/Network/AWS/S3/GetBucketWebsite.hs b/gen/Network/AWS/S3/GetBucketWebsite.hs
--- a/gen/Network/AWS/S3/GetBucketWebsite.hs
+++ b/gen/Network/AWS/S3/GetBucketWebsite.hs
@@ -140,4 +140,4 @@
         <$> x .@? "ErrorDocument"
         <*> x .@? "IndexDocument"
         <*> x .@? "RedirectAllRequestsTo"
-        <*> x .@  "RoutingRules"
+        <*> x .@? "RoutingRules" .!@ mempty
diff --git a/gen/Network/AWS/S3/GetObject.hs b/gen/Network/AWS/S3/GetObject.hs
--- a/gen/Network/AWS/S3/GetObject.hs
+++ b/gen/Network/AWS/S3/GetObject.hs
@@ -48,7 +48,6 @@
     , goSSECustomerAlgorithm
     , goSSECustomerKey
     , goSSECustomerKeyMD5
-    , goSSEKMSKeyId
     , goVersionId
 
     -- * Response
@@ -102,7 +101,6 @@
     , _goSSECustomerAlgorithm       :: Maybe Text
     , _goSSECustomerKey             :: Maybe (Sensitive Text)
     , _goSSECustomerKeyMD5          :: Maybe Text
-    , _goSSEKMSKeyId                :: Maybe (Sensitive Text)
     , _goVersionId                  :: Maybe Text
     } deriving (Eq, Ord, Show)
 
@@ -142,8 +140,6 @@
 --
 -- * 'goSSECustomerKeyMD5' @::@ 'Maybe' 'Text'
 --
--- * 'goSSEKMSKeyId' @::@ 'Maybe' 'Text'
---
 -- * 'goVersionId' @::@ 'Maybe' 'Text'
 --
 getObject :: Text -- ^ 'goBucket'
@@ -167,7 +163,6 @@
     , _goSSECustomerAlgorithm       = Nothing
     , _goSSECustomerKey             = Nothing
     , _goSSECustomerKeyMD5          = Nothing
-    , _goSSEKMSKeyId                = Nothing
     }
 
 goBucket :: Lens' GetObject Text
@@ -261,10 +256,6 @@
 goSSECustomerKeyMD5 =
     lens _goSSECustomerKeyMD5 (\s a -> s { _goSSECustomerKeyMD5 = a })
 
--- | Specifies the AWS KMS key ID to use for object encryption.
-goSSEKMSKeyId :: Lens' GetObject (Maybe Text)
-goSSEKMSKeyId = lens _goSSEKMSKeyId (\s a -> s { _goSSEKMSKeyId = a }) . mapping _Sensitive
-
 -- | VersionId used to reference a specific version of the object.
 goVersionId :: Lens' GetObject (Maybe Text)
 goVersionId = lens _goVersionId (\s a -> s { _goVersionId = a })
@@ -460,7 +451,8 @@
 gorSSECustomerKeyMD5 =
     lens _gorSSECustomerKeyMD5 (\s a -> s { _gorSSECustomerKeyMD5 = a })
 
--- | If present, specifies the AWS KMS key used to encrypt the object.
+-- | If present, specifies the ID of the AWS Key Management Service (KMS) master
+-- encryption key that was used for the object.
 gorSSEKMSKeyId :: Lens' GetObjectResponse (Maybe Text)
 gorSSEKMSKeyId = lens _gorSSEKMSKeyId (\s a -> s { _gorSSEKMSKeyId = a }) . mapping _Sensitive
 
@@ -511,7 +503,6 @@
         , "x-amz-server-side-encryption-customer-algorithm" =: _goSSECustomerAlgorithm
         , "x-amz-server-side-encryption-customer-key"       =: _goSSECustomerKey
         , "x-amz-server-side-encryption-customer-key-MD5"   =: _goSSECustomerKeyMD5
-        , "x-amz-server-side-encryption-aws-kms-key-id"     =: _goSSEKMSKeyId
         ]
 
 instance ToXMLRoot GetObject where
diff --git a/gen/Network/AWS/S3/GetObjectAcl.hs b/gen/Network/AWS/S3/GetObjectAcl.hs
--- a/gen/Network/AWS/S3/GetObjectAcl.hs
+++ b/gen/Network/AWS/S3/GetObjectAcl.hs
@@ -141,5 +141,5 @@
 
 instance FromXML GetObjectAclResponse where
     parseXML x = GetObjectAclResponse
-        <$> x .@  "AccessControlList"
+        <$> x .@? "AccessControlList" .!@ mempty
         <*> x .@? "Owner"
diff --git a/gen/Network/AWS/S3/HeadObject.hs b/gen/Network/AWS/S3/HeadObject.hs
--- a/gen/Network/AWS/S3/HeadObject.hs
+++ b/gen/Network/AWS/S3/HeadObject.hs
@@ -44,7 +44,6 @@
     , hoSSECustomerAlgorithm
     , hoSSECustomerKey
     , hoSSECustomerKeyMD5
-    , hoSSEKMSKeyId
     , hoVersionId
 
     -- * Response
@@ -91,7 +90,6 @@
     , _hoSSECustomerAlgorithm :: Maybe Text
     , _hoSSECustomerKey       :: Maybe (Sensitive Text)
     , _hoSSECustomerKeyMD5    :: Maybe Text
-    , _hoSSEKMSKeyId          :: Maybe (Sensitive Text)
     , _hoVersionId            :: Maybe Text
     } deriving (Eq, Ord, Show)
 
@@ -119,8 +117,6 @@
 --
 -- * 'hoSSECustomerKeyMD5' @::@ 'Maybe' 'Text'
 --
--- * 'hoSSEKMSKeyId' @::@ 'Maybe' 'Text'
---
 -- * 'hoVersionId' @::@ 'Maybe' 'Text'
 --
 headObject :: Text -- ^ 'hoBucket'
@@ -138,7 +134,6 @@
     , _hoSSECustomerAlgorithm = Nothing
     , _hoSSECustomerKey       = Nothing
     , _hoSSECustomerKeyMD5    = Nothing
-    , _hoSSEKMSKeyId          = Nothing
     }
 
 hoBucket :: Lens' HeadObject Text
@@ -198,10 +193,6 @@
 hoSSECustomerKeyMD5 =
     lens _hoSSECustomerKeyMD5 (\s a -> s { _hoSSECustomerKeyMD5 = a })
 
--- | Specifies the AWS KMS key ID to use for object encryption.
-hoSSEKMSKeyId :: Lens' HeadObject (Maybe Text)
-hoSSEKMSKeyId = lens _hoSSEKMSKeyId (\s a -> s { _hoSSEKMSKeyId = a }) . mapping _Sensitive
-
 -- | VersionId used to reference a specific version of the object.
 hoVersionId :: Lens' HeadObject (Maybe Text)
 hoVersionId = lens _hoVersionId (\s a -> s { _hoVersionId = a })
@@ -388,7 +379,8 @@
 horSSECustomerKeyMD5 =
     lens _horSSECustomerKeyMD5 (\s a -> s { _horSSECustomerKeyMD5 = a })
 
--- | If present, specifies the AWS KMS key used to encrypt the object.
+-- | If present, specifies the ID of the AWS Key Management Service (KMS) master
+-- encryption key that was used for the object.
 horSSEKMSKeyId :: Lens' HeadObjectResponse (Maybe Text)
 horSSEKMSKeyId = lens _horSSEKMSKeyId (\s a -> s { _horSSEKMSKeyId = a }) . mapping _Sensitive
 
@@ -431,7 +423,6 @@
         , "x-amz-server-side-encryption-customer-algorithm" =: _hoSSECustomerAlgorithm
         , "x-amz-server-side-encryption-customer-key"       =: _hoSSECustomerKey
         , "x-amz-server-side-encryption-customer-key-MD5"   =: _hoSSECustomerKeyMD5
-        , "x-amz-server-side-encryption-aws-kms-key-id"     =: _hoSSEKMSKeyId
         ]
 
 instance ToXMLRoot HeadObject where
diff --git a/gen/Network/AWS/S3/ListBuckets.hs b/gen/Network/AWS/S3/ListBuckets.hs
--- a/gen/Network/AWS/S3/ListBuckets.hs
+++ b/gen/Network/AWS/S3/ListBuckets.hs
@@ -101,5 +101,5 @@
 
 instance FromXML ListBucketsResponse where
     parseXML x = ListBucketsResponse
-        <$> x .@  "Buckets"
+        <$> x .@? "Buckets" .!@ mempty
         <*> x .@? "Owner"
diff --git a/gen/Network/AWS/S3/PutObject.hs b/gen/Network/AWS/S3/PutObject.hs
--- a/gen/Network/AWS/S3/PutObject.hs
+++ b/gen/Network/AWS/S3/PutObject.hs
@@ -279,7 +279,11 @@
 poSSECustomerKeyMD5 =
     lens _poSSECustomerKeyMD5 (\s a -> s { _poSSECustomerKeyMD5 = a })
 
--- | Specifies the AWS KMS key ID to use for object encryption.
+-- | Specifies the AWS KMS key ID to use for object encryption. All GET and PUT
+-- requests for an object protected by AWS KMS will fail if not made via SSL or
+-- using SigV4. Documentation on configuring any of the officially supported AWS
+-- SDKs and CLI can be found at
+-- http://docs.aws.amazon.com/AmazonS3/latest/dev/UsingAWSSDK.html#specify-signature-version
 poSSEKMSKeyId :: Lens' PutObject (Maybe Text)
 poSSEKMSKeyId = lens _poSSEKMSKeyId (\s a -> s { _poSSEKMSKeyId = a }) . mapping _Sensitive
 
@@ -363,7 +367,8 @@
 porSSECustomerKeyMD5 =
     lens _porSSECustomerKeyMD5 (\s a -> s { _porSSECustomerKeyMD5 = a })
 
--- | If present, specifies the AWS KMS key used to encrypt the object.
+-- | If present, specifies the ID of the AWS Key Management Service (KMS) master
+-- encryption key that was used for the object.
 porSSEKMSKeyId :: Lens' PutObjectResponse (Maybe Text)
 porSSEKMSKeyId = lens _porSSEKMSKeyId (\s a -> s { _porSSEKMSKeyId = a }) . mapping _Sensitive
 
diff --git a/gen/Network/AWS/S3/Types.hs b/gen/Network/AWS/S3/Types.hs
--- a/gen/Network/AWS/S3/Types.hs
+++ b/gen/Network/AWS/S3/Types.hs
@@ -1417,7 +1417,7 @@
         <$> x .@? "ErrorDocument"
         <*> x .@? "IndexDocument"
         <*> x .@? "RedirectAllRequestsTo"
-        <*> x .@  "RoutingRules"
+        <*> x .@? "RoutingRules" .!@ mempty
 
 instance ToXML WebsiteConfiguration where
     toXML WebsiteConfiguration{..} = nodes "WebsiteConfiguration"
@@ -2380,7 +2380,7 @@
 
 instance FromXML Tagging where
     parseXML x = Tagging
-        <$> x .@  "TagSet"
+        <$> x .@? "TagSet" .!@ mempty
 
 instance ToXML Tagging where
     toXML Tagging{..} = nodes "Tagging"
@@ -2839,7 +2839,7 @@
 
 instance FromXML AccessControlPolicy where
     parseXML x = AccessControlPolicy
-        <$> x .@  "AccessControlList"
+        <$> x .@? "AccessControlList" .!@ mempty
         <*> x .@? "Owner"
 
 instance ToXMLRoot AccessControlPolicy where
@@ -3117,7 +3117,7 @@
 instance FromXML LoggingEnabled where
     parseXML x = LoggingEnabled
         <$> x .@? "TargetBucket"
-        <*> x .@  "TargetGrants"
+        <*> x .@? "TargetGrants" .!@ mempty
         <*> x .@? "TargetPrefix"
 
 instance ToXML LoggingEnabled where
diff --git a/gen/Network/AWS/S3/UploadPart.hs b/gen/Network/AWS/S3/UploadPart.hs
--- a/gen/Network/AWS/S3/UploadPart.hs
+++ b/gen/Network/AWS/S3/UploadPart.hs
@@ -47,7 +47,6 @@
     , upSSECustomerAlgorithm
     , upSSECustomerKey
     , upSSECustomerKeyMD5
-    , upSSEKMSKeyId
     , upUploadId
 
     -- * Response
@@ -77,7 +76,6 @@
     , _upSSECustomerAlgorithm :: Maybe Text
     , _upSSECustomerKey       :: Maybe (Sensitive Text)
     , _upSSECustomerKeyMD5    :: Maybe Text
-    , _upSSEKMSKeyId          :: Maybe (Sensitive Text)
     , _upUploadId             :: Text
     } deriving (Show)
 
@@ -103,8 +101,6 @@
 --
 -- * 'upSSECustomerKeyMD5' @::@ 'Maybe' 'Text'
 --
--- * 'upSSEKMSKeyId' @::@ 'Maybe' 'Text'
---
 -- * 'upUploadId' @::@ 'Text'
 --
 uploadPart :: RqBody -- ^ 'upBody'
@@ -124,7 +120,6 @@
     , _upSSECustomerAlgorithm = Nothing
     , _upSSECustomerKey       = Nothing
     , _upSSECustomerKeyMD5    = Nothing
-    , _upSSEKMSKeyId          = Nothing
     }
 
 upBody :: Lens' UploadPart RqBody
@@ -170,10 +165,6 @@
 upSSECustomerKeyMD5 =
     lens _upSSECustomerKeyMD5 (\s a -> s { _upSSECustomerKeyMD5 = a })
 
--- | Specifies the AWS KMS key ID to use for object encryption.
-upSSEKMSKeyId :: Lens' UploadPart (Maybe Text)
-upSSEKMSKeyId = lens _upSSEKMSKeyId (\s a -> s { _upSSEKMSKeyId = a }) . mapping _Sensitive
-
 -- | Upload ID identifying the multipart upload whose part is being uploaded.
 upUploadId :: Lens' UploadPart Text
 upUploadId = lens _upUploadId (\s a -> s { _upUploadId = a })
@@ -227,7 +218,8 @@
 uprSSECustomerKeyMD5 =
     lens _uprSSECustomerKeyMD5 (\s a -> s { _uprSSECustomerKeyMD5 = a })
 
--- | If present, specifies the AWS KMS key used to encrypt the object.
+-- | If present, specifies the ID of the AWS Key Management Service (KMS) master
+-- encryption key that was used for the object.
 uprSSEKMSKeyId :: Lens' UploadPartResponse (Maybe Text)
 uprSSEKMSKeyId = lens _uprSSEKMSKeyId (\s a -> s { _uprSSEKMSKeyId = a }) . mapping _Sensitive
 
@@ -258,7 +250,6 @@
         , "x-amz-server-side-encryption-customer-algorithm" =: _upSSECustomerAlgorithm
         , "x-amz-server-side-encryption-customer-key"       =: _upSSECustomerKey
         , "x-amz-server-side-encryption-customer-key-MD5"   =: _upSSECustomerKeyMD5
-        , "x-amz-server-side-encryption-aws-kms-key-id"     =: _upSSEKMSKeyId
         ]
 
 instance ToBody UploadPart where
diff --git a/gen/Network/AWS/S3/UploadPartCopy.hs b/gen/Network/AWS/S3/UploadPartCopy.hs
--- a/gen/Network/AWS/S3/UploadPartCopy.hs
+++ b/gen/Network/AWS/S3/UploadPartCopy.hs
@@ -42,7 +42,6 @@
     , upcCopySourceSSECustomerAlgorithm
     , upcCopySourceSSECustomerKey
     , upcCopySourceSSECustomerKeyMD5
-    , upcCopySourceSSEKMSKeyId
     , upcKey
     , upcPartNumber
     , upcSSECustomerAlgorithm
@@ -79,7 +78,6 @@
     , _upcCopySourceSSECustomerAlgorithm :: Maybe Text
     , _upcCopySourceSSECustomerKey       :: Maybe (Sensitive Text)
     , _upcCopySourceSSECustomerKeyMD5    :: Maybe Text
-    , _upcCopySourceSSEKMSKeyId          :: Maybe (Sensitive Text)
     , _upcKey                            :: Text
     , _upcPartNumber                     :: Int
     , _upcSSECustomerAlgorithm           :: Maybe Text
@@ -112,8 +110,6 @@
 --
 -- * 'upcCopySourceSSECustomerKeyMD5' @::@ 'Maybe' 'Text'
 --
--- * 'upcCopySourceSSEKMSKeyId' @::@ 'Maybe' 'Text'
---
 -- * 'upcKey' @::@ 'Text'
 --
 -- * 'upcPartNumber' @::@ 'Int'
@@ -149,7 +145,6 @@
     , _upcCopySourceSSECustomerAlgorithm = Nothing
     , _upcCopySourceSSECustomerKey       = Nothing
     , _upcCopySourceSSECustomerKeyMD5    = Nothing
-    , _upcCopySourceSSEKMSKeyId          = Nothing
     }
 
 upcBucket :: Lens' UploadPartCopy Text
@@ -219,13 +214,6 @@
     lens _upcCopySourceSSECustomerKeyMD5
         (\s a -> s { _upcCopySourceSSECustomerKeyMD5 = a })
 
--- | Specifies the AWS KMS key ID to use for object encryption.
-upcCopySourceSSEKMSKeyId :: Lens' UploadPartCopy (Maybe Text)
-upcCopySourceSSEKMSKeyId =
-    lens _upcCopySourceSSEKMSKeyId
-        (\s a -> s { _upcCopySourceSSEKMSKeyId = a })
-            . mapping _Sensitive
-
 upcKey :: Lens' UploadPartCopy Text
 upcKey = lens _upcKey (\s a -> s { _upcKey = a })
 
@@ -321,7 +309,8 @@
 upcrSSECustomerKeyMD5 =
     lens _upcrSSECustomerKeyMD5 (\s a -> s { _upcrSSECustomerKeyMD5 = a })
 
--- | If present, specifies the AWS KMS key used to encrypt the object.
+-- | If present, specifies the ID of the AWS Key Management Service (KMS) master
+-- encryption key that was used for the object.
 upcrSSEKMSKeyId :: Lens' UploadPartCopyResponse (Maybe Text)
 upcrSSEKMSKeyId = lens _upcrSSEKMSKeyId (\s a -> s { _upcrSSEKMSKeyId = a }) . mapping _Sensitive
 
@@ -360,7 +349,6 @@
         , "x-amz-copy-source-server-side-encryption-customer-algorithm" =: _upcCopySourceSSECustomerAlgorithm
         , "x-amz-copy-source-server-side-encryption-customer-key"       =: _upcCopySourceSSECustomerKey
         , "x-amz-copy-source-server-side-encryption-customer-key-MD5"   =: _upcCopySourceSSECustomerKeyMD5
-        , "x-amz-server-side-encryption-aws-kms-key-id"                 =: _upcCopySourceSSEKMSKeyId
         ]
 
 instance ToXMLRoot UploadPartCopy where