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:               0.0.0
+version:               0.0.1
 synopsis:              Amazon Elastic Beanstalk SDK.
 homepage:              https://github.com/brendanhay/amazonka
 license:               OtherLicense
@@ -76,5 +76,5 @@
     other-modules:
 
     build-depends:
-          amazonka-core
-        , base          >= 4.7 && < 5
+          amazonka-core == 0.0.1.*
+        , base          >= 4.7     && < 5
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
@@ -166,7 +166,7 @@
     { _cctrApplicationName   :: Maybe Text
     , _cctrDateCreated       :: Maybe RFC822
     , _cctrDateUpdated       :: Maybe RFC822
-    , _cctrDeploymentStatus  :: Maybe Text
+    , _cctrDeploymentStatus  :: Maybe ConfigurationDeploymentStatus
     , _cctrDescription       :: Maybe Text
     , _cctrEnvironmentName   :: Maybe Text
     , _cctrOptionSettings    :: List "OptionSettings" ConfigurationOptionSetting
@@ -184,7 +184,7 @@
 --
 -- * 'cctrDateUpdated' @::@ 'Maybe' 'UTCTime'
 --
--- * 'cctrDeploymentStatus' @::@ 'Maybe' 'Text'
+-- * 'cctrDeploymentStatus' @::@ 'Maybe' 'ConfigurationDeploymentStatus'
 --
 -- * 'cctrDescription' @::@ 'Maybe' 'Text'
 --
@@ -236,7 +236,7 @@
 -- configuration that is currently deployed to the associated running
 -- environment. failed: This is a draft configuration that failed to
 -- successfully deploy.
-cctrDeploymentStatus :: Lens' CreateConfigurationTemplateResponse (Maybe Text)
+cctrDeploymentStatus :: Lens' CreateConfigurationTemplateResponse (Maybe ConfigurationDeploymentStatus)
 cctrDeploymentStatus =
     lens _cctrDeploymentStatus (\s a -> s { _cctrDeploymentStatus = a })
 
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
@@ -216,10 +216,10 @@
     , _cerEndpointURL       :: Maybe Text
     , _cerEnvironmentId     :: Maybe Text
     , _cerEnvironmentName   :: Maybe Text
-    , _cerHealth            :: Maybe Text
+    , _cerHealth            :: Maybe EnvironmentHealth
     , _cerResources         :: Maybe EnvironmentResourcesDescription
     , _cerSolutionStackName :: Maybe Text
-    , _cerStatus            :: Maybe Text
+    , _cerStatus            :: Maybe EnvironmentStatus
     , _cerTemplateName      :: Maybe Text
     , _cerTier              :: Maybe EnvironmentTier
     , _cerVersionLabel      :: Maybe Text
@@ -245,13 +245,13 @@
 --
 -- * 'cerEnvironmentName' @::@ 'Maybe' 'Text'
 --
--- * 'cerHealth' @::@ 'Maybe' 'Text'
+-- * 'cerHealth' @::@ 'Maybe' 'EnvironmentHealth'
 --
 -- * 'cerResources' @::@ 'Maybe' 'EnvironmentResourcesDescription'
 --
 -- * 'cerSolutionStackName' @::@ 'Maybe' 'Text'
 --
--- * 'cerStatus' @::@ 'Maybe' 'Text'
+-- * 'cerStatus' @::@ 'Maybe' 'EnvironmentStatus'
 --
 -- * 'cerTemplateName' @::@ 'Maybe' 'Text'
 --
@@ -326,7 +326,7 @@
 -- environment is not fully launched and health checks have not started or
 -- health checks are suspended during an UpdateEnvironment or
 -- RestartEnvironement request. Default: Grey.
-cerHealth :: Lens' CreateEnvironmentResponse (Maybe Text)
+cerHealth :: Lens' CreateEnvironmentResponse (Maybe EnvironmentHealth)
 cerHealth = lens _cerHealth (\s a -> s { _cerHealth = a })
 
 -- | The description of the AWS resources used by this environment.
@@ -344,7 +344,7 @@
 -- Ready: Environment is available to have an action performed on it, such
 -- as update or terminate. Terminating: Environment is in the shut-down
 -- process. Terminated: Environment is not running.
-cerStatus :: Lens' CreateEnvironmentResponse (Maybe Text)
+cerStatus :: Lens' CreateEnvironmentResponse (Maybe EnvironmentStatus)
 cerStatus = lens _cerStatus (\s a -> s { _cerStatus = a })
 
 -- | The name of the configuration template used to originally launch this
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
@@ -65,11 +65,11 @@
     , _deMaxRecords      :: Maybe Nat
     , _deNextToken       :: Maybe Text
     , _deRequestId       :: Maybe Text
-    , _deSeverity        :: Maybe Text
+    , _deSeverity        :: Maybe EventSeverity
     , _deStartTime       :: Maybe RFC822
     , _deTemplateName    :: Maybe Text
     , _deVersionLabel    :: Maybe Text
-    } deriving (Eq, Ord, Show)
+    } deriving (Eq, Show)
 
 -- | 'DescribeEvents' constructor.
 --
@@ -89,7 +89,7 @@
 --
 -- * 'deRequestId' @::@ 'Maybe' 'Text'
 --
--- * 'deSeverity' @::@ 'Maybe' 'Text'
+-- * 'deSeverity' @::@ 'Maybe' 'EventSeverity'
 --
 -- * 'deStartTime' @::@ 'Maybe' 'UTCTime'
 --
@@ -151,7 +151,7 @@
 
 -- | If specified, limits the events returned from this call to include only
 -- those with the specified severity or higher.
-deSeverity :: Lens' DescribeEvents (Maybe Text)
+deSeverity :: Lens' DescribeEvents (Maybe EventSeverity)
 deSeverity = lens _deSeverity (\s a -> s { _deSeverity = a })
 
 -- | If specified, AWS Elastic Beanstalk restricts the returned descriptions
diff --git a/gen/Network/AWS/ElasticBeanstalk/RequestEnvironmentInfo.hs b/gen/Network/AWS/ElasticBeanstalk/RequestEnvironmentInfo.hs
--- a/gen/Network/AWS/ElasticBeanstalk/RequestEnvironmentInfo.hs
+++ b/gen/Network/AWS/ElasticBeanstalk/RequestEnvironmentInfo.hs
@@ -52,8 +52,8 @@
 data RequestEnvironmentInfo = RequestEnvironmentInfo
     { _reiEnvironmentId   :: Maybe Text
     , _reiEnvironmentName :: Maybe Text
-    , _reiInfoType        :: Text
-    } deriving (Eq, Ord, Show)
+    , _reiInfoType        :: EnvironmentInfoType
+    } deriving (Eq, Show)
 
 -- | 'RequestEnvironmentInfo' constructor.
 --
@@ -63,9 +63,9 @@
 --
 -- * 'reiEnvironmentName' @::@ 'Maybe' 'Text'
 --
--- * 'reiInfoType' @::@ 'Text'
+-- * 'reiInfoType' @::@ 'EnvironmentInfoType'
 --
-requestEnvironmentInfo :: Text -- ^ 'reiInfoType'
+requestEnvironmentInfo :: EnvironmentInfoType -- ^ 'reiInfoType'
                        -> RequestEnvironmentInfo
 requestEnvironmentInfo p1 = RequestEnvironmentInfo
     { _reiInfoType        = p1
@@ -91,7 +91,7 @@
     lens _reiEnvironmentName (\s a -> s { _reiEnvironmentName = a })
 
 -- | The type of information to request.
-reiInfoType :: Lens' RequestEnvironmentInfo Text
+reiInfoType :: Lens' RequestEnvironmentInfo EnvironmentInfoType
 reiInfoType = lens _reiInfoType (\s a -> s { _reiInfoType = a })
 
 data RequestEnvironmentInfoResponse = RequestEnvironmentInfoResponse
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
@@ -51,8 +51,8 @@
 data RetrieveEnvironmentInfo = RetrieveEnvironmentInfo
     { _rei1EnvironmentId   :: Maybe Text
     , _rei1EnvironmentName :: Maybe Text
-    , _rei1InfoType        :: Text
-    } deriving (Eq, Ord, Show)
+    , _rei1InfoType        :: EnvironmentInfoType
+    } deriving (Eq, Show)
 
 -- | 'RetrieveEnvironmentInfo' constructor.
 --
@@ -62,9 +62,9 @@
 --
 -- * 'rei1EnvironmentName' @::@ 'Maybe' 'Text'
 --
--- * 'rei1InfoType' @::@ 'Text'
+-- * 'rei1InfoType' @::@ 'EnvironmentInfoType'
 --
-retrieveEnvironmentInfo :: Text -- ^ 'rei1InfoType'
+retrieveEnvironmentInfo :: EnvironmentInfoType -- ^ 'rei1InfoType'
                         -> RetrieveEnvironmentInfo
 retrieveEnvironmentInfo p1 = RetrieveEnvironmentInfo
     { _rei1InfoType        = p1
@@ -89,7 +89,7 @@
     lens _rei1EnvironmentName (\s a -> s { _rei1EnvironmentName = a })
 
 -- | The type of information to retrieve.
-rei1InfoType :: Lens' RetrieveEnvironmentInfo Text
+rei1InfoType :: Lens' RetrieveEnvironmentInfo EnvironmentInfoType
 rei1InfoType = lens _rei1InfoType (\s a -> s { _rei1InfoType = a })
 
 newtype RetrieveEnvironmentInfoResponse = RetrieveEnvironmentInfoResponse
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
@@ -120,10 +120,10 @@
     , _terEndpointURL       :: Maybe Text
     , _terEnvironmentId     :: Maybe Text
     , _terEnvironmentName   :: Maybe Text
-    , _terHealth            :: Maybe Text
+    , _terHealth            :: Maybe EnvironmentHealth
     , _terResources         :: Maybe EnvironmentResourcesDescription
     , _terSolutionStackName :: Maybe Text
-    , _terStatus            :: Maybe Text
+    , _terStatus            :: Maybe EnvironmentStatus
     , _terTemplateName      :: Maybe Text
     , _terTier              :: Maybe EnvironmentTier
     , _terVersionLabel      :: Maybe Text
@@ -149,13 +149,13 @@
 --
 -- * 'terEnvironmentName' @::@ 'Maybe' 'Text'
 --
--- * 'terHealth' @::@ 'Maybe' 'Text'
+-- * 'terHealth' @::@ 'Maybe' 'EnvironmentHealth'
 --
 -- * 'terResources' @::@ 'Maybe' 'EnvironmentResourcesDescription'
 --
 -- * 'terSolutionStackName' @::@ 'Maybe' 'Text'
 --
--- * 'terStatus' @::@ 'Maybe' 'Text'
+-- * 'terStatus' @::@ 'Maybe' 'EnvironmentStatus'
 --
 -- * 'terTemplateName' @::@ 'Maybe' 'Text'
 --
@@ -230,7 +230,7 @@
 -- environment is not fully launched and health checks have not started or
 -- health checks are suspended during an UpdateEnvironment or
 -- RestartEnvironement request. Default: Grey.
-terHealth :: Lens' TerminateEnvironmentResponse (Maybe Text)
+terHealth :: Lens' TerminateEnvironmentResponse (Maybe EnvironmentHealth)
 terHealth = lens _terHealth (\s a -> s { _terHealth = a })
 
 -- | The description of the AWS resources used by this environment.
@@ -248,7 +248,7 @@
 -- Ready: Environment is available to have an action performed on it, such
 -- as update or terminate. Terminating: Environment is in the shut-down
 -- process. Terminated: Environment is not running.
-terStatus :: Lens' TerminateEnvironmentResponse (Maybe Text)
+terStatus :: Lens' TerminateEnvironmentResponse (Maybe EnvironmentStatus)
 terStatus = lens _terStatus (\s a -> s { _terStatus = a })
 
 -- | The name of the configuration template used to originally launch this
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
@@ -403,11 +403,13 @@
         Trace -> "TRACE"
         Warn  -> "WARN"
 
+instance ToByteString EventSeverity
+instance ToHeader     EventSeverity
+instance ToQuery      EventSeverity
+
 instance FromXML EventSeverity where
     parseXML = parseXMLText "EventSeverity"
 
-instance ToQuery EventSeverity where
-    toQuery = toQuery . toText
 
 data Tag = Tag
     { _tagKey   :: Maybe Text
@@ -453,10 +455,10 @@
     , _edEventDate       :: Maybe RFC822
     , _edMessage         :: Maybe Text
     , _edRequestId       :: Maybe Text
-    , _edSeverity        :: Maybe Text
+    , _edSeverity        :: Maybe EventSeverity
     , _edTemplateName    :: Maybe Text
     , _edVersionLabel    :: Maybe Text
-    } deriving (Eq, Ord, Show)
+    } deriving (Eq, Show)
 
 -- | 'EventDescription' constructor.
 --
@@ -472,7 +474,7 @@
 --
 -- * 'edRequestId' @::@ 'Maybe' 'Text'
 --
--- * 'edSeverity' @::@ 'Maybe' 'Text'
+-- * 'edSeverity' @::@ 'Maybe' 'EventSeverity'
 --
 -- * 'edTemplateName' @::@ 'Maybe' 'Text'
 --
@@ -513,7 +515,7 @@
 edRequestId = lens _edRequestId (\s a -> s { _edRequestId = a })
 
 -- | The severity level of this event.
-edSeverity :: Lens' EventDescription (Maybe Text)
+edSeverity :: Lens' EventDescription (Maybe EventSeverity)
 edSeverity = lens _edSeverity (\s a -> s { _edSeverity = a })
 
 -- | The name of the configuration associated with this event.
@@ -651,11 +653,13 @@
         Failed   -> "failed"
         Pending  -> "pending"
 
+instance ToByteString ConfigurationDeploymentStatus
+instance ToHeader     ConfigurationDeploymentStatus
+instance ToQuery      ConfigurationDeploymentStatus
+
 instance FromXML ConfigurationDeploymentStatus where
     parseXML = parseXMLText "ConfigurationDeploymentStatus"
 
-instance ToQuery ConfigurationDeploymentStatus where
-    toQuery = toQuery . toText
 
 data ConfigurationOptionSetting = ConfigurationOptionSetting
     { _cosNamespace  :: Maybe Text
@@ -721,17 +725,19 @@
         List'  -> "List"
         Scalar -> "Scalar"
 
+instance ToByteString ConfigurationOptionValueType
+instance ToHeader     ConfigurationOptionValueType
+instance ToQuery      ConfigurationOptionValueType
+
 instance FromXML ConfigurationOptionValueType where
     parseXML = parseXMLText "ConfigurationOptionValueType"
 
-instance ToQuery ConfigurationOptionValueType where
-    toQuery = toQuery . toText
 
 data ConfigurationSettingsDescription = ConfigurationSettingsDescription
     { _csdApplicationName   :: Maybe Text
     , _csdDateCreated       :: Maybe RFC822
     , _csdDateUpdated       :: Maybe RFC822
-    , _csdDeploymentStatus  :: Maybe Text
+    , _csdDeploymentStatus  :: Maybe ConfigurationDeploymentStatus
     , _csdDescription       :: Maybe Text
     , _csdEnvironmentName   :: Maybe Text
     , _csdOptionSettings    :: List "OptionSettings" ConfigurationOptionSetting
@@ -749,7 +755,7 @@
 --
 -- * 'csdDateUpdated' @::@ 'Maybe' 'UTCTime'
 --
--- * 'csdDeploymentStatus' @::@ 'Maybe' 'Text'
+-- * 'csdDeploymentStatus' @::@ 'Maybe' 'ConfigurationDeploymentStatus'
 --
 -- * 'csdDescription' @::@ 'Maybe' 'Text'
 --
@@ -801,7 +807,7 @@
 -- configuration that is currently deployed to the associated running
 -- environment. failed: This is a draft configuration that failed to
 -- successfully deploy.
-csdDeploymentStatus :: Lens' ConfigurationSettingsDescription (Maybe Text)
+csdDeploymentStatus :: Lens' ConfigurationSettingsDescription (Maybe ConfigurationDeploymentStatus)
 csdDeploymentStatus =
     lens _csdDeploymentStatus (\s a -> s { _csdDeploymentStatus = a })
 
@@ -1129,11 +1135,13 @@
         Terminating -> "Terminating"
         Updating    -> "Updating"
 
+instance ToByteString EnvironmentStatus
+instance ToHeader     EnvironmentStatus
+instance ToQuery      EnvironmentStatus
+
 instance FromXML EnvironmentStatus where
     parseXML = parseXMLText "EnvironmentStatus"
 
-instance ToQuery EnvironmentStatus where
-    toQuery = toQuery . toText
 
 data LoadBalancerDescription = LoadBalancerDescription
     { _lbdDomain           :: Maybe Text
@@ -1366,7 +1374,7 @@
     , _codRegex          :: Maybe OptionRestrictionRegex
     , _codUserDefined    :: Maybe Bool
     , _codValueOptions   :: List "ValueOptions" Text
-    , _codValueType      :: Maybe Text
+    , _codValueType      :: Maybe ConfigurationOptionValueType
     } deriving (Eq, Show)
 
 -- | 'ConfigurationOptionDescription' constructor.
@@ -1393,7 +1401,7 @@
 --
 -- * 'codValueOptions' @::@ ['Text']
 --
--- * 'codValueType' @::@ 'Maybe' 'Text'
+-- * 'codValueType' @::@ 'Maybe' 'ConfigurationOptionValueType'
 --
 configurationOptionDescription :: ConfigurationOptionDescription
 configurationOptionDescription = ConfigurationOptionDescription
@@ -1489,7 +1497,7 @@
 -- the MIN/MAX/Regex constraints. List : Values for this option are multiple
 -- selections from the possible values. Boolean : Values for this option are
 -- either true or false .
-codValueType :: Lens' ConfigurationOptionDescription (Maybe Text)
+codValueType :: Lens' ConfigurationOptionDescription (Maybe ConfigurationOptionValueType)
 codValueType = lens _codValueType (\s a -> s { _codValueType = a })
 
 instance FromXML ConfigurationOptionDescription where
@@ -1562,10 +1570,10 @@
 
 data EnvironmentInfoDescription = EnvironmentInfoDescription
     { _eidEc2InstanceId   :: Maybe Text
-    , _eidInfoType        :: Maybe Text
+    , _eidInfoType        :: Maybe EnvironmentInfoType
     , _eidMessage         :: Maybe Text
     , _eidSampleTimestamp :: Maybe RFC822
-    } deriving (Eq, Ord, Show)
+    } deriving (Eq, Show)
 
 -- | 'EnvironmentInfoDescription' constructor.
 --
@@ -1573,7 +1581,7 @@
 --
 -- * 'eidEc2InstanceId' @::@ 'Maybe' 'Text'
 --
--- * 'eidInfoType' @::@ 'Maybe' 'Text'
+-- * 'eidInfoType' @::@ 'Maybe' 'EnvironmentInfoType'
 --
 -- * 'eidMessage' @::@ 'Maybe' 'Text'
 --
@@ -1592,7 +1600,7 @@
 eidEc2InstanceId = lens _eidEc2InstanceId (\s a -> s { _eidEc2InstanceId = a })
 
 -- | The type of information retrieved.
-eidInfoType :: Lens' EnvironmentInfoDescription (Maybe Text)
+eidInfoType :: Lens' EnvironmentInfoDescription (Maybe EnvironmentInfoType)
 eidInfoType = lens _eidInfoType (\s a -> s { _eidInfoType = a })
 
 -- | The retrieved information.
@@ -1662,8 +1670,8 @@
     { _vmMessage    :: Maybe Text
     , _vmNamespace  :: Maybe Text
     , _vmOptionName :: Maybe Text
-    , _vmSeverity   :: Maybe Text
-    } deriving (Eq, Ord, Show)
+    , _vmSeverity   :: Maybe ValidationSeverity
+    } deriving (Eq, Show)
 
 -- | 'ValidationMessage' constructor.
 --
@@ -1675,7 +1683,7 @@
 --
 -- * 'vmOptionName' @::@ 'Maybe' 'Text'
 --
--- * 'vmSeverity' @::@ 'Maybe' 'Text'
+-- * 'vmSeverity' @::@ 'Maybe' 'ValidationSeverity'
 --
 validationMessage :: ValidationMessage
 validationMessage = ValidationMessage
@@ -1703,7 +1711,7 @@
 -- This message indicates that this is not a valid setting for an option.
 -- warning: This message is providing information you should take into
 -- account.
-vmSeverity :: Lens' ValidationMessage (Maybe Text)
+vmSeverity :: Lens' ValidationMessage (Maybe ValidationSeverity)
 vmSeverity = lens _vmSeverity (\s a -> s { _vmSeverity = a })
 
 instance FromXML ValidationMessage where
@@ -1737,11 +1745,13 @@
         VSError   -> "error"
         VSWarning -> "warning"
 
+instance ToByteString ValidationSeverity
+instance ToHeader     ValidationSeverity
+instance ToQuery      ValidationSeverity
+
 instance FromXML ValidationSeverity where
     parseXML = parseXMLText "ValidationSeverity"
 
-instance ToQuery ValidationSeverity where
-    toQuery = toQuery . toText
 
 newtype Trigger = Trigger
     { _tName :: Maybe Text
@@ -1783,11 +1793,13 @@
 instance ToText EnvironmentInfoType where
     toText Tail' = "tail"
 
+instance ToByteString EnvironmentInfoType
+instance ToHeader     EnvironmentInfoType
+instance ToQuery      EnvironmentInfoType
+
 instance FromXML EnvironmentInfoType where
     parseXML = parseXMLText "EnvironmentInfoType"
 
-instance ToQuery EnvironmentInfoType where
-    toQuery = toQuery . toText
 
 data EnvironmentDescription = EnvironmentDescription
     { _ed1ApplicationName   :: Maybe Text
@@ -1798,10 +1810,10 @@
     , _ed1EndpointURL       :: Maybe Text
     , _ed1EnvironmentId     :: Maybe Text
     , _ed1EnvironmentName   :: Maybe Text
-    , _ed1Health            :: Maybe Text
+    , _ed1Health            :: Maybe EnvironmentHealth
     , _ed1Resources         :: Maybe EnvironmentResourcesDescription
     , _ed1SolutionStackName :: Maybe Text
-    , _ed1Status            :: Maybe Text
+    , _ed1Status            :: Maybe EnvironmentStatus
     , _ed1TemplateName      :: Maybe Text
     , _ed1Tier              :: Maybe EnvironmentTier
     , _ed1VersionLabel      :: Maybe Text
@@ -1827,13 +1839,13 @@
 --
 -- * 'ed1EnvironmentName' @::@ 'Maybe' 'Text'
 --
--- * 'ed1Health' @::@ 'Maybe' 'Text'
+-- * 'ed1Health' @::@ 'Maybe' 'EnvironmentHealth'
 --
 -- * 'ed1Resources' @::@ 'Maybe' 'EnvironmentResourcesDescription'
 --
 -- * 'ed1SolutionStackName' @::@ 'Maybe' 'Text'
 --
--- * 'ed1Status' @::@ 'Maybe' 'Text'
+-- * 'ed1Status' @::@ 'Maybe' 'EnvironmentStatus'
 --
 -- * 'ed1TemplateName' @::@ 'Maybe' 'Text'
 --
@@ -1908,7 +1920,7 @@
 -- environment is not fully launched and health checks have not started or
 -- health checks are suspended during an UpdateEnvironment or
 -- RestartEnvironement request. Default: Grey.
-ed1Health :: Lens' EnvironmentDescription (Maybe Text)
+ed1Health :: Lens' EnvironmentDescription (Maybe EnvironmentHealth)
 ed1Health = lens _ed1Health (\s a -> s { _ed1Health = a })
 
 -- | The description of the AWS resources used by this environment.
@@ -1926,7 +1938,7 @@
 -- Ready: Environment is available to have an action performed on it, such
 -- as update or terminate. Terminating: Environment is in the shut-down
 -- process. Terminated: Environment is not running.
-ed1Status :: Lens' EnvironmentDescription (Maybe Text)
+ed1Status :: Lens' EnvironmentDescription (Maybe EnvironmentStatus)
 ed1Status = lens _ed1Status (\s a -> s { _ed1Status = a })
 
 -- | The name of the configuration template used to originally launch this
@@ -2039,11 +2051,13 @@
         Red    -> "Red"
         Yellow -> "Yellow"
 
+instance ToByteString EnvironmentHealth
+instance ToHeader     EnvironmentHealth
+instance ToQuery      EnvironmentHealth
+
 instance FromXML EnvironmentHealth where
     parseXML = parseXMLText "EnvironmentHealth"
 
-instance ToQuery EnvironmentHealth where
-    toQuery = toQuery . toText
 
 newtype Instance = Instance
     { _iId :: Maybe Text
diff --git a/gen/Network/AWS/ElasticBeanstalk/UpdateConfigurationTemplate.hs b/gen/Network/AWS/ElasticBeanstalk/UpdateConfigurationTemplate.hs
--- a/gen/Network/AWS/ElasticBeanstalk/UpdateConfigurationTemplate.hs
+++ b/gen/Network/AWS/ElasticBeanstalk/UpdateConfigurationTemplate.hs
@@ -127,7 +127,7 @@
     { _uctrApplicationName   :: Maybe Text
     , _uctrDateCreated       :: Maybe RFC822
     , _uctrDateUpdated       :: Maybe RFC822
-    , _uctrDeploymentStatus  :: Maybe Text
+    , _uctrDeploymentStatus  :: Maybe ConfigurationDeploymentStatus
     , _uctrDescription       :: Maybe Text
     , _uctrEnvironmentName   :: Maybe Text
     , _uctrOptionSettings    :: List "OptionSettings" ConfigurationOptionSetting
@@ -145,7 +145,7 @@
 --
 -- * 'uctrDateUpdated' @::@ 'Maybe' 'UTCTime'
 --
--- * 'uctrDeploymentStatus' @::@ 'Maybe' 'Text'
+-- * 'uctrDeploymentStatus' @::@ 'Maybe' 'ConfigurationDeploymentStatus'
 --
 -- * 'uctrDescription' @::@ 'Maybe' 'Text'
 --
@@ -197,7 +197,7 @@
 -- configuration that is currently deployed to the associated running
 -- environment. failed: This is a draft configuration that failed to
 -- successfully deploy.
-uctrDeploymentStatus :: Lens' UpdateConfigurationTemplateResponse (Maybe Text)
+uctrDeploymentStatus :: Lens' UpdateConfigurationTemplateResponse (Maybe ConfigurationDeploymentStatus)
 uctrDeploymentStatus =
     lens _uctrDeploymentStatus (\s a -> s { _uctrDeploymentStatus = a })
 
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
@@ -181,10 +181,10 @@
     , _uerEndpointURL       :: Maybe Text
     , _uerEnvironmentId     :: Maybe Text
     , _uerEnvironmentName   :: Maybe Text
-    , _uerHealth            :: Maybe Text
+    , _uerHealth            :: Maybe EnvironmentHealth
     , _uerResources         :: Maybe EnvironmentResourcesDescription
     , _uerSolutionStackName :: Maybe Text
-    , _uerStatus            :: Maybe Text
+    , _uerStatus            :: Maybe EnvironmentStatus
     , _uerTemplateName      :: Maybe Text
     , _uerTier              :: Maybe EnvironmentTier
     , _uerVersionLabel      :: Maybe Text
@@ -210,13 +210,13 @@
 --
 -- * 'uerEnvironmentName' @::@ 'Maybe' 'Text'
 --
--- * 'uerHealth' @::@ 'Maybe' 'Text'
+-- * 'uerHealth' @::@ 'Maybe' 'EnvironmentHealth'
 --
 -- * 'uerResources' @::@ 'Maybe' 'EnvironmentResourcesDescription'
 --
 -- * 'uerSolutionStackName' @::@ 'Maybe' 'Text'
 --
--- * 'uerStatus' @::@ 'Maybe' 'Text'
+-- * 'uerStatus' @::@ 'Maybe' 'EnvironmentStatus'
 --
 -- * 'uerTemplateName' @::@ 'Maybe' 'Text'
 --
@@ -291,7 +291,7 @@
 -- environment is not fully launched and health checks have not started or
 -- health checks are suspended during an UpdateEnvironment or
 -- RestartEnvironement request. Default: Grey.
-uerHealth :: Lens' UpdateEnvironmentResponse (Maybe Text)
+uerHealth :: Lens' UpdateEnvironmentResponse (Maybe EnvironmentHealth)
 uerHealth = lens _uerHealth (\s a -> s { _uerHealth = a })
 
 -- | The description of the AWS resources used by this environment.
@@ -309,7 +309,7 @@
 -- Ready: Environment is available to have an action performed on it, such
 -- as update or terminate. Terminating: Environment is in the shut-down
 -- process. Terminated: Environment is not running.
-uerStatus :: Lens' UpdateEnvironmentResponse (Maybe Text)
+uerStatus :: Lens' UpdateEnvironmentResponse (Maybe EnvironmentStatus)
 uerStatus = lens _uerStatus (\s a -> s { _uerStatus = a })
 
 -- | The name of the configuration template used to originally launch this