diff --git a/README.md b/README.md
--- a/README.md
+++ b/README.md
@@ -8,7 +8,7 @@
 
 ## Version
 
-`1.1.0`
+`1.2.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.1.0
+version:               1.2.0
 synopsis:              Amazon Elastic Beanstalk SDK.
 homepage:              https://github.com/brendanhay/amazonka
 license:               OtherLicense
@@ -105,7 +105,7 @@
         , Network.AWS.ElasticBeanstalk.Types.Sum
 
     build-depends:
-          amazonka-core == 1.1.0.*
+          amazonka-core == 1.2.0.*
         , base          >= 4.7     && < 5
 
 test-suite amazonka-elasticbeanstalk-test
@@ -124,9 +124,9 @@
         , Test.AWS.ElasticBeanstalk.Internal
 
     build-depends:
-          amazonka-core == 1.1.0
-        , amazonka-test == 1.1.0
-        , amazonka-elasticbeanstalk == 1.1.0
+          amazonka-core == 1.2.0
+        , amazonka-test == 1.2.0
+        , amazonka-elasticbeanstalk == 1.2.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
@@ -40,8 +40,8 @@
 -- /See:/ <http://docs.aws.amazon.com/elasticbeanstalk/latest/api/Welcome.html AWS API Reference>
 module Network.AWS.ElasticBeanstalk
     (
-    -- * Service
-      ElasticBeanstalk
+    -- * Service Configuration
+      elasticBeanstalk
 
     -- * Errors
     -- $errors
diff --git a/gen/Network/AWS/ElasticBeanstalk/AbortEnvironmentUpdate.hs b/gen/Network/AWS/ElasticBeanstalk/AbortEnvironmentUpdate.hs
--- a/gen/Network/AWS/ElasticBeanstalk/AbortEnvironmentUpdate.hs
+++ b/gen/Network/AWS/ElasticBeanstalk/AbortEnvironmentUpdate.hs
@@ -76,10 +76,9 @@
 aeuEnvironmentId = lens _aeuEnvironmentId (\ s a -> s{_aeuEnvironmentId = a});
 
 instance AWSRequest AbortEnvironmentUpdate where
-        type Sv AbortEnvironmentUpdate = ElasticBeanstalk
         type Rs AbortEnvironmentUpdate =
              AbortEnvironmentUpdateResponse
-        request = postQuery
+        request = postQuery elasticBeanstalk
         response
           = receiveNull AbortEnvironmentUpdateResponse'
 
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
@@ -69,10 +69,9 @@
 cdaCNAMEPrefix = lens _cdaCNAMEPrefix (\ s a -> s{_cdaCNAMEPrefix = a});
 
 instance AWSRequest CheckDNSAvailability where
-        type Sv CheckDNSAvailability = ElasticBeanstalk
         type Rs CheckDNSAvailability =
              CheckDNSAvailabilityResponse
-        request = postQuery
+        request = postQuery elasticBeanstalk
         response
           = receiveXMLWrapper "CheckDNSAvailabilityResult"
               (\ s h x ->
diff --git a/gen/Network/AWS/ElasticBeanstalk/CreateApplication.hs b/gen/Network/AWS/ElasticBeanstalk/CreateApplication.hs
--- a/gen/Network/AWS/ElasticBeanstalk/CreateApplication.hs
+++ b/gen/Network/AWS/ElasticBeanstalk/CreateApplication.hs
@@ -81,10 +81,9 @@
 caApplicationName = lens _caApplicationName (\ s a -> s{_caApplicationName = a});
 
 instance AWSRequest CreateApplication where
-        type Sv CreateApplication = ElasticBeanstalk
         type Rs CreateApplication =
              ApplicationDescriptionMessage
-        request = postQuery
+        request = postQuery elasticBeanstalk
         response
           = receiveXMLWrapper "CreateApplicationResult"
               (\ s h x -> parseXML x)
diff --git a/gen/Network/AWS/ElasticBeanstalk/CreateApplicationVersion.hs b/gen/Network/AWS/ElasticBeanstalk/CreateApplicationVersion.hs
--- a/gen/Network/AWS/ElasticBeanstalk/CreateApplicationVersion.hs
+++ b/gen/Network/AWS/ElasticBeanstalk/CreateApplicationVersion.hs
@@ -142,10 +142,9 @@
 cavVersionLabel = lens _cavVersionLabel (\ s a -> s{_cavVersionLabel = a});
 
 instance AWSRequest CreateApplicationVersion where
-        type Sv CreateApplicationVersion = ElasticBeanstalk
         type Rs CreateApplicationVersion =
              ApplicationVersionDescriptionMessage
-        request = postQuery
+        request = postQuery elasticBeanstalk
         response
           = receiveXMLWrapper "CreateApplicationVersionResult"
               (\ s h x -> parseXML x)
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
@@ -174,11 +174,9 @@
 cctTemplateName = lens _cctTemplateName (\ s a -> s{_cctTemplateName = a});
 
 instance AWSRequest CreateConfigurationTemplate where
-        type Sv CreateConfigurationTemplate =
-             ElasticBeanstalk
         type Rs CreateConfigurationTemplate =
              ConfigurationSettingsDescription
-        request = postQuery
+        request = postQuery elasticBeanstalk
         response
           = receiveXMLWrapper
               "CreateConfigurationTemplateResult"
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
@@ -217,9 +217,8 @@
 ceEnvironmentName = lens _ceEnvironmentName (\ s a -> s{_ceEnvironmentName = a});
 
 instance AWSRequest CreateEnvironment where
-        type Sv CreateEnvironment = ElasticBeanstalk
         type Rs CreateEnvironment = EnvironmentDescription
-        request = postQuery
+        request = postQuery elasticBeanstalk
         response
           = receiveXMLWrapper "CreateEnvironmentResult"
               (\ s h x -> parseXML x)
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
@@ -55,10 +55,9 @@
 createStorageLocation = CreateStorageLocation'
 
 instance AWSRequest CreateStorageLocation where
-        type Sv CreateStorageLocation = ElasticBeanstalk
         type Rs CreateStorageLocation =
              CreateStorageLocationResponse
-        request = postQuery
+        request = postQuery elasticBeanstalk
         response
           = receiveXMLWrapper "CreateStorageLocationResult"
               (\ s h x ->
diff --git a/gen/Network/AWS/ElasticBeanstalk/DeleteApplication.hs b/gen/Network/AWS/ElasticBeanstalk/DeleteApplication.hs
--- a/gen/Network/AWS/ElasticBeanstalk/DeleteApplication.hs
+++ b/gen/Network/AWS/ElasticBeanstalk/DeleteApplication.hs
@@ -79,9 +79,8 @@
 daApplicationName = lens _daApplicationName (\ s a -> s{_daApplicationName = a});
 
 instance AWSRequest DeleteApplication where
-        type Sv DeleteApplication = ElasticBeanstalk
         type Rs DeleteApplication = DeleteApplicationResponse
-        request = postQuery
+        request = postQuery elasticBeanstalk
         response = receiveNull DeleteApplicationResponse'
 
 instance ToHeaders DeleteApplication where
diff --git a/gen/Network/AWS/ElasticBeanstalk/DeleteApplicationVersion.hs b/gen/Network/AWS/ElasticBeanstalk/DeleteApplicationVersion.hs
--- a/gen/Network/AWS/ElasticBeanstalk/DeleteApplicationVersion.hs
+++ b/gen/Network/AWS/ElasticBeanstalk/DeleteApplicationVersion.hs
@@ -94,10 +94,9 @@
 davVersionLabel = lens _davVersionLabel (\ s a -> s{_davVersionLabel = a});
 
 instance AWSRequest DeleteApplicationVersion where
-        type Sv DeleteApplicationVersion = ElasticBeanstalk
         type Rs DeleteApplicationVersion =
              DeleteApplicationVersionResponse
-        request = postQuery
+        request = postQuery elasticBeanstalk
         response
           = receiveNull DeleteApplicationVersionResponse'
 
diff --git a/gen/Network/AWS/ElasticBeanstalk/DeleteConfigurationTemplate.hs b/gen/Network/AWS/ElasticBeanstalk/DeleteConfigurationTemplate.hs
--- a/gen/Network/AWS/ElasticBeanstalk/DeleteConfigurationTemplate.hs
+++ b/gen/Network/AWS/ElasticBeanstalk/DeleteConfigurationTemplate.hs
@@ -80,11 +80,9 @@
 dctTemplateName = lens _dctTemplateName (\ s a -> s{_dctTemplateName = a});
 
 instance AWSRequest DeleteConfigurationTemplate where
-        type Sv DeleteConfigurationTemplate =
-             ElasticBeanstalk
         type Rs DeleteConfigurationTemplate =
              DeleteConfigurationTemplateResponse
-        request = postQuery
+        request = postQuery elasticBeanstalk
         response
           = receiveNull DeleteConfigurationTemplateResponse'
 
diff --git a/gen/Network/AWS/ElasticBeanstalk/DeleteEnvironmentConfiguration.hs b/gen/Network/AWS/ElasticBeanstalk/DeleteEnvironmentConfiguration.hs
--- a/gen/Network/AWS/ElasticBeanstalk/DeleteEnvironmentConfiguration.hs
+++ b/gen/Network/AWS/ElasticBeanstalk/DeleteEnvironmentConfiguration.hs
@@ -83,11 +83,9 @@
 
 instance AWSRequest DeleteEnvironmentConfiguration
          where
-        type Sv DeleteEnvironmentConfiguration =
-             ElasticBeanstalk
         type Rs DeleteEnvironmentConfiguration =
              DeleteEnvironmentConfigurationResponse
-        request = postQuery
+        request = postQuery elasticBeanstalk
         response
           = receiveNull DeleteEnvironmentConfigurationResponse'
 
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
@@ -78,11 +78,9 @@
 davsApplicationName = lens _davsApplicationName (\ s a -> s{_davsApplicationName = a});
 
 instance AWSRequest DescribeApplicationVersions where
-        type Sv DescribeApplicationVersions =
-             ElasticBeanstalk
         type Rs DescribeApplicationVersions =
              DescribeApplicationVersionsResponse
-        request = postQuery
+        request = postQuery elasticBeanstalk
         response
           = receiveXMLWrapper
               "DescribeApplicationVersionsResult"
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
@@ -68,10 +68,9 @@
 daApplicationNames = lens _daApplicationNames (\ s a -> s{_daApplicationNames = a}) . _Default . _Coerce;
 
 instance AWSRequest DescribeApplications where
-        type Sv DescribeApplications = ElasticBeanstalk
         type Rs DescribeApplications =
              DescribeApplicationsResponse
-        request = postQuery
+        request = postQuery elasticBeanstalk
         response
           = receiveXMLWrapper "DescribeApplicationsResult"
               (\ s h x ->
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
@@ -115,11 +115,9 @@
 
 instance AWSRequest DescribeConfigurationOptions
          where
-        type Sv DescribeConfigurationOptions =
-             ElasticBeanstalk
         type Rs DescribeConfigurationOptions =
              DescribeConfigurationOptionsResponse
-        request = postQuery
+        request = postQuery elasticBeanstalk
         response
           = receiveXMLWrapper
               "DescribeConfigurationOptionsResult"
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
@@ -111,11 +111,9 @@
 
 instance AWSRequest DescribeConfigurationSettings
          where
-        type Sv DescribeConfigurationSettings =
-             ElasticBeanstalk
         type Rs DescribeConfigurationSettings =
              DescribeConfigurationSettingsResponse
-        request = postQuery
+        request = postQuery elasticBeanstalk
         response
           = receiveXMLWrapper
               "DescribeConfigurationSettingsResult"
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
@@ -95,10 +95,9 @@
 dehAttributeNames = lens _dehAttributeNames (\ s a -> s{_dehAttributeNames = a}) . _Default . _Coerce;
 
 instance AWSRequest DescribeEnvironmentHealth where
-        type Sv DescribeEnvironmentHealth = ElasticBeanstalk
         type Rs DescribeEnvironmentHealth =
              DescribeEnvironmentHealthResponse
-        request = postQuery
+        request = postQuery elasticBeanstalk
         response
           = receiveXMLWrapper "DescribeEnvironmentHealthResult"
               (\ s h x ->
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
@@ -85,11 +85,9 @@
 
 instance AWSRequest DescribeEnvironmentResources
          where
-        type Sv DescribeEnvironmentResources =
-             ElasticBeanstalk
         type Rs DescribeEnvironmentResources =
              DescribeEnvironmentResourcesResponse
-        request = postQuery
+        request = postQuery elasticBeanstalk
         response
           = receiveXMLWrapper
               "DescribeEnvironmentResourcesResult"
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
@@ -122,10 +122,9 @@
 dIncludeDeleted = lens _dIncludeDeleted (\ s a -> s{_dIncludeDeleted = a});
 
 instance AWSRequest DescribeEnvironments where
-        type Sv DescribeEnvironments = ElasticBeanstalk
         type Rs DescribeEnvironments =
              DescribeEnvironmentsResponse
-        request = postQuery
+        request = postQuery elasticBeanstalk
         response
           = receiveXMLWrapper "DescribeEnvironmentsResult"
               (\ s h x ->
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
@@ -183,9 +183,8 @@
             Just $ rq & deNextToken .~ rs ^. dersNextToken
 
 instance AWSRequest DescribeEvents where
-        type Sv DescribeEvents = ElasticBeanstalk
         type Rs DescribeEvents = DescribeEventsResponse
-        request = postQuery
+        request = postQuery elasticBeanstalk
         response
           = receiveXMLWrapper "DescribeEventsResult"
               (\ s h x ->
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
@@ -101,10 +101,9 @@
 dihAttributeNames = lens _dihAttributeNames (\ s a -> s{_dihAttributeNames = a}) . _Default . _Coerce;
 
 instance AWSRequest DescribeInstancesHealth where
-        type Sv DescribeInstancesHealth = ElasticBeanstalk
         type Rs DescribeInstancesHealth =
              DescribeInstancesHealthResponse
-        request = postQuery
+        request = postQuery elasticBeanstalk
         response
           = receiveXMLWrapper "DescribeInstancesHealthResult"
               (\ s h x ->
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
@@ -54,11 +54,9 @@
 listAvailableSolutionStacks = ListAvailableSolutionStacks'
 
 instance AWSRequest ListAvailableSolutionStacks where
-        type Sv ListAvailableSolutionStacks =
-             ElasticBeanstalk
         type Rs ListAvailableSolutionStacks =
              ListAvailableSolutionStacksResponse
-        request = postQuery
+        request = postQuery elasticBeanstalk
         response
           = receiveXMLWrapper
               "ListAvailableSolutionStacksResult"
diff --git a/gen/Network/AWS/ElasticBeanstalk/RebuildEnvironment.hs b/gen/Network/AWS/ElasticBeanstalk/RebuildEnvironment.hs
--- a/gen/Network/AWS/ElasticBeanstalk/RebuildEnvironment.hs
+++ b/gen/Network/AWS/ElasticBeanstalk/RebuildEnvironment.hs
@@ -83,10 +83,9 @@
 reEnvironmentId = lens _reEnvironmentId (\ s a -> s{_reEnvironmentId = a});
 
 instance AWSRequest RebuildEnvironment where
-        type Sv RebuildEnvironment = ElasticBeanstalk
         type Rs RebuildEnvironment =
              RebuildEnvironmentResponse
-        request = postQuery
+        request = postQuery elasticBeanstalk
         response = receiveNull RebuildEnvironmentResponse'
 
 instance ToHeaders RebuildEnvironment where
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
@@ -112,10 +112,9 @@
 reiInfoType = lens _reiInfoType (\ s a -> s{_reiInfoType = a});
 
 instance AWSRequest RequestEnvironmentInfo where
-        type Sv RequestEnvironmentInfo = ElasticBeanstalk
         type Rs RequestEnvironmentInfo =
              RequestEnvironmentInfoResponse
-        request = postQuery
+        request = postQuery elasticBeanstalk
         response
           = receiveNull RequestEnvironmentInfoResponse'
 
diff --git a/gen/Network/AWS/ElasticBeanstalk/RestartAppServer.hs b/gen/Network/AWS/ElasticBeanstalk/RestartAppServer.hs
--- a/gen/Network/AWS/ElasticBeanstalk/RestartAppServer.hs
+++ b/gen/Network/AWS/ElasticBeanstalk/RestartAppServer.hs
@@ -82,9 +82,8 @@
 rasEnvironmentId = lens _rasEnvironmentId (\ s a -> s{_rasEnvironmentId = a});
 
 instance AWSRequest RestartAppServer where
-        type Sv RestartAppServer = ElasticBeanstalk
         type Rs RestartAppServer = RestartAppServerResponse
-        request = postQuery
+        request = postQuery elasticBeanstalk
         response = receiveNull RestartAppServerResponse'
 
 instance ToHeaders RestartAppServer where
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
@@ -105,10 +105,9 @@
 rInfoType = lens _rInfoType (\ s a -> s{_rInfoType = a});
 
 instance AWSRequest RetrieveEnvironmentInfo where
-        type Sv RetrieveEnvironmentInfo = ElasticBeanstalk
         type Rs RetrieveEnvironmentInfo =
              RetrieveEnvironmentInfoResponse
-        request = postQuery
+        request = postQuery elasticBeanstalk
         response
           = receiveXMLWrapper "RetrieveEnvironmentInfoResult"
               (\ s h x ->
diff --git a/gen/Network/AWS/ElasticBeanstalk/SwapEnvironmentCNAMEs.hs b/gen/Network/AWS/ElasticBeanstalk/SwapEnvironmentCNAMEs.hs
--- a/gen/Network/AWS/ElasticBeanstalk/SwapEnvironmentCNAMEs.hs
+++ b/gen/Network/AWS/ElasticBeanstalk/SwapEnvironmentCNAMEs.hs
@@ -109,10 +109,9 @@
 secnameSourceEnvironmentId = lens _secnameSourceEnvironmentId (\ s a -> s{_secnameSourceEnvironmentId = a});
 
 instance AWSRequest SwapEnvironmentCNAMEs where
-        type Sv SwapEnvironmentCNAMEs = ElasticBeanstalk
         type Rs SwapEnvironmentCNAMEs =
              SwapEnvironmentCNAMEsResponse
-        request = postQuery
+        request = postQuery elasticBeanstalk
         response = receiveNull SwapEnvironmentCNAMEsResponse'
 
 instance ToHeaders SwapEnvironmentCNAMEs where
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
@@ -128,9 +128,8 @@
 teEnvironmentId = lens _teEnvironmentId (\ s a -> s{_teEnvironmentId = a});
 
 instance AWSRequest TerminateEnvironment where
-        type Sv TerminateEnvironment = ElasticBeanstalk
         type Rs TerminateEnvironment = EnvironmentDescription
-        request = postQuery
+        request = postQuery elasticBeanstalk
         response
           = receiveXMLWrapper "TerminateEnvironmentResult"
               (\ s h x -> parseXML x)
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
@@ -1,5 +1,4 @@
 {-# LANGUAGE OverloadedStrings #-}
-{-# LANGUAGE TypeFamilies      #-}
 
 -- Derived from AWS service descriptions, licensed under Apache 2.0.
 
@@ -13,8 +12,8 @@
 --
 module Network.AWS.ElasticBeanstalk.Types
     (
-    -- * Service
-      ElasticBeanstalk
+    -- * Service Configuration
+      elasticBeanstalk
 
     -- * Errors
     , _InvalidRequestException
@@ -353,39 +352,36 @@
 import           Network.AWS.Prelude
 import           Network.AWS.Sign.V4
 
--- | Version @2010-12-01@ of the Amazon Elastic Beanstalk SDK.
-data ElasticBeanstalk
-
-instance AWSService ElasticBeanstalk where
-    type Sg ElasticBeanstalk = V4
-    service = const svc
-      where
-        svc =
-            Service
-            { _svcAbbrev = "ElasticBeanstalk"
-            , _svcPrefix = "elasticbeanstalk"
-            , _svcVersion = "2010-12-01"
-            , _svcEndpoint = defaultEndpoint svc
-            , _svcTimeout = Just 70
-            , _svcStatus = statusSuccess
-            , _svcError = parseXMLError
-            , _svcRetry = retry
-            }
-        retry =
-            Exponential
-            { _retryBase = 5.0e-2
-            , _retryGrowth = 2
-            , _retryAttempts = 5
-            , _retryCheck = check
-            }
-        check e
-          | has (hasCode "ThrottlingException" . hasStatus 400) e =
-              Just "throttling_exception"
-          | has (hasCode "Throttling" . hasStatus 400) e = Just "throttling"
-          | has (hasStatus 503) e = Just "service_unavailable"
-          | has (hasStatus 500) e = Just "general_server_error"
-          | has (hasStatus 509) e = Just "limit_exceeded"
-          | otherwise = Nothing
+-- | API version '2010-12-01' of the Amazon Elastic Beanstalk SDK configuration.
+elasticBeanstalk :: Service
+elasticBeanstalk =
+    Service
+    { _svcAbbrev = "ElasticBeanstalk"
+    , _svcSigner = v4
+    , _svcPrefix = "elasticbeanstalk"
+    , _svcVersion = "2010-12-01"
+    , _svcEndpoint = defaultEndpoint elasticBeanstalk
+    , _svcTimeout = Just 70
+    , _svcCheck = statusSuccess
+    , _svcError = parseXMLError
+    , _svcRetry = retry
+    }
+  where
+    retry =
+        Exponential
+        { _retryBase = 5.0e-2
+        , _retryGrowth = 2
+        , _retryAttempts = 5
+        , _retryCheck = check
+        }
+    check e
+      | has (hasCode "ThrottlingException" . hasStatus 400) e =
+          Just "throttling_exception"
+      | has (hasCode "Throttling" . hasStatus 400) e = Just "throttling"
+      | has (hasStatus 503) e = Just "service_unavailable"
+      | has (hasStatus 500) e = Just "general_server_error"
+      | has (hasStatus 509) e = Just "limit_exceeded"
+      | otherwise = Nothing
 
 -- | The request is invalid, please check parameters and their values
 _InvalidRequestException :: AsError a => Getting (First ServiceError) a ServiceError
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
@@ -2,7 +2,6 @@
 {-# LANGUAGE DeriveGeneric      #-}
 {-# LANGUAGE OverloadedStrings  #-}
 {-# LANGUAGE RecordWildCards    #-}
-{-# LANGUAGE TypeFamilies       #-}
 
 {-# OPTIONS_GHC -fno-warn-unused-imports #-}
 
diff --git a/gen/Network/AWS/ElasticBeanstalk/UpdateApplication.hs b/gen/Network/AWS/ElasticBeanstalk/UpdateApplication.hs
--- a/gen/Network/AWS/ElasticBeanstalk/UpdateApplication.hs
+++ b/gen/Network/AWS/ElasticBeanstalk/UpdateApplication.hs
@@ -83,10 +83,9 @@
 uaApplicationName = lens _uaApplicationName (\ s a -> s{_uaApplicationName = a});
 
 instance AWSRequest UpdateApplication where
-        type Sv UpdateApplication = ElasticBeanstalk
         type Rs UpdateApplication =
              ApplicationDescriptionMessage
-        request = postQuery
+        request = postQuery elasticBeanstalk
         response
           = receiveXMLWrapper "UpdateApplicationResult"
               (\ s h x -> parseXML x)
diff --git a/gen/Network/AWS/ElasticBeanstalk/UpdateApplicationVersion.hs b/gen/Network/AWS/ElasticBeanstalk/UpdateApplicationVersion.hs
--- a/gen/Network/AWS/ElasticBeanstalk/UpdateApplicationVersion.hs
+++ b/gen/Network/AWS/ElasticBeanstalk/UpdateApplicationVersion.hs
@@ -96,10 +96,9 @@
 uavVersionLabel = lens _uavVersionLabel (\ s a -> s{_uavVersionLabel = a});
 
 instance AWSRequest UpdateApplicationVersion where
-        type Sv UpdateApplicationVersion = ElasticBeanstalk
         type Rs UpdateApplicationVersion =
              ApplicationVersionDescriptionMessage
-        request = postQuery
+        request = postQuery elasticBeanstalk
         response
           = receiveXMLWrapper "UpdateApplicationVersionResult"
               (\ s h x -> parseXML x)
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
@@ -132,11 +132,9 @@
 uctTemplateName = lens _uctTemplateName (\ s a -> s{_uctTemplateName = a});
 
 instance AWSRequest UpdateConfigurationTemplate where
-        type Sv UpdateConfigurationTemplate =
-             ElasticBeanstalk
         type Rs UpdateConfigurationTemplate =
              ConfigurationSettingsDescription
-        request = postQuery
+        request = postQuery elasticBeanstalk
         response
           = receiveXMLWrapper
               "UpdateConfigurationTemplateResult"
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
@@ -191,9 +191,8 @@
 ueDescription = lens _ueDescription (\ s a -> s{_ueDescription = a});
 
 instance AWSRequest UpdateEnvironment where
-        type Sv UpdateEnvironment = ElasticBeanstalk
         type Rs UpdateEnvironment = EnvironmentDescription
-        request = postQuery
+        request = postQuery elasticBeanstalk
         response
           = receiveXMLWrapper "UpdateEnvironmentResult"
               (\ s h x -> parseXML x)
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
@@ -106,11 +106,9 @@
 
 instance AWSRequest ValidateConfigurationSettings
          where
-        type Sv ValidateConfigurationSettings =
-             ElasticBeanstalk
         type Rs ValidateConfigurationSettings =
              ValidateConfigurationSettingsResponse
-        request = postQuery
+        request = postQuery elasticBeanstalk
         response
           = receiveXMLWrapper
               "ValidateConfigurationSettingsResult"
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
@@ -394,190 +394,222 @@
 testDescribeApplicationsResponse = res
     "DescribeApplicationsResponse"
     "fixture/DescribeApplicationsResponse"
+    elasticBeanstalk
     (Proxy :: Proxy DescribeApplications)
 
 testCreateApplicationVersionResponse :: ApplicationVersionDescriptionMessage -> TestTree
 testCreateApplicationVersionResponse = res
     "CreateApplicationVersionResponse"
     "fixture/CreateApplicationVersionResponse"
+    elasticBeanstalk
     (Proxy :: Proxy CreateApplicationVersion)
 
 testUpdateEnvironmentResponse :: EnvironmentDescription -> TestTree
 testUpdateEnvironmentResponse = res
     "UpdateEnvironmentResponse"
     "fixture/UpdateEnvironmentResponse"
+    elasticBeanstalk
     (Proxy :: Proxy UpdateEnvironment)
 
 testTerminateEnvironmentResponse :: EnvironmentDescription -> TestTree
 testTerminateEnvironmentResponse = res
     "TerminateEnvironmentResponse"
     "fixture/TerminateEnvironmentResponse"
+    elasticBeanstalk
     (Proxy :: Proxy TerminateEnvironment)
 
 testDescribeEventsResponse :: DescribeEventsResponse -> TestTree
 testDescribeEventsResponse = res
     "DescribeEventsResponse"
     "fixture/DescribeEventsResponse"
+    elasticBeanstalk
     (Proxy :: Proxy DescribeEvents)
 
 testRequestEnvironmentInfoResponse :: RequestEnvironmentInfoResponse -> TestTree
 testRequestEnvironmentInfoResponse = res
     "RequestEnvironmentInfoResponse"
     "fixture/RequestEnvironmentInfoResponse"
+    elasticBeanstalk
     (Proxy :: Proxy RequestEnvironmentInfo)
 
 testRetrieveEnvironmentInfoResponse :: RetrieveEnvironmentInfoResponse -> TestTree
 testRetrieveEnvironmentInfoResponse = res
     "RetrieveEnvironmentInfoResponse"
     "fixture/RetrieveEnvironmentInfoResponse"
+    elasticBeanstalk
     (Proxy :: Proxy RetrieveEnvironmentInfo)
 
 testDeleteApplicationResponse :: DeleteApplicationResponse -> TestTree
 testDeleteApplicationResponse = res
     "DeleteApplicationResponse"
     "fixture/DeleteApplicationResponse"
+    elasticBeanstalk
     (Proxy :: Proxy DeleteApplication)
 
 testUpdateApplicationResponse :: ApplicationDescriptionMessage -> TestTree
 testUpdateApplicationResponse = res
     "UpdateApplicationResponse"
     "fixture/UpdateApplicationResponse"
+    elasticBeanstalk
     (Proxy :: Proxy UpdateApplication)
 
 testDescribeInstancesHealthResponse :: DescribeInstancesHealthResponse -> TestTree
 testDescribeInstancesHealthResponse = res
     "DescribeInstancesHealthResponse"
     "fixture/DescribeInstancesHealthResponse"
+    elasticBeanstalk
     (Proxy :: Proxy DescribeInstancesHealth)
 
 testCreateApplicationResponse :: ApplicationDescriptionMessage -> TestTree
 testCreateApplicationResponse = res
     "CreateApplicationResponse"
     "fixture/CreateApplicationResponse"
+    elasticBeanstalk
     (Proxy :: Proxy CreateApplication)
 
 testAbortEnvironmentUpdateResponse :: AbortEnvironmentUpdateResponse -> TestTree
 testAbortEnvironmentUpdateResponse = res
     "AbortEnvironmentUpdateResponse"
     "fixture/AbortEnvironmentUpdateResponse"
+    elasticBeanstalk
     (Proxy :: Proxy AbortEnvironmentUpdate)
 
 testDeleteApplicationVersionResponse :: DeleteApplicationVersionResponse -> TestTree
 testDeleteApplicationVersionResponse = res
     "DeleteApplicationVersionResponse"
     "fixture/DeleteApplicationVersionResponse"
+    elasticBeanstalk
     (Proxy :: Proxy DeleteApplicationVersion)
 
 testUpdateApplicationVersionResponse :: ApplicationVersionDescriptionMessage -> TestTree
 testUpdateApplicationVersionResponse = res
     "UpdateApplicationVersionResponse"
     "fixture/UpdateApplicationVersionResponse"
+    elasticBeanstalk
     (Proxy :: Proxy UpdateApplicationVersion)
 
 testDescribeEnvironmentResourcesResponse :: DescribeEnvironmentResourcesResponse -> TestTree
 testDescribeEnvironmentResourcesResponse = res
     "DescribeEnvironmentResourcesResponse"
     "fixture/DescribeEnvironmentResourcesResponse"
+    elasticBeanstalk
     (Proxy :: Proxy DescribeEnvironmentResources)
 
 testDeleteConfigurationTemplateResponse :: DeleteConfigurationTemplateResponse -> TestTree
 testDeleteConfigurationTemplateResponse = res
     "DeleteConfigurationTemplateResponse"
     "fixture/DeleteConfigurationTemplateResponse"
+    elasticBeanstalk
     (Proxy :: Proxy DeleteConfigurationTemplate)
 
 testUpdateConfigurationTemplateResponse :: ConfigurationSettingsDescription -> TestTree
 testUpdateConfigurationTemplateResponse = res
     "UpdateConfigurationTemplateResponse"
     "fixture/UpdateConfigurationTemplateResponse"
+    elasticBeanstalk
     (Proxy :: Proxy UpdateConfigurationTemplate)
 
 testDescribeEnvironmentHealthResponse :: DescribeEnvironmentHealthResponse -> TestTree
 testDescribeEnvironmentHealthResponse = res
     "DescribeEnvironmentHealthResponse"
     "fixture/DescribeEnvironmentHealthResponse"
+    elasticBeanstalk
     (Proxy :: Proxy DescribeEnvironmentHealth)
 
 testRebuildEnvironmentResponse :: RebuildEnvironmentResponse -> TestTree
 testRebuildEnvironmentResponse = res
     "RebuildEnvironmentResponse"
     "fixture/RebuildEnvironmentResponse"
+    elasticBeanstalk
     (Proxy :: Proxy RebuildEnvironment)
 
 testDeleteEnvironmentConfigurationResponse :: DeleteEnvironmentConfigurationResponse -> TestTree
 testDeleteEnvironmentConfigurationResponse = res
     "DeleteEnvironmentConfigurationResponse"
     "fixture/DeleteEnvironmentConfigurationResponse"
+    elasticBeanstalk
     (Proxy :: Proxy DeleteEnvironmentConfiguration)
 
 testCreateConfigurationTemplateResponse :: ConfigurationSettingsDescription -> TestTree
 testCreateConfigurationTemplateResponse = res
     "CreateConfigurationTemplateResponse"
     "fixture/CreateConfigurationTemplateResponse"
+    elasticBeanstalk
     (Proxy :: Proxy CreateConfigurationTemplate)
 
 testListAvailableSolutionStacksResponse :: ListAvailableSolutionStacksResponse -> TestTree
 testListAvailableSolutionStacksResponse = res
     "ListAvailableSolutionStacksResponse"
     "fixture/ListAvailableSolutionStacksResponse"
+    elasticBeanstalk
     (Proxy :: Proxy ListAvailableSolutionStacks)
 
 testSwapEnvironmentCNAMEsResponse :: SwapEnvironmentCNAMEsResponse -> TestTree
 testSwapEnvironmentCNAMEsResponse = res
     "SwapEnvironmentCNAMEsResponse"
     "fixture/SwapEnvironmentCNAMEsResponse"
+    elasticBeanstalk
     (Proxy :: Proxy SwapEnvironmentCNAMEs)
 
 testDescribeConfigurationOptionsResponse :: DescribeConfigurationOptionsResponse -> TestTree
 testDescribeConfigurationOptionsResponse = res
     "DescribeConfigurationOptionsResponse"
     "fixture/DescribeConfigurationOptionsResponse"
+    elasticBeanstalk
     (Proxy :: Proxy DescribeConfigurationOptions)
 
 testDescribeConfigurationSettingsResponse :: DescribeConfigurationSettingsResponse -> TestTree
 testDescribeConfigurationSettingsResponse = res
     "DescribeConfigurationSettingsResponse"
     "fixture/DescribeConfigurationSettingsResponse"
+    elasticBeanstalk
     (Proxy :: Proxy DescribeConfigurationSettings)
 
 testCreateStorageLocationResponse :: CreateStorageLocationResponse -> TestTree
 testCreateStorageLocationResponse = res
     "CreateStorageLocationResponse"
     "fixture/CreateStorageLocationResponse"
+    elasticBeanstalk
     (Proxy :: Proxy CreateStorageLocation)
 
 testDescribeEnvironmentsResponse :: DescribeEnvironmentsResponse -> TestTree
 testDescribeEnvironmentsResponse = res
     "DescribeEnvironmentsResponse"
     "fixture/DescribeEnvironmentsResponse"
+    elasticBeanstalk
     (Proxy :: Proxy DescribeEnvironments)
 
 testRestartAppServerResponse :: RestartAppServerResponse -> TestTree
 testRestartAppServerResponse = res
     "RestartAppServerResponse"
     "fixture/RestartAppServerResponse"
+    elasticBeanstalk
     (Proxy :: Proxy RestartAppServer)
 
 testValidateConfigurationSettingsResponse :: ValidateConfigurationSettingsResponse -> TestTree
 testValidateConfigurationSettingsResponse = res
     "ValidateConfigurationSettingsResponse"
     "fixture/ValidateConfigurationSettingsResponse"
+    elasticBeanstalk
     (Proxy :: Proxy ValidateConfigurationSettings)
 
 testDescribeApplicationVersionsResponse :: DescribeApplicationVersionsResponse -> TestTree
 testDescribeApplicationVersionsResponse = res
     "DescribeApplicationVersionsResponse"
     "fixture/DescribeApplicationVersionsResponse"
+    elasticBeanstalk
     (Proxy :: Proxy DescribeApplicationVersions)
 
 testCheckDNSAvailabilityResponse :: CheckDNSAvailabilityResponse -> TestTree
 testCheckDNSAvailabilityResponse = res
     "CheckDNSAvailabilityResponse"
     "fixture/CheckDNSAvailabilityResponse"
+    elasticBeanstalk
     (Proxy :: Proxy CheckDNSAvailability)
 
 testCreateEnvironmentResponse :: EnvironmentDescription -> TestTree
 testCreateEnvironmentResponse = res
     "CreateEnvironmentResponse"
     "fixture/CreateEnvironmentResponse"
+    elasticBeanstalk
     (Proxy :: Proxy CreateEnvironment)
