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-cloudfront.cabal b/amazonka-cloudfront.cabal
--- a/amazonka-cloudfront.cabal
+++ b/amazonka-cloudfront.cabal
@@ -1,5 +1,5 @@
 name:                  amazonka-cloudfront
-version:               1.2.0.2
+version:               1.3.0
 synopsis:              Amazon CloudFront SDK.
 homepage:              https://github.com/brendanhay/amazonka
 bug-reports:           https://github.com/brendanhay/amazonka/issues
@@ -80,7 +80,7 @@
         , Network.AWS.CloudFront.Types.Sum
 
     build-depends:
-          amazonka-core == 1.2.0.*
+          amazonka-core == 1.3.0.*
         , base          >= 4.7     && < 5
 
 test-suite amazonka-cloudfront-test
@@ -100,9 +100,9 @@
         , Test.AWS.CloudFront.Internal
 
     build-depends:
-          amazonka-core == 1.2.0.*
-        , amazonka-test == 1.2.0.*
-        , amazonka-cloudfront == 1.2.0.*
+          amazonka-core == 1.3.0.*
+        , amazonka-test == 1.3.0.*
+        , amazonka-cloudfront == 1.3.0.*
         , base
         , bytestring
         , lens
diff --git a/gen/Network/AWS/CloudFront.hs b/gen/Network/AWS/CloudFront.hs
--- a/gen/Network/AWS/CloudFront.hs
+++ b/gen/Network/AWS/CloudFront.hs
@@ -38,104 +38,98 @@
     -- ** TooManyCacheBehaviors
     , _TooManyCacheBehaviors
 
-    -- ** DistributionNotDisabled
-    , _DistributionNotDisabled
-
-    -- ** InvalidOriginAccessIdentity
-    , _InvalidOriginAccessIdentity
-
     -- ** TooManyCloudFrontOriginAccessIdentities
     , _TooManyCloudFrontOriginAccessIdentities
 
-    -- ** TooManyStreamingDistributions
-    , _TooManyStreamingDistributions
-
-    -- ** InvalidArgument
-    , _InvalidArgument
+    -- ** InvalidOriginAccessIdentity
+    , _InvalidOriginAccessIdentity
 
-    -- ** NoSuchCloudFrontOriginAccessIdentity
-    , _NoSuchCloudFrontOriginAccessIdentity
+    -- ** DistributionNotDisabled
+    , _DistributionNotDisabled
 
     -- ** NoSuchStreamingDistribution
     , _NoSuchStreamingDistribution
 
-    -- ** CloudFrontOriginAccessIdentityInUse
-    , _CloudFrontOriginAccessIdentityInUse
-
     -- ** InconsistentQuantities
     , _InconsistentQuantities
 
+    -- ** InvalidArgument
+    , _InvalidArgument
+
     -- ** TooManyInvalidationsInProgress
     , _TooManyInvalidationsInProgress
 
     -- ** TooManyDistributionCNAMEs
     , _TooManyDistributionCNAMEs
 
-    -- ** InvalidForwardCookies
-    , _InvalidForwardCookies
+    -- ** NoSuchCloudFrontOriginAccessIdentity
+    , _NoSuchCloudFrontOriginAccessIdentity
 
-    -- ** TooManyCookieNamesInWhiteList
-    , _TooManyCookieNamesInWhiteList
+    -- ** CloudFrontOriginAccessIdentityInUse
+    , _CloudFrontOriginAccessIdentityInUse
 
+    -- ** TooManyStreamingDistributions
+    , _TooManyStreamingDistributions
+
     -- ** BatchTooLarge
     , _BatchTooLarge
 
-    -- ** InvalidOrigin
-    , _InvalidOrigin
+    -- ** TooManyCookieNamesInWhiteList
+    , _TooManyCookieNamesInWhiteList
 
+    -- ** InvalidForwardCookies
+    , _InvalidForwardCookies
+
     -- ** TooManyTrustedSigners
     , _TooManyTrustedSigners
 
-    -- ** NoSuchOrigin
-    , _NoSuchOrigin
+    -- ** InvalidOrigin
+    , _InvalidOrigin
 
     -- ** NoSuchInvalidation
     , _NoSuchInvalidation
 
-    -- ** StreamingDistributionNotDisabled
-    , _StreamingDistributionNotDisabled
+    -- ** NoSuchOrigin
+    , _NoSuchOrigin
 
     -- ** InvalidTTLOrder
     , _InvalidTTLOrder
 
+    -- ** StreamingDistributionNotDisabled
+    , _StreamingDistributionNotDisabled
+
+    -- ** TooManyHeadersInForwardedValues
+    , _TooManyHeadersInForwardedValues
+
     -- ** TooManyStreamingDistributionCNAMEs
     , _TooManyStreamingDistributionCNAMEs
 
-    -- ** TooManyDistributions
-    , _TooManyDistributions
-
     -- ** InvalidRequiredProtocol
     , _InvalidRequiredProtocol
 
-    -- ** TooManyHeadersInForwardedValues
-    , _TooManyHeadersInForwardedValues
+    -- ** TooManyDistributions
+    , _TooManyDistributions
 
     -- ** TooManyCertificates
     , _TooManyCertificates
 
-    -- ** MissingBody
-    , _MissingBody
-
     -- ** DistributionAlreadyExists
     , _DistributionAlreadyExists
 
+    -- ** MissingBody
+    , _MissingBody
+
     -- ** IllegalUpdate
     , _IllegalUpdate
 
-    -- ** InvalidResponseCode
-    , _InvalidResponseCode
-
     -- ** InvalidIfMatchVersion
     , _InvalidIfMatchVersion
 
     -- ** PreconditionFailed
     , _PreconditionFailed
 
-    -- ** InvalidProtocolSettings
-    , _InvalidProtocolSettings
-
-    -- ** TrustedSignerDoesNotExist
-    , _TrustedSignerDoesNotExist
+    -- ** InvalidResponseCode
+    , _InvalidResponseCode
 
     -- ** InvalidHeadersForS3Origin
     , _InvalidHeadersForS3Origin
@@ -143,39 +137,45 @@
     -- ** CNAMEAlreadyExists
     , _CNAMEAlreadyExists
 
-    -- ** StreamingDistributionAlreadyExists
-    , _StreamingDistributionAlreadyExists
+    -- ** TrustedSignerDoesNotExist
+    , _TrustedSignerDoesNotExist
 
-    -- ** TooManyOrigins
-    , _TooManyOrigins
+    -- ** InvalidProtocolSettings
+    , _InvalidProtocolSettings
 
     -- ** CloudFrontOriginAccessIdentityAlreadyExists
     , _CloudFrontOriginAccessIdentityAlreadyExists
 
+    -- ** TooManyOrigins
+    , _TooManyOrigins
+
     -- ** InvalidRelativePath
     , _InvalidRelativePath
 
+    -- ** StreamingDistributionAlreadyExists
+    , _StreamingDistributionAlreadyExists
+
     -- ** InvalidMinimumProtocolVersion
     , _InvalidMinimumProtocolVersion
 
     -- ** AccessDenied
     , _AccessDenied
 
-    -- ** NoSuchDistribution
-    , _NoSuchDistribution
-
     -- ** InvalidViewerCertificate
     , _InvalidViewerCertificate
 
+    -- ** NoSuchDistribution
+    , _NoSuchDistribution
+
     -- ** InvalidDefaultRootObject
     , _InvalidDefaultRootObject
 
-    -- ** InvalidLocationCode
-    , _InvalidLocationCode
-
     -- ** InvalidGeoRestrictionParameter
     , _InvalidGeoRestrictionParameter
 
+    -- ** InvalidLocationCode
+    , _InvalidLocationCode
+
     -- * Waiters
     -- $waiters
 
@@ -197,12 +197,12 @@
     -- ** GetDistribution
     , module Network.AWS.CloudFront.GetDistribution
 
-    -- ** DeleteCloudFrontOriginAccessIdentity
-    , module Network.AWS.CloudFront.DeleteCloudFrontOriginAccessIdentity
-
     -- ** UpdateCloudFrontOriginAccessIdentity
     , module Network.AWS.CloudFront.UpdateCloudFrontOriginAccessIdentity
 
+    -- ** DeleteCloudFrontOriginAccessIdentity
+    , module Network.AWS.CloudFront.DeleteCloudFrontOriginAccessIdentity
+
     -- ** ListStreamingDistributions
     , module Network.AWS.CloudFront.ListStreamingDistributions
 
@@ -227,14 +227,14 @@
     -- ** ListInvalidations
     , module Network.AWS.CloudFront.ListInvalidations
 
-    -- ** GetStreamingDistribution
-    , module Network.AWS.CloudFront.GetStreamingDistribution
+    -- ** CreateInvalidation
+    , module Network.AWS.CloudFront.CreateInvalidation
 
     -- ** GetCloudFrontOriginAccessIdentity
     , module Network.AWS.CloudFront.GetCloudFrontOriginAccessIdentity
 
-    -- ** CreateInvalidation
-    , module Network.AWS.CloudFront.CreateInvalidation
+    -- ** GetStreamingDistribution
+    , module Network.AWS.CloudFront.GetStreamingDistribution
 
     -- ** UpdateDistribution
     , module Network.AWS.CloudFront.UpdateDistribution
@@ -407,14 +407,14 @@
     -- ** DistributionConfig
     , DistributionConfig
     , distributionConfig
-    , dcDefaultRootObject
     , dcAliases
-    , dcCustomErrorResponses
+    , dcDefaultRootObject
     , dcPriceClass
+    , dcCustomErrorResponses
     , dcViewerCertificate
     , dcRestrictions
-    , dcCacheBehaviors
     , dcLogging
+    , dcCacheBehaviors
     , dcCallerReference
     , dcOrigins
     , dcDefaultCacheBehavior
diff --git a/gen/Network/AWS/CloudFront/CreateCloudFrontOriginAccessIdentity.hs b/gen/Network/AWS/CloudFront/CreateCloudFrontOriginAccessIdentity.hs
--- a/gen/Network/AWS/CloudFront/CreateCloudFrontOriginAccessIdentity.hs
+++ b/gen/Network/AWS/CloudFront/CreateCloudFrontOriginAccessIdentity.hs
@@ -36,7 +36,7 @@
     , ccfoairsETag
     , ccfoairsLocation
     , ccfoairsCloudFrontOriginAccessIdentity
-    , ccfoairsStatus
+    , ccfoairsResponseStatus
     ) where
 
 import           Network.AWS.CloudFront.Types
@@ -111,7 +111,7 @@
     { _ccfoairsETag                           :: !(Maybe Text)
     , _ccfoairsLocation                       :: !(Maybe Text)
     , _ccfoairsCloudFrontOriginAccessIdentity :: !(Maybe CloudFrontOriginAccessIdentity)
-    , _ccfoairsStatus                         :: !Int
+    , _ccfoairsResponseStatus                 :: !Int
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'CreateCloudFrontOriginAccessIdentityResponse' with the minimum fields required to make a request.
@@ -124,16 +124,16 @@
 --
 -- * 'ccfoairsCloudFrontOriginAccessIdentity'
 --
--- * 'ccfoairsStatus'
+-- * 'ccfoairsResponseStatus'
 createCloudFrontOriginAccessIdentityResponse
-    :: Int -- ^ 'ccfoairsStatus'
+    :: Int -- ^ 'ccfoairsResponseStatus'
     -> CreateCloudFrontOriginAccessIdentityResponse
-createCloudFrontOriginAccessIdentityResponse pStatus_ =
+createCloudFrontOriginAccessIdentityResponse pResponseStatus_ =
     CreateCloudFrontOriginAccessIdentityResponse'
     { _ccfoairsETag = Nothing
     , _ccfoairsLocation = Nothing
     , _ccfoairsCloudFrontOriginAccessIdentity = Nothing
-    , _ccfoairsStatus = pStatus_
+    , _ccfoairsResponseStatus = pResponseStatus_
     }
 
 -- | The current version of the origin access identity created.
@@ -151,5 +151,5 @@
 ccfoairsCloudFrontOriginAccessIdentity = lens _ccfoairsCloudFrontOriginAccessIdentity (\ s a -> s{_ccfoairsCloudFrontOriginAccessIdentity = a});
 
 -- | The response status code.
-ccfoairsStatus :: Lens' CreateCloudFrontOriginAccessIdentityResponse Int
-ccfoairsStatus = lens _ccfoairsStatus (\ s a -> s{_ccfoairsStatus = a});
+ccfoairsResponseStatus :: Lens' CreateCloudFrontOriginAccessIdentityResponse Int
+ccfoairsResponseStatus = lens _ccfoairsResponseStatus (\ s a -> s{_ccfoairsResponseStatus = a});
diff --git a/gen/Network/AWS/CloudFront/CreateDistribution.hs b/gen/Network/AWS/CloudFront/CreateDistribution.hs
--- a/gen/Network/AWS/CloudFront/CreateDistribution.hs
+++ b/gen/Network/AWS/CloudFront/CreateDistribution.hs
@@ -36,7 +36,7 @@
     , cdrsETag
     , cdrsDistribution
     , cdrsLocation
-    , cdrsStatus
+    , cdrsResponseStatus
     ) where
 
 import           Network.AWS.CloudFront.Types
@@ -101,10 +101,10 @@
 --
 -- /See:/ 'createDistributionResponse' smart constructor.
 data CreateDistributionResponse = CreateDistributionResponse'
-    { _cdrsETag         :: !(Maybe Text)
-    , _cdrsDistribution :: !(Maybe Distribution)
-    , _cdrsLocation     :: !(Maybe Text)
-    , _cdrsStatus       :: !Int
+    { _cdrsETag           :: !(Maybe Text)
+    , _cdrsDistribution   :: !(Maybe Distribution)
+    , _cdrsLocation       :: !(Maybe Text)
+    , _cdrsResponseStatus :: !Int
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'CreateDistributionResponse' with the minimum fields required to make a request.
@@ -117,16 +117,16 @@
 --
 -- * 'cdrsLocation'
 --
--- * 'cdrsStatus'
+-- * 'cdrsResponseStatus'
 createDistributionResponse
-    :: Int -- ^ 'cdrsStatus'
+    :: Int -- ^ 'cdrsResponseStatus'
     -> CreateDistributionResponse
-createDistributionResponse pStatus_ =
+createDistributionResponse pResponseStatus_ =
     CreateDistributionResponse'
     { _cdrsETag = Nothing
     , _cdrsDistribution = Nothing
     , _cdrsLocation = Nothing
-    , _cdrsStatus = pStatus_
+    , _cdrsResponseStatus = pResponseStatus_
     }
 
 -- | The current version of the distribution created.
@@ -144,5 +144,5 @@
 cdrsLocation = lens _cdrsLocation (\ s a -> s{_cdrsLocation = a});
 
 -- | The response status code.
-cdrsStatus :: Lens' CreateDistributionResponse Int
-cdrsStatus = lens _cdrsStatus (\ s a -> s{_cdrsStatus = a});
+cdrsResponseStatus :: Lens' CreateDistributionResponse Int
+cdrsResponseStatus = lens _cdrsResponseStatus (\ s a -> s{_cdrsResponseStatus = a});
diff --git a/gen/Network/AWS/CloudFront/CreateInvalidation.hs b/gen/Network/AWS/CloudFront/CreateInvalidation.hs
--- a/gen/Network/AWS/CloudFront/CreateInvalidation.hs
+++ b/gen/Network/AWS/CloudFront/CreateInvalidation.hs
@@ -36,7 +36,7 @@
     -- * Response Lenses
     , cirsInvalidation
     , cirsLocation
-    , cirsStatus
+    , cirsResponseStatus
     ) where
 
 import           Network.AWS.CloudFront.Types
@@ -112,9 +112,9 @@
 --
 -- /See:/ 'createInvalidationResponse' smart constructor.
 data CreateInvalidationResponse = CreateInvalidationResponse'
-    { _cirsInvalidation :: !(Maybe Invalidation)
-    , _cirsLocation     :: !(Maybe Text)
-    , _cirsStatus       :: !Int
+    { _cirsInvalidation   :: !(Maybe Invalidation)
+    , _cirsLocation       :: !(Maybe Text)
+    , _cirsResponseStatus :: !Int
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'CreateInvalidationResponse' with the minimum fields required to make a request.
@@ -125,15 +125,15 @@
 --
 -- * 'cirsLocation'
 --
--- * 'cirsStatus'
+-- * 'cirsResponseStatus'
 createInvalidationResponse
-    :: Int -- ^ 'cirsStatus'
+    :: Int -- ^ 'cirsResponseStatus'
     -> CreateInvalidationResponse
-createInvalidationResponse pStatus_ =
+createInvalidationResponse pResponseStatus_ =
     CreateInvalidationResponse'
     { _cirsInvalidation = Nothing
     , _cirsLocation = Nothing
-    , _cirsStatus = pStatus_
+    , _cirsResponseStatus = pResponseStatus_
     }
 
 -- | The invalidation\'s information.
@@ -146,5 +146,5 @@
 cirsLocation = lens _cirsLocation (\ s a -> s{_cirsLocation = a});
 
 -- | The response status code.
-cirsStatus :: Lens' CreateInvalidationResponse Int
-cirsStatus = lens _cirsStatus (\ s a -> s{_cirsStatus = a});
+cirsResponseStatus :: Lens' CreateInvalidationResponse Int
+cirsResponseStatus = lens _cirsResponseStatus (\ s a -> s{_cirsResponseStatus = a});
diff --git a/gen/Network/AWS/CloudFront/CreateStreamingDistribution.hs b/gen/Network/AWS/CloudFront/CreateStreamingDistribution.hs
--- a/gen/Network/AWS/CloudFront/CreateStreamingDistribution.hs
+++ b/gen/Network/AWS/CloudFront/CreateStreamingDistribution.hs
@@ -36,7 +36,7 @@
     , csdrsETag
     , csdrsLocation
     , csdrsStreamingDistribution
-    , csdrsStatus
+    , csdrsResponseStatus
     ) where
 
 import           Network.AWS.CloudFront.Types
@@ -104,7 +104,7 @@
     { _csdrsETag                  :: !(Maybe Text)
     , _csdrsLocation              :: !(Maybe Text)
     , _csdrsStreamingDistribution :: !(Maybe StreamingDistribution)
-    , _csdrsStatus                :: !Int
+    , _csdrsResponseStatus        :: !Int
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'CreateStreamingDistributionResponse' with the minimum fields required to make a request.
@@ -117,16 +117,16 @@
 --
 -- * 'csdrsStreamingDistribution'
 --
--- * 'csdrsStatus'
+-- * 'csdrsResponseStatus'
 createStreamingDistributionResponse
-    :: Int -- ^ 'csdrsStatus'
+    :: Int -- ^ 'csdrsResponseStatus'
     -> CreateStreamingDistributionResponse
-createStreamingDistributionResponse pStatus_ =
+createStreamingDistributionResponse pResponseStatus_ =
     CreateStreamingDistributionResponse'
     { _csdrsETag = Nothing
     , _csdrsLocation = Nothing
     , _csdrsStreamingDistribution = Nothing
-    , _csdrsStatus = pStatus_
+    , _csdrsResponseStatus = pResponseStatus_
     }
 
 -- | The current version of the streaming distribution created.
@@ -144,5 +144,5 @@
 csdrsStreamingDistribution = lens _csdrsStreamingDistribution (\ s a -> s{_csdrsStreamingDistribution = a});
 
 -- | The response status code.
-csdrsStatus :: Lens' CreateStreamingDistributionResponse Int
-csdrsStatus = lens _csdrsStatus (\ s a -> s{_csdrsStatus = a});
+csdrsResponseStatus :: Lens' CreateStreamingDistributionResponse Int
+csdrsResponseStatus = lens _csdrsResponseStatus (\ s a -> s{_csdrsResponseStatus = a});
diff --git a/gen/Network/AWS/CloudFront/GetCloudFrontOriginAccessIdentity.hs b/gen/Network/AWS/CloudFront/GetCloudFrontOriginAccessIdentity.hs
--- a/gen/Network/AWS/CloudFront/GetCloudFrontOriginAccessIdentity.hs
+++ b/gen/Network/AWS/CloudFront/GetCloudFrontOriginAccessIdentity.hs
@@ -35,7 +35,7 @@
     -- * Response Lenses
     , gcfoairsETag
     , gcfoairsCloudFrontOriginAccessIdentity
-    , gcfoairsStatus
+    , gcfoairsResponseStatus
     ) where
 
 import           Network.AWS.CloudFront.Types
@@ -101,7 +101,7 @@
 data GetCloudFrontOriginAccessIdentityResponse = GetCloudFrontOriginAccessIdentityResponse'
     { _gcfoairsETag                           :: !(Maybe Text)
     , _gcfoairsCloudFrontOriginAccessIdentity :: !(Maybe CloudFrontOriginAccessIdentity)
-    , _gcfoairsStatus                         :: !Int
+    , _gcfoairsResponseStatus                 :: !Int
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'GetCloudFrontOriginAccessIdentityResponse' with the minimum fields required to make a request.
@@ -112,15 +112,15 @@
 --
 -- * 'gcfoairsCloudFrontOriginAccessIdentity'
 --
--- * 'gcfoairsStatus'
+-- * 'gcfoairsResponseStatus'
 getCloudFrontOriginAccessIdentityResponse
-    :: Int -- ^ 'gcfoairsStatus'
+    :: Int -- ^ 'gcfoairsResponseStatus'
     -> GetCloudFrontOriginAccessIdentityResponse
-getCloudFrontOriginAccessIdentityResponse pStatus_ =
+getCloudFrontOriginAccessIdentityResponse pResponseStatus_ =
     GetCloudFrontOriginAccessIdentityResponse'
     { _gcfoairsETag = Nothing
     , _gcfoairsCloudFrontOriginAccessIdentity = Nothing
-    , _gcfoairsStatus = pStatus_
+    , _gcfoairsResponseStatus = pResponseStatus_
     }
 
 -- | The current version of the origin access identity\'s information. For
@@ -133,5 +133,5 @@
 gcfoairsCloudFrontOriginAccessIdentity = lens _gcfoairsCloudFrontOriginAccessIdentity (\ s a -> s{_gcfoairsCloudFrontOriginAccessIdentity = a});
 
 -- | The response status code.
-gcfoairsStatus :: Lens' GetCloudFrontOriginAccessIdentityResponse Int
-gcfoairsStatus = lens _gcfoairsStatus (\ s a -> s{_gcfoairsStatus = a});
+gcfoairsResponseStatus :: Lens' GetCloudFrontOriginAccessIdentityResponse Int
+gcfoairsResponseStatus = lens _gcfoairsResponseStatus (\ s a -> s{_gcfoairsResponseStatus = a});
diff --git a/gen/Network/AWS/CloudFront/GetCloudFrontOriginAccessIdentityConfig.hs b/gen/Network/AWS/CloudFront/GetCloudFrontOriginAccessIdentityConfig.hs
--- a/gen/Network/AWS/CloudFront/GetCloudFrontOriginAccessIdentityConfig.hs
+++ b/gen/Network/AWS/CloudFront/GetCloudFrontOriginAccessIdentityConfig.hs
@@ -35,7 +35,7 @@
     -- * Response Lenses
     , gcfoaicrsCloudFrontOriginAccessIdentityConfig
     , gcfoaicrsETag
-    , gcfoaicrsStatus
+    , gcfoaicrsResponseStatus
     ) where
 
 import           Network.AWS.CloudFront.Types
@@ -101,7 +101,7 @@
 data GetCloudFrontOriginAccessIdentityConfigResponse = GetCloudFrontOriginAccessIdentityConfigResponse'
     { _gcfoaicrsCloudFrontOriginAccessIdentityConfig :: !(Maybe CloudFrontOriginAccessIdentityConfig)
     , _gcfoaicrsETag                                 :: !(Maybe Text)
-    , _gcfoaicrsStatus                               :: !Int
+    , _gcfoaicrsResponseStatus                       :: !Int
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'GetCloudFrontOriginAccessIdentityConfigResponse' with the minimum fields required to make a request.
@@ -112,15 +112,15 @@
 --
 -- * 'gcfoaicrsETag'
 --
--- * 'gcfoaicrsStatus'
+-- * 'gcfoaicrsResponseStatus'
 getCloudFrontOriginAccessIdentityConfigResponse
-    :: Int -- ^ 'gcfoaicrsStatus'
+    :: Int -- ^ 'gcfoaicrsResponseStatus'
     -> GetCloudFrontOriginAccessIdentityConfigResponse
-getCloudFrontOriginAccessIdentityConfigResponse pStatus_ =
+getCloudFrontOriginAccessIdentityConfigResponse pResponseStatus_ =
     GetCloudFrontOriginAccessIdentityConfigResponse'
     { _gcfoaicrsCloudFrontOriginAccessIdentityConfig = Nothing
     , _gcfoaicrsETag = Nothing
-    , _gcfoaicrsStatus = pStatus_
+    , _gcfoaicrsResponseStatus = pResponseStatus_
     }
 
 -- | The origin access identity\'s configuration information.
@@ -132,5 +132,5 @@
 gcfoaicrsETag = lens _gcfoaicrsETag (\ s a -> s{_gcfoaicrsETag = a});
 
 -- | The response status code.
-gcfoaicrsStatus :: Lens' GetCloudFrontOriginAccessIdentityConfigResponse Int
-gcfoaicrsStatus = lens _gcfoaicrsStatus (\ s a -> s{_gcfoaicrsStatus = a});
+gcfoaicrsResponseStatus :: Lens' GetCloudFrontOriginAccessIdentityConfigResponse Int
+gcfoaicrsResponseStatus = lens _gcfoaicrsResponseStatus (\ s a -> s{_gcfoaicrsResponseStatus = a});
diff --git a/gen/Network/AWS/CloudFront/GetDistribution.hs b/gen/Network/AWS/CloudFront/GetDistribution.hs
--- a/gen/Network/AWS/CloudFront/GetDistribution.hs
+++ b/gen/Network/AWS/CloudFront/GetDistribution.hs
@@ -35,7 +35,7 @@
     -- * Response Lenses
     , gdrsETag
     , gdrsDistribution
-    , gdrsStatus
+    , gdrsResponseStatus
     ) where
 
 import           Network.AWS.CloudFront.Types
@@ -92,9 +92,9 @@
 --
 -- /See:/ 'getDistributionResponse' smart constructor.
 data GetDistributionResponse = GetDistributionResponse'
-    { _gdrsETag         :: !(Maybe Text)
-    , _gdrsDistribution :: !(Maybe Distribution)
-    , _gdrsStatus       :: !Int
+    { _gdrsETag           :: !(Maybe Text)
+    , _gdrsDistribution   :: !(Maybe Distribution)
+    , _gdrsResponseStatus :: !Int
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'GetDistributionResponse' with the minimum fields required to make a request.
@@ -105,15 +105,15 @@
 --
 -- * 'gdrsDistribution'
 --
--- * 'gdrsStatus'
+-- * 'gdrsResponseStatus'
 getDistributionResponse
-    :: Int -- ^ 'gdrsStatus'
+    :: Int -- ^ 'gdrsResponseStatus'
     -> GetDistributionResponse
-getDistributionResponse pStatus_ =
+getDistributionResponse pResponseStatus_ =
     GetDistributionResponse'
     { _gdrsETag = Nothing
     , _gdrsDistribution = Nothing
-    , _gdrsStatus = pStatus_
+    , _gdrsResponseStatus = pResponseStatus_
     }
 
 -- | The current version of the distribution\'s information. For example:
@@ -126,5 +126,5 @@
 gdrsDistribution = lens _gdrsDistribution (\ s a -> s{_gdrsDistribution = a});
 
 -- | The response status code.
-gdrsStatus :: Lens' GetDistributionResponse Int
-gdrsStatus = lens _gdrsStatus (\ s a -> s{_gdrsStatus = a});
+gdrsResponseStatus :: Lens' GetDistributionResponse Int
+gdrsResponseStatus = lens _gdrsResponseStatus (\ s a -> s{_gdrsResponseStatus = a});
diff --git a/gen/Network/AWS/CloudFront/GetDistributionConfig.hs b/gen/Network/AWS/CloudFront/GetDistributionConfig.hs
--- a/gen/Network/AWS/CloudFront/GetDistributionConfig.hs
+++ b/gen/Network/AWS/CloudFront/GetDistributionConfig.hs
@@ -35,7 +35,7 @@
     -- * Response Lenses
     , gdcrsETag
     , gdcrsDistributionConfig
-    , gdcrsStatus
+    , gdcrsResponseStatus
     ) where
 
 import           Network.AWS.CloudFront.Types
@@ -96,7 +96,7 @@
 data GetDistributionConfigResponse = GetDistributionConfigResponse'
     { _gdcrsETag               :: !(Maybe Text)
     , _gdcrsDistributionConfig :: !(Maybe DistributionConfig)
-    , _gdcrsStatus             :: !Int
+    , _gdcrsResponseStatus     :: !Int
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'GetDistributionConfigResponse' with the minimum fields required to make a request.
@@ -107,15 +107,15 @@
 --
 -- * 'gdcrsDistributionConfig'
 --
--- * 'gdcrsStatus'
+-- * 'gdcrsResponseStatus'
 getDistributionConfigResponse
-    :: Int -- ^ 'gdcrsStatus'
+    :: Int -- ^ 'gdcrsResponseStatus'
     -> GetDistributionConfigResponse
-getDistributionConfigResponse pStatus_ =
+getDistributionConfigResponse pResponseStatus_ =
     GetDistributionConfigResponse'
     { _gdcrsETag = Nothing
     , _gdcrsDistributionConfig = Nothing
-    , _gdcrsStatus = pStatus_
+    , _gdcrsResponseStatus = pResponseStatus_
     }
 
 -- | The current version of the configuration. For example: E2QWRUHAPOMQZL.
@@ -127,5 +127,5 @@
 gdcrsDistributionConfig = lens _gdcrsDistributionConfig (\ s a -> s{_gdcrsDistributionConfig = a});
 
 -- | The response status code.
-gdcrsStatus :: Lens' GetDistributionConfigResponse Int
-gdcrsStatus = lens _gdcrsStatus (\ s a -> s{_gdcrsStatus = a});
+gdcrsResponseStatus :: Lens' GetDistributionConfigResponse Int
+gdcrsResponseStatus = lens _gdcrsResponseStatus (\ s a -> s{_gdcrsResponseStatus = a});
diff --git a/gen/Network/AWS/CloudFront/GetInvalidation.hs b/gen/Network/AWS/CloudFront/GetInvalidation.hs
--- a/gen/Network/AWS/CloudFront/GetInvalidation.hs
+++ b/gen/Network/AWS/CloudFront/GetInvalidation.hs
@@ -35,7 +35,7 @@
     , GetInvalidationResponse
     -- * Response Lenses
     , girsInvalidation
-    , girsStatus
+    , girsResponseStatus
     ) where
 
 import           Network.AWS.CloudFront.Types
@@ -102,8 +102,8 @@
 --
 -- /See:/ 'getInvalidationResponse' smart constructor.
 data GetInvalidationResponse = GetInvalidationResponse'
-    { _girsInvalidation :: !(Maybe Invalidation)
-    , _girsStatus       :: !Int
+    { _girsInvalidation   :: !(Maybe Invalidation)
+    , _girsResponseStatus :: !Int
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'GetInvalidationResponse' with the minimum fields required to make a request.
@@ -112,14 +112,14 @@
 --
 -- * 'girsInvalidation'
 --
--- * 'girsStatus'
+-- * 'girsResponseStatus'
 getInvalidationResponse
-    :: Int -- ^ 'girsStatus'
+    :: Int -- ^ 'girsResponseStatus'
     -> GetInvalidationResponse
-getInvalidationResponse pStatus_ =
+getInvalidationResponse pResponseStatus_ =
     GetInvalidationResponse'
     { _girsInvalidation = Nothing
-    , _girsStatus = pStatus_
+    , _girsResponseStatus = pResponseStatus_
     }
 
 -- | The invalidation\'s information.
@@ -127,5 +127,5 @@
 girsInvalidation = lens _girsInvalidation (\ s a -> s{_girsInvalidation = a});
 
 -- | The response status code.
-girsStatus :: Lens' GetInvalidationResponse Int
-girsStatus = lens _girsStatus (\ s a -> s{_girsStatus = a});
+girsResponseStatus :: Lens' GetInvalidationResponse Int
+girsResponseStatus = lens _girsResponseStatus (\ s a -> s{_girsResponseStatus = a});
diff --git a/gen/Network/AWS/CloudFront/GetStreamingDistribution.hs b/gen/Network/AWS/CloudFront/GetStreamingDistribution.hs
--- a/gen/Network/AWS/CloudFront/GetStreamingDistribution.hs
+++ b/gen/Network/AWS/CloudFront/GetStreamingDistribution.hs
@@ -35,7 +35,7 @@
     -- * Response Lenses
     , gsdrsETag
     , gsdrsStreamingDistribution
-    , gsdrsStatus
+    , gsdrsResponseStatus
     ) where
 
 import           Network.AWS.CloudFront.Types
@@ -96,7 +96,7 @@
 data GetStreamingDistributionResponse = GetStreamingDistributionResponse'
     { _gsdrsETag                  :: !(Maybe Text)
     , _gsdrsStreamingDistribution :: !(Maybe StreamingDistribution)
-    , _gsdrsStatus                :: !Int
+    , _gsdrsResponseStatus        :: !Int
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'GetStreamingDistributionResponse' with the minimum fields required to make a request.
@@ -107,15 +107,15 @@
 --
 -- * 'gsdrsStreamingDistribution'
 --
--- * 'gsdrsStatus'
+-- * 'gsdrsResponseStatus'
 getStreamingDistributionResponse
-    :: Int -- ^ 'gsdrsStatus'
+    :: Int -- ^ 'gsdrsResponseStatus'
     -> GetStreamingDistributionResponse
-getStreamingDistributionResponse pStatus_ =
+getStreamingDistributionResponse pResponseStatus_ =
     GetStreamingDistributionResponse'
     { _gsdrsETag = Nothing
     , _gsdrsStreamingDistribution = Nothing
-    , _gsdrsStatus = pStatus_
+    , _gsdrsResponseStatus = pResponseStatus_
     }
 
 -- | The current version of the streaming distribution\'s information. For
@@ -128,5 +128,5 @@
 gsdrsStreamingDistribution = lens _gsdrsStreamingDistribution (\ s a -> s{_gsdrsStreamingDistribution = a});
 
 -- | The response status code.
-gsdrsStatus :: Lens' GetStreamingDistributionResponse Int
-gsdrsStatus = lens _gsdrsStatus (\ s a -> s{_gsdrsStatus = a});
+gsdrsResponseStatus :: Lens' GetStreamingDistributionResponse Int
+gsdrsResponseStatus = lens _gsdrsResponseStatus (\ s a -> s{_gsdrsResponseStatus = a});
diff --git a/gen/Network/AWS/CloudFront/GetStreamingDistributionConfig.hs b/gen/Network/AWS/CloudFront/GetStreamingDistributionConfig.hs
--- a/gen/Network/AWS/CloudFront/GetStreamingDistributionConfig.hs
+++ b/gen/Network/AWS/CloudFront/GetStreamingDistributionConfig.hs
@@ -35,7 +35,7 @@
     -- * Response Lenses
     , gsdcrsStreamingDistributionConfig
     , gsdcrsETag
-    , gsdcrsStatus
+    , gsdcrsResponseStatus
     ) where
 
 import           Network.AWS.CloudFront.Types
@@ -99,7 +99,7 @@
 data GetStreamingDistributionConfigResponse = GetStreamingDistributionConfigResponse'
     { _gsdcrsStreamingDistributionConfig :: !(Maybe StreamingDistributionConfig)
     , _gsdcrsETag                        :: !(Maybe Text)
-    , _gsdcrsStatus                      :: !Int
+    , _gsdcrsResponseStatus              :: !Int
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'GetStreamingDistributionConfigResponse' with the minimum fields required to make a request.
@@ -110,15 +110,15 @@
 --
 -- * 'gsdcrsETag'
 --
--- * 'gsdcrsStatus'
+-- * 'gsdcrsResponseStatus'
 getStreamingDistributionConfigResponse
-    :: Int -- ^ 'gsdcrsStatus'
+    :: Int -- ^ 'gsdcrsResponseStatus'
     -> GetStreamingDistributionConfigResponse
-getStreamingDistributionConfigResponse pStatus_ =
+getStreamingDistributionConfigResponse pResponseStatus_ =
     GetStreamingDistributionConfigResponse'
     { _gsdcrsStreamingDistributionConfig = Nothing
     , _gsdcrsETag = Nothing
-    , _gsdcrsStatus = pStatus_
+    , _gsdcrsResponseStatus = pResponseStatus_
     }
 
 -- | The streaming distribution\'s configuration information.
@@ -130,5 +130,5 @@
 gsdcrsETag = lens _gsdcrsETag (\ s a -> s{_gsdcrsETag = a});
 
 -- | The response status code.
-gsdcrsStatus :: Lens' GetStreamingDistributionConfigResponse Int
-gsdcrsStatus = lens _gsdcrsStatus (\ s a -> s{_gsdcrsStatus = a});
+gsdcrsResponseStatus :: Lens' GetStreamingDistributionConfigResponse Int
+gsdcrsResponseStatus = lens _gsdcrsResponseStatus (\ s a -> s{_gsdcrsResponseStatus = a});
diff --git a/gen/Network/AWS/CloudFront/ListCloudFrontOriginAccessIdentities.hs b/gen/Network/AWS/CloudFront/ListCloudFrontOriginAccessIdentities.hs
--- a/gen/Network/AWS/CloudFront/ListCloudFrontOriginAccessIdentities.hs
+++ b/gen/Network/AWS/CloudFront/ListCloudFrontOriginAccessIdentities.hs
@@ -27,14 +27,14 @@
       listCloudFrontOriginAccessIdentities
     , ListCloudFrontOriginAccessIdentities
     -- * Request Lenses
-    , lcfoaiMaxItems
     , lcfoaiMarker
+    , lcfoaiMaxItems
 
     -- * Destructuring the Response
     , listCloudFrontOriginAccessIdentitiesResponse
     , ListCloudFrontOriginAccessIdentitiesResponse
     -- * Response Lenses
-    , lcfoairsStatus
+    , lcfoairsResponseStatus
     , lcfoairsCloudFrontOriginAccessIdentityList
     ) where
 
@@ -48,30 +48,25 @@
 --
 -- /See:/ 'listCloudFrontOriginAccessIdentities' smart constructor.
 data ListCloudFrontOriginAccessIdentities = ListCloudFrontOriginAccessIdentities'
-    { _lcfoaiMaxItems :: !(Maybe Text)
-    , _lcfoaiMarker   :: !(Maybe Text)
+    { _lcfoaiMarker   :: !(Maybe Text)
+    , _lcfoaiMaxItems :: !(Maybe Text)
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'ListCloudFrontOriginAccessIdentities' with the minimum fields required to make a request.
 --
 -- Use one of the following lenses to modify other fields as desired:
 --
--- * 'lcfoaiMaxItems'
---
 -- * 'lcfoaiMarker'
+--
+-- * 'lcfoaiMaxItems'
 listCloudFrontOriginAccessIdentities
     :: ListCloudFrontOriginAccessIdentities
 listCloudFrontOriginAccessIdentities =
     ListCloudFrontOriginAccessIdentities'
-    { _lcfoaiMaxItems = Nothing
-    , _lcfoaiMarker = Nothing
+    { _lcfoaiMarker = Nothing
+    , _lcfoaiMaxItems = Nothing
     }
 
--- | The maximum number of origin access identities you want in the response
--- body.
-lcfoaiMaxItems :: Lens' ListCloudFrontOriginAccessIdentities (Maybe Text)
-lcfoaiMaxItems = lens _lcfoaiMaxItems (\ s a -> s{_lcfoaiMaxItems = a});
-
 -- | Use this when paginating results to indicate where to begin in your list
 -- of origin access identities. The results include identities in the list
 -- that occur after the marker. To get the next page of results, set the
@@ -80,6 +75,11 @@
 lcfoaiMarker :: Lens' ListCloudFrontOriginAccessIdentities (Maybe Text)
 lcfoaiMarker = lens _lcfoaiMarker (\ s a -> s{_lcfoaiMarker = a});
 
+-- | The maximum number of origin access identities you want in the response
+-- body.
+lcfoaiMaxItems :: Lens' ListCloudFrontOriginAccessIdentities (Maybe Text)
+lcfoaiMaxItems = lens _lcfoaiMaxItems (\ s a -> s{_lcfoaiMaxItems = a});
+
 instance AWSRequest
          ListCloudFrontOriginAccessIdentities where
         type Rs ListCloudFrontOriginAccessIdentities =
@@ -105,14 +105,14 @@
          where
         toQuery ListCloudFrontOriginAccessIdentities'{..}
           = mconcat
-              ["MaxItems" =: _lcfoaiMaxItems,
-               "Marker" =: _lcfoaiMarker]
+              ["Marker" =: _lcfoaiMarker,
+               "MaxItems" =: _lcfoaiMaxItems]
 
 -- | The returned result of the corresponding request.
 --
 -- /See:/ 'listCloudFrontOriginAccessIdentitiesResponse' smart constructor.
 data ListCloudFrontOriginAccessIdentitiesResponse = ListCloudFrontOriginAccessIdentitiesResponse'
-    { _lcfoairsStatus                             :: !Int
+    { _lcfoairsResponseStatus                     :: !Int
     , _lcfoairsCloudFrontOriginAccessIdentityList :: !CloudFrontOriginAccessIdentityList
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
@@ -120,22 +120,22 @@
 --
 -- Use one of the following lenses to modify other fields as desired:
 --
--- * 'lcfoairsStatus'
+-- * 'lcfoairsResponseStatus'
 --
 -- * 'lcfoairsCloudFrontOriginAccessIdentityList'
 listCloudFrontOriginAccessIdentitiesResponse
-    :: Int -- ^ 'lcfoairsStatus'
+    :: Int -- ^ 'lcfoairsResponseStatus'
     -> CloudFrontOriginAccessIdentityList -- ^ 'lcfoairsCloudFrontOriginAccessIdentityList'
     -> ListCloudFrontOriginAccessIdentitiesResponse
-listCloudFrontOriginAccessIdentitiesResponse pStatus_ pCloudFrontOriginAccessIdentityList_ =
+listCloudFrontOriginAccessIdentitiesResponse pResponseStatus_ pCloudFrontOriginAccessIdentityList_ =
     ListCloudFrontOriginAccessIdentitiesResponse'
-    { _lcfoairsStatus = pStatus_
+    { _lcfoairsResponseStatus = pResponseStatus_
     , _lcfoairsCloudFrontOriginAccessIdentityList = pCloudFrontOriginAccessIdentityList_
     }
 
 -- | The response status code.
-lcfoairsStatus :: Lens' ListCloudFrontOriginAccessIdentitiesResponse Int
-lcfoairsStatus = lens _lcfoairsStatus (\ s a -> s{_lcfoairsStatus = a});
+lcfoairsResponseStatus :: Lens' ListCloudFrontOriginAccessIdentitiesResponse Int
+lcfoairsResponseStatus = lens _lcfoairsResponseStatus (\ s a -> s{_lcfoairsResponseStatus = a});
 
 -- | The CloudFrontOriginAccessIdentityList type.
 lcfoairsCloudFrontOriginAccessIdentityList :: Lens' ListCloudFrontOriginAccessIdentitiesResponse CloudFrontOriginAccessIdentityList
diff --git a/gen/Network/AWS/CloudFront/ListDistributions.hs b/gen/Network/AWS/CloudFront/ListDistributions.hs
--- a/gen/Network/AWS/CloudFront/ListDistributions.hs
+++ b/gen/Network/AWS/CloudFront/ListDistributions.hs
@@ -27,14 +27,14 @@
       listDistributions
     , ListDistributions
     -- * Request Lenses
-    , ldMaxItems
     , ldMarker
+    , ldMaxItems
 
     -- * Destructuring the Response
     , listDistributionsResponse
     , ListDistributionsResponse
     -- * Response Lenses
-    , ldrsStatus
+    , ldrsResponseStatus
     , ldrsDistributionList
     ) where
 
@@ -48,29 +48,25 @@
 --
 -- /See:/ 'listDistributions' smart constructor.
 data ListDistributions = ListDistributions'
-    { _ldMaxItems :: !(Maybe Text)
-    , _ldMarker   :: !(Maybe Text)
+    { _ldMarker   :: !(Maybe Text)
+    , _ldMaxItems :: !(Maybe Text)
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'ListDistributions' with the minimum fields required to make a request.
 --
 -- Use one of the following lenses to modify other fields as desired:
 --
--- * 'ldMaxItems'
---
 -- * 'ldMarker'
+--
+-- * 'ldMaxItems'
 listDistributions
     :: ListDistributions
 listDistributions =
     ListDistributions'
-    { _ldMaxItems = Nothing
-    , _ldMarker = Nothing
+    { _ldMarker = Nothing
+    , _ldMaxItems = Nothing
     }
 
--- | The maximum number of distributions you want in the response body.
-ldMaxItems :: Lens' ListDistributions (Maybe Text)
-ldMaxItems = lens _ldMaxItems (\ s a -> s{_ldMaxItems = a});
-
 -- | Use this when paginating results to indicate where to begin in your list
 -- of distributions. The results include distributions in the list that
 -- occur after the marker. To get the next page of results, set the Marker
@@ -79,6 +75,10 @@
 ldMarker :: Lens' ListDistributions (Maybe Text)
 ldMarker = lens _ldMarker (\ s a -> s{_ldMarker = a});
 
+-- | The maximum number of distributions you want in the response body.
+ldMaxItems :: Lens' ListDistributions (Maybe Text)
+ldMaxItems = lens _ldMaxItems (\ s a -> s{_ldMaxItems = a});
+
 instance AWSRequest ListDistributions where
         type Rs ListDistributions = ListDistributionsResponse
         request = get cloudFront
@@ -97,13 +97,13 @@
 instance ToQuery ListDistributions where
         toQuery ListDistributions'{..}
           = mconcat
-              ["MaxItems" =: _ldMaxItems, "Marker" =: _ldMarker]
+              ["Marker" =: _ldMarker, "MaxItems" =: _ldMaxItems]
 
 -- | The returned result of the corresponding request.
 --
 -- /See:/ 'listDistributionsResponse' smart constructor.
 data ListDistributionsResponse = ListDistributionsResponse'
-    { _ldrsStatus           :: !Int
+    { _ldrsResponseStatus   :: !Int
     , _ldrsDistributionList :: !DistributionList
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
@@ -111,22 +111,22 @@
 --
 -- Use one of the following lenses to modify other fields as desired:
 --
--- * 'ldrsStatus'
+-- * 'ldrsResponseStatus'
 --
 -- * 'ldrsDistributionList'
 listDistributionsResponse
-    :: Int -- ^ 'ldrsStatus'
+    :: Int -- ^ 'ldrsResponseStatus'
     -> DistributionList -- ^ 'ldrsDistributionList'
     -> ListDistributionsResponse
-listDistributionsResponse pStatus_ pDistributionList_ =
+listDistributionsResponse pResponseStatus_ pDistributionList_ =
     ListDistributionsResponse'
-    { _ldrsStatus = pStatus_
+    { _ldrsResponseStatus = pResponseStatus_
     , _ldrsDistributionList = pDistributionList_
     }
 
 -- | The response status code.
-ldrsStatus :: Lens' ListDistributionsResponse Int
-ldrsStatus = lens _ldrsStatus (\ s a -> s{_ldrsStatus = a});
+ldrsResponseStatus :: Lens' ListDistributionsResponse Int
+ldrsResponseStatus = lens _ldrsResponseStatus (\ s a -> s{_ldrsResponseStatus = a});
 
 -- | The DistributionList type.
 ldrsDistributionList :: Lens' ListDistributionsResponse DistributionList
diff --git a/gen/Network/AWS/CloudFront/ListInvalidations.hs b/gen/Network/AWS/CloudFront/ListInvalidations.hs
--- a/gen/Network/AWS/CloudFront/ListInvalidations.hs
+++ b/gen/Network/AWS/CloudFront/ListInvalidations.hs
@@ -27,15 +27,15 @@
       listInvalidations
     , ListInvalidations
     -- * Request Lenses
-    , liMaxItems
     , liMarker
+    , liMaxItems
     , liDistributionId
 
     -- * Destructuring the Response
     , listInvalidationsResponse
     , ListInvalidationsResponse
     -- * Response Lenses
-    , lirsStatus
+    , lirsResponseStatus
     , lirsInvalidationList
     ) where
 
@@ -49,8 +49,8 @@
 --
 -- /See:/ 'listInvalidations' smart constructor.
 data ListInvalidations = ListInvalidations'
-    { _liMaxItems       :: !(Maybe Text)
-    , _liMarker         :: !(Maybe Text)
+    { _liMarker         :: !(Maybe Text)
+    , _liMaxItems       :: !(Maybe Text)
     , _liDistributionId :: !Text
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
@@ -58,26 +58,21 @@
 --
 -- Use one of the following lenses to modify other fields as desired:
 --
--- * 'liMaxItems'
---
 -- * 'liMarker'
 --
+-- * 'liMaxItems'
+--
 -- * 'liDistributionId'
 listInvalidations
     :: Text -- ^ 'liDistributionId'
     -> ListInvalidations
 listInvalidations pDistributionId_ =
     ListInvalidations'
-    { _liMaxItems = Nothing
-    , _liMarker = Nothing
+    { _liMarker = Nothing
+    , _liMaxItems = Nothing
     , _liDistributionId = pDistributionId_
     }
 
--- | The maximum number of invalidation batches you want in the response
--- body.
-liMaxItems :: Lens' ListInvalidations (Maybe Text)
-liMaxItems = lens _liMaxItems (\ s a -> s{_liMaxItems = a});
-
 -- | Use this parameter when paginating results to indicate where to begin in
 -- your list of invalidation batches. Because the results are returned in
 -- decreasing order from most recent to oldest, the most recent results are
@@ -88,6 +83,11 @@
 liMarker :: Lens' ListInvalidations (Maybe Text)
 liMarker = lens _liMarker (\ s a -> s{_liMarker = a});
 
+-- | The maximum number of invalidation batches you want in the response
+-- body.
+liMaxItems :: Lens' ListInvalidations (Maybe Text)
+liMaxItems = lens _liMaxItems (\ s a -> s{_liMaxItems = a});
+
 -- | The distribution\'s id.
 liDistributionId :: Lens' ListInvalidations Text
 liDistributionId = lens _liDistributionId (\ s a -> s{_liDistributionId = a});
@@ -113,13 +113,13 @@
 instance ToQuery ListInvalidations where
         toQuery ListInvalidations'{..}
           = mconcat
-              ["MaxItems" =: _liMaxItems, "Marker" =: _liMarker]
+              ["Marker" =: _liMarker, "MaxItems" =: _liMaxItems]
 
 -- | The returned result of the corresponding request.
 --
 -- /See:/ 'listInvalidationsResponse' smart constructor.
 data ListInvalidationsResponse = ListInvalidationsResponse'
-    { _lirsStatus           :: !Int
+    { _lirsResponseStatus   :: !Int
     , _lirsInvalidationList :: !InvalidationList
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
@@ -127,22 +127,22 @@
 --
 -- Use one of the following lenses to modify other fields as desired:
 --
--- * 'lirsStatus'
+-- * 'lirsResponseStatus'
 --
 -- * 'lirsInvalidationList'
 listInvalidationsResponse
-    :: Int -- ^ 'lirsStatus'
+    :: Int -- ^ 'lirsResponseStatus'
     -> InvalidationList -- ^ 'lirsInvalidationList'
     -> ListInvalidationsResponse
-listInvalidationsResponse pStatus_ pInvalidationList_ =
+listInvalidationsResponse pResponseStatus_ pInvalidationList_ =
     ListInvalidationsResponse'
-    { _lirsStatus = pStatus_
+    { _lirsResponseStatus = pResponseStatus_
     , _lirsInvalidationList = pInvalidationList_
     }
 
 -- | The response status code.
-lirsStatus :: Lens' ListInvalidationsResponse Int
-lirsStatus = lens _lirsStatus (\ s a -> s{_lirsStatus = a});
+lirsResponseStatus :: Lens' ListInvalidationsResponse Int
+lirsResponseStatus = lens _lirsResponseStatus (\ s a -> s{_lirsResponseStatus = a});
 
 -- | Information about invalidation batches.
 lirsInvalidationList :: Lens' ListInvalidationsResponse InvalidationList
diff --git a/gen/Network/AWS/CloudFront/ListStreamingDistributions.hs b/gen/Network/AWS/CloudFront/ListStreamingDistributions.hs
--- a/gen/Network/AWS/CloudFront/ListStreamingDistributions.hs
+++ b/gen/Network/AWS/CloudFront/ListStreamingDistributions.hs
@@ -27,14 +27,14 @@
       listStreamingDistributions
     , ListStreamingDistributions
     -- * Request Lenses
-    , lsdMaxItems
     , lsdMarker
+    , lsdMaxItems
 
     -- * Destructuring the Response
     , listStreamingDistributionsResponse
     , ListStreamingDistributionsResponse
     -- * Response Lenses
-    , lsdrsStatus
+    , lsdrsResponseStatus
     , lsdrsStreamingDistributionList
     ) where
 
@@ -48,30 +48,25 @@
 --
 -- /See:/ 'listStreamingDistributions' smart constructor.
 data ListStreamingDistributions = ListStreamingDistributions'
-    { _lsdMaxItems :: !(Maybe Text)
-    , _lsdMarker   :: !(Maybe Text)
+    { _lsdMarker   :: !(Maybe Text)
+    , _lsdMaxItems :: !(Maybe Text)
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'ListStreamingDistributions' with the minimum fields required to make a request.
 --
 -- Use one of the following lenses to modify other fields as desired:
 --
--- * 'lsdMaxItems'
---
 -- * 'lsdMarker'
+--
+-- * 'lsdMaxItems'
 listStreamingDistributions
     :: ListStreamingDistributions
 listStreamingDistributions =
     ListStreamingDistributions'
-    { _lsdMaxItems = Nothing
-    , _lsdMarker = Nothing
+    { _lsdMarker = Nothing
+    , _lsdMaxItems = Nothing
     }
 
--- | The maximum number of streaming distributions you want in the response
--- body.
-lsdMaxItems :: Lens' ListStreamingDistributions (Maybe Text)
-lsdMaxItems = lens _lsdMaxItems (\ s a -> s{_lsdMaxItems = a});
-
 -- | Use this when paginating results to indicate where to begin in your list
 -- of streaming distributions. The results include distributions in the
 -- list that occur after the marker. To get the next page of results, set
@@ -80,6 +75,11 @@
 lsdMarker :: Lens' ListStreamingDistributions (Maybe Text)
 lsdMarker = lens _lsdMarker (\ s a -> s{_lsdMarker = a});
 
+-- | The maximum number of streaming distributions you want in the response
+-- body.
+lsdMaxItems :: Lens' ListStreamingDistributions (Maybe Text)
+lsdMaxItems = lens _lsdMaxItems (\ s a -> s{_lsdMaxItems = a});
+
 instance AWSRequest ListStreamingDistributions where
         type Rs ListStreamingDistributions =
              ListStreamingDistributionsResponse
@@ -99,13 +99,13 @@
 instance ToQuery ListStreamingDistributions where
         toQuery ListStreamingDistributions'{..}
           = mconcat
-              ["MaxItems" =: _lsdMaxItems, "Marker" =: _lsdMarker]
+              ["Marker" =: _lsdMarker, "MaxItems" =: _lsdMaxItems]
 
 -- | The returned result of the corresponding request.
 --
 -- /See:/ 'listStreamingDistributionsResponse' smart constructor.
 data ListStreamingDistributionsResponse = ListStreamingDistributionsResponse'
-    { _lsdrsStatus                    :: !Int
+    { _lsdrsResponseStatus            :: !Int
     , _lsdrsStreamingDistributionList :: !StreamingDistributionList
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
@@ -113,22 +113,22 @@
 --
 -- Use one of the following lenses to modify other fields as desired:
 --
--- * 'lsdrsStatus'
+-- * 'lsdrsResponseStatus'
 --
 -- * 'lsdrsStreamingDistributionList'
 listStreamingDistributionsResponse
-    :: Int -- ^ 'lsdrsStatus'
+    :: Int -- ^ 'lsdrsResponseStatus'
     -> StreamingDistributionList -- ^ 'lsdrsStreamingDistributionList'
     -> ListStreamingDistributionsResponse
-listStreamingDistributionsResponse pStatus_ pStreamingDistributionList_ =
+listStreamingDistributionsResponse pResponseStatus_ pStreamingDistributionList_ =
     ListStreamingDistributionsResponse'
-    { _lsdrsStatus = pStatus_
+    { _lsdrsResponseStatus = pResponseStatus_
     , _lsdrsStreamingDistributionList = pStreamingDistributionList_
     }
 
 -- | The response status code.
-lsdrsStatus :: Lens' ListStreamingDistributionsResponse Int
-lsdrsStatus = lens _lsdrsStatus (\ s a -> s{_lsdrsStatus = a});
+lsdrsResponseStatus :: Lens' ListStreamingDistributionsResponse Int
+lsdrsResponseStatus = lens _lsdrsResponseStatus (\ s a -> s{_lsdrsResponseStatus = a});
 
 -- | The StreamingDistributionList type.
 lsdrsStreamingDistributionList :: Lens' ListStreamingDistributionsResponse StreamingDistributionList
diff --git a/gen/Network/AWS/CloudFront/Types.hs b/gen/Network/AWS/CloudFront/Types.hs
--- a/gen/Network/AWS/CloudFront/Types.hs
+++ b/gen/Network/AWS/CloudFront/Types.hs
@@ -18,52 +18,52 @@
     -- * Errors
     , _InvalidErrorCode
     , _TooManyCacheBehaviors
-    , _DistributionNotDisabled
-    , _InvalidOriginAccessIdentity
     , _TooManyCloudFrontOriginAccessIdentities
-    , _TooManyStreamingDistributions
-    , _InvalidArgument
-    , _NoSuchCloudFrontOriginAccessIdentity
+    , _InvalidOriginAccessIdentity
+    , _DistributionNotDisabled
     , _NoSuchStreamingDistribution
-    , _CloudFrontOriginAccessIdentityInUse
     , _InconsistentQuantities
+    , _InvalidArgument
     , _TooManyInvalidationsInProgress
     , _TooManyDistributionCNAMEs
-    , _InvalidForwardCookies
-    , _TooManyCookieNamesInWhiteList
+    , _NoSuchCloudFrontOriginAccessIdentity
+    , _CloudFrontOriginAccessIdentityInUse
+    , _TooManyStreamingDistributions
     , _BatchTooLarge
-    , _InvalidOrigin
+    , _TooManyCookieNamesInWhiteList
+    , _InvalidForwardCookies
     , _TooManyTrustedSigners
-    , _NoSuchOrigin
+    , _InvalidOrigin
     , _NoSuchInvalidation
-    , _StreamingDistributionNotDisabled
+    , _NoSuchOrigin
     , _InvalidTTLOrder
+    , _StreamingDistributionNotDisabled
+    , _TooManyHeadersInForwardedValues
     , _TooManyStreamingDistributionCNAMEs
-    , _TooManyDistributions
     , _InvalidRequiredProtocol
-    , _TooManyHeadersInForwardedValues
+    , _TooManyDistributions
     , _TooManyCertificates
-    , _MissingBody
     , _DistributionAlreadyExists
+    , _MissingBody
     , _IllegalUpdate
-    , _InvalidResponseCode
     , _InvalidIfMatchVersion
     , _PreconditionFailed
-    , _InvalidProtocolSettings
-    , _TrustedSignerDoesNotExist
+    , _InvalidResponseCode
     , _InvalidHeadersForS3Origin
     , _CNAMEAlreadyExists
-    , _StreamingDistributionAlreadyExists
-    , _TooManyOrigins
+    , _TrustedSignerDoesNotExist
+    , _InvalidProtocolSettings
     , _CloudFrontOriginAccessIdentityAlreadyExists
+    , _TooManyOrigins
     , _InvalidRelativePath
+    , _StreamingDistributionAlreadyExists
     , _InvalidMinimumProtocolVersion
     , _AccessDenied
-    , _NoSuchDistribution
     , _InvalidViewerCertificate
+    , _NoSuchDistribution
     , _InvalidDefaultRootObject
-    , _InvalidLocationCode
     , _InvalidGeoRestrictionParameter
+    , _InvalidLocationCode
 
     -- * GeoRestrictionType
     , GeoRestrictionType (..)
@@ -225,14 +225,14 @@
     -- * DistributionConfig
     , DistributionConfig
     , distributionConfig
-    , dcDefaultRootObject
     , dcAliases
-    , dcCustomErrorResponses
+    , dcDefaultRootObject
     , dcPriceClass
+    , dcCustomErrorResponses
     , dcViewerCertificate
     , dcRestrictions
-    , dcCacheBehaviors
     , dcLogging
+    , dcCacheBehaviors
     , dcCallerReference
     , dcOrigins
     , dcDefaultCacheBehavior
@@ -489,16 +489,6 @@
 _TooManyCacheBehaviors =
     _ServiceError . hasStatus 400 . hasCode "TooManyCacheBehaviors"
 
--- | Prism for DistributionNotDisabled' errors.
-_DistributionNotDisabled :: AsError a => Getting (First ServiceError) a ServiceError
-_DistributionNotDisabled =
-    _ServiceError . hasStatus 409 . hasCode "DistributionNotDisabled"
-
--- | The origin access identity is not valid or doesn\'t exist.
-_InvalidOriginAccessIdentity :: AsError a => Getting (First ServiceError) a ServiceError
-_InvalidOriginAccessIdentity =
-    _ServiceError . hasStatus 400 . hasCode "InvalidOriginAccessIdentity"
-
 -- | Processing your request would cause you to exceed the maximum number of
 -- origin access identities allowed.
 _TooManyCloudFrontOriginAccessIdentities :: AsError a => Getting (First ServiceError) a ServiceError
@@ -506,38 +496,30 @@
     _ServiceError .
     hasStatus 400 . hasCode "TooManyCloudFrontOriginAccessIdentities"
 
--- | Processing your request would cause you to exceed the maximum number of
--- streaming distributions allowed.
-_TooManyStreamingDistributions :: AsError a => Getting (First ServiceError) a ServiceError
-_TooManyStreamingDistributions =
-    _ServiceError . hasStatus 400 . hasCode "TooManyStreamingDistributions"
-
--- | The argument is invalid.
-_InvalidArgument :: AsError a => Getting (First ServiceError) a ServiceError
-_InvalidArgument = _ServiceError . hasStatus 400 . hasCode "InvalidArgument"
+-- | The origin access identity is not valid or doesn\'t exist.
+_InvalidOriginAccessIdentity :: AsError a => Getting (First ServiceError) a ServiceError
+_InvalidOriginAccessIdentity =
+    _ServiceError . hasStatus 400 . hasCode "InvalidOriginAccessIdentity"
 
--- | The specified origin access identity does not exist.
-_NoSuchCloudFrontOriginAccessIdentity :: AsError a => Getting (First ServiceError) a ServiceError
-_NoSuchCloudFrontOriginAccessIdentity =
-    _ServiceError .
-    hasStatus 404 . hasCode "NoSuchCloudFrontOriginAccessIdentity"
+-- | Prism for DistributionNotDisabled' errors.
+_DistributionNotDisabled :: AsError a => Getting (First ServiceError) a ServiceError
+_DistributionNotDisabled =
+    _ServiceError . hasStatus 409 . hasCode "DistributionNotDisabled"
 
 -- | The specified streaming distribution does not exist.
 _NoSuchStreamingDistribution :: AsError a => Getting (First ServiceError) a ServiceError
 _NoSuchStreamingDistribution =
     _ServiceError . hasStatus 404 . hasCode "NoSuchStreamingDistribution"
 
--- | Prism for CloudFrontOriginAccessIdentityInUse' errors.
-_CloudFrontOriginAccessIdentityInUse :: AsError a => Getting (First ServiceError) a ServiceError
-_CloudFrontOriginAccessIdentityInUse =
-    _ServiceError .
-    hasStatus 409 . hasCode "CloudFrontOriginAccessIdentityInUse"
-
 -- | The value of Quantity and the size of Items do not match.
 _InconsistentQuantities :: AsError a => Getting (First ServiceError) a ServiceError
 _InconsistentQuantities =
     _ServiceError . hasStatus 400 . hasCode "InconsistentQuantities"
 
+-- | The argument is invalid.
+_InvalidArgument :: AsError a => Getting (First ServiceError) a ServiceError
+_InvalidArgument = _ServiceError . hasStatus 400 . hasCode "InvalidArgument"
+
 -- | You have exceeded the maximum number of allowable InProgress
 -- invalidation batch requests, or invalidation objects.
 _TooManyInvalidationsInProgress :: AsError a => Getting (First ServiceError) a ServiceError
@@ -549,28 +531,41 @@
 _TooManyDistributionCNAMEs =
     _ServiceError . hasStatus 400 . hasCode "TooManyDistributionCNAMEs"
 
--- | Your request contains forward cookies option which doesn\'t match with
--- the expectation for the whitelisted list of cookie names. Either list of
--- cookie names has been specified when not allowed or list of cookie names
--- is missing when expected.
-_InvalidForwardCookies :: AsError a => Getting (First ServiceError) a ServiceError
-_InvalidForwardCookies =
-    _ServiceError . hasStatus 400 . hasCode "InvalidForwardCookies"
+-- | The specified origin access identity does not exist.
+_NoSuchCloudFrontOriginAccessIdentity :: AsError a => Getting (First ServiceError) a ServiceError
+_NoSuchCloudFrontOriginAccessIdentity =
+    _ServiceError .
+    hasStatus 404 . hasCode "NoSuchCloudFrontOriginAccessIdentity"
 
+-- | Prism for CloudFrontOriginAccessIdentityInUse' errors.
+_CloudFrontOriginAccessIdentityInUse :: AsError a => Getting (First ServiceError) a ServiceError
+_CloudFrontOriginAccessIdentityInUse =
+    _ServiceError .
+    hasStatus 409 . hasCode "CloudFrontOriginAccessIdentityInUse"
+
+-- | Processing your request would cause you to exceed the maximum number of
+-- streaming distributions allowed.
+_TooManyStreamingDistributions :: AsError a => Getting (First ServiceError) a ServiceError
+_TooManyStreamingDistributions =
+    _ServiceError . hasStatus 400 . hasCode "TooManyStreamingDistributions"
+
+-- | Prism for BatchTooLarge' errors.
+_BatchTooLarge :: AsError a => Getting (First ServiceError) a ServiceError
+_BatchTooLarge = _ServiceError . hasStatus 413 . hasCode "BatchTooLarge"
+
 -- | Your request contains more cookie names in the whitelist than are
 -- allowed per cache behavior.
 _TooManyCookieNamesInWhiteList :: AsError a => Getting (First ServiceError) a ServiceError
 _TooManyCookieNamesInWhiteList =
     _ServiceError . hasStatus 400 . hasCode "TooManyCookieNamesInWhiteList"
 
--- | Prism for BatchTooLarge' errors.
-_BatchTooLarge :: AsError a => Getting (First ServiceError) a ServiceError
-_BatchTooLarge = _ServiceError . hasStatus 413 . hasCode "BatchTooLarge"
-
--- | The Amazon S3 origin server specified does not refer to a valid Amazon
--- S3 bucket.
-_InvalidOrigin :: AsError a => Getting (First ServiceError) a ServiceError
-_InvalidOrigin = _ServiceError . hasStatus 400 . hasCode "InvalidOrigin"
+-- | Your request contains forward cookies option which doesn\'t match with
+-- the expectation for the whitelisted list of cookie names. Either list of
+-- cookie names has been specified when not allowed or list of cookie names
+-- is missing when expected.
+_InvalidForwardCookies :: AsError a => Getting (First ServiceError) a ServiceError
+_InvalidForwardCookies =
+    _ServiceError . hasStatus 400 . hasCode "InvalidForwardCookies"
 
 -- | Your request contains more trusted signers than are allowed per
 -- distribution.
@@ -578,23 +573,33 @@
 _TooManyTrustedSigners =
     _ServiceError . hasStatus 400 . hasCode "TooManyTrustedSigners"
 
--- | No origin exists with the specified Origin Id.
-_NoSuchOrigin :: AsError a => Getting (First ServiceError) a ServiceError
-_NoSuchOrigin = _ServiceError . hasStatus 404 . hasCode "NoSuchOrigin"
+-- | The Amazon S3 origin server specified does not refer to a valid Amazon
+-- S3 bucket.
+_InvalidOrigin :: AsError a => Getting (First ServiceError) a ServiceError
+_InvalidOrigin = _ServiceError . hasStatus 400 . hasCode "InvalidOrigin"
 
 -- | The specified invalidation does not exist.
 _NoSuchInvalidation :: AsError a => Getting (First ServiceError) a ServiceError
 _NoSuchInvalidation =
     _ServiceError . hasStatus 404 . hasCode "NoSuchInvalidation"
 
+-- | No origin exists with the specified Origin Id.
+_NoSuchOrigin :: AsError a => Getting (First ServiceError) a ServiceError
+_NoSuchOrigin = _ServiceError . hasStatus 404 . hasCode "NoSuchOrigin"
+
+-- | Prism for InvalidTTLOrder' errors.
+_InvalidTTLOrder :: AsError a => Getting (First ServiceError) a ServiceError
+_InvalidTTLOrder = _ServiceError . hasStatus 400 . hasCode "InvalidTTLOrder"
+
 -- | Prism for StreamingDistributionNotDisabled' errors.
 _StreamingDistributionNotDisabled :: AsError a => Getting (First ServiceError) a ServiceError
 _StreamingDistributionNotDisabled =
     _ServiceError . hasStatus 409 . hasCode "StreamingDistributionNotDisabled"
 
--- | Prism for InvalidTTLOrder' errors.
-_InvalidTTLOrder :: AsError a => Getting (First ServiceError) a ServiceError
-_InvalidTTLOrder = _ServiceError . hasStatus 400 . hasCode "InvalidTTLOrder"
+-- | Prism for TooManyHeadersInForwardedValues' errors.
+_TooManyHeadersInForwardedValues :: AsError a => Getting (First ServiceError) a ServiceError
+_TooManyHeadersInForwardedValues =
+    _ServiceError . hasStatus 400 . hasCode "TooManyHeadersInForwardedValues"
 
 -- | Prism for TooManyStreamingDistributionCNAMEs' errors.
 _TooManyStreamingDistributionCNAMEs :: AsError a => Getting (First ServiceError) a ServiceError
@@ -602,12 +607,6 @@
     _ServiceError .
     hasStatus 400 . hasCode "TooManyStreamingDistributionCNAMEs"
 
--- | Processing your request would cause you to exceed the maximum number of
--- distributions allowed.
-_TooManyDistributions :: AsError a => Getting (First ServiceError) a ServiceError
-_TooManyDistributions =
-    _ServiceError . hasStatus 400 . hasCode "TooManyDistributions"
-
 -- | This operation requires the HTTPS protocol. Ensure that you specify the
 -- HTTPS protocol in your request, or omit the RequiredProtocols element
 -- from your distribution configuration.
@@ -615,36 +614,32 @@
 _InvalidRequiredProtocol =
     _ServiceError . hasStatus 400 . hasCode "InvalidRequiredProtocol"
 
--- | Prism for TooManyHeadersInForwardedValues' errors.
-_TooManyHeadersInForwardedValues :: AsError a => Getting (First ServiceError) a ServiceError
-_TooManyHeadersInForwardedValues =
-    _ServiceError . hasStatus 400 . hasCode "TooManyHeadersInForwardedValues"
+-- | Processing your request would cause you to exceed the maximum number of
+-- distributions allowed.
+_TooManyDistributions :: AsError a => Getting (First ServiceError) a ServiceError
+_TooManyDistributions =
+    _ServiceError . hasStatus 400 . hasCode "TooManyDistributions"
 
 -- | You cannot create anymore custom ssl certificates.
 _TooManyCertificates :: AsError a => Getting (First ServiceError) a ServiceError
 _TooManyCertificates =
     _ServiceError . hasStatus 400 . hasCode "TooManyCertificates"
 
--- | This operation requires a body. Ensure that the body is present and the
--- Content-Type header is set.
-_MissingBody :: AsError a => Getting (First ServiceError) a ServiceError
-_MissingBody = _ServiceError . hasStatus 400 . hasCode "MissingBody"
-
 -- | The caller reference you attempted to create the distribution with is
 -- associated with another distribution.
 _DistributionAlreadyExists :: AsError a => Getting (First ServiceError) a ServiceError
 _DistributionAlreadyExists =
     _ServiceError . hasStatus 409 . hasCode "DistributionAlreadyExists"
 
+-- | This operation requires a body. Ensure that the body is present and the
+-- Content-Type header is set.
+_MissingBody :: AsError a => Getting (First ServiceError) a ServiceError
+_MissingBody = _ServiceError . hasStatus 400 . hasCode "MissingBody"
+
 -- | Origin and CallerReference cannot be updated.
 _IllegalUpdate :: AsError a => Getting (First ServiceError) a ServiceError
 _IllegalUpdate = _ServiceError . hasStatus 400 . hasCode "IllegalUpdate"
 
--- | Prism for InvalidResponseCode' errors.
-_InvalidResponseCode :: AsError a => Getting (First ServiceError) a ServiceError
-_InvalidResponseCode =
-    _ServiceError . hasStatus 400 . hasCode "InvalidResponseCode"
-
 -- | The If-Match version is missing or not valid for the distribution.
 _InvalidIfMatchVersion :: AsError a => Getting (First ServiceError) a ServiceError
 _InvalidIfMatchVersion =
@@ -656,16 +651,10 @@
 _PreconditionFailed =
     _ServiceError . hasStatus 412 . hasCode "PreconditionFailed"
 
--- | You cannot specify SSLv3 as the minimum protocol version if you only
--- want to support only clients that Support Server Name Indication (SNI).
-_InvalidProtocolSettings :: AsError a => Getting (First ServiceError) a ServiceError
-_InvalidProtocolSettings =
-    _ServiceError . hasStatus 400 . hasCode "InvalidProtocolSettings"
-
--- | One or more of your trusted signers do not exist.
-_TrustedSignerDoesNotExist :: AsError a => Getting (First ServiceError) a ServiceError
-_TrustedSignerDoesNotExist =
-    _ServiceError . hasStatus 400 . hasCode "TrustedSignerDoesNotExist"
+-- | Prism for InvalidResponseCode' errors.
+_InvalidResponseCode :: AsError a => Getting (First ServiceError) a ServiceError
+_InvalidResponseCode =
+    _ServiceError . hasStatus 400 . hasCode "InvalidResponseCode"
 
 -- | Prism for InvalidHeadersForS3Origin' errors.
 _InvalidHeadersForS3Origin :: AsError a => Getting (First ServiceError) a ServiceError
@@ -677,15 +666,16 @@
 _CNAMEAlreadyExists =
     _ServiceError . hasStatus 409 . hasCode "CNAMEAlreadyExists"
 
--- | Prism for StreamingDistributionAlreadyExists' errors.
-_StreamingDistributionAlreadyExists :: AsError a => Getting (First ServiceError) a ServiceError
-_StreamingDistributionAlreadyExists =
-    _ServiceError .
-    hasStatus 409 . hasCode "StreamingDistributionAlreadyExists"
+-- | One or more of your trusted signers do not exist.
+_TrustedSignerDoesNotExist :: AsError a => Getting (First ServiceError) a ServiceError
+_TrustedSignerDoesNotExist =
+    _ServiceError . hasStatus 400 . hasCode "TrustedSignerDoesNotExist"
 
--- | You cannot create anymore origins for the distribution.
-_TooManyOrigins :: AsError a => Getting (First ServiceError) a ServiceError
-_TooManyOrigins = _ServiceError . hasStatus 400 . hasCode "TooManyOrigins"
+-- | You cannot specify SSLv3 as the minimum protocol version if you only
+-- want to support only clients that Support Server Name Indication (SNI).
+_InvalidProtocolSettings :: AsError a => Getting (First ServiceError) a ServiceError
+_InvalidProtocolSettings =
+    _ServiceError . hasStatus 400 . hasCode "InvalidProtocolSettings"
 
 -- | If the CallerReference is a value you already sent in a previous request
 -- to create an identity but the content of the
@@ -697,12 +687,22 @@
     _ServiceError .
     hasStatus 409 . hasCode "CloudFrontOriginAccessIdentityAlreadyExists"
 
+-- | You cannot create anymore origins for the distribution.
+_TooManyOrigins :: AsError a => Getting (First ServiceError) a ServiceError
+_TooManyOrigins = _ServiceError . hasStatus 400 . hasCode "TooManyOrigins"
+
 -- | The relative path is too big, is not URL-encoded, or does not begin with
 -- a slash (\/).
 _InvalidRelativePath :: AsError a => Getting (First ServiceError) a ServiceError
 _InvalidRelativePath =
     _ServiceError . hasStatus 400 . hasCode "InvalidRelativePath"
 
+-- | Prism for StreamingDistributionAlreadyExists' errors.
+_StreamingDistributionAlreadyExists :: AsError a => Getting (First ServiceError) a ServiceError
+_StreamingDistributionAlreadyExists =
+    _ServiceError .
+    hasStatus 409 . hasCode "StreamingDistributionAlreadyExists"
+
 -- | Prism for InvalidMinimumProtocolVersion' errors.
 _InvalidMinimumProtocolVersion :: AsError a => Getting (First ServiceError) a ServiceError
 _InvalidMinimumProtocolVersion =
@@ -712,28 +712,28 @@
 _AccessDenied :: AsError a => Getting (First ServiceError) a ServiceError
 _AccessDenied = _ServiceError . hasStatus 403 . hasCode "AccessDenied"
 
--- | The specified distribution does not exist.
-_NoSuchDistribution :: AsError a => Getting (First ServiceError) a ServiceError
-_NoSuchDistribution =
-    _ServiceError . hasStatus 404 . hasCode "NoSuchDistribution"
-
 -- | Prism for InvalidViewerCertificate' errors.
 _InvalidViewerCertificate :: AsError a => Getting (First ServiceError) a ServiceError
 _InvalidViewerCertificate =
     _ServiceError . hasStatus 400 . hasCode "InvalidViewerCertificate"
 
+-- | The specified distribution does not exist.
+_NoSuchDistribution :: AsError a => Getting (First ServiceError) a ServiceError
+_NoSuchDistribution =
+    _ServiceError . hasStatus 404 . hasCode "NoSuchDistribution"
+
 -- | The default root object file name is too big or contains an invalid
 -- character.
 _InvalidDefaultRootObject :: AsError a => Getting (First ServiceError) a ServiceError
 _InvalidDefaultRootObject =
     _ServiceError . hasStatus 400 . hasCode "InvalidDefaultRootObject"
 
--- | Prism for InvalidLocationCode' errors.
-_InvalidLocationCode :: AsError a => Getting (First ServiceError) a ServiceError
-_InvalidLocationCode =
-    _ServiceError . hasStatus 400 . hasCode "InvalidLocationCode"
-
 -- | Prism for InvalidGeoRestrictionParameter' errors.
 _InvalidGeoRestrictionParameter :: AsError a => Getting (First ServiceError) a ServiceError
 _InvalidGeoRestrictionParameter =
     _ServiceError . hasStatus 400 . hasCode "InvalidGeoRestrictionParameter"
+
+-- | Prism for InvalidLocationCode' errors.
+_InvalidLocationCode :: AsError a => Getting (First ServiceError) a ServiceError
+_InvalidLocationCode =
+    _ServiceError . hasStatus 400 . hasCode "InvalidLocationCode"
diff --git a/gen/Network/AWS/CloudFront/Types/Product.hs b/gen/Network/AWS/CloudFront/Types/Product.hs
--- a/gen/Network/AWS/CloudFront/Types/Product.hs
+++ b/gen/Network/AWS/CloudFront/Types/Product.hs
@@ -1274,14 +1274,14 @@
 --
 -- /See:/ 'distributionConfig' smart constructor.
 data DistributionConfig = DistributionConfig'
-    { _dcDefaultRootObject    :: !(Maybe Text)
-    , _dcAliases              :: !(Maybe Aliases)
-    , _dcCustomErrorResponses :: !(Maybe CustomErrorResponses)
+    { _dcAliases              :: !(Maybe Aliases)
+    , _dcDefaultRootObject    :: !(Maybe Text)
     , _dcPriceClass           :: !(Maybe PriceClass)
+    , _dcCustomErrorResponses :: !(Maybe CustomErrorResponses)
     , _dcViewerCertificate    :: !(Maybe ViewerCertificate)
     , _dcRestrictions         :: !(Maybe Restrictions)
-    , _dcCacheBehaviors       :: !(Maybe CacheBehaviors)
     , _dcLogging              :: !(Maybe LoggingConfig)
+    , _dcCacheBehaviors       :: !(Maybe CacheBehaviors)
     , _dcCallerReference      :: !Text
     , _dcOrigins              :: !Origins
     , _dcDefaultCacheBehavior :: !DefaultCacheBehavior
@@ -1293,22 +1293,22 @@
 --
 -- Use one of the following lenses to modify other fields as desired:
 --
--- * 'dcDefaultRootObject'
---
 -- * 'dcAliases'
 --
--- * 'dcCustomErrorResponses'
+-- * 'dcDefaultRootObject'
 --
 -- * 'dcPriceClass'
 --
+-- * 'dcCustomErrorResponses'
+--
 -- * 'dcViewerCertificate'
 --
 -- * 'dcRestrictions'
 --
--- * 'dcCacheBehaviors'
---
 -- * 'dcLogging'
 --
+-- * 'dcCacheBehaviors'
+--
 -- * 'dcCallerReference'
 --
 -- * 'dcOrigins'
@@ -1327,14 +1327,14 @@
     -> DistributionConfig
 distributionConfig pCallerReference_ pOrigins_ pDefaultCacheBehavior_ pComment_ pEnabled_ =
     DistributionConfig'
-    { _dcDefaultRootObject = Nothing
-    , _dcAliases = Nothing
-    , _dcCustomErrorResponses = Nothing
+    { _dcAliases = Nothing
+    , _dcDefaultRootObject = Nothing
     , _dcPriceClass = Nothing
+    , _dcCustomErrorResponses = Nothing
     , _dcViewerCertificate = Nothing
     , _dcRestrictions = Nothing
-    , _dcCacheBehaviors = Nothing
     , _dcLogging = Nothing
+    , _dcCacheBehaviors = Nothing
     , _dcCallerReference = pCallerReference_
     , _dcOrigins = pOrigins_
     , _dcDefaultCacheBehavior = pDefaultCacheBehavior_
@@ -1342,6 +1342,11 @@
     , _dcEnabled = pEnabled_
     }
 
+-- | A complex type that contains information about CNAMEs (alternate domain
+-- names), if any, for this distribution.
+dcAliases :: Lens' DistributionConfig (Maybe Aliases)
+dcAliases = lens _dcAliases (\ s a -> s{_dcAliases = a});
+
 -- | The object that you want CloudFront to return (for example, index.html)
 -- when an end user requests the root URL for your distribution
 -- (http:\/\/www.example.com) instead of an object in your distribution
@@ -1356,20 +1361,15 @@
 dcDefaultRootObject :: Lens' DistributionConfig (Maybe Text)
 dcDefaultRootObject = lens _dcDefaultRootObject (\ s a -> s{_dcDefaultRootObject = a});
 
--- | A complex type that contains information about CNAMEs (alternate domain
--- names), if any, for this distribution.
-dcAliases :: Lens' DistributionConfig (Maybe Aliases)
-dcAliases = lens _dcAliases (\ s a -> s{_dcAliases = a});
-
--- | A complex type that contains zero or more CustomErrorResponse elements.
-dcCustomErrorResponses :: Lens' DistributionConfig (Maybe CustomErrorResponses)
-dcCustomErrorResponses = lens _dcCustomErrorResponses (\ s a -> s{_dcCustomErrorResponses = a});
-
 -- | A complex type that contains information about price class for this
 -- distribution.
 dcPriceClass :: Lens' DistributionConfig (Maybe PriceClass)
 dcPriceClass = lens _dcPriceClass (\ s a -> s{_dcPriceClass = a});
 
+-- | A complex type that contains zero or more CustomErrorResponse elements.
+dcCustomErrorResponses :: Lens' DistributionConfig (Maybe CustomErrorResponses)
+dcCustomErrorResponses = lens _dcCustomErrorResponses (\ s a -> s{_dcCustomErrorResponses = a});
+
 -- | Undocumented member.
 dcViewerCertificate :: Lens' DistributionConfig (Maybe ViewerCertificate)
 dcViewerCertificate = lens _dcViewerCertificate (\ s a -> s{_dcViewerCertificate = a});
@@ -1378,15 +1378,15 @@
 dcRestrictions :: Lens' DistributionConfig (Maybe Restrictions)
 dcRestrictions = lens _dcRestrictions (\ s a -> s{_dcRestrictions = a});
 
--- | A complex type that contains zero or more CacheBehavior elements.
-dcCacheBehaviors :: Lens' DistributionConfig (Maybe CacheBehaviors)
-dcCacheBehaviors = lens _dcCacheBehaviors (\ s a -> s{_dcCacheBehaviors = a});
-
 -- | A complex type that controls whether access logs are written for the
 -- distribution.
 dcLogging :: Lens' DistributionConfig (Maybe LoggingConfig)
 dcLogging = lens _dcLogging (\ s a -> s{_dcLogging = a});
 
+-- | A complex type that contains zero or more CacheBehavior elements.
+dcCacheBehaviors :: Lens' DistributionConfig (Maybe CacheBehaviors)
+dcCacheBehaviors = lens _dcCacheBehaviors (\ s a -> s{_dcCacheBehaviors = a});
+
 -- | A unique number that ensures the request can\'t be replayed. If the
 -- CallerReference is new (no matter the content of the DistributionConfig
 -- object), a new distribution is created. If the CallerReference is a
@@ -1424,13 +1424,13 @@
 instance FromXML DistributionConfig where
         parseXML x
           = DistributionConfig' <$>
-              (x .@? "DefaultRootObject") <*> (x .@? "Aliases") <*>
-                (x .@? "CustomErrorResponses")
-                <*> (x .@? "PriceClass")
+              (x .@? "Aliases") <*> (x .@? "DefaultRootObject") <*>
+                (x .@? "PriceClass")
+                <*> (x .@? "CustomErrorResponses")
                 <*> (x .@? "ViewerCertificate")
                 <*> (x .@? "Restrictions")
-                <*> (x .@? "CacheBehaviors")
                 <*> (x .@? "Logging")
+                <*> (x .@? "CacheBehaviors")
                 <*> (x .@ "CallerReference")
                 <*> (x .@ "Origins")
                 <*> (x .@ "DefaultCacheBehavior")
@@ -1440,14 +1440,14 @@
 instance ToXML DistributionConfig where
         toXML DistributionConfig'{..}
           = mconcat
-              ["DefaultRootObject" @= _dcDefaultRootObject,
-               "Aliases" @= _dcAliases,
-               "CustomErrorResponses" @= _dcCustomErrorResponses,
+              ["Aliases" @= _dcAliases,
+               "DefaultRootObject" @= _dcDefaultRootObject,
                "PriceClass" @= _dcPriceClass,
+               "CustomErrorResponses" @= _dcCustomErrorResponses,
                "ViewerCertificate" @= _dcViewerCertificate,
                "Restrictions" @= _dcRestrictions,
-               "CacheBehaviors" @= _dcCacheBehaviors,
                "Logging" @= _dcLogging,
+               "CacheBehaviors" @= _dcCacheBehaviors,
                "CallerReference" @= _dcCallerReference,
                "Origins" @= _dcOrigins,
                "DefaultCacheBehavior" @= _dcDefaultCacheBehavior,
diff --git a/gen/Network/AWS/CloudFront/UpdateCloudFrontOriginAccessIdentity.hs b/gen/Network/AWS/CloudFront/UpdateCloudFrontOriginAccessIdentity.hs
--- a/gen/Network/AWS/CloudFront/UpdateCloudFrontOriginAccessIdentity.hs
+++ b/gen/Network/AWS/CloudFront/UpdateCloudFrontOriginAccessIdentity.hs
@@ -37,7 +37,7 @@
     -- * Response Lenses
     , ucfoairsETag
     , ucfoairsCloudFrontOriginAccessIdentity
-    , ucfoairsStatus
+    , ucfoairsResponseStatus
     ) where
 
 import           Network.AWS.CloudFront.Types
@@ -130,7 +130,7 @@
 data UpdateCloudFrontOriginAccessIdentityResponse = UpdateCloudFrontOriginAccessIdentityResponse'
     { _ucfoairsETag                           :: !(Maybe Text)
     , _ucfoairsCloudFrontOriginAccessIdentity :: !(Maybe CloudFrontOriginAccessIdentity)
-    , _ucfoairsStatus                         :: !Int
+    , _ucfoairsResponseStatus                 :: !Int
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'UpdateCloudFrontOriginAccessIdentityResponse' with the minimum fields required to make a request.
@@ -141,15 +141,15 @@
 --
 -- * 'ucfoairsCloudFrontOriginAccessIdentity'
 --
--- * 'ucfoairsStatus'
+-- * 'ucfoairsResponseStatus'
 updateCloudFrontOriginAccessIdentityResponse
-    :: Int -- ^ 'ucfoairsStatus'
+    :: Int -- ^ 'ucfoairsResponseStatus'
     -> UpdateCloudFrontOriginAccessIdentityResponse
-updateCloudFrontOriginAccessIdentityResponse pStatus_ =
+updateCloudFrontOriginAccessIdentityResponse pResponseStatus_ =
     UpdateCloudFrontOriginAccessIdentityResponse'
     { _ucfoairsETag = Nothing
     , _ucfoairsCloudFrontOriginAccessIdentity = Nothing
-    , _ucfoairsStatus = pStatus_
+    , _ucfoairsResponseStatus = pResponseStatus_
     }
 
 -- | The current version of the configuration. For example: E2QWRUHAPOMQZL.
@@ -161,5 +161,5 @@
 ucfoairsCloudFrontOriginAccessIdentity = lens _ucfoairsCloudFrontOriginAccessIdentity (\ s a -> s{_ucfoairsCloudFrontOriginAccessIdentity = a});
 
 -- | The response status code.
-ucfoairsStatus :: Lens' UpdateCloudFrontOriginAccessIdentityResponse Int
-ucfoairsStatus = lens _ucfoairsStatus (\ s a -> s{_ucfoairsStatus = a});
+ucfoairsResponseStatus :: Lens' UpdateCloudFrontOriginAccessIdentityResponse Int
+ucfoairsResponseStatus = lens _ucfoairsResponseStatus (\ s a -> s{_ucfoairsResponseStatus = a});
diff --git a/gen/Network/AWS/CloudFront/UpdateDistribution.hs b/gen/Network/AWS/CloudFront/UpdateDistribution.hs
--- a/gen/Network/AWS/CloudFront/UpdateDistribution.hs
+++ b/gen/Network/AWS/CloudFront/UpdateDistribution.hs
@@ -37,7 +37,7 @@
     -- * Response Lenses
     , udrsETag
     , udrsDistribution
-    , udrsStatus
+    , udrsResponseStatus
     ) where
 
 import           Network.AWS.CloudFront.Types
@@ -122,9 +122,9 @@
 --
 -- /See:/ 'updateDistributionResponse' smart constructor.
 data UpdateDistributionResponse = UpdateDistributionResponse'
-    { _udrsETag         :: !(Maybe Text)
-    , _udrsDistribution :: !(Maybe Distribution)
-    , _udrsStatus       :: !Int
+    { _udrsETag           :: !(Maybe Text)
+    , _udrsDistribution   :: !(Maybe Distribution)
+    , _udrsResponseStatus :: !Int
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'UpdateDistributionResponse' with the minimum fields required to make a request.
@@ -135,15 +135,15 @@
 --
 -- * 'udrsDistribution'
 --
--- * 'udrsStatus'
+-- * 'udrsResponseStatus'
 updateDistributionResponse
-    :: Int -- ^ 'udrsStatus'
+    :: Int -- ^ 'udrsResponseStatus'
     -> UpdateDistributionResponse
-updateDistributionResponse pStatus_ =
+updateDistributionResponse pResponseStatus_ =
     UpdateDistributionResponse'
     { _udrsETag = Nothing
     , _udrsDistribution = Nothing
-    , _udrsStatus = pStatus_
+    , _udrsResponseStatus = pResponseStatus_
     }
 
 -- | The current version of the configuration. For example: E2QWRUHAPOMQZL.
@@ -155,5 +155,5 @@
 udrsDistribution = lens _udrsDistribution (\ s a -> s{_udrsDistribution = a});
 
 -- | The response status code.
-udrsStatus :: Lens' UpdateDistributionResponse Int
-udrsStatus = lens _udrsStatus (\ s a -> s{_udrsStatus = a});
+udrsResponseStatus :: Lens' UpdateDistributionResponse Int
+udrsResponseStatus = lens _udrsResponseStatus (\ s a -> s{_udrsResponseStatus = a});
diff --git a/gen/Network/AWS/CloudFront/UpdateStreamingDistribution.hs b/gen/Network/AWS/CloudFront/UpdateStreamingDistribution.hs
--- a/gen/Network/AWS/CloudFront/UpdateStreamingDistribution.hs
+++ b/gen/Network/AWS/CloudFront/UpdateStreamingDistribution.hs
@@ -37,7 +37,7 @@
     -- * Response Lenses
     , usdrsETag
     , usdrsStreamingDistribution
-    , usdrsStatus
+    , usdrsResponseStatus
     ) where
 
 import           Network.AWS.CloudFront.Types
@@ -125,7 +125,7 @@
 data UpdateStreamingDistributionResponse = UpdateStreamingDistributionResponse'
     { _usdrsETag                  :: !(Maybe Text)
     , _usdrsStreamingDistribution :: !(Maybe StreamingDistribution)
-    , _usdrsStatus                :: !Int
+    , _usdrsResponseStatus        :: !Int
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'UpdateStreamingDistributionResponse' with the minimum fields required to make a request.
@@ -136,15 +136,15 @@
 --
 -- * 'usdrsStreamingDistribution'
 --
--- * 'usdrsStatus'
+-- * 'usdrsResponseStatus'
 updateStreamingDistributionResponse
-    :: Int -- ^ 'usdrsStatus'
+    :: Int -- ^ 'usdrsResponseStatus'
     -> UpdateStreamingDistributionResponse
-updateStreamingDistributionResponse pStatus_ =
+updateStreamingDistributionResponse pResponseStatus_ =
     UpdateStreamingDistributionResponse'
     { _usdrsETag = Nothing
     , _usdrsStreamingDistribution = Nothing
-    , _usdrsStatus = pStatus_
+    , _usdrsResponseStatus = pResponseStatus_
     }
 
 -- | The current version of the configuration. For example: E2QWRUHAPOMQZL.
@@ -156,5 +156,5 @@
 usdrsStreamingDistribution = lens _usdrsStreamingDistribution (\ s a -> s{_usdrsStreamingDistribution = a});
 
 -- | The response status code.
-usdrsStatus :: Lens' UpdateStreamingDistributionResponse Int
-usdrsStatus = lens _usdrsStatus (\ s a -> s{_usdrsStatus = a});
+usdrsResponseStatus :: Lens' UpdateStreamingDistributionResponse Int
+usdrsResponseStatus = lens _usdrsResponseStatus (\ s a -> s{_usdrsResponseStatus = a});
diff --git a/test/Test/AWS/Gen/CloudFront.hs b/test/Test/AWS/Gen/CloudFront.hs
--- a/test/Test/AWS/Gen/CloudFront.hs
+++ b/test/Test/AWS/Gen/CloudFront.hs
@@ -43,12 +43,12 @@
 --         , testGetDistribution $
 --             getDistribution
 --
---         , testDeleteCloudFrontOriginAccessIdentity $
---             deleteCloudFrontOriginAccessIdentity
---
 --         , testUpdateCloudFrontOriginAccessIdentity $
 --             updateCloudFrontOriginAccessIdentity
 --
+--         , testDeleteCloudFrontOriginAccessIdentity $
+--             deleteCloudFrontOriginAccessIdentity
+--
 --         , testListStreamingDistributions $
 --             listStreamingDistributions
 --
@@ -73,14 +73,14 @@
 --         , testListInvalidations $
 --             listInvalidations
 --
---         , testGetStreamingDistribution $
---             getStreamingDistribution
+--         , testCreateInvalidation $
+--             createInvalidation
 --
 --         , testGetCloudFrontOriginAccessIdentity $
 --             getCloudFrontOriginAccessIdentity
 --
---         , testCreateInvalidation $
---             createInvalidation
+--         , testGetStreamingDistribution $
+--             getStreamingDistribution
 --
 --         , testUpdateDistribution $
 --             updateDistribution
@@ -109,12 +109,12 @@
 --         , testGetDistributionResponse $
 --             getDistributionResponse
 --
---         , testDeleteCloudFrontOriginAccessIdentityResponse $
---             deleteCloudFrontOriginAccessIdentityResponse
---
 --         , testUpdateCloudFrontOriginAccessIdentityResponse $
 --             updateCloudFrontOriginAccessIdentityResponse
 --
+--         , testDeleteCloudFrontOriginAccessIdentityResponse $
+--             deleteCloudFrontOriginAccessIdentityResponse
+--
 --         , testListStreamingDistributionsResponse $
 --             listStreamingDistributionsResponse
 --
@@ -139,14 +139,14 @@
 --         , testListInvalidationsResponse $
 --             listInvalidationsResponse
 --
---         , testGetStreamingDistributionResponse $
---             getStreamingDistributionResponse
+--         , testCreateInvalidationResponse $
+--             createInvalidationResponse
 --
 --         , testGetCloudFrontOriginAccessIdentityResponse $
 --             getCloudFrontOriginAccessIdentityResponse
 --
---         , testCreateInvalidationResponse $
---             createInvalidationResponse
+--         , testGetStreamingDistributionResponse $
+--             getStreamingDistributionResponse
 --
 --         , testUpdateDistributionResponse $
 --             updateDistributionResponse
@@ -187,16 +187,16 @@
     "GetDistribution"
     "fixture/GetDistribution.yaml"
 
-testDeleteCloudFrontOriginAccessIdentity :: DeleteCloudFrontOriginAccessIdentity -> TestTree
-testDeleteCloudFrontOriginAccessIdentity = req
-    "DeleteCloudFrontOriginAccessIdentity"
-    "fixture/DeleteCloudFrontOriginAccessIdentity.yaml"
-
 testUpdateCloudFrontOriginAccessIdentity :: UpdateCloudFrontOriginAccessIdentity -> TestTree
 testUpdateCloudFrontOriginAccessIdentity = req
     "UpdateCloudFrontOriginAccessIdentity"
     "fixture/UpdateCloudFrontOriginAccessIdentity.yaml"
 
+testDeleteCloudFrontOriginAccessIdentity :: DeleteCloudFrontOriginAccessIdentity -> TestTree
+testDeleteCloudFrontOriginAccessIdentity = req
+    "DeleteCloudFrontOriginAccessIdentity"
+    "fixture/DeleteCloudFrontOriginAccessIdentity.yaml"
+
 testListStreamingDistributions :: ListStreamingDistributions -> TestTree
 testListStreamingDistributions = req
     "ListStreamingDistributions"
@@ -237,20 +237,20 @@
     "ListInvalidations"
     "fixture/ListInvalidations.yaml"
 
-testGetStreamingDistribution :: GetStreamingDistribution -> TestTree
-testGetStreamingDistribution = req
-    "GetStreamingDistribution"
-    "fixture/GetStreamingDistribution.yaml"
+testCreateInvalidation :: CreateInvalidation -> TestTree
+testCreateInvalidation = req
+    "CreateInvalidation"
+    "fixture/CreateInvalidation.yaml"
 
 testGetCloudFrontOriginAccessIdentity :: GetCloudFrontOriginAccessIdentity -> TestTree
 testGetCloudFrontOriginAccessIdentity = req
     "GetCloudFrontOriginAccessIdentity"
     "fixture/GetCloudFrontOriginAccessIdentity.yaml"
 
-testCreateInvalidation :: CreateInvalidation -> TestTree
-testCreateInvalidation = req
-    "CreateInvalidation"
-    "fixture/CreateInvalidation.yaml"
+testGetStreamingDistribution :: GetStreamingDistribution -> TestTree
+testGetStreamingDistribution = req
+    "GetStreamingDistribution"
+    "fixture/GetStreamingDistribution.yaml"
 
 testUpdateDistribution :: UpdateDistribution -> TestTree
 testUpdateDistribution = req
@@ -304,13 +304,6 @@
     cloudFront
     (Proxy :: Proxy GetDistribution)
 
-testDeleteCloudFrontOriginAccessIdentityResponse :: DeleteCloudFrontOriginAccessIdentityResponse -> TestTree
-testDeleteCloudFrontOriginAccessIdentityResponse = res
-    "DeleteCloudFrontOriginAccessIdentityResponse"
-    "fixture/DeleteCloudFrontOriginAccessIdentityResponse.proto"
-    cloudFront
-    (Proxy :: Proxy DeleteCloudFrontOriginAccessIdentity)
-
 testUpdateCloudFrontOriginAccessIdentityResponse :: UpdateCloudFrontOriginAccessIdentityResponse -> TestTree
 testUpdateCloudFrontOriginAccessIdentityResponse = res
     "UpdateCloudFrontOriginAccessIdentityResponse"
@@ -318,6 +311,13 @@
     cloudFront
     (Proxy :: Proxy UpdateCloudFrontOriginAccessIdentity)
 
+testDeleteCloudFrontOriginAccessIdentityResponse :: DeleteCloudFrontOriginAccessIdentityResponse -> TestTree
+testDeleteCloudFrontOriginAccessIdentityResponse = res
+    "DeleteCloudFrontOriginAccessIdentityResponse"
+    "fixture/DeleteCloudFrontOriginAccessIdentityResponse.proto"
+    cloudFront
+    (Proxy :: Proxy DeleteCloudFrontOriginAccessIdentity)
+
 testListStreamingDistributionsResponse :: ListStreamingDistributionsResponse -> TestTree
 testListStreamingDistributionsResponse = res
     "ListStreamingDistributionsResponse"
@@ -374,12 +374,12 @@
     cloudFront
     (Proxy :: Proxy ListInvalidations)
 
-testGetStreamingDistributionResponse :: GetStreamingDistributionResponse -> TestTree
-testGetStreamingDistributionResponse = res
-    "GetStreamingDistributionResponse"
-    "fixture/GetStreamingDistributionResponse.proto"
+testCreateInvalidationResponse :: CreateInvalidationResponse -> TestTree
+testCreateInvalidationResponse = res
+    "CreateInvalidationResponse"
+    "fixture/CreateInvalidationResponse.proto"
     cloudFront
-    (Proxy :: Proxy GetStreamingDistribution)
+    (Proxy :: Proxy CreateInvalidation)
 
 testGetCloudFrontOriginAccessIdentityResponse :: GetCloudFrontOriginAccessIdentityResponse -> TestTree
 testGetCloudFrontOriginAccessIdentityResponse = res
@@ -388,12 +388,12 @@
     cloudFront
     (Proxy :: Proxy GetCloudFrontOriginAccessIdentity)
 
-testCreateInvalidationResponse :: CreateInvalidationResponse -> TestTree
-testCreateInvalidationResponse = res
-    "CreateInvalidationResponse"
-    "fixture/CreateInvalidationResponse.proto"
+testGetStreamingDistributionResponse :: GetStreamingDistributionResponse -> TestTree
+testGetStreamingDistributionResponse = res
+    "GetStreamingDistributionResponse"
+    "fixture/GetStreamingDistributionResponse.proto"
     cloudFront
-    (Proxy :: Proxy CreateInvalidation)
+    (Proxy :: Proxy GetStreamingDistribution)
 
 testUpdateDistributionResponse :: UpdateDistributionResponse -> TestTree
 testUpdateDistributionResponse = res
