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-storagegateway.cabal b/amazonka-storagegateway.cabal
--- a/amazonka-storagegateway.cabal
+++ b/amazonka-storagegateway.cabal
@@ -1,5 +1,5 @@
 name:                  amazonka-storagegateway
-version:               1.2.0.2
+version:               1.3.0
 synopsis:              Amazon Storage Gateway SDK.
 homepage:              https://github.com/brendanhay/amazonka
 bug-reports:           https://github.com/brendanhay/amazonka/issues
@@ -125,7 +125,7 @@
         , Network.AWS.StorageGateway.Types.Sum
 
     build-depends:
-          amazonka-core == 1.2.0.*
+          amazonka-core == 1.3.0.*
         , base          >= 4.7     && < 5
 
 test-suite amazonka-storagegateway-test
@@ -145,9 +145,9 @@
         , Test.AWS.StorageGateway.Internal
 
     build-depends:
-          amazonka-core == 1.2.0.*
-        , amazonka-test == 1.2.0.*
-        , amazonka-storagegateway == 1.2.0.*
+          amazonka-core == 1.3.0.*
+        , amazonka-test == 1.3.0.*
+        , amazonka-storagegateway == 1.3.0.*
         , base
         , bytestring
         , lens
diff --git a/gen/Network/AWS/StorageGateway.hs b/gen/Network/AWS/StorageGateway.hs
--- a/gen/Network/AWS/StorageGateway.hs
+++ b/gen/Network/AWS/StorageGateway.hs
@@ -66,29 +66,23 @@
     -- ** CreateStorediSCSIVolume
     , module Network.AWS.StorageGateway.CreateStorediSCSIVolume
 
+    -- ** DescribeChapCredentials
+    , module Network.AWS.StorageGateway.DescribeChapCredentials
+
     -- ** CreateTapes
     , module Network.AWS.StorageGateway.CreateTapes
 
-    -- ** CreateCachediSCSIVolume
-    , module Network.AWS.StorageGateway.CreateCachediSCSIVolume
-
     -- ** UpdateVTLDeviceType
     , module Network.AWS.StorageGateway.UpdateVTLDeviceType
 
-    -- ** DescribeChapCredentials
-    , module Network.AWS.StorageGateway.DescribeChapCredentials
-
-    -- ** AddUploadBuffer
-    , module Network.AWS.StorageGateway.AddUploadBuffer
+    -- ** CreateCachediSCSIVolume
+    , module Network.AWS.StorageGateway.CreateCachediSCSIVolume
 
     -- ** ListVolumeInitiators
     , module Network.AWS.StorageGateway.ListVolumeInitiators
 
-    -- ** DescribeWorkingStorage
-    , module Network.AWS.StorageGateway.DescribeWorkingStorage
-
-    -- ** DescribeCachediSCSIVolumes
-    , module Network.AWS.StorageGateway.DescribeCachediSCSIVolumes
+    -- ** AddUploadBuffer
+    , module Network.AWS.StorageGateway.AddUploadBuffer
 
     -- ** UpdateGatewayInformation
     , module Network.AWS.StorageGateway.UpdateGatewayInformation
@@ -96,6 +90,12 @@
     -- ** DescribeMaintenanceStartTime
     , module Network.AWS.StorageGateway.DescribeMaintenanceStartTime
 
+    -- ** DescribeWorkingStorage
+    , module Network.AWS.StorageGateway.DescribeWorkingStorage
+
+    -- ** DescribeCachediSCSIVolumes
+    , module Network.AWS.StorageGateway.DescribeCachediSCSIVolumes
+
     -- ** AddCache
     , module Network.AWS.StorageGateway.AddCache
 
@@ -114,59 +114,59 @@
     -- ** UpdateChapCredentials
     , module Network.AWS.StorageGateway.UpdateChapCredentials
 
-    -- ** DescribeStorediSCSIVolumes
-    , module Network.AWS.StorageGateway.DescribeStorediSCSIVolumes
+    -- ** DescribeUploadBuffer
+    , module Network.AWS.StorageGateway.DescribeUploadBuffer
 
     -- ** DescribeTapes (Paginated)
     , module Network.AWS.StorageGateway.DescribeTapes
 
-    -- ** DescribeUploadBuffer
-    , module Network.AWS.StorageGateway.DescribeUploadBuffer
+    -- ** DescribeStorediSCSIVolumes
+    , module Network.AWS.StorageGateway.DescribeStorediSCSIVolumes
 
     -- ** CreateSnapshotFromVolumeRecoveryPoint
     , module Network.AWS.StorageGateway.CreateSnapshotFromVolumeRecoveryPoint
 
-    -- ** DescribeGatewayInformation
-    , module Network.AWS.StorageGateway.DescribeGatewayInformation
-
     -- ** RetrieveTapeRecoveryPoint
     , module Network.AWS.StorageGateway.RetrieveTapeRecoveryPoint
 
+    -- ** DeleteGateway
+    , module Network.AWS.StorageGateway.DeleteGateway
+
     -- ** UpdateMaintenanceStartTime
     , module Network.AWS.StorageGateway.UpdateMaintenanceStartTime
 
-    -- ** DeleteGateway
-    , module Network.AWS.StorageGateway.DeleteGateway
+    -- ** DescribeGatewayInformation
+    , module Network.AWS.StorageGateway.DescribeGatewayInformation
 
+    -- ** RetrieveTapeArchive
+    , module Network.AWS.StorageGateway.RetrieveTapeArchive
+
+    -- ** DescribeTapeArchives (Paginated)
+    , module Network.AWS.StorageGateway.DescribeTapeArchives
+
     -- ** DisableGateway
     , module Network.AWS.StorageGateway.DisableGateway
 
     -- ** DescribeSnapshotSchedule
     , module Network.AWS.StorageGateway.DescribeSnapshotSchedule
 
-    -- ** DescribeTapeArchives (Paginated)
-    , module Network.AWS.StorageGateway.DescribeTapeArchives
-
-    -- ** RetrieveTapeArchive
-    , module Network.AWS.StorageGateway.RetrieveTapeArchive
-
     -- ** DescribeBandwidthRateLimit
     , module Network.AWS.StorageGateway.DescribeBandwidthRateLimit
 
-    -- ** DescribeVTLDevices (Paginated)
-    , module Network.AWS.StorageGateway.DescribeVTLDevices
-
-    -- ** CreateSnapshot
-    , module Network.AWS.StorageGateway.CreateSnapshot
+    -- ** DeleteSnapshotSchedule
+    , module Network.AWS.StorageGateway.DeleteSnapshotSchedule
 
     -- ** UpdateSnapshotSchedule
     , module Network.AWS.StorageGateway.UpdateSnapshotSchedule
 
+    -- ** CreateSnapshot
+    , module Network.AWS.StorageGateway.CreateSnapshot
+
     -- ** CancelRetrieval
     , module Network.AWS.StorageGateway.CancelRetrieval
 
-    -- ** DeleteSnapshotSchedule
-    , module Network.AWS.StorageGateway.DeleteSnapshotSchedule
+    -- ** DescribeVTLDevices (Paginated)
+    , module Network.AWS.StorageGateway.DescribeVTLDevices
 
     -- ** DeleteTapeArchive
     , module Network.AWS.StorageGateway.DeleteTapeArchive
@@ -174,23 +174,32 @@
     -- ** ListVolumeRecoveryPoints
     , module Network.AWS.StorageGateway.ListVolumeRecoveryPoints
 
-    -- ** AddWorkingStorage
-    , module Network.AWS.StorageGateway.AddWorkingStorage
+    -- ** ResetCache
+    , module Network.AWS.StorageGateway.ResetCache
 
     -- ** ListGateways (Paginated)
     , module Network.AWS.StorageGateway.ListGateways
 
+    -- ** DeleteTape
+    , module Network.AWS.StorageGateway.DeleteTape
+
+    -- ** ListLocalDisks
+    , module Network.AWS.StorageGateway.ListLocalDisks
+
     -- ** ListVolumes (Paginated)
     , module Network.AWS.StorageGateway.ListVolumes
 
+    -- ** UpdateBandwidthRateLimit
+    , module Network.AWS.StorageGateway.UpdateBandwidthRateLimit
+
+    -- ** AddWorkingStorage
+    , module Network.AWS.StorageGateway.AddWorkingStorage
+
     -- ** DescribeTapeRecoveryPoints (Paginated)
     , module Network.AWS.StorageGateway.DescribeTapeRecoveryPoints
 
-    -- ** DeleteVolume
-    , module Network.AWS.StorageGateway.DeleteVolume
-
-    -- ** ResetCache
-    , module Network.AWS.StorageGateway.ResetCache
+    -- ** DeleteBandwidthRateLimit
+    , module Network.AWS.StorageGateway.DeleteBandwidthRateLimit
 
     -- ** ActivateGateway
     , module Network.AWS.StorageGateway.ActivateGateway
@@ -198,25 +207,16 @@
     -- ** DescribeCache
     , module Network.AWS.StorageGateway.DescribeCache
 
-    -- ** UpdateBandwidthRateLimit
-    , module Network.AWS.StorageGateway.UpdateBandwidthRateLimit
-
-    -- ** DeleteBandwidthRateLimit
-    , module Network.AWS.StorageGateway.DeleteBandwidthRateLimit
-
-    -- ** ListLocalDisks
-    , module Network.AWS.StorageGateway.ListLocalDisks
-
-    -- ** DeleteTape
-    , module Network.AWS.StorageGateway.DeleteTape
+    -- ** DeleteVolume
+    , module Network.AWS.StorageGateway.DeleteVolume
 
     -- * Types
 
     -- ** CachediSCSIVolume
     , CachediSCSIVolume
     , cachediSCSIVolume
-    , cscsivVolumeStatus
     , cscsivVolumeiSCSIAttributes
+    , cscsivVolumeStatus
     , cscsivSourceSnapshotId
     , cscsivVolumeARN
     , cscsivVolumeProgress
@@ -268,24 +268,24 @@
     -- ** StorediSCSIVolume
     , StorediSCSIVolume
     , storediSCSIVolume
-    , sscsivVolumeStatus
     , sscsivVolumeiSCSIAttributes
+    , sscsivVolumeStatus
     , sscsivSourceSnapshotId
     , sscsivPreservedExistingData
     , sscsivVolumeARN
     , sscsivVolumeProgress
     , sscsivVolumeSizeInBytes
     , sscsivVolumeId
-    , sscsivVolumeType
     , sscsivVolumeDiskId
+    , sscsivVolumeType
 
     -- ** Tape
     , Tape
     , tape
     , tTapeBarcode
     , tTapeStatus
-    , tProgress
     , tTapeARN
+    , tProgress
     , tTapeSizeInBytes
     , tVTLDevice
 
diff --git a/gen/Network/AWS/StorageGateway/ActivateGateway.hs b/gen/Network/AWS/StorageGateway/ActivateGateway.hs
--- a/gen/Network/AWS/StorageGateway/ActivateGateway.hs
+++ b/gen/Network/AWS/StorageGateway/ActivateGateway.hs
@@ -50,7 +50,7 @@
     , ActivateGatewayResponse
     -- * Response Lenses
     , agrsGatewayARN
-    , agrsStatus
+    , agrsResponseStatus
     ) where
 
 import           Network.AWS.Prelude
@@ -212,8 +212,8 @@
 --
 -- /See:/ 'activateGatewayResponse' smart constructor.
 data ActivateGatewayResponse = ActivateGatewayResponse'
-    { _agrsGatewayARN :: !(Maybe Text)
-    , _agrsStatus     :: !Int
+    { _agrsGatewayARN     :: !(Maybe Text)
+    , _agrsResponseStatus :: !Int
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'ActivateGatewayResponse' with the minimum fields required to make a request.
@@ -222,14 +222,14 @@
 --
 -- * 'agrsGatewayARN'
 --
--- * 'agrsStatus'
+-- * 'agrsResponseStatus'
 activateGatewayResponse
-    :: Int -- ^ 'agrsStatus'
+    :: Int -- ^ 'agrsResponseStatus'
     -> ActivateGatewayResponse
-activateGatewayResponse pStatus_ =
+activateGatewayResponse pResponseStatus_ =
     ActivateGatewayResponse'
     { _agrsGatewayARN = Nothing
-    , _agrsStatus = pStatus_
+    , _agrsResponseStatus = pResponseStatus_
     }
 
 -- | Undocumented member.
@@ -237,5 +237,5 @@
 agrsGatewayARN = lens _agrsGatewayARN (\ s a -> s{_agrsGatewayARN = a});
 
 -- | The response status code.
-agrsStatus :: Lens' ActivateGatewayResponse Int
-agrsStatus = lens _agrsStatus (\ s a -> s{_agrsStatus = a});
+agrsResponseStatus :: Lens' ActivateGatewayResponse Int
+agrsResponseStatus = lens _agrsResponseStatus (\ s a -> s{_agrsResponseStatus = a});
diff --git a/gen/Network/AWS/StorageGateway/AddCache.hs b/gen/Network/AWS/StorageGateway/AddCache.hs
--- a/gen/Network/AWS/StorageGateway/AddCache.hs
+++ b/gen/Network/AWS/StorageGateway/AddCache.hs
@@ -42,7 +42,7 @@
     , AddCacheResponse
     -- * Response Lenses
     , acrsGatewayARN
-    , acrsStatus
+    , acrsResponseStatus
     ) where
 
 import           Network.AWS.Prelude
@@ -114,8 +114,8 @@
 
 -- | /See:/ 'addCacheResponse' smart constructor.
 data AddCacheResponse = AddCacheResponse'
-    { _acrsGatewayARN :: !(Maybe Text)
-    , _acrsStatus     :: !Int
+    { _acrsGatewayARN     :: !(Maybe Text)
+    , _acrsResponseStatus :: !Int
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'AddCacheResponse' with the minimum fields required to make a request.
@@ -124,14 +124,14 @@
 --
 -- * 'acrsGatewayARN'
 --
--- * 'acrsStatus'
+-- * 'acrsResponseStatus'
 addCacheResponse
-    :: Int -- ^ 'acrsStatus'
+    :: Int -- ^ 'acrsResponseStatus'
     -> AddCacheResponse
-addCacheResponse pStatus_ =
+addCacheResponse pResponseStatus_ =
     AddCacheResponse'
     { _acrsGatewayARN = Nothing
-    , _acrsStatus = pStatus_
+    , _acrsResponseStatus = pResponseStatus_
     }
 
 -- | Undocumented member.
@@ -139,5 +139,5 @@
 acrsGatewayARN = lens _acrsGatewayARN (\ s a -> s{_acrsGatewayARN = a});
 
 -- | The response status code.
-acrsStatus :: Lens' AddCacheResponse Int
-acrsStatus = lens _acrsStatus (\ s a -> s{_acrsStatus = a});
+acrsResponseStatus :: Lens' AddCacheResponse Int
+acrsResponseStatus = lens _acrsResponseStatus (\ s a -> s{_acrsResponseStatus = a});
diff --git a/gen/Network/AWS/StorageGateway/AddUploadBuffer.hs b/gen/Network/AWS/StorageGateway/AddUploadBuffer.hs
--- a/gen/Network/AWS/StorageGateway/AddUploadBuffer.hs
+++ b/gen/Network/AWS/StorageGateway/AddUploadBuffer.hs
@@ -41,7 +41,7 @@
     , AddUploadBufferResponse
     -- * Response Lenses
     , aubrsGatewayARN
-    , aubrsStatus
+    , aubrsResponseStatus
     ) where
 
 import           Network.AWS.Prelude
@@ -114,8 +114,8 @@
 
 -- | /See:/ 'addUploadBufferResponse' smart constructor.
 data AddUploadBufferResponse = AddUploadBufferResponse'
-    { _aubrsGatewayARN :: !(Maybe Text)
-    , _aubrsStatus     :: !Int
+    { _aubrsGatewayARN     :: !(Maybe Text)
+    , _aubrsResponseStatus :: !Int
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'AddUploadBufferResponse' with the minimum fields required to make a request.
@@ -124,14 +124,14 @@
 --
 -- * 'aubrsGatewayARN'
 --
--- * 'aubrsStatus'
+-- * 'aubrsResponseStatus'
 addUploadBufferResponse
-    :: Int -- ^ 'aubrsStatus'
+    :: Int -- ^ 'aubrsResponseStatus'
     -> AddUploadBufferResponse
-addUploadBufferResponse pStatus_ =
+addUploadBufferResponse pResponseStatus_ =
     AddUploadBufferResponse'
     { _aubrsGatewayARN = Nothing
-    , _aubrsStatus = pStatus_
+    , _aubrsResponseStatus = pResponseStatus_
     }
 
 -- | Undocumented member.
@@ -139,5 +139,5 @@
 aubrsGatewayARN = lens _aubrsGatewayARN (\ s a -> s{_aubrsGatewayARN = a});
 
 -- | The response status code.
-aubrsStatus :: Lens' AddUploadBufferResponse Int
-aubrsStatus = lens _aubrsStatus (\ s a -> s{_aubrsStatus = a});
+aubrsResponseStatus :: Lens' AddUploadBufferResponse Int
+aubrsResponseStatus = lens _aubrsResponseStatus (\ s a -> s{_aubrsResponseStatus = a});
diff --git a/gen/Network/AWS/StorageGateway/AddWorkingStorage.hs b/gen/Network/AWS/StorageGateway/AddWorkingStorage.hs
--- a/gen/Network/AWS/StorageGateway/AddWorkingStorage.hs
+++ b/gen/Network/AWS/StorageGateway/AddWorkingStorage.hs
@@ -46,7 +46,7 @@
     , AddWorkingStorageResponse
     -- * Response Lenses
     , awsrsGatewayARN
-    , awsrsStatus
+    , awsrsResponseStatus
     ) where
 
 import           Network.AWS.Prelude
@@ -128,8 +128,8 @@
 --
 -- /See:/ 'addWorkingStorageResponse' smart constructor.
 data AddWorkingStorageResponse = AddWorkingStorageResponse'
-    { _awsrsGatewayARN :: !(Maybe Text)
-    , _awsrsStatus     :: !Int
+    { _awsrsGatewayARN     :: !(Maybe Text)
+    , _awsrsResponseStatus :: !Int
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'AddWorkingStorageResponse' with the minimum fields required to make a request.
@@ -138,14 +138,14 @@
 --
 -- * 'awsrsGatewayARN'
 --
--- * 'awsrsStatus'
+-- * 'awsrsResponseStatus'
 addWorkingStorageResponse
-    :: Int -- ^ 'awsrsStatus'
+    :: Int -- ^ 'awsrsResponseStatus'
     -> AddWorkingStorageResponse
-addWorkingStorageResponse pStatus_ =
+addWorkingStorageResponse pResponseStatus_ =
     AddWorkingStorageResponse'
     { _awsrsGatewayARN = Nothing
-    , _awsrsStatus = pStatus_
+    , _awsrsResponseStatus = pResponseStatus_
     }
 
 -- | Undocumented member.
@@ -153,5 +153,5 @@
 awsrsGatewayARN = lens _awsrsGatewayARN (\ s a -> s{_awsrsGatewayARN = a});
 
 -- | The response status code.
-awsrsStatus :: Lens' AddWorkingStorageResponse Int
-awsrsStatus = lens _awsrsStatus (\ s a -> s{_awsrsStatus = a});
+awsrsResponseStatus :: Lens' AddWorkingStorageResponse Int
+awsrsResponseStatus = lens _awsrsResponseStatus (\ s a -> s{_awsrsResponseStatus = a});
diff --git a/gen/Network/AWS/StorageGateway/CancelArchival.hs b/gen/Network/AWS/StorageGateway/CancelArchival.hs
--- a/gen/Network/AWS/StorageGateway/CancelArchival.hs
+++ b/gen/Network/AWS/StorageGateway/CancelArchival.hs
@@ -36,7 +36,7 @@
     , CancelArchivalResponse
     -- * Response Lenses
     , carsTapeARN
-    , carsStatus
+    , carsResponseStatus
     ) where
 
 import           Network.AWS.Prelude
@@ -115,8 +115,8 @@
 --
 -- /See:/ 'cancelArchivalResponse' smart constructor.
 data CancelArchivalResponse = CancelArchivalResponse'
-    { _carsTapeARN :: !(Maybe Text)
-    , _carsStatus  :: !Int
+    { _carsTapeARN        :: !(Maybe Text)
+    , _carsResponseStatus :: !Int
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'CancelArchivalResponse' with the minimum fields required to make a request.
@@ -125,14 +125,14 @@
 --
 -- * 'carsTapeARN'
 --
--- * 'carsStatus'
+-- * 'carsResponseStatus'
 cancelArchivalResponse
-    :: Int -- ^ 'carsStatus'
+    :: Int -- ^ 'carsResponseStatus'
     -> CancelArchivalResponse
-cancelArchivalResponse pStatus_ =
+cancelArchivalResponse pResponseStatus_ =
     CancelArchivalResponse'
     { _carsTapeARN = Nothing
-    , _carsStatus = pStatus_
+    , _carsResponseStatus = pResponseStatus_
     }
 
 -- | The Amazon Resource Name (ARN) of the virtual tape for which archiving
@@ -141,5 +141,5 @@
 carsTapeARN = lens _carsTapeARN (\ s a -> s{_carsTapeARN = a});
 
 -- | The response status code.
-carsStatus :: Lens' CancelArchivalResponse Int
-carsStatus = lens _carsStatus (\ s a -> s{_carsStatus = a});
+carsResponseStatus :: Lens' CancelArchivalResponse Int
+carsResponseStatus = lens _carsResponseStatus (\ s a -> s{_carsResponseStatus = a});
diff --git a/gen/Network/AWS/StorageGateway/CancelRetrieval.hs b/gen/Network/AWS/StorageGateway/CancelRetrieval.hs
--- a/gen/Network/AWS/StorageGateway/CancelRetrieval.hs
+++ b/gen/Network/AWS/StorageGateway/CancelRetrieval.hs
@@ -37,7 +37,7 @@
     , CancelRetrievalResponse
     -- * Response Lenses
     , crrsTapeARN
-    , crrsStatus
+    , crrsResponseStatus
     ) where
 
 import           Network.AWS.Prelude
@@ -116,8 +116,8 @@
 --
 -- /See:/ 'cancelRetrievalResponse' smart constructor.
 data CancelRetrievalResponse = CancelRetrievalResponse'
-    { _crrsTapeARN :: !(Maybe Text)
-    , _crrsStatus  :: !Int
+    { _crrsTapeARN        :: !(Maybe Text)
+    , _crrsResponseStatus :: !Int
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'CancelRetrievalResponse' with the minimum fields required to make a request.
@@ -126,14 +126,14 @@
 --
 -- * 'crrsTapeARN'
 --
--- * 'crrsStatus'
+-- * 'crrsResponseStatus'
 cancelRetrievalResponse
-    :: Int -- ^ 'crrsStatus'
+    :: Int -- ^ 'crrsResponseStatus'
     -> CancelRetrievalResponse
-cancelRetrievalResponse pStatus_ =
+cancelRetrievalResponse pResponseStatus_ =
     CancelRetrievalResponse'
     { _crrsTapeARN = Nothing
-    , _crrsStatus = pStatus_
+    , _crrsResponseStatus = pResponseStatus_
     }
 
 -- | The Amazon Resource Name (ARN) of the virtual tape for which retrieval
@@ -142,5 +142,5 @@
 crrsTapeARN = lens _crrsTapeARN (\ s a -> s{_crrsTapeARN = a});
 
 -- | The response status code.
-crrsStatus :: Lens' CancelRetrievalResponse Int
-crrsStatus = lens _crrsStatus (\ s a -> s{_crrsStatus = a});
+crrsResponseStatus :: Lens' CancelRetrievalResponse Int
+crrsResponseStatus = lens _crrsResponseStatus (\ s a -> s{_crrsResponseStatus = a});
diff --git a/gen/Network/AWS/StorageGateway/CreateCachediSCSIVolume.hs b/gen/Network/AWS/StorageGateway/CreateCachediSCSIVolume.hs
--- a/gen/Network/AWS/StorageGateway/CreateCachediSCSIVolume.hs
+++ b/gen/Network/AWS/StorageGateway/CreateCachediSCSIVolume.hs
@@ -53,7 +53,7 @@
     -- * Response Lenses
     , ccscsivrsTargetARN
     , ccscsivrsVolumeARN
-    , ccscsivrsStatus
+    , ccscsivrsResponseStatus
     ) where
 
 import           Network.AWS.Prelude
@@ -170,9 +170,9 @@
 
 -- | /See:/ 'createCachediSCSIVolumeResponse' smart constructor.
 data CreateCachediSCSIVolumeResponse = CreateCachediSCSIVolumeResponse'
-    { _ccscsivrsTargetARN :: !(Maybe Text)
-    , _ccscsivrsVolumeARN :: !(Maybe Text)
-    , _ccscsivrsStatus    :: !Int
+    { _ccscsivrsTargetARN      :: !(Maybe Text)
+    , _ccscsivrsVolumeARN      :: !(Maybe Text)
+    , _ccscsivrsResponseStatus :: !Int
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'CreateCachediSCSIVolumeResponse' with the minimum fields required to make a request.
@@ -183,15 +183,15 @@
 --
 -- * 'ccscsivrsVolumeARN'
 --
--- * 'ccscsivrsStatus'
+-- * 'ccscsivrsResponseStatus'
 createCachediSCSIVolumeResponse
-    :: Int -- ^ 'ccscsivrsStatus'
+    :: Int -- ^ 'ccscsivrsResponseStatus'
     -> CreateCachediSCSIVolumeResponse
-createCachediSCSIVolumeResponse pStatus_ =
+createCachediSCSIVolumeResponse pResponseStatus_ =
     CreateCachediSCSIVolumeResponse'
     { _ccscsivrsTargetARN = Nothing
     , _ccscsivrsVolumeARN = Nothing
-    , _ccscsivrsStatus = pStatus_
+    , _ccscsivrsResponseStatus = pResponseStatus_
     }
 
 -- | Undocumented member.
@@ -203,5 +203,5 @@
 ccscsivrsVolumeARN = lens _ccscsivrsVolumeARN (\ s a -> s{_ccscsivrsVolumeARN = a});
 
 -- | The response status code.
-ccscsivrsStatus :: Lens' CreateCachediSCSIVolumeResponse Int
-ccscsivrsStatus = lens _ccscsivrsStatus (\ s a -> s{_ccscsivrsStatus = a});
+ccscsivrsResponseStatus :: Lens' CreateCachediSCSIVolumeResponse Int
+ccscsivrsResponseStatus = lens _ccscsivrsResponseStatus (\ s a -> s{_ccscsivrsResponseStatus = a});
diff --git a/gen/Network/AWS/StorageGateway/CreateSnapshot.hs b/gen/Network/AWS/StorageGateway/CreateSnapshot.hs
--- a/gen/Network/AWS/StorageGateway/CreateSnapshot.hs
+++ b/gen/Network/AWS/StorageGateway/CreateSnapshot.hs
@@ -56,7 +56,7 @@
     -- * Response Lenses
     , csrsVolumeARN
     , csrsSnapshotId
-    , csrsStatus
+    , csrsResponseStatus
     ) where
 
 import           Network.AWS.Prelude
@@ -143,9 +143,9 @@
 --
 -- /See:/ 'createSnapshotResponse' smart constructor.
 data CreateSnapshotResponse = CreateSnapshotResponse'
-    { _csrsVolumeARN  :: !(Maybe Text)
-    , _csrsSnapshotId :: !(Maybe Text)
-    , _csrsStatus     :: !Int
+    { _csrsVolumeARN      :: !(Maybe Text)
+    , _csrsSnapshotId     :: !(Maybe Text)
+    , _csrsResponseStatus :: !Int
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'CreateSnapshotResponse' with the minimum fields required to make a request.
@@ -156,15 +156,15 @@
 --
 -- * 'csrsSnapshotId'
 --
--- * 'csrsStatus'
+-- * 'csrsResponseStatus'
 createSnapshotResponse
-    :: Int -- ^ 'csrsStatus'
+    :: Int -- ^ 'csrsResponseStatus'
     -> CreateSnapshotResponse
-createSnapshotResponse pStatus_ =
+createSnapshotResponse pResponseStatus_ =
     CreateSnapshotResponse'
     { _csrsVolumeARN = Nothing
     , _csrsSnapshotId = Nothing
-    , _csrsStatus = pStatus_
+    , _csrsResponseStatus = pResponseStatus_
     }
 
 -- | The Amazon Resource Name (ARN) of the volume of which the snapshot was
@@ -180,5 +180,5 @@
 csrsSnapshotId = lens _csrsSnapshotId (\ s a -> s{_csrsSnapshotId = a});
 
 -- | The response status code.
-csrsStatus :: Lens' CreateSnapshotResponse Int
-csrsStatus = lens _csrsStatus (\ s a -> s{_csrsStatus = a});
+csrsResponseStatus :: Lens' CreateSnapshotResponse Int
+csrsResponseStatus = lens _csrsResponseStatus (\ s a -> s{_csrsResponseStatus = a});
diff --git a/gen/Network/AWS/StorageGateway/CreateSnapshotFromVolumeRecoveryPoint.hs b/gen/Network/AWS/StorageGateway/CreateSnapshotFromVolumeRecoveryPoint.hs
--- a/gen/Network/AWS/StorageGateway/CreateSnapshotFromVolumeRecoveryPoint.hs
+++ b/gen/Network/AWS/StorageGateway/CreateSnapshotFromVolumeRecoveryPoint.hs
@@ -56,7 +56,7 @@
     , csfvrprsVolumeRecoveryPointTime
     , csfvrprsVolumeARN
     , csfvrprsSnapshotId
-    , csfvrprsStatus
+    , csfvrprsResponseStatus
     ) where
 
 import           Network.AWS.Prelude
@@ -144,7 +144,7 @@
     { _csfvrprsVolumeRecoveryPointTime :: !(Maybe Text)
     , _csfvrprsVolumeARN               :: !(Maybe Text)
     , _csfvrprsSnapshotId              :: !(Maybe Text)
-    , _csfvrprsStatus                  :: !Int
+    , _csfvrprsResponseStatus          :: !Int
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'CreateSnapshotFromVolumeRecoveryPointResponse' with the minimum fields required to make a request.
@@ -157,16 +157,16 @@
 --
 -- * 'csfvrprsSnapshotId'
 --
--- * 'csfvrprsStatus'
+-- * 'csfvrprsResponseStatus'
 createSnapshotFromVolumeRecoveryPointResponse
-    :: Int -- ^ 'csfvrprsStatus'
+    :: Int -- ^ 'csfvrprsResponseStatus'
     -> CreateSnapshotFromVolumeRecoveryPointResponse
-createSnapshotFromVolumeRecoveryPointResponse pStatus_ =
+createSnapshotFromVolumeRecoveryPointResponse pResponseStatus_ =
     CreateSnapshotFromVolumeRecoveryPointResponse'
     { _csfvrprsVolumeRecoveryPointTime = Nothing
     , _csfvrprsVolumeARN = Nothing
     , _csfvrprsSnapshotId = Nothing
-    , _csfvrprsStatus = pStatus_
+    , _csfvrprsResponseStatus = pResponseStatus_
     }
 
 -- | Undocumented member.
@@ -182,5 +182,5 @@
 csfvrprsSnapshotId = lens _csfvrprsSnapshotId (\ s a -> s{_csfvrprsSnapshotId = a});
 
 -- | The response status code.
-csfvrprsStatus :: Lens' CreateSnapshotFromVolumeRecoveryPointResponse Int
-csfvrprsStatus = lens _csfvrprsStatus (\ s a -> s{_csfvrprsStatus = a});
+csfvrprsResponseStatus :: Lens' CreateSnapshotFromVolumeRecoveryPointResponse Int
+csfvrprsResponseStatus = lens _csfvrprsResponseStatus (\ s a -> s{_csfvrprsResponseStatus = a});
diff --git a/gen/Network/AWS/StorageGateway/CreateStorediSCSIVolume.hs b/gen/Network/AWS/StorageGateway/CreateStorediSCSIVolume.hs
--- a/gen/Network/AWS/StorageGateway/CreateStorediSCSIVolume.hs
+++ b/gen/Network/AWS/StorageGateway/CreateStorediSCSIVolume.hs
@@ -53,7 +53,7 @@
     , csscsivrsTargetARN
     , csscsivrsVolumeARN
     , csscsivrsVolumeSizeInBytes
-    , csscsivrsStatus
+    , csscsivrsResponseStatus
     ) where
 
 import           Network.AWS.Prelude
@@ -205,7 +205,7 @@
     { _csscsivrsTargetARN         :: !(Maybe Text)
     , _csscsivrsVolumeARN         :: !(Maybe Text)
     , _csscsivrsVolumeSizeInBytes :: !(Maybe Integer)
-    , _csscsivrsStatus            :: !Int
+    , _csscsivrsResponseStatus    :: !Int
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'CreateStorediSCSIVolumeResponse' with the minimum fields required to make a request.
@@ -218,16 +218,16 @@
 --
 -- * 'csscsivrsVolumeSizeInBytes'
 --
--- * 'csscsivrsStatus'
+-- * 'csscsivrsResponseStatus'
 createStorediSCSIVolumeResponse
-    :: Int -- ^ 'csscsivrsStatus'
+    :: Int -- ^ 'csscsivrsResponseStatus'
     -> CreateStorediSCSIVolumeResponse
-createStorediSCSIVolumeResponse pStatus_ =
+createStorediSCSIVolumeResponse pResponseStatus_ =
     CreateStorediSCSIVolumeResponse'
     { _csscsivrsTargetARN = Nothing
     , _csscsivrsVolumeARN = Nothing
     , _csscsivrsVolumeSizeInBytes = Nothing
-    , _csscsivrsStatus = pStatus_
+    , _csscsivrsResponseStatus = pResponseStatus_
     }
 
 -- | he Amazon Resource Name (ARN) of the volume target that includes the
@@ -244,5 +244,5 @@
 csscsivrsVolumeSizeInBytes = lens _csscsivrsVolumeSizeInBytes (\ s a -> s{_csscsivrsVolumeSizeInBytes = a});
 
 -- | The response status code.
-csscsivrsStatus :: Lens' CreateStorediSCSIVolumeResponse Int
-csscsivrsStatus = lens _csscsivrsStatus (\ s a -> s{_csscsivrsStatus = a});
+csscsivrsResponseStatus :: Lens' CreateStorediSCSIVolumeResponse Int
+csscsivrsResponseStatus = lens _csscsivrsResponseStatus (\ s a -> s{_csscsivrsResponseStatus = a});
diff --git a/gen/Network/AWS/StorageGateway/CreateTapes.hs b/gen/Network/AWS/StorageGateway/CreateTapes.hs
--- a/gen/Network/AWS/StorageGateway/CreateTapes.hs
+++ b/gen/Network/AWS/StorageGateway/CreateTapes.hs
@@ -43,7 +43,7 @@
     , CreateTapesResponse
     -- * Response Lenses
     , ctrsTapeARNs
-    , ctrsStatus
+    , ctrsResponseStatus
     ) where
 
 import           Network.AWS.Prelude
@@ -164,8 +164,8 @@
 --
 -- /See:/ 'createTapesResponse' smart constructor.
 data CreateTapesResponse = CreateTapesResponse'
-    { _ctrsTapeARNs :: !(Maybe [Text])
-    , _ctrsStatus   :: !Int
+    { _ctrsTapeARNs       :: !(Maybe [Text])
+    , _ctrsResponseStatus :: !Int
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'CreateTapesResponse' with the minimum fields required to make a request.
@@ -174,14 +174,14 @@
 --
 -- * 'ctrsTapeARNs'
 --
--- * 'ctrsStatus'
+-- * 'ctrsResponseStatus'
 createTapesResponse
-    :: Int -- ^ 'ctrsStatus'
+    :: Int -- ^ 'ctrsResponseStatus'
     -> CreateTapesResponse
-createTapesResponse pStatus_ =
+createTapesResponse pResponseStatus_ =
     CreateTapesResponse'
     { _ctrsTapeARNs = Nothing
-    , _ctrsStatus = pStatus_
+    , _ctrsResponseStatus = pResponseStatus_
     }
 
 -- | A list of unique Amazon Resource Named (ARN) the represents the virtual
@@ -190,5 +190,5 @@
 ctrsTapeARNs = lens _ctrsTapeARNs (\ s a -> s{_ctrsTapeARNs = a}) . _Default . _Coerce;
 
 -- | The response status code.
-ctrsStatus :: Lens' CreateTapesResponse Int
-ctrsStatus = lens _ctrsStatus (\ s a -> s{_ctrsStatus = a});
+ctrsResponseStatus :: Lens' CreateTapesResponse Int
+ctrsResponseStatus = lens _ctrsResponseStatus (\ s a -> s{_ctrsResponseStatus = a});
diff --git a/gen/Network/AWS/StorageGateway/DeleteBandwidthRateLimit.hs b/gen/Network/AWS/StorageGateway/DeleteBandwidthRateLimit.hs
--- a/gen/Network/AWS/StorageGateway/DeleteBandwidthRateLimit.hs
+++ b/gen/Network/AWS/StorageGateway/DeleteBandwidthRateLimit.hs
@@ -31,15 +31,15 @@
       deleteBandwidthRateLimit
     , DeleteBandwidthRateLimit
     -- * Request Lenses
-    , delGatewayARN
-    , delBandwidthType
+    , dbrlbGatewayARN
+    , dbrlbBandwidthType
 
     -- * Destructuring the Response
     , deleteBandwidthRateLimitResponse
     , DeleteBandwidthRateLimitResponse
     -- * Response Lenses
     , delrsGatewayARN
-    , delrsStatus
+    , delrsResponseStatus
     ) where
 
 import           Network.AWS.Prelude
@@ -50,34 +50,34 @@
 
 -- | /See:/ 'deleteBandwidthRateLimit' smart constructor.
 data DeleteBandwidthRateLimit = DeleteBandwidthRateLimit'
-    { _delGatewayARN    :: !Text
-    , _delBandwidthType :: !Text
+    { _dbrlbGatewayARN    :: !Text
+    , _dbrlbBandwidthType :: !Text
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'DeleteBandwidthRateLimit' with the minimum fields required to make a request.
 --
 -- Use one of the following lenses to modify other fields as desired:
 --
--- * 'delGatewayARN'
+-- * 'dbrlbGatewayARN'
 --
--- * 'delBandwidthType'
+-- * 'dbrlbBandwidthType'
 deleteBandwidthRateLimit
-    :: Text -- ^ 'delGatewayARN'
-    -> Text -- ^ 'delBandwidthType'
+    :: Text -- ^ 'dbrlbGatewayARN'
+    -> Text -- ^ 'dbrlbBandwidthType'
     -> DeleteBandwidthRateLimit
 deleteBandwidthRateLimit pGatewayARN_ pBandwidthType_ =
     DeleteBandwidthRateLimit'
-    { _delGatewayARN = pGatewayARN_
-    , _delBandwidthType = pBandwidthType_
+    { _dbrlbGatewayARN = pGatewayARN_
+    , _dbrlbBandwidthType = pBandwidthType_
     }
 
 -- | Undocumented member.
-delGatewayARN :: Lens' DeleteBandwidthRateLimit Text
-delGatewayARN = lens _delGatewayARN (\ s a -> s{_delGatewayARN = a});
+dbrlbGatewayARN :: Lens' DeleteBandwidthRateLimit Text
+dbrlbGatewayARN = lens _dbrlbGatewayARN (\ s a -> s{_dbrlbGatewayARN = a});
 
 -- | Undocumented member.
-delBandwidthType :: Lens' DeleteBandwidthRateLimit Text
-delBandwidthType = lens _delBandwidthType (\ s a -> s{_delBandwidthType = a});
+dbrlbBandwidthType :: Lens' DeleteBandwidthRateLimit Text
+dbrlbBandwidthType = lens _dbrlbBandwidthType (\ s a -> s{_dbrlbBandwidthType = a});
 
 instance AWSRequest DeleteBandwidthRateLimit where
         type Rs DeleteBandwidthRateLimit =
@@ -103,8 +103,8 @@
         toJSON DeleteBandwidthRateLimit'{..}
           = object
               (catMaybes
-                 [Just ("GatewayARN" .= _delGatewayARN),
-                  Just ("BandwidthType" .= _delBandwidthType)])
+                 [Just ("GatewayARN" .= _dbrlbGatewayARN),
+                  Just ("BandwidthType" .= _dbrlbBandwidthType)])
 
 instance ToPath DeleteBandwidthRateLimit where
         toPath = const "/"
@@ -117,8 +117,8 @@
 --
 -- /See:/ 'deleteBandwidthRateLimitResponse' smart constructor.
 data DeleteBandwidthRateLimitResponse = DeleteBandwidthRateLimitResponse'
-    { _delrsGatewayARN :: !(Maybe Text)
-    , _delrsStatus     :: !Int
+    { _delrsGatewayARN     :: !(Maybe Text)
+    , _delrsResponseStatus :: !Int
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'DeleteBandwidthRateLimitResponse' with the minimum fields required to make a request.
@@ -127,14 +127,14 @@
 --
 -- * 'delrsGatewayARN'
 --
--- * 'delrsStatus'
+-- * 'delrsResponseStatus'
 deleteBandwidthRateLimitResponse
-    :: Int -- ^ 'delrsStatus'
+    :: Int -- ^ 'delrsResponseStatus'
     -> DeleteBandwidthRateLimitResponse
-deleteBandwidthRateLimitResponse pStatus_ =
+deleteBandwidthRateLimitResponse pResponseStatus_ =
     DeleteBandwidthRateLimitResponse'
     { _delrsGatewayARN = Nothing
-    , _delrsStatus = pStatus_
+    , _delrsResponseStatus = pResponseStatus_
     }
 
 -- | Undocumented member.
@@ -142,5 +142,5 @@
 delrsGatewayARN = lens _delrsGatewayARN (\ s a -> s{_delrsGatewayARN = a});
 
 -- | The response status code.
-delrsStatus :: Lens' DeleteBandwidthRateLimitResponse Int
-delrsStatus = lens _delrsStatus (\ s a -> s{_delrsStatus = a});
+delrsResponseStatus :: Lens' DeleteBandwidthRateLimitResponse Int
+delrsResponseStatus = lens _delrsResponseStatus (\ s a -> s{_delrsResponseStatus = a});
diff --git a/gen/Network/AWS/StorageGateway/DeleteChapCredentials.hs b/gen/Network/AWS/StorageGateway/DeleteChapCredentials.hs
--- a/gen/Network/AWS/StorageGateway/DeleteChapCredentials.hs
+++ b/gen/Network/AWS/StorageGateway/DeleteChapCredentials.hs
@@ -37,7 +37,7 @@
     -- * Response Lenses
     , drsTargetARN
     , drsInitiatorName
-    , drsStatus
+    , drsResponseStatus
     ) where
 
 import           Network.AWS.Prelude
@@ -122,9 +122,9 @@
 --
 -- /See:/ 'deleteChapCredentialsResponse' smart constructor.
 data DeleteChapCredentialsResponse = DeleteChapCredentialsResponse'
-    { _drsTargetARN     :: !(Maybe Text)
-    , _drsInitiatorName :: !(Maybe Text)
-    , _drsStatus        :: !Int
+    { _drsTargetARN      :: !(Maybe Text)
+    , _drsInitiatorName  :: !(Maybe Text)
+    , _drsResponseStatus :: !Int
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'DeleteChapCredentialsResponse' with the minimum fields required to make a request.
@@ -135,15 +135,15 @@
 --
 -- * 'drsInitiatorName'
 --
--- * 'drsStatus'
+-- * 'drsResponseStatus'
 deleteChapCredentialsResponse
-    :: Int -- ^ 'drsStatus'
+    :: Int -- ^ 'drsResponseStatus'
     -> DeleteChapCredentialsResponse
-deleteChapCredentialsResponse pStatus_ =
+deleteChapCredentialsResponse pResponseStatus_ =
     DeleteChapCredentialsResponse'
     { _drsTargetARN = Nothing
     , _drsInitiatorName = Nothing
-    , _drsStatus = pStatus_
+    , _drsResponseStatus = pResponseStatus_
     }
 
 -- | The Amazon Resource Name (ARN) of the target.
@@ -155,5 +155,5 @@
 drsInitiatorName = lens _drsInitiatorName (\ s a -> s{_drsInitiatorName = a});
 
 -- | The response status code.
-drsStatus :: Lens' DeleteChapCredentialsResponse Int
-drsStatus = lens _drsStatus (\ s a -> s{_drsStatus = a});
+drsResponseStatus :: Lens' DeleteChapCredentialsResponse Int
+drsResponseStatus = lens _drsResponseStatus (\ s a -> s{_drsResponseStatus = a});
diff --git a/gen/Network/AWS/StorageGateway/DeleteGateway.hs b/gen/Network/AWS/StorageGateway/DeleteGateway.hs
--- a/gen/Network/AWS/StorageGateway/DeleteGateway.hs
+++ b/gen/Network/AWS/StorageGateway/DeleteGateway.hs
@@ -51,7 +51,7 @@
     , DeleteGatewayResponse
     -- * Response Lenses
     , dgrsGatewayARN
-    , dgrsStatus
+    , dgrsResponseStatus
     ) where
 
 import           Network.AWS.Prelude
@@ -118,8 +118,8 @@
 --
 -- /See:/ 'deleteGatewayResponse' smart constructor.
 data DeleteGatewayResponse = DeleteGatewayResponse'
-    { _dgrsGatewayARN :: !(Maybe Text)
-    , _dgrsStatus     :: !Int
+    { _dgrsGatewayARN     :: !(Maybe Text)
+    , _dgrsResponseStatus :: !Int
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'DeleteGatewayResponse' with the minimum fields required to make a request.
@@ -128,14 +128,14 @@
 --
 -- * 'dgrsGatewayARN'
 --
--- * 'dgrsStatus'
+-- * 'dgrsResponseStatus'
 deleteGatewayResponse
-    :: Int -- ^ 'dgrsStatus'
+    :: Int -- ^ 'dgrsResponseStatus'
     -> DeleteGatewayResponse
-deleteGatewayResponse pStatus_ =
+deleteGatewayResponse pResponseStatus_ =
     DeleteGatewayResponse'
     { _dgrsGatewayARN = Nothing
-    , _dgrsStatus = pStatus_
+    , _dgrsResponseStatus = pResponseStatus_
     }
 
 -- | Undocumented member.
@@ -143,5 +143,5 @@
 dgrsGatewayARN = lens _dgrsGatewayARN (\ s a -> s{_dgrsGatewayARN = a});
 
 -- | The response status code.
-dgrsStatus :: Lens' DeleteGatewayResponse Int
-dgrsStatus = lens _dgrsStatus (\ s a -> s{_dgrsStatus = a});
+dgrsResponseStatus :: Lens' DeleteGatewayResponse Int
+dgrsResponseStatus = lens _dgrsResponseStatus (\ s a -> s{_dgrsResponseStatus = a});
diff --git a/gen/Network/AWS/StorageGateway/DeleteSnapshotSchedule.hs b/gen/Network/AWS/StorageGateway/DeleteSnapshotSchedule.hs
--- a/gen/Network/AWS/StorageGateway/DeleteSnapshotSchedule.hs
+++ b/gen/Network/AWS/StorageGateway/DeleteSnapshotSchedule.hs
@@ -44,7 +44,7 @@
     , DeleteSnapshotScheduleResponse
     -- * Response Lenses
     , dsssrsVolumeARN
-    , dsssrsStatus
+    , dsssrsResponseStatus
     ) where
 
 import           Network.AWS.Prelude
@@ -108,8 +108,8 @@
 
 -- | /See:/ 'deleteSnapshotScheduleResponse' smart constructor.
 data DeleteSnapshotScheduleResponse = DeleteSnapshotScheduleResponse'
-    { _dsssrsVolumeARN :: !(Maybe Text)
-    , _dsssrsStatus    :: !Int
+    { _dsssrsVolumeARN      :: !(Maybe Text)
+    , _dsssrsResponseStatus :: !Int
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'DeleteSnapshotScheduleResponse' with the minimum fields required to make a request.
@@ -118,14 +118,14 @@
 --
 -- * 'dsssrsVolumeARN'
 --
--- * 'dsssrsStatus'
+-- * 'dsssrsResponseStatus'
 deleteSnapshotScheduleResponse
-    :: Int -- ^ 'dsssrsStatus'
+    :: Int -- ^ 'dsssrsResponseStatus'
     -> DeleteSnapshotScheduleResponse
-deleteSnapshotScheduleResponse pStatus_ =
+deleteSnapshotScheduleResponse pResponseStatus_ =
     DeleteSnapshotScheduleResponse'
     { _dsssrsVolumeARN = Nothing
-    , _dsssrsStatus = pStatus_
+    , _dsssrsResponseStatus = pResponseStatus_
     }
 
 -- | Undocumented member.
@@ -133,5 +133,5 @@
 dsssrsVolumeARN = lens _dsssrsVolumeARN (\ s a -> s{_dsssrsVolumeARN = a});
 
 -- | The response status code.
-dsssrsStatus :: Lens' DeleteSnapshotScheduleResponse Int
-dsssrsStatus = lens _dsssrsStatus (\ s a -> s{_dsssrsStatus = a});
+dsssrsResponseStatus :: Lens' DeleteSnapshotScheduleResponse Int
+dsssrsResponseStatus = lens _dsssrsResponseStatus (\ s a -> s{_dsssrsResponseStatus = a});
diff --git a/gen/Network/AWS/StorageGateway/DeleteTape.hs b/gen/Network/AWS/StorageGateway/DeleteTape.hs
--- a/gen/Network/AWS/StorageGateway/DeleteTape.hs
+++ b/gen/Network/AWS/StorageGateway/DeleteTape.hs
@@ -27,15 +27,15 @@
       deleteTape
     , DeleteTape
     -- * Request Lenses
-    , dttGatewayARN
-    , dttTapeARN
+    , delGatewayARN
+    , delTapeARN
 
     -- * Destructuring the Response
     , deleteTapeResponse
     , DeleteTapeResponse
     -- * Response Lenses
     , dtrsTapeARN
-    , dtrsStatus
+    , dtrsResponseStatus
     ) where
 
 import           Network.AWS.Prelude
@@ -48,36 +48,36 @@
 --
 -- /See:/ 'deleteTape' smart constructor.
 data DeleteTape = DeleteTape'
-    { _dttGatewayARN :: !Text
-    , _dttTapeARN    :: !Text
+    { _delGatewayARN :: !Text
+    , _delTapeARN    :: !Text
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'DeleteTape' with the minimum fields required to make a request.
 --
 -- Use one of the following lenses to modify other fields as desired:
 --
--- * 'dttGatewayARN'
+-- * 'delGatewayARN'
 --
--- * 'dttTapeARN'
+-- * 'delTapeARN'
 deleteTape
-    :: Text -- ^ 'dttGatewayARN'
-    -> Text -- ^ 'dttTapeARN'
+    :: Text -- ^ 'delGatewayARN'
+    -> Text -- ^ 'delTapeARN'
     -> DeleteTape
 deleteTape pGatewayARN_ pTapeARN_ =
     DeleteTape'
-    { _dttGatewayARN = pGatewayARN_
-    , _dttTapeARN = pTapeARN_
+    { _delGatewayARN = pGatewayARN_
+    , _delTapeARN = pTapeARN_
     }
 
 -- | The unique Amazon Resource Name (ARN) of the gateway that the virtual
 -- tape to delete is associated with. Use the ListGateways operation to
 -- return a list of gateways for your account and region.
-dttGatewayARN :: Lens' DeleteTape Text
-dttGatewayARN = lens _dttGatewayARN (\ s a -> s{_dttGatewayARN = a});
+delGatewayARN :: Lens' DeleteTape Text
+delGatewayARN = lens _delGatewayARN (\ s a -> s{_delGatewayARN = a});
 
 -- | The Amazon Resource Name (ARN) of the virtual tape to delete.
-dttTapeARN :: Lens' DeleteTape Text
-dttTapeARN = lens _dttTapeARN (\ s a -> s{_dttTapeARN = a});
+delTapeARN :: Lens' DeleteTape Text
+delTapeARN = lens _delTapeARN (\ s a -> s{_delTapeARN = a});
 
 instance AWSRequest DeleteTape where
         type Rs DeleteTape = DeleteTapeResponse
@@ -101,8 +101,8 @@
         toJSON DeleteTape'{..}
           = object
               (catMaybes
-                 [Just ("GatewayARN" .= _dttGatewayARN),
-                  Just ("TapeARN" .= _dttTapeARN)])
+                 [Just ("GatewayARN" .= _delGatewayARN),
+                  Just ("TapeARN" .= _delTapeARN)])
 
 instance ToPath DeleteTape where
         toPath = const "/"
@@ -114,8 +114,8 @@
 --
 -- /See:/ 'deleteTapeResponse' smart constructor.
 data DeleteTapeResponse = DeleteTapeResponse'
-    { _dtrsTapeARN :: !(Maybe Text)
-    , _dtrsStatus  :: !Int
+    { _dtrsTapeARN        :: !(Maybe Text)
+    , _dtrsResponseStatus :: !Int
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'DeleteTapeResponse' with the minimum fields required to make a request.
@@ -124,14 +124,14 @@
 --
 -- * 'dtrsTapeARN'
 --
--- * 'dtrsStatus'
+-- * 'dtrsResponseStatus'
 deleteTapeResponse
-    :: Int -- ^ 'dtrsStatus'
+    :: Int -- ^ 'dtrsResponseStatus'
     -> DeleteTapeResponse
-deleteTapeResponse pStatus_ =
+deleteTapeResponse pResponseStatus_ =
     DeleteTapeResponse'
     { _dtrsTapeARN = Nothing
-    , _dtrsStatus = pStatus_
+    , _dtrsResponseStatus = pResponseStatus_
     }
 
 -- | The Amazon Resource Name (ARN) of the deleted virtual tape.
@@ -139,5 +139,5 @@
 dtrsTapeARN = lens _dtrsTapeARN (\ s a -> s{_dtrsTapeARN = a});
 
 -- | The response status code.
-dtrsStatus :: Lens' DeleteTapeResponse Int
-dtrsStatus = lens _dtrsStatus (\ s a -> s{_dtrsStatus = a});
+dtrsResponseStatus :: Lens' DeleteTapeResponse Int
+dtrsResponseStatus = lens _dtrsResponseStatus (\ s a -> s{_dtrsResponseStatus = a});
diff --git a/gen/Network/AWS/StorageGateway/DeleteTapeArchive.hs b/gen/Network/AWS/StorageGateway/DeleteTapeArchive.hs
--- a/gen/Network/AWS/StorageGateway/DeleteTapeArchive.hs
+++ b/gen/Network/AWS/StorageGateway/DeleteTapeArchive.hs
@@ -34,7 +34,7 @@
     , DeleteTapeArchiveResponse
     -- * Response Lenses
     , dtatrsTapeARN
-    , dtatrsStatus
+    , dtatrsResponseStatus
     ) where
 
 import           Network.AWS.Prelude
@@ -102,8 +102,8 @@
 --
 -- /See:/ 'deleteTapeArchiveResponse' smart constructor.
 data DeleteTapeArchiveResponse = DeleteTapeArchiveResponse'
-    { _dtatrsTapeARN :: !(Maybe Text)
-    , _dtatrsStatus  :: !Int
+    { _dtatrsTapeARN        :: !(Maybe Text)
+    , _dtatrsResponseStatus :: !Int
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'DeleteTapeArchiveResponse' with the minimum fields required to make a request.
@@ -112,14 +112,14 @@
 --
 -- * 'dtatrsTapeARN'
 --
--- * 'dtatrsStatus'
+-- * 'dtatrsResponseStatus'
 deleteTapeArchiveResponse
-    :: Int -- ^ 'dtatrsStatus'
+    :: Int -- ^ 'dtatrsResponseStatus'
     -> DeleteTapeArchiveResponse
-deleteTapeArchiveResponse pStatus_ =
+deleteTapeArchiveResponse pResponseStatus_ =
     DeleteTapeArchiveResponse'
     { _dtatrsTapeARN = Nothing
-    , _dtatrsStatus = pStatus_
+    , _dtatrsResponseStatus = pResponseStatus_
     }
 
 -- | The Amazon Resource Name (ARN) of the virtual tape that was deleted from
@@ -128,5 +128,5 @@
 dtatrsTapeARN = lens _dtatrsTapeARN (\ s a -> s{_dtatrsTapeARN = a});
 
 -- | The response status code.
-dtatrsStatus :: Lens' DeleteTapeArchiveResponse Int
-dtatrsStatus = lens _dtatrsStatus (\ s a -> s{_dtatrsStatus = a});
+dtatrsResponseStatus :: Lens' DeleteTapeArchiveResponse Int
+dtatrsResponseStatus = lens _dtatrsResponseStatus (\ s a -> s{_dtatrsResponseStatus = a});
diff --git a/gen/Network/AWS/StorageGateway/DeleteVolume.hs b/gen/Network/AWS/StorageGateway/DeleteVolume.hs
--- a/gen/Network/AWS/StorageGateway/DeleteVolume.hs
+++ b/gen/Network/AWS/StorageGateway/DeleteVolume.hs
@@ -48,7 +48,7 @@
     , DeleteVolumeResponse
     -- * Response Lenses
     , dvrsVolumeARN
-    , dvrsStatus
+    , dvrsResponseStatus
     ) where
 
 import           Network.AWS.Prelude
@@ -116,8 +116,8 @@
 --
 -- /See:/ 'deleteVolumeResponse' smart constructor.
 data DeleteVolumeResponse = DeleteVolumeResponse'
-    { _dvrsVolumeARN :: !(Maybe Text)
-    , _dvrsStatus    :: !Int
+    { _dvrsVolumeARN      :: !(Maybe Text)
+    , _dvrsResponseStatus :: !Int
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'DeleteVolumeResponse' with the minimum fields required to make a request.
@@ -126,14 +126,14 @@
 --
 -- * 'dvrsVolumeARN'
 --
--- * 'dvrsStatus'
+-- * 'dvrsResponseStatus'
 deleteVolumeResponse
-    :: Int -- ^ 'dvrsStatus'
+    :: Int -- ^ 'dvrsResponseStatus'
     -> DeleteVolumeResponse
-deleteVolumeResponse pStatus_ =
+deleteVolumeResponse pResponseStatus_ =
     DeleteVolumeResponse'
     { _dvrsVolumeARN = Nothing
-    , _dvrsStatus = pStatus_
+    , _dvrsResponseStatus = pResponseStatus_
     }
 
 -- | The Amazon Resource Name (ARN) of the storage volume that was deleted.
@@ -142,5 +142,5 @@
 dvrsVolumeARN = lens _dvrsVolumeARN (\ s a -> s{_dvrsVolumeARN = a});
 
 -- | The response status code.
-dvrsStatus :: Lens' DeleteVolumeResponse Int
-dvrsStatus = lens _dvrsStatus (\ s a -> s{_dvrsStatus = a});
+dvrsResponseStatus :: Lens' DeleteVolumeResponse Int
+dvrsResponseStatus = lens _dvrsResponseStatus (\ s a -> s{_dvrsResponseStatus = a});
diff --git a/gen/Network/AWS/StorageGateway/DescribeBandwidthRateLimit.hs b/gen/Network/AWS/StorageGateway/DescribeBandwidthRateLimit.hs
--- a/gen/Network/AWS/StorageGateway/DescribeBandwidthRateLimit.hs
+++ b/gen/Network/AWS/StorageGateway/DescribeBandwidthRateLimit.hs
@@ -44,7 +44,7 @@
     , dbrlrsGatewayARN
     , dbrlrsAverageUploadRateLimitInBitsPerSec
     , dbrlrsAverageDownloadRateLimitInBitsPerSec
-    , dbrlrsStatus
+    , dbrlrsResponseStatus
     ) where
 
 import           Network.AWS.Prelude
@@ -118,7 +118,7 @@
     { _dbrlrsGatewayARN                           :: !(Maybe Text)
     , _dbrlrsAverageUploadRateLimitInBitsPerSec   :: !(Maybe Nat)
     , _dbrlrsAverageDownloadRateLimitInBitsPerSec :: !(Maybe Nat)
-    , _dbrlrsStatus                               :: !Int
+    , _dbrlrsResponseStatus                       :: !Int
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'DescribeBandwidthRateLimitResponse' with the minimum fields required to make a request.
@@ -131,16 +131,16 @@
 --
 -- * 'dbrlrsAverageDownloadRateLimitInBitsPerSec'
 --
--- * 'dbrlrsStatus'
+-- * 'dbrlrsResponseStatus'
 describeBandwidthRateLimitResponse
-    :: Int -- ^ 'dbrlrsStatus'
+    :: Int -- ^ 'dbrlrsResponseStatus'
     -> DescribeBandwidthRateLimitResponse
-describeBandwidthRateLimitResponse pStatus_ =
+describeBandwidthRateLimitResponse pResponseStatus_ =
     DescribeBandwidthRateLimitResponse'
     { _dbrlrsGatewayARN = Nothing
     , _dbrlrsAverageUploadRateLimitInBitsPerSec = Nothing
     , _dbrlrsAverageDownloadRateLimitInBitsPerSec = Nothing
-    , _dbrlrsStatus = pStatus_
+    , _dbrlrsResponseStatus = pResponseStatus_
     }
 
 -- | Undocumented member.
@@ -158,5 +158,5 @@
 dbrlrsAverageDownloadRateLimitInBitsPerSec = lens _dbrlrsAverageDownloadRateLimitInBitsPerSec (\ s a -> s{_dbrlrsAverageDownloadRateLimitInBitsPerSec = a}) . mapping _Nat;
 
 -- | The response status code.
-dbrlrsStatus :: Lens' DescribeBandwidthRateLimitResponse Int
-dbrlrsStatus = lens _dbrlrsStatus (\ s a -> s{_dbrlrsStatus = a});
+dbrlrsResponseStatus :: Lens' DescribeBandwidthRateLimitResponse Int
+dbrlrsResponseStatus = lens _dbrlrsResponseStatus (\ s a -> s{_dbrlrsResponseStatus = a});
diff --git a/gen/Network/AWS/StorageGateway/DescribeCache.hs b/gen/Network/AWS/StorageGateway/DescribeCache.hs
--- a/gen/Network/AWS/StorageGateway/DescribeCache.hs
+++ b/gen/Network/AWS/StorageGateway/DescribeCache.hs
@@ -44,7 +44,7 @@
     , dcrsCacheMissPercentage
     , dcrsCacheAllocatedInBytes
     , dcrsCacheDirtyPercentage
-    , dcrsStatus
+    , dcrsResponseStatus
     ) where
 
 import           Network.AWS.Prelude
@@ -120,7 +120,7 @@
     , _dcrsCacheMissPercentage   :: !(Maybe Double)
     , _dcrsCacheAllocatedInBytes :: !(Maybe Integer)
     , _dcrsCacheDirtyPercentage  :: !(Maybe Double)
-    , _dcrsStatus                :: !Int
+    , _dcrsResponseStatus        :: !Int
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'DescribeCacheResponse' with the minimum fields required to make a request.
@@ -141,11 +141,11 @@
 --
 -- * 'dcrsCacheDirtyPercentage'
 --
--- * 'dcrsStatus'
+-- * 'dcrsResponseStatus'
 describeCacheResponse
-    :: Int -- ^ 'dcrsStatus'
+    :: Int -- ^ 'dcrsResponseStatus'
     -> DescribeCacheResponse
-describeCacheResponse pStatus_ =
+describeCacheResponse pResponseStatus_ =
     DescribeCacheResponse'
     { _dcrsGatewayARN = Nothing
     , _dcrsDiskIds = Nothing
@@ -154,7 +154,7 @@
     , _dcrsCacheMissPercentage = Nothing
     , _dcrsCacheAllocatedInBytes = Nothing
     , _dcrsCacheDirtyPercentage = Nothing
-    , _dcrsStatus = pStatus_
+    , _dcrsResponseStatus = pResponseStatus_
     }
 
 -- | Undocumented member.
@@ -186,5 +186,5 @@
 dcrsCacheDirtyPercentage = lens _dcrsCacheDirtyPercentage (\ s a -> s{_dcrsCacheDirtyPercentage = a});
 
 -- | The response status code.
-dcrsStatus :: Lens' DescribeCacheResponse Int
-dcrsStatus = lens _dcrsStatus (\ s a -> s{_dcrsStatus = a});
+dcrsResponseStatus :: Lens' DescribeCacheResponse Int
+dcrsResponseStatus = lens _dcrsResponseStatus (\ s a -> s{_dcrsResponseStatus = a});
diff --git a/gen/Network/AWS/StorageGateway/DescribeCachediSCSIVolumes.hs b/gen/Network/AWS/StorageGateway/DescribeCachediSCSIVolumes.hs
--- a/gen/Network/AWS/StorageGateway/DescribeCachediSCSIVolumes.hs
+++ b/gen/Network/AWS/StorageGateway/DescribeCachediSCSIVolumes.hs
@@ -40,7 +40,7 @@
     , DescribeCachediSCSIVolumesResponse
     -- * Response Lenses
     , dcscsivrsCachediSCSIVolumes
-    , dcscsivrsStatus
+    , dcscsivrsResponseStatus
     ) where
 
 import           Network.AWS.Prelude
@@ -108,7 +108,7 @@
 -- /See:/ 'describeCachediSCSIVolumesResponse' smart constructor.
 data DescribeCachediSCSIVolumesResponse = DescribeCachediSCSIVolumesResponse'
     { _dcscsivrsCachediSCSIVolumes :: !(Maybe [CachediSCSIVolume])
-    , _dcscsivrsStatus             :: !Int
+    , _dcscsivrsResponseStatus     :: !Int
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'DescribeCachediSCSIVolumesResponse' with the minimum fields required to make a request.
@@ -117,14 +117,14 @@
 --
 -- * 'dcscsivrsCachediSCSIVolumes'
 --
--- * 'dcscsivrsStatus'
+-- * 'dcscsivrsResponseStatus'
 describeCachediSCSIVolumesResponse
-    :: Int -- ^ 'dcscsivrsStatus'
+    :: Int -- ^ 'dcscsivrsResponseStatus'
     -> DescribeCachediSCSIVolumesResponse
-describeCachediSCSIVolumesResponse pStatus_ =
+describeCachediSCSIVolumesResponse pResponseStatus_ =
     DescribeCachediSCSIVolumesResponse'
     { _dcscsivrsCachediSCSIVolumes = Nothing
-    , _dcscsivrsStatus = pStatus_
+    , _dcscsivrsResponseStatus = pResponseStatus_
     }
 
 -- | An array of objects where each object contains metadata about one cached
@@ -133,5 +133,5 @@
 dcscsivrsCachediSCSIVolumes = lens _dcscsivrsCachediSCSIVolumes (\ s a -> s{_dcscsivrsCachediSCSIVolumes = a}) . _Default . _Coerce;
 
 -- | The response status code.
-dcscsivrsStatus :: Lens' DescribeCachediSCSIVolumesResponse Int
-dcscsivrsStatus = lens _dcscsivrsStatus (\ s a -> s{_dcscsivrsStatus = a});
+dcscsivrsResponseStatus :: Lens' DescribeCachediSCSIVolumesResponse Int
+dcscsivrsResponseStatus = lens _dcscsivrsResponseStatus (\ s a -> s{_dcscsivrsResponseStatus = a});
diff --git a/gen/Network/AWS/StorageGateway/DescribeChapCredentials.hs b/gen/Network/AWS/StorageGateway/DescribeChapCredentials.hs
--- a/gen/Network/AWS/StorageGateway/DescribeChapCredentials.hs
+++ b/gen/Network/AWS/StorageGateway/DescribeChapCredentials.hs
@@ -36,7 +36,7 @@
     , DescribeChapCredentialsResponse
     -- * Response Lenses
     , dccrsChapCredentials
-    , dccrsStatus
+    , dccrsResponseStatus
     ) where
 
 import           Network.AWS.Prelude
@@ -109,7 +109,7 @@
 -- /See:/ 'describeChapCredentialsResponse' smart constructor.
 data DescribeChapCredentialsResponse = DescribeChapCredentialsResponse'
     { _dccrsChapCredentials :: !(Maybe [ChapInfo])
-    , _dccrsStatus          :: !Int
+    , _dccrsResponseStatus  :: !Int
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'DescribeChapCredentialsResponse' with the minimum fields required to make a request.
@@ -118,14 +118,14 @@
 --
 -- * 'dccrsChapCredentials'
 --
--- * 'dccrsStatus'
+-- * 'dccrsResponseStatus'
 describeChapCredentialsResponse
-    :: Int -- ^ 'dccrsStatus'
+    :: Int -- ^ 'dccrsResponseStatus'
     -> DescribeChapCredentialsResponse
-describeChapCredentialsResponse pStatus_ =
+describeChapCredentialsResponse pResponseStatus_ =
     DescribeChapCredentialsResponse'
     { _dccrsChapCredentials = Nothing
-    , _dccrsStatus = pStatus_
+    , _dccrsResponseStatus = pResponseStatus_
     }
 
 -- | An array of ChapInfo objects that represent CHAP credentials. Each
@@ -150,5 +150,5 @@
 dccrsChapCredentials = lens _dccrsChapCredentials (\ s a -> s{_dccrsChapCredentials = a}) . _Default . _Coerce;
 
 -- | The response status code.
-dccrsStatus :: Lens' DescribeChapCredentialsResponse Int
-dccrsStatus = lens _dccrsStatus (\ s a -> s{_dccrsStatus = a});
+dccrsResponseStatus :: Lens' DescribeChapCredentialsResponse Int
+dccrsResponseStatus = lens _dccrsResponseStatus (\ s a -> s{_dccrsResponseStatus = a});
diff --git a/gen/Network/AWS/StorageGateway/DescribeGatewayInformation.hs b/gen/Network/AWS/StorageGateway/DescribeGatewayInformation.hs
--- a/gen/Network/AWS/StorageGateway/DescribeGatewayInformation.hs
+++ b/gen/Network/AWS/StorageGateway/DescribeGatewayInformation.hs
@@ -44,7 +44,7 @@
     , dgirsGatewayId
     , dgirsGatewayType
     , dgirsGatewayTimezone
-    , dgirsStatus
+    , dgirsResponseStatus
     ) where
 
 import           Network.AWS.Prelude
@@ -127,7 +127,7 @@
     , _dgirsGatewayId                  :: !(Maybe Text)
     , _dgirsGatewayType                :: !(Maybe Text)
     , _dgirsGatewayTimezone            :: !(Maybe Text)
-    , _dgirsStatus                     :: !Int
+    , _dgirsResponseStatus             :: !Int
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'DescribeGatewayInformationResponse' with the minimum fields required to make a request.
@@ -150,11 +150,11 @@
 --
 -- * 'dgirsGatewayTimezone'
 --
--- * 'dgirsStatus'
+-- * 'dgirsResponseStatus'
 describeGatewayInformationResponse
-    :: Int -- ^ 'dgirsStatus'
+    :: Int -- ^ 'dgirsResponseStatus'
     -> DescribeGatewayInformationResponse
-describeGatewayInformationResponse pStatus_ =
+describeGatewayInformationResponse pResponseStatus_ =
     DescribeGatewayInformationResponse'
     { _dgirsGatewayState = Nothing
     , _dgirsGatewayARN = Nothing
@@ -164,7 +164,7 @@
     , _dgirsGatewayId = Nothing
     , _dgirsGatewayType = Nothing
     , _dgirsGatewayTimezone = Nothing
-    , _dgirsStatus = pStatus_
+    , _dgirsResponseStatus = pResponseStatus_
     }
 
 -- | One of the values that indicates the operating state of the gateway.
@@ -206,5 +206,5 @@
 dgirsGatewayTimezone = lens _dgirsGatewayTimezone (\ s a -> s{_dgirsGatewayTimezone = a});
 
 -- | The response status code.
-dgirsStatus :: Lens' DescribeGatewayInformationResponse Int
-dgirsStatus = lens _dgirsStatus (\ s a -> s{_dgirsStatus = a});
+dgirsResponseStatus :: Lens' DescribeGatewayInformationResponse Int
+dgirsResponseStatus = lens _dgirsResponseStatus (\ s a -> s{_dgirsResponseStatus = a});
diff --git a/gen/Network/AWS/StorageGateway/DescribeMaintenanceStartTime.hs b/gen/Network/AWS/StorageGateway/DescribeMaintenanceStartTime.hs
--- a/gen/Network/AWS/StorageGateway/DescribeMaintenanceStartTime.hs
+++ b/gen/Network/AWS/StorageGateway/DescribeMaintenanceStartTime.hs
@@ -40,7 +40,7 @@
     , dmstrsHourOfDay
     , dmstrsTimezone
     , dmstrsDayOfWeek
-    , dmstrsStatus
+    , dmstrsResponseStatus
     ) where
 
 import           Network.AWS.Prelude
@@ -111,12 +111,12 @@
 
 -- | /See:/ 'describeMaintenanceStartTimeResponse' smart constructor.
 data DescribeMaintenanceStartTimeResponse = DescribeMaintenanceStartTimeResponse'
-    { _dmstrsGatewayARN   :: !(Maybe Text)
-    , _dmstrsMinuteOfHour :: !(Maybe Nat)
-    , _dmstrsHourOfDay    :: !(Maybe Nat)
-    , _dmstrsTimezone     :: !(Maybe Text)
-    , _dmstrsDayOfWeek    :: !(Maybe Nat)
-    , _dmstrsStatus       :: !Int
+    { _dmstrsGatewayARN     :: !(Maybe Text)
+    , _dmstrsMinuteOfHour   :: !(Maybe Nat)
+    , _dmstrsHourOfDay      :: !(Maybe Nat)
+    , _dmstrsTimezone       :: !(Maybe Text)
+    , _dmstrsDayOfWeek      :: !(Maybe Nat)
+    , _dmstrsResponseStatus :: !Int
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'DescribeMaintenanceStartTimeResponse' with the minimum fields required to make a request.
@@ -133,18 +133,18 @@
 --
 -- * 'dmstrsDayOfWeek'
 --
--- * 'dmstrsStatus'
+-- * 'dmstrsResponseStatus'
 describeMaintenanceStartTimeResponse
-    :: Int -- ^ 'dmstrsStatus'
+    :: Int -- ^ 'dmstrsResponseStatus'
     -> DescribeMaintenanceStartTimeResponse
-describeMaintenanceStartTimeResponse pStatus_ =
+describeMaintenanceStartTimeResponse pResponseStatus_ =
     DescribeMaintenanceStartTimeResponse'
     { _dmstrsGatewayARN = Nothing
     , _dmstrsMinuteOfHour = Nothing
     , _dmstrsHourOfDay = Nothing
     , _dmstrsTimezone = Nothing
     , _dmstrsDayOfWeek = Nothing
-    , _dmstrsStatus = pStatus_
+    , _dmstrsResponseStatus = pResponseStatus_
     }
 
 -- | Undocumented member.
@@ -168,5 +168,5 @@
 dmstrsDayOfWeek = lens _dmstrsDayOfWeek (\ s a -> s{_dmstrsDayOfWeek = a}) . mapping _Nat;
 
 -- | The response status code.
-dmstrsStatus :: Lens' DescribeMaintenanceStartTimeResponse Int
-dmstrsStatus = lens _dmstrsStatus (\ s a -> s{_dmstrsStatus = a});
+dmstrsResponseStatus :: Lens' DescribeMaintenanceStartTimeResponse Int
+dmstrsResponseStatus = lens _dmstrsResponseStatus (\ s a -> s{_dmstrsResponseStatus = a});
diff --git a/gen/Network/AWS/StorageGateway/DescribeSnapshotSchedule.hs b/gen/Network/AWS/StorageGateway/DescribeSnapshotSchedule.hs
--- a/gen/Network/AWS/StorageGateway/DescribeSnapshotSchedule.hs
+++ b/gen/Network/AWS/StorageGateway/DescribeSnapshotSchedule.hs
@@ -35,12 +35,12 @@
     , describeSnapshotScheduleResponse
     , DescribeSnapshotScheduleResponse
     -- * Response Lenses
-    , dssrsVolumeARN
     , dssrsStartAt
+    , dssrsVolumeARN
     , dssrsRecurrenceInHours
     , dssrsTimezone
     , dssrsDescription
-    , dssrsStatus
+    , dssrsResponseStatus
     ) where
 
 import           Network.AWS.Prelude
@@ -83,7 +83,7 @@
           = receiveJSON
               (\ s h x ->
                  DescribeSnapshotScheduleResponse' <$>
-                   (x .?> "VolumeARN") <*> (x .?> "StartAt") <*>
+                   (x .?> "StartAt") <*> (x .?> "VolumeARN") <*>
                      (x .?> "RecurrenceInHours")
                      <*> (x .?> "Timezone")
                      <*> (x .?> "Description")
@@ -112,51 +112,51 @@
 
 -- | /See:/ 'describeSnapshotScheduleResponse' smart constructor.
 data DescribeSnapshotScheduleResponse = DescribeSnapshotScheduleResponse'
-    { _dssrsVolumeARN         :: !(Maybe Text)
-    , _dssrsStartAt           :: !(Maybe Nat)
+    { _dssrsStartAt           :: !(Maybe Nat)
+    , _dssrsVolumeARN         :: !(Maybe Text)
     , _dssrsRecurrenceInHours :: !(Maybe Nat)
     , _dssrsTimezone          :: !(Maybe Text)
     , _dssrsDescription       :: !(Maybe Text)
-    , _dssrsStatus            :: !Int
+    , _dssrsResponseStatus    :: !Int
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'DescribeSnapshotScheduleResponse' with the minimum fields required to make a request.
 --
 -- Use one of the following lenses to modify other fields as desired:
 --
--- * 'dssrsVolumeARN'
---
 -- * 'dssrsStartAt'
 --
+-- * 'dssrsVolumeARN'
+--
 -- * 'dssrsRecurrenceInHours'
 --
 -- * 'dssrsTimezone'
 --
 -- * 'dssrsDescription'
 --
--- * 'dssrsStatus'
+-- * 'dssrsResponseStatus'
 describeSnapshotScheduleResponse
-    :: Int -- ^ 'dssrsStatus'
+    :: Int -- ^ 'dssrsResponseStatus'
     -> DescribeSnapshotScheduleResponse
-describeSnapshotScheduleResponse pStatus_ =
+describeSnapshotScheduleResponse pResponseStatus_ =
     DescribeSnapshotScheduleResponse'
-    { _dssrsVolumeARN = Nothing
-    , _dssrsStartAt = Nothing
+    { _dssrsStartAt = Nothing
+    , _dssrsVolumeARN = Nothing
     , _dssrsRecurrenceInHours = Nothing
     , _dssrsTimezone = Nothing
     , _dssrsDescription = Nothing
-    , _dssrsStatus = pStatus_
+    , _dssrsResponseStatus = pResponseStatus_
     }
 
 -- | Undocumented member.
-dssrsVolumeARN :: Lens' DescribeSnapshotScheduleResponse (Maybe Text)
-dssrsVolumeARN = lens _dssrsVolumeARN (\ s a -> s{_dssrsVolumeARN = a});
-
--- | Undocumented member.
 dssrsStartAt :: Lens' DescribeSnapshotScheduleResponse (Maybe Natural)
 dssrsStartAt = lens _dssrsStartAt (\ s a -> s{_dssrsStartAt = a}) . mapping _Nat;
 
 -- | Undocumented member.
+dssrsVolumeARN :: Lens' DescribeSnapshotScheduleResponse (Maybe Text)
+dssrsVolumeARN = lens _dssrsVolumeARN (\ s a -> s{_dssrsVolumeARN = a});
+
+-- | Undocumented member.
 dssrsRecurrenceInHours :: Lens' DescribeSnapshotScheduleResponse (Maybe Natural)
 dssrsRecurrenceInHours = lens _dssrsRecurrenceInHours (\ s a -> s{_dssrsRecurrenceInHours = a}) . mapping _Nat;
 
@@ -169,5 +169,5 @@
 dssrsDescription = lens _dssrsDescription (\ s a -> s{_dssrsDescription = a});
 
 -- | The response status code.
-dssrsStatus :: Lens' DescribeSnapshotScheduleResponse Int
-dssrsStatus = lens _dssrsStatus (\ s a -> s{_dssrsStatus = a});
+dssrsResponseStatus :: Lens' DescribeSnapshotScheduleResponse Int
+dssrsResponseStatus = lens _dssrsResponseStatus (\ s a -> s{_dssrsResponseStatus = a});
diff --git a/gen/Network/AWS/StorageGateway/DescribeStorediSCSIVolumes.hs b/gen/Network/AWS/StorageGateway/DescribeStorediSCSIVolumes.hs
--- a/gen/Network/AWS/StorageGateway/DescribeStorediSCSIVolumes.hs
+++ b/gen/Network/AWS/StorageGateway/DescribeStorediSCSIVolumes.hs
@@ -37,7 +37,7 @@
     , DescribeStorediSCSIVolumesResponse
     -- * Response Lenses
     , dsscsivrsStorediSCSIVolumes
-    , dsscsivrsStatus
+    , dsscsivrsResponseStatus
     ) where
 
 import           Network.AWS.Prelude
@@ -108,7 +108,7 @@
 -- | /See:/ 'describeStorediSCSIVolumesResponse' smart constructor.
 data DescribeStorediSCSIVolumesResponse = DescribeStorediSCSIVolumesResponse'
     { _dsscsivrsStorediSCSIVolumes :: !(Maybe [StorediSCSIVolume])
-    , _dsscsivrsStatus             :: !Int
+    , _dsscsivrsResponseStatus     :: !Int
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'DescribeStorediSCSIVolumesResponse' with the minimum fields required to make a request.
@@ -117,14 +117,14 @@
 --
 -- * 'dsscsivrsStorediSCSIVolumes'
 --
--- * 'dsscsivrsStatus'
+-- * 'dsscsivrsResponseStatus'
 describeStorediSCSIVolumesResponse
-    :: Int -- ^ 'dsscsivrsStatus'
+    :: Int -- ^ 'dsscsivrsResponseStatus'
     -> DescribeStorediSCSIVolumesResponse
-describeStorediSCSIVolumesResponse pStatus_ =
+describeStorediSCSIVolumesResponse pResponseStatus_ =
     DescribeStorediSCSIVolumesResponse'
     { _dsscsivrsStorediSCSIVolumes = Nothing
-    , _dsscsivrsStatus = pStatus_
+    , _dsscsivrsResponseStatus = pResponseStatus_
     }
 
 -- | Undocumented member.
@@ -132,5 +132,5 @@
 dsscsivrsStorediSCSIVolumes = lens _dsscsivrsStorediSCSIVolumes (\ s a -> s{_dsscsivrsStorediSCSIVolumes = a}) . _Default . _Coerce;
 
 -- | The response status code.
-dsscsivrsStatus :: Lens' DescribeStorediSCSIVolumesResponse Int
-dsscsivrsStatus = lens _dsscsivrsStatus (\ s a -> s{_dsscsivrsStatus = a});
+dsscsivrsResponseStatus :: Lens' DescribeStorediSCSIVolumesResponse Int
+dsscsivrsResponseStatus = lens _dsscsivrsResponseStatus (\ s a -> s{_dsscsivrsResponseStatus = a});
diff --git a/gen/Network/AWS/StorageGateway/DescribeTapeArchives.hs b/gen/Network/AWS/StorageGateway/DescribeTapeArchives.hs
--- a/gen/Network/AWS/StorageGateway/DescribeTapeArchives.hs
+++ b/gen/Network/AWS/StorageGateway/DescribeTapeArchives.hs
@@ -44,7 +44,7 @@
     -- * Response Lenses
     , dtarsTapeArchives
     , dtarsMarker
-    , dtarsStatus
+    , dtarsResponseStatus
     ) where
 
 import           Network.AWS.Pager
@@ -143,9 +143,9 @@
 --
 -- /See:/ 'describeTapeArchivesResponse' smart constructor.
 data DescribeTapeArchivesResponse = DescribeTapeArchivesResponse'
-    { _dtarsTapeArchives :: !(Maybe [TapeArchive])
-    , _dtarsMarker       :: !(Maybe Text)
-    , _dtarsStatus       :: !Int
+    { _dtarsTapeArchives   :: !(Maybe [TapeArchive])
+    , _dtarsMarker         :: !(Maybe Text)
+    , _dtarsResponseStatus :: !Int
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'DescribeTapeArchivesResponse' with the minimum fields required to make a request.
@@ -156,15 +156,15 @@
 --
 -- * 'dtarsMarker'
 --
--- * 'dtarsStatus'
+-- * 'dtarsResponseStatus'
 describeTapeArchivesResponse
-    :: Int -- ^ 'dtarsStatus'
+    :: Int -- ^ 'dtarsResponseStatus'
     -> DescribeTapeArchivesResponse
-describeTapeArchivesResponse pStatus_ =
+describeTapeArchivesResponse pResponseStatus_ =
     DescribeTapeArchivesResponse'
     { _dtarsTapeArchives = Nothing
     , _dtarsMarker = Nothing
-    , _dtarsStatus = pStatus_
+    , _dtarsResponseStatus = pResponseStatus_
     }
 
 -- | An array of virtual tape objects in the virtual tape shelf (VTS). The
@@ -184,5 +184,5 @@
 dtarsMarker = lens _dtarsMarker (\ s a -> s{_dtarsMarker = a});
 
 -- | The response status code.
-dtarsStatus :: Lens' DescribeTapeArchivesResponse Int
-dtarsStatus = lens _dtarsStatus (\ s a -> s{_dtarsStatus = a});
+dtarsResponseStatus :: Lens' DescribeTapeArchivesResponse Int
+dtarsResponseStatus = lens _dtarsResponseStatus (\ s a -> s{_dtarsResponseStatus = a});
diff --git a/gen/Network/AWS/StorageGateway/DescribeTapeRecoveryPoints.hs b/gen/Network/AWS/StorageGateway/DescribeTapeRecoveryPoints.hs
--- a/gen/Network/AWS/StorageGateway/DescribeTapeRecoveryPoints.hs
+++ b/gen/Network/AWS/StorageGateway/DescribeTapeRecoveryPoints.hs
@@ -46,7 +46,7 @@
     , dtrprsTapeRecoveryPointInfos
     , dtrprsGatewayARN
     , dtrprsMarker
-    , dtrprsStatus
+    , dtrprsResponseStatus
     ) where
 
 import           Network.AWS.Pager
@@ -149,7 +149,7 @@
     { _dtrprsTapeRecoveryPointInfos :: !(Maybe [TapeRecoveryPointInfo])
     , _dtrprsGatewayARN             :: !(Maybe Text)
     , _dtrprsMarker                 :: !(Maybe Text)
-    , _dtrprsStatus                 :: !Int
+    , _dtrprsResponseStatus         :: !Int
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'DescribeTapeRecoveryPointsResponse' with the minimum fields required to make a request.
@@ -162,16 +162,16 @@
 --
 -- * 'dtrprsMarker'
 --
--- * 'dtrprsStatus'
+-- * 'dtrprsResponseStatus'
 describeTapeRecoveryPointsResponse
-    :: Int -- ^ 'dtrprsStatus'
+    :: Int -- ^ 'dtrprsResponseStatus'
     -> DescribeTapeRecoveryPointsResponse
-describeTapeRecoveryPointsResponse pStatus_ =
+describeTapeRecoveryPointsResponse pResponseStatus_ =
     DescribeTapeRecoveryPointsResponse'
     { _dtrprsTapeRecoveryPointInfos = Nothing
     , _dtrprsGatewayARN = Nothing
     , _dtrprsMarker = Nothing
-    , _dtrprsStatus = pStatus_
+    , _dtrprsResponseStatus = pResponseStatus_
     }
 
 -- | An array of TapeRecoveryPointInfos that are available for the specified
@@ -193,5 +193,5 @@
 dtrprsMarker = lens _dtrprsMarker (\ s a -> s{_dtrprsMarker = a});
 
 -- | The response status code.
-dtrprsStatus :: Lens' DescribeTapeRecoveryPointsResponse Int
-dtrprsStatus = lens _dtrprsStatus (\ s a -> s{_dtrprsStatus = a});
+dtrprsResponseStatus :: Lens' DescribeTapeRecoveryPointsResponse Int
+dtrprsResponseStatus = lens _dtrprsResponseStatus (\ s a -> s{_dtrprsResponseStatus = a});
diff --git a/gen/Network/AWS/StorageGateway/DescribeTapes.hs b/gen/Network/AWS/StorageGateway/DescribeTapes.hs
--- a/gen/Network/AWS/StorageGateway/DescribeTapes.hs
+++ b/gen/Network/AWS/StorageGateway/DescribeTapes.hs
@@ -42,7 +42,7 @@
     -- * Response Lenses
     , dtsrsMarker
     , dtsrsTapes
-    , dtsrsStatus
+    , dtsrsResponseStatus
     ) where
 
 import           Network.AWS.Pager
@@ -155,9 +155,9 @@
 --
 -- /See:/ 'describeTapesResponse' smart constructor.
 data DescribeTapesResponse = DescribeTapesResponse'
-    { _dtsrsMarker :: !(Maybe Text)
-    , _dtsrsTapes  :: !(Maybe [Tape])
-    , _dtsrsStatus :: !Int
+    { _dtsrsMarker         :: !(Maybe Text)
+    , _dtsrsTapes          :: !(Maybe [Tape])
+    , _dtsrsResponseStatus :: !Int
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'DescribeTapesResponse' with the minimum fields required to make a request.
@@ -168,15 +168,15 @@
 --
 -- * 'dtsrsTapes'
 --
--- * 'dtsrsStatus'
+-- * 'dtsrsResponseStatus'
 describeTapesResponse
-    :: Int -- ^ 'dtsrsStatus'
+    :: Int -- ^ 'dtsrsResponseStatus'
     -> DescribeTapesResponse
-describeTapesResponse pStatus_ =
+describeTapesResponse pResponseStatus_ =
     DescribeTapesResponse'
     { _dtsrsMarker = Nothing
     , _dtsrsTapes = Nothing
-    , _dtsrsStatus = pStatus_
+    , _dtsrsResponseStatus = pResponseStatus_
     }
 
 -- | An opaque string which can be used as part of a subsequent DescribeTapes
@@ -192,5 +192,5 @@
 dtsrsTapes = lens _dtsrsTapes (\ s a -> s{_dtsrsTapes = a}) . _Default . _Coerce;
 
 -- | The response status code.
-dtsrsStatus :: Lens' DescribeTapesResponse Int
-dtsrsStatus = lens _dtsrsStatus (\ s a -> s{_dtsrsStatus = a});
+dtsrsResponseStatus :: Lens' DescribeTapesResponse Int
+dtsrsResponseStatus = lens _dtsrsResponseStatus (\ s a -> s{_dtsrsResponseStatus = a});
diff --git a/gen/Network/AWS/StorageGateway/DescribeUploadBuffer.hs b/gen/Network/AWS/StorageGateway/DescribeUploadBuffer.hs
--- a/gen/Network/AWS/StorageGateway/DescribeUploadBuffer.hs
+++ b/gen/Network/AWS/StorageGateway/DescribeUploadBuffer.hs
@@ -43,7 +43,7 @@
     , dubrsGatewayARN
     , dubrsDiskIds
     , dubrsUploadBufferUsedInBytes
-    , dubrsStatus
+    , dubrsResponseStatus
     ) where
 
 import           Network.AWS.Prelude
@@ -115,7 +115,7 @@
     , _dubrsGatewayARN                   :: !(Maybe Text)
     , _dubrsDiskIds                      :: !(Maybe [Text])
     , _dubrsUploadBufferUsedInBytes      :: !(Maybe Integer)
-    , _dubrsStatus                       :: !Int
+    , _dubrsResponseStatus               :: !Int
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'DescribeUploadBufferResponse' with the minimum fields required to make a request.
@@ -130,17 +130,17 @@
 --
 -- * 'dubrsUploadBufferUsedInBytes'
 --
--- * 'dubrsStatus'
+-- * 'dubrsResponseStatus'
 describeUploadBufferResponse
-    :: Int -- ^ 'dubrsStatus'
+    :: Int -- ^ 'dubrsResponseStatus'
     -> DescribeUploadBufferResponse
-describeUploadBufferResponse pStatus_ =
+describeUploadBufferResponse pResponseStatus_ =
     DescribeUploadBufferResponse'
     { _dubrsUploadBufferAllocatedInBytes = Nothing
     , _dubrsGatewayARN = Nothing
     , _dubrsDiskIds = Nothing
     , _dubrsUploadBufferUsedInBytes = Nothing
-    , _dubrsStatus = pStatus_
+    , _dubrsResponseStatus = pResponseStatus_
     }
 
 -- | Undocumented member.
@@ -160,5 +160,5 @@
 dubrsUploadBufferUsedInBytes = lens _dubrsUploadBufferUsedInBytes (\ s a -> s{_dubrsUploadBufferUsedInBytes = a});
 
 -- | The response status code.
-dubrsStatus :: Lens' DescribeUploadBufferResponse Int
-dubrsStatus = lens _dubrsStatus (\ s a -> s{_dubrsStatus = a});
+dubrsResponseStatus :: Lens' DescribeUploadBufferResponse Int
+dubrsResponseStatus = lens _dubrsResponseStatus (\ s a -> s{_dubrsResponseStatus = a});
diff --git a/gen/Network/AWS/StorageGateway/DescribeVTLDevices.hs b/gen/Network/AWS/StorageGateway/DescribeVTLDevices.hs
--- a/gen/Network/AWS/StorageGateway/DescribeVTLDevices.hs
+++ b/gen/Network/AWS/StorageGateway/DescribeVTLDevices.hs
@@ -42,10 +42,10 @@
     , describeVTLDevicesResponse
     , DescribeVTLDevicesResponse
     -- * Response Lenses
-    , dvtldrsGatewayARN
     , dvtldrsVTLDevices
+    , dvtldrsGatewayARN
     , dvtldrsMarker
-    , dvtldrsStatus
+    , dvtldrsResponseStatus
     ) where
 
 import           Network.AWS.Pager
@@ -125,8 +125,8 @@
           = receiveJSON
               (\ s h x ->
                  DescribeVTLDevicesResponse' <$>
-                   (x .?> "GatewayARN") <*>
-                     (x .?> "VTLDevices" .!@ mempty)
+                   (x .?> "VTLDevices" .!@ mempty) <*>
+                     (x .?> "GatewayARN")
                      <*> (x .?> "Marker")
                      <*> (pure (fromEnum s)))
 
@@ -159,43 +159,43 @@
 --
 -- /See:/ 'describeVTLDevicesResponse' smart constructor.
 data DescribeVTLDevicesResponse = DescribeVTLDevicesResponse'
-    { _dvtldrsGatewayARN :: !(Maybe Text)
-    , _dvtldrsVTLDevices :: !(Maybe [VTLDevice])
-    , _dvtldrsMarker     :: !(Maybe Text)
-    , _dvtldrsStatus     :: !Int
+    { _dvtldrsVTLDevices     :: !(Maybe [VTLDevice])
+    , _dvtldrsGatewayARN     :: !(Maybe Text)
+    , _dvtldrsMarker         :: !(Maybe Text)
+    , _dvtldrsResponseStatus :: !Int
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'DescribeVTLDevicesResponse' with the minimum fields required to make a request.
 --
 -- Use one of the following lenses to modify other fields as desired:
 --
--- * 'dvtldrsGatewayARN'
---
 -- * 'dvtldrsVTLDevices'
 --
+-- * 'dvtldrsGatewayARN'
+--
 -- * 'dvtldrsMarker'
 --
--- * 'dvtldrsStatus'
+-- * 'dvtldrsResponseStatus'
 describeVTLDevicesResponse
-    :: Int -- ^ 'dvtldrsStatus'
+    :: Int -- ^ 'dvtldrsResponseStatus'
     -> DescribeVTLDevicesResponse
-describeVTLDevicesResponse pStatus_ =
+describeVTLDevicesResponse pResponseStatus_ =
     DescribeVTLDevicesResponse'
-    { _dvtldrsGatewayARN = Nothing
-    , _dvtldrsVTLDevices = Nothing
+    { _dvtldrsVTLDevices = Nothing
+    , _dvtldrsGatewayARN = Nothing
     , _dvtldrsMarker = Nothing
-    , _dvtldrsStatus = pStatus_
+    , _dvtldrsResponseStatus = pResponseStatus_
     }
 
--- | Undocumented member.
-dvtldrsGatewayARN :: Lens' DescribeVTLDevicesResponse (Maybe Text)
-dvtldrsGatewayARN = lens _dvtldrsGatewayARN (\ s a -> s{_dvtldrsGatewayARN = a});
-
 -- | An array of VTL device objects composed of the Amazon Resource Name(ARN)
 -- of the VTL devices.
 dvtldrsVTLDevices :: Lens' DescribeVTLDevicesResponse [VTLDevice]
 dvtldrsVTLDevices = lens _dvtldrsVTLDevices (\ s a -> s{_dvtldrsVTLDevices = a}) . _Default . _Coerce;
 
+-- | Undocumented member.
+dvtldrsGatewayARN :: Lens' DescribeVTLDevicesResponse (Maybe Text)
+dvtldrsGatewayARN = lens _dvtldrsGatewayARN (\ s a -> s{_dvtldrsGatewayARN = a});
+
 -- | An opaque string that indicates the position at which the VTL devices
 -- that were fetched for description ended. Use the marker in your next
 -- request to fetch the next set of VTL devices in the list. If there are
@@ -205,5 +205,5 @@
 dvtldrsMarker = lens _dvtldrsMarker (\ s a -> s{_dvtldrsMarker = a});
 
 -- | The response status code.
-dvtldrsStatus :: Lens' DescribeVTLDevicesResponse Int
-dvtldrsStatus = lens _dvtldrsStatus (\ s a -> s{_dvtldrsStatus = a});
+dvtldrsResponseStatus :: Lens' DescribeVTLDevicesResponse Int
+dvtldrsResponseStatus = lens _dvtldrsResponseStatus (\ s a -> s{_dvtldrsResponseStatus = a});
diff --git a/gen/Network/AWS/StorageGateway/DescribeWorkingStorage.hs b/gen/Network/AWS/StorageGateway/DescribeWorkingStorage.hs
--- a/gen/Network/AWS/StorageGateway/DescribeWorkingStorage.hs
+++ b/gen/Network/AWS/StorageGateway/DescribeWorkingStorage.hs
@@ -47,7 +47,7 @@
     , dwsrsDiskIds
     , dwsrsWorkingStorageAllocatedInBytes
     , dwsrsWorkingStorageUsedInBytes
-    , dwsrsStatus
+    , dwsrsResponseStatus
     ) where
 
 import           Network.AWS.Prelude
@@ -122,7 +122,7 @@
     , _dwsrsDiskIds                        :: !(Maybe [Text])
     , _dwsrsWorkingStorageAllocatedInBytes :: !(Maybe Integer)
     , _dwsrsWorkingStorageUsedInBytes      :: !(Maybe Integer)
-    , _dwsrsStatus                         :: !Int
+    , _dwsrsResponseStatus                 :: !Int
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'DescribeWorkingStorageResponse' with the minimum fields required to make a request.
@@ -137,17 +137,17 @@
 --
 -- * 'dwsrsWorkingStorageUsedInBytes'
 --
--- * 'dwsrsStatus'
+-- * 'dwsrsResponseStatus'
 describeWorkingStorageResponse
-    :: Int -- ^ 'dwsrsStatus'
+    :: Int -- ^ 'dwsrsResponseStatus'
     -> DescribeWorkingStorageResponse
-describeWorkingStorageResponse pStatus_ =
+describeWorkingStorageResponse pResponseStatus_ =
     DescribeWorkingStorageResponse'
     { _dwsrsGatewayARN = Nothing
     , _dwsrsDiskIds = Nothing
     , _dwsrsWorkingStorageAllocatedInBytes = Nothing
     , _dwsrsWorkingStorageUsedInBytes = Nothing
-    , _dwsrsStatus = pStatus_
+    , _dwsrsResponseStatus = pResponseStatus_
     }
 
 -- | Undocumented member.
@@ -172,5 +172,5 @@
 dwsrsWorkingStorageUsedInBytes = lens _dwsrsWorkingStorageUsedInBytes (\ s a -> s{_dwsrsWorkingStorageUsedInBytes = a});
 
 -- | The response status code.
-dwsrsStatus :: Lens' DescribeWorkingStorageResponse Int
-dwsrsStatus = lens _dwsrsStatus (\ s a -> s{_dwsrsStatus = a});
+dwsrsResponseStatus :: Lens' DescribeWorkingStorageResponse Int
+dwsrsResponseStatus = lens _dwsrsResponseStatus (\ s a -> s{_dwsrsResponseStatus = a});
diff --git a/gen/Network/AWS/StorageGateway/DisableGateway.hs b/gen/Network/AWS/StorageGateway/DisableGateway.hs
--- a/gen/Network/AWS/StorageGateway/DisableGateway.hs
+++ b/gen/Network/AWS/StorageGateway/DisableGateway.hs
@@ -41,7 +41,7 @@
     , DisableGatewayResponse
     -- * Response Lenses
     , disrsGatewayARN
-    , disrsStatus
+    , disrsResponseStatus
     ) where
 
 import           Network.AWS.Prelude
@@ -108,8 +108,8 @@
 --
 -- /See:/ 'disableGatewayResponse' smart constructor.
 data DisableGatewayResponse = DisableGatewayResponse'
-    { _disrsGatewayARN :: !(Maybe Text)
-    , _disrsStatus     :: !Int
+    { _disrsGatewayARN     :: !(Maybe Text)
+    , _disrsResponseStatus :: !Int
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'DisableGatewayResponse' with the minimum fields required to make a request.
@@ -118,14 +118,14 @@
 --
 -- * 'disrsGatewayARN'
 --
--- * 'disrsStatus'
+-- * 'disrsResponseStatus'
 disableGatewayResponse
-    :: Int -- ^ 'disrsStatus'
+    :: Int -- ^ 'disrsResponseStatus'
     -> DisableGatewayResponse
-disableGatewayResponse pStatus_ =
+disableGatewayResponse pResponseStatus_ =
     DisableGatewayResponse'
     { _disrsGatewayARN = Nothing
-    , _disrsStatus = pStatus_
+    , _disrsResponseStatus = pResponseStatus_
     }
 
 -- | The unique Amazon Resource Name of the disabled gateway.
@@ -133,5 +133,5 @@
 disrsGatewayARN = lens _disrsGatewayARN (\ s a -> s{_disrsGatewayARN = a});
 
 -- | The response status code.
-disrsStatus :: Lens' DisableGatewayResponse Int
-disrsStatus = lens _disrsStatus (\ s a -> s{_disrsStatus = a});
+disrsResponseStatus :: Lens' DisableGatewayResponse Int
+disrsResponseStatus = lens _disrsResponseStatus (\ s a -> s{_disrsResponseStatus = a});
diff --git a/gen/Network/AWS/StorageGateway/ListGateways.hs b/gen/Network/AWS/StorageGateway/ListGateways.hs
--- a/gen/Network/AWS/StorageGateway/ListGateways.hs
+++ b/gen/Network/AWS/StorageGateway/ListGateways.hs
@@ -49,7 +49,7 @@
     -- * Response Lenses
     , lgrsMarker
     , lgrsGateways
-    , lgrsStatus
+    , lgrsResponseStatus
     ) where
 
 import           Network.AWS.Pager
@@ -137,9 +137,9 @@
 
 -- | /See:/ 'listGatewaysResponse' smart constructor.
 data ListGatewaysResponse = ListGatewaysResponse'
-    { _lgrsMarker   :: !(Maybe Text)
-    , _lgrsGateways :: !(Maybe [GatewayInfo])
-    , _lgrsStatus   :: !Int
+    { _lgrsMarker         :: !(Maybe Text)
+    , _lgrsGateways       :: !(Maybe [GatewayInfo])
+    , _lgrsResponseStatus :: !Int
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'ListGatewaysResponse' with the minimum fields required to make a request.
@@ -150,15 +150,15 @@
 --
 -- * 'lgrsGateways'
 --
--- * 'lgrsStatus'
+-- * 'lgrsResponseStatus'
 listGatewaysResponse
-    :: Int -- ^ 'lgrsStatus'
+    :: Int -- ^ 'lgrsResponseStatus'
     -> ListGatewaysResponse
-listGatewaysResponse pStatus_ =
+listGatewaysResponse pResponseStatus_ =
     ListGatewaysResponse'
     { _lgrsMarker = Nothing
     , _lgrsGateways = Nothing
-    , _lgrsStatus = pStatus_
+    , _lgrsResponseStatus = pResponseStatus_
     }
 
 -- | Undocumented member.
@@ -170,5 +170,5 @@
 lgrsGateways = lens _lgrsGateways (\ s a -> s{_lgrsGateways = a}) . _Default . _Coerce;
 
 -- | The response status code.
-lgrsStatus :: Lens' ListGatewaysResponse Int
-lgrsStatus = lens _lgrsStatus (\ s a -> s{_lgrsStatus = a});
+lgrsResponseStatus :: Lens' ListGatewaysResponse Int
+lgrsResponseStatus = lens _lgrsResponseStatus (\ s a -> s{_lgrsResponseStatus = a});
diff --git a/gen/Network/AWS/StorageGateway/ListLocalDisks.hs b/gen/Network/AWS/StorageGateway/ListLocalDisks.hs
--- a/gen/Network/AWS/StorageGateway/ListLocalDisks.hs
+++ b/gen/Network/AWS/StorageGateway/ListLocalDisks.hs
@@ -44,7 +44,7 @@
     -- * Response Lenses
     , lldrsGatewayARN
     , lldrsDisks
-    , lldrsStatus
+    , lldrsResponseStatus
     ) where
 
 import           Network.AWS.Prelude
@@ -110,9 +110,9 @@
 
 -- | /See:/ 'listLocalDisksResponse' smart constructor.
 data ListLocalDisksResponse = ListLocalDisksResponse'
-    { _lldrsGatewayARN :: !(Maybe Text)
-    , _lldrsDisks      :: !(Maybe [Disk])
-    , _lldrsStatus     :: !Int
+    { _lldrsGatewayARN     :: !(Maybe Text)
+    , _lldrsDisks          :: !(Maybe [Disk])
+    , _lldrsResponseStatus :: !Int
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'ListLocalDisksResponse' with the minimum fields required to make a request.
@@ -123,15 +123,15 @@
 --
 -- * 'lldrsDisks'
 --
--- * 'lldrsStatus'
+-- * 'lldrsResponseStatus'
 listLocalDisksResponse
-    :: Int -- ^ 'lldrsStatus'
+    :: Int -- ^ 'lldrsResponseStatus'
     -> ListLocalDisksResponse
-listLocalDisksResponse pStatus_ =
+listLocalDisksResponse pResponseStatus_ =
     ListLocalDisksResponse'
     { _lldrsGatewayARN = Nothing
     , _lldrsDisks = Nothing
-    , _lldrsStatus = pStatus_
+    , _lldrsResponseStatus = pResponseStatus_
     }
 
 -- | Undocumented member.
@@ -143,5 +143,5 @@
 lldrsDisks = lens _lldrsDisks (\ s a -> s{_lldrsDisks = a}) . _Default . _Coerce;
 
 -- | The response status code.
-lldrsStatus :: Lens' ListLocalDisksResponse Int
-lldrsStatus = lens _lldrsStatus (\ s a -> s{_lldrsStatus = a});
+lldrsResponseStatus :: Lens' ListLocalDisksResponse Int
+lldrsResponseStatus = lens _lldrsResponseStatus (\ s a -> s{_lldrsResponseStatus = a});
diff --git a/gen/Network/AWS/StorageGateway/ListVolumeInitiators.hs b/gen/Network/AWS/StorageGateway/ListVolumeInitiators.hs
--- a/gen/Network/AWS/StorageGateway/ListVolumeInitiators.hs
+++ b/gen/Network/AWS/StorageGateway/ListVolumeInitiators.hs
@@ -36,7 +36,7 @@
     , ListVolumeInitiatorsResponse
     -- * Response Lenses
     , lvirsInitiators
-    , lvirsStatus
+    , lvirsResponseStatus
     ) where
 
 import           Network.AWS.Prelude
@@ -106,8 +106,8 @@
 --
 -- /See:/ 'listVolumeInitiatorsResponse' smart constructor.
 data ListVolumeInitiatorsResponse = ListVolumeInitiatorsResponse'
-    { _lvirsInitiators :: !(Maybe [Text])
-    , _lvirsStatus     :: !Int
+    { _lvirsInitiators     :: !(Maybe [Text])
+    , _lvirsResponseStatus :: !Int
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'ListVolumeInitiatorsResponse' with the minimum fields required to make a request.
@@ -116,14 +116,14 @@
 --
 -- * 'lvirsInitiators'
 --
--- * 'lvirsStatus'
+-- * 'lvirsResponseStatus'
 listVolumeInitiatorsResponse
-    :: Int -- ^ 'lvirsStatus'
+    :: Int -- ^ 'lvirsResponseStatus'
     -> ListVolumeInitiatorsResponse
-listVolumeInitiatorsResponse pStatus_ =
+listVolumeInitiatorsResponse pResponseStatus_ =
     ListVolumeInitiatorsResponse'
     { _lvirsInitiators = Nothing
-    , _lvirsStatus = pStatus_
+    , _lvirsResponseStatus = pResponseStatus_
     }
 
 -- | The host names and port numbers of all iSCSI initiators that are
@@ -132,5 +132,5 @@
 lvirsInitiators = lens _lvirsInitiators (\ s a -> s{_lvirsInitiators = a}) . _Default . _Coerce;
 
 -- | The response status code.
-lvirsStatus :: Lens' ListVolumeInitiatorsResponse Int
-lvirsStatus = lens _lvirsStatus (\ s a -> s{_lvirsStatus = a});
+lvirsResponseStatus :: Lens' ListVolumeInitiatorsResponse Int
+lvirsResponseStatus = lens _lvirsResponseStatus (\ s a -> s{_lvirsResponseStatus = a});
diff --git a/gen/Network/AWS/StorageGateway/ListVolumeRecoveryPoints.hs b/gen/Network/AWS/StorageGateway/ListVolumeRecoveryPoints.hs
--- a/gen/Network/AWS/StorageGateway/ListVolumeRecoveryPoints.hs
+++ b/gen/Network/AWS/StorageGateway/ListVolumeRecoveryPoints.hs
@@ -42,7 +42,7 @@
     -- * Response Lenses
     , lvrprsVolumeRecoveryPointInfos
     , lvrprsGatewayARN
-    , lvrprsStatus
+    , lvrprsResponseStatus
     ) where
 
 import           Network.AWS.Prelude
@@ -110,7 +110,7 @@
 data ListVolumeRecoveryPointsResponse = ListVolumeRecoveryPointsResponse'
     { _lvrprsVolumeRecoveryPointInfos :: !(Maybe [VolumeRecoveryPointInfo])
     , _lvrprsGatewayARN               :: !(Maybe Text)
-    , _lvrprsStatus                   :: !Int
+    , _lvrprsResponseStatus           :: !Int
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'ListVolumeRecoveryPointsResponse' with the minimum fields required to make a request.
@@ -121,15 +121,15 @@
 --
 -- * 'lvrprsGatewayARN'
 --
--- * 'lvrprsStatus'
+-- * 'lvrprsResponseStatus'
 listVolumeRecoveryPointsResponse
-    :: Int -- ^ 'lvrprsStatus'
+    :: Int -- ^ 'lvrprsResponseStatus'
     -> ListVolumeRecoveryPointsResponse
-listVolumeRecoveryPointsResponse pStatus_ =
+listVolumeRecoveryPointsResponse pResponseStatus_ =
     ListVolumeRecoveryPointsResponse'
     { _lvrprsVolumeRecoveryPointInfos = Nothing
     , _lvrprsGatewayARN = Nothing
-    , _lvrprsStatus = pStatus_
+    , _lvrprsResponseStatus = pResponseStatus_
     }
 
 -- | Undocumented member.
@@ -141,5 +141,5 @@
 lvrprsGatewayARN = lens _lvrprsGatewayARN (\ s a -> s{_lvrprsGatewayARN = a});
 
 -- | The response status code.
-lvrprsStatus :: Lens' ListVolumeRecoveryPointsResponse Int
-lvrprsStatus = lens _lvrprsStatus (\ s a -> s{_lvrprsStatus = a});
+lvrprsResponseStatus :: Lens' ListVolumeRecoveryPointsResponse Int
+lvrprsResponseStatus = lens _lvrprsResponseStatus (\ s a -> s{_lvrprsResponseStatus = a});
diff --git a/gen/Network/AWS/StorageGateway/ListVolumes.hs b/gen/Network/AWS/StorageGateway/ListVolumes.hs
--- a/gen/Network/AWS/StorageGateway/ListVolumes.hs
+++ b/gen/Network/AWS/StorageGateway/ListVolumes.hs
@@ -50,7 +50,7 @@
     , lvrsGatewayARN
     , lvrsMarker
     , lvrsVolumeInfos
-    , lvrsStatus
+    , lvrsResponseStatus
     ) where
 
 import           Network.AWS.Pager
@@ -150,10 +150,10 @@
 
 -- | /See:/ 'listVolumesResponse' smart constructor.
 data ListVolumesResponse = ListVolumesResponse'
-    { _lvrsGatewayARN  :: !(Maybe Text)
-    , _lvrsMarker      :: !(Maybe Text)
-    , _lvrsVolumeInfos :: !(Maybe [VolumeInfo])
-    , _lvrsStatus      :: !Int
+    { _lvrsGatewayARN     :: !(Maybe Text)
+    , _lvrsMarker         :: !(Maybe Text)
+    , _lvrsVolumeInfos    :: !(Maybe [VolumeInfo])
+    , _lvrsResponseStatus :: !Int
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'ListVolumesResponse' with the minimum fields required to make a request.
@@ -166,16 +166,16 @@
 --
 -- * 'lvrsVolumeInfos'
 --
--- * 'lvrsStatus'
+-- * 'lvrsResponseStatus'
 listVolumesResponse
-    :: Int -- ^ 'lvrsStatus'
+    :: Int -- ^ 'lvrsResponseStatus'
     -> ListVolumesResponse
-listVolumesResponse pStatus_ =
+listVolumesResponse pResponseStatus_ =
     ListVolumesResponse'
     { _lvrsGatewayARN = Nothing
     , _lvrsMarker = Nothing
     , _lvrsVolumeInfos = Nothing
-    , _lvrsStatus = pStatus_
+    , _lvrsResponseStatus = pResponseStatus_
     }
 
 -- | Undocumented member.
@@ -191,5 +191,5 @@
 lvrsVolumeInfos = lens _lvrsVolumeInfos (\ s a -> s{_lvrsVolumeInfos = a}) . _Default . _Coerce;
 
 -- | The response status code.
-lvrsStatus :: Lens' ListVolumesResponse Int
-lvrsStatus = lens _lvrsStatus (\ s a -> s{_lvrsStatus = a});
+lvrsResponseStatus :: Lens' ListVolumesResponse Int
+lvrsResponseStatus = lens _lvrsResponseStatus (\ s a -> s{_lvrsResponseStatus = a});
diff --git a/gen/Network/AWS/StorageGateway/ResetCache.hs b/gen/Network/AWS/StorageGateway/ResetCache.hs
--- a/gen/Network/AWS/StorageGateway/ResetCache.hs
+++ b/gen/Network/AWS/StorageGateway/ResetCache.hs
@@ -46,7 +46,7 @@
     , ResetCacheResponse
     -- * Response Lenses
     , rcrsGatewayARN
-    , rcrsStatus
+    , rcrsResponseStatus
     ) where
 
 import           Network.AWS.Prelude
@@ -108,8 +108,8 @@
 
 -- | /See:/ 'resetCacheResponse' smart constructor.
 data ResetCacheResponse = ResetCacheResponse'
-    { _rcrsGatewayARN :: !(Maybe Text)
-    , _rcrsStatus     :: !Int
+    { _rcrsGatewayARN     :: !(Maybe Text)
+    , _rcrsResponseStatus :: !Int
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'ResetCacheResponse' with the minimum fields required to make a request.
@@ -118,14 +118,14 @@
 --
 -- * 'rcrsGatewayARN'
 --
--- * 'rcrsStatus'
+-- * 'rcrsResponseStatus'
 resetCacheResponse
-    :: Int -- ^ 'rcrsStatus'
+    :: Int -- ^ 'rcrsResponseStatus'
     -> ResetCacheResponse
-resetCacheResponse pStatus_ =
+resetCacheResponse pResponseStatus_ =
     ResetCacheResponse'
     { _rcrsGatewayARN = Nothing
-    , _rcrsStatus = pStatus_
+    , _rcrsResponseStatus = pResponseStatus_
     }
 
 -- | Undocumented member.
@@ -133,5 +133,5 @@
 rcrsGatewayARN = lens _rcrsGatewayARN (\ s a -> s{_rcrsGatewayARN = a});
 
 -- | The response status code.
-rcrsStatus :: Lens' ResetCacheResponse Int
-rcrsStatus = lens _rcrsStatus (\ s a -> s{_rcrsStatus = a});
+rcrsResponseStatus :: Lens' ResetCacheResponse Int
+rcrsResponseStatus = lens _rcrsResponseStatus (\ s a -> s{_rcrsResponseStatus = a});
diff --git a/gen/Network/AWS/StorageGateway/RetrieveTapeArchive.hs b/gen/Network/AWS/StorageGateway/RetrieveTapeArchive.hs
--- a/gen/Network/AWS/StorageGateway/RetrieveTapeArchive.hs
+++ b/gen/Network/AWS/StorageGateway/RetrieveTapeArchive.hs
@@ -42,7 +42,7 @@
     , RetrieveTapeArchiveResponse
     -- * Response Lenses
     , rtarsTapeARN
-    , rtarsStatus
+    , rtarsResponseStatus
     ) where
 
 import           Network.AWS.Prelude
@@ -127,8 +127,8 @@
 --
 -- /See:/ 'retrieveTapeArchiveResponse' smart constructor.
 data RetrieveTapeArchiveResponse = RetrieveTapeArchiveResponse'
-    { _rtarsTapeARN :: !(Maybe Text)
-    , _rtarsStatus  :: !Int
+    { _rtarsTapeARN        :: !(Maybe Text)
+    , _rtarsResponseStatus :: !Int
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'RetrieveTapeArchiveResponse' with the minimum fields required to make a request.
@@ -137,14 +137,14 @@
 --
 -- * 'rtarsTapeARN'
 --
--- * 'rtarsStatus'
+-- * 'rtarsResponseStatus'
 retrieveTapeArchiveResponse
-    :: Int -- ^ 'rtarsStatus'
+    :: Int -- ^ 'rtarsResponseStatus'
     -> RetrieveTapeArchiveResponse
-retrieveTapeArchiveResponse pStatus_ =
+retrieveTapeArchiveResponse pResponseStatus_ =
     RetrieveTapeArchiveResponse'
     { _rtarsTapeARN = Nothing
-    , _rtarsStatus = pStatus_
+    , _rtarsResponseStatus = pResponseStatus_
     }
 
 -- | The Amazon Resource Name (ARN) of the retrieved virtual tape.
@@ -152,5 +152,5 @@
 rtarsTapeARN = lens _rtarsTapeARN (\ s a -> s{_rtarsTapeARN = a});
 
 -- | The response status code.
-rtarsStatus :: Lens' RetrieveTapeArchiveResponse Int
-rtarsStatus = lens _rtarsStatus (\ s a -> s{_rtarsStatus = a});
+rtarsResponseStatus :: Lens' RetrieveTapeArchiveResponse Int
+rtarsResponseStatus = lens _rtarsResponseStatus (\ s a -> s{_rtarsResponseStatus = a});
diff --git a/gen/Network/AWS/StorageGateway/RetrieveTapeRecoveryPoint.hs b/gen/Network/AWS/StorageGateway/RetrieveTapeRecoveryPoint.hs
--- a/gen/Network/AWS/StorageGateway/RetrieveTapeRecoveryPoint.hs
+++ b/gen/Network/AWS/StorageGateway/RetrieveTapeRecoveryPoint.hs
@@ -43,7 +43,7 @@
     , RetrieveTapeRecoveryPointResponse
     -- * Response Lenses
     , rtrprsTapeARN
-    , rtrprsStatus
+    , rtrprsResponseStatus
     ) where
 
 import           Network.AWS.Prelude
@@ -123,8 +123,8 @@
 --
 -- /See:/ 'retrieveTapeRecoveryPointResponse' smart constructor.
 data RetrieveTapeRecoveryPointResponse = RetrieveTapeRecoveryPointResponse'
-    { _rtrprsTapeARN :: !(Maybe Text)
-    , _rtrprsStatus  :: !Int
+    { _rtrprsTapeARN        :: !(Maybe Text)
+    , _rtrprsResponseStatus :: !Int
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'RetrieveTapeRecoveryPointResponse' with the minimum fields required to make a request.
@@ -133,14 +133,14 @@
 --
 -- * 'rtrprsTapeARN'
 --
--- * 'rtrprsStatus'
+-- * 'rtrprsResponseStatus'
 retrieveTapeRecoveryPointResponse
-    :: Int -- ^ 'rtrprsStatus'
+    :: Int -- ^ 'rtrprsResponseStatus'
     -> RetrieveTapeRecoveryPointResponse
-retrieveTapeRecoveryPointResponse pStatus_ =
+retrieveTapeRecoveryPointResponse pResponseStatus_ =
     RetrieveTapeRecoveryPointResponse'
     { _rtrprsTapeARN = Nothing
-    , _rtrprsStatus = pStatus_
+    , _rtrprsResponseStatus = pResponseStatus_
     }
 
 -- | The Amazon Resource Name (ARN) of the virtual tape for which the
@@ -149,5 +149,5 @@
 rtrprsTapeARN = lens _rtrprsTapeARN (\ s a -> s{_rtrprsTapeARN = a});
 
 -- | The response status code.
-rtrprsStatus :: Lens' RetrieveTapeRecoveryPointResponse Int
-rtrprsStatus = lens _rtrprsStatus (\ s a -> s{_rtrprsStatus = a});
+rtrprsResponseStatus :: Lens' RetrieveTapeRecoveryPointResponse Int
+rtrprsResponseStatus = lens _rtrprsResponseStatus (\ s a -> s{_rtrprsResponseStatus = a});
diff --git a/gen/Network/AWS/StorageGateway/ShutdownGateway.hs b/gen/Network/AWS/StorageGateway/ShutdownGateway.hs
--- a/gen/Network/AWS/StorageGateway/ShutdownGateway.hs
+++ b/gen/Network/AWS/StorageGateway/ShutdownGateway.hs
@@ -56,8 +56,8 @@
     , shutdownGatewayResponse
     , ShutdownGatewayResponse
     -- * Response Lenses
-    , sgrsGatewayARN
-    , sgrsStatus
+    , srsGatewayARN
+    , srsResponseStatus
     ) where
 
 import           Network.AWS.Prelude
@@ -124,30 +124,30 @@
 --
 -- /See:/ 'shutdownGatewayResponse' smart constructor.
 data ShutdownGatewayResponse = ShutdownGatewayResponse'
-    { _sgrsGatewayARN :: !(Maybe Text)
-    , _sgrsStatus     :: !Int
+    { _srsGatewayARN     :: !(Maybe Text)
+    , _srsResponseStatus :: !Int
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'ShutdownGatewayResponse' with the minimum fields required to make a request.
 --
 -- Use one of the following lenses to modify other fields as desired:
 --
--- * 'sgrsGatewayARN'
+-- * 'srsGatewayARN'
 --
--- * 'sgrsStatus'
+-- * 'srsResponseStatus'
 shutdownGatewayResponse
-    :: Int -- ^ 'sgrsStatus'
+    :: Int -- ^ 'srsResponseStatus'
     -> ShutdownGatewayResponse
-shutdownGatewayResponse pStatus_ =
+shutdownGatewayResponse pResponseStatus_ =
     ShutdownGatewayResponse'
-    { _sgrsGatewayARN = Nothing
-    , _sgrsStatus = pStatus_
+    { _srsGatewayARN = Nothing
+    , _srsResponseStatus = pResponseStatus_
     }
 
 -- | Undocumented member.
-sgrsGatewayARN :: Lens' ShutdownGatewayResponse (Maybe Text)
-sgrsGatewayARN = lens _sgrsGatewayARN (\ s a -> s{_sgrsGatewayARN = a});
+srsGatewayARN :: Lens' ShutdownGatewayResponse (Maybe Text)
+srsGatewayARN = lens _srsGatewayARN (\ s a -> s{_srsGatewayARN = a});
 
 -- | The response status code.
-sgrsStatus :: Lens' ShutdownGatewayResponse Int
-sgrsStatus = lens _sgrsStatus (\ s a -> s{_sgrsStatus = a});
+srsResponseStatus :: Lens' ShutdownGatewayResponse Int
+srsResponseStatus = lens _srsResponseStatus (\ s a -> s{_srsResponseStatus = a});
diff --git a/gen/Network/AWS/StorageGateway/StartGateway.hs b/gen/Network/AWS/StorageGateway/StartGateway.hs
--- a/gen/Network/AWS/StorageGateway/StartGateway.hs
+++ b/gen/Network/AWS/StorageGateway/StartGateway.hs
@@ -45,8 +45,8 @@
     , startGatewayResponse
     , StartGatewayResponse
     -- * Response Lenses
-    , srsGatewayARN
-    , srsStatus
+    , sgrsGatewayARN
+    , sgrsResponseStatus
     ) where
 
 import           Network.AWS.Prelude
@@ -113,30 +113,30 @@
 --
 -- /See:/ 'startGatewayResponse' smart constructor.
 data StartGatewayResponse = StartGatewayResponse'
-    { _srsGatewayARN :: !(Maybe Text)
-    , _srsStatus     :: !Int
+    { _sgrsGatewayARN     :: !(Maybe Text)
+    , _sgrsResponseStatus :: !Int
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'StartGatewayResponse' with the minimum fields required to make a request.
 --
 -- Use one of the following lenses to modify other fields as desired:
 --
--- * 'srsGatewayARN'
+-- * 'sgrsGatewayARN'
 --
--- * 'srsStatus'
+-- * 'sgrsResponseStatus'
 startGatewayResponse
-    :: Int -- ^ 'srsStatus'
+    :: Int -- ^ 'sgrsResponseStatus'
     -> StartGatewayResponse
-startGatewayResponse pStatus_ =
+startGatewayResponse pResponseStatus_ =
     StartGatewayResponse'
-    { _srsGatewayARN = Nothing
-    , _srsStatus = pStatus_
+    { _sgrsGatewayARN = Nothing
+    , _sgrsResponseStatus = pResponseStatus_
     }
 
 -- | Undocumented member.
-srsGatewayARN :: Lens' StartGatewayResponse (Maybe Text)
-srsGatewayARN = lens _srsGatewayARN (\ s a -> s{_srsGatewayARN = a});
+sgrsGatewayARN :: Lens' StartGatewayResponse (Maybe Text)
+sgrsGatewayARN = lens _sgrsGatewayARN (\ s a -> s{_sgrsGatewayARN = a});
 
 -- | The response status code.
-srsStatus :: Lens' StartGatewayResponse Int
-srsStatus = lens _srsStatus (\ s a -> s{_srsStatus = a});
+sgrsResponseStatus :: Lens' StartGatewayResponse Int
+sgrsResponseStatus = lens _sgrsResponseStatus (\ s a -> s{_sgrsResponseStatus = a});
diff --git a/gen/Network/AWS/StorageGateway/Types.hs b/gen/Network/AWS/StorageGateway/Types.hs
--- a/gen/Network/AWS/StorageGateway/Types.hs
+++ b/gen/Network/AWS/StorageGateway/Types.hs
@@ -22,8 +22,8 @@
     -- * CachediSCSIVolume
     , CachediSCSIVolume
     , cachediSCSIVolume
-    , cscsivVolumeStatus
     , cscsivVolumeiSCSIAttributes
+    , cscsivVolumeStatus
     , cscsivSourceSnapshotId
     , cscsivVolumeARN
     , cscsivVolumeProgress
@@ -75,24 +75,24 @@
     -- * StorediSCSIVolume
     , StorediSCSIVolume
     , storediSCSIVolume
-    , sscsivVolumeStatus
     , sscsivVolumeiSCSIAttributes
+    , sscsivVolumeStatus
     , sscsivSourceSnapshotId
     , sscsivPreservedExistingData
     , sscsivVolumeARN
     , sscsivVolumeProgress
     , sscsivVolumeSizeInBytes
     , sscsivVolumeId
-    , sscsivVolumeType
     , sscsivVolumeDiskId
+    , sscsivVolumeType
 
     -- * Tape
     , Tape
     , tape
     , tTapeBarcode
     , tTapeStatus
-    , tProgress
     , tTapeARN
+    , tProgress
     , tTapeSizeInBytes
     , tVTLDevice
 
diff --git a/gen/Network/AWS/StorageGateway/Types/Product.hs b/gen/Network/AWS/StorageGateway/Types/Product.hs
--- a/gen/Network/AWS/StorageGateway/Types/Product.hs
+++ b/gen/Network/AWS/StorageGateway/Types/Product.hs
@@ -22,8 +22,8 @@
 
 -- | /See:/ 'cachediSCSIVolume' smart constructor.
 data CachediSCSIVolume = CachediSCSIVolume'
-    { _cscsivVolumeStatus          :: !(Maybe Text)
-    , _cscsivVolumeiSCSIAttributes :: !(Maybe VolumeiSCSIAttributes)
+    { _cscsivVolumeiSCSIAttributes :: !(Maybe VolumeiSCSIAttributes)
+    , _cscsivVolumeStatus          :: !(Maybe Text)
     , _cscsivSourceSnapshotId      :: !(Maybe Text)
     , _cscsivVolumeARN             :: !(Maybe Text)
     , _cscsivVolumeProgress        :: !(Maybe Double)
@@ -36,10 +36,10 @@
 --
 -- Use one of the following lenses to modify other fields as desired:
 --
--- * 'cscsivVolumeStatus'
---
 -- * 'cscsivVolumeiSCSIAttributes'
 --
+-- * 'cscsivVolumeStatus'
+--
 -- * 'cscsivSourceSnapshotId'
 --
 -- * 'cscsivVolumeARN'
@@ -55,8 +55,8 @@
     :: CachediSCSIVolume
 cachediSCSIVolume =
     CachediSCSIVolume'
-    { _cscsivVolumeStatus = Nothing
-    , _cscsivVolumeiSCSIAttributes = Nothing
+    { _cscsivVolumeiSCSIAttributes = Nothing
+    , _cscsivVolumeStatus = Nothing
     , _cscsivSourceSnapshotId = Nothing
     , _cscsivVolumeARN = Nothing
     , _cscsivVolumeProgress = Nothing
@@ -66,14 +66,14 @@
     }
 
 -- | Undocumented member.
-cscsivVolumeStatus :: Lens' CachediSCSIVolume (Maybe Text)
-cscsivVolumeStatus = lens _cscsivVolumeStatus (\ s a -> s{_cscsivVolumeStatus = a});
-
--- | Undocumented member.
 cscsivVolumeiSCSIAttributes :: Lens' CachediSCSIVolume (Maybe VolumeiSCSIAttributes)
 cscsivVolumeiSCSIAttributes = lens _cscsivVolumeiSCSIAttributes (\ s a -> s{_cscsivVolumeiSCSIAttributes = a});
 
 -- | Undocumented member.
+cscsivVolumeStatus :: Lens' CachediSCSIVolume (Maybe Text)
+cscsivVolumeStatus = lens _cscsivVolumeStatus (\ s a -> s{_cscsivVolumeStatus = a});
+
+-- | Undocumented member.
 cscsivSourceSnapshotId :: Lens' CachediSCSIVolume (Maybe Text)
 cscsivSourceSnapshotId = lens _cscsivSourceSnapshotId (\ s a -> s{_cscsivSourceSnapshotId = a});
 
@@ -102,8 +102,8 @@
           = withObject "CachediSCSIVolume"
               (\ x ->
                  CachediSCSIVolume' <$>
-                   (x .:? "VolumeStatus") <*>
-                     (x .:? "VolumeiSCSIAttributes")
+                   (x .:? "VolumeiSCSIAttributes") <*>
+                     (x .:? "VolumeStatus")
                      <*> (x .:? "SourceSnapshotId")
                      <*> (x .:? "VolumeARN")
                      <*> (x .:? "VolumeProgress")
@@ -411,26 +411,26 @@
 
 -- | /See:/ 'storediSCSIVolume' smart constructor.
 data StorediSCSIVolume = StorediSCSIVolume'
-    { _sscsivVolumeStatus          :: !(Maybe Text)
-    , _sscsivVolumeiSCSIAttributes :: !(Maybe VolumeiSCSIAttributes)
+    { _sscsivVolumeiSCSIAttributes :: !(Maybe VolumeiSCSIAttributes)
+    , _sscsivVolumeStatus          :: !(Maybe Text)
     , _sscsivSourceSnapshotId      :: !(Maybe Text)
     , _sscsivPreservedExistingData :: !(Maybe Bool)
     , _sscsivVolumeARN             :: !(Maybe Text)
     , _sscsivVolumeProgress        :: !(Maybe Double)
     , _sscsivVolumeSizeInBytes     :: !(Maybe Integer)
     , _sscsivVolumeId              :: !(Maybe Text)
-    , _sscsivVolumeType            :: !(Maybe Text)
     , _sscsivVolumeDiskId          :: !(Maybe Text)
+    , _sscsivVolumeType            :: !(Maybe Text)
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'StorediSCSIVolume' with the minimum fields required to make a request.
 --
 -- Use one of the following lenses to modify other fields as desired:
 --
--- * 'sscsivVolumeStatus'
---
 -- * 'sscsivVolumeiSCSIAttributes'
 --
+-- * 'sscsivVolumeStatus'
+--
 -- * 'sscsivSourceSnapshotId'
 --
 -- * 'sscsivPreservedExistingData'
@@ -443,34 +443,34 @@
 --
 -- * 'sscsivVolumeId'
 --
--- * 'sscsivVolumeType'
---
 -- * 'sscsivVolumeDiskId'
+--
+-- * 'sscsivVolumeType'
 storediSCSIVolume
     :: StorediSCSIVolume
 storediSCSIVolume =
     StorediSCSIVolume'
-    { _sscsivVolumeStatus = Nothing
-    , _sscsivVolumeiSCSIAttributes = Nothing
+    { _sscsivVolumeiSCSIAttributes = Nothing
+    , _sscsivVolumeStatus = Nothing
     , _sscsivSourceSnapshotId = Nothing
     , _sscsivPreservedExistingData = Nothing
     , _sscsivVolumeARN = Nothing
     , _sscsivVolumeProgress = Nothing
     , _sscsivVolumeSizeInBytes = Nothing
     , _sscsivVolumeId = Nothing
-    , _sscsivVolumeType = Nothing
     , _sscsivVolumeDiskId = Nothing
+    , _sscsivVolumeType = Nothing
     }
 
 -- | Undocumented member.
-sscsivVolumeStatus :: Lens' StorediSCSIVolume (Maybe Text)
-sscsivVolumeStatus = lens _sscsivVolumeStatus (\ s a -> s{_sscsivVolumeStatus = a});
-
--- | Undocumented member.
 sscsivVolumeiSCSIAttributes :: Lens' StorediSCSIVolume (Maybe VolumeiSCSIAttributes)
 sscsivVolumeiSCSIAttributes = lens _sscsivVolumeiSCSIAttributes (\ s a -> s{_sscsivVolumeiSCSIAttributes = a});
 
 -- | Undocumented member.
+sscsivVolumeStatus :: Lens' StorediSCSIVolume (Maybe Text)
+sscsivVolumeStatus = lens _sscsivVolumeStatus (\ s a -> s{_sscsivVolumeStatus = a});
+
+-- | Undocumented member.
 sscsivSourceSnapshotId :: Lens' StorediSCSIVolume (Maybe Text)
 sscsivSourceSnapshotId = lens _sscsivSourceSnapshotId (\ s a -> s{_sscsivSourceSnapshotId = a});
 
@@ -495,28 +495,28 @@
 sscsivVolumeId = lens _sscsivVolumeId (\ s a -> s{_sscsivVolumeId = a});
 
 -- | Undocumented member.
-sscsivVolumeType :: Lens' StorediSCSIVolume (Maybe Text)
-sscsivVolumeType = lens _sscsivVolumeType (\ s a -> s{_sscsivVolumeType = a});
-
--- | Undocumented member.
 sscsivVolumeDiskId :: Lens' StorediSCSIVolume (Maybe Text)
 sscsivVolumeDiskId = lens _sscsivVolumeDiskId (\ s a -> s{_sscsivVolumeDiskId = a});
 
+-- | Undocumented member.
+sscsivVolumeType :: Lens' StorediSCSIVolume (Maybe Text)
+sscsivVolumeType = lens _sscsivVolumeType (\ s a -> s{_sscsivVolumeType = a});
+
 instance FromJSON StorediSCSIVolume where
         parseJSON
           = withObject "StorediSCSIVolume"
               (\ x ->
                  StorediSCSIVolume' <$>
-                   (x .:? "VolumeStatus") <*>
-                     (x .:? "VolumeiSCSIAttributes")
+                   (x .:? "VolumeiSCSIAttributes") <*>
+                     (x .:? "VolumeStatus")
                      <*> (x .:? "SourceSnapshotId")
                      <*> (x .:? "PreservedExistingData")
                      <*> (x .:? "VolumeARN")
                      <*> (x .:? "VolumeProgress")
                      <*> (x .:? "VolumeSizeInBytes")
                      <*> (x .:? "VolumeId")
-                     <*> (x .:? "VolumeType")
-                     <*> (x .:? "VolumeDiskId"))
+                     <*> (x .:? "VolumeDiskId")
+                     <*> (x .:? "VolumeType"))
 
 -- | Describes a virtual tape object.
 --
@@ -524,8 +524,8 @@
 data Tape = Tape'
     { _tTapeBarcode     :: !(Maybe Text)
     , _tTapeStatus      :: !(Maybe Text)
-    , _tProgress        :: !(Maybe Double)
     , _tTapeARN         :: !(Maybe Text)
+    , _tProgress        :: !(Maybe Double)
     , _tTapeSizeInBytes :: !(Maybe Integer)
     , _tVTLDevice       :: !(Maybe Text)
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
@@ -538,10 +538,10 @@
 --
 -- * 'tTapeStatus'
 --
--- * 'tProgress'
---
 -- * 'tTapeARN'
 --
+-- * 'tProgress'
+--
 -- * 'tTapeSizeInBytes'
 --
 -- * 'tVTLDevice'
@@ -551,8 +551,8 @@
     Tape'
     { _tTapeBarcode = Nothing
     , _tTapeStatus = Nothing
-    , _tProgress = Nothing
     , _tTapeARN = Nothing
+    , _tProgress = Nothing
     , _tTapeSizeInBytes = Nothing
     , _tVTLDevice = Nothing
     }
@@ -565,6 +565,10 @@
 tTapeStatus :: Lens' Tape (Maybe Text)
 tTapeStatus = lens _tTapeStatus (\ s a -> s{_tTapeStatus = a});
 
+-- | The Amazon Resource Name (ARN) of the virtual tape.
+tTapeARN :: Lens' Tape (Maybe Text)
+tTapeARN = lens _tTapeARN (\ s a -> s{_tTapeARN = a});
+
 -- | For archiving virtual tapes, indicates how much data remains to be
 -- uploaded before archiving is complete.
 --
@@ -572,10 +576,6 @@
 tProgress :: Lens' Tape (Maybe Double)
 tProgress = lens _tProgress (\ s a -> s{_tProgress = a});
 
--- | The Amazon Resource Name (ARN) of the virtual tape.
-tTapeARN :: Lens' Tape (Maybe Text)
-tTapeARN = lens _tTapeARN (\ s a -> s{_tTapeARN = a});
-
 -- | The size, in bytes, of the virtual tape.
 tTapeSizeInBytes :: Lens' Tape (Maybe Integer)
 tTapeSizeInBytes = lens _tTapeSizeInBytes (\ s a -> s{_tTapeSizeInBytes = a});
@@ -591,8 +591,8 @@
               (\ x ->
                  Tape' <$>
                    (x .:? "TapeBarcode") <*> (x .:? "TapeStatus") <*>
-                     (x .:? "Progress")
-                     <*> (x .:? "TapeARN")
+                     (x .:? "TapeARN")
+                     <*> (x .:? "Progress")
                      <*> (x .:? "TapeSizeInBytes")
                      <*> (x .:? "VTLDevice"))
 
diff --git a/gen/Network/AWS/StorageGateway/UpdateBandwidthRateLimit.hs b/gen/Network/AWS/StorageGateway/UpdateBandwidthRateLimit.hs
--- a/gen/Network/AWS/StorageGateway/UpdateBandwidthRateLimit.hs
+++ b/gen/Network/AWS/StorageGateway/UpdateBandwidthRateLimit.hs
@@ -47,7 +47,7 @@
     , UpdateBandwidthRateLimitResponse
     -- * Response Lenses
     , ubrlrsGatewayARN
-    , ubrlrsStatus
+    , ubrlrsResponseStatus
     ) where
 
 import           Network.AWS.Prelude
@@ -140,8 +140,8 @@
 --
 -- /See:/ 'updateBandwidthRateLimitResponse' smart constructor.
 data UpdateBandwidthRateLimitResponse = UpdateBandwidthRateLimitResponse'
-    { _ubrlrsGatewayARN :: !(Maybe Text)
-    , _ubrlrsStatus     :: !Int
+    { _ubrlrsGatewayARN     :: !(Maybe Text)
+    , _ubrlrsResponseStatus :: !Int
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'UpdateBandwidthRateLimitResponse' with the minimum fields required to make a request.
@@ -150,14 +150,14 @@
 --
 -- * 'ubrlrsGatewayARN'
 --
--- * 'ubrlrsStatus'
+-- * 'ubrlrsResponseStatus'
 updateBandwidthRateLimitResponse
-    :: Int -- ^ 'ubrlrsStatus'
+    :: Int -- ^ 'ubrlrsResponseStatus'
     -> UpdateBandwidthRateLimitResponse
-updateBandwidthRateLimitResponse pStatus_ =
+updateBandwidthRateLimitResponse pResponseStatus_ =
     UpdateBandwidthRateLimitResponse'
     { _ubrlrsGatewayARN = Nothing
-    , _ubrlrsStatus = pStatus_
+    , _ubrlrsResponseStatus = pResponseStatus_
     }
 
 -- | Undocumented member.
@@ -165,5 +165,5 @@
 ubrlrsGatewayARN = lens _ubrlrsGatewayARN (\ s a -> s{_ubrlrsGatewayARN = a});
 
 -- | The response status code.
-ubrlrsStatus :: Lens' UpdateBandwidthRateLimitResponse Int
-ubrlrsStatus = lens _ubrlrsStatus (\ s a -> s{_ubrlrsStatus = a});
+ubrlrsResponseStatus :: Lens' UpdateBandwidthRateLimitResponse Int
+ubrlrsResponseStatus = lens _ubrlrsResponseStatus (\ s a -> s{_ubrlrsResponseStatus = a});
diff --git a/gen/Network/AWS/StorageGateway/UpdateChapCredentials.hs b/gen/Network/AWS/StorageGateway/UpdateChapCredentials.hs
--- a/gen/Network/AWS/StorageGateway/UpdateChapCredentials.hs
+++ b/gen/Network/AWS/StorageGateway/UpdateChapCredentials.hs
@@ -44,7 +44,7 @@
     -- * Response Lenses
     , uccrsTargetARN
     , uccrsInitiatorName
-    , uccrsStatus
+    , uccrsResponseStatus
     ) where
 
 import           Network.AWS.Prelude
@@ -161,9 +161,9 @@
 --
 -- /See:/ 'updateChapCredentialsResponse' smart constructor.
 data UpdateChapCredentialsResponse = UpdateChapCredentialsResponse'
-    { _uccrsTargetARN     :: !(Maybe Text)
-    , _uccrsInitiatorName :: !(Maybe Text)
-    , _uccrsStatus        :: !Int
+    { _uccrsTargetARN      :: !(Maybe Text)
+    , _uccrsInitiatorName  :: !(Maybe Text)
+    , _uccrsResponseStatus :: !Int
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'UpdateChapCredentialsResponse' with the minimum fields required to make a request.
@@ -174,15 +174,15 @@
 --
 -- * 'uccrsInitiatorName'
 --
--- * 'uccrsStatus'
+-- * 'uccrsResponseStatus'
 updateChapCredentialsResponse
-    :: Int -- ^ 'uccrsStatus'
+    :: Int -- ^ 'uccrsResponseStatus'
     -> UpdateChapCredentialsResponse
-updateChapCredentialsResponse pStatus_ =
+updateChapCredentialsResponse pResponseStatus_ =
     UpdateChapCredentialsResponse'
     { _uccrsTargetARN = Nothing
     , _uccrsInitiatorName = Nothing
-    , _uccrsStatus = pStatus_
+    , _uccrsResponseStatus = pResponseStatus_
     }
 
 -- | The Amazon Resource Name (ARN) of the target. This is the same target
@@ -196,5 +196,5 @@
 uccrsInitiatorName = lens _uccrsInitiatorName (\ s a -> s{_uccrsInitiatorName = a});
 
 -- | The response status code.
-uccrsStatus :: Lens' UpdateChapCredentialsResponse Int
-uccrsStatus = lens _uccrsStatus (\ s a -> s{_uccrsStatus = a});
+uccrsResponseStatus :: Lens' UpdateChapCredentialsResponse Int
+uccrsResponseStatus = lens _uccrsResponseStatus (\ s a -> s{_uccrsResponseStatus = a});
diff --git a/gen/Network/AWS/StorageGateway/UpdateGatewayInformation.hs b/gen/Network/AWS/StorageGateway/UpdateGatewayInformation.hs
--- a/gen/Network/AWS/StorageGateway/UpdateGatewayInformation.hs
+++ b/gen/Network/AWS/StorageGateway/UpdateGatewayInformation.hs
@@ -38,7 +38,7 @@
     , UpdateGatewayInformationResponse
     -- * Response Lenses
     , ugirsGatewayARN
-    , ugirsStatus
+    , ugirsResponseStatus
     ) where
 
 import           Network.AWS.Prelude
@@ -123,8 +123,8 @@
 --
 -- /See:/ 'updateGatewayInformationResponse' smart constructor.
 data UpdateGatewayInformationResponse = UpdateGatewayInformationResponse'
-    { _ugirsGatewayARN :: !(Maybe Text)
-    , _ugirsStatus     :: !Int
+    { _ugirsGatewayARN     :: !(Maybe Text)
+    , _ugirsResponseStatus :: !Int
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'UpdateGatewayInformationResponse' with the minimum fields required to make a request.
@@ -133,14 +133,14 @@
 --
 -- * 'ugirsGatewayARN'
 --
--- * 'ugirsStatus'
+-- * 'ugirsResponseStatus'
 updateGatewayInformationResponse
-    :: Int -- ^ 'ugirsStatus'
+    :: Int -- ^ 'ugirsResponseStatus'
     -> UpdateGatewayInformationResponse
-updateGatewayInformationResponse pStatus_ =
+updateGatewayInformationResponse pResponseStatus_ =
     UpdateGatewayInformationResponse'
     { _ugirsGatewayARN = Nothing
-    , _ugirsStatus = pStatus_
+    , _ugirsResponseStatus = pResponseStatus_
     }
 
 -- | Undocumented member.
@@ -148,5 +148,5 @@
 ugirsGatewayARN = lens _ugirsGatewayARN (\ s a -> s{_ugirsGatewayARN = a});
 
 -- | The response status code.
-ugirsStatus :: Lens' UpdateGatewayInformationResponse Int
-ugirsStatus = lens _ugirsStatus (\ s a -> s{_ugirsStatus = a});
+ugirsResponseStatus :: Lens' UpdateGatewayInformationResponse Int
+ugirsResponseStatus = lens _ugirsResponseStatus (\ s a -> s{_ugirsResponseStatus = a});
diff --git a/gen/Network/AWS/StorageGateway/UpdateGatewaySoftwareNow.hs b/gen/Network/AWS/StorageGateway/UpdateGatewaySoftwareNow.hs
--- a/gen/Network/AWS/StorageGateway/UpdateGatewaySoftwareNow.hs
+++ b/gen/Network/AWS/StorageGateway/UpdateGatewaySoftwareNow.hs
@@ -49,7 +49,7 @@
     , UpdateGatewaySoftwareNowResponse
     -- * Response Lenses
     , ugsnrsGatewayARN
-    , ugsnrsStatus
+    , ugsnrsResponseStatus
     ) where
 
 import           Network.AWS.Prelude
@@ -117,8 +117,8 @@
 --
 -- /See:/ 'updateGatewaySoftwareNowResponse' smart constructor.
 data UpdateGatewaySoftwareNowResponse = UpdateGatewaySoftwareNowResponse'
-    { _ugsnrsGatewayARN :: !(Maybe Text)
-    , _ugsnrsStatus     :: !Int
+    { _ugsnrsGatewayARN     :: !(Maybe Text)
+    , _ugsnrsResponseStatus :: !Int
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'UpdateGatewaySoftwareNowResponse' with the minimum fields required to make a request.
@@ -127,14 +127,14 @@
 --
 -- * 'ugsnrsGatewayARN'
 --
--- * 'ugsnrsStatus'
+-- * 'ugsnrsResponseStatus'
 updateGatewaySoftwareNowResponse
-    :: Int -- ^ 'ugsnrsStatus'
+    :: Int -- ^ 'ugsnrsResponseStatus'
     -> UpdateGatewaySoftwareNowResponse
-updateGatewaySoftwareNowResponse pStatus_ =
+updateGatewaySoftwareNowResponse pResponseStatus_ =
     UpdateGatewaySoftwareNowResponse'
     { _ugsnrsGatewayARN = Nothing
-    , _ugsnrsStatus = pStatus_
+    , _ugsnrsResponseStatus = pResponseStatus_
     }
 
 -- | Undocumented member.
@@ -142,5 +142,5 @@
 ugsnrsGatewayARN = lens _ugsnrsGatewayARN (\ s a -> s{_ugsnrsGatewayARN = a});
 
 -- | The response status code.
-ugsnrsStatus :: Lens' UpdateGatewaySoftwareNowResponse Int
-ugsnrsStatus = lens _ugsnrsStatus (\ s a -> s{_ugsnrsStatus = a});
+ugsnrsResponseStatus :: Lens' UpdateGatewaySoftwareNowResponse Int
+ugsnrsResponseStatus = lens _ugsnrsResponseStatus (\ s a -> s{_ugsnrsResponseStatus = a});
diff --git a/gen/Network/AWS/StorageGateway/UpdateMaintenanceStartTime.hs b/gen/Network/AWS/StorageGateway/UpdateMaintenanceStartTime.hs
--- a/gen/Network/AWS/StorageGateway/UpdateMaintenanceStartTime.hs
+++ b/gen/Network/AWS/StorageGateway/UpdateMaintenanceStartTime.hs
@@ -39,7 +39,7 @@
     , UpdateMaintenanceStartTimeResponse
     -- * Response Lenses
     , umstrsGatewayARN
-    , umstrsStatus
+    , umstrsResponseStatus
     ) where
 
 import           Network.AWS.Prelude
@@ -147,8 +147,8 @@
 --
 -- /See:/ 'updateMaintenanceStartTimeResponse' smart constructor.
 data UpdateMaintenanceStartTimeResponse = UpdateMaintenanceStartTimeResponse'
-    { _umstrsGatewayARN :: !(Maybe Text)
-    , _umstrsStatus     :: !Int
+    { _umstrsGatewayARN     :: !(Maybe Text)
+    , _umstrsResponseStatus :: !Int
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'UpdateMaintenanceStartTimeResponse' with the minimum fields required to make a request.
@@ -157,14 +157,14 @@
 --
 -- * 'umstrsGatewayARN'
 --
--- * 'umstrsStatus'
+-- * 'umstrsResponseStatus'
 updateMaintenanceStartTimeResponse
-    :: Int -- ^ 'umstrsStatus'
+    :: Int -- ^ 'umstrsResponseStatus'
     -> UpdateMaintenanceStartTimeResponse
-updateMaintenanceStartTimeResponse pStatus_ =
+updateMaintenanceStartTimeResponse pResponseStatus_ =
     UpdateMaintenanceStartTimeResponse'
     { _umstrsGatewayARN = Nothing
-    , _umstrsStatus = pStatus_
+    , _umstrsResponseStatus = pResponseStatus_
     }
 
 -- | Undocumented member.
@@ -172,5 +172,5 @@
 umstrsGatewayARN = lens _umstrsGatewayARN (\ s a -> s{_umstrsGatewayARN = a});
 
 -- | The response status code.
-umstrsStatus :: Lens' UpdateMaintenanceStartTimeResponse Int
-umstrsStatus = lens _umstrsStatus (\ s a -> s{_umstrsStatus = a});
+umstrsResponseStatus :: Lens' UpdateMaintenanceStartTimeResponse Int
+umstrsResponseStatus = lens _umstrsResponseStatus (\ s a -> s{_umstrsResponseStatus = a});
diff --git a/gen/Network/AWS/StorageGateway/UpdateSnapshotSchedule.hs b/gen/Network/AWS/StorageGateway/UpdateSnapshotSchedule.hs
--- a/gen/Network/AWS/StorageGateway/UpdateSnapshotSchedule.hs
+++ b/gen/Network/AWS/StorageGateway/UpdateSnapshotSchedule.hs
@@ -47,7 +47,7 @@
     , UpdateSnapshotScheduleResponse
     -- * Response Lenses
     , ussrsVolumeARN
-    , ussrsStatus
+    , ussrsResponseStatus
     ) where
 
 import           Network.AWS.Prelude
@@ -154,8 +154,8 @@
 --
 -- /See:/ 'updateSnapshotScheduleResponse' smart constructor.
 data UpdateSnapshotScheduleResponse = UpdateSnapshotScheduleResponse'
-    { _ussrsVolumeARN :: !(Maybe Text)
-    , _ussrsStatus    :: !Int
+    { _ussrsVolumeARN      :: !(Maybe Text)
+    , _ussrsResponseStatus :: !Int
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'UpdateSnapshotScheduleResponse' with the minimum fields required to make a request.
@@ -164,14 +164,14 @@
 --
 -- * 'ussrsVolumeARN'
 --
--- * 'ussrsStatus'
+-- * 'ussrsResponseStatus'
 updateSnapshotScheduleResponse
-    :: Int -- ^ 'ussrsStatus'
+    :: Int -- ^ 'ussrsResponseStatus'
     -> UpdateSnapshotScheduleResponse
-updateSnapshotScheduleResponse pStatus_ =
+updateSnapshotScheduleResponse pResponseStatus_ =
     UpdateSnapshotScheduleResponse'
     { _ussrsVolumeARN = Nothing
-    , _ussrsStatus = pStatus_
+    , _ussrsResponseStatus = pResponseStatus_
     }
 
 -- | Undocumented member.
@@ -179,5 +179,5 @@
 ussrsVolumeARN = lens _ussrsVolumeARN (\ s a -> s{_ussrsVolumeARN = a});
 
 -- | The response status code.
-ussrsStatus :: Lens' UpdateSnapshotScheduleResponse Int
-ussrsStatus = lens _ussrsStatus (\ s a -> s{_ussrsStatus = a});
+ussrsResponseStatus :: Lens' UpdateSnapshotScheduleResponse Int
+ussrsResponseStatus = lens _ussrsResponseStatus (\ s a -> s{_ussrsResponseStatus = a});
diff --git a/gen/Network/AWS/StorageGateway/UpdateVTLDeviceType.hs b/gen/Network/AWS/StorageGateway/UpdateVTLDeviceType.hs
--- a/gen/Network/AWS/StorageGateway/UpdateVTLDeviceType.hs
+++ b/gen/Network/AWS/StorageGateway/UpdateVTLDeviceType.hs
@@ -38,7 +38,7 @@
     , UpdateVTLDeviceTypeResponse
     -- * Response Lenses
     , uvtldtrsVTLDeviceARN
-    , uvtldtrsStatus
+    , uvtldtrsResponseStatus
     ) where
 
 import           Network.AWS.Prelude
@@ -119,8 +119,8 @@
 --
 -- /See:/ 'updateVTLDeviceTypeResponse' smart constructor.
 data UpdateVTLDeviceTypeResponse = UpdateVTLDeviceTypeResponse'
-    { _uvtldtrsVTLDeviceARN :: !(Maybe Text)
-    , _uvtldtrsStatus       :: !Int
+    { _uvtldtrsVTLDeviceARN   :: !(Maybe Text)
+    , _uvtldtrsResponseStatus :: !Int
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'UpdateVTLDeviceTypeResponse' with the minimum fields required to make a request.
@@ -129,14 +129,14 @@
 --
 -- * 'uvtldtrsVTLDeviceARN'
 --
--- * 'uvtldtrsStatus'
+-- * 'uvtldtrsResponseStatus'
 updateVTLDeviceTypeResponse
-    :: Int -- ^ 'uvtldtrsStatus'
+    :: Int -- ^ 'uvtldtrsResponseStatus'
     -> UpdateVTLDeviceTypeResponse
-updateVTLDeviceTypeResponse pStatus_ =
+updateVTLDeviceTypeResponse pResponseStatus_ =
     UpdateVTLDeviceTypeResponse'
     { _uvtldtrsVTLDeviceARN = Nothing
-    , _uvtldtrsStatus = pStatus_
+    , _uvtldtrsResponseStatus = pResponseStatus_
     }
 
 -- | The Amazon Resource Name (ARN) of the medium changer you have selected.
@@ -144,5 +144,5 @@
 uvtldtrsVTLDeviceARN = lens _uvtldtrsVTLDeviceARN (\ s a -> s{_uvtldtrsVTLDeviceARN = a});
 
 -- | The response status code.
-uvtldtrsStatus :: Lens' UpdateVTLDeviceTypeResponse Int
-uvtldtrsStatus = lens _uvtldtrsStatus (\ s a -> s{_uvtldtrsStatus = a});
+uvtldtrsResponseStatus :: Lens' UpdateVTLDeviceTypeResponse Int
+uvtldtrsResponseStatus = lens _uvtldtrsResponseStatus (\ s a -> s{_uvtldtrsResponseStatus = a});
diff --git a/test/Test/AWS/Gen/StorageGateway.hs b/test/Test/AWS/Gen/StorageGateway.hs
--- a/test/Test/AWS/Gen/StorageGateway.hs
+++ b/test/Test/AWS/Gen/StorageGateway.hs
@@ -34,29 +34,23 @@
 --         , testCreateStorediSCSIVolume $
 --             createStorediSCSIVolume
 --
+--         , testDescribeChapCredentials $
+--             describeChapCredentials
+--
 --         , testCreateTapes $
 --             createTapes
 --
---         , testCreateCachediSCSIVolume $
---             createCachediSCSIVolume
---
 --         , testUpdateVTLDeviceType $
 --             updateVTLDeviceType
 --
---         , testDescribeChapCredentials $
---             describeChapCredentials
---
---         , testAddUploadBuffer $
---             addUploadBuffer
+--         , testCreateCachediSCSIVolume $
+--             createCachediSCSIVolume
 --
 --         , testListVolumeInitiators $
 --             listVolumeInitiators
 --
---         , testDescribeWorkingStorage $
---             describeWorkingStorage
---
---         , testDescribeCachediSCSIVolumes $
---             describeCachediSCSIVolumes
+--         , testAddUploadBuffer $
+--             addUploadBuffer
 --
 --         , testUpdateGatewayInformation $
 --             updateGatewayInformation
@@ -64,6 +58,12 @@
 --         , testDescribeMaintenanceStartTime $
 --             describeMaintenanceStartTime
 --
+--         , testDescribeWorkingStorage $
+--             describeWorkingStorage
+--
+--         , testDescribeCachediSCSIVolumes $
+--             describeCachediSCSIVolumes
+--
 --         , testAddCache $
 --             addCache
 --
@@ -82,59 +82,59 @@
 --         , testUpdateChapCredentials $
 --             updateChapCredentials
 --
---         , testDescribeStorediSCSIVolumes $
---             describeStorediSCSIVolumes
+--         , testDescribeUploadBuffer $
+--             describeUploadBuffer
 --
 --         , testDescribeTapes $
 --             describeTapes
 --
---         , testDescribeUploadBuffer $
---             describeUploadBuffer
+--         , testDescribeStorediSCSIVolumes $
+--             describeStorediSCSIVolumes
 --
 --         , testCreateSnapshotFromVolumeRecoveryPoint $
 --             createSnapshotFromVolumeRecoveryPoint
 --
---         , testDescribeGatewayInformation $
---             describeGatewayInformation
---
 --         , testRetrieveTapeRecoveryPoint $
 --             retrieveTapeRecoveryPoint
 --
+--         , testDeleteGateway $
+--             deleteGateway
+--
 --         , testUpdateMaintenanceStartTime $
 --             updateMaintenanceStartTime
 --
---         , testDeleteGateway $
---             deleteGateway
+--         , testDescribeGatewayInformation $
+--             describeGatewayInformation
 --
+--         , testRetrieveTapeArchive $
+--             retrieveTapeArchive
+--
+--         , testDescribeTapeArchives $
+--             describeTapeArchives
+--
 --         , testDisableGateway $
 --             disableGateway
 --
 --         , testDescribeSnapshotSchedule $
 --             describeSnapshotSchedule
 --
---         , testDescribeTapeArchives $
---             describeTapeArchives
---
---         , testRetrieveTapeArchive $
---             retrieveTapeArchive
---
 --         , testDescribeBandwidthRateLimit $
 --             describeBandwidthRateLimit
 --
---         , testDescribeVTLDevices $
---             describeVTLDevices
---
---         , testCreateSnapshot $
---             createSnapshot
+--         , testDeleteSnapshotSchedule $
+--             deleteSnapshotSchedule
 --
 --         , testUpdateSnapshotSchedule $
 --             updateSnapshotSchedule
 --
+--         , testCreateSnapshot $
+--             createSnapshot
+--
 --         , testCancelRetrieval $
 --             cancelRetrieval
 --
---         , testDeleteSnapshotSchedule $
---             deleteSnapshotSchedule
+--         , testDescribeVTLDevices $
+--             describeVTLDevices
 --
 --         , testDeleteTapeArchive $
 --             deleteTapeArchive
@@ -142,23 +142,32 @@
 --         , testListVolumeRecoveryPoints $
 --             listVolumeRecoveryPoints
 --
---         , testAddWorkingStorage $
---             addWorkingStorage
+--         , testResetCache $
+--             resetCache
 --
 --         , testListGateways $
 --             listGateways
 --
+--         , testDeleteTape $
+--             deleteTape
+--
+--         , testListLocalDisks $
+--             listLocalDisks
+--
 --         , testListVolumes $
 --             listVolumes
 --
+--         , testUpdateBandwidthRateLimit $
+--             updateBandwidthRateLimit
+--
+--         , testAddWorkingStorage $
+--             addWorkingStorage
+--
 --         , testDescribeTapeRecoveryPoints $
 --             describeTapeRecoveryPoints
 --
---         , testDeleteVolume $
---             deleteVolume
---
---         , testResetCache $
---             resetCache
+--         , testDeleteBandwidthRateLimit $
+--             deleteBandwidthRateLimit
 --
 --         , testActivateGateway $
 --             activateGateway
@@ -166,17 +175,8 @@
 --         , testDescribeCache $
 --             describeCache
 --
---         , testUpdateBandwidthRateLimit $
---             updateBandwidthRateLimit
---
---         , testDeleteBandwidthRateLimit $
---             deleteBandwidthRateLimit
---
---         , testListLocalDisks $
---             listLocalDisks
---
---         , testDeleteTape $
---             deleteTape
+--         , testDeleteVolume $
+--             deleteVolume
 --
 --           ]
 
@@ -187,29 +187,23 @@
 --         , testCreateStorediSCSIVolumeResponse $
 --             createStorediSCSIVolumeResponse
 --
+--         , testDescribeChapCredentialsResponse $
+--             describeChapCredentialsResponse
+--
 --         , testCreateTapesResponse $
 --             createTapesResponse
 --
---         , testCreateCachediSCSIVolumeResponse $
---             createCachediSCSIVolumeResponse
---
 --         , testUpdateVTLDeviceTypeResponse $
 --             updateVTLDeviceTypeResponse
 --
---         , testDescribeChapCredentialsResponse $
---             describeChapCredentialsResponse
---
---         , testAddUploadBufferResponse $
---             addUploadBufferResponse
+--         , testCreateCachediSCSIVolumeResponse $
+--             createCachediSCSIVolumeResponse
 --
 --         , testListVolumeInitiatorsResponse $
 --             listVolumeInitiatorsResponse
 --
---         , testDescribeWorkingStorageResponse $
---             describeWorkingStorageResponse
---
---         , testDescribeCachediSCSIVolumesResponse $
---             describeCachediSCSIVolumesResponse
+--         , testAddUploadBufferResponse $
+--             addUploadBufferResponse
 --
 --         , testUpdateGatewayInformationResponse $
 --             updateGatewayInformationResponse
@@ -217,6 +211,12 @@
 --         , testDescribeMaintenanceStartTimeResponse $
 --             describeMaintenanceStartTimeResponse
 --
+--         , testDescribeWorkingStorageResponse $
+--             describeWorkingStorageResponse
+--
+--         , testDescribeCachediSCSIVolumesResponse $
+--             describeCachediSCSIVolumesResponse
+--
 --         , testAddCacheResponse $
 --             addCacheResponse
 --
@@ -235,59 +235,59 @@
 --         , testUpdateChapCredentialsResponse $
 --             updateChapCredentialsResponse
 --
---         , testDescribeStorediSCSIVolumesResponse $
---             describeStorediSCSIVolumesResponse
+--         , testDescribeUploadBufferResponse $
+--             describeUploadBufferResponse
 --
 --         , testDescribeTapesResponse $
 --             describeTapesResponse
 --
---         , testDescribeUploadBufferResponse $
---             describeUploadBufferResponse
+--         , testDescribeStorediSCSIVolumesResponse $
+--             describeStorediSCSIVolumesResponse
 --
 --         , testCreateSnapshotFromVolumeRecoveryPointResponse $
 --             createSnapshotFromVolumeRecoveryPointResponse
 --
---         , testDescribeGatewayInformationResponse $
---             describeGatewayInformationResponse
---
 --         , testRetrieveTapeRecoveryPointResponse $
 --             retrieveTapeRecoveryPointResponse
 --
+--         , testDeleteGatewayResponse $
+--             deleteGatewayResponse
+--
 --         , testUpdateMaintenanceStartTimeResponse $
 --             updateMaintenanceStartTimeResponse
 --
---         , testDeleteGatewayResponse $
---             deleteGatewayResponse
+--         , testDescribeGatewayInformationResponse $
+--             describeGatewayInformationResponse
 --
+--         , testRetrieveTapeArchiveResponse $
+--             retrieveTapeArchiveResponse
+--
+--         , testDescribeTapeArchivesResponse $
+--             describeTapeArchivesResponse
+--
 --         , testDisableGatewayResponse $
 --             disableGatewayResponse
 --
 --         , testDescribeSnapshotScheduleResponse $
 --             describeSnapshotScheduleResponse
 --
---         , testDescribeTapeArchivesResponse $
---             describeTapeArchivesResponse
---
---         , testRetrieveTapeArchiveResponse $
---             retrieveTapeArchiveResponse
---
 --         , testDescribeBandwidthRateLimitResponse $
 --             describeBandwidthRateLimitResponse
 --
---         , testDescribeVTLDevicesResponse $
---             describeVTLDevicesResponse
---
---         , testCreateSnapshotResponse $
---             createSnapshotResponse
+--         , testDeleteSnapshotScheduleResponse $
+--             deleteSnapshotScheduleResponse
 --
 --         , testUpdateSnapshotScheduleResponse $
 --             updateSnapshotScheduleResponse
 --
+--         , testCreateSnapshotResponse $
+--             createSnapshotResponse
+--
 --         , testCancelRetrievalResponse $
 --             cancelRetrievalResponse
 --
---         , testDeleteSnapshotScheduleResponse $
---             deleteSnapshotScheduleResponse
+--         , testDescribeVTLDevicesResponse $
+--             describeVTLDevicesResponse
 --
 --         , testDeleteTapeArchiveResponse $
 --             deleteTapeArchiveResponse
@@ -295,23 +295,32 @@
 --         , testListVolumeRecoveryPointsResponse $
 --             listVolumeRecoveryPointsResponse
 --
---         , testAddWorkingStorageResponse $
---             addWorkingStorageResponse
+--         , testResetCacheResponse $
+--             resetCacheResponse
 --
 --         , testListGatewaysResponse $
 --             listGatewaysResponse
 --
+--         , testDeleteTapeResponse $
+--             deleteTapeResponse
+--
+--         , testListLocalDisksResponse $
+--             listLocalDisksResponse
+--
 --         , testListVolumesResponse $
 --             listVolumesResponse
 --
+--         , testUpdateBandwidthRateLimitResponse $
+--             updateBandwidthRateLimitResponse
+--
+--         , testAddWorkingStorageResponse $
+--             addWorkingStorageResponse
+--
 --         , testDescribeTapeRecoveryPointsResponse $
 --             describeTapeRecoveryPointsResponse
 --
---         , testDeleteVolumeResponse $
---             deleteVolumeResponse
---
---         , testResetCacheResponse $
---             resetCacheResponse
+--         , testDeleteBandwidthRateLimitResponse $
+--             deleteBandwidthRateLimitResponse
 --
 --         , testActivateGatewayResponse $
 --             activateGatewayResponse
@@ -319,17 +328,8 @@
 --         , testDescribeCacheResponse $
 --             describeCacheResponse
 --
---         , testUpdateBandwidthRateLimitResponse $
---             updateBandwidthRateLimitResponse
---
---         , testDeleteBandwidthRateLimitResponse $
---             deleteBandwidthRateLimitResponse
---
---         , testListLocalDisksResponse $
---             listLocalDisksResponse
---
---         , testDeleteTapeResponse $
---             deleteTapeResponse
+--         , testDeleteVolumeResponse $
+--             deleteVolumeResponse
 --
 --           ]
 --     ]
@@ -346,45 +346,35 @@
     "CreateStorediSCSIVolume"
     "fixture/CreateStorediSCSIVolume.yaml"
 
+testDescribeChapCredentials :: DescribeChapCredentials -> TestTree
+testDescribeChapCredentials = req
+    "DescribeChapCredentials"
+    "fixture/DescribeChapCredentials.yaml"
+
 testCreateTapes :: CreateTapes -> TestTree
 testCreateTapes = req
     "CreateTapes"
     "fixture/CreateTapes.yaml"
 
-testCreateCachediSCSIVolume :: CreateCachediSCSIVolume -> TestTree
-testCreateCachediSCSIVolume = req
-    "CreateCachediSCSIVolume"
-    "fixture/CreateCachediSCSIVolume.yaml"
-
 testUpdateVTLDeviceType :: UpdateVTLDeviceType -> TestTree
 testUpdateVTLDeviceType = req
     "UpdateVTLDeviceType"
     "fixture/UpdateVTLDeviceType.yaml"
 
-testDescribeChapCredentials :: DescribeChapCredentials -> TestTree
-testDescribeChapCredentials = req
-    "DescribeChapCredentials"
-    "fixture/DescribeChapCredentials.yaml"
-
-testAddUploadBuffer :: AddUploadBuffer -> TestTree
-testAddUploadBuffer = req
-    "AddUploadBuffer"
-    "fixture/AddUploadBuffer.yaml"
+testCreateCachediSCSIVolume :: CreateCachediSCSIVolume -> TestTree
+testCreateCachediSCSIVolume = req
+    "CreateCachediSCSIVolume"
+    "fixture/CreateCachediSCSIVolume.yaml"
 
 testListVolumeInitiators :: ListVolumeInitiators -> TestTree
 testListVolumeInitiators = req
     "ListVolumeInitiators"
     "fixture/ListVolumeInitiators.yaml"
 
-testDescribeWorkingStorage :: DescribeWorkingStorage -> TestTree
-testDescribeWorkingStorage = req
-    "DescribeWorkingStorage"
-    "fixture/DescribeWorkingStorage.yaml"
-
-testDescribeCachediSCSIVolumes :: DescribeCachediSCSIVolumes -> TestTree
-testDescribeCachediSCSIVolumes = req
-    "DescribeCachediSCSIVolumes"
-    "fixture/DescribeCachediSCSIVolumes.yaml"
+testAddUploadBuffer :: AddUploadBuffer -> TestTree
+testAddUploadBuffer = req
+    "AddUploadBuffer"
+    "fixture/AddUploadBuffer.yaml"
 
 testUpdateGatewayInformation :: UpdateGatewayInformation -> TestTree
 testUpdateGatewayInformation = req
@@ -396,6 +386,16 @@
     "DescribeMaintenanceStartTime"
     "fixture/DescribeMaintenanceStartTime.yaml"
 
+testDescribeWorkingStorage :: DescribeWorkingStorage -> TestTree
+testDescribeWorkingStorage = req
+    "DescribeWorkingStorage"
+    "fixture/DescribeWorkingStorage.yaml"
+
+testDescribeCachediSCSIVolumes :: DescribeCachediSCSIVolumes -> TestTree
+testDescribeCachediSCSIVolumes = req
+    "DescribeCachediSCSIVolumes"
+    "fixture/DescribeCachediSCSIVolumes.yaml"
+
 testAddCache :: AddCache -> TestTree
 testAddCache = req
     "AddCache"
@@ -426,46 +426,56 @@
     "UpdateChapCredentials"
     "fixture/UpdateChapCredentials.yaml"
 
-testDescribeStorediSCSIVolumes :: DescribeStorediSCSIVolumes -> TestTree
-testDescribeStorediSCSIVolumes = req
-    "DescribeStorediSCSIVolumes"
-    "fixture/DescribeStorediSCSIVolumes.yaml"
+testDescribeUploadBuffer :: DescribeUploadBuffer -> TestTree
+testDescribeUploadBuffer = req
+    "DescribeUploadBuffer"
+    "fixture/DescribeUploadBuffer.yaml"
 
 testDescribeTapes :: DescribeTapes -> TestTree
 testDescribeTapes = req
     "DescribeTapes"
     "fixture/DescribeTapes.yaml"
 
-testDescribeUploadBuffer :: DescribeUploadBuffer -> TestTree
-testDescribeUploadBuffer = req
-    "DescribeUploadBuffer"
-    "fixture/DescribeUploadBuffer.yaml"
+testDescribeStorediSCSIVolumes :: DescribeStorediSCSIVolumes -> TestTree
+testDescribeStorediSCSIVolumes = req
+    "DescribeStorediSCSIVolumes"
+    "fixture/DescribeStorediSCSIVolumes.yaml"
 
 testCreateSnapshotFromVolumeRecoveryPoint :: CreateSnapshotFromVolumeRecoveryPoint -> TestTree
 testCreateSnapshotFromVolumeRecoveryPoint = req
     "CreateSnapshotFromVolumeRecoveryPoint"
     "fixture/CreateSnapshotFromVolumeRecoveryPoint.yaml"
 
-testDescribeGatewayInformation :: DescribeGatewayInformation -> TestTree
-testDescribeGatewayInformation = req
-    "DescribeGatewayInformation"
-    "fixture/DescribeGatewayInformation.yaml"
-
 testRetrieveTapeRecoveryPoint :: RetrieveTapeRecoveryPoint -> TestTree
 testRetrieveTapeRecoveryPoint = req
     "RetrieveTapeRecoveryPoint"
     "fixture/RetrieveTapeRecoveryPoint.yaml"
 
+testDeleteGateway :: DeleteGateway -> TestTree
+testDeleteGateway = req
+    "DeleteGateway"
+    "fixture/DeleteGateway.yaml"
+
 testUpdateMaintenanceStartTime :: UpdateMaintenanceStartTime -> TestTree
 testUpdateMaintenanceStartTime = req
     "UpdateMaintenanceStartTime"
     "fixture/UpdateMaintenanceStartTime.yaml"
 
-testDeleteGateway :: DeleteGateway -> TestTree
-testDeleteGateway = req
-    "DeleteGateway"
-    "fixture/DeleteGateway.yaml"
+testDescribeGatewayInformation :: DescribeGatewayInformation -> TestTree
+testDescribeGatewayInformation = req
+    "DescribeGatewayInformation"
+    "fixture/DescribeGatewayInformation.yaml"
 
+testRetrieveTapeArchive :: RetrieveTapeArchive -> TestTree
+testRetrieveTapeArchive = req
+    "RetrieveTapeArchive"
+    "fixture/RetrieveTapeArchive.yaml"
+
+testDescribeTapeArchives :: DescribeTapeArchives -> TestTree
+testDescribeTapeArchives = req
+    "DescribeTapeArchives"
+    "fixture/DescribeTapeArchives.yaml"
+
 testDisableGateway :: DisableGateway -> TestTree
 testDisableGateway = req
     "DisableGateway"
@@ -476,45 +486,35 @@
     "DescribeSnapshotSchedule"
     "fixture/DescribeSnapshotSchedule.yaml"
 
-testDescribeTapeArchives :: DescribeTapeArchives -> TestTree
-testDescribeTapeArchives = req
-    "DescribeTapeArchives"
-    "fixture/DescribeTapeArchives.yaml"
-
-testRetrieveTapeArchive :: RetrieveTapeArchive -> TestTree
-testRetrieveTapeArchive = req
-    "RetrieveTapeArchive"
-    "fixture/RetrieveTapeArchive.yaml"
-
 testDescribeBandwidthRateLimit :: DescribeBandwidthRateLimit -> TestTree
 testDescribeBandwidthRateLimit = req
     "DescribeBandwidthRateLimit"
     "fixture/DescribeBandwidthRateLimit.yaml"
 
-testDescribeVTLDevices :: DescribeVTLDevices -> TestTree
-testDescribeVTLDevices = req
-    "DescribeVTLDevices"
-    "fixture/DescribeVTLDevices.yaml"
-
-testCreateSnapshot :: CreateSnapshot -> TestTree
-testCreateSnapshot = req
-    "CreateSnapshot"
-    "fixture/CreateSnapshot.yaml"
+testDeleteSnapshotSchedule :: DeleteSnapshotSchedule -> TestTree
+testDeleteSnapshotSchedule = req
+    "DeleteSnapshotSchedule"
+    "fixture/DeleteSnapshotSchedule.yaml"
 
 testUpdateSnapshotSchedule :: UpdateSnapshotSchedule -> TestTree
 testUpdateSnapshotSchedule = req
     "UpdateSnapshotSchedule"
     "fixture/UpdateSnapshotSchedule.yaml"
 
+testCreateSnapshot :: CreateSnapshot -> TestTree
+testCreateSnapshot = req
+    "CreateSnapshot"
+    "fixture/CreateSnapshot.yaml"
+
 testCancelRetrieval :: CancelRetrieval -> TestTree
 testCancelRetrieval = req
     "CancelRetrieval"
     "fixture/CancelRetrieval.yaml"
 
-testDeleteSnapshotSchedule :: DeleteSnapshotSchedule -> TestTree
-testDeleteSnapshotSchedule = req
-    "DeleteSnapshotSchedule"
-    "fixture/DeleteSnapshotSchedule.yaml"
+testDescribeVTLDevices :: DescribeVTLDevices -> TestTree
+testDescribeVTLDevices = req
+    "DescribeVTLDevices"
+    "fixture/DescribeVTLDevices.yaml"
 
 testDeleteTapeArchive :: DeleteTapeArchive -> TestTree
 testDeleteTapeArchive = req
@@ -526,35 +526,50 @@
     "ListVolumeRecoveryPoints"
     "fixture/ListVolumeRecoveryPoints.yaml"
 
-testAddWorkingStorage :: AddWorkingStorage -> TestTree
-testAddWorkingStorage = req
-    "AddWorkingStorage"
-    "fixture/AddWorkingStorage.yaml"
+testResetCache :: ResetCache -> TestTree
+testResetCache = req
+    "ResetCache"
+    "fixture/ResetCache.yaml"
 
 testListGateways :: ListGateways -> TestTree
 testListGateways = req
     "ListGateways"
     "fixture/ListGateways.yaml"
 
+testDeleteTape :: DeleteTape -> TestTree
+testDeleteTape = req
+    "DeleteTape"
+    "fixture/DeleteTape.yaml"
+
+testListLocalDisks :: ListLocalDisks -> TestTree
+testListLocalDisks = req
+    "ListLocalDisks"
+    "fixture/ListLocalDisks.yaml"
+
 testListVolumes :: ListVolumes -> TestTree
 testListVolumes = req
     "ListVolumes"
     "fixture/ListVolumes.yaml"
 
+testUpdateBandwidthRateLimit :: UpdateBandwidthRateLimit -> TestTree
+testUpdateBandwidthRateLimit = req
+    "UpdateBandwidthRateLimit"
+    "fixture/UpdateBandwidthRateLimit.yaml"
+
+testAddWorkingStorage :: AddWorkingStorage -> TestTree
+testAddWorkingStorage = req
+    "AddWorkingStorage"
+    "fixture/AddWorkingStorage.yaml"
+
 testDescribeTapeRecoveryPoints :: DescribeTapeRecoveryPoints -> TestTree
 testDescribeTapeRecoveryPoints = req
     "DescribeTapeRecoveryPoints"
     "fixture/DescribeTapeRecoveryPoints.yaml"
 
-testDeleteVolume :: DeleteVolume -> TestTree
-testDeleteVolume = req
-    "DeleteVolume"
-    "fixture/DeleteVolume.yaml"
-
-testResetCache :: ResetCache -> TestTree
-testResetCache = req
-    "ResetCache"
-    "fixture/ResetCache.yaml"
+testDeleteBandwidthRateLimit :: DeleteBandwidthRateLimit -> TestTree
+testDeleteBandwidthRateLimit = req
+    "DeleteBandwidthRateLimit"
+    "fixture/DeleteBandwidthRateLimit.yaml"
 
 testActivateGateway :: ActivateGateway -> TestTree
 testActivateGateway = req
@@ -566,25 +581,10 @@
     "DescribeCache"
     "fixture/DescribeCache.yaml"
 
-testUpdateBandwidthRateLimit :: UpdateBandwidthRateLimit -> TestTree
-testUpdateBandwidthRateLimit = req
-    "UpdateBandwidthRateLimit"
-    "fixture/UpdateBandwidthRateLimit.yaml"
-
-testDeleteBandwidthRateLimit :: DeleteBandwidthRateLimit -> TestTree
-testDeleteBandwidthRateLimit = req
-    "DeleteBandwidthRateLimit"
-    "fixture/DeleteBandwidthRateLimit.yaml"
-
-testListLocalDisks :: ListLocalDisks -> TestTree
-testListLocalDisks = req
-    "ListLocalDisks"
-    "fixture/ListLocalDisks.yaml"
-
-testDeleteTape :: DeleteTape -> TestTree
-testDeleteTape = req
-    "DeleteTape"
-    "fixture/DeleteTape.yaml"
+testDeleteVolume :: DeleteVolume -> TestTree
+testDeleteVolume = req
+    "DeleteVolume"
+    "fixture/DeleteVolume.yaml"
 
 -- Responses
 
@@ -602,6 +602,13 @@
     storageGateway
     (Proxy :: Proxy CreateStorediSCSIVolume)
 
+testDescribeChapCredentialsResponse :: DescribeChapCredentialsResponse -> TestTree
+testDescribeChapCredentialsResponse = res
+    "DescribeChapCredentialsResponse"
+    "fixture/DescribeChapCredentialsResponse.proto"
+    storageGateway
+    (Proxy :: Proxy DescribeChapCredentials)
+
 testCreateTapesResponse :: CreateTapesResponse -> TestTree
 testCreateTapesResponse = res
     "CreateTapesResponse"
@@ -609,13 +616,6 @@
     storageGateway
     (Proxy :: Proxy CreateTapes)
 
-testCreateCachediSCSIVolumeResponse :: CreateCachediSCSIVolumeResponse -> TestTree
-testCreateCachediSCSIVolumeResponse = res
-    "CreateCachediSCSIVolumeResponse"
-    "fixture/CreateCachediSCSIVolumeResponse.proto"
-    storageGateway
-    (Proxy :: Proxy CreateCachediSCSIVolume)
-
 testUpdateVTLDeviceTypeResponse :: UpdateVTLDeviceTypeResponse -> TestTree
 testUpdateVTLDeviceTypeResponse = res
     "UpdateVTLDeviceTypeResponse"
@@ -623,19 +623,12 @@
     storageGateway
     (Proxy :: Proxy UpdateVTLDeviceType)
 
-testDescribeChapCredentialsResponse :: DescribeChapCredentialsResponse -> TestTree
-testDescribeChapCredentialsResponse = res
-    "DescribeChapCredentialsResponse"
-    "fixture/DescribeChapCredentialsResponse.proto"
-    storageGateway
-    (Proxy :: Proxy DescribeChapCredentials)
-
-testAddUploadBufferResponse :: AddUploadBufferResponse -> TestTree
-testAddUploadBufferResponse = res
-    "AddUploadBufferResponse"
-    "fixture/AddUploadBufferResponse.proto"
+testCreateCachediSCSIVolumeResponse :: CreateCachediSCSIVolumeResponse -> TestTree
+testCreateCachediSCSIVolumeResponse = res
+    "CreateCachediSCSIVolumeResponse"
+    "fixture/CreateCachediSCSIVolumeResponse.proto"
     storageGateway
-    (Proxy :: Proxy AddUploadBuffer)
+    (Proxy :: Proxy CreateCachediSCSIVolume)
 
 testListVolumeInitiatorsResponse :: ListVolumeInitiatorsResponse -> TestTree
 testListVolumeInitiatorsResponse = res
@@ -644,19 +637,12 @@
     storageGateway
     (Proxy :: Proxy ListVolumeInitiators)
 
-testDescribeWorkingStorageResponse :: DescribeWorkingStorageResponse -> TestTree
-testDescribeWorkingStorageResponse = res
-    "DescribeWorkingStorageResponse"
-    "fixture/DescribeWorkingStorageResponse.proto"
-    storageGateway
-    (Proxy :: Proxy DescribeWorkingStorage)
-
-testDescribeCachediSCSIVolumesResponse :: DescribeCachediSCSIVolumesResponse -> TestTree
-testDescribeCachediSCSIVolumesResponse = res
-    "DescribeCachediSCSIVolumesResponse"
-    "fixture/DescribeCachediSCSIVolumesResponse.proto"
+testAddUploadBufferResponse :: AddUploadBufferResponse -> TestTree
+testAddUploadBufferResponse = res
+    "AddUploadBufferResponse"
+    "fixture/AddUploadBufferResponse.proto"
     storageGateway
-    (Proxy :: Proxy DescribeCachediSCSIVolumes)
+    (Proxy :: Proxy AddUploadBuffer)
 
 testUpdateGatewayInformationResponse :: UpdateGatewayInformationResponse -> TestTree
 testUpdateGatewayInformationResponse = res
@@ -672,6 +658,20 @@
     storageGateway
     (Proxy :: Proxy DescribeMaintenanceStartTime)
 
+testDescribeWorkingStorageResponse :: DescribeWorkingStorageResponse -> TestTree
+testDescribeWorkingStorageResponse = res
+    "DescribeWorkingStorageResponse"
+    "fixture/DescribeWorkingStorageResponse.proto"
+    storageGateway
+    (Proxy :: Proxy DescribeWorkingStorage)
+
+testDescribeCachediSCSIVolumesResponse :: DescribeCachediSCSIVolumesResponse -> TestTree
+testDescribeCachediSCSIVolumesResponse = res
+    "DescribeCachediSCSIVolumesResponse"
+    "fixture/DescribeCachediSCSIVolumesResponse.proto"
+    storageGateway
+    (Proxy :: Proxy DescribeCachediSCSIVolumes)
+
 testAddCacheResponse :: AddCacheResponse -> TestTree
 testAddCacheResponse = res
     "AddCacheResponse"
@@ -714,12 +714,12 @@
     storageGateway
     (Proxy :: Proxy UpdateChapCredentials)
 
-testDescribeStorediSCSIVolumesResponse :: DescribeStorediSCSIVolumesResponse -> TestTree
-testDescribeStorediSCSIVolumesResponse = res
-    "DescribeStorediSCSIVolumesResponse"
-    "fixture/DescribeStorediSCSIVolumesResponse.proto"
+testDescribeUploadBufferResponse :: DescribeUploadBufferResponse -> TestTree
+testDescribeUploadBufferResponse = res
+    "DescribeUploadBufferResponse"
+    "fixture/DescribeUploadBufferResponse.proto"
     storageGateway
-    (Proxy :: Proxy DescribeStorediSCSIVolumes)
+    (Proxy :: Proxy DescribeUploadBuffer)
 
 testDescribeTapesResponse :: DescribeTapesResponse -> TestTree
 testDescribeTapesResponse = res
@@ -728,12 +728,12 @@
     storageGateway
     (Proxy :: Proxy DescribeTapes)
 
-testDescribeUploadBufferResponse :: DescribeUploadBufferResponse -> TestTree
-testDescribeUploadBufferResponse = res
-    "DescribeUploadBufferResponse"
-    "fixture/DescribeUploadBufferResponse.proto"
+testDescribeStorediSCSIVolumesResponse :: DescribeStorediSCSIVolumesResponse -> TestTree
+testDescribeStorediSCSIVolumesResponse = res
+    "DescribeStorediSCSIVolumesResponse"
+    "fixture/DescribeStorediSCSIVolumesResponse.proto"
     storageGateway
-    (Proxy :: Proxy DescribeUploadBuffer)
+    (Proxy :: Proxy DescribeStorediSCSIVolumes)
 
 testCreateSnapshotFromVolumeRecoveryPointResponse :: CreateSnapshotFromVolumeRecoveryPointResponse -> TestTree
 testCreateSnapshotFromVolumeRecoveryPointResponse = res
@@ -742,13 +742,6 @@
     storageGateway
     (Proxy :: Proxy CreateSnapshotFromVolumeRecoveryPoint)
 
-testDescribeGatewayInformationResponse :: DescribeGatewayInformationResponse -> TestTree
-testDescribeGatewayInformationResponse = res
-    "DescribeGatewayInformationResponse"
-    "fixture/DescribeGatewayInformationResponse.proto"
-    storageGateway
-    (Proxy :: Proxy DescribeGatewayInformation)
-
 testRetrieveTapeRecoveryPointResponse :: RetrieveTapeRecoveryPointResponse -> TestTree
 testRetrieveTapeRecoveryPointResponse = res
     "RetrieveTapeRecoveryPointResponse"
@@ -756,6 +749,13 @@
     storageGateway
     (Proxy :: Proxy RetrieveTapeRecoveryPoint)
 
+testDeleteGatewayResponse :: DeleteGatewayResponse -> TestTree
+testDeleteGatewayResponse = res
+    "DeleteGatewayResponse"
+    "fixture/DeleteGatewayResponse.proto"
+    storageGateway
+    (Proxy :: Proxy DeleteGateway)
+
 testUpdateMaintenanceStartTimeResponse :: UpdateMaintenanceStartTimeResponse -> TestTree
 testUpdateMaintenanceStartTimeResponse = res
     "UpdateMaintenanceStartTimeResponse"
@@ -763,13 +763,27 @@
     storageGateway
     (Proxy :: Proxy UpdateMaintenanceStartTime)
 
-testDeleteGatewayResponse :: DeleteGatewayResponse -> TestTree
-testDeleteGatewayResponse = res
-    "DeleteGatewayResponse"
-    "fixture/DeleteGatewayResponse.proto"
+testDescribeGatewayInformationResponse :: DescribeGatewayInformationResponse -> TestTree
+testDescribeGatewayInformationResponse = res
+    "DescribeGatewayInformationResponse"
+    "fixture/DescribeGatewayInformationResponse.proto"
     storageGateway
-    (Proxy :: Proxy DeleteGateway)
+    (Proxy :: Proxy DescribeGatewayInformation)
 
+testRetrieveTapeArchiveResponse :: RetrieveTapeArchiveResponse -> TestTree
+testRetrieveTapeArchiveResponse = res
+    "RetrieveTapeArchiveResponse"
+    "fixture/RetrieveTapeArchiveResponse.proto"
+    storageGateway
+    (Proxy :: Proxy RetrieveTapeArchive)
+
+testDescribeTapeArchivesResponse :: DescribeTapeArchivesResponse -> TestTree
+testDescribeTapeArchivesResponse = res
+    "DescribeTapeArchivesResponse"
+    "fixture/DescribeTapeArchivesResponse.proto"
+    storageGateway
+    (Proxy :: Proxy DescribeTapeArchives)
+
 testDisableGatewayResponse :: DisableGatewayResponse -> TestTree
 testDisableGatewayResponse = res
     "DisableGatewayResponse"
@@ -784,20 +798,6 @@
     storageGateway
     (Proxy :: Proxy DescribeSnapshotSchedule)
 
-testDescribeTapeArchivesResponse :: DescribeTapeArchivesResponse -> TestTree
-testDescribeTapeArchivesResponse = res
-    "DescribeTapeArchivesResponse"
-    "fixture/DescribeTapeArchivesResponse.proto"
-    storageGateway
-    (Proxy :: Proxy DescribeTapeArchives)
-
-testRetrieveTapeArchiveResponse :: RetrieveTapeArchiveResponse -> TestTree
-testRetrieveTapeArchiveResponse = res
-    "RetrieveTapeArchiveResponse"
-    "fixture/RetrieveTapeArchiveResponse.proto"
-    storageGateway
-    (Proxy :: Proxy RetrieveTapeArchive)
-
 testDescribeBandwidthRateLimitResponse :: DescribeBandwidthRateLimitResponse -> TestTree
 testDescribeBandwidthRateLimitResponse = res
     "DescribeBandwidthRateLimitResponse"
@@ -805,19 +805,12 @@
     storageGateway
     (Proxy :: Proxy DescribeBandwidthRateLimit)
 
-testDescribeVTLDevicesResponse :: DescribeVTLDevicesResponse -> TestTree
-testDescribeVTLDevicesResponse = res
-    "DescribeVTLDevicesResponse"
-    "fixture/DescribeVTLDevicesResponse.proto"
-    storageGateway
-    (Proxy :: Proxy DescribeVTLDevices)
-
-testCreateSnapshotResponse :: CreateSnapshotResponse -> TestTree
-testCreateSnapshotResponse = res
-    "CreateSnapshotResponse"
-    "fixture/CreateSnapshotResponse.proto"
+testDeleteSnapshotScheduleResponse :: DeleteSnapshotScheduleResponse -> TestTree
+testDeleteSnapshotScheduleResponse = res
+    "DeleteSnapshotScheduleResponse"
+    "fixture/DeleteSnapshotScheduleResponse.proto"
     storageGateway
-    (Proxy :: Proxy CreateSnapshot)
+    (Proxy :: Proxy DeleteSnapshotSchedule)
 
 testUpdateSnapshotScheduleResponse :: UpdateSnapshotScheduleResponse -> TestTree
 testUpdateSnapshotScheduleResponse = res
@@ -826,6 +819,13 @@
     storageGateway
     (Proxy :: Proxy UpdateSnapshotSchedule)
 
+testCreateSnapshotResponse :: CreateSnapshotResponse -> TestTree
+testCreateSnapshotResponse = res
+    "CreateSnapshotResponse"
+    "fixture/CreateSnapshotResponse.proto"
+    storageGateway
+    (Proxy :: Proxy CreateSnapshot)
+
 testCancelRetrievalResponse :: CancelRetrievalResponse -> TestTree
 testCancelRetrievalResponse = res
     "CancelRetrievalResponse"
@@ -833,12 +833,12 @@
     storageGateway
     (Proxy :: Proxy CancelRetrieval)
 
-testDeleteSnapshotScheduleResponse :: DeleteSnapshotScheduleResponse -> TestTree
-testDeleteSnapshotScheduleResponse = res
-    "DeleteSnapshotScheduleResponse"
-    "fixture/DeleteSnapshotScheduleResponse.proto"
+testDescribeVTLDevicesResponse :: DescribeVTLDevicesResponse -> TestTree
+testDescribeVTLDevicesResponse = res
+    "DescribeVTLDevicesResponse"
+    "fixture/DescribeVTLDevicesResponse.proto"
     storageGateway
-    (Proxy :: Proxy DeleteSnapshotSchedule)
+    (Proxy :: Proxy DescribeVTLDevices)
 
 testDeleteTapeArchiveResponse :: DeleteTapeArchiveResponse -> TestTree
 testDeleteTapeArchiveResponse = res
@@ -854,12 +854,12 @@
     storageGateway
     (Proxy :: Proxy ListVolumeRecoveryPoints)
 
-testAddWorkingStorageResponse :: AddWorkingStorageResponse -> TestTree
-testAddWorkingStorageResponse = res
-    "AddWorkingStorageResponse"
-    "fixture/AddWorkingStorageResponse.proto"
+testResetCacheResponse :: ResetCacheResponse -> TestTree
+testResetCacheResponse = res
+    "ResetCacheResponse"
+    "fixture/ResetCacheResponse.proto"
     storageGateway
-    (Proxy :: Proxy AddWorkingStorage)
+    (Proxy :: Proxy ResetCache)
 
 testListGatewaysResponse :: ListGatewaysResponse -> TestTree
 testListGatewaysResponse = res
@@ -868,6 +868,20 @@
     storageGateway
     (Proxy :: Proxy ListGateways)
 
+testDeleteTapeResponse :: DeleteTapeResponse -> TestTree
+testDeleteTapeResponse = res
+    "DeleteTapeResponse"
+    "fixture/DeleteTapeResponse.proto"
+    storageGateway
+    (Proxy :: Proxy DeleteTape)
+
+testListLocalDisksResponse :: ListLocalDisksResponse -> TestTree
+testListLocalDisksResponse = res
+    "ListLocalDisksResponse"
+    "fixture/ListLocalDisksResponse.proto"
+    storageGateway
+    (Proxy :: Proxy ListLocalDisks)
+
 testListVolumesResponse :: ListVolumesResponse -> TestTree
 testListVolumesResponse = res
     "ListVolumesResponse"
@@ -875,6 +889,20 @@
     storageGateway
     (Proxy :: Proxy ListVolumes)
 
+testUpdateBandwidthRateLimitResponse :: UpdateBandwidthRateLimitResponse -> TestTree
+testUpdateBandwidthRateLimitResponse = res
+    "UpdateBandwidthRateLimitResponse"
+    "fixture/UpdateBandwidthRateLimitResponse.proto"
+    storageGateway
+    (Proxy :: Proxy UpdateBandwidthRateLimit)
+
+testAddWorkingStorageResponse :: AddWorkingStorageResponse -> TestTree
+testAddWorkingStorageResponse = res
+    "AddWorkingStorageResponse"
+    "fixture/AddWorkingStorageResponse.proto"
+    storageGateway
+    (Proxy :: Proxy AddWorkingStorage)
+
 testDescribeTapeRecoveryPointsResponse :: DescribeTapeRecoveryPointsResponse -> TestTree
 testDescribeTapeRecoveryPointsResponse = res
     "DescribeTapeRecoveryPointsResponse"
@@ -882,19 +910,12 @@
     storageGateway
     (Proxy :: Proxy DescribeTapeRecoveryPoints)
 
-testDeleteVolumeResponse :: DeleteVolumeResponse -> TestTree
-testDeleteVolumeResponse = res
-    "DeleteVolumeResponse"
-    "fixture/DeleteVolumeResponse.proto"
-    storageGateway
-    (Proxy :: Proxy DeleteVolume)
-
-testResetCacheResponse :: ResetCacheResponse -> TestTree
-testResetCacheResponse = res
-    "ResetCacheResponse"
-    "fixture/ResetCacheResponse.proto"
+testDeleteBandwidthRateLimitResponse :: DeleteBandwidthRateLimitResponse -> TestTree
+testDeleteBandwidthRateLimitResponse = res
+    "DeleteBandwidthRateLimitResponse"
+    "fixture/DeleteBandwidthRateLimitResponse.proto"
     storageGateway
-    (Proxy :: Proxy ResetCache)
+    (Proxy :: Proxy DeleteBandwidthRateLimit)
 
 testActivateGatewayResponse :: ActivateGatewayResponse -> TestTree
 testActivateGatewayResponse = res
@@ -910,30 +931,9 @@
     storageGateway
     (Proxy :: Proxy DescribeCache)
 
-testUpdateBandwidthRateLimitResponse :: UpdateBandwidthRateLimitResponse -> TestTree
-testUpdateBandwidthRateLimitResponse = res
-    "UpdateBandwidthRateLimitResponse"
-    "fixture/UpdateBandwidthRateLimitResponse.proto"
-    storageGateway
-    (Proxy :: Proxy UpdateBandwidthRateLimit)
-
-testDeleteBandwidthRateLimitResponse :: DeleteBandwidthRateLimitResponse -> TestTree
-testDeleteBandwidthRateLimitResponse = res
-    "DeleteBandwidthRateLimitResponse"
-    "fixture/DeleteBandwidthRateLimitResponse.proto"
-    storageGateway
-    (Proxy :: Proxy DeleteBandwidthRateLimit)
-
-testListLocalDisksResponse :: ListLocalDisksResponse -> TestTree
-testListLocalDisksResponse = res
-    "ListLocalDisksResponse"
-    "fixture/ListLocalDisksResponse.proto"
-    storageGateway
-    (Proxy :: Proxy ListLocalDisks)
-
-testDeleteTapeResponse :: DeleteTapeResponse -> TestTree
-testDeleteTapeResponse = res
-    "DeleteTapeResponse"
-    "fixture/DeleteTapeResponse.proto"
+testDeleteVolumeResponse :: DeleteVolumeResponse -> TestTree
+testDeleteVolumeResponse = res
+    "DeleteVolumeResponse"
+    "fixture/DeleteVolumeResponse.proto"
     storageGateway
-    (Proxy :: Proxy DeleteTape)
+    (Proxy :: Proxy DeleteVolume)
