diff --git a/README.md b/README.md
--- a/README.md
+++ b/README.md
@@ -8,7 +8,7 @@
 
 ## Version
 
-`1.0.1`
+`1.1.0`
 
 
 ## Description
diff --git a/Setup.hs b/Setup.hs
--- a/Setup.hs
+++ b/Setup.hs
@@ -1,2 +1,2 @@
-import Distribution.Simple
+import           Distribution.Simple
 main = defaultMain
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.0.1
+version:               1.1.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.0.1.*
+          amazonka-core == 1.1.0.*
         , base          >= 4.7     && < 5
 
 test-suite amazonka-ec2-test
@@ -255,9 +255,9 @@
         , Test.AWS.EC2.Internal
 
     build-depends:
-          amazonka-core == 1.0.1
-        , amazonka-test == 1.0.1
-        , amazonka-ec2 == 1.0.1
+          amazonka-core == 1.1.0
+        , amazonka-test == 1.1.0
+        , amazonka-ec2 == 1.1.0
         , base
         , bytestring
         , lens
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
@@ -84,7 +84,7 @@
         type Sv AcceptVPCPeeringConnection = EC2
         type Rs AcceptVPCPeeringConnection =
              AcceptVPCPeeringConnectionResponse
-        request = post
+        request = postQuery
         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
@@ -88,7 +88,7 @@
 instance AWSRequest AllocateAddress where
         type Sv AllocateAddress = EC2
         type Rs AllocateAddress = AllocateAddressResponse
-        request = post
+        request = postQuery
         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
@@ -114,7 +114,7 @@
         type Sv AssignPrivateIPAddresses = EC2
         type Rs AssignPrivateIPAddresses =
              AssignPrivateIPAddressesResponse
-        request = post
+        request = postQuery
         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
@@ -153,7 +153,7 @@
 instance AWSRequest AssociateAddress where
         type Sv AssociateAddress = EC2
         type Rs AssociateAddress = AssociateAddressResponse
-        request = post
+        request = postQuery
         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
@@ -101,7 +101,7 @@
         type Sv AssociateDHCPOptions = EC2
         type Rs AssociateDHCPOptions =
              AssociateDHCPOptionsResponse
-        request = post
+        request = postQuery
         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
@@ -100,7 +100,7 @@
         type Sv AssociateRouteTable = EC2
         type Rs AssociateRouteTable =
              AssociateRouteTableResponse
-        request = post
+        request = postQuery
         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
@@ -114,7 +114,7 @@
         type Sv AttachClassicLinkVPC = EC2
         type Rs AttachClassicLinkVPC =
              AttachClassicLinkVPCResponse
-        request = post
+        request = postQuery
         response
           = receiveXML
               (\ s h x ->
@@ -135,7 +135,7 @@
                "DryRun" =: _aclvDryRun,
                "InstanceId" =: _aclvInstanceId,
                "VpcId" =: _aclvVPCId,
-               toQueryList "groupId" _aclvGroups]
+               toQueryList "SecurityGroupId" _aclvGroups]
 
 -- | /See:/ 'attachClassicLinkVPCResponse' smart constructor.
 data AttachClassicLinkVPCResponse = AttachClassicLinkVPCResponse'
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
@@ -91,7 +91,7 @@
         type Sv AttachInternetGateway = EC2
         type Rs AttachInternetGateway =
              AttachInternetGatewayResponse
-        request = post
+        request = postQuery
         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
@@ -101,7 +101,7 @@
         type Sv AttachNetworkInterface = EC2
         type Rs AttachNetworkInterface =
              AttachNetworkInterfaceResponse
-        request = post
+        request = postQuery
         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
@@ -92,7 +92,7 @@
 instance AWSRequest AttachVPNGateway where
         type Sv AttachVPNGateway = EC2
         type Rs AttachVPNGateway = AttachVPNGatewayResponse
-        request = post
+        request = postQuery
         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
@@ -136,7 +136,7 @@
 instance AWSRequest AttachVolume where
         type Sv AttachVolume = EC2
         type Rs AttachVolume = VolumeAttachment
-        request = post
+        request = postQuery
         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
@@ -174,7 +174,7 @@
         type Sv AuthorizeSecurityGroupEgress = EC2
         type Rs AuthorizeSecurityGroupEgress =
              AuthorizeSecurityGroupEgressResponse
-        request = post
+        request = postQuery
         response
           = receiveNull AuthorizeSecurityGroupEgressResponse'
 
@@ -191,7 +191,8 @@
                  ("AuthorizeSecurityGroupEgress" :: ByteString),
                "Version" =: ("2015-04-15" :: ByteString),
                "FromPort" =: _asgeFromPort,
-               toQuery (toQueryList "item" <$> _asgeIPPermissions),
+               toQuery
+                 (toQueryList "IpPermissions" <$> _asgeIPPermissions),
                "IpProtocol" =: _asgeIPProtocol,
                "ToPort" =: _asgeToPort, "CidrIp" =: _asgeCIdRIP,
                "SourceSecurityGroupOwnerId" =:
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
@@ -188,7 +188,7 @@
         type Sv AuthorizeSecurityGroupIngress = EC2
         type Rs AuthorizeSecurityGroupIngress =
              AuthorizeSecurityGroupIngressResponse
-        request = post
+        request = postQuery
         response
           = receiveNull AuthorizeSecurityGroupIngressResponse'
 
@@ -206,7 +206,8 @@
                  ("AuthorizeSecurityGroupIngress" :: ByteString),
                "Version" =: ("2015-04-15" :: ByteString),
                "FromPort" =: _asgiFromPort,
-               toQuery (toQueryList "item" <$> _asgiIPPermissions),
+               toQuery
+                 (toQueryList "IpPermissions" <$> _asgiIPPermissions),
                "IpProtocol" =: _asgiIPProtocol,
                "GroupId" =: _asgiGroupId, "ToPort" =: _asgiToPort,
                "CidrIp" =: _asgiCIdRIP,
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
@@ -108,7 +108,7 @@
 instance AWSRequest BundleInstance where
         type Sv BundleInstance = EC2
         type Rs BundleInstance = BundleInstanceResponse
-        request = post
+        request = postQuery
         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
@@ -81,7 +81,7 @@
 instance AWSRequest CancelBundleTask where
         type Sv CancelBundleTask = EC2
         type Rs CancelBundleTask = CancelBundleTaskResponse
-        request = post
+        request = postQuery
         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
@@ -95,7 +95,7 @@
         type Sv CancelConversionTask = EC2
         type Rs CancelConversionTask =
              CancelConversionTaskResponse
-        request = post
+        request = postQuery
         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
@@ -69,7 +69,7 @@
 instance AWSRequest CancelExportTask where
         type Sv CancelExportTask = EC2
         type Rs CancelExportTask = CancelExportTaskResponse
-        request = post
+        request = postQuery
         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
@@ -90,7 +90,7 @@
 instance AWSRequest CancelImportTask where
         type Sv CancelImportTask = EC2
         type Rs CancelImportTask = CancelImportTaskResponse
-        request = post
+        request = postQuery
         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
@@ -75,7 +75,7 @@
         type Sv CancelReservedInstancesListing = EC2
         type Rs CancelReservedInstancesListing =
              CancelReservedInstancesListingResponse
-        request = post
+        request = postQuery
         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
@@ -94,7 +94,7 @@
         type Sv CancelSpotFleetRequests = EC2
         type Rs CancelSpotFleetRequests =
              CancelSpotFleetRequestsResponse
-        request = post
+        request = postQuery
         response
           = receiveXML
               (\ s h x ->
@@ -119,7 +119,8 @@
                  ("CancelSpotFleetRequests" :: ByteString),
                "Version" =: ("2015-04-15" :: ByteString),
                "DryRun" =: _csfrDryRun,
-               toQueryList "item" _csfrSpotFleetRequestIds,
+               toQueryList "SpotFleetRequestId"
+                 _csfrSpotFleetRequestIds,
                "TerminateInstances" =: _csfrTerminateInstances]
 
 -- | Contains the output of CancelSpotFleetRequests.
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
@@ -91,7 +91,7 @@
         type Sv CancelSpotInstanceRequests = EC2
         type Rs CancelSpotInstanceRequests =
              CancelSpotInstanceRequestsResponse
-        request = post
+        request = postQuery
         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
@@ -95,7 +95,7 @@
         type Sv ConfirmProductInstance = EC2
         type Rs ConfirmProductInstance =
              ConfirmProductInstanceResponse
-        request = post
+        request = postQuery
         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
@@ -128,7 +128,7 @@
 instance AWSRequest CopyImage where
         type Sv CopyImage = EC2
         type Rs CopyImage = CopyImageResponse
-        request = post
+        request = postQuery
         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
@@ -185,7 +185,7 @@
 instance AWSRequest CopySnapshot where
         type Sv CopySnapshot = EC2
         type Rs CopySnapshot = CopySnapshotResponse
-        request = post
+        request = postQuery
         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
@@ -131,7 +131,7 @@
         type Sv CreateCustomerGateway = EC2
         type Rs CreateCustomerGateway =
              CreateCustomerGatewayResponse
-        request = post
+        request = postQuery
         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
@@ -117,7 +117,7 @@
 instance AWSRequest CreateDHCPOptions where
         type Sv CreateDHCPOptions = EC2
         type Rs CreateDHCPOptions = CreateDHCPOptionsResponse
-        request = post
+        request = postQuery
         response
           = receiveXML
               (\ s h x ->
@@ -136,7 +136,8 @@
               ["Action" =: ("CreateDhcpOptions" :: ByteString),
                "Version" =: ("2015-04-15" :: ByteString),
                "DryRun" =: _cdoDryRun,
-               toQueryList "item" _cdoDHCPConfigurations]
+               toQueryList "DhcpConfiguration"
+                 _cdoDHCPConfigurations]
 
 -- | /See:/ 'createDHCPOptionsResponse' smart constructor.
 data CreateDHCPOptionsResponse = CreateDHCPOptionsResponse'
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
@@ -130,7 +130,7 @@
 instance AWSRequest CreateFlowLogs where
         type Sv CreateFlowLogs = EC2
         type Rs CreateFlowLogs = CreateFlowLogsResponse
-        request = post
+        request = postQuery
         response
           = receiveXML
               (\ s h x ->
@@ -155,7 +155,7 @@
               ["Action" =: ("CreateFlowLogs" :: ByteString),
                "Version" =: ("2015-04-15" :: ByteString),
                "ClientToken" =: _cflClientToken,
-               toQueryList "item" _cflResourceIds,
+               toQueryList "ResourceId" _cflResourceIds,
                "ResourceType" =: _cflResourceType,
                "TrafficType" =: _cflTrafficType,
                "LogGroupName" =: _cflLogGroupName,
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
@@ -137,7 +137,7 @@
 instance AWSRequest CreateImage where
         type Sv CreateImage = EC2
         type Rs CreateImage = CreateImageResponse
-        request = post
+        request = postQuery
         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
@@ -102,7 +102,7 @@
         type Sv CreateInstanceExportTask = EC2
         type Rs CreateInstanceExportTask =
              CreateInstanceExportTaskResponse
-        request = post
+        request = postQuery
         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
@@ -75,7 +75,7 @@
         type Sv CreateInternetGateway = EC2
         type Rs CreateInternetGateway =
              CreateInternetGatewayResponse
-        request = post
+        request = postQuery
         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
@@ -98,7 +98,7 @@
 instance AWSRequest CreateKeyPair where
         type Sv CreateKeyPair = EC2
         type Rs CreateKeyPair = CreateKeyPairResponse
-        request = post
+        request = postQuery
         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
@@ -86,7 +86,7 @@
 instance AWSRequest CreateNetworkACL where
         type Sv CreateNetworkACL = EC2
         type Rs CreateNetworkACL = CreateNetworkACLResponse
-        request = post
+        request = postQuery
         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
@@ -170,7 +170,7 @@
         type Sv CreateNetworkACLEntry = EC2
         type Rs CreateNetworkACLEntry =
              CreateNetworkACLEntryResponse
-        request = post
+        request = postQuery
         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
@@ -143,7 +143,7 @@
         type Sv CreateNetworkInterface = EC2
         type Rs CreateNetworkInterface =
              CreateNetworkInterfaceResponse
-        request = post
+        request = postQuery
         response
           = receiveXML
               (\ s h x ->
@@ -163,7 +163,8 @@
                  ("CreateNetworkInterface" :: ByteString),
                "Version" =: ("2015-04-15" :: ByteString),
                toQuery
-                 (toQueryList "item" <$> _cniPrivateIPAddresses),
+                 (toQueryList "PrivateIpAddresses" <$>
+                    _cniPrivateIPAddresses),
                toQuery
                  (toQueryList "SecurityGroupId" <$> _cniGroups),
                "PrivateIpAddress" =: _cniPrivateIPAddress,
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
@@ -96,7 +96,7 @@
         type Sv CreatePlacementGroup = EC2
         type Rs CreatePlacementGroup =
              CreatePlacementGroupResponse
-        request = post
+        request = postQuery
         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
@@ -127,7 +127,7 @@
         type Sv CreateReservedInstancesListing = EC2
         type Rs CreateReservedInstancesListing =
              CreateReservedInstancesListingResponse
-        request = post
+        request = postQuery
         response
           = receiveXML
               (\ s h x ->
@@ -151,7 +151,7 @@
                "Version" =: ("2015-04-15" :: ByteString),
                "ReservedInstancesId" =: _crilReservedInstancesId,
                "InstanceCount" =: _crilInstanceCount,
-               toQueryList "item" _crilPriceSchedules,
+               toQueryList "PriceSchedules" _crilPriceSchedules,
                "ClientToken" =: _crilClientToken]
 
 -- | /See:/ 'createReservedInstancesListingResponse' smart constructor.
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
@@ -150,7 +150,7 @@
 instance AWSRequest CreateRoute where
         type Sv CreateRoute = EC2
         type Rs CreateRoute = CreateRouteResponse
-        request = post
+        request = postQuery
         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
@@ -85,7 +85,7 @@
 instance AWSRequest CreateRouteTable where
         type Sv CreateRouteTable = EC2
         type Rs CreateRouteTable = CreateRouteTableResponse
-        request = post
+        request = postQuery
         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
@@ -142,7 +142,7 @@
         type Sv CreateSecurityGroup = EC2
         type Rs CreateSecurityGroup =
              CreateSecurityGroupResponse
-        request = post
+        request = postQuery
         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
@@ -129,7 +129,7 @@
 instance AWSRequest CreateSnapshot where
         type Sv CreateSnapshot = EC2
         type Rs CreateSnapshot = Snapshot
-        request = post
+        request = postQuery
         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
@@ -97,7 +97,7 @@
         type Sv CreateSpotDatafeedSubscription = EC2
         type Rs CreateSpotDatafeedSubscription =
              CreateSpotDatafeedSubscriptionResponse
-        request = post
+        request = postQuery
         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
@@ -128,7 +128,7 @@
 instance AWSRequest CreateSubnet where
         type Sv CreateSubnet = EC2
         type Rs CreateSubnet = CreateSubnetResponse
-        request = post
+        request = postQuery
         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
@@ -94,7 +94,7 @@
 instance AWSRequest CreateTags where
         type Sv CreateTags = EC2
         type Rs CreateTags = CreateTagsResponse
-        request = post
+        request = postQuery
         response = receiveNull CreateTagsResponse'
 
 instance ToHeaders CreateTags where
@@ -110,7 +110,7 @@
                "Version" =: ("2015-04-15" :: ByteString),
                "DryRun" =: _cDryRun,
                toQueryList "ResourceId" _cResources,
-               toQueryList "item" _cTags]
+               toQueryList "Tag" _cTags]
 
 -- | /See:/ 'createTagsResponse' smart constructor.
 data CreateTagsResponse =
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
@@ -109,7 +109,7 @@
 instance AWSRequest CreateVPC where
         type Sv CreateVPC = EC2
         type Rs CreateVPC = CreateVPCResponse
-        request = post
+        request = postQuery
         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
@@ -131,7 +131,7 @@
 instance AWSRequest CreateVPCEndpoint where
         type Sv CreateVPCEndpoint = EC2
         type Rs CreateVPCEndpoint = CreateVPCEndpointResponse
-        request = post
+        request = postQuery
         response
           = receiveXML
               (\ s h x ->
@@ -153,7 +153,8 @@
                "PolicyDocument" =: _cvePolicyDocument,
                "ClientToken" =: _cveClientToken,
                "DryRun" =: _cveDryRun,
-               toQuery (toQueryList "item" <$> _cveRouteTableIds),
+               toQuery
+                 (toQueryList "RouteTableId" <$> _cveRouteTableIds),
                "VpcId" =: _cveVPCId,
                "ServiceName" =: _cveServiceName]
 
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
@@ -112,7 +112,7 @@
         type Sv CreateVPCPeeringConnection = EC2
         type Rs CreateVPCPeeringConnection =
              CreateVPCPeeringConnectionResponse
-        request = post
+        request = postQuery
         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
@@ -130,7 +130,7 @@
         type Sv CreateVPNConnection = EC2
         type Rs CreateVPNConnection =
              CreateVPNConnectionResponse
-        request = post
+        request = postQuery
         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
@@ -83,7 +83,7 @@
         type Sv CreateVPNConnectionRoute = EC2
         type Rs CreateVPNConnectionRoute =
              CreateVPNConnectionRouteResponse
-        request = post
+        request = postQuery
         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
@@ -95,7 +95,7 @@
 instance AWSRequest CreateVPNGateway where
         type Sv CreateVPNGateway = EC2
         type Rs CreateVPNGateway = CreateVPNGatewayResponse
-        request = post
+        request = postQuery
         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
@@ -195,7 +195,7 @@
 instance AWSRequest CreateVolume where
         type Sv CreateVolume = EC2
         type Rs CreateVolume = Volume
-        request = post
+        request = postQuery
         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
@@ -79,7 +79,7 @@
         type Sv DeleteCustomerGateway = EC2
         type Rs DeleteCustomerGateway =
              DeleteCustomerGatewayResponse
-        request = post
+        request = postQuery
         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
@@ -80,7 +80,7 @@
 instance AWSRequest DeleteDHCPOptions where
         type Sv DeleteDHCPOptions = EC2
         type Rs DeleteDHCPOptions = DeleteDHCPOptionsResponse
-        request = post
+        request = postQuery
         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
@@ -67,7 +67,7 @@
 instance AWSRequest DeleteFlowLogs where
         type Sv DeleteFlowLogs = EC2
         type Rs DeleteFlowLogs = DeleteFlowLogsResponse
-        request = post
+        request = postQuery
         response
           = receiveXML
               (\ s h x ->
@@ -87,7 +87,7 @@
           = mconcat
               ["Action" =: ("DeleteFlowLogs" :: ByteString),
                "Version" =: ("2015-04-15" :: ByteString),
-               toQueryList "item" _dflFlowLogIds]
+               toQueryList "FlowLogId" _dflFlowLogIds]
 
 -- | /See:/ 'deleteFlowLogsResponse' smart constructor.
 data DeleteFlowLogsResponse = DeleteFlowLogsResponse'
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
@@ -79,7 +79,7 @@
         type Sv DeleteInternetGateway = EC2
         type Rs DeleteInternetGateway =
              DeleteInternetGatewayResponse
-        request = post
+        request = postQuery
         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
@@ -78,7 +78,7 @@
 instance AWSRequest DeleteKeyPair where
         type Sv DeleteKeyPair = EC2
         type Rs DeleteKeyPair = DeleteKeyPairResponse
-        request = post
+        request = postQuery
         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
@@ -78,7 +78,7 @@
 instance AWSRequest DeleteNetworkACL where
         type Sv DeleteNetworkACL = EC2
         type Rs DeleteNetworkACL = DeleteNetworkACLResponse
-        request = post
+        request = postQuery
         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
@@ -99,7 +99,7 @@
         type Sv DeleteNetworkACLEntry = EC2
         type Rs DeleteNetworkACLEntry =
              DeleteNetworkACLEntryResponse
-        request = post
+        request = postQuery
         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
@@ -79,7 +79,7 @@
         type Sv DeleteNetworkInterface = EC2
         type Rs DeleteNetworkInterface =
              DeleteNetworkInterfaceResponse
-        request = post
+        request = postQuery
         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
@@ -82,7 +82,7 @@
         type Sv DeletePlacementGroup = EC2
         type Rs DeletePlacementGroup =
              DeletePlacementGroupResponse
-        request = post
+        request = postQuery
         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
@@ -88,7 +88,7 @@
 instance AWSRequest DeleteRoute where
         type Sv DeleteRoute = EC2
         type Rs DeleteRoute = DeleteRouteResponse
-        request = post
+        request = postQuery
         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
@@ -79,7 +79,7 @@
 instance AWSRequest DeleteRouteTable where
         type Sv DeleteRouteTable = EC2
         type Rs DeleteRouteTable = DeleteRouteTableResponse
-        request = post
+        request = postQuery
         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
@@ -92,7 +92,7 @@
         type Sv DeleteSecurityGroup = EC2
         type Rs DeleteSecurityGroup =
              DeleteSecurityGroupResponse
-        request = post
+        request = postQuery
         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
@@ -93,7 +93,7 @@
 instance AWSRequest DeleteSnapshot where
         type Sv DeleteSnapshot = EC2
         type Rs DeleteSnapshot = DeleteSnapshotResponse
-        request = post
+        request = postQuery
         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
@@ -73,7 +73,7 @@
         type Sv DeleteSpotDatafeedSubscription = EC2
         type Rs DeleteSpotDatafeedSubscription =
              DeleteSpotDatafeedSubscriptionResponse
-        request = post
+        request = postQuery
         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
@@ -78,7 +78,7 @@
 instance AWSRequest DeleteSubnet where
         type Sv DeleteSubnet = EC2
         type Rs DeleteSubnet = DeleteSubnetResponse
-        request = post
+        request = postQuery
         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
@@ -94,7 +94,7 @@
 instance AWSRequest DeleteTags where
         type Sv DeleteTags = EC2
         type Rs DeleteTags = DeleteTagsResponse
-        request = post
+        request = postQuery
         response = receiveNull DeleteTagsResponse'
 
 instance ToHeaders DeleteTags where
@@ -109,7 +109,7 @@
               ["Action" =: ("DeleteTags" :: ByteString),
                "Version" =: ("2015-04-15" :: ByteString),
                "DryRun" =: _dtsDryRun,
-               toQuery (toQueryList "item" <$> _dtsTags),
+               toQuery (toQueryList "Tag" <$> _dtsTags),
                toQueryList "ResourceId" _dtsResources]
 
 -- | /See:/ 'deleteTagsResponse' smart constructor.
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
@@ -82,7 +82,7 @@
 instance AWSRequest DeleteVPC where
         type Sv DeleteVPC = EC2
         type Rs DeleteVPC = DeleteVPCResponse
-        request = post
+        request = postQuery
         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
@@ -82,7 +82,7 @@
         type Sv DeleteVPCEndpoints = EC2
         type Rs DeleteVPCEndpoints =
              DeleteVPCEndpointsResponse
-        request = post
+        request = postQuery
         response
           = receiveXML
               (\ s h x ->
@@ -103,7 +103,7 @@
               ["Action" =: ("DeleteVpcEndpoints" :: ByteString),
                "Version" =: ("2015-04-15" :: ByteString),
                "DryRun" =: _dveDryRun,
-               toQueryList "item" _dveVPCEndpointIds]
+               toQueryList "VpcEndpointId" _dveVPCEndpointIds]
 
 -- | /See:/ 'deleteVPCEndpointsResponse' smart constructor.
 data DeleteVPCEndpointsResponse = DeleteVPCEndpointsResponse'
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
@@ -84,7 +84,7 @@
         type Sv DeleteVPCPeeringConnection = EC2
         type Rs DeleteVPCPeeringConnection =
              DeleteVPCPeeringConnectionResponse
-        request = post
+        request = postQuery
         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
@@ -88,7 +88,7 @@
         type Sv DeleteVPNConnection = EC2
         type Rs DeleteVPNConnection =
              DeleteVPNConnectionResponse
-        request = post
+        request = postQuery
         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
@@ -79,7 +79,7 @@
         type Sv DeleteVPNConnectionRoute = EC2
         type Rs DeleteVPNConnectionRoute =
              DeleteVPNConnectionRouteResponse
-        request = post
+        request = postQuery
         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
@@ -81,7 +81,7 @@
 instance AWSRequest DeleteVPNGateway where
         type Sv DeleteVPNGateway = EC2
         type Rs DeleteVPNGateway = DeleteVPNGatewayResponse
-        request = post
+        request = postQuery
         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
@@ -84,7 +84,7 @@
 instance AWSRequest DeleteVolume where
         type Sv DeleteVolume = EC2
         type Rs DeleteVolume = DeleteVolumeResponse
-        request = post
+        request = postQuery
         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
@@ -80,7 +80,7 @@
 instance AWSRequest DeregisterImage where
         type Sv DeregisterImage = EC2
         type Rs DeregisterImage = DeregisterImageResponse
-        request = post
+        request = postQuery
         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
@@ -100,7 +100,7 @@
         type Sv DescribeAccountAttributes = EC2
         type Rs DescribeAccountAttributes =
              DescribeAccountAttributesResponse
-        request = post
+        request = postQuery
         response
           = receiveXML
               (\ s h x ->
@@ -122,7 +122,7 @@
                  ("DescribeAccountAttributes" :: ByteString),
                "Version" =: ("2015-04-15" :: ByteString),
                toQuery
-                 (toQueryList "attributeName" <$> _daaAttributeNames),
+                 (toQueryList "AttributeName" <$> _daaAttributeNames),
                "DryRun" =: _daaDryRun]
 
 -- | /See:/ 'describeAccountAttributesResponse' smart constructor.
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
@@ -127,7 +127,7 @@
 instance AWSRequest DescribeAddresses where
         type Sv DescribeAddresses = EC2
         type Rs DescribeAddresses = DescribeAddressesResponse
-        request = post
+        request = postQuery
         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
@@ -109,7 +109,7 @@
         type Sv DescribeAvailabilityZones = EC2
         type Rs DescribeAvailabilityZones =
              DescribeAvailabilityZonesResponse
-        request = post
+        request = postQuery
         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
@@ -120,7 +120,7 @@
         type Sv DescribeBundleTasks = EC2
         type Rs DescribeBundleTasks =
              DescribeBundleTasksResponse
-        request = post
+        request = postQuery
         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
@@ -143,7 +143,7 @@
         type Sv DescribeClassicLinkInstances = EC2
         type Rs DescribeClassicLinkInstances =
              DescribeClassicLinkInstancesResponse
-        request = post
+        request = postQuery
         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
@@ -92,7 +92,7 @@
         type Sv DescribeConversionTasks = EC2
         type Rs DescribeConversionTasks =
              DescribeConversionTasksResponse
-        request = post
+        request = postQuery
         response
           = receiveXML
               (\ s h x ->
@@ -114,7 +114,8 @@
                  ("DescribeConversionTasks" :: ByteString),
                "Version" =: ("2015-04-15" :: ByteString),
                toQuery
-                 (toQueryList "item" <$> _dctConversionTaskIds),
+                 (toQueryList "ConversionTaskId" <$>
+                    _dctConversionTaskIds),
                toQuery (toQueryList "Filter" <$> _dctFilters),
                "DryRun" =: _dctDryRun]
 
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
@@ -124,7 +124,7 @@
         type Sv DescribeCustomerGateways = EC2
         type Rs DescribeCustomerGateways =
              DescribeCustomerGatewaysResponse
-        request = post
+        request = postQuery
         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
@@ -116,7 +116,7 @@
         type Sv DescribeDHCPOptions = EC2
         type Rs DescribeDHCPOptions =
              DescribeDHCPOptionsResponse
-        request = post
+        request = postQuery
         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
@@ -68,7 +68,7 @@
         type Sv DescribeExportTasks = EC2
         type Rs DescribeExportTasks =
              DescribeExportTasksResponse
-        request = post
+        request = postQuery
         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
@@ -114,7 +114,7 @@
 instance AWSRequest DescribeFlowLogs where
         type Sv DescribeFlowLogs = EC2
         type Rs DescribeFlowLogs = DescribeFlowLogsResponse
-        request = post
+        request = postQuery
         response
           = receiveXML
               (\ s h x ->
@@ -137,7 +137,7 @@
                "Version" =: ("2015-04-15" :: ByteString),
                "NextToken" =: _dNextToken,
                toQuery (toQueryList "Filter" <$> _dFilter),
-               toQuery (toQueryList "item" <$> _dFlowLogIds),
+               toQuery (toQueryList "FlowLogId" <$> _dFlowLogIds),
                "MaxResults" =: _dMaxResults]
 
 -- | /See:/ 'describeFlowLogsResponse' smart constructor.
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
@@ -104,7 +104,7 @@
         type Sv DescribeImageAttribute = EC2
         type Rs DescribeImageAttribute =
              DescribeImageAttributeResponse
-        request = post
+        request = postQuery
         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
@@ -199,7 +199,7 @@
 instance AWSRequest DescribeImages where
         type Sv DescribeImages = EC2
         type Rs DescribeImages = DescribeImagesResponse
-        request = post
+        request = postQuery
         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
@@ -109,7 +109,7 @@
         type Sv DescribeImportImageTasks = EC2
         type Rs DescribeImportImageTasks =
              DescribeImportImageTasksResponse
-        request = post
+        request = postQuery
         response
           = receiveXML
               (\ s h x ->
@@ -131,7 +131,7 @@
               ["Action" =:
                  ("DescribeImportImageTasks" :: ByteString),
                "Version" =: ("2015-04-15" :: ByteString),
-               toQuery (toQueryList "Filter" <$> _diitFilters),
+               toQuery (toQueryList "Filters" <$> _diitFilters),
                toQuery
                  (toQueryList "ImportTaskId" <$> _diitImportTaskIds),
                "NextToken" =: _diitNextToken,
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
@@ -108,7 +108,7 @@
         type Sv DescribeImportSnapshotTasks = EC2
         type Rs DescribeImportSnapshotTasks =
              DescribeImportSnapshotTasksResponse
-        request = post
+        request = postQuery
         response
           = receiveXML
               (\ s h x ->
@@ -130,7 +130,7 @@
               ["Action" =:
                  ("DescribeImportSnapshotTasks" :: ByteString),
                "Version" =: ("2015-04-15" :: ByteString),
-               toQuery (toQueryList "Filter" <$> _distFilters),
+               toQuery (toQueryList "Filters" <$> _distFilters),
                toQuery
                  (toQueryList "ImportTaskId" <$> _distImportTaskIds),
                "NextToken" =: _distNextToken,
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
@@ -109,7 +109,7 @@
         type Sv DescribeInstanceAttribute = EC2
         type Rs DescribeInstanceAttribute =
              DescribeInstanceAttributeResponse
-        request = post
+        request = postQuery
         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
@@ -203,7 +203,7 @@
         type Sv DescribeInstanceStatus = EC2
         type Rs DescribeInstanceStatus =
              DescribeInstanceStatusResponse
-        request = post
+        request = postQuery
         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
@@ -378,7 +378,7 @@
 instance AWSRequest DescribeInstances where
         type Sv DescribeInstances = EC2
         type Rs DescribeInstances = DescribeInstancesResponse
-        request = post
+        request = postQuery
         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
@@ -114,7 +114,7 @@
         type Sv DescribeInternetGateways = EC2
         type Rs DescribeInternetGateways =
              DescribeInternetGatewaysResponse
-        request = post
+        request = postQuery
         response
           = receiveXML
               (\ s h x ->
@@ -137,7 +137,8 @@
                "Version" =: ("2015-04-15" :: ByteString),
                toQuery (toQueryList "Filter" <$> _dFilters),
                toQuery
-                 (toQueryList "item" <$> _dInternetGatewayIds),
+                 (toQueryList "InternetGatewayId" <$>
+                    _dInternetGatewayIds),
                "DryRun" =: _dDryRun]
 
 -- | /See:/ 'describeInternetGatewaysResponse' smart constructor.
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
@@ -99,7 +99,7 @@
 instance AWSRequest DescribeKeyPairs where
         type Sv DescribeKeyPairs = EC2
         type Rs DescribeKeyPairs = DescribeKeyPairsResponse
-        request = post
+        request = postQuery
         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
@@ -121,7 +121,7 @@
         type Sv DescribeMovingAddresses = EC2
         type Rs DescribeMovingAddresses =
              DescribeMovingAddressesResponse
-        request = post
+        request = postQuery
         response
           = receiveXML
               (\ s h x ->
@@ -143,7 +143,7 @@
               ["Action" =:
                  ("DescribeMovingAddresses" :: ByteString),
                "Version" =: ("2015-04-15" :: ByteString),
-               toQuery (toQueryList "item" <$> _dmaPublicIPs),
+               toQuery (toQueryList "PublicIp" <$> _dmaPublicIPs),
                toQuery (toQueryList "Filter" <$> _dmaFilters),
                "NextToken" =: _dmaNextToken, "DryRun" =: _dmaDryRun,
                "MaxResults" =: _dmaMaxResults]
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
@@ -150,7 +150,7 @@
         type Sv DescribeNetworkACLs = EC2
         type Rs DescribeNetworkACLs =
              DescribeNetworkACLsResponse
-        request = post
+        request = postQuery
         response
           = receiveXML
               (\ s h x ->
@@ -172,7 +172,8 @@
                "Version" =: ("2015-04-15" :: ByteString),
                toQuery (toQueryList "Filter" <$> _dnaclFilters),
                "DryRun" =: _dnaclDryRun,
-               toQuery (toQueryList "item" <$> _dnaclNetworkACLIds)]
+               toQuery
+                 (toQueryList "NetworkAclId" <$> _dnaclNetworkACLIds)]
 
 -- | /See:/ 'describeNetworkACLsResponse' smart constructor.
 data DescribeNetworkACLsResponse = DescribeNetworkACLsResponse'
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
@@ -96,7 +96,7 @@
         type Sv DescribeNetworkInterfaceAttribute = EC2
         type Rs DescribeNetworkInterfaceAttribute =
              DescribeNetworkInterfaceAttributeResponse
-        request = post
+        request = postQuery
         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
@@ -198,7 +198,7 @@
         type Sv DescribeNetworkInterfaces = EC2
         type Rs DescribeNetworkInterfaces =
              DescribeNetworkInterfacesResponse
-        request = post
+        request = postQuery
         response
           = receiveXML
               (\ s h x ->
@@ -220,7 +220,8 @@
                  ("DescribeNetworkInterfaces" :: ByteString),
                "Version" =: ("2015-04-15" :: ByteString),
                toQuery
-                 (toQueryList "item" <$> _dnisNetworkInterfaceIds),
+                 (toQueryList "NetworkInterfaceId" <$>
+                    _dnisNetworkInterfaceIds),
                toQuery (toQueryList "Filter" <$> _dnisFilters),
                "DryRun" =: _dnisDryRun]
 
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
@@ -103,7 +103,7 @@
         type Sv DescribePlacementGroups = EC2
         type Rs DescribePlacementGroups =
              DescribePlacementGroupsResponse
-        request = post
+        request = postQuery
         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
@@ -123,7 +123,7 @@
         type Sv DescribePrefixLists = EC2
         type Rs DescribePrefixLists =
              DescribePrefixListsResponse
-        request = post
+        request = postQuery
         response
           = receiveXML
               (\ s h x ->
@@ -146,7 +146,8 @@
                "Version" =: ("2015-04-15" :: ByteString),
                toQuery (toQueryList "Filter" <$> _dplFilters),
                "NextToken" =: _dplNextToken,
-               toQuery (toQueryList "item" <$> _dplPrefixListIds),
+               toQuery
+                 (toQueryList "PrefixListId" <$> _dplPrefixListIds),
                "DryRun" =: _dplDryRun,
                "MaxResults" =: _dplMaxResults]
 
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
@@ -97,7 +97,7 @@
 instance AWSRequest DescribeRegions where
         type Sv DescribeRegions = EC2
         type Rs DescribeRegions = DescribeRegionsResponse
-        request = post
+        request = postQuery
         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
@@ -162,7 +162,7 @@
         type Sv DescribeReservedInstances = EC2
         type Rs DescribeReservedInstances =
              DescribeReservedInstancesResponse
-        request = post
+        request = postQuery
         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
@@ -121,7 +121,7 @@
         type Sv DescribeReservedInstancesListings = EC2
         type Rs DescribeReservedInstancesListings =
              DescribeReservedInstancesListingsResponse
-        request = post
+        request = postQuery
         response
           = receiveXML
               (\ s h x ->
@@ -145,7 +145,7 @@
               ["Action" =:
                  ("DescribeReservedInstancesListings" :: ByteString),
                "Version" =: ("2015-04-15" :: ByteString),
-               toQuery (toQueryList "Filter" <$> _drilFilters),
+               toQuery (toQueryList "Filters" <$> _drilFilters),
                "ReservedInstancesId" =: _drilReservedInstancesId,
                "ReservedInstancesListingId" =:
                  _drilReservedInstancesListingId]
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
@@ -144,7 +144,7 @@
         type Sv DescribeReservedInstancesModifications = EC2
         type Rs DescribeReservedInstancesModifications =
              DescribeReservedInstancesModificationsResponse
-        request = post
+        request = postQuery
         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
@@ -271,7 +271,7 @@
         type Sv DescribeReservedInstancesOfferings = EC2
         type Rs DescribeReservedInstancesOfferings =
              DescribeReservedInstancesOfferingsResponse
-        request = post
+        request = postQuery
         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
@@ -159,7 +159,7 @@
         type Sv DescribeRouteTables = EC2
         type Rs DescribeRouteTables =
              DescribeRouteTablesResponse
-        request = post
+        request = postQuery
         response
           = receiveXML
               (\ s h x ->
@@ -181,7 +181,8 @@
                "Version" =: ("2015-04-15" :: ByteString),
                toQuery (toQueryList "Filter" <$> _drtsFilters),
                "DryRun" =: _drtsDryRun,
-               toQuery (toQueryList "item" <$> _drtsRouteTableIds)]
+               toQuery
+                 (toQueryList "RouteTableId" <$> _drtsRouteTableIds)]
 
 -- | /See:/ 'describeRouteTablesResponse' smart constructor.
 data DescribeRouteTablesResponse = DescribeRouteTablesResponse'
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
@@ -153,7 +153,7 @@
         type Sv DescribeSecurityGroups = EC2
         type Rs DescribeSecurityGroups =
              DescribeSecurityGroupsResponse
-        request = post
+        request = postQuery
         response
           = receiveXML
               (\ s h x ->
@@ -177,7 +177,7 @@
                toQuery
                  (toQueryList "GroupName" <$> _dsgsGroupNames),
                toQuery (toQueryList "Filter" <$> _dsgsFilters),
-               toQuery (toQueryList "groupId" <$> _dsgsGroupIds),
+               toQuery (toQueryList "GroupId" <$> _dsgsGroupIds),
                "DryRun" =: _dsgsDryRun]
 
 -- | /See:/ 'describeSecurityGroupsResponse' smart constructor.
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
@@ -98,7 +98,7 @@
         type Sv DescribeSnapshotAttribute = EC2
         type Rs DescribeSnapshotAttribute =
              DescribeSnapshotAttributeResponse
-        request = post
+        request = postQuery
         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
@@ -233,7 +233,7 @@
 instance AWSRequest DescribeSnapshots where
         type Sv DescribeSnapshots = EC2
         type Rs DescribeSnapshots = DescribeSnapshotsResponse
-        request = post
+        request = postQuery
         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
@@ -76,7 +76,7 @@
         type Sv DescribeSpotDatafeedSubscription = EC2
         type Rs DescribeSpotDatafeedSubscription =
              DescribeSpotDatafeedSubscriptionResponse
-        request = post
+        request = postQuery
         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
@@ -106,7 +106,7 @@
         type Sv DescribeSpotFleetInstances = EC2
         type Rs DescribeSpotFleetInstances =
              DescribeSpotFleetInstancesResponse
-        request = post
+        request = postQuery
         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
@@ -134,7 +134,7 @@
         type Sv DescribeSpotFleetRequestHistory = EC2
         type Rs DescribeSpotFleetRequestHistory =
              DescribeSpotFleetRequestHistoryResponse
-        request = post
+        request = postQuery
         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
@@ -104,7 +104,7 @@
         type Sv DescribeSpotFleetRequests = EC2
         type Rs DescribeSpotFleetRequests =
              DescribeSpotFleetRequestsResponse
-        request = post
+        request = postQuery
         response
           = receiveXML
               (\ s h x ->
@@ -126,7 +126,8 @@
                  ("DescribeSpotFleetRequests" :: ByteString),
                "Version" =: ("2015-04-15" :: ByteString),
                toQuery
-                 (toQueryList "item" <$> _dsfrSpotFleetRequestIds),
+                 (toQueryList "SpotFleetRequestId" <$>
+                    _dsfrSpotFleetRequestIds),
                "NextToken" =: _dsfrNextToken,
                "DryRun" =: _dsfrDryRun,
                "MaxResults" =: _dsfrMaxResults]
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
@@ -223,7 +223,7 @@
         type Sv DescribeSpotInstanceRequests = EC2
         type Rs DescribeSpotInstanceRequests =
              DescribeSpotInstanceRequestsResponse
-        request = post
+        request = postQuery
         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
@@ -192,7 +192,7 @@
         type Sv DescribeSpotPriceHistory = EC2
         type Rs DescribeSpotPriceHistory =
              DescribeSpotPriceHistoryResponse
-        request = post
+        request = postQuery
         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
@@ -130,7 +130,7 @@
 instance AWSRequest DescribeSubnets where
         type Sv DescribeSubnets = EC2
         type Rs DescribeSubnets = DescribeSubnetsResponse
-        request = post
+        request = postQuery
         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
@@ -130,7 +130,7 @@
 instance AWSRequest DescribeTags where
         type Sv DescribeTags = EC2
         type Rs DescribeTags = DescribeTagsResponse
-        request = post
+        request = postQuery
         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
@@ -93,7 +93,7 @@
         type Sv DescribeVPCAttribute = EC2
         type Rs DescribeVPCAttribute =
              DescribeVPCAttributeResponse
-        request = post
+        request = postQuery
         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
@@ -107,7 +107,7 @@
         type Sv DescribeVPCClassicLink = EC2
         type Rs DescribeVPCClassicLink =
              DescribeVPCClassicLinkResponse
-        request = post
+        request = postQuery
         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
@@ -97,7 +97,7 @@
         type Sv DescribeVPCEndpointServices = EC2
         type Rs DescribeVPCEndpointServices =
              DescribeVPCEndpointServicesResponse
-        request = post
+        request = postQuery
         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
@@ -124,7 +124,7 @@
         type Sv DescribeVPCEndpoints = EC2
         type Rs DescribeVPCEndpoints =
              DescribeVPCEndpointsResponse
-        request = post
+        request = postQuery
         response
           = receiveXML
               (\ s h x ->
@@ -148,7 +148,8 @@
                toQuery (toQueryList "Filter" <$> _dvpceFilters),
                "NextToken" =: _dvpceNextToken,
                toQuery
-                 (toQueryList "item" <$> _dvpceVPCEndpointIds),
+                 (toQueryList "VpcEndpointId" <$>
+                    _dvpceVPCEndpointIds),
                "DryRun" =: _dvpceDryRun,
                "MaxResults" =: _dvpceMaxResults]
 
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
@@ -134,7 +134,7 @@
         type Sv DescribeVPCPeeringConnections = EC2
         type Rs DescribeVPCPeeringConnections =
              DescribeVPCPeeringConnectionsResponse
-        request = post
+        request = postQuery
         response
           = receiveXML
               (\ s h x ->
@@ -158,7 +158,7 @@
                "Version" =: ("2015-04-15" :: ByteString),
                toQuery (toQueryList "Filter" <$> _dvpcpcFilters),
                toQuery
-                 (toQueryList "item" <$>
+                 (toQueryList "VpcPeeringConnectionId" <$>
                     _dvpcpcVPCPeeringConnectionIds),
                "DryRun" =: _dvpcpcDryRun]
 
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
@@ -118,7 +118,7 @@
 instance AWSRequest DescribeVPCs where
         type Sv DescribeVPCs = EC2
         type Rs DescribeVPCs = DescribeVPCsResponse
-        request = post
+        request = postQuery
         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
@@ -137,7 +137,7 @@
         type Sv DescribeVPNConnections = EC2
         type Rs DescribeVPNConnections =
              DescribeVPNConnectionsResponse
-        request = post
+        request = postQuery
         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
@@ -127,7 +127,7 @@
         type Sv DescribeVPNGateways = EC2
         type Rs DescribeVPNGateways =
              DescribeVPNGatewaysResponse
-        request = post
+        request = postQuery
         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
@@ -97,7 +97,7 @@
         type Sv DescribeVolumeAttribute = EC2
         type Rs DescribeVolumeAttribute =
              DescribeVolumeAttributeResponse
-        request = post
+        request = postQuery
         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
@@ -202,7 +202,7 @@
         type Sv DescribeVolumeStatus = EC2
         type Rs DescribeVolumeStatus =
              DescribeVolumeStatusResponse
-        request = post
+        request = postQuery
         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
@@ -181,7 +181,7 @@
 instance AWSRequest DescribeVolumes where
         type Sv DescribeVolumes = EC2
         type Rs DescribeVolumes = DescribeVolumesResponse
-        request = post
+        request = postQuery
         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
@@ -94,7 +94,7 @@
         type Sv DetachClassicLinkVPC = EC2
         type Rs DetachClassicLinkVPC =
              DetachClassicLinkVPCResponse
-        request = post
+        request = postQuery
         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
@@ -90,7 +90,7 @@
         type Sv DetachInternetGateway = EC2
         type Rs DetachInternetGateway =
              DetachInternetGatewayResponse
-        request = post
+        request = postQuery
         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
@@ -87,7 +87,7 @@
         type Sv DetachNetworkInterface = EC2
         type Rs DetachNetworkInterface =
              DetachNetworkInterfaceResponse
-        request = post
+        request = postQuery
         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
@@ -95,7 +95,7 @@
 instance AWSRequest DetachVPNGateway where
         type Sv DetachVPNGateway = EC2
         type Rs DetachVPNGateway = DetachVPNGatewayResponse
-        request = post
+        request = postQuery
         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
@@ -131,7 +131,7 @@
 instance AWSRequest DetachVolume where
         type Sv DetachVolume = EC2
         type Rs DetachVolume = VolumeAttachment
-        request = post
+        request = postQuery
         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
@@ -77,7 +77,7 @@
         type Sv DisableVGWRoutePropagation = EC2
         type Rs DisableVGWRoutePropagation =
              DisableVGWRoutePropagationResponse
-        request = post
+        request = postQuery
         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
@@ -82,7 +82,7 @@
         type Sv DisableVPCClassicLink = EC2
         type Rs DisableVPCClassicLink =
              DisableVPCClassicLinkResponse
-        request = post
+        request = postQuery
         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
@@ -95,7 +95,7 @@
         type Sv DisassociateAddress = EC2
         type Rs DisassociateAddress =
              DisassociateAddressResponse
-        request = post
+        request = postQuery
         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
@@ -85,7 +85,7 @@
         type Sv DisassociateRouteTable = EC2
         type Rs DisassociateRouteTable =
              DisassociateRouteTableResponse
-        request = post
+        request = postQuery
         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
@@ -77,7 +77,7 @@
         type Sv EnableVGWRoutePropagation = EC2
         type Rs EnableVGWRoutePropagation =
              EnableVGWRoutePropagationResponse
-        request = post
+        request = postQuery
         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
@@ -89,7 +89,7 @@
         type Sv EnableVPCClassicLink = EC2
         type Rs EnableVPCClassicLink =
              EnableVPCClassicLinkResponse
-        request = post
+        request = postQuery
         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
@@ -78,7 +78,7 @@
 instance AWSRequest EnableVolumeIO where
         type Sv EnableVolumeIO = EC2
         type Rs EnableVolumeIO = EnableVolumeIOResponse
-        request = post
+        request = postQuery
         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
@@ -101,7 +101,7 @@
 instance AWSRequest GetConsoleOutput where
         type Sv GetConsoleOutput = EC2
         type Rs GetConsoleOutput = GetConsoleOutputResponse
-        request = post
+        request = postQuery
         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
@@ -96,7 +96,7 @@
 instance AWSRequest GetPasswordData where
         type Sv GetPasswordData = EC2
         type Rs GetPasswordData = GetPasswordDataResponse
-        request = post
+        request = postQuery
         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
@@ -177,7 +177,7 @@
 instance AWSRequest ImportImage where
         type Sv ImportImage = EC2
         type Rs ImportImage = ImportImageResponse
-        request = post
+        request = postQuery
         response
           = receiveXML
               (\ s h x ->
@@ -215,7 +215,8 @@
                "DryRun" =: _impDryRun,
                "Description" =: _impDescription,
                "ClientData" =: _impClientData,
-               toQuery (toQueryList "item" <$> _impDiskContainers)]
+               toQuery
+                 (toQueryList "DiskContainer" <$> _impDiskContainers)]
 
 -- | /See:/ 'importImageResponse' smart constructor.
 data ImportImageResponse = ImportImageResponse'
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
@@ -113,7 +113,7 @@
 instance AWSRequest ImportInstance where
         type Sv ImportInstance = EC2
         type Rs ImportInstance = ImportInstanceResponse
-        request = post
+        request = postQuery
         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
@@ -94,13 +94,19 @@
 
 -- | The public key. You must base64 encode the public key material before
 -- sending it to AWS.
+--
+-- /Note:/ This 'Lens' automatically encodes and decodes Base64 data,
+-- despite what the AWS documentation might say.
+-- The underlying isomorphism will encode to Base64 representation during
+-- serialisation, and decode from Base64 representation during deserialisation.
+-- This 'Lens' accepts and returns only raw unencoded data.
 ikpPublicKeyMaterial :: Lens' ImportKeyPair ByteString
 ikpPublicKeyMaterial = lens _ikpPublicKeyMaterial (\ s a -> s{_ikpPublicKeyMaterial = a}) . _Base64;
 
 instance AWSRequest ImportKeyPair where
         type Sv ImportKeyPair = EC2
         type Rs ImportKeyPair = ImportKeyPairResponse
-        request = post
+        request = postQuery
         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
@@ -118,7 +118,7 @@
 instance AWSRequest ImportSnapshot where
         type Sv ImportSnapshot = EC2
         type Rs ImportSnapshot = ImportSnapshotResponse
-        request = post
+        request = postQuery
         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
@@ -114,7 +114,7 @@
 instance AWSRequest ImportVolume where
         type Sv ImportVolume = EC2
         type Rs ImportVolume = ImportVolumeResponse
-        request = post
+        request = postQuery
         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
@@ -159,7 +159,7 @@
         type Sv ModifyImageAttribute = EC2
         type Rs ModifyImageAttribute =
              ModifyImageAttributeResponse
-        request = post
+        request = postQuery
         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
@@ -238,7 +238,7 @@
         type Sv ModifyInstanceAttribute = EC2
         type Rs ModifyInstanceAttribute =
              ModifyInstanceAttributeResponse
-        request = post
+        request = postQuery
         response
           = receiveNull ModifyInstanceAttributeResponse'
 
@@ -255,7 +255,7 @@
                  ("ModifyInstanceAttribute" :: ByteString),
                "Version" =: ("2015-04-15" :: ByteString),
                "Attribute" =: _mAttribute,
-               toQuery (toQueryList "groupId" <$> _mGroups),
+               toQuery (toQueryList "GroupId" <$> _mGroups),
                "SourceDestCheck" =: _mSourceDestCheck,
                "DisableApiTermination" =: _mDisableAPITermination,
                "Ramdisk" =: _mRAMDisk, "Value" =: _mValue,
@@ -267,7 +267,8 @@
                "InstanceInitiatedShutdownBehavior" =:
                  _mInstanceInitiatedShutdownBehavior,
                toQuery
-                 (toQueryList "item" <$> _mBlockDeviceMappings),
+                 (toQueryList "BlockDeviceMapping" <$>
+                    _mBlockDeviceMappings),
                "DryRun" =: _mDryRun, "InstanceId" =: _mInstanceId]
 
 -- | /See:/ 'modifyInstanceAttributeResponse' smart constructor.
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
@@ -126,7 +126,7 @@
         type Sv ModifyNetworkInterfaceAttribute = EC2
         type Rs ModifyNetworkInterfaceAttribute =
              ModifyNetworkInterfaceAttributeResponse
-        request = post
+        request = postQuery
         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
@@ -95,7 +95,7 @@
         type Sv ModifyReservedInstances = EC2
         type Rs ModifyReservedInstances =
              ModifyReservedInstancesResponse
-        request = post
+        request = postQuery
         response
           = receiveXML
               (\ s h x ->
@@ -118,7 +118,9 @@
                "ClientToken" =: _mriClientToken,
                toQueryList "ReservedInstancesId"
                  _mriReservedInstancesIds,
-               toQueryList "item" _mriTargetConfigurations]
+               toQueryList
+                 "ReservedInstancesConfigurationSetItemType"
+                 _mriTargetConfigurations]
 
 -- | /See:/ 'modifyReservedInstancesResponse' smart constructor.
 data ModifyReservedInstancesResponse = ModifyReservedInstancesResponse'
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
@@ -135,7 +135,7 @@
         type Sv ModifySnapshotAttribute = EC2
         type Rs ModifySnapshotAttribute =
              ModifySnapshotAttributeResponse
-        request = post
+        request = postQuery
         response
           = receiveNull ModifySnapshotAttributeResponse'
 
@@ -155,7 +155,7 @@
                toQuery (toQueryList "UserId" <$> _msaUserIds),
                "CreateVolumePermission" =:
                  _msaCreateVolumePermission,
-               toQuery (toQueryList "GroupName" <$> _msaGroupNames),
+               toQuery (toQueryList "UserGroup" <$> _msaGroupNames),
                "OperationType" =: _msaOperationType,
                "DryRun" =: _msaDryRun,
                "SnapshotId" =: _msaSnapshotId]
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
@@ -76,7 +76,7 @@
         type Sv ModifySubnetAttribute = EC2
         type Rs ModifySubnetAttribute =
              ModifySubnetAttributeResponse
-        request = post
+        request = postQuery
         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
@@ -93,7 +93,7 @@
         type Sv ModifyVPCAttribute = EC2
         type Rs ModifyVPCAttribute =
              ModifyVPCAttributeResponse
-        request = post
+        request = postQuery
         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
@@ -120,7 +120,7 @@
 instance AWSRequest ModifyVPCEndpoint where
         type Sv ModifyVPCEndpoint = EC2
         type Rs ModifyVPCEndpoint = ModifyVPCEndpointResponse
-        request = post
+        request = postQuery
         response
           = receiveXML
               (\ s h x ->
@@ -140,10 +140,12 @@
                "Version" =: ("2015-04-15" :: ByteString),
                "PolicyDocument" =: _mvePolicyDocument,
                toQuery
-                 (toQueryList "item" <$> _mveRemoveRouteTableIds),
+                 (toQueryList "RemoveRouteTableId" <$>
+                    _mveRemoveRouteTableIds),
                "ResetPolicy" =: _mveResetPolicy,
                toQuery
-                 (toQueryList "item" <$> _mveAddRouteTableIds),
+                 (toQueryList "AddRouteTableId" <$>
+                    _mveAddRouteTableIds),
                "DryRun" =: _mveDryRun,
                "VpcEndpointId" =: _mveVPCEndpointId]
 
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
@@ -97,7 +97,7 @@
         type Sv ModifyVolumeAttribute = EC2
         type Rs ModifyVolumeAttribute =
              ModifyVolumeAttributeResponse
-        request = post
+        request = postQuery
         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
@@ -82,7 +82,7 @@
 instance AWSRequest MonitorInstances where
         type Sv MonitorInstances = EC2
         type Rs MonitorInstances = MonitorInstancesResponse
-        request = post
+        request = postQuery
         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
@@ -86,7 +86,7 @@
 instance AWSRequest MoveAddressToVPC where
         type Sv MoveAddressToVPC = EC2
         type Rs MoveAddressToVPC = MoveAddressToVPCResponse
-        request = post
+        request = postQuery
         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
@@ -117,7 +117,7 @@
         type Sv PurchaseReservedInstancesOffering = EC2
         type Rs PurchaseReservedInstancesOffering =
              PurchaseReservedInstancesOfferingResponse
-        request = post
+        request = postQuery
         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
@@ -86,7 +86,7 @@
 instance AWSRequest RebootInstances where
         type Sv RebootInstances = EC2
         type Rs RebootInstances = RebootInstancesResponse
-        request = post
+        request = postQuery
         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
@@ -203,7 +203,7 @@
 instance AWSRequest RegisterImage where
         type Sv RegisterImage = EC2
         type Rs RegisterImage = RegisterImageResponse
-        request = post
+        request = postQuery
         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
@@ -86,7 +86,7 @@
         type Sv RejectVPCPeeringConnection = EC2
         type Rs RejectVPCPeeringConnection =
              RejectVPCPeeringConnectionResponse
-        request = post
+        request = postQuery
         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
@@ -101,7 +101,7 @@
 instance AWSRequest ReleaseAddress where
         type Sv ReleaseAddress = EC2
         type Rs ReleaseAddress = ReleaseAddressResponse
-        request = post
+        request = postQuery
         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
@@ -97,7 +97,7 @@
         type Sv ReplaceNetworkACLAssociation = EC2
         type Rs ReplaceNetworkACLAssociation =
              ReplaceNetworkACLAssociationResponse
-        request = post
+        request = postQuery
         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
@@ -153,7 +153,7 @@
         type Sv ReplaceNetworkACLEntry = EC2
         type Rs ReplaceNetworkACLEntry =
              ReplaceNetworkACLEntryResponse
-        request = post
+        request = postQuery
         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
@@ -130,7 +130,7 @@
 instance AWSRequest ReplaceRoute where
         type Sv ReplaceRoute = EC2
         type Rs ReplaceRoute = ReplaceRouteResponse
-        request = post
+        request = postQuery
         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
@@ -102,7 +102,7 @@
         type Sv ReplaceRouteTableAssociation = EC2
         type Rs ReplaceRouteTableAssociation =
              ReplaceRouteTableAssociationResponse
-        request = post
+        request = postQuery
         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
@@ -157,7 +157,7 @@
         type Sv ReportInstanceStatus = EC2
         type Rs ReportInstanceStatus =
              ReportInstanceStatusResponse
-        request = post
+        request = postQuery
         response = receiveNull ReportInstanceStatusResponse'
 
 instance ToHeaders ReportInstanceStatus where
@@ -176,7 +176,7 @@
                "Description" =: _risDescription,
                toQueryList "InstanceId" _risInstances,
                "Status" =: _risStatus,
-               toQueryList "item" _risReasonCodes]
+               toQueryList "ReasonCode" _risReasonCodes]
 
 -- | /See:/ 'reportInstanceStatusResponse' smart constructor.
 data ReportInstanceStatusResponse =
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
@@ -86,7 +86,7 @@
 instance AWSRequest RequestSpotFleet where
         type Sv RequestSpotFleet = EC2
         type Rs RequestSpotFleet = RequestSpotFleetResponse
-        request = post
+        request = postQuery
         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
@@ -202,7 +202,7 @@
         type Sv RequestSpotInstances = EC2
         type Rs RequestSpotInstances =
              RequestSpotInstancesResponse
-        request = post
+        request = postQuery
         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
@@ -91,7 +91,7 @@
         type Sv ResetImageAttribute = EC2
         type Rs ResetImageAttribute =
              ResetImageAttributeResponse
-        request = post
+        request = postQuery
         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
@@ -97,7 +97,7 @@
         type Sv ResetInstanceAttribute = EC2
         type Rs ResetInstanceAttribute =
              ResetInstanceAttributeResponse
-        request = post
+        request = postQuery
         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
@@ -89,7 +89,7 @@
         type Sv ResetNetworkInterfaceAttribute = EC2
         type Rs ResetNetworkInterfaceAttribute =
              ResetNetworkInterfaceAttributeResponse
-        request = post
+        request = postQuery
         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
@@ -93,7 +93,7 @@
         type Sv ResetSnapshotAttribute = EC2
         type Rs ResetSnapshotAttribute =
              ResetSnapshotAttributeResponse
-        request = post
+        request = postQuery
         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
@@ -84,7 +84,7 @@
         type Sv RestoreAddressToClassic = EC2
         type Rs RestoreAddressToClassic =
              RestoreAddressToClassicResponse
-        request = post
+        request = postQuery
         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
@@ -162,7 +162,7 @@
         type Sv RevokeSecurityGroupEgress = EC2
         type Rs RevokeSecurityGroupEgress =
              RevokeSecurityGroupEgressResponse
-        request = post
+        request = postQuery
         response
           = receiveNull RevokeSecurityGroupEgressResponse'
 
@@ -179,7 +179,8 @@
                  ("RevokeSecurityGroupEgress" :: ByteString),
                "Version" =: ("2015-04-15" :: ByteString),
                "FromPort" =: _rsgeFromPort,
-               toQuery (toQueryList "item" <$> _rsgeIPPermissions),
+               toQuery
+                 (toQueryList "IpPermissions" <$> _rsgeIPPermissions),
                "IpProtocol" =: _rsgeIPProtocol,
                "ToPort" =: _rsgeToPort, "CidrIp" =: _rsgeCIdRIP,
                "SourceSecurityGroupOwnerId" =:
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
@@ -176,7 +176,7 @@
         type Sv RevokeSecurityGroupIngress = EC2
         type Rs RevokeSecurityGroupIngress =
              RevokeSecurityGroupIngressResponse
-        request = post
+        request = postQuery
         response
           = receiveNull RevokeSecurityGroupIngressResponse'
 
@@ -193,7 +193,8 @@
                  ("RevokeSecurityGroupIngress" :: ByteString),
                "Version" =: ("2015-04-15" :: ByteString),
                "FromPort" =: _rsgiFromPort,
-               toQuery (toQueryList "item" <$> _rsgiIPPermissions),
+               toQuery
+                 (toQueryList "IpPermissions" <$> _rsgiIPPermissions),
                "IpProtocol" =: _rsgiIPProtocol,
                "GroupId" =: _rsgiGroupId, "ToPort" =: _rsgiToPort,
                "CidrIp" =: _rsgiCIdRIP,
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
@@ -382,7 +382,7 @@
 instance AWSRequest RunInstances where
         type Sv RunInstances = EC2
         type Rs RunInstances = Reservation
-        request = post
+        request = postQuery
         response = receiveXML (\ s h x -> parseXML x)
 
 instance ToHeaders RunInstances where
@@ -404,7 +404,9 @@
                  (toQueryList "SecurityGroup" <$> _rSecurityGroups),
                "ClientToken" =: _rClientToken,
                "DisableApiTermination" =: _rDisableAPITermination,
-               toQuery (toQueryList "item" <$> _rNetworkInterfaces),
+               toQuery
+                 (toQueryList "NetworkInterface" <$>
+                    _rNetworkInterfaces),
                "KeyName" =: _rKeyName, "RamdiskId" =: _rRAMDiskId,
                "KernelId" =: _rKernelId, "SubnetId" =: _rSubnetId,
                "InstanceType" =: _rInstanceType,
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
@@ -108,7 +108,7 @@
 instance AWSRequest StartInstances where
         type Sv StartInstances = EC2
         type Rs StartInstances = StartInstancesResponse
-        request = post
+        request = postQuery
         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
@@ -126,7 +126,7 @@
 instance AWSRequest StopInstances where
         type Sv StopInstances = EC2
         type Rs StopInstances = StopInstancesResponse
-        request = post
+        request = postQuery
         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
@@ -103,7 +103,7 @@
         type Sv TerminateInstances = EC2
         type Rs TerminateInstances =
              TerminateInstancesResponse
-        request = post
+        request = postQuery
         response
           = receiveXML
               (\ s h x ->
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
@@ -386,6 +386,12 @@
     }
 
 -- | Undocumented member.
+--
+-- /Note:/ This 'Lens' automatically encodes and decodes Base64 data,
+-- despite what the AWS documentation might say.
+-- The underlying isomorphism will encode to Base64 representation during
+-- serialisation, and decode from Base64 representation during deserialisation.
+-- This 'Lens' accepts and returns only raw unencoded data.
 bavValue :: Lens' BlobAttributeValue (Maybe ByteString)
 bavValue = lens _bavValue (\ s a -> s{_bavValue = a}) . mapping _Base64;
 
@@ -1044,8 +1050,8 @@
          where
         toQuery CreateVolumePermissionModifications'{..}
           = mconcat
-              [toQuery (toQueryList "item" <$> _cvpmRemove),
-               toQuery (toQueryList "item" <$> _cvpmAdd)]
+              [toQuery (toQueryList "Remove" <$> _cvpmRemove),
+               toQuery (toQueryList "Add" <$> _cvpmAdd)]
 
 -- | Describes a customer gateway.
 --
@@ -1933,7 +1939,7 @@
 instance ToQuery Filter where
         toQuery Filter'{..}
           = mconcat
-              [toQuery (toQueryList "item" <$> _fValues),
+              [toQuery (toQueryList "Value" <$> _fValues),
                "Name" =: _fName]
 
 -- | Describes a flow log.
@@ -2354,10 +2360,12 @@
         toQuery IPPermission'{..}
           = mconcat
               ["FromPort" =: _ipFromPort,
-               toQuery (toQueryList "item" <$> _ipUserIdGroupPairs),
-               toQuery (toQueryList "item" <$> _ipPrefixListIds),
+               toQuery
+                 (toQueryList "Groups" <$> _ipUserIdGroupPairs),
+               toQuery
+                 (toQueryList "PrefixListIds" <$> _ipPrefixListIds),
                "ToPort" =: _ipToPort,
-               toQuery (toQueryList "item" <$> _ipIPRanges),
+               toQuery (toQueryList "IpRanges" <$> _ipIPRanges),
                "IpProtocol" =: _ipIPProtocol]
 
 -- | Describes an IP range.
@@ -2955,10 +2963,9 @@
           = mconcat
               ["AdditionalInfo" =: _iilsAdditionalInfo,
                toQuery
-                 (toQueryList "SecurityGroup" <$> _iilsGroupNames),
+                 (toQueryList "GroupName" <$> _iilsGroupNames),
                "SubnetId" =: _iilsSubnetId,
-               toQuery
-                 (toQueryList "SecurityGroupId" <$> _iilsGroupIds),
+               toQuery (toQueryList "GroupId" <$> _iilsGroupIds),
                "InstanceType" =: _iilsInstanceType,
                "UserData" =: _iilsUserData,
                "Monitoring" =: _iilsMonitoring,
@@ -4212,7 +4219,8 @@
         toQuery InstanceNetworkInterfaceSpecification'{..}
           = mconcat
               [toQuery
-                 (toQueryList "item" <$> _inisPrivateIPAddresses),
+                 (toQueryList "PrivateIpAddresses" <$>
+                    _inisPrivateIPAddresses),
                "DeleteOnTermination" =: _inisDeleteOnTermination,
                toQuery
                  (toQueryList "SecurityGroupId" <$> _inisGroups),
@@ -4802,8 +4810,8 @@
 instance ToQuery LaunchPermissionModifications where
         toQuery LaunchPermissionModifications'{..}
           = mconcat
-              [toQuery (toQueryList "item" <$> _lpmRemove),
-               toQuery (toQueryList "item" <$> _lpmAdd)]
+              [toQuery (toQueryList "Remove" <$> _lpmRemove),
+               toQuery (toQueryList "Add" <$> _lpmAdd)]
 
 -- | Describes the launch specification for an instance.
 --
@@ -5704,7 +5712,7 @@
 instance ToQuery NewDHCPConfiguration where
         toQuery NewDHCPConfiguration'{..}
           = mconcat
-              [toQuery (toQueryList "item" <$> _ndcValues),
+              [toQuery (toQueryList "Value" <$> _ndcValues),
                "Key" =: _ndcKey]
 
 -- | Describes the placement for the instance.
@@ -6400,10 +6408,14 @@
         toQuery RequestSpotLaunchSpecification'{..}
           = mconcat
               [toQuery
-                 (toQueryList "item" <$> _rslsSecurityGroupIds),
-               toQuery (toQueryList "item" <$> _rslsSecurityGroups),
+                 (toQueryList "SecurityGroupId" <$>
+                    _rslsSecurityGroupIds),
                toQuery
-                 (toQueryList "item" <$> _rslsNetworkInterfaces),
+                 (toQueryList "SecurityGroup" <$>
+                    _rslsSecurityGroups),
+               toQuery
+                 (toQueryList "NetworkInterface" <$>
+                    _rslsNetworkInterfaces),
                "KeyName" =: _rslsKeyName,
                "RamdiskId" =: _rslsRAMDiskId,
                "KernelId" =: _rslsKernelId,
@@ -6415,7 +6427,8 @@
                "IamInstanceProfile" =: _rslsIAMInstanceProfile,
                "ImageId" =: _rslsImageId,
                toQuery
-                 (toQueryList "item" <$> _rslsBlockDeviceMappings),
+                 (toQueryList "BlockDeviceMapping" <$>
+                    _rslsBlockDeviceMappings),
                "AddressingType" =: _rslsAddressingType,
                "Placement" =: _rslsPlacement]
 
@@ -7512,6 +7525,12 @@
 
 -- | A Base64-encoded Amazon S3 upload policy that gives Amazon EC2
 -- permission to upload items into Amazon S3 on your behalf.
+--
+-- /Note:/ This 'Lens' automatically encodes and decodes Base64 data,
+-- despite what the AWS documentation might say.
+-- The underlying isomorphism will encode to Base64 representation during
+-- serialisation, and decode from Base64 representation during deserialisation.
+-- This 'Lens' accepts and returns only raw unencoded data.
 ssUploadPolicy :: Lens' S3Storage (Maybe ByteString)
 ssUploadPolicy = lens _ssUploadPolicy (\ s a -> s{_ssUploadPolicy = a}) . mapping _Base64;
 
@@ -8287,9 +8306,10 @@
         toQuery SpotFleetLaunchSpecification'{..}
           = mconcat
               [toQuery
-                 (toQueryList "item" <$> _sflsSecurityGroups),
+                 (toQueryList "GroupSet" <$> _sflsSecurityGroups),
                toQuery
-                 (toQueryList "item" <$> _sflsNetworkInterfaces),
+                 (toQueryList "NetworkInterfaceSet" <$>
+                    _sflsNetworkInterfaces),
                "KeyName" =: _sflsKeyName,
                "RamdiskId" =: _sflsRAMDiskId,
                "KernelId" =: _sflsKernelId,
@@ -8301,7 +8321,8 @@
                "IamInstanceProfile" =: _sflsIAMInstanceProfile,
                "ImageId" =: _sflsImageId,
                toQuery
-                 (toQueryList "item" <$> _sflsBlockDeviceMappings),
+                 (toQueryList "BlockDeviceMapping" <$>
+                    _sflsBlockDeviceMappings),
                "AddressingType" =: _sflsAddressingType,
                "Placement" =: _sflsPlacement]
 
@@ -8506,7 +8527,8 @@
                "SpotPrice" =: _sfrcdSpotPrice,
                "TargetCapacity" =: _sfrcdTargetCapacity,
                "IamFleetRole" =: _sfrcdIAMFleetRole,
-               toQueryList "item" _sfrcdLaunchSpecifications]
+               toQueryList "LaunchSpecifications"
+                 _sfrcdLaunchSpecifications]
 
 -- | Describe a Spot Instance request.
 --
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
@@ -78,7 +78,7 @@
         type Sv UnassignPrivateIPAddresses = EC2
         type Rs UnassignPrivateIPAddresses =
              UnassignPrivateIPAddressesResponse
-        request = post
+        request = postQuery
         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
@@ -83,7 +83,7 @@
         type Sv UnmonitorInstances = EC2
         type Rs UnmonitorInstances =
              UnmonitorInstancesResponse
-        request = post
+        request = postQuery
         response
           = receiveXML
               (\ s h x ->
diff --git a/test/Test/AWS/EC2.hs b/test/Test/AWS/EC2.hs
--- a/test/Test/AWS/EC2.hs
+++ b/test/Test/AWS/EC2.hs
@@ -26,7 +26,36 @@
 
 fixtures :: [TestTree]
 fixtures =
-    [ testGroup "response"
+    [ testGroup "request"
+        [ testDescribeVolumes $ describeVolumes
+            & desVolumeIds .~ ["foo", "bar", "baz"]
+            & desFilters   .~
+                [ filter' "tag:Name" & fValues .~ ["octopus"]
+                , filter' "tag:Role" & fValues .~ ["database", "server"]
+                ]
+
+        , testDescribeImages $ describeImages
+            & deseFilters .~
+                [ filter' "is-public"    & fValues .~ ["true"]
+                , filter' "architecture" & fValues .~ ["x86_64"]
+                , filter' "platform"     & fValues .~ ["windows"]
+                ]
+
+        , testDescribeInstances $ describeInstances
+            & diiInstanceIds .~ ["i-foo", "i-bar", "i-baz"]
+            & diiFilters     .~
+                [ filter' "instance-type"
+                    & fValues .~ ["m1.small", "m1.large"]
+                , filter' "block-device-mapping.status"
+                    & fValues .~ ["attached"]
+                ]
+
+        , testCopySnapshot $ copySnapshot "us-west-1" "snap-1a2b3c4d"
+            & csDescription ?~ "My_snapshot"
+
+        ]
+
+    , testGroup "response"
         [ testDescribeInstancesResponse $ describeInstancesResponse 200
             & dirsReservations .~
                 [ reservation "r-1a2b3c4d" "123456789012"