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-elasticbeanstalk.cabal b/amazonka-elasticbeanstalk.cabal
--- a/amazonka-elasticbeanstalk.cabal
+++ b/amazonka-elasticbeanstalk.cabal
@@ -1,5 +1,5 @@
 name:                  amazonka-elasticbeanstalk
-version:               1.2.0.2
+version:               1.3.0
 synopsis:              Amazon Elastic Beanstalk SDK.
 homepage:              https://github.com/brendanhay/amazonka
 bug-reports:           https://github.com/brendanhay/amazonka/issues
@@ -105,7 +105,7 @@
         , Network.AWS.ElasticBeanstalk.Types.Sum
 
     build-depends:
-          amazonka-core == 1.2.0.*
+          amazonka-core == 1.3.0.*
         , base          >= 4.7     && < 5
 
 test-suite amazonka-elasticbeanstalk-test
@@ -125,9 +125,9 @@
         , Test.AWS.ElasticBeanstalk.Internal
 
     build-depends:
-          amazonka-core == 1.2.0.*
-        , amazonka-test == 1.2.0.*
-        , amazonka-elasticbeanstalk == 1.2.0.*
+          amazonka-core == 1.3.0.*
+        , amazonka-test == 1.3.0.*
+        , amazonka-elasticbeanstalk == 1.3.0.*
         , base
         , bytestring
         , lens
diff --git a/gen/Network/AWS/ElasticBeanstalk.hs b/gen/Network/AWS/ElasticBeanstalk.hs
--- a/gen/Network/AWS/ElasticBeanstalk.hs
+++ b/gen/Network/AWS/ElasticBeanstalk.hs
@@ -49,27 +49,27 @@
     -- ** InvalidRequestException
     , _InvalidRequestException
 
-    -- ** S3SubscriptionRequiredException
-    , _S3SubscriptionRequiredException
-
     -- ** TooManyBucketsException
     , _TooManyBucketsException
 
+    -- ** S3SubscriptionRequiredException
+    , _S3SubscriptionRequiredException
+
     -- ** OperationInProgressException
     , _OperationInProgressException
 
-    -- ** TooManyConfigurationTemplatesException
-    , _TooManyConfigurationTemplatesException
-
     -- ** TooManyApplicationVersionsException
     , _TooManyApplicationVersionsException
 
-    -- ** ElasticBeanstalkServiceException
-    , _ElasticBeanstalkServiceException
+    -- ** TooManyConfigurationTemplatesException
+    , _TooManyConfigurationTemplatesException
 
     -- ** InsufficientPrivilegesException
     , _InsufficientPrivilegesException
 
+    -- ** ElasticBeanstalkServiceException
+    , _ElasticBeanstalkServiceException
+
     -- ** TooManyApplicationsException
     , _TooManyApplicationsException
 
@@ -91,15 +91,15 @@
     -- ** DescribeApplications
     , module Network.AWS.ElasticBeanstalk.DescribeApplications
 
-    -- ** CreateApplicationVersion
-    , module Network.AWS.ElasticBeanstalk.CreateApplicationVersion
-
     -- ** UpdateEnvironment
     , module Network.AWS.ElasticBeanstalk.UpdateEnvironment
 
     -- ** TerminateEnvironment
     , module Network.AWS.ElasticBeanstalk.TerminateEnvironment
 
+    -- ** CreateApplicationVersion
+    , module Network.AWS.ElasticBeanstalk.CreateApplicationVersion
+
     -- ** DescribeEvents (Paginated)
     , module Network.AWS.ElasticBeanstalk.DescribeEvents
 
@@ -124,21 +124,24 @@
     -- ** AbortEnvironmentUpdate
     , module Network.AWS.ElasticBeanstalk.AbortEnvironmentUpdate
 
-    -- ** DeleteApplicationVersion
-    , module Network.AWS.ElasticBeanstalk.DeleteApplicationVersion
+    -- ** DeleteConfigurationTemplate
+    , module Network.AWS.ElasticBeanstalk.DeleteConfigurationTemplate
 
-    -- ** UpdateApplicationVersion
-    , module Network.AWS.ElasticBeanstalk.UpdateApplicationVersion
+    -- ** UpdateConfigurationTemplate
+    , module Network.AWS.ElasticBeanstalk.UpdateConfigurationTemplate
 
     -- ** DescribeEnvironmentResources
     , module Network.AWS.ElasticBeanstalk.DescribeEnvironmentResources
 
-    -- ** DeleteConfigurationTemplate
-    , module Network.AWS.ElasticBeanstalk.DeleteConfigurationTemplate
+    -- ** DeleteApplicationVersion
+    , module Network.AWS.ElasticBeanstalk.DeleteApplicationVersion
 
-    -- ** UpdateConfigurationTemplate
-    , module Network.AWS.ElasticBeanstalk.UpdateConfigurationTemplate
+    -- ** UpdateApplicationVersion
+    , module Network.AWS.ElasticBeanstalk.UpdateApplicationVersion
 
+    -- ** CreateConfigurationTemplate
+    , module Network.AWS.ElasticBeanstalk.CreateConfigurationTemplate
+
     -- ** DescribeEnvironmentHealth
     , module Network.AWS.ElasticBeanstalk.DescribeEnvironmentHealth
 
@@ -148,39 +151,36 @@
     -- ** DeleteEnvironmentConfiguration
     , module Network.AWS.ElasticBeanstalk.DeleteEnvironmentConfiguration
 
-    -- ** CreateConfigurationTemplate
-    , module Network.AWS.ElasticBeanstalk.CreateConfigurationTemplate
+    -- ** SwapEnvironmentCNAMEs
+    , module Network.AWS.ElasticBeanstalk.SwapEnvironmentCNAMEs
 
     -- ** ListAvailableSolutionStacks
     , module Network.AWS.ElasticBeanstalk.ListAvailableSolutionStacks
 
-    -- ** SwapEnvironmentCNAMEs
-    , module Network.AWS.ElasticBeanstalk.SwapEnvironmentCNAMEs
-
     -- ** DescribeConfigurationOptions
     , module Network.AWS.ElasticBeanstalk.DescribeConfigurationOptions
 
-    -- ** DescribeConfigurationSettings
-    , module Network.AWS.ElasticBeanstalk.DescribeConfigurationSettings
-
     -- ** CreateStorageLocation
     , module Network.AWS.ElasticBeanstalk.CreateStorageLocation
 
-    -- ** DescribeEnvironments
-    , module Network.AWS.ElasticBeanstalk.DescribeEnvironments
-
-    -- ** RestartAppServer
-    , module Network.AWS.ElasticBeanstalk.RestartAppServer
+    -- ** DescribeConfigurationSettings
+    , module Network.AWS.ElasticBeanstalk.DescribeConfigurationSettings
 
     -- ** ValidateConfigurationSettings
     , module Network.AWS.ElasticBeanstalk.ValidateConfigurationSettings
 
-    -- ** DescribeApplicationVersions
-    , module Network.AWS.ElasticBeanstalk.DescribeApplicationVersions
+    -- ** RestartAppServer
+    , module Network.AWS.ElasticBeanstalk.RestartAppServer
 
+    -- ** DescribeEnvironments
+    , module Network.AWS.ElasticBeanstalk.DescribeEnvironments
+
     -- ** CheckDNSAvailability
     , module Network.AWS.ElasticBeanstalk.CheckDNSAvailability
 
+    -- ** DescribeApplicationVersions
+    , module Network.AWS.ElasticBeanstalk.DescribeApplicationVersions
+
     -- ** CreateEnvironment
     , module Network.AWS.ElasticBeanstalk.CreateEnvironment
 
@@ -219,8 +219,8 @@
     -- ** ApplicationDescription
     , ApplicationDescription
     , applicationDescription
-    , adDateUpdated
     , adVersions
+    , adDateUpdated
     , adDateCreated
     , adApplicationName
     , adConfigurationTemplates
@@ -242,10 +242,10 @@
     -- ** ApplicationVersionDescription
     , ApplicationVersionDescription
     , applicationVersionDescription
-    , avdDateUpdated
     , avdSourceBundle
-    , avdVersionLabel
+    , avdDateUpdated
     , avdDateCreated
+    , avdVersionLabel
     , avdApplicationName
     , avdDescription
 
@@ -262,8 +262,8 @@
     -- ** CPUUtilization
     , CPUUtilization
     , cpuUtilization
-    , cuIdle
     , cuSoftIRQ
+    , cuIdle
     , cuIRQ
     , cuSystem
     , cuUser
@@ -275,10 +275,10 @@
     , configurationOptionDescription
     , codMaxValue
     , codRegex
-    , codUserDefined
     , codMaxLength
-    , codValueOptions
+    , codUserDefined
     , codNamespace
+    , codValueOptions
     , codName
     , codChangeSeverity
     , codDefaultValue
@@ -290,8 +290,8 @@
     , configurationOptionSetting
     , cosOptionName
     , cosResourceName
-    , cosValue
     , cosNamespace
+    , cosValue
 
     -- ** ConfigurationSettingsDescription
     , ConfigurationSettingsDescription
@@ -309,22 +309,22 @@
     -- ** EnvironmentDescription
     , EnvironmentDescription
     , environmentDescription
-    , eCNAME
     , eStatus
+    , eCNAME
     , eTemplateName
     , eAbortableOperationInProgress
     , eEndpointURL
-    , eDateUpdated
     , eResources
+    , eDateUpdated
+    , eDateCreated
     , eHealth
     , eVersionLabel
-    , eDateCreated
     , eTier
     , eEnvironmentName
     , eApplicationName
-    , eHealthStatus
-    , eEnvironmentId
     , eSolutionStackName
+    , eEnvironmentId
+    , eHealthStatus
     , eDescription
 
     -- ** EnvironmentInfoDescription
@@ -341,8 +341,8 @@
     , erdQueues
     , erdTriggers
     , erdLoadBalancers
-    , erdInstances
     , erdEnvironmentName
+    , erdInstances
     , erdLaunchConfigurations
     , erdAutoScalingGroups
 
@@ -452,9 +452,9 @@
     , singleInstanceHealth
     , sihInstanceId
     , sihCauses
+    , sihSystem
     , sihApplicationMetrics
     , sihColor
-    , sihSystem
     , sihHealthStatus
     , sihLaunchedAt
 
diff --git a/gen/Network/AWS/ElasticBeanstalk/CheckDNSAvailability.hs b/gen/Network/AWS/ElasticBeanstalk/CheckDNSAvailability.hs
--- a/gen/Network/AWS/ElasticBeanstalk/CheckDNSAvailability.hs
+++ b/gen/Network/AWS/ElasticBeanstalk/CheckDNSAvailability.hs
@@ -35,7 +35,7 @@
     -- * Response Lenses
     , cdarsFullyQualifiedCNAME
     , cdarsAvailable
-    , cdarsStatus
+    , cdarsResponseStatus
     ) where
 
 import           Network.AWS.ElasticBeanstalk.Types
@@ -98,7 +98,7 @@
 data CheckDNSAvailabilityResponse = CheckDNSAvailabilityResponse'
     { _cdarsFullyQualifiedCNAME :: !(Maybe Text)
     , _cdarsAvailable           :: !(Maybe Bool)
-    , _cdarsStatus              :: !Int
+    , _cdarsResponseStatus      :: !Int
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'CheckDNSAvailabilityResponse' with the minimum fields required to make a request.
@@ -109,15 +109,15 @@
 --
 -- * 'cdarsAvailable'
 --
--- * 'cdarsStatus'
+-- * 'cdarsResponseStatus'
 checkDNSAvailabilityResponse
-    :: Int -- ^ 'cdarsStatus'
+    :: Int -- ^ 'cdarsResponseStatus'
     -> CheckDNSAvailabilityResponse
-checkDNSAvailabilityResponse pStatus_ =
+checkDNSAvailabilityResponse pResponseStatus_ =
     CheckDNSAvailabilityResponse'
     { _cdarsFullyQualifiedCNAME = Nothing
     , _cdarsAvailable = Nothing
-    , _cdarsStatus = pStatus_
+    , _cdarsResponseStatus = pResponseStatus_
     }
 
 -- | The fully qualified CNAME to reserve when CreateEnvironment is called
@@ -137,5 +137,5 @@
 cdarsAvailable = lens _cdarsAvailable (\ s a -> s{_cdarsAvailable = a});
 
 -- | The response status code.
-cdarsStatus :: Lens' CheckDNSAvailabilityResponse Int
-cdarsStatus = lens _cdarsStatus (\ s a -> s{_cdarsStatus = a});
+cdarsResponseStatus :: Lens' CheckDNSAvailabilityResponse Int
+cdarsResponseStatus = lens _cdarsResponseStatus (\ s a -> s{_cdarsResponseStatus = a});
diff --git a/gen/Network/AWS/ElasticBeanstalk/CreateConfigurationTemplate.hs b/gen/Network/AWS/ElasticBeanstalk/CreateConfigurationTemplate.hs
--- a/gen/Network/AWS/ElasticBeanstalk/CreateConfigurationTemplate.hs
+++ b/gen/Network/AWS/ElasticBeanstalk/CreateConfigurationTemplate.hs
@@ -37,8 +37,8 @@
     -- * Request Lenses
     , cctOptionSettings
     , cctSourceConfiguration
-    , cctEnvironmentId
     , cctSolutionStackName
+    , cctEnvironmentId
     , cctDescription
     , cctApplicationName
     , cctTemplateName
@@ -70,8 +70,8 @@
 data CreateConfigurationTemplate = CreateConfigurationTemplate'
     { _cctOptionSettings      :: !(Maybe [ConfigurationOptionSetting])
     , _cctSourceConfiguration :: !(Maybe SourceConfiguration)
-    , _cctEnvironmentId       :: !(Maybe Text)
     , _cctSolutionStackName   :: !(Maybe Text)
+    , _cctEnvironmentId       :: !(Maybe Text)
     , _cctDescription         :: !(Maybe Text)
     , _cctApplicationName     :: !Text
     , _cctTemplateName        :: !Text
@@ -85,10 +85,10 @@
 --
 -- * 'cctSourceConfiguration'
 --
--- * 'cctEnvironmentId'
---
 -- * 'cctSolutionStackName'
 --
+-- * 'cctEnvironmentId'
+--
 -- * 'cctDescription'
 --
 -- * 'cctApplicationName'
@@ -102,8 +102,8 @@
     CreateConfigurationTemplate'
     { _cctOptionSettings = Nothing
     , _cctSourceConfiguration = Nothing
-    , _cctEnvironmentId = Nothing
     , _cctSolutionStackName = Nothing
+    , _cctEnvironmentId = Nothing
     , _cctDescription = Nothing
     , _cctApplicationName = pApplicationName_
     , _cctTemplateName = pTemplateName_
@@ -132,10 +132,6 @@
 cctSourceConfiguration :: Lens' CreateConfigurationTemplate (Maybe SourceConfiguration)
 cctSourceConfiguration = lens _cctSourceConfiguration (\ s a -> s{_cctSourceConfiguration = a});
 
--- | The ID of the environment used with this configuration template.
-cctEnvironmentId :: Lens' CreateConfigurationTemplate (Maybe Text)
-cctEnvironmentId = lens _cctEnvironmentId (\ s a -> s{_cctEnvironmentId = a});
-
 -- | The name of the solution stack used by this configuration. The solution
 -- stack specifies the operating system, architecture, and application
 -- server for a configuration template. It determines the set of
@@ -154,6 +150,10 @@
 cctSolutionStackName :: Lens' CreateConfigurationTemplate (Maybe Text)
 cctSolutionStackName = lens _cctSolutionStackName (\ s a -> s{_cctSolutionStackName = a});
 
+-- | The ID of the environment used with this configuration template.
+cctEnvironmentId :: Lens' CreateConfigurationTemplate (Maybe Text)
+cctEnvironmentId = lens _cctEnvironmentId (\ s a -> s{_cctEnvironmentId = a});
+
 -- | Describes this configuration.
 cctDescription :: Lens' CreateConfigurationTemplate (Maybe Text)
 cctDescription = lens _cctDescription (\ s a -> s{_cctDescription = a});
@@ -198,8 +198,8 @@
                  toQuery
                    (toQueryList "member" <$> _cctOptionSettings),
                "SourceConfiguration" =: _cctSourceConfiguration,
-               "EnvironmentId" =: _cctEnvironmentId,
                "SolutionStackName" =: _cctSolutionStackName,
+               "EnvironmentId" =: _cctEnvironmentId,
                "Description" =: _cctDescription,
                "ApplicationName" =: _cctApplicationName,
                "TemplateName" =: _cctTemplateName]
diff --git a/gen/Network/AWS/ElasticBeanstalk/CreateEnvironment.hs b/gen/Network/AWS/ElasticBeanstalk/CreateEnvironment.hs
--- a/gen/Network/AWS/ElasticBeanstalk/CreateEnvironment.hs
+++ b/gen/Network/AWS/ElasticBeanstalk/CreateEnvironment.hs
@@ -44,22 +44,22 @@
     , environmentDescription
     , EnvironmentDescription
     -- * Response Lenses
-    , eCNAME
     , eStatus
+    , eCNAME
     , eTemplateName
     , eAbortableOperationInProgress
     , eEndpointURL
-    , eDateUpdated
     , eResources
+    , eDateUpdated
+    , eDateCreated
     , eHealth
     , eVersionLabel
-    , eDateCreated
     , eTier
     , eEnvironmentName
     , eApplicationName
-    , eHealthStatus
-    , eEnvironmentId
     , eSolutionStackName
+    , eEnvironmentId
+    , eHealthStatus
     , eDescription
     ) where
 
diff --git a/gen/Network/AWS/ElasticBeanstalk/CreateStorageLocation.hs b/gen/Network/AWS/ElasticBeanstalk/CreateStorageLocation.hs
--- a/gen/Network/AWS/ElasticBeanstalk/CreateStorageLocation.hs
+++ b/gen/Network/AWS/ElasticBeanstalk/CreateStorageLocation.hs
@@ -34,7 +34,7 @@
     , CreateStorageLocationResponse
     -- * Response Lenses
     , cslrsS3Bucket
-    , cslrsStatus
+    , cslrsResponseStatus
     ) where
 
 import           Network.AWS.ElasticBeanstalk.Types
@@ -81,8 +81,8 @@
 --
 -- /See:/ 'createStorageLocationResponse' smart constructor.
 data CreateStorageLocationResponse = CreateStorageLocationResponse'
-    { _cslrsS3Bucket :: !(Maybe Text)
-    , _cslrsStatus   :: !Int
+    { _cslrsS3Bucket       :: !(Maybe Text)
+    , _cslrsResponseStatus :: !Int
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'CreateStorageLocationResponse' with the minimum fields required to make a request.
@@ -91,14 +91,14 @@
 --
 -- * 'cslrsS3Bucket'
 --
--- * 'cslrsStatus'
+-- * 'cslrsResponseStatus'
 createStorageLocationResponse
-    :: Int -- ^ 'cslrsStatus'
+    :: Int -- ^ 'cslrsResponseStatus'
     -> CreateStorageLocationResponse
-createStorageLocationResponse pStatus_ =
+createStorageLocationResponse pResponseStatus_ =
     CreateStorageLocationResponse'
     { _cslrsS3Bucket = Nothing
-    , _cslrsStatus = pStatus_
+    , _cslrsResponseStatus = pResponseStatus_
     }
 
 -- | The name of the Amazon S3 bucket created.
@@ -106,5 +106,5 @@
 cslrsS3Bucket = lens _cslrsS3Bucket (\ s a -> s{_cslrsS3Bucket = a});
 
 -- | The response status code.
-cslrsStatus :: Lens' CreateStorageLocationResponse Int
-cslrsStatus = lens _cslrsStatus (\ s a -> s{_cslrsStatus = a});
+cslrsResponseStatus :: Lens' CreateStorageLocationResponse Int
+cslrsResponseStatus = lens _cslrsResponseStatus (\ s a -> s{_cslrsResponseStatus = a});
diff --git a/gen/Network/AWS/ElasticBeanstalk/DescribeApplicationVersions.hs b/gen/Network/AWS/ElasticBeanstalk/DescribeApplicationVersions.hs
--- a/gen/Network/AWS/ElasticBeanstalk/DescribeApplicationVersions.hs
+++ b/gen/Network/AWS/ElasticBeanstalk/DescribeApplicationVersions.hs
@@ -35,7 +35,7 @@
     , DescribeApplicationVersionsResponse
     -- * Response Lenses
     , davrsApplicationVersions
-    , davrsStatus
+    , davrsResponseStatus
     ) where
 
 import           Network.AWS.ElasticBeanstalk.Types
@@ -112,7 +112,7 @@
 -- /See:/ 'describeApplicationVersionsResponse' smart constructor.
 data DescribeApplicationVersionsResponse = DescribeApplicationVersionsResponse'
     { _davrsApplicationVersions :: !(Maybe [ApplicationVersionDescription])
-    , _davrsStatus              :: !Int
+    , _davrsResponseStatus      :: !Int
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'DescribeApplicationVersionsResponse' with the minimum fields required to make a request.
@@ -121,14 +121,14 @@
 --
 -- * 'davrsApplicationVersions'
 --
--- * 'davrsStatus'
+-- * 'davrsResponseStatus'
 describeApplicationVersionsResponse
-    :: Int -- ^ 'davrsStatus'
+    :: Int -- ^ 'davrsResponseStatus'
     -> DescribeApplicationVersionsResponse
-describeApplicationVersionsResponse pStatus_ =
+describeApplicationVersionsResponse pResponseStatus_ =
     DescribeApplicationVersionsResponse'
     { _davrsApplicationVersions = Nothing
-    , _davrsStatus = pStatus_
+    , _davrsResponseStatus = pResponseStatus_
     }
 
 -- | A list of ApplicationVersionDescription .
@@ -136,5 +136,5 @@
 davrsApplicationVersions = lens _davrsApplicationVersions (\ s a -> s{_davrsApplicationVersions = a}) . _Default . _Coerce;
 
 -- | The response status code.
-davrsStatus :: Lens' DescribeApplicationVersionsResponse Int
-davrsStatus = lens _davrsStatus (\ s a -> s{_davrsStatus = a});
+davrsResponseStatus :: Lens' DescribeApplicationVersionsResponse Int
+davrsResponseStatus = lens _davrsResponseStatus (\ s a -> s{_davrsResponseStatus = a});
diff --git a/gen/Network/AWS/ElasticBeanstalk/DescribeApplications.hs b/gen/Network/AWS/ElasticBeanstalk/DescribeApplications.hs
--- a/gen/Network/AWS/ElasticBeanstalk/DescribeApplications.hs
+++ b/gen/Network/AWS/ElasticBeanstalk/DescribeApplications.hs
@@ -34,7 +34,7 @@
     , DescribeApplicationsResponse
     -- * Response Lenses
     , darsApplications
-    , darsStatus
+    , darsResponseStatus
     ) where
 
 import           Network.AWS.ElasticBeanstalk.Types
@@ -98,8 +98,8 @@
 --
 -- /See:/ 'describeApplicationsResponse' smart constructor.
 data DescribeApplicationsResponse = DescribeApplicationsResponse'
-    { _darsApplications :: !(Maybe [ApplicationDescription])
-    , _darsStatus       :: !Int
+    { _darsApplications   :: !(Maybe [ApplicationDescription])
+    , _darsResponseStatus :: !Int
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'DescribeApplicationsResponse' with the minimum fields required to make a request.
@@ -108,14 +108,14 @@
 --
 -- * 'darsApplications'
 --
--- * 'darsStatus'
+-- * 'darsResponseStatus'
 describeApplicationsResponse
-    :: Int -- ^ 'darsStatus'
+    :: Int -- ^ 'darsResponseStatus'
     -> DescribeApplicationsResponse
-describeApplicationsResponse pStatus_ =
+describeApplicationsResponse pResponseStatus_ =
     DescribeApplicationsResponse'
     { _darsApplications = Nothing
-    , _darsStatus = pStatus_
+    , _darsResponseStatus = pResponseStatus_
     }
 
 -- | This parameter contains a list of ApplicationDescription.
@@ -123,5 +123,5 @@
 darsApplications = lens _darsApplications (\ s a -> s{_darsApplications = a}) . _Default . _Coerce;
 
 -- | The response status code.
-darsStatus :: Lens' DescribeApplicationsResponse Int
-darsStatus = lens _darsStatus (\ s a -> s{_darsStatus = a});
+darsResponseStatus :: Lens' DescribeApplicationsResponse Int
+darsResponseStatus = lens _darsResponseStatus (\ s a -> s{_darsResponseStatus = a});
diff --git a/gen/Network/AWS/ElasticBeanstalk/DescribeConfigurationOptions.hs b/gen/Network/AWS/ElasticBeanstalk/DescribeConfigurationOptions.hs
--- a/gen/Network/AWS/ElasticBeanstalk/DescribeConfigurationOptions.hs
+++ b/gen/Network/AWS/ElasticBeanstalk/DescribeConfigurationOptions.hs
@@ -34,16 +34,16 @@
     , dcoTemplateName
     , dcoEnvironmentName
     , dcoApplicationName
-    , dcoOptions
     , dcoSolutionStackName
+    , dcoOptions
 
     -- * Destructuring the Response
     , describeConfigurationOptionsResponse
     , DescribeConfigurationOptionsResponse
     -- * Response Lenses
-    , dcorsOptions
     , dcorsSolutionStackName
-    , dcorsStatus
+    , dcorsOptions
+    , dcorsResponseStatus
     ) where
 
 import           Network.AWS.ElasticBeanstalk.Types
@@ -59,8 +59,8 @@
     { _dcoTemplateName      :: !(Maybe Text)
     , _dcoEnvironmentName   :: !(Maybe Text)
     , _dcoApplicationName   :: !(Maybe Text)
-    , _dcoOptions           :: !(Maybe [OptionSpecification])
     , _dcoSolutionStackName :: !(Maybe Text)
+    , _dcoOptions           :: !(Maybe [OptionSpecification])
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'DescribeConfigurationOptions' with the minimum fields required to make a request.
@@ -73,9 +73,9 @@
 --
 -- * 'dcoApplicationName'
 --
--- * 'dcoOptions'
---
 -- * 'dcoSolutionStackName'
+--
+-- * 'dcoOptions'
 describeConfigurationOptions
     :: DescribeConfigurationOptions
 describeConfigurationOptions =
@@ -83,8 +83,8 @@
     { _dcoTemplateName = Nothing
     , _dcoEnvironmentName = Nothing
     , _dcoApplicationName = Nothing
-    , _dcoOptions = Nothing
     , _dcoSolutionStackName = Nothing
+    , _dcoOptions = Nothing
     }
 
 -- | The name of the configuration template whose configuration options you
@@ -104,15 +104,15 @@
 dcoApplicationName :: Lens' DescribeConfigurationOptions (Maybe Text)
 dcoApplicationName = lens _dcoApplicationName (\ s a -> s{_dcoApplicationName = a});
 
--- | If specified, restricts the descriptions to only the specified options.
-dcoOptions :: Lens' DescribeConfigurationOptions [OptionSpecification]
-dcoOptions = lens _dcoOptions (\ s a -> s{_dcoOptions = a}) . _Default . _Coerce;
-
 -- | The name of the solution stack whose configuration options you want to
 -- describe.
 dcoSolutionStackName :: Lens' DescribeConfigurationOptions (Maybe Text)
 dcoSolutionStackName = lens _dcoSolutionStackName (\ s a -> s{_dcoSolutionStackName = a});
 
+-- | If specified, restricts the descriptions to only the specified options.
+dcoOptions :: Lens' DescribeConfigurationOptions [OptionSpecification]
+dcoOptions = lens _dcoOptions (\ s a -> s{_dcoOptions = a}) . _Default . _Coerce;
+
 instance AWSRequest DescribeConfigurationOptions
          where
         type Rs DescribeConfigurationOptions =
@@ -123,9 +123,9 @@
               "DescribeConfigurationOptionsResult"
               (\ s h x ->
                  DescribeConfigurationOptionsResponse' <$>
-                   (x .@? "Options" .!@ mempty >>=
-                      may (parseXMLList "member"))
-                     <*> (x .@? "SolutionStackName")
+                   (x .@? "SolutionStackName") <*>
+                     (x .@? "Options" .!@ mempty >>=
+                        may (parseXMLList "member"))
                      <*> (pure (fromEnum s)))
 
 instance ToHeaders DescribeConfigurationOptions where
@@ -143,46 +143,46 @@
                "TemplateName" =: _dcoTemplateName,
                "EnvironmentName" =: _dcoEnvironmentName,
                "ApplicationName" =: _dcoApplicationName,
+               "SolutionStackName" =: _dcoSolutionStackName,
                "Options" =:
-                 toQuery (toQueryList "member" <$> _dcoOptions),
-               "SolutionStackName" =: _dcoSolutionStackName]
+                 toQuery (toQueryList "member" <$> _dcoOptions)]
 
 -- | Describes the settings for a specified configuration set.
 --
 -- /See:/ 'describeConfigurationOptionsResponse' smart constructor.
 data DescribeConfigurationOptionsResponse = DescribeConfigurationOptionsResponse'
-    { _dcorsOptions           :: !(Maybe [ConfigurationOptionDescription])
-    , _dcorsSolutionStackName :: !(Maybe Text)
-    , _dcorsStatus            :: !Int
+    { _dcorsSolutionStackName :: !(Maybe Text)
+    , _dcorsOptions           :: !(Maybe [ConfigurationOptionDescription])
+    , _dcorsResponseStatus    :: !Int
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'DescribeConfigurationOptionsResponse' with the minimum fields required to make a request.
 --
 -- Use one of the following lenses to modify other fields as desired:
 --
--- * 'dcorsOptions'
---
 -- * 'dcorsSolutionStackName'
 --
--- * 'dcorsStatus'
+-- * 'dcorsOptions'
+--
+-- * 'dcorsResponseStatus'
 describeConfigurationOptionsResponse
-    :: Int -- ^ 'dcorsStatus'
+    :: Int -- ^ 'dcorsResponseStatus'
     -> DescribeConfigurationOptionsResponse
-describeConfigurationOptionsResponse pStatus_ =
+describeConfigurationOptionsResponse pResponseStatus_ =
     DescribeConfigurationOptionsResponse'
-    { _dcorsOptions = Nothing
-    , _dcorsSolutionStackName = Nothing
-    , _dcorsStatus = pStatus_
+    { _dcorsSolutionStackName = Nothing
+    , _dcorsOptions = Nothing
+    , _dcorsResponseStatus = pResponseStatus_
     }
 
--- | A list of ConfigurationOptionDescription.
-dcorsOptions :: Lens' DescribeConfigurationOptionsResponse [ConfigurationOptionDescription]
-dcorsOptions = lens _dcorsOptions (\ s a -> s{_dcorsOptions = a}) . _Default . _Coerce;
-
 -- | The name of the solution stack these configuration options belong to.
 dcorsSolutionStackName :: Lens' DescribeConfigurationOptionsResponse (Maybe Text)
 dcorsSolutionStackName = lens _dcorsSolutionStackName (\ s a -> s{_dcorsSolutionStackName = a});
 
+-- | A list of ConfigurationOptionDescription.
+dcorsOptions :: Lens' DescribeConfigurationOptionsResponse [ConfigurationOptionDescription]
+dcorsOptions = lens _dcorsOptions (\ s a -> s{_dcorsOptions = a}) . _Default . _Coerce;
+
 -- | The response status code.
-dcorsStatus :: Lens' DescribeConfigurationOptionsResponse Int
-dcorsStatus = lens _dcorsStatus (\ s a -> s{_dcorsStatus = a});
+dcorsResponseStatus :: Lens' DescribeConfigurationOptionsResponse Int
+dcorsResponseStatus = lens _dcorsResponseStatus (\ s a -> s{_dcorsResponseStatus = a});
diff --git a/gen/Network/AWS/ElasticBeanstalk/DescribeConfigurationSettings.hs b/gen/Network/AWS/ElasticBeanstalk/DescribeConfigurationSettings.hs
--- a/gen/Network/AWS/ElasticBeanstalk/DescribeConfigurationSettings.hs
+++ b/gen/Network/AWS/ElasticBeanstalk/DescribeConfigurationSettings.hs
@@ -48,7 +48,7 @@
     , DescribeConfigurationSettingsResponse
     -- * Response Lenses
     , dcsrsConfigurationSettings
-    , dcsrsStatus
+    , dcsrsResponseStatus
     ) where
 
 import           Network.AWS.ElasticBeanstalk.Types
@@ -146,7 +146,7 @@
 -- /See:/ 'describeConfigurationSettingsResponse' smart constructor.
 data DescribeConfigurationSettingsResponse = DescribeConfigurationSettingsResponse'
     { _dcsrsConfigurationSettings :: !(Maybe [ConfigurationSettingsDescription])
-    , _dcsrsStatus                :: !Int
+    , _dcsrsResponseStatus        :: !Int
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'DescribeConfigurationSettingsResponse' with the minimum fields required to make a request.
@@ -155,14 +155,14 @@
 --
 -- * 'dcsrsConfigurationSettings'
 --
--- * 'dcsrsStatus'
+-- * 'dcsrsResponseStatus'
 describeConfigurationSettingsResponse
-    :: Int -- ^ 'dcsrsStatus'
+    :: Int -- ^ 'dcsrsResponseStatus'
     -> DescribeConfigurationSettingsResponse
-describeConfigurationSettingsResponse pStatus_ =
+describeConfigurationSettingsResponse pResponseStatus_ =
     DescribeConfigurationSettingsResponse'
     { _dcsrsConfigurationSettings = Nothing
-    , _dcsrsStatus = pStatus_
+    , _dcsrsResponseStatus = pResponseStatus_
     }
 
 -- | A list of ConfigurationSettingsDescription.
@@ -170,5 +170,5 @@
 dcsrsConfigurationSettings = lens _dcsrsConfigurationSettings (\ s a -> s{_dcsrsConfigurationSettings = a}) . _Default . _Coerce;
 
 -- | The response status code.
-dcsrsStatus :: Lens' DescribeConfigurationSettingsResponse Int
-dcsrsStatus = lens _dcsrsStatus (\ s a -> s{_dcsrsStatus = a});
+dcsrsResponseStatus :: Lens' DescribeConfigurationSettingsResponse Int
+dcsrsResponseStatus = lens _dcsrsResponseStatus (\ s a -> s{_dcsrsResponseStatus = a});
diff --git a/gen/Network/AWS/ElasticBeanstalk/DescribeEnvironmentHealth.hs b/gen/Network/AWS/ElasticBeanstalk/DescribeEnvironmentHealth.hs
--- a/gen/Network/AWS/ElasticBeanstalk/DescribeEnvironmentHealth.hs
+++ b/gen/Network/AWS/ElasticBeanstalk/DescribeEnvironmentHealth.hs
@@ -30,13 +30,14 @@
     , DescribeEnvironmentHealth
     -- * Request Lenses
     , dehEnvironmentName
-    , dehEnvironmentId
     , dehAttributeNames
+    , dehEnvironmentId
 
     -- * Destructuring the Response
     , describeEnvironmentHealthResponse
     , DescribeEnvironmentHealthResponse
     -- * Response Lenses
+    , dehrsStatus
     , dehrsCauses
     , dehrsApplicationMetrics
     , dehrsColor
@@ -44,7 +45,7 @@
     , dehrsHealthStatus
     , dehrsInstancesHealth
     , dehrsRefreshedAt
-    , dehrsStatus
+    , dehrsResponseStatus
     ) where
 
 import           Network.AWS.ElasticBeanstalk.Types
@@ -58,8 +59,8 @@
 -- /See:/ 'describeEnvironmentHealth' smart constructor.
 data DescribeEnvironmentHealth = DescribeEnvironmentHealth'
     { _dehEnvironmentName :: !(Maybe Text)
-    , _dehEnvironmentId   :: !(Maybe Text)
     , _dehAttributeNames  :: !(Maybe [EnvironmentHealthAttribute])
+    , _dehEnvironmentId   :: !(Maybe Text)
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'DescribeEnvironmentHealth' with the minimum fields required to make a request.
@@ -68,32 +69,32 @@
 --
 -- * 'dehEnvironmentName'
 --
--- * 'dehEnvironmentId'
---
 -- * 'dehAttributeNames'
+--
+-- * 'dehEnvironmentId'
 describeEnvironmentHealth
     :: DescribeEnvironmentHealth
 describeEnvironmentHealth =
     DescribeEnvironmentHealth'
     { _dehEnvironmentName = Nothing
-    , _dehEnvironmentId = Nothing
     , _dehAttributeNames = Nothing
+    , _dehEnvironmentId = Nothing
     }
 
 -- | Specifies the AWS Elastic Beanstalk environment name.
 dehEnvironmentName :: Lens' DescribeEnvironmentHealth (Maybe Text)
 dehEnvironmentName = lens _dehEnvironmentName (\ s a -> s{_dehEnvironmentName = a});
 
--- | Specifies the AWS Elastic Beanstalk environment ID.
-dehEnvironmentId :: Lens' DescribeEnvironmentHealth (Maybe Text)
-dehEnvironmentId = lens _dehEnvironmentId (\ s a -> s{_dehEnvironmentId = a});
-
 -- | Specifies the response elements you wish to receive. If no attribute
 -- names are specified, AWS Elastic Beanstalk returns all response
 -- elements.
 dehAttributeNames :: Lens' DescribeEnvironmentHealth [EnvironmentHealthAttribute]
 dehAttributeNames = lens _dehAttributeNames (\ s a -> s{_dehAttributeNames = a}) . _Default . _Coerce;
 
+-- | Specifies the AWS Elastic Beanstalk environment ID.
+dehEnvironmentId :: Lens' DescribeEnvironmentHealth (Maybe Text)
+dehEnvironmentId = lens _dehEnvironmentId (\ s a -> s{_dehEnvironmentId = a});
+
 instance AWSRequest DescribeEnvironmentHealth where
         type Rs DescribeEnvironmentHealth =
              DescribeEnvironmentHealthResponse
@@ -102,8 +103,9 @@
           = receiveXMLWrapper "DescribeEnvironmentHealthResult"
               (\ s h x ->
                  DescribeEnvironmentHealthResponse' <$>
-                   (x .@? "Causes" .!@ mempty >>=
-                      may (parseXMLList "member"))
+                   (x .@? "Status") <*>
+                     (x .@? "Causes" .!@ mempty >>=
+                        may (parseXMLList "member"))
                      <*> (x .@? "ApplicationMetrics")
                      <*> (x .@? "Color")
                      <*> (x .@? "EnvironmentName")
@@ -125,29 +127,32 @@
                  ("DescribeEnvironmentHealth" :: ByteString),
                "Version" =: ("2010-12-01" :: ByteString),
                "EnvironmentName" =: _dehEnvironmentName,
-               "EnvironmentId" =: _dehEnvironmentId,
                "AttributeNames" =:
                  toQuery
-                   (toQueryList "member" <$> _dehAttributeNames)]
+                   (toQueryList "member" <$> _dehAttributeNames),
+               "EnvironmentId" =: _dehEnvironmentId]
 
 -- | See the example below for a sample response.
 --
 -- /See:/ 'describeEnvironmentHealthResponse' smart constructor.
 data DescribeEnvironmentHealthResponse = DescribeEnvironmentHealthResponse'
-    { _dehrsCauses             :: !(Maybe [Text])
+    { _dehrsStatus             :: !(Maybe EnvironmentHealth)
+    , _dehrsCauses             :: !(Maybe [Text])
     , _dehrsApplicationMetrics :: !(Maybe ApplicationMetrics)
     , _dehrsColor              :: !(Maybe Text)
     , _dehrsEnvironmentName    :: !(Maybe Text)
     , _dehrsHealthStatus       :: !(Maybe Text)
     , _dehrsInstancesHealth    :: !(Maybe InstanceHealthSummary)
     , _dehrsRefreshedAt        :: !(Maybe ISO8601)
-    , _dehrsStatus             :: !Int
+    , _dehrsResponseStatus     :: !Int
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'DescribeEnvironmentHealthResponse' with the minimum fields required to make a request.
 --
 -- Use one of the following lenses to modify other fields as desired:
 --
+-- * 'dehrsStatus'
+--
 -- * 'dehrsCauses'
 --
 -- * 'dehrsApplicationMetrics'
@@ -162,22 +167,29 @@
 --
 -- * 'dehrsRefreshedAt'
 --
--- * 'dehrsStatus'
+-- * 'dehrsResponseStatus'
 describeEnvironmentHealthResponse
-    :: Int -- ^ 'dehrsStatus'
+    :: Int -- ^ 'dehrsResponseStatus'
     -> DescribeEnvironmentHealthResponse
-describeEnvironmentHealthResponse pStatus_ =
+describeEnvironmentHealthResponse pResponseStatus_ =
     DescribeEnvironmentHealthResponse'
-    { _dehrsCauses = Nothing
+    { _dehrsStatus = Nothing
+    , _dehrsCauses = Nothing
     , _dehrsApplicationMetrics = Nothing
     , _dehrsColor = Nothing
     , _dehrsEnvironmentName = Nothing
     , _dehrsHealthStatus = Nothing
     , _dehrsInstancesHealth = Nothing
     , _dehrsRefreshedAt = Nothing
-    , _dehrsStatus = pStatus_
+    , _dehrsResponseStatus = pResponseStatus_
     }
 
+-- | Returns the health status value of the environment. For more
+-- information, see
+-- <http://docs.aws.amazon.com/elasticbeanstalk/latest/dg/health-enhanced-status.html Health Colors and Statuses>.
+dehrsStatus :: Lens' DescribeEnvironmentHealthResponse (Maybe EnvironmentHealth)
+dehrsStatus = lens _dehrsStatus (\ s a -> s{_dehrsStatus = a});
+
 -- | Returns potential causes for the reported status.
 dehrsCauses :: Lens' DescribeEnvironmentHealthResponse [Text]
 dehrsCauses = lens _dehrsCauses (\ s a -> s{_dehrsCauses = a}) . _Default . _Coerce;
@@ -210,5 +222,5 @@
 dehrsRefreshedAt = lens _dehrsRefreshedAt (\ s a -> s{_dehrsRefreshedAt = a}) . mapping _Time;
 
 -- | The response status code.
-dehrsStatus :: Lens' DescribeEnvironmentHealthResponse Int
-dehrsStatus = lens _dehrsStatus (\ s a -> s{_dehrsStatus = a});
+dehrsResponseStatus :: Lens' DescribeEnvironmentHealthResponse Int
+dehrsResponseStatus = lens _dehrsResponseStatus (\ s a -> s{_dehrsResponseStatus = a});
diff --git a/gen/Network/AWS/ElasticBeanstalk/DescribeEnvironmentResources.hs b/gen/Network/AWS/ElasticBeanstalk/DescribeEnvironmentResources.hs
--- a/gen/Network/AWS/ElasticBeanstalk/DescribeEnvironmentResources.hs
+++ b/gen/Network/AWS/ElasticBeanstalk/DescribeEnvironmentResources.hs
@@ -35,7 +35,7 @@
     , DescribeEnvironmentResourcesResponse
     -- * Response Lenses
     , derrsEnvironmentResources
-    , derrsStatus
+    , derrsResponseStatus
     ) where
 
 import           Network.AWS.ElasticBeanstalk.Types
@@ -116,7 +116,7 @@
 -- /See:/ 'describeEnvironmentResourcesResponse' smart constructor.
 data DescribeEnvironmentResourcesResponse = DescribeEnvironmentResourcesResponse'
     { _derrsEnvironmentResources :: !(Maybe EnvironmentResourceDescription)
-    , _derrsStatus               :: !Int
+    , _derrsResponseStatus       :: !Int
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'DescribeEnvironmentResourcesResponse' with the minimum fields required to make a request.
@@ -125,14 +125,14 @@
 --
 -- * 'derrsEnvironmentResources'
 --
--- * 'derrsStatus'
+-- * 'derrsResponseStatus'
 describeEnvironmentResourcesResponse
-    :: Int -- ^ 'derrsStatus'
+    :: Int -- ^ 'derrsResponseStatus'
     -> DescribeEnvironmentResourcesResponse
-describeEnvironmentResourcesResponse pStatus_ =
+describeEnvironmentResourcesResponse pResponseStatus_ =
     DescribeEnvironmentResourcesResponse'
     { _derrsEnvironmentResources = Nothing
-    , _derrsStatus = pStatus_
+    , _derrsResponseStatus = pResponseStatus_
     }
 
 -- | A list of EnvironmentResourceDescription.
@@ -140,5 +140,5 @@
 derrsEnvironmentResources = lens _derrsEnvironmentResources (\ s a -> s{_derrsEnvironmentResources = a});
 
 -- | The response status code.
-derrsStatus :: Lens' DescribeEnvironmentResourcesResponse Int
-derrsStatus = lens _derrsStatus (\ s a -> s{_derrsStatus = a});
+derrsResponseStatus :: Lens' DescribeEnvironmentResourcesResponse Int
+derrsResponseStatus = lens _derrsResponseStatus (\ s a -> s{_derrsResponseStatus = a});
diff --git a/gen/Network/AWS/ElasticBeanstalk/DescribeEnvironments.hs b/gen/Network/AWS/ElasticBeanstalk/DescribeEnvironments.hs
--- a/gen/Network/AWS/ElasticBeanstalk/DescribeEnvironments.hs
+++ b/gen/Network/AWS/ElasticBeanstalk/DescribeEnvironments.hs
@@ -30,8 +30,8 @@
     , dEnvironmentIds
     , dEnvironmentNames
     , dVersionLabel
-    , dIncludedDeletedBackTo
     , dApplicationName
+    , dIncludedDeletedBackTo
     , dIncludeDeleted
 
     -- * Destructuring the Response
@@ -39,7 +39,7 @@
     , DescribeEnvironmentsResponse
     -- * Response Lenses
     , drsEnvironments
-    , drsStatus
+    , drsResponseStatus
     ) where
 
 import           Network.AWS.ElasticBeanstalk.Types
@@ -55,8 +55,8 @@
     { _dEnvironmentIds        :: !(Maybe [Text])
     , _dEnvironmentNames      :: !(Maybe [Text])
     , _dVersionLabel          :: !(Maybe Text)
-    , _dIncludedDeletedBackTo :: !(Maybe ISO8601)
     , _dApplicationName       :: !(Maybe Text)
+    , _dIncludedDeletedBackTo :: !(Maybe ISO8601)
     , _dIncludeDeleted        :: !(Maybe Bool)
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
@@ -70,10 +70,10 @@
 --
 -- * 'dVersionLabel'
 --
--- * 'dIncludedDeletedBackTo'
---
 -- * 'dApplicationName'
 --
+-- * 'dIncludedDeletedBackTo'
+--
 -- * 'dIncludeDeleted'
 describeEnvironments
     :: DescribeEnvironments
@@ -82,8 +82,8 @@
     { _dEnvironmentIds = Nothing
     , _dEnvironmentNames = Nothing
     , _dVersionLabel = Nothing
-    , _dIncludedDeletedBackTo = Nothing
     , _dApplicationName = Nothing
+    , _dIncludedDeletedBackTo = Nothing
     , _dIncludeDeleted = Nothing
     }
 
@@ -102,16 +102,16 @@
 dVersionLabel :: Lens' DescribeEnvironments (Maybe Text)
 dVersionLabel = lens _dVersionLabel (\ s a -> s{_dVersionLabel = a});
 
--- | If specified when 'IncludeDeleted' is set to 'true', then environments
--- deleted after this date are displayed.
-dIncludedDeletedBackTo :: Lens' DescribeEnvironments (Maybe UTCTime)
-dIncludedDeletedBackTo = lens _dIncludedDeletedBackTo (\ s a -> s{_dIncludedDeletedBackTo = a}) . mapping _Time;
-
 -- | If specified, AWS Elastic Beanstalk restricts the returned descriptions
 -- to include only those that are associated with this application.
 dApplicationName :: Lens' DescribeEnvironments (Maybe Text)
 dApplicationName = lens _dApplicationName (\ s a -> s{_dApplicationName = a});
 
+-- | If specified when 'IncludeDeleted' is set to 'true', then environments
+-- deleted after this date are displayed.
+dIncludedDeletedBackTo :: Lens' DescribeEnvironments (Maybe UTCTime)
+dIncludedDeletedBackTo = lens _dIncludedDeletedBackTo (\ s a -> s{_dIncludedDeletedBackTo = a}) . mapping _Time;
+
 -- | Indicates whether to include deleted environments:
 --
 -- 'true': Environments that have been deleted after
@@ -150,16 +150,16 @@
                  toQuery
                    (toQueryList "member" <$> _dEnvironmentNames),
                "VersionLabel" =: _dVersionLabel,
-               "IncludedDeletedBackTo" =: _dIncludedDeletedBackTo,
                "ApplicationName" =: _dApplicationName,
+               "IncludedDeletedBackTo" =: _dIncludedDeletedBackTo,
                "IncludeDeleted" =: _dIncludeDeleted]
 
 -- | Result message containing a list of environment descriptions.
 --
 -- /See:/ 'describeEnvironmentsResponse' smart constructor.
 data DescribeEnvironmentsResponse = DescribeEnvironmentsResponse'
-    { _drsEnvironments :: !(Maybe [EnvironmentDescription])
-    , _drsStatus       :: !Int
+    { _drsEnvironments   :: !(Maybe [EnvironmentDescription])
+    , _drsResponseStatus :: !Int
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'DescribeEnvironmentsResponse' with the minimum fields required to make a request.
@@ -168,14 +168,14 @@
 --
 -- * 'drsEnvironments'
 --
--- * 'drsStatus'
+-- * 'drsResponseStatus'
 describeEnvironmentsResponse
-    :: Int -- ^ 'drsStatus'
+    :: Int -- ^ 'drsResponseStatus'
     -> DescribeEnvironmentsResponse
-describeEnvironmentsResponse pStatus_ =
+describeEnvironmentsResponse pResponseStatus_ =
     DescribeEnvironmentsResponse'
     { _drsEnvironments = Nothing
-    , _drsStatus = pStatus_
+    , _drsResponseStatus = pResponseStatus_
     }
 
 -- | Returns an EnvironmentDescription list.
@@ -183,5 +183,5 @@
 drsEnvironments = lens _drsEnvironments (\ s a -> s{_drsEnvironments = a}) . _Default . _Coerce;
 
 -- | The response status code.
-drsStatus :: Lens' DescribeEnvironmentsResponse Int
-drsStatus = lens _drsStatus (\ s a -> s{_drsStatus = a});
+drsResponseStatus :: Lens' DescribeEnvironmentsResponse Int
+drsResponseStatus = lens _drsResponseStatus (\ s a -> s{_drsResponseStatus = a});
diff --git a/gen/Network/AWS/ElasticBeanstalk/DescribeEvents.hs b/gen/Network/AWS/ElasticBeanstalk/DescribeEvents.hs
--- a/gen/Network/AWS/ElasticBeanstalk/DescribeEvents.hs
+++ b/gen/Network/AWS/ElasticBeanstalk/DescribeEvents.hs
@@ -39,8 +39,8 @@
     , deSeverity
     , deNextToken
     , deVersionLabel
-    , deMaxRecords
     , deEnvironmentName
+    , deMaxRecords
     , deEndTime
     , deApplicationName
     , deEnvironmentId
@@ -51,7 +51,7 @@
     -- * Response Lenses
     , dersNextToken
     , dersEvents
-    , dersStatus
+    , dersResponseStatus
     ) where
 
 import           Network.AWS.ElasticBeanstalk.Types
@@ -71,8 +71,8 @@
     , _deSeverity        :: !(Maybe EventSeverity)
     , _deNextToken       :: !(Maybe Text)
     , _deVersionLabel    :: !(Maybe Text)
-    , _deMaxRecords      :: !(Maybe Nat)
     , _deEnvironmentName :: !(Maybe Text)
+    , _deMaxRecords      :: !(Maybe Nat)
     , _deEndTime         :: !(Maybe ISO8601)
     , _deApplicationName :: !(Maybe Text)
     , _deEnvironmentId   :: !(Maybe Text)
@@ -94,10 +94,10 @@
 --
 -- * 'deVersionLabel'
 --
--- * 'deMaxRecords'
---
 -- * 'deEnvironmentName'
 --
+-- * 'deMaxRecords'
+--
 -- * 'deEndTime'
 --
 -- * 'deApplicationName'
@@ -113,8 +113,8 @@
     , _deSeverity = Nothing
     , _deNextToken = Nothing
     , _deVersionLabel = Nothing
-    , _deMaxRecords = Nothing
     , _deEnvironmentName = Nothing
+    , _deMaxRecords = Nothing
     , _deEndTime = Nothing
     , _deApplicationName = Nothing
     , _deEnvironmentId = Nothing
@@ -150,16 +150,16 @@
 deVersionLabel :: Lens' DescribeEvents (Maybe Text)
 deVersionLabel = lens _deVersionLabel (\ s a -> s{_deVersionLabel = a});
 
--- | Specifies the maximum number of events that can be returned, beginning
--- with the most recent event.
-deMaxRecords :: Lens' DescribeEvents (Maybe Natural)
-deMaxRecords = lens _deMaxRecords (\ s a -> s{_deMaxRecords = a}) . mapping _Nat;
-
 -- | If specified, AWS Elastic Beanstalk restricts the returned descriptions
 -- to those associated with this environment.
 deEnvironmentName :: Lens' DescribeEvents (Maybe Text)
 deEnvironmentName = lens _deEnvironmentName (\ s a -> s{_deEnvironmentName = a});
 
+-- | Specifies the maximum number of events that can be returned, beginning
+-- with the most recent event.
+deMaxRecords :: Lens' DescribeEvents (Maybe Natural)
+deMaxRecords = lens _deMaxRecords (\ s a -> s{_deMaxRecords = a}) . mapping _Nat;
+
 -- | If specified, AWS Elastic Beanstalk restricts the returned descriptions
 -- to those that occur up to, but not including, the 'EndTime'.
 deEndTime :: Lens' DescribeEvents (Maybe UTCTime)
@@ -211,8 +211,8 @@
                "Severity" =: _deSeverity,
                "NextToken" =: _deNextToken,
                "VersionLabel" =: _deVersionLabel,
-               "MaxRecords" =: _deMaxRecords,
                "EnvironmentName" =: _deEnvironmentName,
+               "MaxRecords" =: _deMaxRecords,
                "EndTime" =: _deEndTime,
                "ApplicationName" =: _deApplicationName,
                "EnvironmentId" =: _deEnvironmentId]
@@ -221,9 +221,9 @@
 --
 -- /See:/ 'describeEventsResponse' smart constructor.
 data DescribeEventsResponse = DescribeEventsResponse'
-    { _dersNextToken :: !(Maybe Text)
-    , _dersEvents    :: !(Maybe [EventDescription])
-    , _dersStatus    :: !Int
+    { _dersNextToken      :: !(Maybe Text)
+    , _dersEvents         :: !(Maybe [EventDescription])
+    , _dersResponseStatus :: !Int
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'DescribeEventsResponse' with the minimum fields required to make a request.
@@ -234,15 +234,15 @@
 --
 -- * 'dersEvents'
 --
--- * 'dersStatus'
+-- * 'dersResponseStatus'
 describeEventsResponse
-    :: Int -- ^ 'dersStatus'
+    :: Int -- ^ 'dersResponseStatus'
     -> DescribeEventsResponse
-describeEventsResponse pStatus_ =
+describeEventsResponse pResponseStatus_ =
     DescribeEventsResponse'
     { _dersNextToken = Nothing
     , _dersEvents = Nothing
-    , _dersStatus = pStatus_
+    , _dersResponseStatus = pResponseStatus_
     }
 
 -- | If returned, this indicates that there are more results to obtain. Use
@@ -256,5 +256,5 @@
 dersEvents = lens _dersEvents (\ s a -> s{_dersEvents = a}) . _Default . _Coerce;
 
 -- | The response status code.
-dersStatus :: Lens' DescribeEventsResponse Int
-dersStatus = lens _dersStatus (\ s a -> s{_dersStatus = a});
+dersResponseStatus :: Lens' DescribeEventsResponse Int
+dersResponseStatus = lens _dersResponseStatus (\ s a -> s{_dersResponseStatus = a});
diff --git a/gen/Network/AWS/ElasticBeanstalk/DescribeInstancesHealth.hs b/gen/Network/AWS/ElasticBeanstalk/DescribeInstancesHealth.hs
--- a/gen/Network/AWS/ElasticBeanstalk/DescribeInstancesHealth.hs
+++ b/gen/Network/AWS/ElasticBeanstalk/DescribeInstancesHealth.hs
@@ -32,8 +32,8 @@
     -- * Request Lenses
     , dihNextToken
     , dihEnvironmentName
-    , dihEnvironmentId
     , dihAttributeNames
+    , dihEnvironmentId
 
     -- * Destructuring the Response
     , describeInstancesHealthResponse
@@ -42,7 +42,7 @@
     , dihrsInstanceHealthList
     , dihrsNextToken
     , dihrsRefreshedAt
-    , dihrsStatus
+    , dihrsResponseStatus
     ) where
 
 import           Network.AWS.ElasticBeanstalk.Types
@@ -57,8 +57,8 @@
 data DescribeInstancesHealth = DescribeInstancesHealth'
     { _dihNextToken       :: !(Maybe Text)
     , _dihEnvironmentName :: !(Maybe Text)
-    , _dihEnvironmentId   :: !(Maybe Text)
     , _dihAttributeNames  :: !(Maybe [InstancesHealthAttribute])
+    , _dihEnvironmentId   :: !(Maybe Text)
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'DescribeInstancesHealth' with the minimum fields required to make a request.
@@ -69,17 +69,17 @@
 --
 -- * 'dihEnvironmentName'
 --
--- * 'dihEnvironmentId'
---
 -- * 'dihAttributeNames'
+--
+-- * 'dihEnvironmentId'
 describeInstancesHealth
     :: DescribeInstancesHealth
 describeInstancesHealth =
     DescribeInstancesHealth'
     { _dihNextToken = Nothing
     , _dihEnvironmentName = Nothing
-    , _dihEnvironmentId = Nothing
     , _dihAttributeNames = Nothing
+    , _dihEnvironmentId = Nothing
     }
 
 -- | Specifies the next token of the request.
@@ -90,16 +90,16 @@
 dihEnvironmentName :: Lens' DescribeInstancesHealth (Maybe Text)
 dihEnvironmentName = lens _dihEnvironmentName (\ s a -> s{_dihEnvironmentName = a});
 
--- | Specifies the AWS Elastic Beanstalk environment ID.
-dihEnvironmentId :: Lens' DescribeInstancesHealth (Maybe Text)
-dihEnvironmentId = lens _dihEnvironmentId (\ s a -> s{_dihEnvironmentId = a});
-
 -- | Specifies the response elements you wish to receive. If no attribute
 -- names are specified, AWS Elastic Beanstalk returns all response
 -- elements.
 dihAttributeNames :: Lens' DescribeInstancesHealth [InstancesHealthAttribute]
 dihAttributeNames = lens _dihAttributeNames (\ s a -> s{_dihAttributeNames = a}) . _Default . _Coerce;
 
+-- | Specifies the AWS Elastic Beanstalk environment ID.
+dihEnvironmentId :: Lens' DescribeInstancesHealth (Maybe Text)
+dihEnvironmentId = lens _dihEnvironmentId (\ s a -> s{_dihEnvironmentId = a});
+
 instance AWSRequest DescribeInstancesHealth where
         type Rs DescribeInstancesHealth =
              DescribeInstancesHealthResponse
@@ -128,10 +128,10 @@
                "Version" =: ("2010-12-01" :: ByteString),
                "NextToken" =: _dihNextToken,
                "EnvironmentName" =: _dihEnvironmentName,
-               "EnvironmentId" =: _dihEnvironmentId,
                "AttributeNames" =:
                  toQuery
-                   (toQueryList "member" <$> _dihAttributeNames)]
+                   (toQueryList "member" <$> _dihAttributeNames),
+               "EnvironmentId" =: _dihEnvironmentId]
 
 -- | See the example below for a sample response.
 --
@@ -140,7 +140,7 @@
     { _dihrsInstanceHealthList :: !(Maybe [SingleInstanceHealth])
     , _dihrsNextToken          :: !(Maybe Text)
     , _dihrsRefreshedAt        :: !(Maybe ISO8601)
-    , _dihrsStatus             :: !Int
+    , _dihrsResponseStatus     :: !Int
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'DescribeInstancesHealthResponse' with the minimum fields required to make a request.
@@ -153,16 +153,16 @@
 --
 -- * 'dihrsRefreshedAt'
 --
--- * 'dihrsStatus'
+-- * 'dihrsResponseStatus'
 describeInstancesHealthResponse
-    :: Int -- ^ 'dihrsStatus'
+    :: Int -- ^ 'dihrsResponseStatus'
     -> DescribeInstancesHealthResponse
-describeInstancesHealthResponse pStatus_ =
+describeInstancesHealthResponse pResponseStatus_ =
     DescribeInstancesHealthResponse'
     { _dihrsInstanceHealthList = Nothing
     , _dihrsNextToken = Nothing
     , _dihrsRefreshedAt = Nothing
-    , _dihrsStatus = pStatus_
+    , _dihrsResponseStatus = pResponseStatus_
     }
 
 -- | Contains the response body with information about the health of the
@@ -179,5 +179,5 @@
 dihrsRefreshedAt = lens _dihrsRefreshedAt (\ s a -> s{_dihrsRefreshedAt = a}) . mapping _Time;
 
 -- | The response status code.
-dihrsStatus :: Lens' DescribeInstancesHealthResponse Int
-dihrsStatus = lens _dihrsStatus (\ s a -> s{_dihrsStatus = a});
+dihrsResponseStatus :: Lens' DescribeInstancesHealthResponse Int
+dihrsResponseStatus = lens _dihrsResponseStatus (\ s a -> s{_dihrsResponseStatus = a});
diff --git a/gen/Network/AWS/ElasticBeanstalk/ListAvailableSolutionStacks.hs b/gen/Network/AWS/ElasticBeanstalk/ListAvailableSolutionStacks.hs
--- a/gen/Network/AWS/ElasticBeanstalk/ListAvailableSolutionStacks.hs
+++ b/gen/Network/AWS/ElasticBeanstalk/ListAvailableSolutionStacks.hs
@@ -33,7 +33,7 @@
     -- * Response Lenses
     , lassrsSolutionStacks
     , lassrsSolutionStackDetails
-    , lassrsStatus
+    , lassrsResponseStatus
     ) where
 
 import           Network.AWS.ElasticBeanstalk.Types
@@ -89,7 +89,7 @@
 data ListAvailableSolutionStacksResponse = ListAvailableSolutionStacksResponse'
     { _lassrsSolutionStacks       :: !(Maybe [Text])
     , _lassrsSolutionStackDetails :: !(Maybe [SolutionStackDescription])
-    , _lassrsStatus               :: !Int
+    , _lassrsResponseStatus       :: !Int
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'ListAvailableSolutionStacksResponse' with the minimum fields required to make a request.
@@ -100,15 +100,15 @@
 --
 -- * 'lassrsSolutionStackDetails'
 --
--- * 'lassrsStatus'
+-- * 'lassrsResponseStatus'
 listAvailableSolutionStacksResponse
-    :: Int -- ^ 'lassrsStatus'
+    :: Int -- ^ 'lassrsResponseStatus'
     -> ListAvailableSolutionStacksResponse
-listAvailableSolutionStacksResponse pStatus_ =
+listAvailableSolutionStacksResponse pResponseStatus_ =
     ListAvailableSolutionStacksResponse'
     { _lassrsSolutionStacks = Nothing
     , _lassrsSolutionStackDetails = Nothing
-    , _lassrsStatus = pStatus_
+    , _lassrsResponseStatus = pResponseStatus_
     }
 
 -- | A list of available solution stacks.
@@ -120,5 +120,5 @@
 lassrsSolutionStackDetails = lens _lassrsSolutionStackDetails (\ s a -> s{_lassrsSolutionStackDetails = a}) . _Default . _Coerce;
 
 -- | The response status code.
-lassrsStatus :: Lens' ListAvailableSolutionStacksResponse Int
-lassrsStatus = lens _lassrsStatus (\ s a -> s{_lassrsStatus = a});
+lassrsResponseStatus :: Lens' ListAvailableSolutionStacksResponse Int
+lassrsResponseStatus = lens _lassrsResponseStatus (\ s a -> s{_lassrsResponseStatus = a});
diff --git a/gen/Network/AWS/ElasticBeanstalk/RetrieveEnvironmentInfo.hs b/gen/Network/AWS/ElasticBeanstalk/RetrieveEnvironmentInfo.hs
--- a/gen/Network/AWS/ElasticBeanstalk/RetrieveEnvironmentInfo.hs
+++ b/gen/Network/AWS/ElasticBeanstalk/RetrieveEnvironmentInfo.hs
@@ -41,7 +41,7 @@
     , RetrieveEnvironmentInfoResponse
     -- * Response Lenses
     , reirsEnvironmentInfo
-    , reirsStatus
+    , reirsResponseStatus
     ) where
 
 import           Network.AWS.ElasticBeanstalk.Types
@@ -138,7 +138,7 @@
 -- /See:/ 'retrieveEnvironmentInfoResponse' smart constructor.
 data RetrieveEnvironmentInfoResponse = RetrieveEnvironmentInfoResponse'
     { _reirsEnvironmentInfo :: !(Maybe [EnvironmentInfoDescription])
-    , _reirsStatus          :: !Int
+    , _reirsResponseStatus  :: !Int
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'RetrieveEnvironmentInfoResponse' with the minimum fields required to make a request.
@@ -147,14 +147,14 @@
 --
 -- * 'reirsEnvironmentInfo'
 --
--- * 'reirsStatus'
+-- * 'reirsResponseStatus'
 retrieveEnvironmentInfoResponse
-    :: Int -- ^ 'reirsStatus'
+    :: Int -- ^ 'reirsResponseStatus'
     -> RetrieveEnvironmentInfoResponse
-retrieveEnvironmentInfoResponse pStatus_ =
+retrieveEnvironmentInfoResponse pResponseStatus_ =
     RetrieveEnvironmentInfoResponse'
     { _reirsEnvironmentInfo = Nothing
-    , _reirsStatus = pStatus_
+    , _reirsResponseStatus = pResponseStatus_
     }
 
 -- | The EnvironmentInfoDescription of the environment.
@@ -162,5 +162,5 @@
 reirsEnvironmentInfo = lens _reirsEnvironmentInfo (\ s a -> s{_reirsEnvironmentInfo = a}) . _Default . _Coerce;
 
 -- | The response status code.
-reirsStatus :: Lens' RetrieveEnvironmentInfoResponse Int
-reirsStatus = lens _reirsStatus (\ s a -> s{_reirsStatus = a});
+reirsResponseStatus :: Lens' RetrieveEnvironmentInfoResponse Int
+reirsResponseStatus = lens _reirsResponseStatus (\ s a -> s{_reirsResponseStatus = a});
diff --git a/gen/Network/AWS/ElasticBeanstalk/TerminateEnvironment.hs b/gen/Network/AWS/ElasticBeanstalk/TerminateEnvironment.hs
--- a/gen/Network/AWS/ElasticBeanstalk/TerminateEnvironment.hs
+++ b/gen/Network/AWS/ElasticBeanstalk/TerminateEnvironment.hs
@@ -35,22 +35,22 @@
     , environmentDescription
     , EnvironmentDescription
     -- * Response Lenses
-    , eCNAME
     , eStatus
+    , eCNAME
     , eTemplateName
     , eAbortableOperationInProgress
     , eEndpointURL
-    , eDateUpdated
     , eResources
+    , eDateUpdated
+    , eDateCreated
     , eHealth
     , eVersionLabel
-    , eDateCreated
     , eTier
     , eEnvironmentName
     , eApplicationName
-    , eHealthStatus
-    , eEnvironmentId
     , eSolutionStackName
+    , eEnvironmentId
+    , eHealthStatus
     , eDescription
     ) where
 
diff --git a/gen/Network/AWS/ElasticBeanstalk/Types.hs b/gen/Network/AWS/ElasticBeanstalk/Types.hs
--- a/gen/Network/AWS/ElasticBeanstalk/Types.hs
+++ b/gen/Network/AWS/ElasticBeanstalk/Types.hs
@@ -17,13 +17,13 @@
 
     -- * Errors
     , _InvalidRequestException
-    , _S3SubscriptionRequiredException
     , _TooManyBucketsException
+    , _S3SubscriptionRequiredException
     , _OperationInProgressException
-    , _TooManyConfigurationTemplatesException
     , _TooManyApplicationVersionsException
-    , _ElasticBeanstalkServiceException
+    , _TooManyConfigurationTemplatesException
     , _InsufficientPrivilegesException
+    , _ElasticBeanstalkServiceException
     , _TooManyApplicationsException
     , _SourceBundleDeletionException
     , _S3LocationNotInServiceRegionException
@@ -62,8 +62,8 @@
     -- * ApplicationDescription
     , ApplicationDescription
     , applicationDescription
-    , adDateUpdated
     , adVersions
+    , adDateUpdated
     , adDateCreated
     , adApplicationName
     , adConfigurationTemplates
@@ -85,10 +85,10 @@
     -- * ApplicationVersionDescription
     , ApplicationVersionDescription
     , applicationVersionDescription
-    , avdDateUpdated
     , avdSourceBundle
-    , avdVersionLabel
+    , avdDateUpdated
     , avdDateCreated
+    , avdVersionLabel
     , avdApplicationName
     , avdDescription
 
@@ -105,8 +105,8 @@
     -- * CPUUtilization
     , CPUUtilization
     , cpuUtilization
-    , cuIdle
     , cuSoftIRQ
+    , cuIdle
     , cuIRQ
     , cuSystem
     , cuUser
@@ -118,10 +118,10 @@
     , configurationOptionDescription
     , codMaxValue
     , codRegex
-    , codUserDefined
     , codMaxLength
-    , codValueOptions
+    , codUserDefined
     , codNamespace
+    , codValueOptions
     , codName
     , codChangeSeverity
     , codDefaultValue
@@ -133,8 +133,8 @@
     , configurationOptionSetting
     , cosOptionName
     , cosResourceName
-    , cosValue
     , cosNamespace
+    , cosValue
 
     -- * ConfigurationSettingsDescription
     , ConfigurationSettingsDescription
@@ -152,22 +152,22 @@
     -- * EnvironmentDescription
     , EnvironmentDescription
     , environmentDescription
-    , eCNAME
     , eStatus
+    , eCNAME
     , eTemplateName
     , eAbortableOperationInProgress
     , eEndpointURL
-    , eDateUpdated
     , eResources
+    , eDateUpdated
+    , eDateCreated
     , eHealth
     , eVersionLabel
-    , eDateCreated
     , eTier
     , eEnvironmentName
     , eApplicationName
-    , eHealthStatus
-    , eEnvironmentId
     , eSolutionStackName
+    , eEnvironmentId
+    , eHealthStatus
     , eDescription
 
     -- * EnvironmentInfoDescription
@@ -184,8 +184,8 @@
     , erdQueues
     , erdTriggers
     , erdLoadBalancers
-    , erdInstances
     , erdEnvironmentName
+    , erdInstances
     , erdLaunchConfigurations
     , erdAutoScalingGroups
 
@@ -295,9 +295,9 @@
     , singleInstanceHealth
     , sihInstanceId
     , sihCauses
+    , sihSystem
     , sihApplicationMetrics
     , sihColor
-    , sihSystem
     , sihHealthStatus
     , sihLaunchedAt
 
@@ -388,46 +388,46 @@
 _InvalidRequestException =
     _ServiceError . hasStatus 400 . hasCode "InvalidRequestException"
 
--- | The caller does not have a subscription to Amazon S3.
-_S3SubscriptionRequiredException :: AsError a => Getting (First ServiceError) a ServiceError
-_S3SubscriptionRequiredException =
-    _ServiceError . hasStatus 400 . hasCode "S3SubscriptionRequiredException"
-
 -- | The web service attempted to create a bucket in an Amazon S3 account
 -- that already has 100 buckets.
 _TooManyBucketsException :: AsError a => Getting (First ServiceError) a ServiceError
 _TooManyBucketsException =
     _ServiceError . hasStatus 400 . hasCode "TooManyBucketsException"
 
+-- | The caller does not have a subscription to Amazon S3.
+_S3SubscriptionRequiredException :: AsError a => Getting (First ServiceError) a ServiceError
+_S3SubscriptionRequiredException =
+    _ServiceError . hasStatus 400 . hasCode "S3SubscriptionRequiredException"
+
 -- | Unable to perform the specified operation because another operation is
 -- already in progress affecting an element in this activity.
 _OperationInProgressException :: AsError a => Getting (First ServiceError) a ServiceError
 _OperationInProgressException =
     _ServiceError . hasStatus 400 . hasCode "OperationInProgressFailure"
 
--- | The caller has exceeded the limit on the number of configuration
--- templates associated with their account.
-_TooManyConfigurationTemplatesException :: AsError a => Getting (First ServiceError) a ServiceError
-_TooManyConfigurationTemplatesException =
-    _ServiceError .
-    hasStatus 400 . hasCode "TooManyConfigurationTemplatesException"
-
 -- | The caller has exceeded the limit on the number of application versions
 -- associated with their account.
 _TooManyApplicationVersionsException :: AsError a => Getting (First ServiceError) a ServiceError
 _TooManyApplicationVersionsException =
     _ServiceError . hasCode "TooManyApplicationVersionsException"
 
--- | Prism for ElasticBeanstalkServiceException' errors.
-_ElasticBeanstalkServiceException :: AsError a => Getting (First ServiceError) a ServiceError
-_ElasticBeanstalkServiceException =
-    _ServiceError . hasCode "ElasticBeanstalkServiceException"
+-- | The caller has exceeded the limit on the number of configuration
+-- templates associated with their account.
+_TooManyConfigurationTemplatesException :: AsError a => Getting (First ServiceError) a ServiceError
+_TooManyConfigurationTemplatesException =
+    _ServiceError .
+    hasStatus 400 . hasCode "TooManyConfigurationTemplatesException"
 
 -- | Unable to perform the specified operation because the user does not have
 -- enough privileges for one of more downstream aws services
 _InsufficientPrivilegesException :: AsError a => Getting (First ServiceError) a ServiceError
 _InsufficientPrivilegesException =
     _ServiceError . hasStatus 403 . hasCode "InsufficientPrivilegesException"
+
+-- | Prism for ElasticBeanstalkServiceException' errors.
+_ElasticBeanstalkServiceException :: AsError a => Getting (First ServiceError) a ServiceError
+_ElasticBeanstalkServiceException =
+    _ServiceError . hasCode "ElasticBeanstalkServiceException"
 
 -- | The caller has exceeded the limit on the number of applications
 -- associated with their account.
diff --git a/gen/Network/AWS/ElasticBeanstalk/Types/Product.hs b/gen/Network/AWS/ElasticBeanstalk/Types/Product.hs
--- a/gen/Network/AWS/ElasticBeanstalk/Types/Product.hs
+++ b/gen/Network/AWS/ElasticBeanstalk/Types/Product.hs
@@ -24,8 +24,8 @@
 --
 -- /See:/ 'applicationDescription' smart constructor.
 data ApplicationDescription = ApplicationDescription'
-    { _adDateUpdated            :: !(Maybe ISO8601)
-    , _adVersions               :: !(Maybe [Text])
+    { _adVersions               :: !(Maybe [Text])
+    , _adDateUpdated            :: !(Maybe ISO8601)
     , _adDateCreated            :: !(Maybe ISO8601)
     , _adApplicationName        :: !(Maybe Text)
     , _adConfigurationTemplates :: !(Maybe [Text])
@@ -36,10 +36,10 @@
 --
 -- Use one of the following lenses to modify other fields as desired:
 --
--- * 'adDateUpdated'
---
 -- * 'adVersions'
 --
+-- * 'adDateUpdated'
+--
 -- * 'adDateCreated'
 --
 -- * 'adApplicationName'
@@ -51,22 +51,22 @@
     :: ApplicationDescription
 applicationDescription =
     ApplicationDescription'
-    { _adDateUpdated = Nothing
-    , _adVersions = Nothing
+    { _adVersions = Nothing
+    , _adDateUpdated = Nothing
     , _adDateCreated = Nothing
     , _adApplicationName = Nothing
     , _adConfigurationTemplates = Nothing
     , _adDescription = Nothing
     }
 
--- | The date when the application was last modified.
-adDateUpdated :: Lens' ApplicationDescription (Maybe UTCTime)
-adDateUpdated = lens _adDateUpdated (\ s a -> s{_adDateUpdated = a}) . mapping _Time;
-
 -- | The names of the versions for this application.
 adVersions :: Lens' ApplicationDescription [Text]
 adVersions = lens _adVersions (\ s a -> s{_adVersions = a}) . _Default . _Coerce;
 
+-- | The date when the application was last modified.
+adDateUpdated :: Lens' ApplicationDescription (Maybe UTCTime)
+adDateUpdated = lens _adDateUpdated (\ s a -> s{_adDateUpdated = a}) . mapping _Time;
+
 -- | The date when the application was created.
 adDateCreated :: Lens' ApplicationDescription (Maybe UTCTime)
 adDateCreated = lens _adDateCreated (\ s a -> s{_adDateCreated = a}) . mapping _Time;
@@ -87,9 +87,9 @@
 instance FromXML ApplicationDescription where
         parseXML x
           = ApplicationDescription' <$>
-              (x .@? "DateUpdated") <*>
-                (x .@? "Versions" .!@ mempty >>=
-                   may (parseXMLList "member"))
+              (x .@? "Versions" .!@ mempty >>=
+                 may (parseXMLList "member"))
+                <*> (x .@? "DateUpdated")
                 <*> (x .@? "DateCreated")
                 <*> (x .@? "ApplicationName")
                 <*>
@@ -189,10 +189,10 @@
 --
 -- /See:/ 'applicationVersionDescription' smart constructor.
 data ApplicationVersionDescription = ApplicationVersionDescription'
-    { _avdDateUpdated     :: !(Maybe ISO8601)
-    , _avdSourceBundle    :: !(Maybe S3Location)
-    , _avdVersionLabel    :: !(Maybe Text)
+    { _avdSourceBundle    :: !(Maybe S3Location)
+    , _avdDateUpdated     :: !(Maybe ISO8601)
     , _avdDateCreated     :: !(Maybe ISO8601)
+    , _avdVersionLabel    :: !(Maybe Text)
     , _avdApplicationName :: !(Maybe Text)
     , _avdDescription     :: !(Maybe Text)
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
@@ -201,14 +201,14 @@
 --
 -- Use one of the following lenses to modify other fields as desired:
 --
--- * 'avdDateUpdated'
---
 -- * 'avdSourceBundle'
 --
--- * 'avdVersionLabel'
+-- * 'avdDateUpdated'
 --
 -- * 'avdDateCreated'
 --
+-- * 'avdVersionLabel'
+--
 -- * 'avdApplicationName'
 --
 -- * 'avdDescription'
@@ -216,30 +216,30 @@
     :: ApplicationVersionDescription
 applicationVersionDescription =
     ApplicationVersionDescription'
-    { _avdDateUpdated = Nothing
-    , _avdSourceBundle = Nothing
-    , _avdVersionLabel = Nothing
+    { _avdSourceBundle = Nothing
+    , _avdDateUpdated = Nothing
     , _avdDateCreated = Nothing
+    , _avdVersionLabel = Nothing
     , _avdApplicationName = Nothing
     , _avdDescription = Nothing
     }
 
--- | The last modified date of the application version.
-avdDateUpdated :: Lens' ApplicationVersionDescription (Maybe UTCTime)
-avdDateUpdated = lens _avdDateUpdated (\ s a -> s{_avdDateUpdated = a}) . mapping _Time;
-
 -- | The location where the source bundle is located for this version.
 avdSourceBundle :: Lens' ApplicationVersionDescription (Maybe S3Location)
 avdSourceBundle = lens _avdSourceBundle (\ s a -> s{_avdSourceBundle = a});
 
--- | A label uniquely identifying the version for the associated application.
-avdVersionLabel :: Lens' ApplicationVersionDescription (Maybe Text)
-avdVersionLabel = lens _avdVersionLabel (\ s a -> s{_avdVersionLabel = a});
+-- | The last modified date of the application version.
+avdDateUpdated :: Lens' ApplicationVersionDescription (Maybe UTCTime)
+avdDateUpdated = lens _avdDateUpdated (\ s a -> s{_avdDateUpdated = a}) . mapping _Time;
 
 -- | The creation date of the application version.
 avdDateCreated :: Lens' ApplicationVersionDescription (Maybe UTCTime)
 avdDateCreated = lens _avdDateCreated (\ s a -> s{_avdDateCreated = a}) . mapping _Time;
 
+-- | A label uniquely identifying the version for the associated application.
+avdVersionLabel :: Lens' ApplicationVersionDescription (Maybe Text)
+avdVersionLabel = lens _avdVersionLabel (\ s a -> s{_avdVersionLabel = a});
+
 -- | The name of the application associated with this release.
 avdApplicationName :: Lens' ApplicationVersionDescription (Maybe Text)
 avdApplicationName = lens _avdApplicationName (\ s a -> s{_avdApplicationName = a});
@@ -251,9 +251,9 @@
 instance FromXML ApplicationVersionDescription where
         parseXML x
           = ApplicationVersionDescription' <$>
-              (x .@? "DateUpdated") <*> (x .@? "SourceBundle") <*>
-                (x .@? "VersionLabel")
-                <*> (x .@? "DateCreated")
+              (x .@? "SourceBundle") <*> (x .@? "DateUpdated") <*>
+                (x .@? "DateCreated")
+                <*> (x .@? "VersionLabel")
                 <*> (x .@? "ApplicationName")
                 <*> (x .@? "Description")
 
@@ -319,8 +319,8 @@
 --
 -- /See:/ 'cpuUtilization' smart constructor.
 data CPUUtilization = CPUUtilization'
-    { _cuIdle    :: !(Maybe Double)
-    , _cuSoftIRQ :: !(Maybe Double)
+    { _cuSoftIRQ :: !(Maybe Double)
+    , _cuIdle    :: !(Maybe Double)
     , _cuIRQ     :: !(Maybe Double)
     , _cuSystem  :: !(Maybe Double)
     , _cuUser    :: !(Maybe Double)
@@ -332,10 +332,10 @@
 --
 -- Use one of the following lenses to modify other fields as desired:
 --
--- * 'cuIdle'
---
 -- * 'cuSoftIRQ'
 --
+-- * 'cuIdle'
+--
 -- * 'cuIRQ'
 --
 -- * 'cuSystem'
@@ -349,8 +349,8 @@
     :: CPUUtilization
 cpuUtilization =
     CPUUtilization'
-    { _cuIdle = Nothing
-    , _cuSoftIRQ = Nothing
+    { _cuSoftIRQ = Nothing
+    , _cuIdle = Nothing
     , _cuIRQ = Nothing
     , _cuSystem = Nothing
     , _cuUser = Nothing
@@ -358,16 +358,16 @@
     , _cuNice = Nothing
     }
 
--- | Percentage of time that the CPU has spent in the 'Idle' state over the
--- last 10 seconds.
-cuIdle :: Lens' CPUUtilization (Maybe Double)
-cuIdle = lens _cuIdle (\ s a -> s{_cuIdle = a});
-
 -- | Percentage of time that the CPU has spent in the 'SoftIRQ' state over
 -- the last 10 seconds.
 cuSoftIRQ :: Lens' CPUUtilization (Maybe Double)
 cuSoftIRQ = lens _cuSoftIRQ (\ s a -> s{_cuSoftIRQ = a});
 
+-- | Percentage of time that the CPU has spent in the 'Idle' state over the
+-- last 10 seconds.
+cuIdle :: Lens' CPUUtilization (Maybe Double)
+cuIdle = lens _cuIdle (\ s a -> s{_cuIdle = a});
+
 -- | Percentage of time that the CPU has spent in the 'IRQ' state over the
 -- last 10 seconds.
 cuIRQ :: Lens' CPUUtilization (Maybe Double)
@@ -396,7 +396,7 @@
 instance FromXML CPUUtilization where
         parseXML x
           = CPUUtilization' <$>
-              (x .@? "Idle") <*> (x .@? "SoftIRQ") <*>
+              (x .@? "SoftIRQ") <*> (x .@? "Idle") <*>
                 (x .@? "IRQ")
                 <*> (x .@? "System")
                 <*> (x .@? "User")
@@ -409,10 +409,10 @@
 data ConfigurationOptionDescription = ConfigurationOptionDescription'
     { _codMaxValue       :: !(Maybe Int)
     , _codRegex          :: !(Maybe OptionRestrictionRegex)
-    , _codUserDefined    :: !(Maybe Bool)
     , _codMaxLength      :: !(Maybe Int)
-    , _codValueOptions   :: !(Maybe [Text])
+    , _codUserDefined    :: !(Maybe Bool)
     , _codNamespace      :: !(Maybe Text)
+    , _codValueOptions   :: !(Maybe [Text])
     , _codName           :: !(Maybe Text)
     , _codChangeSeverity :: !(Maybe Text)
     , _codDefaultValue   :: !(Maybe Text)
@@ -428,14 +428,14 @@
 --
 -- * 'codRegex'
 --
--- * 'codUserDefined'
---
 -- * 'codMaxLength'
 --
--- * 'codValueOptions'
+-- * 'codUserDefined'
 --
 -- * 'codNamespace'
 --
+-- * 'codValueOptions'
+--
 -- * 'codName'
 --
 -- * 'codChangeSeverity'
@@ -451,10 +451,10 @@
     ConfigurationOptionDescription'
     { _codMaxValue = Nothing
     , _codRegex = Nothing
-    , _codUserDefined = Nothing
     , _codMaxLength = Nothing
-    , _codValueOptions = Nothing
+    , _codUserDefined = Nothing
     , _codNamespace = Nothing
+    , _codValueOptions = Nothing
     , _codName = Nothing
     , _codChangeSeverity = Nothing
     , _codDefaultValue = Nothing
@@ -472,6 +472,11 @@
 codRegex :: Lens' ConfigurationOptionDescription (Maybe OptionRestrictionRegex)
 codRegex = lens _codRegex (\ s a -> s{_codRegex = a});
 
+-- | If specified, the configuration option must be a string value no longer
+-- than this value.
+codMaxLength :: Lens' ConfigurationOptionDescription (Maybe Int)
+codMaxLength = lens _codMaxLength (\ s a -> s{_codMaxLength = a});
+
 -- | An indication of whether the user defined this configuration option:
 --
 -- 'true' : This configuration option was defined by the user. It is a
@@ -493,20 +498,15 @@
 codUserDefined :: Lens' ConfigurationOptionDescription (Maybe Bool)
 codUserDefined = lens _codUserDefined (\ s a -> s{_codUserDefined = a});
 
--- | If specified, the configuration option must be a string value no longer
--- than this value.
-codMaxLength :: Lens' ConfigurationOptionDescription (Maybe Int)
-codMaxLength = lens _codMaxLength (\ s a -> s{_codMaxLength = a});
+-- | A unique namespace identifying the option\'s associated AWS resource.
+codNamespace :: Lens' ConfigurationOptionDescription (Maybe Text)
+codNamespace = lens _codNamespace (\ s a -> s{_codNamespace = a});
 
 -- | If specified, values for the configuration option are selected from this
 -- list.
 codValueOptions :: Lens' ConfigurationOptionDescription [Text]
 codValueOptions = lens _codValueOptions (\ s a -> s{_codValueOptions = a}) . _Default . _Coerce;
 
--- | A unique namespace identifying the option\'s associated AWS resource.
-codNamespace :: Lens' ConfigurationOptionDescription (Maybe Text)
-codNamespace = lens _codNamespace (\ s a -> s{_codNamespace = a});
-
 -- | The name of the configuration option.
 codName :: Lens' ConfigurationOptionDescription (Maybe Text)
 codName = lens _codName (\ s a -> s{_codName = a});
@@ -576,12 +576,12 @@
         parseXML x
           = ConfigurationOptionDescription' <$>
               (x .@? "MaxValue") <*> (x .@? "Regex") <*>
-                (x .@? "UserDefined")
-                <*> (x .@? "MaxLength")
+                (x .@? "MaxLength")
+                <*> (x .@? "UserDefined")
+                <*> (x .@? "Namespace")
                 <*>
                 (x .@? "ValueOptions" .!@ mempty >>=
                    may (parseXMLList "member"))
-                <*> (x .@? "Namespace")
                 <*> (x .@? "Name")
                 <*> (x .@? "ChangeSeverity")
                 <*> (x .@? "DefaultValue")
@@ -597,8 +597,8 @@
 data ConfigurationOptionSetting = ConfigurationOptionSetting'
     { _cosOptionName   :: !(Maybe Text)
     , _cosResourceName :: !(Maybe Text)
-    , _cosValue        :: !(Maybe Text)
     , _cosNamespace    :: !(Maybe Text)
+    , _cosValue        :: !(Maybe Text)
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'ConfigurationOptionSetting' with the minimum fields required to make a request.
@@ -609,17 +609,17 @@
 --
 -- * 'cosResourceName'
 --
--- * 'cosValue'
---
 -- * 'cosNamespace'
+--
+-- * 'cosValue'
 configurationOptionSetting
     :: ConfigurationOptionSetting
 configurationOptionSetting =
     ConfigurationOptionSetting'
     { _cosOptionName = Nothing
     , _cosResourceName = Nothing
-    , _cosValue = Nothing
     , _cosNamespace = Nothing
+    , _cosValue = Nothing
     }
 
 -- | The name of the configuration option.
@@ -630,27 +630,27 @@
 cosResourceName :: Lens' ConfigurationOptionSetting (Maybe Text)
 cosResourceName = lens _cosResourceName (\ s a -> s{_cosResourceName = a});
 
--- | The current value for the configuration option.
-cosValue :: Lens' ConfigurationOptionSetting (Maybe Text)
-cosValue = lens _cosValue (\ s a -> s{_cosValue = a});
-
 -- | A unique namespace identifying the option\'s associated AWS resource.
 cosNamespace :: Lens' ConfigurationOptionSetting (Maybe Text)
 cosNamespace = lens _cosNamespace (\ s a -> s{_cosNamespace = a});
 
+-- | The current value for the configuration option.
+cosValue :: Lens' ConfigurationOptionSetting (Maybe Text)
+cosValue = lens _cosValue (\ s a -> s{_cosValue = a});
+
 instance FromXML ConfigurationOptionSetting where
         parseXML x
           = ConfigurationOptionSetting' <$>
               (x .@? "OptionName") <*> (x .@? "ResourceName") <*>
-                (x .@? "Value")
-                <*> (x .@? "Namespace")
+                (x .@? "Namespace")
+                <*> (x .@? "Value")
 
 instance ToQuery ConfigurationOptionSetting where
         toQuery ConfigurationOptionSetting'{..}
           = mconcat
               ["OptionName" =: _cosOptionName,
                "ResourceName" =: _cosResourceName,
-               "Value" =: _cosValue, "Namespace" =: _cosNamespace]
+               "Namespace" =: _cosNamespace, "Value" =: _cosValue]
 
 -- | Describes the settings for a configuration set.
 --
@@ -782,22 +782,22 @@
 --
 -- /See:/ 'environmentDescription' smart constructor.
 data EnvironmentDescription = EnvironmentDescription'
-    { _eCNAME                        :: !(Maybe Text)
-    , _eStatus                       :: !(Maybe EnvironmentStatus)
+    { _eStatus                       :: !(Maybe EnvironmentStatus)
+    , _eCNAME                        :: !(Maybe Text)
     , _eTemplateName                 :: !(Maybe Text)
     , _eAbortableOperationInProgress :: !(Maybe Bool)
     , _eEndpointURL                  :: !(Maybe Text)
-    , _eDateUpdated                  :: !(Maybe ISO8601)
     , _eResources                    :: !(Maybe EnvironmentResourcesDescription)
+    , _eDateUpdated                  :: !(Maybe ISO8601)
+    , _eDateCreated                  :: !(Maybe ISO8601)
     , _eHealth                       :: !(Maybe EnvironmentHealth)
     , _eVersionLabel                 :: !(Maybe Text)
-    , _eDateCreated                  :: !(Maybe ISO8601)
     , _eTier                         :: !(Maybe EnvironmentTier)
     , _eEnvironmentName              :: !(Maybe Text)
     , _eApplicationName              :: !(Maybe Text)
-    , _eHealthStatus                 :: !(Maybe EnvironmentHealthStatus)
-    , _eEnvironmentId                :: !(Maybe Text)
     , _eSolutionStackName            :: !(Maybe Text)
+    , _eEnvironmentId                :: !(Maybe Text)
+    , _eHealthStatus                 :: !(Maybe EnvironmentHealthStatus)
     , _eDescription                  :: !(Maybe Text)
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
@@ -805,66 +805,62 @@
 --
 -- Use one of the following lenses to modify other fields as desired:
 --
--- * 'eCNAME'
---
 -- * 'eStatus'
 --
+-- * 'eCNAME'
+--
 -- * 'eTemplateName'
 --
 -- * 'eAbortableOperationInProgress'
 --
 -- * 'eEndpointURL'
 --
+-- * 'eResources'
+--
 -- * 'eDateUpdated'
 --
--- * 'eResources'
+-- * 'eDateCreated'
 --
 -- * 'eHealth'
 --
 -- * 'eVersionLabel'
 --
--- * 'eDateCreated'
---
 -- * 'eTier'
 --
 -- * 'eEnvironmentName'
 --
 -- * 'eApplicationName'
 --
--- * 'eHealthStatus'
+-- * 'eSolutionStackName'
 --
 -- * 'eEnvironmentId'
 --
--- * 'eSolutionStackName'
+-- * 'eHealthStatus'
 --
 -- * 'eDescription'
 environmentDescription
     :: EnvironmentDescription
 environmentDescription =
     EnvironmentDescription'
-    { _eCNAME = Nothing
-    , _eStatus = Nothing
+    { _eStatus = Nothing
+    , _eCNAME = Nothing
     , _eTemplateName = Nothing
     , _eAbortableOperationInProgress = Nothing
     , _eEndpointURL = Nothing
-    , _eDateUpdated = Nothing
     , _eResources = Nothing
+    , _eDateUpdated = Nothing
+    , _eDateCreated = Nothing
     , _eHealth = Nothing
     , _eVersionLabel = Nothing
-    , _eDateCreated = Nothing
     , _eTier = Nothing
     , _eEnvironmentName = Nothing
     , _eApplicationName = Nothing
-    , _eHealthStatus = Nothing
-    , _eEnvironmentId = Nothing
     , _eSolutionStackName = Nothing
+    , _eEnvironmentId = Nothing
+    , _eHealthStatus = Nothing
     , _eDescription = Nothing
     }
 
--- | The URL to the CNAME for this environment.
-eCNAME :: Lens' EnvironmentDescription (Maybe Text)
-eCNAME = lens _eCNAME (\ s a -> s{_eCNAME = a});
-
 -- | The current operational status of the environment:
 --
 -- -   'Launching': Environment is in the process of initial deployment.
@@ -877,6 +873,10 @@
 eStatus :: Lens' EnvironmentDescription (Maybe EnvironmentStatus)
 eStatus = lens _eStatus (\ s a -> s{_eStatus = a});
 
+-- | The URL to the CNAME for this environment.
+eCNAME :: Lens' EnvironmentDescription (Maybe Text)
+eCNAME = lens _eCNAME (\ s a -> s{_eCNAME = a});
+
 -- | The name of the configuration template used to originally launch this
 -- environment.
 eTemplateName :: Lens' EnvironmentDescription (Maybe Text)
@@ -897,13 +897,17 @@
 eEndpointURL :: Lens' EnvironmentDescription (Maybe Text)
 eEndpointURL = lens _eEndpointURL (\ s a -> s{_eEndpointURL = a});
 
+-- | The description of the AWS resources used by this environment.
+eResources :: Lens' EnvironmentDescription (Maybe EnvironmentResourcesDescription)
+eResources = lens _eResources (\ s a -> s{_eResources = a});
+
 -- | The last modified date for this environment.
 eDateUpdated :: Lens' EnvironmentDescription (Maybe UTCTime)
 eDateUpdated = lens _eDateUpdated (\ s a -> s{_eDateUpdated = a}) . mapping _Time;
 
--- | The description of the AWS resources used by this environment.
-eResources :: Lens' EnvironmentDescription (Maybe EnvironmentResourcesDescription)
-eResources = lens _eResources (\ s a -> s{_eResources = a});
+-- | The creation date for this environment.
+eDateCreated :: Lens' EnvironmentDescription (Maybe UTCTime)
+eDateCreated = lens _eDateCreated (\ s a -> s{_eDateCreated = a}) . mapping _Time;
 
 -- | Describes the health status of the environment. AWS Elastic Beanstalk
 -- indicates the failure levels for a running environment:
@@ -933,10 +937,6 @@
 eVersionLabel :: Lens' EnvironmentDescription (Maybe Text)
 eVersionLabel = lens _eVersionLabel (\ s a -> s{_eVersionLabel = a});
 
--- | The creation date for this environment.
-eDateCreated :: Lens' EnvironmentDescription (Maybe UTCTime)
-eDateCreated = lens _eDateCreated (\ s a -> s{_eDateCreated = a}) . mapping _Time;
-
 -- | Describes the current tier of this environment.
 eTier :: Lens' EnvironmentDescription (Maybe EnvironmentTier)
 eTier = lens _eTier (\ s a -> s{_eTier = a});
@@ -949,19 +949,19 @@
 eApplicationName :: Lens' EnvironmentDescription (Maybe Text)
 eApplicationName = lens _eApplicationName (\ s a -> s{_eApplicationName = a});
 
--- | Returns the health status of the application running in your
--- environment. For more information, see
--- <http://docs.aws.amazon.com/elasticbeanstalk/latest/dg/health-enhanced-status.html Health Colors and Statuses>.
-eHealthStatus :: Lens' EnvironmentDescription (Maybe EnvironmentHealthStatus)
-eHealthStatus = lens _eHealthStatus (\ s a -> s{_eHealthStatus = a});
+-- | The name of the 'SolutionStack' deployed with this environment.
+eSolutionStackName :: Lens' EnvironmentDescription (Maybe Text)
+eSolutionStackName = lens _eSolutionStackName (\ s a -> s{_eSolutionStackName = a});
 
 -- | The ID of this environment.
 eEnvironmentId :: Lens' EnvironmentDescription (Maybe Text)
 eEnvironmentId = lens _eEnvironmentId (\ s a -> s{_eEnvironmentId = a});
 
--- | The name of the 'SolutionStack' deployed with this environment.
-eSolutionStackName :: Lens' EnvironmentDescription (Maybe Text)
-eSolutionStackName = lens _eSolutionStackName (\ s a -> s{_eSolutionStackName = a});
+-- | Returns the health status of the application running in your
+-- environment. For more information, see
+-- <http://docs.aws.amazon.com/elasticbeanstalk/latest/dg/health-enhanced-status.html Health Colors and Statuses>.
+eHealthStatus :: Lens' EnvironmentDescription (Maybe EnvironmentHealthStatus)
+eHealthStatus = lens _eHealthStatus (\ s a -> s{_eHealthStatus = a});
 
 -- | Describes this environment.
 eDescription :: Lens' EnvironmentDescription (Maybe Text)
@@ -970,21 +970,21 @@
 instance FromXML EnvironmentDescription where
         parseXML x
           = EnvironmentDescription' <$>
-              (x .@? "CNAME") <*> (x .@? "Status") <*>
+              (x .@? "Status") <*> (x .@? "CNAME") <*>
                 (x .@? "TemplateName")
                 <*> (x .@? "AbortableOperationInProgress")
                 <*> (x .@? "EndpointURL")
-                <*> (x .@? "DateUpdated")
                 <*> (x .@? "Resources")
+                <*> (x .@? "DateUpdated")
+                <*> (x .@? "DateCreated")
                 <*> (x .@? "Health")
                 <*> (x .@? "VersionLabel")
-                <*> (x .@? "DateCreated")
                 <*> (x .@? "Tier")
                 <*> (x .@? "EnvironmentName")
                 <*> (x .@? "ApplicationName")
-                <*> (x .@? "HealthStatus")
-                <*> (x .@? "EnvironmentId")
                 <*> (x .@? "SolutionStackName")
+                <*> (x .@? "EnvironmentId")
+                <*> (x .@? "HealthStatus")
                 <*> (x .@? "Description")
 
 -- | The information retrieved from the Amazon EC2 instances.
@@ -1049,8 +1049,8 @@
     { _erdQueues               :: !(Maybe [Queue])
     , _erdTriggers             :: !(Maybe [Trigger])
     , _erdLoadBalancers        :: !(Maybe [LoadBalancer])
-    , _erdInstances            :: !(Maybe [Instance])
     , _erdEnvironmentName      :: !(Maybe Text)
+    , _erdInstances            :: !(Maybe [Instance])
     , _erdLaunchConfigurations :: !(Maybe [LaunchConfiguration])
     , _erdAutoScalingGroups    :: !(Maybe [AutoScalingGroup])
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
@@ -1065,10 +1065,10 @@
 --
 -- * 'erdLoadBalancers'
 --
--- * 'erdInstances'
---
 -- * 'erdEnvironmentName'
 --
+-- * 'erdInstances'
+--
 -- * 'erdLaunchConfigurations'
 --
 -- * 'erdAutoScalingGroups'
@@ -1079,8 +1079,8 @@
     { _erdQueues = Nothing
     , _erdTriggers = Nothing
     , _erdLoadBalancers = Nothing
-    , _erdInstances = Nothing
     , _erdEnvironmentName = Nothing
+    , _erdInstances = Nothing
     , _erdLaunchConfigurations = Nothing
     , _erdAutoScalingGroups = Nothing
     }
@@ -1097,14 +1097,14 @@
 erdLoadBalancers :: Lens' EnvironmentResourceDescription [LoadBalancer]
 erdLoadBalancers = lens _erdLoadBalancers (\ s a -> s{_erdLoadBalancers = a}) . _Default . _Coerce;
 
--- | The Amazon EC2 instances used by this environment.
-erdInstances :: Lens' EnvironmentResourceDescription [Instance]
-erdInstances = lens _erdInstances (\ s a -> s{_erdInstances = a}) . _Default . _Coerce;
-
 -- | The name of the environment.
 erdEnvironmentName :: Lens' EnvironmentResourceDescription (Maybe Text)
 erdEnvironmentName = lens _erdEnvironmentName (\ s a -> s{_erdEnvironmentName = a});
 
+-- | The Amazon EC2 instances used by this environment.
+erdInstances :: Lens' EnvironmentResourceDescription [Instance]
+erdInstances = lens _erdInstances (\ s a -> s{_erdInstances = a}) . _Default . _Coerce;
+
 -- | The Auto Scaling launch configurations in use by this environment.
 erdLaunchConfigurations :: Lens' EnvironmentResourceDescription [LaunchConfiguration]
 erdLaunchConfigurations = lens _erdLaunchConfigurations (\ s a -> s{_erdLaunchConfigurations = a}) . _Default . _Coerce;
@@ -1124,10 +1124,10 @@
                 <*>
                 (x .@? "LoadBalancers" .!@ mempty >>=
                    may (parseXMLList "member"))
+                <*> (x .@? "EnvironmentName")
                 <*>
                 (x .@? "Instances" .!@ mempty >>=
                    may (parseXMLList "member"))
-                <*> (x .@? "EnvironmentName")
                 <*>
                 (x .@? "LaunchConfigurations" .!@ mempty >>=
                    may (parseXMLList "member"))
@@ -1832,9 +1832,9 @@
 data SingleInstanceHealth = SingleInstanceHealth'
     { _sihInstanceId         :: !(Maybe Text)
     , _sihCauses             :: !(Maybe [Text])
+    , _sihSystem             :: !(Maybe SystemStatus)
     , _sihApplicationMetrics :: !(Maybe ApplicationMetrics)
     , _sihColor              :: !(Maybe Text)
-    , _sihSystem             :: !(Maybe SystemStatus)
     , _sihHealthStatus       :: !(Maybe Text)
     , _sihLaunchedAt         :: !(Maybe ISO8601)
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
@@ -1847,12 +1847,12 @@
 --
 -- * 'sihCauses'
 --
+-- * 'sihSystem'
+--
 -- * 'sihApplicationMetrics'
 --
 -- * 'sihColor'
 --
--- * 'sihSystem'
---
 -- * 'sihHealthStatus'
 --
 -- * 'sihLaunchedAt'
@@ -1862,9 +1862,9 @@
     SingleInstanceHealth'
     { _sihInstanceId = Nothing
     , _sihCauses = Nothing
+    , _sihSystem = Nothing
     , _sihApplicationMetrics = Nothing
     , _sihColor = Nothing
-    , _sihSystem = Nothing
     , _sihHealthStatus = Nothing
     , _sihLaunchedAt = Nothing
     }
@@ -1879,6 +1879,10 @@
 sihCauses = lens _sihCauses (\ s a -> s{_sihCauses = a}) . _Default . _Coerce;
 
 -- | Undocumented member.
+sihSystem :: Lens' SingleInstanceHealth (Maybe SystemStatus)
+sihSystem = lens _sihSystem (\ s a -> s{_sihSystem = a});
+
+-- | Undocumented member.
 sihApplicationMetrics :: Lens' SingleInstanceHealth (Maybe ApplicationMetrics)
 sihApplicationMetrics = lens _sihApplicationMetrics (\ s a -> s{_sihApplicationMetrics = a});
 
@@ -1888,10 +1892,6 @@
 sihColor :: Lens' SingleInstanceHealth (Maybe Text)
 sihColor = lens _sihColor (\ s a -> s{_sihColor = a});
 
--- | Undocumented member.
-sihSystem :: Lens' SingleInstanceHealth (Maybe SystemStatus)
-sihSystem = lens _sihSystem (\ s a -> s{_sihSystem = a});
-
 -- | Returns the health status of the specified instance. For more
 -- information, see
 -- <http://docs.aws.amazon.com/elasticbeanstalk/latest/dg/health-enhanced-status.html >.
@@ -1908,9 +1908,9 @@
               (x .@? "InstanceId") <*>
                 (x .@? "Causes" .!@ mempty >>=
                    may (parseXMLList "member"))
+                <*> (x .@? "System")
                 <*> (x .@? "ApplicationMetrics")
                 <*> (x .@? "Color")
-                <*> (x .@? "System")
                 <*> (x .@? "HealthStatus")
                 <*> (x .@? "LaunchedAt")
 
diff --git a/gen/Network/AWS/ElasticBeanstalk/UpdateEnvironment.hs b/gen/Network/AWS/ElasticBeanstalk/UpdateEnvironment.hs
--- a/gen/Network/AWS/ElasticBeanstalk/UpdateEnvironment.hs
+++ b/gen/Network/AWS/ElasticBeanstalk/UpdateEnvironment.hs
@@ -45,30 +45,30 @@
     , ueVersionLabel
     , ueTier
     , ueEnvironmentName
-    , ueEnvironmentId
     , ueSolutionStackName
+    , ueEnvironmentId
     , ueDescription
 
     -- * Destructuring the Response
     , environmentDescription
     , EnvironmentDescription
     -- * Response Lenses
-    , eCNAME
     , eStatus
+    , eCNAME
     , eTemplateName
     , eAbortableOperationInProgress
     , eEndpointURL
-    , eDateUpdated
     , eResources
+    , eDateUpdated
+    , eDateCreated
     , eHealth
     , eVersionLabel
-    , eDateCreated
     , eTier
     , eEnvironmentName
     , eApplicationName
-    , eHealthStatus
-    , eEnvironmentId
     , eSolutionStackName
+    , eEnvironmentId
+    , eHealthStatus
     , eDescription
     ) where
 
@@ -88,8 +88,8 @@
     , _ueVersionLabel      :: !(Maybe Text)
     , _ueTier              :: !(Maybe EnvironmentTier)
     , _ueEnvironmentName   :: !(Maybe Text)
-    , _ueEnvironmentId     :: !(Maybe Text)
     , _ueSolutionStackName :: !(Maybe Text)
+    , _ueEnvironmentId     :: !(Maybe Text)
     , _ueDescription       :: !(Maybe Text)
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
@@ -109,10 +109,10 @@
 --
 -- * 'ueEnvironmentName'
 --
--- * 'ueEnvironmentId'
---
 -- * 'ueSolutionStackName'
 --
+-- * 'ueEnvironmentId'
+--
 -- * 'ueDescription'
 updateEnvironment
     :: UpdateEnvironment
@@ -124,8 +124,8 @@
     , _ueVersionLabel = Nothing
     , _ueTier = Nothing
     , _ueEnvironmentName = Nothing
-    , _ueEnvironmentId = Nothing
     , _ueSolutionStackName = Nothing
+    , _ueEnvironmentId = Nothing
     , _ueDescription = Nothing
     }
 
@@ -169,6 +169,11 @@
 ueEnvironmentName :: Lens' UpdateEnvironment (Maybe Text)
 ueEnvironmentName = lens _ueEnvironmentName (\ s a -> s{_ueEnvironmentName = a});
 
+-- | This specifies the platform version that the environment will run after
+-- the environment is updated.
+ueSolutionStackName :: Lens' UpdateEnvironment (Maybe Text)
+ueSolutionStackName = lens _ueSolutionStackName (\ s a -> s{_ueSolutionStackName = a});
+
 -- | The ID of the environment to update.
 --
 -- If no environment with this ID exists, AWS Elastic Beanstalk returns an
@@ -180,11 +185,6 @@
 ueEnvironmentId :: Lens' UpdateEnvironment (Maybe Text)
 ueEnvironmentId = lens _ueEnvironmentId (\ s a -> s{_ueEnvironmentId = a});
 
--- | This specifies the platform version that the environment will run after
--- the environment is updated.
-ueSolutionStackName :: Lens' UpdateEnvironment (Maybe Text)
-ueSolutionStackName = lens _ueSolutionStackName (\ s a -> s{_ueSolutionStackName = a});
-
 -- | If this parameter is specified, AWS Elastic Beanstalk updates the
 -- description of this environment.
 ueDescription :: Lens' UpdateEnvironment (Maybe Text)
@@ -216,6 +216,6 @@
                  toQuery (toQueryList "member" <$> _ueOptionSettings),
                "VersionLabel" =: _ueVersionLabel, "Tier" =: _ueTier,
                "EnvironmentName" =: _ueEnvironmentName,
-               "EnvironmentId" =: _ueEnvironmentId,
                "SolutionStackName" =: _ueSolutionStackName,
+               "EnvironmentId" =: _ueEnvironmentId,
                "Description" =: _ueDescription]
diff --git a/gen/Network/AWS/ElasticBeanstalk/ValidateConfigurationSettings.hs b/gen/Network/AWS/ElasticBeanstalk/ValidateConfigurationSettings.hs
--- a/gen/Network/AWS/ElasticBeanstalk/ValidateConfigurationSettings.hs
+++ b/gen/Network/AWS/ElasticBeanstalk/ValidateConfigurationSettings.hs
@@ -41,7 +41,7 @@
     , ValidateConfigurationSettingsResponse
     -- * Response Lenses
     , vcsrsMessages
-    , vcsrsStatus
+    , vcsrsResponseStatus
     ) where
 
 import           Network.AWS.ElasticBeanstalk.Types
@@ -141,8 +141,8 @@
 --
 -- /See:/ 'validateConfigurationSettingsResponse' smart constructor.
 data ValidateConfigurationSettingsResponse = ValidateConfigurationSettingsResponse'
-    { _vcsrsMessages :: !(Maybe [ValidationMessage])
-    , _vcsrsStatus   :: !Int
+    { _vcsrsMessages       :: !(Maybe [ValidationMessage])
+    , _vcsrsResponseStatus :: !Int
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'ValidateConfigurationSettingsResponse' with the minimum fields required to make a request.
@@ -151,14 +151,14 @@
 --
 -- * 'vcsrsMessages'
 --
--- * 'vcsrsStatus'
+-- * 'vcsrsResponseStatus'
 validateConfigurationSettingsResponse
-    :: Int -- ^ 'vcsrsStatus'
+    :: Int -- ^ 'vcsrsResponseStatus'
     -> ValidateConfigurationSettingsResponse
-validateConfigurationSettingsResponse pStatus_ =
+validateConfigurationSettingsResponse pResponseStatus_ =
     ValidateConfigurationSettingsResponse'
     { _vcsrsMessages = Nothing
-    , _vcsrsStatus = pStatus_
+    , _vcsrsResponseStatus = pResponseStatus_
     }
 
 -- | A list of ValidationMessage.
@@ -166,5 +166,5 @@
 vcsrsMessages = lens _vcsrsMessages (\ s a -> s{_vcsrsMessages = a}) . _Default . _Coerce;
 
 -- | The response status code.
-vcsrsStatus :: Lens' ValidateConfigurationSettingsResponse Int
-vcsrsStatus = lens _vcsrsStatus (\ s a -> s{_vcsrsStatus = a});
+vcsrsResponseStatus :: Lens' ValidateConfigurationSettingsResponse Int
+vcsrsResponseStatus = lens _vcsrsResponseStatus (\ s a -> s{_vcsrsResponseStatus = a});
diff --git a/test/Test/AWS/Gen/ElasticBeanstalk.hs b/test/Test/AWS/Gen/ElasticBeanstalk.hs
--- a/test/Test/AWS/Gen/ElasticBeanstalk.hs
+++ b/test/Test/AWS/Gen/ElasticBeanstalk.hs
@@ -31,15 +31,15 @@
 --         [ testDescribeApplications $
 --             describeApplications
 --
---         , testCreateApplicationVersion $
---             createApplicationVersion
---
 --         , testUpdateEnvironment $
 --             updateEnvironment
 --
 --         , testTerminateEnvironment $
 --             terminateEnvironment
 --
+--         , testCreateApplicationVersion $
+--             createApplicationVersion
+--
 --         , testDescribeEvents $
 --             describeEvents
 --
@@ -64,21 +64,24 @@
 --         , testAbortEnvironmentUpdate $
 --             abortEnvironmentUpdate
 --
---         , testDeleteApplicationVersion $
---             deleteApplicationVersion
+--         , testDeleteConfigurationTemplate $
+--             deleteConfigurationTemplate
 --
---         , testUpdateApplicationVersion $
---             updateApplicationVersion
+--         , testUpdateConfigurationTemplate $
+--             updateConfigurationTemplate
 --
 --         , testDescribeEnvironmentResources $
 --             describeEnvironmentResources
 --
---         , testDeleteConfigurationTemplate $
---             deleteConfigurationTemplate
+--         , testDeleteApplicationVersion $
+--             deleteApplicationVersion
 --
---         , testUpdateConfigurationTemplate $
---             updateConfigurationTemplate
+--         , testUpdateApplicationVersion $
+--             updateApplicationVersion
 --
+--         , testCreateConfigurationTemplate $
+--             createConfigurationTemplate
+--
 --         , testDescribeEnvironmentHealth $
 --             describeEnvironmentHealth
 --
@@ -88,39 +91,36 @@
 --         , testDeleteEnvironmentConfiguration $
 --             deleteEnvironmentConfiguration
 --
---         , testCreateConfigurationTemplate $
---             createConfigurationTemplate
+--         , testSwapEnvironmentCNAMEs $
+--             swapEnvironmentCNAMEs
 --
 --         , testListAvailableSolutionStacks $
 --             listAvailableSolutionStacks
 --
---         , testSwapEnvironmentCNAMEs $
---             swapEnvironmentCNAMEs
---
 --         , testDescribeConfigurationOptions $
 --             describeConfigurationOptions
 --
---         , testDescribeConfigurationSettings $
---             describeConfigurationSettings
---
 --         , testCreateStorageLocation $
 --             createStorageLocation
 --
---         , testDescribeEnvironments $
---             describeEnvironments
---
---         , testRestartAppServer $
---             restartAppServer
+--         , testDescribeConfigurationSettings $
+--             describeConfigurationSettings
 --
 --         , testValidateConfigurationSettings $
 --             validateConfigurationSettings
 --
---         , testDescribeApplicationVersions $
---             describeApplicationVersions
+--         , testRestartAppServer $
+--             restartAppServer
 --
+--         , testDescribeEnvironments $
+--             describeEnvironments
+--
 --         , testCheckDNSAvailability $
 --             checkDNSAvailability
 --
+--         , testDescribeApplicationVersions $
+--             describeApplicationVersions
+--
 --         , testCreateEnvironment $
 --             createEnvironment
 --
@@ -130,15 +130,15 @@
 --         [ testDescribeApplicationsResponse $
 --             describeApplicationsResponse
 --
---         , testCreateApplicationVersionResponse $
---             applicationVersionDescriptionMessage
---
 --         , testUpdateEnvironmentResponse $
 --             environmentDescription
 --
 --         , testTerminateEnvironmentResponse $
 --             environmentDescription
 --
+--         , testCreateApplicationVersionResponse $
+--             applicationVersionDescriptionMessage
+--
 --         , testDescribeEventsResponse $
 --             describeEventsResponse
 --
@@ -163,19 +163,22 @@
 --         , testAbortEnvironmentUpdateResponse $
 --             abortEnvironmentUpdateResponse
 --
---         , testDeleteApplicationVersionResponse $
---             deleteApplicationVersionResponse
+--         , testDeleteConfigurationTemplateResponse $
+--             deleteConfigurationTemplateResponse
 --
---         , testUpdateApplicationVersionResponse $
---             applicationVersionDescriptionMessage
+--         , testUpdateConfigurationTemplateResponse $
+--             configurationSettingsDescription
 --
 --         , testDescribeEnvironmentResourcesResponse $
 --             describeEnvironmentResourcesResponse
 --
---         , testDeleteConfigurationTemplateResponse $
---             deleteConfigurationTemplateResponse
+--         , testDeleteApplicationVersionResponse $
+--             deleteApplicationVersionResponse
 --
---         , testUpdateConfigurationTemplateResponse $
+--         , testUpdateApplicationVersionResponse $
+--             applicationVersionDescriptionMessage
+--
+--         , testCreateConfigurationTemplateResponse $
 --             configurationSettingsDescription
 --
 --         , testDescribeEnvironmentHealthResponse $
@@ -187,39 +190,36 @@
 --         , testDeleteEnvironmentConfigurationResponse $
 --             deleteEnvironmentConfigurationResponse
 --
---         , testCreateConfigurationTemplateResponse $
---             configurationSettingsDescription
+--         , testSwapEnvironmentCNAMEsResponse $
+--             swapEnvironmentCNAMEsResponse
 --
 --         , testListAvailableSolutionStacksResponse $
 --             listAvailableSolutionStacksResponse
 --
---         , testSwapEnvironmentCNAMEsResponse $
---             swapEnvironmentCNAMEsResponse
---
 --         , testDescribeConfigurationOptionsResponse $
 --             describeConfigurationOptionsResponse
 --
---         , testDescribeConfigurationSettingsResponse $
---             describeConfigurationSettingsResponse
---
 --         , testCreateStorageLocationResponse $
 --             createStorageLocationResponse
 --
---         , testDescribeEnvironmentsResponse $
---             describeEnvironmentsResponse
---
---         , testRestartAppServerResponse $
---             restartAppServerResponse
+--         , testDescribeConfigurationSettingsResponse $
+--             describeConfigurationSettingsResponse
 --
 --         , testValidateConfigurationSettingsResponse $
 --             validateConfigurationSettingsResponse
 --
---         , testDescribeApplicationVersionsResponse $
---             describeApplicationVersionsResponse
+--         , testRestartAppServerResponse $
+--             restartAppServerResponse
 --
+--         , testDescribeEnvironmentsResponse $
+--             describeEnvironmentsResponse
+--
 --         , testCheckDNSAvailabilityResponse $
 --             checkDNSAvailabilityResponse
 --
+--         , testDescribeApplicationVersionsResponse $
+--             describeApplicationVersionsResponse
+--
 --         , testCreateEnvironmentResponse $
 --             environmentDescription
 --
@@ -233,11 +233,6 @@
     "DescribeApplications"
     "fixture/DescribeApplications.yaml"
 
-testCreateApplicationVersion :: CreateApplicationVersion -> TestTree
-testCreateApplicationVersion = req
-    "CreateApplicationVersion"
-    "fixture/CreateApplicationVersion.yaml"
-
 testUpdateEnvironment :: UpdateEnvironment -> TestTree
 testUpdateEnvironment = req
     "UpdateEnvironment"
@@ -248,6 +243,11 @@
     "TerminateEnvironment"
     "fixture/TerminateEnvironment.yaml"
 
+testCreateApplicationVersion :: CreateApplicationVersion -> TestTree
+testCreateApplicationVersion = req
+    "CreateApplicationVersion"
+    "fixture/CreateApplicationVersion.yaml"
+
 testDescribeEvents :: DescribeEvents -> TestTree
 testDescribeEvents = req
     "DescribeEvents"
@@ -288,6 +288,21 @@
     "AbortEnvironmentUpdate"
     "fixture/AbortEnvironmentUpdate.yaml"
 
+testDeleteConfigurationTemplate :: DeleteConfigurationTemplate -> TestTree
+testDeleteConfigurationTemplate = req
+    "DeleteConfigurationTemplate"
+    "fixture/DeleteConfigurationTemplate.yaml"
+
+testUpdateConfigurationTemplate :: UpdateConfigurationTemplate -> TestTree
+testUpdateConfigurationTemplate = req
+    "UpdateConfigurationTemplate"
+    "fixture/UpdateConfigurationTemplate.yaml"
+
+testDescribeEnvironmentResources :: DescribeEnvironmentResources -> TestTree
+testDescribeEnvironmentResources = req
+    "DescribeEnvironmentResources"
+    "fixture/DescribeEnvironmentResources.yaml"
+
 testDeleteApplicationVersion :: DeleteApplicationVersion -> TestTree
 testDeleteApplicationVersion = req
     "DeleteApplicationVersion"
@@ -298,20 +313,10 @@
     "UpdateApplicationVersion"
     "fixture/UpdateApplicationVersion.yaml"
 
-testDescribeEnvironmentResources :: DescribeEnvironmentResources -> TestTree
-testDescribeEnvironmentResources = req
-    "DescribeEnvironmentResources"
-    "fixture/DescribeEnvironmentResources.yaml"
-
-testDeleteConfigurationTemplate :: DeleteConfigurationTemplate -> TestTree
-testDeleteConfigurationTemplate = req
-    "DeleteConfigurationTemplate"
-    "fixture/DeleteConfigurationTemplate.yaml"
-
-testUpdateConfigurationTemplate :: UpdateConfigurationTemplate -> TestTree
-testUpdateConfigurationTemplate = req
-    "UpdateConfigurationTemplate"
-    "fixture/UpdateConfigurationTemplate.yaml"
+testCreateConfigurationTemplate :: CreateConfigurationTemplate -> TestTree
+testCreateConfigurationTemplate = req
+    "CreateConfigurationTemplate"
+    "fixture/CreateConfigurationTemplate.yaml"
 
 testDescribeEnvironmentHealth :: DescribeEnvironmentHealth -> TestTree
 testDescribeEnvironmentHealth = req
@@ -328,61 +333,56 @@
     "DeleteEnvironmentConfiguration"
     "fixture/DeleteEnvironmentConfiguration.yaml"
 
-testCreateConfigurationTemplate :: CreateConfigurationTemplate -> TestTree
-testCreateConfigurationTemplate = req
-    "CreateConfigurationTemplate"
-    "fixture/CreateConfigurationTemplate.yaml"
+testSwapEnvironmentCNAMEs :: SwapEnvironmentCNAMEs -> TestTree
+testSwapEnvironmentCNAMEs = req
+    "SwapEnvironmentCNAMEs"
+    "fixture/SwapEnvironmentCNAMEs.yaml"
 
 testListAvailableSolutionStacks :: ListAvailableSolutionStacks -> TestTree
 testListAvailableSolutionStacks = req
     "ListAvailableSolutionStacks"
     "fixture/ListAvailableSolutionStacks.yaml"
 
-testSwapEnvironmentCNAMEs :: SwapEnvironmentCNAMEs -> TestTree
-testSwapEnvironmentCNAMEs = req
-    "SwapEnvironmentCNAMEs"
-    "fixture/SwapEnvironmentCNAMEs.yaml"
-
 testDescribeConfigurationOptions :: DescribeConfigurationOptions -> TestTree
 testDescribeConfigurationOptions = req
     "DescribeConfigurationOptions"
     "fixture/DescribeConfigurationOptions.yaml"
 
-testDescribeConfigurationSettings :: DescribeConfigurationSettings -> TestTree
-testDescribeConfigurationSettings = req
-    "DescribeConfigurationSettings"
-    "fixture/DescribeConfigurationSettings.yaml"
-
 testCreateStorageLocation :: CreateStorageLocation -> TestTree
 testCreateStorageLocation = req
     "CreateStorageLocation"
     "fixture/CreateStorageLocation.yaml"
 
-testDescribeEnvironments :: DescribeEnvironments -> TestTree
-testDescribeEnvironments = req
-    "DescribeEnvironments"
-    "fixture/DescribeEnvironments.yaml"
-
-testRestartAppServer :: RestartAppServer -> TestTree
-testRestartAppServer = req
-    "RestartAppServer"
-    "fixture/RestartAppServer.yaml"
+testDescribeConfigurationSettings :: DescribeConfigurationSettings -> TestTree
+testDescribeConfigurationSettings = req
+    "DescribeConfigurationSettings"
+    "fixture/DescribeConfigurationSettings.yaml"
 
 testValidateConfigurationSettings :: ValidateConfigurationSettings -> TestTree
 testValidateConfigurationSettings = req
     "ValidateConfigurationSettings"
     "fixture/ValidateConfigurationSettings.yaml"
 
-testDescribeApplicationVersions :: DescribeApplicationVersions -> TestTree
-testDescribeApplicationVersions = req
-    "DescribeApplicationVersions"
-    "fixture/DescribeApplicationVersions.yaml"
+testRestartAppServer :: RestartAppServer -> TestTree
+testRestartAppServer = req
+    "RestartAppServer"
+    "fixture/RestartAppServer.yaml"
 
+testDescribeEnvironments :: DescribeEnvironments -> TestTree
+testDescribeEnvironments = req
+    "DescribeEnvironments"
+    "fixture/DescribeEnvironments.yaml"
+
 testCheckDNSAvailability :: CheckDNSAvailability -> TestTree
 testCheckDNSAvailability = req
     "CheckDNSAvailability"
     "fixture/CheckDNSAvailability.yaml"
 
+testDescribeApplicationVersions :: DescribeApplicationVersions -> TestTree
+testDescribeApplicationVersions = req
+    "DescribeApplicationVersions"
+    "fixture/DescribeApplicationVersions.yaml"
+
 testCreateEnvironment :: CreateEnvironment -> TestTree
 testCreateEnvironment = req
     "CreateEnvironment"
@@ -397,13 +397,6 @@
     elasticBeanstalk
     (Proxy :: Proxy DescribeApplications)
 
-testCreateApplicationVersionResponse :: ApplicationVersionDescriptionMessage -> TestTree
-testCreateApplicationVersionResponse = res
-    "CreateApplicationVersionResponse"
-    "fixture/CreateApplicationVersionResponse.proto"
-    elasticBeanstalk
-    (Proxy :: Proxy CreateApplicationVersion)
-
 testUpdateEnvironmentResponse :: EnvironmentDescription -> TestTree
 testUpdateEnvironmentResponse = res
     "UpdateEnvironmentResponse"
@@ -418,6 +411,13 @@
     elasticBeanstalk
     (Proxy :: Proxy TerminateEnvironment)
 
+testCreateApplicationVersionResponse :: ApplicationVersionDescriptionMessage -> TestTree
+testCreateApplicationVersionResponse = res
+    "CreateApplicationVersionResponse"
+    "fixture/CreateApplicationVersionResponse.proto"
+    elasticBeanstalk
+    (Proxy :: Proxy CreateApplicationVersion)
+
 testDescribeEventsResponse :: DescribeEventsResponse -> TestTree
 testDescribeEventsResponse = res
     "DescribeEventsResponse"
@@ -474,6 +474,27 @@
     elasticBeanstalk
     (Proxy :: Proxy AbortEnvironmentUpdate)
 
+testDeleteConfigurationTemplateResponse :: DeleteConfigurationTemplateResponse -> TestTree
+testDeleteConfigurationTemplateResponse = res
+    "DeleteConfigurationTemplateResponse"
+    "fixture/DeleteConfigurationTemplateResponse.proto"
+    elasticBeanstalk
+    (Proxy :: Proxy DeleteConfigurationTemplate)
+
+testUpdateConfigurationTemplateResponse :: ConfigurationSettingsDescription -> TestTree
+testUpdateConfigurationTemplateResponse = res
+    "UpdateConfigurationTemplateResponse"
+    "fixture/UpdateConfigurationTemplateResponse.proto"
+    elasticBeanstalk
+    (Proxy :: Proxy UpdateConfigurationTemplate)
+
+testDescribeEnvironmentResourcesResponse :: DescribeEnvironmentResourcesResponse -> TestTree
+testDescribeEnvironmentResourcesResponse = res
+    "DescribeEnvironmentResourcesResponse"
+    "fixture/DescribeEnvironmentResourcesResponse.proto"
+    elasticBeanstalk
+    (Proxy :: Proxy DescribeEnvironmentResources)
+
 testDeleteApplicationVersionResponse :: DeleteApplicationVersionResponse -> TestTree
 testDeleteApplicationVersionResponse = res
     "DeleteApplicationVersionResponse"
@@ -488,26 +509,12 @@
     elasticBeanstalk
     (Proxy :: Proxy UpdateApplicationVersion)
 
-testDescribeEnvironmentResourcesResponse :: DescribeEnvironmentResourcesResponse -> TestTree
-testDescribeEnvironmentResourcesResponse = res
-    "DescribeEnvironmentResourcesResponse"
-    "fixture/DescribeEnvironmentResourcesResponse.proto"
-    elasticBeanstalk
-    (Proxy :: Proxy DescribeEnvironmentResources)
-
-testDeleteConfigurationTemplateResponse :: DeleteConfigurationTemplateResponse -> TestTree
-testDeleteConfigurationTemplateResponse = res
-    "DeleteConfigurationTemplateResponse"
-    "fixture/DeleteConfigurationTemplateResponse.proto"
-    elasticBeanstalk
-    (Proxy :: Proxy DeleteConfigurationTemplate)
-
-testUpdateConfigurationTemplateResponse :: ConfigurationSettingsDescription -> TestTree
-testUpdateConfigurationTemplateResponse = res
-    "UpdateConfigurationTemplateResponse"
-    "fixture/UpdateConfigurationTemplateResponse.proto"
+testCreateConfigurationTemplateResponse :: ConfigurationSettingsDescription -> TestTree
+testCreateConfigurationTemplateResponse = res
+    "CreateConfigurationTemplateResponse"
+    "fixture/CreateConfigurationTemplateResponse.proto"
     elasticBeanstalk
-    (Proxy :: Proxy UpdateConfigurationTemplate)
+    (Proxy :: Proxy CreateConfigurationTemplate)
 
 testDescribeEnvironmentHealthResponse :: DescribeEnvironmentHealthResponse -> TestTree
 testDescribeEnvironmentHealthResponse = res
@@ -530,12 +537,12 @@
     elasticBeanstalk
     (Proxy :: Proxy DeleteEnvironmentConfiguration)
 
-testCreateConfigurationTemplateResponse :: ConfigurationSettingsDescription -> TestTree
-testCreateConfigurationTemplateResponse = res
-    "CreateConfigurationTemplateResponse"
-    "fixture/CreateConfigurationTemplateResponse.proto"
+testSwapEnvironmentCNAMEsResponse :: SwapEnvironmentCNAMEsResponse -> TestTree
+testSwapEnvironmentCNAMEsResponse = res
+    "SwapEnvironmentCNAMEsResponse"
+    "fixture/SwapEnvironmentCNAMEsResponse.proto"
     elasticBeanstalk
-    (Proxy :: Proxy CreateConfigurationTemplate)
+    (Proxy :: Proxy SwapEnvironmentCNAMEs)
 
 testListAvailableSolutionStacksResponse :: ListAvailableSolutionStacksResponse -> TestTree
 testListAvailableSolutionStacksResponse = res
@@ -544,13 +551,6 @@
     elasticBeanstalk
     (Proxy :: Proxy ListAvailableSolutionStacks)
 
-testSwapEnvironmentCNAMEsResponse :: SwapEnvironmentCNAMEsResponse -> TestTree
-testSwapEnvironmentCNAMEsResponse = res
-    "SwapEnvironmentCNAMEsResponse"
-    "fixture/SwapEnvironmentCNAMEsResponse.proto"
-    elasticBeanstalk
-    (Proxy :: Proxy SwapEnvironmentCNAMEs)
-
 testDescribeConfigurationOptionsResponse :: DescribeConfigurationOptionsResponse -> TestTree
 testDescribeConfigurationOptionsResponse = res
     "DescribeConfigurationOptionsResponse"
@@ -558,13 +558,6 @@
     elasticBeanstalk
     (Proxy :: Proxy DescribeConfigurationOptions)
 
-testDescribeConfigurationSettingsResponse :: DescribeConfigurationSettingsResponse -> TestTree
-testDescribeConfigurationSettingsResponse = res
-    "DescribeConfigurationSettingsResponse"
-    "fixture/DescribeConfigurationSettingsResponse.proto"
-    elasticBeanstalk
-    (Proxy :: Proxy DescribeConfigurationSettings)
-
 testCreateStorageLocationResponse :: CreateStorageLocationResponse -> TestTree
 testCreateStorageLocationResponse = res
     "CreateStorageLocationResponse"
@@ -572,19 +565,12 @@
     elasticBeanstalk
     (Proxy :: Proxy CreateStorageLocation)
 
-testDescribeEnvironmentsResponse :: DescribeEnvironmentsResponse -> TestTree
-testDescribeEnvironmentsResponse = res
-    "DescribeEnvironmentsResponse"
-    "fixture/DescribeEnvironmentsResponse.proto"
-    elasticBeanstalk
-    (Proxy :: Proxy DescribeEnvironments)
-
-testRestartAppServerResponse :: RestartAppServerResponse -> TestTree
-testRestartAppServerResponse = res
-    "RestartAppServerResponse"
-    "fixture/RestartAppServerResponse.proto"
+testDescribeConfigurationSettingsResponse :: DescribeConfigurationSettingsResponse -> TestTree
+testDescribeConfigurationSettingsResponse = res
+    "DescribeConfigurationSettingsResponse"
+    "fixture/DescribeConfigurationSettingsResponse.proto"
     elasticBeanstalk
-    (Proxy :: Proxy RestartAppServer)
+    (Proxy :: Proxy DescribeConfigurationSettings)
 
 testValidateConfigurationSettingsResponse :: ValidateConfigurationSettingsResponse -> TestTree
 testValidateConfigurationSettingsResponse = res
@@ -593,19 +579,33 @@
     elasticBeanstalk
     (Proxy :: Proxy ValidateConfigurationSettings)
 
-testDescribeApplicationVersionsResponse :: DescribeApplicationVersionsResponse -> TestTree
-testDescribeApplicationVersionsResponse = res
-    "DescribeApplicationVersionsResponse"
-    "fixture/DescribeApplicationVersionsResponse.proto"
+testRestartAppServerResponse :: RestartAppServerResponse -> TestTree
+testRestartAppServerResponse = res
+    "RestartAppServerResponse"
+    "fixture/RestartAppServerResponse.proto"
     elasticBeanstalk
-    (Proxy :: Proxy DescribeApplicationVersions)
+    (Proxy :: Proxy RestartAppServer)
 
+testDescribeEnvironmentsResponse :: DescribeEnvironmentsResponse -> TestTree
+testDescribeEnvironmentsResponse = res
+    "DescribeEnvironmentsResponse"
+    "fixture/DescribeEnvironmentsResponse.proto"
+    elasticBeanstalk
+    (Proxy :: Proxy DescribeEnvironments)
+
 testCheckDNSAvailabilityResponse :: CheckDNSAvailabilityResponse -> TestTree
 testCheckDNSAvailabilityResponse = res
     "CheckDNSAvailabilityResponse"
     "fixture/CheckDNSAvailabilityResponse.proto"
     elasticBeanstalk
     (Proxy :: Proxy CheckDNSAvailability)
+
+testDescribeApplicationVersionsResponse :: DescribeApplicationVersionsResponse -> TestTree
+testDescribeApplicationVersionsResponse = res
+    "DescribeApplicationVersionsResponse"
+    "fixture/DescribeApplicationVersionsResponse.proto"
+    elasticBeanstalk
+    (Proxy :: Proxy DescribeApplicationVersions)
 
 testCreateEnvironmentResponse :: EnvironmentDescription -> TestTree
 testCreateEnvironmentResponse = res
