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-datapipeline.cabal b/amazonka-datapipeline.cabal
--- a/amazonka-datapipeline.cabal
+++ b/amazonka-datapipeline.cabal
@@ -1,5 +1,5 @@
 name:                  amazonka-datapipeline
-version:               1.2.0.2
+version:               1.3.0
 synopsis:              Amazon Data Pipeline SDK.
 homepage:              https://github.com/brendanhay/amazonka
 bug-reports:           https://github.com/brendanhay/amazonka/issues
@@ -90,7 +90,7 @@
         , Network.AWS.DataPipeline.Types.Sum
 
     build-depends:
-          amazonka-core == 1.2.0.*
+          amazonka-core == 1.3.0.*
         , base          >= 4.7     && < 5
 
 test-suite amazonka-datapipeline-test
@@ -110,9 +110,9 @@
         , Test.AWS.DataPipeline.Internal
 
     build-depends:
-          amazonka-core == 1.2.0.*
-        , amazonka-test == 1.2.0.*
-        , amazonka-datapipeline == 1.2.0.*
+          amazonka-core == 1.3.0.*
+        , amazonka-test == 1.3.0.*
+        , amazonka-datapipeline == 1.3.0.*
         , base
         , bytestring
         , lens
diff --git a/gen/Network/AWS/DataPipeline.hs b/gen/Network/AWS/DataPipeline.hs
--- a/gen/Network/AWS/DataPipeline.hs
+++ b/gen/Network/AWS/DataPipeline.hs
@@ -80,15 +80,15 @@
     -- ** ListPipelines (Paginated)
     , module Network.AWS.DataPipeline.ListPipelines
 
+    -- ** EvaluateExpression
+    , module Network.AWS.DataPipeline.EvaluateExpression
+
     -- ** GetPipelineDefinition
     , module Network.AWS.DataPipeline.GetPipelineDefinition
 
     -- ** PollForTask
     , module Network.AWS.DataPipeline.PollForTask
 
-    -- ** EvaluateExpression
-    , module Network.AWS.DataPipeline.EvaluateExpression
-
     -- ** DeactivatePipeline
     , module Network.AWS.DataPipeline.DeactivatePipeline
 
@@ -107,15 +107,15 @@
     -- ** SetTaskStatus
     , module Network.AWS.DataPipeline.SetTaskStatus
 
+    -- ** SetStatus
+    , module Network.AWS.DataPipeline.SetStatus
+
     -- ** ReportTaskProgress
     , module Network.AWS.DataPipeline.ReportTaskProgress
 
     -- ** CreatePipeline
     , module Network.AWS.DataPipeline.CreatePipeline
 
-    -- ** SetStatus
-    , module Network.AWS.DataPipeline.SetStatus
-
     -- ** PutPipelineDefinition
     , module Network.AWS.DataPipeline.PutPipelineDefinition
 
@@ -210,8 +210,8 @@
     , TaskObject
     , taskObject
     , toPipelineId
-    , toTaskId
     , toAttemptId
+    , toTaskId
     , toObjects
 
     -- ** ValidationError
diff --git a/gen/Network/AWS/DataPipeline/ActivatePipeline.hs b/gen/Network/AWS/DataPipeline/ActivatePipeline.hs
--- a/gen/Network/AWS/DataPipeline/ActivatePipeline.hs
+++ b/gen/Network/AWS/DataPipeline/ActivatePipeline.hs
@@ -42,7 +42,7 @@
     , activatePipelineResponse
     , ActivatePipelineResponse
     -- * Response Lenses
-    , aprsStatus
+    , aprsResponseStatus
     ) where
 
 import           Network.AWS.DataPipeline.Types
@@ -127,22 +127,22 @@
 --
 -- /See:/ 'activatePipelineResponse' smart constructor.
 newtype ActivatePipelineResponse = ActivatePipelineResponse'
-    { _aprsStatus :: Int
+    { _aprsResponseStatus :: Int
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'ActivatePipelineResponse' with the minimum fields required to make a request.
 --
 -- Use one of the following lenses to modify other fields as desired:
 --
--- * 'aprsStatus'
+-- * 'aprsResponseStatus'
 activatePipelineResponse
-    :: Int -- ^ 'aprsStatus'
+    :: Int -- ^ 'aprsResponseStatus'
     -> ActivatePipelineResponse
-activatePipelineResponse pStatus_ =
+activatePipelineResponse pResponseStatus_ =
     ActivatePipelineResponse'
-    { _aprsStatus = pStatus_
+    { _aprsResponseStatus = pResponseStatus_
     }
 
 -- | The response status code.
-aprsStatus :: Lens' ActivatePipelineResponse Int
-aprsStatus = lens _aprsStatus (\ s a -> s{_aprsStatus = a});
+aprsResponseStatus :: Lens' ActivatePipelineResponse Int
+aprsResponseStatus = lens _aprsResponseStatus (\ s a -> s{_aprsResponseStatus = a});
diff --git a/gen/Network/AWS/DataPipeline/AddTags.hs b/gen/Network/AWS/DataPipeline/AddTags.hs
--- a/gen/Network/AWS/DataPipeline/AddTags.hs
+++ b/gen/Network/AWS/DataPipeline/AddTags.hs
@@ -34,7 +34,7 @@
     , addTagsResponse
     , AddTagsResponse
     -- * Response Lenses
-    , atrsStatus
+    , atrsResponseStatus
     ) where
 
 import           Network.AWS.DataPipeline.Types
@@ -108,22 +108,22 @@
 --
 -- /See:/ 'addTagsResponse' smart constructor.
 newtype AddTagsResponse = AddTagsResponse'
-    { _atrsStatus :: Int
+    { _atrsResponseStatus :: Int
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'AddTagsResponse' with the minimum fields required to make a request.
 --
 -- Use one of the following lenses to modify other fields as desired:
 --
--- * 'atrsStatus'
+-- * 'atrsResponseStatus'
 addTagsResponse
-    :: Int -- ^ 'atrsStatus'
+    :: Int -- ^ 'atrsResponseStatus'
     -> AddTagsResponse
-addTagsResponse pStatus_ =
+addTagsResponse pResponseStatus_ =
     AddTagsResponse'
-    { _atrsStatus = pStatus_
+    { _atrsResponseStatus = pResponseStatus_
     }
 
 -- | The response status code.
-atrsStatus :: Lens' AddTagsResponse Int
-atrsStatus = lens _atrsStatus (\ s a -> s{_atrsStatus = a});
+atrsResponseStatus :: Lens' AddTagsResponse Int
+atrsResponseStatus = lens _atrsResponseStatus (\ s a -> s{_atrsResponseStatus = a});
diff --git a/gen/Network/AWS/DataPipeline/CreatePipeline.hs b/gen/Network/AWS/DataPipeline/CreatePipeline.hs
--- a/gen/Network/AWS/DataPipeline/CreatePipeline.hs
+++ b/gen/Network/AWS/DataPipeline/CreatePipeline.hs
@@ -37,7 +37,7 @@
     , createPipelineResponse
     , CreatePipelineResponse
     -- * Response Lenses
-    , cprsStatus
+    , cprsResponseStatus
     , cprsPipelineId
     ) where
 
@@ -148,30 +148,30 @@
 --
 -- /See:/ 'createPipelineResponse' smart constructor.
 data CreatePipelineResponse = CreatePipelineResponse'
-    { _cprsStatus     :: !Int
-    , _cprsPipelineId :: !Text
+    { _cprsResponseStatus :: !Int
+    , _cprsPipelineId     :: !Text
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'CreatePipelineResponse' with the minimum fields required to make a request.
 --
 -- Use one of the following lenses to modify other fields as desired:
 --
--- * 'cprsStatus'
+-- * 'cprsResponseStatus'
 --
 -- * 'cprsPipelineId'
 createPipelineResponse
-    :: Int -- ^ 'cprsStatus'
+    :: Int -- ^ 'cprsResponseStatus'
     -> Text -- ^ 'cprsPipelineId'
     -> CreatePipelineResponse
-createPipelineResponse pStatus_ pPipelineId_ =
+createPipelineResponse pResponseStatus_ pPipelineId_ =
     CreatePipelineResponse'
-    { _cprsStatus = pStatus_
+    { _cprsResponseStatus = pResponseStatus_
     , _cprsPipelineId = pPipelineId_
     }
 
 -- | The response status code.
-cprsStatus :: Lens' CreatePipelineResponse Int
-cprsStatus = lens _cprsStatus (\ s a -> s{_cprsStatus = a});
+cprsResponseStatus :: Lens' CreatePipelineResponse Int
+cprsResponseStatus = lens _cprsResponseStatus (\ s a -> s{_cprsResponseStatus = a});
 
 -- | The ID that AWS Data Pipeline assigns the newly created pipeline. For
 -- example, 'df-06372391ZG65EXAMPLE'.
diff --git a/gen/Network/AWS/DataPipeline/DeactivatePipeline.hs b/gen/Network/AWS/DataPipeline/DeactivatePipeline.hs
--- a/gen/Network/AWS/DataPipeline/DeactivatePipeline.hs
+++ b/gen/Network/AWS/DataPipeline/DeactivatePipeline.hs
@@ -39,7 +39,7 @@
     , deactivatePipelineResponse
     , DeactivatePipelineResponse
     -- * Response Lenses
-    , drsStatus
+    , drsResponseStatus
     ) where
 
 import           Network.AWS.DataPipeline.Types
@@ -117,22 +117,22 @@
 --
 -- /See:/ 'deactivatePipelineResponse' smart constructor.
 newtype DeactivatePipelineResponse = DeactivatePipelineResponse'
-    { _drsStatus :: Int
+    { _drsResponseStatus :: Int
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'DeactivatePipelineResponse' with the minimum fields required to make a request.
 --
 -- Use one of the following lenses to modify other fields as desired:
 --
--- * 'drsStatus'
+-- * 'drsResponseStatus'
 deactivatePipelineResponse
-    :: Int -- ^ 'drsStatus'
+    :: Int -- ^ 'drsResponseStatus'
     -> DeactivatePipelineResponse
-deactivatePipelineResponse pStatus_ =
+deactivatePipelineResponse pResponseStatus_ =
     DeactivatePipelineResponse'
-    { _drsStatus = pStatus_
+    { _drsResponseStatus = pResponseStatus_
     }
 
 -- | The response status code.
-drsStatus :: Lens' DeactivatePipelineResponse Int
-drsStatus = lens _drsStatus (\ s a -> s{_drsStatus = a});
+drsResponseStatus :: Lens' DeactivatePipelineResponse Int
+drsResponseStatus = lens _drsResponseStatus (\ s a -> s{_drsResponseStatus = a});
diff --git a/gen/Network/AWS/DataPipeline/DescribeObjects.hs b/gen/Network/AWS/DataPipeline/DescribeObjects.hs
--- a/gen/Network/AWS/DataPipeline/DescribeObjects.hs
+++ b/gen/Network/AWS/DataPipeline/DescribeObjects.hs
@@ -42,7 +42,7 @@
     -- * Response Lenses
     , dorsHasMoreResults
     , dorsMarker
-    , dorsStatus
+    , dorsResponseStatus
     , dorsPipelineObjects
     ) where
 
@@ -109,8 +109,8 @@
 
 instance AWSPager DescribeObjects where
         page rq rs
-          | stop (rs ^. dorsHasMoreResults) = Nothing
-          | isNothing (rs ^. dorsMarker) = Nothing
+          | stop (rs ^. dorsMarker) = Nothing
+          | stop (rs ^. dorsPipelineObjects) = Nothing
           | otherwise =
             Just $ rq & doMarker .~ rs ^. dorsMarker
 
@@ -156,7 +156,7 @@
 data DescribeObjectsResponse = DescribeObjectsResponse'
     { _dorsHasMoreResults  :: !(Maybe Bool)
     , _dorsMarker          :: !(Maybe Text)
-    , _dorsStatus          :: !Int
+    , _dorsResponseStatus  :: !Int
     , _dorsPipelineObjects :: ![PipelineObject]
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
@@ -168,17 +168,17 @@
 --
 -- * 'dorsMarker'
 --
--- * 'dorsStatus'
+-- * 'dorsResponseStatus'
 --
 -- * 'dorsPipelineObjects'
 describeObjectsResponse
-    :: Int -- ^ 'dorsStatus'
+    :: Int -- ^ 'dorsResponseStatus'
     -> DescribeObjectsResponse
-describeObjectsResponse pStatus_ =
+describeObjectsResponse pResponseStatus_ =
     DescribeObjectsResponse'
     { _dorsHasMoreResults = Nothing
     , _dorsMarker = Nothing
-    , _dorsStatus = pStatus_
+    , _dorsResponseStatus = pResponseStatus_
     , _dorsPipelineObjects = mempty
     }
 
@@ -193,8 +193,8 @@
 dorsMarker = lens _dorsMarker (\ s a -> s{_dorsMarker = a});
 
 -- | The response status code.
-dorsStatus :: Lens' DescribeObjectsResponse Int
-dorsStatus = lens _dorsStatus (\ s a -> s{_dorsStatus = a});
+dorsResponseStatus :: Lens' DescribeObjectsResponse Int
+dorsResponseStatus = lens _dorsResponseStatus (\ s a -> s{_dorsResponseStatus = a});
 
 -- | An array of object definitions.
 dorsPipelineObjects :: Lens' DescribeObjectsResponse [PipelineObject]
diff --git a/gen/Network/AWS/DataPipeline/DescribePipelines.hs b/gen/Network/AWS/DataPipeline/DescribePipelines.hs
--- a/gen/Network/AWS/DataPipeline/DescribePipelines.hs
+++ b/gen/Network/AWS/DataPipeline/DescribePipelines.hs
@@ -42,7 +42,7 @@
     , describePipelinesResponse
     , DescribePipelinesResponse
     -- * Response Lenses
-    , dprsStatus
+    , dprsResponseStatus
     , dprsPipelineDescriptionList
     ) where
 
@@ -111,7 +111,7 @@
 --
 -- /See:/ 'describePipelinesResponse' smart constructor.
 data DescribePipelinesResponse = DescribePipelinesResponse'
-    { _dprsStatus                  :: !Int
+    { _dprsResponseStatus          :: !Int
     , _dprsPipelineDescriptionList :: ![PipelineDescription]
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
@@ -119,21 +119,21 @@
 --
 -- Use one of the following lenses to modify other fields as desired:
 --
--- * 'dprsStatus'
+-- * 'dprsResponseStatus'
 --
 -- * 'dprsPipelineDescriptionList'
 describePipelinesResponse
-    :: Int -- ^ 'dprsStatus'
+    :: Int -- ^ 'dprsResponseStatus'
     -> DescribePipelinesResponse
-describePipelinesResponse pStatus_ =
+describePipelinesResponse pResponseStatus_ =
     DescribePipelinesResponse'
-    { _dprsStatus = pStatus_
+    { _dprsResponseStatus = pResponseStatus_
     , _dprsPipelineDescriptionList = mempty
     }
 
 -- | The response status code.
-dprsStatus :: Lens' DescribePipelinesResponse Int
-dprsStatus = lens _dprsStatus (\ s a -> s{_dprsStatus = a});
+dprsResponseStatus :: Lens' DescribePipelinesResponse Int
+dprsResponseStatus = lens _dprsResponseStatus (\ s a -> s{_dprsResponseStatus = a});
 
 -- | An array of descriptions for the specified pipelines.
 dprsPipelineDescriptionList :: Lens' DescribePipelinesResponse [PipelineDescription]
diff --git a/gen/Network/AWS/DataPipeline/EvaluateExpression.hs b/gen/Network/AWS/DataPipeline/EvaluateExpression.hs
--- a/gen/Network/AWS/DataPipeline/EvaluateExpression.hs
+++ b/gen/Network/AWS/DataPipeline/EvaluateExpression.hs
@@ -37,7 +37,7 @@
     , evaluateExpressionResponse
     , EvaluateExpressionResponse
     -- * Response Lenses
-    , eersStatus
+    , eersResponseStatus
     , eersEvaluatedExpression
     ) where
 
@@ -127,7 +127,7 @@
 --
 -- /See:/ 'evaluateExpressionResponse' smart constructor.
 data EvaluateExpressionResponse = EvaluateExpressionResponse'
-    { _eersStatus              :: !Int
+    { _eersResponseStatus      :: !Int
     , _eersEvaluatedExpression :: !Text
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
@@ -135,22 +135,22 @@
 --
 -- Use one of the following lenses to modify other fields as desired:
 --
--- * 'eersStatus'
+-- * 'eersResponseStatus'
 --
 -- * 'eersEvaluatedExpression'
 evaluateExpressionResponse
-    :: Int -- ^ 'eersStatus'
+    :: Int -- ^ 'eersResponseStatus'
     -> Text -- ^ 'eersEvaluatedExpression'
     -> EvaluateExpressionResponse
-evaluateExpressionResponse pStatus_ pEvaluatedExpression_ =
+evaluateExpressionResponse pResponseStatus_ pEvaluatedExpression_ =
     EvaluateExpressionResponse'
-    { _eersStatus = pStatus_
+    { _eersResponseStatus = pResponseStatus_
     , _eersEvaluatedExpression = pEvaluatedExpression_
     }
 
 -- | The response status code.
-eersStatus :: Lens' EvaluateExpressionResponse Int
-eersStatus = lens _eersStatus (\ s a -> s{_eersStatus = a});
+eersResponseStatus :: Lens' EvaluateExpressionResponse Int
+eersResponseStatus = lens _eersResponseStatus (\ s a -> s{_eersResponseStatus = a});
 
 -- | The evaluated expression.
 eersEvaluatedExpression :: Lens' EvaluateExpressionResponse Text
diff --git a/gen/Network/AWS/DataPipeline/GetPipelineDefinition.hs b/gen/Network/AWS/DataPipeline/GetPipelineDefinition.hs
--- a/gen/Network/AWS/DataPipeline/GetPipelineDefinition.hs
+++ b/gen/Network/AWS/DataPipeline/GetPipelineDefinition.hs
@@ -39,7 +39,7 @@
     , gpdrsPipelineObjects
     , gpdrsParameterObjects
     , gpdrsParameterValues
-    , gpdrsStatus
+    , gpdrsResponseStatus
     ) where
 
 import           Network.AWS.DataPipeline.Types
@@ -124,7 +124,7 @@
     { _gpdrsPipelineObjects  :: !(Maybe [PipelineObject])
     , _gpdrsParameterObjects :: !(Maybe [ParameterObject])
     , _gpdrsParameterValues  :: !(Maybe [ParameterValue])
-    , _gpdrsStatus           :: !Int
+    , _gpdrsResponseStatus   :: !Int
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'GetPipelineDefinitionResponse' with the minimum fields required to make a request.
@@ -137,16 +137,16 @@
 --
 -- * 'gpdrsParameterValues'
 --
--- * 'gpdrsStatus'
+-- * 'gpdrsResponseStatus'
 getPipelineDefinitionResponse
-    :: Int -- ^ 'gpdrsStatus'
+    :: Int -- ^ 'gpdrsResponseStatus'
     -> GetPipelineDefinitionResponse
-getPipelineDefinitionResponse pStatus_ =
+getPipelineDefinitionResponse pResponseStatus_ =
     GetPipelineDefinitionResponse'
     { _gpdrsPipelineObjects = Nothing
     , _gpdrsParameterObjects = Nothing
     , _gpdrsParameterValues = Nothing
-    , _gpdrsStatus = pStatus_
+    , _gpdrsResponseStatus = pResponseStatus_
     }
 
 -- | The objects defined in the pipeline.
@@ -162,5 +162,5 @@
 gpdrsParameterValues = lens _gpdrsParameterValues (\ s a -> s{_gpdrsParameterValues = a}) . _Default . _Coerce;
 
 -- | The response status code.
-gpdrsStatus :: Lens' GetPipelineDefinitionResponse Int
-gpdrsStatus = lens _gpdrsStatus (\ s a -> s{_gpdrsStatus = a});
+gpdrsResponseStatus :: Lens' GetPipelineDefinitionResponse Int
+gpdrsResponseStatus = lens _gpdrsResponseStatus (\ s a -> s{_gpdrsResponseStatus = a});
diff --git a/gen/Network/AWS/DataPipeline/ListPipelines.hs b/gen/Network/AWS/DataPipeline/ListPipelines.hs
--- a/gen/Network/AWS/DataPipeline/ListPipelines.hs
+++ b/gen/Network/AWS/DataPipeline/ListPipelines.hs
@@ -38,7 +38,7 @@
     -- * Response Lenses
     , lprsHasMoreResults
     , lprsMarker
-    , lprsStatus
+    , lprsResponseStatus
     , lprsPipelineIdList
     ) where
 
@@ -77,8 +77,8 @@
 
 instance AWSPager ListPipelines where
         page rq rs
-          | stop (rs ^. lprsHasMoreResults) = Nothing
-          | isNothing (rs ^. lprsMarker) = Nothing
+          | stop (rs ^. lprsMarker) = Nothing
+          | stop (rs ^. lprsPipelineIdList) = Nothing
           | otherwise =
             Just $ rq & lpMarker .~ rs ^. lprsMarker
 
@@ -118,7 +118,7 @@
 data ListPipelinesResponse = ListPipelinesResponse'
     { _lprsHasMoreResults :: !(Maybe Bool)
     , _lprsMarker         :: !(Maybe Text)
-    , _lprsStatus         :: !Int
+    , _lprsResponseStatus :: !Int
     , _lprsPipelineIdList :: ![PipelineIdName]
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
@@ -130,17 +130,17 @@
 --
 -- * 'lprsMarker'
 --
--- * 'lprsStatus'
+-- * 'lprsResponseStatus'
 --
 -- * 'lprsPipelineIdList'
 listPipelinesResponse
-    :: Int -- ^ 'lprsStatus'
+    :: Int -- ^ 'lprsResponseStatus'
     -> ListPipelinesResponse
-listPipelinesResponse pStatus_ =
+listPipelinesResponse pResponseStatus_ =
     ListPipelinesResponse'
     { _lprsHasMoreResults = Nothing
     , _lprsMarker = Nothing
-    , _lprsStatus = pStatus_
+    , _lprsResponseStatus = pResponseStatus_
     , _lprsPipelineIdList = mempty
     }
 
@@ -156,8 +156,8 @@
 lprsMarker = lens _lprsMarker (\ s a -> s{_lprsMarker = a});
 
 -- | The response status code.
-lprsStatus :: Lens' ListPipelinesResponse Int
-lprsStatus = lens _lprsStatus (\ s a -> s{_lprsStatus = a});
+lprsResponseStatus :: Lens' ListPipelinesResponse Int
+lprsResponseStatus = lens _lprsResponseStatus (\ s a -> s{_lprsResponseStatus = a});
 
 -- | The pipeline identifiers. If you require additional information about
 -- the pipelines, you can use these identifiers to call DescribePipelines
diff --git a/gen/Network/AWS/DataPipeline/PollForTask.hs b/gen/Network/AWS/DataPipeline/PollForTask.hs
--- a/gen/Network/AWS/DataPipeline/PollForTask.hs
+++ b/gen/Network/AWS/DataPipeline/PollForTask.hs
@@ -50,7 +50,7 @@
     , PollForTaskResponse
     -- * Response Lenses
     , pftrsTaskObject
-    , pftrsStatus
+    , pftrsResponseStatus
     ) where
 
 import           Network.AWS.DataPipeline.Types
@@ -147,8 +147,8 @@
 --
 -- /See:/ 'pollForTaskResponse' smart constructor.
 data PollForTaskResponse = PollForTaskResponse'
-    { _pftrsTaskObject :: !(Maybe TaskObject)
-    , _pftrsStatus     :: !Int
+    { _pftrsTaskObject     :: !(Maybe TaskObject)
+    , _pftrsResponseStatus :: !Int
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'PollForTaskResponse' with the minimum fields required to make a request.
@@ -157,14 +157,14 @@
 --
 -- * 'pftrsTaskObject'
 --
--- * 'pftrsStatus'
+-- * 'pftrsResponseStatus'
 pollForTaskResponse
-    :: Int -- ^ 'pftrsStatus'
+    :: Int -- ^ 'pftrsResponseStatus'
     -> PollForTaskResponse
-pollForTaskResponse pStatus_ =
+pollForTaskResponse pResponseStatus_ =
     PollForTaskResponse'
     { _pftrsTaskObject = Nothing
-    , _pftrsStatus = pStatus_
+    , _pftrsResponseStatus = pResponseStatus_
     }
 
 -- | The information needed to complete the task that is being assigned to
@@ -176,5 +176,5 @@
 pftrsTaskObject = lens _pftrsTaskObject (\ s a -> s{_pftrsTaskObject = a});
 
 -- | The response status code.
-pftrsStatus :: Lens' PollForTaskResponse Int
-pftrsStatus = lens _pftrsStatus (\ s a -> s{_pftrsStatus = a});
+pftrsResponseStatus :: Lens' PollForTaskResponse Int
+pftrsResponseStatus = lens _pftrsResponseStatus (\ s a -> s{_pftrsResponseStatus = a});
diff --git a/gen/Network/AWS/DataPipeline/PutPipelineDefinition.hs b/gen/Network/AWS/DataPipeline/PutPipelineDefinition.hs
--- a/gen/Network/AWS/DataPipeline/PutPipelineDefinition.hs
+++ b/gen/Network/AWS/DataPipeline/PutPipelineDefinition.hs
@@ -52,7 +52,7 @@
     -- * Response Lenses
     , ppdrsValidationErrors
     , ppdrsValidationWarnings
-    , ppdrsStatus
+    , ppdrsResponseStatus
     , ppdrsErrored
     ) where
 
@@ -154,7 +154,7 @@
 data PutPipelineDefinitionResponse = PutPipelineDefinitionResponse'
     { _ppdrsValidationErrors   :: !(Maybe [ValidationError])
     , _ppdrsValidationWarnings :: !(Maybe [ValidationWarning])
-    , _ppdrsStatus             :: !Int
+    , _ppdrsResponseStatus     :: !Int
     , _ppdrsErrored            :: !Bool
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
@@ -166,18 +166,18 @@
 --
 -- * 'ppdrsValidationWarnings'
 --
--- * 'ppdrsStatus'
+-- * 'ppdrsResponseStatus'
 --
 -- * 'ppdrsErrored'
 putPipelineDefinitionResponse
-    :: Int -- ^ 'ppdrsStatus'
+    :: Int -- ^ 'ppdrsResponseStatus'
     -> Bool -- ^ 'ppdrsErrored'
     -> PutPipelineDefinitionResponse
-putPipelineDefinitionResponse pStatus_ pErrored_ =
+putPipelineDefinitionResponse pResponseStatus_ pErrored_ =
     PutPipelineDefinitionResponse'
     { _ppdrsValidationErrors = Nothing
     , _ppdrsValidationWarnings = Nothing
-    , _ppdrsStatus = pStatus_
+    , _ppdrsResponseStatus = pResponseStatus_
     , _ppdrsErrored = pErrored_
     }
 
@@ -192,8 +192,8 @@
 ppdrsValidationWarnings = lens _ppdrsValidationWarnings (\ s a -> s{_ppdrsValidationWarnings = a}) . _Default . _Coerce;
 
 -- | The response status code.
-ppdrsStatus :: Lens' PutPipelineDefinitionResponse Int
-ppdrsStatus = lens _ppdrsStatus (\ s a -> s{_ppdrsStatus = a});
+ppdrsResponseStatus :: Lens' PutPipelineDefinitionResponse Int
+ppdrsResponseStatus = lens _ppdrsResponseStatus (\ s a -> s{_ppdrsResponseStatus = a});
 
 -- | Indicates whether there were validation errors, and the pipeline
 -- definition is stored but cannot be activated until you correct the
diff --git a/gen/Network/AWS/DataPipeline/QueryObjects.hs b/gen/Network/AWS/DataPipeline/QueryObjects.hs
--- a/gen/Network/AWS/DataPipeline/QueryObjects.hs
+++ b/gen/Network/AWS/DataPipeline/QueryObjects.hs
@@ -43,7 +43,7 @@
     , qorsHasMoreResults
     , qorsIds
     , qorsMarker
-    , qorsStatus
+    , qorsResponseStatus
     ) where
 
 import           Network.AWS.DataPipeline.Types
@@ -120,8 +120,8 @@
 
 instance AWSPager QueryObjects where
         page rq rs
-          | stop (rs ^. qorsHasMoreResults) = Nothing
-          | isNothing (rs ^. qorsMarker) = Nothing
+          | stop (rs ^. qorsMarker) = Nothing
+          | stop (rs ^. qorsIds) = Nothing
           | otherwise =
             Just $ rq & qoMarker .~ rs ^. qorsMarker
 
@@ -168,7 +168,7 @@
     { _qorsHasMoreResults :: !(Maybe Bool)
     , _qorsIds            :: !(Maybe [Text])
     , _qorsMarker         :: !(Maybe Text)
-    , _qorsStatus         :: !Int
+    , _qorsResponseStatus :: !Int
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'QueryObjectsResponse' with the minimum fields required to make a request.
@@ -181,16 +181,16 @@
 --
 -- * 'qorsMarker'
 --
--- * 'qorsStatus'
+-- * 'qorsResponseStatus'
 queryObjectsResponse
-    :: Int -- ^ 'qorsStatus'
+    :: Int -- ^ 'qorsResponseStatus'
     -> QueryObjectsResponse
-queryObjectsResponse pStatus_ =
+queryObjectsResponse pResponseStatus_ =
     QueryObjectsResponse'
     { _qorsHasMoreResults = Nothing
     , _qorsIds = Nothing
     , _qorsMarker = Nothing
-    , _qorsStatus = pStatus_
+    , _qorsResponseStatus = pResponseStatus_
     }
 
 -- | Indicates whether there are more results that can be obtained by a
@@ -209,5 +209,5 @@
 qorsMarker = lens _qorsMarker (\ s a -> s{_qorsMarker = a});
 
 -- | The response status code.
-qorsStatus :: Lens' QueryObjectsResponse Int
-qorsStatus = lens _qorsStatus (\ s a -> s{_qorsStatus = a});
+qorsResponseStatus :: Lens' QueryObjectsResponse Int
+qorsResponseStatus = lens _qorsResponseStatus (\ s a -> s{_qorsResponseStatus = a});
diff --git a/gen/Network/AWS/DataPipeline/RemoveTags.hs b/gen/Network/AWS/DataPipeline/RemoveTags.hs
--- a/gen/Network/AWS/DataPipeline/RemoveTags.hs
+++ b/gen/Network/AWS/DataPipeline/RemoveTags.hs
@@ -34,7 +34,7 @@
     , removeTagsResponse
     , RemoveTagsResponse
     -- * Response Lenses
-    , rtrsStatus
+    , rtrsResponseStatus
     ) where
 
 import           Network.AWS.DataPipeline.Types
@@ -109,22 +109,22 @@
 --
 -- /See:/ 'removeTagsResponse' smart constructor.
 newtype RemoveTagsResponse = RemoveTagsResponse'
-    { _rtrsStatus :: Int
+    { _rtrsResponseStatus :: Int
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'RemoveTagsResponse' with the minimum fields required to make a request.
 --
 -- Use one of the following lenses to modify other fields as desired:
 --
--- * 'rtrsStatus'
+-- * 'rtrsResponseStatus'
 removeTagsResponse
-    :: Int -- ^ 'rtrsStatus'
+    :: Int -- ^ 'rtrsResponseStatus'
     -> RemoveTagsResponse
-removeTagsResponse pStatus_ =
+removeTagsResponse pResponseStatus_ =
     RemoveTagsResponse'
-    { _rtrsStatus = pStatus_
+    { _rtrsResponseStatus = pResponseStatus_
     }
 
 -- | The response status code.
-rtrsStatus :: Lens' RemoveTagsResponse Int
-rtrsStatus = lens _rtrsStatus (\ s a -> s{_rtrsStatus = a});
+rtrsResponseStatus :: Lens' RemoveTagsResponse Int
+rtrsResponseStatus = lens _rtrsResponseStatus (\ s a -> s{_rtrsResponseStatus = a});
diff --git a/gen/Network/AWS/DataPipeline/ReportTaskProgress.hs b/gen/Network/AWS/DataPipeline/ReportTaskProgress.hs
--- a/gen/Network/AWS/DataPipeline/ReportTaskProgress.hs
+++ b/gen/Network/AWS/DataPipeline/ReportTaskProgress.hs
@@ -45,7 +45,7 @@
     , reportTaskProgressResponse
     , ReportTaskProgressResponse
     -- * Response Lenses
-    , rtprsStatus
+    , rtprsResponseStatus
     , rtprsCanceled
     ) where
 
@@ -125,30 +125,30 @@
 --
 -- /See:/ 'reportTaskProgressResponse' smart constructor.
 data ReportTaskProgressResponse = ReportTaskProgressResponse'
-    { _rtprsStatus   :: !Int
-    , _rtprsCanceled :: !Bool
+    { _rtprsResponseStatus :: !Int
+    , _rtprsCanceled       :: !Bool
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'ReportTaskProgressResponse' with the minimum fields required to make a request.
 --
 -- Use one of the following lenses to modify other fields as desired:
 --
--- * 'rtprsStatus'
+-- * 'rtprsResponseStatus'
 --
 -- * 'rtprsCanceled'
 reportTaskProgressResponse
-    :: Int -- ^ 'rtprsStatus'
+    :: Int -- ^ 'rtprsResponseStatus'
     -> Bool -- ^ 'rtprsCanceled'
     -> ReportTaskProgressResponse
-reportTaskProgressResponse pStatus_ pCanceled_ =
+reportTaskProgressResponse pResponseStatus_ pCanceled_ =
     ReportTaskProgressResponse'
-    { _rtprsStatus = pStatus_
+    { _rtprsResponseStatus = pResponseStatus_
     , _rtprsCanceled = pCanceled_
     }
 
 -- | The response status code.
-rtprsStatus :: Lens' ReportTaskProgressResponse Int
-rtprsStatus = lens _rtprsStatus (\ s a -> s{_rtprsStatus = a});
+rtprsResponseStatus :: Lens' ReportTaskProgressResponse Int
+rtprsResponseStatus = lens _rtprsResponseStatus (\ s a -> s{_rtprsResponseStatus = a});
 
 -- | If true, the calling task runner should cancel processing of the task.
 -- The task runner does not need to call SetTaskStatus for canceled tasks.
diff --git a/gen/Network/AWS/DataPipeline/ReportTaskRunnerHeartbeat.hs b/gen/Network/AWS/DataPipeline/ReportTaskRunnerHeartbeat.hs
--- a/gen/Network/AWS/DataPipeline/ReportTaskRunnerHeartbeat.hs
+++ b/gen/Network/AWS/DataPipeline/ReportTaskRunnerHeartbeat.hs
@@ -39,7 +39,7 @@
     , reportTaskRunnerHeartbeatResponse
     , ReportTaskRunnerHeartbeatResponse
     -- * Response Lenses
-    , rtrhrsStatus
+    , rtrhrsResponseStatus
     , rtrhrsTerminate
     ) where
 
@@ -136,30 +136,30 @@
 --
 -- /See:/ 'reportTaskRunnerHeartbeatResponse' smart constructor.
 data ReportTaskRunnerHeartbeatResponse = ReportTaskRunnerHeartbeatResponse'
-    { _rtrhrsStatus    :: !Int
-    , _rtrhrsTerminate :: !Bool
+    { _rtrhrsResponseStatus :: !Int
+    , _rtrhrsTerminate      :: !Bool
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'ReportTaskRunnerHeartbeatResponse' with the minimum fields required to make a request.
 --
 -- Use one of the following lenses to modify other fields as desired:
 --
--- * 'rtrhrsStatus'
+-- * 'rtrhrsResponseStatus'
 --
 -- * 'rtrhrsTerminate'
 reportTaskRunnerHeartbeatResponse
-    :: Int -- ^ 'rtrhrsStatus'
+    :: Int -- ^ 'rtrhrsResponseStatus'
     -> Bool -- ^ 'rtrhrsTerminate'
     -> ReportTaskRunnerHeartbeatResponse
-reportTaskRunnerHeartbeatResponse pStatus_ pTerminate_ =
+reportTaskRunnerHeartbeatResponse pResponseStatus_ pTerminate_ =
     ReportTaskRunnerHeartbeatResponse'
-    { _rtrhrsStatus = pStatus_
+    { _rtrhrsResponseStatus = pResponseStatus_
     , _rtrhrsTerminate = pTerminate_
     }
 
 -- | The response status code.
-rtrhrsStatus :: Lens' ReportTaskRunnerHeartbeatResponse Int
-rtrhrsStatus = lens _rtrhrsStatus (\ s a -> s{_rtrhrsStatus = a});
+rtrhrsResponseStatus :: Lens' ReportTaskRunnerHeartbeatResponse Int
+rtrhrsResponseStatus = lens _rtrhrsResponseStatus (\ s a -> s{_rtrhrsResponseStatus = a});
 
 -- | Indicates whether the calling task runner should terminate.
 rtrhrsTerminate :: Lens' ReportTaskRunnerHeartbeatResponse Bool
diff --git a/gen/Network/AWS/DataPipeline/SetTaskStatus.hs b/gen/Network/AWS/DataPipeline/SetTaskStatus.hs
--- a/gen/Network/AWS/DataPipeline/SetTaskStatus.hs
+++ b/gen/Network/AWS/DataPipeline/SetTaskStatus.hs
@@ -41,7 +41,7 @@
     , setTaskStatusResponse
     , SetTaskStatusResponse
     -- * Response Lenses
-    , stsrsStatus
+    , stsrsResponseStatus
     ) where
 
 import           Network.AWS.DataPipeline.Types
@@ -155,22 +155,22 @@
 --
 -- /See:/ 'setTaskStatusResponse' smart constructor.
 newtype SetTaskStatusResponse = SetTaskStatusResponse'
-    { _stsrsStatus :: Int
+    { _stsrsResponseStatus :: Int
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'SetTaskStatusResponse' with the minimum fields required to make a request.
 --
 -- Use one of the following lenses to modify other fields as desired:
 --
--- * 'stsrsStatus'
+-- * 'stsrsResponseStatus'
 setTaskStatusResponse
-    :: Int -- ^ 'stsrsStatus'
+    :: Int -- ^ 'stsrsResponseStatus'
     -> SetTaskStatusResponse
-setTaskStatusResponse pStatus_ =
+setTaskStatusResponse pResponseStatus_ =
     SetTaskStatusResponse'
-    { _stsrsStatus = pStatus_
+    { _stsrsResponseStatus = pResponseStatus_
     }
 
 -- | The response status code.
-stsrsStatus :: Lens' SetTaskStatusResponse Int
-stsrsStatus = lens _stsrsStatus (\ s a -> s{_stsrsStatus = a});
+stsrsResponseStatus :: Lens' SetTaskStatusResponse Int
+stsrsResponseStatus = lens _stsrsResponseStatus (\ s a -> s{_stsrsResponseStatus = a});
diff --git a/gen/Network/AWS/DataPipeline/Types.hs b/gen/Network/AWS/DataPipeline/Types.hs
--- a/gen/Network/AWS/DataPipeline/Types.hs
+++ b/gen/Network/AWS/DataPipeline/Types.hs
@@ -108,8 +108,8 @@
     , TaskObject
     , taskObject
     , toPipelineId
-    , toTaskId
     , toAttemptId
+    , toTaskId
     , toObjects
 
     -- * ValidationError
diff --git a/gen/Network/AWS/DataPipeline/Types/Product.hs b/gen/Network/AWS/DataPipeline/Types/Product.hs
--- a/gen/Network/AWS/DataPipeline/Types/Product.hs
+++ b/gen/Network/AWS/DataPipeline/Types/Product.hs
@@ -635,8 +635,8 @@
 -- /See:/ 'taskObject' smart constructor.
 data TaskObject = TaskObject'
     { _toPipelineId :: !(Maybe Text)
-    , _toTaskId     :: !(Maybe Text)
     , _toAttemptId  :: !(Maybe Text)
+    , _toTaskId     :: !(Maybe Text)
     , _toObjects    :: !(Maybe (Map Text PipelineObject))
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
@@ -646,18 +646,18 @@
 --
 -- * 'toPipelineId'
 --
--- * 'toTaskId'
---
 -- * 'toAttemptId'
 --
+-- * 'toTaskId'
+--
 -- * 'toObjects'
 taskObject
     :: TaskObject
 taskObject =
     TaskObject'
     { _toPipelineId = Nothing
-    , _toTaskId = Nothing
     , _toAttemptId = Nothing
+    , _toTaskId = Nothing
     , _toObjects = Nothing
     }
 
@@ -665,16 +665,16 @@
 toPipelineId :: Lens' TaskObject (Maybe Text)
 toPipelineId = lens _toPipelineId (\ s a -> s{_toPipelineId = a});
 
--- | An internal identifier for the task. This ID is passed to the
--- SetTaskStatus and ReportTaskProgress actions.
-toTaskId :: Lens' TaskObject (Maybe Text)
-toTaskId = lens _toTaskId (\ s a -> s{_toTaskId = a});
-
 -- | The ID of the pipeline task attempt object. AWS Data Pipeline uses this
 -- value to track how many times a task is attempted.
 toAttemptId :: Lens' TaskObject (Maybe Text)
 toAttemptId = lens _toAttemptId (\ s a -> s{_toAttemptId = a});
 
+-- | An internal identifier for the task. This ID is passed to the
+-- SetTaskStatus and ReportTaskProgress actions.
+toTaskId :: Lens' TaskObject (Maybe Text)
+toTaskId = lens _toTaskId (\ s a -> s{_toTaskId = a});
+
 -- | Connection information for the location where the task runner will
 -- publish the output of the task.
 toObjects :: Lens' TaskObject (HashMap Text PipelineObject)
@@ -685,8 +685,8 @@
           = withObject "TaskObject"
               (\ x ->
                  TaskObject' <$>
-                   (x .:? "pipelineId") <*> (x .:? "taskId") <*>
-                     (x .:? "attemptId")
+                   (x .:? "pipelineId") <*> (x .:? "attemptId") <*>
+                     (x .:? "taskId")
                      <*> (x .:? "objects" .!= mempty))
 
 -- | Defines a validation error. Validation errors prevent pipeline
diff --git a/gen/Network/AWS/DataPipeline/ValidatePipelineDefinition.hs b/gen/Network/AWS/DataPipeline/ValidatePipelineDefinition.hs
--- a/gen/Network/AWS/DataPipeline/ValidatePipelineDefinition.hs
+++ b/gen/Network/AWS/DataPipeline/ValidatePipelineDefinition.hs
@@ -39,7 +39,7 @@
     -- * Response Lenses
     , vpdrsValidationErrors
     , vpdrsValidationWarnings
-    , vpdrsStatus
+    , vpdrsResponseStatus
     , vpdrsErrored
     ) where
 
@@ -142,7 +142,7 @@
 data ValidatePipelineDefinitionResponse = ValidatePipelineDefinitionResponse'
     { _vpdrsValidationErrors   :: !(Maybe [ValidationError])
     , _vpdrsValidationWarnings :: !(Maybe [ValidationWarning])
-    , _vpdrsStatus             :: !Int
+    , _vpdrsResponseStatus     :: !Int
     , _vpdrsErrored            :: !Bool
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
@@ -154,18 +154,18 @@
 --
 -- * 'vpdrsValidationWarnings'
 --
--- * 'vpdrsStatus'
+-- * 'vpdrsResponseStatus'
 --
 -- * 'vpdrsErrored'
 validatePipelineDefinitionResponse
-    :: Int -- ^ 'vpdrsStatus'
+    :: Int -- ^ 'vpdrsResponseStatus'
     -> Bool -- ^ 'vpdrsErrored'
     -> ValidatePipelineDefinitionResponse
-validatePipelineDefinitionResponse pStatus_ pErrored_ =
+validatePipelineDefinitionResponse pResponseStatus_ pErrored_ =
     ValidatePipelineDefinitionResponse'
     { _vpdrsValidationErrors = Nothing
     , _vpdrsValidationWarnings = Nothing
-    , _vpdrsStatus = pStatus_
+    , _vpdrsResponseStatus = pResponseStatus_
     , _vpdrsErrored = pErrored_
     }
 
@@ -178,8 +178,8 @@
 vpdrsValidationWarnings = lens _vpdrsValidationWarnings (\ s a -> s{_vpdrsValidationWarnings = a}) . _Default . _Coerce;
 
 -- | The response status code.
-vpdrsStatus :: Lens' ValidatePipelineDefinitionResponse Int
-vpdrsStatus = lens _vpdrsStatus (\ s a -> s{_vpdrsStatus = a});
+vpdrsResponseStatus :: Lens' ValidatePipelineDefinitionResponse Int
+vpdrsResponseStatus = lens _vpdrsResponseStatus (\ s a -> s{_vpdrsResponseStatus = a});
 
 -- | Indicates whether there were validation errors.
 vpdrsErrored :: Lens' ValidatePipelineDefinitionResponse Bool
diff --git a/test/Test/AWS/Gen/DataPipeline.hs b/test/Test/AWS/Gen/DataPipeline.hs
--- a/test/Test/AWS/Gen/DataPipeline.hs
+++ b/test/Test/AWS/Gen/DataPipeline.hs
@@ -43,15 +43,15 @@
 --         , testListPipelines $
 --             listPipelines
 --
+--         , testEvaluateExpression $
+--             evaluateExpression
+--
 --         , testGetPipelineDefinition $
 --             getPipelineDefinition
 --
 --         , testPollForTask $
 --             pollForTask
 --
---         , testEvaluateExpression $
---             evaluateExpression
---
 --         , testDeactivatePipeline $
 --             deactivatePipeline
 --
@@ -70,15 +70,15 @@
 --         , testSetTaskStatus $
 --             setTaskStatus
 --
+--         , testSetStatus $
+--             setStatus
+--
 --         , testReportTaskProgress $
 --             reportTaskProgress
 --
 --         , testCreatePipeline $
 --             createPipeline
 --
---         , testSetStatus $
---             setStatus
---
 --         , testPutPipelineDefinition $
 --             putPipelineDefinition
 --
@@ -103,15 +103,15 @@
 --         , testListPipelinesResponse $
 --             listPipelinesResponse
 --
+--         , testEvaluateExpressionResponse $
+--             evaluateExpressionResponse
+--
 --         , testGetPipelineDefinitionResponse $
 --             getPipelineDefinitionResponse
 --
 --         , testPollForTaskResponse $
 --             pollForTaskResponse
 --
---         , testEvaluateExpressionResponse $
---             evaluateExpressionResponse
---
 --         , testDeactivatePipelineResponse $
 --             deactivatePipelineResponse
 --
@@ -130,15 +130,15 @@
 --         , testSetTaskStatusResponse $
 --             setTaskStatusResponse
 --
+--         , testSetStatusResponse $
+--             setStatusResponse
+--
 --         , testReportTaskProgressResponse $
 --             reportTaskProgressResponse
 --
 --         , testCreatePipelineResponse $
 --             createPipelineResponse
 --
---         , testSetStatusResponse $
---             setStatusResponse
---
 --         , testPutPipelineDefinitionResponse $
 --             putPipelineDefinitionResponse
 --
@@ -175,6 +175,11 @@
     "ListPipelines"
     "fixture/ListPipelines.yaml"
 
+testEvaluateExpression :: EvaluateExpression -> TestTree
+testEvaluateExpression = req
+    "EvaluateExpression"
+    "fixture/EvaluateExpression.yaml"
+
 testGetPipelineDefinition :: GetPipelineDefinition -> TestTree
 testGetPipelineDefinition = req
     "GetPipelineDefinition"
@@ -185,11 +190,6 @@
     "PollForTask"
     "fixture/PollForTask.yaml"
 
-testEvaluateExpression :: EvaluateExpression -> TestTree
-testEvaluateExpression = req
-    "EvaluateExpression"
-    "fixture/EvaluateExpression.yaml"
-
 testDeactivatePipeline :: DeactivatePipeline -> TestTree
 testDeactivatePipeline = req
     "DeactivatePipeline"
@@ -220,6 +220,11 @@
     "SetTaskStatus"
     "fixture/SetTaskStatus.yaml"
 
+testSetStatus :: SetStatus -> TestTree
+testSetStatus = req
+    "SetStatus"
+    "fixture/SetStatus.yaml"
+
 testReportTaskProgress :: ReportTaskProgress -> TestTree
 testReportTaskProgress = req
     "ReportTaskProgress"
@@ -230,11 +235,6 @@
     "CreatePipeline"
     "fixture/CreatePipeline.yaml"
 
-testSetStatus :: SetStatus -> TestTree
-testSetStatus = req
-    "SetStatus"
-    "fixture/SetStatus.yaml"
-
 testPutPipelineDefinition :: PutPipelineDefinition -> TestTree
 testPutPipelineDefinition = req
     "PutPipelineDefinition"
@@ -282,6 +282,13 @@
     dataPipeline
     (Proxy :: Proxy ListPipelines)
 
+testEvaluateExpressionResponse :: EvaluateExpressionResponse -> TestTree
+testEvaluateExpressionResponse = res
+    "EvaluateExpressionResponse"
+    "fixture/EvaluateExpressionResponse.proto"
+    dataPipeline
+    (Proxy :: Proxy EvaluateExpression)
+
 testGetPipelineDefinitionResponse :: GetPipelineDefinitionResponse -> TestTree
 testGetPipelineDefinitionResponse = res
     "GetPipelineDefinitionResponse"
@@ -296,13 +303,6 @@
     dataPipeline
     (Proxy :: Proxy PollForTask)
 
-testEvaluateExpressionResponse :: EvaluateExpressionResponse -> TestTree
-testEvaluateExpressionResponse = res
-    "EvaluateExpressionResponse"
-    "fixture/EvaluateExpressionResponse.proto"
-    dataPipeline
-    (Proxy :: Proxy EvaluateExpression)
-
 testDeactivatePipelineResponse :: DeactivatePipelineResponse -> TestTree
 testDeactivatePipelineResponse = res
     "DeactivatePipelineResponse"
@@ -345,6 +345,13 @@
     dataPipeline
     (Proxy :: Proxy SetTaskStatus)
 
+testSetStatusResponse :: SetStatusResponse -> TestTree
+testSetStatusResponse = res
+    "SetStatusResponse"
+    "fixture/SetStatusResponse.proto"
+    dataPipeline
+    (Proxy :: Proxy SetStatus)
+
 testReportTaskProgressResponse :: ReportTaskProgressResponse -> TestTree
 testReportTaskProgressResponse = res
     "ReportTaskProgressResponse"
@@ -358,13 +365,6 @@
     "fixture/CreatePipelineResponse.proto"
     dataPipeline
     (Proxy :: Proxy CreatePipeline)
-
-testSetStatusResponse :: SetStatusResponse -> TestTree
-testSetStatusResponse = res
-    "SetStatusResponse"
-    "fixture/SetStatusResponse.proto"
-    dataPipeline
-    (Proxy :: Proxy SetStatus)
 
 testPutPipelineDefinitionResponse :: PutPipelineDefinitionResponse -> TestTree
 testPutPipelineDefinitionResponse = res