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-cloudhsm.cabal b/amazonka-cloudhsm.cabal
--- a/amazonka-cloudhsm.cabal
+++ b/amazonka-cloudhsm.cabal
@@ -1,5 +1,5 @@
 name:                  amazonka-cloudhsm
-version:               1.2.0.2
+version:               1.3.0
 synopsis:              Amazon CloudHSM SDK.
 homepage:              https://github.com/brendanhay/amazonka
 bug-reports:           https://github.com/brendanhay/amazonka/issues
@@ -66,7 +66,7 @@
         , Network.AWS.CloudHSM.Types.Sum
 
     build-depends:
-          amazonka-core == 1.2.0.*
+          amazonka-core == 1.3.0.*
         , base          >= 4.7     && < 5
 
 test-suite amazonka-cloudhsm-test
@@ -86,9 +86,9 @@
         , Test.AWS.CloudHSM.Internal
 
     build-depends:
-          amazonka-core == 1.2.0.*
-        , amazonka-test == 1.2.0.*
-        , amazonka-cloudhsm == 1.2.0.*
+          amazonka-core == 1.3.0.*
+        , amazonka-test == 1.3.0.*
+        , amazonka-cloudhsm == 1.3.0.*
         , base
         , bytestring
         , lens
diff --git a/gen/Network/AWS/CloudHSM.hs b/gen/Network/AWS/CloudHSM.hs
--- a/gen/Network/AWS/CloudHSM.hs
+++ b/gen/Network/AWS/CloudHSM.hs
@@ -37,33 +37,33 @@
     -- * Operations
     -- $operations
 
-    -- ** ListHAPGs
-    , module Network.AWS.CloudHSM.ListHAPGs
-
-    -- ** ListHSMs
-    , module Network.AWS.CloudHSM.ListHSMs
-
     -- ** DeleteHAPG
     , module Network.AWS.CloudHSM.DeleteHAPG
 
+    -- ** ListHAPGs
+    , module Network.AWS.CloudHSM.ListHAPGs
+
     -- ** ModifyLunaClient
     , module Network.AWS.CloudHSM.ModifyLunaClient
 
+    -- ** ListHSMs
+    , module Network.AWS.CloudHSM.ListHSMs
+
     -- ** DescribeLunaClient
     , module Network.AWS.CloudHSM.DescribeLunaClient
 
-    -- ** CreateHSM
-    , module Network.AWS.CloudHSM.CreateHSM
-
     -- ** CreateHAPG
     , module Network.AWS.CloudHSM.CreateHAPG
 
-    -- ** CreateLunaClient
-    , module Network.AWS.CloudHSM.CreateLunaClient
+    -- ** CreateHSM
+    , module Network.AWS.CloudHSM.CreateHSM
 
     -- ** DescribeHAPG
     , module Network.AWS.CloudHSM.DescribeHAPG
 
+    -- ** CreateLunaClient
+    , module Network.AWS.CloudHSM.CreateLunaClient
+
     -- ** ListLunaClients
     , module Network.AWS.CloudHSM.ListLunaClients
 
@@ -79,14 +79,14 @@
     -- ** ModifyHAPG
     , module Network.AWS.CloudHSM.ModifyHAPG
 
-    -- ** ListAvailableZones
-    , module Network.AWS.CloudHSM.ListAvailableZones
+    -- ** DeleteLunaClient
+    , module Network.AWS.CloudHSM.DeleteLunaClient
 
     -- ** ModifyHSM
     , module Network.AWS.CloudHSM.ModifyHSM
 
-    -- ** DeleteLunaClient
-    , module Network.AWS.CloudHSM.DeleteLunaClient
+    -- ** ListAvailableZones
+    , module Network.AWS.CloudHSM.ListAvailableZones
 
     -- * Types
 
diff --git a/gen/Network/AWS/CloudHSM/CreateHAPG.hs b/gen/Network/AWS/CloudHSM/CreateHAPG.hs
--- a/gen/Network/AWS/CloudHSM/CreateHAPG.hs
+++ b/gen/Network/AWS/CloudHSM/CreateHAPG.hs
@@ -35,8 +35,8 @@
     , createHAPGResponse
     , CreateHAPGResponse
     -- * Response Lenses
-    , chrsHAPGARN
-    , chrsStatus
+    , chapgrsHAPGARN
+    , chapgrsResponseStatus
     ) where
 
 import           Network.AWS.CloudHSM.Types
@@ -101,30 +101,30 @@
 --
 -- /See:/ 'createHAPGResponse' smart constructor.
 data CreateHAPGResponse = CreateHAPGResponse'
-    { _chrsHAPGARN :: !(Maybe Text)
-    , _chrsStatus  :: !Int
+    { _chapgrsHAPGARN        :: !(Maybe Text)
+    , _chapgrsResponseStatus :: !Int
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'CreateHAPGResponse' with the minimum fields required to make a request.
 --
 -- Use one of the following lenses to modify other fields as desired:
 --
--- * 'chrsHAPGARN'
+-- * 'chapgrsHAPGARN'
 --
--- * 'chrsStatus'
+-- * 'chapgrsResponseStatus'
 createHAPGResponse
-    :: Int -- ^ 'chrsStatus'
+    :: Int -- ^ 'chapgrsResponseStatus'
     -> CreateHAPGResponse
-createHAPGResponse pStatus_ =
+createHAPGResponse pResponseStatus_ =
     CreateHAPGResponse'
-    { _chrsHAPGARN = Nothing
-    , _chrsStatus = pStatus_
+    { _chapgrsHAPGARN = Nothing
+    , _chapgrsResponseStatus = pResponseStatus_
     }
 
 -- | The ARN of the high-availability partition group.
-chrsHAPGARN :: Lens' CreateHAPGResponse (Maybe Text)
-chrsHAPGARN = lens _chrsHAPGARN (\ s a -> s{_chrsHAPGARN = a});
+chapgrsHAPGARN :: Lens' CreateHAPGResponse (Maybe Text)
+chapgrsHAPGARN = lens _chapgrsHAPGARN (\ s a -> s{_chapgrsHAPGARN = a});
 
 -- | The response status code.
-chrsStatus :: Lens' CreateHAPGResponse Int
-chrsStatus = lens _chrsStatus (\ s a -> s{_chrsStatus = a});
+chapgrsResponseStatus :: Lens' CreateHAPGResponse Int
+chapgrsResponseStatus = lens _chapgrsResponseStatus (\ s a -> s{_chapgrsResponseStatus = a});
diff --git a/gen/Network/AWS/CloudHSM/CreateHSM.hs b/gen/Network/AWS/CloudHSM/CreateHSM.hs
--- a/gen/Network/AWS/CloudHSM/CreateHSM.hs
+++ b/gen/Network/AWS/CloudHSM/CreateHSM.hs
@@ -42,8 +42,8 @@
     , createHSMResponse
     , CreateHSMResponse
     -- * Response Lenses
-    , chsmrsHSMARN
-    , chsmrsStatus
+    , chrsHSMARN
+    , chrsResponseStatus
     ) where
 
 import           Network.AWS.CloudHSM.Types
@@ -178,30 +178,30 @@
 --
 -- /See:/ 'createHSMResponse' smart constructor.
 data CreateHSMResponse = CreateHSMResponse'
-    { _chsmrsHSMARN :: !(Maybe Text)
-    , _chsmrsStatus :: !Int
+    { _chrsHSMARN         :: !(Maybe Text)
+    , _chrsResponseStatus :: !Int
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'CreateHSMResponse' with the minimum fields required to make a request.
 --
 -- Use one of the following lenses to modify other fields as desired:
 --
--- * 'chsmrsHSMARN'
+-- * 'chrsHSMARN'
 --
--- * 'chsmrsStatus'
+-- * 'chrsResponseStatus'
 createHSMResponse
-    :: Int -- ^ 'chsmrsStatus'
+    :: Int -- ^ 'chrsResponseStatus'
     -> CreateHSMResponse
-createHSMResponse pStatus_ =
+createHSMResponse pResponseStatus_ =
     CreateHSMResponse'
-    { _chsmrsHSMARN = Nothing
-    , _chsmrsStatus = pStatus_
+    { _chrsHSMARN = Nothing
+    , _chrsResponseStatus = pResponseStatus_
     }
 
 -- | The ARN of the HSM.
-chsmrsHSMARN :: Lens' CreateHSMResponse (Maybe Text)
-chsmrsHSMARN = lens _chsmrsHSMARN (\ s a -> s{_chsmrsHSMARN = a});
+chrsHSMARN :: Lens' CreateHSMResponse (Maybe Text)
+chrsHSMARN = lens _chrsHSMARN (\ s a -> s{_chrsHSMARN = a});
 
 -- | The response status code.
-chsmrsStatus :: Lens' CreateHSMResponse Int
-chsmrsStatus = lens _chsmrsStatus (\ s a -> s{_chsmrsStatus = a});
+chrsResponseStatus :: Lens' CreateHSMResponse Int
+chrsResponseStatus = lens _chrsResponseStatus (\ s a -> s{_chrsResponseStatus = a});
diff --git a/gen/Network/AWS/CloudHSM/CreateLunaClient.hs b/gen/Network/AWS/CloudHSM/CreateLunaClient.hs
--- a/gen/Network/AWS/CloudHSM/CreateLunaClient.hs
+++ b/gen/Network/AWS/CloudHSM/CreateLunaClient.hs
@@ -35,7 +35,7 @@
     , CreateLunaClientResponse
     -- * Response Lenses
     , clcrsClientARN
-    , clcrsStatus
+    , clcrsResponseStatus
     ) where
 
 import           Network.AWS.CloudHSM.Types
@@ -113,8 +113,8 @@
 --
 -- /See:/ 'createLunaClientResponse' smart constructor.
 data CreateLunaClientResponse = CreateLunaClientResponse'
-    { _clcrsClientARN :: !(Maybe Text)
-    , _clcrsStatus    :: !Int
+    { _clcrsClientARN      :: !(Maybe Text)
+    , _clcrsResponseStatus :: !Int
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'CreateLunaClientResponse' with the minimum fields required to make a request.
@@ -123,14 +123,14 @@
 --
 -- * 'clcrsClientARN'
 --
--- * 'clcrsStatus'
+-- * 'clcrsResponseStatus'
 createLunaClientResponse
-    :: Int -- ^ 'clcrsStatus'
+    :: Int -- ^ 'clcrsResponseStatus'
     -> CreateLunaClientResponse
-createLunaClientResponse pStatus_ =
+createLunaClientResponse pResponseStatus_ =
     CreateLunaClientResponse'
     { _clcrsClientARN = Nothing
-    , _clcrsStatus = pStatus_
+    , _clcrsResponseStatus = pResponseStatus_
     }
 
 -- | The ARN of the client.
@@ -138,5 +138,5 @@
 clcrsClientARN = lens _clcrsClientARN (\ s a -> s{_clcrsClientARN = a});
 
 -- | The response status code.
-clcrsStatus :: Lens' CreateLunaClientResponse Int
-clcrsStatus = lens _clcrsStatus (\ s a -> s{_clcrsStatus = a});
+clcrsResponseStatus :: Lens' CreateLunaClientResponse Int
+clcrsResponseStatus = lens _clcrsResponseStatus (\ s a -> s{_clcrsResponseStatus = a});
diff --git a/gen/Network/AWS/CloudHSM/DeleteHAPG.hs b/gen/Network/AWS/CloudHSM/DeleteHAPG.hs
--- a/gen/Network/AWS/CloudHSM/DeleteHAPG.hs
+++ b/gen/Network/AWS/CloudHSM/DeleteHAPG.hs
@@ -33,6 +33,7 @@
     , deleteHAPGResponse
     , DeleteHAPGResponse
     -- * Response Lenses
+    , dhrsResponseStatus
     , dhrsStatus
     ) where
 
@@ -70,9 +71,10 @@
         type Rs DeleteHAPG = DeleteHAPGResponse
         request = postJSON cloudHSM
         response
-          = receiveEmpty
+          = receiveJSON
               (\ s h x ->
-                 DeleteHAPGResponse' <$> (pure (fromEnum s)))
+                 DeleteHAPGResponse' <$>
+                   (pure (fromEnum s)) <*> (x .:> "Status"))
 
 instance ToHeaders DeleteHAPG where
         toHeaders
@@ -96,23 +98,32 @@
 -- | Contains the output of the DeleteHapg action.
 --
 -- /See:/ 'deleteHAPGResponse' smart constructor.
-newtype DeleteHAPGResponse = DeleteHAPGResponse'
-    { _dhrsStatus :: Int
+data DeleteHAPGResponse = DeleteHAPGResponse'
+    { _dhrsResponseStatus :: !Int
+    , _dhrsStatus         :: !Text
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'DeleteHAPGResponse' with the minimum fields required to make a request.
 --
 -- Use one of the following lenses to modify other fields as desired:
 --
+-- * 'dhrsResponseStatus'
+--
 -- * 'dhrsStatus'
 deleteHAPGResponse
-    :: Int -- ^ 'dhrsStatus'
+    :: Int -- ^ 'dhrsResponseStatus'
+    -> Text -- ^ 'dhrsStatus'
     -> DeleteHAPGResponse
-deleteHAPGResponse pStatus_ =
+deleteHAPGResponse pResponseStatus_ pStatus_ =
     DeleteHAPGResponse'
-    { _dhrsStatus = pStatus_
+    { _dhrsResponseStatus = pResponseStatus_
+    , _dhrsStatus = pStatus_
     }
 
 -- | The response status code.
-dhrsStatus :: Lens' DeleteHAPGResponse Int
+dhrsResponseStatus :: Lens' DeleteHAPGResponse Int
+dhrsResponseStatus = lens _dhrsResponseStatus (\ s a -> s{_dhrsResponseStatus = a});
+
+-- | The status of the action.
+dhrsStatus :: Lens' DeleteHAPGResponse Text
 dhrsStatus = lens _dhrsStatus (\ s a -> s{_dhrsStatus = a});
diff --git a/gen/Network/AWS/CloudHSM/DeleteHSM.hs b/gen/Network/AWS/CloudHSM/DeleteHSM.hs
--- a/gen/Network/AWS/CloudHSM/DeleteHSM.hs
+++ b/gen/Network/AWS/CloudHSM/DeleteHSM.hs
@@ -34,6 +34,7 @@
     , deleteHSMResponse
     , DeleteHSMResponse
     -- * Response Lenses
+    , dhsmrsResponseStatus
     , dhsmrsStatus
     ) where
 
@@ -71,9 +72,10 @@
         type Rs DeleteHSM = DeleteHSMResponse
         request = postJSON cloudHSM
         response
-          = receiveEmpty
+          = receiveJSON
               (\ s h x ->
-                 DeleteHSMResponse' <$> (pure (fromEnum s)))
+                 DeleteHSMResponse' <$>
+                   (pure (fromEnum s)) <*> (x .:> "Status"))
 
 instance ToHeaders DeleteHSM where
         toHeaders
@@ -97,23 +99,32 @@
 -- | Contains the output of the DeleteHsm action.
 --
 -- /See:/ 'deleteHSMResponse' smart constructor.
-newtype DeleteHSMResponse = DeleteHSMResponse'
-    { _dhsmrsStatus :: Int
+data DeleteHSMResponse = DeleteHSMResponse'
+    { _dhsmrsResponseStatus :: !Int
+    , _dhsmrsStatus         :: !Text
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'DeleteHSMResponse' with the minimum fields required to make a request.
 --
 -- Use one of the following lenses to modify other fields as desired:
 --
+-- * 'dhsmrsResponseStatus'
+--
 -- * 'dhsmrsStatus'
 deleteHSMResponse
-    :: Int -- ^ 'dhsmrsStatus'
+    :: Int -- ^ 'dhsmrsResponseStatus'
+    -> Text -- ^ 'dhsmrsStatus'
     -> DeleteHSMResponse
-deleteHSMResponse pStatus_ =
+deleteHSMResponse pResponseStatus_ pStatus_ =
     DeleteHSMResponse'
-    { _dhsmrsStatus = pStatus_
+    { _dhsmrsResponseStatus = pResponseStatus_
+    , _dhsmrsStatus = pStatus_
     }
 
 -- | The response status code.
-dhsmrsStatus :: Lens' DeleteHSMResponse Int
+dhsmrsResponseStatus :: Lens' DeleteHSMResponse Int
+dhsmrsResponseStatus = lens _dhsmrsResponseStatus (\ s a -> s{_dhsmrsResponseStatus = a});
+
+-- | The status of the action.
+dhsmrsStatus :: Lens' DeleteHSMResponse Text
 dhsmrsStatus = lens _dhsmrsStatus (\ s a -> s{_dhsmrsStatus = a});
diff --git a/gen/Network/AWS/CloudHSM/DeleteLunaClient.hs b/gen/Network/AWS/CloudHSM/DeleteLunaClient.hs
--- a/gen/Network/AWS/CloudHSM/DeleteLunaClient.hs
+++ b/gen/Network/AWS/CloudHSM/DeleteLunaClient.hs
@@ -33,6 +33,7 @@
     , deleteLunaClientResponse
     , DeleteLunaClientResponse
     -- * Response Lenses
+    , dlcrsResponseStatus
     , dlcrsStatus
     ) where
 
@@ -68,9 +69,10 @@
         type Rs DeleteLunaClient = DeleteLunaClientResponse
         request = postJSON cloudHSM
         response
-          = receiveEmpty
+          = receiveJSON
               (\ s h x ->
-                 DeleteLunaClientResponse' <$> (pure (fromEnum s)))
+                 DeleteLunaClientResponse' <$>
+                   (pure (fromEnum s)) <*> (x .:> "Status"))
 
 instance ToHeaders DeleteLunaClient where
         toHeaders
@@ -94,23 +96,32 @@
         toQuery = const mempty
 
 -- | /See:/ 'deleteLunaClientResponse' smart constructor.
-newtype DeleteLunaClientResponse = DeleteLunaClientResponse'
-    { _dlcrsStatus :: Int
+data DeleteLunaClientResponse = DeleteLunaClientResponse'
+    { _dlcrsResponseStatus :: !Int
+    , _dlcrsStatus         :: !Text
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'DeleteLunaClientResponse' with the minimum fields required to make a request.
 --
 -- Use one of the following lenses to modify other fields as desired:
 --
+-- * 'dlcrsResponseStatus'
+--
 -- * 'dlcrsStatus'
 deleteLunaClientResponse
-    :: Int -- ^ 'dlcrsStatus'
+    :: Int -- ^ 'dlcrsResponseStatus'
+    -> Text -- ^ 'dlcrsStatus'
     -> DeleteLunaClientResponse
-deleteLunaClientResponse pStatus_ =
+deleteLunaClientResponse pResponseStatus_ pStatus_ =
     DeleteLunaClientResponse'
-    { _dlcrsStatus = pStatus_
+    { _dlcrsResponseStatus = pResponseStatus_
+    , _dlcrsStatus = pStatus_
     }
 
 -- | The response status code.
-dlcrsStatus :: Lens' DeleteLunaClientResponse Int
+dlcrsResponseStatus :: Lens' DeleteLunaClientResponse Int
+dlcrsResponseStatus = lens _dlcrsResponseStatus (\ s a -> s{_dlcrsResponseStatus = a});
+
+-- | The status of the action.
+dlcrsStatus :: Lens' DeleteLunaClientResponse Text
 dlcrsStatus = lens _dlcrsStatus (\ s a -> s{_dlcrsStatus = a});
diff --git a/gen/Network/AWS/CloudHSM/DescribeHAPG.hs b/gen/Network/AWS/CloudHSM/DescribeHAPG.hs
--- a/gen/Network/AWS/CloudHSM/DescribeHAPG.hs
+++ b/gen/Network/AWS/CloudHSM/DescribeHAPG.hs
@@ -36,13 +36,13 @@
     , dhapgrsState
     , dhapgrsLastModifiedTimestamp
     , dhapgrsHSMsPendingRegistration
-    , dhapgrsHAPGSerial
     , dhapgrsHSMsPendingDeletion
+    , dhapgrsHAPGSerial
     , dhapgrsHSMsLastActionFailed
     , dhapgrsPartitionSerialList
     , dhapgrsHAPGARN
     , dhapgrsLabel
-    , dhapgrsStatus
+    , dhapgrsResponseStatus
     ) where
 
 import           Network.AWS.CloudHSM.Types
@@ -84,8 +84,8 @@
                  DescribeHAPGResponse' <$>
                    (x .?> "State") <*> (x .?> "LastModifiedTimestamp")
                      <*> (x .?> "HsmsPendingRegistration" .!@ mempty)
-                     <*> (x .?> "HapgSerial")
                      <*> (x .?> "HsmsPendingDeletion" .!@ mempty)
+                     <*> (x .?> "HapgSerial")
                      <*> (x .?> "HsmsLastActionFailed" .!@ mempty)
                      <*> (x .?> "PartitionSerialList" .!@ mempty)
                      <*> (x .?> "HapgArn")
@@ -120,13 +120,13 @@
     { _dhapgrsState                   :: !(Maybe CloudHSMObjectState)
     , _dhapgrsLastModifiedTimestamp   :: !(Maybe Text)
     , _dhapgrsHSMsPendingRegistration :: !(Maybe [Text])
-    , _dhapgrsHAPGSerial              :: !(Maybe Text)
     , _dhapgrsHSMsPendingDeletion     :: !(Maybe [Text])
+    , _dhapgrsHAPGSerial              :: !(Maybe Text)
     , _dhapgrsHSMsLastActionFailed    :: !(Maybe [Text])
     , _dhapgrsPartitionSerialList     :: !(Maybe [Text])
     , _dhapgrsHAPGARN                 :: !(Maybe Text)
     , _dhapgrsLabel                   :: !(Maybe Text)
-    , _dhapgrsStatus                  :: !Int
+    , _dhapgrsResponseStatus          :: !Int
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'DescribeHAPGResponse' with the minimum fields required to make a request.
@@ -139,10 +139,10 @@
 --
 -- * 'dhapgrsHSMsPendingRegistration'
 --
--- * 'dhapgrsHAPGSerial'
---
 -- * 'dhapgrsHSMsPendingDeletion'
 --
+-- * 'dhapgrsHAPGSerial'
+--
 -- * 'dhapgrsHSMsLastActionFailed'
 --
 -- * 'dhapgrsPartitionSerialList'
@@ -151,22 +151,22 @@
 --
 -- * 'dhapgrsLabel'
 --
--- * 'dhapgrsStatus'
+-- * 'dhapgrsResponseStatus'
 describeHAPGResponse
-    :: Int -- ^ 'dhapgrsStatus'
+    :: Int -- ^ 'dhapgrsResponseStatus'
     -> DescribeHAPGResponse
-describeHAPGResponse pStatus_ =
+describeHAPGResponse pResponseStatus_ =
     DescribeHAPGResponse'
     { _dhapgrsState = Nothing
     , _dhapgrsLastModifiedTimestamp = Nothing
     , _dhapgrsHSMsPendingRegistration = Nothing
-    , _dhapgrsHAPGSerial = Nothing
     , _dhapgrsHSMsPendingDeletion = Nothing
+    , _dhapgrsHAPGSerial = Nothing
     , _dhapgrsHSMsLastActionFailed = Nothing
     , _dhapgrsPartitionSerialList = Nothing
     , _dhapgrsHAPGARN = Nothing
     , _dhapgrsLabel = Nothing
-    , _dhapgrsStatus = pStatus_
+    , _dhapgrsResponseStatus = pResponseStatus_
     }
 
 -- | The state of the high-availability partition group.
@@ -182,14 +182,14 @@
 dhapgrsHSMsPendingRegistration :: Lens' DescribeHAPGResponse [Text]
 dhapgrsHSMsPendingRegistration = lens _dhapgrsHSMsPendingRegistration (\ s a -> s{_dhapgrsHSMsPendingRegistration = a}) . _Default . _Coerce;
 
--- | The serial number of the high-availability partition group.
-dhapgrsHAPGSerial :: Lens' DescribeHAPGResponse (Maybe Text)
-dhapgrsHAPGSerial = lens _dhapgrsHAPGSerial (\ s a -> s{_dhapgrsHAPGSerial = a});
-
 -- | Undocumented member.
 dhapgrsHSMsPendingDeletion :: Lens' DescribeHAPGResponse [Text]
 dhapgrsHSMsPendingDeletion = lens _dhapgrsHSMsPendingDeletion (\ s a -> s{_dhapgrsHSMsPendingDeletion = a}) . _Default . _Coerce;
 
+-- | The serial number of the high-availability partition group.
+dhapgrsHAPGSerial :: Lens' DescribeHAPGResponse (Maybe Text)
+dhapgrsHAPGSerial = lens _dhapgrsHAPGSerial (\ s a -> s{_dhapgrsHAPGSerial = a});
+
 -- | Undocumented member.
 dhapgrsHSMsLastActionFailed :: Lens' DescribeHAPGResponse [Text]
 dhapgrsHSMsLastActionFailed = lens _dhapgrsHSMsLastActionFailed (\ s a -> s{_dhapgrsHSMsLastActionFailed = a}) . _Default . _Coerce;
@@ -208,5 +208,5 @@
 dhapgrsLabel = lens _dhapgrsLabel (\ s a -> s{_dhapgrsLabel = a});
 
 -- | The response status code.
-dhapgrsStatus :: Lens' DescribeHAPGResponse Int
-dhapgrsStatus = lens _dhapgrsStatus (\ s a -> s{_dhapgrsStatus = a});
+dhapgrsResponseStatus :: Lens' DescribeHAPGResponse Int
+dhapgrsResponseStatus = lens _dhapgrsResponseStatus (\ s a -> s{_dhapgrsResponseStatus = a});
diff --git a/gen/Network/AWS/CloudHSM/DescribeHSM.hs b/gen/Network/AWS/CloudHSM/DescribeHSM.hs
--- a/gen/Network/AWS/CloudHSM/DescribeHSM.hs
+++ b/gen/Network/AWS/CloudHSM/DescribeHSM.hs
@@ -35,27 +35,28 @@
     , describeHSMResponse
     , DescribeHSMResponse
     -- * Response Lenses
+    , desrsStatus
     , desrsIAMRoleARN
     , desrsEniId
-    , desrsSubscriptionEndDate
     , desrsVPCId
     , desrsSSHKeyLastUpdated
+    , desrsSubscriptionEndDate
     , desrsServerCertURI
     , desrsSubscriptionType
-    , desrsStatusDetails
     , desrsSSHPublicKey
     , desrsSubnetId
+    , desrsStatusDetails
     , desrsPartitions
-    , desrsAvailabilityZone
     , desrsSubscriptionStartDate
+    , desrsAvailabilityZone
     , desrsServerCertLastUpdated
     , desrsSoftwareVersion
-    , desrsSerialNumber
     , desrsVendorName
+    , desrsSerialNumber
     , desrsHSMARN
     , desrsEniIP
     , desrsHSMType
-    , desrsStatus
+    , desrsResponseStatus
     ) where
 
 import           Network.AWS.CloudHSM.Types
@@ -104,22 +105,23 @@
           = receiveJSON
               (\ s h x ->
                  DescribeHSMResponse' <$>
-                   (x .?> "IamRoleArn") <*> (x .?> "EniId") <*>
-                     (x .?> "SubscriptionEndDate")
+                   (x .?> "Status") <*> (x .?> "IamRoleArn") <*>
+                     (x .?> "EniId")
                      <*> (x .?> "VpcId")
                      <*> (x .?> "SshKeyLastUpdated")
+                     <*> (x .?> "SubscriptionEndDate")
                      <*> (x .?> "ServerCertUri")
                      <*> (x .?> "SubscriptionType")
-                     <*> (x .?> "StatusDetails")
                      <*> (x .?> "SshPublicKey")
                      <*> (x .?> "SubnetId")
+                     <*> (x .?> "StatusDetails")
                      <*> (x .?> "Partitions" .!@ mempty)
-                     <*> (x .?> "AvailabilityZone")
                      <*> (x .?> "SubscriptionStartDate")
+                     <*> (x .?> "AvailabilityZone")
                      <*> (x .?> "ServerCertLastUpdated")
                      <*> (x .?> "SoftwareVersion")
-                     <*> (x .?> "SerialNumber")
                      <*> (x .?> "VendorName")
+                     <*> (x .?> "SerialNumber")
                      <*> (x .?> "HsmArn")
                      <*> (x .?> "EniIp")
                      <*> (x .?> "HsmType")
@@ -152,102 +154,110 @@
 --
 -- /See:/ 'describeHSMResponse' smart constructor.
 data DescribeHSMResponse = DescribeHSMResponse'
-    { _desrsIAMRoleARN            :: !(Maybe Text)
+    { _desrsStatus                :: !(Maybe HSMStatus)
+    , _desrsIAMRoleARN            :: !(Maybe Text)
     , _desrsEniId                 :: !(Maybe Text)
-    , _desrsSubscriptionEndDate   :: !(Maybe Text)
     , _desrsVPCId                 :: !(Maybe Text)
     , _desrsSSHKeyLastUpdated     :: !(Maybe Text)
+    , _desrsSubscriptionEndDate   :: !(Maybe Text)
     , _desrsServerCertURI         :: !(Maybe Text)
     , _desrsSubscriptionType      :: !(Maybe SubscriptionType)
-    , _desrsStatusDetails         :: !(Maybe Text)
     , _desrsSSHPublicKey          :: !(Maybe Text)
     , _desrsSubnetId              :: !(Maybe Text)
+    , _desrsStatusDetails         :: !(Maybe Text)
     , _desrsPartitions            :: !(Maybe [Text])
-    , _desrsAvailabilityZone      :: !(Maybe Text)
     , _desrsSubscriptionStartDate :: !(Maybe Text)
+    , _desrsAvailabilityZone      :: !(Maybe Text)
     , _desrsServerCertLastUpdated :: !(Maybe Text)
     , _desrsSoftwareVersion       :: !(Maybe Text)
-    , _desrsSerialNumber          :: !(Maybe Text)
     , _desrsVendorName            :: !(Maybe Text)
+    , _desrsSerialNumber          :: !(Maybe Text)
     , _desrsHSMARN                :: !(Maybe Text)
     , _desrsEniIP                 :: !(Maybe Text)
     , _desrsHSMType               :: !(Maybe Text)
-    , _desrsStatus                :: !Int
+    , _desrsResponseStatus        :: !Int
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'DescribeHSMResponse' with the minimum fields required to make a request.
 --
 -- Use one of the following lenses to modify other fields as desired:
 --
+-- * 'desrsStatus'
+--
 -- * 'desrsIAMRoleARN'
 --
 -- * 'desrsEniId'
 --
--- * 'desrsSubscriptionEndDate'
---
 -- * 'desrsVPCId'
 --
 -- * 'desrsSSHKeyLastUpdated'
 --
+-- * 'desrsSubscriptionEndDate'
+--
 -- * 'desrsServerCertURI'
 --
 -- * 'desrsSubscriptionType'
 --
--- * 'desrsStatusDetails'
---
 -- * 'desrsSSHPublicKey'
 --
 -- * 'desrsSubnetId'
 --
--- * 'desrsPartitions'
+-- * 'desrsStatusDetails'
 --
--- * 'desrsAvailabilityZone'
+-- * 'desrsPartitions'
 --
 -- * 'desrsSubscriptionStartDate'
 --
+-- * 'desrsAvailabilityZone'
+--
 -- * 'desrsServerCertLastUpdated'
 --
 -- * 'desrsSoftwareVersion'
 --
--- * 'desrsSerialNumber'
---
 -- * 'desrsVendorName'
 --
+-- * 'desrsSerialNumber'
+--
 -- * 'desrsHSMARN'
 --
 -- * 'desrsEniIP'
 --
 -- * 'desrsHSMType'
 --
--- * 'desrsStatus'
+-- * 'desrsResponseStatus'
 describeHSMResponse
-    :: Int -- ^ 'desrsStatus'
+    :: Int -- ^ 'desrsResponseStatus'
     -> DescribeHSMResponse
-describeHSMResponse pStatus_ =
+describeHSMResponse pResponseStatus_ =
     DescribeHSMResponse'
-    { _desrsIAMRoleARN = Nothing
+    { _desrsStatus = Nothing
+    , _desrsIAMRoleARN = Nothing
     , _desrsEniId = Nothing
-    , _desrsSubscriptionEndDate = Nothing
     , _desrsVPCId = Nothing
     , _desrsSSHKeyLastUpdated = Nothing
+    , _desrsSubscriptionEndDate = Nothing
     , _desrsServerCertURI = Nothing
     , _desrsSubscriptionType = Nothing
-    , _desrsStatusDetails = Nothing
     , _desrsSSHPublicKey = Nothing
     , _desrsSubnetId = Nothing
+    , _desrsStatusDetails = Nothing
     , _desrsPartitions = Nothing
-    , _desrsAvailabilityZone = Nothing
     , _desrsSubscriptionStartDate = Nothing
+    , _desrsAvailabilityZone = Nothing
     , _desrsServerCertLastUpdated = Nothing
     , _desrsSoftwareVersion = Nothing
-    , _desrsSerialNumber = Nothing
     , _desrsVendorName = Nothing
+    , _desrsSerialNumber = Nothing
     , _desrsHSMARN = Nothing
     , _desrsEniIP = Nothing
     , _desrsHSMType = Nothing
-    , _desrsStatus = pStatus_
+    , _desrsResponseStatus = pResponseStatus_
     }
 
+-- | The status of the HSM.
+desrsStatus :: Lens' DescribeHSMResponse (Maybe HSMStatus)
+desrsStatus = lens _desrsStatus (\ s a -> s{_desrsStatus = a});
+
 -- | The ARN of the IAM role assigned to the HSM.
 desrsIAMRoleARN :: Lens' DescribeHSMResponse (Maybe Text)
 desrsIAMRoleARN = lens _desrsIAMRoleARN (\ s a -> s{_desrsIAMRoleARN = a});
@@ -257,10 +267,6 @@
 desrsEniId :: Lens' DescribeHSMResponse (Maybe Text)
 desrsEniId = lens _desrsEniId (\ s a -> s{_desrsEniId = a});
 
--- | The subscription end date.
-desrsSubscriptionEndDate :: Lens' DescribeHSMResponse (Maybe Text)
-desrsSubscriptionEndDate = lens _desrsSubscriptionEndDate (\ s a -> s{_desrsSubscriptionEndDate = a});
-
 -- | The identifier of the VPC that the HSM is in.
 desrsVPCId :: Lens' DescribeHSMResponse (Maybe Text)
 desrsVPCId = lens _desrsVPCId (\ s a -> s{_desrsVPCId = a});
@@ -269,6 +275,10 @@
 desrsSSHKeyLastUpdated :: Lens' DescribeHSMResponse (Maybe Text)
 desrsSSHKeyLastUpdated = lens _desrsSSHKeyLastUpdated (\ s a -> s{_desrsSSHKeyLastUpdated = a});
 
+-- | The subscription end date.
+desrsSubscriptionEndDate :: Lens' DescribeHSMResponse (Maybe Text)
+desrsSubscriptionEndDate = lens _desrsSubscriptionEndDate (\ s a -> s{_desrsSubscriptionEndDate = a});
+
 -- | The URI of the certificate server.
 desrsServerCertURI :: Lens' DescribeHSMResponse (Maybe Text)
 desrsServerCertURI = lens _desrsServerCertURI (\ s a -> s{_desrsServerCertURI = a});
@@ -277,10 +287,6 @@
 desrsSubscriptionType :: Lens' DescribeHSMResponse (Maybe SubscriptionType)
 desrsSubscriptionType = lens _desrsSubscriptionType (\ s a -> s{_desrsSubscriptionType = a});
 
--- | Contains additional information about the status of the HSM.
-desrsStatusDetails :: Lens' DescribeHSMResponse (Maybe Text)
-desrsStatusDetails = lens _desrsStatusDetails (\ s a -> s{_desrsStatusDetails = a});
-
 -- | The public SSH key.
 desrsSSHPublicKey :: Lens' DescribeHSMResponse (Maybe Text)
 desrsSSHPublicKey = lens _desrsSSHPublicKey (\ s a -> s{_desrsSSHPublicKey = a});
@@ -289,18 +295,22 @@
 desrsSubnetId :: Lens' DescribeHSMResponse (Maybe Text)
 desrsSubnetId = lens _desrsSubnetId (\ s a -> s{_desrsSubnetId = a});
 
+-- | Contains additional information about the status of the HSM.
+desrsStatusDetails :: Lens' DescribeHSMResponse (Maybe Text)
+desrsStatusDetails = lens _desrsStatusDetails (\ s a -> s{_desrsStatusDetails = a});
+
 -- | The list of partitions on the HSM.
 desrsPartitions :: Lens' DescribeHSMResponse [Text]
 desrsPartitions = lens _desrsPartitions (\ s a -> s{_desrsPartitions = a}) . _Default . _Coerce;
 
--- | The Availability Zone that the HSM is in.
-desrsAvailabilityZone :: Lens' DescribeHSMResponse (Maybe Text)
-desrsAvailabilityZone = lens _desrsAvailabilityZone (\ s a -> s{_desrsAvailabilityZone = a});
-
 -- | The subscription start date.
 desrsSubscriptionStartDate :: Lens' DescribeHSMResponse (Maybe Text)
 desrsSubscriptionStartDate = lens _desrsSubscriptionStartDate (\ s a -> s{_desrsSubscriptionStartDate = a});
 
+-- | The Availability Zone that the HSM is in.
+desrsAvailabilityZone :: Lens' DescribeHSMResponse (Maybe Text)
+desrsAvailabilityZone = lens _desrsAvailabilityZone (\ s a -> s{_desrsAvailabilityZone = a});
+
 -- | The date and time the server certificate was last updated.
 desrsServerCertLastUpdated :: Lens' DescribeHSMResponse (Maybe Text)
 desrsServerCertLastUpdated = lens _desrsServerCertLastUpdated (\ s a -> s{_desrsServerCertLastUpdated = a});
@@ -309,14 +319,14 @@
 desrsSoftwareVersion :: Lens' DescribeHSMResponse (Maybe Text)
 desrsSoftwareVersion = lens _desrsSoftwareVersion (\ s a -> s{_desrsSoftwareVersion = a});
 
--- | The serial number of the HSM.
-desrsSerialNumber :: Lens' DescribeHSMResponse (Maybe Text)
-desrsSerialNumber = lens _desrsSerialNumber (\ s a -> s{_desrsSerialNumber = a});
-
 -- | The name of the HSM vendor.
 desrsVendorName :: Lens' DescribeHSMResponse (Maybe Text)
 desrsVendorName = lens _desrsVendorName (\ s a -> s{_desrsVendorName = a});
 
+-- | The serial number of the HSM.
+desrsSerialNumber :: Lens' DescribeHSMResponse (Maybe Text)
+desrsSerialNumber = lens _desrsSerialNumber (\ s a -> s{_desrsSerialNumber = a});
+
 -- | The ARN of the HSM.
 desrsHSMARN :: Lens' DescribeHSMResponse (Maybe Text)
 desrsHSMARN = lens _desrsHSMARN (\ s a -> s{_desrsHSMARN = a});
@@ -330,5 +340,5 @@
 desrsHSMType = lens _desrsHSMType (\ s a -> s{_desrsHSMType = a});
 
 -- | The response status code.
-desrsStatus :: Lens' DescribeHSMResponse Int
-desrsStatus = lens _desrsStatus (\ s a -> s{_desrsStatus = a});
+desrsResponseStatus :: Lens' DescribeHSMResponse Int
+desrsResponseStatus = lens _desrsResponseStatus (\ s a -> s{_desrsResponseStatus = a});
diff --git a/gen/Network/AWS/CloudHSM/DescribeLunaClient.hs b/gen/Network/AWS/CloudHSM/DescribeLunaClient.hs
--- a/gen/Network/AWS/CloudHSM/DescribeLunaClient.hs
+++ b/gen/Network/AWS/CloudHSM/DescribeLunaClient.hs
@@ -35,11 +35,11 @@
     , DescribeLunaClientResponse
     -- * Response Lenses
     , drsClientARN
-    , drsCertificateFingerprint
     , drsLastModifiedTimestamp
+    , drsCertificateFingerprint
     , drsCertificate
     , drsLabel
-    , drsStatus
+    , drsResponseStatus
     ) where
 
 import           Network.AWS.CloudHSM.Types
@@ -86,8 +86,8 @@
               (\ s h x ->
                  DescribeLunaClientResponse' <$>
                    (x .?> "ClientArn") <*>
-                     (x .?> "CertificateFingerprint")
-                     <*> (x .?> "LastModifiedTimestamp")
+                     (x .?> "LastModifiedTimestamp")
+                     <*> (x .?> "CertificateFingerprint")
                      <*> (x .?> "Certificate")
                      <*> (x .?> "Label")
                      <*> (pure (fromEnum s)))
@@ -119,11 +119,11 @@
 -- | /See:/ 'describeLunaClientResponse' smart constructor.
 data DescribeLunaClientResponse = DescribeLunaClientResponse'
     { _drsClientARN              :: !(Maybe Text)
-    , _drsCertificateFingerprint :: !(Maybe Text)
     , _drsLastModifiedTimestamp  :: !(Maybe Text)
+    , _drsCertificateFingerprint :: !(Maybe Text)
     , _drsCertificate            :: !(Maybe Text)
     , _drsLabel                  :: !(Maybe Text)
-    , _drsStatus                 :: !Int
+    , _drsResponseStatus         :: !Int
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'DescribeLunaClientResponse' with the minimum fields required to make a request.
@@ -132,40 +132,40 @@
 --
 -- * 'drsClientARN'
 --
--- * 'drsCertificateFingerprint'
---
 -- * 'drsLastModifiedTimestamp'
 --
+-- * 'drsCertificateFingerprint'
+--
 -- * 'drsCertificate'
 --
 -- * 'drsLabel'
 --
--- * 'drsStatus'
+-- * 'drsResponseStatus'
 describeLunaClientResponse
-    :: Int -- ^ 'drsStatus'
+    :: Int -- ^ 'drsResponseStatus'
     -> DescribeLunaClientResponse
-describeLunaClientResponse pStatus_ =
+describeLunaClientResponse pResponseStatus_ =
     DescribeLunaClientResponse'
     { _drsClientARN = Nothing
-    , _drsCertificateFingerprint = Nothing
     , _drsLastModifiedTimestamp = Nothing
+    , _drsCertificateFingerprint = Nothing
     , _drsCertificate = Nothing
     , _drsLabel = Nothing
-    , _drsStatus = pStatus_
+    , _drsResponseStatus = pResponseStatus_
     }
 
 -- | The ARN of the client.
 drsClientARN :: Lens' DescribeLunaClientResponse (Maybe Text)
 drsClientARN = lens _drsClientARN (\ s a -> s{_drsClientARN = a});
 
--- | The certificate fingerprint.
-drsCertificateFingerprint :: Lens' DescribeLunaClientResponse (Maybe Text)
-drsCertificateFingerprint = lens _drsCertificateFingerprint (\ s a -> s{_drsCertificateFingerprint = a});
-
 -- | The date and time the client was last modified.
 drsLastModifiedTimestamp :: Lens' DescribeLunaClientResponse (Maybe Text)
 drsLastModifiedTimestamp = lens _drsLastModifiedTimestamp (\ s a -> s{_drsLastModifiedTimestamp = a});
 
+-- | The certificate fingerprint.
+drsCertificateFingerprint :: Lens' DescribeLunaClientResponse (Maybe Text)
+drsCertificateFingerprint = lens _drsCertificateFingerprint (\ s a -> s{_drsCertificateFingerprint = a});
+
 -- | The certificate installed on the HSMs used by this client.
 drsCertificate :: Lens' DescribeLunaClientResponse (Maybe Text)
 drsCertificate = lens _drsCertificate (\ s a -> s{_drsCertificate = a});
@@ -175,5 +175,5 @@
 drsLabel = lens _drsLabel (\ s a -> s{_drsLabel = a});
 
 -- | The response status code.
-drsStatus :: Lens' DescribeLunaClientResponse Int
-drsStatus = lens _drsStatus (\ s a -> s{_drsStatus = a});
+drsResponseStatus :: Lens' DescribeLunaClientResponse Int
+drsResponseStatus = lens _drsResponseStatus (\ s a -> s{_drsResponseStatus = a});
diff --git a/gen/Network/AWS/CloudHSM/GetConfig.hs b/gen/Network/AWS/CloudHSM/GetConfig.hs
--- a/gen/Network/AWS/CloudHSM/GetConfig.hs
+++ b/gen/Network/AWS/CloudHSM/GetConfig.hs
@@ -39,7 +39,7 @@
     , gcrsConfigFile
     , gcrsConfigCred
     , gcrsConfigType
-    , gcrsStatus
+    , gcrsResponseStatus
     ) where
 
 import           Network.AWS.CloudHSM.Types
@@ -124,10 +124,10 @@
 
 -- | /See:/ 'getConfigResponse' smart constructor.
 data GetConfigResponse = GetConfigResponse'
-    { _gcrsConfigFile :: !(Maybe Text)
-    , _gcrsConfigCred :: !(Maybe Text)
-    , _gcrsConfigType :: !(Maybe Text)
-    , _gcrsStatus     :: !Int
+    { _gcrsConfigFile     :: !(Maybe Text)
+    , _gcrsConfigCred     :: !(Maybe Text)
+    , _gcrsConfigType     :: !(Maybe Text)
+    , _gcrsResponseStatus :: !Int
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'GetConfigResponse' with the minimum fields required to make a request.
@@ -140,16 +140,16 @@
 --
 -- * 'gcrsConfigType'
 --
--- * 'gcrsStatus'
+-- * 'gcrsResponseStatus'
 getConfigResponse
-    :: Int -- ^ 'gcrsStatus'
+    :: Int -- ^ 'gcrsResponseStatus'
     -> GetConfigResponse
-getConfigResponse pStatus_ =
+getConfigResponse pResponseStatus_ =
     GetConfigResponse'
     { _gcrsConfigFile = Nothing
     , _gcrsConfigCred = Nothing
     , _gcrsConfigType = Nothing
-    , _gcrsStatus = pStatus_
+    , _gcrsResponseStatus = pResponseStatus_
     }
 
 -- | The chrystoki.conf configuration file.
@@ -165,5 +165,5 @@
 gcrsConfigType = lens _gcrsConfigType (\ s a -> s{_gcrsConfigType = a});
 
 -- | The response status code.
-gcrsStatus :: Lens' GetConfigResponse Int
-gcrsStatus = lens _gcrsStatus (\ s a -> s{_gcrsStatus = a});
+gcrsResponseStatus :: Lens' GetConfigResponse Int
+gcrsResponseStatus = lens _gcrsResponseStatus (\ s a -> s{_gcrsResponseStatus = a});
diff --git a/gen/Network/AWS/CloudHSM/ListAvailableZones.hs b/gen/Network/AWS/CloudHSM/ListAvailableZones.hs
--- a/gen/Network/AWS/CloudHSM/ListAvailableZones.hs
+++ b/gen/Network/AWS/CloudHSM/ListAvailableZones.hs
@@ -32,7 +32,7 @@
     , ListAvailableZonesResponse
     -- * Response Lenses
     , lazrsAZList
-    , lazrsStatus
+    , lazrsResponseStatus
     ) where
 
 import           Network.AWS.CloudHSM.Types
@@ -85,8 +85,8 @@
 
 -- | /See:/ 'listAvailableZonesResponse' smart constructor.
 data ListAvailableZonesResponse = ListAvailableZonesResponse'
-    { _lazrsAZList :: !(Maybe [Text])
-    , _lazrsStatus :: !Int
+    { _lazrsAZList         :: !(Maybe [Text])
+    , _lazrsResponseStatus :: !Int
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'ListAvailableZonesResponse' with the minimum fields required to make a request.
@@ -95,14 +95,14 @@
 --
 -- * 'lazrsAZList'
 --
--- * 'lazrsStatus'
+-- * 'lazrsResponseStatus'
 listAvailableZonesResponse
-    :: Int -- ^ 'lazrsStatus'
+    :: Int -- ^ 'lazrsResponseStatus'
     -> ListAvailableZonesResponse
-listAvailableZonesResponse pStatus_ =
+listAvailableZonesResponse pResponseStatus_ =
     ListAvailableZonesResponse'
     { _lazrsAZList = Nothing
-    , _lazrsStatus = pStatus_
+    , _lazrsResponseStatus = pResponseStatus_
     }
 
 -- | The list of Availability Zones that have available AWS CloudHSM
@@ -111,5 +111,5 @@
 lazrsAZList = lens _lazrsAZList (\ s a -> s{_lazrsAZList = a}) . _Default . _Coerce;
 
 -- | The response status code.
-lazrsStatus :: Lens' ListAvailableZonesResponse Int
-lazrsStatus = lens _lazrsStatus (\ s a -> s{_lazrsStatus = a});
+lazrsResponseStatus :: Lens' ListAvailableZonesResponse Int
+lazrsResponseStatus = lens _lazrsResponseStatus (\ s a -> s{_lazrsResponseStatus = a});
diff --git a/gen/Network/AWS/CloudHSM/ListHAPGs.hs b/gen/Network/AWS/CloudHSM/ListHAPGs.hs
--- a/gen/Network/AWS/CloudHSM/ListHAPGs.hs
+++ b/gen/Network/AWS/CloudHSM/ListHAPGs.hs
@@ -39,7 +39,7 @@
     , ListHAPGsResponse
     -- * Response Lenses
     , lhrsNextToken
-    , lhrsStatus
+    , lhrsResponseStatus
     , lhrsHAPGList
     ) where
 
@@ -103,9 +103,9 @@
 
 -- | /See:/ 'listHAPGsResponse' smart constructor.
 data ListHAPGsResponse = ListHAPGsResponse'
-    { _lhrsNextToken :: !(Maybe Text)
-    , _lhrsStatus    :: !Int
-    , _lhrsHAPGList  :: ![Text]
+    { _lhrsNextToken      :: !(Maybe Text)
+    , _lhrsResponseStatus :: !Int
+    , _lhrsHAPGList       :: ![Text]
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'ListHAPGsResponse' with the minimum fields required to make a request.
@@ -114,16 +114,16 @@
 --
 -- * 'lhrsNextToken'
 --
--- * 'lhrsStatus'
+-- * 'lhrsResponseStatus'
 --
 -- * 'lhrsHAPGList'
 listHAPGsResponse
-    :: Int -- ^ 'lhrsStatus'
+    :: Int -- ^ 'lhrsResponseStatus'
     -> ListHAPGsResponse
-listHAPGsResponse pStatus_ =
+listHAPGsResponse pResponseStatus_ =
     ListHAPGsResponse'
     { _lhrsNextToken = Nothing
-    , _lhrsStatus = pStatus_
+    , _lhrsResponseStatus = pResponseStatus_
     , _lhrsHAPGList = mempty
     }
 
@@ -133,8 +133,8 @@
 lhrsNextToken = lens _lhrsNextToken (\ s a -> s{_lhrsNextToken = a});
 
 -- | The response status code.
-lhrsStatus :: Lens' ListHAPGsResponse Int
-lhrsStatus = lens _lhrsStatus (\ s a -> s{_lhrsStatus = a});
+lhrsResponseStatus :: Lens' ListHAPGsResponse Int
+lhrsResponseStatus = lens _lhrsResponseStatus (\ s a -> s{_lhrsResponseStatus = a});
 
 -- | The list of high-availability partition groups.
 lhrsHAPGList :: Lens' ListHAPGsResponse [Text]
diff --git a/gen/Network/AWS/CloudHSM/ListHSMs.hs b/gen/Network/AWS/CloudHSM/ListHSMs.hs
--- a/gen/Network/AWS/CloudHSM/ListHSMs.hs
+++ b/gen/Network/AWS/CloudHSM/ListHSMs.hs
@@ -41,7 +41,7 @@
     -- * Response Lenses
     , lhsmrsNextToken
     , lhsmrsHSMList
-    , lhsmrsStatus
+    , lhsmrsResponseStatus
     ) where
 
 import           Network.AWS.CloudHSM.Types
@@ -106,9 +106,9 @@
 --
 -- /See:/ 'listHSMsResponse' smart constructor.
 data ListHSMsResponse = ListHSMsResponse'
-    { _lhsmrsNextToken :: !(Maybe Text)
-    , _lhsmrsHSMList   :: !(Maybe [Text])
-    , _lhsmrsStatus    :: !Int
+    { _lhsmrsNextToken      :: !(Maybe Text)
+    , _lhsmrsHSMList        :: !(Maybe [Text])
+    , _lhsmrsResponseStatus :: !Int
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'ListHSMsResponse' with the minimum fields required to make a request.
@@ -119,15 +119,15 @@
 --
 -- * 'lhsmrsHSMList'
 --
--- * 'lhsmrsStatus'
+-- * 'lhsmrsResponseStatus'
 listHSMsResponse
-    :: Int -- ^ 'lhsmrsStatus'
+    :: Int -- ^ 'lhsmrsResponseStatus'
     -> ListHSMsResponse
-listHSMsResponse pStatus_ =
+listHSMsResponse pResponseStatus_ =
     ListHSMsResponse'
     { _lhsmrsNextToken = Nothing
     , _lhsmrsHSMList = Nothing
-    , _lhsmrsStatus = pStatus_
+    , _lhsmrsResponseStatus = pResponseStatus_
     }
 
 -- | If not null, more results are available. Pass this value to ListHsms to
@@ -140,5 +140,5 @@
 lhsmrsHSMList = lens _lhsmrsHSMList (\ s a -> s{_lhsmrsHSMList = a}) . _Default . _Coerce;
 
 -- | The response status code.
-lhsmrsStatus :: Lens' ListHSMsResponse Int
-lhsmrsStatus = lens _lhsmrsStatus (\ s a -> s{_lhsmrsStatus = a});
+lhsmrsResponseStatus :: Lens' ListHSMsResponse Int
+lhsmrsResponseStatus = lens _lhsmrsResponseStatus (\ s a -> s{_lhsmrsResponseStatus = a});
diff --git a/gen/Network/AWS/CloudHSM/ListLunaClients.hs b/gen/Network/AWS/CloudHSM/ListLunaClients.hs
--- a/gen/Network/AWS/CloudHSM/ListLunaClients.hs
+++ b/gen/Network/AWS/CloudHSM/ListLunaClients.hs
@@ -39,7 +39,7 @@
     , ListLunaClientsResponse
     -- * Response Lenses
     , llcrsNextToken
-    , llcrsStatus
+    , llcrsResponseStatus
     , llcrsClientList
     ) where
 
@@ -104,9 +104,9 @@
 
 -- | /See:/ 'listLunaClientsResponse' smart constructor.
 data ListLunaClientsResponse = ListLunaClientsResponse'
-    { _llcrsNextToken  :: !(Maybe Text)
-    , _llcrsStatus     :: !Int
-    , _llcrsClientList :: ![Text]
+    { _llcrsNextToken      :: !(Maybe Text)
+    , _llcrsResponseStatus :: !Int
+    , _llcrsClientList     :: ![Text]
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'ListLunaClientsResponse' with the minimum fields required to make a request.
@@ -115,16 +115,16 @@
 --
 -- * 'llcrsNextToken'
 --
--- * 'llcrsStatus'
+-- * 'llcrsResponseStatus'
 --
 -- * 'llcrsClientList'
 listLunaClientsResponse
-    :: Int -- ^ 'llcrsStatus'
+    :: Int -- ^ 'llcrsResponseStatus'
     -> ListLunaClientsResponse
-listLunaClientsResponse pStatus_ =
+listLunaClientsResponse pResponseStatus_ =
     ListLunaClientsResponse'
     { _llcrsNextToken = Nothing
-    , _llcrsStatus = pStatus_
+    , _llcrsResponseStatus = pResponseStatus_
     , _llcrsClientList = mempty
     }
 
@@ -134,8 +134,8 @@
 llcrsNextToken = lens _llcrsNextToken (\ s a -> s{_llcrsNextToken = a});
 
 -- | The response status code.
-llcrsStatus :: Lens' ListLunaClientsResponse Int
-llcrsStatus = lens _llcrsStatus (\ s a -> s{_llcrsStatus = a});
+llcrsResponseStatus :: Lens' ListLunaClientsResponse Int
+llcrsResponseStatus = lens _llcrsResponseStatus (\ s a -> s{_llcrsResponseStatus = a});
 
 -- | The list of clients.
 llcrsClientList :: Lens' ListLunaClientsResponse [Text]
diff --git a/gen/Network/AWS/CloudHSM/ModifyHAPG.hs b/gen/Network/AWS/CloudHSM/ModifyHAPG.hs
--- a/gen/Network/AWS/CloudHSM/ModifyHAPG.hs
+++ b/gen/Network/AWS/CloudHSM/ModifyHAPG.hs
@@ -36,7 +36,7 @@
     , ModifyHAPGResponse
     -- * Response Lenses
     , mhrsHAPGARN
-    , mhrsStatus
+    , mhrsResponseStatus
     ) where
 
 import           Network.AWS.CloudHSM.Types
@@ -119,8 +119,8 @@
 
 -- | /See:/ 'modifyHAPGResponse' smart constructor.
 data ModifyHAPGResponse = ModifyHAPGResponse'
-    { _mhrsHAPGARN :: !(Maybe Text)
-    , _mhrsStatus  :: !Int
+    { _mhrsHAPGARN        :: !(Maybe Text)
+    , _mhrsResponseStatus :: !Int
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'ModifyHAPGResponse' with the minimum fields required to make a request.
@@ -129,14 +129,14 @@
 --
 -- * 'mhrsHAPGARN'
 --
--- * 'mhrsStatus'
+-- * 'mhrsResponseStatus'
 modifyHAPGResponse
-    :: Int -- ^ 'mhrsStatus'
+    :: Int -- ^ 'mhrsResponseStatus'
     -> ModifyHAPGResponse
-modifyHAPGResponse pStatus_ =
+modifyHAPGResponse pResponseStatus_ =
     ModifyHAPGResponse'
     { _mhrsHAPGARN = Nothing
-    , _mhrsStatus = pStatus_
+    , _mhrsResponseStatus = pResponseStatus_
     }
 
 -- | The ARN of the high-availability partition group.
@@ -144,5 +144,5 @@
 mhrsHAPGARN = lens _mhrsHAPGARN (\ s a -> s{_mhrsHAPGARN = a});
 
 -- | The response status code.
-mhrsStatus :: Lens' ModifyHAPGResponse Int
-mhrsStatus = lens _mhrsStatus (\ s a -> s{_mhrsStatus = a});
+mhrsResponseStatus :: Lens' ModifyHAPGResponse Int
+mhrsResponseStatus = lens _mhrsResponseStatus (\ s a -> s{_mhrsResponseStatus = a});
diff --git a/gen/Network/AWS/CloudHSM/ModifyHSM.hs b/gen/Network/AWS/CloudHSM/ModifyHSM.hs
--- a/gen/Network/AWS/CloudHSM/ModifyHSM.hs
+++ b/gen/Network/AWS/CloudHSM/ModifyHSM.hs
@@ -39,7 +39,7 @@
     , ModifyHSMResponse
     -- * Response Lenses
     , mhsmrsHSMARN
-    , mhsmrsStatus
+    , mhsmrsResponseStatus
     ) where
 
 import           Network.AWS.CloudHSM.Types
@@ -152,8 +152,8 @@
 --
 -- /See:/ 'modifyHSMResponse' smart constructor.
 data ModifyHSMResponse = ModifyHSMResponse'
-    { _mhsmrsHSMARN :: !(Maybe Text)
-    , _mhsmrsStatus :: !Int
+    { _mhsmrsHSMARN         :: !(Maybe Text)
+    , _mhsmrsResponseStatus :: !Int
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'ModifyHSMResponse' with the minimum fields required to make a request.
@@ -162,14 +162,14 @@
 --
 -- * 'mhsmrsHSMARN'
 --
--- * 'mhsmrsStatus'
+-- * 'mhsmrsResponseStatus'
 modifyHSMResponse
-    :: Int -- ^ 'mhsmrsStatus'
+    :: Int -- ^ 'mhsmrsResponseStatus'
     -> ModifyHSMResponse
-modifyHSMResponse pStatus_ =
+modifyHSMResponse pResponseStatus_ =
     ModifyHSMResponse'
     { _mhsmrsHSMARN = Nothing
-    , _mhsmrsStatus = pStatus_
+    , _mhsmrsResponseStatus = pResponseStatus_
     }
 
 -- | The ARN of the HSM.
@@ -177,5 +177,5 @@
 mhsmrsHSMARN = lens _mhsmrsHSMARN (\ s a -> s{_mhsmrsHSMARN = a});
 
 -- | The response status code.
-mhsmrsStatus :: Lens' ModifyHSMResponse Int
-mhsmrsStatus = lens _mhsmrsStatus (\ s a -> s{_mhsmrsStatus = a});
+mhsmrsResponseStatus :: Lens' ModifyHSMResponse Int
+mhsmrsResponseStatus = lens _mhsmrsResponseStatus (\ s a -> s{_mhsmrsResponseStatus = a});
diff --git a/gen/Network/AWS/CloudHSM/ModifyLunaClient.hs b/gen/Network/AWS/CloudHSM/ModifyLunaClient.hs
--- a/gen/Network/AWS/CloudHSM/ModifyLunaClient.hs
+++ b/gen/Network/AWS/CloudHSM/ModifyLunaClient.hs
@@ -38,7 +38,7 @@
     , ModifyLunaClientResponse
     -- * Response Lenses
     , mlcrsClientARN
-    , mlcrsStatus
+    , mlcrsResponseStatus
     ) where
 
 import           Network.AWS.CloudHSM.Types
@@ -112,8 +112,8 @@
 
 -- | /See:/ 'modifyLunaClientResponse' smart constructor.
 data ModifyLunaClientResponse = ModifyLunaClientResponse'
-    { _mlcrsClientARN :: !(Maybe Text)
-    , _mlcrsStatus    :: !Int
+    { _mlcrsClientARN      :: !(Maybe Text)
+    , _mlcrsResponseStatus :: !Int
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'ModifyLunaClientResponse' with the minimum fields required to make a request.
@@ -122,14 +122,14 @@
 --
 -- * 'mlcrsClientARN'
 --
--- * 'mlcrsStatus'
+-- * 'mlcrsResponseStatus'
 modifyLunaClientResponse
-    :: Int -- ^ 'mlcrsStatus'
+    :: Int -- ^ 'mlcrsResponseStatus'
     -> ModifyLunaClientResponse
-modifyLunaClientResponse pStatus_ =
+modifyLunaClientResponse pResponseStatus_ =
     ModifyLunaClientResponse'
     { _mlcrsClientARN = Nothing
-    , _mlcrsStatus = pStatus_
+    , _mlcrsResponseStatus = pResponseStatus_
     }
 
 -- | The ARN of the client.
@@ -137,5 +137,5 @@
 mlcrsClientARN = lens _mlcrsClientARN (\ s a -> s{_mlcrsClientARN = a});
 
 -- | The response status code.
-mlcrsStatus :: Lens' ModifyLunaClientResponse Int
-mlcrsStatus = lens _mlcrsStatus (\ s a -> s{_mlcrsStatus = a});
+mlcrsResponseStatus :: Lens' ModifyLunaClientResponse Int
+mlcrsResponseStatus = lens _mlcrsResponseStatus (\ s a -> s{_mlcrsResponseStatus = a});
diff --git a/test/Test/AWS/Gen/CloudHSM.hs b/test/Test/AWS/Gen/CloudHSM.hs
--- a/test/Test/AWS/Gen/CloudHSM.hs
+++ b/test/Test/AWS/Gen/CloudHSM.hs
@@ -28,33 +28,33 @@
 -- fixtures :: TestTree
 -- fixtures =
 --     [ testGroup "request"
---         [ testListHAPGs $
---             listHAPGs
---
---         , testListHSMs $
---             listHSMs
---
---         , testDeleteHAPG $
+--         [ testDeleteHAPG $
 --             deleteHAPG
 --
+--         , testListHAPGs $
+--             listHAPGs
+--
 --         , testModifyLunaClient $
 --             modifyLunaClient
 --
+--         , testListHSMs $
+--             listHSMs
+--
 --         , testDescribeLunaClient $
 --             describeLunaClient
 --
---         , testCreateHSM $
---             createHSM
---
 --         , testCreateHAPG $
 --             createHAPG
 --
---         , testCreateLunaClient $
---             createLunaClient
+--         , testCreateHSM $
+--             createHSM
 --
 --         , testDescribeHAPG $
 --             describeHAPG
 --
+--         , testCreateLunaClient $
+--             createLunaClient
+--
 --         , testListLunaClients $
 --             listLunaClients
 --
@@ -70,45 +70,45 @@
 --         , testModifyHAPG $
 --             modifyHAPG
 --
---         , testListAvailableZones $
---             listAvailableZones
+--         , testDeleteLunaClient $
+--             deleteLunaClient
 --
 --         , testModifyHSM $
 --             modifyHSM
 --
---         , testDeleteLunaClient $
---             deleteLunaClient
+--         , testListAvailableZones $
+--             listAvailableZones
 --
 --           ]
 
 --     , testGroup "response"
---         [ testListHAPGsResponse $
---             listHAPGsResponse
---
---         , testListHSMsResponse $
---             listHSMsResponse
---
---         , testDeleteHAPGResponse $
+--         [ testDeleteHAPGResponse $
 --             deleteHAPGResponse
 --
+--         , testListHAPGsResponse $
+--             listHAPGsResponse
+--
 --         , testModifyLunaClientResponse $
 --             modifyLunaClientResponse
 --
+--         , testListHSMsResponse $
+--             listHSMsResponse
+--
 --         , testDescribeLunaClientResponse $
 --             describeLunaClientResponse
 --
---         , testCreateHSMResponse $
---             createHSMResponse
---
 --         , testCreateHAPGResponse $
 --             createHAPGResponse
 --
---         , testCreateLunaClientResponse $
---             createLunaClientResponse
+--         , testCreateHSMResponse $
+--             createHSMResponse
 --
 --         , testDescribeHAPGResponse $
 --             describeHAPGResponse
 --
+--         , testCreateLunaClientResponse $
+--             createLunaClientResponse
+--
 --         , testListLunaClientsResponse $
 --             listLunaClientsResponse
 --
@@ -124,65 +124,65 @@
 --         , testModifyHAPGResponse $
 --             modifyHAPGResponse
 --
---         , testListAvailableZonesResponse $
---             listAvailableZonesResponse
+--         , testDeleteLunaClientResponse $
+--             deleteLunaClientResponse
 --
 --         , testModifyHSMResponse $
 --             modifyHSMResponse
 --
---         , testDeleteLunaClientResponse $
---             deleteLunaClientResponse
+--         , testListAvailableZonesResponse $
+--             listAvailableZonesResponse
 --
 --           ]
 --     ]
 
 -- Requests
 
-testListHAPGs :: ListHAPGs -> TestTree
-testListHAPGs = req
-    "ListHAPGs"
-    "fixture/ListHAPGs.yaml"
-
-testListHSMs :: ListHSMs -> TestTree
-testListHSMs = req
-    "ListHSMs"
-    "fixture/ListHSMs.yaml"
-
 testDeleteHAPG :: DeleteHAPG -> TestTree
 testDeleteHAPG = req
     "DeleteHAPG"
     "fixture/DeleteHAPG.yaml"
 
+testListHAPGs :: ListHAPGs -> TestTree
+testListHAPGs = req
+    "ListHAPGs"
+    "fixture/ListHAPGs.yaml"
+
 testModifyLunaClient :: ModifyLunaClient -> TestTree
 testModifyLunaClient = req
     "ModifyLunaClient"
     "fixture/ModifyLunaClient.yaml"
 
+testListHSMs :: ListHSMs -> TestTree
+testListHSMs = req
+    "ListHSMs"
+    "fixture/ListHSMs.yaml"
+
 testDescribeLunaClient :: DescribeLunaClient -> TestTree
 testDescribeLunaClient = req
     "DescribeLunaClient"
     "fixture/DescribeLunaClient.yaml"
 
-testCreateHSM :: CreateHSM -> TestTree
-testCreateHSM = req
-    "CreateHSM"
-    "fixture/CreateHSM.yaml"
-
 testCreateHAPG :: CreateHAPG -> TestTree
 testCreateHAPG = req
     "CreateHAPG"
     "fixture/CreateHAPG.yaml"
 
-testCreateLunaClient :: CreateLunaClient -> TestTree
-testCreateLunaClient = req
-    "CreateLunaClient"
-    "fixture/CreateLunaClient.yaml"
+testCreateHSM :: CreateHSM -> TestTree
+testCreateHSM = req
+    "CreateHSM"
+    "fixture/CreateHSM.yaml"
 
 testDescribeHAPG :: DescribeHAPG -> TestTree
 testDescribeHAPG = req
     "DescribeHAPG"
     "fixture/DescribeHAPG.yaml"
 
+testCreateLunaClient :: CreateLunaClient -> TestTree
+testCreateLunaClient = req
+    "CreateLunaClient"
+    "fixture/CreateLunaClient.yaml"
+
 testListLunaClients :: ListLunaClients -> TestTree
 testListLunaClients = req
     "ListLunaClients"
@@ -208,37 +208,23 @@
     "ModifyHAPG"
     "fixture/ModifyHAPG.yaml"
 
-testListAvailableZones :: ListAvailableZones -> TestTree
-testListAvailableZones = req
-    "ListAvailableZones"
-    "fixture/ListAvailableZones.yaml"
+testDeleteLunaClient :: DeleteLunaClient -> TestTree
+testDeleteLunaClient = req
+    "DeleteLunaClient"
+    "fixture/DeleteLunaClient.yaml"
 
 testModifyHSM :: ModifyHSM -> TestTree
 testModifyHSM = req
     "ModifyHSM"
     "fixture/ModifyHSM.yaml"
 
-testDeleteLunaClient :: DeleteLunaClient -> TestTree
-testDeleteLunaClient = req
-    "DeleteLunaClient"
-    "fixture/DeleteLunaClient.yaml"
+testListAvailableZones :: ListAvailableZones -> TestTree
+testListAvailableZones = req
+    "ListAvailableZones"
+    "fixture/ListAvailableZones.yaml"
 
 -- Responses
 
-testListHAPGsResponse :: ListHAPGsResponse -> TestTree
-testListHAPGsResponse = res
-    "ListHAPGsResponse"
-    "fixture/ListHAPGsResponse.proto"
-    cloudHSM
-    (Proxy :: Proxy ListHAPGs)
-
-testListHSMsResponse :: ListHSMsResponse -> TestTree
-testListHSMsResponse = res
-    "ListHSMsResponse"
-    "fixture/ListHSMsResponse.proto"
-    cloudHSM
-    (Proxy :: Proxy ListHSMs)
-
 testDeleteHAPGResponse :: DeleteHAPGResponse -> TestTree
 testDeleteHAPGResponse = res
     "DeleteHAPGResponse"
@@ -246,6 +232,13 @@
     cloudHSM
     (Proxy :: Proxy DeleteHAPG)
 
+testListHAPGsResponse :: ListHAPGsResponse -> TestTree
+testListHAPGsResponse = res
+    "ListHAPGsResponse"
+    "fixture/ListHAPGsResponse.proto"
+    cloudHSM
+    (Proxy :: Proxy ListHAPGs)
+
 testModifyLunaClientResponse :: ModifyLunaClientResponse -> TestTree
 testModifyLunaClientResponse = res
     "ModifyLunaClientResponse"
@@ -253,6 +246,13 @@
     cloudHSM
     (Proxy :: Proxy ModifyLunaClient)
 
+testListHSMsResponse :: ListHSMsResponse -> TestTree
+testListHSMsResponse = res
+    "ListHSMsResponse"
+    "fixture/ListHSMsResponse.proto"
+    cloudHSM
+    (Proxy :: Proxy ListHSMs)
+
 testDescribeLunaClientResponse :: DescribeLunaClientResponse -> TestTree
 testDescribeLunaClientResponse = res
     "DescribeLunaClientResponse"
@@ -260,13 +260,6 @@
     cloudHSM
     (Proxy :: Proxy DescribeLunaClient)
 
-testCreateHSMResponse :: CreateHSMResponse -> TestTree
-testCreateHSMResponse = res
-    "CreateHSMResponse"
-    "fixture/CreateHSMResponse.proto"
-    cloudHSM
-    (Proxy :: Proxy CreateHSM)
-
 testCreateHAPGResponse :: CreateHAPGResponse -> TestTree
 testCreateHAPGResponse = res
     "CreateHAPGResponse"
@@ -274,12 +267,12 @@
     cloudHSM
     (Proxy :: Proxy CreateHAPG)
 
-testCreateLunaClientResponse :: CreateLunaClientResponse -> TestTree
-testCreateLunaClientResponse = res
-    "CreateLunaClientResponse"
-    "fixture/CreateLunaClientResponse.proto"
+testCreateHSMResponse :: CreateHSMResponse -> TestTree
+testCreateHSMResponse = res
+    "CreateHSMResponse"
+    "fixture/CreateHSMResponse.proto"
     cloudHSM
-    (Proxy :: Proxy CreateLunaClient)
+    (Proxy :: Proxy CreateHSM)
 
 testDescribeHAPGResponse :: DescribeHAPGResponse -> TestTree
 testDescribeHAPGResponse = res
@@ -288,6 +281,13 @@
     cloudHSM
     (Proxy :: Proxy DescribeHAPG)
 
+testCreateLunaClientResponse :: CreateLunaClientResponse -> TestTree
+testCreateLunaClientResponse = res
+    "CreateLunaClientResponse"
+    "fixture/CreateLunaClientResponse.proto"
+    cloudHSM
+    (Proxy :: Proxy CreateLunaClient)
+
 testListLunaClientsResponse :: ListLunaClientsResponse -> TestTree
 testListLunaClientsResponse = res
     "ListLunaClientsResponse"
@@ -323,12 +323,12 @@
     cloudHSM
     (Proxy :: Proxy ModifyHAPG)
 
-testListAvailableZonesResponse :: ListAvailableZonesResponse -> TestTree
-testListAvailableZonesResponse = res
-    "ListAvailableZonesResponse"
-    "fixture/ListAvailableZonesResponse.proto"
+testDeleteLunaClientResponse :: DeleteLunaClientResponse -> TestTree
+testDeleteLunaClientResponse = res
+    "DeleteLunaClientResponse"
+    "fixture/DeleteLunaClientResponse.proto"
     cloudHSM
-    (Proxy :: Proxy ListAvailableZones)
+    (Proxy :: Proxy DeleteLunaClient)
 
 testModifyHSMResponse :: ModifyHSMResponse -> TestTree
 testModifyHSMResponse = res
@@ -337,9 +337,9 @@
     cloudHSM
     (Proxy :: Proxy ModifyHSM)
 
-testDeleteLunaClientResponse :: DeleteLunaClientResponse -> TestTree
-testDeleteLunaClientResponse = res
-    "DeleteLunaClientResponse"
-    "fixture/DeleteLunaClientResponse.proto"
+testListAvailableZonesResponse :: ListAvailableZonesResponse -> TestTree
+testListAvailableZonesResponse = res
+    "ListAvailableZonesResponse"
+    "fixture/ListAvailableZonesResponse.proto"
     cloudHSM
-    (Proxy :: Proxy DeleteLunaClient)
+    (Proxy :: Proxy ListAvailableZones)
