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-ec2.cabal b/amazonka-ec2.cabal
--- a/amazonka-ec2.cabal
+++ b/amazonka-ec2.cabal
@@ -1,5 +1,5 @@
 name:                  amazonka-ec2
-version:               1.1.0
+version:               1.2.0
 synopsis:              Amazon Elastic Compute Cloud SDK.
 homepage:              https://github.com/brendanhay/amazonka
 license:               OtherLicense
@@ -236,7 +236,7 @@
         , Network.AWS.EC2.Types.Sum
 
     build-depends:
-          amazonka-core == 1.1.0.*
+          amazonka-core == 1.2.0.*
         , base          >= 4.7     && < 5
 
 test-suite amazonka-ec2-test
@@ -255,9 +255,9 @@
         , Test.AWS.EC2.Internal
 
     build-depends:
-          amazonka-core == 1.1.0
-        , amazonka-test == 1.1.0
-        , amazonka-ec2 == 1.1.0
+          amazonka-core == 1.2.0
+        , amazonka-test == 1.2.0
+        , amazonka-ec2 == 1.2.0
         , base
         , bytestring
         , lens
diff --git a/gen/Network/AWS/EC2.hs b/gen/Network/AWS/EC2.hs
--- a/gen/Network/AWS/EC2.hs
+++ b/gen/Network/AWS/EC2.hs
@@ -21,8 +21,8 @@
 -- /See:/ <http://docs.aws.amazon.com/AWSEC2/latest/APIReference/Welcome.html AWS API Reference>
 module Network.AWS.EC2
     (
-    -- * Service
-      EC2
+    -- * Service Configuration
+      eC2
 
     -- * Errors
     -- $errors
diff --git a/gen/Network/AWS/EC2/AcceptVPCPeeringConnection.hs b/gen/Network/AWS/EC2/AcceptVPCPeeringConnection.hs
--- a/gen/Network/AWS/EC2/AcceptVPCPeeringConnection.hs
+++ b/gen/Network/AWS/EC2/AcceptVPCPeeringConnection.hs
@@ -81,10 +81,9 @@
 avpcDryRun = lens _avpcDryRun (\ s a -> s{_avpcDryRun = a});
 
 instance AWSRequest AcceptVPCPeeringConnection where
-        type Sv AcceptVPCPeeringConnection = EC2
         type Rs AcceptVPCPeeringConnection =
              AcceptVPCPeeringConnectionResponse
-        request = postQuery
+        request = postQuery eC2
         response
           = receiveXML
               (\ s h x ->
diff --git a/gen/Network/AWS/EC2/AllocateAddress.hs b/gen/Network/AWS/EC2/AllocateAddress.hs
--- a/gen/Network/AWS/EC2/AllocateAddress.hs
+++ b/gen/Network/AWS/EC2/AllocateAddress.hs
@@ -86,9 +86,8 @@
 aaDryRun = lens _aaDryRun (\ s a -> s{_aaDryRun = a});
 
 instance AWSRequest AllocateAddress where
-        type Sv AllocateAddress = EC2
         type Rs AllocateAddress = AllocateAddressResponse
-        request = postQuery
+        request = postQuery eC2
         response
           = receiveXML
               (\ s h x ->
diff --git a/gen/Network/AWS/EC2/AssignPrivateIPAddresses.hs b/gen/Network/AWS/EC2/AssignPrivateIPAddresses.hs
--- a/gen/Network/AWS/EC2/AssignPrivateIPAddresses.hs
+++ b/gen/Network/AWS/EC2/AssignPrivateIPAddresses.hs
@@ -111,10 +111,9 @@
 apiaNetworkInterfaceId = lens _apiaNetworkInterfaceId (\ s a -> s{_apiaNetworkInterfaceId = a});
 
 instance AWSRequest AssignPrivateIPAddresses where
-        type Sv AssignPrivateIPAddresses = EC2
         type Rs AssignPrivateIPAddresses =
              AssignPrivateIPAddressesResponse
-        request = postQuery
+        request = postQuery eC2
         response
           = receiveNull AssignPrivateIPAddressesResponse'
 
diff --git a/gen/Network/AWS/EC2/AssociateAddress.hs b/gen/Network/AWS/EC2/AssociateAddress.hs
--- a/gen/Network/AWS/EC2/AssociateAddress.hs
+++ b/gen/Network/AWS/EC2/AssociateAddress.hs
@@ -151,9 +151,8 @@
 aasDryRun = lens _aasDryRun (\ s a -> s{_aasDryRun = a});
 
 instance AWSRequest AssociateAddress where
-        type Sv AssociateAddress = EC2
         type Rs AssociateAddress = AssociateAddressResponse
-        request = postQuery
+        request = postQuery eC2
         response
           = receiveXML
               (\ s h x ->
diff --git a/gen/Network/AWS/EC2/AssociateDHCPOptions.hs b/gen/Network/AWS/EC2/AssociateDHCPOptions.hs
--- a/gen/Network/AWS/EC2/AssociateDHCPOptions.hs
+++ b/gen/Network/AWS/EC2/AssociateDHCPOptions.hs
@@ -98,10 +98,9 @@
 adoVPCId = lens _adoVPCId (\ s a -> s{_adoVPCId = a});
 
 instance AWSRequest AssociateDHCPOptions where
-        type Sv AssociateDHCPOptions = EC2
         type Rs AssociateDHCPOptions =
              AssociateDHCPOptionsResponse
-        request = postQuery
+        request = postQuery eC2
         response = receiveNull AssociateDHCPOptionsResponse'
 
 instance ToHeaders AssociateDHCPOptions where
diff --git a/gen/Network/AWS/EC2/AssociateRouteTable.hs b/gen/Network/AWS/EC2/AssociateRouteTable.hs
--- a/gen/Network/AWS/EC2/AssociateRouteTable.hs
+++ b/gen/Network/AWS/EC2/AssociateRouteTable.hs
@@ -97,10 +97,9 @@
 artRouteTableId = lens _artRouteTableId (\ s a -> s{_artRouteTableId = a});
 
 instance AWSRequest AssociateRouteTable where
-        type Sv AssociateRouteTable = EC2
         type Rs AssociateRouteTable =
              AssociateRouteTableResponse
-        request = postQuery
+        request = postQuery eC2
         response
           = receiveXML
               (\ s h x ->
diff --git a/gen/Network/AWS/EC2/AttachClassicLinkVPC.hs b/gen/Network/AWS/EC2/AttachClassicLinkVPC.hs
--- a/gen/Network/AWS/EC2/AttachClassicLinkVPC.hs
+++ b/gen/Network/AWS/EC2/AttachClassicLinkVPC.hs
@@ -111,10 +111,9 @@
 aclvGroups = lens _aclvGroups (\ s a -> s{_aclvGroups = a}) . _Coerce;
 
 instance AWSRequest AttachClassicLinkVPC where
-        type Sv AttachClassicLinkVPC = EC2
         type Rs AttachClassicLinkVPC =
              AttachClassicLinkVPCResponse
-        request = postQuery
+        request = postQuery eC2
         response
           = receiveXML
               (\ s h x ->
diff --git a/gen/Network/AWS/EC2/AttachInternetGateway.hs b/gen/Network/AWS/EC2/AttachInternetGateway.hs
--- a/gen/Network/AWS/EC2/AttachInternetGateway.hs
+++ b/gen/Network/AWS/EC2/AttachInternetGateway.hs
@@ -88,10 +88,9 @@
 aigVPCId = lens _aigVPCId (\ s a -> s{_aigVPCId = a});
 
 instance AWSRequest AttachInternetGateway where
-        type Sv AttachInternetGateway = EC2
         type Rs AttachInternetGateway =
              AttachInternetGatewayResponse
-        request = postQuery
+        request = postQuery eC2
         response = receiveNull AttachInternetGatewayResponse'
 
 instance ToHeaders AttachInternetGateway where
diff --git a/gen/Network/AWS/EC2/AttachNetworkInterface.hs b/gen/Network/AWS/EC2/AttachNetworkInterface.hs
--- a/gen/Network/AWS/EC2/AttachNetworkInterface.hs
+++ b/gen/Network/AWS/EC2/AttachNetworkInterface.hs
@@ -98,10 +98,9 @@
 aniDeviceIndex = lens _aniDeviceIndex (\ s a -> s{_aniDeviceIndex = a});
 
 instance AWSRequest AttachNetworkInterface where
-        type Sv AttachNetworkInterface = EC2
         type Rs AttachNetworkInterface =
              AttachNetworkInterfaceResponse
-        request = postQuery
+        request = postQuery eC2
         response
           = receiveXML
               (\ s h x ->
diff --git a/gen/Network/AWS/EC2/AttachVPNGateway.hs b/gen/Network/AWS/EC2/AttachVPNGateway.hs
--- a/gen/Network/AWS/EC2/AttachVPNGateway.hs
+++ b/gen/Network/AWS/EC2/AttachVPNGateway.hs
@@ -90,9 +90,8 @@
 avgVPCId = lens _avgVPCId (\ s a -> s{_avgVPCId = a});
 
 instance AWSRequest AttachVPNGateway where
-        type Sv AttachVPNGateway = EC2
         type Rs AttachVPNGateway = AttachVPNGatewayResponse
-        request = postQuery
+        request = postQuery eC2
         response
           = receiveXML
               (\ s h x ->
diff --git a/gen/Network/AWS/EC2/AttachVolume.hs b/gen/Network/AWS/EC2/AttachVolume.hs
--- a/gen/Network/AWS/EC2/AttachVolume.hs
+++ b/gen/Network/AWS/EC2/AttachVolume.hs
@@ -134,9 +134,8 @@
 avDevice = lens _avDevice (\ s a -> s{_avDevice = a});
 
 instance AWSRequest AttachVolume where
-        type Sv AttachVolume = EC2
         type Rs AttachVolume = VolumeAttachment
-        request = postQuery
+        request = postQuery eC2
         response = receiveXML (\ s h x -> parseXML x)
 
 instance ToHeaders AttachVolume where
diff --git a/gen/Network/AWS/EC2/AuthorizeSecurityGroupEgress.hs b/gen/Network/AWS/EC2/AuthorizeSecurityGroupEgress.hs
--- a/gen/Network/AWS/EC2/AuthorizeSecurityGroupEgress.hs
+++ b/gen/Network/AWS/EC2/AuthorizeSecurityGroupEgress.hs
@@ -171,10 +171,9 @@
 
 instance AWSRequest AuthorizeSecurityGroupEgress
          where
-        type Sv AuthorizeSecurityGroupEgress = EC2
         type Rs AuthorizeSecurityGroupEgress =
              AuthorizeSecurityGroupEgressResponse
-        request = postQuery
+        request = postQuery eC2
         response
           = receiveNull AuthorizeSecurityGroupEgressResponse'
 
diff --git a/gen/Network/AWS/EC2/AuthorizeSecurityGroupIngress.hs b/gen/Network/AWS/EC2/AuthorizeSecurityGroupIngress.hs
--- a/gen/Network/AWS/EC2/AuthorizeSecurityGroupIngress.hs
+++ b/gen/Network/AWS/EC2/AuthorizeSecurityGroupIngress.hs
@@ -185,10 +185,9 @@
 
 instance AWSRequest AuthorizeSecurityGroupIngress
          where
-        type Sv AuthorizeSecurityGroupIngress = EC2
         type Rs AuthorizeSecurityGroupIngress =
              AuthorizeSecurityGroupIngressResponse
-        request = postQuery
+        request = postQuery eC2
         response
           = receiveNull AuthorizeSecurityGroupIngressResponse'
 
diff --git a/gen/Network/AWS/EC2/BundleInstance.hs b/gen/Network/AWS/EC2/BundleInstance.hs
--- a/gen/Network/AWS/EC2/BundleInstance.hs
+++ b/gen/Network/AWS/EC2/BundleInstance.hs
@@ -106,9 +106,8 @@
 biStorage = lens _biStorage (\ s a -> s{_biStorage = a});
 
 instance AWSRequest BundleInstance where
-        type Sv BundleInstance = EC2
         type Rs BundleInstance = BundleInstanceResponse
-        request = postQuery
+        request = postQuery eC2
         response
           = receiveXML
               (\ s h x ->
diff --git a/gen/Network/AWS/EC2/CancelBundleTask.hs b/gen/Network/AWS/EC2/CancelBundleTask.hs
--- a/gen/Network/AWS/EC2/CancelBundleTask.hs
+++ b/gen/Network/AWS/EC2/CancelBundleTask.hs
@@ -79,9 +79,8 @@
 cbtBundleId = lens _cbtBundleId (\ s a -> s{_cbtBundleId = a});
 
 instance AWSRequest CancelBundleTask where
-        type Sv CancelBundleTask = EC2
         type Rs CancelBundleTask = CancelBundleTaskResponse
-        request = postQuery
+        request = postQuery eC2
         response
           = receiveXML
               (\ s h x ->
diff --git a/gen/Network/AWS/EC2/CancelConversionTask.hs b/gen/Network/AWS/EC2/CancelConversionTask.hs
--- a/gen/Network/AWS/EC2/CancelConversionTask.hs
+++ b/gen/Network/AWS/EC2/CancelConversionTask.hs
@@ -92,10 +92,9 @@
 cctConversionTaskId = lens _cctConversionTaskId (\ s a -> s{_cctConversionTaskId = a});
 
 instance AWSRequest CancelConversionTask where
-        type Sv CancelConversionTask = EC2
         type Rs CancelConversionTask =
              CancelConversionTaskResponse
-        request = postQuery
+        request = postQuery eC2
         response = receiveNull CancelConversionTaskResponse'
 
 instance ToHeaders CancelConversionTask where
diff --git a/gen/Network/AWS/EC2/CancelExportTask.hs b/gen/Network/AWS/EC2/CancelExportTask.hs
--- a/gen/Network/AWS/EC2/CancelExportTask.hs
+++ b/gen/Network/AWS/EC2/CancelExportTask.hs
@@ -67,9 +67,8 @@
 cetExportTaskId = lens _cetExportTaskId (\ s a -> s{_cetExportTaskId = a});
 
 instance AWSRequest CancelExportTask where
-        type Sv CancelExportTask = EC2
         type Rs CancelExportTask = CancelExportTaskResponse
-        request = postQuery
+        request = postQuery eC2
         response = receiveNull CancelExportTaskResponse'
 
 instance ToHeaders CancelExportTask where
diff --git a/gen/Network/AWS/EC2/CancelImportTask.hs b/gen/Network/AWS/EC2/CancelImportTask.hs
--- a/gen/Network/AWS/EC2/CancelImportTask.hs
+++ b/gen/Network/AWS/EC2/CancelImportTask.hs
@@ -88,9 +88,8 @@
 citDryRun = lens _citDryRun (\ s a -> s{_citDryRun = a});
 
 instance AWSRequest CancelImportTask where
-        type Sv CancelImportTask = EC2
         type Rs CancelImportTask = CancelImportTaskResponse
-        request = postQuery
+        request = postQuery eC2
         response
           = receiveXML
               (\ s h x ->
diff --git a/gen/Network/AWS/EC2/CancelReservedInstancesListing.hs b/gen/Network/AWS/EC2/CancelReservedInstancesListing.hs
--- a/gen/Network/AWS/EC2/CancelReservedInstancesListing.hs
+++ b/gen/Network/AWS/EC2/CancelReservedInstancesListing.hs
@@ -72,10 +72,9 @@
 
 instance AWSRequest CancelReservedInstancesListing
          where
-        type Sv CancelReservedInstancesListing = EC2
         type Rs CancelReservedInstancesListing =
              CancelReservedInstancesListingResponse
-        request = postQuery
+        request = postQuery eC2
         response
           = receiveXML
               (\ s h x ->
diff --git a/gen/Network/AWS/EC2/CancelSpotFleetRequests.hs b/gen/Network/AWS/EC2/CancelSpotFleetRequests.hs
--- a/gen/Network/AWS/EC2/CancelSpotFleetRequests.hs
+++ b/gen/Network/AWS/EC2/CancelSpotFleetRequests.hs
@@ -91,10 +91,9 @@
 csfrTerminateInstances = lens _csfrTerminateInstances (\ s a -> s{_csfrTerminateInstances = a});
 
 instance AWSRequest CancelSpotFleetRequests where
-        type Sv CancelSpotFleetRequests = EC2
         type Rs CancelSpotFleetRequests =
              CancelSpotFleetRequestsResponse
-        request = postQuery
+        request = postQuery eC2
         response
           = receiveXML
               (\ s h x ->
diff --git a/gen/Network/AWS/EC2/CancelSpotInstanceRequests.hs b/gen/Network/AWS/EC2/CancelSpotInstanceRequests.hs
--- a/gen/Network/AWS/EC2/CancelSpotInstanceRequests.hs
+++ b/gen/Network/AWS/EC2/CancelSpotInstanceRequests.hs
@@ -88,10 +88,9 @@
 csirSpotInstanceRequestIds = lens _csirSpotInstanceRequestIds (\ s a -> s{_csirSpotInstanceRequestIds = a}) . _Coerce;
 
 instance AWSRequest CancelSpotInstanceRequests where
-        type Sv CancelSpotInstanceRequests = EC2
         type Rs CancelSpotInstanceRequests =
              CancelSpotInstanceRequestsResponse
-        request = postQuery
+        request = postQuery eC2
         response
           = receiveXML
               (\ s h x ->
diff --git a/gen/Network/AWS/EC2/ConfirmProductInstance.hs b/gen/Network/AWS/EC2/ConfirmProductInstance.hs
--- a/gen/Network/AWS/EC2/ConfirmProductInstance.hs
+++ b/gen/Network/AWS/EC2/ConfirmProductInstance.hs
@@ -92,10 +92,9 @@
 cpiInstanceId = lens _cpiInstanceId (\ s a -> s{_cpiInstanceId = a});
 
 instance AWSRequest ConfirmProductInstance where
-        type Sv ConfirmProductInstance = EC2
         type Rs ConfirmProductInstance =
              ConfirmProductInstanceResponse
-        request = postQuery
+        request = postQuery eC2
         response
           = receiveXML
               (\ s h x ->
diff --git a/gen/Network/AWS/EC2/CopyImage.hs b/gen/Network/AWS/EC2/CopyImage.hs
--- a/gen/Network/AWS/EC2/CopyImage.hs
+++ b/gen/Network/AWS/EC2/CopyImage.hs
@@ -126,9 +126,8 @@
 ciName = lens _ciName (\ s a -> s{_ciName = a});
 
 instance AWSRequest CopyImage where
-        type Sv CopyImage = EC2
         type Rs CopyImage = CopyImageResponse
-        request = postQuery
+        request = postQuery eC2
         response
           = receiveXML
               (\ s h x ->
diff --git a/gen/Network/AWS/EC2/CopySnapshot.hs b/gen/Network/AWS/EC2/CopySnapshot.hs
--- a/gen/Network/AWS/EC2/CopySnapshot.hs
+++ b/gen/Network/AWS/EC2/CopySnapshot.hs
@@ -183,9 +183,8 @@
 csSourceSnapshotId = lens _csSourceSnapshotId (\ s a -> s{_csSourceSnapshotId = a});
 
 instance AWSRequest CopySnapshot where
-        type Sv CopySnapshot = EC2
         type Rs CopySnapshot = CopySnapshotResponse
-        request = postQuery
+        request = postQuery eC2
         response
           = receiveXML
               (\ s h x ->
diff --git a/gen/Network/AWS/EC2/CreateCustomerGateway.hs b/gen/Network/AWS/EC2/CreateCustomerGateway.hs
--- a/gen/Network/AWS/EC2/CreateCustomerGateway.hs
+++ b/gen/Network/AWS/EC2/CreateCustomerGateway.hs
@@ -128,10 +128,9 @@
 ccgBGPASN = lens _ccgBGPASN (\ s a -> s{_ccgBGPASN = a});
 
 instance AWSRequest CreateCustomerGateway where
-        type Sv CreateCustomerGateway = EC2
         type Rs CreateCustomerGateway =
              CreateCustomerGatewayResponse
-        request = postQuery
+        request = postQuery eC2
         response
           = receiveXML
               (\ s h x ->
diff --git a/gen/Network/AWS/EC2/CreateDHCPOptions.hs b/gen/Network/AWS/EC2/CreateDHCPOptions.hs
--- a/gen/Network/AWS/EC2/CreateDHCPOptions.hs
+++ b/gen/Network/AWS/EC2/CreateDHCPOptions.hs
@@ -115,9 +115,8 @@
 cdoDHCPConfigurations = lens _cdoDHCPConfigurations (\ s a -> s{_cdoDHCPConfigurations = a}) . _Coerce;
 
 instance AWSRequest CreateDHCPOptions where
-        type Sv CreateDHCPOptions = EC2
         type Rs CreateDHCPOptions = CreateDHCPOptionsResponse
-        request = postQuery
+        request = postQuery eC2
         response
           = receiveXML
               (\ s h x ->
diff --git a/gen/Network/AWS/EC2/CreateFlowLogs.hs b/gen/Network/AWS/EC2/CreateFlowLogs.hs
--- a/gen/Network/AWS/EC2/CreateFlowLogs.hs
+++ b/gen/Network/AWS/EC2/CreateFlowLogs.hs
@@ -128,9 +128,8 @@
 cflDeliverLogsPermissionARN = lens _cflDeliverLogsPermissionARN (\ s a -> s{_cflDeliverLogsPermissionARN = a});
 
 instance AWSRequest CreateFlowLogs where
-        type Sv CreateFlowLogs = EC2
         type Rs CreateFlowLogs = CreateFlowLogsResponse
-        request = postQuery
+        request = postQuery eC2
         response
           = receiveXML
               (\ s h x ->
diff --git a/gen/Network/AWS/EC2/CreateImage.hs b/gen/Network/AWS/EC2/CreateImage.hs
--- a/gen/Network/AWS/EC2/CreateImage.hs
+++ b/gen/Network/AWS/EC2/CreateImage.hs
@@ -135,9 +135,8 @@
 ciiName = lens _ciiName (\ s a -> s{_ciiName = a});
 
 instance AWSRequest CreateImage where
-        type Sv CreateImage = EC2
         type Rs CreateImage = CreateImageResponse
-        request = postQuery
+        request = postQuery eC2
         response
           = receiveXML
               (\ s h x ->
diff --git a/gen/Network/AWS/EC2/CreateInstanceExportTask.hs b/gen/Network/AWS/EC2/CreateInstanceExportTask.hs
--- a/gen/Network/AWS/EC2/CreateInstanceExportTask.hs
+++ b/gen/Network/AWS/EC2/CreateInstanceExportTask.hs
@@ -99,10 +99,9 @@
 cietInstanceId = lens _cietInstanceId (\ s a -> s{_cietInstanceId = a});
 
 instance AWSRequest CreateInstanceExportTask where
-        type Sv CreateInstanceExportTask = EC2
         type Rs CreateInstanceExportTask =
              CreateInstanceExportTaskResponse
-        request = postQuery
+        request = postQuery eC2
         response
           = receiveXML
               (\ s h x ->
diff --git a/gen/Network/AWS/EC2/CreateInternetGateway.hs b/gen/Network/AWS/EC2/CreateInternetGateway.hs
--- a/gen/Network/AWS/EC2/CreateInternetGateway.hs
+++ b/gen/Network/AWS/EC2/CreateInternetGateway.hs
@@ -72,10 +72,9 @@
 cigDryRun = lens _cigDryRun (\ s a -> s{_cigDryRun = a});
 
 instance AWSRequest CreateInternetGateway where
-        type Sv CreateInternetGateway = EC2
         type Rs CreateInternetGateway =
              CreateInternetGatewayResponse
-        request = postQuery
+        request = postQuery eC2
         response
           = receiveXML
               (\ s h x ->
diff --git a/gen/Network/AWS/EC2/CreateKeyPair.hs b/gen/Network/AWS/EC2/CreateKeyPair.hs
--- a/gen/Network/AWS/EC2/CreateKeyPair.hs
+++ b/gen/Network/AWS/EC2/CreateKeyPair.hs
@@ -96,9 +96,8 @@
 ckpKeyName = lens _ckpKeyName (\ s a -> s{_ckpKeyName = a});
 
 instance AWSRequest CreateKeyPair where
-        type Sv CreateKeyPair = EC2
         type Rs CreateKeyPair = CreateKeyPairResponse
-        request = postQuery
+        request = postQuery eC2
         response
           = receiveXML
               (\ s h x ->
diff --git a/gen/Network/AWS/EC2/CreateNetworkACL.hs b/gen/Network/AWS/EC2/CreateNetworkACL.hs
--- a/gen/Network/AWS/EC2/CreateNetworkACL.hs
+++ b/gen/Network/AWS/EC2/CreateNetworkACL.hs
@@ -84,9 +84,8 @@
 cnaVPCId = lens _cnaVPCId (\ s a -> s{_cnaVPCId = a});
 
 instance AWSRequest CreateNetworkACL where
-        type Sv CreateNetworkACL = EC2
         type Rs CreateNetworkACL = CreateNetworkACLResponse
-        request = postQuery
+        request = postQuery eC2
         response
           = receiveXML
               (\ s h x ->
diff --git a/gen/Network/AWS/EC2/CreateNetworkACLEntry.hs b/gen/Network/AWS/EC2/CreateNetworkACLEntry.hs
--- a/gen/Network/AWS/EC2/CreateNetworkACLEntry.hs
+++ b/gen/Network/AWS/EC2/CreateNetworkACLEntry.hs
@@ -167,10 +167,9 @@
 cnaeCIdRBlock = lens _cnaeCIdRBlock (\ s a -> s{_cnaeCIdRBlock = a});
 
 instance AWSRequest CreateNetworkACLEntry where
-        type Sv CreateNetworkACLEntry = EC2
         type Rs CreateNetworkACLEntry =
              CreateNetworkACLEntryResponse
-        request = postQuery
+        request = postQuery eC2
         response = receiveNull CreateNetworkACLEntryResponse'
 
 instance ToHeaders CreateNetworkACLEntry where
diff --git a/gen/Network/AWS/EC2/CreateNetworkInterface.hs b/gen/Network/AWS/EC2/CreateNetworkInterface.hs
--- a/gen/Network/AWS/EC2/CreateNetworkInterface.hs
+++ b/gen/Network/AWS/EC2/CreateNetworkInterface.hs
@@ -140,10 +140,9 @@
 cniSubnetId = lens _cniSubnetId (\ s a -> s{_cniSubnetId = a});
 
 instance AWSRequest CreateNetworkInterface where
-        type Sv CreateNetworkInterface = EC2
         type Rs CreateNetworkInterface =
              CreateNetworkInterfaceResponse
-        request = postQuery
+        request = postQuery eC2
         response
           = receiveXML
               (\ s h x ->
diff --git a/gen/Network/AWS/EC2/CreatePlacementGroup.hs b/gen/Network/AWS/EC2/CreatePlacementGroup.hs
--- a/gen/Network/AWS/EC2/CreatePlacementGroup.hs
+++ b/gen/Network/AWS/EC2/CreatePlacementGroup.hs
@@ -93,10 +93,9 @@
 cpgStrategy = lens _cpgStrategy (\ s a -> s{_cpgStrategy = a});
 
 instance AWSRequest CreatePlacementGroup where
-        type Sv CreatePlacementGroup = EC2
         type Rs CreatePlacementGroup =
              CreatePlacementGroupResponse
-        request = postQuery
+        request = postQuery eC2
         response = receiveNull CreatePlacementGroupResponse'
 
 instance ToHeaders CreatePlacementGroup where
diff --git a/gen/Network/AWS/EC2/CreateReservedInstancesListing.hs b/gen/Network/AWS/EC2/CreateReservedInstancesListing.hs
--- a/gen/Network/AWS/EC2/CreateReservedInstancesListing.hs
+++ b/gen/Network/AWS/EC2/CreateReservedInstancesListing.hs
@@ -124,10 +124,9 @@
 
 instance AWSRequest CreateReservedInstancesListing
          where
-        type Sv CreateReservedInstancesListing = EC2
         type Rs CreateReservedInstancesListing =
              CreateReservedInstancesListingResponse
-        request = postQuery
+        request = postQuery eC2
         response
           = receiveXML
               (\ s h x ->
diff --git a/gen/Network/AWS/EC2/CreateRoute.hs b/gen/Network/AWS/EC2/CreateRoute.hs
--- a/gen/Network/AWS/EC2/CreateRoute.hs
+++ b/gen/Network/AWS/EC2/CreateRoute.hs
@@ -148,9 +148,8 @@
 crDestinationCIdRBlock = lens _crDestinationCIdRBlock (\ s a -> s{_crDestinationCIdRBlock = a});
 
 instance AWSRequest CreateRoute where
-        type Sv CreateRoute = EC2
         type Rs CreateRoute = CreateRouteResponse
-        request = postQuery
+        request = postQuery eC2
         response
           = receiveXML
               (\ s h x ->
diff --git a/gen/Network/AWS/EC2/CreateRouteTable.hs b/gen/Network/AWS/EC2/CreateRouteTable.hs
--- a/gen/Network/AWS/EC2/CreateRouteTable.hs
+++ b/gen/Network/AWS/EC2/CreateRouteTable.hs
@@ -83,9 +83,8 @@
 crtVPCId = lens _crtVPCId (\ s a -> s{_crtVPCId = a});
 
 instance AWSRequest CreateRouteTable where
-        type Sv CreateRouteTable = EC2
         type Rs CreateRouteTable = CreateRouteTableResponse
-        request = postQuery
+        request = postQuery eC2
         response
           = receiveXML
               (\ s h x ->
diff --git a/gen/Network/AWS/EC2/CreateSecurityGroup.hs b/gen/Network/AWS/EC2/CreateSecurityGroup.hs
--- a/gen/Network/AWS/EC2/CreateSecurityGroup.hs
+++ b/gen/Network/AWS/EC2/CreateSecurityGroup.hs
@@ -139,10 +139,9 @@
 csgDescription = lens _csgDescription (\ s a -> s{_csgDescription = a});
 
 instance AWSRequest CreateSecurityGroup where
-        type Sv CreateSecurityGroup = EC2
         type Rs CreateSecurityGroup =
              CreateSecurityGroupResponse
-        request = postQuery
+        request = postQuery eC2
         response
           = receiveXML
               (\ s h x ->
diff --git a/gen/Network/AWS/EC2/CreateSnapshot.hs b/gen/Network/AWS/EC2/CreateSnapshot.hs
--- a/gen/Network/AWS/EC2/CreateSnapshot.hs
+++ b/gen/Network/AWS/EC2/CreateSnapshot.hs
@@ -127,9 +127,8 @@
 ccVolumeId = lens _ccVolumeId (\ s a -> s{_ccVolumeId = a});
 
 instance AWSRequest CreateSnapshot where
-        type Sv CreateSnapshot = EC2
         type Rs CreateSnapshot = Snapshot
-        request = postQuery
+        request = postQuery eC2
         response = receiveXML (\ s h x -> parseXML x)
 
 instance ToHeaders CreateSnapshot where
diff --git a/gen/Network/AWS/EC2/CreateSpotDatafeedSubscription.hs b/gen/Network/AWS/EC2/CreateSpotDatafeedSubscription.hs
--- a/gen/Network/AWS/EC2/CreateSpotDatafeedSubscription.hs
+++ b/gen/Network/AWS/EC2/CreateSpotDatafeedSubscription.hs
@@ -94,10 +94,9 @@
 
 instance AWSRequest CreateSpotDatafeedSubscription
          where
-        type Sv CreateSpotDatafeedSubscription = EC2
         type Rs CreateSpotDatafeedSubscription =
              CreateSpotDatafeedSubscriptionResponse
-        request = postQuery
+        request = postQuery eC2
         response
           = receiveXML
               (\ s h x ->
diff --git a/gen/Network/AWS/EC2/CreateSubnet.hs b/gen/Network/AWS/EC2/CreateSubnet.hs
--- a/gen/Network/AWS/EC2/CreateSubnet.hs
+++ b/gen/Network/AWS/EC2/CreateSubnet.hs
@@ -126,9 +126,8 @@
 cssCIdRBlock = lens _cssCIdRBlock (\ s a -> s{_cssCIdRBlock = a});
 
 instance AWSRequest CreateSubnet where
-        type Sv CreateSubnet = EC2
         type Rs CreateSubnet = CreateSubnetResponse
-        request = postQuery
+        request = postQuery eC2
         response
           = receiveXML
               (\ s h x ->
diff --git a/gen/Network/AWS/EC2/CreateTags.hs b/gen/Network/AWS/EC2/CreateTags.hs
--- a/gen/Network/AWS/EC2/CreateTags.hs
+++ b/gen/Network/AWS/EC2/CreateTags.hs
@@ -92,9 +92,8 @@
 cTags = lens _cTags (\ s a -> s{_cTags = a}) . _Coerce;
 
 instance AWSRequest CreateTags where
-        type Sv CreateTags = EC2
         type Rs CreateTags = CreateTagsResponse
-        request = postQuery
+        request = postQuery eC2
         response = receiveNull CreateTagsResponse'
 
 instance ToHeaders CreateTags where
diff --git a/gen/Network/AWS/EC2/CreateVPC.hs b/gen/Network/AWS/EC2/CreateVPC.hs
--- a/gen/Network/AWS/EC2/CreateVPC.hs
+++ b/gen/Network/AWS/EC2/CreateVPC.hs
@@ -107,9 +107,8 @@
 cvCIdRBlock = lens _cvCIdRBlock (\ s a -> s{_cvCIdRBlock = a});
 
 instance AWSRequest CreateVPC where
-        type Sv CreateVPC = EC2
         type Rs CreateVPC = CreateVPCResponse
-        request = postQuery
+        request = postQuery eC2
         response
           = receiveXML
               (\ s h x ->
diff --git a/gen/Network/AWS/EC2/CreateVPCEndpoint.hs b/gen/Network/AWS/EC2/CreateVPCEndpoint.hs
--- a/gen/Network/AWS/EC2/CreateVPCEndpoint.hs
+++ b/gen/Network/AWS/EC2/CreateVPCEndpoint.hs
@@ -129,9 +129,8 @@
 cveServiceName = lens _cveServiceName (\ s a -> s{_cveServiceName = a});
 
 instance AWSRequest CreateVPCEndpoint where
-        type Sv CreateVPCEndpoint = EC2
         type Rs CreateVPCEndpoint = CreateVPCEndpointResponse
-        request = postQuery
+        request = postQuery eC2
         response
           = receiveXML
               (\ s h x ->
diff --git a/gen/Network/AWS/EC2/CreateVPCPeeringConnection.hs b/gen/Network/AWS/EC2/CreateVPCPeeringConnection.hs
--- a/gen/Network/AWS/EC2/CreateVPCPeeringConnection.hs
+++ b/gen/Network/AWS/EC2/CreateVPCPeeringConnection.hs
@@ -109,10 +109,9 @@
 cvpcDryRun = lens _cvpcDryRun (\ s a -> s{_cvpcDryRun = a});
 
 instance AWSRequest CreateVPCPeeringConnection where
-        type Sv CreateVPCPeeringConnection = EC2
         type Rs CreateVPCPeeringConnection =
              CreateVPCPeeringConnectionResponse
-        request = postQuery
+        request = postQuery eC2
         response
           = receiveXML
               (\ s h x ->
diff --git a/gen/Network/AWS/EC2/CreateVPNConnection.hs b/gen/Network/AWS/EC2/CreateVPNConnection.hs
--- a/gen/Network/AWS/EC2/CreateVPNConnection.hs
+++ b/gen/Network/AWS/EC2/CreateVPNConnection.hs
@@ -127,10 +127,9 @@
 cvcVPNGatewayId = lens _cvcVPNGatewayId (\ s a -> s{_cvcVPNGatewayId = a});
 
 instance AWSRequest CreateVPNConnection where
-        type Sv CreateVPNConnection = EC2
         type Rs CreateVPNConnection =
              CreateVPNConnectionResponse
-        request = postQuery
+        request = postQuery eC2
         response
           = receiveXML
               (\ s h x ->
diff --git a/gen/Network/AWS/EC2/CreateVPNConnectionRoute.hs b/gen/Network/AWS/EC2/CreateVPNConnectionRoute.hs
--- a/gen/Network/AWS/EC2/CreateVPNConnectionRoute.hs
+++ b/gen/Network/AWS/EC2/CreateVPNConnectionRoute.hs
@@ -80,10 +80,9 @@
 cvcrDestinationCIdRBlock = lens _cvcrDestinationCIdRBlock (\ s a -> s{_cvcrDestinationCIdRBlock = a});
 
 instance AWSRequest CreateVPNConnectionRoute where
-        type Sv CreateVPNConnectionRoute = EC2
         type Rs CreateVPNConnectionRoute =
              CreateVPNConnectionRouteResponse
-        request = postQuery
+        request = postQuery eC2
         response
           = receiveNull CreateVPNConnectionRouteResponse'
 
diff --git a/gen/Network/AWS/EC2/CreateVPNGateway.hs b/gen/Network/AWS/EC2/CreateVPNGateway.hs
--- a/gen/Network/AWS/EC2/CreateVPNGateway.hs
+++ b/gen/Network/AWS/EC2/CreateVPNGateway.hs
@@ -93,9 +93,8 @@
 cvgType = lens _cvgType (\ s a -> s{_cvgType = a});
 
 instance AWSRequest CreateVPNGateway where
-        type Sv CreateVPNGateway = EC2
         type Rs CreateVPNGateway = CreateVPNGatewayResponse
-        request = postQuery
+        request = postQuery eC2
         response
           = receiveXML
               (\ s h x ->
diff --git a/gen/Network/AWS/EC2/CreateVolume.hs b/gen/Network/AWS/EC2/CreateVolume.hs
--- a/gen/Network/AWS/EC2/CreateVolume.hs
+++ b/gen/Network/AWS/EC2/CreateVolume.hs
@@ -193,9 +193,8 @@
 creAvailabilityZone = lens _creAvailabilityZone (\ s a -> s{_creAvailabilityZone = a});
 
 instance AWSRequest CreateVolume where
-        type Sv CreateVolume = EC2
         type Rs CreateVolume = Volume
-        request = postQuery
+        request = postQuery eC2
         response = receiveXML (\ s h x -> parseXML x)
 
 instance ToHeaders CreateVolume where
diff --git a/gen/Network/AWS/EC2/DeleteCustomerGateway.hs b/gen/Network/AWS/EC2/DeleteCustomerGateway.hs
--- a/gen/Network/AWS/EC2/DeleteCustomerGateway.hs
+++ b/gen/Network/AWS/EC2/DeleteCustomerGateway.hs
@@ -76,10 +76,9 @@
 dcgcCustomerGatewayId = lens _dcgcCustomerGatewayId (\ s a -> s{_dcgcCustomerGatewayId = a});
 
 instance AWSRequest DeleteCustomerGateway where
-        type Sv DeleteCustomerGateway = EC2
         type Rs DeleteCustomerGateway =
              DeleteCustomerGatewayResponse
-        request = postQuery
+        request = postQuery eC2
         response = receiveNull DeleteCustomerGatewayResponse'
 
 instance ToHeaders DeleteCustomerGateway where
diff --git a/gen/Network/AWS/EC2/DeleteDHCPOptions.hs b/gen/Network/AWS/EC2/DeleteDHCPOptions.hs
--- a/gen/Network/AWS/EC2/DeleteDHCPOptions.hs
+++ b/gen/Network/AWS/EC2/DeleteDHCPOptions.hs
@@ -78,9 +78,8 @@
 ddhcpoDHCPOptionsId = lens _ddhcpoDHCPOptionsId (\ s a -> s{_ddhcpoDHCPOptionsId = a});
 
 instance AWSRequest DeleteDHCPOptions where
-        type Sv DeleteDHCPOptions = EC2
         type Rs DeleteDHCPOptions = DeleteDHCPOptionsResponse
-        request = postQuery
+        request = postQuery eC2
         response = receiveNull DeleteDHCPOptionsResponse'
 
 instance ToHeaders DeleteDHCPOptions where
diff --git a/gen/Network/AWS/EC2/DeleteFlowLogs.hs b/gen/Network/AWS/EC2/DeleteFlowLogs.hs
--- a/gen/Network/AWS/EC2/DeleteFlowLogs.hs
+++ b/gen/Network/AWS/EC2/DeleteFlowLogs.hs
@@ -65,9 +65,8 @@
 dflFlowLogIds = lens _dflFlowLogIds (\ s a -> s{_dflFlowLogIds = a}) . _Coerce;
 
 instance AWSRequest DeleteFlowLogs where
-        type Sv DeleteFlowLogs = EC2
         type Rs DeleteFlowLogs = DeleteFlowLogsResponse
-        request = postQuery
+        request = postQuery eC2
         response
           = receiveXML
               (\ s h x ->
diff --git a/gen/Network/AWS/EC2/DeleteInternetGateway.hs b/gen/Network/AWS/EC2/DeleteInternetGateway.hs
--- a/gen/Network/AWS/EC2/DeleteInternetGateway.hs
+++ b/gen/Network/AWS/EC2/DeleteInternetGateway.hs
@@ -76,10 +76,9 @@
 digiInternetGatewayId = lens _digiInternetGatewayId (\ s a -> s{_digiInternetGatewayId = a});
 
 instance AWSRequest DeleteInternetGateway where
-        type Sv DeleteInternetGateway = EC2
         type Rs DeleteInternetGateway =
              DeleteInternetGatewayResponse
-        request = postQuery
+        request = postQuery eC2
         response = receiveNull DeleteInternetGatewayResponse'
 
 instance ToHeaders DeleteInternetGateway where
diff --git a/gen/Network/AWS/EC2/DeleteKeyPair.hs b/gen/Network/AWS/EC2/DeleteKeyPair.hs
--- a/gen/Network/AWS/EC2/DeleteKeyPair.hs
+++ b/gen/Network/AWS/EC2/DeleteKeyPair.hs
@@ -76,9 +76,8 @@
 dkpKeyName = lens _dkpKeyName (\ s a -> s{_dkpKeyName = a});
 
 instance AWSRequest DeleteKeyPair where
-        type Sv DeleteKeyPair = EC2
         type Rs DeleteKeyPair = DeleteKeyPairResponse
-        request = postQuery
+        request = postQuery eC2
         response = receiveNull DeleteKeyPairResponse'
 
 instance ToHeaders DeleteKeyPair where
diff --git a/gen/Network/AWS/EC2/DeleteNetworkACL.hs b/gen/Network/AWS/EC2/DeleteNetworkACL.hs
--- a/gen/Network/AWS/EC2/DeleteNetworkACL.hs
+++ b/gen/Network/AWS/EC2/DeleteNetworkACL.hs
@@ -76,9 +76,8 @@
 dnaNetworkACLId = lens _dnaNetworkACLId (\ s a -> s{_dnaNetworkACLId = a});
 
 instance AWSRequest DeleteNetworkACL where
-        type Sv DeleteNetworkACL = EC2
         type Rs DeleteNetworkACL = DeleteNetworkACLResponse
-        request = postQuery
+        request = postQuery eC2
         response = receiveNull DeleteNetworkACLResponse'
 
 instance ToHeaders DeleteNetworkACL where
diff --git a/gen/Network/AWS/EC2/DeleteNetworkACLEntry.hs b/gen/Network/AWS/EC2/DeleteNetworkACLEntry.hs
--- a/gen/Network/AWS/EC2/DeleteNetworkACLEntry.hs
+++ b/gen/Network/AWS/EC2/DeleteNetworkACLEntry.hs
@@ -96,10 +96,9 @@
 dnaeEgress = lens _dnaeEgress (\ s a -> s{_dnaeEgress = a});
 
 instance AWSRequest DeleteNetworkACLEntry where
-        type Sv DeleteNetworkACLEntry = EC2
         type Rs DeleteNetworkACLEntry =
              DeleteNetworkACLEntryResponse
-        request = postQuery
+        request = postQuery eC2
         response = receiveNull DeleteNetworkACLEntryResponse'
 
 instance ToHeaders DeleteNetworkACLEntry where
diff --git a/gen/Network/AWS/EC2/DeleteNetworkInterface.hs b/gen/Network/AWS/EC2/DeleteNetworkInterface.hs
--- a/gen/Network/AWS/EC2/DeleteNetworkInterface.hs
+++ b/gen/Network/AWS/EC2/DeleteNetworkInterface.hs
@@ -76,10 +76,9 @@
 dninNetworkInterfaceId = lens _dninNetworkInterfaceId (\ s a -> s{_dninNetworkInterfaceId = a});
 
 instance AWSRequest DeleteNetworkInterface where
-        type Sv DeleteNetworkInterface = EC2
         type Rs DeleteNetworkInterface =
              DeleteNetworkInterfaceResponse
-        request = postQuery
+        request = postQuery eC2
         response
           = receiveNull DeleteNetworkInterfaceResponse'
 
diff --git a/gen/Network/AWS/EC2/DeletePlacementGroup.hs b/gen/Network/AWS/EC2/DeletePlacementGroup.hs
--- a/gen/Network/AWS/EC2/DeletePlacementGroup.hs
+++ b/gen/Network/AWS/EC2/DeletePlacementGroup.hs
@@ -79,10 +79,9 @@
 dpgGroupName = lens _dpgGroupName (\ s a -> s{_dpgGroupName = a});
 
 instance AWSRequest DeletePlacementGroup where
-        type Sv DeletePlacementGroup = EC2
         type Rs DeletePlacementGroup =
              DeletePlacementGroupResponse
-        request = postQuery
+        request = postQuery eC2
         response = receiveNull DeletePlacementGroupResponse'
 
 instance ToHeaders DeletePlacementGroup where
diff --git a/gen/Network/AWS/EC2/DeleteRoute.hs b/gen/Network/AWS/EC2/DeleteRoute.hs
--- a/gen/Network/AWS/EC2/DeleteRoute.hs
+++ b/gen/Network/AWS/EC2/DeleteRoute.hs
@@ -86,9 +86,8 @@
 drDestinationCIdRBlock = lens _drDestinationCIdRBlock (\ s a -> s{_drDestinationCIdRBlock = a});
 
 instance AWSRequest DeleteRoute where
-        type Sv DeleteRoute = EC2
         type Rs DeleteRoute = DeleteRouteResponse
-        request = postQuery
+        request = postQuery eC2
         response = receiveNull DeleteRouteResponse'
 
 instance ToHeaders DeleteRoute where
diff --git a/gen/Network/AWS/EC2/DeleteRouteTable.hs b/gen/Network/AWS/EC2/DeleteRouteTable.hs
--- a/gen/Network/AWS/EC2/DeleteRouteTable.hs
+++ b/gen/Network/AWS/EC2/DeleteRouteTable.hs
@@ -77,9 +77,8 @@
 drtrRouteTableId = lens _drtrRouteTableId (\ s a -> s{_drtrRouteTableId = a});
 
 instance AWSRequest DeleteRouteTable where
-        type Sv DeleteRouteTable = EC2
         type Rs DeleteRouteTable = DeleteRouteTableResponse
-        request = postQuery
+        request = postQuery eC2
         response = receiveNull DeleteRouteTableResponse'
 
 instance ToHeaders DeleteRouteTable where
diff --git a/gen/Network/AWS/EC2/DeleteSecurityGroup.hs b/gen/Network/AWS/EC2/DeleteSecurityGroup.hs
--- a/gen/Network/AWS/EC2/DeleteSecurityGroup.hs
+++ b/gen/Network/AWS/EC2/DeleteSecurityGroup.hs
@@ -89,10 +89,9 @@
 dsgDryRun = lens _dsgDryRun (\ s a -> s{_dsgDryRun = a});
 
 instance AWSRequest DeleteSecurityGroup where
-        type Sv DeleteSecurityGroup = EC2
         type Rs DeleteSecurityGroup =
              DeleteSecurityGroupResponse
-        request = postQuery
+        request = postQuery eC2
         response = receiveNull DeleteSecurityGroupResponse'
 
 instance ToHeaders DeleteSecurityGroup where
diff --git a/gen/Network/AWS/EC2/DeleteSnapshot.hs b/gen/Network/AWS/EC2/DeleteSnapshot.hs
--- a/gen/Network/AWS/EC2/DeleteSnapshot.hs
+++ b/gen/Network/AWS/EC2/DeleteSnapshot.hs
@@ -91,9 +91,8 @@
 deleSnapshotId = lens _deleSnapshotId (\ s a -> s{_deleSnapshotId = a});
 
 instance AWSRequest DeleteSnapshot where
-        type Sv DeleteSnapshot = EC2
         type Rs DeleteSnapshot = DeleteSnapshotResponse
-        request = postQuery
+        request = postQuery eC2
         response = receiveNull DeleteSnapshotResponse'
 
 instance ToHeaders DeleteSnapshot where
diff --git a/gen/Network/AWS/EC2/DeleteSpotDatafeedSubscription.hs b/gen/Network/AWS/EC2/DeleteSpotDatafeedSubscription.hs
--- a/gen/Network/AWS/EC2/DeleteSpotDatafeedSubscription.hs
+++ b/gen/Network/AWS/EC2/DeleteSpotDatafeedSubscription.hs
@@ -70,10 +70,9 @@
 
 instance AWSRequest DeleteSpotDatafeedSubscription
          where
-        type Sv DeleteSpotDatafeedSubscription = EC2
         type Rs DeleteSpotDatafeedSubscription =
              DeleteSpotDatafeedSubscriptionResponse
-        request = postQuery
+        request = postQuery eC2
         response
           = receiveNull DeleteSpotDatafeedSubscriptionResponse'
 
diff --git a/gen/Network/AWS/EC2/DeleteSubnet.hs b/gen/Network/AWS/EC2/DeleteSubnet.hs
--- a/gen/Network/AWS/EC2/DeleteSubnet.hs
+++ b/gen/Network/AWS/EC2/DeleteSubnet.hs
@@ -76,9 +76,8 @@
 ddSubnetId = lens _ddSubnetId (\ s a -> s{_ddSubnetId = a});
 
 instance AWSRequest DeleteSubnet where
-        type Sv DeleteSubnet = EC2
         type Rs DeleteSubnet = DeleteSubnetResponse
-        request = postQuery
+        request = postQuery eC2
         response = receiveNull DeleteSubnetResponse'
 
 instance ToHeaders DeleteSubnet where
diff --git a/gen/Network/AWS/EC2/DeleteTags.hs b/gen/Network/AWS/EC2/DeleteTags.hs
--- a/gen/Network/AWS/EC2/DeleteTags.hs
+++ b/gen/Network/AWS/EC2/DeleteTags.hs
@@ -92,9 +92,8 @@
 dtsResources = lens _dtsResources (\ s a -> s{_dtsResources = a}) . _Coerce;
 
 instance AWSRequest DeleteTags where
-        type Sv DeleteTags = EC2
         type Rs DeleteTags = DeleteTagsResponse
-        request = postQuery
+        request = postQuery eC2
         response = receiveNull DeleteTagsResponse'
 
 instance ToHeaders DeleteTags where
diff --git a/gen/Network/AWS/EC2/DeleteVPC.hs b/gen/Network/AWS/EC2/DeleteVPC.hs
--- a/gen/Network/AWS/EC2/DeleteVPC.hs
+++ b/gen/Network/AWS/EC2/DeleteVPC.hs
@@ -80,9 +80,8 @@
 delVPCId = lens _delVPCId (\ s a -> s{_delVPCId = a});
 
 instance AWSRequest DeleteVPC where
-        type Sv DeleteVPC = EC2
         type Rs DeleteVPC = DeleteVPCResponse
-        request = postQuery
+        request = postQuery eC2
         response = receiveNull DeleteVPCResponse'
 
 instance ToHeaders DeleteVPC where
diff --git a/gen/Network/AWS/EC2/DeleteVPCEndpoints.hs b/gen/Network/AWS/EC2/DeleteVPCEndpoints.hs
--- a/gen/Network/AWS/EC2/DeleteVPCEndpoints.hs
+++ b/gen/Network/AWS/EC2/DeleteVPCEndpoints.hs
@@ -79,10 +79,9 @@
 dveVPCEndpointIds = lens _dveVPCEndpointIds (\ s a -> s{_dveVPCEndpointIds = a}) . _Coerce;
 
 instance AWSRequest DeleteVPCEndpoints where
-        type Sv DeleteVPCEndpoints = EC2
         type Rs DeleteVPCEndpoints =
              DeleteVPCEndpointsResponse
-        request = postQuery
+        request = postQuery eC2
         response
           = receiveXML
               (\ s h x ->
diff --git a/gen/Network/AWS/EC2/DeleteVPCPeeringConnection.hs b/gen/Network/AWS/EC2/DeleteVPCPeeringConnection.hs
--- a/gen/Network/AWS/EC2/DeleteVPCPeeringConnection.hs
+++ b/gen/Network/AWS/EC2/DeleteVPCPeeringConnection.hs
@@ -81,10 +81,9 @@
 dvpcVPCPeeringConnectionId = lens _dvpcVPCPeeringConnectionId (\ s a -> s{_dvpcVPCPeeringConnectionId = a});
 
 instance AWSRequest DeleteVPCPeeringConnection where
-        type Sv DeleteVPCPeeringConnection = EC2
         type Rs DeleteVPCPeeringConnection =
              DeleteVPCPeeringConnectionResponse
-        request = postQuery
+        request = postQuery eC2
         response
           = receiveXML
               (\ s h x ->
diff --git a/gen/Network/AWS/EC2/DeleteVPNConnection.hs b/gen/Network/AWS/EC2/DeleteVPNConnection.hs
--- a/gen/Network/AWS/EC2/DeleteVPNConnection.hs
+++ b/gen/Network/AWS/EC2/DeleteVPNConnection.hs
@@ -85,10 +85,9 @@
 dvcVPNConnectionId = lens _dvcVPNConnectionId (\ s a -> s{_dvcVPNConnectionId = a});
 
 instance AWSRequest DeleteVPNConnection where
-        type Sv DeleteVPNConnection = EC2
         type Rs DeleteVPNConnection =
              DeleteVPNConnectionResponse
-        request = postQuery
+        request = postQuery eC2
         response = receiveNull DeleteVPNConnectionResponse'
 
 instance ToHeaders DeleteVPNConnection where
diff --git a/gen/Network/AWS/EC2/DeleteVPNConnectionRoute.hs b/gen/Network/AWS/EC2/DeleteVPNConnectionRoute.hs
--- a/gen/Network/AWS/EC2/DeleteVPNConnectionRoute.hs
+++ b/gen/Network/AWS/EC2/DeleteVPNConnectionRoute.hs
@@ -76,10 +76,9 @@
 dvcrDestinationCIdRBlock = lens _dvcrDestinationCIdRBlock (\ s a -> s{_dvcrDestinationCIdRBlock = a});
 
 instance AWSRequest DeleteVPNConnectionRoute where
-        type Sv DeleteVPNConnectionRoute = EC2
         type Rs DeleteVPNConnectionRoute =
              DeleteVPNConnectionRouteResponse
-        request = postQuery
+        request = postQuery eC2
         response
           = receiveNull DeleteVPNConnectionRouteResponse'
 
diff --git a/gen/Network/AWS/EC2/DeleteVPNGateway.hs b/gen/Network/AWS/EC2/DeleteVPNGateway.hs
--- a/gen/Network/AWS/EC2/DeleteVPNGateway.hs
+++ b/gen/Network/AWS/EC2/DeleteVPNGateway.hs
@@ -79,9 +79,8 @@
 dvgVPNGatewayId = lens _dvgVPNGatewayId (\ s a -> s{_dvgVPNGatewayId = a});
 
 instance AWSRequest DeleteVPNGateway where
-        type Sv DeleteVPNGateway = EC2
         type Rs DeleteVPNGateway = DeleteVPNGatewayResponse
-        request = postQuery
+        request = postQuery eC2
         response = receiveNull DeleteVPNGatewayResponse'
 
 instance ToHeaders DeleteVPNGateway where
diff --git a/gen/Network/AWS/EC2/DeleteVolume.hs b/gen/Network/AWS/EC2/DeleteVolume.hs
--- a/gen/Network/AWS/EC2/DeleteVolume.hs
+++ b/gen/Network/AWS/EC2/DeleteVolume.hs
@@ -82,9 +82,8 @@
 dvvVolumeId = lens _dvvVolumeId (\ s a -> s{_dvvVolumeId = a});
 
 instance AWSRequest DeleteVolume where
-        type Sv DeleteVolume = EC2
         type Rs DeleteVolume = DeleteVolumeResponse
-        request = postQuery
+        request = postQuery eC2
         response = receiveNull DeleteVolumeResponse'
 
 instance ToHeaders DeleteVolume where
diff --git a/gen/Network/AWS/EC2/DeregisterImage.hs b/gen/Network/AWS/EC2/DeregisterImage.hs
--- a/gen/Network/AWS/EC2/DeregisterImage.hs
+++ b/gen/Network/AWS/EC2/DeregisterImage.hs
@@ -78,9 +78,8 @@
 diImageId = lens _diImageId (\ s a -> s{_diImageId = a});
 
 instance AWSRequest DeregisterImage where
-        type Sv DeregisterImage = EC2
         type Rs DeregisterImage = DeregisterImageResponse
-        request = postQuery
+        request = postQuery eC2
         response = receiveNull DeregisterImageResponse'
 
 instance ToHeaders DeregisterImage where
diff --git a/gen/Network/AWS/EC2/DescribeAccountAttributes.hs b/gen/Network/AWS/EC2/DescribeAccountAttributes.hs
--- a/gen/Network/AWS/EC2/DescribeAccountAttributes.hs
+++ b/gen/Network/AWS/EC2/DescribeAccountAttributes.hs
@@ -97,10 +97,9 @@
 daaDryRun = lens _daaDryRun (\ s a -> s{_daaDryRun = a});
 
 instance AWSRequest DescribeAccountAttributes where
-        type Sv DescribeAccountAttributes = EC2
         type Rs DescribeAccountAttributes =
              DescribeAccountAttributesResponse
-        request = postQuery
+        request = postQuery eC2
         response
           = receiveXML
               (\ s h x ->
diff --git a/gen/Network/AWS/EC2/DescribeAddresses.hs b/gen/Network/AWS/EC2/DescribeAddresses.hs
--- a/gen/Network/AWS/EC2/DescribeAddresses.hs
+++ b/gen/Network/AWS/EC2/DescribeAddresses.hs
@@ -125,9 +125,8 @@
 daAllocationIds = lens _daAllocationIds (\ s a -> s{_daAllocationIds = a}) . _Default . _Coerce;
 
 instance AWSRequest DescribeAddresses where
-        type Sv DescribeAddresses = EC2
         type Rs DescribeAddresses = DescribeAddressesResponse
-        request = postQuery
+        request = postQuery eC2
         response
           = receiveXML
               (\ s h x ->
diff --git a/gen/Network/AWS/EC2/DescribeAvailabilityZones.hs b/gen/Network/AWS/EC2/DescribeAvailabilityZones.hs
--- a/gen/Network/AWS/EC2/DescribeAvailabilityZones.hs
+++ b/gen/Network/AWS/EC2/DescribeAvailabilityZones.hs
@@ -106,10 +106,9 @@
 dazDryRun = lens _dazDryRun (\ s a -> s{_dazDryRun = a});
 
 instance AWSRequest DescribeAvailabilityZones where
-        type Sv DescribeAvailabilityZones = EC2
         type Rs DescribeAvailabilityZones =
              DescribeAvailabilityZonesResponse
-        request = postQuery
+        request = postQuery eC2
         response
           = receiveXML
               (\ s h x ->
diff --git a/gen/Network/AWS/EC2/DescribeBundleTasks.hs b/gen/Network/AWS/EC2/DescribeBundleTasks.hs
--- a/gen/Network/AWS/EC2/DescribeBundleTasks.hs
+++ b/gen/Network/AWS/EC2/DescribeBundleTasks.hs
@@ -117,10 +117,9 @@
 dbtDryRun = lens _dbtDryRun (\ s a -> s{_dbtDryRun = a});
 
 instance AWSRequest DescribeBundleTasks where
-        type Sv DescribeBundleTasks = EC2
         type Rs DescribeBundleTasks =
              DescribeBundleTasksResponse
-        request = postQuery
+        request = postQuery eC2
         response
           = receiveXML
               (\ s h x ->
diff --git a/gen/Network/AWS/EC2/DescribeClassicLinkInstances.hs b/gen/Network/AWS/EC2/DescribeClassicLinkInstances.hs
--- a/gen/Network/AWS/EC2/DescribeClassicLinkInstances.hs
+++ b/gen/Network/AWS/EC2/DescribeClassicLinkInstances.hs
@@ -140,10 +140,9 @@
 
 instance AWSRequest DescribeClassicLinkInstances
          where
-        type Sv DescribeClassicLinkInstances = EC2
         type Rs DescribeClassicLinkInstances =
              DescribeClassicLinkInstancesResponse
-        request = postQuery
+        request = postQuery eC2
         response
           = receiveXML
               (\ s h x ->
diff --git a/gen/Network/AWS/EC2/DescribeConversionTasks.hs b/gen/Network/AWS/EC2/DescribeConversionTasks.hs
--- a/gen/Network/AWS/EC2/DescribeConversionTasks.hs
+++ b/gen/Network/AWS/EC2/DescribeConversionTasks.hs
@@ -89,10 +89,9 @@
 dctDryRun = lens _dctDryRun (\ s a -> s{_dctDryRun = a});
 
 instance AWSRequest DescribeConversionTasks where
-        type Sv DescribeConversionTasks = EC2
         type Rs DescribeConversionTasks =
              DescribeConversionTasksResponse
-        request = postQuery
+        request = postQuery eC2
         response
           = receiveXML
               (\ s h x ->
diff --git a/gen/Network/AWS/EC2/DescribeCustomerGateways.hs b/gen/Network/AWS/EC2/DescribeCustomerGateways.hs
--- a/gen/Network/AWS/EC2/DescribeCustomerGateways.hs
+++ b/gen/Network/AWS/EC2/DescribeCustomerGateways.hs
@@ -121,10 +121,9 @@
 dcgDryRun = lens _dcgDryRun (\ s a -> s{_dcgDryRun = a});
 
 instance AWSRequest DescribeCustomerGateways where
-        type Sv DescribeCustomerGateways = EC2
         type Rs DescribeCustomerGateways =
              DescribeCustomerGatewaysResponse
-        request = postQuery
+        request = postQuery eC2
         response
           = receiveXML
               (\ s h x ->
diff --git a/gen/Network/AWS/EC2/DescribeDHCPOptions.hs b/gen/Network/AWS/EC2/DescribeDHCPOptions.hs
--- a/gen/Network/AWS/EC2/DescribeDHCPOptions.hs
+++ b/gen/Network/AWS/EC2/DescribeDHCPOptions.hs
@@ -113,10 +113,9 @@
 ddoDryRun = lens _ddoDryRun (\ s a -> s{_ddoDryRun = a});
 
 instance AWSRequest DescribeDHCPOptions where
-        type Sv DescribeDHCPOptions = EC2
         type Rs DescribeDHCPOptions =
              DescribeDHCPOptionsResponse
-        request = postQuery
+        request = postQuery eC2
         response
           = receiveXML
               (\ s h x ->
diff --git a/gen/Network/AWS/EC2/DescribeExportTasks.hs b/gen/Network/AWS/EC2/DescribeExportTasks.hs
--- a/gen/Network/AWS/EC2/DescribeExportTasks.hs
+++ b/gen/Network/AWS/EC2/DescribeExportTasks.hs
@@ -65,10 +65,9 @@
 detExportTaskIds = lens _detExportTaskIds (\ s a -> s{_detExportTaskIds = a}) . _Default . _Coerce;
 
 instance AWSRequest DescribeExportTasks where
-        type Sv DescribeExportTasks = EC2
         type Rs DescribeExportTasks =
              DescribeExportTasksResponse
-        request = postQuery
+        request = postQuery eC2
         response
           = receiveXML
               (\ s h x ->
diff --git a/gen/Network/AWS/EC2/DescribeFlowLogs.hs b/gen/Network/AWS/EC2/DescribeFlowLogs.hs
--- a/gen/Network/AWS/EC2/DescribeFlowLogs.hs
+++ b/gen/Network/AWS/EC2/DescribeFlowLogs.hs
@@ -112,9 +112,8 @@
 dMaxResults = lens _dMaxResults (\ s a -> s{_dMaxResults = a});
 
 instance AWSRequest DescribeFlowLogs where
-        type Sv DescribeFlowLogs = EC2
         type Rs DescribeFlowLogs = DescribeFlowLogsResponse
-        request = postQuery
+        request = postQuery eC2
         response
           = receiveXML
               (\ s h x ->
diff --git a/gen/Network/AWS/EC2/DescribeImageAttribute.hs b/gen/Network/AWS/EC2/DescribeImageAttribute.hs
--- a/gen/Network/AWS/EC2/DescribeImageAttribute.hs
+++ b/gen/Network/AWS/EC2/DescribeImageAttribute.hs
@@ -101,10 +101,9 @@
 diaiAttribute = lens _diaiAttribute (\ s a -> s{_diaiAttribute = a});
 
 instance AWSRequest DescribeImageAttribute where
-        type Sv DescribeImageAttribute = EC2
         type Rs DescribeImageAttribute =
              DescribeImageAttributeResponse
-        request = postQuery
+        request = postQuery eC2
         response
           = receiveXML
               (\ s h x ->
diff --git a/gen/Network/AWS/EC2/DescribeImages.hs b/gen/Network/AWS/EC2/DescribeImages.hs
--- a/gen/Network/AWS/EC2/DescribeImages.hs
+++ b/gen/Network/AWS/EC2/DescribeImages.hs
@@ -197,9 +197,8 @@
 deseDryRun = lens _deseDryRun (\ s a -> s{_deseDryRun = a});
 
 instance AWSRequest DescribeImages where
-        type Sv DescribeImages = EC2
         type Rs DescribeImages = DescribeImagesResponse
-        request = postQuery
+        request = postQuery eC2
         response
           = receiveXML
               (\ s h x ->
diff --git a/gen/Network/AWS/EC2/DescribeImportImageTasks.hs b/gen/Network/AWS/EC2/DescribeImportImageTasks.hs
--- a/gen/Network/AWS/EC2/DescribeImportImageTasks.hs
+++ b/gen/Network/AWS/EC2/DescribeImportImageTasks.hs
@@ -106,10 +106,9 @@
 diitMaxResults = lens _diitMaxResults (\ s a -> s{_diitMaxResults = a});
 
 instance AWSRequest DescribeImportImageTasks where
-        type Sv DescribeImportImageTasks = EC2
         type Rs DescribeImportImageTasks =
              DescribeImportImageTasksResponse
-        request = postQuery
+        request = postQuery eC2
         response
           = receiveXML
               (\ s h x ->
diff --git a/gen/Network/AWS/EC2/DescribeImportSnapshotTasks.hs b/gen/Network/AWS/EC2/DescribeImportSnapshotTasks.hs
--- a/gen/Network/AWS/EC2/DescribeImportSnapshotTasks.hs
+++ b/gen/Network/AWS/EC2/DescribeImportSnapshotTasks.hs
@@ -105,10 +105,9 @@
 distMaxResults = lens _distMaxResults (\ s a -> s{_distMaxResults = a});
 
 instance AWSRequest DescribeImportSnapshotTasks where
-        type Sv DescribeImportSnapshotTasks = EC2
         type Rs DescribeImportSnapshotTasks =
              DescribeImportSnapshotTasksResponse
-        request = postQuery
+        request = postQuery eC2
         response
           = receiveXML
               (\ s h x ->
diff --git a/gen/Network/AWS/EC2/DescribeInstanceAttribute.hs b/gen/Network/AWS/EC2/DescribeInstanceAttribute.hs
--- a/gen/Network/AWS/EC2/DescribeInstanceAttribute.hs
+++ b/gen/Network/AWS/EC2/DescribeInstanceAttribute.hs
@@ -106,10 +106,9 @@
 diaAttribute = lens _diaAttribute (\ s a -> s{_diaAttribute = a});
 
 instance AWSRequest DescribeInstanceAttribute where
-        type Sv DescribeInstanceAttribute = EC2
         type Rs DescribeInstanceAttribute =
              DescribeInstanceAttributeResponse
-        request = postQuery
+        request = postQuery eC2
         response
           = receiveXML
               (\ s h x ->
diff --git a/gen/Network/AWS/EC2/DescribeInstanceStatus.hs b/gen/Network/AWS/EC2/DescribeInstanceStatus.hs
--- a/gen/Network/AWS/EC2/DescribeInstanceStatus.hs
+++ b/gen/Network/AWS/EC2/DescribeInstanceStatus.hs
@@ -200,10 +200,9 @@
             Just $ rq & disNextToken .~ rs ^. disrsNextToken
 
 instance AWSRequest DescribeInstanceStatus where
-        type Sv DescribeInstanceStatus = EC2
         type Rs DescribeInstanceStatus =
              DescribeInstanceStatusResponse
-        request = postQuery
+        request = postQuery eC2
         response
           = receiveXML
               (\ s h x ->
diff --git a/gen/Network/AWS/EC2/DescribeInstances.hs b/gen/Network/AWS/EC2/DescribeInstances.hs
--- a/gen/Network/AWS/EC2/DescribeInstances.hs
+++ b/gen/Network/AWS/EC2/DescribeInstances.hs
@@ -376,9 +376,8 @@
             Just $ rq & diiNextToken .~ rs ^. dirsNextToken
 
 instance AWSRequest DescribeInstances where
-        type Sv DescribeInstances = EC2
         type Rs DescribeInstances = DescribeInstancesResponse
-        request = postQuery
+        request = postQuery eC2
         response
           = receiveXML
               (\ s h x ->
diff --git a/gen/Network/AWS/EC2/DescribeInternetGateways.hs b/gen/Network/AWS/EC2/DescribeInternetGateways.hs
--- a/gen/Network/AWS/EC2/DescribeInternetGateways.hs
+++ b/gen/Network/AWS/EC2/DescribeInternetGateways.hs
@@ -111,10 +111,9 @@
 dDryRun = lens _dDryRun (\ s a -> s{_dDryRun = a});
 
 instance AWSRequest DescribeInternetGateways where
-        type Sv DescribeInternetGateways = EC2
         type Rs DescribeInternetGateways =
              DescribeInternetGatewaysResponse
-        request = postQuery
+        request = postQuery eC2
         response
           = receiveXML
               (\ s h x ->
diff --git a/gen/Network/AWS/EC2/DescribeKeyPairs.hs b/gen/Network/AWS/EC2/DescribeKeyPairs.hs
--- a/gen/Network/AWS/EC2/DescribeKeyPairs.hs
+++ b/gen/Network/AWS/EC2/DescribeKeyPairs.hs
@@ -97,9 +97,8 @@
 dkpsDryRun = lens _dkpsDryRun (\ s a -> s{_dkpsDryRun = a});
 
 instance AWSRequest DescribeKeyPairs where
-        type Sv DescribeKeyPairs = EC2
         type Rs DescribeKeyPairs = DescribeKeyPairsResponse
-        request = postQuery
+        request = postQuery eC2
         response
           = receiveXML
               (\ s h x ->
diff --git a/gen/Network/AWS/EC2/DescribeMovingAddresses.hs b/gen/Network/AWS/EC2/DescribeMovingAddresses.hs
--- a/gen/Network/AWS/EC2/DescribeMovingAddresses.hs
+++ b/gen/Network/AWS/EC2/DescribeMovingAddresses.hs
@@ -118,10 +118,9 @@
 dmaMaxResults = lens _dmaMaxResults (\ s a -> s{_dmaMaxResults = a});
 
 instance AWSRequest DescribeMovingAddresses where
-        type Sv DescribeMovingAddresses = EC2
         type Rs DescribeMovingAddresses =
              DescribeMovingAddressesResponse
-        request = postQuery
+        request = postQuery eC2
         response
           = receiveXML
               (\ s h x ->
diff --git a/gen/Network/AWS/EC2/DescribeNetworkACLs.hs b/gen/Network/AWS/EC2/DescribeNetworkACLs.hs
--- a/gen/Network/AWS/EC2/DescribeNetworkACLs.hs
+++ b/gen/Network/AWS/EC2/DescribeNetworkACLs.hs
@@ -147,10 +147,9 @@
 dnaclNetworkACLIds = lens _dnaclNetworkACLIds (\ s a -> s{_dnaclNetworkACLIds = a}) . _Default . _Coerce;
 
 instance AWSRequest DescribeNetworkACLs where
-        type Sv DescribeNetworkACLs = EC2
         type Rs DescribeNetworkACLs =
              DescribeNetworkACLsResponse
-        request = postQuery
+        request = postQuery eC2
         response
           = receiveXML
               (\ s h x ->
diff --git a/gen/Network/AWS/EC2/DescribeNetworkInterfaceAttribute.hs b/gen/Network/AWS/EC2/DescribeNetworkInterfaceAttribute.hs
--- a/gen/Network/AWS/EC2/DescribeNetworkInterfaceAttribute.hs
+++ b/gen/Network/AWS/EC2/DescribeNetworkInterfaceAttribute.hs
@@ -93,10 +93,9 @@
 
 instance AWSRequest DescribeNetworkInterfaceAttribute
          where
-        type Sv DescribeNetworkInterfaceAttribute = EC2
         type Rs DescribeNetworkInterfaceAttribute =
              DescribeNetworkInterfaceAttributeResponse
-        request = postQuery
+        request = postQuery eC2
         response
           = receiveXML
               (\ s h x ->
diff --git a/gen/Network/AWS/EC2/DescribeNetworkInterfaces.hs b/gen/Network/AWS/EC2/DescribeNetworkInterfaces.hs
--- a/gen/Network/AWS/EC2/DescribeNetworkInterfaces.hs
+++ b/gen/Network/AWS/EC2/DescribeNetworkInterfaces.hs
@@ -195,10 +195,9 @@
 dnisDryRun = lens _dnisDryRun (\ s a -> s{_dnisDryRun = a});
 
 instance AWSRequest DescribeNetworkInterfaces where
-        type Sv DescribeNetworkInterfaces = EC2
         type Rs DescribeNetworkInterfaces =
              DescribeNetworkInterfacesResponse
-        request = postQuery
+        request = postQuery eC2
         response
           = receiveXML
               (\ s h x ->
diff --git a/gen/Network/AWS/EC2/DescribePlacementGroups.hs b/gen/Network/AWS/EC2/DescribePlacementGroups.hs
--- a/gen/Network/AWS/EC2/DescribePlacementGroups.hs
+++ b/gen/Network/AWS/EC2/DescribePlacementGroups.hs
@@ -100,10 +100,9 @@
 dpgsDryRun = lens _dpgsDryRun (\ s a -> s{_dpgsDryRun = a});
 
 instance AWSRequest DescribePlacementGroups where
-        type Sv DescribePlacementGroups = EC2
         type Rs DescribePlacementGroups =
              DescribePlacementGroupsResponse
-        request = postQuery
+        request = postQuery eC2
         response
           = receiveXML
               (\ s h x ->
diff --git a/gen/Network/AWS/EC2/DescribePrefixLists.hs b/gen/Network/AWS/EC2/DescribePrefixLists.hs
--- a/gen/Network/AWS/EC2/DescribePrefixLists.hs
+++ b/gen/Network/AWS/EC2/DescribePrefixLists.hs
@@ -120,10 +120,9 @@
 dplMaxResults = lens _dplMaxResults (\ s a -> s{_dplMaxResults = a});
 
 instance AWSRequest DescribePrefixLists where
-        type Sv DescribePrefixLists = EC2
         type Rs DescribePrefixLists =
              DescribePrefixListsResponse
-        request = postQuery
+        request = postQuery eC2
         response
           = receiveXML
               (\ s h x ->
diff --git a/gen/Network/AWS/EC2/DescribeRegions.hs b/gen/Network/AWS/EC2/DescribeRegions.hs
--- a/gen/Network/AWS/EC2/DescribeRegions.hs
+++ b/gen/Network/AWS/EC2/DescribeRegions.hs
@@ -95,9 +95,8 @@
 drsDryRun = lens _drsDryRun (\ s a -> s{_drsDryRun = a});
 
 instance AWSRequest DescribeRegions where
-        type Sv DescribeRegions = EC2
         type Rs DescribeRegions = DescribeRegionsResponse
-        request = postQuery
+        request = postQuery eC2
         response
           = receiveXML
               (\ s h x ->
diff --git a/gen/Network/AWS/EC2/DescribeReservedInstances.hs b/gen/Network/AWS/EC2/DescribeReservedInstances.hs
--- a/gen/Network/AWS/EC2/DescribeReservedInstances.hs
+++ b/gen/Network/AWS/EC2/DescribeReservedInstances.hs
@@ -159,10 +159,9 @@
 driDryRun = lens _driDryRun (\ s a -> s{_driDryRun = a});
 
 instance AWSRequest DescribeReservedInstances where
-        type Sv DescribeReservedInstances = EC2
         type Rs DescribeReservedInstances =
              DescribeReservedInstancesResponse
-        request = postQuery
+        request = postQuery eC2
         response
           = receiveXML
               (\ s h x ->
diff --git a/gen/Network/AWS/EC2/DescribeReservedInstancesListings.hs b/gen/Network/AWS/EC2/DescribeReservedInstancesListings.hs
--- a/gen/Network/AWS/EC2/DescribeReservedInstancesListings.hs
+++ b/gen/Network/AWS/EC2/DescribeReservedInstancesListings.hs
@@ -118,10 +118,9 @@
 
 instance AWSRequest DescribeReservedInstancesListings
          where
-        type Sv DescribeReservedInstancesListings = EC2
         type Rs DescribeReservedInstancesListings =
              DescribeReservedInstancesListingsResponse
-        request = postQuery
+        request = postQuery eC2
         response
           = receiveXML
               (\ s h x ->
diff --git a/gen/Network/AWS/EC2/DescribeReservedInstancesModifications.hs b/gen/Network/AWS/EC2/DescribeReservedInstancesModifications.hs
--- a/gen/Network/AWS/EC2/DescribeReservedInstancesModifications.hs
+++ b/gen/Network/AWS/EC2/DescribeReservedInstancesModifications.hs
@@ -141,10 +141,9 @@
 
 instance AWSRequest
          DescribeReservedInstancesModifications where
-        type Sv DescribeReservedInstancesModifications = EC2
         type Rs DescribeReservedInstancesModifications =
              DescribeReservedInstancesModificationsResponse
-        request = postQuery
+        request = postQuery eC2
         response
           = receiveXML
               (\ s h x ->
diff --git a/gen/Network/AWS/EC2/DescribeReservedInstancesOfferings.hs b/gen/Network/AWS/EC2/DescribeReservedInstancesOfferings.hs
--- a/gen/Network/AWS/EC2/DescribeReservedInstancesOfferings.hs
+++ b/gen/Network/AWS/EC2/DescribeReservedInstancesOfferings.hs
@@ -268,10 +268,9 @@
 
 instance AWSRequest
          DescribeReservedInstancesOfferings where
-        type Sv DescribeReservedInstancesOfferings = EC2
         type Rs DescribeReservedInstancesOfferings =
              DescribeReservedInstancesOfferingsResponse
-        request = postQuery
+        request = postQuery eC2
         response
           = receiveXML
               (\ s h x ->
diff --git a/gen/Network/AWS/EC2/DescribeRouteTables.hs b/gen/Network/AWS/EC2/DescribeRouteTables.hs
--- a/gen/Network/AWS/EC2/DescribeRouteTables.hs
+++ b/gen/Network/AWS/EC2/DescribeRouteTables.hs
@@ -156,10 +156,9 @@
 drtsRouteTableIds = lens _drtsRouteTableIds (\ s a -> s{_drtsRouteTableIds = a}) . _Default . _Coerce;
 
 instance AWSRequest DescribeRouteTables where
-        type Sv DescribeRouteTables = EC2
         type Rs DescribeRouteTables =
              DescribeRouteTablesResponse
-        request = postQuery
+        request = postQuery eC2
         response
           = receiveXML
               (\ s h x ->
diff --git a/gen/Network/AWS/EC2/DescribeSecurityGroups.hs b/gen/Network/AWS/EC2/DescribeSecurityGroups.hs
--- a/gen/Network/AWS/EC2/DescribeSecurityGroups.hs
+++ b/gen/Network/AWS/EC2/DescribeSecurityGroups.hs
@@ -150,10 +150,9 @@
 dsgsDryRun = lens _dsgsDryRun (\ s a -> s{_dsgsDryRun = a});
 
 instance AWSRequest DescribeSecurityGroups where
-        type Sv DescribeSecurityGroups = EC2
         type Rs DescribeSecurityGroups =
              DescribeSecurityGroupsResponse
-        request = postQuery
+        request = postQuery eC2
         response
           = receiveXML
               (\ s h x ->
diff --git a/gen/Network/AWS/EC2/DescribeSnapshotAttribute.hs b/gen/Network/AWS/EC2/DescribeSnapshotAttribute.hs
--- a/gen/Network/AWS/EC2/DescribeSnapshotAttribute.hs
+++ b/gen/Network/AWS/EC2/DescribeSnapshotAttribute.hs
@@ -95,10 +95,9 @@
 dsaAttribute = lens _dsaAttribute (\ s a -> s{_dsaAttribute = a});
 
 instance AWSRequest DescribeSnapshotAttribute where
-        type Sv DescribeSnapshotAttribute = EC2
         type Rs DescribeSnapshotAttribute =
              DescribeSnapshotAttributeResponse
-        request = postQuery
+        request = postQuery eC2
         response
           = receiveXML
               (\ s h x ->
diff --git a/gen/Network/AWS/EC2/DescribeSnapshots.hs b/gen/Network/AWS/EC2/DescribeSnapshots.hs
--- a/gen/Network/AWS/EC2/DescribeSnapshots.hs
+++ b/gen/Network/AWS/EC2/DescribeSnapshots.hs
@@ -231,9 +231,8 @@
             Just $ rq & dssNextToken .~ rs ^. dssrsNextToken
 
 instance AWSRequest DescribeSnapshots where
-        type Sv DescribeSnapshots = EC2
         type Rs DescribeSnapshots = DescribeSnapshotsResponse
-        request = postQuery
+        request = postQuery eC2
         response
           = receiveXML
               (\ s h x ->
diff --git a/gen/Network/AWS/EC2/DescribeSpotDatafeedSubscription.hs b/gen/Network/AWS/EC2/DescribeSpotDatafeedSubscription.hs
--- a/gen/Network/AWS/EC2/DescribeSpotDatafeedSubscription.hs
+++ b/gen/Network/AWS/EC2/DescribeSpotDatafeedSubscription.hs
@@ -73,10 +73,9 @@
 
 instance AWSRequest DescribeSpotDatafeedSubscription
          where
-        type Sv DescribeSpotDatafeedSubscription = EC2
         type Rs DescribeSpotDatafeedSubscription =
              DescribeSpotDatafeedSubscriptionResponse
-        request = postQuery
+        request = postQuery eC2
         response
           = receiveXML
               (\ s h x ->
diff --git a/gen/Network/AWS/EC2/DescribeSpotFleetInstances.hs b/gen/Network/AWS/EC2/DescribeSpotFleetInstances.hs
--- a/gen/Network/AWS/EC2/DescribeSpotFleetInstances.hs
+++ b/gen/Network/AWS/EC2/DescribeSpotFleetInstances.hs
@@ -103,10 +103,9 @@
 dsfiSpotFleetRequestId = lens _dsfiSpotFleetRequestId (\ s a -> s{_dsfiSpotFleetRequestId = a});
 
 instance AWSRequest DescribeSpotFleetInstances where
-        type Sv DescribeSpotFleetInstances = EC2
         type Rs DescribeSpotFleetInstances =
              DescribeSpotFleetInstancesResponse
-        request = postQuery
+        request = postQuery eC2
         response
           = receiveXML
               (\ s h x ->
diff --git a/gen/Network/AWS/EC2/DescribeSpotFleetRequestHistory.hs b/gen/Network/AWS/EC2/DescribeSpotFleetRequestHistory.hs
--- a/gen/Network/AWS/EC2/DescribeSpotFleetRequestHistory.hs
+++ b/gen/Network/AWS/EC2/DescribeSpotFleetRequestHistory.hs
@@ -131,10 +131,9 @@
 
 instance AWSRequest DescribeSpotFleetRequestHistory
          where
-        type Sv DescribeSpotFleetRequestHistory = EC2
         type Rs DescribeSpotFleetRequestHistory =
              DescribeSpotFleetRequestHistoryResponse
-        request = postQuery
+        request = postQuery eC2
         response
           = receiveXML
               (\ s h x ->
diff --git a/gen/Network/AWS/EC2/DescribeSpotFleetRequests.hs b/gen/Network/AWS/EC2/DescribeSpotFleetRequests.hs
--- a/gen/Network/AWS/EC2/DescribeSpotFleetRequests.hs
+++ b/gen/Network/AWS/EC2/DescribeSpotFleetRequests.hs
@@ -101,10 +101,9 @@
 dsfrMaxResults = lens _dsfrMaxResults (\ s a -> s{_dsfrMaxResults = a});
 
 instance AWSRequest DescribeSpotFleetRequests where
-        type Sv DescribeSpotFleetRequests = EC2
         type Rs DescribeSpotFleetRequests =
              DescribeSpotFleetRequestsResponse
-        request = postQuery
+        request = postQuery eC2
         response
           = receiveXML
               (\ s h x ->
diff --git a/gen/Network/AWS/EC2/DescribeSpotInstanceRequests.hs b/gen/Network/AWS/EC2/DescribeSpotInstanceRequests.hs
--- a/gen/Network/AWS/EC2/DescribeSpotInstanceRequests.hs
+++ b/gen/Network/AWS/EC2/DescribeSpotInstanceRequests.hs
@@ -220,10 +220,9 @@
 
 instance AWSRequest DescribeSpotInstanceRequests
          where
-        type Sv DescribeSpotInstanceRequests = EC2
         type Rs DescribeSpotInstanceRequests =
              DescribeSpotInstanceRequestsResponse
-        request = postQuery
+        request = postQuery eC2
         response
           = receiveXML
               (\ s h x ->
diff --git a/gen/Network/AWS/EC2/DescribeSpotPriceHistory.hs b/gen/Network/AWS/EC2/DescribeSpotPriceHistory.hs
--- a/gen/Network/AWS/EC2/DescribeSpotPriceHistory.hs
+++ b/gen/Network/AWS/EC2/DescribeSpotPriceHistory.hs
@@ -189,10 +189,9 @@
             Just $ rq & dsphNextToken .~ rs ^. dsphrsNextToken
 
 instance AWSRequest DescribeSpotPriceHistory where
-        type Sv DescribeSpotPriceHistory = EC2
         type Rs DescribeSpotPriceHistory =
              DescribeSpotPriceHistoryResponse
-        request = postQuery
+        request = postQuery eC2
         response
           = receiveXML
               (\ s h x ->
diff --git a/gen/Network/AWS/EC2/DescribeSubnets.hs b/gen/Network/AWS/EC2/DescribeSubnets.hs
--- a/gen/Network/AWS/EC2/DescribeSubnets.hs
+++ b/gen/Network/AWS/EC2/DescribeSubnets.hs
@@ -128,9 +128,8 @@
 dsDryRun = lens _dsDryRun (\ s a -> s{_dsDryRun = a});
 
 instance AWSRequest DescribeSubnets where
-        type Sv DescribeSubnets = EC2
         type Rs DescribeSubnets = DescribeSubnetsResponse
-        request = postQuery
+        request = postQuery eC2
         response
           = receiveXML
               (\ s h x ->
diff --git a/gen/Network/AWS/EC2/DescribeTags.hs b/gen/Network/AWS/EC2/DescribeTags.hs
--- a/gen/Network/AWS/EC2/DescribeTags.hs
+++ b/gen/Network/AWS/EC2/DescribeTags.hs
@@ -128,9 +128,8 @@
             Just $ rq & dtNextToken .~ rs ^. dtrsNextToken
 
 instance AWSRequest DescribeTags where
-        type Sv DescribeTags = EC2
         type Rs DescribeTags = DescribeTagsResponse
-        request = postQuery
+        request = postQuery eC2
         response
           = receiveXML
               (\ s h x ->
diff --git a/gen/Network/AWS/EC2/DescribeVPCAttribute.hs b/gen/Network/AWS/EC2/DescribeVPCAttribute.hs
--- a/gen/Network/AWS/EC2/DescribeVPCAttribute.hs
+++ b/gen/Network/AWS/EC2/DescribeVPCAttribute.hs
@@ -90,10 +90,9 @@
 dvpcaVPCId = lens _dvpcaVPCId (\ s a -> s{_dvpcaVPCId = a});
 
 instance AWSRequest DescribeVPCAttribute where
-        type Sv DescribeVPCAttribute = EC2
         type Rs DescribeVPCAttribute =
              DescribeVPCAttributeResponse
-        request = postQuery
+        request = postQuery eC2
         response
           = receiveXML
               (\ s h x ->
diff --git a/gen/Network/AWS/EC2/DescribeVPCClassicLink.hs b/gen/Network/AWS/EC2/DescribeVPCClassicLink.hs
--- a/gen/Network/AWS/EC2/DescribeVPCClassicLink.hs
+++ b/gen/Network/AWS/EC2/DescribeVPCClassicLink.hs
@@ -104,10 +104,9 @@
 dvclDryRun = lens _dvclDryRun (\ s a -> s{_dvclDryRun = a});
 
 instance AWSRequest DescribeVPCClassicLink where
-        type Sv DescribeVPCClassicLink = EC2
         type Rs DescribeVPCClassicLink =
              DescribeVPCClassicLinkResponse
-        request = postQuery
+        request = postQuery eC2
         response
           = receiveXML
               (\ s h x ->
diff --git a/gen/Network/AWS/EC2/DescribeVPCEndpointServices.hs b/gen/Network/AWS/EC2/DescribeVPCEndpointServices.hs
--- a/gen/Network/AWS/EC2/DescribeVPCEndpointServices.hs
+++ b/gen/Network/AWS/EC2/DescribeVPCEndpointServices.hs
@@ -94,10 +94,9 @@
 dvesMaxResults = lens _dvesMaxResults (\ s a -> s{_dvesMaxResults = a});
 
 instance AWSRequest DescribeVPCEndpointServices where
-        type Sv DescribeVPCEndpointServices = EC2
         type Rs DescribeVPCEndpointServices =
              DescribeVPCEndpointServicesResponse
-        request = postQuery
+        request = postQuery eC2
         response
           = receiveXML
               (\ s h x ->
diff --git a/gen/Network/AWS/EC2/DescribeVPCEndpoints.hs b/gen/Network/AWS/EC2/DescribeVPCEndpoints.hs
--- a/gen/Network/AWS/EC2/DescribeVPCEndpoints.hs
+++ b/gen/Network/AWS/EC2/DescribeVPCEndpoints.hs
@@ -121,10 +121,9 @@
 dvpceMaxResults = lens _dvpceMaxResults (\ s a -> s{_dvpceMaxResults = a});
 
 instance AWSRequest DescribeVPCEndpoints where
-        type Sv DescribeVPCEndpoints = EC2
         type Rs DescribeVPCEndpoints =
              DescribeVPCEndpointsResponse
-        request = postQuery
+        request = postQuery eC2
         response
           = receiveXML
               (\ s h x ->
diff --git a/gen/Network/AWS/EC2/DescribeVPCPeeringConnections.hs b/gen/Network/AWS/EC2/DescribeVPCPeeringConnections.hs
--- a/gen/Network/AWS/EC2/DescribeVPCPeeringConnections.hs
+++ b/gen/Network/AWS/EC2/DescribeVPCPeeringConnections.hs
@@ -131,10 +131,9 @@
 
 instance AWSRequest DescribeVPCPeeringConnections
          where
-        type Sv DescribeVPCPeeringConnections = EC2
         type Rs DescribeVPCPeeringConnections =
              DescribeVPCPeeringConnectionsResponse
-        request = postQuery
+        request = postQuery eC2
         response
           = receiveXML
               (\ s h x ->
diff --git a/gen/Network/AWS/EC2/DescribeVPCs.hs b/gen/Network/AWS/EC2/DescribeVPCs.hs
--- a/gen/Network/AWS/EC2/DescribeVPCs.hs
+++ b/gen/Network/AWS/EC2/DescribeVPCs.hs
@@ -116,9 +116,8 @@
 dvsDryRun = lens _dvsDryRun (\ s a -> s{_dvsDryRun = a});
 
 instance AWSRequest DescribeVPCs where
-        type Sv DescribeVPCs = EC2
         type Rs DescribeVPCs = DescribeVPCsResponse
-        request = postQuery
+        request = postQuery eC2
         response
           = receiveXML
               (\ s h x ->
diff --git a/gen/Network/AWS/EC2/DescribeVPNConnections.hs b/gen/Network/AWS/EC2/DescribeVPNConnections.hs
--- a/gen/Network/AWS/EC2/DescribeVPNConnections.hs
+++ b/gen/Network/AWS/EC2/DescribeVPNConnections.hs
@@ -134,10 +134,9 @@
 dvpncDryRun = lens _dvpncDryRun (\ s a -> s{_dvpncDryRun = a});
 
 instance AWSRequest DescribeVPNConnections where
-        type Sv DescribeVPNConnections = EC2
         type Rs DescribeVPNConnections =
              DescribeVPNConnectionsResponse
-        request = postQuery
+        request = postQuery eC2
         response
           = receiveXML
               (\ s h x ->
diff --git a/gen/Network/AWS/EC2/DescribeVPNGateways.hs b/gen/Network/AWS/EC2/DescribeVPNGateways.hs
--- a/gen/Network/AWS/EC2/DescribeVPNGateways.hs
+++ b/gen/Network/AWS/EC2/DescribeVPNGateways.hs
@@ -124,10 +124,9 @@
 dvgsVPNGatewayIds = lens _dvgsVPNGatewayIds (\ s a -> s{_dvgsVPNGatewayIds = a}) . _Default . _Coerce;
 
 instance AWSRequest DescribeVPNGateways where
-        type Sv DescribeVPNGateways = EC2
         type Rs DescribeVPNGateways =
              DescribeVPNGatewaysResponse
-        request = postQuery
+        request = postQuery eC2
         response
           = receiveXML
               (\ s h x ->
diff --git a/gen/Network/AWS/EC2/DescribeVolumeAttribute.hs b/gen/Network/AWS/EC2/DescribeVolumeAttribute.hs
--- a/gen/Network/AWS/EC2/DescribeVolumeAttribute.hs
+++ b/gen/Network/AWS/EC2/DescribeVolumeAttribute.hs
@@ -94,10 +94,9 @@
 dvaVolumeId = lens _dvaVolumeId (\ s a -> s{_dvaVolumeId = a});
 
 instance AWSRequest DescribeVolumeAttribute where
-        type Sv DescribeVolumeAttribute = EC2
         type Rs DescribeVolumeAttribute =
              DescribeVolumeAttributeResponse
-        request = postQuery
+        request = postQuery eC2
         response
           = receiveXML
               (\ s h x ->
diff --git a/gen/Network/AWS/EC2/DescribeVolumeStatus.hs b/gen/Network/AWS/EC2/DescribeVolumeStatus.hs
--- a/gen/Network/AWS/EC2/DescribeVolumeStatus.hs
+++ b/gen/Network/AWS/EC2/DescribeVolumeStatus.hs
@@ -199,10 +199,9 @@
             Just $ rq & dvssNextToken .~ rs ^. dvsrsNextToken
 
 instance AWSRequest DescribeVolumeStatus where
-        type Sv DescribeVolumeStatus = EC2
         type Rs DescribeVolumeStatus =
              DescribeVolumeStatusResponse
-        request = postQuery
+        request = postQuery eC2
         response
           = receiveXML
               (\ s h x ->
diff --git a/gen/Network/AWS/EC2/DescribeVolumes.hs b/gen/Network/AWS/EC2/DescribeVolumes.hs
--- a/gen/Network/AWS/EC2/DescribeVolumes.hs
+++ b/gen/Network/AWS/EC2/DescribeVolumes.hs
@@ -179,9 +179,8 @@
 desMaxResults = lens _desMaxResults (\ s a -> s{_desMaxResults = a});
 
 instance AWSRequest DescribeVolumes where
-        type Sv DescribeVolumes = EC2
         type Rs DescribeVolumes = DescribeVolumesResponse
-        request = postQuery
+        request = postQuery eC2
         response
           = receiveXML
               (\ s h x ->
diff --git a/gen/Network/AWS/EC2/DetachClassicLinkVPC.hs b/gen/Network/AWS/EC2/DetachClassicLinkVPC.hs
--- a/gen/Network/AWS/EC2/DetachClassicLinkVPC.hs
+++ b/gen/Network/AWS/EC2/DetachClassicLinkVPC.hs
@@ -91,10 +91,9 @@
 dclvVPCId = lens _dclvVPCId (\ s a -> s{_dclvVPCId = a});
 
 instance AWSRequest DetachClassicLinkVPC where
-        type Sv DetachClassicLinkVPC = EC2
         type Rs DetachClassicLinkVPC =
              DetachClassicLinkVPCResponse
-        request = postQuery
+        request = postQuery eC2
         response
           = receiveXML
               (\ s h x ->
diff --git a/gen/Network/AWS/EC2/DetachInternetGateway.hs b/gen/Network/AWS/EC2/DetachInternetGateway.hs
--- a/gen/Network/AWS/EC2/DetachInternetGateway.hs
+++ b/gen/Network/AWS/EC2/DetachInternetGateway.hs
@@ -87,10 +87,9 @@
 digVPCId = lens _digVPCId (\ s a -> s{_digVPCId = a});
 
 instance AWSRequest DetachInternetGateway where
-        type Sv DetachInternetGateway = EC2
         type Rs DetachInternetGateway =
              DetachInternetGatewayResponse
-        request = postQuery
+        request = postQuery eC2
         response = receiveNull DetachInternetGatewayResponse'
 
 instance ToHeaders DetachInternetGateway where
diff --git a/gen/Network/AWS/EC2/DetachNetworkInterface.hs b/gen/Network/AWS/EC2/DetachNetworkInterface.hs
--- a/gen/Network/AWS/EC2/DetachNetworkInterface.hs
+++ b/gen/Network/AWS/EC2/DetachNetworkInterface.hs
@@ -84,10 +84,9 @@
 dniAttachmentId = lens _dniAttachmentId (\ s a -> s{_dniAttachmentId = a});
 
 instance AWSRequest DetachNetworkInterface where
-        type Sv DetachNetworkInterface = EC2
         type Rs DetachNetworkInterface =
              DetachNetworkInterfaceResponse
-        request = postQuery
+        request = postQuery eC2
         response
           = receiveNull DetachNetworkInterfaceResponse'
 
diff --git a/gen/Network/AWS/EC2/DetachVPNGateway.hs b/gen/Network/AWS/EC2/DetachVPNGateway.hs
--- a/gen/Network/AWS/EC2/DetachVPNGateway.hs
+++ b/gen/Network/AWS/EC2/DetachVPNGateway.hs
@@ -93,9 +93,8 @@
 dvpngVPCId = lens _dvpngVPCId (\ s a -> s{_dvpngVPCId = a});
 
 instance AWSRequest DetachVPNGateway where
-        type Sv DetachVPNGateway = EC2
         type Rs DetachVPNGateway = DetachVPNGatewayResponse
-        request = postQuery
+        request = postQuery eC2
         response = receiveNull DetachVPNGatewayResponse'
 
 instance ToHeaders DetachVPNGateway where
diff --git a/gen/Network/AWS/EC2/DetachVolume.hs b/gen/Network/AWS/EC2/DetachVolume.hs
--- a/gen/Network/AWS/EC2/DetachVolume.hs
+++ b/gen/Network/AWS/EC2/DetachVolume.hs
@@ -129,9 +129,8 @@
 dvVolumeId = lens _dvVolumeId (\ s a -> s{_dvVolumeId = a});
 
 instance AWSRequest DetachVolume where
-        type Sv DetachVolume = EC2
         type Rs DetachVolume = VolumeAttachment
-        request = postQuery
+        request = postQuery eC2
         response = receiveXML (\ s h x -> parseXML x)
 
 instance ToHeaders DetachVolume where
diff --git a/gen/Network/AWS/EC2/DisableVGWRoutePropagation.hs b/gen/Network/AWS/EC2/DisableVGWRoutePropagation.hs
--- a/gen/Network/AWS/EC2/DisableVGWRoutePropagation.hs
+++ b/gen/Network/AWS/EC2/DisableVGWRoutePropagation.hs
@@ -74,10 +74,9 @@
 dvrpGatewayId = lens _dvrpGatewayId (\ s a -> s{_dvrpGatewayId = a});
 
 instance AWSRequest DisableVGWRoutePropagation where
-        type Sv DisableVGWRoutePropagation = EC2
         type Rs DisableVGWRoutePropagation =
              DisableVGWRoutePropagationResponse
-        request = postQuery
+        request = postQuery eC2
         response
           = receiveNull DisableVGWRoutePropagationResponse'
 
diff --git a/gen/Network/AWS/EC2/DisableVPCClassicLink.hs b/gen/Network/AWS/EC2/DisableVPCClassicLink.hs
--- a/gen/Network/AWS/EC2/DisableVPCClassicLink.hs
+++ b/gen/Network/AWS/EC2/DisableVPCClassicLink.hs
@@ -79,10 +79,9 @@
 dvpcclVPCId = lens _dvpcclVPCId (\ s a -> s{_dvpcclVPCId = a});
 
 instance AWSRequest DisableVPCClassicLink where
-        type Sv DisableVPCClassicLink = EC2
         type Rs DisableVPCClassicLink =
              DisableVPCClassicLinkResponse
-        request = postQuery
+        request = postQuery eC2
         response
           = receiveXML
               (\ s h x ->
diff --git a/gen/Network/AWS/EC2/DisassociateAddress.hs b/gen/Network/AWS/EC2/DisassociateAddress.hs
--- a/gen/Network/AWS/EC2/DisassociateAddress.hs
+++ b/gen/Network/AWS/EC2/DisassociateAddress.hs
@@ -92,10 +92,9 @@
 dasDryRun = lens _dasDryRun (\ s a -> s{_dasDryRun = a});
 
 instance AWSRequest DisassociateAddress where
-        type Sv DisassociateAddress = EC2
         type Rs DisassociateAddress =
              DisassociateAddressResponse
-        request = postQuery
+        request = postQuery eC2
         response = receiveNull DisassociateAddressResponse'
 
 instance ToHeaders DisassociateAddress where
diff --git a/gen/Network/AWS/EC2/DisassociateRouteTable.hs b/gen/Network/AWS/EC2/DisassociateRouteTable.hs
--- a/gen/Network/AWS/EC2/DisassociateRouteTable.hs
+++ b/gen/Network/AWS/EC2/DisassociateRouteTable.hs
@@ -82,10 +82,9 @@
 drtAssociationId = lens _drtAssociationId (\ s a -> s{_drtAssociationId = a});
 
 instance AWSRequest DisassociateRouteTable where
-        type Sv DisassociateRouteTable = EC2
         type Rs DisassociateRouteTable =
              DisassociateRouteTableResponse
-        request = postQuery
+        request = postQuery eC2
         response
           = receiveNull DisassociateRouteTableResponse'
 
diff --git a/gen/Network/AWS/EC2/EnableVGWRoutePropagation.hs b/gen/Network/AWS/EC2/EnableVGWRoutePropagation.hs
--- a/gen/Network/AWS/EC2/EnableVGWRoutePropagation.hs
+++ b/gen/Network/AWS/EC2/EnableVGWRoutePropagation.hs
@@ -74,10 +74,9 @@
 evrpGatewayId = lens _evrpGatewayId (\ s a -> s{_evrpGatewayId = a});
 
 instance AWSRequest EnableVGWRoutePropagation where
-        type Sv EnableVGWRoutePropagation = EC2
         type Rs EnableVGWRoutePropagation =
              EnableVGWRoutePropagationResponse
-        request = postQuery
+        request = postQuery eC2
         response
           = receiveNull EnableVGWRoutePropagationResponse'
 
diff --git a/gen/Network/AWS/EC2/EnableVPCClassicLink.hs b/gen/Network/AWS/EC2/EnableVPCClassicLink.hs
--- a/gen/Network/AWS/EC2/EnableVPCClassicLink.hs
+++ b/gen/Network/AWS/EC2/EnableVPCClassicLink.hs
@@ -86,10 +86,9 @@
 evclVPCId = lens _evclVPCId (\ s a -> s{_evclVPCId = a});
 
 instance AWSRequest EnableVPCClassicLink where
-        type Sv EnableVPCClassicLink = EC2
         type Rs EnableVPCClassicLink =
              EnableVPCClassicLinkResponse
-        request = postQuery
+        request = postQuery eC2
         response
           = receiveXML
               (\ s h x ->
diff --git a/gen/Network/AWS/EC2/EnableVolumeIO.hs b/gen/Network/AWS/EC2/EnableVolumeIO.hs
--- a/gen/Network/AWS/EC2/EnableVolumeIO.hs
+++ b/gen/Network/AWS/EC2/EnableVolumeIO.hs
@@ -76,9 +76,8 @@
 evioVolumeId = lens _evioVolumeId (\ s a -> s{_evioVolumeId = a});
 
 instance AWSRequest EnableVolumeIO where
-        type Sv EnableVolumeIO = EC2
         type Rs EnableVolumeIO = EnableVolumeIOResponse
-        request = postQuery
+        request = postQuery eC2
         response = receiveNull EnableVolumeIOResponse'
 
 instance ToHeaders EnableVolumeIO where
diff --git a/gen/Network/AWS/EC2/GetConsoleOutput.hs b/gen/Network/AWS/EC2/GetConsoleOutput.hs
--- a/gen/Network/AWS/EC2/GetConsoleOutput.hs
+++ b/gen/Network/AWS/EC2/GetConsoleOutput.hs
@@ -99,9 +99,8 @@
 gcoInstanceId = lens _gcoInstanceId (\ s a -> s{_gcoInstanceId = a});
 
 instance AWSRequest GetConsoleOutput where
-        type Sv GetConsoleOutput = EC2
         type Rs GetConsoleOutput = GetConsoleOutputResponse
-        request = postQuery
+        request = postQuery eC2
         response
           = receiveXML
               (\ s h x ->
diff --git a/gen/Network/AWS/EC2/GetPasswordData.hs b/gen/Network/AWS/EC2/GetPasswordData.hs
--- a/gen/Network/AWS/EC2/GetPasswordData.hs
+++ b/gen/Network/AWS/EC2/GetPasswordData.hs
@@ -94,9 +94,8 @@
 gpdInstanceId = lens _gpdInstanceId (\ s a -> s{_gpdInstanceId = a});
 
 instance AWSRequest GetPasswordData where
-        type Sv GetPasswordData = EC2
         type Rs GetPasswordData = GetPasswordDataResponse
-        request = postQuery
+        request = postQuery eC2
         response
           = receiveXML
               (\ s h x ->
diff --git a/gen/Network/AWS/EC2/ImportImage.hs b/gen/Network/AWS/EC2/ImportImage.hs
--- a/gen/Network/AWS/EC2/ImportImage.hs
+++ b/gen/Network/AWS/EC2/ImportImage.hs
@@ -175,9 +175,8 @@
 impDiskContainers = lens _impDiskContainers (\ s a -> s{_impDiskContainers = a}) . _Default . _Coerce;
 
 instance AWSRequest ImportImage where
-        type Sv ImportImage = EC2
         type Rs ImportImage = ImportImageResponse
-        request = postQuery
+        request = postQuery eC2
         response
           = receiveXML
               (\ s h x ->
diff --git a/gen/Network/AWS/EC2/ImportInstance.hs b/gen/Network/AWS/EC2/ImportInstance.hs
--- a/gen/Network/AWS/EC2/ImportInstance.hs
+++ b/gen/Network/AWS/EC2/ImportInstance.hs
@@ -111,9 +111,8 @@
 iiPlatform = lens _iiPlatform (\ s a -> s{_iiPlatform = a});
 
 instance AWSRequest ImportInstance where
-        type Sv ImportInstance = EC2
         type Rs ImportInstance = ImportInstanceResponse
-        request = postQuery
+        request = postQuery eC2
         response
           = receiveXML
               (\ s h x ->
diff --git a/gen/Network/AWS/EC2/ImportKeyPair.hs b/gen/Network/AWS/EC2/ImportKeyPair.hs
--- a/gen/Network/AWS/EC2/ImportKeyPair.hs
+++ b/gen/Network/AWS/EC2/ImportKeyPair.hs
@@ -104,9 +104,8 @@
 ikpPublicKeyMaterial = lens _ikpPublicKeyMaterial (\ s a -> s{_ikpPublicKeyMaterial = a}) . _Base64;
 
 instance AWSRequest ImportKeyPair where
-        type Sv ImportKeyPair = EC2
         type Rs ImportKeyPair = ImportKeyPairResponse
-        request = postQuery
+        request = postQuery eC2
         response
           = receiveXML
               (\ s h x ->
diff --git a/gen/Network/AWS/EC2/ImportSnapshot.hs b/gen/Network/AWS/EC2/ImportSnapshot.hs
--- a/gen/Network/AWS/EC2/ImportSnapshot.hs
+++ b/gen/Network/AWS/EC2/ImportSnapshot.hs
@@ -116,9 +116,8 @@
 isClientData = lens _isClientData (\ s a -> s{_isClientData = a});
 
 instance AWSRequest ImportSnapshot where
-        type Sv ImportSnapshot = EC2
         type Rs ImportSnapshot = ImportSnapshotResponse
-        request = postQuery
+        request = postQuery eC2
         response
           = receiveXML
               (\ s h x ->
diff --git a/gen/Network/AWS/EC2/ImportVolume.hs b/gen/Network/AWS/EC2/ImportVolume.hs
--- a/gen/Network/AWS/EC2/ImportVolume.hs
+++ b/gen/Network/AWS/EC2/ImportVolume.hs
@@ -112,9 +112,8 @@
 ivVolume = lens _ivVolume (\ s a -> s{_ivVolume = a});
 
 instance AWSRequest ImportVolume where
-        type Sv ImportVolume = EC2
         type Rs ImportVolume = ImportVolumeResponse
-        request = postQuery
+        request = postQuery eC2
         response
           = receiveXML
               (\ s h x ->
diff --git a/gen/Network/AWS/EC2/ModifyImageAttribute.hs b/gen/Network/AWS/EC2/ModifyImageAttribute.hs
--- a/gen/Network/AWS/EC2/ModifyImageAttribute.hs
+++ b/gen/Network/AWS/EC2/ModifyImageAttribute.hs
@@ -156,10 +156,9 @@
 miaImageId = lens _miaImageId (\ s a -> s{_miaImageId = a});
 
 instance AWSRequest ModifyImageAttribute where
-        type Sv ModifyImageAttribute = EC2
         type Rs ModifyImageAttribute =
              ModifyImageAttributeResponse
-        request = postQuery
+        request = postQuery eC2
         response = receiveNull ModifyImageAttributeResponse'
 
 instance ToHeaders ModifyImageAttribute where
diff --git a/gen/Network/AWS/EC2/ModifyInstanceAttribute.hs b/gen/Network/AWS/EC2/ModifyInstanceAttribute.hs
--- a/gen/Network/AWS/EC2/ModifyInstanceAttribute.hs
+++ b/gen/Network/AWS/EC2/ModifyInstanceAttribute.hs
@@ -235,10 +235,9 @@
 mInstanceId = lens _mInstanceId (\ s a -> s{_mInstanceId = a});
 
 instance AWSRequest ModifyInstanceAttribute where
-        type Sv ModifyInstanceAttribute = EC2
         type Rs ModifyInstanceAttribute =
              ModifyInstanceAttributeResponse
-        request = postQuery
+        request = postQuery eC2
         response
           = receiveNull ModifyInstanceAttributeResponse'
 
diff --git a/gen/Network/AWS/EC2/ModifyNetworkInterfaceAttribute.hs b/gen/Network/AWS/EC2/ModifyNetworkInterfaceAttribute.hs
--- a/gen/Network/AWS/EC2/ModifyNetworkInterfaceAttribute.hs
+++ b/gen/Network/AWS/EC2/ModifyNetworkInterfaceAttribute.hs
@@ -123,10 +123,9 @@
 
 instance AWSRequest ModifyNetworkInterfaceAttribute
          where
-        type Sv ModifyNetworkInterfaceAttribute = EC2
         type Rs ModifyNetworkInterfaceAttribute =
              ModifyNetworkInterfaceAttributeResponse
-        request = postQuery
+        request = postQuery eC2
         response
           = receiveNull
               ModifyNetworkInterfaceAttributeResponse'
diff --git a/gen/Network/AWS/EC2/ModifyReservedInstances.hs b/gen/Network/AWS/EC2/ModifyReservedInstances.hs
--- a/gen/Network/AWS/EC2/ModifyReservedInstances.hs
+++ b/gen/Network/AWS/EC2/ModifyReservedInstances.hs
@@ -92,10 +92,9 @@
 mriTargetConfigurations = lens _mriTargetConfigurations (\ s a -> s{_mriTargetConfigurations = a}) . _Coerce;
 
 instance AWSRequest ModifyReservedInstances where
-        type Sv ModifyReservedInstances = EC2
         type Rs ModifyReservedInstances =
              ModifyReservedInstancesResponse
-        request = postQuery
+        request = postQuery eC2
         response
           = receiveXML
               (\ s h x ->
diff --git a/gen/Network/AWS/EC2/ModifySnapshotAttribute.hs b/gen/Network/AWS/EC2/ModifySnapshotAttribute.hs
--- a/gen/Network/AWS/EC2/ModifySnapshotAttribute.hs
+++ b/gen/Network/AWS/EC2/ModifySnapshotAttribute.hs
@@ -132,10 +132,9 @@
 msaSnapshotId = lens _msaSnapshotId (\ s a -> s{_msaSnapshotId = a});
 
 instance AWSRequest ModifySnapshotAttribute where
-        type Sv ModifySnapshotAttribute = EC2
         type Rs ModifySnapshotAttribute =
              ModifySnapshotAttributeResponse
-        request = postQuery
+        request = postQuery eC2
         response
           = receiveNull ModifySnapshotAttributeResponse'
 
diff --git a/gen/Network/AWS/EC2/ModifySubnetAttribute.hs b/gen/Network/AWS/EC2/ModifySubnetAttribute.hs
--- a/gen/Network/AWS/EC2/ModifySubnetAttribute.hs
+++ b/gen/Network/AWS/EC2/ModifySubnetAttribute.hs
@@ -73,10 +73,9 @@
 msaSubnetId = lens _msaSubnetId (\ s a -> s{_msaSubnetId = a});
 
 instance AWSRequest ModifySubnetAttribute where
-        type Sv ModifySubnetAttribute = EC2
         type Rs ModifySubnetAttribute =
              ModifySubnetAttributeResponse
-        request = postQuery
+        request = postQuery eC2
         response = receiveNull ModifySubnetAttributeResponse'
 
 instance ToHeaders ModifySubnetAttribute where
diff --git a/gen/Network/AWS/EC2/ModifyVPCAttribute.hs b/gen/Network/AWS/EC2/ModifyVPCAttribute.hs
--- a/gen/Network/AWS/EC2/ModifyVPCAttribute.hs
+++ b/gen/Network/AWS/EC2/ModifyVPCAttribute.hs
@@ -90,10 +90,9 @@
 mvaVPCId = lens _mvaVPCId (\ s a -> s{_mvaVPCId = a});
 
 instance AWSRequest ModifyVPCAttribute where
-        type Sv ModifyVPCAttribute = EC2
         type Rs ModifyVPCAttribute =
              ModifyVPCAttributeResponse
-        request = postQuery
+        request = postQuery eC2
         response = receiveNull ModifyVPCAttributeResponse'
 
 instance ToHeaders ModifyVPCAttribute where
diff --git a/gen/Network/AWS/EC2/ModifyVPCEndpoint.hs b/gen/Network/AWS/EC2/ModifyVPCEndpoint.hs
--- a/gen/Network/AWS/EC2/ModifyVPCEndpoint.hs
+++ b/gen/Network/AWS/EC2/ModifyVPCEndpoint.hs
@@ -118,9 +118,8 @@
 mveVPCEndpointId = lens _mveVPCEndpointId (\ s a -> s{_mveVPCEndpointId = a});
 
 instance AWSRequest ModifyVPCEndpoint where
-        type Sv ModifyVPCEndpoint = EC2
         type Rs ModifyVPCEndpoint = ModifyVPCEndpointResponse
-        request = postQuery
+        request = postQuery eC2
         response
           = receiveXML
               (\ s h x ->
diff --git a/gen/Network/AWS/EC2/ModifyVolumeAttribute.hs b/gen/Network/AWS/EC2/ModifyVolumeAttribute.hs
--- a/gen/Network/AWS/EC2/ModifyVolumeAttribute.hs
+++ b/gen/Network/AWS/EC2/ModifyVolumeAttribute.hs
@@ -94,10 +94,9 @@
 mvaVolumeId = lens _mvaVolumeId (\ s a -> s{_mvaVolumeId = a});
 
 instance AWSRequest ModifyVolumeAttribute where
-        type Sv ModifyVolumeAttribute = EC2
         type Rs ModifyVolumeAttribute =
              ModifyVolumeAttributeResponse
-        request = postQuery
+        request = postQuery eC2
         response = receiveNull ModifyVolumeAttributeResponse'
 
 instance ToHeaders ModifyVolumeAttribute where
diff --git a/gen/Network/AWS/EC2/MonitorInstances.hs b/gen/Network/AWS/EC2/MonitorInstances.hs
--- a/gen/Network/AWS/EC2/MonitorInstances.hs
+++ b/gen/Network/AWS/EC2/MonitorInstances.hs
@@ -80,9 +80,8 @@
 miInstanceIds = lens _miInstanceIds (\ s a -> s{_miInstanceIds = a}) . _Coerce;
 
 instance AWSRequest MonitorInstances where
-        type Sv MonitorInstances = EC2
         type Rs MonitorInstances = MonitorInstancesResponse
-        request = postQuery
+        request = postQuery eC2
         response
           = receiveXML
               (\ s h x ->
diff --git a/gen/Network/AWS/EC2/MoveAddressToVPC.hs b/gen/Network/AWS/EC2/MoveAddressToVPC.hs
--- a/gen/Network/AWS/EC2/MoveAddressToVPC.hs
+++ b/gen/Network/AWS/EC2/MoveAddressToVPC.hs
@@ -84,9 +84,8 @@
 matvPublicIP = lens _matvPublicIP (\ s a -> s{_matvPublicIP = a});
 
 instance AWSRequest MoveAddressToVPC where
-        type Sv MoveAddressToVPC = EC2
         type Rs MoveAddressToVPC = MoveAddressToVPCResponse
-        request = postQuery
+        request = postQuery eC2
         response
           = receiveXML
               (\ s h x ->
diff --git a/gen/Network/AWS/EC2/PurchaseReservedInstancesOffering.hs b/gen/Network/AWS/EC2/PurchaseReservedInstancesOffering.hs
--- a/gen/Network/AWS/EC2/PurchaseReservedInstancesOffering.hs
+++ b/gen/Network/AWS/EC2/PurchaseReservedInstancesOffering.hs
@@ -114,10 +114,9 @@
 
 instance AWSRequest PurchaseReservedInstancesOffering
          where
-        type Sv PurchaseReservedInstancesOffering = EC2
         type Rs PurchaseReservedInstancesOffering =
              PurchaseReservedInstancesOfferingResponse
-        request = postQuery
+        request = postQuery eC2
         response
           = receiveXML
               (\ s h x ->
diff --git a/gen/Network/AWS/EC2/RebootInstances.hs b/gen/Network/AWS/EC2/RebootInstances.hs
--- a/gen/Network/AWS/EC2/RebootInstances.hs
+++ b/gen/Network/AWS/EC2/RebootInstances.hs
@@ -84,9 +84,8 @@
 rebInstanceIds = lens _rebInstanceIds (\ s a -> s{_rebInstanceIds = a}) . _Coerce;
 
 instance AWSRequest RebootInstances where
-        type Sv RebootInstances = EC2
         type Rs RebootInstances = RebootInstancesResponse
-        request = postQuery
+        request = postQuery eC2
         response = receiveNull RebootInstancesResponse'
 
 instance ToHeaders RebootInstances where
diff --git a/gen/Network/AWS/EC2/RegisterImage.hs b/gen/Network/AWS/EC2/RegisterImage.hs
--- a/gen/Network/AWS/EC2/RegisterImage.hs
+++ b/gen/Network/AWS/EC2/RegisterImage.hs
@@ -201,9 +201,8 @@
 riName = lens _riName (\ s a -> s{_riName = a});
 
 instance AWSRequest RegisterImage where
-        type Sv RegisterImage = EC2
         type Rs RegisterImage = RegisterImageResponse
-        request = postQuery
+        request = postQuery eC2
         response
           = receiveXML
               (\ s h x ->
diff --git a/gen/Network/AWS/EC2/RejectVPCPeeringConnection.hs b/gen/Network/AWS/EC2/RejectVPCPeeringConnection.hs
--- a/gen/Network/AWS/EC2/RejectVPCPeeringConnection.hs
+++ b/gen/Network/AWS/EC2/RejectVPCPeeringConnection.hs
@@ -83,10 +83,9 @@
 rvpcVPCPeeringConnectionId = lens _rvpcVPCPeeringConnectionId (\ s a -> s{_rvpcVPCPeeringConnectionId = a});
 
 instance AWSRequest RejectVPCPeeringConnection where
-        type Sv RejectVPCPeeringConnection = EC2
         type Rs RejectVPCPeeringConnection =
              RejectVPCPeeringConnectionResponse
-        request = postQuery
+        request = postQuery eC2
         response
           = receiveXML
               (\ s h x ->
diff --git a/gen/Network/AWS/EC2/ReleaseAddress.hs b/gen/Network/AWS/EC2/ReleaseAddress.hs
--- a/gen/Network/AWS/EC2/ReleaseAddress.hs
+++ b/gen/Network/AWS/EC2/ReleaseAddress.hs
@@ -99,9 +99,8 @@
 raDryRun = lens _raDryRun (\ s a -> s{_raDryRun = a});
 
 instance AWSRequest ReleaseAddress where
-        type Sv ReleaseAddress = EC2
         type Rs ReleaseAddress = ReleaseAddressResponse
-        request = postQuery
+        request = postQuery eC2
         response = receiveNull ReleaseAddressResponse'
 
 instance ToHeaders ReleaseAddress where
diff --git a/gen/Network/AWS/EC2/ReplaceNetworkACLAssociation.hs b/gen/Network/AWS/EC2/ReplaceNetworkACLAssociation.hs
--- a/gen/Network/AWS/EC2/ReplaceNetworkACLAssociation.hs
+++ b/gen/Network/AWS/EC2/ReplaceNetworkACLAssociation.hs
@@ -94,10 +94,9 @@
 
 instance AWSRequest ReplaceNetworkACLAssociation
          where
-        type Sv ReplaceNetworkACLAssociation = EC2
         type Rs ReplaceNetworkACLAssociation =
              ReplaceNetworkACLAssociationResponse
-        request = postQuery
+        request = postQuery eC2
         response
           = receiveXML
               (\ s h x ->
diff --git a/gen/Network/AWS/EC2/ReplaceNetworkACLEntry.hs b/gen/Network/AWS/EC2/ReplaceNetworkACLEntry.hs
--- a/gen/Network/AWS/EC2/ReplaceNetworkACLEntry.hs
+++ b/gen/Network/AWS/EC2/ReplaceNetworkACLEntry.hs
@@ -150,10 +150,9 @@
 rnaeCIdRBlock = lens _rnaeCIdRBlock (\ s a -> s{_rnaeCIdRBlock = a});
 
 instance AWSRequest ReplaceNetworkACLEntry where
-        type Sv ReplaceNetworkACLEntry = EC2
         type Rs ReplaceNetworkACLEntry =
              ReplaceNetworkACLEntryResponse
-        request = postQuery
+        request = postQuery eC2
         response
           = receiveNull ReplaceNetworkACLEntryResponse'
 
diff --git a/gen/Network/AWS/EC2/ReplaceRoute.hs b/gen/Network/AWS/EC2/ReplaceRoute.hs
--- a/gen/Network/AWS/EC2/ReplaceRoute.hs
+++ b/gen/Network/AWS/EC2/ReplaceRoute.hs
@@ -128,9 +128,8 @@
 rrDestinationCIdRBlock = lens _rrDestinationCIdRBlock (\ s a -> s{_rrDestinationCIdRBlock = a});
 
 instance AWSRequest ReplaceRoute where
-        type Sv ReplaceRoute = EC2
         type Rs ReplaceRoute = ReplaceRouteResponse
-        request = postQuery
+        request = postQuery eC2
         response = receiveNull ReplaceRouteResponse'
 
 instance ToHeaders ReplaceRoute where
diff --git a/gen/Network/AWS/EC2/ReplaceRouteTableAssociation.hs b/gen/Network/AWS/EC2/ReplaceRouteTableAssociation.hs
--- a/gen/Network/AWS/EC2/ReplaceRouteTableAssociation.hs
+++ b/gen/Network/AWS/EC2/ReplaceRouteTableAssociation.hs
@@ -99,10 +99,9 @@
 
 instance AWSRequest ReplaceRouteTableAssociation
          where
-        type Sv ReplaceRouteTableAssociation = EC2
         type Rs ReplaceRouteTableAssociation =
              ReplaceRouteTableAssociationResponse
-        request = postQuery
+        request = postQuery eC2
         response
           = receiveXML
               (\ s h x ->
diff --git a/gen/Network/AWS/EC2/ReportInstanceStatus.hs b/gen/Network/AWS/EC2/ReportInstanceStatus.hs
--- a/gen/Network/AWS/EC2/ReportInstanceStatus.hs
+++ b/gen/Network/AWS/EC2/ReportInstanceStatus.hs
@@ -154,10 +154,9 @@
 risReasonCodes = lens _risReasonCodes (\ s a -> s{_risReasonCodes = a}) . _Coerce;
 
 instance AWSRequest ReportInstanceStatus where
-        type Sv ReportInstanceStatus = EC2
         type Rs ReportInstanceStatus =
              ReportInstanceStatusResponse
-        request = postQuery
+        request = postQuery eC2
         response = receiveNull ReportInstanceStatusResponse'
 
 instance ToHeaders ReportInstanceStatus where
diff --git a/gen/Network/AWS/EC2/RequestSpotFleet.hs b/gen/Network/AWS/EC2/RequestSpotFleet.hs
--- a/gen/Network/AWS/EC2/RequestSpotFleet.hs
+++ b/gen/Network/AWS/EC2/RequestSpotFleet.hs
@@ -84,9 +84,8 @@
 rsfSpotFleetRequestConfig = lens _rsfSpotFleetRequestConfig (\ s a -> s{_rsfSpotFleetRequestConfig = a});
 
 instance AWSRequest RequestSpotFleet where
-        type Sv RequestSpotFleet = EC2
         type Rs RequestSpotFleet = RequestSpotFleetResponse
-        request = postQuery
+        request = postQuery eC2
         response
           = receiveXML
               (\ s h x ->
diff --git a/gen/Network/AWS/EC2/RequestSpotInstances.hs b/gen/Network/AWS/EC2/RequestSpotInstances.hs
--- a/gen/Network/AWS/EC2/RequestSpotInstances.hs
+++ b/gen/Network/AWS/EC2/RequestSpotInstances.hs
@@ -199,10 +199,9 @@
 rsiSpotPrice = lens _rsiSpotPrice (\ s a -> s{_rsiSpotPrice = a});
 
 instance AWSRequest RequestSpotInstances where
-        type Sv RequestSpotInstances = EC2
         type Rs RequestSpotInstances =
              RequestSpotInstancesResponse
-        request = postQuery
+        request = postQuery eC2
         response
           = receiveXML
               (\ s h x ->
diff --git a/gen/Network/AWS/EC2/ResetImageAttribute.hs b/gen/Network/AWS/EC2/ResetImageAttribute.hs
--- a/gen/Network/AWS/EC2/ResetImageAttribute.hs
+++ b/gen/Network/AWS/EC2/ResetImageAttribute.hs
@@ -88,10 +88,9 @@
 resAttribute = lens _resAttribute (\ s a -> s{_resAttribute = a});
 
 instance AWSRequest ResetImageAttribute where
-        type Sv ResetImageAttribute = EC2
         type Rs ResetImageAttribute =
              ResetImageAttributeResponse
-        request = postQuery
+        request = postQuery eC2
         response = receiveNull ResetImageAttributeResponse'
 
 instance ToHeaders ResetImageAttribute where
diff --git a/gen/Network/AWS/EC2/ResetInstanceAttribute.hs b/gen/Network/AWS/EC2/ResetInstanceAttribute.hs
--- a/gen/Network/AWS/EC2/ResetInstanceAttribute.hs
+++ b/gen/Network/AWS/EC2/ResetInstanceAttribute.hs
@@ -94,10 +94,9 @@
 riaAttribute = lens _riaAttribute (\ s a -> s{_riaAttribute = a});
 
 instance AWSRequest ResetInstanceAttribute where
-        type Sv ResetInstanceAttribute = EC2
         type Rs ResetInstanceAttribute =
              ResetInstanceAttributeResponse
-        request = postQuery
+        request = postQuery eC2
         response
           = receiveNull ResetInstanceAttributeResponse'
 
diff --git a/gen/Network/AWS/EC2/ResetNetworkInterfaceAttribute.hs b/gen/Network/AWS/EC2/ResetNetworkInterfaceAttribute.hs
--- a/gen/Network/AWS/EC2/ResetNetworkInterfaceAttribute.hs
+++ b/gen/Network/AWS/EC2/ResetNetworkInterfaceAttribute.hs
@@ -86,10 +86,9 @@
 
 instance AWSRequest ResetNetworkInterfaceAttribute
          where
-        type Sv ResetNetworkInterfaceAttribute = EC2
         type Rs ResetNetworkInterfaceAttribute =
              ResetNetworkInterfaceAttributeResponse
-        request = postQuery
+        request = postQuery eC2
         response
           = receiveNull ResetNetworkInterfaceAttributeResponse'
 
diff --git a/gen/Network/AWS/EC2/ResetSnapshotAttribute.hs b/gen/Network/AWS/EC2/ResetSnapshotAttribute.hs
--- a/gen/Network/AWS/EC2/ResetSnapshotAttribute.hs
+++ b/gen/Network/AWS/EC2/ResetSnapshotAttribute.hs
@@ -90,10 +90,9 @@
 rsaAttribute = lens _rsaAttribute (\ s a -> s{_rsaAttribute = a});
 
 instance AWSRequest ResetSnapshotAttribute where
-        type Sv ResetSnapshotAttribute = EC2
         type Rs ResetSnapshotAttribute =
              ResetSnapshotAttributeResponse
-        request = postQuery
+        request = postQuery eC2
         response
           = receiveNull ResetSnapshotAttributeResponse'
 
diff --git a/gen/Network/AWS/EC2/RestoreAddressToClassic.hs b/gen/Network/AWS/EC2/RestoreAddressToClassic.hs
--- a/gen/Network/AWS/EC2/RestoreAddressToClassic.hs
+++ b/gen/Network/AWS/EC2/RestoreAddressToClassic.hs
@@ -81,10 +81,9 @@
 ratcPublicIP = lens _ratcPublicIP (\ s a -> s{_ratcPublicIP = a});
 
 instance AWSRequest RestoreAddressToClassic where
-        type Sv RestoreAddressToClassic = EC2
         type Rs RestoreAddressToClassic =
              RestoreAddressToClassicResponse
-        request = postQuery
+        request = postQuery eC2
         response
           = receiveXML
               (\ s h x ->
diff --git a/gen/Network/AWS/EC2/RevokeSecurityGroupEgress.hs b/gen/Network/AWS/EC2/RevokeSecurityGroupEgress.hs
--- a/gen/Network/AWS/EC2/RevokeSecurityGroupEgress.hs
+++ b/gen/Network/AWS/EC2/RevokeSecurityGroupEgress.hs
@@ -159,10 +159,9 @@
 rsgeGroupId = lens _rsgeGroupId (\ s a -> s{_rsgeGroupId = a});
 
 instance AWSRequest RevokeSecurityGroupEgress where
-        type Sv RevokeSecurityGroupEgress = EC2
         type Rs RevokeSecurityGroupEgress =
              RevokeSecurityGroupEgressResponse
-        request = postQuery
+        request = postQuery eC2
         response
           = receiveNull RevokeSecurityGroupEgressResponse'
 
diff --git a/gen/Network/AWS/EC2/RevokeSecurityGroupIngress.hs b/gen/Network/AWS/EC2/RevokeSecurityGroupIngress.hs
--- a/gen/Network/AWS/EC2/RevokeSecurityGroupIngress.hs
+++ b/gen/Network/AWS/EC2/RevokeSecurityGroupIngress.hs
@@ -173,10 +173,9 @@
 rsgiDryRun = lens _rsgiDryRun (\ s a -> s{_rsgiDryRun = a});
 
 instance AWSRequest RevokeSecurityGroupIngress where
-        type Sv RevokeSecurityGroupIngress = EC2
         type Rs RevokeSecurityGroupIngress =
              RevokeSecurityGroupIngressResponse
-        request = postQuery
+        request = postQuery eC2
         response
           = receiveNull RevokeSecurityGroupIngressResponse'
 
diff --git a/gen/Network/AWS/EC2/RunInstances.hs b/gen/Network/AWS/EC2/RunInstances.hs
--- a/gen/Network/AWS/EC2/RunInstances.hs
+++ b/gen/Network/AWS/EC2/RunInstances.hs
@@ -380,9 +380,8 @@
 rMaxCount = lens _rMaxCount (\ s a -> s{_rMaxCount = a});
 
 instance AWSRequest RunInstances where
-        type Sv RunInstances = EC2
         type Rs RunInstances = Reservation
-        request = postQuery
+        request = postQuery eC2
         response = receiveXML (\ s h x -> parseXML x)
 
 instance ToHeaders RunInstances where
diff --git a/gen/Network/AWS/EC2/StartInstances.hs b/gen/Network/AWS/EC2/StartInstances.hs
--- a/gen/Network/AWS/EC2/StartInstances.hs
+++ b/gen/Network/AWS/EC2/StartInstances.hs
@@ -106,9 +106,8 @@
 sInstanceIds = lens _sInstanceIds (\ s a -> s{_sInstanceIds = a}) . _Coerce;
 
 instance AWSRequest StartInstances where
-        type Sv StartInstances = EC2
         type Rs StartInstances = StartInstancesResponse
-        request = postQuery
+        request = postQuery eC2
         response
           = receiveXML
               (\ s h x ->
diff --git a/gen/Network/AWS/EC2/StopInstances.hs b/gen/Network/AWS/EC2/StopInstances.hs
--- a/gen/Network/AWS/EC2/StopInstances.hs
+++ b/gen/Network/AWS/EC2/StopInstances.hs
@@ -124,9 +124,8 @@
 siInstanceIds = lens _siInstanceIds (\ s a -> s{_siInstanceIds = a}) . _Coerce;
 
 instance AWSRequest StopInstances where
-        type Sv StopInstances = EC2
         type Rs StopInstances = StopInstancesResponse
-        request = postQuery
+        request = postQuery eC2
         response
           = receiveXML
               (\ s h x ->
diff --git a/gen/Network/AWS/EC2/TerminateInstances.hs b/gen/Network/AWS/EC2/TerminateInstances.hs
--- a/gen/Network/AWS/EC2/TerminateInstances.hs
+++ b/gen/Network/AWS/EC2/TerminateInstances.hs
@@ -100,10 +100,9 @@
 tiInstanceIds = lens _tiInstanceIds (\ s a -> s{_tiInstanceIds = a}) . _Coerce;
 
 instance AWSRequest TerminateInstances where
-        type Sv TerminateInstances = EC2
         type Rs TerminateInstances =
              TerminateInstancesResponse
-        request = postQuery
+        request = postQuery eC2
         response
           = receiveXML
               (\ s h x ->
diff --git a/gen/Network/AWS/EC2/Types.hs b/gen/Network/AWS/EC2/Types.hs
--- a/gen/Network/AWS/EC2/Types.hs
+++ b/gen/Network/AWS/EC2/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.EC2.Types
     (
-    -- * Service
-      EC2
+    -- * Service Configuration
+      eC2
 
     -- * Errors
 
@@ -1661,38 +1660,35 @@
 import           Network.AWS.Prelude
 import           Network.AWS.Sign.V4
 
--- | Version @2015-04-15@ of the Amazon Elastic Compute Cloud SDK.
-data EC2
-
-instance AWSService EC2 where
-    type Sg EC2 = V4
-    service = const svc
-      where
-        svc =
-            Service
-            { _svcAbbrev = "EC2"
-            , _svcPrefix = "ec2"
-            , _svcVersion = "2015-04-15"
-            , _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 "RequestLimitExceeded" . hasStatus 503) e =
-              Just "request_limit_exceeded"
-          | 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 '2015-04-15' of the Amazon Elastic Compute Cloud SDK configuration.
+eC2 :: Service
+eC2 =
+    Service
+    { _svcAbbrev = "EC2"
+    , _svcSigner = v4
+    , _svcPrefix = "ec2"
+    , _svcVersion = "2015-04-15"
+    , _svcEndpoint = defaultEndpoint eC2
+    , _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 "RequestLimitExceeded" . hasStatus 503) e =
+          Just "request_limit_exceeded"
+      | 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
diff --git a/gen/Network/AWS/EC2/Types/Product.hs b/gen/Network/AWS/EC2/Types/Product.hs
--- a/gen/Network/AWS/EC2/Types/Product.hs
+++ b/gen/Network/AWS/EC2/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/EC2/UnassignPrivateIPAddresses.hs b/gen/Network/AWS/EC2/UnassignPrivateIPAddresses.hs
--- a/gen/Network/AWS/EC2/UnassignPrivateIPAddresses.hs
+++ b/gen/Network/AWS/EC2/UnassignPrivateIPAddresses.hs
@@ -75,10 +75,9 @@
 upiaPrivateIPAddresses = lens _upiaPrivateIPAddresses (\ s a -> s{_upiaPrivateIPAddresses = a}) . _Coerce;
 
 instance AWSRequest UnassignPrivateIPAddresses where
-        type Sv UnassignPrivateIPAddresses = EC2
         type Rs UnassignPrivateIPAddresses =
              UnassignPrivateIPAddressesResponse
-        request = postQuery
+        request = postQuery eC2
         response
           = receiveNull UnassignPrivateIPAddressesResponse'
 
diff --git a/gen/Network/AWS/EC2/UnmonitorInstances.hs b/gen/Network/AWS/EC2/UnmonitorInstances.hs
--- a/gen/Network/AWS/EC2/UnmonitorInstances.hs
+++ b/gen/Network/AWS/EC2/UnmonitorInstances.hs
@@ -80,10 +80,9 @@
 uiInstanceIds = lens _uiInstanceIds (\ s a -> s{_uiInstanceIds = a}) . _Coerce;
 
 instance AWSRequest UnmonitorInstances where
-        type Sv UnmonitorInstances = EC2
         type Rs UnmonitorInstances =
              UnmonitorInstancesResponse
-        request = postQuery
+        request = postQuery eC2
         response
           = receiveXML
               (\ s h x ->
diff --git a/test/Test/AWS/Gen/EC2.hs b/test/Test/AWS/Gen/EC2.hs
--- a/test/Test/AWS/Gen/EC2.hs
+++ b/test/Test/AWS/Gen/EC2.hs
@@ -2044,1090 +2044,1272 @@
 testDetachNetworkInterfaceResponse = res
     "DetachNetworkInterfaceResponse"
     "fixture/DetachNetworkInterfaceResponse"
+    eC2
     (Proxy :: Proxy DetachNetworkInterface)
 
 testDeleteVPCEndpointsResponse :: DeleteVPCEndpointsResponse -> TestTree
 testDeleteVPCEndpointsResponse = res
     "DeleteVPCEndpointsResponse"
     "fixture/DeleteVPCEndpointsResponse"
+    eC2
     (Proxy :: Proxy DeleteVPCEndpoints)
 
 testDeleteKeyPairResponse :: DeleteKeyPairResponse -> TestTree
 testDeleteKeyPairResponse = res
     "DeleteKeyPairResponse"
     "fixture/DeleteKeyPairResponse"
+    eC2
     (Proxy :: Proxy DeleteKeyPair)
 
 testDeleteFlowLogsResponse :: DeleteFlowLogsResponse -> TestTree
 testDeleteFlowLogsResponse = res
     "DeleteFlowLogsResponse"
     "fixture/DeleteFlowLogsResponse"
+    eC2
     (Proxy :: Proxy DeleteFlowLogs)
 
 testDescribeTagsResponse :: DescribeTagsResponse -> TestTree
 testDescribeTagsResponse = res
     "DescribeTagsResponse"
     "fixture/DescribeTagsResponse"
+    eC2
     (Proxy :: Proxy DescribeTags)
 
 testRevokeSecurityGroupEgressResponse :: RevokeSecurityGroupEgressResponse -> TestTree
 testRevokeSecurityGroupEgressResponse = res
     "RevokeSecurityGroupEgressResponse"
     "fixture/RevokeSecurityGroupEgressResponse"
+    eC2
     (Proxy :: Proxy RevokeSecurityGroupEgress)
 
 testCreateVPNGatewayResponse :: CreateVPNGatewayResponse -> TestTree
 testCreateVPNGatewayResponse = res
     "CreateVPNGatewayResponse"
     "fixture/CreateVPNGatewayResponse"
+    eC2
     (Proxy :: Proxy CreateVPNGateway)
 
 testDetachInternetGatewayResponse :: DetachInternetGatewayResponse -> TestTree
 testDetachInternetGatewayResponse = res
     "DetachInternetGatewayResponse"
     "fixture/DetachInternetGatewayResponse"
+    eC2
     (Proxy :: Proxy DetachInternetGateway)
 
 testCreateNetworkACLResponse :: CreateNetworkACLResponse -> TestTree
 testCreateNetworkACLResponse = res
     "CreateNetworkACLResponse"
     "fixture/CreateNetworkACLResponse"
+    eC2
     (Proxy :: Proxy CreateNetworkACL)
 
 testImportInstanceResponse :: ImportInstanceResponse -> TestTree
 testImportInstanceResponse = res
     "ImportInstanceResponse"
     "fixture/ImportInstanceResponse"
+    eC2
     (Proxy :: Proxy ImportInstance)
 
 testDescribeVPCClassicLinkResponse :: DescribeVPCClassicLinkResponse -> TestTree
 testDescribeVPCClassicLinkResponse = res
     "DescribeVPCClassicLinkResponse"
     "fixture/DescribeVPCClassicLinkResponse"
+    eC2
     (Proxy :: Proxy DescribeVPCClassicLink)
 
 testDeleteVPNConnectionResponse :: DeleteVPNConnectionResponse -> TestTree
 testDeleteVPNConnectionResponse = res
     "DeleteVPNConnectionResponse"
     "fixture/DeleteVPNConnectionResponse"
+    eC2
     (Proxy :: Proxy DeleteVPNConnection)
 
 testAuthorizeSecurityGroupEgressResponse :: AuthorizeSecurityGroupEgressResponse -> TestTree
 testAuthorizeSecurityGroupEgressResponse = res
     "AuthorizeSecurityGroupEgressResponse"
     "fixture/AuthorizeSecurityGroupEgressResponse"
+    eC2
     (Proxy :: Proxy AuthorizeSecurityGroupEgress)
 
 testDescribeBundleTasksResponse :: DescribeBundleTasksResponse -> TestTree
 testDescribeBundleTasksResponse = res
     "DescribeBundleTasksResponse"
     "fixture/DescribeBundleTasksResponse"
+    eC2
     (Proxy :: Proxy DescribeBundleTasks)
 
 testCreateInternetGatewayResponse :: CreateInternetGatewayResponse -> TestTree
 testCreateInternetGatewayResponse = res
     "CreateInternetGatewayResponse"
     "fixture/CreateInternetGatewayResponse"
+    eC2
     (Proxy :: Proxy CreateInternetGateway)
 
 testReleaseAddressResponse :: ReleaseAddressResponse -> TestTree
 testReleaseAddressResponse = res
     "ReleaseAddressResponse"
     "fixture/ReleaseAddressResponse"
+    eC2
     (Proxy :: Proxy ReleaseAddress)
 
 testCancelBundleTaskResponse :: CancelBundleTaskResponse -> TestTree
 testCancelBundleTaskResponse = res
     "CancelBundleTaskResponse"
     "fixture/CancelBundleTaskResponse"
+    eC2
     (Proxy :: Proxy CancelBundleTask)
 
 testModifyNetworkInterfaceAttributeResponse :: ModifyNetworkInterfaceAttributeResponse -> TestTree
 testModifyNetworkInterfaceAttributeResponse = res
     "ModifyNetworkInterfaceAttributeResponse"
     "fixture/ModifyNetworkInterfaceAttributeResponse"
+    eC2
     (Proxy :: Proxy ModifyNetworkInterfaceAttribute)
 
 testModifySubnetAttributeResponse :: ModifySubnetAttributeResponse -> TestTree
 testModifySubnetAttributeResponse = res
     "ModifySubnetAttributeResponse"
     "fixture/ModifySubnetAttributeResponse"
+    eC2
     (Proxy :: Proxy ModifySubnetAttribute)
 
 testDeregisterImageResponse :: DeregisterImageResponse -> TestTree
 testDeregisterImageResponse = res
     "DeregisterImageResponse"
     "fixture/DeregisterImageResponse"
+    eC2
     (Proxy :: Proxy DeregisterImage)
 
 testDetachVolumeResponse :: VolumeAttachment -> TestTree
 testDetachVolumeResponse = res
     "DetachVolumeResponse"
     "fixture/DetachVolumeResponse"
+    eC2
     (Proxy :: Proxy DetachVolume)
 
 testCancelReservedInstancesListingResponse :: CancelReservedInstancesListingResponse -> TestTree
 testCancelReservedInstancesListingResponse = res
     "CancelReservedInstancesListingResponse"
     "fixture/CancelReservedInstancesListingResponse"
+    eC2
     (Proxy :: Proxy CancelReservedInstancesListing)
 
 testAttachClassicLinkVPCResponse :: AttachClassicLinkVPCResponse -> TestTree
 testAttachClassicLinkVPCResponse = res
     "AttachClassicLinkVPCResponse"
     "fixture/AttachClassicLinkVPCResponse"
+    eC2
     (Proxy :: Proxy AttachClassicLinkVPC)
 
 testCancelSpotFleetRequestsResponse :: CancelSpotFleetRequestsResponse -> TestTree
 testCancelSpotFleetRequestsResponse = res
     "CancelSpotFleetRequestsResponse"
     "fixture/CancelSpotFleetRequestsResponse"
+    eC2
     (Proxy :: Proxy CancelSpotFleetRequests)
 
 testDescribeDHCPOptionsResponse :: DescribeDHCPOptionsResponse -> TestTree
 testDescribeDHCPOptionsResponse = res
     "DescribeDHCPOptionsResponse"
     "fixture/DescribeDHCPOptionsResponse"
+    eC2
     (Proxy :: Proxy DescribeDHCPOptions)
 
 testDescribeSpotPriceHistoryResponse :: DescribeSpotPriceHistoryResponse -> TestTree
 testDescribeSpotPriceHistoryResponse = res
     "DescribeSpotPriceHistoryResponse"
     "fixture/DescribeSpotPriceHistoryResponse"
+    eC2
     (Proxy :: Proxy DescribeSpotPriceHistory)
 
 testStopInstancesResponse :: StopInstancesResponse -> TestTree
 testStopInstancesResponse = res
     "StopInstancesResponse"
     "fixture/StopInstancesResponse"
+    eC2
     (Proxy :: Proxy StopInstances)
 
 testImportImageResponse :: ImportImageResponse -> TestTree
 testImportImageResponse = res
     "ImportImageResponse"
     "fixture/ImportImageResponse"
+    eC2
     (Proxy :: Proxy ImportImage)
 
 testDeleteNetworkACLEntryResponse :: DeleteNetworkACLEntryResponse -> TestTree
 testDeleteNetworkACLEntryResponse = res
     "DeleteNetworkACLEntryResponse"
     "fixture/DeleteNetworkACLEntryResponse"
+    eC2
     (Proxy :: Proxy DeleteNetworkACLEntry)
 
 testDisableVPCClassicLinkResponse :: DisableVPCClassicLinkResponse -> TestTree
 testDisableVPCClassicLinkResponse = res
     "DisableVPCClassicLinkResponse"
     "fixture/DisableVPCClassicLinkResponse"
+    eC2
     (Proxy :: Proxy DisableVPCClassicLink)
 
 testAuthorizeSecurityGroupIngressResponse :: AuthorizeSecurityGroupIngressResponse -> TestTree
 testAuthorizeSecurityGroupIngressResponse = res
     "AuthorizeSecurityGroupIngressResponse"
     "fixture/AuthorizeSecurityGroupIngressResponse"
+    eC2
     (Proxy :: Proxy AuthorizeSecurityGroupIngress)
 
 testBundleInstanceResponse :: BundleInstanceResponse -> TestTree
 testBundleInstanceResponse = res
     "BundleInstanceResponse"
     "fixture/BundleInstanceResponse"
+    eC2
     (Proxy :: Proxy BundleInstance)
 
 testDescribeVPCEndpointServicesResponse :: DescribeVPCEndpointServicesResponse -> TestTree
 testDescribeVPCEndpointServicesResponse = res
     "DescribeVPCEndpointServicesResponse"
     "fixture/DescribeVPCEndpointServicesResponse"
+    eC2
     (Proxy :: Proxy DescribeVPCEndpointServices)
 
 testReplaceNetworkACLAssociationResponse :: ReplaceNetworkACLAssociationResponse -> TestTree
 testReplaceNetworkACLAssociationResponse = res
     "ReplaceNetworkACLAssociationResponse"
     "fixture/ReplaceNetworkACLAssociationResponse"
+    eC2
     (Proxy :: Proxy ReplaceNetworkACLAssociation)
 
 testCreateVPCPeeringConnectionResponse :: CreateVPCPeeringConnectionResponse -> TestTree
 testCreateVPCPeeringConnectionResponse = res
     "CreateVPCPeeringConnectionResponse"
     "fixture/CreateVPCPeeringConnectionResponse"
+    eC2
     (Proxy :: Proxy CreateVPCPeeringConnection)
 
 testResetSnapshotAttributeResponse :: ResetSnapshotAttributeResponse -> TestTree
 testResetSnapshotAttributeResponse = res
     "ResetSnapshotAttributeResponse"
     "fixture/ResetSnapshotAttributeResponse"
+    eC2
     (Proxy :: Proxy ResetSnapshotAttribute)
 
 testDescribeAddressesResponse :: DescribeAddressesResponse -> TestTree
 testDescribeAddressesResponse = res
     "DescribeAddressesResponse"
     "fixture/DescribeAddressesResponse"
+    eC2
     (Proxy :: Proxy DescribeAddresses)
 
 testDescribeInternetGatewaysResponse :: DescribeInternetGatewaysResponse -> TestTree
 testDescribeInternetGatewaysResponse = res
     "DescribeInternetGatewaysResponse"
     "fixture/DescribeInternetGatewaysResponse"
+    eC2
     (Proxy :: Proxy DescribeInternetGateways)
 
 testReplaceRouteResponse :: ReplaceRouteResponse -> TestTree
 testReplaceRouteResponse = res
     "ReplaceRouteResponse"
     "fixture/ReplaceRouteResponse"
+    eC2
     (Proxy :: Proxy ReplaceRoute)
 
 testCreateTagsResponse :: CreateTagsResponse -> TestTree
 testCreateTagsResponse = res
     "CreateTagsResponse"
     "fixture/CreateTagsResponse"
+    eC2
     (Proxy :: Proxy CreateTags)
 
 testDescribeSubnetsResponse :: DescribeSubnetsResponse -> TestTree
 testDescribeSubnetsResponse = res
     "DescribeSubnetsResponse"
     "fixture/DescribeSubnetsResponse"
+    eC2
     (Proxy :: Proxy DescribeSubnets)
 
 testDescribeNetworkInterfacesResponse :: DescribeNetworkInterfacesResponse -> TestTree
 testDescribeNetworkInterfacesResponse = res
     "DescribeNetworkInterfacesResponse"
     "fixture/DescribeNetworkInterfacesResponse"
+    eC2
     (Proxy :: Proxy DescribeNetworkInterfaces)
 
 testPurchaseReservedInstancesOfferingResponse :: PurchaseReservedInstancesOfferingResponse -> TestTree
 testPurchaseReservedInstancesOfferingResponse = res
     "PurchaseReservedInstancesOfferingResponse"
     "fixture/PurchaseReservedInstancesOfferingResponse"
+    eC2
     (Proxy :: Proxy PurchaseReservedInstancesOffering)
 
 testDescribeSnapshotAttributeResponse :: DescribeSnapshotAttributeResponse -> TestTree
 testDescribeSnapshotAttributeResponse = res
     "DescribeSnapshotAttributeResponse"
     "fixture/DescribeSnapshotAttributeResponse"
+    eC2
     (Proxy :: Proxy DescribeSnapshotAttribute)
 
 testCreateCustomerGatewayResponse :: CreateCustomerGatewayResponse -> TestTree
 testCreateCustomerGatewayResponse = res
     "CreateCustomerGatewayResponse"
     "fixture/CreateCustomerGatewayResponse"
+    eC2
     (Proxy :: Proxy CreateCustomerGateway)
 
 testAttachInternetGatewayResponse :: AttachInternetGatewayResponse -> TestTree
 testAttachInternetGatewayResponse = res
     "AttachInternetGatewayResponse"
     "fixture/AttachInternetGatewayResponse"
+    eC2
     (Proxy :: Proxy AttachInternetGateway)
 
 testDeleteTagsResponse :: DeleteTagsResponse -> TestTree
 testDeleteTagsResponse = res
     "DeleteTagsResponse"
     "fixture/DeleteTagsResponse"
+    eC2
     (Proxy :: Proxy DeleteTags)
 
 testReplaceNetworkACLEntryResponse :: ReplaceNetworkACLEntryResponse -> TestTree
 testReplaceNetworkACLEntryResponse = res
     "ReplaceNetworkACLEntryResponse"
     "fixture/ReplaceNetworkACLEntryResponse"
+    eC2
     (Proxy :: Proxy ReplaceNetworkACLEntry)
 
 testResetInstanceAttributeResponse :: ResetInstanceAttributeResponse -> TestTree
 testResetInstanceAttributeResponse = res
     "ResetInstanceAttributeResponse"
     "fixture/ResetInstanceAttributeResponse"
+    eC2
     (Proxy :: Proxy ResetInstanceAttribute)
 
 testDeleteRouteResponse :: DeleteRouteResponse -> TestTree
 testDeleteRouteResponse = res
     "DeleteRouteResponse"
     "fixture/DeleteRouteResponse"
+    eC2
     (Proxy :: Proxy DeleteRoute)
 
 testDescribeVPNConnectionsResponse :: DescribeVPNConnectionsResponse -> TestTree
 testDescribeVPNConnectionsResponse = res
     "DescribeVPNConnectionsResponse"
     "fixture/DescribeVPNConnectionsResponse"
+    eC2
     (Proxy :: Proxy DescribeVPNConnections)
 
 testDescribeFlowLogsResponse :: DescribeFlowLogsResponse -> TestTree
 testDescribeFlowLogsResponse = res
     "DescribeFlowLogsResponse"
     "fixture/DescribeFlowLogsResponse"
+    eC2
     (Proxy :: Proxy DescribeFlowLogs)
 
 testDeleteSecurityGroupResponse :: DeleteSecurityGroupResponse -> TestTree
 testDeleteSecurityGroupResponse = res
     "DeleteSecurityGroupResponse"
     "fixture/DeleteSecurityGroupResponse"
+    eC2
     (Proxy :: Proxy DeleteSecurityGroup)
 
 testDescribeReservedInstancesOfferingsResponse :: DescribeReservedInstancesOfferingsResponse -> TestTree
 testDescribeReservedInstancesOfferingsResponse = res
     "DescribeReservedInstancesOfferingsResponse"
     "fixture/DescribeReservedInstancesOfferingsResponse"
+    eC2
     (Proxy :: Proxy DescribeReservedInstancesOfferings)
 
 testDeleteVPCPeeringConnectionResponse :: DeleteVPCPeeringConnectionResponse -> TestTree
 testDeleteVPCPeeringConnectionResponse = res
     "DeleteVPCPeeringConnectionResponse"
     "fixture/DeleteVPCPeeringConnectionResponse"
+    eC2
     (Proxy :: Proxy DeleteVPCPeeringConnection)
 
 testDescribeVPCEndpointsResponse :: DescribeVPCEndpointsResponse -> TestTree
 testDescribeVPCEndpointsResponse = res
     "DescribeVPCEndpointsResponse"
     "fixture/DescribeVPCEndpointsResponse"
+    eC2
     (Proxy :: Proxy DescribeVPCEndpoints)
 
 testDescribeInstanceAttributeResponse :: DescribeInstanceAttributeResponse -> TestTree
 testDescribeInstanceAttributeResponse = res
     "DescribeInstanceAttributeResponse"
     "fixture/DescribeInstanceAttributeResponse"
+    eC2
     (Proxy :: Proxy DescribeInstanceAttribute)
 
 testConfirmProductInstanceResponse :: ConfirmProductInstanceResponse -> TestTree
 testConfirmProductInstanceResponse = res
     "ConfirmProductInstanceResponse"
     "fixture/ConfirmProductInstanceResponse"
+    eC2
     (Proxy :: Proxy ConfirmProductInstance)
 
 testImportKeyPairResponse :: ImportKeyPairResponse -> TestTree
 testImportKeyPairResponse = res
     "ImportKeyPairResponse"
     "fixture/ImportKeyPairResponse"
+    eC2
     (Proxy :: Proxy ImportKeyPair)
 
 testAttachNetworkInterfaceResponse :: AttachNetworkInterfaceResponse -> TestTree
 testAttachNetworkInterfaceResponse = res
     "AttachNetworkInterfaceResponse"
     "fixture/AttachNetworkInterfaceResponse"
+    eC2
     (Proxy :: Proxy AttachNetworkInterface)
 
 testDescribeInstanceStatusResponse :: DescribeInstanceStatusResponse -> TestTree
 testDescribeInstanceStatusResponse = res
     "DescribeInstanceStatusResponse"
     "fixture/DescribeInstanceStatusResponse"
+    eC2
     (Proxy :: Proxy DescribeInstanceStatus)
 
 testCancelConversionTaskResponse :: CancelConversionTaskResponse -> TestTree
 testCancelConversionTaskResponse = res
     "CancelConversionTaskResponse"
     "fixture/CancelConversionTaskResponse"
+    eC2
     (Proxy :: Proxy CancelConversionTask)
 
 testReportInstanceStatusResponse :: ReportInstanceStatusResponse -> TestTree
 testReportInstanceStatusResponse = res
     "ReportInstanceStatusResponse"
     "fixture/ReportInstanceStatusResponse"
+    eC2
     (Proxy :: Proxy ReportInstanceStatus)
 
 testAssociateDHCPOptionsResponse :: AssociateDHCPOptionsResponse -> TestTree
 testAssociateDHCPOptionsResponse = res
     "AssociateDHCPOptionsResponse"
     "fixture/AssociateDHCPOptionsResponse"
+    eC2
     (Proxy :: Proxy AssociateDHCPOptions)
 
 testDescribeVPCsResponse :: DescribeVPCsResponse -> TestTree
 testDescribeVPCsResponse = res
     "DescribeVPCsResponse"
     "fixture/DescribeVPCsResponse"
+    eC2
     (Proxy :: Proxy DescribeVPCs)
 
 testRequestSpotInstancesResponse :: RequestSpotInstancesResponse -> TestTree
 testRequestSpotInstancesResponse = res
     "RequestSpotInstancesResponse"
     "fixture/RequestSpotInstancesResponse"
+    eC2
     (Proxy :: Proxy RequestSpotInstances)
 
 testModifyImageAttributeResponse :: ModifyImageAttributeResponse -> TestTree
 testModifyImageAttributeResponse = res
     "ModifyImageAttributeResponse"
     "fixture/ModifyImageAttributeResponse"
+    eC2
     (Proxy :: Proxy ModifyImageAttribute)
 
 testDescribeReservedInstancesResponse :: DescribeReservedInstancesResponse -> TestTree
 testDescribeReservedInstancesResponse = res
     "DescribeReservedInstancesResponse"
     "fixture/DescribeReservedInstancesResponse"
+    eC2
     (Proxy :: Proxy DescribeReservedInstances)
 
 testAllocateAddressResponse :: AllocateAddressResponse -> TestTree
 testAllocateAddressResponse = res
     "AllocateAddressResponse"
     "fixture/AllocateAddressResponse"
+    eC2
     (Proxy :: Proxy AllocateAddress)
 
 testRunInstancesResponse :: Reservation -> TestTree
 testRunInstancesResponse = res
     "RunInstancesResponse"
     "fixture/RunInstancesResponse"
+    eC2
     (Proxy :: Proxy RunInstances)
 
 testCreateRouteTableResponse :: CreateRouteTableResponse -> TestTree
 testCreateRouteTableResponse = res
     "CreateRouteTableResponse"
     "fixture/CreateRouteTableResponse"
+    eC2
     (Proxy :: Proxy CreateRouteTable)
 
 testAttachVolumeResponse :: VolumeAttachment -> TestTree
 testAttachVolumeResponse = res
     "AttachVolumeResponse"
     "fixture/AttachVolumeResponse"
+    eC2
     (Proxy :: Proxy AttachVolume)
 
 testDescribeConversionTasksResponse :: DescribeConversionTasksResponse -> TestTree
 testDescribeConversionTasksResponse = res
     "DescribeConversionTasksResponse"
     "fixture/DescribeConversionTasksResponse"
+    eC2
     (Proxy :: Proxy DescribeConversionTasks)
 
 testRejectVPCPeeringConnectionResponse :: RejectVPCPeeringConnectionResponse -> TestTree
 testRejectVPCPeeringConnectionResponse = res
     "RejectVPCPeeringConnectionResponse"
     "fixture/RejectVPCPeeringConnectionResponse"
+    eC2
     (Proxy :: Proxy RejectVPCPeeringConnection)
 
 testRevokeSecurityGroupIngressResponse :: RevokeSecurityGroupIngressResponse -> TestTree
 testRevokeSecurityGroupIngressResponse = res
     "RevokeSecurityGroupIngressResponse"
     "fixture/RevokeSecurityGroupIngressResponse"
+    eC2
     (Proxy :: Proxy RevokeSecurityGroupIngress)
 
 testDescribeVolumesResponse :: DescribeVolumesResponse -> TestTree
 testDescribeVolumesResponse = res
     "DescribeVolumesResponse"
     "fixture/DescribeVolumesResponse"
+    eC2
     (Proxy :: Proxy DescribeVolumes)
 
 testDeleteVPNConnectionRouteResponse :: DeleteVPNConnectionRouteResponse -> TestTree
 testDeleteVPNConnectionRouteResponse = res
     "DeleteVPNConnectionRouteResponse"
     "fixture/DeleteVPNConnectionRouteResponse"
+    eC2
     (Proxy :: Proxy DeleteVPNConnectionRoute)
 
 testModifyReservedInstancesResponse :: ModifyReservedInstancesResponse -> TestTree
 testModifyReservedInstancesResponse = res
     "ModifyReservedInstancesResponse"
     "fixture/ModifyReservedInstancesResponse"
+    eC2
     (Proxy :: Proxy ModifyReservedInstances)
 
 testRegisterImageResponse :: RegisterImageResponse -> TestTree
 testRegisterImageResponse = res
     "RegisterImageResponse"
     "fixture/RegisterImageResponse"
+    eC2
     (Proxy :: Proxy RegisterImage)
 
 testModifyVPCEndpointResponse :: ModifyVPCEndpointResponse -> TestTree
 testModifyVPCEndpointResponse = res
     "ModifyVPCEndpointResponse"
     "fixture/ModifyVPCEndpointResponse"
+    eC2
     (Proxy :: Proxy ModifyVPCEndpoint)
 
 testDeleteVPNGatewayResponse :: DeleteVPNGatewayResponse -> TestTree
 testDeleteVPNGatewayResponse = res
     "DeleteVPNGatewayResponse"
     "fixture/DeleteVPNGatewayResponse"
+    eC2
     (Proxy :: Proxy DeleteVPNGateway)
 
 testCreateVPCResponse :: CreateVPCResponse -> TestTree
 testCreateVPCResponse = res
     "CreateVPCResponse"
     "fixture/CreateVPCResponse"
+    eC2
     (Proxy :: Proxy CreateVPC)
 
 testDescribeMovingAddressesResponse :: DescribeMovingAddressesResponse -> TestTree
 testDescribeMovingAddressesResponse = res
     "DescribeMovingAddressesResponse"
     "fixture/DescribeMovingAddressesResponse"
+    eC2
     (Proxy :: Proxy DescribeMovingAddresses)
 
 testDescribeVolumeAttributeResponse :: DescribeVolumeAttributeResponse -> TestTree
 testDescribeVolumeAttributeResponse = res
     "DescribeVolumeAttributeResponse"
     "fixture/DescribeVolumeAttributeResponse"
+    eC2
     (Proxy :: Proxy DescribeVolumeAttribute)
 
 testMoveAddressToVPCResponse :: MoveAddressToVPCResponse -> TestTree
 testMoveAddressToVPCResponse = res
     "MoveAddressToVPCResponse"
     "fixture/MoveAddressToVPCResponse"
+    eC2
     (Proxy :: Proxy MoveAddressToVPC)
 
 testGetPasswordDataResponse :: GetPasswordDataResponse -> TestTree
 testGetPasswordDataResponse = res
     "GetPasswordDataResponse"
     "fixture/GetPasswordDataResponse"
+    eC2
     (Proxy :: Proxy GetPasswordData)
 
 testCreateFlowLogsResponse :: CreateFlowLogsResponse -> TestTree
 testCreateFlowLogsResponse = res
     "CreateFlowLogsResponse"
     "fixture/CreateFlowLogsResponse"
+    eC2
     (Proxy :: Proxy CreateFlowLogs)
 
 testDescribeImportImageTasksResponse :: DescribeImportImageTasksResponse -> TestTree
 testDescribeImportImageTasksResponse = res
     "DescribeImportImageTasksResponse"
     "fixture/DescribeImportImageTasksResponse"
+    eC2
     (Proxy :: Proxy DescribeImportImageTasks)
 
 testDeleteNetworkACLResponse :: DeleteNetworkACLResponse -> TestTree
 testDeleteNetworkACLResponse = res
     "DeleteNetworkACLResponse"
     "fixture/DeleteNetworkACLResponse"
+    eC2
     (Proxy :: Proxy DeleteNetworkACL)
 
 testDescribeSpotFleetRequestsResponse :: DescribeSpotFleetRequestsResponse -> TestTree
 testDescribeSpotFleetRequestsResponse = res
     "DescribeSpotFleetRequestsResponse"
     "fixture/DescribeSpotFleetRequestsResponse"
+    eC2
     (Proxy :: Proxy DescribeSpotFleetRequests)
 
 testCopySnapshotResponse :: CopySnapshotResponse -> TestTree
 testCopySnapshotResponse = res
     "CopySnapshotResponse"
     "fixture/CopySnapshotResponse"
+    eC2
     (Proxy :: Proxy CopySnapshot)
 
 testModifyVolumeAttributeResponse :: ModifyVolumeAttributeResponse -> TestTree
 testModifyVolumeAttributeResponse = res
     "ModifyVolumeAttributeResponse"
     "fixture/ModifyVolumeAttributeResponse"
+    eC2
     (Proxy :: Proxy ModifyVolumeAttribute)
 
 testDescribeVPCAttributeResponse :: DescribeVPCAttributeResponse -> TestTree
 testDescribeVPCAttributeResponse = res
     "DescribeVPCAttributeResponse"
     "fixture/DescribeVPCAttributeResponse"
+    eC2
     (Proxy :: Proxy DescribeVPCAttribute)
 
 testCreateVolumeResponse :: Volume -> TestTree
 testCreateVolumeResponse = res
     "CreateVolumeResponse"
     "fixture/CreateVolumeResponse"
+    eC2
     (Proxy :: Proxy CreateVolume)
 
 testDisassociateAddressResponse :: DisassociateAddressResponse -> TestTree
 testDisassociateAddressResponse = res
     "DisassociateAddressResponse"
     "fixture/DisassociateAddressResponse"
+    eC2
     (Proxy :: Proxy DisassociateAddress)
 
 testDeleteVPCResponse :: DeleteVPCResponse -> TestTree
 testDeleteVPCResponse = res
     "DeleteVPCResponse"
     "fixture/DeleteVPCResponse"
+    eC2
     (Proxy :: Proxy DeleteVPC)
 
 testDescribePrefixListsResponse :: DescribePrefixListsResponse -> TestTree
 testDescribePrefixListsResponse = res
     "DescribePrefixListsResponse"
     "fixture/DescribePrefixListsResponse"
+    eC2
     (Proxy :: Proxy DescribePrefixLists)
 
 testCreateInstanceExportTaskResponse :: CreateInstanceExportTaskResponse -> TestTree
 testCreateInstanceExportTaskResponse = res
     "CreateInstanceExportTaskResponse"
     "fixture/CreateInstanceExportTaskResponse"
+    eC2
     (Proxy :: Proxy CreateInstanceExportTask)
 
 testDescribeSpotDatafeedSubscriptionResponse :: DescribeSpotDatafeedSubscriptionResponse -> TestTree
 testDescribeSpotDatafeedSubscriptionResponse = res
     "DescribeSpotDatafeedSubscriptionResponse"
     "fixture/DescribeSpotDatafeedSubscriptionResponse"
+    eC2
     (Proxy :: Proxy DescribeSpotDatafeedSubscription)
 
 testDetachVPNGatewayResponse :: DetachVPNGatewayResponse -> TestTree
 testDetachVPNGatewayResponse = res
     "DetachVPNGatewayResponse"
     "fixture/DetachVPNGatewayResponse"
+    eC2
     (Proxy :: Proxy DetachVPNGateway)
 
 testDescribeExportTasksResponse :: DescribeExportTasksResponse -> TestTree
 testDescribeExportTasksResponse = res
     "DescribeExportTasksResponse"
     "fixture/DescribeExportTasksResponse"
+    eC2
     (Proxy :: Proxy DescribeExportTasks)
 
 testDeletePlacementGroupResponse :: DeletePlacementGroupResponse -> TestTree
 testDeletePlacementGroupResponse = res
     "DeletePlacementGroupResponse"
     "fixture/DeletePlacementGroupResponse"
+    eC2
     (Proxy :: Proxy DeletePlacementGroup)
 
 testCreateSubnetResponse :: CreateSubnetResponse -> TestTree
 testCreateSubnetResponse = res
     "CreateSubnetResponse"
     "fixture/CreateSubnetResponse"
+    eC2
     (Proxy :: Proxy CreateSubnet)
 
 testEnableVolumeIOResponse :: EnableVolumeIOResponse -> TestTree
 testEnableVolumeIOResponse = res
     "EnableVolumeIOResponse"
     "fixture/EnableVolumeIOResponse"
+    eC2
     (Proxy :: Proxy EnableVolumeIO)
 
 testCancelExportTaskResponse :: CancelExportTaskResponse -> TestTree
 testCancelExportTaskResponse = res
     "CancelExportTaskResponse"
     "fixture/CancelExportTaskResponse"
+    eC2
     (Proxy :: Proxy CancelExportTask)
 
 testRequestSpotFleetResponse :: RequestSpotFleetResponse -> TestTree
 testRequestSpotFleetResponse = res
     "RequestSpotFleetResponse"
     "fixture/RequestSpotFleetResponse"
+    eC2
     (Proxy :: Proxy RequestSpotFleet)
 
 testDescribeInstancesResponse :: DescribeInstancesResponse -> TestTree
 testDescribeInstancesResponse = res
     "DescribeInstancesResponse"
     "fixture/DescribeInstancesResponse"
+    eC2
     (Proxy :: Proxy DescribeInstances)
 
 testDescribeSecurityGroupsResponse :: DescribeSecurityGroupsResponse -> TestTree
 testDescribeSecurityGroupsResponse = res
     "DescribeSecurityGroupsResponse"
     "fixture/DescribeSecurityGroupsResponse"
+    eC2
     (Proxy :: Proxy DescribeSecurityGroups)
 
 testDescribeVPCPeeringConnectionsResponse :: DescribeVPCPeeringConnectionsResponse -> TestTree
 testDescribeVPCPeeringConnectionsResponse = res
     "DescribeVPCPeeringConnectionsResponse"
     "fixture/DescribeVPCPeeringConnectionsResponse"
+    eC2
     (Proxy :: Proxy DescribeVPCPeeringConnections)
 
 testCreateNetworkInterfaceResponse :: CreateNetworkInterfaceResponse -> TestTree
 testCreateNetworkInterfaceResponse = res
     "CreateNetworkInterfaceResponse"
     "fixture/CreateNetworkInterfaceResponse"
+    eC2
     (Proxy :: Proxy CreateNetworkInterface)
 
 testAssociateAddressResponse :: AssociateAddressResponse -> TestTree
 testAssociateAddressResponse = res
     "AssociateAddressResponse"
     "fixture/AssociateAddressResponse"
+    eC2
     (Proxy :: Proxy AssociateAddress)
 
 testStartInstancesResponse :: StartInstancesResponse -> TestTree
 testStartInstancesResponse = res
     "StartInstancesResponse"
     "fixture/StartInstancesResponse"
+    eC2
     (Proxy :: Proxy StartInstances)
 
 testDescribeCustomerGatewaysResponse :: DescribeCustomerGatewaysResponse -> TestTree
 testDescribeCustomerGatewaysResponse = res
     "DescribeCustomerGatewaysResponse"
     "fixture/DescribeCustomerGatewaysResponse"
+    eC2
     (Proxy :: Proxy DescribeCustomerGateways)
 
 testResetNetworkInterfaceAttributeResponse :: ResetNetworkInterfaceAttributeResponse -> TestTree
 testResetNetworkInterfaceAttributeResponse = res
     "ResetNetworkInterfaceAttributeResponse"
     "fixture/ResetNetworkInterfaceAttributeResponse"
+    eC2
     (Proxy :: Proxy ResetNetworkInterfaceAttribute)
 
 testCreateVPNConnectionResponse :: CreateVPNConnectionResponse -> TestTree
 testCreateVPNConnectionResponse = res
     "CreateVPNConnectionResponse"
     "fixture/CreateVPNConnectionResponse"
+    eC2
     (Proxy :: Proxy CreateVPNConnection)
 
 testDescribeSnapshotsResponse :: DescribeSnapshotsResponse -> TestTree
 testDescribeSnapshotsResponse = res
     "DescribeSnapshotsResponse"
     "fixture/DescribeSnapshotsResponse"
+    eC2
     (Proxy :: Proxy DescribeSnapshots)
 
 testCreatePlacementGroupResponse :: CreatePlacementGroupResponse -> TestTree
 testCreatePlacementGroupResponse = res
     "CreatePlacementGroupResponse"
     "fixture/CreatePlacementGroupResponse"
+    eC2
     (Proxy :: Proxy CreatePlacementGroup)
 
 testReplaceRouteTableAssociationResponse :: ReplaceRouteTableAssociationResponse -> TestTree
 testReplaceRouteTableAssociationResponse = res
     "ReplaceRouteTableAssociationResponse"
     "fixture/ReplaceRouteTableAssociationResponse"
+    eC2
     (Proxy :: Proxy ReplaceRouteTableAssociation)
 
 testDescribeNetworkInterfaceAttributeResponse :: DescribeNetworkInterfaceAttributeResponse -> TestTree
 testDescribeNetworkInterfaceAttributeResponse = res
     "DescribeNetworkInterfaceAttributeResponse"
     "fixture/DescribeNetworkInterfaceAttributeResponse"
+    eC2
     (Proxy :: Proxy DescribeNetworkInterfaceAttribute)
 
 testDescribeReservedInstancesListingsResponse :: DescribeReservedInstancesListingsResponse -> TestTree
 testDescribeReservedInstancesListingsResponse = res
     "DescribeReservedInstancesListingsResponse"
     "fixture/DescribeReservedInstancesListingsResponse"
+    eC2
     (Proxy :: Proxy DescribeReservedInstancesListings)
 
 testDeleteNetworkInterfaceResponse :: DeleteNetworkInterfaceResponse -> TestTree
 testDeleteNetworkInterfaceResponse = res
     "DeleteNetworkInterfaceResponse"
     "fixture/DeleteNetworkInterfaceResponse"
+    eC2
     (Proxy :: Proxy DeleteNetworkInterface)
 
 testDeleteInternetGatewayResponse :: DeleteInternetGatewayResponse -> TestTree
 testDeleteInternetGatewayResponse = res
     "DeleteInternetGatewayResponse"
     "fixture/DeleteInternetGatewayResponse"
+    eC2
     (Proxy :: Proxy DeleteInternetGateway)
 
 testDeleteSubnetResponse :: DeleteSubnetResponse -> TestTree
 testDeleteSubnetResponse = res
     "DeleteSubnetResponse"
     "fixture/DeleteSubnetResponse"
+    eC2
     (Proxy :: Proxy DeleteSubnet)
 
 testCreateVPCEndpointResponse :: CreateVPCEndpointResponse -> TestTree
 testCreateVPCEndpointResponse = res
     "CreateVPCEndpointResponse"
     "fixture/CreateVPCEndpointResponse"
+    eC2
     (Proxy :: Proxy CreateVPCEndpoint)
 
 testDescribeImportSnapshotTasksResponse :: DescribeImportSnapshotTasksResponse -> TestTree
 testDescribeImportSnapshotTasksResponse = res
     "DescribeImportSnapshotTasksResponse"
     "fixture/DescribeImportSnapshotTasksResponse"
+    eC2
     (Proxy :: Proxy DescribeImportSnapshotTasks)
 
 testCopyImageResponse :: CopyImageResponse -> TestTree
 testCopyImageResponse = res
     "CopyImageResponse"
     "fixture/CopyImageResponse"
+    eC2
     (Proxy :: Proxy CopyImage)
 
 testDisassociateRouteTableResponse :: DisassociateRouteTableResponse -> TestTree
 testDisassociateRouteTableResponse = res
     "DisassociateRouteTableResponse"
     "fixture/DisassociateRouteTableResponse"
+    eC2
     (Proxy :: Proxy DisassociateRouteTable)
 
 testUnmonitorInstancesResponse :: UnmonitorInstancesResponse -> TestTree
 testUnmonitorInstancesResponse = res
     "UnmonitorInstancesResponse"
     "fixture/UnmonitorInstancesResponse"
+    eC2
     (Proxy :: Proxy UnmonitorInstances)
 
 testImportVolumeResponse :: ImportVolumeResponse -> TestTree
 testImportVolumeResponse = res
     "ImportVolumeResponse"
     "fixture/ImportVolumeResponse"
+    eC2
     (Proxy :: Proxy ImportVolume)
 
 testDisableVGWRoutePropagationResponse :: DisableVGWRoutePropagationResponse -> TestTree
 testDisableVGWRoutePropagationResponse = res
     "DisableVGWRoutePropagationResponse"
     "fixture/DisableVGWRoutePropagationResponse"
+    eC2
     (Proxy :: Proxy DisableVGWRoutePropagation)
 
 testCreateSpotDatafeedSubscriptionResponse :: CreateSpotDatafeedSubscriptionResponse -> TestTree
 testCreateSpotDatafeedSubscriptionResponse = res
     "CreateSpotDatafeedSubscriptionResponse"
     "fixture/CreateSpotDatafeedSubscriptionResponse"
+    eC2
     (Proxy :: Proxy CreateSpotDatafeedSubscription)
 
 testAssignPrivateIPAddressesResponse :: AssignPrivateIPAddressesResponse -> TestTree
 testAssignPrivateIPAddressesResponse = res
     "AssignPrivateIPAddressesResponse"
     "fixture/AssignPrivateIPAddressesResponse"
+    eC2
     (Proxy :: Proxy AssignPrivateIPAddresses)
 
 testDeleteSnapshotResponse :: DeleteSnapshotResponse -> TestTree
 testDeleteSnapshotResponse = res
     "DeleteSnapshotResponse"
     "fixture/DeleteSnapshotResponse"
+    eC2
     (Proxy :: Proxy DeleteSnapshot)
 
 testDeleteCustomerGatewayResponse :: DeleteCustomerGatewayResponse -> TestTree
 testDeleteCustomerGatewayResponse = res
     "DeleteCustomerGatewayResponse"
     "fixture/DeleteCustomerGatewayResponse"
+    eC2
     (Proxy :: Proxy DeleteCustomerGateway)
 
 testModifyInstanceAttributeResponse :: ModifyInstanceAttributeResponse -> TestTree
 testModifyInstanceAttributeResponse = res
     "ModifyInstanceAttributeResponse"
     "fixture/ModifyInstanceAttributeResponse"
+    eC2
     (Proxy :: Proxy ModifyInstanceAttribute)
 
 testCreateSecurityGroupResponse :: CreateSecurityGroupResponse -> TestTree
 testCreateSecurityGroupResponse = res
     "CreateSecurityGroupResponse"
     "fixture/CreateSecurityGroupResponse"
+    eC2
     (Proxy :: Proxy CreateSecurityGroup)
 
 testCancelSpotInstanceRequestsResponse :: CancelSpotInstanceRequestsResponse -> TestTree
 testCancelSpotInstanceRequestsResponse = res
     "CancelSpotInstanceRequestsResponse"
     "fixture/CancelSpotInstanceRequestsResponse"
+    eC2
     (Proxy :: Proxy CancelSpotInstanceRequests)
 
 testCreateRouteResponse :: CreateRouteResponse -> TestTree
 testCreateRouteResponse = res
     "CreateRouteResponse"
     "fixture/CreateRouteResponse"
+    eC2
     (Proxy :: Proxy CreateRoute)
 
 testCreateNetworkACLEntryResponse :: CreateNetworkACLEntryResponse -> TestTree
 testCreateNetworkACLEntryResponse = res
     "CreateNetworkACLEntryResponse"
     "fixture/CreateNetworkACLEntryResponse"
+    eC2
     (Proxy :: Proxy CreateNetworkACLEntry)
 
 testModifySnapshotAttributeResponse :: ModifySnapshotAttributeResponse -> TestTree
 testModifySnapshotAttributeResponse = res
     "ModifySnapshotAttributeResponse"
     "fixture/ModifySnapshotAttributeResponse"
+    eC2
     (Proxy :: Proxy ModifySnapshotAttribute)
 
 testEnableVGWRoutePropagationResponse :: EnableVGWRoutePropagationResponse -> TestTree
 testEnableVGWRoutePropagationResponse = res
     "EnableVGWRoutePropagationResponse"
     "fixture/EnableVGWRoutePropagationResponse"
+    eC2
     (Proxy :: Proxy EnableVGWRoutePropagation)
 
 testCreateSnapshotResponse :: Snapshot -> TestTree
 testCreateSnapshotResponse = res
     "CreateSnapshotResponse"
     "fixture/CreateSnapshotResponse"
+    eC2
     (Proxy :: Proxy CreateSnapshot)
 
 testDescribeSpotFleetRequestHistoryResponse :: DescribeSpotFleetRequestHistoryResponse -> TestTree
 testDescribeSpotFleetRequestHistoryResponse = res
     "DescribeSpotFleetRequestHistoryResponse"
     "fixture/DescribeSpotFleetRequestHistoryResponse"
+    eC2
     (Proxy :: Proxy DescribeSpotFleetRequestHistory)
 
 testDeleteSpotDatafeedSubscriptionResponse :: DeleteSpotDatafeedSubscriptionResponse -> TestTree
 testDeleteSpotDatafeedSubscriptionResponse = res
     "DeleteSpotDatafeedSubscriptionResponse"
     "fixture/DeleteSpotDatafeedSubscriptionResponse"
+    eC2
     (Proxy :: Proxy DeleteSpotDatafeedSubscription)
 
 testDescribePlacementGroupsResponse :: DescribePlacementGroupsResponse -> TestTree
 testDescribePlacementGroupsResponse = res
     "DescribePlacementGroupsResponse"
     "fixture/DescribePlacementGroupsResponse"
+    eC2
     (Proxy :: Proxy DescribePlacementGroups)
 
 testCreateReservedInstancesListingResponse :: CreateReservedInstancesListingResponse -> TestTree
 testCreateReservedInstancesListingResponse = res
     "CreateReservedInstancesListingResponse"
     "fixture/CreateReservedInstancesListingResponse"
+    eC2
     (Proxy :: Proxy CreateReservedInstancesListing)
 
 testEnableVPCClassicLinkResponse :: EnableVPCClassicLinkResponse -> TestTree
 testEnableVPCClassicLinkResponse = res
     "EnableVPCClassicLinkResponse"
     "fixture/EnableVPCClassicLinkResponse"
+    eC2
     (Proxy :: Proxy EnableVPCClassicLink)
 
 testDescribeKeyPairsResponse :: DescribeKeyPairsResponse -> TestTree
 testDescribeKeyPairsResponse = res
     "DescribeKeyPairsResponse"
     "fixture/DescribeKeyPairsResponse"
+    eC2
     (Proxy :: Proxy DescribeKeyPairs)
 
 testRebootInstancesResponse :: RebootInstancesResponse -> TestTree
 testRebootInstancesResponse = res
     "RebootInstancesResponse"
     "fixture/RebootInstancesResponse"
+    eC2
     (Proxy :: Proxy RebootInstances)
 
 testAttachVPNGatewayResponse :: AttachVPNGatewayResponse -> TestTree
 testAttachVPNGatewayResponse = res
     "AttachVPNGatewayResponse"
     "fixture/AttachVPNGatewayResponse"
+    eC2
     (Proxy :: Proxy AttachVPNGateway)
 
 testCreateVPNConnectionRouteResponse :: CreateVPNConnectionRouteResponse -> TestTree
 testCreateVPNConnectionRouteResponse = res
     "CreateVPNConnectionRouteResponse"
     "fixture/CreateVPNConnectionRouteResponse"
+    eC2
     (Proxy :: Proxy CreateVPNConnectionRoute)
 
 testDescribeClassicLinkInstancesResponse :: DescribeClassicLinkInstancesResponse -> TestTree
 testDescribeClassicLinkInstancesResponse = res
     "DescribeClassicLinkInstancesResponse"
     "fixture/DescribeClassicLinkInstancesResponse"
+    eC2
     (Proxy :: Proxy DescribeClassicLinkInstances)
 
 testTerminateInstancesResponse :: TerminateInstancesResponse -> TestTree
 testTerminateInstancesResponse = res
     "TerminateInstancesResponse"
     "fixture/TerminateInstancesResponse"
+    eC2
     (Proxy :: Proxy TerminateInstances)
 
 testCreateDHCPOptionsResponse :: CreateDHCPOptionsResponse -> TestTree
 testCreateDHCPOptionsResponse = res
     "CreateDHCPOptionsResponse"
     "fixture/CreateDHCPOptionsResponse"
+    eC2
     (Proxy :: Proxy CreateDHCPOptions)
 
 testAssociateRouteTableResponse :: AssociateRouteTableResponse -> TestTree
 testAssociateRouteTableResponse = res
     "AssociateRouteTableResponse"
     "fixture/AssociateRouteTableResponse"
+    eC2
     (Proxy :: Proxy AssociateRouteTable)
 
 testCreateImageResponse :: CreateImageResponse -> TestTree
 testCreateImageResponse = res
     "CreateImageResponse"
     "fixture/CreateImageResponse"
+    eC2
     (Proxy :: Proxy CreateImage)
 
 testDescribeAccountAttributesResponse :: DescribeAccountAttributesResponse -> TestTree
 testDescribeAccountAttributesResponse = res
     "DescribeAccountAttributesResponse"
     "fixture/DescribeAccountAttributesResponse"
+    eC2
     (Proxy :: Proxy DescribeAccountAttributes)
 
 testResetImageAttributeResponse :: ResetImageAttributeResponse -> TestTree
 testResetImageAttributeResponse = res
     "ResetImageAttributeResponse"
     "fixture/ResetImageAttributeResponse"
+    eC2
     (Proxy :: Proxy ResetImageAttribute)
 
 testDescribeNetworkACLsResponse :: DescribeNetworkACLsResponse -> TestTree
 testDescribeNetworkACLsResponse = res
     "DescribeNetworkACLsResponse"
     "fixture/DescribeNetworkACLsResponse"
+    eC2
     (Proxy :: Proxy DescribeNetworkACLs)
 
 testCancelImportTaskResponse :: CancelImportTaskResponse -> TestTree
 testCancelImportTaskResponse = res
     "CancelImportTaskResponse"
     "fixture/CancelImportTaskResponse"
+    eC2
     (Proxy :: Proxy CancelImportTask)
 
 testGetConsoleOutputResponse :: GetConsoleOutputResponse -> TestTree
 testGetConsoleOutputResponse = res
     "GetConsoleOutputResponse"
     "fixture/GetConsoleOutputResponse"
+    eC2
     (Proxy :: Proxy GetConsoleOutput)
 
 testUnassignPrivateIPAddressesResponse :: UnassignPrivateIPAddressesResponse -> TestTree
 testUnassignPrivateIPAddressesResponse = res
     "UnassignPrivateIPAddressesResponse"
     "fixture/UnassignPrivateIPAddressesResponse"
+    eC2
     (Proxy :: Proxy UnassignPrivateIPAddresses)
 
 testDeleteRouteTableResponse :: DeleteRouteTableResponse -> TestTree
 testDeleteRouteTableResponse = res
     "DeleteRouteTableResponse"
     "fixture/DeleteRouteTableResponse"
+    eC2
     (Proxy :: Proxy DeleteRouteTable)
 
 testDescribeImageAttributeResponse :: DescribeImageAttributeResponse -> TestTree
 testDescribeImageAttributeResponse = res
     "DescribeImageAttributeResponse"
     "fixture/DescribeImageAttributeResponse"
+    eC2
     (Proxy :: Proxy DescribeImageAttribute)
 
 testDeleteDHCPOptionsResponse :: DeleteDHCPOptionsResponse -> TestTree
 testDeleteDHCPOptionsResponse = res
     "DeleteDHCPOptionsResponse"
     "fixture/DeleteDHCPOptionsResponse"
+    eC2
     (Proxy :: Proxy DeleteDHCPOptions)
 
 testDescribeVPNGatewaysResponse :: DescribeVPNGatewaysResponse -> TestTree
 testDescribeVPNGatewaysResponse = res
     "DescribeVPNGatewaysResponse"
     "fixture/DescribeVPNGatewaysResponse"
+    eC2
     (Proxy :: Proxy DescribeVPNGateways)
 
 testDetachClassicLinkVPCResponse :: DetachClassicLinkVPCResponse -> TestTree
 testDetachClassicLinkVPCResponse = res
     "DetachClassicLinkVPCResponse"
     "fixture/DetachClassicLinkVPCResponse"
+    eC2
     (Proxy :: Proxy DetachClassicLinkVPC)
 
 testDescribeReservedInstancesModificationsResponse :: DescribeReservedInstancesModificationsResponse -> TestTree
 testDescribeReservedInstancesModificationsResponse = res
     "DescribeReservedInstancesModificationsResponse"
     "fixture/DescribeReservedInstancesModificationsResponse"
+    eC2
     (Proxy :: Proxy DescribeReservedInstancesModifications)
 
 testDescribeSpotInstanceRequestsResponse :: DescribeSpotInstanceRequestsResponse -> TestTree
 testDescribeSpotInstanceRequestsResponse = res
     "DescribeSpotInstanceRequestsResponse"
     "fixture/DescribeSpotInstanceRequestsResponse"
+    eC2
     (Proxy :: Proxy DescribeSpotInstanceRequests)
 
 testMonitorInstancesResponse :: MonitorInstancesResponse -> TestTree
 testMonitorInstancesResponse = res
     "MonitorInstancesResponse"
     "fixture/MonitorInstancesResponse"
+    eC2
     (Proxy :: Proxy MonitorInstances)
 
 testDescribeRegionsResponse :: DescribeRegionsResponse -> TestTree
 testDescribeRegionsResponse = res
     "DescribeRegionsResponse"
     "fixture/DescribeRegionsResponse"
+    eC2
     (Proxy :: Proxy DescribeRegions)
 
 testModifyVPCAttributeResponse :: ModifyVPCAttributeResponse -> TestTree
 testModifyVPCAttributeResponse = res
     "ModifyVPCAttributeResponse"
     "fixture/ModifyVPCAttributeResponse"
+    eC2
     (Proxy :: Proxy ModifyVPCAttribute)
 
 testDescribeSpotFleetInstancesResponse :: DescribeSpotFleetInstancesResponse -> TestTree
 testDescribeSpotFleetInstancesResponse = res
     "DescribeSpotFleetInstancesResponse"
     "fixture/DescribeSpotFleetInstancesResponse"
+    eC2
     (Proxy :: Proxy DescribeSpotFleetInstances)
 
 testDescribeVolumeStatusResponse :: DescribeVolumeStatusResponse -> TestTree
 testDescribeVolumeStatusResponse = res
     "DescribeVolumeStatusResponse"
     "fixture/DescribeVolumeStatusResponse"
+    eC2
     (Proxy :: Proxy DescribeVolumeStatus)
 
 testDeleteVolumeResponse :: DeleteVolumeResponse -> TestTree
 testDeleteVolumeResponse = res
     "DeleteVolumeResponse"
     "fixture/DeleteVolumeResponse"
+    eC2
     (Proxy :: Proxy DeleteVolume)
 
 testDescribeImagesResponse :: DescribeImagesResponse -> TestTree
 testDescribeImagesResponse = res
     "DescribeImagesResponse"
     "fixture/DescribeImagesResponse"
+    eC2
     (Proxy :: Proxy DescribeImages)
 
 testCreateKeyPairResponse :: CreateKeyPairResponse -> TestTree
 testCreateKeyPairResponse = res
     "CreateKeyPairResponse"
     "fixture/CreateKeyPairResponse"
+    eC2
     (Proxy :: Proxy CreateKeyPair)
 
 testRestoreAddressToClassicResponse :: RestoreAddressToClassicResponse -> TestTree
 testRestoreAddressToClassicResponse = res
     "RestoreAddressToClassicResponse"
     "fixture/RestoreAddressToClassicResponse"
+    eC2
     (Proxy :: Proxy RestoreAddressToClassic)
 
 testDescribeAvailabilityZonesResponse :: DescribeAvailabilityZonesResponse -> TestTree
 testDescribeAvailabilityZonesResponse = res
     "DescribeAvailabilityZonesResponse"
     "fixture/DescribeAvailabilityZonesResponse"
+    eC2
     (Proxy :: Proxy DescribeAvailabilityZones)
 
 testImportSnapshotResponse :: ImportSnapshotResponse -> TestTree
 testImportSnapshotResponse = res
     "ImportSnapshotResponse"
     "fixture/ImportSnapshotResponse"
+    eC2
     (Proxy :: Proxy ImportSnapshot)
 
 testAcceptVPCPeeringConnectionResponse :: AcceptVPCPeeringConnectionResponse -> TestTree
 testAcceptVPCPeeringConnectionResponse = res
     "AcceptVPCPeeringConnectionResponse"
     "fixture/AcceptVPCPeeringConnectionResponse"
+    eC2
     (Proxy :: Proxy AcceptVPCPeeringConnection)
 
 testDescribeRouteTablesResponse :: DescribeRouteTablesResponse -> TestTree
 testDescribeRouteTablesResponse = res
     "DescribeRouteTablesResponse"
     "fixture/DescribeRouteTablesResponse"
+    eC2
     (Proxy :: Proxy DescribeRouteTables)