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-elb.cabal b/amazonka-elb.cabal
--- a/amazonka-elb.cabal
+++ b/amazonka-elb.cabal
@@ -1,5 +1,5 @@
 name:                  amazonka-elb
-version:               1.1.0
+version:               1.2.0
 synopsis:              Amazon Elastic Load Balancing SDK.
 homepage:              https://github.com/brendanhay/amazonka
 license:               OtherLicense
@@ -93,7 +93,7 @@
         , Network.AWS.ELB.Types.Sum
 
     build-depends:
-          amazonka-core == 1.1.0.*
+          amazonka-core == 1.2.0.*
         , base          >= 4.7     && < 5
 
 test-suite amazonka-elb-test
@@ -112,9 +112,9 @@
         , Test.AWS.ELB.Internal
 
     build-depends:
-          amazonka-core == 1.1.0
-        , amazonka-test == 1.1.0
-        , amazonka-elb == 1.1.0
+          amazonka-core == 1.2.0
+        , amazonka-test == 1.2.0
+        , amazonka-elb == 1.2.0
         , base
         , bytestring
         , lens
diff --git a/gen/Network/AWS/ELB.hs b/gen/Network/AWS/ELB.hs
--- a/gen/Network/AWS/ELB.hs
+++ b/gen/Network/AWS/ELB.hs
@@ -32,8 +32,8 @@
 -- /See:/ <http://docs.aws.amazon.com/ElasticLoadBalancing/latest/APIReference/Welcome.html AWS API Reference>
 module Network.AWS.ELB
     (
-    -- * Service
-      ELB
+    -- * Service Configuration
+      eLB
 
     -- * Errors
     -- $errors
diff --git a/gen/Network/AWS/ELB/AddTags.hs b/gen/Network/AWS/ELB/AddTags.hs
--- a/gen/Network/AWS/ELB/AddTags.hs
+++ b/gen/Network/AWS/ELB/AddTags.hs
@@ -83,9 +83,8 @@
 atTags = lens _atTags (\ s a -> s{_atTags = a}) . _List1;
 
 instance AWSRequest AddTags where
-        type Sv AddTags = ELB
         type Rs AddTags = AddTagsResponse
-        request = postQuery
+        request = postQuery eLB
         response
           = receiveXMLWrapper "AddTagsResult"
               (\ s h x -> AddTagsResponse' <$> (pure (fromEnum s)))
diff --git a/gen/Network/AWS/ELB/ApplySecurityGroupsToLoadBalancer.hs b/gen/Network/AWS/ELB/ApplySecurityGroupsToLoadBalancer.hs
--- a/gen/Network/AWS/ELB/ApplySecurityGroupsToLoadBalancer.hs
+++ b/gen/Network/AWS/ELB/ApplySecurityGroupsToLoadBalancer.hs
@@ -83,10 +83,9 @@
 
 instance AWSRequest ApplySecurityGroupsToLoadBalancer
          where
-        type Sv ApplySecurityGroupsToLoadBalancer = ELB
         type Rs ApplySecurityGroupsToLoadBalancer =
              ApplySecurityGroupsToLoadBalancerResponse
-        request = postQuery
+        request = postQuery eLB
         response
           = receiveXMLWrapper
               "ApplySecurityGroupsToLoadBalancerResult"
diff --git a/gen/Network/AWS/ELB/AttachLoadBalancerToSubnets.hs b/gen/Network/AWS/ELB/AttachLoadBalancerToSubnets.hs
--- a/gen/Network/AWS/ELB/AttachLoadBalancerToSubnets.hs
+++ b/gen/Network/AWS/ELB/AttachLoadBalancerToSubnets.hs
@@ -82,10 +82,9 @@
 albtsSubnets = lens _albtsSubnets (\ s a -> s{_albtsSubnets = a}) . _Coerce;
 
 instance AWSRequest AttachLoadBalancerToSubnets where
-        type Sv AttachLoadBalancerToSubnets = ELB
         type Rs AttachLoadBalancerToSubnets =
              AttachLoadBalancerToSubnetsResponse
-        request = postQuery
+        request = postQuery eLB
         response
           = receiveXMLWrapper
               "AttachLoadBalancerToSubnetsResult"
diff --git a/gen/Network/AWS/ELB/ConfigureHealthCheck.hs b/gen/Network/AWS/ELB/ConfigureHealthCheck.hs
--- a/gen/Network/AWS/ELB/ConfigureHealthCheck.hs
+++ b/gen/Network/AWS/ELB/ConfigureHealthCheck.hs
@@ -81,10 +81,9 @@
 chcHealthCheck = lens _chcHealthCheck (\ s a -> s{_chcHealthCheck = a});
 
 instance AWSRequest ConfigureHealthCheck where
-        type Sv ConfigureHealthCheck = ELB
         type Rs ConfigureHealthCheck =
              ConfigureHealthCheckResponse
-        request = postQuery
+        request = postQuery eLB
         response
           = receiveXMLWrapper "ConfigureHealthCheckResult"
               (\ s h x ->
diff --git a/gen/Network/AWS/ELB/CreateAppCookieStickinessPolicy.hs b/gen/Network/AWS/ELB/CreateAppCookieStickinessPolicy.hs
--- a/gen/Network/AWS/ELB/CreateAppCookieStickinessPolicy.hs
+++ b/gen/Network/AWS/ELB/CreateAppCookieStickinessPolicy.hs
@@ -103,10 +103,9 @@
 
 instance AWSRequest CreateAppCookieStickinessPolicy
          where
-        type Sv CreateAppCookieStickinessPolicy = ELB
         type Rs CreateAppCookieStickinessPolicy =
              CreateAppCookieStickinessPolicyResponse
-        request = postQuery
+        request = postQuery eLB
         response
           = receiveXMLWrapper
               "CreateAppCookieStickinessPolicyResult"
diff --git a/gen/Network/AWS/ELB/CreateLBCookieStickinessPolicy.hs b/gen/Network/AWS/ELB/CreateLBCookieStickinessPolicy.hs
--- a/gen/Network/AWS/ELB/CreateLBCookieStickinessPolicy.hs
+++ b/gen/Network/AWS/ELB/CreateLBCookieStickinessPolicy.hs
@@ -107,10 +107,9 @@
 
 instance AWSRequest CreateLBCookieStickinessPolicy
          where
-        type Sv CreateLBCookieStickinessPolicy = ELB
         type Rs CreateLBCookieStickinessPolicy =
              CreateLBCookieStickinessPolicyResponse
-        request = postQuery
+        request = postQuery eLB
         response
           = receiveXMLWrapper
               "CreateLBCookieStickinessPolicyResult"
diff --git a/gen/Network/AWS/ELB/CreateLoadBalancer.hs b/gen/Network/AWS/ELB/CreateLoadBalancer.hs
--- a/gen/Network/AWS/ELB/CreateLoadBalancer.hs
+++ b/gen/Network/AWS/ELB/CreateLoadBalancer.hs
@@ -164,10 +164,9 @@
 clbListeners = lens _clbListeners (\ s a -> s{_clbListeners = a}) . _Coerce;
 
 instance AWSRequest CreateLoadBalancer where
-        type Sv CreateLoadBalancer = ELB
         type Rs CreateLoadBalancer =
              CreateLoadBalancerResponse
-        request = postQuery
+        request = postQuery eLB
         response
           = receiveXMLWrapper "CreateLoadBalancerResult"
               (\ s h x ->
diff --git a/gen/Network/AWS/ELB/CreateLoadBalancerListeners.hs b/gen/Network/AWS/ELB/CreateLoadBalancerListeners.hs
--- a/gen/Network/AWS/ELB/CreateLoadBalancerListeners.hs
+++ b/gen/Network/AWS/ELB/CreateLoadBalancerListeners.hs
@@ -81,10 +81,9 @@
 clblListeners = lens _clblListeners (\ s a -> s{_clblListeners = a}) . _Coerce;
 
 instance AWSRequest CreateLoadBalancerListeners where
-        type Sv CreateLoadBalancerListeners = ELB
         type Rs CreateLoadBalancerListeners =
              CreateLoadBalancerListenersResponse
-        request = postQuery
+        request = postQuery eLB
         response
           = receiveXMLWrapper
               "CreateLoadBalancerListenersResult"
diff --git a/gen/Network/AWS/ELB/CreateLoadBalancerPolicy.hs b/gen/Network/AWS/ELB/CreateLoadBalancerPolicy.hs
--- a/gen/Network/AWS/ELB/CreateLoadBalancerPolicy.hs
+++ b/gen/Network/AWS/ELB/CreateLoadBalancerPolicy.hs
@@ -101,10 +101,9 @@
 clbpPolicyTypeName = lens _clbpPolicyTypeName (\ s a -> s{_clbpPolicyTypeName = a});
 
 instance AWSRequest CreateLoadBalancerPolicy where
-        type Sv CreateLoadBalancerPolicy = ELB
         type Rs CreateLoadBalancerPolicy =
              CreateLoadBalancerPolicyResponse
-        request = postQuery
+        request = postQuery eLB
         response
           = receiveXMLWrapper "CreateLoadBalancerPolicyResult"
               (\ s h x ->
diff --git a/gen/Network/AWS/ELB/DeleteLoadBalancer.hs b/gen/Network/AWS/ELB/DeleteLoadBalancer.hs
--- a/gen/Network/AWS/ELB/DeleteLoadBalancer.hs
+++ b/gen/Network/AWS/ELB/DeleteLoadBalancer.hs
@@ -74,10 +74,9 @@
 dlbLoadBalancerName = lens _dlbLoadBalancerName (\ s a -> s{_dlbLoadBalancerName = a});
 
 instance AWSRequest DeleteLoadBalancer where
-        type Sv DeleteLoadBalancer = ELB
         type Rs DeleteLoadBalancer =
              DeleteLoadBalancerResponse
-        request = postQuery
+        request = postQuery eLB
         response
           = receiveXMLWrapper "DeleteLoadBalancerResult"
               (\ s h x ->
diff --git a/gen/Network/AWS/ELB/DeleteLoadBalancerListeners.hs b/gen/Network/AWS/ELB/DeleteLoadBalancerListeners.hs
--- a/gen/Network/AWS/ELB/DeleteLoadBalancerListeners.hs
+++ b/gen/Network/AWS/ELB/DeleteLoadBalancerListeners.hs
@@ -74,10 +74,9 @@
 dlblLoadBalancerPorts = lens _dlblLoadBalancerPorts (\ s a -> s{_dlblLoadBalancerPorts = a}) . _Coerce;
 
 instance AWSRequest DeleteLoadBalancerListeners where
-        type Sv DeleteLoadBalancerListeners = ELB
         type Rs DeleteLoadBalancerListeners =
              DeleteLoadBalancerListenersResponse
-        request = postQuery
+        request = postQuery eLB
         response
           = receiveXMLWrapper
               "DeleteLoadBalancerListenersResult"
diff --git a/gen/Network/AWS/ELB/DeleteLoadBalancerPolicy.hs b/gen/Network/AWS/ELB/DeleteLoadBalancerPolicy.hs
--- a/gen/Network/AWS/ELB/DeleteLoadBalancerPolicy.hs
+++ b/gen/Network/AWS/ELB/DeleteLoadBalancerPolicy.hs
@@ -78,10 +78,9 @@
 dPolicyName = lens _dPolicyName (\ s a -> s{_dPolicyName = a});
 
 instance AWSRequest DeleteLoadBalancerPolicy where
-        type Sv DeleteLoadBalancerPolicy = ELB
         type Rs DeleteLoadBalancerPolicy =
              DeleteLoadBalancerPolicyResponse
-        request = postQuery
+        request = postQuery eLB
         response
           = receiveXMLWrapper "DeleteLoadBalancerPolicyResult"
               (\ s h x ->
diff --git a/gen/Network/AWS/ELB/DeregisterInstancesFromLoadBalancer.hs b/gen/Network/AWS/ELB/DeregisterInstancesFromLoadBalancer.hs
--- a/gen/Network/AWS/ELB/DeregisterInstancesFromLoadBalancer.hs
+++ b/gen/Network/AWS/ELB/DeregisterInstancesFromLoadBalancer.hs
@@ -85,10 +85,9 @@
 
 instance AWSRequest
          DeregisterInstancesFromLoadBalancer where
-        type Sv DeregisterInstancesFromLoadBalancer = ELB
         type Rs DeregisterInstancesFromLoadBalancer =
              DeregisterInstancesFromLoadBalancerResponse
-        request = postQuery
+        request = postQuery eLB
         response
           = receiveXMLWrapper
               "DeregisterInstancesFromLoadBalancerResult"
diff --git a/gen/Network/AWS/ELB/DescribeInstanceHealth.hs b/gen/Network/AWS/ELB/DescribeInstanceHealth.hs
--- a/gen/Network/AWS/ELB/DescribeInstanceHealth.hs
+++ b/gen/Network/AWS/ELB/DescribeInstanceHealth.hs
@@ -78,10 +78,9 @@
 dihLoadBalancerName = lens _dihLoadBalancerName (\ s a -> s{_dihLoadBalancerName = a});
 
 instance AWSRequest DescribeInstanceHealth where
-        type Sv DescribeInstanceHealth = ELB
         type Rs DescribeInstanceHealth =
              DescribeInstanceHealthResponse
-        request = postQuery
+        request = postQuery eLB
         response
           = receiveXMLWrapper "DescribeInstanceHealthResult"
               (\ s h x ->
diff --git a/gen/Network/AWS/ELB/DescribeLoadBalancerAttributes.hs b/gen/Network/AWS/ELB/DescribeLoadBalancerAttributes.hs
--- a/gen/Network/AWS/ELB/DescribeLoadBalancerAttributes.hs
+++ b/gen/Network/AWS/ELB/DescribeLoadBalancerAttributes.hs
@@ -67,10 +67,9 @@
 
 instance AWSRequest DescribeLoadBalancerAttributes
          where
-        type Sv DescribeLoadBalancerAttributes = ELB
         type Rs DescribeLoadBalancerAttributes =
              DescribeLoadBalancerAttributesResponse
-        request = postQuery
+        request = postQuery eLB
         response
           = receiveXMLWrapper
               "DescribeLoadBalancerAttributesResult"
diff --git a/gen/Network/AWS/ELB/DescribeLoadBalancerPolicies.hs b/gen/Network/AWS/ELB/DescribeLoadBalancerPolicies.hs
--- a/gen/Network/AWS/ELB/DescribeLoadBalancerPolicies.hs
+++ b/gen/Network/AWS/ELB/DescribeLoadBalancerPolicies.hs
@@ -83,10 +83,9 @@
 
 instance AWSRequest DescribeLoadBalancerPolicies
          where
-        type Sv DescribeLoadBalancerPolicies = ELB
         type Rs DescribeLoadBalancerPolicies =
              DescribeLoadBalancerPoliciesResponse
-        request = postQuery
+        request = postQuery eLB
         response
           = receiveXMLWrapper
               "DescribeLoadBalancerPoliciesResult"
diff --git a/gen/Network/AWS/ELB/DescribeLoadBalancerPolicyTypes.hs b/gen/Network/AWS/ELB/DescribeLoadBalancerPolicyTypes.hs
--- a/gen/Network/AWS/ELB/DescribeLoadBalancerPolicyTypes.hs
+++ b/gen/Network/AWS/ELB/DescribeLoadBalancerPolicyTypes.hs
@@ -70,10 +70,9 @@
 
 instance AWSRequest DescribeLoadBalancerPolicyTypes
          where
-        type Sv DescribeLoadBalancerPolicyTypes = ELB
         type Rs DescribeLoadBalancerPolicyTypes =
              DescribeLoadBalancerPolicyTypesResponse
-        request = postQuery
+        request = postQuery eLB
         response
           = receiveXMLWrapper
               "DescribeLoadBalancerPolicyTypesResult"
diff --git a/gen/Network/AWS/ELB/DescribeLoadBalancers.hs b/gen/Network/AWS/ELB/DescribeLoadBalancers.hs
--- a/gen/Network/AWS/ELB/DescribeLoadBalancers.hs
+++ b/gen/Network/AWS/ELB/DescribeLoadBalancers.hs
@@ -98,10 +98,9 @@
             Just $ rq & dlbMarker .~ rs ^. dlbrsNextMarker
 
 instance AWSRequest DescribeLoadBalancers where
-        type Sv DescribeLoadBalancers = ELB
         type Rs DescribeLoadBalancers =
              DescribeLoadBalancersResponse
-        request = postQuery
+        request = postQuery eLB
         response
           = receiveXMLWrapper "DescribeLoadBalancersResult"
               (\ s h x ->
diff --git a/gen/Network/AWS/ELB/DescribeTags.hs b/gen/Network/AWS/ELB/DescribeTags.hs
--- a/gen/Network/AWS/ELB/DescribeTags.hs
+++ b/gen/Network/AWS/ELB/DescribeTags.hs
@@ -66,9 +66,8 @@
 dtLoadBalancerNames = lens _dtLoadBalancerNames (\ s a -> s{_dtLoadBalancerNames = a}) . _List1;
 
 instance AWSRequest DescribeTags where
-        type Sv DescribeTags = ELB
         type Rs DescribeTags = DescribeTagsResponse
-        request = postQuery
+        request = postQuery eLB
         response
           = receiveXMLWrapper "DescribeTagsResult"
               (\ s h x ->
diff --git a/gen/Network/AWS/ELB/DetachLoadBalancerFromSubnets.hs b/gen/Network/AWS/ELB/DetachLoadBalancerFromSubnets.hs
--- a/gen/Network/AWS/ELB/DetachLoadBalancerFromSubnets.hs
+++ b/gen/Network/AWS/ELB/DetachLoadBalancerFromSubnets.hs
@@ -82,10 +82,9 @@
 
 instance AWSRequest DetachLoadBalancerFromSubnets
          where
-        type Sv DetachLoadBalancerFromSubnets = ELB
         type Rs DetachLoadBalancerFromSubnets =
              DetachLoadBalancerFromSubnetsResponse
-        request = postQuery
+        request = postQuery eLB
         response
           = receiveXMLWrapper
               "DetachLoadBalancerFromSubnetsResult"
diff --git a/gen/Network/AWS/ELB/DisableAvailabilityZonesForLoadBalancer.hs b/gen/Network/AWS/ELB/DisableAvailabilityZonesForLoadBalancer.hs
--- a/gen/Network/AWS/ELB/DisableAvailabilityZonesForLoadBalancer.hs
+++ b/gen/Network/AWS/ELB/DisableAvailabilityZonesForLoadBalancer.hs
@@ -88,10 +88,9 @@
 
 instance AWSRequest
          DisableAvailabilityZonesForLoadBalancer where
-        type Sv DisableAvailabilityZonesForLoadBalancer = ELB
         type Rs DisableAvailabilityZonesForLoadBalancer =
              DisableAvailabilityZonesForLoadBalancerResponse
-        request = postQuery
+        request = postQuery eLB
         response
           = receiveXMLWrapper
               "DisableAvailabilityZonesForLoadBalancerResult"
diff --git a/gen/Network/AWS/ELB/EnableAvailabilityZonesForLoadBalancer.hs b/gen/Network/AWS/ELB/EnableAvailabilityZonesForLoadBalancer.hs
--- a/gen/Network/AWS/ELB/EnableAvailabilityZonesForLoadBalancer.hs
+++ b/gen/Network/AWS/ELB/EnableAvailabilityZonesForLoadBalancer.hs
@@ -85,10 +85,9 @@
 
 instance AWSRequest
          EnableAvailabilityZonesForLoadBalancer where
-        type Sv EnableAvailabilityZonesForLoadBalancer = ELB
         type Rs EnableAvailabilityZonesForLoadBalancer =
              EnableAvailabilityZonesForLoadBalancerResponse
-        request = postQuery
+        request = postQuery eLB
         response
           = receiveXMLWrapper
               "EnableAvailabilityZonesForLoadBalancerResult"
diff --git a/gen/Network/AWS/ELB/ModifyLoadBalancerAttributes.hs b/gen/Network/AWS/ELB/ModifyLoadBalancerAttributes.hs
--- a/gen/Network/AWS/ELB/ModifyLoadBalancerAttributes.hs
+++ b/gen/Network/AWS/ELB/ModifyLoadBalancerAttributes.hs
@@ -92,10 +92,9 @@
 
 instance AWSRequest ModifyLoadBalancerAttributes
          where
-        type Sv ModifyLoadBalancerAttributes = ELB
         type Rs ModifyLoadBalancerAttributes =
              ModifyLoadBalancerAttributesResponse
-        request = postQuery
+        request = postQuery eLB
         response
           = receiveXMLWrapper
               "ModifyLoadBalancerAttributesResult"
diff --git a/gen/Network/AWS/ELB/RegisterInstancesWithLoadBalancer.hs b/gen/Network/AWS/ELB/RegisterInstancesWithLoadBalancer.hs
--- a/gen/Network/AWS/ELB/RegisterInstancesWithLoadBalancer.hs
+++ b/gen/Network/AWS/ELB/RegisterInstancesWithLoadBalancer.hs
@@ -106,10 +106,9 @@
 
 instance AWSRequest RegisterInstancesWithLoadBalancer
          where
-        type Sv RegisterInstancesWithLoadBalancer = ELB
         type Rs RegisterInstancesWithLoadBalancer =
              RegisterInstancesWithLoadBalancerResponse
-        request = postQuery
+        request = postQuery eLB
         response
           = receiveXMLWrapper
               "RegisterInstancesWithLoadBalancerResult"
diff --git a/gen/Network/AWS/ELB/RemoveTags.hs b/gen/Network/AWS/ELB/RemoveTags.hs
--- a/gen/Network/AWS/ELB/RemoveTags.hs
+++ b/gen/Network/AWS/ELB/RemoveTags.hs
@@ -75,9 +75,8 @@
 rtTags = lens _rtTags (\ s a -> s{_rtTags = a}) . _List1;
 
 instance AWSRequest RemoveTags where
-        type Sv RemoveTags = ELB
         type Rs RemoveTags = RemoveTagsResponse
-        request = postQuery
+        request = postQuery eLB
         response
           = receiveXMLWrapper "RemoveTagsResult"
               (\ s h x ->
diff --git a/gen/Network/AWS/ELB/SetLoadBalancerListenerSSLCertificate.hs b/gen/Network/AWS/ELB/SetLoadBalancerListenerSSLCertificate.hs
--- a/gen/Network/AWS/ELB/SetLoadBalancerListenerSSLCertificate.hs
+++ b/gen/Network/AWS/ELB/SetLoadBalancerListenerSSLCertificate.hs
@@ -92,10 +92,9 @@
 
 instance AWSRequest
          SetLoadBalancerListenerSSLCertificate where
-        type Sv SetLoadBalancerListenerSSLCertificate = ELB
         type Rs SetLoadBalancerListenerSSLCertificate =
              SetLoadBalancerListenerSSLCertificateResponse
-        request = postQuery
+        request = postQuery eLB
         response
           = receiveXMLWrapper
               "SetLoadBalancerListenerSSLCertificateResult"
diff --git a/gen/Network/AWS/ELB/SetLoadBalancerPoliciesForBackendServer.hs b/gen/Network/AWS/ELB/SetLoadBalancerPoliciesForBackendServer.hs
--- a/gen/Network/AWS/ELB/SetLoadBalancerPoliciesForBackendServer.hs
+++ b/gen/Network/AWS/ELB/SetLoadBalancerPoliciesForBackendServer.hs
@@ -97,10 +97,9 @@
 
 instance AWSRequest
          SetLoadBalancerPoliciesForBackendServer where
-        type Sv SetLoadBalancerPoliciesForBackendServer = ELB
         type Rs SetLoadBalancerPoliciesForBackendServer =
              SetLoadBalancerPoliciesForBackendServerResponse
-        request = postQuery
+        request = postQuery eLB
         response
           = receiveXMLWrapper
               "SetLoadBalancerPoliciesForBackendServerResult"
diff --git a/gen/Network/AWS/ELB/SetLoadBalancerPoliciesOfListener.hs b/gen/Network/AWS/ELB/SetLoadBalancerPoliciesOfListener.hs
--- a/gen/Network/AWS/ELB/SetLoadBalancerPoliciesOfListener.hs
+++ b/gen/Network/AWS/ELB/SetLoadBalancerPoliciesOfListener.hs
@@ -88,10 +88,9 @@
 
 instance AWSRequest SetLoadBalancerPoliciesOfListener
          where
-        type Sv SetLoadBalancerPoliciesOfListener = ELB
         type Rs SetLoadBalancerPoliciesOfListener =
              SetLoadBalancerPoliciesOfListenerResponse
-        request = postQuery
+        request = postQuery eLB
         response
           = receiveXMLWrapper
               "SetLoadBalancerPoliciesOfListenerResult"
diff --git a/gen/Network/AWS/ELB/Types.hs b/gen/Network/AWS/ELB/Types.hs
--- a/gen/Network/AWS/ELB/Types.hs
+++ b/gen/Network/AWS/ELB/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.ELB.Types
     (
-    -- * Service
-      ELB
+    -- * Service Configuration
+      eLB
 
     -- * Errors
     , _PolicyNotFoundException
@@ -222,39 +221,36 @@
 import           Network.AWS.Prelude
 import           Network.AWS.Sign.V4
 
--- | Version @2012-06-01@ of the Amazon Elastic Load Balancing SDK.
-data ELB
-
-instance AWSService ELB where
-    type Sg ELB = V4
-    service = const svc
-      where
-        svc =
-            Service
-            { _svcAbbrev = "ELB"
-            , _svcPrefix = "elasticloadbalancing"
-            , _svcVersion = "2012-06-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 '2012-06-01' of the Amazon Elastic Load Balancing SDK configuration.
+eLB :: Service
+eLB =
+    Service
+    { _svcAbbrev = "ELB"
+    , _svcSigner = v4
+    , _svcPrefix = "elasticloadbalancing"
+    , _svcVersion = "2012-06-01"
+    , _svcEndpoint = defaultEndpoint eLB
+    , _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
 
 -- | One or more of the specified policies do not exist.
 _PolicyNotFoundException :: AsError a => Getting (First ServiceError) a ServiceError
diff --git a/gen/Network/AWS/ELB/Types/Product.hs b/gen/Network/AWS/ELB/Types/Product.hs
--- a/gen/Network/AWS/ELB/Types/Product.hs
+++ b/gen/Network/AWS/ELB/Types/Product.hs
@@ -2,7 +2,6 @@
 {-# LANGUAGE DeriveGeneric      #-}
 {-# LANGUAGE OverloadedStrings  #-}
 {-# LANGUAGE RecordWildCards    #-}
-{-# LANGUAGE TypeFamilies       #-}
 
 {-# OPTIONS_GHC -fno-warn-unused-imports #-}
 
diff --git a/test/Test/AWS/Gen/ELB.hs b/test/Test/AWS/Gen/ELB.hs
--- a/test/Test/AWS/Gen/ELB.hs
+++ b/test/Test/AWS/Gen/ELB.hs
@@ -350,166 +350,194 @@
 testDescribeLoadBalancerPolicyTypesResponse = res
     "DescribeLoadBalancerPolicyTypesResponse"
     "fixture/DescribeLoadBalancerPolicyTypesResponse"
+    eLB
     (Proxy :: Proxy DescribeLoadBalancerPolicyTypes)
 
 testDescribeTagsResponse :: DescribeTagsResponse -> TestTree
 testDescribeTagsResponse = res
     "DescribeTagsResponse"
     "fixture/DescribeTagsResponse"
+    eLB
     (Proxy :: Proxy DescribeTags)
 
 testDescribeLoadBalancersResponse :: DescribeLoadBalancersResponse -> TestTree
 testDescribeLoadBalancersResponse = res
     "DescribeLoadBalancersResponse"
     "fixture/DescribeLoadBalancersResponse"
+    eLB
     (Proxy :: Proxy DescribeLoadBalancers)
 
 testApplySecurityGroupsToLoadBalancerResponse :: ApplySecurityGroupsToLoadBalancerResponse -> TestTree
 testApplySecurityGroupsToLoadBalancerResponse = res
     "ApplySecurityGroupsToLoadBalancerResponse"
     "fixture/ApplySecurityGroupsToLoadBalancerResponse"
+    eLB
     (Proxy :: Proxy ApplySecurityGroupsToLoadBalancer)
 
 testRemoveTagsResponse :: RemoveTagsResponse -> TestTree
 testRemoveTagsResponse = res
     "RemoveTagsResponse"
     "fixture/RemoveTagsResponse"
+    eLB
     (Proxy :: Proxy RemoveTags)
 
 testCreateLBCookieStickinessPolicyResponse :: CreateLBCookieStickinessPolicyResponse -> TestTree
 testCreateLBCookieStickinessPolicyResponse = res
     "CreateLBCookieStickinessPolicyResponse"
     "fixture/CreateLBCookieStickinessPolicyResponse"
+    eLB
     (Proxy :: Proxy CreateLBCookieStickinessPolicy)
 
 testDeleteLoadBalancerResponse :: DeleteLoadBalancerResponse -> TestTree
 testDeleteLoadBalancerResponse = res
     "DeleteLoadBalancerResponse"
     "fixture/DeleteLoadBalancerResponse"
+    eLB
     (Proxy :: Proxy DeleteLoadBalancer)
 
 testCreateLoadBalancerPolicyResponse :: CreateLoadBalancerPolicyResponse -> TestTree
 testCreateLoadBalancerPolicyResponse = res
     "CreateLoadBalancerPolicyResponse"
     "fixture/CreateLoadBalancerPolicyResponse"
+    eLB
     (Proxy :: Proxy CreateLoadBalancerPolicy)
 
 testDeregisterInstancesFromLoadBalancerResponse :: DeregisterInstancesFromLoadBalancerResponse -> TestTree
 testDeregisterInstancesFromLoadBalancerResponse = res
     "DeregisterInstancesFromLoadBalancerResponse"
     "fixture/DeregisterInstancesFromLoadBalancerResponse"
+    eLB
     (Proxy :: Proxy DeregisterInstancesFromLoadBalancer)
 
 testDescribeLoadBalancerPoliciesResponse :: DescribeLoadBalancerPoliciesResponse -> TestTree
 testDescribeLoadBalancerPoliciesResponse = res
     "DescribeLoadBalancerPoliciesResponse"
     "fixture/DescribeLoadBalancerPoliciesResponse"
+    eLB
     (Proxy :: Proxy DescribeLoadBalancerPolicies)
 
 testDisableAvailabilityZonesForLoadBalancerResponse :: DisableAvailabilityZonesForLoadBalancerResponse -> TestTree
 testDisableAvailabilityZonesForLoadBalancerResponse = res
     "DisableAvailabilityZonesForLoadBalancerResponse"
     "fixture/DisableAvailabilityZonesForLoadBalancerResponse"
+    eLB
     (Proxy :: Proxy DisableAvailabilityZonesForLoadBalancer)
 
 testSetLoadBalancerPoliciesForBackendServerResponse :: SetLoadBalancerPoliciesForBackendServerResponse -> TestTree
 testSetLoadBalancerPoliciesForBackendServerResponse = res
     "SetLoadBalancerPoliciesForBackendServerResponse"
     "fixture/SetLoadBalancerPoliciesForBackendServerResponse"
+    eLB
     (Proxy :: Proxy SetLoadBalancerPoliciesForBackendServer)
 
 testEnableAvailabilityZonesForLoadBalancerResponse :: EnableAvailabilityZonesForLoadBalancerResponse -> TestTree
 testEnableAvailabilityZonesForLoadBalancerResponse = res
     "EnableAvailabilityZonesForLoadBalancerResponse"
     "fixture/EnableAvailabilityZonesForLoadBalancerResponse"
+    eLB
     (Proxy :: Proxy EnableAvailabilityZonesForLoadBalancer)
 
 testSetLoadBalancerListenerSSLCertificateResponse :: SetLoadBalancerListenerSSLCertificateResponse -> TestTree
 testSetLoadBalancerListenerSSLCertificateResponse = res
     "SetLoadBalancerListenerSSLCertificateResponse"
     "fixture/SetLoadBalancerListenerSSLCertificateResponse"
+    eLB
     (Proxy :: Proxy SetLoadBalancerListenerSSLCertificate)
 
 testConfigureHealthCheckResponse :: ConfigureHealthCheckResponse -> TestTree
 testConfigureHealthCheckResponse = res
     "ConfigureHealthCheckResponse"
     "fixture/ConfigureHealthCheckResponse"
+    eLB
     (Proxy :: Proxy ConfigureHealthCheck)
 
 testAttachLoadBalancerToSubnetsResponse :: AttachLoadBalancerToSubnetsResponse -> TestTree
 testAttachLoadBalancerToSubnetsResponse = res
     "AttachLoadBalancerToSubnetsResponse"
     "fixture/AttachLoadBalancerToSubnetsResponse"
+    eLB
     (Proxy :: Proxy AttachLoadBalancerToSubnets)
 
 testModifyLoadBalancerAttributesResponse :: ModifyLoadBalancerAttributesResponse -> TestTree
 testModifyLoadBalancerAttributesResponse = res
     "ModifyLoadBalancerAttributesResponse"
     "fixture/ModifyLoadBalancerAttributesResponse"
+    eLB
     (Proxy :: Proxy ModifyLoadBalancerAttributes)
 
 testCreateAppCookieStickinessPolicyResponse :: CreateAppCookieStickinessPolicyResponse -> TestTree
 testCreateAppCookieStickinessPolicyResponse = res
     "CreateAppCookieStickinessPolicyResponse"
     "fixture/CreateAppCookieStickinessPolicyResponse"
+    eLB
     (Proxy :: Proxy CreateAppCookieStickinessPolicy)
 
 testAddTagsResponse :: AddTagsResponse -> TestTree
 testAddTagsResponse = res
     "AddTagsResponse"
     "fixture/AddTagsResponse"
+    eLB
     (Proxy :: Proxy AddTags)
 
 testDescribeLoadBalancerAttributesResponse :: DescribeLoadBalancerAttributesResponse -> TestTree
 testDescribeLoadBalancerAttributesResponse = res
     "DescribeLoadBalancerAttributesResponse"
     "fixture/DescribeLoadBalancerAttributesResponse"
+    eLB
     (Proxy :: Proxy DescribeLoadBalancerAttributes)
 
 testDescribeInstanceHealthResponse :: DescribeInstanceHealthResponse -> TestTree
 testDescribeInstanceHealthResponse = res
     "DescribeInstanceHealthResponse"
     "fixture/DescribeInstanceHealthResponse"
+    eLB
     (Proxy :: Proxy DescribeInstanceHealth)
 
 testDetachLoadBalancerFromSubnetsResponse :: DetachLoadBalancerFromSubnetsResponse -> TestTree
 testDetachLoadBalancerFromSubnetsResponse = res
     "DetachLoadBalancerFromSubnetsResponse"
     "fixture/DetachLoadBalancerFromSubnetsResponse"
+    eLB
     (Proxy :: Proxy DetachLoadBalancerFromSubnets)
 
 testRegisterInstancesWithLoadBalancerResponse :: RegisterInstancesWithLoadBalancerResponse -> TestTree
 testRegisterInstancesWithLoadBalancerResponse = res
     "RegisterInstancesWithLoadBalancerResponse"
     "fixture/RegisterInstancesWithLoadBalancerResponse"
+    eLB
     (Proxy :: Proxy RegisterInstancesWithLoadBalancer)
 
 testDeleteLoadBalancerPolicyResponse :: DeleteLoadBalancerPolicyResponse -> TestTree
 testDeleteLoadBalancerPolicyResponse = res
     "DeleteLoadBalancerPolicyResponse"
     "fixture/DeleteLoadBalancerPolicyResponse"
+    eLB
     (Proxy :: Proxy DeleteLoadBalancerPolicy)
 
 testCreateLoadBalancerListenersResponse :: CreateLoadBalancerListenersResponse -> TestTree
 testCreateLoadBalancerListenersResponse = res
     "CreateLoadBalancerListenersResponse"
     "fixture/CreateLoadBalancerListenersResponse"
+    eLB
     (Proxy :: Proxy CreateLoadBalancerListeners)
 
 testDeleteLoadBalancerListenersResponse :: DeleteLoadBalancerListenersResponse -> TestTree
 testDeleteLoadBalancerListenersResponse = res
     "DeleteLoadBalancerListenersResponse"
     "fixture/DeleteLoadBalancerListenersResponse"
+    eLB
     (Proxy :: Proxy DeleteLoadBalancerListeners)
 
 testCreateLoadBalancerResponse :: CreateLoadBalancerResponse -> TestTree
 testCreateLoadBalancerResponse = res
     "CreateLoadBalancerResponse"
     "fixture/CreateLoadBalancerResponse"
+    eLB
     (Proxy :: Proxy CreateLoadBalancer)
 
 testSetLoadBalancerPoliciesOfListenerResponse :: SetLoadBalancerPoliciesOfListenerResponse -> TestTree
 testSetLoadBalancerPoliciesOfListenerResponse = res
     "SetLoadBalancerPoliciesOfListenerResponse"
     "fixture/SetLoadBalancerPoliciesOfListenerResponse"
+    eLB
     (Proxy :: Proxy SetLoadBalancerPoliciesOfListener)
