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-elasticache.cabal b/amazonka-elasticache.cabal
--- a/amazonka-elasticache.cabal
+++ b/amazonka-elasticache.cabal
@@ -1,5 +1,5 @@
 name:                  amazonka-elasticache
-version:               1.2.0.2
+version:               1.3.0
 synopsis:              Amazon ElastiCache SDK.
 homepage:              https://github.com/brendanhay/amazonka
 bug-reports:           https://github.com/brendanhay/amazonka/issues
@@ -99,7 +99,7 @@
         , Network.AWS.ElastiCache.Types.Sum
 
     build-depends:
-          amazonka-core == 1.2.0.*
+          amazonka-core == 1.3.0.*
         , base          >= 4.7     && < 5
 
 test-suite amazonka-elasticache-test
@@ -119,9 +119,9 @@
         , Test.AWS.ElastiCache.Internal
 
     build-depends:
-          amazonka-core == 1.2.0.*
-        , amazonka-test == 1.2.0.*
-        , amazonka-elasticache == 1.2.0.*
+          amazonka-core == 1.3.0.*
+        , amazonka-test == 1.3.0.*
+        , amazonka-elasticache == 1.3.0.*
         , base
         , bytestring
         , lens
diff --git a/gen/Network/AWS/ElastiCache.hs b/gen/Network/AWS/ElastiCache.hs
--- a/gen/Network/AWS/ElastiCache.hs
+++ b/gen/Network/AWS/ElastiCache.hs
@@ -35,39 +35,39 @@
     -- * Errors
     -- $errors
 
-    -- ** CacheSubnetGroupAlreadyExistsFault
-    , _CacheSubnetGroupAlreadyExistsFault
-
     -- ** CacheSubnetGroupInUse
     , _CacheSubnetGroupInUse
 
+    -- ** ReservedCacheNodeAlreadyExistsFault
+    , _ReservedCacheNodeAlreadyExistsFault
+
     -- ** CacheSecurityGroupNotFoundFault
     , _CacheSecurityGroupNotFoundFault
 
-    -- ** ReservedCacheNodeAlreadyExistsFault
-    , _ReservedCacheNodeAlreadyExistsFault
+    -- ** CacheSubnetGroupAlreadyExistsFault
+    , _CacheSubnetGroupAlreadyExistsFault
 
+    -- ** CacheSubnetGroupQuotaExceededFault
+    , _CacheSubnetGroupQuotaExceededFault
+
     -- ** AuthorizationAlreadyExistsFault
     , _AuthorizationAlreadyExistsFault
 
     -- ** ReservedCacheNodeQuotaExceededFault
     , _ReservedCacheNodeQuotaExceededFault
 
-    -- ** CacheSubnetGroupQuotaExceededFault
-    , _CacheSubnetGroupQuotaExceededFault
+    -- ** ReservedCacheNodesOfferingNotFoundFault
+    , _ReservedCacheNodesOfferingNotFoundFault
 
     -- ** ReplicationGroupNotFoundFault
     , _ReplicationGroupNotFoundFault
 
-    -- ** ReservedCacheNodesOfferingNotFoundFault
-    , _ReservedCacheNodesOfferingNotFoundFault
+    -- ** InvalidSubnet
+    , _InvalidSubnet
 
     -- ** TagQuotaPerResourceExceeded
     , _TagQuotaPerResourceExceeded
 
-    -- ** InvalidSubnet
-    , _InvalidSubnet
-
     -- ** SnapshotNotFoundFault
     , _SnapshotNotFoundFault
 
@@ -86,41 +86,38 @@
     -- ** SnapshotQuotaExceededFault
     , _SnapshotQuotaExceededFault
 
-    -- ** CacheParameterGroupAlreadyExistsFault
-    , _CacheParameterGroupAlreadyExistsFault
-
     -- ** NodeQuotaForClusterExceededFault
     , _NodeQuotaForClusterExceededFault
 
-    -- ** SnapshotFeatureNotSupportedFault
-    , _SnapshotFeatureNotSupportedFault
+    -- ** CacheParameterGroupAlreadyExistsFault
+    , _CacheParameterGroupAlreadyExistsFault
 
+    -- ** ReservedCacheNodeNotFoundFault
+    , _ReservedCacheNodeNotFoundFault
+
     -- ** CacheSubnetGroupNotFoundFault
     , _CacheSubnetGroupNotFoundFault
 
-    -- ** ReservedCacheNodeNotFoundFault
-    , _ReservedCacheNodeNotFoundFault
+    -- ** SnapshotFeatureNotSupportedFault
+    , _SnapshotFeatureNotSupportedFault
 
     -- ** InvalidParameterValueException
     , _InvalidParameterValueException
 
-    -- ** InvalidVPCNetworkStateFault
-    , _InvalidVPCNetworkStateFault
-
-    -- ** CacheClusterNotFoundFault
-    , _CacheClusterNotFoundFault
-
     -- ** InvalidReplicationGroupStateFault
     , _InvalidReplicationGroupStateFault
 
     -- ** ReplicationGroupAlreadyExistsFault
     , _ReplicationGroupAlreadyExistsFault
 
+    -- ** InvalidVPCNetworkStateFault
+    , _InvalidVPCNetworkStateFault
+
     -- ** SubnetInUse
     , _SubnetInUse
 
-    -- ** CacheClusterAlreadyExistsFault
-    , _CacheClusterAlreadyExistsFault
+    -- ** CacheClusterNotFoundFault
+    , _CacheClusterNotFoundFault
 
     -- ** ClusterQuotaForCustomerExceededFault
     , _ClusterQuotaForCustomerExceededFault
@@ -128,11 +125,14 @@
     -- ** AuthorizationNotFoundFault
     , _AuthorizationNotFoundFault
 
+    -- ** InvalidCacheClusterStateFault
+    , _InvalidCacheClusterStateFault
+
     -- ** CacheSecurityGroupQuotaExceededFault
     , _CacheSecurityGroupQuotaExceededFault
 
-    -- ** InvalidCacheClusterStateFault
-    , _InvalidCacheClusterStateFault
+    -- ** CacheClusterAlreadyExistsFault
+    , _CacheClusterAlreadyExistsFault
 
     -- ** CacheParameterGroupQuotaExceededFault
     , _CacheParameterGroupQuotaExceededFault
@@ -146,21 +146,21 @@
     -- ** CacheParameterGroupNotFoundFault
     , _CacheParameterGroupNotFoundFault
 
-    -- ** InvalidParameterCombinationException
-    , _InvalidParameterCombinationException
-
     -- ** InvalidARNFault
     , _InvalidARNFault
 
     -- ** InvalidCacheParameterGroupStateFault
     , _InvalidCacheParameterGroupStateFault
 
-    -- ** CacheSecurityGroupAlreadyExistsFault
-    , _CacheSecurityGroupAlreadyExistsFault
+    -- ** InvalidParameterCombinationException
+    , _InvalidParameterCombinationException
 
     -- ** InvalidCacheSecurityGroupStateFault
     , _InvalidCacheSecurityGroupStateFault
 
+    -- ** CacheSecurityGroupAlreadyExistsFault
+    , _CacheSecurityGroupAlreadyExistsFault
+
     -- * Waiters
     -- $waiters
 
@@ -194,6 +194,9 @@
     -- ** RevokeCacheSecurityGroupIngress
     , module Network.AWS.ElastiCache.RevokeCacheSecurityGroupIngress
 
+    -- ** CreateCacheCluster
+    , module Network.AWS.ElastiCache.CreateCacheCluster
+
     -- ** DescribeEvents (Paginated)
     , module Network.AWS.ElastiCache.DescribeEvents
 
@@ -203,27 +206,24 @@
     -- ** ModifyCacheParameterGroup
     , module Network.AWS.ElastiCache.ModifyCacheParameterGroup
 
-    -- ** CreateCacheCluster
-    , module Network.AWS.ElastiCache.CreateCacheCluster
+    -- ** DeleteReplicationGroup
+    , module Network.AWS.ElastiCache.DeleteReplicationGroup
 
     -- ** ListTagsForResource
     , module Network.AWS.ElastiCache.ListTagsForResource
 
-    -- ** DeleteReplicationGroup
-    , module Network.AWS.ElastiCache.DeleteReplicationGroup
+    -- ** DescribeCacheClusters (Paginated)
+    , module Network.AWS.ElastiCache.DescribeCacheClusters
 
     -- ** PurchaseReservedCacheNodesOffering
     , module Network.AWS.ElastiCache.PurchaseReservedCacheNodesOffering
 
-    -- ** DescribeCacheClusters (Paginated)
-    , module Network.AWS.ElastiCache.DescribeCacheClusters
+    -- ** RemoveTagsFromResource
+    , module Network.AWS.ElastiCache.RemoveTagsFromResource
 
     -- ** ModifyReplicationGroup
     , module Network.AWS.ElastiCache.ModifyReplicationGroup
 
-    -- ** RemoveTagsFromResource
-    , module Network.AWS.ElastiCache.RemoveTagsFromResource
-
     -- ** DescribeCacheParameters (Paginated)
     , module Network.AWS.ElastiCache.DescribeCacheParameters
 
@@ -254,14 +254,14 @@
     -- ** DescribeSnapshots (Paginated)
     , module Network.AWS.ElastiCache.DescribeSnapshots
 
-    -- ** DescribeReservedCacheNodesOfferings (Paginated)
-    , module Network.AWS.ElastiCache.DescribeReservedCacheNodesOfferings
+    -- ** DescribeReplicationGroups (Paginated)
+    , module Network.AWS.ElastiCache.DescribeReplicationGroups
 
     -- ** DeleteSnapshot
     , module Network.AWS.ElastiCache.DeleteSnapshot
 
-    -- ** DescribeReplicationGroups (Paginated)
-    , module Network.AWS.ElastiCache.DescribeReplicationGroups
+    -- ** DescribeReservedCacheNodesOfferings (Paginated)
+    , module Network.AWS.ElastiCache.DescribeReservedCacheNodesOfferings
 
     -- ** ModifyCacheSubnetGroup
     , module Network.AWS.ElastiCache.ModifyCacheSubnetGroup
@@ -269,24 +269,24 @@
     -- ** CreateSnapshot
     , module Network.AWS.ElastiCache.CreateSnapshot
 
-    -- ** DescribeCacheSecurityGroups (Paginated)
-    , module Network.AWS.ElastiCache.DescribeCacheSecurityGroups
-
     -- ** DeleteCacheParameterGroup
     , module Network.AWS.ElastiCache.DeleteCacheParameterGroup
 
-    -- ** DescribeReservedCacheNodes (Paginated)
-    , module Network.AWS.ElastiCache.DescribeReservedCacheNodes
-
-    -- ** DescribeCacheEngineVersions (Paginated)
-    , module Network.AWS.ElastiCache.DescribeCacheEngineVersions
+    -- ** DescribeCacheSecurityGroups (Paginated)
+    , module Network.AWS.ElastiCache.DescribeCacheSecurityGroups
 
     -- ** ModifyCacheCluster
     , module Network.AWS.ElastiCache.ModifyCacheCluster
 
+    -- ** DescribeCacheEngineVersions (Paginated)
+    , module Network.AWS.ElastiCache.DescribeCacheEngineVersions
+
     -- ** CreateCacheParameterGroup
     , module Network.AWS.ElastiCache.CreateCacheParameterGroup
 
+    -- ** DescribeReservedCacheNodes (Paginated)
+    , module Network.AWS.ElastiCache.DescribeReservedCacheNodes
+
     -- ** DeleteCacheSubnetGroup
     , module Network.AWS.ElastiCache.DeleteCacheSubnetGroup
 
@@ -312,8 +312,8 @@
     -- ** CacheCluster
     , CacheCluster
     , cacheCluster
-    , ccCacheNodeType
     , ccEngineVersion
+    , ccCacheNodeType
     , ccCacheNodes
     , ccCacheClusterCreateTime
     , ccAutoMinorVersionUpgrade
@@ -327,9 +327,9 @@
     , ccClientDownloadLandingPage
     , ccPreferredMaintenanceWindow
     , ccCacheSubnetGroupName
-    , ccCacheClusterStatus
     , ccPreferredAvailabilityZone
     , ccCacheParameterGroup
+    , ccCacheClusterStatus
     , ccSnapshotRetentionLimit
     , ccReplicationGroupId
     , ccPendingModifiedValues
@@ -338,11 +338,11 @@
     -- ** CacheEngineVersion
     , CacheEngineVersion
     , cacheEngineVersion
-    , cevCacheEngineDescription
-    , cevCacheParameterGroupFamily
     , cevEngineVersion
-    , cevCacheEngineVersionDescription
+    , cevCacheParameterGroupFamily
+    , cevCacheEngineDescription
     , cevEngine
+    , cevCacheEngineVersionDescription
 
     -- ** CacheNode
     , CacheNode
@@ -362,8 +362,8 @@
     , cntspMinimumEngineVersion
     , cntspSource
     , cntspIsModifiable
-    , cntspAllowedValues
     , cntspDataType
+    , cntspAllowedValues
     , cntspParameterName
     , cntspDescription
 
@@ -432,8 +432,8 @@
     , engineDefaults
     , edCacheParameterGroupFamily
     , edCacheNodeTypeSpecificParameters
-    , edParameters
     , edMarker
+    , edParameters
 
     -- ** Event
     , Event
@@ -481,8 +481,8 @@
     , pMinimumEngineVersion
     , pSource
     , pIsModifiable
-    , pAllowedValues
     , pDataType
+    , pAllowedValues
     , pParameterName
     , pDescription
 
@@ -508,13 +508,13 @@
     -- ** ReplicationGroup
     , ReplicationGroup
     , replicationGroup
-    , rgNodeGroups
     , rgStatus
+    , rgNodeGroups
     , rgSnapshottingClusterId
     , rgMemberClusters
+    , rgDescription
     , rgReplicationGroupId
     , rgPendingModifiedValues
-    , rgDescription
     , rgAutomaticFailover
 
     -- ** ReplicationGroupPendingModifiedValues
@@ -528,13 +528,13 @@
     , reservedCacheNode
     , rcnCacheNodeType
     , rcnState
-    , rcnProductDescription
     , rcnStartTime
+    , rcnProductDescription
     , rcnCacheNodeCount
     , rcnReservedCacheNodeId
+    , rcnRecurringCharges
     , rcnOfferingType
     , rcnUsagePrice
-    , rcnRecurringCharges
     , rcnFixedPrice
     , rcnDuration
     , rcnReservedCacheNodesOfferingId
@@ -544,9 +544,9 @@
     , reservedCacheNodesOffering
     , rcnoCacheNodeType
     , rcnoProductDescription
+    , rcnoRecurringCharges
     , rcnoOfferingType
     , rcnoUsagePrice
-    , rcnoRecurringCharges
     , rcnoFixedPrice
     , rcnoDuration
     , rcnoReservedCacheNodesOfferingId
@@ -560,26 +560,26 @@
     -- ** Snapshot
     , Snapshot
     , snapshot
-    , sCacheNodeType
     , sEngineVersion
+    , sCacheNodeType
     , sCacheClusterCreateTime
     , sAutoMinorVersionUpgrade
     , sCacheParameterGroupName
+    , sVPCId
     , sSnapshotStatus
     , sSnapshotWindow
-    , sVPCId
     , sCacheClusterId
     , sEngine
     , sPreferredMaintenanceWindow
     , sTopicARN
-    , sCacheSubnetGroupName
     , sNodeSnapshots
+    , sCacheSubnetGroupName
     , sPreferredAvailabilityZone
     , sSnapshotRetentionLimit
     , sSnapshotName
-    , sSnapshotSource
     , sNumCacheNodes
     , sPort
+    , sSnapshotSource
 
     -- ** Subnet
     , Subnet
diff --git a/gen/Network/AWS/ElastiCache/AuthorizeCacheSecurityGroupIngress.hs b/gen/Network/AWS/ElastiCache/AuthorizeCacheSecurityGroupIngress.hs
--- a/gen/Network/AWS/ElastiCache/AuthorizeCacheSecurityGroupIngress.hs
+++ b/gen/Network/AWS/ElastiCache/AuthorizeCacheSecurityGroupIngress.hs
@@ -42,7 +42,7 @@
     , AuthorizeCacheSecurityGroupIngressResponse
     -- * Response Lenses
     , acsgirsCacheSecurityGroup
-    , acsgirsStatus
+    , acsgirsResponseStatus
     ) where
 
 import           Network.AWS.ElastiCache.Types
@@ -132,7 +132,7 @@
 -- | /See:/ 'authorizeCacheSecurityGroupIngressResponse' smart constructor.
 data AuthorizeCacheSecurityGroupIngressResponse = AuthorizeCacheSecurityGroupIngressResponse'
     { _acsgirsCacheSecurityGroup :: !(Maybe CacheSecurityGroup)
-    , _acsgirsStatus             :: !Int
+    , _acsgirsResponseStatus     :: !Int
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'AuthorizeCacheSecurityGroupIngressResponse' with the minimum fields required to make a request.
@@ -141,14 +141,14 @@
 --
 -- * 'acsgirsCacheSecurityGroup'
 --
--- * 'acsgirsStatus'
+-- * 'acsgirsResponseStatus'
 authorizeCacheSecurityGroupIngressResponse
-    :: Int -- ^ 'acsgirsStatus'
+    :: Int -- ^ 'acsgirsResponseStatus'
     -> AuthorizeCacheSecurityGroupIngressResponse
-authorizeCacheSecurityGroupIngressResponse pStatus_ =
+authorizeCacheSecurityGroupIngressResponse pResponseStatus_ =
     AuthorizeCacheSecurityGroupIngressResponse'
     { _acsgirsCacheSecurityGroup = Nothing
-    , _acsgirsStatus = pStatus_
+    , _acsgirsResponseStatus = pResponseStatus_
     }
 
 -- | Undocumented member.
@@ -156,5 +156,5 @@
 acsgirsCacheSecurityGroup = lens _acsgirsCacheSecurityGroup (\ s a -> s{_acsgirsCacheSecurityGroup = a});
 
 -- | The response status code.
-acsgirsStatus :: Lens' AuthorizeCacheSecurityGroupIngressResponse Int
-acsgirsStatus = lens _acsgirsStatus (\ s a -> s{_acsgirsStatus = a});
+acsgirsResponseStatus :: Lens' AuthorizeCacheSecurityGroupIngressResponse Int
+acsgirsResponseStatus = lens _acsgirsResponseStatus (\ s a -> s{_acsgirsResponseStatus = a});
diff --git a/gen/Network/AWS/ElastiCache/CopySnapshot.hs b/gen/Network/AWS/ElastiCache/CopySnapshot.hs
--- a/gen/Network/AWS/ElastiCache/CopySnapshot.hs
+++ b/gen/Network/AWS/ElastiCache/CopySnapshot.hs
@@ -35,7 +35,7 @@
     , CopySnapshotResponse
     -- * Response Lenses
     , csrsSnapshot
-    , csrsStatus
+    , csrsResponseStatus
     ) where
 
 import           Network.AWS.ElastiCache.Types
@@ -102,8 +102,8 @@
 
 -- | /See:/ 'copySnapshotResponse' smart constructor.
 data CopySnapshotResponse = CopySnapshotResponse'
-    { _csrsSnapshot :: !(Maybe Snapshot)
-    , _csrsStatus   :: !Int
+    { _csrsSnapshot       :: !(Maybe Snapshot)
+    , _csrsResponseStatus :: !Int
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'CopySnapshotResponse' with the minimum fields required to make a request.
@@ -112,14 +112,14 @@
 --
 -- * 'csrsSnapshot'
 --
--- * 'csrsStatus'
+-- * 'csrsResponseStatus'
 copySnapshotResponse
-    :: Int -- ^ 'csrsStatus'
+    :: Int -- ^ 'csrsResponseStatus'
     -> CopySnapshotResponse
-copySnapshotResponse pStatus_ =
+copySnapshotResponse pResponseStatus_ =
     CopySnapshotResponse'
     { _csrsSnapshot = Nothing
-    , _csrsStatus = pStatus_
+    , _csrsResponseStatus = pResponseStatus_
     }
 
 -- | Undocumented member.
@@ -127,5 +127,5 @@
 csrsSnapshot = lens _csrsSnapshot (\ s a -> s{_csrsSnapshot = a});
 
 -- | The response status code.
-csrsStatus :: Lens' CopySnapshotResponse Int
-csrsStatus = lens _csrsStatus (\ s a -> s{_csrsStatus = a});
+csrsResponseStatus :: Lens' CopySnapshotResponse Int
+csrsResponseStatus = lens _csrsResponseStatus (\ s a -> s{_csrsResponseStatus = a});
diff --git a/gen/Network/AWS/ElastiCache/CreateCacheCluster.hs b/gen/Network/AWS/ElastiCache/CreateCacheCluster.hs
--- a/gen/Network/AWS/ElastiCache/CreateCacheCluster.hs
+++ b/gen/Network/AWS/ElastiCache/CreateCacheCluster.hs
@@ -29,11 +29,11 @@
       createCacheCluster
     , CreateCacheCluster
     -- * Request Lenses
-    , cccCacheNodeType
     , cccEngineVersion
+    , cccCacheNodeType
     , cccSecurityGroupIds
-    , cccAutoMinorVersionUpgrade
     , cccSnapshotARNs
+    , cccAutoMinorVersionUpgrade
     , cccCacheParameterGroupName
     , cccSnapshotWindow
     , cccEngine
@@ -46,10 +46,10 @@
     , cccSnapshotName
     , cccReplicationGroupId
     , cccNotificationTopicARN
-    , cccTags
     , cccNumCacheNodes
-    , cccCacheSecurityGroupNames
+    , cccTags
     , cccPort
+    , cccCacheSecurityGroupNames
     , cccCacheClusterId
 
     -- * Destructuring the Response
@@ -57,7 +57,7 @@
     , CreateCacheClusterResponse
     -- * Response Lenses
     , cccrsCacheCluster
-    , cccrsStatus
+    , cccrsResponseStatus
     ) where
 
 import           Network.AWS.ElastiCache.Types
@@ -70,11 +70,11 @@
 --
 -- /See:/ 'createCacheCluster' smart constructor.
 data CreateCacheCluster = CreateCacheCluster'
-    { _cccCacheNodeType              :: !(Maybe Text)
-    , _cccEngineVersion              :: !(Maybe Text)
+    { _cccEngineVersion              :: !(Maybe Text)
+    , _cccCacheNodeType              :: !(Maybe Text)
     , _cccSecurityGroupIds           :: !(Maybe [Text])
-    , _cccAutoMinorVersionUpgrade    :: !(Maybe Bool)
     , _cccSnapshotARNs               :: !(Maybe [Text])
+    , _cccAutoMinorVersionUpgrade    :: !(Maybe Bool)
     , _cccCacheParameterGroupName    :: !(Maybe Text)
     , _cccSnapshotWindow             :: !(Maybe Text)
     , _cccEngine                     :: !(Maybe Text)
@@ -87,10 +87,10 @@
     , _cccSnapshotName               :: !(Maybe Text)
     , _cccReplicationGroupId         :: !(Maybe Text)
     , _cccNotificationTopicARN       :: !(Maybe Text)
-    , _cccTags                       :: !(Maybe [Tag])
     , _cccNumCacheNodes              :: !(Maybe Int)
-    , _cccCacheSecurityGroupNames    :: !(Maybe [Text])
+    , _cccTags                       :: !(Maybe [Tag])
     , _cccPort                       :: !(Maybe Int)
+    , _cccCacheSecurityGroupNames    :: !(Maybe [Text])
     , _cccCacheClusterId             :: !Text
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
@@ -98,16 +98,16 @@
 --
 -- Use one of the following lenses to modify other fields as desired:
 --
--- * 'cccCacheNodeType'
---
 -- * 'cccEngineVersion'
 --
--- * 'cccSecurityGroupIds'
+-- * 'cccCacheNodeType'
 --
--- * 'cccAutoMinorVersionUpgrade'
+-- * 'cccSecurityGroupIds'
 --
 -- * 'cccSnapshotARNs'
 --
+-- * 'cccAutoMinorVersionUpgrade'
+--
 -- * 'cccCacheParameterGroupName'
 --
 -- * 'cccSnapshotWindow'
@@ -132,25 +132,25 @@
 --
 -- * 'cccNotificationTopicARN'
 --
--- * 'cccTags'
---
 -- * 'cccNumCacheNodes'
 --
--- * 'cccCacheSecurityGroupNames'
+-- * 'cccTags'
 --
 -- * 'cccPort'
 --
+-- * 'cccCacheSecurityGroupNames'
+--
 -- * 'cccCacheClusterId'
 createCacheCluster
     :: Text -- ^ 'cccCacheClusterId'
     -> CreateCacheCluster
 createCacheCluster pCacheClusterId_ =
     CreateCacheCluster'
-    { _cccCacheNodeType = Nothing
-    , _cccEngineVersion = Nothing
+    { _cccEngineVersion = Nothing
+    , _cccCacheNodeType = Nothing
     , _cccSecurityGroupIds = Nothing
-    , _cccAutoMinorVersionUpgrade = Nothing
     , _cccSnapshotARNs = Nothing
+    , _cccAutoMinorVersionUpgrade = Nothing
     , _cccCacheParameterGroupName = Nothing
     , _cccSnapshotWindow = Nothing
     , _cccEngine = Nothing
@@ -163,13 +163,19 @@
     , _cccSnapshotName = Nothing
     , _cccReplicationGroupId = Nothing
     , _cccNotificationTopicARN = Nothing
-    , _cccTags = Nothing
     , _cccNumCacheNodes = Nothing
-    , _cccCacheSecurityGroupNames = Nothing
+    , _cccTags = Nothing
     , _cccPort = Nothing
+    , _cccCacheSecurityGroupNames = Nothing
     , _cccCacheClusterId = pCacheClusterId_
     }
 
+-- | The version number of the cache engine to be used for this cache
+-- cluster. To view the supported cache engine versions, use the
+-- /DescribeCacheEngineVersions/ action.
+cccEngineVersion :: Lens' CreateCacheCluster (Maybe Text)
+cccEngineVersion = lens _cccEngineVersion (\ s a -> s{_cccEngineVersion = a});
+
 -- | The compute and memory capacity of the nodes in the node group.
 --
 -- Valid node types are as follows:
@@ -204,12 +210,6 @@
 cccCacheNodeType :: Lens' CreateCacheCluster (Maybe Text)
 cccCacheNodeType = lens _cccCacheNodeType (\ s a -> s{_cccCacheNodeType = a});
 
--- | The version number of the cache engine to be used for this cache
--- cluster. To view the supported cache engine versions, use the
--- /DescribeCacheEngineVersions/ action.
-cccEngineVersion :: Lens' CreateCacheCluster (Maybe Text)
-cccEngineVersion = lens _cccEngineVersion (\ s a -> s{_cccEngineVersion = a});
-
 -- | One or more VPC security groups associated with the cache cluster.
 --
 -- Use this parameter only when you are creating a cache cluster in an
@@ -217,10 +217,6 @@
 cccSecurityGroupIds :: Lens' CreateCacheCluster [Text]
 cccSecurityGroupIds = lens _cccSecurityGroupIds (\ s a -> s{_cccSecurityGroupIds = a}) . _Default . _Coerce;
 
--- | This parameter is currently disabled.
-cccAutoMinorVersionUpgrade :: Lens' CreateCacheCluster (Maybe Bool)
-cccAutoMinorVersionUpgrade = lens _cccAutoMinorVersionUpgrade (\ s a -> s{_cccAutoMinorVersionUpgrade = a});
-
 -- | A single-element string list containing an Amazon Resource Name (ARN)
 -- that uniquely identifies a Redis RDB snapshot file stored in Amazon S3.
 -- The snapshot file will be used to populate the node group. The Amazon S3
@@ -233,6 +229,10 @@
 cccSnapshotARNs :: Lens' CreateCacheCluster [Text]
 cccSnapshotARNs = lens _cccSnapshotARNs (\ s a -> s{_cccSnapshotARNs = a}) . _Default . _Coerce;
 
+-- | This parameter is currently disabled.
+cccAutoMinorVersionUpgrade :: Lens' CreateCacheCluster (Maybe Bool)
+cccAutoMinorVersionUpgrade = lens _cccAutoMinorVersionUpgrade (\ s a -> s{_cccAutoMinorVersionUpgrade = a});
+
 -- | The name of the parameter group to associate with this cache cluster. If
 -- this argument is omitted, the default parameter group for the specified
 -- engine is used.
@@ -377,11 +377,6 @@
 cccNotificationTopicARN :: Lens' CreateCacheCluster (Maybe Text)
 cccNotificationTopicARN = lens _cccNotificationTopicARN (\ s a -> s{_cccNotificationTopicARN = a});
 
--- | A list of cost allocation tags to be added to this resource. A tag is a
--- key-value pair. A tag key must be accompanied by a tag value.
-cccTags :: Lens' CreateCacheCluster [Tag]
-cccTags = lens _cccTags (\ s a -> s{_cccTags = a}) . _Default . _Coerce;
-
 -- | The initial number of cache nodes that the cache cluster will have.
 --
 -- For clusters running Redis, this value must be 1. For clusters running
@@ -393,6 +388,16 @@
 cccNumCacheNodes :: Lens' CreateCacheCluster (Maybe Int)
 cccNumCacheNodes = lens _cccNumCacheNodes (\ s a -> s{_cccNumCacheNodes = a});
 
+-- | A list of cost allocation tags to be added to this resource. A tag is a
+-- key-value pair. A tag key must be accompanied by a tag value.
+cccTags :: Lens' CreateCacheCluster [Tag]
+cccTags = lens _cccTags (\ s a -> s{_cccTags = a}) . _Default . _Coerce;
+
+-- | The port number on which each of the cache nodes will accept
+-- connections.
+cccPort :: Lens' CreateCacheCluster (Maybe Int)
+cccPort = lens _cccPort (\ s a -> s{_cccPort = a});
+
 -- | A list of security group names to associate with this cache cluster.
 --
 -- Use this parameter only when you are creating a cache cluster outside of
@@ -400,11 +405,6 @@
 cccCacheSecurityGroupNames :: Lens' CreateCacheCluster [Text]
 cccCacheSecurityGroupNames = lens _cccCacheSecurityGroupNames (\ s a -> s{_cccCacheSecurityGroupNames = a}) . _Default . _Coerce;
 
--- | The port number on which each of the cache nodes will accept
--- connections.
-cccPort :: Lens' CreateCacheCluster (Maybe Int)
-cccPort = lens _cccPort (\ s a -> s{_cccPort = a});
-
 -- | The node group identifier. This parameter is stored as a lowercase
 -- string.
 --
@@ -437,17 +437,17 @@
           = mconcat
               ["Action" =: ("CreateCacheCluster" :: ByteString),
                "Version" =: ("2015-02-02" :: ByteString),
-               "CacheNodeType" =: _cccCacheNodeType,
                "EngineVersion" =: _cccEngineVersion,
+               "CacheNodeType" =: _cccCacheNodeType,
                "SecurityGroupIds" =:
                  toQuery
                    (toQueryList "SecurityGroupId" <$>
                       _cccSecurityGroupIds),
-               "AutoMinorVersionUpgrade" =:
-                 _cccAutoMinorVersionUpgrade,
                "SnapshotArns" =:
                  toQuery
                    (toQueryList "SnapshotArn" <$> _cccSnapshotARNs),
+               "AutoMinorVersionUpgrade" =:
+                 _cccAutoMinorVersionUpgrade,
                "CacheParameterGroupName" =:
                  _cccCacheParameterGroupName,
                "SnapshotWindow" =: _cccSnapshotWindow,
@@ -467,19 +467,19 @@
                "SnapshotName" =: _cccSnapshotName,
                "ReplicationGroupId" =: _cccReplicationGroupId,
                "NotificationTopicArn" =: _cccNotificationTopicARN,
-               "Tags" =: toQuery (toQueryList "Tag" <$> _cccTags),
                "NumCacheNodes" =: _cccNumCacheNodes,
+               "Tags" =: toQuery (toQueryList "Tag" <$> _cccTags),
+               "Port" =: _cccPort,
                "CacheSecurityGroupNames" =:
                  toQuery
                    (toQueryList "CacheSecurityGroupName" <$>
                       _cccCacheSecurityGroupNames),
-               "Port" =: _cccPort,
                "CacheClusterId" =: _cccCacheClusterId]
 
 -- | /See:/ 'createCacheClusterResponse' smart constructor.
 data CreateCacheClusterResponse = CreateCacheClusterResponse'
-    { _cccrsCacheCluster :: !(Maybe CacheCluster)
-    , _cccrsStatus       :: !Int
+    { _cccrsCacheCluster   :: !(Maybe CacheCluster)
+    , _cccrsResponseStatus :: !Int
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'CreateCacheClusterResponse' with the minimum fields required to make a request.
@@ -488,14 +488,14 @@
 --
 -- * 'cccrsCacheCluster'
 --
--- * 'cccrsStatus'
+-- * 'cccrsResponseStatus'
 createCacheClusterResponse
-    :: Int -- ^ 'cccrsStatus'
+    :: Int -- ^ 'cccrsResponseStatus'
     -> CreateCacheClusterResponse
-createCacheClusterResponse pStatus_ =
+createCacheClusterResponse pResponseStatus_ =
     CreateCacheClusterResponse'
     { _cccrsCacheCluster = Nothing
-    , _cccrsStatus = pStatus_
+    , _cccrsResponseStatus = pResponseStatus_
     }
 
 -- | Undocumented member.
@@ -503,5 +503,5 @@
 cccrsCacheCluster = lens _cccrsCacheCluster (\ s a -> s{_cccrsCacheCluster = a});
 
 -- | The response status code.
-cccrsStatus :: Lens' CreateCacheClusterResponse Int
-cccrsStatus = lens _cccrsStatus (\ s a -> s{_cccrsStatus = a});
+cccrsResponseStatus :: Lens' CreateCacheClusterResponse Int
+cccrsResponseStatus = lens _cccrsResponseStatus (\ s a -> s{_cccrsResponseStatus = a});
diff --git a/gen/Network/AWS/ElastiCache/CreateCacheParameterGroup.hs b/gen/Network/AWS/ElastiCache/CreateCacheParameterGroup.hs
--- a/gen/Network/AWS/ElastiCache/CreateCacheParameterGroup.hs
+++ b/gen/Network/AWS/ElastiCache/CreateCacheParameterGroup.hs
@@ -38,7 +38,7 @@
     , CreateCacheParameterGroupResponse
     -- * Response Lenses
     , ccpgrsCacheParameterGroup
-    , ccpgrsStatus
+    , ccpgrsResponseStatus
     ) where
 
 import           Network.AWS.ElastiCache.Types
@@ -124,7 +124,7 @@
 -- | /See:/ 'createCacheParameterGroupResponse' smart constructor.
 data CreateCacheParameterGroupResponse = CreateCacheParameterGroupResponse'
     { _ccpgrsCacheParameterGroup :: !(Maybe CacheParameterGroup)
-    , _ccpgrsStatus              :: !Int
+    , _ccpgrsResponseStatus      :: !Int
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'CreateCacheParameterGroupResponse' with the minimum fields required to make a request.
@@ -133,14 +133,14 @@
 --
 -- * 'ccpgrsCacheParameterGroup'
 --
--- * 'ccpgrsStatus'
+-- * 'ccpgrsResponseStatus'
 createCacheParameterGroupResponse
-    :: Int -- ^ 'ccpgrsStatus'
+    :: Int -- ^ 'ccpgrsResponseStatus'
     -> CreateCacheParameterGroupResponse
-createCacheParameterGroupResponse pStatus_ =
+createCacheParameterGroupResponse pResponseStatus_ =
     CreateCacheParameterGroupResponse'
     { _ccpgrsCacheParameterGroup = Nothing
-    , _ccpgrsStatus = pStatus_
+    , _ccpgrsResponseStatus = pResponseStatus_
     }
 
 -- | Undocumented member.
@@ -148,5 +148,5 @@
 ccpgrsCacheParameterGroup = lens _ccpgrsCacheParameterGroup (\ s a -> s{_ccpgrsCacheParameterGroup = a});
 
 -- | The response status code.
-ccpgrsStatus :: Lens' CreateCacheParameterGroupResponse Int
-ccpgrsStatus = lens _ccpgrsStatus (\ s a -> s{_ccpgrsStatus = a});
+ccpgrsResponseStatus :: Lens' CreateCacheParameterGroupResponse Int
+ccpgrsResponseStatus = lens _ccpgrsResponseStatus (\ s a -> s{_ccpgrsResponseStatus = a});
diff --git a/gen/Network/AWS/ElastiCache/CreateCacheSecurityGroup.hs b/gen/Network/AWS/ElastiCache/CreateCacheSecurityGroup.hs
--- a/gen/Network/AWS/ElastiCache/CreateCacheSecurityGroup.hs
+++ b/gen/Network/AWS/ElastiCache/CreateCacheSecurityGroup.hs
@@ -43,7 +43,7 @@
     , CreateCacheSecurityGroupResponse
     -- * Response Lenses
     , ccsgrsCacheSecurityGroup
-    , ccsgrsStatus
+    , ccsgrsResponseStatus
     ) where
 
 import           Network.AWS.ElastiCache.Types
@@ -120,7 +120,7 @@
 -- | /See:/ 'createCacheSecurityGroupResponse' smart constructor.
 data CreateCacheSecurityGroupResponse = CreateCacheSecurityGroupResponse'
     { _ccsgrsCacheSecurityGroup :: !(Maybe CacheSecurityGroup)
-    , _ccsgrsStatus             :: !Int
+    , _ccsgrsResponseStatus     :: !Int
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'CreateCacheSecurityGroupResponse' with the minimum fields required to make a request.
@@ -129,14 +129,14 @@
 --
 -- * 'ccsgrsCacheSecurityGroup'
 --
--- * 'ccsgrsStatus'
+-- * 'ccsgrsResponseStatus'
 createCacheSecurityGroupResponse
-    :: Int -- ^ 'ccsgrsStatus'
+    :: Int -- ^ 'ccsgrsResponseStatus'
     -> CreateCacheSecurityGroupResponse
-createCacheSecurityGroupResponse pStatus_ =
+createCacheSecurityGroupResponse pResponseStatus_ =
     CreateCacheSecurityGroupResponse'
     { _ccsgrsCacheSecurityGroup = Nothing
-    , _ccsgrsStatus = pStatus_
+    , _ccsgrsResponseStatus = pResponseStatus_
     }
 
 -- | Undocumented member.
@@ -144,5 +144,5 @@
 ccsgrsCacheSecurityGroup = lens _ccsgrsCacheSecurityGroup (\ s a -> s{_ccsgrsCacheSecurityGroup = a});
 
 -- | The response status code.
-ccsgrsStatus :: Lens' CreateCacheSecurityGroupResponse Int
-ccsgrsStatus = lens _ccsgrsStatus (\ s a -> s{_ccsgrsStatus = a});
+ccsgrsResponseStatus :: Lens' CreateCacheSecurityGroupResponse Int
+ccsgrsResponseStatus = lens _ccsgrsResponseStatus (\ s a -> s{_ccsgrsResponseStatus = a});
diff --git a/gen/Network/AWS/ElastiCache/CreateCacheSubnetGroup.hs b/gen/Network/AWS/ElastiCache/CreateCacheSubnetGroup.hs
--- a/gen/Network/AWS/ElastiCache/CreateCacheSubnetGroup.hs
+++ b/gen/Network/AWS/ElastiCache/CreateCacheSubnetGroup.hs
@@ -39,7 +39,7 @@
     , CreateCacheSubnetGroupResponse
     -- * Response Lenses
     , crsCacheSubnetGroup
-    , crsStatus
+    , crsResponseStatus
     ) where
 
 import           Network.AWS.ElastiCache.Types
@@ -126,7 +126,7 @@
 -- | /See:/ 'createCacheSubnetGroupResponse' smart constructor.
 data CreateCacheSubnetGroupResponse = CreateCacheSubnetGroupResponse'
     { _crsCacheSubnetGroup :: !(Maybe CacheSubnetGroup)
-    , _crsStatus           :: !Int
+    , _crsResponseStatus   :: !Int
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'CreateCacheSubnetGroupResponse' with the minimum fields required to make a request.
@@ -135,14 +135,14 @@
 --
 -- * 'crsCacheSubnetGroup'
 --
--- * 'crsStatus'
+-- * 'crsResponseStatus'
 createCacheSubnetGroupResponse
-    :: Int -- ^ 'crsStatus'
+    :: Int -- ^ 'crsResponseStatus'
     -> CreateCacheSubnetGroupResponse
-createCacheSubnetGroupResponse pStatus_ =
+createCacheSubnetGroupResponse pResponseStatus_ =
     CreateCacheSubnetGroupResponse'
     { _crsCacheSubnetGroup = Nothing
-    , _crsStatus = pStatus_
+    , _crsResponseStatus = pResponseStatus_
     }
 
 -- | Undocumented member.
@@ -150,5 +150,5 @@
 crsCacheSubnetGroup = lens _crsCacheSubnetGroup (\ s a -> s{_crsCacheSubnetGroup = a});
 
 -- | The response status code.
-crsStatus :: Lens' CreateCacheSubnetGroupResponse Int
-crsStatus = lens _crsStatus (\ s a -> s{_crsStatus = a});
+crsResponseStatus :: Lens' CreateCacheSubnetGroupResponse Int
+crsResponseStatus = lens _crsResponseStatus (\ s a -> s{_crsResponseStatus = a});
diff --git a/gen/Network/AWS/ElastiCache/CreateReplicationGroup.hs b/gen/Network/AWS/ElastiCache/CreateReplicationGroup.hs
--- a/gen/Network/AWS/ElastiCache/CreateReplicationGroup.hs
+++ b/gen/Network/AWS/ElastiCache/CreateReplicationGroup.hs
@@ -39,11 +39,11 @@
     , CreateReplicationGroup
     -- * Request Lenses
     , crgAutomaticFailoverEnabled
-    , crgCacheNodeType
     , crgEngineVersion
+    , crgCacheNodeType
     , crgSecurityGroupIds
-    , crgAutoMinorVersionUpgrade
     , crgSnapshotARNs
+    , crgAutoMinorVersionUpgrade
     , crgCacheParameterGroupName
     , crgSnapshotWindow
     , crgPrimaryClusterId
@@ -51,13 +51,13 @@
     , crgPreferredMaintenanceWindow
     , crgCacheSubnetGroupName
     , crgSnapshotRetentionLimit
-    , crgSnapshotName
-    , crgPreferredCacheClusterAZs
     , crgNumCacheClusters
+    , crgPreferredCacheClusterAZs
+    , crgSnapshotName
     , crgNotificationTopicARN
     , crgTags
-    , crgCacheSecurityGroupNames
     , crgPort
+    , crgCacheSecurityGroupNames
     , crgReplicationGroupId
     , crgReplicationGroupDescription
 
@@ -66,7 +66,7 @@
     , CreateReplicationGroupResponse
     -- * Response Lenses
     , crgrsReplicationGroup
-    , crgrsStatus
+    , crgrsResponseStatus
     ) where
 
 import           Network.AWS.ElastiCache.Types
@@ -80,11 +80,11 @@
 -- /See:/ 'createReplicationGroup' smart constructor.
 data CreateReplicationGroup = CreateReplicationGroup'
     { _crgAutomaticFailoverEnabled    :: !(Maybe Bool)
-    , _crgCacheNodeType               :: !(Maybe Text)
     , _crgEngineVersion               :: !(Maybe Text)
+    , _crgCacheNodeType               :: !(Maybe Text)
     , _crgSecurityGroupIds            :: !(Maybe [Text])
-    , _crgAutoMinorVersionUpgrade     :: !(Maybe Bool)
     , _crgSnapshotARNs                :: !(Maybe [Text])
+    , _crgAutoMinorVersionUpgrade     :: !(Maybe Bool)
     , _crgCacheParameterGroupName     :: !(Maybe Text)
     , _crgSnapshotWindow              :: !(Maybe Text)
     , _crgPrimaryClusterId            :: !(Maybe Text)
@@ -92,13 +92,13 @@
     , _crgPreferredMaintenanceWindow  :: !(Maybe Text)
     , _crgCacheSubnetGroupName        :: !(Maybe Text)
     , _crgSnapshotRetentionLimit      :: !(Maybe Int)
-    , _crgSnapshotName                :: !(Maybe Text)
-    , _crgPreferredCacheClusterAZs    :: !(Maybe [Text])
     , _crgNumCacheClusters            :: !(Maybe Int)
+    , _crgPreferredCacheClusterAZs    :: !(Maybe [Text])
+    , _crgSnapshotName                :: !(Maybe Text)
     , _crgNotificationTopicARN        :: !(Maybe Text)
     , _crgTags                        :: !(Maybe [Tag])
-    , _crgCacheSecurityGroupNames     :: !(Maybe [Text])
     , _crgPort                        :: !(Maybe Int)
+    , _crgCacheSecurityGroupNames     :: !(Maybe [Text])
     , _crgReplicationGroupId          :: !Text
     , _crgReplicationGroupDescription :: !Text
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
@@ -109,16 +109,16 @@
 --
 -- * 'crgAutomaticFailoverEnabled'
 --
--- * 'crgCacheNodeType'
---
 -- * 'crgEngineVersion'
 --
--- * 'crgSecurityGroupIds'
+-- * 'crgCacheNodeType'
 --
--- * 'crgAutoMinorVersionUpgrade'
+-- * 'crgSecurityGroupIds'
 --
 -- * 'crgSnapshotARNs'
 --
+-- * 'crgAutoMinorVersionUpgrade'
+--
 -- * 'crgCacheParameterGroupName'
 --
 -- * 'crgSnapshotWindow'
@@ -133,20 +133,20 @@
 --
 -- * 'crgSnapshotRetentionLimit'
 --
--- * 'crgSnapshotName'
+-- * 'crgNumCacheClusters'
 --
 -- * 'crgPreferredCacheClusterAZs'
 --
--- * 'crgNumCacheClusters'
+-- * 'crgSnapshotName'
 --
 -- * 'crgNotificationTopicARN'
 --
 -- * 'crgTags'
 --
--- * 'crgCacheSecurityGroupNames'
---
 -- * 'crgPort'
 --
+-- * 'crgCacheSecurityGroupNames'
+--
 -- * 'crgReplicationGroupId'
 --
 -- * 'crgReplicationGroupDescription'
@@ -157,11 +157,11 @@
 createReplicationGroup pReplicationGroupId_ pReplicationGroupDescription_ =
     CreateReplicationGroup'
     { _crgAutomaticFailoverEnabled = Nothing
-    , _crgCacheNodeType = Nothing
     , _crgEngineVersion = Nothing
+    , _crgCacheNodeType = Nothing
     , _crgSecurityGroupIds = Nothing
-    , _crgAutoMinorVersionUpgrade = Nothing
     , _crgSnapshotARNs = Nothing
+    , _crgAutoMinorVersionUpgrade = Nothing
     , _crgCacheParameterGroupName = Nothing
     , _crgSnapshotWindow = Nothing
     , _crgPrimaryClusterId = Nothing
@@ -169,13 +169,13 @@
     , _crgPreferredMaintenanceWindow = Nothing
     , _crgCacheSubnetGroupName = Nothing
     , _crgSnapshotRetentionLimit = Nothing
-    , _crgSnapshotName = Nothing
-    , _crgPreferredCacheClusterAZs = Nothing
     , _crgNumCacheClusters = Nothing
+    , _crgPreferredCacheClusterAZs = Nothing
+    , _crgSnapshotName = Nothing
     , _crgNotificationTopicARN = Nothing
     , _crgTags = Nothing
-    , _crgCacheSecurityGroupNames = Nothing
     , _crgPort = Nothing
+    , _crgCacheSecurityGroupNames = Nothing
     , _crgReplicationGroupId = pReplicationGroupId_
     , _crgReplicationGroupDescription = pReplicationGroupDescription_
     }
@@ -195,6 +195,12 @@
 crgAutomaticFailoverEnabled :: Lens' CreateReplicationGroup (Maybe Bool)
 crgAutomaticFailoverEnabled = lens _crgAutomaticFailoverEnabled (\ s a -> s{_crgAutomaticFailoverEnabled = a});
 
+-- | The version number of the cache engine to be used for the cache clusters
+-- in this replication group. To view the supported cache engine versions,
+-- use the /DescribeCacheEngineVersions/ action.
+crgEngineVersion :: Lens' CreateReplicationGroup (Maybe Text)
+crgEngineVersion = lens _crgEngineVersion (\ s a -> s{_crgEngineVersion = a});
+
 -- | The compute and memory capacity of the nodes in the node group.
 --
 -- Valid node types are as follows:
@@ -229,12 +235,6 @@
 crgCacheNodeType :: Lens' CreateReplicationGroup (Maybe Text)
 crgCacheNodeType = lens _crgCacheNodeType (\ s a -> s{_crgCacheNodeType = a});
 
--- | The version number of the cache engine to be used for the cache clusters
--- in this replication group. To view the supported cache engine versions,
--- use the /DescribeCacheEngineVersions/ action.
-crgEngineVersion :: Lens' CreateReplicationGroup (Maybe Text)
-crgEngineVersion = lens _crgEngineVersion (\ s a -> s{_crgEngineVersion = a});
-
 -- | One or more Amazon VPC security groups associated with this replication
 -- group.
 --
@@ -243,10 +243,6 @@
 crgSecurityGroupIds :: Lens' CreateReplicationGroup [Text]
 crgSecurityGroupIds = lens _crgSecurityGroupIds (\ s a -> s{_crgSecurityGroupIds = a}) . _Default . _Coerce;
 
--- | This parameter is currently disabled.
-crgAutoMinorVersionUpgrade :: Lens' CreateReplicationGroup (Maybe Bool)
-crgAutoMinorVersionUpgrade = lens _crgAutoMinorVersionUpgrade (\ s a -> s{_crgAutoMinorVersionUpgrade = a});
-
 -- | A single-element string list containing an Amazon Resource Name (ARN)
 -- that uniquely identifies a Redis RDB snapshot file stored in Amazon S3.
 -- The snapshot file will be used to populate the node group. The Amazon S3
@@ -259,6 +255,10 @@
 crgSnapshotARNs :: Lens' CreateReplicationGroup [Text]
 crgSnapshotARNs = lens _crgSnapshotARNs (\ s a -> s{_crgSnapshotARNs = a}) . _Default . _Coerce;
 
+-- | This parameter is currently disabled.
+crgAutoMinorVersionUpgrade :: Lens' CreateReplicationGroup (Maybe Bool)
+crgAutoMinorVersionUpgrade = lens _crgAutoMinorVersionUpgrade (\ s a -> s{_crgAutoMinorVersionUpgrade = a});
+
 -- | The name of the parameter group to associate with this replication
 -- group. If this argument is omitted, the default cache parameter group
 -- for the specified engine is used.
@@ -327,14 +327,17 @@
 crgSnapshotRetentionLimit :: Lens' CreateReplicationGroup (Maybe Int)
 crgSnapshotRetentionLimit = lens _crgSnapshotRetentionLimit (\ s a -> s{_crgSnapshotRetentionLimit = a});
 
--- | The name of a snapshot from which to restore data into the new node
--- group. The snapshot status changes to 'restoring' while the new node
--- group is being created.
+-- | The number of cache clusters this replication group will initially have.
 --
--- __Note:__ This parameter is only valid if the 'Engine' parameter is
--- 'redis'.
-crgSnapshotName :: Lens' CreateReplicationGroup (Maybe Text)
-crgSnapshotName = lens _crgSnapshotName (\ s a -> s{_crgSnapshotName = a});
+-- If /Multi-AZ/ is 'enabled', the value of this parameter must be at least
+-- 2.
+--
+-- The maximum permitted value for /NumCacheClusters/ is 6 (primary plus 5
+-- replicas). If you need to exceed this limit, please fill out the
+-- ElastiCache Limit Increase Request form at
+-- <http://aws.amazon.com/contact-us/elasticache-node-limit-request>.
+crgNumCacheClusters :: Lens' CreateReplicationGroup (Maybe Int)
+crgNumCacheClusters = lens _crgNumCacheClusters (\ s a -> s{_crgNumCacheClusters = a});
 
 -- | A list of EC2 availability zones in which the replication group\'s cache
 -- clusters will be created. The order of the availability zones in the
@@ -356,17 +359,14 @@
 crgPreferredCacheClusterAZs :: Lens' CreateReplicationGroup [Text]
 crgPreferredCacheClusterAZs = lens _crgPreferredCacheClusterAZs (\ s a -> s{_crgPreferredCacheClusterAZs = a}) . _Default . _Coerce;
 
--- | The number of cache clusters this replication group will initially have.
---
--- If /Multi-AZ/ is 'enabled', the value of this parameter must be at least
--- 2.
+-- | The name of a snapshot from which to restore data into the new node
+-- group. The snapshot status changes to 'restoring' while the new node
+-- group is being created.
 --
--- The maximum permitted value for /NumCacheClusters/ is 6 (primary plus 5
--- replicas). If you need to exceed this limit, please fill out the
--- ElastiCache Limit Increase Request form at
--- <http://aws.amazon.com/contact-us/elasticache-node-limit-request>.
-crgNumCacheClusters :: Lens' CreateReplicationGroup (Maybe Int)
-crgNumCacheClusters = lens _crgNumCacheClusters (\ s a -> s{_crgNumCacheClusters = a});
+-- __Note:__ This parameter is only valid if the 'Engine' parameter is
+-- 'redis'.
+crgSnapshotName :: Lens' CreateReplicationGroup (Maybe Text)
+crgSnapshotName = lens _crgSnapshotName (\ s a -> s{_crgSnapshotName = a});
 
 -- | The Amazon Resource Name (ARN) of the Amazon Simple Notification Service
 -- (SNS) topic to which notifications will be sent.
@@ -380,16 +380,16 @@
 crgTags :: Lens' CreateReplicationGroup [Tag]
 crgTags = lens _crgTags (\ s a -> s{_crgTags = a}) . _Default . _Coerce;
 
--- | A list of cache security group names to associate with this replication
--- group.
-crgCacheSecurityGroupNames :: Lens' CreateReplicationGroup [Text]
-crgCacheSecurityGroupNames = lens _crgCacheSecurityGroupNames (\ s a -> s{_crgCacheSecurityGroupNames = a}) . _Default . _Coerce;
-
 -- | The port number on which each member of the replication group will
 -- accept connections.
 crgPort :: Lens' CreateReplicationGroup (Maybe Int)
 crgPort = lens _crgPort (\ s a -> s{_crgPort = a});
 
+-- | A list of cache security group names to associate with this replication
+-- group.
+crgCacheSecurityGroupNames :: Lens' CreateReplicationGroup [Text]
+crgCacheSecurityGroupNames = lens _crgCacheSecurityGroupNames (\ s a -> s{_crgCacheSecurityGroupNames = a}) . _Default . _Coerce;
+
 -- | The replication group identifier. This parameter is stored as a
 -- lowercase string.
 --
@@ -429,17 +429,17 @@
                "Version" =: ("2015-02-02" :: ByteString),
                "AutomaticFailoverEnabled" =:
                  _crgAutomaticFailoverEnabled,
-               "CacheNodeType" =: _crgCacheNodeType,
                "EngineVersion" =: _crgEngineVersion,
+               "CacheNodeType" =: _crgCacheNodeType,
                "SecurityGroupIds" =:
                  toQuery
                    (toQueryList "SecurityGroupId" <$>
                       _crgSecurityGroupIds),
-               "AutoMinorVersionUpgrade" =:
-                 _crgAutoMinorVersionUpgrade,
                "SnapshotArns" =:
                  toQuery
                    (toQueryList "SnapshotArn" <$> _crgSnapshotARNs),
+               "AutoMinorVersionUpgrade" =:
+                 _crgAutoMinorVersionUpgrade,
                "CacheParameterGroupName" =:
                  _crgCacheParameterGroupName,
                "SnapshotWindow" =: _crgSnapshotWindow,
@@ -450,19 +450,19 @@
                "CacheSubnetGroupName" =: _crgCacheSubnetGroupName,
                "SnapshotRetentionLimit" =:
                  _crgSnapshotRetentionLimit,
-               "SnapshotName" =: _crgSnapshotName,
+               "NumCacheClusters" =: _crgNumCacheClusters,
                "PreferredCacheClusterAZs" =:
                  toQuery
                    (toQueryList "AvailabilityZone" <$>
                       _crgPreferredCacheClusterAZs),
-               "NumCacheClusters" =: _crgNumCacheClusters,
+               "SnapshotName" =: _crgSnapshotName,
                "NotificationTopicArn" =: _crgNotificationTopicARN,
                "Tags" =: toQuery (toQueryList "Tag" <$> _crgTags),
+               "Port" =: _crgPort,
                "CacheSecurityGroupNames" =:
                  toQuery
                    (toQueryList "CacheSecurityGroupName" <$>
                       _crgCacheSecurityGroupNames),
-               "Port" =: _crgPort,
                "ReplicationGroupId" =: _crgReplicationGroupId,
                "ReplicationGroupDescription" =:
                  _crgReplicationGroupDescription]
@@ -470,7 +470,7 @@
 -- | /See:/ 'createReplicationGroupResponse' smart constructor.
 data CreateReplicationGroupResponse = CreateReplicationGroupResponse'
     { _crgrsReplicationGroup :: !(Maybe ReplicationGroup)
-    , _crgrsStatus           :: !Int
+    , _crgrsResponseStatus   :: !Int
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'CreateReplicationGroupResponse' with the minimum fields required to make a request.
@@ -479,14 +479,14 @@
 --
 -- * 'crgrsReplicationGroup'
 --
--- * 'crgrsStatus'
+-- * 'crgrsResponseStatus'
 createReplicationGroupResponse
-    :: Int -- ^ 'crgrsStatus'
+    :: Int -- ^ 'crgrsResponseStatus'
     -> CreateReplicationGroupResponse
-createReplicationGroupResponse pStatus_ =
+createReplicationGroupResponse pResponseStatus_ =
     CreateReplicationGroupResponse'
     { _crgrsReplicationGroup = Nothing
-    , _crgrsStatus = pStatus_
+    , _crgrsResponseStatus = pResponseStatus_
     }
 
 -- | Undocumented member.
@@ -494,5 +494,5 @@
 crgrsReplicationGroup = lens _crgrsReplicationGroup (\ s a -> s{_crgrsReplicationGroup = a});
 
 -- | The response status code.
-crgrsStatus :: Lens' CreateReplicationGroupResponse Int
-crgrsStatus = lens _crgrsStatus (\ s a -> s{_crgrsStatus = a});
+crgrsResponseStatus :: Lens' CreateReplicationGroupResponse Int
+crgrsResponseStatus = lens _crgrsResponseStatus (\ s a -> s{_crgrsResponseStatus = a});
diff --git a/gen/Network/AWS/ElastiCache/CreateSnapshot.hs b/gen/Network/AWS/ElastiCache/CreateSnapshot.hs
--- a/gen/Network/AWS/ElastiCache/CreateSnapshot.hs
+++ b/gen/Network/AWS/ElastiCache/CreateSnapshot.hs
@@ -36,7 +36,7 @@
     , CreateSnapshotResponse
     -- * Response Lenses
     , crersSnapshot
-    , crersStatus
+    , crersResponseStatus
     ) where
 
 import           Network.AWS.ElastiCache.Types
@@ -104,8 +104,8 @@
 
 -- | /See:/ 'createSnapshotResponse' smart constructor.
 data CreateSnapshotResponse = CreateSnapshotResponse'
-    { _crersSnapshot :: !(Maybe Snapshot)
-    , _crersStatus   :: !Int
+    { _crersSnapshot       :: !(Maybe Snapshot)
+    , _crersResponseStatus :: !Int
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'CreateSnapshotResponse' with the minimum fields required to make a request.
@@ -114,14 +114,14 @@
 --
 -- * 'crersSnapshot'
 --
--- * 'crersStatus'
+-- * 'crersResponseStatus'
 createSnapshotResponse
-    :: Int -- ^ 'crersStatus'
+    :: Int -- ^ 'crersResponseStatus'
     -> CreateSnapshotResponse
-createSnapshotResponse pStatus_ =
+createSnapshotResponse pResponseStatus_ =
     CreateSnapshotResponse'
     { _crersSnapshot = Nothing
-    , _crersStatus = pStatus_
+    , _crersResponseStatus = pResponseStatus_
     }
 
 -- | Undocumented member.
@@ -129,5 +129,5 @@
 crersSnapshot = lens _crersSnapshot (\ s a -> s{_crersSnapshot = a});
 
 -- | The response status code.
-crersStatus :: Lens' CreateSnapshotResponse Int
-crersStatus = lens _crersStatus (\ s a -> s{_crersStatus = a});
+crersResponseStatus :: Lens' CreateSnapshotResponse Int
+crersResponseStatus = lens _crersResponseStatus (\ s a -> s{_crersResponseStatus = a});
diff --git a/gen/Network/AWS/ElastiCache/DeleteCacheCluster.hs b/gen/Network/AWS/ElastiCache/DeleteCacheCluster.hs
--- a/gen/Network/AWS/ElastiCache/DeleteCacheCluster.hs
+++ b/gen/Network/AWS/ElastiCache/DeleteCacheCluster.hs
@@ -42,7 +42,7 @@
     , DeleteCacheClusterResponse
     -- * Response Lenses
     , dccrsCacheCluster
-    , dccrsStatus
+    , dccrsResponseStatus
     ) where
 
 import           Network.AWS.ElastiCache.Types
@@ -113,8 +113,8 @@
 
 -- | /See:/ 'deleteCacheClusterResponse' smart constructor.
 data DeleteCacheClusterResponse = DeleteCacheClusterResponse'
-    { _dccrsCacheCluster :: !(Maybe CacheCluster)
-    , _dccrsStatus       :: !Int
+    { _dccrsCacheCluster   :: !(Maybe CacheCluster)
+    , _dccrsResponseStatus :: !Int
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'DeleteCacheClusterResponse' with the minimum fields required to make a request.
@@ -123,14 +123,14 @@
 --
 -- * 'dccrsCacheCluster'
 --
--- * 'dccrsStatus'
+-- * 'dccrsResponseStatus'
 deleteCacheClusterResponse
-    :: Int -- ^ 'dccrsStatus'
+    :: Int -- ^ 'dccrsResponseStatus'
     -> DeleteCacheClusterResponse
-deleteCacheClusterResponse pStatus_ =
+deleteCacheClusterResponse pResponseStatus_ =
     DeleteCacheClusterResponse'
     { _dccrsCacheCluster = Nothing
-    , _dccrsStatus = pStatus_
+    , _dccrsResponseStatus = pResponseStatus_
     }
 
 -- | Undocumented member.
@@ -138,5 +138,5 @@
 dccrsCacheCluster = lens _dccrsCacheCluster (\ s a -> s{_dccrsCacheCluster = a});
 
 -- | The response status code.
-dccrsStatus :: Lens' DeleteCacheClusterResponse Int
-dccrsStatus = lens _dccrsStatus (\ s a -> s{_dccrsStatus = a});
+dccrsResponseStatus :: Lens' DeleteCacheClusterResponse Int
+dccrsResponseStatus = lens _dccrsResponseStatus (\ s a -> s{_dccrsResponseStatus = a});
diff --git a/gen/Network/AWS/ElastiCache/DeleteReplicationGroup.hs b/gen/Network/AWS/ElastiCache/DeleteReplicationGroup.hs
--- a/gen/Network/AWS/ElastiCache/DeleteReplicationGroup.hs
+++ b/gen/Network/AWS/ElastiCache/DeleteReplicationGroup.hs
@@ -44,7 +44,7 @@
     , DeleteReplicationGroupResponse
     -- * Response Lenses
     , delrsReplicationGroup
-    , delrsStatus
+    , delrsResponseStatus
     ) where
 
 import           Network.AWS.ElastiCache.Types
@@ -128,7 +128,7 @@
 -- | /See:/ 'deleteReplicationGroupResponse' smart constructor.
 data DeleteReplicationGroupResponse = DeleteReplicationGroupResponse'
     { _delrsReplicationGroup :: !(Maybe ReplicationGroup)
-    , _delrsStatus           :: !Int
+    , _delrsResponseStatus   :: !Int
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'DeleteReplicationGroupResponse' with the minimum fields required to make a request.
@@ -137,14 +137,14 @@
 --
 -- * 'delrsReplicationGroup'
 --
--- * 'delrsStatus'
+-- * 'delrsResponseStatus'
 deleteReplicationGroupResponse
-    :: Int -- ^ 'delrsStatus'
+    :: Int -- ^ 'delrsResponseStatus'
     -> DeleteReplicationGroupResponse
-deleteReplicationGroupResponse pStatus_ =
+deleteReplicationGroupResponse pResponseStatus_ =
     DeleteReplicationGroupResponse'
     { _delrsReplicationGroup = Nothing
-    , _delrsStatus = pStatus_
+    , _delrsResponseStatus = pResponseStatus_
     }
 
 -- | Undocumented member.
@@ -152,5 +152,5 @@
 delrsReplicationGroup = lens _delrsReplicationGroup (\ s a -> s{_delrsReplicationGroup = a});
 
 -- | The response status code.
-delrsStatus :: Lens' DeleteReplicationGroupResponse Int
-delrsStatus = lens _delrsStatus (\ s a -> s{_delrsStatus = a});
+delrsResponseStatus :: Lens' DeleteReplicationGroupResponse Int
+delrsResponseStatus = lens _delrsResponseStatus (\ s a -> s{_delrsResponseStatus = a});
diff --git a/gen/Network/AWS/ElastiCache/DeleteSnapshot.hs b/gen/Network/AWS/ElastiCache/DeleteSnapshot.hs
--- a/gen/Network/AWS/ElastiCache/DeleteSnapshot.hs
+++ b/gen/Network/AWS/ElastiCache/DeleteSnapshot.hs
@@ -36,7 +36,7 @@
     , DeleteSnapshotResponse
     -- * Response Lenses
     , dsrsSnapshot
-    , dsrsStatus
+    , dsrsResponseStatus
     ) where
 
 import           Network.AWS.ElastiCache.Types
@@ -93,8 +93,8 @@
 
 -- | /See:/ 'deleteSnapshotResponse' smart constructor.
 data DeleteSnapshotResponse = DeleteSnapshotResponse'
-    { _dsrsSnapshot :: !(Maybe Snapshot)
-    , _dsrsStatus   :: !Int
+    { _dsrsSnapshot       :: !(Maybe Snapshot)
+    , _dsrsResponseStatus :: !Int
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'DeleteSnapshotResponse' with the minimum fields required to make a request.
@@ -103,14 +103,14 @@
 --
 -- * 'dsrsSnapshot'
 --
--- * 'dsrsStatus'
+-- * 'dsrsResponseStatus'
 deleteSnapshotResponse
-    :: Int -- ^ 'dsrsStatus'
+    :: Int -- ^ 'dsrsResponseStatus'
     -> DeleteSnapshotResponse
-deleteSnapshotResponse pStatus_ =
+deleteSnapshotResponse pResponseStatus_ =
     DeleteSnapshotResponse'
     { _dsrsSnapshot = Nothing
-    , _dsrsStatus = pStatus_
+    , _dsrsResponseStatus = pResponseStatus_
     }
 
 -- | Undocumented member.
@@ -118,5 +118,5 @@
 dsrsSnapshot = lens _dsrsSnapshot (\ s a -> s{_dsrsSnapshot = a});
 
 -- | The response status code.
-dsrsStatus :: Lens' DeleteSnapshotResponse Int
-dsrsStatus = lens _dsrsStatus (\ s a -> s{_dsrsStatus = a});
+dsrsResponseStatus :: Lens' DeleteSnapshotResponse Int
+dsrsResponseStatus = lens _dsrsResponseStatus (\ s a -> s{_dsrsResponseStatus = a});
diff --git a/gen/Network/AWS/ElastiCache/DescribeCacheClusters.hs b/gen/Network/AWS/ElastiCache/DescribeCacheClusters.hs
--- a/gen/Network/AWS/ElastiCache/DescribeCacheClusters.hs
+++ b/gen/Network/AWS/ElastiCache/DescribeCacheClusters.hs
@@ -53,8 +53,8 @@
     , DescribeCacheClusters
     -- * Request Lenses
     , dCacheClusterId
-    , dMaxRecords
     , dMarker
+    , dMaxRecords
     , dShowCacheNodeInfo
 
     -- * Destructuring the Response
@@ -63,7 +63,7 @@
     -- * Response Lenses
     , drsCacheClusters
     , drsMarker
-    , drsStatus
+    , drsResponseStatus
     ) where
 
 import           Network.AWS.ElastiCache.Types
@@ -78,8 +78,8 @@
 -- /See:/ 'describeCacheClusters' smart constructor.
 data DescribeCacheClusters = DescribeCacheClusters'
     { _dCacheClusterId    :: !(Maybe Text)
-    , _dMaxRecords        :: !(Maybe Int)
     , _dMarker            :: !(Maybe Text)
+    , _dMaxRecords        :: !(Maybe Int)
     , _dShowCacheNodeInfo :: !(Maybe Bool)
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
@@ -89,18 +89,18 @@
 --
 -- * 'dCacheClusterId'
 --
--- * 'dMaxRecords'
---
 -- * 'dMarker'
 --
+-- * 'dMaxRecords'
+--
 -- * 'dShowCacheNodeInfo'
 describeCacheClusters
     :: DescribeCacheClusters
 describeCacheClusters =
     DescribeCacheClusters'
     { _dCacheClusterId = Nothing
-    , _dMaxRecords = Nothing
     , _dMarker = Nothing
+    , _dMaxRecords = Nothing
     , _dShowCacheNodeInfo = Nothing
     }
 
@@ -110,6 +110,13 @@
 dCacheClusterId :: Lens' DescribeCacheClusters (Maybe Text)
 dCacheClusterId = lens _dCacheClusterId (\ s a -> s{_dCacheClusterId = a});
 
+-- | An optional marker returned from a prior request. Use this marker for
+-- pagination of results from this action. If this parameter is specified,
+-- the response includes only records beyond the marker, up to the value
+-- specified by /MaxRecords/.
+dMarker :: Lens' DescribeCacheClusters (Maybe Text)
+dMarker = lens _dMarker (\ s a -> s{_dMarker = a});
+
 -- | The maximum number of records to include in the response. If more
 -- records exist than the specified 'MaxRecords' value, a marker is
 -- included in the response so that the remaining results can be retrieved.
@@ -120,13 +127,6 @@
 dMaxRecords :: Lens' DescribeCacheClusters (Maybe Int)
 dMaxRecords = lens _dMaxRecords (\ s a -> s{_dMaxRecords = a});
 
--- | An optional marker returned from a prior request. Use this marker for
--- pagination of results from this action. If this parameter is specified,
--- the response includes only records beyond the marker, up to the value
--- specified by /MaxRecords/.
-dMarker :: Lens' DescribeCacheClusters (Maybe Text)
-dMarker = lens _dMarker (\ s a -> s{_dMarker = a});
-
 -- | An optional flag that can be included in the DescribeCacheCluster
 -- request to retrieve information about the individual cache nodes.
 dShowCacheNodeInfo :: Lens' DescribeCacheClusters (Maybe Bool)
@@ -163,16 +163,16 @@
               ["Action" =: ("DescribeCacheClusters" :: ByteString),
                "Version" =: ("2015-02-02" :: ByteString),
                "CacheClusterId" =: _dCacheClusterId,
-               "MaxRecords" =: _dMaxRecords, "Marker" =: _dMarker,
+               "Marker" =: _dMarker, "MaxRecords" =: _dMaxRecords,
                "ShowCacheNodeInfo" =: _dShowCacheNodeInfo]
 
 -- | Represents the output of a /DescribeCacheClusters/ action.
 --
 -- /See:/ 'describeCacheClustersResponse' smart constructor.
 data DescribeCacheClustersResponse = DescribeCacheClustersResponse'
-    { _drsCacheClusters :: !(Maybe [CacheCluster])
-    , _drsMarker        :: !(Maybe Text)
-    , _drsStatus        :: !Int
+    { _drsCacheClusters  :: !(Maybe [CacheCluster])
+    , _drsMarker         :: !(Maybe Text)
+    , _drsResponseStatus :: !Int
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'DescribeCacheClustersResponse' with the minimum fields required to make a request.
@@ -183,15 +183,15 @@
 --
 -- * 'drsMarker'
 --
--- * 'drsStatus'
+-- * 'drsResponseStatus'
 describeCacheClustersResponse
-    :: Int -- ^ 'drsStatus'
+    :: Int -- ^ 'drsResponseStatus'
     -> DescribeCacheClustersResponse
-describeCacheClustersResponse pStatus_ =
+describeCacheClustersResponse pResponseStatus_ =
     DescribeCacheClustersResponse'
     { _drsCacheClusters = Nothing
     , _drsMarker = Nothing
-    , _drsStatus = pStatus_
+    , _drsResponseStatus = pResponseStatus_
     }
 
 -- | A list of cache clusters. Each item in the list contains detailed
@@ -204,5 +204,5 @@
 drsMarker = lens _drsMarker (\ s a -> s{_drsMarker = a});
 
 -- | The response status code.
-drsStatus :: Lens' DescribeCacheClustersResponse Int
-drsStatus = lens _drsStatus (\ s a -> s{_drsStatus = a});
+drsResponseStatus :: Lens' DescribeCacheClustersResponse Int
+drsResponseStatus = lens _drsResponseStatus (\ s a -> s{_drsResponseStatus = a});
diff --git a/gen/Network/AWS/ElastiCache/DescribeCacheEngineVersions.hs b/gen/Network/AWS/ElastiCache/DescribeCacheEngineVersions.hs
--- a/gen/Network/AWS/ElastiCache/DescribeCacheEngineVersions.hs
+++ b/gen/Network/AWS/ElastiCache/DescribeCacheEngineVersions.hs
@@ -30,12 +30,12 @@
       describeCacheEngineVersions
     , DescribeCacheEngineVersions
     -- * Request Lenses
-    , dcevCacheParameterGroupFamily
     , dcevEngineVersion
+    , dcevCacheParameterGroupFamily
     , dcevDefaultOnly
     , dcevEngine
-    , dcevMaxRecords
     , dcevMarker
+    , dcevMaxRecords
 
     -- * Destructuring the Response
     , describeCacheEngineVersionsResponse
@@ -43,7 +43,7 @@
     -- * Response Lenses
     , dcevrsCacheEngineVersions
     , dcevrsMarker
-    , dcevrsStatus
+    , dcevrsResponseStatus
     ) where
 
 import           Network.AWS.ElastiCache.Types
@@ -57,41 +57,47 @@
 --
 -- /See:/ 'describeCacheEngineVersions' smart constructor.
 data DescribeCacheEngineVersions = DescribeCacheEngineVersions'
-    { _dcevCacheParameterGroupFamily :: !(Maybe Text)
-    , _dcevEngineVersion             :: !(Maybe Text)
+    { _dcevEngineVersion             :: !(Maybe Text)
+    , _dcevCacheParameterGroupFamily :: !(Maybe Text)
     , _dcevDefaultOnly               :: !(Maybe Bool)
     , _dcevEngine                    :: !(Maybe Text)
-    , _dcevMaxRecords                :: !(Maybe Int)
     , _dcevMarker                    :: !(Maybe Text)
+    , _dcevMaxRecords                :: !(Maybe Int)
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'DescribeCacheEngineVersions' with the minimum fields required to make a request.
 --
 -- Use one of the following lenses to modify other fields as desired:
 --
--- * 'dcevCacheParameterGroupFamily'
---
 -- * 'dcevEngineVersion'
 --
+-- * 'dcevCacheParameterGroupFamily'
+--
 -- * 'dcevDefaultOnly'
 --
 -- * 'dcevEngine'
 --
--- * 'dcevMaxRecords'
---
 -- * 'dcevMarker'
+--
+-- * 'dcevMaxRecords'
 describeCacheEngineVersions
     :: DescribeCacheEngineVersions
 describeCacheEngineVersions =
     DescribeCacheEngineVersions'
-    { _dcevCacheParameterGroupFamily = Nothing
-    , _dcevEngineVersion = Nothing
+    { _dcevEngineVersion = Nothing
+    , _dcevCacheParameterGroupFamily = Nothing
     , _dcevDefaultOnly = Nothing
     , _dcevEngine = Nothing
-    , _dcevMaxRecords = Nothing
     , _dcevMarker = Nothing
+    , _dcevMaxRecords = Nothing
     }
 
+-- | The cache engine version to return.
+--
+-- Example: '1.4.14'
+dcevEngineVersion :: Lens' DescribeCacheEngineVersions (Maybe Text)
+dcevEngineVersion = lens _dcevEngineVersion (\ s a -> s{_dcevEngineVersion = a});
+
 -- | The name of a specific cache parameter group family to return details
 -- for.
 --
@@ -103,12 +109,6 @@
 dcevCacheParameterGroupFamily :: Lens' DescribeCacheEngineVersions (Maybe Text)
 dcevCacheParameterGroupFamily = lens _dcevCacheParameterGroupFamily (\ s a -> s{_dcevCacheParameterGroupFamily = a});
 
--- | The cache engine version to return.
---
--- Example: '1.4.14'
-dcevEngineVersion :: Lens' DescribeCacheEngineVersions (Maybe Text)
-dcevEngineVersion = lens _dcevEngineVersion (\ s a -> s{_dcevEngineVersion = a});
-
 -- | If /true/, specifies that only the default version of the specified
 -- engine or engine and major version combination is to be returned.
 dcevDefaultOnly :: Lens' DescribeCacheEngineVersions (Maybe Bool)
@@ -118,6 +118,13 @@
 dcevEngine :: Lens' DescribeCacheEngineVersions (Maybe Text)
 dcevEngine = lens _dcevEngine (\ s a -> s{_dcevEngine = a});
 
+-- | An optional marker returned from a prior request. Use this marker for
+-- pagination of results from this action. If this parameter is specified,
+-- the response includes only records beyond the marker, up to the value
+-- specified by /MaxRecords/.
+dcevMarker :: Lens' DescribeCacheEngineVersions (Maybe Text)
+dcevMarker = lens _dcevMarker (\ s a -> s{_dcevMarker = a});
+
 -- | The maximum number of records to include in the response. If more
 -- records exist than the specified 'MaxRecords' value, a marker is
 -- included in the response so that the remaining results can be retrieved.
@@ -128,13 +135,6 @@
 dcevMaxRecords :: Lens' DescribeCacheEngineVersions (Maybe Int)
 dcevMaxRecords = lens _dcevMaxRecords (\ s a -> s{_dcevMaxRecords = a});
 
--- | An optional marker returned from a prior request. Use this marker for
--- pagination of results from this action. If this parameter is specified,
--- the response includes only records beyond the marker, up to the value
--- specified by /MaxRecords/.
-dcevMarker :: Lens' DescribeCacheEngineVersions (Maybe Text)
-dcevMarker = lens _dcevMarker (\ s a -> s{_dcevMarker = a});
-
 instance AWSPager DescribeCacheEngineVersions where
         page rq rs
           | stop (rs ^. dcevrsMarker) = Nothing
@@ -168,13 +168,12 @@
               ["Action" =:
                  ("DescribeCacheEngineVersions" :: ByteString),
                "Version" =: ("2015-02-02" :: ByteString),
+               "EngineVersion" =: _dcevEngineVersion,
                "CacheParameterGroupFamily" =:
                  _dcevCacheParameterGroupFamily,
-               "EngineVersion" =: _dcevEngineVersion,
                "DefaultOnly" =: _dcevDefaultOnly,
-               "Engine" =: _dcevEngine,
-               "MaxRecords" =: _dcevMaxRecords,
-               "Marker" =: _dcevMarker]
+               "Engine" =: _dcevEngine, "Marker" =: _dcevMarker,
+               "MaxRecords" =: _dcevMaxRecords]
 
 -- | Represents the output of a DescribeCacheEngineVersions action.
 --
@@ -182,7 +181,7 @@
 data DescribeCacheEngineVersionsResponse = DescribeCacheEngineVersionsResponse'
     { _dcevrsCacheEngineVersions :: !(Maybe [CacheEngineVersion])
     , _dcevrsMarker              :: !(Maybe Text)
-    , _dcevrsStatus              :: !Int
+    , _dcevrsResponseStatus      :: !Int
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'DescribeCacheEngineVersionsResponse' with the minimum fields required to make a request.
@@ -193,15 +192,15 @@
 --
 -- * 'dcevrsMarker'
 --
--- * 'dcevrsStatus'
+-- * 'dcevrsResponseStatus'
 describeCacheEngineVersionsResponse
-    :: Int -- ^ 'dcevrsStatus'
+    :: Int -- ^ 'dcevrsResponseStatus'
     -> DescribeCacheEngineVersionsResponse
-describeCacheEngineVersionsResponse pStatus_ =
+describeCacheEngineVersionsResponse pResponseStatus_ =
     DescribeCacheEngineVersionsResponse'
     { _dcevrsCacheEngineVersions = Nothing
     , _dcevrsMarker = Nothing
-    , _dcevrsStatus = pStatus_
+    , _dcevrsResponseStatus = pResponseStatus_
     }
 
 -- | A list of cache engine version details. Each element in the list
@@ -214,5 +213,5 @@
 dcevrsMarker = lens _dcevrsMarker (\ s a -> s{_dcevrsMarker = a});
 
 -- | The response status code.
-dcevrsStatus :: Lens' DescribeCacheEngineVersionsResponse Int
-dcevrsStatus = lens _dcevrsStatus (\ s a -> s{_dcevrsStatus = a});
+dcevrsResponseStatus :: Lens' DescribeCacheEngineVersionsResponse Int
+dcevrsResponseStatus = lens _dcevrsResponseStatus (\ s a -> s{_dcevrsResponseStatus = a});
diff --git a/gen/Network/AWS/ElastiCache/DescribeCacheParameterGroups.hs b/gen/Network/AWS/ElastiCache/DescribeCacheParameterGroups.hs
--- a/gen/Network/AWS/ElastiCache/DescribeCacheParameterGroups.hs
+++ b/gen/Network/AWS/ElastiCache/DescribeCacheParameterGroups.hs
@@ -32,8 +32,8 @@
     , DescribeCacheParameterGroups
     -- * Request Lenses
     , dcpgCacheParameterGroupName
-    , dcpgMaxRecords
     , dcpgMarker
+    , dcpgMaxRecords
 
     -- * Destructuring the Response
     , describeCacheParameterGroupsResponse
@@ -41,7 +41,7 @@
     -- * Response Lenses
     , dcpgrsCacheParameterGroups
     , dcpgrsMarker
-    , dcpgrsStatus
+    , dcpgrsResponseStatus
     ) where
 
 import           Network.AWS.ElastiCache.Types
@@ -56,8 +56,8 @@
 -- /See:/ 'describeCacheParameterGroups' smart constructor.
 data DescribeCacheParameterGroups = DescribeCacheParameterGroups'
     { _dcpgCacheParameterGroupName :: !(Maybe Text)
-    , _dcpgMaxRecords              :: !(Maybe Int)
     , _dcpgMarker                  :: !(Maybe Text)
+    , _dcpgMaxRecords              :: !(Maybe Int)
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'DescribeCacheParameterGroups' with the minimum fields required to make a request.
@@ -66,22 +66,29 @@
 --
 -- * 'dcpgCacheParameterGroupName'
 --
--- * 'dcpgMaxRecords'
---
 -- * 'dcpgMarker'
+--
+-- * 'dcpgMaxRecords'
 describeCacheParameterGroups
     :: DescribeCacheParameterGroups
 describeCacheParameterGroups =
     DescribeCacheParameterGroups'
     { _dcpgCacheParameterGroupName = Nothing
-    , _dcpgMaxRecords = Nothing
     , _dcpgMarker = Nothing
+    , _dcpgMaxRecords = Nothing
     }
 
 -- | The name of a specific cache parameter group to return details for.
 dcpgCacheParameterGroupName :: Lens' DescribeCacheParameterGroups (Maybe Text)
 dcpgCacheParameterGroupName = lens _dcpgCacheParameterGroupName (\ s a -> s{_dcpgCacheParameterGroupName = a});
 
+-- | An optional marker returned from a prior request. Use this marker for
+-- pagination of results from this action. If this parameter is specified,
+-- the response includes only records beyond the marker, up to the value
+-- specified by /MaxRecords/.
+dcpgMarker :: Lens' DescribeCacheParameterGroups (Maybe Text)
+dcpgMarker = lens _dcpgMarker (\ s a -> s{_dcpgMarker = a});
+
 -- | The maximum number of records to include in the response. If more
 -- records exist than the specified 'MaxRecords' value, a marker is
 -- included in the response so that the remaining results can be retrieved.
@@ -92,13 +99,6 @@
 dcpgMaxRecords :: Lens' DescribeCacheParameterGroups (Maybe Int)
 dcpgMaxRecords = lens _dcpgMaxRecords (\ s a -> s{_dcpgMaxRecords = a});
 
--- | An optional marker returned from a prior request. Use this marker for
--- pagination of results from this action. If this parameter is specified,
--- the response includes only records beyond the marker, up to the value
--- specified by /MaxRecords/.
-dcpgMarker :: Lens' DescribeCacheParameterGroups (Maybe Text)
-dcpgMarker = lens _dcpgMarker (\ s a -> s{_dcpgMarker = a});
-
 instance AWSPager DescribeCacheParameterGroups where
         page rq rs
           | stop (rs ^. dcpgrsMarker) = Nothing
@@ -135,8 +135,8 @@
                "Version" =: ("2015-02-02" :: ByteString),
                "CacheParameterGroupName" =:
                  _dcpgCacheParameterGroupName,
-               "MaxRecords" =: _dcpgMaxRecords,
-               "Marker" =: _dcpgMarker]
+               "Marker" =: _dcpgMarker,
+               "MaxRecords" =: _dcpgMaxRecords]
 
 -- | Represents the output of a /DescribeCacheParameterGroups/ action.
 --
@@ -144,7 +144,7 @@
 data DescribeCacheParameterGroupsResponse = DescribeCacheParameterGroupsResponse'
     { _dcpgrsCacheParameterGroups :: !(Maybe [CacheParameterGroup])
     , _dcpgrsMarker               :: !(Maybe Text)
-    , _dcpgrsStatus               :: !Int
+    , _dcpgrsResponseStatus       :: !Int
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'DescribeCacheParameterGroupsResponse' with the minimum fields required to make a request.
@@ -155,15 +155,15 @@
 --
 -- * 'dcpgrsMarker'
 --
--- * 'dcpgrsStatus'
+-- * 'dcpgrsResponseStatus'
 describeCacheParameterGroupsResponse
-    :: Int -- ^ 'dcpgrsStatus'
+    :: Int -- ^ 'dcpgrsResponseStatus'
     -> DescribeCacheParameterGroupsResponse
-describeCacheParameterGroupsResponse pStatus_ =
+describeCacheParameterGroupsResponse pResponseStatus_ =
     DescribeCacheParameterGroupsResponse'
     { _dcpgrsCacheParameterGroups = Nothing
     , _dcpgrsMarker = Nothing
-    , _dcpgrsStatus = pStatus_
+    , _dcpgrsResponseStatus = pResponseStatus_
     }
 
 -- | A list of cache parameter groups. Each element in the list contains
@@ -176,5 +176,5 @@
 dcpgrsMarker = lens _dcpgrsMarker (\ s a -> s{_dcpgrsMarker = a});
 
 -- | The response status code.
-dcpgrsStatus :: Lens' DescribeCacheParameterGroupsResponse Int
-dcpgrsStatus = lens _dcpgrsStatus (\ s a -> s{_dcpgrsStatus = a});
+dcpgrsResponseStatus :: Lens' DescribeCacheParameterGroupsResponse Int
+dcpgrsResponseStatus = lens _dcpgrsResponseStatus (\ s a -> s{_dcpgrsResponseStatus = a});
diff --git a/gen/Network/AWS/ElastiCache/DescribeCacheParameters.hs b/gen/Network/AWS/ElastiCache/DescribeCacheParameters.hs
--- a/gen/Network/AWS/ElastiCache/DescribeCacheParameters.hs
+++ b/gen/Network/AWS/ElastiCache/DescribeCacheParameters.hs
@@ -30,8 +30,8 @@
       describeCacheParameters
     , DescribeCacheParameters
     -- * Request Lenses
-    , dcpMaxRecords
     , dcpMarker
+    , dcpMaxRecords
     , dcpSource
     , dcpCacheParameterGroupName
 
@@ -40,9 +40,9 @@
     , DescribeCacheParametersResponse
     -- * Response Lenses
     , dcprsCacheNodeTypeSpecificParameters
-    , dcprsParameters
     , dcprsMarker
-    , dcprsStatus
+    , dcprsParameters
+    , dcprsResponseStatus
     ) where
 
 import           Network.AWS.ElastiCache.Types
@@ -56,8 +56,8 @@
 --
 -- /See:/ 'describeCacheParameters' smart constructor.
 data DescribeCacheParameters = DescribeCacheParameters'
-    { _dcpMaxRecords              :: !(Maybe Int)
-    , _dcpMarker                  :: !(Maybe Text)
+    { _dcpMarker                  :: !(Maybe Text)
+    , _dcpMaxRecords              :: !(Maybe Int)
     , _dcpSource                  :: !(Maybe Text)
     , _dcpCacheParameterGroupName :: !Text
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
@@ -66,10 +66,10 @@
 --
 -- Use one of the following lenses to modify other fields as desired:
 --
--- * 'dcpMaxRecords'
---
 -- * 'dcpMarker'
 --
+-- * 'dcpMaxRecords'
+--
 -- * 'dcpSource'
 --
 -- * 'dcpCacheParameterGroupName'
@@ -78,12 +78,19 @@
     -> DescribeCacheParameters
 describeCacheParameters pCacheParameterGroupName_ =
     DescribeCacheParameters'
-    { _dcpMaxRecords = Nothing
-    , _dcpMarker = Nothing
+    { _dcpMarker = Nothing
+    , _dcpMaxRecords = Nothing
     , _dcpSource = Nothing
     , _dcpCacheParameterGroupName = pCacheParameterGroupName_
     }
 
+-- | An optional marker returned from a prior request. Use this marker for
+-- pagination of results from this action. If this parameter is specified,
+-- the response includes only records beyond the marker, up to the value
+-- specified by /MaxRecords/.
+dcpMarker :: Lens' DescribeCacheParameters (Maybe Text)
+dcpMarker = lens _dcpMarker (\ s a -> s{_dcpMarker = a});
+
 -- | The maximum number of records to include in the response. If more
 -- records exist than the specified 'MaxRecords' value, a marker is
 -- included in the response so that the remaining results can be retrieved.
@@ -94,13 +101,6 @@
 dcpMaxRecords :: Lens' DescribeCacheParameters (Maybe Int)
 dcpMaxRecords = lens _dcpMaxRecords (\ s a -> s{_dcpMaxRecords = a});
 
--- | An optional marker returned from a prior request. Use this marker for
--- pagination of results from this action. If this parameter is specified,
--- the response includes only records beyond the marker, up to the value
--- specified by /MaxRecords/.
-dcpMarker :: Lens' DescribeCacheParameters (Maybe Text)
-dcpMarker = lens _dcpMarker (\ s a -> s{_dcpMarker = a});
-
 -- | The parameter types to return.
 --
 -- Valid values: 'user' | 'system' | 'engine-default'
@@ -129,10 +129,10 @@
                    (x .@? "CacheNodeTypeSpecificParameters" .!@ mempty
                       >>=
                       may (parseXMLList "CacheNodeTypeSpecificParameter"))
+                     <*> (x .@? "Marker")
                      <*>
                      (x .@? "Parameters" .!@ mempty >>=
                         may (parseXMLList "Parameter"))
-                     <*> (x .@? "Marker")
                      <*> (pure (fromEnum s)))
 
 instance ToHeaders DescribeCacheParameters where
@@ -147,8 +147,9 @@
               ["Action" =:
                  ("DescribeCacheParameters" :: ByteString),
                "Version" =: ("2015-02-02" :: ByteString),
+               "Marker" =: _dcpMarker,
                "MaxRecords" =: _dcpMaxRecords,
-               "Marker" =: _dcpMarker, "Source" =: _dcpSource,
+               "Source" =: _dcpSource,
                "CacheParameterGroupName" =:
                  _dcpCacheParameterGroupName]
 
@@ -157,9 +158,9 @@
 -- /See:/ 'describeCacheParametersResponse' smart constructor.
 data DescribeCacheParametersResponse = DescribeCacheParametersResponse'
     { _dcprsCacheNodeTypeSpecificParameters :: !(Maybe [CacheNodeTypeSpecificParameter])
-    , _dcprsParameters                      :: !(Maybe [Parameter])
     , _dcprsMarker                          :: !(Maybe Text)
-    , _dcprsStatus                          :: !Int
+    , _dcprsParameters                      :: !(Maybe [Parameter])
+    , _dcprsResponseStatus                  :: !Int
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'DescribeCacheParametersResponse' with the minimum fields required to make a request.
@@ -168,20 +169,20 @@
 --
 -- * 'dcprsCacheNodeTypeSpecificParameters'
 --
--- * 'dcprsParameters'
---
 -- * 'dcprsMarker'
 --
--- * 'dcprsStatus'
+-- * 'dcprsParameters'
+--
+-- * 'dcprsResponseStatus'
 describeCacheParametersResponse
-    :: Int -- ^ 'dcprsStatus'
+    :: Int -- ^ 'dcprsResponseStatus'
     -> DescribeCacheParametersResponse
-describeCacheParametersResponse pStatus_ =
+describeCacheParametersResponse pResponseStatus_ =
     DescribeCacheParametersResponse'
     { _dcprsCacheNodeTypeSpecificParameters = Nothing
-    , _dcprsParameters = Nothing
     , _dcprsMarker = Nothing
-    , _dcprsStatus = pStatus_
+    , _dcprsParameters = Nothing
+    , _dcprsResponseStatus = pResponseStatus_
     }
 
 -- | A list of parameters specific to a particular cache node type. Each
@@ -189,14 +190,14 @@
 dcprsCacheNodeTypeSpecificParameters :: Lens' DescribeCacheParametersResponse [CacheNodeTypeSpecificParameter]
 dcprsCacheNodeTypeSpecificParameters = lens _dcprsCacheNodeTypeSpecificParameters (\ s a -> s{_dcprsCacheNodeTypeSpecificParameters = a}) . _Default . _Coerce;
 
--- | A list of Parameter instances.
-dcprsParameters :: Lens' DescribeCacheParametersResponse [Parameter]
-dcprsParameters = lens _dcprsParameters (\ s a -> s{_dcprsParameters = a}) . _Default . _Coerce;
-
 -- | Provides an identifier to allow retrieval of paginated results.
 dcprsMarker :: Lens' DescribeCacheParametersResponse (Maybe Text)
 dcprsMarker = lens _dcprsMarker (\ s a -> s{_dcprsMarker = a});
 
+-- | A list of Parameter instances.
+dcprsParameters :: Lens' DescribeCacheParametersResponse [Parameter]
+dcprsParameters = lens _dcprsParameters (\ s a -> s{_dcprsParameters = a}) . _Default . _Coerce;
+
 -- | The response status code.
-dcprsStatus :: Lens' DescribeCacheParametersResponse Int
-dcprsStatus = lens _dcprsStatus (\ s a -> s{_dcprsStatus = a});
+dcprsResponseStatus :: Lens' DescribeCacheParametersResponse Int
+dcprsResponseStatus = lens _dcprsResponseStatus (\ s a -> s{_dcprsResponseStatus = a});
diff --git a/gen/Network/AWS/ElastiCache/DescribeCacheSecurityGroups.hs b/gen/Network/AWS/ElastiCache/DescribeCacheSecurityGroups.hs
--- a/gen/Network/AWS/ElastiCache/DescribeCacheSecurityGroups.hs
+++ b/gen/Network/AWS/ElastiCache/DescribeCacheSecurityGroups.hs
@@ -32,8 +32,8 @@
     , DescribeCacheSecurityGroups
     -- * Request Lenses
     , dcsgsCacheSecurityGroupName
-    , dcsgsMaxRecords
     , dcsgsMarker
+    , dcsgsMaxRecords
 
     -- * Destructuring the Response
     , describeCacheSecurityGroupsResponse
@@ -41,7 +41,7 @@
     -- * Response Lenses
     , dcsgsrsCacheSecurityGroups
     , dcsgsrsMarker
-    , dcsgsrsStatus
+    , dcsgsrsResponseStatus
     ) where
 
 import           Network.AWS.ElastiCache.Types
@@ -56,8 +56,8 @@
 -- /See:/ 'describeCacheSecurityGroups' smart constructor.
 data DescribeCacheSecurityGroups = DescribeCacheSecurityGroups'
     { _dcsgsCacheSecurityGroupName :: !(Maybe Text)
-    , _dcsgsMaxRecords             :: !(Maybe Int)
     , _dcsgsMarker                 :: !(Maybe Text)
+    , _dcsgsMaxRecords             :: !(Maybe Int)
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'DescribeCacheSecurityGroups' with the minimum fields required to make a request.
@@ -66,22 +66,29 @@
 --
 -- * 'dcsgsCacheSecurityGroupName'
 --
--- * 'dcsgsMaxRecords'
---
 -- * 'dcsgsMarker'
+--
+-- * 'dcsgsMaxRecords'
 describeCacheSecurityGroups
     :: DescribeCacheSecurityGroups
 describeCacheSecurityGroups =
     DescribeCacheSecurityGroups'
     { _dcsgsCacheSecurityGroupName = Nothing
-    , _dcsgsMaxRecords = Nothing
     , _dcsgsMarker = Nothing
+    , _dcsgsMaxRecords = Nothing
     }
 
 -- | The name of the cache security group to return details for.
 dcsgsCacheSecurityGroupName :: Lens' DescribeCacheSecurityGroups (Maybe Text)
 dcsgsCacheSecurityGroupName = lens _dcsgsCacheSecurityGroupName (\ s a -> s{_dcsgsCacheSecurityGroupName = a});
 
+-- | An optional marker returned from a prior request. Use this marker for
+-- pagination of results from this action. If this parameter is specified,
+-- the response includes only records beyond the marker, up to the value
+-- specified by /MaxRecords/.
+dcsgsMarker :: Lens' DescribeCacheSecurityGroups (Maybe Text)
+dcsgsMarker = lens _dcsgsMarker (\ s a -> s{_dcsgsMarker = a});
+
 -- | The maximum number of records to include in the response. If more
 -- records exist than the specified 'MaxRecords' value, a marker is
 -- included in the response so that the remaining results can be retrieved.
@@ -92,13 +99,6 @@
 dcsgsMaxRecords :: Lens' DescribeCacheSecurityGroups (Maybe Int)
 dcsgsMaxRecords = lens _dcsgsMaxRecords (\ s a -> s{_dcsgsMaxRecords = a});
 
--- | An optional marker returned from a prior request. Use this marker for
--- pagination of results from this action. If this parameter is specified,
--- the response includes only records beyond the marker, up to the value
--- specified by /MaxRecords/.
-dcsgsMarker :: Lens' DescribeCacheSecurityGroups (Maybe Text)
-dcsgsMarker = lens _dcsgsMarker (\ s a -> s{_dcsgsMarker = a});
-
 instance AWSPager DescribeCacheSecurityGroups where
         page rq rs
           | stop (rs ^. dcsgsrsMarker) = Nothing
@@ -134,8 +134,8 @@
                "Version" =: ("2015-02-02" :: ByteString),
                "CacheSecurityGroupName" =:
                  _dcsgsCacheSecurityGroupName,
-               "MaxRecords" =: _dcsgsMaxRecords,
-               "Marker" =: _dcsgsMarker]
+               "Marker" =: _dcsgsMarker,
+               "MaxRecords" =: _dcsgsMaxRecords]
 
 -- | Represents the output of a /DescribeCacheSecurityGroups/ action.
 --
@@ -143,7 +143,7 @@
 data DescribeCacheSecurityGroupsResponse = DescribeCacheSecurityGroupsResponse'
     { _dcsgsrsCacheSecurityGroups :: !(Maybe [CacheSecurityGroup])
     , _dcsgsrsMarker              :: !(Maybe Text)
-    , _dcsgsrsStatus              :: !Int
+    , _dcsgsrsResponseStatus      :: !Int
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'DescribeCacheSecurityGroupsResponse' with the minimum fields required to make a request.
@@ -154,15 +154,15 @@
 --
 -- * 'dcsgsrsMarker'
 --
--- * 'dcsgsrsStatus'
+-- * 'dcsgsrsResponseStatus'
 describeCacheSecurityGroupsResponse
-    :: Int -- ^ 'dcsgsrsStatus'
+    :: Int -- ^ 'dcsgsrsResponseStatus'
     -> DescribeCacheSecurityGroupsResponse
-describeCacheSecurityGroupsResponse pStatus_ =
+describeCacheSecurityGroupsResponse pResponseStatus_ =
     DescribeCacheSecurityGroupsResponse'
     { _dcsgsrsCacheSecurityGroups = Nothing
     , _dcsgsrsMarker = Nothing
-    , _dcsgsrsStatus = pStatus_
+    , _dcsgsrsResponseStatus = pResponseStatus_
     }
 
 -- | A list of cache security groups. Each element in the list contains
@@ -175,5 +175,5 @@
 dcsgsrsMarker = lens _dcsgsrsMarker (\ s a -> s{_dcsgsrsMarker = a});
 
 -- | The response status code.
-dcsgsrsStatus :: Lens' DescribeCacheSecurityGroupsResponse Int
-dcsgsrsStatus = lens _dcsgsrsStatus (\ s a -> s{_dcsgsrsStatus = a});
+dcsgsrsResponseStatus :: Lens' DescribeCacheSecurityGroupsResponse Int
+dcsgsrsResponseStatus = lens _dcsgsrsResponseStatus (\ s a -> s{_dcsgsrsResponseStatus = a});
diff --git a/gen/Network/AWS/ElastiCache/DescribeCacheSubnetGroups.hs b/gen/Network/AWS/ElastiCache/DescribeCacheSubnetGroups.hs
--- a/gen/Network/AWS/ElastiCache/DescribeCacheSubnetGroups.hs
+++ b/gen/Network/AWS/ElastiCache/DescribeCacheSubnetGroups.hs
@@ -32,8 +32,8 @@
     , DescribeCacheSubnetGroups
     -- * Request Lenses
     , dcsgCacheSubnetGroupName
-    , dcsgMaxRecords
     , dcsgMarker
+    , dcsgMaxRecords
 
     -- * Destructuring the Response
     , describeCacheSubnetGroupsResponse
@@ -41,7 +41,7 @@
     -- * Response Lenses
     , dcsgrsMarker
     , dcsgrsCacheSubnetGroups
-    , dcsgrsStatus
+    , dcsgrsResponseStatus
     ) where
 
 import           Network.AWS.ElastiCache.Types
@@ -56,8 +56,8 @@
 -- /See:/ 'describeCacheSubnetGroups' smart constructor.
 data DescribeCacheSubnetGroups = DescribeCacheSubnetGroups'
     { _dcsgCacheSubnetGroupName :: !(Maybe Text)
-    , _dcsgMaxRecords           :: !(Maybe Int)
     , _dcsgMarker               :: !(Maybe Text)
+    , _dcsgMaxRecords           :: !(Maybe Int)
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'DescribeCacheSubnetGroups' with the minimum fields required to make a request.
@@ -66,22 +66,29 @@
 --
 -- * 'dcsgCacheSubnetGroupName'
 --
--- * 'dcsgMaxRecords'
---
 -- * 'dcsgMarker'
+--
+-- * 'dcsgMaxRecords'
 describeCacheSubnetGroups
     :: DescribeCacheSubnetGroups
 describeCacheSubnetGroups =
     DescribeCacheSubnetGroups'
     { _dcsgCacheSubnetGroupName = Nothing
-    , _dcsgMaxRecords = Nothing
     , _dcsgMarker = Nothing
+    , _dcsgMaxRecords = Nothing
     }
 
 -- | The name of the cache subnet group to return details for.
 dcsgCacheSubnetGroupName :: Lens' DescribeCacheSubnetGroups (Maybe Text)
 dcsgCacheSubnetGroupName = lens _dcsgCacheSubnetGroupName (\ s a -> s{_dcsgCacheSubnetGroupName = a});
 
+-- | An optional marker returned from a prior request. Use this marker for
+-- pagination of results from this action. If this parameter is specified,
+-- the response includes only records beyond the marker, up to the value
+-- specified by /MaxRecords/.
+dcsgMarker :: Lens' DescribeCacheSubnetGroups (Maybe Text)
+dcsgMarker = lens _dcsgMarker (\ s a -> s{_dcsgMarker = a});
+
 -- | The maximum number of records to include in the response. If more
 -- records exist than the specified 'MaxRecords' value, a marker is
 -- included in the response so that the remaining results can be retrieved.
@@ -92,13 +99,6 @@
 dcsgMaxRecords :: Lens' DescribeCacheSubnetGroups (Maybe Int)
 dcsgMaxRecords = lens _dcsgMaxRecords (\ s a -> s{_dcsgMaxRecords = a});
 
--- | An optional marker returned from a prior request. Use this marker for
--- pagination of results from this action. If this parameter is specified,
--- the response includes only records beyond the marker, up to the value
--- specified by /MaxRecords/.
-dcsgMarker :: Lens' DescribeCacheSubnetGroups (Maybe Text)
-dcsgMarker = lens _dcsgMarker (\ s a -> s{_dcsgMarker = a});
-
 instance AWSPager DescribeCacheSubnetGroups where
         page rq rs
           | stop (rs ^. dcsgrsMarker) = Nothing
@@ -132,8 +132,8 @@
                  ("DescribeCacheSubnetGroups" :: ByteString),
                "Version" =: ("2015-02-02" :: ByteString),
                "CacheSubnetGroupName" =: _dcsgCacheSubnetGroupName,
-               "MaxRecords" =: _dcsgMaxRecords,
-               "Marker" =: _dcsgMarker]
+               "Marker" =: _dcsgMarker,
+               "MaxRecords" =: _dcsgMaxRecords]
 
 -- | Represents the output of a /DescribeCacheSubnetGroups/ action.
 --
@@ -141,7 +141,7 @@
 data DescribeCacheSubnetGroupsResponse = DescribeCacheSubnetGroupsResponse'
     { _dcsgrsMarker            :: !(Maybe Text)
     , _dcsgrsCacheSubnetGroups :: !(Maybe [CacheSubnetGroup])
-    , _dcsgrsStatus            :: !Int
+    , _dcsgrsResponseStatus    :: !Int
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'DescribeCacheSubnetGroupsResponse' with the minimum fields required to make a request.
@@ -152,15 +152,15 @@
 --
 -- * 'dcsgrsCacheSubnetGroups'
 --
--- * 'dcsgrsStatus'
+-- * 'dcsgrsResponseStatus'
 describeCacheSubnetGroupsResponse
-    :: Int -- ^ 'dcsgrsStatus'
+    :: Int -- ^ 'dcsgrsResponseStatus'
     -> DescribeCacheSubnetGroupsResponse
-describeCacheSubnetGroupsResponse pStatus_ =
+describeCacheSubnetGroupsResponse pResponseStatus_ =
     DescribeCacheSubnetGroupsResponse'
     { _dcsgrsMarker = Nothing
     , _dcsgrsCacheSubnetGroups = Nothing
-    , _dcsgrsStatus = pStatus_
+    , _dcsgrsResponseStatus = pResponseStatus_
     }
 
 -- | Provides an identifier to allow retrieval of paginated results.
@@ -173,5 +173,5 @@
 dcsgrsCacheSubnetGroups = lens _dcsgrsCacheSubnetGroups (\ s a -> s{_dcsgrsCacheSubnetGroups = a}) . _Default . _Coerce;
 
 -- | The response status code.
-dcsgrsStatus :: Lens' DescribeCacheSubnetGroupsResponse Int
-dcsgrsStatus = lens _dcsgrsStatus (\ s a -> s{_dcsgrsStatus = a});
+dcsgrsResponseStatus :: Lens' DescribeCacheSubnetGroupsResponse Int
+dcsgrsResponseStatus = lens _dcsgrsResponseStatus (\ s a -> s{_dcsgrsResponseStatus = a});
diff --git a/gen/Network/AWS/ElastiCache/DescribeEngineDefaultParameters.hs b/gen/Network/AWS/ElastiCache/DescribeEngineDefaultParameters.hs
--- a/gen/Network/AWS/ElastiCache/DescribeEngineDefaultParameters.hs
+++ b/gen/Network/AWS/ElastiCache/DescribeEngineDefaultParameters.hs
@@ -30,15 +30,15 @@
       describeEngineDefaultParameters
     , DescribeEngineDefaultParameters
     -- * Request Lenses
-    , dedpMaxRecords
     , dedpMarker
+    , dedpMaxRecords
     , dedpCacheParameterGroupFamily
 
     -- * Destructuring the Response
     , describeEngineDefaultParametersResponse
     , DescribeEngineDefaultParametersResponse
     -- * Response Lenses
-    , dedprsStatus
+    , dedprsResponseStatus
     , dedprsEngineDefaults
     ) where
 
@@ -53,8 +53,8 @@
 --
 -- /See:/ 'describeEngineDefaultParameters' smart constructor.
 data DescribeEngineDefaultParameters = DescribeEngineDefaultParameters'
-    { _dedpMaxRecords                :: !(Maybe Int)
-    , _dedpMarker                    :: !(Maybe Text)
+    { _dedpMarker                    :: !(Maybe Text)
+    , _dedpMaxRecords                :: !(Maybe Int)
     , _dedpCacheParameterGroupFamily :: !Text
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
@@ -62,21 +62,28 @@
 --
 -- Use one of the following lenses to modify other fields as desired:
 --
--- * 'dedpMaxRecords'
---
 -- * 'dedpMarker'
 --
+-- * 'dedpMaxRecords'
+--
 -- * 'dedpCacheParameterGroupFamily'
 describeEngineDefaultParameters
     :: Text -- ^ 'dedpCacheParameterGroupFamily'
     -> DescribeEngineDefaultParameters
 describeEngineDefaultParameters pCacheParameterGroupFamily_ =
     DescribeEngineDefaultParameters'
-    { _dedpMaxRecords = Nothing
-    , _dedpMarker = Nothing
+    { _dedpMarker = Nothing
+    , _dedpMaxRecords = Nothing
     , _dedpCacheParameterGroupFamily = pCacheParameterGroupFamily_
     }
 
+-- | An optional marker returned from a prior request. Use this marker for
+-- pagination of results from this action. If this parameter is specified,
+-- the response includes only records beyond the marker, up to the value
+-- specified by /MaxRecords/.
+dedpMarker :: Lens' DescribeEngineDefaultParameters (Maybe Text)
+dedpMarker = lens _dedpMarker (\ s a -> s{_dedpMarker = a});
+
 -- | The maximum number of records to include in the response. If more
 -- records exist than the specified 'MaxRecords' value, a marker is
 -- included in the response so that the remaining results can be retrieved.
@@ -87,13 +94,6 @@
 dedpMaxRecords :: Lens' DescribeEngineDefaultParameters (Maybe Int)
 dedpMaxRecords = lens _dedpMaxRecords (\ s a -> s{_dedpMaxRecords = a});
 
--- | An optional marker returned from a prior request. Use this marker for
--- pagination of results from this action. If this parameter is specified,
--- the response includes only records beyond the marker, up to the value
--- specified by /MaxRecords/.
-dedpMarker :: Lens' DescribeEngineDefaultParameters (Maybe Text)
-dedpMarker = lens _dedpMarker (\ s a -> s{_dedpMarker = a});
-
 -- | The name of the cache parameter group family. Valid values are:
 -- 'memcached1.4' | 'redis2.6' | 'redis2.8'
 dedpCacheParameterGroupFamily :: Lens' DescribeEngineDefaultParameters Text
@@ -138,14 +138,14 @@
               ["Action" =:
                  ("DescribeEngineDefaultParameters" :: ByteString),
                "Version" =: ("2015-02-02" :: ByteString),
-               "MaxRecords" =: _dedpMaxRecords,
                "Marker" =: _dedpMarker,
+               "MaxRecords" =: _dedpMaxRecords,
                "CacheParameterGroupFamily" =:
                  _dedpCacheParameterGroupFamily]
 
 -- | /See:/ 'describeEngineDefaultParametersResponse' smart constructor.
 data DescribeEngineDefaultParametersResponse = DescribeEngineDefaultParametersResponse'
-    { _dedprsStatus         :: !Int
+    { _dedprsResponseStatus :: !Int
     , _dedprsEngineDefaults :: !EngineDefaults
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
@@ -153,22 +153,22 @@
 --
 -- Use one of the following lenses to modify other fields as desired:
 --
--- * 'dedprsStatus'
+-- * 'dedprsResponseStatus'
 --
 -- * 'dedprsEngineDefaults'
 describeEngineDefaultParametersResponse
-    :: Int -- ^ 'dedprsStatus'
+    :: Int -- ^ 'dedprsResponseStatus'
     -> EngineDefaults -- ^ 'dedprsEngineDefaults'
     -> DescribeEngineDefaultParametersResponse
-describeEngineDefaultParametersResponse pStatus_ pEngineDefaults_ =
+describeEngineDefaultParametersResponse pResponseStatus_ pEngineDefaults_ =
     DescribeEngineDefaultParametersResponse'
-    { _dedprsStatus = pStatus_
+    { _dedprsResponseStatus = pResponseStatus_
     , _dedprsEngineDefaults = pEngineDefaults_
     }
 
 -- | The response status code.
-dedprsStatus :: Lens' DescribeEngineDefaultParametersResponse Int
-dedprsStatus = lens _dedprsStatus (\ s a -> s{_dedprsStatus = a});
+dedprsResponseStatus :: Lens' DescribeEngineDefaultParametersResponse Int
+dedprsResponseStatus = lens _dedprsResponseStatus (\ s a -> s{_dedprsResponseStatus = a});
 
 -- | Undocumented member.
 dedprsEngineDefaults :: Lens' DescribeEngineDefaultParametersResponse EngineDefaults
diff --git a/gen/Network/AWS/ElastiCache/DescribeEvents.hs b/gen/Network/AWS/ElastiCache/DescribeEvents.hs
--- a/gen/Network/AWS/ElastiCache/DescribeEvents.hs
+++ b/gen/Network/AWS/ElastiCache/DescribeEvents.hs
@@ -38,9 +38,9 @@
     , deStartTime
     , deSourceType
     , deSourceIdentifier
+    , deMarker
     , deMaxRecords
     , deEndTime
-    , deMarker
     , deDuration
 
     -- * Destructuring the Response
@@ -49,7 +49,7 @@
     -- * Response Lenses
     , dersEvents
     , dersMarker
-    , dersStatus
+    , dersResponseStatus
     ) where
 
 import           Network.AWS.ElastiCache.Types
@@ -66,9 +66,9 @@
     { _deStartTime        :: !(Maybe ISO8601)
     , _deSourceType       :: !(Maybe SourceType)
     , _deSourceIdentifier :: !(Maybe Text)
+    , _deMarker           :: !(Maybe Text)
     , _deMaxRecords       :: !(Maybe Int)
     , _deEndTime          :: !(Maybe ISO8601)
-    , _deMarker           :: !(Maybe Text)
     , _deDuration         :: !(Maybe Int)
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
@@ -82,12 +82,12 @@
 --
 -- * 'deSourceIdentifier'
 --
+-- * 'deMarker'
+--
 -- * 'deMaxRecords'
 --
 -- * 'deEndTime'
 --
--- * 'deMarker'
---
 -- * 'deDuration'
 describeEvents
     :: DescribeEvents
@@ -96,9 +96,9 @@
     { _deStartTime = Nothing
     , _deSourceType = Nothing
     , _deSourceIdentifier = Nothing
+    , _deMarker = Nothing
     , _deMaxRecords = Nothing
     , _deEndTime = Nothing
-    , _deMarker = Nothing
     , _deDuration = Nothing
     }
 
@@ -120,6 +120,13 @@
 deSourceIdentifier :: Lens' DescribeEvents (Maybe Text)
 deSourceIdentifier = lens _deSourceIdentifier (\ s a -> s{_deSourceIdentifier = a});
 
+-- | An optional marker returned from a prior request. Use this marker for
+-- pagination of results from this action. If this parameter is specified,
+-- the response includes only records beyond the marker, up to the value
+-- specified by /MaxRecords/.
+deMarker :: Lens' DescribeEvents (Maybe Text)
+deMarker = lens _deMarker (\ s a -> s{_deMarker = a});
+
 -- | The maximum number of records to include in the response. If more
 -- records exist than the specified 'MaxRecords' value, a marker is
 -- included in the response so that the remaining results can be retrieved.
@@ -135,13 +142,6 @@
 deEndTime :: Lens' DescribeEvents (Maybe UTCTime)
 deEndTime = lens _deEndTime (\ s a -> s{_deEndTime = a}) . mapping _Time;
 
--- | An optional marker returned from a prior request. Use this marker for
--- pagination of results from this action. If this parameter is specified,
--- the response includes only records beyond the marker, up to the value
--- specified by /MaxRecords/.
-deMarker :: Lens' DescribeEvents (Maybe Text)
-deMarker = lens _deMarker (\ s a -> s{_deMarker = a});
-
 -- | The number of minutes\' worth of events to retrieve.
 deDuration :: Lens' DescribeEvents (Maybe Int)
 deDuration = lens _deDuration (\ s a -> s{_deDuration = a});
@@ -179,17 +179,16 @@
                "StartTime" =: _deStartTime,
                "SourceType" =: _deSourceType,
                "SourceIdentifier" =: _deSourceIdentifier,
-               "MaxRecords" =: _deMaxRecords,
-               "EndTime" =: _deEndTime, "Marker" =: _deMarker,
-               "Duration" =: _deDuration]
+               "Marker" =: _deMarker, "MaxRecords" =: _deMaxRecords,
+               "EndTime" =: _deEndTime, "Duration" =: _deDuration]
 
 -- | Represents the output of a /DescribeEvents/ action.
 --
 -- /See:/ 'describeEventsResponse' smart constructor.
 data DescribeEventsResponse = DescribeEventsResponse'
-    { _dersEvents :: !(Maybe [Event])
-    , _dersMarker :: !(Maybe Text)
-    , _dersStatus :: !Int
+    { _dersEvents         :: !(Maybe [Event])
+    , _dersMarker         :: !(Maybe Text)
+    , _dersResponseStatus :: !Int
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'DescribeEventsResponse' with the minimum fields required to make a request.
@@ -200,15 +199,15 @@
 --
 -- * 'dersMarker'
 --
--- * 'dersStatus'
+-- * 'dersResponseStatus'
 describeEventsResponse
-    :: Int -- ^ 'dersStatus'
+    :: Int -- ^ 'dersResponseStatus'
     -> DescribeEventsResponse
-describeEventsResponse pStatus_ =
+describeEventsResponse pResponseStatus_ =
     DescribeEventsResponse'
     { _dersEvents = Nothing
     , _dersMarker = Nothing
-    , _dersStatus = pStatus_
+    , _dersResponseStatus = pResponseStatus_
     }
 
 -- | A list of events. Each element in the list contains detailed information
@@ -221,5 +220,5 @@
 dersMarker = lens _dersMarker (\ s a -> s{_dersMarker = a});
 
 -- | The response status code.
-dersStatus :: Lens' DescribeEventsResponse Int
-dersStatus = lens _dersStatus (\ s a -> s{_dersStatus = a});
+dersResponseStatus :: Lens' DescribeEventsResponse Int
+dersResponseStatus = lens _dersResponseStatus (\ s a -> s{_dersResponseStatus = a});
diff --git a/gen/Network/AWS/ElastiCache/DescribeReplicationGroups.hs b/gen/Network/AWS/ElastiCache/DescribeReplicationGroups.hs
--- a/gen/Network/AWS/ElastiCache/DescribeReplicationGroups.hs
+++ b/gen/Network/AWS/ElastiCache/DescribeReplicationGroups.hs
@@ -32,8 +32,8 @@
       describeReplicationGroups
     , DescribeReplicationGroups
     -- * Request Lenses
-    , drgsMaxRecords
     , drgsMarker
+    , drgsMaxRecords
     , drgsReplicationGroupId
 
     -- * Destructuring the Response
@@ -42,7 +42,7 @@
     -- * Response Lenses
     , drgrsMarker
     , drgrsReplicationGroups
-    , drgrsStatus
+    , drgrsResponseStatus
     ) where
 
 import           Network.AWS.ElastiCache.Types
@@ -56,8 +56,8 @@
 --
 -- /See:/ 'describeReplicationGroups' smart constructor.
 data DescribeReplicationGroups = DescribeReplicationGroups'
-    { _drgsMaxRecords         :: !(Maybe Int)
-    , _drgsMarker             :: !(Maybe Text)
+    { _drgsMarker             :: !(Maybe Text)
+    , _drgsMaxRecords         :: !(Maybe Int)
     , _drgsReplicationGroupId :: !(Maybe Text)
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
@@ -65,20 +65,27 @@
 --
 -- Use one of the following lenses to modify other fields as desired:
 --
--- * 'drgsMaxRecords'
---
 -- * 'drgsMarker'
 --
+-- * 'drgsMaxRecords'
+--
 -- * 'drgsReplicationGroupId'
 describeReplicationGroups
     :: DescribeReplicationGroups
 describeReplicationGroups =
     DescribeReplicationGroups'
-    { _drgsMaxRecords = Nothing
-    , _drgsMarker = Nothing
+    { _drgsMarker = Nothing
+    , _drgsMaxRecords = Nothing
     , _drgsReplicationGroupId = Nothing
     }
 
+-- | An optional marker returned from a prior request. Use this marker for
+-- pagination of results from this action. If this parameter is specified,
+-- the response includes only records beyond the marker, up to the value
+-- specified by /MaxRecords/.
+drgsMarker :: Lens' DescribeReplicationGroups (Maybe Text)
+drgsMarker = lens _drgsMarker (\ s a -> s{_drgsMarker = a});
+
 -- | The maximum number of records to include in the response. If more
 -- records exist than the specified 'MaxRecords' value, a marker is
 -- included in the response so that the remaining results can be retrieved.
@@ -89,13 +96,6 @@
 drgsMaxRecords :: Lens' DescribeReplicationGroups (Maybe Int)
 drgsMaxRecords = lens _drgsMaxRecords (\ s a -> s{_drgsMaxRecords = a});
 
--- | An optional marker returned from a prior request. Use this marker for
--- pagination of results from this action. If this parameter is specified,
--- the response includes only records beyond the marker, up to the value
--- specified by /MaxRecords/.
-drgsMarker :: Lens' DescribeReplicationGroups (Maybe Text)
-drgsMarker = lens _drgsMarker (\ s a -> s{_drgsMarker = a});
-
 -- | The identifier for the replication group to be described. This parameter
 -- is not case sensitive.
 --
@@ -136,8 +136,8 @@
               ["Action" =:
                  ("DescribeReplicationGroups" :: ByteString),
                "Version" =: ("2015-02-02" :: ByteString),
-               "MaxRecords" =: _drgsMaxRecords,
                "Marker" =: _drgsMarker,
+               "MaxRecords" =: _drgsMaxRecords,
                "ReplicationGroupId" =: _drgsReplicationGroupId]
 
 -- | Represents the output of a /DescribeReplicationGroups/ action.
@@ -146,7 +146,7 @@
 data DescribeReplicationGroupsResponse = DescribeReplicationGroupsResponse'
     { _drgrsMarker            :: !(Maybe Text)
     , _drgrsReplicationGroups :: !(Maybe [ReplicationGroup])
-    , _drgrsStatus            :: !Int
+    , _drgrsResponseStatus    :: !Int
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'DescribeReplicationGroupsResponse' with the minimum fields required to make a request.
@@ -157,15 +157,15 @@
 --
 -- * 'drgrsReplicationGroups'
 --
--- * 'drgrsStatus'
+-- * 'drgrsResponseStatus'
 describeReplicationGroupsResponse
-    :: Int -- ^ 'drgrsStatus'
+    :: Int -- ^ 'drgrsResponseStatus'
     -> DescribeReplicationGroupsResponse
-describeReplicationGroupsResponse pStatus_ =
+describeReplicationGroupsResponse pResponseStatus_ =
     DescribeReplicationGroupsResponse'
     { _drgrsMarker = Nothing
     , _drgrsReplicationGroups = Nothing
-    , _drgrsStatus = pStatus_
+    , _drgrsResponseStatus = pResponseStatus_
     }
 
 -- | Provides an identifier to allow retrieval of paginated results.
@@ -178,5 +178,5 @@
 drgrsReplicationGroups = lens _drgrsReplicationGroups (\ s a -> s{_drgrsReplicationGroups = a}) . _Default . _Coerce;
 
 -- | The response status code.
-drgrsStatus :: Lens' DescribeReplicationGroupsResponse Int
-drgrsStatus = lens _drgrsStatus (\ s a -> s{_drgrsStatus = a});
+drgrsResponseStatus :: Lens' DescribeReplicationGroupsResponse Int
+drgrsResponseStatus = lens _drgrsResponseStatus (\ s a -> s{_drgrsResponseStatus = a});
diff --git a/gen/Network/AWS/ElastiCache/DescribeReservedCacheNodes.hs b/gen/Network/AWS/ElastiCache/DescribeReservedCacheNodes.hs
--- a/gen/Network/AWS/ElastiCache/DescribeReservedCacheNodes.hs
+++ b/gen/Network/AWS/ElastiCache/DescribeReservedCacheNodes.hs
@@ -33,8 +33,8 @@
     -- * Request Lenses
     , drcnCacheNodeType
     , drcnProductDescription
-    , drcnMaxRecords
     , drcnMarker
+    , drcnMaxRecords
     , drcnReservedCacheNodeId
     , drcnOfferingType
     , drcnDuration
@@ -46,7 +46,7 @@
     -- * Response Lenses
     , drcnrsMarker
     , drcnrsReservedCacheNodes
-    , drcnrsStatus
+    , drcnrsResponseStatus
     ) where
 
 import           Network.AWS.ElastiCache.Types
@@ -62,8 +62,8 @@
 data DescribeReservedCacheNodes = DescribeReservedCacheNodes'
     { _drcnCacheNodeType                :: !(Maybe Text)
     , _drcnProductDescription           :: !(Maybe Text)
-    , _drcnMaxRecords                   :: !(Maybe Int)
     , _drcnMarker                       :: !(Maybe Text)
+    , _drcnMaxRecords                   :: !(Maybe Int)
     , _drcnReservedCacheNodeId          :: !(Maybe Text)
     , _drcnOfferingType                 :: !(Maybe Text)
     , _drcnDuration                     :: !(Maybe Text)
@@ -78,10 +78,10 @@
 --
 -- * 'drcnProductDescription'
 --
--- * 'drcnMaxRecords'
---
 -- * 'drcnMarker'
 --
+-- * 'drcnMaxRecords'
+--
 -- * 'drcnReservedCacheNodeId'
 --
 -- * 'drcnOfferingType'
@@ -95,8 +95,8 @@
     DescribeReservedCacheNodes'
     { _drcnCacheNodeType = Nothing
     , _drcnProductDescription = Nothing
-    , _drcnMaxRecords = Nothing
     , _drcnMarker = Nothing
+    , _drcnMaxRecords = Nothing
     , _drcnReservedCacheNodeId = Nothing
     , _drcnOfferingType = Nothing
     , _drcnDuration = Nothing
@@ -143,6 +143,13 @@
 drcnProductDescription :: Lens' DescribeReservedCacheNodes (Maybe Text)
 drcnProductDescription = lens _drcnProductDescription (\ s a -> s{_drcnProductDescription = a});
 
+-- | An optional marker returned from a prior request. Use this marker for
+-- pagination of results from this action. If this parameter is specified,
+-- the response includes only records beyond the marker, up to the value
+-- specified by /MaxRecords/.
+drcnMarker :: Lens' DescribeReservedCacheNodes (Maybe Text)
+drcnMarker = lens _drcnMarker (\ s a -> s{_drcnMarker = a});
+
 -- | The maximum number of records to include in the response. If more
 -- records exist than the specified 'MaxRecords' value, a marker is
 -- included in the response so that the remaining results can be retrieved.
@@ -153,13 +160,6 @@
 drcnMaxRecords :: Lens' DescribeReservedCacheNodes (Maybe Int)
 drcnMaxRecords = lens _drcnMaxRecords (\ s a -> s{_drcnMaxRecords = a});
 
--- | An optional marker returned from a prior request. Use this marker for
--- pagination of results from this action. If this parameter is specified,
--- the response includes only records beyond the marker, up to the value
--- specified by /MaxRecords/.
-drcnMarker :: Lens' DescribeReservedCacheNodes (Maybe Text)
-drcnMarker = lens _drcnMarker (\ s a -> s{_drcnMarker = a});
-
 -- | The reserved cache node identifier filter value. Use this parameter to
 -- show only the reservation that matches the specified reservation ID.
 drcnReservedCacheNodeId :: Lens' DescribeReservedCacheNodes (Maybe Text)
@@ -220,8 +220,8 @@
                "Version" =: ("2015-02-02" :: ByteString),
                "CacheNodeType" =: _drcnCacheNodeType,
                "ProductDescription" =: _drcnProductDescription,
-               "MaxRecords" =: _drcnMaxRecords,
                "Marker" =: _drcnMarker,
+               "MaxRecords" =: _drcnMaxRecords,
                "ReservedCacheNodeId" =: _drcnReservedCacheNodeId,
                "OfferingType" =: _drcnOfferingType,
                "Duration" =: _drcnDuration,
@@ -234,7 +234,7 @@
 data DescribeReservedCacheNodesResponse = DescribeReservedCacheNodesResponse'
     { _drcnrsMarker             :: !(Maybe Text)
     , _drcnrsReservedCacheNodes :: !(Maybe [ReservedCacheNode])
-    , _drcnrsStatus             :: !Int
+    , _drcnrsResponseStatus     :: !Int
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'DescribeReservedCacheNodesResponse' with the minimum fields required to make a request.
@@ -245,15 +245,15 @@
 --
 -- * 'drcnrsReservedCacheNodes'
 --
--- * 'drcnrsStatus'
+-- * 'drcnrsResponseStatus'
 describeReservedCacheNodesResponse
-    :: Int -- ^ 'drcnrsStatus'
+    :: Int -- ^ 'drcnrsResponseStatus'
     -> DescribeReservedCacheNodesResponse
-describeReservedCacheNodesResponse pStatus_ =
+describeReservedCacheNodesResponse pResponseStatus_ =
     DescribeReservedCacheNodesResponse'
     { _drcnrsMarker = Nothing
     , _drcnrsReservedCacheNodes = Nothing
-    , _drcnrsStatus = pStatus_
+    , _drcnrsResponseStatus = pResponseStatus_
     }
 
 -- | Provides an identifier to allow retrieval of paginated results.
@@ -266,5 +266,5 @@
 drcnrsReservedCacheNodes = lens _drcnrsReservedCacheNodes (\ s a -> s{_drcnrsReservedCacheNodes = a}) . _Default . _Coerce;
 
 -- | The response status code.
-drcnrsStatus :: Lens' DescribeReservedCacheNodesResponse Int
-drcnrsStatus = lens _drcnrsStatus (\ s a -> s{_drcnrsStatus = a});
+drcnrsResponseStatus :: Lens' DescribeReservedCacheNodesResponse Int
+drcnrsResponseStatus = lens _drcnrsResponseStatus (\ s a -> s{_drcnrsResponseStatus = a});
diff --git a/gen/Network/AWS/ElastiCache/DescribeReservedCacheNodesOfferings.hs b/gen/Network/AWS/ElastiCache/DescribeReservedCacheNodesOfferings.hs
--- a/gen/Network/AWS/ElastiCache/DescribeReservedCacheNodesOfferings.hs
+++ b/gen/Network/AWS/ElastiCache/DescribeReservedCacheNodesOfferings.hs
@@ -32,8 +32,8 @@
     -- * Request Lenses
     , drcnoCacheNodeType
     , drcnoProductDescription
-    , drcnoMaxRecords
     , drcnoMarker
+    , drcnoMaxRecords
     , drcnoOfferingType
     , drcnoDuration
     , drcnoReservedCacheNodesOfferingId
@@ -44,7 +44,7 @@
     -- * Response Lenses
     , drcnorsMarker
     , drcnorsReservedCacheNodesOfferings
-    , drcnorsStatus
+    , drcnorsResponseStatus
     ) where
 
 import           Network.AWS.ElastiCache.Types
@@ -60,8 +60,8 @@
 data DescribeReservedCacheNodesOfferings = DescribeReservedCacheNodesOfferings'
     { _drcnoCacheNodeType                :: !(Maybe Text)
     , _drcnoProductDescription           :: !(Maybe Text)
-    , _drcnoMaxRecords                   :: !(Maybe Int)
     , _drcnoMarker                       :: !(Maybe Text)
+    , _drcnoMaxRecords                   :: !(Maybe Int)
     , _drcnoOfferingType                 :: !(Maybe Text)
     , _drcnoDuration                     :: !(Maybe Text)
     , _drcnoReservedCacheNodesOfferingId :: !(Maybe Text)
@@ -75,10 +75,10 @@
 --
 -- * 'drcnoProductDescription'
 --
--- * 'drcnoMaxRecords'
---
 -- * 'drcnoMarker'
 --
+-- * 'drcnoMaxRecords'
+--
 -- * 'drcnoOfferingType'
 --
 -- * 'drcnoDuration'
@@ -90,8 +90,8 @@
     DescribeReservedCacheNodesOfferings'
     { _drcnoCacheNodeType = Nothing
     , _drcnoProductDescription = Nothing
-    , _drcnoMaxRecords = Nothing
     , _drcnoMarker = Nothing
+    , _drcnoMaxRecords = Nothing
     , _drcnoOfferingType = Nothing
     , _drcnoDuration = Nothing
     , _drcnoReservedCacheNodesOfferingId = Nothing
@@ -137,6 +137,13 @@
 drcnoProductDescription :: Lens' DescribeReservedCacheNodesOfferings (Maybe Text)
 drcnoProductDescription = lens _drcnoProductDescription (\ s a -> s{_drcnoProductDescription = a});
 
+-- | An optional marker returned from a prior request. Use this marker for
+-- pagination of results from this action. If this parameter is specified,
+-- the response includes only records beyond the marker, up to the value
+-- specified by /MaxRecords/.
+drcnoMarker :: Lens' DescribeReservedCacheNodesOfferings (Maybe Text)
+drcnoMarker = lens _drcnoMarker (\ s a -> s{_drcnoMarker = a});
+
 -- | The maximum number of records to include in the response. If more
 -- records exist than the specified 'MaxRecords' value, a marker is
 -- included in the response so that the remaining results can be retrieved.
@@ -147,13 +154,6 @@
 drcnoMaxRecords :: Lens' DescribeReservedCacheNodesOfferings (Maybe Int)
 drcnoMaxRecords = lens _drcnoMaxRecords (\ s a -> s{_drcnoMaxRecords = a});
 
--- | An optional marker returned from a prior request. Use this marker for
--- pagination of results from this action. If this parameter is specified,
--- the response includes only records beyond the marker, up to the value
--- specified by /MaxRecords/.
-drcnoMarker :: Lens' DescribeReservedCacheNodesOfferings (Maybe Text)
-drcnoMarker = lens _drcnoMarker (\ s a -> s{_drcnoMarker = a});
-
 -- | The offering type filter value. Use this parameter to show only the
 -- available offerings matching the specified offering type.
 --
@@ -219,8 +219,8 @@
                "Version" =: ("2015-02-02" :: ByteString),
                "CacheNodeType" =: _drcnoCacheNodeType,
                "ProductDescription" =: _drcnoProductDescription,
-               "MaxRecords" =: _drcnoMaxRecords,
                "Marker" =: _drcnoMarker,
+               "MaxRecords" =: _drcnoMaxRecords,
                "OfferingType" =: _drcnoOfferingType,
                "Duration" =: _drcnoDuration,
                "ReservedCacheNodesOfferingId" =:
@@ -232,7 +232,7 @@
 data DescribeReservedCacheNodesOfferingsResponse = DescribeReservedCacheNodesOfferingsResponse'
     { _drcnorsMarker                      :: !(Maybe Text)
     , _drcnorsReservedCacheNodesOfferings :: !(Maybe [ReservedCacheNodesOffering])
-    , _drcnorsStatus                      :: !Int
+    , _drcnorsResponseStatus              :: !Int
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'DescribeReservedCacheNodesOfferingsResponse' with the minimum fields required to make a request.
@@ -243,15 +243,15 @@
 --
 -- * 'drcnorsReservedCacheNodesOfferings'
 --
--- * 'drcnorsStatus'
+-- * 'drcnorsResponseStatus'
 describeReservedCacheNodesOfferingsResponse
-    :: Int -- ^ 'drcnorsStatus'
+    :: Int -- ^ 'drcnorsResponseStatus'
     -> DescribeReservedCacheNodesOfferingsResponse
-describeReservedCacheNodesOfferingsResponse pStatus_ =
+describeReservedCacheNodesOfferingsResponse pResponseStatus_ =
     DescribeReservedCacheNodesOfferingsResponse'
     { _drcnorsMarker = Nothing
     , _drcnorsReservedCacheNodesOfferings = Nothing
-    , _drcnorsStatus = pStatus_
+    , _drcnorsResponseStatus = pResponseStatus_
     }
 
 -- | Provides an identifier to allow retrieval of paginated results.
@@ -264,5 +264,5 @@
 drcnorsReservedCacheNodesOfferings = lens _drcnorsReservedCacheNodesOfferings (\ s a -> s{_drcnorsReservedCacheNodesOfferings = a}) . _Default . _Coerce;
 
 -- | The response status code.
-drcnorsStatus :: Lens' DescribeReservedCacheNodesOfferingsResponse Int
-drcnorsStatus = lens _drcnorsStatus (\ s a -> s{_drcnorsStatus = a});
+drcnorsResponseStatus :: Lens' DescribeReservedCacheNodesOfferingsResponse Int
+drcnorsResponseStatus = lens _drcnorsResponseStatus (\ s a -> s{_drcnorsResponseStatus = a});
diff --git a/gen/Network/AWS/ElastiCache/DescribeSnapshots.hs b/gen/Network/AWS/ElastiCache/DescribeSnapshots.hs
--- a/gen/Network/AWS/ElastiCache/DescribeSnapshots.hs
+++ b/gen/Network/AWS/ElastiCache/DescribeSnapshots.hs
@@ -33,8 +33,8 @@
     , DescribeSnapshots
     -- * Request Lenses
     , dsCacheClusterId
-    , dsMaxRecords
     , dsMarker
+    , dsMaxRecords
     , dsSnapshotName
     , dsSnapshotSource
 
@@ -44,7 +44,7 @@
     -- * Response Lenses
     , dssrsSnapshots
     , dssrsMarker
-    , dssrsStatus
+    , dssrsResponseStatus
     ) where
 
 import           Network.AWS.ElastiCache.Types
@@ -59,8 +59,8 @@
 -- /See:/ 'describeSnapshots' smart constructor.
 data DescribeSnapshots = DescribeSnapshots'
     { _dsCacheClusterId :: !(Maybe Text)
-    , _dsMaxRecords     :: !(Maybe Int)
     , _dsMarker         :: !(Maybe Text)
+    , _dsMaxRecords     :: !(Maybe Int)
     , _dsSnapshotName   :: !(Maybe Text)
     , _dsSnapshotSource :: !(Maybe Text)
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
@@ -71,10 +71,10 @@
 --
 -- * 'dsCacheClusterId'
 --
--- * 'dsMaxRecords'
---
 -- * 'dsMarker'
 --
+-- * 'dsMaxRecords'
+--
 -- * 'dsSnapshotName'
 --
 -- * 'dsSnapshotSource'
@@ -83,8 +83,8 @@
 describeSnapshots =
     DescribeSnapshots'
     { _dsCacheClusterId = Nothing
-    , _dsMaxRecords = Nothing
     , _dsMarker = Nothing
+    , _dsMaxRecords = Nothing
     , _dsSnapshotName = Nothing
     , _dsSnapshotSource = Nothing
     }
@@ -94,6 +94,13 @@
 dsCacheClusterId :: Lens' DescribeSnapshots (Maybe Text)
 dsCacheClusterId = lens _dsCacheClusterId (\ s a -> s{_dsCacheClusterId = a});
 
+-- | An optional marker returned from a prior request. Use this marker for
+-- pagination of results from this action. If this parameter is specified,
+-- the response includes only records beyond the marker, up to the value
+-- specified by /MaxRecords/.
+dsMarker :: Lens' DescribeSnapshots (Maybe Text)
+dsMarker = lens _dsMarker (\ s a -> s{_dsMarker = a});
+
 -- | The maximum number of records to include in the response. If more
 -- records exist than the specified 'MaxRecords' value, a marker is
 -- included in the response so that the remaining results can be retrieved.
@@ -104,13 +111,6 @@
 dsMaxRecords :: Lens' DescribeSnapshots (Maybe Int)
 dsMaxRecords = lens _dsMaxRecords (\ s a -> s{_dsMaxRecords = a});
 
--- | An optional marker returned from a prior request. Use this marker for
--- pagination of results from this action. If this parameter is specified,
--- the response includes only records beyond the marker, up to the value
--- specified by /MaxRecords/.
-dsMarker :: Lens' DescribeSnapshots (Maybe Text)
-dsMarker = lens _dsMarker (\ s a -> s{_dsMarker = a});
-
 -- | A user-supplied name of the snapshot. If this parameter is specified,
 -- only this snapshot will be described.
 dsSnapshotName :: Lens' DescribeSnapshots (Maybe Text)
@@ -154,7 +154,7 @@
               ["Action" =: ("DescribeSnapshots" :: ByteString),
                "Version" =: ("2015-02-02" :: ByteString),
                "CacheClusterId" =: _dsCacheClusterId,
-               "MaxRecords" =: _dsMaxRecords, "Marker" =: _dsMarker,
+               "Marker" =: _dsMarker, "MaxRecords" =: _dsMaxRecords,
                "SnapshotName" =: _dsSnapshotName,
                "SnapshotSource" =: _dsSnapshotSource]
 
@@ -162,9 +162,9 @@
 --
 -- /See:/ 'describeSnapshotsResponse' smart constructor.
 data DescribeSnapshotsResponse = DescribeSnapshotsResponse'
-    { _dssrsSnapshots :: !(Maybe [Snapshot])
-    , _dssrsMarker    :: !(Maybe Text)
-    , _dssrsStatus    :: !Int
+    { _dssrsSnapshots      :: !(Maybe [Snapshot])
+    , _dssrsMarker         :: !(Maybe Text)
+    , _dssrsResponseStatus :: !Int
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'DescribeSnapshotsResponse' with the minimum fields required to make a request.
@@ -175,15 +175,15 @@
 --
 -- * 'dssrsMarker'
 --
--- * 'dssrsStatus'
+-- * 'dssrsResponseStatus'
 describeSnapshotsResponse
-    :: Int -- ^ 'dssrsStatus'
+    :: Int -- ^ 'dssrsResponseStatus'
     -> DescribeSnapshotsResponse
-describeSnapshotsResponse pStatus_ =
+describeSnapshotsResponse pResponseStatus_ =
     DescribeSnapshotsResponse'
     { _dssrsSnapshots = Nothing
     , _dssrsMarker = Nothing
-    , _dssrsStatus = pStatus_
+    , _dssrsResponseStatus = pResponseStatus_
     }
 
 -- | A list of snapshots. Each item in the list contains detailed information
@@ -199,5 +199,5 @@
 dssrsMarker = lens _dssrsMarker (\ s a -> s{_dssrsMarker = a});
 
 -- | The response status code.
-dssrsStatus :: Lens' DescribeSnapshotsResponse Int
-dssrsStatus = lens _dssrsStatus (\ s a -> s{_dssrsStatus = a});
+dssrsResponseStatus :: Lens' DescribeSnapshotsResponse Int
+dssrsResponseStatus = lens _dssrsResponseStatus (\ s a -> s{_dssrsResponseStatus = a});
diff --git a/gen/Network/AWS/ElastiCache/ModifyCacheCluster.hs b/gen/Network/AWS/ElastiCache/ModifyCacheCluster.hs
--- a/gen/Network/AWS/ElastiCache/ModifyCacheCluster.hs
+++ b/gen/Network/AWS/ElastiCache/ModifyCacheCluster.hs
@@ -34,13 +34,13 @@
     , mccSecurityGroupIds
     , mccAutoMinorVersionUpgrade
     , mccCacheParameterGroupName
-    , mccNewAvailabilityZones
     , mccSnapshotWindow
+    , mccNewAvailabilityZones
     , mccPreferredMaintenanceWindow
     , mccCacheNodeIdsToRemove
     , mccSnapshotRetentionLimit
-    , mccAZMode
     , mccNotificationTopicStatus
+    , mccAZMode
     , mccApplyImmediately
     , mccNotificationTopicARN
     , mccNumCacheNodes
@@ -52,7 +52,7 @@
     , ModifyCacheClusterResponse
     -- * Response Lenses
     , mccrsCacheCluster
-    , mccrsStatus
+    , mccrsResponseStatus
     ) where
 
 import           Network.AWS.ElastiCache.Types
@@ -69,13 +69,13 @@
     , _mccSecurityGroupIds           :: !(Maybe [Text])
     , _mccAutoMinorVersionUpgrade    :: !(Maybe Bool)
     , _mccCacheParameterGroupName    :: !(Maybe Text)
-    , _mccNewAvailabilityZones       :: !(Maybe [Text])
     , _mccSnapshotWindow             :: !(Maybe Text)
+    , _mccNewAvailabilityZones       :: !(Maybe [Text])
     , _mccPreferredMaintenanceWindow :: !(Maybe Text)
     , _mccCacheNodeIdsToRemove       :: !(Maybe [Text])
     , _mccSnapshotRetentionLimit     :: !(Maybe Int)
-    , _mccAZMode                     :: !(Maybe AZMode)
     , _mccNotificationTopicStatus    :: !(Maybe Text)
+    , _mccAZMode                     :: !(Maybe AZMode)
     , _mccApplyImmediately           :: !(Maybe Bool)
     , _mccNotificationTopicARN       :: !(Maybe Text)
     , _mccNumCacheNodes              :: !(Maybe Int)
@@ -95,20 +95,20 @@
 --
 -- * 'mccCacheParameterGroupName'
 --
--- * 'mccNewAvailabilityZones'
---
 -- * 'mccSnapshotWindow'
 --
+-- * 'mccNewAvailabilityZones'
+--
 -- * 'mccPreferredMaintenanceWindow'
 --
 -- * 'mccCacheNodeIdsToRemove'
 --
 -- * 'mccSnapshotRetentionLimit'
 --
--- * 'mccAZMode'
---
 -- * 'mccNotificationTopicStatus'
 --
+-- * 'mccAZMode'
+--
 -- * 'mccApplyImmediately'
 --
 -- * 'mccNotificationTopicARN'
@@ -127,13 +127,13 @@
     , _mccSecurityGroupIds = Nothing
     , _mccAutoMinorVersionUpgrade = Nothing
     , _mccCacheParameterGroupName = Nothing
-    , _mccNewAvailabilityZones = Nothing
     , _mccSnapshotWindow = Nothing
+    , _mccNewAvailabilityZones = Nothing
     , _mccPreferredMaintenanceWindow = Nothing
     , _mccCacheNodeIdsToRemove = Nothing
     , _mccSnapshotRetentionLimit = Nothing
-    , _mccAZMode = Nothing
     , _mccNotificationTopicStatus = Nothing
+    , _mccAZMode = Nothing
     , _mccApplyImmediately = Nothing
     , _mccNotificationTopicARN = Nothing
     , _mccNumCacheNodes = Nothing
@@ -163,6 +163,11 @@
 mccCacheParameterGroupName :: Lens' ModifyCacheCluster (Maybe Text)
 mccCacheParameterGroupName = lens _mccCacheParameterGroupName (\ s a -> s{_mccCacheParameterGroupName = a});
 
+-- | The daily time range (in UTC) during which ElastiCache will begin taking
+-- a daily snapshot of your cache cluster.
+mccSnapshotWindow :: Lens' ModifyCacheCluster (Maybe Text)
+mccSnapshotWindow = lens _mccSnapshotWindow (\ s a -> s{_mccSnapshotWindow = a});
+
 -- | The list of Availability Zones where the new Memcached cache nodes will
 -- be created.
 --
@@ -217,11 +222,6 @@
 mccNewAvailabilityZones :: Lens' ModifyCacheCluster [Text]
 mccNewAvailabilityZones = lens _mccNewAvailabilityZones (\ s a -> s{_mccNewAvailabilityZones = a}) . _Default . _Coerce;
 
--- | The daily time range (in UTC) during which ElastiCache will begin taking
--- a daily snapshot of your cache cluster.
-mccSnapshotWindow :: Lens' ModifyCacheCluster (Maybe Text)
-mccSnapshotWindow = lens _mccSnapshotWindow (\ s a -> s{_mccSnapshotWindow = a});
-
 -- | Specifies the weekly time range during which maintenance on the cache
 -- cluster is performed. It is specified as a range in the format
 -- ddd:hh24:mi-ddd:hh24:mi (24H Clock UTC). The minimum maintenance window
@@ -264,6 +264,13 @@
 mccSnapshotRetentionLimit :: Lens' ModifyCacheCluster (Maybe Int)
 mccSnapshotRetentionLimit = lens _mccSnapshotRetentionLimit (\ s a -> s{_mccSnapshotRetentionLimit = a});
 
+-- | The status of the Amazon SNS notification topic. Notifications are sent
+-- only if the status is /active/.
+--
+-- Valid values: 'active' | 'inactive'
+mccNotificationTopicStatus :: Lens' ModifyCacheCluster (Maybe Text)
+mccNotificationTopicStatus = lens _mccNotificationTopicStatus (\ s a -> s{_mccNotificationTopicStatus = a});
+
 -- | Specifies whether the new nodes in this Memcached cache cluster are all
 -- created in a single Availability Zone or created across multiple
 -- Availability Zones.
@@ -285,13 +292,6 @@
 mccAZMode :: Lens' ModifyCacheCluster (Maybe AZMode)
 mccAZMode = lens _mccAZMode (\ s a -> s{_mccAZMode = a});
 
--- | The status of the Amazon SNS notification topic. Notifications are sent
--- only if the status is /active/.
---
--- Valid values: 'active' | 'inactive'
-mccNotificationTopicStatus :: Lens' ModifyCacheCluster (Maybe Text)
-mccNotificationTopicStatus = lens _mccNotificationTopicStatus (\ s a -> s{_mccNotificationTopicStatus = a});
-
 -- | If 'true', this parameter causes the modifications in this request and
 -- any pending modifications to be applied, asynchronously and as soon as
 -- possible, regardless of the /PreferredMaintenanceWindow/ setting for the
@@ -399,11 +399,11 @@
                  _mccAutoMinorVersionUpgrade,
                "CacheParameterGroupName" =:
                  _mccCacheParameterGroupName,
+               "SnapshotWindow" =: _mccSnapshotWindow,
                "NewAvailabilityZones" =:
                  toQuery
                    (toQueryList "PreferredAvailabilityZone" <$>
                       _mccNewAvailabilityZones),
-               "SnapshotWindow" =: _mccSnapshotWindow,
                "PreferredMaintenanceWindow" =:
                  _mccPreferredMaintenanceWindow,
                "CacheNodeIdsToRemove" =:
@@ -412,9 +412,9 @@
                       _mccCacheNodeIdsToRemove),
                "SnapshotRetentionLimit" =:
                  _mccSnapshotRetentionLimit,
-               "AZMode" =: _mccAZMode,
                "NotificationTopicStatus" =:
                  _mccNotificationTopicStatus,
+               "AZMode" =: _mccAZMode,
                "ApplyImmediately" =: _mccApplyImmediately,
                "NotificationTopicArn" =: _mccNotificationTopicARN,
                "NumCacheNodes" =: _mccNumCacheNodes,
@@ -426,8 +426,8 @@
 
 -- | /See:/ 'modifyCacheClusterResponse' smart constructor.
 data ModifyCacheClusterResponse = ModifyCacheClusterResponse'
-    { _mccrsCacheCluster :: !(Maybe CacheCluster)
-    , _mccrsStatus       :: !Int
+    { _mccrsCacheCluster   :: !(Maybe CacheCluster)
+    , _mccrsResponseStatus :: !Int
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'ModifyCacheClusterResponse' with the minimum fields required to make a request.
@@ -436,14 +436,14 @@
 --
 -- * 'mccrsCacheCluster'
 --
--- * 'mccrsStatus'
+-- * 'mccrsResponseStatus'
 modifyCacheClusterResponse
-    :: Int -- ^ 'mccrsStatus'
+    :: Int -- ^ 'mccrsResponseStatus'
     -> ModifyCacheClusterResponse
-modifyCacheClusterResponse pStatus_ =
+modifyCacheClusterResponse pResponseStatus_ =
     ModifyCacheClusterResponse'
     { _mccrsCacheCluster = Nothing
-    , _mccrsStatus = pStatus_
+    , _mccrsResponseStatus = pResponseStatus_
     }
 
 -- | Undocumented member.
@@ -451,5 +451,5 @@
 mccrsCacheCluster = lens _mccrsCacheCluster (\ s a -> s{_mccrsCacheCluster = a});
 
 -- | The response status code.
-mccrsStatus :: Lens' ModifyCacheClusterResponse Int
-mccrsStatus = lens _mccrsStatus (\ s a -> s{_mccrsStatus = a});
+mccrsResponseStatus :: Lens' ModifyCacheClusterResponse Int
+mccrsResponseStatus = lens _mccrsResponseStatus (\ s a -> s{_mccrsResponseStatus = a});
diff --git a/gen/Network/AWS/ElastiCache/ModifyCacheSubnetGroup.hs b/gen/Network/AWS/ElastiCache/ModifyCacheSubnetGroup.hs
--- a/gen/Network/AWS/ElastiCache/ModifyCacheSubnetGroup.hs
+++ b/gen/Network/AWS/ElastiCache/ModifyCacheSubnetGroup.hs
@@ -37,7 +37,7 @@
     , ModifyCacheSubnetGroupResponse
     -- * Response Lenses
     , mcsgrsCacheSubnetGroup
-    , mcsgrsStatus
+    , mcsgrsResponseStatus
     ) where
 
 import           Network.AWS.ElastiCache.Types
@@ -124,7 +124,7 @@
 -- | /See:/ 'modifyCacheSubnetGroupResponse' smart constructor.
 data ModifyCacheSubnetGroupResponse = ModifyCacheSubnetGroupResponse'
     { _mcsgrsCacheSubnetGroup :: !(Maybe CacheSubnetGroup)
-    , _mcsgrsStatus           :: !Int
+    , _mcsgrsResponseStatus   :: !Int
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'ModifyCacheSubnetGroupResponse' with the minimum fields required to make a request.
@@ -133,14 +133,14 @@
 --
 -- * 'mcsgrsCacheSubnetGroup'
 --
--- * 'mcsgrsStatus'
+-- * 'mcsgrsResponseStatus'
 modifyCacheSubnetGroupResponse
-    :: Int -- ^ 'mcsgrsStatus'
+    :: Int -- ^ 'mcsgrsResponseStatus'
     -> ModifyCacheSubnetGroupResponse
-modifyCacheSubnetGroupResponse pStatus_ =
+modifyCacheSubnetGroupResponse pResponseStatus_ =
     ModifyCacheSubnetGroupResponse'
     { _mcsgrsCacheSubnetGroup = Nothing
-    , _mcsgrsStatus = pStatus_
+    , _mcsgrsResponseStatus = pResponseStatus_
     }
 
 -- | Undocumented member.
@@ -148,5 +148,5 @@
 mcsgrsCacheSubnetGroup = lens _mcsgrsCacheSubnetGroup (\ s a -> s{_mcsgrsCacheSubnetGroup = a});
 
 -- | The response status code.
-mcsgrsStatus :: Lens' ModifyCacheSubnetGroupResponse Int
-mcsgrsStatus = lens _mcsgrsStatus (\ s a -> s{_mcsgrsStatus = a});
+mcsgrsResponseStatus :: Lens' ModifyCacheSubnetGroupResponse Int
+mcsgrsResponseStatus = lens _mcsgrsResponseStatus (\ s a -> s{_mcsgrsResponseStatus = a});
diff --git a/gen/Network/AWS/ElastiCache/ModifyReplicationGroup.hs b/gen/Network/AWS/ElastiCache/ModifyReplicationGroup.hs
--- a/gen/Network/AWS/ElastiCache/ModifyReplicationGroup.hs
+++ b/gen/Network/AWS/ElastiCache/ModifyReplicationGroup.hs
@@ -33,8 +33,8 @@
     , mrgSnapshottingClusterId
     , mrgSecurityGroupIds
     , mrgAutoMinorVersionUpgrade
-    , mrgReplicationGroupDescription
     , mrgCacheParameterGroupName
+    , mrgReplicationGroupDescription
     , mrgSnapshotWindow
     , mrgPrimaryClusterId
     , mrgPreferredMaintenanceWindow
@@ -50,7 +50,7 @@
     , ModifyReplicationGroupResponse
     -- * Response Lenses
     , mrgrsReplicationGroup
-    , mrgrsStatus
+    , mrgrsResponseStatus
     ) where
 
 import           Network.AWS.ElastiCache.Types
@@ -68,8 +68,8 @@
     , _mrgSnapshottingClusterId       :: !(Maybe Text)
     , _mrgSecurityGroupIds            :: !(Maybe [Text])
     , _mrgAutoMinorVersionUpgrade     :: !(Maybe Bool)
-    , _mrgReplicationGroupDescription :: !(Maybe Text)
     , _mrgCacheParameterGroupName     :: !(Maybe Text)
+    , _mrgReplicationGroupDescription :: !(Maybe Text)
     , _mrgSnapshotWindow              :: !(Maybe Text)
     , _mrgPrimaryClusterId            :: !(Maybe Text)
     , _mrgPreferredMaintenanceWindow  :: !(Maybe Text)
@@ -95,10 +95,10 @@
 --
 -- * 'mrgAutoMinorVersionUpgrade'
 --
--- * 'mrgReplicationGroupDescription'
---
 -- * 'mrgCacheParameterGroupName'
 --
+-- * 'mrgReplicationGroupDescription'
+--
 -- * 'mrgSnapshotWindow'
 --
 -- * 'mrgPrimaryClusterId'
@@ -126,8 +126,8 @@
     , _mrgSnapshottingClusterId = Nothing
     , _mrgSecurityGroupIds = Nothing
     , _mrgAutoMinorVersionUpgrade = Nothing
-    , _mrgReplicationGroupDescription = Nothing
     , _mrgCacheParameterGroupName = Nothing
+    , _mrgReplicationGroupDescription = Nothing
     , _mrgSnapshotWindow = Nothing
     , _mrgPrimaryClusterId = Nothing
     , _mrgPreferredMaintenanceWindow = Nothing
@@ -173,11 +173,6 @@
 mrgAutoMinorVersionUpgrade :: Lens' ModifyReplicationGroup (Maybe Bool)
 mrgAutoMinorVersionUpgrade = lens _mrgAutoMinorVersionUpgrade (\ s a -> s{_mrgAutoMinorVersionUpgrade = a});
 
--- | A description for the replication group. Maximum length is 255
--- characters.
-mrgReplicationGroupDescription :: Lens' ModifyReplicationGroup (Maybe Text)
-mrgReplicationGroupDescription = lens _mrgReplicationGroupDescription (\ s a -> s{_mrgReplicationGroupDescription = a});
-
 -- | The name of the cache parameter group to apply to all of the clusters in
 -- this replication group. This change is asynchronously applied as soon as
 -- possible for parameters when the /ApplyImmediately/ parameter is
@@ -185,6 +180,11 @@
 mrgCacheParameterGroupName :: Lens' ModifyReplicationGroup (Maybe Text)
 mrgCacheParameterGroupName = lens _mrgCacheParameterGroupName (\ s a -> s{_mrgCacheParameterGroupName = a});
 
+-- | A description for the replication group. Maximum length is 255
+-- characters.
+mrgReplicationGroupDescription :: Lens' ModifyReplicationGroup (Maybe Text)
+mrgReplicationGroupDescription = lens _mrgReplicationGroupDescription (\ s a -> s{_mrgReplicationGroupDescription = a});
+
 -- | The daily time range (in UTC) during which ElastiCache will begin taking
 -- a daily snapshot of the node group specified by /SnapshottingClusterId/.
 --
@@ -307,10 +307,10 @@
                       _mrgSecurityGroupIds),
                "AutoMinorVersionUpgrade" =:
                  _mrgAutoMinorVersionUpgrade,
-               "ReplicationGroupDescription" =:
-                 _mrgReplicationGroupDescription,
                "CacheParameterGroupName" =:
                  _mrgCacheParameterGroupName,
+               "ReplicationGroupDescription" =:
+                 _mrgReplicationGroupDescription,
                "SnapshotWindow" =: _mrgSnapshotWindow,
                "PrimaryClusterId" =: _mrgPrimaryClusterId,
                "PreferredMaintenanceWindow" =:
@@ -330,7 +330,7 @@
 -- | /See:/ 'modifyReplicationGroupResponse' smart constructor.
 data ModifyReplicationGroupResponse = ModifyReplicationGroupResponse'
     { _mrgrsReplicationGroup :: !(Maybe ReplicationGroup)
-    , _mrgrsStatus           :: !Int
+    , _mrgrsResponseStatus   :: !Int
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'ModifyReplicationGroupResponse' with the minimum fields required to make a request.
@@ -339,14 +339,14 @@
 --
 -- * 'mrgrsReplicationGroup'
 --
--- * 'mrgrsStatus'
+-- * 'mrgrsResponseStatus'
 modifyReplicationGroupResponse
-    :: Int -- ^ 'mrgrsStatus'
+    :: Int -- ^ 'mrgrsResponseStatus'
     -> ModifyReplicationGroupResponse
-modifyReplicationGroupResponse pStatus_ =
+modifyReplicationGroupResponse pResponseStatus_ =
     ModifyReplicationGroupResponse'
     { _mrgrsReplicationGroup = Nothing
-    , _mrgrsStatus = pStatus_
+    , _mrgrsResponseStatus = pResponseStatus_
     }
 
 -- | Undocumented member.
@@ -354,5 +354,5 @@
 mrgrsReplicationGroup = lens _mrgrsReplicationGroup (\ s a -> s{_mrgrsReplicationGroup = a});
 
 -- | The response status code.
-mrgrsStatus :: Lens' ModifyReplicationGroupResponse Int
-mrgrsStatus = lens _mrgrsStatus (\ s a -> s{_mrgrsStatus = a});
+mrgrsResponseStatus :: Lens' ModifyReplicationGroupResponse Int
+mrgrsResponseStatus = lens _mrgrsResponseStatus (\ s a -> s{_mrgrsResponseStatus = a});
diff --git a/gen/Network/AWS/ElastiCache/PurchaseReservedCacheNodesOffering.hs b/gen/Network/AWS/ElastiCache/PurchaseReservedCacheNodesOffering.hs
--- a/gen/Network/AWS/ElastiCache/PurchaseReservedCacheNodesOffering.hs
+++ b/gen/Network/AWS/ElastiCache/PurchaseReservedCacheNodesOffering.hs
@@ -37,7 +37,7 @@
     , PurchaseReservedCacheNodesOfferingResponse
     -- * Response Lenses
     , prcnorsReservedCacheNode
-    , prcnorsStatus
+    , prcnorsResponseStatus
     ) where
 
 import           Network.AWS.ElastiCache.Types
@@ -127,7 +127,7 @@
 -- | /See:/ 'purchaseReservedCacheNodesOfferingResponse' smart constructor.
 data PurchaseReservedCacheNodesOfferingResponse = PurchaseReservedCacheNodesOfferingResponse'
     { _prcnorsReservedCacheNode :: !(Maybe ReservedCacheNode)
-    , _prcnorsStatus            :: !Int
+    , _prcnorsResponseStatus    :: !Int
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'PurchaseReservedCacheNodesOfferingResponse' with the minimum fields required to make a request.
@@ -136,14 +136,14 @@
 --
 -- * 'prcnorsReservedCacheNode'
 --
--- * 'prcnorsStatus'
+-- * 'prcnorsResponseStatus'
 purchaseReservedCacheNodesOfferingResponse
-    :: Int -- ^ 'prcnorsStatus'
+    :: Int -- ^ 'prcnorsResponseStatus'
     -> PurchaseReservedCacheNodesOfferingResponse
-purchaseReservedCacheNodesOfferingResponse pStatus_ =
+purchaseReservedCacheNodesOfferingResponse pResponseStatus_ =
     PurchaseReservedCacheNodesOfferingResponse'
     { _prcnorsReservedCacheNode = Nothing
-    , _prcnorsStatus = pStatus_
+    , _prcnorsResponseStatus = pResponseStatus_
     }
 
 -- | Undocumented member.
@@ -151,5 +151,5 @@
 prcnorsReservedCacheNode = lens _prcnorsReservedCacheNode (\ s a -> s{_prcnorsReservedCacheNode = a});
 
 -- | The response status code.
-prcnorsStatus :: Lens' PurchaseReservedCacheNodesOfferingResponse Int
-prcnorsStatus = lens _prcnorsStatus (\ s a -> s{_prcnorsStatus = a});
+prcnorsResponseStatus :: Lens' PurchaseReservedCacheNodesOfferingResponse Int
+prcnorsResponseStatus = lens _prcnorsResponseStatus (\ s a -> s{_prcnorsResponseStatus = a});
diff --git a/gen/Network/AWS/ElastiCache/RebootCacheCluster.hs b/gen/Network/AWS/ElastiCache/RebootCacheCluster.hs
--- a/gen/Network/AWS/ElastiCache/RebootCacheCluster.hs
+++ b/gen/Network/AWS/ElastiCache/RebootCacheCluster.hs
@@ -45,7 +45,7 @@
     , RebootCacheClusterResponse
     -- * Response Lenses
     , rccrsCacheCluster
-    , rccrsStatus
+    , rccrsResponseStatus
     ) where
 
 import           Network.AWS.ElastiCache.Types
@@ -116,8 +116,8 @@
 
 -- | /See:/ 'rebootCacheClusterResponse' smart constructor.
 data RebootCacheClusterResponse = RebootCacheClusterResponse'
-    { _rccrsCacheCluster :: !(Maybe CacheCluster)
-    , _rccrsStatus       :: !Int
+    { _rccrsCacheCluster   :: !(Maybe CacheCluster)
+    , _rccrsResponseStatus :: !Int
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'RebootCacheClusterResponse' with the minimum fields required to make a request.
@@ -126,14 +126,14 @@
 --
 -- * 'rccrsCacheCluster'
 --
--- * 'rccrsStatus'
+-- * 'rccrsResponseStatus'
 rebootCacheClusterResponse
-    :: Int -- ^ 'rccrsStatus'
+    :: Int -- ^ 'rccrsResponseStatus'
     -> RebootCacheClusterResponse
-rebootCacheClusterResponse pStatus_ =
+rebootCacheClusterResponse pResponseStatus_ =
     RebootCacheClusterResponse'
     { _rccrsCacheCluster = Nothing
-    , _rccrsStatus = pStatus_
+    , _rccrsResponseStatus = pResponseStatus_
     }
 
 -- | Undocumented member.
@@ -141,5 +141,5 @@
 rccrsCacheCluster = lens _rccrsCacheCluster (\ s a -> s{_rccrsCacheCluster = a});
 
 -- | The response status code.
-rccrsStatus :: Lens' RebootCacheClusterResponse Int
-rccrsStatus = lens _rccrsStatus (\ s a -> s{_rccrsStatus = a});
+rccrsResponseStatus :: Lens' RebootCacheClusterResponse Int
+rccrsResponseStatus = lens _rccrsResponseStatus (\ s a -> s{_rccrsResponseStatus = a});
diff --git a/gen/Network/AWS/ElastiCache/RevokeCacheSecurityGroupIngress.hs b/gen/Network/AWS/ElastiCache/RevokeCacheSecurityGroupIngress.hs
--- a/gen/Network/AWS/ElastiCache/RevokeCacheSecurityGroupIngress.hs
+++ b/gen/Network/AWS/ElastiCache/RevokeCacheSecurityGroupIngress.hs
@@ -38,7 +38,7 @@
     , RevokeCacheSecurityGroupIngressResponse
     -- * Response Lenses
     , rcsgirsCacheSecurityGroup
-    , rcsgirsStatus
+    , rcsgirsResponseStatus
     ) where
 
 import           Network.AWS.ElastiCache.Types
@@ -126,7 +126,7 @@
 -- | /See:/ 'revokeCacheSecurityGroupIngressResponse' smart constructor.
 data RevokeCacheSecurityGroupIngressResponse = RevokeCacheSecurityGroupIngressResponse'
     { _rcsgirsCacheSecurityGroup :: !(Maybe CacheSecurityGroup)
-    , _rcsgirsStatus             :: !Int
+    , _rcsgirsResponseStatus     :: !Int
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'RevokeCacheSecurityGroupIngressResponse' with the minimum fields required to make a request.
@@ -135,14 +135,14 @@
 --
 -- * 'rcsgirsCacheSecurityGroup'
 --
--- * 'rcsgirsStatus'
+-- * 'rcsgirsResponseStatus'
 revokeCacheSecurityGroupIngressResponse
-    :: Int -- ^ 'rcsgirsStatus'
+    :: Int -- ^ 'rcsgirsResponseStatus'
     -> RevokeCacheSecurityGroupIngressResponse
-revokeCacheSecurityGroupIngressResponse pStatus_ =
+revokeCacheSecurityGroupIngressResponse pResponseStatus_ =
     RevokeCacheSecurityGroupIngressResponse'
     { _rcsgirsCacheSecurityGroup = Nothing
-    , _rcsgirsStatus = pStatus_
+    , _rcsgirsResponseStatus = pResponseStatus_
     }
 
 -- | Undocumented member.
@@ -150,5 +150,5 @@
 rcsgirsCacheSecurityGroup = lens _rcsgirsCacheSecurityGroup (\ s a -> s{_rcsgirsCacheSecurityGroup = a});
 
 -- | The response status code.
-rcsgirsStatus :: Lens' RevokeCacheSecurityGroupIngressResponse Int
-rcsgirsStatus = lens _rcsgirsStatus (\ s a -> s{_rcsgirsStatus = a});
+rcsgirsResponseStatus :: Lens' RevokeCacheSecurityGroupIngressResponse Int
+rcsgirsResponseStatus = lens _rcsgirsResponseStatus (\ s a -> s{_rcsgirsResponseStatus = a});
diff --git a/gen/Network/AWS/ElastiCache/Types.hs b/gen/Network/AWS/ElastiCache/Types.hs
--- a/gen/Network/AWS/ElastiCache/Types.hs
+++ b/gen/Network/AWS/ElastiCache/Types.hs
@@ -16,48 +16,48 @@
       elastiCache
 
     -- * Errors
-    , _CacheSubnetGroupAlreadyExistsFault
     , _CacheSubnetGroupInUse
-    , _CacheSecurityGroupNotFoundFault
     , _ReservedCacheNodeAlreadyExistsFault
+    , _CacheSecurityGroupNotFoundFault
+    , _CacheSubnetGroupAlreadyExistsFault
+    , _CacheSubnetGroupQuotaExceededFault
     , _AuthorizationAlreadyExistsFault
     , _ReservedCacheNodeQuotaExceededFault
-    , _CacheSubnetGroupQuotaExceededFault
-    , _ReplicationGroupNotFoundFault
     , _ReservedCacheNodesOfferingNotFoundFault
-    , _TagQuotaPerResourceExceeded
+    , _ReplicationGroupNotFoundFault
     , _InvalidSubnet
+    , _TagQuotaPerResourceExceeded
     , _SnapshotNotFoundFault
     , _InsufficientCacheClusterCapacityFault
     , _InvalidSnapshotStateFault
     , _SnapshotAlreadyExistsFault
     , _TagNotFoundFault
     , _SnapshotQuotaExceededFault
-    , _CacheParameterGroupAlreadyExistsFault
     , _NodeQuotaForClusterExceededFault
-    , _SnapshotFeatureNotSupportedFault
-    , _CacheSubnetGroupNotFoundFault
+    , _CacheParameterGroupAlreadyExistsFault
     , _ReservedCacheNodeNotFoundFault
+    , _CacheSubnetGroupNotFoundFault
+    , _SnapshotFeatureNotSupportedFault
     , _InvalidParameterValueException
-    , _InvalidVPCNetworkStateFault
-    , _CacheClusterNotFoundFault
     , _InvalidReplicationGroupStateFault
     , _ReplicationGroupAlreadyExistsFault
+    , _InvalidVPCNetworkStateFault
     , _SubnetInUse
-    , _CacheClusterAlreadyExistsFault
+    , _CacheClusterNotFoundFault
     , _ClusterQuotaForCustomerExceededFault
     , _AuthorizationNotFoundFault
-    , _CacheSecurityGroupQuotaExceededFault
     , _InvalidCacheClusterStateFault
+    , _CacheSecurityGroupQuotaExceededFault
+    , _CacheClusterAlreadyExistsFault
     , _CacheParameterGroupQuotaExceededFault
     , _NodeQuotaForCustomerExceededFault
     , _CacheSubnetQuotaExceededFault
     , _CacheParameterGroupNotFoundFault
-    , _InvalidParameterCombinationException
     , _InvalidARNFault
     , _InvalidCacheParameterGroupStateFault
-    , _CacheSecurityGroupAlreadyExistsFault
+    , _InvalidParameterCombinationException
     , _InvalidCacheSecurityGroupStateFault
+    , _CacheSecurityGroupAlreadyExistsFault
 
     -- * AZMode
     , AZMode (..)
@@ -79,8 +79,8 @@
     -- * CacheCluster
     , CacheCluster
     , cacheCluster
-    , ccCacheNodeType
     , ccEngineVersion
+    , ccCacheNodeType
     , ccCacheNodes
     , ccCacheClusterCreateTime
     , ccAutoMinorVersionUpgrade
@@ -94,9 +94,9 @@
     , ccClientDownloadLandingPage
     , ccPreferredMaintenanceWindow
     , ccCacheSubnetGroupName
-    , ccCacheClusterStatus
     , ccPreferredAvailabilityZone
     , ccCacheParameterGroup
+    , ccCacheClusterStatus
     , ccSnapshotRetentionLimit
     , ccReplicationGroupId
     , ccPendingModifiedValues
@@ -105,11 +105,11 @@
     -- * CacheEngineVersion
     , CacheEngineVersion
     , cacheEngineVersion
-    , cevCacheEngineDescription
-    , cevCacheParameterGroupFamily
     , cevEngineVersion
-    , cevCacheEngineVersionDescription
+    , cevCacheParameterGroupFamily
+    , cevCacheEngineDescription
     , cevEngine
+    , cevCacheEngineVersionDescription
 
     -- * CacheNode
     , CacheNode
@@ -129,8 +129,8 @@
     , cntspMinimumEngineVersion
     , cntspSource
     , cntspIsModifiable
-    , cntspAllowedValues
     , cntspDataType
+    , cntspAllowedValues
     , cntspParameterName
     , cntspDescription
 
@@ -199,8 +199,8 @@
     , engineDefaults
     , edCacheParameterGroupFamily
     , edCacheNodeTypeSpecificParameters
-    , edParameters
     , edMarker
+    , edParameters
 
     -- * Event
     , Event
@@ -248,8 +248,8 @@
     , pMinimumEngineVersion
     , pSource
     , pIsModifiable
-    , pAllowedValues
     , pDataType
+    , pAllowedValues
     , pParameterName
     , pDescription
 
@@ -275,13 +275,13 @@
     -- * ReplicationGroup
     , ReplicationGroup
     , replicationGroup
-    , rgNodeGroups
     , rgStatus
+    , rgNodeGroups
     , rgSnapshottingClusterId
     , rgMemberClusters
+    , rgDescription
     , rgReplicationGroupId
     , rgPendingModifiedValues
-    , rgDescription
     , rgAutomaticFailover
 
     -- * ReplicationGroupPendingModifiedValues
@@ -295,13 +295,13 @@
     , reservedCacheNode
     , rcnCacheNodeType
     , rcnState
-    , rcnProductDescription
     , rcnStartTime
+    , rcnProductDescription
     , rcnCacheNodeCount
     , rcnReservedCacheNodeId
+    , rcnRecurringCharges
     , rcnOfferingType
     , rcnUsagePrice
-    , rcnRecurringCharges
     , rcnFixedPrice
     , rcnDuration
     , rcnReservedCacheNodesOfferingId
@@ -311,9 +311,9 @@
     , reservedCacheNodesOffering
     , rcnoCacheNodeType
     , rcnoProductDescription
+    , rcnoRecurringCharges
     , rcnoOfferingType
     , rcnoUsagePrice
-    , rcnoRecurringCharges
     , rcnoFixedPrice
     , rcnoDuration
     , rcnoReservedCacheNodesOfferingId
@@ -327,26 +327,26 @@
     -- * Snapshot
     , Snapshot
     , snapshot
-    , sCacheNodeType
     , sEngineVersion
+    , sCacheNodeType
     , sCacheClusterCreateTime
     , sAutoMinorVersionUpgrade
     , sCacheParameterGroupName
+    , sVPCId
     , sSnapshotStatus
     , sSnapshotWindow
-    , sVPCId
     , sCacheClusterId
     , sEngine
     , sPreferredMaintenanceWindow
     , sTopicARN
-    , sCacheSubnetGroupName
     , sNodeSnapshots
+    , sCacheSubnetGroupName
     , sPreferredAvailabilityZone
     , sSnapshotRetentionLimit
     , sSnapshotName
-    , sSnapshotSource
     , sNumCacheNodes
     , sPort
+    , sSnapshotSource
 
     -- * Subnet
     , Subnet
@@ -402,28 +402,34 @@
       | has (hasStatus 509) e = Just "limit_exceeded"
       | otherwise = Nothing
 
--- | The requested cache subnet group name is already in use by an existing
--- cache subnet group.
-_CacheSubnetGroupAlreadyExistsFault :: AsError a => Getting (First ServiceError) a ServiceError
-_CacheSubnetGroupAlreadyExistsFault =
-    _ServiceError . hasStatus 400 . hasCode "CacheSubnetGroupAlreadyExists"
-
 -- | The requested cache subnet group is currently in use.
 _CacheSubnetGroupInUse :: AsError a => Getting (First ServiceError) a ServiceError
 _CacheSubnetGroupInUse =
     _ServiceError . hasStatus 400 . hasCode "CacheSubnetGroupInUse"
 
+-- | You already have a reservation with the given identifier.
+_ReservedCacheNodeAlreadyExistsFault :: AsError a => Getting (First ServiceError) a ServiceError
+_ReservedCacheNodeAlreadyExistsFault =
+    _ServiceError . hasStatus 404 . hasCode "ReservedCacheNodeAlreadyExists"
+
 -- | The requested cache security group name does not refer to an existing
 -- cache security group.
 _CacheSecurityGroupNotFoundFault :: AsError a => Getting (First ServiceError) a ServiceError
 _CacheSecurityGroupNotFoundFault =
     _ServiceError . hasStatus 404 . hasCode "CacheSecurityGroupNotFound"
 
--- | You already have a reservation with the given identifier.
-_ReservedCacheNodeAlreadyExistsFault :: AsError a => Getting (First ServiceError) a ServiceError
-_ReservedCacheNodeAlreadyExistsFault =
-    _ServiceError . hasStatus 404 . hasCode "ReservedCacheNodeAlreadyExists"
+-- | The requested cache subnet group name is already in use by an existing
+-- cache subnet group.
+_CacheSubnetGroupAlreadyExistsFault :: AsError a => Getting (First ServiceError) a ServiceError
+_CacheSubnetGroupAlreadyExistsFault =
+    _ServiceError . hasStatus 400 . hasCode "CacheSubnetGroupAlreadyExists"
 
+-- | The request cannot be processed because it would exceed the allowed
+-- number of cache subnet groups.
+_CacheSubnetGroupQuotaExceededFault :: AsError a => Getting (First ServiceError) a ServiceError
+_CacheSubnetGroupQuotaExceededFault =
+    _ServiceError . hasStatus 400 . hasCode "CacheSubnetGroupQuotaExceeded"
+
 -- | The specified Amazon EC2 security group is already authorized for the
 -- specified cache security group.
 _AuthorizationAlreadyExistsFault :: AsError a => Getting (First ServiceError) a ServiceError
@@ -436,22 +442,20 @@
 _ReservedCacheNodeQuotaExceededFault =
     _ServiceError . hasStatus 400 . hasCode "ReservedCacheNodeQuotaExceeded"
 
--- | The request cannot be processed because it would exceed the allowed
--- number of cache subnet groups.
-_CacheSubnetGroupQuotaExceededFault :: AsError a => Getting (First ServiceError) a ServiceError
-_CacheSubnetGroupQuotaExceededFault =
-    _ServiceError . hasStatus 400 . hasCode "CacheSubnetGroupQuotaExceeded"
+-- | The requested cache node offering does not exist.
+_ReservedCacheNodesOfferingNotFoundFault :: AsError a => Getting (First ServiceError) a ServiceError
+_ReservedCacheNodesOfferingNotFoundFault =
+    _ServiceError .
+    hasStatus 404 . hasCode "ReservedCacheNodesOfferingNotFound"
 
 -- | The specified replication group does not exist.
 _ReplicationGroupNotFoundFault :: AsError a => Getting (First ServiceError) a ServiceError
 _ReplicationGroupNotFoundFault =
     _ServiceError . hasStatus 404 . hasCode "ReplicationGroupNotFoundFault"
 
--- | The requested cache node offering does not exist.
-_ReservedCacheNodesOfferingNotFoundFault :: AsError a => Getting (First ServiceError) a ServiceError
-_ReservedCacheNodesOfferingNotFoundFault =
-    _ServiceError .
-    hasStatus 404 . hasCode "ReservedCacheNodesOfferingNotFound"
+-- | An invalid subnet identifier was specified.
+_InvalidSubnet :: AsError a => Getting (First ServiceError) a ServiceError
+_InvalidSubnet = _ServiceError . hasStatus 400 . hasCode "InvalidSubnet"
 
 -- | The request cannot be processed because it would cause the resource to
 -- have more than the allowed number of tags. The maximum number of tags
@@ -460,10 +464,6 @@
 _TagQuotaPerResourceExceeded =
     _ServiceError . hasStatus 400 . hasCode "TagQuotaPerResourceExceeded"
 
--- | An invalid subnet identifier was specified.
-_InvalidSubnet :: AsError a => Getting (First ServiceError) a ServiceError
-_InvalidSubnet = _ServiceError . hasStatus 400 . hasCode "InvalidSubnet"
-
 -- | The requested snapshot name does not refer to an existing snapshot.
 _SnapshotNotFoundFault :: AsError a => Getting (First ServiceError) a ServiceError
 _SnapshotNotFoundFault =
@@ -496,17 +496,28 @@
 _SnapshotQuotaExceededFault =
     _ServiceError . hasStatus 400 . hasCode "SnapshotQuotaExceededFault"
 
--- | A cache parameter group with the requested name already exists.
-_CacheParameterGroupAlreadyExistsFault :: AsError a => Getting (First ServiceError) a ServiceError
-_CacheParameterGroupAlreadyExistsFault =
-    _ServiceError . hasStatus 400 . hasCode "CacheParameterGroupAlreadyExists"
-
 -- | The request cannot be processed because it would exceed the allowed
 -- number of cache nodes in a single cache cluster.
 _NodeQuotaForClusterExceededFault :: AsError a => Getting (First ServiceError) a ServiceError
 _NodeQuotaForClusterExceededFault =
     _ServiceError . hasStatus 400 . hasCode "NodeQuotaForClusterExceeded"
 
+-- | A cache parameter group with the requested name already exists.
+_CacheParameterGroupAlreadyExistsFault :: AsError a => Getting (First ServiceError) a ServiceError
+_CacheParameterGroupAlreadyExistsFault =
+    _ServiceError . hasStatus 400 . hasCode "CacheParameterGroupAlreadyExists"
+
+-- | The requested reserved cache node was not found.
+_ReservedCacheNodeNotFoundFault :: AsError a => Getting (First ServiceError) a ServiceError
+_ReservedCacheNodeNotFoundFault =
+    _ServiceError . hasStatus 404 . hasCode "ReservedCacheNodeNotFound"
+
+-- | The requested cache subnet group name does not refer to an existing
+-- cache subnet group.
+_CacheSubnetGroupNotFoundFault :: AsError a => Getting (First ServiceError) a ServiceError
+_CacheSubnetGroupNotFoundFault =
+    _ServiceError . hasStatus 400 . hasCode "CacheSubnetGroupNotFoundFault"
+
 -- | You attempted one of the following actions:
 --
 -- -   Creating a snapshot of a Redis cache cluster running on a /t1.micro/
@@ -520,33 +531,11 @@
 _SnapshotFeatureNotSupportedFault =
     _ServiceError . hasStatus 400 . hasCode "SnapshotFeatureNotSupportedFault"
 
--- | The requested cache subnet group name does not refer to an existing
--- cache subnet group.
-_CacheSubnetGroupNotFoundFault :: AsError a => Getting (First ServiceError) a ServiceError
-_CacheSubnetGroupNotFoundFault =
-    _ServiceError . hasStatus 400 . hasCode "CacheSubnetGroupNotFoundFault"
-
--- | The requested reserved cache node was not found.
-_ReservedCacheNodeNotFoundFault :: AsError a => Getting (First ServiceError) a ServiceError
-_ReservedCacheNodeNotFoundFault =
-    _ServiceError . hasStatus 404 . hasCode "ReservedCacheNodeNotFound"
-
 -- | The value for a parameter is invalid.
 _InvalidParameterValueException :: AsError a => Getting (First ServiceError) a ServiceError
 _InvalidParameterValueException =
     _ServiceError . hasStatus 400 . hasCode "InvalidParameterValue"
 
--- | The VPC network is in an invalid state.
-_InvalidVPCNetworkStateFault :: AsError a => Getting (First ServiceError) a ServiceError
-_InvalidVPCNetworkStateFault =
-    _ServiceError . hasStatus 400 . hasCode "InvalidVPCNetworkStateFault"
-
--- | The requested cache cluster ID does not refer to an existing cache
--- cluster.
-_CacheClusterNotFoundFault :: AsError a => Getting (First ServiceError) a ServiceError
-_CacheClusterNotFoundFault =
-    _ServiceError . hasStatus 404 . hasCode "CacheClusterNotFound"
-
 -- | The requested replication group is not in the /available/ state.
 _InvalidReplicationGroupStateFault :: AsError a => Getting (First ServiceError) a ServiceError
 _InvalidReplicationGroupStateFault =
@@ -557,14 +546,20 @@
 _ReplicationGroupAlreadyExistsFault =
     _ServiceError . hasStatus 400 . hasCode "ReplicationGroupAlreadyExists"
 
+-- | The VPC network is in an invalid state.
+_InvalidVPCNetworkStateFault :: AsError a => Getting (First ServiceError) a ServiceError
+_InvalidVPCNetworkStateFault =
+    _ServiceError . hasStatus 400 . hasCode "InvalidVPCNetworkStateFault"
+
 -- | The requested subnet is being used by another cache subnet group.
 _SubnetInUse :: AsError a => Getting (First ServiceError) a ServiceError
 _SubnetInUse = _ServiceError . hasStatus 400 . hasCode "SubnetInUse"
 
--- | You already have a cache cluster with the given identifier.
-_CacheClusterAlreadyExistsFault :: AsError a => Getting (First ServiceError) a ServiceError
-_CacheClusterAlreadyExistsFault =
-    _ServiceError . hasStatus 400 . hasCode "CacheClusterAlreadyExists"
+-- | The requested cache cluster ID does not refer to an existing cache
+-- cluster.
+_CacheClusterNotFoundFault :: AsError a => Getting (First ServiceError) a ServiceError
+_CacheClusterNotFoundFault =
+    _ServiceError . hasStatus 404 . hasCode "CacheClusterNotFound"
 
 -- | The request cannot be processed because it would exceed the allowed
 -- number of cache clusters per customer.
@@ -578,16 +573,21 @@
 _AuthorizationNotFoundFault =
     _ServiceError . hasStatus 404 . hasCode "AuthorizationNotFound"
 
+-- | The requested cache cluster is not in the /available/ state.
+_InvalidCacheClusterStateFault :: AsError a => Getting (First ServiceError) a ServiceError
+_InvalidCacheClusterStateFault =
+    _ServiceError . hasStatus 400 . hasCode "InvalidCacheClusterState"
+
 -- | The request cannot be processed because it would exceed the allowed
 -- number of cache security groups.
 _CacheSecurityGroupQuotaExceededFault :: AsError a => Getting (First ServiceError) a ServiceError
 _CacheSecurityGroupQuotaExceededFault =
     _ServiceError . hasStatus 400 . hasCode "QuotaExceeded.CacheSecurityGroup"
 
--- | The requested cache cluster is not in the /available/ state.
-_InvalidCacheClusterStateFault :: AsError a => Getting (First ServiceError) a ServiceError
-_InvalidCacheClusterStateFault =
-    _ServiceError . hasStatus 400 . hasCode "InvalidCacheClusterState"
+-- | You already have a cache cluster with the given identifier.
+_CacheClusterAlreadyExistsFault :: AsError a => Getting (First ServiceError) a ServiceError
+_CacheClusterAlreadyExistsFault =
+    _ServiceError . hasStatus 400 . hasCode "CacheClusterAlreadyExists"
 
 -- | The request cannot be processed because it would exceed the maximum
 -- number of cache security groups.
@@ -613,11 +613,6 @@
 _CacheParameterGroupNotFoundFault =
     _ServiceError . hasStatus 404 . hasCode "CacheParameterGroupNotFound"
 
--- | Two or more incompatible parameters were specified.
-_InvalidParameterCombinationException :: AsError a => Getting (First ServiceError) a ServiceError
-_InvalidParameterCombinationException =
-    _ServiceError . hasStatus 400 . hasCode "InvalidParameterCombination"
-
 -- | The requested Amazon Resource Name (ARN) does not refer to an existing
 -- resource.
 _InvalidARNFault :: AsError a => Getting (First ServiceError) a ServiceError
@@ -629,12 +624,17 @@
 _InvalidCacheParameterGroupStateFault =
     _ServiceError . hasStatus 400 . hasCode "InvalidCacheParameterGroupState"
 
--- | A cache security group with the specified name already exists.
-_CacheSecurityGroupAlreadyExistsFault :: AsError a => Getting (First ServiceError) a ServiceError
-_CacheSecurityGroupAlreadyExistsFault =
-    _ServiceError . hasStatus 400 . hasCode "CacheSecurityGroupAlreadyExists"
+-- | Two or more incompatible parameters were specified.
+_InvalidParameterCombinationException :: AsError a => Getting (First ServiceError) a ServiceError
+_InvalidParameterCombinationException =
+    _ServiceError . hasStatus 400 . hasCode "InvalidParameterCombination"
 
 -- | The current state of the cache security group does not allow deletion.
 _InvalidCacheSecurityGroupStateFault :: AsError a => Getting (First ServiceError) a ServiceError
 _InvalidCacheSecurityGroupStateFault =
     _ServiceError . hasStatus 400 . hasCode "InvalidCacheSecurityGroupState"
+
+-- | A cache security group with the specified name already exists.
+_CacheSecurityGroupAlreadyExistsFault :: AsError a => Getting (First ServiceError) a ServiceError
+_CacheSecurityGroupAlreadyExistsFault =
+    _ServiceError . hasStatus 400 . hasCode "CacheSecurityGroupAlreadyExists"
diff --git a/gen/Network/AWS/ElastiCache/Types/Product.hs b/gen/Network/AWS/ElastiCache/Types/Product.hs
--- a/gen/Network/AWS/ElastiCache/Types/Product.hs
+++ b/gen/Network/AWS/ElastiCache/Types/Product.hs
@@ -50,8 +50,8 @@
 --
 -- /See:/ 'cacheCluster' smart constructor.
 data CacheCluster = CacheCluster'
-    { _ccCacheNodeType              :: !(Maybe Text)
-    , _ccEngineVersion              :: !(Maybe Text)
+    { _ccEngineVersion              :: !(Maybe Text)
+    , _ccCacheNodeType              :: !(Maybe Text)
     , _ccCacheNodes                 :: !(Maybe [CacheNode])
     , _ccCacheClusterCreateTime     :: !(Maybe ISO8601)
     , _ccAutoMinorVersionUpgrade    :: !(Maybe Bool)
@@ -65,9 +65,9 @@
     , _ccClientDownloadLandingPage  :: !(Maybe Text)
     , _ccPreferredMaintenanceWindow :: !(Maybe Text)
     , _ccCacheSubnetGroupName       :: !(Maybe Text)
-    , _ccCacheClusterStatus         :: !(Maybe Text)
     , _ccPreferredAvailabilityZone  :: !(Maybe Text)
     , _ccCacheParameterGroup        :: !(Maybe CacheParameterGroupStatus)
+    , _ccCacheClusterStatus         :: !(Maybe Text)
     , _ccSnapshotRetentionLimit     :: !(Maybe Int)
     , _ccReplicationGroupId         :: !(Maybe Text)
     , _ccPendingModifiedValues      :: !(Maybe PendingModifiedValues)
@@ -78,10 +78,10 @@
 --
 -- Use one of the following lenses to modify other fields as desired:
 --
--- * 'ccCacheNodeType'
---
 -- * 'ccEngineVersion'
 --
+-- * 'ccCacheNodeType'
+--
 -- * 'ccCacheNodes'
 --
 -- * 'ccCacheClusterCreateTime'
@@ -108,12 +108,12 @@
 --
 -- * 'ccCacheSubnetGroupName'
 --
--- * 'ccCacheClusterStatus'
---
 -- * 'ccPreferredAvailabilityZone'
 --
 -- * 'ccCacheParameterGroup'
 --
+-- * 'ccCacheClusterStatus'
+--
 -- * 'ccSnapshotRetentionLimit'
 --
 -- * 'ccReplicationGroupId'
@@ -125,8 +125,8 @@
     :: CacheCluster
 cacheCluster =
     CacheCluster'
-    { _ccCacheNodeType = Nothing
-    , _ccEngineVersion = Nothing
+    { _ccEngineVersion = Nothing
+    , _ccCacheNodeType = Nothing
     , _ccCacheNodes = Nothing
     , _ccCacheClusterCreateTime = Nothing
     , _ccAutoMinorVersionUpgrade = Nothing
@@ -140,15 +140,20 @@
     , _ccClientDownloadLandingPage = Nothing
     , _ccPreferredMaintenanceWindow = Nothing
     , _ccCacheSubnetGroupName = Nothing
-    , _ccCacheClusterStatus = Nothing
     , _ccPreferredAvailabilityZone = Nothing
     , _ccCacheParameterGroup = Nothing
+    , _ccCacheClusterStatus = Nothing
     , _ccSnapshotRetentionLimit = Nothing
     , _ccReplicationGroupId = Nothing
     , _ccPendingModifiedValues = Nothing
     , _ccNumCacheNodes = Nothing
     }
 
+-- | The version of the cache engine version that is used in this cache
+-- cluster.
+ccEngineVersion :: Lens' CacheCluster (Maybe Text)
+ccEngineVersion = lens _ccEngineVersion (\ s a -> s{_ccEngineVersion = a});
+
 -- | The name of the compute and memory capacity node type for the cache
 -- cluster.
 --
@@ -184,11 +189,6 @@
 ccCacheNodeType :: Lens' CacheCluster (Maybe Text)
 ccCacheNodeType = lens _ccCacheNodeType (\ s a -> s{_ccCacheNodeType = a});
 
--- | The version of the cache engine version that is used in this cache
--- cluster.
-ccEngineVersion :: Lens' CacheCluster (Maybe Text)
-ccEngineVersion = lens _ccEngineVersion (\ s a -> s{_ccEngineVersion = a});
-
 -- | A list of cache nodes that are members of the cache cluster.
 ccCacheNodes :: Lens' CacheCluster [CacheNode]
 ccCacheNodes = lens _ccCacheNodes (\ s a -> s{_ccCacheNodes = a}) . _Default . _Coerce;
@@ -261,13 +261,6 @@
 ccCacheSubnetGroupName :: Lens' CacheCluster (Maybe Text)
 ccCacheSubnetGroupName = lens _ccCacheSubnetGroupName (\ s a -> s{_ccCacheSubnetGroupName = a});
 
--- | The current state of this cache cluster, one of the following values:
--- /available/, /creating/, /deleted/, /deleting/, /incompatible-network/,
--- /modifying/, /rebooting cache cluster nodes/, /restore-failed/, or
--- /snapshotting/.
-ccCacheClusterStatus :: Lens' CacheCluster (Maybe Text)
-ccCacheClusterStatus = lens _ccCacheClusterStatus (\ s a -> s{_ccCacheClusterStatus = a});
-
 -- | The name of the Availability Zone in which the cache cluster is located
 -- or \"Multiple\" if the cache nodes are located in different Availability
 -- Zones.
@@ -278,6 +271,13 @@
 ccCacheParameterGroup :: Lens' CacheCluster (Maybe CacheParameterGroupStatus)
 ccCacheParameterGroup = lens _ccCacheParameterGroup (\ s a -> s{_ccCacheParameterGroup = a});
 
+-- | The current state of this cache cluster, one of the following values:
+-- /available/, /creating/, /deleted/, /deleting/, /incompatible-network/,
+-- /modifying/, /rebooting cache cluster nodes/, /restore-failed/, or
+-- /snapshotting/.
+ccCacheClusterStatus :: Lens' CacheCluster (Maybe Text)
+ccCacheClusterStatus = lens _ccCacheClusterStatus (\ s a -> s{_ccCacheClusterStatus = a});
+
 -- | The number of days for which ElastiCache will retain automatic cache
 -- cluster snapshots before deleting them. For example, if you set
 -- /SnapshotRetentionLimit/ to 5, then a snapshot that was taken today will
@@ -309,7 +309,7 @@
 instance FromXML CacheCluster where
         parseXML x
           = CacheCluster' <$>
-              (x .@? "CacheNodeType") <*> (x .@? "EngineVersion")
+              (x .@? "EngineVersion") <*> (x .@? "CacheNodeType")
                 <*>
                 (x .@? "CacheNodes" .!@ mempty >>=
                    may (parseXMLList "CacheNode"))
@@ -329,9 +329,9 @@
                 <*> (x .@? "ClientDownloadLandingPage")
                 <*> (x .@? "PreferredMaintenanceWindow")
                 <*> (x .@? "CacheSubnetGroupName")
-                <*> (x .@? "CacheClusterStatus")
                 <*> (x .@? "PreferredAvailabilityZone")
                 <*> (x .@? "CacheParameterGroup")
+                <*> (x .@? "CacheClusterStatus")
                 <*> (x .@? "SnapshotRetentionLimit")
                 <*> (x .@? "ReplicationGroupId")
                 <*> (x .@? "PendingModifiedValues")
@@ -341,66 +341,66 @@
 --
 -- /See:/ 'cacheEngineVersion' smart constructor.
 data CacheEngineVersion = CacheEngineVersion'
-    { _cevCacheEngineDescription        :: !(Maybe Text)
+    { _cevEngineVersion                 :: !(Maybe Text)
     , _cevCacheParameterGroupFamily     :: !(Maybe Text)
-    , _cevEngineVersion                 :: !(Maybe Text)
-    , _cevCacheEngineVersionDescription :: !(Maybe Text)
+    , _cevCacheEngineDescription        :: !(Maybe Text)
     , _cevEngine                        :: !(Maybe Text)
+    , _cevCacheEngineVersionDescription :: !(Maybe Text)
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'CacheEngineVersion' with the minimum fields required to make a request.
 --
 -- Use one of the following lenses to modify other fields as desired:
 --
--- * 'cevCacheEngineDescription'
+-- * 'cevEngineVersion'
 --
 -- * 'cevCacheParameterGroupFamily'
 --
--- * 'cevEngineVersion'
---
--- * 'cevCacheEngineVersionDescription'
+-- * 'cevCacheEngineDescription'
 --
 -- * 'cevEngine'
+--
+-- * 'cevCacheEngineVersionDescription'
 cacheEngineVersion
     :: CacheEngineVersion
 cacheEngineVersion =
     CacheEngineVersion'
-    { _cevCacheEngineDescription = Nothing
+    { _cevEngineVersion = Nothing
     , _cevCacheParameterGroupFamily = Nothing
-    , _cevEngineVersion = Nothing
-    , _cevCacheEngineVersionDescription = Nothing
+    , _cevCacheEngineDescription = Nothing
     , _cevEngine = Nothing
+    , _cevCacheEngineVersionDescription = Nothing
     }
 
--- | The description of the cache engine.
-cevCacheEngineDescription :: Lens' CacheEngineVersion (Maybe Text)
-cevCacheEngineDescription = lens _cevCacheEngineDescription (\ s a -> s{_cevCacheEngineDescription = a});
+-- | The version number of the cache engine.
+cevEngineVersion :: Lens' CacheEngineVersion (Maybe Text)
+cevEngineVersion = lens _cevEngineVersion (\ s a -> s{_cevEngineVersion = a});
 
 -- | The name of the cache parameter group family associated with this cache
 -- engine.
 cevCacheParameterGroupFamily :: Lens' CacheEngineVersion (Maybe Text)
 cevCacheParameterGroupFamily = lens _cevCacheParameterGroupFamily (\ s a -> s{_cevCacheParameterGroupFamily = a});
 
--- | The version number of the cache engine.
-cevEngineVersion :: Lens' CacheEngineVersion (Maybe Text)
-cevEngineVersion = lens _cevEngineVersion (\ s a -> s{_cevEngineVersion = a});
-
--- | The description of the cache engine version.
-cevCacheEngineVersionDescription :: Lens' CacheEngineVersion (Maybe Text)
-cevCacheEngineVersionDescription = lens _cevCacheEngineVersionDescription (\ s a -> s{_cevCacheEngineVersionDescription = a});
+-- | The description of the cache engine.
+cevCacheEngineDescription :: Lens' CacheEngineVersion (Maybe Text)
+cevCacheEngineDescription = lens _cevCacheEngineDescription (\ s a -> s{_cevCacheEngineDescription = a});
 
 -- | The name of the cache engine.
 cevEngine :: Lens' CacheEngineVersion (Maybe Text)
 cevEngine = lens _cevEngine (\ s a -> s{_cevEngine = a});
 
+-- | The description of the cache engine version.
+cevCacheEngineVersionDescription :: Lens' CacheEngineVersion (Maybe Text)
+cevCacheEngineVersionDescription = lens _cevCacheEngineVersionDescription (\ s a -> s{_cevCacheEngineVersionDescription = a});
+
 instance FromXML CacheEngineVersion where
         parseXML x
           = CacheEngineVersion' <$>
-              (x .@? "CacheEngineDescription") <*>
+              (x .@? "EngineVersion") <*>
                 (x .@? "CacheParameterGroupFamily")
-                <*> (x .@? "EngineVersion")
-                <*> (x .@? "CacheEngineVersionDescription")
+                <*> (x .@? "CacheEngineDescription")
                 <*> (x .@? "Engine")
+                <*> (x .@? "CacheEngineVersionDescription")
 
 -- | Represents an individual cache node within a cache cluster. Each cache
 -- node runs its own instance of the cluster\'s protocol-compliant caching
@@ -531,8 +531,8 @@
     , _cntspMinimumEngineVersion        :: !(Maybe Text)
     , _cntspSource                      :: !(Maybe Text)
     , _cntspIsModifiable                :: !(Maybe Bool)
-    , _cntspAllowedValues               :: !(Maybe Text)
     , _cntspDataType                    :: !(Maybe Text)
+    , _cntspAllowedValues               :: !(Maybe Text)
     , _cntspParameterName               :: !(Maybe Text)
     , _cntspDescription                 :: !(Maybe Text)
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
@@ -549,10 +549,10 @@
 --
 -- * 'cntspIsModifiable'
 --
--- * 'cntspAllowedValues'
---
 -- * 'cntspDataType'
 --
+-- * 'cntspAllowedValues'
+--
 -- * 'cntspParameterName'
 --
 -- * 'cntspDescription'
@@ -564,8 +564,8 @@
     , _cntspMinimumEngineVersion = Nothing
     , _cntspSource = Nothing
     , _cntspIsModifiable = Nothing
-    , _cntspAllowedValues = Nothing
     , _cntspDataType = Nothing
+    , _cntspAllowedValues = Nothing
     , _cntspParameterName = Nothing
     , _cntspDescription = Nothing
     }
@@ -589,14 +589,14 @@
 cntspIsModifiable :: Lens' CacheNodeTypeSpecificParameter (Maybe Bool)
 cntspIsModifiable = lens _cntspIsModifiable (\ s a -> s{_cntspIsModifiable = a});
 
--- | The valid range of values for the parameter.
-cntspAllowedValues :: Lens' CacheNodeTypeSpecificParameter (Maybe Text)
-cntspAllowedValues = lens _cntspAllowedValues (\ s a -> s{_cntspAllowedValues = a});
-
 -- | The valid data type for the parameter.
 cntspDataType :: Lens' CacheNodeTypeSpecificParameter (Maybe Text)
 cntspDataType = lens _cntspDataType (\ s a -> s{_cntspDataType = a});
 
+-- | The valid range of values for the parameter.
+cntspAllowedValues :: Lens' CacheNodeTypeSpecificParameter (Maybe Text)
+cntspAllowedValues = lens _cntspAllowedValues (\ s a -> s{_cntspAllowedValues = a});
+
 -- | The name of the parameter.
 cntspParameterName :: Lens' CacheNodeTypeSpecificParameter (Maybe Text)
 cntspParameterName = lens _cntspParameterName (\ s a -> s{_cntspParameterName = a});
@@ -613,8 +613,8 @@
                 <*> (x .@? "MinimumEngineVersion")
                 <*> (x .@? "Source")
                 <*> (x .@? "IsModifiable")
-                <*> (x .@? "AllowedValues")
                 <*> (x .@? "DataType")
+                <*> (x .@? "AllowedValues")
                 <*> (x .@? "ParameterName")
                 <*> (x .@? "Description")
 
@@ -1031,8 +1031,8 @@
 data EngineDefaults = EngineDefaults'
     { _edCacheParameterGroupFamily       :: !(Maybe Text)
     , _edCacheNodeTypeSpecificParameters :: !(Maybe [CacheNodeTypeSpecificParameter])
-    , _edParameters                      :: !(Maybe [Parameter])
     , _edMarker                          :: !(Maybe Text)
+    , _edParameters                      :: !(Maybe [Parameter])
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'EngineDefaults' with the minimum fields required to make a request.
@@ -1043,17 +1043,17 @@
 --
 -- * 'edCacheNodeTypeSpecificParameters'
 --
--- * 'edParameters'
---
 -- * 'edMarker'
+--
+-- * 'edParameters'
 engineDefaults
     :: EngineDefaults
 engineDefaults =
     EngineDefaults'
     { _edCacheParameterGroupFamily = Nothing
     , _edCacheNodeTypeSpecificParameters = Nothing
-    , _edParameters = Nothing
     , _edMarker = Nothing
+    , _edParameters = Nothing
     }
 
 -- | Specifies the name of the cache parameter group family to which the
@@ -1066,14 +1066,14 @@
 edCacheNodeTypeSpecificParameters :: Lens' EngineDefaults [CacheNodeTypeSpecificParameter]
 edCacheNodeTypeSpecificParameters = lens _edCacheNodeTypeSpecificParameters (\ s a -> s{_edCacheNodeTypeSpecificParameters = a}) . _Default . _Coerce;
 
--- | Contains a list of engine default parameters.
-edParameters :: Lens' EngineDefaults [Parameter]
-edParameters = lens _edParameters (\ s a -> s{_edParameters = a}) . _Default . _Coerce;
-
 -- | Provides an identifier to allow retrieval of paginated results.
 edMarker :: Lens' EngineDefaults (Maybe Text)
 edMarker = lens _edMarker (\ s a -> s{_edMarker = a});
 
+-- | Contains a list of engine default parameters.
+edParameters :: Lens' EngineDefaults [Parameter]
+edParameters = lens _edParameters (\ s a -> s{_edParameters = a}) . _Default . _Coerce;
+
 instance FromXML EngineDefaults where
         parseXML x
           = EngineDefaults' <$>
@@ -1081,10 +1081,10 @@
                 (x .@? "CacheNodeTypeSpecificParameters" .!@ mempty
                    >>=
                    may (parseXMLList "CacheNodeTypeSpecificParameter"))
+                <*> (x .@? "Marker")
                 <*>
                 (x .@? "Parameters" .!@ mempty >>=
                    may (parseXMLList "Parameter"))
-                <*> (x .@? "Marker")
 
 -- | Represents a single occurrence of something interesting within the
 -- system. Some examples of events are creating a cache cluster, adding or
@@ -1372,8 +1372,8 @@
     , _pMinimumEngineVersion :: !(Maybe Text)
     , _pSource               :: !(Maybe Text)
     , _pIsModifiable         :: !(Maybe Bool)
-    , _pAllowedValues        :: !(Maybe Text)
     , _pDataType             :: !(Maybe Text)
+    , _pAllowedValues        :: !(Maybe Text)
     , _pParameterName        :: !(Maybe Text)
     , _pDescription          :: !(Maybe Text)
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
@@ -1390,10 +1390,10 @@
 --
 -- * 'pIsModifiable'
 --
--- * 'pAllowedValues'
---
 -- * 'pDataType'
 --
+-- * 'pAllowedValues'
+--
 -- * 'pParameterName'
 --
 -- * 'pDescription'
@@ -1405,8 +1405,8 @@
     , _pMinimumEngineVersion = Nothing
     , _pSource = Nothing
     , _pIsModifiable = Nothing
-    , _pAllowedValues = Nothing
     , _pDataType = Nothing
+    , _pAllowedValues = Nothing
     , _pParameterName = Nothing
     , _pDescription = Nothing
     }
@@ -1429,14 +1429,14 @@
 pIsModifiable :: Lens' Parameter (Maybe Bool)
 pIsModifiable = lens _pIsModifiable (\ s a -> s{_pIsModifiable = a});
 
--- | The valid range of values for the parameter.
-pAllowedValues :: Lens' Parameter (Maybe Text)
-pAllowedValues = lens _pAllowedValues (\ s a -> s{_pAllowedValues = a});
-
 -- | The valid data type for the parameter.
 pDataType :: Lens' Parameter (Maybe Text)
 pDataType = lens _pDataType (\ s a -> s{_pDataType = a});
 
+-- | The valid range of values for the parameter.
+pAllowedValues :: Lens' Parameter (Maybe Text)
+pAllowedValues = lens _pAllowedValues (\ s a -> s{_pAllowedValues = a});
+
 -- | The name of the parameter.
 pParameterName :: Lens' Parameter (Maybe Text)
 pParameterName = lens _pParameterName (\ s a -> s{_pParameterName = a});
@@ -1452,8 +1452,8 @@
                 (x .@? "MinimumEngineVersion")
                 <*> (x .@? "Source")
                 <*> (x .@? "IsModifiable")
-                <*> (x .@? "AllowedValues")
                 <*> (x .@? "DataType")
+                <*> (x .@? "AllowedValues")
                 <*> (x .@? "ParameterName")
                 <*> (x .@? "Description")
 
@@ -1590,13 +1590,13 @@
 --
 -- /See:/ 'replicationGroup' smart constructor.
 data ReplicationGroup = ReplicationGroup'
-    { _rgNodeGroups            :: !(Maybe [NodeGroup])
-    , _rgStatus                :: !(Maybe Text)
+    { _rgStatus                :: !(Maybe Text)
+    , _rgNodeGroups            :: !(Maybe [NodeGroup])
     , _rgSnapshottingClusterId :: !(Maybe Text)
     , _rgMemberClusters        :: !(Maybe [Text])
+    , _rgDescription           :: !(Maybe Text)
     , _rgReplicationGroupId    :: !(Maybe Text)
     , _rgPendingModifiedValues :: !(Maybe ReplicationGroupPendingModifiedValues)
-    , _rgDescription           :: !(Maybe Text)
     , _rgAutomaticFailover     :: !(Maybe AutomaticFailoverStatus)
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
@@ -1604,45 +1604,45 @@
 --
 -- Use one of the following lenses to modify other fields as desired:
 --
--- * 'rgNodeGroups'
---
 -- * 'rgStatus'
 --
+-- * 'rgNodeGroups'
+--
 -- * 'rgSnapshottingClusterId'
 --
 -- * 'rgMemberClusters'
 --
+-- * 'rgDescription'
+--
 -- * 'rgReplicationGroupId'
 --
 -- * 'rgPendingModifiedValues'
 --
--- * 'rgDescription'
---
 -- * 'rgAutomaticFailover'
 replicationGroup
     :: ReplicationGroup
 replicationGroup =
     ReplicationGroup'
-    { _rgNodeGroups = Nothing
-    , _rgStatus = Nothing
+    { _rgStatus = Nothing
+    , _rgNodeGroups = Nothing
     , _rgSnapshottingClusterId = Nothing
     , _rgMemberClusters = Nothing
+    , _rgDescription = Nothing
     , _rgReplicationGroupId = Nothing
     , _rgPendingModifiedValues = Nothing
-    , _rgDescription = Nothing
     , _rgAutomaticFailover = Nothing
     }
 
--- | A single element list with information about the nodes in the
--- replication group.
-rgNodeGroups :: Lens' ReplicationGroup [NodeGroup]
-rgNodeGroups = lens _rgNodeGroups (\ s a -> s{_rgNodeGroups = a}) . _Default . _Coerce;
-
 -- | The current state of this replication group - /creating/, /available/,
 -- etc.
 rgStatus :: Lens' ReplicationGroup (Maybe Text)
 rgStatus = lens _rgStatus (\ s a -> s{_rgStatus = a});
 
+-- | A single element list with information about the nodes in the
+-- replication group.
+rgNodeGroups :: Lens' ReplicationGroup [NodeGroup]
+rgNodeGroups = lens _rgNodeGroups (\ s a -> s{_rgNodeGroups = a}) . _Default . _Coerce;
+
 -- | The cache cluster ID that is used as the daily snapshot source for the
 -- replication group.
 rgSnapshottingClusterId :: Lens' ReplicationGroup (Maybe Text)
@@ -1653,6 +1653,10 @@
 rgMemberClusters :: Lens' ReplicationGroup [Text]
 rgMemberClusters = lens _rgMemberClusters (\ s a -> s{_rgMemberClusters = a}) . _Default . _Coerce;
 
+-- | The description of the replication group.
+rgDescription :: Lens' ReplicationGroup (Maybe Text)
+rgDescription = lens _rgDescription (\ s a -> s{_rgDescription = a});
+
 -- | The identifier for the replication group.
 rgReplicationGroupId :: Lens' ReplicationGroup (Maybe Text)
 rgReplicationGroupId = lens _rgReplicationGroupId (\ s a -> s{_rgReplicationGroupId = a});
@@ -1662,10 +1666,6 @@
 rgPendingModifiedValues :: Lens' ReplicationGroup (Maybe ReplicationGroupPendingModifiedValues)
 rgPendingModifiedValues = lens _rgPendingModifiedValues (\ s a -> s{_rgPendingModifiedValues = a});
 
--- | The description of the replication group.
-rgDescription :: Lens' ReplicationGroup (Maybe Text)
-rgDescription = lens _rgDescription (\ s a -> s{_rgDescription = a});
-
 -- | Indicates the status of Multi-AZ for this replication group.
 --
 -- ElastiCache Multi-AZ replication groups are not supported on:
@@ -1678,16 +1678,16 @@
 instance FromXML ReplicationGroup where
         parseXML x
           = ReplicationGroup' <$>
-              (x .@? "NodeGroups" .!@ mempty >>=
-                 may (parseXMLList "NodeGroup"))
-                <*> (x .@? "Status")
+              (x .@? "Status") <*>
+                (x .@? "NodeGroups" .!@ mempty >>=
+                   may (parseXMLList "NodeGroup"))
                 <*> (x .@? "SnapshottingClusterId")
                 <*>
                 (x .@? "MemberClusters" .!@ mempty >>=
                    may (parseXMLList "ClusterId"))
+                <*> (x .@? "Description")
                 <*> (x .@? "ReplicationGroupId")
                 <*> (x .@? "PendingModifiedValues")
-                <*> (x .@? "Description")
                 <*> (x .@? "AutomaticFailover")
 
 -- | The settings to be applied to the replication group, either immediately
@@ -1742,13 +1742,13 @@
 data ReservedCacheNode = ReservedCacheNode'
     { _rcnCacheNodeType                :: !(Maybe Text)
     , _rcnState                        :: !(Maybe Text)
-    , _rcnProductDescription           :: !(Maybe Text)
     , _rcnStartTime                    :: !(Maybe ISO8601)
+    , _rcnProductDescription           :: !(Maybe Text)
     , _rcnCacheNodeCount               :: !(Maybe Int)
     , _rcnReservedCacheNodeId          :: !(Maybe Text)
+    , _rcnRecurringCharges             :: !(Maybe [RecurringCharge])
     , _rcnOfferingType                 :: !(Maybe Text)
     , _rcnUsagePrice                   :: !(Maybe Double)
-    , _rcnRecurringCharges             :: !(Maybe [RecurringCharge])
     , _rcnFixedPrice                   :: !(Maybe Double)
     , _rcnDuration                     :: !(Maybe Int)
     , _rcnReservedCacheNodesOfferingId :: !(Maybe Text)
@@ -1762,20 +1762,20 @@
 --
 -- * 'rcnState'
 --
--- * 'rcnProductDescription'
---
 -- * 'rcnStartTime'
 --
+-- * 'rcnProductDescription'
+--
 -- * 'rcnCacheNodeCount'
 --
 -- * 'rcnReservedCacheNodeId'
 --
+-- * 'rcnRecurringCharges'
+--
 -- * 'rcnOfferingType'
 --
 -- * 'rcnUsagePrice'
 --
--- * 'rcnRecurringCharges'
---
 -- * 'rcnFixedPrice'
 --
 -- * 'rcnDuration'
@@ -1787,13 +1787,13 @@
     ReservedCacheNode'
     { _rcnCacheNodeType = Nothing
     , _rcnState = Nothing
-    , _rcnProductDescription = Nothing
     , _rcnStartTime = Nothing
+    , _rcnProductDescription = Nothing
     , _rcnCacheNodeCount = Nothing
     , _rcnReservedCacheNodeId = Nothing
+    , _rcnRecurringCharges = Nothing
     , _rcnOfferingType = Nothing
     , _rcnUsagePrice = Nothing
-    , _rcnRecurringCharges = Nothing
     , _rcnFixedPrice = Nothing
     , _rcnDuration = Nothing
     , _rcnReservedCacheNodesOfferingId = Nothing
@@ -1837,14 +1837,14 @@
 rcnState :: Lens' ReservedCacheNode (Maybe Text)
 rcnState = lens _rcnState (\ s a -> s{_rcnState = a});
 
--- | The description of the reserved cache node.
-rcnProductDescription :: Lens' ReservedCacheNode (Maybe Text)
-rcnProductDescription = lens _rcnProductDescription (\ s a -> s{_rcnProductDescription = a});
-
 -- | The time the reservation started.
 rcnStartTime :: Lens' ReservedCacheNode (Maybe UTCTime)
 rcnStartTime = lens _rcnStartTime (\ s a -> s{_rcnStartTime = a}) . mapping _Time;
 
+-- | The description of the reserved cache node.
+rcnProductDescription :: Lens' ReservedCacheNode (Maybe Text)
+rcnProductDescription = lens _rcnProductDescription (\ s a -> s{_rcnProductDescription = a});
+
 -- | The number of cache nodes that have been reserved.
 rcnCacheNodeCount :: Lens' ReservedCacheNode (Maybe Int)
 rcnCacheNodeCount = lens _rcnCacheNodeCount (\ s a -> s{_rcnCacheNodeCount = a});
@@ -1853,6 +1853,10 @@
 rcnReservedCacheNodeId :: Lens' ReservedCacheNode (Maybe Text)
 rcnReservedCacheNodeId = lens _rcnReservedCacheNodeId (\ s a -> s{_rcnReservedCacheNodeId = a});
 
+-- | The recurring price charged to run this reserved cache node.
+rcnRecurringCharges :: Lens' ReservedCacheNode [RecurringCharge]
+rcnRecurringCharges = lens _rcnRecurringCharges (\ s a -> s{_rcnRecurringCharges = a}) . _Default . _Coerce;
+
 -- | The offering type of this reserved cache node.
 rcnOfferingType :: Lens' ReservedCacheNode (Maybe Text)
 rcnOfferingType = lens _rcnOfferingType (\ s a -> s{_rcnOfferingType = a});
@@ -1861,10 +1865,6 @@
 rcnUsagePrice :: Lens' ReservedCacheNode (Maybe Double)
 rcnUsagePrice = lens _rcnUsagePrice (\ s a -> s{_rcnUsagePrice = a});
 
--- | The recurring price charged to run this reserved cache node.
-rcnRecurringCharges :: Lens' ReservedCacheNode [RecurringCharge]
-rcnRecurringCharges = lens _rcnRecurringCharges (\ s a -> s{_rcnRecurringCharges = a}) . _Default . _Coerce;
-
 -- | The fixed price charged for this reserved cache node.
 rcnFixedPrice :: Lens' ReservedCacheNode (Maybe Double)
 rcnFixedPrice = lens _rcnFixedPrice (\ s a -> s{_rcnFixedPrice = a});
@@ -1881,15 +1881,15 @@
         parseXML x
           = ReservedCacheNode' <$>
               (x .@? "CacheNodeType") <*> (x .@? "State") <*>
-                (x .@? "ProductDescription")
-                <*> (x .@? "StartTime")
+                (x .@? "StartTime")
+                <*> (x .@? "ProductDescription")
                 <*> (x .@? "CacheNodeCount")
                 <*> (x .@? "ReservedCacheNodeId")
-                <*> (x .@? "OfferingType")
-                <*> (x .@? "UsagePrice")
                 <*>
                 (x .@? "RecurringCharges" .!@ mempty >>=
                    may (parseXMLList "RecurringCharge"))
+                <*> (x .@? "OfferingType")
+                <*> (x .@? "UsagePrice")
                 <*> (x .@? "FixedPrice")
                 <*> (x .@? "Duration")
                 <*> (x .@? "ReservedCacheNodesOfferingId")
@@ -1900,9 +1900,9 @@
 data ReservedCacheNodesOffering = ReservedCacheNodesOffering'
     { _rcnoCacheNodeType                :: !(Maybe Text)
     , _rcnoProductDescription           :: !(Maybe Text)
+    , _rcnoRecurringCharges             :: !(Maybe [RecurringCharge])
     , _rcnoOfferingType                 :: !(Maybe Text)
     , _rcnoUsagePrice                   :: !(Maybe Double)
-    , _rcnoRecurringCharges             :: !(Maybe [RecurringCharge])
     , _rcnoFixedPrice                   :: !(Maybe Double)
     , _rcnoDuration                     :: !(Maybe Int)
     , _rcnoReservedCacheNodesOfferingId :: !(Maybe Text)
@@ -1916,12 +1916,12 @@
 --
 -- * 'rcnoProductDescription'
 --
+-- * 'rcnoRecurringCharges'
+--
 -- * 'rcnoOfferingType'
 --
 -- * 'rcnoUsagePrice'
 --
--- * 'rcnoRecurringCharges'
---
 -- * 'rcnoFixedPrice'
 --
 -- * 'rcnoDuration'
@@ -1933,9 +1933,9 @@
     ReservedCacheNodesOffering'
     { _rcnoCacheNodeType = Nothing
     , _rcnoProductDescription = Nothing
+    , _rcnoRecurringCharges = Nothing
     , _rcnoOfferingType = Nothing
     , _rcnoUsagePrice = Nothing
-    , _rcnoRecurringCharges = Nothing
     , _rcnoFixedPrice = Nothing
     , _rcnoDuration = Nothing
     , _rcnoReservedCacheNodesOfferingId = Nothing
@@ -1979,6 +1979,10 @@
 rcnoProductDescription :: Lens' ReservedCacheNodesOffering (Maybe Text)
 rcnoProductDescription = lens _rcnoProductDescription (\ s a -> s{_rcnoProductDescription = a});
 
+-- | The recurring price charged to run this reserved cache node.
+rcnoRecurringCharges :: Lens' ReservedCacheNodesOffering [RecurringCharge]
+rcnoRecurringCharges = lens _rcnoRecurringCharges (\ s a -> s{_rcnoRecurringCharges = a}) . _Default . _Coerce;
+
 -- | The offering type.
 rcnoOfferingType :: Lens' ReservedCacheNodesOffering (Maybe Text)
 rcnoOfferingType = lens _rcnoOfferingType (\ s a -> s{_rcnoOfferingType = a});
@@ -1987,10 +1991,6 @@
 rcnoUsagePrice :: Lens' ReservedCacheNodesOffering (Maybe Double)
 rcnoUsagePrice = lens _rcnoUsagePrice (\ s a -> s{_rcnoUsagePrice = a});
 
--- | The recurring price charged to run this reserved cache node.
-rcnoRecurringCharges :: Lens' ReservedCacheNodesOffering [RecurringCharge]
-rcnoRecurringCharges = lens _rcnoRecurringCharges (\ s a -> s{_rcnoRecurringCharges = a}) . _Default . _Coerce;
-
 -- | The fixed price charged for this offering.
 rcnoFixedPrice :: Lens' ReservedCacheNodesOffering (Maybe Double)
 rcnoFixedPrice = lens _rcnoFixedPrice (\ s a -> s{_rcnoFixedPrice = a});
@@ -2008,11 +2008,11 @@
           = ReservedCacheNodesOffering' <$>
               (x .@? "CacheNodeType") <*>
                 (x .@? "ProductDescription")
-                <*> (x .@? "OfferingType")
-                <*> (x .@? "UsagePrice")
                 <*>
                 (x .@? "RecurringCharges" .!@ mempty >>=
                    may (parseXMLList "RecurringCharge"))
+                <*> (x .@? "OfferingType")
+                <*> (x .@? "UsagePrice")
                 <*> (x .@? "FixedPrice")
                 <*> (x .@? "Duration")
                 <*> (x .@? "ReservedCacheNodesOfferingId")
@@ -2060,48 +2060,48 @@
 --
 -- /See:/ 'snapshot' smart constructor.
 data Snapshot = Snapshot'
-    { _sCacheNodeType              :: !(Maybe Text)
-    , _sEngineVersion              :: !(Maybe Text)
+    { _sEngineVersion              :: !(Maybe Text)
+    , _sCacheNodeType              :: !(Maybe Text)
     , _sCacheClusterCreateTime     :: !(Maybe ISO8601)
     , _sAutoMinorVersionUpgrade    :: !(Maybe Bool)
     , _sCacheParameterGroupName    :: !(Maybe Text)
+    , _sVPCId                      :: !(Maybe Text)
     , _sSnapshotStatus             :: !(Maybe Text)
     , _sSnapshotWindow             :: !(Maybe Text)
-    , _sVPCId                      :: !(Maybe Text)
     , _sCacheClusterId             :: !(Maybe Text)
     , _sEngine                     :: !(Maybe Text)
     , _sPreferredMaintenanceWindow :: !(Maybe Text)
     , _sTopicARN                   :: !(Maybe Text)
-    , _sCacheSubnetGroupName       :: !(Maybe Text)
     , _sNodeSnapshots              :: !(Maybe [NodeSnapshot])
+    , _sCacheSubnetGroupName       :: !(Maybe Text)
     , _sPreferredAvailabilityZone  :: !(Maybe Text)
     , _sSnapshotRetentionLimit     :: !(Maybe Int)
     , _sSnapshotName               :: !(Maybe Text)
-    , _sSnapshotSource             :: !(Maybe Text)
     , _sNumCacheNodes              :: !(Maybe Int)
     , _sPort                       :: !(Maybe Int)
+    , _sSnapshotSource             :: !(Maybe Text)
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'Snapshot' with the minimum fields required to make a request.
 --
 -- Use one of the following lenses to modify other fields as desired:
 --
--- * 'sCacheNodeType'
---
 -- * 'sEngineVersion'
 --
+-- * 'sCacheNodeType'
+--
 -- * 'sCacheClusterCreateTime'
 --
 -- * 'sAutoMinorVersionUpgrade'
 --
 -- * 'sCacheParameterGroupName'
 --
+-- * 'sVPCId'
+--
 -- * 'sSnapshotStatus'
 --
 -- * 'sSnapshotWindow'
 --
--- * 'sVPCId'
---
 -- * 'sCacheClusterId'
 --
 -- * 'sEngine'
@@ -2110,47 +2110,52 @@
 --
 -- * 'sTopicARN'
 --
--- * 'sCacheSubnetGroupName'
---
 -- * 'sNodeSnapshots'
 --
+-- * 'sCacheSubnetGroupName'
+--
 -- * 'sPreferredAvailabilityZone'
 --
 -- * 'sSnapshotRetentionLimit'
 --
 -- * 'sSnapshotName'
 --
--- * 'sSnapshotSource'
---
 -- * 'sNumCacheNodes'
 --
 -- * 'sPort'
+--
+-- * 'sSnapshotSource'
 snapshot
     :: Snapshot
 snapshot =
     Snapshot'
-    { _sCacheNodeType = Nothing
-    , _sEngineVersion = Nothing
+    { _sEngineVersion = Nothing
+    , _sCacheNodeType = Nothing
     , _sCacheClusterCreateTime = Nothing
     , _sAutoMinorVersionUpgrade = Nothing
     , _sCacheParameterGroupName = Nothing
+    , _sVPCId = Nothing
     , _sSnapshotStatus = Nothing
     , _sSnapshotWindow = Nothing
-    , _sVPCId = Nothing
     , _sCacheClusterId = Nothing
     , _sEngine = Nothing
     , _sPreferredMaintenanceWindow = Nothing
     , _sTopicARN = Nothing
-    , _sCacheSubnetGroupName = Nothing
     , _sNodeSnapshots = Nothing
+    , _sCacheSubnetGroupName = Nothing
     , _sPreferredAvailabilityZone = Nothing
     , _sSnapshotRetentionLimit = Nothing
     , _sSnapshotName = Nothing
-    , _sSnapshotSource = Nothing
     , _sNumCacheNodes = Nothing
     , _sPort = Nothing
+    , _sSnapshotSource = Nothing
     }
 
+-- | The version of the cache engine version that is used by the source cache
+-- cluster.
+sEngineVersion :: Lens' Snapshot (Maybe Text)
+sEngineVersion = lens _sEngineVersion (\ s a -> s{_sEngineVersion = a});
+
 -- | The name of the compute and memory capacity node type for the source
 -- cache cluster.
 --
@@ -2186,11 +2191,6 @@
 sCacheNodeType :: Lens' Snapshot (Maybe Text)
 sCacheNodeType = lens _sCacheNodeType (\ s a -> s{_sCacheNodeType = a});
 
--- | The version of the cache engine version that is used by the source cache
--- cluster.
-sEngineVersion :: Lens' Snapshot (Maybe Text)
-sEngineVersion = lens _sEngineVersion (\ s a -> s{_sEngineVersion = a});
-
 -- | The date and time when the source cache cluster was created.
 sCacheClusterCreateTime :: Lens' Snapshot (Maybe UTCTime)
 sCacheClusterCreateTime = lens _sCacheClusterCreateTime (\ s a -> s{_sCacheClusterCreateTime = a}) . mapping _Time;
@@ -2204,6 +2204,11 @@
 sCacheParameterGroupName :: Lens' Snapshot (Maybe Text)
 sCacheParameterGroupName = lens _sCacheParameterGroupName (\ s a -> s{_sCacheParameterGroupName = a});
 
+-- | The Amazon Virtual Private Cloud identifier (VPC ID) of the cache subnet
+-- group for the source cache cluster.
+sVPCId :: Lens' Snapshot (Maybe Text)
+sVPCId = lens _sVPCId (\ s a -> s{_sVPCId = a});
+
 -- | The status of the snapshot. Valid values: 'creating' | 'available' |
 -- 'restoring' | 'copying' | 'deleting'.
 sSnapshotStatus :: Lens' Snapshot (Maybe Text)
@@ -2214,11 +2219,6 @@
 sSnapshotWindow :: Lens' Snapshot (Maybe Text)
 sSnapshotWindow = lens _sSnapshotWindow (\ s a -> s{_sSnapshotWindow = a});
 
--- | The Amazon Virtual Private Cloud identifier (VPC ID) of the cache subnet
--- group for the source cache cluster.
-sVPCId :: Lens' Snapshot (Maybe Text)
-sVPCId = lens _sVPCId (\ s a -> s{_sVPCId = a});
-
 -- | The user-supplied identifier of the source cache cluster.
 sCacheClusterId :: Lens' Snapshot (Maybe Text)
 sCacheClusterId = lens _sCacheClusterId (\ s a -> s{_sCacheClusterId = a});
@@ -2250,15 +2250,15 @@
 sTopicARN :: Lens' Snapshot (Maybe Text)
 sTopicARN = lens _sTopicARN (\ s a -> s{_sTopicARN = a});
 
+-- | A list of the cache nodes in the source cache cluster.
+sNodeSnapshots :: Lens' Snapshot [NodeSnapshot]
+sNodeSnapshots = lens _sNodeSnapshots (\ s a -> s{_sNodeSnapshots = a}) . _Default . _Coerce;
+
 -- | The name of the cache subnet group associated with the source cache
 -- cluster.
 sCacheSubnetGroupName :: Lens' Snapshot (Maybe Text)
 sCacheSubnetGroupName = lens _sCacheSubnetGroupName (\ s a -> s{_sCacheSubnetGroupName = a});
 
--- | A list of the cache nodes in the source cache cluster.
-sNodeSnapshots :: Lens' Snapshot [NodeSnapshot]
-sNodeSnapshots = lens _sNodeSnapshots (\ s a -> s{_sNodeSnapshots = a}) . _Default . _Coerce;
-
 -- | The name of the Availability Zone in which the source cache cluster is
 -- located.
 sPreferredAvailabilityZone :: Lens' Snapshot (Maybe Text)
@@ -2283,11 +2283,6 @@
 sSnapshotName :: Lens' Snapshot (Maybe Text)
 sSnapshotName = lens _sSnapshotName (\ s a -> s{_sSnapshotName = a});
 
--- | Indicates whether the snapshot is from an automatic backup ('automated')
--- or was created manually ('manual').
-sSnapshotSource :: Lens' Snapshot (Maybe Text)
-sSnapshotSource = lens _sSnapshotSource (\ s a -> s{_sSnapshotSource = a});
-
 -- | The number of cache nodes in the source cache cluster.
 --
 -- For clusters running Redis, this value must be 1. For clusters running
@@ -2299,30 +2294,35 @@
 sPort :: Lens' Snapshot (Maybe Int)
 sPort = lens _sPort (\ s a -> s{_sPort = a});
 
+-- | Indicates whether the snapshot is from an automatic backup ('automated')
+-- or was created manually ('manual').
+sSnapshotSource :: Lens' Snapshot (Maybe Text)
+sSnapshotSource = lens _sSnapshotSource (\ s a -> s{_sSnapshotSource = a});
+
 instance FromXML Snapshot where
         parseXML x
           = Snapshot' <$>
-              (x .@? "CacheNodeType") <*> (x .@? "EngineVersion")
+              (x .@? "EngineVersion") <*> (x .@? "CacheNodeType")
                 <*> (x .@? "CacheClusterCreateTime")
                 <*> (x .@? "AutoMinorVersionUpgrade")
                 <*> (x .@? "CacheParameterGroupName")
+                <*> (x .@? "VpcId")
                 <*> (x .@? "SnapshotStatus")
                 <*> (x .@? "SnapshotWindow")
-                <*> (x .@? "VpcId")
                 <*> (x .@? "CacheClusterId")
                 <*> (x .@? "Engine")
                 <*> (x .@? "PreferredMaintenanceWindow")
                 <*> (x .@? "TopicArn")
-                <*> (x .@? "CacheSubnetGroupName")
                 <*>
                 (x .@? "NodeSnapshots" .!@ mempty >>=
                    may (parseXMLList "NodeSnapshot"))
+                <*> (x .@? "CacheSubnetGroupName")
                 <*> (x .@? "PreferredAvailabilityZone")
                 <*> (x .@? "SnapshotRetentionLimit")
                 <*> (x .@? "SnapshotName")
-                <*> (x .@? "SnapshotSource")
                 <*> (x .@? "NumCacheNodes")
                 <*> (x .@? "Port")
+                <*> (x .@? "SnapshotSource")
 
 -- | Represents the subnet associated with a cache cluster. This parameter
 -- refers to subnets defined in Amazon Virtual Private Cloud (Amazon VPC)
diff --git a/test/Test/AWS/Gen/ElastiCache.hs b/test/Test/AWS/Gen/ElastiCache.hs
--- a/test/Test/AWS/Gen/ElastiCache.hs
+++ b/test/Test/AWS/Gen/ElastiCache.hs
@@ -43,6 +43,9 @@
 --         , testRevokeCacheSecurityGroupIngress $
 --             revokeCacheSecurityGroupIngress
 --
+--         , testCreateCacheCluster $
+--             createCacheCluster
+--
 --         , testDescribeEvents $
 --             describeEvents
 --
@@ -52,27 +55,24 @@
 --         , testModifyCacheParameterGroup $
 --             modifyCacheParameterGroup
 --
---         , testCreateCacheCluster $
---             createCacheCluster
+--         , testDeleteReplicationGroup $
+--             deleteReplicationGroup
 --
 --         , testListTagsForResource $
 --             listTagsForResource
 --
---         , testDeleteReplicationGroup $
---             deleteReplicationGroup
+--         , testDescribeCacheClusters $
+--             describeCacheClusters
 --
 --         , testPurchaseReservedCacheNodesOffering $
 --             purchaseReservedCacheNodesOffering
 --
---         , testDescribeCacheClusters $
---             describeCacheClusters
+--         , testRemoveTagsFromResource $
+--             removeTagsFromResource
 --
 --         , testModifyReplicationGroup $
 --             modifyReplicationGroup
 --
---         , testRemoveTagsFromResource $
---             removeTagsFromResource
---
 --         , testDescribeCacheParameters $
 --             describeCacheParameters
 --
@@ -103,14 +103,14 @@
 --         , testDescribeSnapshots $
 --             describeSnapshots
 --
---         , testDescribeReservedCacheNodesOfferings $
---             describeReservedCacheNodesOfferings
+--         , testDescribeReplicationGroups $
+--             describeReplicationGroups
 --
 --         , testDeleteSnapshot $
 --             deleteSnapshot
 --
---         , testDescribeReplicationGroups $
---             describeReplicationGroups
+--         , testDescribeReservedCacheNodesOfferings $
+--             describeReservedCacheNodesOfferings
 --
 --         , testModifyCacheSubnetGroup $
 --             modifyCacheSubnetGroup
@@ -118,24 +118,24 @@
 --         , testCreateSnapshot $
 --             createSnapshot
 --
---         , testDescribeCacheSecurityGroups $
---             describeCacheSecurityGroups
---
 --         , testDeleteCacheParameterGroup $
 --             deleteCacheParameterGroup
 --
---         , testDescribeReservedCacheNodes $
---             describeReservedCacheNodes
---
---         , testDescribeCacheEngineVersions $
---             describeCacheEngineVersions
+--         , testDescribeCacheSecurityGroups $
+--             describeCacheSecurityGroups
 --
 --         , testModifyCacheCluster $
 --             modifyCacheCluster
 --
+--         , testDescribeCacheEngineVersions $
+--             describeCacheEngineVersions
+--
 --         , testCreateCacheParameterGroup $
 --             createCacheParameterGroup
 --
+--         , testDescribeReservedCacheNodes $
+--             describeReservedCacheNodes
+--
 --         , testDeleteCacheSubnetGroup $
 --             deleteCacheSubnetGroup
 --
@@ -157,6 +157,9 @@
 --         , testRevokeCacheSecurityGroupIngressResponse $
 --             revokeCacheSecurityGroupIngressResponse
 --
+--         , testCreateCacheClusterResponse $
+--             createCacheClusterResponse
+--
 --         , testDescribeEventsResponse $
 --             describeEventsResponse
 --
@@ -166,27 +169,24 @@
 --         , testModifyCacheParameterGroupResponse $
 --             cacheParameterGroupNameMessage
 --
---         , testCreateCacheClusterResponse $
---             createCacheClusterResponse
+--         , testDeleteReplicationGroupResponse $
+--             deleteReplicationGroupResponse
 --
 --         , testListTagsForResourceResponse $
 --             tagListMessage
 --
---         , testDeleteReplicationGroupResponse $
---             deleteReplicationGroupResponse
+--         , testDescribeCacheClustersResponse $
+--             describeCacheClustersResponse
 --
 --         , testPurchaseReservedCacheNodesOfferingResponse $
 --             purchaseReservedCacheNodesOfferingResponse
 --
---         , testDescribeCacheClustersResponse $
---             describeCacheClustersResponse
+--         , testRemoveTagsFromResourceResponse $
+--             tagListMessage
 --
 --         , testModifyReplicationGroupResponse $
 --             modifyReplicationGroupResponse
 --
---         , testRemoveTagsFromResourceResponse $
---             tagListMessage
---
 --         , testDescribeCacheParametersResponse $
 --             describeCacheParametersResponse
 --
@@ -217,14 +217,14 @@
 --         , testDescribeSnapshotsResponse $
 --             describeSnapshotsResponse
 --
---         , testDescribeReservedCacheNodesOfferingsResponse $
---             describeReservedCacheNodesOfferingsResponse
+--         , testDescribeReplicationGroupsResponse $
+--             describeReplicationGroupsResponse
 --
 --         , testDeleteSnapshotResponse $
 --             deleteSnapshotResponse
 --
---         , testDescribeReplicationGroupsResponse $
---             describeReplicationGroupsResponse
+--         , testDescribeReservedCacheNodesOfferingsResponse $
+--             describeReservedCacheNodesOfferingsResponse
 --
 --         , testModifyCacheSubnetGroupResponse $
 --             modifyCacheSubnetGroupResponse
@@ -232,24 +232,24 @@
 --         , testCreateSnapshotResponse $
 --             createSnapshotResponse
 --
---         , testDescribeCacheSecurityGroupsResponse $
---             describeCacheSecurityGroupsResponse
---
 --         , testDeleteCacheParameterGroupResponse $
 --             deleteCacheParameterGroupResponse
 --
---         , testDescribeReservedCacheNodesResponse $
---             describeReservedCacheNodesResponse
---
---         , testDescribeCacheEngineVersionsResponse $
---             describeCacheEngineVersionsResponse
+--         , testDescribeCacheSecurityGroupsResponse $
+--             describeCacheSecurityGroupsResponse
 --
 --         , testModifyCacheClusterResponse $
 --             modifyCacheClusterResponse
 --
+--         , testDescribeCacheEngineVersionsResponse $
+--             describeCacheEngineVersionsResponse
+--
 --         , testCreateCacheParameterGroupResponse $
 --             createCacheParameterGroupResponse
 --
+--         , testDescribeReservedCacheNodesResponse $
+--             describeReservedCacheNodesResponse
+--
 --         , testDeleteCacheSubnetGroupResponse $
 --             deleteCacheSubnetGroupResponse
 --
@@ -283,6 +283,11 @@
     "RevokeCacheSecurityGroupIngress"
     "fixture/RevokeCacheSecurityGroupIngress.yaml"
 
+testCreateCacheCluster :: CreateCacheCluster -> TestTree
+testCreateCacheCluster = req
+    "CreateCacheCluster"
+    "fixture/CreateCacheCluster.yaml"
+
 testDescribeEvents :: DescribeEvents -> TestTree
 testDescribeEvents = req
     "DescribeEvents"
@@ -298,41 +303,36 @@
     "ModifyCacheParameterGroup"
     "fixture/ModifyCacheParameterGroup.yaml"
 
-testCreateCacheCluster :: CreateCacheCluster -> TestTree
-testCreateCacheCluster = req
-    "CreateCacheCluster"
-    "fixture/CreateCacheCluster.yaml"
+testDeleteReplicationGroup :: DeleteReplicationGroup -> TestTree
+testDeleteReplicationGroup = req
+    "DeleteReplicationGroup"
+    "fixture/DeleteReplicationGroup.yaml"
 
 testListTagsForResource :: ListTagsForResource -> TestTree
 testListTagsForResource = req
     "ListTagsForResource"
     "fixture/ListTagsForResource.yaml"
 
-testDeleteReplicationGroup :: DeleteReplicationGroup -> TestTree
-testDeleteReplicationGroup = req
-    "DeleteReplicationGroup"
-    "fixture/DeleteReplicationGroup.yaml"
+testDescribeCacheClusters :: DescribeCacheClusters -> TestTree
+testDescribeCacheClusters = req
+    "DescribeCacheClusters"
+    "fixture/DescribeCacheClusters.yaml"
 
 testPurchaseReservedCacheNodesOffering :: PurchaseReservedCacheNodesOffering -> TestTree
 testPurchaseReservedCacheNodesOffering = req
     "PurchaseReservedCacheNodesOffering"
     "fixture/PurchaseReservedCacheNodesOffering.yaml"
 
-testDescribeCacheClusters :: DescribeCacheClusters -> TestTree
-testDescribeCacheClusters = req
-    "DescribeCacheClusters"
-    "fixture/DescribeCacheClusters.yaml"
+testRemoveTagsFromResource :: RemoveTagsFromResource -> TestTree
+testRemoveTagsFromResource = req
+    "RemoveTagsFromResource"
+    "fixture/RemoveTagsFromResource.yaml"
 
 testModifyReplicationGroup :: ModifyReplicationGroup -> TestTree
 testModifyReplicationGroup = req
     "ModifyReplicationGroup"
     "fixture/ModifyReplicationGroup.yaml"
 
-testRemoveTagsFromResource :: RemoveTagsFromResource -> TestTree
-testRemoveTagsFromResource = req
-    "RemoveTagsFromResource"
-    "fixture/RemoveTagsFromResource.yaml"
-
 testDescribeCacheParameters :: DescribeCacheParameters -> TestTree
 testDescribeCacheParameters = req
     "DescribeCacheParameters"
@@ -383,20 +383,20 @@
     "DescribeSnapshots"
     "fixture/DescribeSnapshots.yaml"
 
-testDescribeReservedCacheNodesOfferings :: DescribeReservedCacheNodesOfferings -> TestTree
-testDescribeReservedCacheNodesOfferings = req
-    "DescribeReservedCacheNodesOfferings"
-    "fixture/DescribeReservedCacheNodesOfferings.yaml"
+testDescribeReplicationGroups :: DescribeReplicationGroups -> TestTree
+testDescribeReplicationGroups = req
+    "DescribeReplicationGroups"
+    "fixture/DescribeReplicationGroups.yaml"
 
 testDeleteSnapshot :: DeleteSnapshot -> TestTree
 testDeleteSnapshot = req
     "DeleteSnapshot"
     "fixture/DeleteSnapshot.yaml"
 
-testDescribeReplicationGroups :: DescribeReplicationGroups -> TestTree
-testDescribeReplicationGroups = req
-    "DescribeReplicationGroups"
-    "fixture/DescribeReplicationGroups.yaml"
+testDescribeReservedCacheNodesOfferings :: DescribeReservedCacheNodesOfferings -> TestTree
+testDescribeReservedCacheNodesOfferings = req
+    "DescribeReservedCacheNodesOfferings"
+    "fixture/DescribeReservedCacheNodesOfferings.yaml"
 
 testModifyCacheSubnetGroup :: ModifyCacheSubnetGroup -> TestTree
 testModifyCacheSubnetGroup = req
@@ -408,36 +408,36 @@
     "CreateSnapshot"
     "fixture/CreateSnapshot.yaml"
 
-testDescribeCacheSecurityGroups :: DescribeCacheSecurityGroups -> TestTree
-testDescribeCacheSecurityGroups = req
-    "DescribeCacheSecurityGroups"
-    "fixture/DescribeCacheSecurityGroups.yaml"
-
 testDeleteCacheParameterGroup :: DeleteCacheParameterGroup -> TestTree
 testDeleteCacheParameterGroup = req
     "DeleteCacheParameterGroup"
     "fixture/DeleteCacheParameterGroup.yaml"
 
-testDescribeReservedCacheNodes :: DescribeReservedCacheNodes -> TestTree
-testDescribeReservedCacheNodes = req
-    "DescribeReservedCacheNodes"
-    "fixture/DescribeReservedCacheNodes.yaml"
-
-testDescribeCacheEngineVersions :: DescribeCacheEngineVersions -> TestTree
-testDescribeCacheEngineVersions = req
-    "DescribeCacheEngineVersions"
-    "fixture/DescribeCacheEngineVersions.yaml"
+testDescribeCacheSecurityGroups :: DescribeCacheSecurityGroups -> TestTree
+testDescribeCacheSecurityGroups = req
+    "DescribeCacheSecurityGroups"
+    "fixture/DescribeCacheSecurityGroups.yaml"
 
 testModifyCacheCluster :: ModifyCacheCluster -> TestTree
 testModifyCacheCluster = req
     "ModifyCacheCluster"
     "fixture/ModifyCacheCluster.yaml"
 
+testDescribeCacheEngineVersions :: DescribeCacheEngineVersions -> TestTree
+testDescribeCacheEngineVersions = req
+    "DescribeCacheEngineVersions"
+    "fixture/DescribeCacheEngineVersions.yaml"
+
 testCreateCacheParameterGroup :: CreateCacheParameterGroup -> TestTree
 testCreateCacheParameterGroup = req
     "CreateCacheParameterGroup"
     "fixture/CreateCacheParameterGroup.yaml"
 
+testDescribeReservedCacheNodes :: DescribeReservedCacheNodes -> TestTree
+testDescribeReservedCacheNodes = req
+    "DescribeReservedCacheNodes"
+    "fixture/DescribeReservedCacheNodes.yaml"
+
 testDeleteCacheSubnetGroup :: DeleteCacheSubnetGroup -> TestTree
 testDeleteCacheSubnetGroup = req
     "DeleteCacheSubnetGroup"
@@ -480,6 +480,13 @@
     elastiCache
     (Proxy :: Proxy RevokeCacheSecurityGroupIngress)
 
+testCreateCacheClusterResponse :: CreateCacheClusterResponse -> TestTree
+testCreateCacheClusterResponse = res
+    "CreateCacheClusterResponse"
+    "fixture/CreateCacheClusterResponse.proto"
+    elastiCache
+    (Proxy :: Proxy CreateCacheCluster)
+
 testDescribeEventsResponse :: DescribeEventsResponse -> TestTree
 testDescribeEventsResponse = res
     "DescribeEventsResponse"
@@ -501,12 +508,12 @@
     elastiCache
     (Proxy :: Proxy ModifyCacheParameterGroup)
 
-testCreateCacheClusterResponse :: CreateCacheClusterResponse -> TestTree
-testCreateCacheClusterResponse = res
-    "CreateCacheClusterResponse"
-    "fixture/CreateCacheClusterResponse.proto"
+testDeleteReplicationGroupResponse :: DeleteReplicationGroupResponse -> TestTree
+testDeleteReplicationGroupResponse = res
+    "DeleteReplicationGroupResponse"
+    "fixture/DeleteReplicationGroupResponse.proto"
     elastiCache
-    (Proxy :: Proxy CreateCacheCluster)
+    (Proxy :: Proxy DeleteReplicationGroup)
 
 testListTagsForResourceResponse :: TagListMessage -> TestTree
 testListTagsForResourceResponse = res
@@ -515,12 +522,12 @@
     elastiCache
     (Proxy :: Proxy ListTagsForResource)
 
-testDeleteReplicationGroupResponse :: DeleteReplicationGroupResponse -> TestTree
-testDeleteReplicationGroupResponse = res
-    "DeleteReplicationGroupResponse"
-    "fixture/DeleteReplicationGroupResponse.proto"
+testDescribeCacheClustersResponse :: DescribeCacheClustersResponse -> TestTree
+testDescribeCacheClustersResponse = res
+    "DescribeCacheClustersResponse"
+    "fixture/DescribeCacheClustersResponse.proto"
     elastiCache
-    (Proxy :: Proxy DeleteReplicationGroup)
+    (Proxy :: Proxy DescribeCacheClusters)
 
 testPurchaseReservedCacheNodesOfferingResponse :: PurchaseReservedCacheNodesOfferingResponse -> TestTree
 testPurchaseReservedCacheNodesOfferingResponse = res
@@ -529,12 +536,12 @@
     elastiCache
     (Proxy :: Proxy PurchaseReservedCacheNodesOffering)
 
-testDescribeCacheClustersResponse :: DescribeCacheClustersResponse -> TestTree
-testDescribeCacheClustersResponse = res
-    "DescribeCacheClustersResponse"
-    "fixture/DescribeCacheClustersResponse.proto"
+testRemoveTagsFromResourceResponse :: TagListMessage -> TestTree
+testRemoveTagsFromResourceResponse = res
+    "RemoveTagsFromResourceResponse"
+    "fixture/RemoveTagsFromResourceResponse.proto"
     elastiCache
-    (Proxy :: Proxy DescribeCacheClusters)
+    (Proxy :: Proxy RemoveTagsFromResource)
 
 testModifyReplicationGroupResponse :: ModifyReplicationGroupResponse -> TestTree
 testModifyReplicationGroupResponse = res
@@ -543,13 +550,6 @@
     elastiCache
     (Proxy :: Proxy ModifyReplicationGroup)
 
-testRemoveTagsFromResourceResponse :: TagListMessage -> TestTree
-testRemoveTagsFromResourceResponse = res
-    "RemoveTagsFromResourceResponse"
-    "fixture/RemoveTagsFromResourceResponse.proto"
-    elastiCache
-    (Proxy :: Proxy RemoveTagsFromResource)
-
 testDescribeCacheParametersResponse :: DescribeCacheParametersResponse -> TestTree
 testDescribeCacheParametersResponse = res
     "DescribeCacheParametersResponse"
@@ -620,12 +620,12 @@
     elastiCache
     (Proxy :: Proxy DescribeSnapshots)
 
-testDescribeReservedCacheNodesOfferingsResponse :: DescribeReservedCacheNodesOfferingsResponse -> TestTree
-testDescribeReservedCacheNodesOfferingsResponse = res
-    "DescribeReservedCacheNodesOfferingsResponse"
-    "fixture/DescribeReservedCacheNodesOfferingsResponse.proto"
+testDescribeReplicationGroupsResponse :: DescribeReplicationGroupsResponse -> TestTree
+testDescribeReplicationGroupsResponse = res
+    "DescribeReplicationGroupsResponse"
+    "fixture/DescribeReplicationGroupsResponse.proto"
     elastiCache
-    (Proxy :: Proxy DescribeReservedCacheNodesOfferings)
+    (Proxy :: Proxy DescribeReplicationGroups)
 
 testDeleteSnapshotResponse :: DeleteSnapshotResponse -> TestTree
 testDeleteSnapshotResponse = res
@@ -634,12 +634,12 @@
     elastiCache
     (Proxy :: Proxy DeleteSnapshot)
 
-testDescribeReplicationGroupsResponse :: DescribeReplicationGroupsResponse -> TestTree
-testDescribeReplicationGroupsResponse = res
-    "DescribeReplicationGroupsResponse"
-    "fixture/DescribeReplicationGroupsResponse.proto"
+testDescribeReservedCacheNodesOfferingsResponse :: DescribeReservedCacheNodesOfferingsResponse -> TestTree
+testDescribeReservedCacheNodesOfferingsResponse = res
+    "DescribeReservedCacheNodesOfferingsResponse"
+    "fixture/DescribeReservedCacheNodesOfferingsResponse.proto"
     elastiCache
-    (Proxy :: Proxy DescribeReplicationGroups)
+    (Proxy :: Proxy DescribeReservedCacheNodesOfferings)
 
 testModifyCacheSubnetGroupResponse :: ModifyCacheSubnetGroupResponse -> TestTree
 testModifyCacheSubnetGroupResponse = res
@@ -655,13 +655,6 @@
     elastiCache
     (Proxy :: Proxy CreateSnapshot)
 
-testDescribeCacheSecurityGroupsResponse :: DescribeCacheSecurityGroupsResponse -> TestTree
-testDescribeCacheSecurityGroupsResponse = res
-    "DescribeCacheSecurityGroupsResponse"
-    "fixture/DescribeCacheSecurityGroupsResponse.proto"
-    elastiCache
-    (Proxy :: Proxy DescribeCacheSecurityGroups)
-
 testDeleteCacheParameterGroupResponse :: DeleteCacheParameterGroupResponse -> TestTree
 testDeleteCacheParameterGroupResponse = res
     "DeleteCacheParameterGroupResponse"
@@ -669,19 +662,12 @@
     elastiCache
     (Proxy :: Proxy DeleteCacheParameterGroup)
 
-testDescribeReservedCacheNodesResponse :: DescribeReservedCacheNodesResponse -> TestTree
-testDescribeReservedCacheNodesResponse = res
-    "DescribeReservedCacheNodesResponse"
-    "fixture/DescribeReservedCacheNodesResponse.proto"
-    elastiCache
-    (Proxy :: Proxy DescribeReservedCacheNodes)
-
-testDescribeCacheEngineVersionsResponse :: DescribeCacheEngineVersionsResponse -> TestTree
-testDescribeCacheEngineVersionsResponse = res
-    "DescribeCacheEngineVersionsResponse"
-    "fixture/DescribeCacheEngineVersionsResponse.proto"
+testDescribeCacheSecurityGroupsResponse :: DescribeCacheSecurityGroupsResponse -> TestTree
+testDescribeCacheSecurityGroupsResponse = res
+    "DescribeCacheSecurityGroupsResponse"
+    "fixture/DescribeCacheSecurityGroupsResponse.proto"
     elastiCache
-    (Proxy :: Proxy DescribeCacheEngineVersions)
+    (Proxy :: Proxy DescribeCacheSecurityGroups)
 
 testModifyCacheClusterResponse :: ModifyCacheClusterResponse -> TestTree
 testModifyCacheClusterResponse = res
@@ -690,12 +676,26 @@
     elastiCache
     (Proxy :: Proxy ModifyCacheCluster)
 
+testDescribeCacheEngineVersionsResponse :: DescribeCacheEngineVersionsResponse -> TestTree
+testDescribeCacheEngineVersionsResponse = res
+    "DescribeCacheEngineVersionsResponse"
+    "fixture/DescribeCacheEngineVersionsResponse.proto"
+    elastiCache
+    (Proxy :: Proxy DescribeCacheEngineVersions)
+
 testCreateCacheParameterGroupResponse :: CreateCacheParameterGroupResponse -> TestTree
 testCreateCacheParameterGroupResponse = res
     "CreateCacheParameterGroupResponse"
     "fixture/CreateCacheParameterGroupResponse.proto"
     elastiCache
     (Proxy :: Proxy CreateCacheParameterGroup)
+
+testDescribeReservedCacheNodesResponse :: DescribeReservedCacheNodesResponse -> TestTree
+testDescribeReservedCacheNodesResponse = res
+    "DescribeReservedCacheNodesResponse"
+    "fixture/DescribeReservedCacheNodesResponse.proto"
+    elastiCache
+    (Proxy :: Proxy DescribeReservedCacheNodes)
 
 testDeleteCacheSubnetGroupResponse :: DeleteCacheSubnetGroupResponse -> TestTree
 testDeleteCacheSubnetGroupResponse = res
