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-swf.cabal b/amazonka-swf.cabal
--- a/amazonka-swf.cabal
+++ b/amazonka-swf.cabal
@@ -1,5 +1,5 @@
 name:                  amazonka-swf
-version:               1.2.0.2
+version:               1.3.0
 synopsis:              Amazon Simple Workflow Service SDK.
 homepage:              https://github.com/brendanhay/amazonka
 bug-reports:           https://github.com/brendanhay/amazonka/issues
@@ -96,7 +96,7 @@
         , Network.AWS.SWF.Types.Sum
 
     build-depends:
-          amazonka-core == 1.2.0.*
+          amazonka-core == 1.3.0.*
         , base          >= 4.7     && < 5
 
 test-suite amazonka-swf-test
@@ -116,9 +116,9 @@
         , Test.AWS.SWF.Internal
 
     build-depends:
-          amazonka-core == 1.2.0.*
-        , amazonka-test == 1.2.0.*
-        , amazonka-swf == 1.2.0.*
+          amazonka-core == 1.3.0.*
+        , amazonka-test == 1.3.0.*
+        , amazonka-swf == 1.3.0.*
         , base
         , bytestring
         , lens
diff --git a/gen/Network/AWS/SWF.hs b/gen/Network/AWS/SWF.hs
--- a/gen/Network/AWS/SWF.hs
+++ b/gen/Network/AWS/SWF.hs
@@ -38,21 +38,21 @@
     -- * Errors
     -- $errors
 
+    -- ** DomainAlreadyExistsFault
+    , _DomainAlreadyExistsFault
+
     -- ** LimitExceededFault
     , _LimitExceededFault
 
     -- ** WorkflowExecutionAlreadyStartedFault
     , _WorkflowExecutionAlreadyStartedFault
 
-    -- ** DomainAlreadyExistsFault
-    , _DomainAlreadyExistsFault
+    -- ** OperationNotPermittedFault
+    , _OperationNotPermittedFault
 
     -- ** UnknownResourceFault
     , _UnknownResourceFault
 
-    -- ** OperationNotPermittedFault
-    , _OperationNotPermittedFault
-
     -- ** DefaultUndefinedFault
     , _DefaultUndefinedFault
 
@@ -71,47 +71,44 @@
     -- * Operations
     -- $operations
 
-    -- ** ListActivityTypes (Paginated)
-    , module Network.AWS.SWF.ListActivityTypes
-
     -- ** ListOpenWorkflowExecutions (Paginated)
     , module Network.AWS.SWF.ListOpenWorkflowExecutions
 
     -- ** RegisterActivityType
     , module Network.AWS.SWF.RegisterActivityType
 
+    -- ** ListActivityTypes (Paginated)
+    , module Network.AWS.SWF.ListActivityTypes
+
     -- ** CountPendingActivityTasks
     , module Network.AWS.SWF.CountPendingActivityTasks
 
     -- ** RegisterWorkflowType
     , module Network.AWS.SWF.RegisterWorkflowType
 
-    -- ** RespondActivityTaskFailed
-    , module Network.AWS.SWF.RespondActivityTaskFailed
-
     -- ** ListWorkflowTypes (Paginated)
     , module Network.AWS.SWF.ListWorkflowTypes
 
+    -- ** RespondActivityTaskFailed
+    , module Network.AWS.SWF.RespondActivityTaskFailed
+
     -- ** CountOpenWorkflowExecutions
     , module Network.AWS.SWF.CountOpenWorkflowExecutions
 
     -- ** DescribeWorkflowType
     , module Network.AWS.SWF.DescribeWorkflowType
 
-    -- ** RequestCancelWorkflowExecution
-    , module Network.AWS.SWF.RequestCancelWorkflowExecution
-
     -- ** DeprecateWorkflowType
     , module Network.AWS.SWF.DeprecateWorkflowType
 
-    -- ** RespondDecisionTaskCompleted
-    , module Network.AWS.SWF.RespondDecisionTaskCompleted
+    -- ** RequestCancelWorkflowExecution
+    , module Network.AWS.SWF.RequestCancelWorkflowExecution
 
     -- ** RegisterDomain
     , module Network.AWS.SWF.RegisterDomain
 
-    -- ** DescribeWorkflowExecution
-    , module Network.AWS.SWF.DescribeWorkflowExecution
+    -- ** RespondDecisionTaskCompleted
+    , module Network.AWS.SWF.RespondDecisionTaskCompleted
 
     -- ** PollForActivityTask
     , module Network.AWS.SWF.PollForActivityTask
@@ -119,6 +116,9 @@
     -- ** RespondActivityTaskCompleted
     , module Network.AWS.SWF.RespondActivityTaskCompleted
 
+    -- ** DescribeWorkflowExecution
+    , module Network.AWS.SWF.DescribeWorkflowExecution
+
     -- ** SignalWorkflowExecution
     , module Network.AWS.SWF.SignalWorkflowExecution
 
@@ -134,11 +134,14 @@
     -- ** DescribeDomain
     , module Network.AWS.SWF.DescribeDomain
 
+    -- ** GetWorkflowExecutionHistory (Paginated)
+    , module Network.AWS.SWF.GetWorkflowExecutionHistory
+
     -- ** DeprecateDomain
     , module Network.AWS.SWF.DeprecateDomain
 
-    -- ** GetWorkflowExecutionHistory (Paginated)
-    , module Network.AWS.SWF.GetWorkflowExecutionHistory
+    -- ** TerminateWorkflowExecution
+    , module Network.AWS.SWF.TerminateWorkflowExecution
 
     -- ** DescribeActivityType
     , module Network.AWS.SWF.DescribeActivityType
@@ -146,24 +149,21 @@
     -- ** DeprecateActivityType
     , module Network.AWS.SWF.DeprecateActivityType
 
-    -- ** TerminateWorkflowExecution
-    , module Network.AWS.SWF.TerminateWorkflowExecution
-
     -- ** CountClosedWorkflowExecutions
     , module Network.AWS.SWF.CountClosedWorkflowExecutions
 
     -- ** RespondActivityTaskCanceled
     , module Network.AWS.SWF.RespondActivityTaskCanceled
 
-    -- ** ListDomains (Paginated)
-    , module Network.AWS.SWF.ListDomains
-
     -- ** StartWorkflowExecution
     , module Network.AWS.SWF.StartWorkflowExecution
 
     -- ** PollForDecisionTask (Paginated)
     , module Network.AWS.SWF.PollForDecisionTask
 
+    -- ** ListDomains (Paginated)
+    , module Network.AWS.SWF.ListDomains
+
     -- * Types
 
     -- ** ActivityTaskTimeoutType
@@ -277,8 +277,8 @@
     , ActivityTaskScheduledEventAttributes
     , activityTaskScheduledEventAttributes
     , atseaControl
-    , atseaScheduleToCloseTimeout
     , atseaHeartbeatTimeout
+    , atseaScheduleToCloseTimeout
     , atseaInput
     , atseaTaskPriority
     , atseaScheduleToStartTimeout
@@ -447,8 +447,8 @@
     , dRecordMarkerDecisionAttributes
     , dFailWorkflowExecutionDecisionAttributes
     , dStartChildWorkflowExecutionDecisionAttributes
-    , dScheduleLambdaFunctionDecisionAttributes
     , dCompleteWorkflowExecutionDecisionAttributes
+    , dScheduleLambdaFunctionDecisionAttributes
     , dRequestCancelActivityTaskDecisionAttributes
     , dCancelWorkflowExecutionDecisionAttributes
     , dCancelTimerDecisionAttributes
@@ -528,59 +528,59 @@
     , HistoryEvent
     , historyEvent
     , heWorkflowExecutionCancelRequestedEventAttributes
-    , heDecisionTaskScheduledEventAttributes
-    , heStartTimerFailedEventAttributes
-    , heLambdaFunctionStartedEventAttributes
     , heRecordMarkerFailedEventAttributes
     , heRequestCancelExternalWorkflowExecutionInitiatedEventAttributes
+    , heLambdaFunctionStartedEventAttributes
+    , heDecisionTaskScheduledEventAttributes
     , heWorkflowExecutionCompletedEventAttributes
+    , heStartTimerFailedEventAttributes
     , heActivityTaskScheduledEventAttributes
-    , heChildWorkflowExecutionCompletedEventAttributes
     , heScheduleActivityTaskFailedEventAttributes
+    , heChildWorkflowExecutionCompletedEventAttributes
     , heMarkerRecordedEventAttributes
     , heScheduleLambdaFunctionFailedEventAttributes
     , heCompleteWorkflowExecutionFailedEventAttributes
-    , heRequestCancelExternalWorkflowExecutionFailedEventAttributes
     , heLambdaFunctionCompletedEventAttributes
+    , heRequestCancelExternalWorkflowExecutionFailedEventAttributes
     , heTimerCanceledEventAttributes
     , heWorkflowExecutionStartedEventAttributes
     , heActivityTaskCompletedEventAttributes
-    , heChildWorkflowExecutionStartedEventAttributes
     , heDecisionTaskTimedOutEventAttributes
     , heCancelTimerFailedEventAttributes
-    , heActivityTaskTimedOutEventAttributes
+    , heChildWorkflowExecutionStartedEventAttributes
     , heActivityTaskCanceledEventAttributes
-    , heChildWorkflowExecutionCanceledEventAttributes
+    , heActivityTaskTimedOutEventAttributes
     , heDecisionTaskStartedEventAttributes
-    , heCancelWorkflowExecutionFailedEventAttributes
+    , heWorkflowExecutionTerminatedEventAttributes
+    , heChildWorkflowExecutionCanceledEventAttributes
+    , heRequestCancelActivityTaskFailedEventAttributes
     , heLambdaFunctionScheduledEventAttributes
     , heChildWorkflowExecutionTimedOutEventAttributes
-    , heRequestCancelActivityTaskFailedEventAttributes
-    , heWorkflowExecutionTerminatedEventAttributes
+    , heCancelWorkflowExecutionFailedEventAttributes
     , heStartChildWorkflowExecutionInitiatedEventAttributes
-    , heActivityTaskStartedEventAttributes
     , heSignalExternalWorkflowExecutionFailedEventAttributes
-    , heTimerStartedEventAttributes
-    , heWorkflowExecutionTimedOutEventAttributes
-    , heActivityTaskCancelRequestedEventAttributes
+    , heActivityTaskStartedEventAttributes
     , heStartLambdaFunctionFailedEventAttributes
     , heChildWorkflowExecutionTerminatedEventAttributes
     , heLambdaFunctionFailedEventAttributes
     , heWorkflowExecutionCanceledEventAttributes
+    , heTimerStartedEventAttributes
+    , heActivityTaskCancelRequestedEventAttributes
+    , heWorkflowExecutionTimedOutEventAttributes
     , heWorkflowExecutionSignaledEventAttributes
+    , heTimerFiredEventAttributes
     , heActivityTaskFailedEventAttributes
     , heExternalWorkflowExecutionSignaledEventAttributes
-    , heTimerFiredEventAttributes
-    , heFailWorkflowExecutionFailedEventAttributes
-    , heChildWorkflowExecutionFailedEventAttributes
     , heDecisionTaskCompletedEventAttributes
     , heStartChildWorkflowExecutionFailedEventAttributes
-    , heSignalExternalWorkflowExecutionInitiatedEventAttributes
+    , heChildWorkflowExecutionFailedEventAttributes
+    , heFailWorkflowExecutionFailedEventAttributes
     , heContinueAsNewWorkflowExecutionFailedEventAttributes
+    , heSignalExternalWorkflowExecutionInitiatedEventAttributes
+    , heLambdaFunctionTimedOutEventAttributes
     , heWorkflowExecutionFailedEventAttributes
     , heWorkflowExecutionContinuedAsNewEventAttributes
     , heExternalWorkflowExecutionCancelRequestedEventAttributes
-    , heLambdaFunctionTimedOutEventAttributes
     , heEventTimestamp
     , heEventType
     , heEventId
@@ -688,8 +688,8 @@
     , ScheduleActivityTaskDecisionAttributes
     , scheduleActivityTaskDecisionAttributes
     , satdaControl
-    , satdaScheduleToCloseTimeout
     , satdaHeartbeatTimeout
+    , satdaScheduleToCloseTimeout
     , satdaInput
     , satdaTaskList
     , satdaTaskPriority
diff --git a/gen/Network/AWS/SWF/CountClosedWorkflowExecutions.hs b/gen/Network/AWS/SWF/CountClosedWorkflowExecutions.hs
--- a/gen/Network/AWS/SWF/CountClosedWorkflowExecutions.hs
+++ b/gen/Network/AWS/SWF/CountClosedWorkflowExecutions.hs
@@ -56,8 +56,8 @@
       countClosedWorkflowExecutions
     , CountClosedWorkflowExecutions
     -- * Request Lenses
-    , ccweCloseStatusFilter
     , ccweExecutionFilter
+    , ccweCloseStatusFilter
     , ccweTypeFilter
     , ccweCloseTimeFilter
     , ccweTagFilter
@@ -80,8 +80,8 @@
 
 -- | /See:/ 'countClosedWorkflowExecutions' smart constructor.
 data CountClosedWorkflowExecutions = CountClosedWorkflowExecutions'
-    { _ccweCloseStatusFilter :: !(Maybe CloseStatusFilter)
-    , _ccweExecutionFilter   :: !(Maybe WorkflowExecutionFilter)
+    { _ccweExecutionFilter   :: !(Maybe WorkflowExecutionFilter)
+    , _ccweCloseStatusFilter :: !(Maybe CloseStatusFilter)
     , _ccweTypeFilter        :: !(Maybe WorkflowTypeFilter)
     , _ccweCloseTimeFilter   :: !(Maybe ExecutionTimeFilter)
     , _ccweTagFilter         :: !(Maybe TagFilter)
@@ -93,10 +93,10 @@
 --
 -- Use one of the following lenses to modify other fields as desired:
 --
--- * 'ccweCloseStatusFilter'
---
 -- * 'ccweExecutionFilter'
 --
+-- * 'ccweCloseStatusFilter'
+--
 -- * 'ccweTypeFilter'
 --
 -- * 'ccweCloseTimeFilter'
@@ -111,8 +111,8 @@
     -> CountClosedWorkflowExecutions
 countClosedWorkflowExecutions pDomain_ =
     CountClosedWorkflowExecutions'
-    { _ccweCloseStatusFilter = Nothing
-    , _ccweExecutionFilter = Nothing
+    { _ccweExecutionFilter = Nothing
+    , _ccweCloseStatusFilter = Nothing
     , _ccweTypeFilter = Nothing
     , _ccweCloseTimeFilter = Nothing
     , _ccweTagFilter = Nothing
@@ -120,6 +120,14 @@
     , _ccweDomain = pDomain_
     }
 
+-- | If specified, only workflow executions matching the 'WorkflowId' in the
+-- filter are counted.
+--
+-- 'closeStatusFilter', 'executionFilter', 'typeFilter' and 'tagFilter' are
+-- mutually exclusive. You can specify at most one of these in a request.
+ccweExecutionFilter :: Lens' CountClosedWorkflowExecutions (Maybe WorkflowExecutionFilter)
+ccweExecutionFilter = lens _ccweExecutionFilter (\ s a -> s{_ccweExecutionFilter = a});
+
 -- | If specified, only workflow executions that match this close status are
 -- counted. This filter has an affect only if 'executionStatus' is
 -- specified as 'CLOSED'.
@@ -129,14 +137,6 @@
 ccweCloseStatusFilter :: Lens' CountClosedWorkflowExecutions (Maybe CloseStatusFilter)
 ccweCloseStatusFilter = lens _ccweCloseStatusFilter (\ s a -> s{_ccweCloseStatusFilter = a});
 
--- | If specified, only workflow executions matching the 'WorkflowId' in the
--- filter are counted.
---
--- 'closeStatusFilter', 'executionFilter', 'typeFilter' and 'tagFilter' are
--- mutually exclusive. You can specify at most one of these in a request.
-ccweExecutionFilter :: Lens' CountClosedWorkflowExecutions (Maybe WorkflowExecutionFilter)
-ccweExecutionFilter = lens _ccweExecutionFilter (\ s a -> s{_ccweExecutionFilter = a});
-
 -- | If specified, indicates the type of the workflow executions to be
 -- counted.
 --
@@ -195,8 +195,8 @@
         toJSON CountClosedWorkflowExecutions'{..}
           = object
               (catMaybes
-                 [("closeStatusFilter" .=) <$> _ccweCloseStatusFilter,
-                  ("executionFilter" .=) <$> _ccweExecutionFilter,
+                 [("executionFilter" .=) <$> _ccweExecutionFilter,
+                  ("closeStatusFilter" .=) <$> _ccweCloseStatusFilter,
                   ("typeFilter" .=) <$> _ccweTypeFilter,
                   ("closeTimeFilter" .=) <$> _ccweCloseTimeFilter,
                   ("tagFilter" .=) <$> _ccweTagFilter,
diff --git a/gen/Network/AWS/SWF/DescribeActivityType.hs b/gen/Network/AWS/SWF/DescribeActivityType.hs
--- a/gen/Network/AWS/SWF/DescribeActivityType.hs
+++ b/gen/Network/AWS/SWF/DescribeActivityType.hs
@@ -59,7 +59,7 @@
     , describeActivityTypeResponse
     , DescribeActivityTypeResponse
     -- * Response Lenses
-    , datrsStatus
+    , datrsResponseStatus
     , datrsTypeInfo
     , datrsConfiguration
     ) where
@@ -141,35 +141,35 @@
 --
 -- /See:/ 'describeActivityTypeResponse' smart constructor.
 data DescribeActivityTypeResponse = DescribeActivityTypeResponse'
-    { _datrsStatus        :: !Int
-    , _datrsTypeInfo      :: !ActivityTypeInfo
-    , _datrsConfiguration :: !ActivityTypeConfiguration
+    { _datrsResponseStatus :: !Int
+    , _datrsTypeInfo       :: !ActivityTypeInfo
+    , _datrsConfiguration  :: !ActivityTypeConfiguration
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'DescribeActivityTypeResponse' with the minimum fields required to make a request.
 --
 -- Use one of the following lenses to modify other fields as desired:
 --
--- * 'datrsStatus'
+-- * 'datrsResponseStatus'
 --
 -- * 'datrsTypeInfo'
 --
 -- * 'datrsConfiguration'
 describeActivityTypeResponse
-    :: Int -- ^ 'datrsStatus'
+    :: Int -- ^ 'datrsResponseStatus'
     -> ActivityTypeInfo -- ^ 'datrsTypeInfo'
     -> ActivityTypeConfiguration -- ^ 'datrsConfiguration'
     -> DescribeActivityTypeResponse
-describeActivityTypeResponse pStatus_ pTypeInfo_ pConfiguration_ =
+describeActivityTypeResponse pResponseStatus_ pTypeInfo_ pConfiguration_ =
     DescribeActivityTypeResponse'
-    { _datrsStatus = pStatus_
+    { _datrsResponseStatus = pResponseStatus_
     , _datrsTypeInfo = pTypeInfo_
     , _datrsConfiguration = pConfiguration_
     }
 
 -- | The response status code.
-datrsStatus :: Lens' DescribeActivityTypeResponse Int
-datrsStatus = lens _datrsStatus (\ s a -> s{_datrsStatus = a});
+datrsResponseStatus :: Lens' DescribeActivityTypeResponse Int
+datrsResponseStatus = lens _datrsResponseStatus (\ s a -> s{_datrsResponseStatus = a});
 
 -- | General information about the activity type.
 --
diff --git a/gen/Network/AWS/SWF/DescribeDomain.hs b/gen/Network/AWS/SWF/DescribeDomain.hs
--- a/gen/Network/AWS/SWF/DescribeDomain.hs
+++ b/gen/Network/AWS/SWF/DescribeDomain.hs
@@ -52,7 +52,7 @@
     , describeDomainResponse
     , DescribeDomainResponse
     -- * Response Lenses
-    , ddrsStatus
+    , ddrsResponseStatus
     , ddrsDomainInfo
     , ddrsConfiguration
     ) where
@@ -119,35 +119,35 @@
 --
 -- /See:/ 'describeDomainResponse' smart constructor.
 data DescribeDomainResponse = DescribeDomainResponse'
-    { _ddrsStatus        :: !Int
-    , _ddrsDomainInfo    :: !DomainInfo
-    , _ddrsConfiguration :: !DomainConfiguration
+    { _ddrsResponseStatus :: !Int
+    , _ddrsDomainInfo     :: !DomainInfo
+    , _ddrsConfiguration  :: !DomainConfiguration
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'DescribeDomainResponse' with the minimum fields required to make a request.
 --
 -- Use one of the following lenses to modify other fields as desired:
 --
--- * 'ddrsStatus'
+-- * 'ddrsResponseStatus'
 --
 -- * 'ddrsDomainInfo'
 --
 -- * 'ddrsConfiguration'
 describeDomainResponse
-    :: Int -- ^ 'ddrsStatus'
+    :: Int -- ^ 'ddrsResponseStatus'
     -> DomainInfo -- ^ 'ddrsDomainInfo'
     -> DomainConfiguration -- ^ 'ddrsConfiguration'
     -> DescribeDomainResponse
-describeDomainResponse pStatus_ pDomainInfo_ pConfiguration_ =
+describeDomainResponse pResponseStatus_ pDomainInfo_ pConfiguration_ =
     DescribeDomainResponse'
-    { _ddrsStatus = pStatus_
+    { _ddrsResponseStatus = pResponseStatus_
     , _ddrsDomainInfo = pDomainInfo_
     , _ddrsConfiguration = pConfiguration_
     }
 
 -- | The response status code.
-ddrsStatus :: Lens' DescribeDomainResponse Int
-ddrsStatus = lens _ddrsStatus (\ s a -> s{_ddrsStatus = a});
+ddrsResponseStatus :: Lens' DescribeDomainResponse Int
+ddrsResponseStatus = lens _ddrsResponseStatus (\ s a -> s{_ddrsResponseStatus = a});
 
 -- | Undocumented member.
 ddrsDomainInfo :: Lens' DescribeDomainResponse DomainInfo
diff --git a/gen/Network/AWS/SWF/DescribeWorkflowExecution.hs b/gen/Network/AWS/SWF/DescribeWorkflowExecution.hs
--- a/gen/Network/AWS/SWF/DescribeWorkflowExecution.hs
+++ b/gen/Network/AWS/SWF/DescribeWorkflowExecution.hs
@@ -58,7 +58,7 @@
     -- * Response Lenses
     , dwersLatestActivityTaskTimestamp
     , dwersLatestExecutionContext
-    , dwersStatus
+    , dwersResponseStatus
     , dwersExecutionInfo
     , dwersExecutionConfiguration
     , dwersOpenCounts
@@ -145,7 +145,7 @@
 data DescribeWorkflowExecutionResponse = DescribeWorkflowExecutionResponse'
     { _dwersLatestActivityTaskTimestamp :: !(Maybe POSIX)
     , _dwersLatestExecutionContext      :: !(Maybe Text)
-    , _dwersStatus                      :: !Int
+    , _dwersResponseStatus              :: !Int
     , _dwersExecutionInfo               :: !WorkflowExecutionInfo
     , _dwersExecutionConfiguration      :: !WorkflowExecutionConfiguration
     , _dwersOpenCounts                  :: !WorkflowExecutionOpenCounts
@@ -159,7 +159,7 @@
 --
 -- * 'dwersLatestExecutionContext'
 --
--- * 'dwersStatus'
+-- * 'dwersResponseStatus'
 --
 -- * 'dwersExecutionInfo'
 --
@@ -167,16 +167,16 @@
 --
 -- * 'dwersOpenCounts'
 describeWorkflowExecutionResponse
-    :: Int -- ^ 'dwersStatus'
+    :: Int -- ^ 'dwersResponseStatus'
     -> WorkflowExecutionInfo -- ^ 'dwersExecutionInfo'
     -> WorkflowExecutionConfiguration -- ^ 'dwersExecutionConfiguration'
     -> WorkflowExecutionOpenCounts -- ^ 'dwersOpenCounts'
     -> DescribeWorkflowExecutionResponse
-describeWorkflowExecutionResponse pStatus_ pExecutionInfo_ pExecutionConfiguration_ pOpenCounts_ =
+describeWorkflowExecutionResponse pResponseStatus_ pExecutionInfo_ pExecutionConfiguration_ pOpenCounts_ =
     DescribeWorkflowExecutionResponse'
     { _dwersLatestActivityTaskTimestamp = Nothing
     , _dwersLatestExecutionContext = Nothing
-    , _dwersStatus = pStatus_
+    , _dwersResponseStatus = pResponseStatus_
     , _dwersExecutionInfo = pExecutionInfo_
     , _dwersExecutionConfiguration = pExecutionConfiguration_
     , _dwersOpenCounts = pOpenCounts_
@@ -196,8 +196,8 @@
 dwersLatestExecutionContext = lens _dwersLatestExecutionContext (\ s a -> s{_dwersLatestExecutionContext = a});
 
 -- | The response status code.
-dwersStatus :: Lens' DescribeWorkflowExecutionResponse Int
-dwersStatus = lens _dwersStatus (\ s a -> s{_dwersStatus = a});
+dwersResponseStatus :: Lens' DescribeWorkflowExecutionResponse Int
+dwersResponseStatus = lens _dwersResponseStatus (\ s a -> s{_dwersResponseStatus = a});
 
 -- | Information about the workflow execution.
 dwersExecutionInfo :: Lens' DescribeWorkflowExecutionResponse WorkflowExecutionInfo
diff --git a/gen/Network/AWS/SWF/DescribeWorkflowType.hs b/gen/Network/AWS/SWF/DescribeWorkflowType.hs
--- a/gen/Network/AWS/SWF/DescribeWorkflowType.hs
+++ b/gen/Network/AWS/SWF/DescribeWorkflowType.hs
@@ -59,7 +59,7 @@
     , describeWorkflowTypeResponse
     , DescribeWorkflowTypeResponse
     -- * Response Lenses
-    , dwtrsStatus
+    , dwtrsResponseStatus
     , dwtrsTypeInfo
     , dwtrsConfiguration
     ) where
@@ -139,35 +139,35 @@
 --
 -- /See:/ 'describeWorkflowTypeResponse' smart constructor.
 data DescribeWorkflowTypeResponse = DescribeWorkflowTypeResponse'
-    { _dwtrsStatus        :: !Int
-    , _dwtrsTypeInfo      :: !WorkflowTypeInfo
-    , _dwtrsConfiguration :: !WorkflowTypeConfiguration
+    { _dwtrsResponseStatus :: !Int
+    , _dwtrsTypeInfo       :: !WorkflowTypeInfo
+    , _dwtrsConfiguration  :: !WorkflowTypeConfiguration
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'DescribeWorkflowTypeResponse' with the minimum fields required to make a request.
 --
 -- Use one of the following lenses to modify other fields as desired:
 --
--- * 'dwtrsStatus'
+-- * 'dwtrsResponseStatus'
 --
 -- * 'dwtrsTypeInfo'
 --
 -- * 'dwtrsConfiguration'
 describeWorkflowTypeResponse
-    :: Int -- ^ 'dwtrsStatus'
+    :: Int -- ^ 'dwtrsResponseStatus'
     -> WorkflowTypeInfo -- ^ 'dwtrsTypeInfo'
     -> WorkflowTypeConfiguration -- ^ 'dwtrsConfiguration'
     -> DescribeWorkflowTypeResponse
-describeWorkflowTypeResponse pStatus_ pTypeInfo_ pConfiguration_ =
+describeWorkflowTypeResponse pResponseStatus_ pTypeInfo_ pConfiguration_ =
     DescribeWorkflowTypeResponse'
-    { _dwtrsStatus = pStatus_
+    { _dwtrsResponseStatus = pResponseStatus_
     , _dwtrsTypeInfo = pTypeInfo_
     , _dwtrsConfiguration = pConfiguration_
     }
 
 -- | The response status code.
-dwtrsStatus :: Lens' DescribeWorkflowTypeResponse Int
-dwtrsStatus = lens _dwtrsStatus (\ s a -> s{_dwtrsStatus = a});
+dwtrsResponseStatus :: Lens' DescribeWorkflowTypeResponse Int
+dwtrsResponseStatus = lens _dwtrsResponseStatus (\ s a -> s{_dwtrsResponseStatus = a});
 
 -- | General information about the workflow type.
 --
diff --git a/gen/Network/AWS/SWF/GetWorkflowExecutionHistory.hs b/gen/Network/AWS/SWF/GetWorkflowExecutionHistory.hs
--- a/gen/Network/AWS/SWF/GetWorkflowExecutionHistory.hs
+++ b/gen/Network/AWS/SWF/GetWorkflowExecutionHistory.hs
@@ -63,7 +63,7 @@
     , GetWorkflowExecutionHistoryResponse
     -- * Response Lenses
     , gwehrsNextPageToken
-    , gwehrsStatus
+    , gwehrsResponseStatus
     , gwehrsEvents
     ) where
 
@@ -194,9 +194,9 @@
 --
 -- /See:/ 'getWorkflowExecutionHistoryResponse' smart constructor.
 data GetWorkflowExecutionHistoryResponse = GetWorkflowExecutionHistoryResponse'
-    { _gwehrsNextPageToken :: !(Maybe Text)
-    , _gwehrsStatus        :: !Int
-    , _gwehrsEvents        :: ![HistoryEvent]
+    { _gwehrsNextPageToken  :: !(Maybe Text)
+    , _gwehrsResponseStatus :: !Int
+    , _gwehrsEvents         :: ![HistoryEvent]
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'GetWorkflowExecutionHistoryResponse' with the minimum fields required to make a request.
@@ -205,16 +205,16 @@
 --
 -- * 'gwehrsNextPageToken'
 --
--- * 'gwehrsStatus'
+-- * 'gwehrsResponseStatus'
 --
 -- * 'gwehrsEvents'
 getWorkflowExecutionHistoryResponse
-    :: Int -- ^ 'gwehrsStatus'
+    :: Int -- ^ 'gwehrsResponseStatus'
     -> GetWorkflowExecutionHistoryResponse
-getWorkflowExecutionHistoryResponse pStatus_ =
+getWorkflowExecutionHistoryResponse pResponseStatus_ =
     GetWorkflowExecutionHistoryResponse'
     { _gwehrsNextPageToken = Nothing
-    , _gwehrsStatus = pStatus_
+    , _gwehrsResponseStatus = pResponseStatus_
     , _gwehrsEvents = mempty
     }
 
@@ -229,8 +229,8 @@
 gwehrsNextPageToken = lens _gwehrsNextPageToken (\ s a -> s{_gwehrsNextPageToken = a});
 
 -- | The response status code.
-gwehrsStatus :: Lens' GetWorkflowExecutionHistoryResponse Int
-gwehrsStatus = lens _gwehrsStatus (\ s a -> s{_gwehrsStatus = a});
+gwehrsResponseStatus :: Lens' GetWorkflowExecutionHistoryResponse Int
+gwehrsResponseStatus = lens _gwehrsResponseStatus (\ s a -> s{_gwehrsResponseStatus = a});
 
 -- | The list of history events.
 gwehrsEvents :: Lens' GetWorkflowExecutionHistoryResponse [HistoryEvent]
diff --git a/gen/Network/AWS/SWF/ListActivityTypes.hs b/gen/Network/AWS/SWF/ListActivityTypes.hs
--- a/gen/Network/AWS/SWF/ListActivityTypes.hs
+++ b/gen/Network/AWS/SWF/ListActivityTypes.hs
@@ -64,7 +64,7 @@
     , ListActivityTypesResponse
     -- * Response Lenses
     , latrsNextPageToken
-    , latrsStatus
+    , latrsResponseStatus
     , latrsTypeInfos
     ) where
 
@@ -202,9 +202,9 @@
 --
 -- /See:/ 'listActivityTypesResponse' smart constructor.
 data ListActivityTypesResponse = ListActivityTypesResponse'
-    { _latrsNextPageToken :: !(Maybe Text)
-    , _latrsStatus        :: !Int
-    , _latrsTypeInfos     :: ![ActivityTypeInfo]
+    { _latrsNextPageToken  :: !(Maybe Text)
+    , _latrsResponseStatus :: !Int
+    , _latrsTypeInfos      :: ![ActivityTypeInfo]
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'ListActivityTypesResponse' with the minimum fields required to make a request.
@@ -213,16 +213,16 @@
 --
 -- * 'latrsNextPageToken'
 --
--- * 'latrsStatus'
+-- * 'latrsResponseStatus'
 --
 -- * 'latrsTypeInfos'
 listActivityTypesResponse
-    :: Int -- ^ 'latrsStatus'
+    :: Int -- ^ 'latrsResponseStatus'
     -> ListActivityTypesResponse
-listActivityTypesResponse pStatus_ =
+listActivityTypesResponse pResponseStatus_ =
     ListActivityTypesResponse'
     { _latrsNextPageToken = Nothing
-    , _latrsStatus = pStatus_
+    , _latrsResponseStatus = pResponseStatus_
     , _latrsTypeInfos = mempty
     }
 
@@ -237,8 +237,8 @@
 latrsNextPageToken = lens _latrsNextPageToken (\ s a -> s{_latrsNextPageToken = a});
 
 -- | The response status code.
-latrsStatus :: Lens' ListActivityTypesResponse Int
-latrsStatus = lens _latrsStatus (\ s a -> s{_latrsStatus = a});
+latrsResponseStatus :: Lens' ListActivityTypesResponse Int
+latrsResponseStatus = lens _latrsResponseStatus (\ s a -> s{_latrsResponseStatus = a});
 
 -- | List of activity type information.
 latrsTypeInfos :: Lens' ListActivityTypesResponse [ActivityTypeInfo]
diff --git a/gen/Network/AWS/SWF/ListClosedWorkflowExecutions.hs b/gen/Network/AWS/SWF/ListClosedWorkflowExecutions.hs
--- a/gen/Network/AWS/SWF/ListClosedWorkflowExecutions.hs
+++ b/gen/Network/AWS/SWF/ListClosedWorkflowExecutions.hs
@@ -61,8 +61,8 @@
     , ListClosedWorkflowExecutions
     -- * Request Lenses
     , lcweNextPageToken
-    , lcweCloseStatusFilter
     , lcweExecutionFilter
+    , lcweCloseStatusFilter
     , lcweTypeFilter
     , lcweCloseTimeFilter
     , lcweReverseOrder
@@ -89,8 +89,8 @@
 -- | /See:/ 'listClosedWorkflowExecutions' smart constructor.
 data ListClosedWorkflowExecutions = ListClosedWorkflowExecutions'
     { _lcweNextPageToken     :: !(Maybe Text)
-    , _lcweCloseStatusFilter :: !(Maybe CloseStatusFilter)
     , _lcweExecutionFilter   :: !(Maybe WorkflowExecutionFilter)
+    , _lcweCloseStatusFilter :: !(Maybe CloseStatusFilter)
     , _lcweTypeFilter        :: !(Maybe WorkflowTypeFilter)
     , _lcweCloseTimeFilter   :: !(Maybe ExecutionTimeFilter)
     , _lcweReverseOrder      :: !(Maybe Bool)
@@ -106,10 +106,10 @@
 --
 -- * 'lcweNextPageToken'
 --
--- * 'lcweCloseStatusFilter'
---
 -- * 'lcweExecutionFilter'
 --
+-- * 'lcweCloseStatusFilter'
+--
 -- * 'lcweTypeFilter'
 --
 -- * 'lcweCloseTimeFilter'
@@ -129,8 +129,8 @@
 listClosedWorkflowExecutions pDomain_ =
     ListClosedWorkflowExecutions'
     { _lcweNextPageToken = Nothing
-    , _lcweCloseStatusFilter = Nothing
     , _lcweExecutionFilter = Nothing
+    , _lcweCloseStatusFilter = Nothing
     , _lcweTypeFilter = Nothing
     , _lcweCloseTimeFilter = Nothing
     , _lcweReverseOrder = Nothing
@@ -150,6 +150,14 @@
 lcweNextPageToken :: Lens' ListClosedWorkflowExecutions (Maybe Text)
 lcweNextPageToken = lens _lcweNextPageToken (\ s a -> s{_lcweNextPageToken = a});
 
+-- | If specified, only workflow executions matching the workflow ID
+-- specified in the filter are returned.
+--
+-- 'closeStatusFilter', 'executionFilter', 'typeFilter' and 'tagFilter' are
+-- mutually exclusive. You can specify at most one of these in a request.
+lcweExecutionFilter :: Lens' ListClosedWorkflowExecutions (Maybe WorkflowExecutionFilter)
+lcweExecutionFilter = lens _lcweExecutionFilter (\ s a -> s{_lcweExecutionFilter = a});
+
 -- | If specified, only workflow executions that match this /close status/
 -- are listed. For example, if TERMINATED is specified, then only
 -- TERMINATED workflow executions are listed.
@@ -159,14 +167,6 @@
 lcweCloseStatusFilter :: Lens' ListClosedWorkflowExecutions (Maybe CloseStatusFilter)
 lcweCloseStatusFilter = lens _lcweCloseStatusFilter (\ s a -> s{_lcweCloseStatusFilter = a});
 
--- | If specified, only workflow executions matching the workflow ID
--- specified in the filter are returned.
---
--- 'closeStatusFilter', 'executionFilter', 'typeFilter' and 'tagFilter' are
--- mutually exclusive. You can specify at most one of these in a request.
-lcweExecutionFilter :: Lens' ListClosedWorkflowExecutions (Maybe WorkflowExecutionFilter)
-lcweExecutionFilter = lens _lcweExecutionFilter (\ s a -> s{_lcweExecutionFilter = a});
-
 -- | If specified, only executions of the type specified in the filter are
 -- returned.
 --
@@ -252,8 +252,8 @@
           = object
               (catMaybes
                  [("nextPageToken" .=) <$> _lcweNextPageToken,
-                  ("closeStatusFilter" .=) <$> _lcweCloseStatusFilter,
                   ("executionFilter" .=) <$> _lcweExecutionFilter,
+                  ("closeStatusFilter" .=) <$> _lcweCloseStatusFilter,
                   ("typeFilter" .=) <$> _lcweTypeFilter,
                   ("closeTimeFilter" .=) <$> _lcweCloseTimeFilter,
                   ("reverseOrder" .=) <$> _lcweReverseOrder,
diff --git a/gen/Network/AWS/SWF/ListDomains.hs b/gen/Network/AWS/SWF/ListDomains.hs
--- a/gen/Network/AWS/SWF/ListDomains.hs
+++ b/gen/Network/AWS/SWF/ListDomains.hs
@@ -64,7 +64,7 @@
     , ListDomainsResponse
     -- * Response Lenses
     , ldrsNextPageToken
-    , ldrsStatus
+    , ldrsResponseStatus
     , ldrsDomainInfos
     ) where
 
@@ -182,9 +182,9 @@
 --
 -- /See:/ 'listDomainsResponse' smart constructor.
 data ListDomainsResponse = ListDomainsResponse'
-    { _ldrsNextPageToken :: !(Maybe Text)
-    , _ldrsStatus        :: !Int
-    , _ldrsDomainInfos   :: ![DomainInfo]
+    { _ldrsNextPageToken  :: !(Maybe Text)
+    , _ldrsResponseStatus :: !Int
+    , _ldrsDomainInfos    :: ![DomainInfo]
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'ListDomainsResponse' with the minimum fields required to make a request.
@@ -193,16 +193,16 @@
 --
 -- * 'ldrsNextPageToken'
 --
--- * 'ldrsStatus'
+-- * 'ldrsResponseStatus'
 --
 -- * 'ldrsDomainInfos'
 listDomainsResponse
-    :: Int -- ^ 'ldrsStatus'
+    :: Int -- ^ 'ldrsResponseStatus'
     -> ListDomainsResponse
-listDomainsResponse pStatus_ =
+listDomainsResponse pResponseStatus_ =
     ListDomainsResponse'
     { _ldrsNextPageToken = Nothing
-    , _ldrsStatus = pStatus_
+    , _ldrsResponseStatus = pResponseStatus_
     , _ldrsDomainInfos = mempty
     }
 
@@ -217,8 +217,8 @@
 ldrsNextPageToken = lens _ldrsNextPageToken (\ s a -> s{_ldrsNextPageToken = a});
 
 -- | The response status code.
-ldrsStatus :: Lens' ListDomainsResponse Int
-ldrsStatus = lens _ldrsStatus (\ s a -> s{_ldrsStatus = a});
+ldrsResponseStatus :: Lens' ListDomainsResponse Int
+ldrsResponseStatus = lens _ldrsResponseStatus (\ s a -> s{_ldrsResponseStatus = a});
 
 -- | A list of DomainInfo structures.
 ldrsDomainInfos :: Lens' ListDomainsResponse [DomainInfo]
diff --git a/gen/Network/AWS/SWF/ListWorkflowTypes.hs b/gen/Network/AWS/SWF/ListWorkflowTypes.hs
--- a/gen/Network/AWS/SWF/ListWorkflowTypes.hs
+++ b/gen/Network/AWS/SWF/ListWorkflowTypes.hs
@@ -61,7 +61,7 @@
     , ListWorkflowTypesResponse
     -- * Response Lenses
     , lwtrsNextPageToken
-    , lwtrsStatus
+    , lwtrsResponseStatus
     , lwtrsTypeInfos
     ) where
 
@@ -200,9 +200,9 @@
 --
 -- /See:/ 'listWorkflowTypesResponse' smart constructor.
 data ListWorkflowTypesResponse = ListWorkflowTypesResponse'
-    { _lwtrsNextPageToken :: !(Maybe Text)
-    , _lwtrsStatus        :: !Int
-    , _lwtrsTypeInfos     :: ![WorkflowTypeInfo]
+    { _lwtrsNextPageToken  :: !(Maybe Text)
+    , _lwtrsResponseStatus :: !Int
+    , _lwtrsTypeInfos      :: ![WorkflowTypeInfo]
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'ListWorkflowTypesResponse' with the minimum fields required to make a request.
@@ -211,16 +211,16 @@
 --
 -- * 'lwtrsNextPageToken'
 --
--- * 'lwtrsStatus'
+-- * 'lwtrsResponseStatus'
 --
 -- * 'lwtrsTypeInfos'
 listWorkflowTypesResponse
-    :: Int -- ^ 'lwtrsStatus'
+    :: Int -- ^ 'lwtrsResponseStatus'
     -> ListWorkflowTypesResponse
-listWorkflowTypesResponse pStatus_ =
+listWorkflowTypesResponse pResponseStatus_ =
     ListWorkflowTypesResponse'
     { _lwtrsNextPageToken = Nothing
-    , _lwtrsStatus = pStatus_
+    , _lwtrsResponseStatus = pResponseStatus_
     , _lwtrsTypeInfos = mempty
     }
 
@@ -235,8 +235,8 @@
 lwtrsNextPageToken = lens _lwtrsNextPageToken (\ s a -> s{_lwtrsNextPageToken = a});
 
 -- | The response status code.
-lwtrsStatus :: Lens' ListWorkflowTypesResponse Int
-lwtrsStatus = lens _lwtrsStatus (\ s a -> s{_lwtrsStatus = a});
+lwtrsResponseStatus :: Lens' ListWorkflowTypesResponse Int
+lwtrsResponseStatus = lens _lwtrsResponseStatus (\ s a -> s{_lwtrsResponseStatus = a});
 
 -- | The list of workflow type information.
 lwtrsTypeInfos :: Lens' ListWorkflowTypesResponse [WorkflowTypeInfo]
diff --git a/gen/Network/AWS/SWF/PollForActivityTask.hs b/gen/Network/AWS/SWF/PollForActivityTask.hs
--- a/gen/Network/AWS/SWF/PollForActivityTask.hs
+++ b/gen/Network/AWS/SWF/PollForActivityTask.hs
@@ -68,7 +68,7 @@
     , PollForActivityTaskResponse
     -- * Response Lenses
     , pfatrsInput
-    , pfatrsStatus
+    , pfatrsResponseStatus
     , pfatrsTaskToken
     , pfatrsActivityId
     , pfatrsStartedEventId
@@ -173,7 +173,7 @@
 -- /See:/ 'pollForActivityTaskResponse' smart constructor.
 data PollForActivityTaskResponse = PollForActivityTaskResponse'
     { _pfatrsInput             :: !(Maybe Text)
-    , _pfatrsStatus            :: !Int
+    , _pfatrsResponseStatus    :: !Int
     , _pfatrsTaskToken         :: !Text
     , _pfatrsActivityId        :: !Text
     , _pfatrsStartedEventId    :: !Integer
@@ -187,7 +187,7 @@
 --
 -- * 'pfatrsInput'
 --
--- * 'pfatrsStatus'
+-- * 'pfatrsResponseStatus'
 --
 -- * 'pfatrsTaskToken'
 --
@@ -199,17 +199,17 @@
 --
 -- * 'pfatrsActivityType'
 pollForActivityTaskResponse
-    :: Int -- ^ 'pfatrsStatus'
+    :: Int -- ^ 'pfatrsResponseStatus'
     -> Text -- ^ 'pfatrsTaskToken'
     -> Text -- ^ 'pfatrsActivityId'
     -> Integer -- ^ 'pfatrsStartedEventId'
     -> WorkflowExecution -- ^ 'pfatrsWorkflowExecution'
     -> ActivityType -- ^ 'pfatrsActivityType'
     -> PollForActivityTaskResponse
-pollForActivityTaskResponse pStatus_ pTaskToken_ pActivityId_ pStartedEventId_ pWorkflowExecution_ pActivityType_ =
+pollForActivityTaskResponse pResponseStatus_ pTaskToken_ pActivityId_ pStartedEventId_ pWorkflowExecution_ pActivityType_ =
     PollForActivityTaskResponse'
     { _pfatrsInput = Nothing
-    , _pfatrsStatus = pStatus_
+    , _pfatrsResponseStatus = pResponseStatus_
     , _pfatrsTaskToken = pTaskToken_
     , _pfatrsActivityId = pActivityId_
     , _pfatrsStartedEventId = pStartedEventId_
@@ -224,8 +224,8 @@
 pfatrsInput = lens _pfatrsInput (\ s a -> s{_pfatrsInput = a});
 
 -- | The response status code.
-pfatrsStatus :: Lens' PollForActivityTaskResponse Int
-pfatrsStatus = lens _pfatrsStatus (\ s a -> s{_pfatrsStatus = a});
+pfatrsResponseStatus :: Lens' PollForActivityTaskResponse Int
+pfatrsResponseStatus = lens _pfatrsResponseStatus (\ s a -> s{_pfatrsResponseStatus = a});
 
 -- | The opaque string used as a handle on the task. This token is used by
 -- workers to communicate progress and response information back to the
diff --git a/gen/Network/AWS/SWF/PollForDecisionTask.hs b/gen/Network/AWS/SWF/PollForDecisionTask.hs
--- a/gen/Network/AWS/SWF/PollForDecisionTask.hs
+++ b/gen/Network/AWS/SWF/PollForDecisionTask.hs
@@ -74,8 +74,8 @@
     -- * Request Lenses
     , pfdtNextPageToken
     , pfdtReverseOrder
-    , pfdtIdentity
     , pfdtMaximumPageSize
+    , pfdtIdentity
     , pfdtDomain
     , pfdtTaskList
 
@@ -85,7 +85,7 @@
     -- * Response Lenses
     , pfdtrsNextPageToken
     , pfdtrsPreviousStartedEventId
-    , pfdtrsStatus
+    , pfdtrsResponseStatus
     , pfdtrsTaskToken
     , pfdtrsStartedEventId
     , pfdtrsWorkflowExecution
@@ -104,8 +104,8 @@
 data PollForDecisionTask = PollForDecisionTask'
     { _pfdtNextPageToken   :: !(Maybe Text)
     , _pfdtReverseOrder    :: !(Maybe Bool)
-    , _pfdtIdentity        :: !(Maybe Text)
     , _pfdtMaximumPageSize :: !(Maybe Nat)
+    , _pfdtIdentity        :: !(Maybe Text)
     , _pfdtDomain          :: !Text
     , _pfdtTaskList        :: !TaskList
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
@@ -118,10 +118,10 @@
 --
 -- * 'pfdtReverseOrder'
 --
--- * 'pfdtIdentity'
---
 -- * 'pfdtMaximumPageSize'
 --
+-- * 'pfdtIdentity'
+--
 -- * 'pfdtDomain'
 --
 -- * 'pfdtTaskList'
@@ -133,8 +133,8 @@
     PollForDecisionTask'
     { _pfdtNextPageToken = Nothing
     , _pfdtReverseOrder = Nothing
-    , _pfdtIdentity = Nothing
     , _pfdtMaximumPageSize = Nothing
+    , _pfdtIdentity = Nothing
     , _pfdtDomain = pDomain_
     , _pfdtTaskList = pTaskList_
     }
@@ -163,13 +163,6 @@
 pfdtReverseOrder :: Lens' PollForDecisionTask (Maybe Bool)
 pfdtReverseOrder = lens _pfdtReverseOrder (\ s a -> s{_pfdtReverseOrder = a});
 
--- | Identity of the decider making the request, which is recorded in the
--- DecisionTaskStarted event in the workflow history. This enables
--- diagnostic tracing when problems arise. The form of this identity is
--- user defined.
-pfdtIdentity :: Lens' PollForDecisionTask (Maybe Text)
-pfdtIdentity = lens _pfdtIdentity (\ s a -> s{_pfdtIdentity = a});
-
 -- | The maximum number of results that will be returned per call.
 -- 'nextPageToken' can be used to obtain futher pages of results. The
 -- default is 1000, which is the maximum allowed page size. You can,
@@ -180,6 +173,13 @@
 pfdtMaximumPageSize :: Lens' PollForDecisionTask (Maybe Natural)
 pfdtMaximumPageSize = lens _pfdtMaximumPageSize (\ s a -> s{_pfdtMaximumPageSize = a}) . mapping _Nat;
 
+-- | Identity of the decider making the request, which is recorded in the
+-- DecisionTaskStarted event in the workflow history. This enables
+-- diagnostic tracing when problems arise. The form of this identity is
+-- user defined.
+pfdtIdentity :: Lens' PollForDecisionTask (Maybe Text)
+pfdtIdentity = lens _pfdtIdentity (\ s a -> s{_pfdtIdentity = a});
+
 -- | The name of the domain containing the task lists to poll.
 pfdtDomain :: Lens' PollForDecisionTask Text
 pfdtDomain = lens _pfdtDomain (\ s a -> s{_pfdtDomain = a});
@@ -234,8 +234,8 @@
               (catMaybes
                  [("nextPageToken" .=) <$> _pfdtNextPageToken,
                   ("reverseOrder" .=) <$> _pfdtReverseOrder,
-                  ("identity" .=) <$> _pfdtIdentity,
                   ("maximumPageSize" .=) <$> _pfdtMaximumPageSize,
+                  ("identity" .=) <$> _pfdtIdentity,
                   Just ("domain" .= _pfdtDomain),
                   Just ("taskList" .= _pfdtTaskList)])
 
@@ -252,7 +252,7 @@
 data PollForDecisionTaskResponse = PollForDecisionTaskResponse'
     { _pfdtrsNextPageToken          :: !(Maybe Text)
     , _pfdtrsPreviousStartedEventId :: !(Maybe Integer)
-    , _pfdtrsStatus                 :: !Int
+    , _pfdtrsResponseStatus         :: !Int
     , _pfdtrsTaskToken              :: !Text
     , _pfdtrsStartedEventId         :: !Integer
     , _pfdtrsWorkflowExecution      :: !WorkflowExecution
@@ -268,7 +268,7 @@
 --
 -- * 'pfdtrsPreviousStartedEventId'
 --
--- * 'pfdtrsStatus'
+-- * 'pfdtrsResponseStatus'
 --
 -- * 'pfdtrsTaskToken'
 --
@@ -280,17 +280,17 @@
 --
 -- * 'pfdtrsEvents'
 pollForDecisionTaskResponse
-    :: Int -- ^ 'pfdtrsStatus'
+    :: Int -- ^ 'pfdtrsResponseStatus'
     -> Text -- ^ 'pfdtrsTaskToken'
     -> Integer -- ^ 'pfdtrsStartedEventId'
     -> WorkflowExecution -- ^ 'pfdtrsWorkflowExecution'
     -> WorkflowType -- ^ 'pfdtrsWorkflowType'
     -> PollForDecisionTaskResponse
-pollForDecisionTaskResponse pStatus_ pTaskToken_ pStartedEventId_ pWorkflowExecution_ pWorkflowType_ =
+pollForDecisionTaskResponse pResponseStatus_ pTaskToken_ pStartedEventId_ pWorkflowExecution_ pWorkflowType_ =
     PollForDecisionTaskResponse'
     { _pfdtrsNextPageToken = Nothing
     , _pfdtrsPreviousStartedEventId = Nothing
-    , _pfdtrsStatus = pStatus_
+    , _pfdtrsResponseStatus = pResponseStatus_
     , _pfdtrsTaskToken = pTaskToken_
     , _pfdtrsStartedEventId = pStartedEventId_
     , _pfdtrsWorkflowExecution = pWorkflowExecution_
@@ -316,8 +316,8 @@
 pfdtrsPreviousStartedEventId = lens _pfdtrsPreviousStartedEventId (\ s a -> s{_pfdtrsPreviousStartedEventId = a});
 
 -- | The response status code.
-pfdtrsStatus :: Lens' PollForDecisionTaskResponse Int
-pfdtrsStatus = lens _pfdtrsStatus (\ s a -> s{_pfdtrsStatus = a});
+pfdtrsResponseStatus :: Lens' PollForDecisionTaskResponse Int
+pfdtrsResponseStatus = lens _pfdtrsResponseStatus (\ s a -> s{_pfdtrsResponseStatus = a});
 
 -- | The opaque string used as a handle on the task. This token is used by
 -- workers to communicate progress and response information back to the
diff --git a/gen/Network/AWS/SWF/RecordActivityTaskHeartbeat.hs b/gen/Network/AWS/SWF/RecordActivityTaskHeartbeat.hs
--- a/gen/Network/AWS/SWF/RecordActivityTaskHeartbeat.hs
+++ b/gen/Network/AWS/SWF/RecordActivityTaskHeartbeat.hs
@@ -81,7 +81,7 @@
     , recordActivityTaskHeartbeatResponse
     , RecordActivityTaskHeartbeatResponse
     -- * Response Lenses
-    , rathrsStatus
+    , rathrsResponseStatus
     , rathrsCancelRequested
     ) where
 
@@ -163,7 +163,7 @@
 --
 -- /See:/ 'recordActivityTaskHeartbeatResponse' smart constructor.
 data RecordActivityTaskHeartbeatResponse = RecordActivityTaskHeartbeatResponse'
-    { _rathrsStatus          :: !Int
+    { _rathrsResponseStatus  :: !Int
     , _rathrsCancelRequested :: !Bool
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
@@ -171,22 +171,22 @@
 --
 -- Use one of the following lenses to modify other fields as desired:
 --
--- * 'rathrsStatus'
+-- * 'rathrsResponseStatus'
 --
 -- * 'rathrsCancelRequested'
 recordActivityTaskHeartbeatResponse
-    :: Int -- ^ 'rathrsStatus'
+    :: Int -- ^ 'rathrsResponseStatus'
     -> Bool -- ^ 'rathrsCancelRequested'
     -> RecordActivityTaskHeartbeatResponse
-recordActivityTaskHeartbeatResponse pStatus_ pCancelRequested_ =
+recordActivityTaskHeartbeatResponse pResponseStatus_ pCancelRequested_ =
     RecordActivityTaskHeartbeatResponse'
-    { _rathrsStatus = pStatus_
+    { _rathrsResponseStatus = pResponseStatus_
     , _rathrsCancelRequested = pCancelRequested_
     }
 
 -- | The response status code.
-rathrsStatus :: Lens' RecordActivityTaskHeartbeatResponse Int
-rathrsStatus = lens _rathrsStatus (\ s a -> s{_rathrsStatus = a});
+rathrsResponseStatus :: Lens' RecordActivityTaskHeartbeatResponse Int
+rathrsResponseStatus = lens _rathrsResponseStatus (\ s a -> s{_rathrsResponseStatus = a});
 
 -- | Set to 'true' if cancellation of the task is requested.
 rathrsCancelRequested :: Lens' RecordActivityTaskHeartbeatResponse Bool
diff --git a/gen/Network/AWS/SWF/StartWorkflowExecution.hs b/gen/Network/AWS/SWF/StartWorkflowExecution.hs
--- a/gen/Network/AWS/SWF/StartWorkflowExecution.hs
+++ b/gen/Network/AWS/SWF/StartWorkflowExecution.hs
@@ -76,7 +76,7 @@
     , StartWorkflowExecutionResponse
     -- * Response Lenses
     , swersRunId
-    , swersStatus
+    , swersResponseStatus
     ) where
 
 import           Network.AWS.Prelude
@@ -321,8 +321,8 @@
 --
 -- /See:/ 'startWorkflowExecutionResponse' smart constructor.
 data StartWorkflowExecutionResponse = StartWorkflowExecutionResponse'
-    { _swersRunId  :: !(Maybe Text)
-    , _swersStatus :: !Int
+    { _swersRunId          :: !(Maybe Text)
+    , _swersResponseStatus :: !Int
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'StartWorkflowExecutionResponse' with the minimum fields required to make a request.
@@ -331,14 +331,14 @@
 --
 -- * 'swersRunId'
 --
--- * 'swersStatus'
+-- * 'swersResponseStatus'
 startWorkflowExecutionResponse
-    :: Int -- ^ 'swersStatus'
+    :: Int -- ^ 'swersResponseStatus'
     -> StartWorkflowExecutionResponse
-startWorkflowExecutionResponse pStatus_ =
+startWorkflowExecutionResponse pResponseStatus_ =
     StartWorkflowExecutionResponse'
     { _swersRunId = Nothing
-    , _swersStatus = pStatus_
+    , _swersResponseStatus = pResponseStatus_
     }
 
 -- | The 'runId' of a workflow execution. This ID is generated by the service
@@ -348,5 +348,5 @@
 swersRunId = lens _swersRunId (\ s a -> s{_swersRunId = a});
 
 -- | The response status code.
-swersStatus :: Lens' StartWorkflowExecutionResponse Int
-swersStatus = lens _swersStatus (\ s a -> s{_swersStatus = a});
+swersResponseStatus :: Lens' StartWorkflowExecutionResponse Int
+swersResponseStatus = lens _swersResponseStatus (\ s a -> s{_swersResponseStatus = a});
diff --git a/gen/Network/AWS/SWF/TerminateWorkflowExecution.hs b/gen/Network/AWS/SWF/TerminateWorkflowExecution.hs
--- a/gen/Network/AWS/SWF/TerminateWorkflowExecution.hs
+++ b/gen/Network/AWS/SWF/TerminateWorkflowExecution.hs
@@ -60,10 +60,10 @@
       terminateWorkflowExecution
     , TerminateWorkflowExecution
     -- * Request Lenses
-    , tweRunId
     , tweReason
-    , tweDetails
+    , tweRunId
     , tweChildPolicy
+    , tweDetails
     , tweDomain
     , tweWorkflowId
 
@@ -80,10 +80,10 @@
 
 -- | /See:/ 'terminateWorkflowExecution' smart constructor.
 data TerminateWorkflowExecution = TerminateWorkflowExecution'
-    { _tweRunId       :: !(Maybe Text)
-    , _tweReason      :: !(Maybe Text)
-    , _tweDetails     :: !(Maybe Text)
+    { _tweReason      :: !(Maybe Text)
+    , _tweRunId       :: !(Maybe Text)
     , _tweChildPolicy :: !(Maybe ChildPolicy)
+    , _tweDetails     :: !(Maybe Text)
     , _tweDomain      :: !Text
     , _tweWorkflowId  :: !Text
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
@@ -92,14 +92,14 @@
 --
 -- Use one of the following lenses to modify other fields as desired:
 --
--- * 'tweRunId'
---
 -- * 'tweReason'
 --
--- * 'tweDetails'
+-- * 'tweRunId'
 --
 -- * 'tweChildPolicy'
 --
+-- * 'tweDetails'
+--
 -- * 'tweDomain'
 --
 -- * 'tweWorkflowId'
@@ -109,25 +109,21 @@
     -> TerminateWorkflowExecution
 terminateWorkflowExecution pDomain_ pWorkflowId_ =
     TerminateWorkflowExecution'
-    { _tweRunId = Nothing
-    , _tweReason = Nothing
-    , _tweDetails = Nothing
+    { _tweReason = Nothing
+    , _tweRunId = Nothing
     , _tweChildPolicy = Nothing
+    , _tweDetails = Nothing
     , _tweDomain = pDomain_
     , _tweWorkflowId = pWorkflowId_
     }
 
--- | The runId of the workflow execution to terminate.
-tweRunId :: Lens' TerminateWorkflowExecution (Maybe Text)
-tweRunId = lens _tweRunId (\ s a -> s{_tweRunId = a});
-
 -- | /Optional./ A descriptive reason for terminating the workflow execution.
 tweReason :: Lens' TerminateWorkflowExecution (Maybe Text)
 tweReason = lens _tweReason (\ s a -> s{_tweReason = a});
 
--- | /Optional./ Details for terminating the workflow execution.
-tweDetails :: Lens' TerminateWorkflowExecution (Maybe Text)
-tweDetails = lens _tweDetails (\ s a -> s{_tweDetails = a});
+-- | The runId of the workflow execution to terminate.
+tweRunId :: Lens' TerminateWorkflowExecution (Maybe Text)
+tweRunId = lens _tweRunId (\ s a -> s{_tweRunId = a});
 
 -- | If set, specifies the policy to use for the child workflow executions of
 -- the workflow execution being terminated. This policy overrides the child
@@ -151,6 +147,10 @@
 tweChildPolicy :: Lens' TerminateWorkflowExecution (Maybe ChildPolicy)
 tweChildPolicy = lens _tweChildPolicy (\ s a -> s{_tweChildPolicy = a});
 
+-- | /Optional./ Details for terminating the workflow execution.
+tweDetails :: Lens' TerminateWorkflowExecution (Maybe Text)
+tweDetails = lens _tweDetails (\ s a -> s{_tweDetails = a});
+
 -- | The domain of the workflow execution to terminate.
 tweDomain :: Lens' TerminateWorkflowExecution Text
 tweDomain = lens _tweDomain (\ s a -> s{_tweDomain = a});
@@ -180,10 +180,10 @@
         toJSON TerminateWorkflowExecution'{..}
           = object
               (catMaybes
-                 [("runId" .=) <$> _tweRunId,
-                  ("reason" .=) <$> _tweReason,
-                  ("details" .=) <$> _tweDetails,
+                 [("reason" .=) <$> _tweReason,
+                  ("runId" .=) <$> _tweRunId,
                   ("childPolicy" .=) <$> _tweChildPolicy,
+                  ("details" .=) <$> _tweDetails,
                   Just ("domain" .= _tweDomain),
                   Just ("workflowId" .= _tweWorkflowId)])
 
diff --git a/gen/Network/AWS/SWF/Types.hs b/gen/Network/AWS/SWF/Types.hs
--- a/gen/Network/AWS/SWF/Types.hs
+++ b/gen/Network/AWS/SWF/Types.hs
@@ -16,11 +16,11 @@
       sWF
 
     -- * Errors
+    , _DomainAlreadyExistsFault
     , _LimitExceededFault
     , _WorkflowExecutionAlreadyStartedFault
-    , _DomainAlreadyExistsFault
-    , _UnknownResourceFault
     , _OperationNotPermittedFault
+    , _UnknownResourceFault
     , _DefaultUndefinedFault
     , _TypeDeprecatedFault
     , _TypeAlreadyExistsFault
@@ -137,8 +137,8 @@
     , ActivityTaskScheduledEventAttributes
     , activityTaskScheduledEventAttributes
     , atseaControl
-    , atseaScheduleToCloseTimeout
     , atseaHeartbeatTimeout
+    , atseaScheduleToCloseTimeout
     , atseaInput
     , atseaTaskPriority
     , atseaScheduleToStartTimeout
@@ -307,8 +307,8 @@
     , dRecordMarkerDecisionAttributes
     , dFailWorkflowExecutionDecisionAttributes
     , dStartChildWorkflowExecutionDecisionAttributes
-    , dScheduleLambdaFunctionDecisionAttributes
     , dCompleteWorkflowExecutionDecisionAttributes
+    , dScheduleLambdaFunctionDecisionAttributes
     , dRequestCancelActivityTaskDecisionAttributes
     , dCancelWorkflowExecutionDecisionAttributes
     , dCancelTimerDecisionAttributes
@@ -388,59 +388,59 @@
     , HistoryEvent
     , historyEvent
     , heWorkflowExecutionCancelRequestedEventAttributes
-    , heDecisionTaskScheduledEventAttributes
-    , heStartTimerFailedEventAttributes
-    , heLambdaFunctionStartedEventAttributes
     , heRecordMarkerFailedEventAttributes
     , heRequestCancelExternalWorkflowExecutionInitiatedEventAttributes
+    , heLambdaFunctionStartedEventAttributes
+    , heDecisionTaskScheduledEventAttributes
     , heWorkflowExecutionCompletedEventAttributes
+    , heStartTimerFailedEventAttributes
     , heActivityTaskScheduledEventAttributes
-    , heChildWorkflowExecutionCompletedEventAttributes
     , heScheduleActivityTaskFailedEventAttributes
+    , heChildWorkflowExecutionCompletedEventAttributes
     , heMarkerRecordedEventAttributes
     , heScheduleLambdaFunctionFailedEventAttributes
     , heCompleteWorkflowExecutionFailedEventAttributes
-    , heRequestCancelExternalWorkflowExecutionFailedEventAttributes
     , heLambdaFunctionCompletedEventAttributes
+    , heRequestCancelExternalWorkflowExecutionFailedEventAttributes
     , heTimerCanceledEventAttributes
     , heWorkflowExecutionStartedEventAttributes
     , heActivityTaskCompletedEventAttributes
-    , heChildWorkflowExecutionStartedEventAttributes
     , heDecisionTaskTimedOutEventAttributes
     , heCancelTimerFailedEventAttributes
-    , heActivityTaskTimedOutEventAttributes
+    , heChildWorkflowExecutionStartedEventAttributes
     , heActivityTaskCanceledEventAttributes
-    , heChildWorkflowExecutionCanceledEventAttributes
+    , heActivityTaskTimedOutEventAttributes
     , heDecisionTaskStartedEventAttributes
-    , heCancelWorkflowExecutionFailedEventAttributes
+    , heWorkflowExecutionTerminatedEventAttributes
+    , heChildWorkflowExecutionCanceledEventAttributes
+    , heRequestCancelActivityTaskFailedEventAttributes
     , heLambdaFunctionScheduledEventAttributes
     , heChildWorkflowExecutionTimedOutEventAttributes
-    , heRequestCancelActivityTaskFailedEventAttributes
-    , heWorkflowExecutionTerminatedEventAttributes
+    , heCancelWorkflowExecutionFailedEventAttributes
     , heStartChildWorkflowExecutionInitiatedEventAttributes
-    , heActivityTaskStartedEventAttributes
     , heSignalExternalWorkflowExecutionFailedEventAttributes
-    , heTimerStartedEventAttributes
-    , heWorkflowExecutionTimedOutEventAttributes
-    , heActivityTaskCancelRequestedEventAttributes
+    , heActivityTaskStartedEventAttributes
     , heStartLambdaFunctionFailedEventAttributes
     , heChildWorkflowExecutionTerminatedEventAttributes
     , heLambdaFunctionFailedEventAttributes
     , heWorkflowExecutionCanceledEventAttributes
+    , heTimerStartedEventAttributes
+    , heActivityTaskCancelRequestedEventAttributes
+    , heWorkflowExecutionTimedOutEventAttributes
     , heWorkflowExecutionSignaledEventAttributes
+    , heTimerFiredEventAttributes
     , heActivityTaskFailedEventAttributes
     , heExternalWorkflowExecutionSignaledEventAttributes
-    , heTimerFiredEventAttributes
-    , heFailWorkflowExecutionFailedEventAttributes
-    , heChildWorkflowExecutionFailedEventAttributes
     , heDecisionTaskCompletedEventAttributes
     , heStartChildWorkflowExecutionFailedEventAttributes
-    , heSignalExternalWorkflowExecutionInitiatedEventAttributes
+    , heChildWorkflowExecutionFailedEventAttributes
+    , heFailWorkflowExecutionFailedEventAttributes
     , heContinueAsNewWorkflowExecutionFailedEventAttributes
+    , heSignalExternalWorkflowExecutionInitiatedEventAttributes
+    , heLambdaFunctionTimedOutEventAttributes
     , heWorkflowExecutionFailedEventAttributes
     , heWorkflowExecutionContinuedAsNewEventAttributes
     , heExternalWorkflowExecutionCancelRequestedEventAttributes
-    , heLambdaFunctionTimedOutEventAttributes
     , heEventTimestamp
     , heEventType
     , heEventId
@@ -548,8 +548,8 @@
     , ScheduleActivityTaskDecisionAttributes
     , scheduleActivityTaskDecisionAttributes
     , satdaControl
-    , satdaScheduleToCloseTimeout
     , satdaHeartbeatTimeout
+    , satdaScheduleToCloseTimeout
     , satdaInput
     , satdaTaskList
     , satdaTaskPriority
@@ -906,6 +906,11 @@
       | has (hasStatus 509) e = Just "limit_exceeded"
       | otherwise = Nothing
 
+-- | Returned if the specified domain already exists. You will get this fault
+-- even if the existing domain is in deprecated status.
+_DomainAlreadyExistsFault :: AsError a => Getting (First ServiceError) a ServiceError
+_DomainAlreadyExistsFault = _ServiceError . hasCode "DomainAlreadyExistsFault"
+
 -- | Returned by any operation if a system imposed limitation has been
 -- reached. To address this fault you should either clean up unused
 -- resources or increase the limit by contacting AWS.
@@ -918,22 +923,17 @@
 _WorkflowExecutionAlreadyStartedFault =
     _ServiceError . hasCode "WorkflowExecutionAlreadyStartedFault"
 
--- | Returned if the specified domain already exists. You will get this fault
--- even if the existing domain is in deprecated status.
-_DomainAlreadyExistsFault :: AsError a => Getting (First ServiceError) a ServiceError
-_DomainAlreadyExistsFault = _ServiceError . hasCode "DomainAlreadyExistsFault"
+-- | Returned when the caller does not have sufficient permissions to invoke
+-- the action.
+_OperationNotPermittedFault :: AsError a => Getting (First ServiceError) a ServiceError
+_OperationNotPermittedFault =
+    _ServiceError . hasCode "OperationNotPermittedFault"
 
 -- | Returned when the named resource cannot be found with in the scope of
 -- this operation (region or domain). This could happen if the named
 -- resource was never created or is no longer available for this operation.
 _UnknownResourceFault :: AsError a => Getting (First ServiceError) a ServiceError
 _UnknownResourceFault = _ServiceError . hasCode "UnknownResourceFault"
-
--- | Returned when the caller does not have sufficient permissions to invoke
--- the action.
-_OperationNotPermittedFault :: AsError a => Getting (First ServiceError) a ServiceError
-_OperationNotPermittedFault =
-    _ServiceError . hasCode "OperationNotPermittedFault"
 
 -- | Prism for DefaultUndefinedFault' errors.
 _DefaultUndefinedFault :: AsError a => Getting (First ServiceError) a ServiceError
diff --git a/gen/Network/AWS/SWF/Types/Product.hs b/gen/Network/AWS/SWF/Types/Product.hs
--- a/gen/Network/AWS/SWF/Types/Product.hs
+++ b/gen/Network/AWS/SWF/Types/Product.hs
@@ -259,8 +259,8 @@
 -- /See:/ 'activityTaskScheduledEventAttributes' smart constructor.
 data ActivityTaskScheduledEventAttributes = ActivityTaskScheduledEventAttributes'
     { _atseaControl                      :: !(Maybe Text)
-    , _atseaScheduleToCloseTimeout       :: !(Maybe Text)
     , _atseaHeartbeatTimeout             :: !(Maybe Text)
+    , _atseaScheduleToCloseTimeout       :: !(Maybe Text)
     , _atseaInput                        :: !(Maybe Text)
     , _atseaTaskPriority                 :: !(Maybe Text)
     , _atseaScheduleToStartTimeout       :: !(Maybe Text)
@@ -277,10 +277,10 @@
 --
 -- * 'atseaControl'
 --
--- * 'atseaScheduleToCloseTimeout'
---
 -- * 'atseaHeartbeatTimeout'
 --
+-- * 'atseaScheduleToCloseTimeout'
+--
 -- * 'atseaInput'
 --
 -- * 'atseaTaskPriority'
@@ -305,8 +305,8 @@
 activityTaskScheduledEventAttributes pActivityType_ pActivityId_ pTaskList_ pDecisionTaskCompletedEventId_ =
     ActivityTaskScheduledEventAttributes'
     { _atseaControl = Nothing
-    , _atseaScheduleToCloseTimeout = Nothing
     , _atseaHeartbeatTimeout = Nothing
+    , _atseaScheduleToCloseTimeout = Nothing
     , _atseaInput = Nothing
     , _atseaTaskPriority = Nothing
     , _atseaScheduleToStartTimeout = Nothing
@@ -322,10 +322,6 @@
 atseaControl :: Lens' ActivityTaskScheduledEventAttributes (Maybe Text)
 atseaControl = lens _atseaControl (\ s a -> s{_atseaControl = a});
 
--- | The maximum amount of time for this activity task.
-atseaScheduleToCloseTimeout :: Lens' ActivityTaskScheduledEventAttributes (Maybe Text)
-atseaScheduleToCloseTimeout = lens _atseaScheduleToCloseTimeout (\ s a -> s{_atseaScheduleToCloseTimeout = a});
-
 -- | The maximum time before which the worker processing this task must
 -- report progress by calling RecordActivityTaskHeartbeat. If the timeout
 -- is exceeded, the activity task is automatically timed out. If the worker
@@ -334,6 +330,10 @@
 atseaHeartbeatTimeout :: Lens' ActivityTaskScheduledEventAttributes (Maybe Text)
 atseaHeartbeatTimeout = lens _atseaHeartbeatTimeout (\ s a -> s{_atseaHeartbeatTimeout = a});
 
+-- | The maximum amount of time for this activity task.
+atseaScheduleToCloseTimeout :: Lens' ActivityTaskScheduledEventAttributes (Maybe Text)
+atseaScheduleToCloseTimeout = lens _atseaScheduleToCloseTimeout (\ s a -> s{_atseaScheduleToCloseTimeout = a});
+
 -- | The input provided to the activity task.
 atseaInput :: Lens' ActivityTaskScheduledEventAttributes (Maybe Text)
 atseaInput = lens _atseaInput (\ s a -> s{_atseaInput = a});
@@ -387,9 +387,8 @@
           = withObject "ActivityTaskScheduledEventAttributes"
               (\ x ->
                  ActivityTaskScheduledEventAttributes' <$>
-                   (x .:? "control") <*>
+                   (x .:? "control") <*> (x .:? "heartbeatTimeout") <*>
                      (x .:? "scheduleToCloseTimeout")
-                     <*> (x .:? "heartbeatTimeout")
                      <*> (x .:? "input")
                      <*> (x .:? "taskPriority")
                      <*> (x .:? "scheduleToStartTimeout")
@@ -1933,8 +1932,8 @@
     , _dRecordMarkerDecisionAttributes                           :: !(Maybe RecordMarkerDecisionAttributes)
     , _dFailWorkflowExecutionDecisionAttributes                  :: !(Maybe FailWorkflowExecutionDecisionAttributes)
     , _dStartChildWorkflowExecutionDecisionAttributes            :: !(Maybe StartChildWorkflowExecutionDecisionAttributes)
-    , _dScheduleLambdaFunctionDecisionAttributes                 :: !(Maybe ScheduleLambdaFunctionDecisionAttributes)
     , _dCompleteWorkflowExecutionDecisionAttributes              :: !(Maybe CompleteWorkflowExecutionDecisionAttributes)
+    , _dScheduleLambdaFunctionDecisionAttributes                 :: !(Maybe ScheduleLambdaFunctionDecisionAttributes)
     , _dRequestCancelActivityTaskDecisionAttributes              :: !(Maybe RequestCancelActivityTaskDecisionAttributes)
     , _dCancelWorkflowExecutionDecisionAttributes                :: !(Maybe CancelWorkflowExecutionDecisionAttributes)
     , _dCancelTimerDecisionAttributes                            :: !(Maybe CancelTimerDecisionAttributes)
@@ -1960,10 +1959,10 @@
 --
 -- * 'dStartChildWorkflowExecutionDecisionAttributes'
 --
--- * 'dScheduleLambdaFunctionDecisionAttributes'
---
 -- * 'dCompleteWorkflowExecutionDecisionAttributes'
 --
+-- * 'dScheduleLambdaFunctionDecisionAttributes'
+--
 -- * 'dRequestCancelActivityTaskDecisionAttributes'
 --
 -- * 'dCancelWorkflowExecutionDecisionAttributes'
@@ -1985,8 +1984,8 @@
     , _dRecordMarkerDecisionAttributes = Nothing
     , _dFailWorkflowExecutionDecisionAttributes = Nothing
     , _dStartChildWorkflowExecutionDecisionAttributes = Nothing
-    , _dScheduleLambdaFunctionDecisionAttributes = Nothing
     , _dCompleteWorkflowExecutionDecisionAttributes = Nothing
+    , _dScheduleLambdaFunctionDecisionAttributes = Nothing
     , _dRequestCancelActivityTaskDecisionAttributes = Nothing
     , _dCancelWorkflowExecutionDecisionAttributes = Nothing
     , _dCancelTimerDecisionAttributes = Nothing
@@ -2029,15 +2028,15 @@
 dStartChildWorkflowExecutionDecisionAttributes :: Lens' Decision (Maybe StartChildWorkflowExecutionDecisionAttributes)
 dStartChildWorkflowExecutionDecisionAttributes = lens _dStartChildWorkflowExecutionDecisionAttributes (\ s a -> s{_dStartChildWorkflowExecutionDecisionAttributes = a});
 
--- | Undocumented member.
-dScheduleLambdaFunctionDecisionAttributes :: Lens' Decision (Maybe ScheduleLambdaFunctionDecisionAttributes)
-dScheduleLambdaFunctionDecisionAttributes = lens _dScheduleLambdaFunctionDecisionAttributes (\ s a -> s{_dScheduleLambdaFunctionDecisionAttributes = a});
-
 -- | Provides details of the 'CompleteWorkflowExecution' decision. It is not
 -- set for other decision types.
 dCompleteWorkflowExecutionDecisionAttributes :: Lens' Decision (Maybe CompleteWorkflowExecutionDecisionAttributes)
 dCompleteWorkflowExecutionDecisionAttributes = lens _dCompleteWorkflowExecutionDecisionAttributes (\ s a -> s{_dCompleteWorkflowExecutionDecisionAttributes = a});
 
+-- | Undocumented member.
+dScheduleLambdaFunctionDecisionAttributes :: Lens' Decision (Maybe ScheduleLambdaFunctionDecisionAttributes)
+dScheduleLambdaFunctionDecisionAttributes = lens _dScheduleLambdaFunctionDecisionAttributes (\ s a -> s{_dScheduleLambdaFunctionDecisionAttributes = a});
+
 -- | Provides details of the 'RequestCancelActivityTask' decision. It is not
 -- set for other decision types.
 dRequestCancelActivityTaskDecisionAttributes :: Lens' Decision (Maybe RequestCancelActivityTaskDecisionAttributes)
@@ -2084,10 +2083,10 @@
                     _dFailWorkflowExecutionDecisionAttributes,
                   ("startChildWorkflowExecutionDecisionAttributes" .=)
                     <$> _dStartChildWorkflowExecutionDecisionAttributes,
-                  ("scheduleLambdaFunctionDecisionAttributes" .=) <$>
-                    _dScheduleLambdaFunctionDecisionAttributes,
                   ("completeWorkflowExecutionDecisionAttributes" .=)
                     <$> _dCompleteWorkflowExecutionDecisionAttributes,
+                  ("scheduleLambdaFunctionDecisionAttributes" .=) <$>
+                    _dScheduleLambdaFunctionDecisionAttributes,
                   ("requestCancelActivityTaskDecisionAttributes" .=)
                     <$> _dRequestCancelActivityTaskDecisionAttributes,
                   ("cancelWorkflowExecutionDecisionAttributes" .=) <$>
@@ -2772,59 +2771,59 @@
 -- /See:/ 'historyEvent' smart constructor.
 data HistoryEvent = HistoryEvent'
     { _heWorkflowExecutionCancelRequestedEventAttributes                :: !(Maybe WorkflowExecutionCancelRequestedEventAttributes)
-    , _heDecisionTaskScheduledEventAttributes                           :: !(Maybe DecisionTaskScheduledEventAttributes)
-    , _heStartTimerFailedEventAttributes                                :: !(Maybe StartTimerFailedEventAttributes)
-    , _heLambdaFunctionStartedEventAttributes                           :: !(Maybe LambdaFunctionStartedEventAttributes)
     , _heRecordMarkerFailedEventAttributes                              :: !(Maybe RecordMarkerFailedEventAttributes)
     , _heRequestCancelExternalWorkflowExecutionInitiatedEventAttributes :: !(Maybe RequestCancelExternalWorkflowExecutionInitiatedEventAttributes)
+    , _heLambdaFunctionStartedEventAttributes                           :: !(Maybe LambdaFunctionStartedEventAttributes)
+    , _heDecisionTaskScheduledEventAttributes                           :: !(Maybe DecisionTaskScheduledEventAttributes)
     , _heWorkflowExecutionCompletedEventAttributes                      :: !(Maybe WorkflowExecutionCompletedEventAttributes)
+    , _heStartTimerFailedEventAttributes                                :: !(Maybe StartTimerFailedEventAttributes)
     , _heActivityTaskScheduledEventAttributes                           :: !(Maybe ActivityTaskScheduledEventAttributes)
-    , _heChildWorkflowExecutionCompletedEventAttributes                 :: !(Maybe ChildWorkflowExecutionCompletedEventAttributes)
     , _heScheduleActivityTaskFailedEventAttributes                      :: !(Maybe ScheduleActivityTaskFailedEventAttributes)
+    , _heChildWorkflowExecutionCompletedEventAttributes                 :: !(Maybe ChildWorkflowExecutionCompletedEventAttributes)
     , _heMarkerRecordedEventAttributes                                  :: !(Maybe MarkerRecordedEventAttributes)
     , _heScheduleLambdaFunctionFailedEventAttributes                    :: !(Maybe ScheduleLambdaFunctionFailedEventAttributes)
     , _heCompleteWorkflowExecutionFailedEventAttributes                 :: !(Maybe CompleteWorkflowExecutionFailedEventAttributes)
-    , _heRequestCancelExternalWorkflowExecutionFailedEventAttributes    :: !(Maybe RequestCancelExternalWorkflowExecutionFailedEventAttributes)
     , _heLambdaFunctionCompletedEventAttributes                         :: !(Maybe LambdaFunctionCompletedEventAttributes)
+    , _heRequestCancelExternalWorkflowExecutionFailedEventAttributes    :: !(Maybe RequestCancelExternalWorkflowExecutionFailedEventAttributes)
     , _heTimerCanceledEventAttributes                                   :: !(Maybe TimerCanceledEventAttributes)
     , _heWorkflowExecutionStartedEventAttributes                        :: !(Maybe WorkflowExecutionStartedEventAttributes)
     , _heActivityTaskCompletedEventAttributes                           :: !(Maybe ActivityTaskCompletedEventAttributes)
-    , _heChildWorkflowExecutionStartedEventAttributes                   :: !(Maybe ChildWorkflowExecutionStartedEventAttributes)
     , _heDecisionTaskTimedOutEventAttributes                            :: !(Maybe DecisionTaskTimedOutEventAttributes)
     , _heCancelTimerFailedEventAttributes                               :: !(Maybe CancelTimerFailedEventAttributes)
-    , _heActivityTaskTimedOutEventAttributes                            :: !(Maybe ActivityTaskTimedOutEventAttributes)
+    , _heChildWorkflowExecutionStartedEventAttributes                   :: !(Maybe ChildWorkflowExecutionStartedEventAttributes)
     , _heActivityTaskCanceledEventAttributes                            :: !(Maybe ActivityTaskCanceledEventAttributes)
-    , _heChildWorkflowExecutionCanceledEventAttributes                  :: !(Maybe ChildWorkflowExecutionCanceledEventAttributes)
+    , _heActivityTaskTimedOutEventAttributes                            :: !(Maybe ActivityTaskTimedOutEventAttributes)
     , _heDecisionTaskStartedEventAttributes                             :: !(Maybe DecisionTaskStartedEventAttributes)
-    , _heCancelWorkflowExecutionFailedEventAttributes                   :: !(Maybe CancelWorkflowExecutionFailedEventAttributes)
+    , _heWorkflowExecutionTerminatedEventAttributes                     :: !(Maybe WorkflowExecutionTerminatedEventAttributes)
+    , _heChildWorkflowExecutionCanceledEventAttributes                  :: !(Maybe ChildWorkflowExecutionCanceledEventAttributes)
+    , _heRequestCancelActivityTaskFailedEventAttributes                 :: !(Maybe RequestCancelActivityTaskFailedEventAttributes)
     , _heLambdaFunctionScheduledEventAttributes                         :: !(Maybe LambdaFunctionScheduledEventAttributes)
     , _heChildWorkflowExecutionTimedOutEventAttributes                  :: !(Maybe ChildWorkflowExecutionTimedOutEventAttributes)
-    , _heRequestCancelActivityTaskFailedEventAttributes                 :: !(Maybe RequestCancelActivityTaskFailedEventAttributes)
-    , _heWorkflowExecutionTerminatedEventAttributes                     :: !(Maybe WorkflowExecutionTerminatedEventAttributes)
+    , _heCancelWorkflowExecutionFailedEventAttributes                   :: !(Maybe CancelWorkflowExecutionFailedEventAttributes)
     , _heStartChildWorkflowExecutionInitiatedEventAttributes            :: !(Maybe StartChildWorkflowExecutionInitiatedEventAttributes)
-    , _heActivityTaskStartedEventAttributes                             :: !(Maybe ActivityTaskStartedEventAttributes)
     , _heSignalExternalWorkflowExecutionFailedEventAttributes           :: !(Maybe SignalExternalWorkflowExecutionFailedEventAttributes)
-    , _heTimerStartedEventAttributes                                    :: !(Maybe TimerStartedEventAttributes)
-    , _heWorkflowExecutionTimedOutEventAttributes                       :: !(Maybe WorkflowExecutionTimedOutEventAttributes)
-    , _heActivityTaskCancelRequestedEventAttributes                     :: !(Maybe ActivityTaskCancelRequestedEventAttributes)
+    , _heActivityTaskStartedEventAttributes                             :: !(Maybe ActivityTaskStartedEventAttributes)
     , _heStartLambdaFunctionFailedEventAttributes                       :: !(Maybe StartLambdaFunctionFailedEventAttributes)
     , _heChildWorkflowExecutionTerminatedEventAttributes                :: !(Maybe ChildWorkflowExecutionTerminatedEventAttributes)
     , _heLambdaFunctionFailedEventAttributes                            :: !(Maybe LambdaFunctionFailedEventAttributes)
     , _heWorkflowExecutionCanceledEventAttributes                       :: !(Maybe WorkflowExecutionCanceledEventAttributes)
+    , _heTimerStartedEventAttributes                                    :: !(Maybe TimerStartedEventAttributes)
+    , _heActivityTaskCancelRequestedEventAttributes                     :: !(Maybe ActivityTaskCancelRequestedEventAttributes)
+    , _heWorkflowExecutionTimedOutEventAttributes                       :: !(Maybe WorkflowExecutionTimedOutEventAttributes)
     , _heWorkflowExecutionSignaledEventAttributes                       :: !(Maybe WorkflowExecutionSignaledEventAttributes)
+    , _heTimerFiredEventAttributes                                      :: !(Maybe TimerFiredEventAttributes)
     , _heActivityTaskFailedEventAttributes                              :: !(Maybe ActivityTaskFailedEventAttributes)
     , _heExternalWorkflowExecutionSignaledEventAttributes               :: !(Maybe ExternalWorkflowExecutionSignaledEventAttributes)
-    , _heTimerFiredEventAttributes                                      :: !(Maybe TimerFiredEventAttributes)
-    , _heFailWorkflowExecutionFailedEventAttributes                     :: !(Maybe FailWorkflowExecutionFailedEventAttributes)
-    , _heChildWorkflowExecutionFailedEventAttributes                    :: !(Maybe ChildWorkflowExecutionFailedEventAttributes)
     , _heDecisionTaskCompletedEventAttributes                           :: !(Maybe DecisionTaskCompletedEventAttributes)
     , _heStartChildWorkflowExecutionFailedEventAttributes               :: !(Maybe StartChildWorkflowExecutionFailedEventAttributes)
-    , _heSignalExternalWorkflowExecutionInitiatedEventAttributes        :: !(Maybe SignalExternalWorkflowExecutionInitiatedEventAttributes)
+    , _heChildWorkflowExecutionFailedEventAttributes                    :: !(Maybe ChildWorkflowExecutionFailedEventAttributes)
+    , _heFailWorkflowExecutionFailedEventAttributes                     :: !(Maybe FailWorkflowExecutionFailedEventAttributes)
     , _heContinueAsNewWorkflowExecutionFailedEventAttributes            :: !(Maybe ContinueAsNewWorkflowExecutionFailedEventAttributes)
+    , _heSignalExternalWorkflowExecutionInitiatedEventAttributes        :: !(Maybe SignalExternalWorkflowExecutionInitiatedEventAttributes)
+    , _heLambdaFunctionTimedOutEventAttributes                          :: !(Maybe LambdaFunctionTimedOutEventAttributes)
     , _heWorkflowExecutionFailedEventAttributes                         :: !(Maybe WorkflowExecutionFailedEventAttributes)
     , _heWorkflowExecutionContinuedAsNewEventAttributes                 :: !(Maybe WorkflowExecutionContinuedAsNewEventAttributes)
     , _heExternalWorkflowExecutionCancelRequestedEventAttributes        :: !(Maybe ExternalWorkflowExecutionCancelRequestedEventAttributes)
-    , _heLambdaFunctionTimedOutEventAttributes                          :: !(Maybe LambdaFunctionTimedOutEventAttributes)
     , _heEventTimestamp                                                 :: !POSIX
     , _heEventType                                                      :: !EventType
     , _heEventId                                                        :: !Integer
@@ -2836,75 +2835,69 @@
 --
 -- * 'heWorkflowExecutionCancelRequestedEventAttributes'
 --
--- * 'heDecisionTaskScheduledEventAttributes'
+-- * 'heRecordMarkerFailedEventAttributes'
 --
--- * 'heStartTimerFailedEventAttributes'
+-- * 'heRequestCancelExternalWorkflowExecutionInitiatedEventAttributes'
 --
 -- * 'heLambdaFunctionStartedEventAttributes'
 --
--- * 'heRecordMarkerFailedEventAttributes'
---
--- * 'heRequestCancelExternalWorkflowExecutionInitiatedEventAttributes'
+-- * 'heDecisionTaskScheduledEventAttributes'
 --
 -- * 'heWorkflowExecutionCompletedEventAttributes'
 --
--- * 'heActivityTaskScheduledEventAttributes'
+-- * 'heStartTimerFailedEventAttributes'
 --
--- * 'heChildWorkflowExecutionCompletedEventAttributes'
+-- * 'heActivityTaskScheduledEventAttributes'
 --
 -- * 'heScheduleActivityTaskFailedEventAttributes'
 --
+-- * 'heChildWorkflowExecutionCompletedEventAttributes'
+--
 -- * 'heMarkerRecordedEventAttributes'
 --
 -- * 'heScheduleLambdaFunctionFailedEventAttributes'
 --
 -- * 'heCompleteWorkflowExecutionFailedEventAttributes'
 --
--- * 'heRequestCancelExternalWorkflowExecutionFailedEventAttributes'
---
 -- * 'heLambdaFunctionCompletedEventAttributes'
 --
+-- * 'heRequestCancelExternalWorkflowExecutionFailedEventAttributes'
+--
 -- * 'heTimerCanceledEventAttributes'
 --
 -- * 'heWorkflowExecutionStartedEventAttributes'
 --
 -- * 'heActivityTaskCompletedEventAttributes'
 --
--- * 'heChildWorkflowExecutionStartedEventAttributes'
---
 -- * 'heDecisionTaskTimedOutEventAttributes'
 --
 -- * 'heCancelTimerFailedEventAttributes'
 --
--- * 'heActivityTaskTimedOutEventAttributes'
+-- * 'heChildWorkflowExecutionStartedEventAttributes'
 --
 -- * 'heActivityTaskCanceledEventAttributes'
 --
--- * 'heChildWorkflowExecutionCanceledEventAttributes'
+-- * 'heActivityTaskTimedOutEventAttributes'
 --
 -- * 'heDecisionTaskStartedEventAttributes'
 --
--- * 'heCancelWorkflowExecutionFailedEventAttributes'
+-- * 'heWorkflowExecutionTerminatedEventAttributes'
 --
+-- * 'heChildWorkflowExecutionCanceledEventAttributes'
+--
+-- * 'heRequestCancelActivityTaskFailedEventAttributes'
+--
 -- * 'heLambdaFunctionScheduledEventAttributes'
 --
 -- * 'heChildWorkflowExecutionTimedOutEventAttributes'
 --
--- * 'heRequestCancelActivityTaskFailedEventAttributes'
---
--- * 'heWorkflowExecutionTerminatedEventAttributes'
+-- * 'heCancelWorkflowExecutionFailedEventAttributes'
 --
 -- * 'heStartChildWorkflowExecutionInitiatedEventAttributes'
 --
--- * 'heActivityTaskStartedEventAttributes'
---
 -- * 'heSignalExternalWorkflowExecutionFailedEventAttributes'
 --
--- * 'heTimerStartedEventAttributes'
---
--- * 'heWorkflowExecutionTimedOutEventAttributes'
---
--- * 'heActivityTaskCancelRequestedEventAttributes'
+-- * 'heActivityTaskStartedEventAttributes'
 --
 -- * 'heStartLambdaFunctionFailedEventAttributes'
 --
@@ -2914,25 +2907,33 @@
 --
 -- * 'heWorkflowExecutionCanceledEventAttributes'
 --
+-- * 'heTimerStartedEventAttributes'
+--
+-- * 'heActivityTaskCancelRequestedEventAttributes'
+--
+-- * 'heWorkflowExecutionTimedOutEventAttributes'
+--
 -- * 'heWorkflowExecutionSignaledEventAttributes'
 --
+-- * 'heTimerFiredEventAttributes'
+--
 -- * 'heActivityTaskFailedEventAttributes'
 --
 -- * 'heExternalWorkflowExecutionSignaledEventAttributes'
 --
--- * 'heTimerFiredEventAttributes'
+-- * 'heDecisionTaskCompletedEventAttributes'
 --
--- * 'heFailWorkflowExecutionFailedEventAttributes'
+-- * 'heStartChildWorkflowExecutionFailedEventAttributes'
 --
 -- * 'heChildWorkflowExecutionFailedEventAttributes'
 --
--- * 'heDecisionTaskCompletedEventAttributes'
+-- * 'heFailWorkflowExecutionFailedEventAttributes'
 --
--- * 'heStartChildWorkflowExecutionFailedEventAttributes'
+-- * 'heContinueAsNewWorkflowExecutionFailedEventAttributes'
 --
 -- * 'heSignalExternalWorkflowExecutionInitiatedEventAttributes'
 --
--- * 'heContinueAsNewWorkflowExecutionFailedEventAttributes'
+-- * 'heLambdaFunctionTimedOutEventAttributes'
 --
 -- * 'heWorkflowExecutionFailedEventAttributes'
 --
@@ -2940,8 +2941,6 @@
 --
 -- * 'heExternalWorkflowExecutionCancelRequestedEventAttributes'
 --
--- * 'heLambdaFunctionTimedOutEventAttributes'
---
 -- * 'heEventTimestamp'
 --
 -- * 'heEventType'
@@ -2955,59 +2954,59 @@
 historyEvent pEventTimestamp_ pEventType_ pEventId_ =
     HistoryEvent'
     { _heWorkflowExecutionCancelRequestedEventAttributes = Nothing
-    , _heDecisionTaskScheduledEventAttributes = Nothing
-    , _heStartTimerFailedEventAttributes = Nothing
-    , _heLambdaFunctionStartedEventAttributes = Nothing
     , _heRecordMarkerFailedEventAttributes = Nothing
     , _heRequestCancelExternalWorkflowExecutionInitiatedEventAttributes = Nothing
+    , _heLambdaFunctionStartedEventAttributes = Nothing
+    , _heDecisionTaskScheduledEventAttributes = Nothing
     , _heWorkflowExecutionCompletedEventAttributes = Nothing
+    , _heStartTimerFailedEventAttributes = Nothing
     , _heActivityTaskScheduledEventAttributes = Nothing
-    , _heChildWorkflowExecutionCompletedEventAttributes = Nothing
     , _heScheduleActivityTaskFailedEventAttributes = Nothing
+    , _heChildWorkflowExecutionCompletedEventAttributes = Nothing
     , _heMarkerRecordedEventAttributes = Nothing
     , _heScheduleLambdaFunctionFailedEventAttributes = Nothing
     , _heCompleteWorkflowExecutionFailedEventAttributes = Nothing
-    , _heRequestCancelExternalWorkflowExecutionFailedEventAttributes = Nothing
     , _heLambdaFunctionCompletedEventAttributes = Nothing
+    , _heRequestCancelExternalWorkflowExecutionFailedEventAttributes = Nothing
     , _heTimerCanceledEventAttributes = Nothing
     , _heWorkflowExecutionStartedEventAttributes = Nothing
     , _heActivityTaskCompletedEventAttributes = Nothing
-    , _heChildWorkflowExecutionStartedEventAttributes = Nothing
     , _heDecisionTaskTimedOutEventAttributes = Nothing
     , _heCancelTimerFailedEventAttributes = Nothing
-    , _heActivityTaskTimedOutEventAttributes = Nothing
+    , _heChildWorkflowExecutionStartedEventAttributes = Nothing
     , _heActivityTaskCanceledEventAttributes = Nothing
-    , _heChildWorkflowExecutionCanceledEventAttributes = Nothing
+    , _heActivityTaskTimedOutEventAttributes = Nothing
     , _heDecisionTaskStartedEventAttributes = Nothing
-    , _heCancelWorkflowExecutionFailedEventAttributes = Nothing
+    , _heWorkflowExecutionTerminatedEventAttributes = Nothing
+    , _heChildWorkflowExecutionCanceledEventAttributes = Nothing
+    , _heRequestCancelActivityTaskFailedEventAttributes = Nothing
     , _heLambdaFunctionScheduledEventAttributes = Nothing
     , _heChildWorkflowExecutionTimedOutEventAttributes = Nothing
-    , _heRequestCancelActivityTaskFailedEventAttributes = Nothing
-    , _heWorkflowExecutionTerminatedEventAttributes = Nothing
+    , _heCancelWorkflowExecutionFailedEventAttributes = Nothing
     , _heStartChildWorkflowExecutionInitiatedEventAttributes = Nothing
-    , _heActivityTaskStartedEventAttributes = Nothing
     , _heSignalExternalWorkflowExecutionFailedEventAttributes = Nothing
-    , _heTimerStartedEventAttributes = Nothing
-    , _heWorkflowExecutionTimedOutEventAttributes = Nothing
-    , _heActivityTaskCancelRequestedEventAttributes = Nothing
+    , _heActivityTaskStartedEventAttributes = Nothing
     , _heStartLambdaFunctionFailedEventAttributes = Nothing
     , _heChildWorkflowExecutionTerminatedEventAttributes = Nothing
     , _heLambdaFunctionFailedEventAttributes = Nothing
     , _heWorkflowExecutionCanceledEventAttributes = Nothing
+    , _heTimerStartedEventAttributes = Nothing
+    , _heActivityTaskCancelRequestedEventAttributes = Nothing
+    , _heWorkflowExecutionTimedOutEventAttributes = Nothing
     , _heWorkflowExecutionSignaledEventAttributes = Nothing
+    , _heTimerFiredEventAttributes = Nothing
     , _heActivityTaskFailedEventAttributes = Nothing
     , _heExternalWorkflowExecutionSignaledEventAttributes = Nothing
-    , _heTimerFiredEventAttributes = Nothing
-    , _heFailWorkflowExecutionFailedEventAttributes = Nothing
-    , _heChildWorkflowExecutionFailedEventAttributes = Nothing
     , _heDecisionTaskCompletedEventAttributes = Nothing
     , _heStartChildWorkflowExecutionFailedEventAttributes = Nothing
-    , _heSignalExternalWorkflowExecutionInitiatedEventAttributes = Nothing
+    , _heChildWorkflowExecutionFailedEventAttributes = Nothing
+    , _heFailWorkflowExecutionFailedEventAttributes = Nothing
     , _heContinueAsNewWorkflowExecutionFailedEventAttributes = Nothing
+    , _heSignalExternalWorkflowExecutionInitiatedEventAttributes = Nothing
+    , _heLambdaFunctionTimedOutEventAttributes = Nothing
     , _heWorkflowExecutionFailedEventAttributes = Nothing
     , _heWorkflowExecutionContinuedAsNewEventAttributes = Nothing
     , _heExternalWorkflowExecutionCancelRequestedEventAttributes = Nothing
-    , _heLambdaFunctionTimedOutEventAttributes = Nothing
     , _heEventTimestamp = _Time # pEventTimestamp_
     , _heEventType = pEventType_
     , _heEventId = pEventId_
@@ -3019,22 +3018,6 @@
 heWorkflowExecutionCancelRequestedEventAttributes :: Lens' HistoryEvent (Maybe WorkflowExecutionCancelRequestedEventAttributes)
 heWorkflowExecutionCancelRequestedEventAttributes = lens _heWorkflowExecutionCancelRequestedEventAttributes (\ s a -> s{_heWorkflowExecutionCancelRequestedEventAttributes = a});
 
--- | If the event is of type 'DecisionTaskScheduled' then this member is set
--- and provides detailed information about the event. It is not set for
--- other event types.
-heDecisionTaskScheduledEventAttributes :: Lens' HistoryEvent (Maybe DecisionTaskScheduledEventAttributes)
-heDecisionTaskScheduledEventAttributes = lens _heDecisionTaskScheduledEventAttributes (\ s a -> s{_heDecisionTaskScheduledEventAttributes = a});
-
--- | If the event is of type 'StartTimerFailed' then this member is set and
--- provides detailed information about the event. It is not set for other
--- event types.
-heStartTimerFailedEventAttributes :: Lens' HistoryEvent (Maybe StartTimerFailedEventAttributes)
-heStartTimerFailedEventAttributes = lens _heStartTimerFailedEventAttributes (\ s a -> s{_heStartTimerFailedEventAttributes = a});
-
--- | Undocumented member.
-heLambdaFunctionStartedEventAttributes :: Lens' HistoryEvent (Maybe LambdaFunctionStartedEventAttributes)
-heLambdaFunctionStartedEventAttributes = lens _heLambdaFunctionStartedEventAttributes (\ s a -> s{_heLambdaFunctionStartedEventAttributes = a});
-
 -- | If the event is of type 'DecisionTaskFailed' then this member is set and
 -- provides detailed information about the event. It is not set for other
 -- event types.
@@ -3048,30 +3031,46 @@
 heRequestCancelExternalWorkflowExecutionInitiatedEventAttributes :: Lens' HistoryEvent (Maybe RequestCancelExternalWorkflowExecutionInitiatedEventAttributes)
 heRequestCancelExternalWorkflowExecutionInitiatedEventAttributes = lens _heRequestCancelExternalWorkflowExecutionInitiatedEventAttributes (\ s a -> s{_heRequestCancelExternalWorkflowExecutionInitiatedEventAttributes = a});
 
+-- | Undocumented member.
+heLambdaFunctionStartedEventAttributes :: Lens' HistoryEvent (Maybe LambdaFunctionStartedEventAttributes)
+heLambdaFunctionStartedEventAttributes = lens _heLambdaFunctionStartedEventAttributes (\ s a -> s{_heLambdaFunctionStartedEventAttributes = a});
+
+-- | If the event is of type 'DecisionTaskScheduled' then this member is set
+-- and provides detailed information about the event. It is not set for
+-- other event types.
+heDecisionTaskScheduledEventAttributes :: Lens' HistoryEvent (Maybe DecisionTaskScheduledEventAttributes)
+heDecisionTaskScheduledEventAttributes = lens _heDecisionTaskScheduledEventAttributes (\ s a -> s{_heDecisionTaskScheduledEventAttributes = a});
+
 -- | If the event is of type 'WorkflowExecutionCompleted' then this member is
 -- set and provides detailed information about the event. It is not set for
 -- other event types.
 heWorkflowExecutionCompletedEventAttributes :: Lens' HistoryEvent (Maybe WorkflowExecutionCompletedEventAttributes)
 heWorkflowExecutionCompletedEventAttributes = lens _heWorkflowExecutionCompletedEventAttributes (\ s a -> s{_heWorkflowExecutionCompletedEventAttributes = a});
 
+-- | If the event is of type 'StartTimerFailed' then this member is set and
+-- provides detailed information about the event. It is not set for other
+-- event types.
+heStartTimerFailedEventAttributes :: Lens' HistoryEvent (Maybe StartTimerFailedEventAttributes)
+heStartTimerFailedEventAttributes = lens _heStartTimerFailedEventAttributes (\ s a -> s{_heStartTimerFailedEventAttributes = a});
+
 -- | If the event is of type 'ActivityTaskScheduled' then this member is set
 -- and provides detailed information about the event. It is not set for
 -- other event types.
 heActivityTaskScheduledEventAttributes :: Lens' HistoryEvent (Maybe ActivityTaskScheduledEventAttributes)
 heActivityTaskScheduledEventAttributes = lens _heActivityTaskScheduledEventAttributes (\ s a -> s{_heActivityTaskScheduledEventAttributes = a});
 
--- | If the event is of type 'ChildWorkflowExecutionCompleted' then this
--- member is set and provides detailed information about the event. It is
--- not set for other event types.
-heChildWorkflowExecutionCompletedEventAttributes :: Lens' HistoryEvent (Maybe ChildWorkflowExecutionCompletedEventAttributes)
-heChildWorkflowExecutionCompletedEventAttributes = lens _heChildWorkflowExecutionCompletedEventAttributes (\ s a -> s{_heChildWorkflowExecutionCompletedEventAttributes = a});
-
 -- | If the event is of type 'ScheduleActivityTaskFailed' then this member is
 -- set and provides detailed information about the event. It is not set for
 -- other event types.
 heScheduleActivityTaskFailedEventAttributes :: Lens' HistoryEvent (Maybe ScheduleActivityTaskFailedEventAttributes)
 heScheduleActivityTaskFailedEventAttributes = lens _heScheduleActivityTaskFailedEventAttributes (\ s a -> s{_heScheduleActivityTaskFailedEventAttributes = a});
 
+-- | If the event is of type 'ChildWorkflowExecutionCompleted' then this
+-- member is set and provides detailed information about the event. It is
+-- not set for other event types.
+heChildWorkflowExecutionCompletedEventAttributes :: Lens' HistoryEvent (Maybe ChildWorkflowExecutionCompletedEventAttributes)
+heChildWorkflowExecutionCompletedEventAttributes = lens _heChildWorkflowExecutionCompletedEventAttributes (\ s a -> s{_heChildWorkflowExecutionCompletedEventAttributes = a});
+
 -- | If the event is of type 'MarkerRecorded' then this member is set and
 -- provides detailed information about the event. It is not set for other
 -- event types.
@@ -3088,16 +3087,16 @@
 heCompleteWorkflowExecutionFailedEventAttributes :: Lens' HistoryEvent (Maybe CompleteWorkflowExecutionFailedEventAttributes)
 heCompleteWorkflowExecutionFailedEventAttributes = lens _heCompleteWorkflowExecutionFailedEventAttributes (\ s a -> s{_heCompleteWorkflowExecutionFailedEventAttributes = a});
 
+-- | Undocumented member.
+heLambdaFunctionCompletedEventAttributes :: Lens' HistoryEvent (Maybe LambdaFunctionCompletedEventAttributes)
+heLambdaFunctionCompletedEventAttributes = lens _heLambdaFunctionCompletedEventAttributes (\ s a -> s{_heLambdaFunctionCompletedEventAttributes = a});
+
 -- | If the event is of type 'RequestCancelExternalWorkflowExecutionFailed'
 -- then this member is set and provides detailed information about the
 -- event. It is not set for other event types.
 heRequestCancelExternalWorkflowExecutionFailedEventAttributes :: Lens' HistoryEvent (Maybe RequestCancelExternalWorkflowExecutionFailedEventAttributes)
 heRequestCancelExternalWorkflowExecutionFailedEventAttributes = lens _heRequestCancelExternalWorkflowExecutionFailedEventAttributes (\ s a -> s{_heRequestCancelExternalWorkflowExecutionFailedEventAttributes = a});
 
--- | Undocumented member.
-heLambdaFunctionCompletedEventAttributes :: Lens' HistoryEvent (Maybe LambdaFunctionCompletedEventAttributes)
-heLambdaFunctionCompletedEventAttributes = lens _heLambdaFunctionCompletedEventAttributes (\ s a -> s{_heLambdaFunctionCompletedEventAttributes = a});
-
 -- | If the event is of type 'TimerCanceled' then this member is set and
 -- provides detailed information about the event. It is not set for other
 -- event types.
@@ -3116,12 +3115,6 @@
 heActivityTaskCompletedEventAttributes :: Lens' HistoryEvent (Maybe ActivityTaskCompletedEventAttributes)
 heActivityTaskCompletedEventAttributes = lens _heActivityTaskCompletedEventAttributes (\ s a -> s{_heActivityTaskCompletedEventAttributes = a});
 
--- | If the event is of type 'ChildWorkflowExecutionStarted' then this member
--- is set and provides detailed information about the event. It is not set
--- for other event types.
-heChildWorkflowExecutionStartedEventAttributes :: Lens' HistoryEvent (Maybe ChildWorkflowExecutionStartedEventAttributes)
-heChildWorkflowExecutionStartedEventAttributes = lens _heChildWorkflowExecutionStartedEventAttributes (\ s a -> s{_heChildWorkflowExecutionStartedEventAttributes = a});
-
 -- | If the event is of type 'DecisionTaskTimedOut' then this member is set
 -- and provides detailed information about the event. It is not set for
 -- other event types.
@@ -3134,11 +3127,11 @@
 heCancelTimerFailedEventAttributes :: Lens' HistoryEvent (Maybe CancelTimerFailedEventAttributes)
 heCancelTimerFailedEventAttributes = lens _heCancelTimerFailedEventAttributes (\ s a -> s{_heCancelTimerFailedEventAttributes = a});
 
--- | If the event is of type 'ActivityTaskTimedOut' then this member is set
--- and provides detailed information about the event. It is not set for
--- other event types.
-heActivityTaskTimedOutEventAttributes :: Lens' HistoryEvent (Maybe ActivityTaskTimedOutEventAttributes)
-heActivityTaskTimedOutEventAttributes = lens _heActivityTaskTimedOutEventAttributes (\ s a -> s{_heActivityTaskTimedOutEventAttributes = a});
+-- | If the event is of type 'ChildWorkflowExecutionStarted' then this member
+-- is set and provides detailed information about the event. It is not set
+-- for other event types.
+heChildWorkflowExecutionStartedEventAttributes :: Lens' HistoryEvent (Maybe ChildWorkflowExecutionStartedEventAttributes)
+heChildWorkflowExecutionStartedEventAttributes = lens _heChildWorkflowExecutionStartedEventAttributes (\ s a -> s{_heChildWorkflowExecutionStartedEventAttributes = a});
 
 -- | If the event is of type 'ActivityTaskCanceled' then this member is set
 -- and provides detailed information about the event. It is not set for
@@ -3146,11 +3139,11 @@
 heActivityTaskCanceledEventAttributes :: Lens' HistoryEvent (Maybe ActivityTaskCanceledEventAttributes)
 heActivityTaskCanceledEventAttributes = lens _heActivityTaskCanceledEventAttributes (\ s a -> s{_heActivityTaskCanceledEventAttributes = a});
 
--- | If the event is of type 'ChildWorkflowExecutionCanceled' then this
--- member is set and provides detailed information about the event. It is
--- not set for other event types.
-heChildWorkflowExecutionCanceledEventAttributes :: Lens' HistoryEvent (Maybe ChildWorkflowExecutionCanceledEventAttributes)
-heChildWorkflowExecutionCanceledEventAttributes = lens _heChildWorkflowExecutionCanceledEventAttributes (\ s a -> s{_heChildWorkflowExecutionCanceledEventAttributes = a});
+-- | If the event is of type 'ActivityTaskTimedOut' then this member is set
+-- and provides detailed information about the event. It is not set for
+-- other event types.
+heActivityTaskTimedOutEventAttributes :: Lens' HistoryEvent (Maybe ActivityTaskTimedOutEventAttributes)
+heActivityTaskTimedOutEventAttributes = lens _heActivityTaskTimedOutEventAttributes (\ s a -> s{_heActivityTaskTimedOutEventAttributes = a});
 
 -- | If the event is of type 'DecisionTaskStarted' then this member is set
 -- and provides detailed information about the event. It is not set for
@@ -3158,12 +3151,24 @@
 heDecisionTaskStartedEventAttributes :: Lens' HistoryEvent (Maybe DecisionTaskStartedEventAttributes)
 heDecisionTaskStartedEventAttributes = lens _heDecisionTaskStartedEventAttributes (\ s a -> s{_heDecisionTaskStartedEventAttributes = a});
 
--- | If the event is of type 'CancelWorkflowExecutionFailed' then this member
+-- | If the event is of type 'WorkflowExecutionTerminated' then this member
 -- is set and provides detailed information about the event. It is not set
 -- for other event types.
-heCancelWorkflowExecutionFailedEventAttributes :: Lens' HistoryEvent (Maybe CancelWorkflowExecutionFailedEventAttributes)
-heCancelWorkflowExecutionFailedEventAttributes = lens _heCancelWorkflowExecutionFailedEventAttributes (\ s a -> s{_heCancelWorkflowExecutionFailedEventAttributes = a});
+heWorkflowExecutionTerminatedEventAttributes :: Lens' HistoryEvent (Maybe WorkflowExecutionTerminatedEventAttributes)
+heWorkflowExecutionTerminatedEventAttributes = lens _heWorkflowExecutionTerminatedEventAttributes (\ s a -> s{_heWorkflowExecutionTerminatedEventAttributes = a});
 
+-- | If the event is of type 'ChildWorkflowExecutionCanceled' then this
+-- member is set and provides detailed information about the event. It is
+-- not set for other event types.
+heChildWorkflowExecutionCanceledEventAttributes :: Lens' HistoryEvent (Maybe ChildWorkflowExecutionCanceledEventAttributes)
+heChildWorkflowExecutionCanceledEventAttributes = lens _heChildWorkflowExecutionCanceledEventAttributes (\ s a -> s{_heChildWorkflowExecutionCanceledEventAttributes = a});
+
+-- | If the event is of type 'RequestCancelActivityTaskFailed' then this
+-- member is set and provides detailed information about the event. It is
+-- not set for other event types.
+heRequestCancelActivityTaskFailedEventAttributes :: Lens' HistoryEvent (Maybe RequestCancelActivityTaskFailedEventAttributes)
+heRequestCancelActivityTaskFailedEventAttributes = lens _heRequestCancelActivityTaskFailedEventAttributes (\ s a -> s{_heRequestCancelActivityTaskFailedEventAttributes = a});
+
 -- | Undocumented member.
 heLambdaFunctionScheduledEventAttributes :: Lens' HistoryEvent (Maybe LambdaFunctionScheduledEventAttributes)
 heLambdaFunctionScheduledEventAttributes = lens _heLambdaFunctionScheduledEventAttributes (\ s a -> s{_heLambdaFunctionScheduledEventAttributes = a});
@@ -3174,17 +3179,11 @@
 heChildWorkflowExecutionTimedOutEventAttributes :: Lens' HistoryEvent (Maybe ChildWorkflowExecutionTimedOutEventAttributes)
 heChildWorkflowExecutionTimedOutEventAttributes = lens _heChildWorkflowExecutionTimedOutEventAttributes (\ s a -> s{_heChildWorkflowExecutionTimedOutEventAttributes = a});
 
--- | If the event is of type 'RequestCancelActivityTaskFailed' then this
--- member is set and provides detailed information about the event. It is
--- not set for other event types.
-heRequestCancelActivityTaskFailedEventAttributes :: Lens' HistoryEvent (Maybe RequestCancelActivityTaskFailedEventAttributes)
-heRequestCancelActivityTaskFailedEventAttributes = lens _heRequestCancelActivityTaskFailedEventAttributes (\ s a -> s{_heRequestCancelActivityTaskFailedEventAttributes = a});
-
--- | If the event is of type 'WorkflowExecutionTerminated' then this member
+-- | If the event is of type 'CancelWorkflowExecutionFailed' then this member
 -- is set and provides detailed information about the event. It is not set
 -- for other event types.
-heWorkflowExecutionTerminatedEventAttributes :: Lens' HistoryEvent (Maybe WorkflowExecutionTerminatedEventAttributes)
-heWorkflowExecutionTerminatedEventAttributes = lens _heWorkflowExecutionTerminatedEventAttributes (\ s a -> s{_heWorkflowExecutionTerminatedEventAttributes = a});
+heCancelWorkflowExecutionFailedEventAttributes :: Lens' HistoryEvent (Maybe CancelWorkflowExecutionFailedEventAttributes)
+heCancelWorkflowExecutionFailedEventAttributes = lens _heCancelWorkflowExecutionFailedEventAttributes (\ s a -> s{_heCancelWorkflowExecutionFailedEventAttributes = a});
 
 -- | If the event is of type 'StartChildWorkflowExecutionInitiated' then this
 -- member is set and provides detailed information about the event. It is
@@ -3192,35 +3191,17 @@
 heStartChildWorkflowExecutionInitiatedEventAttributes :: Lens' HistoryEvent (Maybe StartChildWorkflowExecutionInitiatedEventAttributes)
 heStartChildWorkflowExecutionInitiatedEventAttributes = lens _heStartChildWorkflowExecutionInitiatedEventAttributes (\ s a -> s{_heStartChildWorkflowExecutionInitiatedEventAttributes = a});
 
--- | If the event is of type 'ActivityTaskStarted' then this member is set
--- and provides detailed information about the event. It is not set for
--- other event types.
-heActivityTaskStartedEventAttributes :: Lens' HistoryEvent (Maybe ActivityTaskStartedEventAttributes)
-heActivityTaskStartedEventAttributes = lens _heActivityTaskStartedEventAttributes (\ s a -> s{_heActivityTaskStartedEventAttributes = a});
-
 -- | If the event is of type 'SignalExternalWorkflowExecutionFailed' then
 -- this member is set and provides detailed information about the event. It
 -- is not set for other event types.
 heSignalExternalWorkflowExecutionFailedEventAttributes :: Lens' HistoryEvent (Maybe SignalExternalWorkflowExecutionFailedEventAttributes)
 heSignalExternalWorkflowExecutionFailedEventAttributes = lens _heSignalExternalWorkflowExecutionFailedEventAttributes (\ s a -> s{_heSignalExternalWorkflowExecutionFailedEventAttributes = a});
 
--- | If the event is of type 'TimerStarted' then this member is set and
--- provides detailed information about the event. It is not set for other
--- event types.
-heTimerStartedEventAttributes :: Lens' HistoryEvent (Maybe TimerStartedEventAttributes)
-heTimerStartedEventAttributes = lens _heTimerStartedEventAttributes (\ s a -> s{_heTimerStartedEventAttributes = a});
-
--- | If the event is of type 'WorkflowExecutionTimedOut' then this member is
--- set and provides detailed information about the event. It is not set for
+-- | If the event is of type 'ActivityTaskStarted' then this member is set
+-- and provides detailed information about the event. It is not set for
 -- other event types.
-heWorkflowExecutionTimedOutEventAttributes :: Lens' HistoryEvent (Maybe WorkflowExecutionTimedOutEventAttributes)
-heWorkflowExecutionTimedOutEventAttributes = lens _heWorkflowExecutionTimedOutEventAttributes (\ s a -> s{_heWorkflowExecutionTimedOutEventAttributes = a});
-
--- | If the event is of type 'ActivityTaskcancelRequested' then this member
--- is set and provides detailed information about the event. It is not set
--- for other event types.
-heActivityTaskCancelRequestedEventAttributes :: Lens' HistoryEvent (Maybe ActivityTaskCancelRequestedEventAttributes)
-heActivityTaskCancelRequestedEventAttributes = lens _heActivityTaskCancelRequestedEventAttributes (\ s a -> s{_heActivityTaskCancelRequestedEventAttributes = a});
+heActivityTaskStartedEventAttributes :: Lens' HistoryEvent (Maybe ActivityTaskStartedEventAttributes)
+heActivityTaskStartedEventAttributes = lens _heActivityTaskStartedEventAttributes (\ s a -> s{_heActivityTaskStartedEventAttributes = a});
 
 -- | Undocumented member.
 heStartLambdaFunctionFailedEventAttributes :: Lens' HistoryEvent (Maybe StartLambdaFunctionFailedEventAttributes)
@@ -3242,12 +3223,36 @@
 heWorkflowExecutionCanceledEventAttributes :: Lens' HistoryEvent (Maybe WorkflowExecutionCanceledEventAttributes)
 heWorkflowExecutionCanceledEventAttributes = lens _heWorkflowExecutionCanceledEventAttributes (\ s a -> s{_heWorkflowExecutionCanceledEventAttributes = a});
 
+-- | If the event is of type 'TimerStarted' then this member is set and
+-- provides detailed information about the event. It is not set for other
+-- event types.
+heTimerStartedEventAttributes :: Lens' HistoryEvent (Maybe TimerStartedEventAttributes)
+heTimerStartedEventAttributes = lens _heTimerStartedEventAttributes (\ s a -> s{_heTimerStartedEventAttributes = a});
+
+-- | If the event is of type 'ActivityTaskcancelRequested' then this member
+-- is set and provides detailed information about the event. It is not set
+-- for other event types.
+heActivityTaskCancelRequestedEventAttributes :: Lens' HistoryEvent (Maybe ActivityTaskCancelRequestedEventAttributes)
+heActivityTaskCancelRequestedEventAttributes = lens _heActivityTaskCancelRequestedEventAttributes (\ s a -> s{_heActivityTaskCancelRequestedEventAttributes = a});
+
+-- | If the event is of type 'WorkflowExecutionTimedOut' then this member is
+-- set and provides detailed information about the event. It is not set for
+-- other event types.
+heWorkflowExecutionTimedOutEventAttributes :: Lens' HistoryEvent (Maybe WorkflowExecutionTimedOutEventAttributes)
+heWorkflowExecutionTimedOutEventAttributes = lens _heWorkflowExecutionTimedOutEventAttributes (\ s a -> s{_heWorkflowExecutionTimedOutEventAttributes = a});
+
 -- | If the event is of type 'WorkflowExecutionSignaled' then this member is
 -- set and provides detailed information about the event. It is not set for
 -- other event types.
 heWorkflowExecutionSignaledEventAttributes :: Lens' HistoryEvent (Maybe WorkflowExecutionSignaledEventAttributes)
 heWorkflowExecutionSignaledEventAttributes = lens _heWorkflowExecutionSignaledEventAttributes (\ s a -> s{_heWorkflowExecutionSignaledEventAttributes = a});
 
+-- | If the event is of type 'TimerFired' then this member is set and
+-- provides detailed information about the event. It is not set for other
+-- event types.
+heTimerFiredEventAttributes :: Lens' HistoryEvent (Maybe TimerFiredEventAttributes)
+heTimerFiredEventAttributes = lens _heTimerFiredEventAttributes (\ s a -> s{_heTimerFiredEventAttributes = a});
+
 -- | If the event is of type 'ActivityTaskFailed' then this member is set and
 -- provides detailed information about the event. It is not set for other
 -- event types.
@@ -3260,24 +3265,6 @@
 heExternalWorkflowExecutionSignaledEventAttributes :: Lens' HistoryEvent (Maybe ExternalWorkflowExecutionSignaledEventAttributes)
 heExternalWorkflowExecutionSignaledEventAttributes = lens _heExternalWorkflowExecutionSignaledEventAttributes (\ s a -> s{_heExternalWorkflowExecutionSignaledEventAttributes = a});
 
--- | If the event is of type 'TimerFired' then this member is set and
--- provides detailed information about the event. It is not set for other
--- event types.
-heTimerFiredEventAttributes :: Lens' HistoryEvent (Maybe TimerFiredEventAttributes)
-heTimerFiredEventAttributes = lens _heTimerFiredEventAttributes (\ s a -> s{_heTimerFiredEventAttributes = a});
-
--- | If the event is of type 'FailWorkflowExecutionFailed' then this member
--- is set and provides detailed information about the event. It is not set
--- for other event types.
-heFailWorkflowExecutionFailedEventAttributes :: Lens' HistoryEvent (Maybe FailWorkflowExecutionFailedEventAttributes)
-heFailWorkflowExecutionFailedEventAttributes = lens _heFailWorkflowExecutionFailedEventAttributes (\ s a -> s{_heFailWorkflowExecutionFailedEventAttributes = a});
-
--- | If the event is of type 'ChildWorkflowExecutionFailed' then this member
--- is set and provides detailed information about the event. It is not set
--- for other event types.
-heChildWorkflowExecutionFailedEventAttributes :: Lens' HistoryEvent (Maybe ChildWorkflowExecutionFailedEventAttributes)
-heChildWorkflowExecutionFailedEventAttributes = lens _heChildWorkflowExecutionFailedEventAttributes (\ s a -> s{_heChildWorkflowExecutionFailedEventAttributes = a});
-
 -- | If the event is of type 'DecisionTaskCompleted' then this member is set
 -- and provides detailed information about the event. It is not set for
 -- other event types.
@@ -3290,18 +3277,34 @@
 heStartChildWorkflowExecutionFailedEventAttributes :: Lens' HistoryEvent (Maybe StartChildWorkflowExecutionFailedEventAttributes)
 heStartChildWorkflowExecutionFailedEventAttributes = lens _heStartChildWorkflowExecutionFailedEventAttributes (\ s a -> s{_heStartChildWorkflowExecutionFailedEventAttributes = a});
 
--- | If the event is of type 'SignalExternalWorkflowExecutionInitiated' then
--- this member is set and provides detailed information about the event. It
--- is not set for other event types.
-heSignalExternalWorkflowExecutionInitiatedEventAttributes :: Lens' HistoryEvent (Maybe SignalExternalWorkflowExecutionInitiatedEventAttributes)
-heSignalExternalWorkflowExecutionInitiatedEventAttributes = lens _heSignalExternalWorkflowExecutionInitiatedEventAttributes (\ s a -> s{_heSignalExternalWorkflowExecutionInitiatedEventAttributes = a});
+-- | If the event is of type 'ChildWorkflowExecutionFailed' then this member
+-- is set and provides detailed information about the event. It is not set
+-- for other event types.
+heChildWorkflowExecutionFailedEventAttributes :: Lens' HistoryEvent (Maybe ChildWorkflowExecutionFailedEventAttributes)
+heChildWorkflowExecutionFailedEventAttributes = lens _heChildWorkflowExecutionFailedEventAttributes (\ s a -> s{_heChildWorkflowExecutionFailedEventAttributes = a});
 
+-- | If the event is of type 'FailWorkflowExecutionFailed' then this member
+-- is set and provides detailed information about the event. It is not set
+-- for other event types.
+heFailWorkflowExecutionFailedEventAttributes :: Lens' HistoryEvent (Maybe FailWorkflowExecutionFailedEventAttributes)
+heFailWorkflowExecutionFailedEventAttributes = lens _heFailWorkflowExecutionFailedEventAttributes (\ s a -> s{_heFailWorkflowExecutionFailedEventAttributes = a});
+
 -- | If the event is of type 'ContinueAsNewWorkflowExecutionFailed' then this
 -- member is set and provides detailed information about the event. It is
 -- not set for other event types.
 heContinueAsNewWorkflowExecutionFailedEventAttributes :: Lens' HistoryEvent (Maybe ContinueAsNewWorkflowExecutionFailedEventAttributes)
 heContinueAsNewWorkflowExecutionFailedEventAttributes = lens _heContinueAsNewWorkflowExecutionFailedEventAttributes (\ s a -> s{_heContinueAsNewWorkflowExecutionFailedEventAttributes = a});
 
+-- | If the event is of type 'SignalExternalWorkflowExecutionInitiated' then
+-- this member is set and provides detailed information about the event. It
+-- is not set for other event types.
+heSignalExternalWorkflowExecutionInitiatedEventAttributes :: Lens' HistoryEvent (Maybe SignalExternalWorkflowExecutionInitiatedEventAttributes)
+heSignalExternalWorkflowExecutionInitiatedEventAttributes = lens _heSignalExternalWorkflowExecutionInitiatedEventAttributes (\ s a -> s{_heSignalExternalWorkflowExecutionInitiatedEventAttributes = a});
+
+-- | Undocumented member.
+heLambdaFunctionTimedOutEventAttributes :: Lens' HistoryEvent (Maybe LambdaFunctionTimedOutEventAttributes)
+heLambdaFunctionTimedOutEventAttributes = lens _heLambdaFunctionTimedOutEventAttributes (\ s a -> s{_heLambdaFunctionTimedOutEventAttributes = a});
+
 -- | If the event is of type 'WorkflowExecutionFailed' then this member is
 -- set and provides detailed information about the event. It is not set for
 -- other event types.
@@ -3320,10 +3323,6 @@
 heExternalWorkflowExecutionCancelRequestedEventAttributes :: Lens' HistoryEvent (Maybe ExternalWorkflowExecutionCancelRequestedEventAttributes)
 heExternalWorkflowExecutionCancelRequestedEventAttributes = lens _heExternalWorkflowExecutionCancelRequestedEventAttributes (\ s a -> s{_heExternalWorkflowExecutionCancelRequestedEventAttributes = a});
 
--- | Undocumented member.
-heLambdaFunctionTimedOutEventAttributes :: Lens' HistoryEvent (Maybe LambdaFunctionTimedOutEventAttributes)
-heLambdaFunctionTimedOutEventAttributes = lens _heLambdaFunctionTimedOutEventAttributes (\ s a -> s{_heLambdaFunctionTimedOutEventAttributes = a});
-
 -- | The date and time when the event occurred.
 heEventTimestamp :: Lens' HistoryEvent UTCTime
 heEventTimestamp = lens _heEventTimestamp (\ s a -> s{_heEventTimestamp = a}) . _Time;
@@ -3344,69 +3343,64 @@
                  HistoryEvent' <$>
                    (x .:?
                       "workflowExecutionCancelRequestedEventAttributes")
-                     <*> (x .:? "decisionTaskScheduledEventAttributes")
-                     <*> (x .:? "startTimerFailedEventAttributes")
-                     <*> (x .:? "lambdaFunctionStartedEventAttributes")
                      <*> (x .:? "recordMarkerFailedEventAttributes")
                      <*>
                      (x .:?
                         "requestCancelExternalWorkflowExecutionInitiatedEventAttributes")
+                     <*> (x .:? "lambdaFunctionStartedEventAttributes")
+                     <*> (x .:? "decisionTaskScheduledEventAttributes")
                      <*>
                      (x .:? "workflowExecutionCompletedEventAttributes")
+                     <*> (x .:? "startTimerFailedEventAttributes")
                      <*> (x .:? "activityTaskScheduledEventAttributes")
                      <*>
+                     (x .:? "scheduleActivityTaskFailedEventAttributes")
+                     <*>
                      (x .:?
                         "childWorkflowExecutionCompletedEventAttributes")
-                     <*>
-                     (x .:? "scheduleActivityTaskFailedEventAttributes")
                      <*> (x .:? "markerRecordedEventAttributes")
                      <*>
                      (x .:? "scheduleLambdaFunctionFailedEventAttributes")
                      <*>
                      (x .:?
                         "completeWorkflowExecutionFailedEventAttributes")
+                     <*> (x .:? "lambdaFunctionCompletedEventAttributes")
                      <*>
                      (x .:?
                         "requestCancelExternalWorkflowExecutionFailedEventAttributes")
-                     <*> (x .:? "lambdaFunctionCompletedEventAttributes")
                      <*> (x .:? "timerCanceledEventAttributes")
                      <*> (x .:? "workflowExecutionStartedEventAttributes")
                      <*> (x .:? "activityTaskCompletedEventAttributes")
+                     <*> (x .:? "decisionTaskTimedOutEventAttributes")
+                     <*> (x .:? "cancelTimerFailedEventAttributes")
                      <*>
                      (x .:?
                         "childWorkflowExecutionStartedEventAttributes")
-                     <*> (x .:? "decisionTaskTimedOutEventAttributes")
-                     <*> (x .:? "cancelTimerFailedEventAttributes")
-                     <*> (x .:? "activityTaskTimedOutEventAttributes")
                      <*> (x .:? "activityTaskCanceledEventAttributes")
+                     <*> (x .:? "activityTaskTimedOutEventAttributes")
+                     <*> (x .:? "decisionTaskStartedEventAttributes")
                      <*>
+                     (x .:? "workflowExecutionTerminatedEventAttributes")
+                     <*>
                      (x .:?
                         "childWorkflowExecutionCanceledEventAttributes")
-                     <*> (x .:? "decisionTaskStartedEventAttributes")
                      <*>
                      (x .:?
-                        "cancelWorkflowExecutionFailedEventAttributes")
+                        "requestCancelActivityTaskFailedEventAttributes")
                      <*> (x .:? "lambdaFunctionScheduledEventAttributes")
                      <*>
                      (x .:?
                         "childWorkflowExecutionTimedOutEventAttributes")
                      <*>
                      (x .:?
-                        "requestCancelActivityTaskFailedEventAttributes")
-                     <*>
-                     (x .:? "workflowExecutionTerminatedEventAttributes")
+                        "cancelWorkflowExecutionFailedEventAttributes")
                      <*>
                      (x .:?
                         "startChildWorkflowExecutionInitiatedEventAttributes")
-                     <*> (x .:? "activityTaskStartedEventAttributes")
                      <*>
                      (x .:?
                         "signalExternalWorkflowExecutionFailedEventAttributes")
-                     <*> (x .:? "timerStartedEventAttributes")
-                     <*>
-                     (x .:? "workflowExecutionTimedOutEventAttributes")
-                     <*>
-                     (x .:? "activityTaskCancelRequestedEventAttributes")
+                     <*> (x .:? "activityTaskStartedEventAttributes")
                      <*>
                      (x .:? "startLambdaFunctionFailedEventAttributes")
                      <*>
@@ -3415,27 +3409,33 @@
                      <*> (x .:? "lambdaFunctionFailedEventAttributes")
                      <*>
                      (x .:? "workflowExecutionCanceledEventAttributes")
+                     <*> (x .:? "timerStartedEventAttributes")
                      <*>
+                     (x .:? "activityTaskCancelRequestedEventAttributes")
+                     <*>
+                     (x .:? "workflowExecutionTimedOutEventAttributes")
+                     <*>
                      (x .:? "workflowExecutionSignaledEventAttributes")
+                     <*> (x .:? "timerFiredEventAttributes")
                      <*> (x .:? "activityTaskFailedEventAttributes")
                      <*>
                      (x .:?
                         "externalWorkflowExecutionSignaledEventAttributes")
-                     <*> (x .:? "timerFiredEventAttributes")
-                     <*>
-                     (x .:? "failWorkflowExecutionFailedEventAttributes")
-                     <*>
-                     (x .:? "childWorkflowExecutionFailedEventAttributes")
                      <*> (x .:? "decisionTaskCompletedEventAttributes")
                      <*>
                      (x .:?
                         "startChildWorkflowExecutionFailedEventAttributes")
                      <*>
-                     (x .:?
-                        "signalExternalWorkflowExecutionInitiatedEventAttributes")
+                     (x .:? "childWorkflowExecutionFailedEventAttributes")
                      <*>
+                     (x .:? "failWorkflowExecutionFailedEventAttributes")
+                     <*>
                      (x .:?
                         "continueAsNewWorkflowExecutionFailedEventAttributes")
+                     <*>
+                     (x .:?
+                        "signalExternalWorkflowExecutionInitiatedEventAttributes")
+                     <*> (x .:? "lambdaFunctionTimedOutEventAttributes")
                      <*> (x .:? "workflowExecutionFailedEventAttributes")
                      <*>
                      (x .:?
@@ -3443,7 +3443,6 @@
                      <*>
                      (x .:?
                         "externalWorkflowExecutionCancelRequestedEventAttributes")
-                     <*> (x .:? "lambdaFunctionTimedOutEventAttributes")
                      <*> (x .: "eventTimestamp")
                      <*> (x .: "eventType")
                      <*> (x .: "eventId"))
@@ -4314,8 +4313,8 @@
 -- /See:/ 'scheduleActivityTaskDecisionAttributes' smart constructor.
 data ScheduleActivityTaskDecisionAttributes = ScheduleActivityTaskDecisionAttributes'
     { _satdaControl                :: !(Maybe Text)
-    , _satdaScheduleToCloseTimeout :: !(Maybe Text)
     , _satdaHeartbeatTimeout       :: !(Maybe Text)
+    , _satdaScheduleToCloseTimeout :: !(Maybe Text)
     , _satdaInput                  :: !(Maybe Text)
     , _satdaTaskList               :: !(Maybe TaskList)
     , _satdaTaskPriority           :: !(Maybe Text)
@@ -4331,10 +4330,10 @@
 --
 -- * 'satdaControl'
 --
--- * 'satdaScheduleToCloseTimeout'
---
 -- * 'satdaHeartbeatTimeout'
 --
+-- * 'satdaScheduleToCloseTimeout'
+--
 -- * 'satdaInput'
 --
 -- * 'satdaTaskList'
@@ -4355,8 +4354,8 @@
 scheduleActivityTaskDecisionAttributes pActivityType_ pActivityId_ =
     ScheduleActivityTaskDecisionAttributes'
     { _satdaControl = Nothing
-    , _satdaScheduleToCloseTimeout = Nothing
     , _satdaHeartbeatTimeout = Nothing
+    , _satdaScheduleToCloseTimeout = Nothing
     , _satdaInput = Nothing
     , _satdaTaskList = Nothing
     , _satdaTaskPriority = Nothing
@@ -4371,18 +4370,6 @@
 satdaControl :: Lens' ScheduleActivityTaskDecisionAttributes (Maybe Text)
 satdaControl = lens _satdaControl (\ s a -> s{_satdaControl = a});
 
--- | The maximum duration for this activity task.
---
--- The duration is specified in seconds; an integer greater than or equal
--- to 0. The value \"NONE\" can be used to specify unlimited duration.
---
--- A schedule-to-close timeout for this activity task must be specified
--- either as a default for the activity type or through this field. If
--- neither this field is set nor a default schedule-to-close timeout was
--- specified at registration time then a fault will be returned.
-satdaScheduleToCloseTimeout :: Lens' ScheduleActivityTaskDecisionAttributes (Maybe Text)
-satdaScheduleToCloseTimeout = lens _satdaScheduleToCloseTimeout (\ s a -> s{_satdaScheduleToCloseTimeout = a});
-
 -- | If set, specifies the maximum time before which a worker processing a
 -- task of this type must report progress by calling
 -- RecordActivityTaskHeartbeat. If the timeout is exceeded, the activity
@@ -4396,6 +4383,18 @@
 satdaHeartbeatTimeout :: Lens' ScheduleActivityTaskDecisionAttributes (Maybe Text)
 satdaHeartbeatTimeout = lens _satdaHeartbeatTimeout (\ s a -> s{_satdaHeartbeatTimeout = a});
 
+-- | The maximum duration for this activity task.
+--
+-- The duration is specified in seconds; an integer greater than or equal
+-- to 0. The value \"NONE\" can be used to specify unlimited duration.
+--
+-- A schedule-to-close timeout for this activity task must be specified
+-- either as a default for the activity type or through this field. If
+-- neither this field is set nor a default schedule-to-close timeout was
+-- specified at registration time then a fault will be returned.
+satdaScheduleToCloseTimeout :: Lens' ScheduleActivityTaskDecisionAttributes (Maybe Text)
+satdaScheduleToCloseTimeout = lens _satdaScheduleToCloseTimeout (\ s a -> s{_satdaScheduleToCloseTimeout = a});
+
 -- | The input provided to the activity task.
 satdaInput :: Lens' ScheduleActivityTaskDecisionAttributes (Maybe Text)
 satdaInput = lens _satdaInput (\ s a -> s{_satdaInput = a});
@@ -4477,9 +4476,9 @@
           = object
               (catMaybes
                  [("control" .=) <$> _satdaControl,
+                  ("heartbeatTimeout" .=) <$> _satdaHeartbeatTimeout,
                   ("scheduleToCloseTimeout" .=) <$>
                     _satdaScheduleToCloseTimeout,
-                  ("heartbeatTimeout" .=) <$> _satdaHeartbeatTimeout,
                   ("input" .=) <$> _satdaInput,
                   ("taskList" .=) <$> _satdaTaskList,
                   ("taskPriority" .=) <$> _satdaTaskPriority,
diff --git a/gen/Network/AWS/SWF/Types/Sum.hs b/gen/Network/AWS/SWF/Types/Sum.hs
--- a/gen/Network/AWS/SWF/Types/Sum.hs
+++ b/gen/Network/AWS/SWF/Types/Sum.hs
@@ -576,18 +576,18 @@
     parseJSON = parseJSONText "LambdaFunctionTimeoutType"
 
 data RecordMarkerFailedCause =
-    RMFCOperationNotPermitted
+    OperationNotPermitted
     deriving (Eq,Ord,Read,Show,Enum,Data,Typeable,Generic)
 
 instance FromText RecordMarkerFailedCause where
     parser = takeLowerText >>= \case
-        "operation_not_permitted" -> pure RMFCOperationNotPermitted
+        "operation_not_permitted" -> pure OperationNotPermitted
         e -> fromTextError $ "Failure parsing RecordMarkerFailedCause from value: '" <> e
            <> "'. Accepted values: OPERATION_NOT_PERMITTED"
 
 instance ToText RecordMarkerFailedCause where
     toText = \case
-        RMFCOperationNotPermitted -> "OPERATION_NOT_PERMITTED"
+        OperationNotPermitted -> "OPERATION_NOT_PERMITTED"
 
 instance Hashable     RecordMarkerFailedCause
 instance ToByteString RecordMarkerFailedCause
@@ -864,27 +864,27 @@
     parseJSON = parseJSONText "StartLambdaFunctionFailedCause"
 
 data StartTimerFailedCause
-    = OpenTimersLimitExceeded
-    | OperationNotPermitted
-    | TimerCreationRateExceeded
-    | TimerIdAlreadyInUse
+    = STFCOpenTimersLimitExceeded
+    | STFCOperationNotPermitted
+    | STFCTimerCreationRateExceeded
+    | STFCTimerIdAlreadyInUse
     deriving (Eq,Ord,Read,Show,Enum,Data,Typeable,Generic)
 
 instance FromText StartTimerFailedCause where
     parser = takeLowerText >>= \case
-        "open_timers_limit_exceeded" -> pure OpenTimersLimitExceeded
-        "operation_not_permitted" -> pure OperationNotPermitted
-        "timer_creation_rate_exceeded" -> pure TimerCreationRateExceeded
-        "timer_id_already_in_use" -> pure TimerIdAlreadyInUse
+        "open_timers_limit_exceeded" -> pure STFCOpenTimersLimitExceeded
+        "operation_not_permitted" -> pure STFCOperationNotPermitted
+        "timer_creation_rate_exceeded" -> pure STFCTimerCreationRateExceeded
+        "timer_id_already_in_use" -> pure STFCTimerIdAlreadyInUse
         e -> fromTextError $ "Failure parsing StartTimerFailedCause from value: '" <> e
            <> "'. Accepted values: OPEN_TIMERS_LIMIT_EXCEEDED, OPERATION_NOT_PERMITTED, TIMER_CREATION_RATE_EXCEEDED, TIMER_ID_ALREADY_IN_USE"
 
 instance ToText StartTimerFailedCause where
     toText = \case
-        OpenTimersLimitExceeded -> "OPEN_TIMERS_LIMIT_EXCEEDED"
-        OperationNotPermitted -> "OPERATION_NOT_PERMITTED"
-        TimerCreationRateExceeded -> "TIMER_CREATION_RATE_EXCEEDED"
-        TimerIdAlreadyInUse -> "TIMER_ID_ALREADY_IN_USE"
+        STFCOpenTimersLimitExceeded -> "OPEN_TIMERS_LIMIT_EXCEEDED"
+        STFCOperationNotPermitted -> "OPERATION_NOT_PERMITTED"
+        STFCTimerCreationRateExceeded -> "TIMER_CREATION_RATE_EXCEEDED"
+        STFCTimerIdAlreadyInUse -> "TIMER_ID_ALREADY_IN_USE"
 
 instance Hashable     StartTimerFailedCause
 instance ToByteString StartTimerFailedCause
diff --git a/test/Test/AWS/Gen/SWF.hs b/test/Test/AWS/Gen/SWF.hs
--- a/test/Test/AWS/Gen/SWF.hs
+++ b/test/Test/AWS/Gen/SWF.hs
@@ -28,47 +28,44 @@
 -- fixtures :: TestTree
 -- fixtures =
 --     [ testGroup "request"
---         [ testListActivityTypes $
---             listActivityTypes
---
---         , testListOpenWorkflowExecutions $
+--         [ testListOpenWorkflowExecutions $
 --             listOpenWorkflowExecutions
 --
 --         , testRegisterActivityType $
 --             registerActivityType
 --
+--         , testListActivityTypes $
+--             listActivityTypes
+--
 --         , testCountPendingActivityTasks $
 --             countPendingActivityTasks
 --
 --         , testRegisterWorkflowType $
 --             registerWorkflowType
 --
---         , testRespondActivityTaskFailed $
---             respondActivityTaskFailed
---
 --         , testListWorkflowTypes $
 --             listWorkflowTypes
 --
+--         , testRespondActivityTaskFailed $
+--             respondActivityTaskFailed
+--
 --         , testCountOpenWorkflowExecutions $
 --             countOpenWorkflowExecutions
 --
 --         , testDescribeWorkflowType $
 --             describeWorkflowType
 --
---         , testRequestCancelWorkflowExecution $
---             requestCancelWorkflowExecution
---
 --         , testDeprecateWorkflowType $
 --             deprecateWorkflowType
 --
---         , testRespondDecisionTaskCompleted $
---             respondDecisionTaskCompleted
+--         , testRequestCancelWorkflowExecution $
+--             requestCancelWorkflowExecution
 --
 --         , testRegisterDomain $
 --             registerDomain
 --
---         , testDescribeWorkflowExecution $
---             describeWorkflowExecution
+--         , testRespondDecisionTaskCompleted $
+--             respondDecisionTaskCompleted
 --
 --         , testPollForActivityTask $
 --             pollForActivityTask
@@ -76,6 +73,9 @@
 --         , testRespondActivityTaskCompleted $
 --             respondActivityTaskCompleted
 --
+--         , testDescribeWorkflowExecution $
+--             describeWorkflowExecution
+--
 --         , testSignalWorkflowExecution $
 --             signalWorkflowExecution
 --
@@ -91,11 +91,14 @@
 --         , testDescribeDomain $
 --             describeDomain
 --
+--         , testGetWorkflowExecutionHistory $
+--             getWorkflowExecutionHistory
+--
 --         , testDeprecateDomain $
 --             deprecateDomain
 --
---         , testGetWorkflowExecutionHistory $
---             getWorkflowExecutionHistory
+--         , testTerminateWorkflowExecution $
+--             terminateWorkflowExecution
 --
 --         , testDescribeActivityType $
 --             describeActivityType
@@ -103,68 +106,62 @@
 --         , testDeprecateActivityType $
 --             deprecateActivityType
 --
---         , testTerminateWorkflowExecution $
---             terminateWorkflowExecution
---
 --         , testCountClosedWorkflowExecutions $
 --             countClosedWorkflowExecutions
 --
 --         , testRespondActivityTaskCanceled $
 --             respondActivityTaskCanceled
 --
---         , testListDomains $
---             listDomains
---
 --         , testStartWorkflowExecution $
 --             startWorkflowExecution
 --
 --         , testPollForDecisionTask $
 --             pollForDecisionTask
 --
+--         , testListDomains $
+--             listDomains
+--
 --           ]
 
 --     , testGroup "response"
---         [ testListActivityTypesResponse $
---             listActivityTypesResponse
---
---         , testListOpenWorkflowExecutionsResponse $
+--         [ testListOpenWorkflowExecutionsResponse $
 --             workflowExecutionInfos
 --
 --         , testRegisterActivityTypeResponse $
 --             registerActivityTypeResponse
 --
+--         , testListActivityTypesResponse $
+--             listActivityTypesResponse
+--
 --         , testCountPendingActivityTasksResponse $
 --             pendingTaskCount
 --
 --         , testRegisterWorkflowTypeResponse $
 --             registerWorkflowTypeResponse
 --
---         , testRespondActivityTaskFailedResponse $
---             respondActivityTaskFailedResponse
---
 --         , testListWorkflowTypesResponse $
 --             listWorkflowTypesResponse
 --
+--         , testRespondActivityTaskFailedResponse $
+--             respondActivityTaskFailedResponse
+--
 --         , testCountOpenWorkflowExecutionsResponse $
 --             workflowExecutionCount
 --
 --         , testDescribeWorkflowTypeResponse $
 --             describeWorkflowTypeResponse
 --
---         , testRequestCancelWorkflowExecutionResponse $
---             requestCancelWorkflowExecutionResponse
---
 --         , testDeprecateWorkflowTypeResponse $
 --             deprecateWorkflowTypeResponse
 --
---         , testRespondDecisionTaskCompletedResponse $
---             respondDecisionTaskCompletedResponse
+--         , testRequestCancelWorkflowExecutionResponse $
+--             requestCancelWorkflowExecutionResponse
 --
 --         , testRegisterDomainResponse $
 --             registerDomainResponse
 --
---         , testDescribeWorkflowExecutionResponse $
---             describeWorkflowExecutionResponse
+--         , testRespondDecisionTaskCompletedResponse $
+--             respondDecisionTaskCompletedResponse
 --
 --         , testPollForActivityTaskResponse $
 --             pollForActivityTaskResponse
@@ -172,6 +169,9 @@
 --         , testRespondActivityTaskCompletedResponse $
 --             respondActivityTaskCompletedResponse
 --
+--         , testDescribeWorkflowExecutionResponse $
+--             describeWorkflowExecutionResponse
+--
 --         , testSignalWorkflowExecutionResponse $
 --             signalWorkflowExecutionResponse
 --
@@ -187,11 +187,14 @@
 --         , testDescribeDomainResponse $
 --             describeDomainResponse
 --
+--         , testGetWorkflowExecutionHistoryResponse $
+--             getWorkflowExecutionHistoryResponse
+--
 --         , testDeprecateDomainResponse $
 --             deprecateDomainResponse
 --
---         , testGetWorkflowExecutionHistoryResponse $
---             getWorkflowExecutionHistoryResponse
+--         , testTerminateWorkflowExecutionResponse $
+--             terminateWorkflowExecutionResponse
 --
 --         , testDescribeActivityTypeResponse $
 --             describeActivityTypeResponse
@@ -199,34 +202,26 @@
 --         , testDeprecateActivityTypeResponse $
 --             deprecateActivityTypeResponse
 --
---         , testTerminateWorkflowExecutionResponse $
---             terminateWorkflowExecutionResponse
---
 --         , testCountClosedWorkflowExecutionsResponse $
 --             workflowExecutionCount
 --
 --         , testRespondActivityTaskCanceledResponse $
 --             respondActivityTaskCanceledResponse
 --
---         , testListDomainsResponse $
---             listDomainsResponse
---
 --         , testStartWorkflowExecutionResponse $
 --             startWorkflowExecutionResponse
 --
 --         , testPollForDecisionTaskResponse $
 --             pollForDecisionTaskResponse
 --
+--         , testListDomainsResponse $
+--             listDomainsResponse
+--
 --           ]
 --     ]
 
 -- Requests
 
-testListActivityTypes :: ListActivityTypes -> TestTree
-testListActivityTypes = req
-    "ListActivityTypes"
-    "fixture/ListActivityTypes.yaml"
-
 testListOpenWorkflowExecutions :: ListOpenWorkflowExecutions -> TestTree
 testListOpenWorkflowExecutions = req
     "ListOpenWorkflowExecutions"
@@ -237,6 +232,11 @@
     "RegisterActivityType"
     "fixture/RegisterActivityType.yaml"
 
+testListActivityTypes :: ListActivityTypes -> TestTree
+testListActivityTypes = req
+    "ListActivityTypes"
+    "fixture/ListActivityTypes.yaml"
+
 testCountPendingActivityTasks :: CountPendingActivityTasks -> TestTree
 testCountPendingActivityTasks = req
     "CountPendingActivityTasks"
@@ -247,16 +247,16 @@
     "RegisterWorkflowType"
     "fixture/RegisterWorkflowType.yaml"
 
-testRespondActivityTaskFailed :: RespondActivityTaskFailed -> TestTree
-testRespondActivityTaskFailed = req
-    "RespondActivityTaskFailed"
-    "fixture/RespondActivityTaskFailed.yaml"
-
 testListWorkflowTypes :: ListWorkflowTypes -> TestTree
 testListWorkflowTypes = req
     "ListWorkflowTypes"
     "fixture/ListWorkflowTypes.yaml"
 
+testRespondActivityTaskFailed :: RespondActivityTaskFailed -> TestTree
+testRespondActivityTaskFailed = req
+    "RespondActivityTaskFailed"
+    "fixture/RespondActivityTaskFailed.yaml"
+
 testCountOpenWorkflowExecutions :: CountOpenWorkflowExecutions -> TestTree
 testCountOpenWorkflowExecutions = req
     "CountOpenWorkflowExecutions"
@@ -267,30 +267,25 @@
     "DescribeWorkflowType"
     "fixture/DescribeWorkflowType.yaml"
 
-testRequestCancelWorkflowExecution :: RequestCancelWorkflowExecution -> TestTree
-testRequestCancelWorkflowExecution = req
-    "RequestCancelWorkflowExecution"
-    "fixture/RequestCancelWorkflowExecution.yaml"
-
 testDeprecateWorkflowType :: DeprecateWorkflowType -> TestTree
 testDeprecateWorkflowType = req
     "DeprecateWorkflowType"
     "fixture/DeprecateWorkflowType.yaml"
 
-testRespondDecisionTaskCompleted :: RespondDecisionTaskCompleted -> TestTree
-testRespondDecisionTaskCompleted = req
-    "RespondDecisionTaskCompleted"
-    "fixture/RespondDecisionTaskCompleted.yaml"
+testRequestCancelWorkflowExecution :: RequestCancelWorkflowExecution -> TestTree
+testRequestCancelWorkflowExecution = req
+    "RequestCancelWorkflowExecution"
+    "fixture/RequestCancelWorkflowExecution.yaml"
 
 testRegisterDomain :: RegisterDomain -> TestTree
 testRegisterDomain = req
     "RegisterDomain"
     "fixture/RegisterDomain.yaml"
 
-testDescribeWorkflowExecution :: DescribeWorkflowExecution -> TestTree
-testDescribeWorkflowExecution = req
-    "DescribeWorkflowExecution"
-    "fixture/DescribeWorkflowExecution.yaml"
+testRespondDecisionTaskCompleted :: RespondDecisionTaskCompleted -> TestTree
+testRespondDecisionTaskCompleted = req
+    "RespondDecisionTaskCompleted"
+    "fixture/RespondDecisionTaskCompleted.yaml"
 
 testPollForActivityTask :: PollForActivityTask -> TestTree
 testPollForActivityTask = req
@@ -302,6 +297,11 @@
     "RespondActivityTaskCompleted"
     "fixture/RespondActivityTaskCompleted.yaml"
 
+testDescribeWorkflowExecution :: DescribeWorkflowExecution -> TestTree
+testDescribeWorkflowExecution = req
+    "DescribeWorkflowExecution"
+    "fixture/DescribeWorkflowExecution.yaml"
+
 testSignalWorkflowExecution :: SignalWorkflowExecution -> TestTree
 testSignalWorkflowExecution = req
     "SignalWorkflowExecution"
@@ -327,15 +327,20 @@
     "DescribeDomain"
     "fixture/DescribeDomain.yaml"
 
+testGetWorkflowExecutionHistory :: GetWorkflowExecutionHistory -> TestTree
+testGetWorkflowExecutionHistory = req
+    "GetWorkflowExecutionHistory"
+    "fixture/GetWorkflowExecutionHistory.yaml"
+
 testDeprecateDomain :: DeprecateDomain -> TestTree
 testDeprecateDomain = req
     "DeprecateDomain"
     "fixture/DeprecateDomain.yaml"
 
-testGetWorkflowExecutionHistory :: GetWorkflowExecutionHistory -> TestTree
-testGetWorkflowExecutionHistory = req
-    "GetWorkflowExecutionHistory"
-    "fixture/GetWorkflowExecutionHistory.yaml"
+testTerminateWorkflowExecution :: TerminateWorkflowExecution -> TestTree
+testTerminateWorkflowExecution = req
+    "TerminateWorkflowExecution"
+    "fixture/TerminateWorkflowExecution.yaml"
 
 testDescribeActivityType :: DescribeActivityType -> TestTree
 testDescribeActivityType = req
@@ -347,11 +352,6 @@
     "DeprecateActivityType"
     "fixture/DeprecateActivityType.yaml"
 
-testTerminateWorkflowExecution :: TerminateWorkflowExecution -> TestTree
-testTerminateWorkflowExecution = req
-    "TerminateWorkflowExecution"
-    "fixture/TerminateWorkflowExecution.yaml"
-
 testCountClosedWorkflowExecutions :: CountClosedWorkflowExecutions -> TestTree
 testCountClosedWorkflowExecutions = req
     "CountClosedWorkflowExecutions"
@@ -362,11 +362,6 @@
     "RespondActivityTaskCanceled"
     "fixture/RespondActivityTaskCanceled.yaml"
 
-testListDomains :: ListDomains -> TestTree
-testListDomains = req
-    "ListDomains"
-    "fixture/ListDomains.yaml"
-
 testStartWorkflowExecution :: StartWorkflowExecution -> TestTree
 testStartWorkflowExecution = req
     "StartWorkflowExecution"
@@ -377,14 +372,12 @@
     "PollForDecisionTask"
     "fixture/PollForDecisionTask.yaml"
 
--- Responses
+testListDomains :: ListDomains -> TestTree
+testListDomains = req
+    "ListDomains"
+    "fixture/ListDomains.yaml"
 
-testListActivityTypesResponse :: ListActivityTypesResponse -> TestTree
-testListActivityTypesResponse = res
-    "ListActivityTypesResponse"
-    "fixture/ListActivityTypesResponse.proto"
-    sWF
-    (Proxy :: Proxy ListActivityTypes)
+-- Responses
 
 testListOpenWorkflowExecutionsResponse :: WorkflowExecutionInfos -> TestTree
 testListOpenWorkflowExecutionsResponse = res
@@ -400,6 +393,13 @@
     sWF
     (Proxy :: Proxy RegisterActivityType)
 
+testListActivityTypesResponse :: ListActivityTypesResponse -> TestTree
+testListActivityTypesResponse = res
+    "ListActivityTypesResponse"
+    "fixture/ListActivityTypesResponse.proto"
+    sWF
+    (Proxy :: Proxy ListActivityTypes)
+
 testCountPendingActivityTasksResponse :: PendingTaskCount -> TestTree
 testCountPendingActivityTasksResponse = res
     "CountPendingActivityTasksResponse"
@@ -414,13 +414,6 @@
     sWF
     (Proxy :: Proxy RegisterWorkflowType)
 
-testRespondActivityTaskFailedResponse :: RespondActivityTaskFailedResponse -> TestTree
-testRespondActivityTaskFailedResponse = res
-    "RespondActivityTaskFailedResponse"
-    "fixture/RespondActivityTaskFailedResponse.proto"
-    sWF
-    (Proxy :: Proxy RespondActivityTaskFailed)
-
 testListWorkflowTypesResponse :: ListWorkflowTypesResponse -> TestTree
 testListWorkflowTypesResponse = res
     "ListWorkflowTypesResponse"
@@ -428,6 +421,13 @@
     sWF
     (Proxy :: Proxy ListWorkflowTypes)
 
+testRespondActivityTaskFailedResponse :: RespondActivityTaskFailedResponse -> TestTree
+testRespondActivityTaskFailedResponse = res
+    "RespondActivityTaskFailedResponse"
+    "fixture/RespondActivityTaskFailedResponse.proto"
+    sWF
+    (Proxy :: Proxy RespondActivityTaskFailed)
+
 testCountOpenWorkflowExecutionsResponse :: WorkflowExecutionCount -> TestTree
 testCountOpenWorkflowExecutionsResponse = res
     "CountOpenWorkflowExecutionsResponse"
@@ -442,13 +442,6 @@
     sWF
     (Proxy :: Proxy DescribeWorkflowType)
 
-testRequestCancelWorkflowExecutionResponse :: RequestCancelWorkflowExecutionResponse -> TestTree
-testRequestCancelWorkflowExecutionResponse = res
-    "RequestCancelWorkflowExecutionResponse"
-    "fixture/RequestCancelWorkflowExecutionResponse.proto"
-    sWF
-    (Proxy :: Proxy RequestCancelWorkflowExecution)
-
 testDeprecateWorkflowTypeResponse :: DeprecateWorkflowTypeResponse -> TestTree
 testDeprecateWorkflowTypeResponse = res
     "DeprecateWorkflowTypeResponse"
@@ -456,12 +449,12 @@
     sWF
     (Proxy :: Proxy DeprecateWorkflowType)
 
-testRespondDecisionTaskCompletedResponse :: RespondDecisionTaskCompletedResponse -> TestTree
-testRespondDecisionTaskCompletedResponse = res
-    "RespondDecisionTaskCompletedResponse"
-    "fixture/RespondDecisionTaskCompletedResponse.proto"
+testRequestCancelWorkflowExecutionResponse :: RequestCancelWorkflowExecutionResponse -> TestTree
+testRequestCancelWorkflowExecutionResponse = res
+    "RequestCancelWorkflowExecutionResponse"
+    "fixture/RequestCancelWorkflowExecutionResponse.proto"
     sWF
-    (Proxy :: Proxy RespondDecisionTaskCompleted)
+    (Proxy :: Proxy RequestCancelWorkflowExecution)
 
 testRegisterDomainResponse :: RegisterDomainResponse -> TestTree
 testRegisterDomainResponse = res
@@ -470,12 +463,12 @@
     sWF
     (Proxy :: Proxy RegisterDomain)
 
-testDescribeWorkflowExecutionResponse :: DescribeWorkflowExecutionResponse -> TestTree
-testDescribeWorkflowExecutionResponse = res
-    "DescribeWorkflowExecutionResponse"
-    "fixture/DescribeWorkflowExecutionResponse.proto"
+testRespondDecisionTaskCompletedResponse :: RespondDecisionTaskCompletedResponse -> TestTree
+testRespondDecisionTaskCompletedResponse = res
+    "RespondDecisionTaskCompletedResponse"
+    "fixture/RespondDecisionTaskCompletedResponse.proto"
     sWF
-    (Proxy :: Proxy DescribeWorkflowExecution)
+    (Proxy :: Proxy RespondDecisionTaskCompleted)
 
 testPollForActivityTaskResponse :: PollForActivityTaskResponse -> TestTree
 testPollForActivityTaskResponse = res
@@ -491,6 +484,13 @@
     sWF
     (Proxy :: Proxy RespondActivityTaskCompleted)
 
+testDescribeWorkflowExecutionResponse :: DescribeWorkflowExecutionResponse -> TestTree
+testDescribeWorkflowExecutionResponse = res
+    "DescribeWorkflowExecutionResponse"
+    "fixture/DescribeWorkflowExecutionResponse.proto"
+    sWF
+    (Proxy :: Proxy DescribeWorkflowExecution)
+
 testSignalWorkflowExecutionResponse :: SignalWorkflowExecutionResponse -> TestTree
 testSignalWorkflowExecutionResponse = res
     "SignalWorkflowExecutionResponse"
@@ -526,6 +526,13 @@
     sWF
     (Proxy :: Proxy DescribeDomain)
 
+testGetWorkflowExecutionHistoryResponse :: GetWorkflowExecutionHistoryResponse -> TestTree
+testGetWorkflowExecutionHistoryResponse = res
+    "GetWorkflowExecutionHistoryResponse"
+    "fixture/GetWorkflowExecutionHistoryResponse.proto"
+    sWF
+    (Proxy :: Proxy GetWorkflowExecutionHistory)
+
 testDeprecateDomainResponse :: DeprecateDomainResponse -> TestTree
 testDeprecateDomainResponse = res
     "DeprecateDomainResponse"
@@ -533,12 +540,12 @@
     sWF
     (Proxy :: Proxy DeprecateDomain)
 
-testGetWorkflowExecutionHistoryResponse :: GetWorkflowExecutionHistoryResponse -> TestTree
-testGetWorkflowExecutionHistoryResponse = res
-    "GetWorkflowExecutionHistoryResponse"
-    "fixture/GetWorkflowExecutionHistoryResponse.proto"
+testTerminateWorkflowExecutionResponse :: TerminateWorkflowExecutionResponse -> TestTree
+testTerminateWorkflowExecutionResponse = res
+    "TerminateWorkflowExecutionResponse"
+    "fixture/TerminateWorkflowExecutionResponse.proto"
     sWF
-    (Proxy :: Proxy GetWorkflowExecutionHistory)
+    (Proxy :: Proxy TerminateWorkflowExecution)
 
 testDescribeActivityTypeResponse :: DescribeActivityTypeResponse -> TestTree
 testDescribeActivityTypeResponse = res
@@ -554,13 +561,6 @@
     sWF
     (Proxy :: Proxy DeprecateActivityType)
 
-testTerminateWorkflowExecutionResponse :: TerminateWorkflowExecutionResponse -> TestTree
-testTerminateWorkflowExecutionResponse = res
-    "TerminateWorkflowExecutionResponse"
-    "fixture/TerminateWorkflowExecutionResponse.proto"
-    sWF
-    (Proxy :: Proxy TerminateWorkflowExecution)
-
 testCountClosedWorkflowExecutionsResponse :: WorkflowExecutionCount -> TestTree
 testCountClosedWorkflowExecutionsResponse = res
     "CountClosedWorkflowExecutionsResponse"
@@ -575,13 +575,6 @@
     sWF
     (Proxy :: Proxy RespondActivityTaskCanceled)
 
-testListDomainsResponse :: ListDomainsResponse -> TestTree
-testListDomainsResponse = res
-    "ListDomainsResponse"
-    "fixture/ListDomainsResponse.proto"
-    sWF
-    (Proxy :: Proxy ListDomains)
-
 testStartWorkflowExecutionResponse :: StartWorkflowExecutionResponse -> TestTree
 testStartWorkflowExecutionResponse = res
     "StartWorkflowExecutionResponse"
@@ -595,3 +588,10 @@
     "fixture/PollForDecisionTaskResponse.proto"
     sWF
     (Proxy :: Proxy PollForDecisionTask)
+
+testListDomainsResponse :: ListDomainsResponse -> TestTree
+testListDomainsResponse = res
+    "ListDomainsResponse"
+    "fixture/ListDomainsResponse.proto"
+    sWF
+    (Proxy :: Proxy ListDomains)
