diff --git a/README.md b/README.md
--- a/README.md
+++ b/README.md
@@ -8,7 +8,7 @@
 
 ## Version
 
-`1.1.0`
+`1.2.0`
 
 
 ## Description
diff --git a/amazonka-rds.cabal b/amazonka-rds.cabal
--- a/amazonka-rds.cabal
+++ b/amazonka-rds.cabal
@@ -1,5 +1,5 @@
 name:                  amazonka-rds
-version:               1.1.0
+version:               1.2.0
 synopsis:              Amazon Relational Database Service SDK.
 homepage:              https://github.com/brendanhay/amazonka
 license:               OtherLicense
@@ -152,7 +152,7 @@
         , Network.AWS.RDS.Types.Sum
 
     build-depends:
-          amazonka-core == 1.1.0.*
+          amazonka-core == 1.2.0.*
         , base          >= 4.7     && < 5
 
 test-suite amazonka-rds-test
@@ -171,9 +171,9 @@
         , Test.AWS.RDS.Internal
 
     build-depends:
-          amazonka-core == 1.1.0
-        , amazonka-test == 1.1.0
-        , amazonka-rds == 1.1.0
+          amazonka-core == 1.2.0
+        , amazonka-test == 1.2.0
+        , amazonka-rds == 1.2.0
         , base
         , bytestring
         , lens
diff --git a/gen/Network/AWS/RDS.hs b/gen/Network/AWS/RDS.hs
--- a/gen/Network/AWS/RDS.hs
+++ b/gen/Network/AWS/RDS.hs
@@ -43,8 +43,8 @@
 -- /See:/ <http://docs.aws.amazon.com/AmazonRDS/latest/APIReference/Welcome.html AWS API Reference>
 module Network.AWS.RDS
     (
-    -- * Service
-      RDS
+    -- * Service Configuration
+      rDS
 
     -- * Errors
     -- $errors
diff --git a/gen/Network/AWS/RDS/AddSourceIdentifierToSubscription.hs b/gen/Network/AWS/RDS/AddSourceIdentifierToSubscription.hs
--- a/gen/Network/AWS/RDS/AddSourceIdentifierToSubscription.hs
+++ b/gen/Network/AWS/RDS/AddSourceIdentifierToSubscription.hs
@@ -94,10 +94,9 @@
 
 instance AWSRequest AddSourceIdentifierToSubscription
          where
-        type Sv AddSourceIdentifierToSubscription = RDS
         type Rs AddSourceIdentifierToSubscription =
              AddSourceIdentifierToSubscriptionResponse
-        request = postQuery
+        request = postQuery rDS
         response
           = receiveXMLWrapper
               "AddSourceIdentifierToSubscriptionResult"
diff --git a/gen/Network/AWS/RDS/AddTagsToResource.hs b/gen/Network/AWS/RDS/AddTagsToResource.hs
--- a/gen/Network/AWS/RDS/AddTagsToResource.hs
+++ b/gen/Network/AWS/RDS/AddTagsToResource.hs
@@ -82,9 +82,8 @@
 attrTags = lens _attrTags (\ s a -> s{_attrTags = a}) . _Coerce;
 
 instance AWSRequest AddTagsToResource where
-        type Sv AddTagsToResource = RDS
         type Rs AddTagsToResource = AddTagsToResourceResponse
-        request = postQuery
+        request = postQuery rDS
         response = receiveNull AddTagsToResourceResponse'
 
 instance ToHeaders AddTagsToResource where
diff --git a/gen/Network/AWS/RDS/ApplyPendingMaintenanceAction.hs b/gen/Network/AWS/RDS/ApplyPendingMaintenanceAction.hs
--- a/gen/Network/AWS/RDS/ApplyPendingMaintenanceAction.hs
+++ b/gen/Network/AWS/RDS/ApplyPendingMaintenanceAction.hs
@@ -102,10 +102,9 @@
 
 instance AWSRequest ApplyPendingMaintenanceAction
          where
-        type Sv ApplyPendingMaintenanceAction = RDS
         type Rs ApplyPendingMaintenanceAction =
              ApplyPendingMaintenanceActionResponse
-        request = postQuery
+        request = postQuery rDS
         response
           = receiveXMLWrapper
               "ApplyPendingMaintenanceActionResult"
diff --git a/gen/Network/AWS/RDS/AuthorizeDBSecurityGroupIngress.hs b/gen/Network/AWS/RDS/AuthorizeDBSecurityGroupIngress.hs
--- a/gen/Network/AWS/RDS/AuthorizeDBSecurityGroupIngress.hs
+++ b/gen/Network/AWS/RDS/AuthorizeDBSecurityGroupIngress.hs
@@ -129,10 +129,9 @@
 
 instance AWSRequest AuthorizeDBSecurityGroupIngress
          where
-        type Sv AuthorizeDBSecurityGroupIngress = RDS
         type Rs AuthorizeDBSecurityGroupIngress =
              AuthorizeDBSecurityGroupIngressResponse
-        request = postQuery
+        request = postQuery rDS
         response
           = receiveXMLWrapper
               "AuthorizeDBSecurityGroupIngressResult"
diff --git a/gen/Network/AWS/RDS/CopyDBClusterSnapshot.hs b/gen/Network/AWS/RDS/CopyDBClusterSnapshot.hs
--- a/gen/Network/AWS/RDS/CopyDBClusterSnapshot.hs
+++ b/gen/Network/AWS/RDS/CopyDBClusterSnapshot.hs
@@ -108,10 +108,9 @@
 cdbcsTargetDBClusterSnapshotIdentifier = lens _cdbcsTargetDBClusterSnapshotIdentifier (\ s a -> s{_cdbcsTargetDBClusterSnapshotIdentifier = a});
 
 instance AWSRequest CopyDBClusterSnapshot where
-        type Sv CopyDBClusterSnapshot = RDS
         type Rs CopyDBClusterSnapshot =
              CopyDBClusterSnapshotResponse
-        request = postQuery
+        request = postQuery rDS
         response
           = receiveXMLWrapper "CopyDBClusterSnapshotResult"
               (\ s h x ->
diff --git a/gen/Network/AWS/RDS/CopyDBParameterGroup.hs b/gen/Network/AWS/RDS/CopyDBParameterGroup.hs
--- a/gen/Network/AWS/RDS/CopyDBParameterGroup.hs
+++ b/gen/Network/AWS/RDS/CopyDBParameterGroup.hs
@@ -118,10 +118,9 @@
 cdpgTargetDBParameterGroupDescription = lens _cdpgTargetDBParameterGroupDescription (\ s a -> s{_cdpgTargetDBParameterGroupDescription = a});
 
 instance AWSRequest CopyDBParameterGroup where
-        type Sv CopyDBParameterGroup = RDS
         type Rs CopyDBParameterGroup =
              CopyDBParameterGroupResponse
-        request = postQuery
+        request = postQuery rDS
         response
           = receiveXMLWrapper "CopyDBParameterGroupResult"
               (\ s h x ->
diff --git a/gen/Network/AWS/RDS/CopyDBSnapshot.hs b/gen/Network/AWS/RDS/CopyDBSnapshot.hs
--- a/gen/Network/AWS/RDS/CopyDBSnapshot.hs
+++ b/gen/Network/AWS/RDS/CopyDBSnapshot.hs
@@ -120,9 +120,8 @@
 cdsTargetDBSnapshotIdentifier = lens _cdsTargetDBSnapshotIdentifier (\ s a -> s{_cdsTargetDBSnapshotIdentifier = a});
 
 instance AWSRequest CopyDBSnapshot where
-        type Sv CopyDBSnapshot = RDS
         type Rs CopyDBSnapshot = CopyDBSnapshotResponse
-        request = postQuery
+        request = postQuery rDS
         response
           = receiveXMLWrapper "CopyDBSnapshotResult"
               (\ s h x ->
diff --git a/gen/Network/AWS/RDS/CopyOptionGroup.hs b/gen/Network/AWS/RDS/CopyOptionGroup.hs
--- a/gen/Network/AWS/RDS/CopyOptionGroup.hs
+++ b/gen/Network/AWS/RDS/CopyOptionGroup.hs
@@ -118,9 +118,8 @@
 cTargetOptionGroupDescription = lens _cTargetOptionGroupDescription (\ s a -> s{_cTargetOptionGroupDescription = a});
 
 instance AWSRequest CopyOptionGroup where
-        type Sv CopyOptionGroup = RDS
         type Rs CopyOptionGroup = CopyOptionGroupResponse
-        request = postQuery
+        request = postQuery rDS
         response
           = receiveXMLWrapper "CopyOptionGroupResult"
               (\ s h x ->
diff --git a/gen/Network/AWS/RDS/CreateDBCluster.hs b/gen/Network/AWS/RDS/CreateDBCluster.hs
--- a/gen/Network/AWS/RDS/CreateDBCluster.hs
+++ b/gen/Network/AWS/RDS/CreateDBCluster.hs
@@ -294,9 +294,8 @@
 cdcPort = lens _cdcPort (\ s a -> s{_cdcPort = a});
 
 instance AWSRequest CreateDBCluster where
-        type Sv CreateDBCluster = RDS
         type Rs CreateDBCluster = CreateDBClusterResponse
-        request = postQuery
+        request = postQuery rDS
         response
           = receiveXMLWrapper "CreateDBClusterResult"
               (\ s h x ->
diff --git a/gen/Network/AWS/RDS/CreateDBClusterParameterGroup.hs b/gen/Network/AWS/RDS/CreateDBClusterParameterGroup.hs
--- a/gen/Network/AWS/RDS/CreateDBClusterParameterGroup.hs
+++ b/gen/Network/AWS/RDS/CreateDBClusterParameterGroup.hs
@@ -140,10 +140,9 @@
 
 instance AWSRequest CreateDBClusterParameterGroup
          where
-        type Sv CreateDBClusterParameterGroup = RDS
         type Rs CreateDBClusterParameterGroup =
              CreateDBClusterParameterGroupResponse
-        request = postQuery
+        request = postQuery rDS
         response
           = receiveXMLWrapper
               "CreateDBClusterParameterGroupResult"
diff --git a/gen/Network/AWS/RDS/CreateDBClusterSnapshot.hs b/gen/Network/AWS/RDS/CreateDBClusterSnapshot.hs
--- a/gen/Network/AWS/RDS/CreateDBClusterSnapshot.hs
+++ b/gen/Network/AWS/RDS/CreateDBClusterSnapshot.hs
@@ -108,10 +108,9 @@
 cdcsDBClusterIdentifier = lens _cdcsDBClusterIdentifier (\ s a -> s{_cdcsDBClusterIdentifier = a});
 
 instance AWSRequest CreateDBClusterSnapshot where
-        type Sv CreateDBClusterSnapshot = RDS
         type Rs CreateDBClusterSnapshot =
              CreateDBClusterSnapshotResponse
-        request = postQuery
+        request = postQuery rDS
         response
           = receiveXMLWrapper "CreateDBClusterSnapshotResult"
               (\ s h x ->
diff --git a/gen/Network/AWS/RDS/CreateDBInstance.hs b/gen/Network/AWS/RDS/CreateDBInstance.hs
--- a/gen/Network/AWS/RDS/CreateDBInstance.hs
+++ b/gen/Network/AWS/RDS/CreateDBInstance.hs
@@ -870,9 +870,8 @@
 cdiEngine = lens _cdiEngine (\ s a -> s{_cdiEngine = a});
 
 instance AWSRequest CreateDBInstance where
-        type Sv CreateDBInstance = RDS
         type Rs CreateDBInstance = CreateDBInstanceResponse
-        request = postQuery
+        request = postQuery rDS
         response
           = receiveXMLWrapper "CreateDBInstanceResult"
               (\ s h x ->
diff --git a/gen/Network/AWS/RDS/CreateDBInstanceReadReplica.hs b/gen/Network/AWS/RDS/CreateDBInstanceReadReplica.hs
--- a/gen/Network/AWS/RDS/CreateDBInstanceReadReplica.hs
+++ b/gen/Network/AWS/RDS/CreateDBInstanceReadReplica.hs
@@ -263,10 +263,9 @@
 cdirrSourceDBInstanceIdentifier = lens _cdirrSourceDBInstanceIdentifier (\ s a -> s{_cdirrSourceDBInstanceIdentifier = a});
 
 instance AWSRequest CreateDBInstanceReadReplica where
-        type Sv CreateDBInstanceReadReplica = RDS
         type Rs CreateDBInstanceReadReplica =
              CreateDBInstanceReadReplicaResponse
-        request = postQuery
+        request = postQuery rDS
         response
           = receiveXMLWrapper
               "CreateDBInstanceReadReplicaResult"
diff --git a/gen/Network/AWS/RDS/CreateDBParameterGroup.hs b/gen/Network/AWS/RDS/CreateDBParameterGroup.hs
--- a/gen/Network/AWS/RDS/CreateDBParameterGroup.hs
+++ b/gen/Network/AWS/RDS/CreateDBParameterGroup.hs
@@ -130,10 +130,9 @@
 cdbpgDescription = lens _cdbpgDescription (\ s a -> s{_cdbpgDescription = a});
 
 instance AWSRequest CreateDBParameterGroup where
-        type Sv CreateDBParameterGroup = RDS
         type Rs CreateDBParameterGroup =
              CreateDBParameterGroupResponse
-        request = postQuery
+        request = postQuery rDS
         response
           = receiveXMLWrapper "CreateDBParameterGroupResult"
               (\ s h x ->
diff --git a/gen/Network/AWS/RDS/CreateDBSecurityGroup.hs b/gen/Network/AWS/RDS/CreateDBSecurityGroup.hs
--- a/gen/Network/AWS/RDS/CreateDBSecurityGroup.hs
+++ b/gen/Network/AWS/RDS/CreateDBSecurityGroup.hs
@@ -99,10 +99,9 @@
 cdsgDBSecurityGroupDescription = lens _cdsgDBSecurityGroupDescription (\ s a -> s{_cdsgDBSecurityGroupDescription = a});
 
 instance AWSRequest CreateDBSecurityGroup where
-        type Sv CreateDBSecurityGroup = RDS
         type Rs CreateDBSecurityGroup =
              CreateDBSecurityGroupResponse
-        request = postQuery
+        request = postQuery rDS
         response
           = receiveXMLWrapper "CreateDBSecurityGroupResult"
               (\ s h x ->
diff --git a/gen/Network/AWS/RDS/CreateDBSnapshot.hs b/gen/Network/AWS/RDS/CreateDBSnapshot.hs
--- a/gen/Network/AWS/RDS/CreateDBSnapshot.hs
+++ b/gen/Network/AWS/RDS/CreateDBSnapshot.hs
@@ -104,9 +104,8 @@
 cdbsDBInstanceIdentifier = lens _cdbsDBInstanceIdentifier (\ s a -> s{_cdbsDBInstanceIdentifier = a});
 
 instance AWSRequest CreateDBSnapshot where
-        type Sv CreateDBSnapshot = RDS
         type Rs CreateDBSnapshot = CreateDBSnapshotResponse
-        request = postQuery
+        request = postQuery rDS
         response
           = receiveXMLWrapper "CreateDBSnapshotResult"
               (\ s h x ->
diff --git a/gen/Network/AWS/RDS/CreateDBSubnetGroup.hs b/gen/Network/AWS/RDS/CreateDBSubnetGroup.hs
--- a/gen/Network/AWS/RDS/CreateDBSubnetGroup.hs
+++ b/gen/Network/AWS/RDS/CreateDBSubnetGroup.hs
@@ -103,10 +103,9 @@
 cdbsgSubnetIds = lens _cdbsgSubnetIds (\ s a -> s{_cdbsgSubnetIds = a}) . _Coerce;
 
 instance AWSRequest CreateDBSubnetGroup where
-        type Sv CreateDBSubnetGroup = RDS
         type Rs CreateDBSubnetGroup =
              CreateDBSubnetGroupResponse
-        request = postQuery
+        request = postQuery rDS
         response
           = receiveXMLWrapper "CreateDBSubnetGroupResult"
               (\ s h x ->
diff --git a/gen/Network/AWS/RDS/CreateEventSubscription.hs b/gen/Network/AWS/RDS/CreateEventSubscription.hs
--- a/gen/Network/AWS/RDS/CreateEventSubscription.hs
+++ b/gen/Network/AWS/RDS/CreateEventSubscription.hs
@@ -174,10 +174,9 @@
 cesSNSTopicARN = lens _cesSNSTopicARN (\ s a -> s{_cesSNSTopicARN = a});
 
 instance AWSRequest CreateEventSubscription where
-        type Sv CreateEventSubscription = RDS
         type Rs CreateEventSubscription =
              CreateEventSubscriptionResponse
-        request = postQuery
+        request = postQuery rDS
         response
           = receiveXMLWrapper "CreateEventSubscriptionResult"
               (\ s h x ->
diff --git a/gen/Network/AWS/RDS/CreateOptionGroup.hs b/gen/Network/AWS/RDS/CreateOptionGroup.hs
--- a/gen/Network/AWS/RDS/CreateOptionGroup.hs
+++ b/gen/Network/AWS/RDS/CreateOptionGroup.hs
@@ -117,9 +117,8 @@
 cogOptionGroupDescription = lens _cogOptionGroupDescription (\ s a -> s{_cogOptionGroupDescription = a});
 
 instance AWSRequest CreateOptionGroup where
-        type Sv CreateOptionGroup = RDS
         type Rs CreateOptionGroup = CreateOptionGroupResponse
-        request = postQuery
+        request = postQuery rDS
         response
           = receiveXMLWrapper "CreateOptionGroupResult"
               (\ s h x ->
diff --git a/gen/Network/AWS/RDS/DeleteDBCluster.hs b/gen/Network/AWS/RDS/DeleteDBCluster.hs
--- a/gen/Network/AWS/RDS/DeleteDBCluster.hs
+++ b/gen/Network/AWS/RDS/DeleteDBCluster.hs
@@ -118,9 +118,8 @@
 ddbcSkipFinalSnapshot = lens _ddbcSkipFinalSnapshot (\ s a -> s{_ddbcSkipFinalSnapshot = a});
 
 instance AWSRequest DeleteDBCluster where
-        type Sv DeleteDBCluster = RDS
         type Rs DeleteDBCluster = DeleteDBClusterResponse
-        request = postQuery
+        request = postQuery rDS
         response
           = receiveXMLWrapper "DeleteDBClusterResult"
               (\ s h x ->
diff --git a/gen/Network/AWS/RDS/DeleteDBClusterParameterGroup.hs b/gen/Network/AWS/RDS/DeleteDBClusterParameterGroup.hs
--- a/gen/Network/AWS/RDS/DeleteDBClusterParameterGroup.hs
+++ b/gen/Network/AWS/RDS/DeleteDBClusterParameterGroup.hs
@@ -77,10 +77,9 @@
 
 instance AWSRequest DeleteDBClusterParameterGroup
          where
-        type Sv DeleteDBClusterParameterGroup = RDS
         type Rs DeleteDBClusterParameterGroup =
              DeleteDBClusterParameterGroupResponse
-        request = postQuery
+        request = postQuery rDS
         response
           = receiveNull DeleteDBClusterParameterGroupResponse'
 
diff --git a/gen/Network/AWS/RDS/DeleteDBClusterSnapshot.hs b/gen/Network/AWS/RDS/DeleteDBClusterSnapshot.hs
--- a/gen/Network/AWS/RDS/DeleteDBClusterSnapshot.hs
+++ b/gen/Network/AWS/RDS/DeleteDBClusterSnapshot.hs
@@ -78,10 +78,9 @@
 ddcsDBClusterSnapshotIdentifier = lens _ddcsDBClusterSnapshotIdentifier (\ s a -> s{_ddcsDBClusterSnapshotIdentifier = a});
 
 instance AWSRequest DeleteDBClusterSnapshot where
-        type Sv DeleteDBClusterSnapshot = RDS
         type Rs DeleteDBClusterSnapshot =
              DeleteDBClusterSnapshotResponse
-        request = postQuery
+        request = postQuery rDS
         response
           = receiveXMLWrapper "DeleteDBClusterSnapshotResult"
               (\ s h x ->
diff --git a/gen/Network/AWS/RDS/DeleteDBInstance.hs b/gen/Network/AWS/RDS/DeleteDBInstance.hs
--- a/gen/Network/AWS/RDS/DeleteDBInstance.hs
+++ b/gen/Network/AWS/RDS/DeleteDBInstance.hs
@@ -133,9 +133,8 @@
 ddiDBInstanceIdentifier = lens _ddiDBInstanceIdentifier (\ s a -> s{_ddiDBInstanceIdentifier = a});
 
 instance AWSRequest DeleteDBInstance where
-        type Sv DeleteDBInstance = RDS
         type Rs DeleteDBInstance = DeleteDBInstanceResponse
-        request = postQuery
+        request = postQuery rDS
         response
           = receiveXMLWrapper "DeleteDBInstanceResult"
               (\ s h x ->
diff --git a/gen/Network/AWS/RDS/DeleteDBParameterGroup.hs b/gen/Network/AWS/RDS/DeleteDBParameterGroup.hs
--- a/gen/Network/AWS/RDS/DeleteDBParameterGroup.hs
+++ b/gen/Network/AWS/RDS/DeleteDBParameterGroup.hs
@@ -72,10 +72,9 @@
 ddbpgDBParameterGroupName = lens _ddbpgDBParameterGroupName (\ s a -> s{_ddbpgDBParameterGroupName = a});
 
 instance AWSRequest DeleteDBParameterGroup where
-        type Sv DeleteDBParameterGroup = RDS
         type Rs DeleteDBParameterGroup =
              DeleteDBParameterGroupResponse
-        request = postQuery
+        request = postQuery rDS
         response
           = receiveNull DeleteDBParameterGroupResponse'
 
diff --git a/gen/Network/AWS/RDS/DeleteDBSecurityGroup.hs b/gen/Network/AWS/RDS/DeleteDBSecurityGroup.hs
--- a/gen/Network/AWS/RDS/DeleteDBSecurityGroup.hs
+++ b/gen/Network/AWS/RDS/DeleteDBSecurityGroup.hs
@@ -78,10 +78,9 @@
 ddsgDBSecurityGroupName = lens _ddsgDBSecurityGroupName (\ s a -> s{_ddsgDBSecurityGroupName = a});
 
 instance AWSRequest DeleteDBSecurityGroup where
-        type Sv DeleteDBSecurityGroup = RDS
         type Rs DeleteDBSecurityGroup =
              DeleteDBSecurityGroupResponse
-        request = postQuery
+        request = postQuery rDS
         response = receiveNull DeleteDBSecurityGroupResponse'
 
 instance ToHeaders DeleteDBSecurityGroup where
diff --git a/gen/Network/AWS/RDS/DeleteDBSnapshot.hs b/gen/Network/AWS/RDS/DeleteDBSnapshot.hs
--- a/gen/Network/AWS/RDS/DeleteDBSnapshot.hs
+++ b/gen/Network/AWS/RDS/DeleteDBSnapshot.hs
@@ -74,9 +74,8 @@
 ddbsDBSnapshotIdentifier = lens _ddbsDBSnapshotIdentifier (\ s a -> s{_ddbsDBSnapshotIdentifier = a});
 
 instance AWSRequest DeleteDBSnapshot where
-        type Sv DeleteDBSnapshot = RDS
         type Rs DeleteDBSnapshot = DeleteDBSnapshotResponse
-        request = postQuery
+        request = postQuery rDS
         response
           = receiveXMLWrapper "DeleteDBSnapshotResult"
               (\ s h x ->
diff --git a/gen/Network/AWS/RDS/DeleteDBSubnetGroup.hs b/gen/Network/AWS/RDS/DeleteDBSubnetGroup.hs
--- a/gen/Network/AWS/RDS/DeleteDBSubnetGroup.hs
+++ b/gen/Network/AWS/RDS/DeleteDBSubnetGroup.hs
@@ -76,10 +76,9 @@
 ddbsgDBSubnetGroupName = lens _ddbsgDBSubnetGroupName (\ s a -> s{_ddbsgDBSubnetGroupName = a});
 
 instance AWSRequest DeleteDBSubnetGroup where
-        type Sv DeleteDBSubnetGroup = RDS
         type Rs DeleteDBSubnetGroup =
              DeleteDBSubnetGroupResponse
-        request = postQuery
+        request = postQuery rDS
         response = receiveNull DeleteDBSubnetGroupResponse'
 
 instance ToHeaders DeleteDBSubnetGroup where
diff --git a/gen/Network/AWS/RDS/DeleteEventSubscription.hs b/gen/Network/AWS/RDS/DeleteEventSubscription.hs
--- a/gen/Network/AWS/RDS/DeleteEventSubscription.hs
+++ b/gen/Network/AWS/RDS/DeleteEventSubscription.hs
@@ -68,10 +68,9 @@
 desSubscriptionName = lens _desSubscriptionName (\ s a -> s{_desSubscriptionName = a});
 
 instance AWSRequest DeleteEventSubscription where
-        type Sv DeleteEventSubscription = RDS
         type Rs DeleteEventSubscription =
              DeleteEventSubscriptionResponse
-        request = postQuery
+        request = postQuery rDS
         response
           = receiveXMLWrapper "DeleteEventSubscriptionResult"
               (\ s h x ->
diff --git a/gen/Network/AWS/RDS/DeleteOptionGroup.hs b/gen/Network/AWS/RDS/DeleteOptionGroup.hs
--- a/gen/Network/AWS/RDS/DeleteOptionGroup.hs
+++ b/gen/Network/AWS/RDS/DeleteOptionGroup.hs
@@ -67,9 +67,8 @@
 dOptionGroupName = lens _dOptionGroupName (\ s a -> s{_dOptionGroupName = a});
 
 instance AWSRequest DeleteOptionGroup where
-        type Sv DeleteOptionGroup = RDS
         type Rs DeleteOptionGroup = DeleteOptionGroupResponse
-        request = postQuery
+        request = postQuery rDS
         response = receiveNull DeleteOptionGroupResponse'
 
 instance ToHeaders DeleteOptionGroup where
diff --git a/gen/Network/AWS/RDS/DescribeAccountAttributes.hs b/gen/Network/AWS/RDS/DescribeAccountAttributes.hs
--- a/gen/Network/AWS/RDS/DescribeAccountAttributes.hs
+++ b/gen/Network/AWS/RDS/DescribeAccountAttributes.hs
@@ -60,10 +60,9 @@
 describeAccountAttributes = DescribeAccountAttributes'
 
 instance AWSRequest DescribeAccountAttributes where
-        type Sv DescribeAccountAttributes = RDS
         type Rs DescribeAccountAttributes =
              DescribeAccountAttributesResponse
-        request = postQuery
+        request = postQuery rDS
         response
           = receiveXMLWrapper "DescribeAccountAttributesResult"
               (\ s h x ->
diff --git a/gen/Network/AWS/RDS/DescribeCertificates.hs b/gen/Network/AWS/RDS/DescribeCertificates.hs
--- a/gen/Network/AWS/RDS/DescribeCertificates.hs
+++ b/gen/Network/AWS/RDS/DescribeCertificates.hs
@@ -113,10 +113,9 @@
 dcMarker = lens _dcMarker (\ s a -> s{_dcMarker = a});
 
 instance AWSRequest DescribeCertificates where
-        type Sv DescribeCertificates = RDS
         type Rs DescribeCertificates =
              DescribeCertificatesResponse
-        request = postQuery
+        request = postQuery rDS
         response
           = receiveXMLWrapper "DescribeCertificatesResult"
               (\ s h x ->
diff --git a/gen/Network/AWS/RDS/DescribeDBClusterParameterGroups.hs b/gen/Network/AWS/RDS/DescribeDBClusterParameterGroups.hs
--- a/gen/Network/AWS/RDS/DescribeDBClusterParameterGroups.hs
+++ b/gen/Network/AWS/RDS/DescribeDBClusterParameterGroups.hs
@@ -119,10 +119,9 @@
 
 instance AWSRequest DescribeDBClusterParameterGroups
          where
-        type Sv DescribeDBClusterParameterGroups = RDS
         type Rs DescribeDBClusterParameterGroups =
              DescribeDBClusterParameterGroupsResponse
-        request = postQuery
+        request = postQuery rDS
         response
           = receiveXMLWrapper
               "DescribeDBClusterParameterGroupsResult"
diff --git a/gen/Network/AWS/RDS/DescribeDBClusterParameters.hs b/gen/Network/AWS/RDS/DescribeDBClusterParameters.hs
--- a/gen/Network/AWS/RDS/DescribeDBClusterParameters.hs
+++ b/gen/Network/AWS/RDS/DescribeDBClusterParameters.hs
@@ -128,10 +128,9 @@
 ddcpDBClusterParameterGroupName = lens _ddcpDBClusterParameterGroupName (\ s a -> s{_ddcpDBClusterParameterGroupName = a});
 
 instance AWSRequest DescribeDBClusterParameters where
-        type Sv DescribeDBClusterParameters = RDS
         type Rs DescribeDBClusterParameters =
              DescribeDBClusterParametersResponse
-        request = postQuery
+        request = postQuery rDS
         response
           = receiveXMLWrapper
               "DescribeDBClusterParametersResult"
diff --git a/gen/Network/AWS/RDS/DescribeDBClusterSnapshots.hs b/gen/Network/AWS/RDS/DescribeDBClusterSnapshots.hs
--- a/gen/Network/AWS/RDS/DescribeDBClusterSnapshots.hs
+++ b/gen/Network/AWS/RDS/DescribeDBClusterSnapshots.hs
@@ -149,10 +149,9 @@
 ddbcsMarker = lens _ddbcsMarker (\ s a -> s{_ddbcsMarker = a});
 
 instance AWSRequest DescribeDBClusterSnapshots where
-        type Sv DescribeDBClusterSnapshots = RDS
         type Rs DescribeDBClusterSnapshots =
              DescribeDBClusterSnapshotsResponse
-        request = postQuery
+        request = postQuery rDS
         response
           = receiveXMLWrapper
               "DescribeDBClusterSnapshotsResult"
diff --git a/gen/Network/AWS/RDS/DescribeDBClusters.hs b/gen/Network/AWS/RDS/DescribeDBClusters.hs
--- a/gen/Network/AWS/RDS/DescribeDBClusters.hs
+++ b/gen/Network/AWS/RDS/DescribeDBClusters.hs
@@ -117,10 +117,9 @@
 ddcMarker = lens _ddcMarker (\ s a -> s{_ddcMarker = a});
 
 instance AWSRequest DescribeDBClusters where
-        type Sv DescribeDBClusters = RDS
         type Rs DescribeDBClusters =
              DescribeDBClustersResponse
-        request = postQuery
+        request = postQuery rDS
         response
           = receiveXMLWrapper "DescribeDBClustersResult"
               (\ s h x ->
diff --git a/gen/Network/AWS/RDS/DescribeDBEngineVersions.hs b/gen/Network/AWS/RDS/DescribeDBEngineVersions.hs
--- a/gen/Network/AWS/RDS/DescribeDBEngineVersions.hs
+++ b/gen/Network/AWS/RDS/DescribeDBEngineVersions.hs
@@ -159,10 +159,9 @@
             Just $ rq & ddevMarker .~ rs ^. ddevrsMarker
 
 instance AWSRequest DescribeDBEngineVersions where
-        type Sv DescribeDBEngineVersions = RDS
         type Rs DescribeDBEngineVersions =
              DescribeDBEngineVersionsResponse
-        request = postQuery
+        request = postQuery rDS
         response
           = receiveXMLWrapper "DescribeDBEngineVersionsResult"
               (\ s h x ->
diff --git a/gen/Network/AWS/RDS/DescribeDBInstances.hs b/gen/Network/AWS/RDS/DescribeDBInstances.hs
--- a/gen/Network/AWS/RDS/DescribeDBInstances.hs
+++ b/gen/Network/AWS/RDS/DescribeDBInstances.hs
@@ -124,10 +124,9 @@
             Just $ rq & ddbiMarker .~ rs ^. ddbirsMarker
 
 instance AWSRequest DescribeDBInstances where
-        type Sv DescribeDBInstances = RDS
         type Rs DescribeDBInstances =
              DescribeDBInstancesResponse
-        request = postQuery
+        request = postQuery rDS
         response
           = receiveXMLWrapper "DescribeDBInstancesResult"
               (\ s h x ->
diff --git a/gen/Network/AWS/RDS/DescribeDBLogFiles.hs b/gen/Network/AWS/RDS/DescribeDBLogFiles.hs
--- a/gen/Network/AWS/RDS/DescribeDBLogFiles.hs
+++ b/gen/Network/AWS/RDS/DescribeDBLogFiles.hs
@@ -148,10 +148,9 @@
             Just $ rq & ddlfMarker .~ rs ^. ddlfrsMarker
 
 instance AWSRequest DescribeDBLogFiles where
-        type Sv DescribeDBLogFiles = RDS
         type Rs DescribeDBLogFiles =
              DescribeDBLogFilesResponse
-        request = postQuery
+        request = postQuery rDS
         response
           = receiveXMLWrapper "DescribeDBLogFilesResult"
               (\ s h x ->
diff --git a/gen/Network/AWS/RDS/DescribeDBParameterGroups.hs b/gen/Network/AWS/RDS/DescribeDBParameterGroups.hs
--- a/gen/Network/AWS/RDS/DescribeDBParameterGroups.hs
+++ b/gen/Network/AWS/RDS/DescribeDBParameterGroups.hs
@@ -123,10 +123,9 @@
             Just $ rq & ddpgMarker .~ rs ^. ddpgrsMarker
 
 instance AWSRequest DescribeDBParameterGroups where
-        type Sv DescribeDBParameterGroups = RDS
         type Rs DescribeDBParameterGroups =
              DescribeDBParameterGroupsResponse
-        request = postQuery
+        request = postQuery rDS
         response
           = receiveXMLWrapper "DescribeDBParameterGroupsResult"
               (\ s h x ->
diff --git a/gen/Network/AWS/RDS/DescribeDBParameters.hs b/gen/Network/AWS/RDS/DescribeDBParameters.hs
--- a/gen/Network/AWS/RDS/DescribeDBParameters.hs
+++ b/gen/Network/AWS/RDS/DescribeDBParameters.hs
@@ -133,10 +133,9 @@
             Just $ rq & ddpMarker .~ rs ^. ddprsMarker
 
 instance AWSRequest DescribeDBParameters where
-        type Sv DescribeDBParameters = RDS
         type Rs DescribeDBParameters =
              DescribeDBParametersResponse
-        request = postQuery
+        request = postQuery rDS
         response
           = receiveXMLWrapper "DescribeDBParametersResult"
               (\ s h x ->
diff --git a/gen/Network/AWS/RDS/DescribeDBSecurityGroups.hs b/gen/Network/AWS/RDS/DescribeDBSecurityGroups.hs
--- a/gen/Network/AWS/RDS/DescribeDBSecurityGroups.hs
+++ b/gen/Network/AWS/RDS/DescribeDBSecurityGroups.hs
@@ -117,10 +117,9 @@
             Just $ rq & ddbsgMarker .~ rs ^. ddbsgrsMarker
 
 instance AWSRequest DescribeDBSecurityGroups where
-        type Sv DescribeDBSecurityGroups = RDS
         type Rs DescribeDBSecurityGroups =
              DescribeDBSecurityGroupsResponse
-        request = postQuery
+        request = postQuery rDS
         response
           = receiveXMLWrapper "DescribeDBSecurityGroupsResult"
               (\ s h x ->
diff --git a/gen/Network/AWS/RDS/DescribeDBSnapshots.hs b/gen/Network/AWS/RDS/DescribeDBSnapshots.hs
--- a/gen/Network/AWS/RDS/DescribeDBSnapshots.hs
+++ b/gen/Network/AWS/RDS/DescribeDBSnapshots.hs
@@ -153,10 +153,9 @@
             Just $ rq & ddsMarker .~ rs ^. ddsrsMarker
 
 instance AWSRequest DescribeDBSnapshots where
-        type Sv DescribeDBSnapshots = RDS
         type Rs DescribeDBSnapshots =
              DescribeDBSnapshotsResponse
-        request = postQuery
+        request = postQuery rDS
         response
           = receiveXMLWrapper "DescribeDBSnapshotsResult"
               (\ s h x ->
diff --git a/gen/Network/AWS/RDS/DescribeDBSubnetGroups.hs b/gen/Network/AWS/RDS/DescribeDBSubnetGroups.hs
--- a/gen/Network/AWS/RDS/DescribeDBSubnetGroups.hs
+++ b/gen/Network/AWS/RDS/DescribeDBSubnetGroups.hs
@@ -120,10 +120,9 @@
             Just $ rq & ddsgMarker .~ rs ^. ddsgrsMarker
 
 instance AWSRequest DescribeDBSubnetGroups where
-        type Sv DescribeDBSubnetGroups = RDS
         type Rs DescribeDBSubnetGroups =
              DescribeDBSubnetGroupsResponse
-        request = postQuery
+        request = postQuery rDS
         response
           = receiveXMLWrapper "DescribeDBSubnetGroupsResult"
               (\ s h x ->
diff --git a/gen/Network/AWS/RDS/DescribeEngineDefaultClusterParameters.hs b/gen/Network/AWS/RDS/DescribeEngineDefaultClusterParameters.hs
--- a/gen/Network/AWS/RDS/DescribeEngineDefaultClusterParameters.hs
+++ b/gen/Network/AWS/RDS/DescribeEngineDefaultClusterParameters.hs
@@ -112,10 +112,9 @@
 
 instance AWSRequest
          DescribeEngineDefaultClusterParameters where
-        type Sv DescribeEngineDefaultClusterParameters = RDS
         type Rs DescribeEngineDefaultClusterParameters =
              DescribeEngineDefaultClusterParametersResponse
-        request = postQuery
+        request = postQuery rDS
         response
           = receiveXMLWrapper
               "DescribeEngineDefaultClusterParametersResult"
diff --git a/gen/Network/AWS/RDS/DescribeEngineDefaultParameters.hs b/gen/Network/AWS/RDS/DescribeEngineDefaultParameters.hs
--- a/gen/Network/AWS/RDS/DescribeEngineDefaultParameters.hs
+++ b/gen/Network/AWS/RDS/DescribeEngineDefaultParameters.hs
@@ -123,10 +123,9 @@
 
 instance AWSRequest DescribeEngineDefaultParameters
          where
-        type Sv DescribeEngineDefaultParameters = RDS
         type Rs DescribeEngineDefaultParameters =
              DescribeEngineDefaultParametersResponse
-        request = postQuery
+        request = postQuery rDS
         response
           = receiveXMLWrapper
               "DescribeEngineDefaultParametersResult"
diff --git a/gen/Network/AWS/RDS/DescribeEventCategories.hs b/gen/Network/AWS/RDS/DescribeEventCategories.hs
--- a/gen/Network/AWS/RDS/DescribeEventCategories.hs
+++ b/gen/Network/AWS/RDS/DescribeEventCategories.hs
@@ -83,10 +83,9 @@
 decFilters = lens _decFilters (\ s a -> s{_decFilters = a}) . _Default . _Coerce;
 
 instance AWSRequest DescribeEventCategories where
-        type Sv DescribeEventCategories = RDS
         type Rs DescribeEventCategories =
              DescribeEventCategoriesResponse
-        request = postQuery
+        request = postQuery rDS
         response
           = receiveXMLWrapper "DescribeEventCategoriesResult"
               (\ s h x ->
diff --git a/gen/Network/AWS/RDS/DescribeEventSubscriptions.hs b/gen/Network/AWS/RDS/DescribeEventSubscriptions.hs
--- a/gen/Network/AWS/RDS/DescribeEventSubscriptions.hs
+++ b/gen/Network/AWS/RDS/DescribeEventSubscriptions.hs
@@ -121,10 +121,9 @@
             Just $ rq & dMarker .~ rs ^. desrsMarker
 
 instance AWSRequest DescribeEventSubscriptions where
-        type Sv DescribeEventSubscriptions = RDS
         type Rs DescribeEventSubscriptions =
              DescribeEventSubscriptionsResponse
-        request = postQuery
+        request = postQuery rDS
         response
           = receiveXMLWrapper
               "DescribeEventSubscriptionsResult"
diff --git a/gen/Network/AWS/RDS/DescribeEvents.hs b/gen/Network/AWS/RDS/DescribeEvents.hs
--- a/gen/Network/AWS/RDS/DescribeEvents.hs
+++ b/gen/Network/AWS/RDS/DescribeEvents.hs
@@ -189,9 +189,8 @@
             Just $ rq & deMarker .~ rs ^. dersMarker
 
 instance AWSRequest DescribeEvents where
-        type Sv DescribeEvents = RDS
         type Rs DescribeEvents = DescribeEventsResponse
-        request = postQuery
+        request = postQuery rDS
         response
           = receiveXMLWrapper "DescribeEventsResult"
               (\ s h x ->
diff --git a/gen/Network/AWS/RDS/DescribeOptionGroupOptions.hs b/gen/Network/AWS/RDS/DescribeOptionGroupOptions.hs
--- a/gen/Network/AWS/RDS/DescribeOptionGroupOptions.hs
+++ b/gen/Network/AWS/RDS/DescribeOptionGroupOptions.hs
@@ -126,10 +126,9 @@
             Just $ rq & dogoMarker .~ rs ^. dogorsMarker
 
 instance AWSRequest DescribeOptionGroupOptions where
-        type Sv DescribeOptionGroupOptions = RDS
         type Rs DescribeOptionGroupOptions =
              DescribeOptionGroupOptionsResponse
-        request = postQuery
+        request = postQuery rDS
         response
           = receiveXMLWrapper
               "DescribeOptionGroupOptionsResult"
diff --git a/gen/Network/AWS/RDS/DescribeOptionGroups.hs b/gen/Network/AWS/RDS/DescribeOptionGroups.hs
--- a/gen/Network/AWS/RDS/DescribeOptionGroups.hs
+++ b/gen/Network/AWS/RDS/DescribeOptionGroups.hs
@@ -136,10 +136,9 @@
             Just $ rq & dogMarker .~ rs ^. dogrsMarker
 
 instance AWSRequest DescribeOptionGroups where
-        type Sv DescribeOptionGroups = RDS
         type Rs DescribeOptionGroups =
              DescribeOptionGroupsResponse
-        request = postQuery
+        request = postQuery rDS
         response
           = receiveXMLWrapper "DescribeOptionGroupsResult"
               (\ s h x ->
diff --git a/gen/Network/AWS/RDS/DescribeOrderableDBInstanceOptions.hs b/gen/Network/AWS/RDS/DescribeOrderableDBInstanceOptions.hs
--- a/gen/Network/AWS/RDS/DescribeOrderableDBInstanceOptions.hs
+++ b/gen/Network/AWS/RDS/DescribeOrderableDBInstanceOptions.hs
@@ -160,10 +160,9 @@
 
 instance AWSRequest
          DescribeOrderableDBInstanceOptions where
-        type Sv DescribeOrderableDBInstanceOptions = RDS
         type Rs DescribeOrderableDBInstanceOptions =
              DescribeOrderableDBInstanceOptionsResponse
-        request = postQuery
+        request = postQuery rDS
         response
           = receiveXMLWrapper
               "DescribeOrderableDBInstanceOptionsResult"
diff --git a/gen/Network/AWS/RDS/DescribePendingMaintenanceActions.hs b/gen/Network/AWS/RDS/DescribePendingMaintenanceActions.hs
--- a/gen/Network/AWS/RDS/DescribePendingMaintenanceActions.hs
+++ b/gen/Network/AWS/RDS/DescribePendingMaintenanceActions.hs
@@ -115,10 +115,9 @@
 
 instance AWSRequest DescribePendingMaintenanceActions
          where
-        type Sv DescribePendingMaintenanceActions = RDS
         type Rs DescribePendingMaintenanceActions =
              DescribePendingMaintenanceActionsResponse
-        request = postQuery
+        request = postQuery rDS
         response
           = receiveXMLWrapper
               "DescribePendingMaintenanceActionsResult"
diff --git a/gen/Network/AWS/RDS/DescribeReservedDBInstances.hs b/gen/Network/AWS/RDS/DescribeReservedDBInstances.hs
--- a/gen/Network/AWS/RDS/DescribeReservedDBInstances.hs
+++ b/gen/Network/AWS/RDS/DescribeReservedDBInstances.hs
@@ -180,10 +180,9 @@
             Just $ rq & drdiMarker .~ rs ^. drdirsMarker
 
 instance AWSRequest DescribeReservedDBInstances where
-        type Sv DescribeReservedDBInstances = RDS
         type Rs DescribeReservedDBInstances =
              DescribeReservedDBInstancesResponse
-        request = postQuery
+        request = postQuery rDS
         response
           = receiveXMLWrapper
               "DescribeReservedDBInstancesResult"
diff --git a/gen/Network/AWS/RDS/DescribeReservedDBInstancesOfferings.hs b/gen/Network/AWS/RDS/DescribeReservedDBInstancesOfferings.hs
--- a/gen/Network/AWS/RDS/DescribeReservedDBInstancesOfferings.hs
+++ b/gen/Network/AWS/RDS/DescribeReservedDBInstancesOfferings.hs
@@ -175,10 +175,9 @@
 
 instance AWSRequest
          DescribeReservedDBInstancesOfferings where
-        type Sv DescribeReservedDBInstancesOfferings = RDS
         type Rs DescribeReservedDBInstancesOfferings =
              DescribeReservedDBInstancesOfferingsResponse
-        request = postQuery
+        request = postQuery rDS
         response
           = receiveXMLWrapper
               "DescribeReservedDBInstancesOfferingsResult"
diff --git a/gen/Network/AWS/RDS/DownloadDBLogFilePortion.hs b/gen/Network/AWS/RDS/DownloadDBLogFilePortion.hs
--- a/gen/Network/AWS/RDS/DownloadDBLogFilePortion.hs
+++ b/gen/Network/AWS/RDS/DownloadDBLogFilePortion.hs
@@ -141,10 +141,9 @@
             Just $ rq & ddlfpMarker .~ rs ^. ddlfprsMarker
 
 instance AWSRequest DownloadDBLogFilePortion where
-        type Sv DownloadDBLogFilePortion = RDS
         type Rs DownloadDBLogFilePortion =
              DownloadDBLogFilePortionResponse
-        request = postQuery
+        request = postQuery rDS
         response
           = receiveXMLWrapper "DownloadDBLogFilePortionResult"
               (\ s h x ->
diff --git a/gen/Network/AWS/RDS/FailoverDBCluster.hs b/gen/Network/AWS/RDS/FailoverDBCluster.hs
--- a/gen/Network/AWS/RDS/FailoverDBCluster.hs
+++ b/gen/Network/AWS/RDS/FailoverDBCluster.hs
@@ -89,9 +89,8 @@
 fdcDBClusterIdentifier = lens _fdcDBClusterIdentifier (\ s a -> s{_fdcDBClusterIdentifier = a});
 
 instance AWSRequest FailoverDBCluster where
-        type Sv FailoverDBCluster = RDS
         type Rs FailoverDBCluster = FailoverDBClusterResponse
-        request = postQuery
+        request = postQuery rDS
         response
           = receiveXMLWrapper "FailoverDBClusterResult"
               (\ s h x ->
diff --git a/gen/Network/AWS/RDS/ListTagsForResource.hs b/gen/Network/AWS/RDS/ListTagsForResource.hs
--- a/gen/Network/AWS/RDS/ListTagsForResource.hs
+++ b/gen/Network/AWS/RDS/ListTagsForResource.hs
@@ -82,10 +82,9 @@
 ltfrResourceName = lens _ltfrResourceName (\ s a -> s{_ltfrResourceName = a});
 
 instance AWSRequest ListTagsForResource where
-        type Sv ListTagsForResource = RDS
         type Rs ListTagsForResource =
              ListTagsForResourceResponse
-        request = postQuery
+        request = postQuery rDS
         response
           = receiveXMLWrapper "ListTagsForResourceResult"
               (\ s h x ->
diff --git a/gen/Network/AWS/RDS/ModifyDBCluster.hs b/gen/Network/AWS/RDS/ModifyDBCluster.hs
--- a/gen/Network/AWS/RDS/ModifyDBCluster.hs
+++ b/gen/Network/AWS/RDS/ModifyDBCluster.hs
@@ -240,9 +240,8 @@
 mdcPort = lens _mdcPort (\ s a -> s{_mdcPort = a});
 
 instance AWSRequest ModifyDBCluster where
-        type Sv ModifyDBCluster = RDS
         type Rs ModifyDBCluster = ModifyDBClusterResponse
-        request = postQuery
+        request = postQuery rDS
         response
           = receiveXMLWrapper "ModifyDBClusterResult"
               (\ s h x ->
diff --git a/gen/Network/AWS/RDS/ModifyDBClusterParameterGroup.hs b/gen/Network/AWS/RDS/ModifyDBClusterParameterGroup.hs
--- a/gen/Network/AWS/RDS/ModifyDBClusterParameterGroup.hs
+++ b/gen/Network/AWS/RDS/ModifyDBClusterParameterGroup.hs
@@ -101,10 +101,9 @@
 
 instance AWSRequest ModifyDBClusterParameterGroup
          where
-        type Sv ModifyDBClusterParameterGroup = RDS
         type Rs ModifyDBClusterParameterGroup =
              DBClusterParameterGroupNameMessage
-        request = postQuery
+        request = postQuery rDS
         response
           = receiveXMLWrapper
               "ModifyDBClusterParameterGroupResult"
diff --git a/gen/Network/AWS/RDS/ModifyDBInstance.hs b/gen/Network/AWS/RDS/ModifyDBInstance.hs
--- a/gen/Network/AWS/RDS/ModifyDBInstance.hs
+++ b/gen/Network/AWS/RDS/ModifyDBInstance.hs
@@ -557,9 +557,8 @@
 mdiDBInstanceIdentifier = lens _mdiDBInstanceIdentifier (\ s a -> s{_mdiDBInstanceIdentifier = a});
 
 instance AWSRequest ModifyDBInstance where
-        type Sv ModifyDBInstance = RDS
         type Rs ModifyDBInstance = ModifyDBInstanceResponse
-        request = postQuery
+        request = postQuery rDS
         response
           = receiveXMLWrapper "ModifyDBInstanceResult"
               (\ s h x ->
diff --git a/gen/Network/AWS/RDS/ModifyDBParameterGroup.hs b/gen/Network/AWS/RDS/ModifyDBParameterGroup.hs
--- a/gen/Network/AWS/RDS/ModifyDBParameterGroup.hs
+++ b/gen/Network/AWS/RDS/ModifyDBParameterGroup.hs
@@ -112,10 +112,9 @@
 mdpgParameters = lens _mdpgParameters (\ s a -> s{_mdpgParameters = a}) . _Coerce;
 
 instance AWSRequest ModifyDBParameterGroup where
-        type Sv ModifyDBParameterGroup = RDS
         type Rs ModifyDBParameterGroup =
              DBParameterGroupNameMessage
-        request = postQuery
+        request = postQuery rDS
         response
           = receiveXMLWrapper "ModifyDBParameterGroupResult"
               (\ s h x -> parseXML x)
diff --git a/gen/Network/AWS/RDS/ModifyDBSubnetGroup.hs b/gen/Network/AWS/RDS/ModifyDBSubnetGroup.hs
--- a/gen/Network/AWS/RDS/ModifyDBSubnetGroup.hs
+++ b/gen/Network/AWS/RDS/ModifyDBSubnetGroup.hs
@@ -93,10 +93,9 @@
 mdsgSubnetIds = lens _mdsgSubnetIds (\ s a -> s{_mdsgSubnetIds = a}) . _Coerce;
 
 instance AWSRequest ModifyDBSubnetGroup where
-        type Sv ModifyDBSubnetGroup = RDS
         type Rs ModifyDBSubnetGroup =
              ModifyDBSubnetGroupResponse
-        request = postQuery
+        request = postQuery rDS
         response
           = receiveXMLWrapper "ModifyDBSubnetGroupResult"
               (\ s h x ->
diff --git a/gen/Network/AWS/RDS/ModifyEventSubscription.hs b/gen/Network/AWS/RDS/ModifyEventSubscription.hs
--- a/gen/Network/AWS/RDS/ModifyEventSubscription.hs
+++ b/gen/Network/AWS/RDS/ModifyEventSubscription.hs
@@ -125,10 +125,9 @@
 mesSubscriptionName = lens _mesSubscriptionName (\ s a -> s{_mesSubscriptionName = a});
 
 instance AWSRequest ModifyEventSubscription where
-        type Sv ModifyEventSubscription = RDS
         type Rs ModifyEventSubscription =
              ModifyEventSubscriptionResponse
-        request = postQuery
+        request = postQuery rDS
         response
           = receiveXMLWrapper "ModifyEventSubscriptionResult"
               (\ s h x ->
diff --git a/gen/Network/AWS/RDS/ModifyOptionGroup.hs b/gen/Network/AWS/RDS/ModifyOptionGroup.hs
--- a/gen/Network/AWS/RDS/ModifyOptionGroup.hs
+++ b/gen/Network/AWS/RDS/ModifyOptionGroup.hs
@@ -104,9 +104,8 @@
 mogOptionGroupName = lens _mogOptionGroupName (\ s a -> s{_mogOptionGroupName = a});
 
 instance AWSRequest ModifyOptionGroup where
-        type Sv ModifyOptionGroup = RDS
         type Rs ModifyOptionGroup = ModifyOptionGroupResponse
-        request = postQuery
+        request = postQuery rDS
         response
           = receiveXMLWrapper "ModifyOptionGroupResult"
               (\ s h x ->
diff --git a/gen/Network/AWS/RDS/PromoteReadReplica.hs b/gen/Network/AWS/RDS/PromoteReadReplica.hs
--- a/gen/Network/AWS/RDS/PromoteReadReplica.hs
+++ b/gen/Network/AWS/RDS/PromoteReadReplica.hs
@@ -122,10 +122,9 @@
 prrDBInstanceIdentifier = lens _prrDBInstanceIdentifier (\ s a -> s{_prrDBInstanceIdentifier = a});
 
 instance AWSRequest PromoteReadReplica where
-        type Sv PromoteReadReplica = RDS
         type Rs PromoteReadReplica =
              PromoteReadReplicaResponse
-        request = postQuery
+        request = postQuery rDS
         response
           = receiveXMLWrapper "PromoteReadReplicaResult"
               (\ s h x ->
diff --git a/gen/Network/AWS/RDS/PurchaseReservedDBInstancesOffering.hs b/gen/Network/AWS/RDS/PurchaseReservedDBInstancesOffering.hs
--- a/gen/Network/AWS/RDS/PurchaseReservedDBInstancesOffering.hs
+++ b/gen/Network/AWS/RDS/PurchaseReservedDBInstancesOffering.hs
@@ -102,10 +102,9 @@
 
 instance AWSRequest
          PurchaseReservedDBInstancesOffering where
-        type Sv PurchaseReservedDBInstancesOffering = RDS
         type Rs PurchaseReservedDBInstancesOffering =
              PurchaseReservedDBInstancesOfferingResponse
-        request = postQuery
+        request = postQuery rDS
         response
           = receiveXMLWrapper
               "PurchaseReservedDBInstancesOfferingResult"
diff --git a/gen/Network/AWS/RDS/RebootDBInstance.hs b/gen/Network/AWS/RDS/RebootDBInstance.hs
--- a/gen/Network/AWS/RDS/RebootDBInstance.hs
+++ b/gen/Network/AWS/RDS/RebootDBInstance.hs
@@ -104,9 +104,8 @@
 rdiDBInstanceIdentifier = lens _rdiDBInstanceIdentifier (\ s a -> s{_rdiDBInstanceIdentifier = a});
 
 instance AWSRequest RebootDBInstance where
-        type Sv RebootDBInstance = RDS
         type Rs RebootDBInstance = RebootDBInstanceResponse
-        request = postQuery
+        request = postQuery rDS
         response
           = receiveXMLWrapper "RebootDBInstanceResult"
               (\ s h x ->
diff --git a/gen/Network/AWS/RDS/RemoveSourceIdentifierFromSubscription.hs b/gen/Network/AWS/RDS/RemoveSourceIdentifierFromSubscription.hs
--- a/gen/Network/AWS/RDS/RemoveSourceIdentifierFromSubscription.hs
+++ b/gen/Network/AWS/RDS/RemoveSourceIdentifierFromSubscription.hs
@@ -83,10 +83,9 @@
 
 instance AWSRequest
          RemoveSourceIdentifierFromSubscription where
-        type Sv RemoveSourceIdentifierFromSubscription = RDS
         type Rs RemoveSourceIdentifierFromSubscription =
              RemoveSourceIdentifierFromSubscriptionResponse
-        request = postQuery
+        request = postQuery rDS
         response
           = receiveXMLWrapper
               "RemoveSourceIdentifierFromSubscriptionResult"
diff --git a/gen/Network/AWS/RDS/RemoveTagsFromResource.hs b/gen/Network/AWS/RDS/RemoveTagsFromResource.hs
--- a/gen/Network/AWS/RDS/RemoveTagsFromResource.hs
+++ b/gen/Network/AWS/RDS/RemoveTagsFromResource.hs
@@ -79,10 +79,9 @@
 rtfrTagKeys = lens _rtfrTagKeys (\ s a -> s{_rtfrTagKeys = a}) . _Coerce;
 
 instance AWSRequest RemoveTagsFromResource where
-        type Sv RemoveTagsFromResource = RDS
         type Rs RemoveTagsFromResource =
              RemoveTagsFromResourceResponse
-        request = postQuery
+        request = postQuery rDS
         response
           = receiveNull RemoveTagsFromResourceResponse'
 
diff --git a/gen/Network/AWS/RDS/ResetDBClusterParameterGroup.hs b/gen/Network/AWS/RDS/ResetDBClusterParameterGroup.hs
--- a/gen/Network/AWS/RDS/ResetDBClusterParameterGroup.hs
+++ b/gen/Network/AWS/RDS/ResetDBClusterParameterGroup.hs
@@ -105,10 +105,9 @@
 
 instance AWSRequest ResetDBClusterParameterGroup
          where
-        type Sv ResetDBClusterParameterGroup = RDS
         type Rs ResetDBClusterParameterGroup =
              DBClusterParameterGroupNameMessage
-        request = postQuery
+        request = postQuery rDS
         response
           = receiveXMLWrapper
               "ResetDBClusterParameterGroupResult"
diff --git a/gen/Network/AWS/RDS/ResetDBParameterGroup.hs b/gen/Network/AWS/RDS/ResetDBParameterGroup.hs
--- a/gen/Network/AWS/RDS/ResetDBParameterGroup.hs
+++ b/gen/Network/AWS/RDS/ResetDBParameterGroup.hs
@@ -116,10 +116,9 @@
 rdpgDBParameterGroupName = lens _rdpgDBParameterGroupName (\ s a -> s{_rdpgDBParameterGroupName = a});
 
 instance AWSRequest ResetDBParameterGroup where
-        type Sv ResetDBParameterGroup = RDS
         type Rs ResetDBParameterGroup =
              DBParameterGroupNameMessage
-        request = postQuery
+        request = postQuery rDS
         response
           = receiveXMLWrapper "ResetDBParameterGroupResult"
               (\ s h x -> parseXML x)
diff --git a/gen/Network/AWS/RDS/RestoreDBClusterFromSnapshot.hs b/gen/Network/AWS/RDS/RestoreDBClusterFromSnapshot.hs
--- a/gen/Network/AWS/RDS/RestoreDBClusterFromSnapshot.hs
+++ b/gen/Network/AWS/RDS/RestoreDBClusterFromSnapshot.hs
@@ -192,10 +192,9 @@
 
 instance AWSRequest RestoreDBClusterFromSnapshot
          where
-        type Sv RestoreDBClusterFromSnapshot = RDS
         type Rs RestoreDBClusterFromSnapshot =
              RestoreDBClusterFromSnapshotResponse
-        request = postQuery
+        request = postQuery rDS
         response
           = receiveXMLWrapper
               "RestoreDBClusterFromSnapshotResult"
diff --git a/gen/Network/AWS/RDS/RestoreDBClusterToPointInTime.hs b/gen/Network/AWS/RDS/RestoreDBClusterToPointInTime.hs
--- a/gen/Network/AWS/RDS/RestoreDBClusterToPointInTime.hs
+++ b/gen/Network/AWS/RDS/RestoreDBClusterToPointInTime.hs
@@ -184,10 +184,9 @@
 
 instance AWSRequest RestoreDBClusterToPointInTime
          where
-        type Sv RestoreDBClusterToPointInTime = RDS
         type Rs RestoreDBClusterToPointInTime =
              RestoreDBClusterToPointInTimeResponse
-        request = postQuery
+        request = postQuery rDS
         response
           = receiveXMLWrapper
               "RestoreDBClusterToPointInTimeResult"
diff --git a/gen/Network/AWS/RDS/RestoreDBInstanceFromDBSnapshot.hs b/gen/Network/AWS/RDS/RestoreDBInstanceFromDBSnapshot.hs
--- a/gen/Network/AWS/RDS/RestoreDBInstanceFromDBSnapshot.hs
+++ b/gen/Network/AWS/RDS/RestoreDBInstanceFromDBSnapshot.hs
@@ -374,10 +374,9 @@
 
 instance AWSRequest RestoreDBInstanceFromDBSnapshot
          where
-        type Sv RestoreDBInstanceFromDBSnapshot = RDS
         type Rs RestoreDBInstanceFromDBSnapshot =
              RestoreDBInstanceFromDBSnapshotResponse
-        request = postQuery
+        request = postQuery rDS
         response
           = receiveXMLWrapper
               "RestoreDBInstanceFromDBSnapshotResult"
diff --git a/gen/Network/AWS/RDS/RestoreDBInstanceToPointInTime.hs b/gen/Network/AWS/RDS/RestoreDBInstanceToPointInTime.hs
--- a/gen/Network/AWS/RDS/RestoreDBInstanceToPointInTime.hs
+++ b/gen/Network/AWS/RDS/RestoreDBInstanceToPointInTime.hs
@@ -394,10 +394,9 @@
 
 instance AWSRequest RestoreDBInstanceToPointInTime
          where
-        type Sv RestoreDBInstanceToPointInTime = RDS
         type Rs RestoreDBInstanceToPointInTime =
              RestoreDBInstanceToPointInTimeResponse
-        request = postQuery
+        request = postQuery rDS
         response
           = receiveXMLWrapper
               "RestoreDBInstanceToPointInTimeResult"
diff --git a/gen/Network/AWS/RDS/RevokeDBSecurityGroupIngress.hs b/gen/Network/AWS/RDS/RevokeDBSecurityGroupIngress.hs
--- a/gen/Network/AWS/RDS/RevokeDBSecurityGroupIngress.hs
+++ b/gen/Network/AWS/RDS/RevokeDBSecurityGroupIngress.hs
@@ -121,10 +121,9 @@
 
 instance AWSRequest RevokeDBSecurityGroupIngress
          where
-        type Sv RevokeDBSecurityGroupIngress = RDS
         type Rs RevokeDBSecurityGroupIngress =
              RevokeDBSecurityGroupIngressResponse
-        request = postQuery
+        request = postQuery rDS
         response
           = receiveXMLWrapper
               "RevokeDBSecurityGroupIngressResult"
diff --git a/gen/Network/AWS/RDS/Types.hs b/gen/Network/AWS/RDS/Types.hs
--- a/gen/Network/AWS/RDS/Types.hs
+++ b/gen/Network/AWS/RDS/Types.hs
@@ -1,5 +1,4 @@
 {-# LANGUAGE OverloadedStrings #-}
-{-# LANGUAGE TypeFamilies      #-}
 
 -- Derived from AWS service descriptions, licensed under Apache 2.0.
 
@@ -13,8 +12,8 @@
 --
 module Network.AWS.RDS.Types
     (
-    -- * Service
-      RDS
+    -- * Service Configuration
+      rDS
 
     -- * Errors
     , _CertificateNotFoundFault
@@ -601,39 +600,36 @@
 import           Network.AWS.RDS.Types.Sum
 import           Network.AWS.Sign.V4
 
--- | Version @2014-10-31@ of the Amazon Relational Database Service SDK.
-data RDS
-
-instance AWSService RDS where
-    type Sg RDS = V4
-    service = const svc
-      where
-        svc =
-            Service
-            { _svcAbbrev = "RDS"
-            , _svcPrefix = "rds"
-            , _svcVersion = "2014-10-31"
-            , _svcEndpoint = defaultEndpoint svc
-            , _svcTimeout = Just 70
-            , _svcStatus = statusSuccess
-            , _svcError = parseXMLError
-            , _svcRetry = retry
-            }
-        retry =
-            Exponential
-            { _retryBase = 5.0e-2
-            , _retryGrowth = 2
-            , _retryAttempts = 5
-            , _retryCheck = check
-            }
-        check e
-          | has (hasCode "ThrottlingException" . hasStatus 400) e =
-              Just "throttling_exception"
-          | has (hasCode "Throttling" . hasStatus 400) e = Just "throttling"
-          | has (hasStatus 503) e = Just "service_unavailable"
-          | has (hasStatus 500) e = Just "general_server_error"
-          | has (hasStatus 509) e = Just "limit_exceeded"
-          | otherwise = Nothing
+-- | API version '2014-10-31' of the Amazon Relational Database Service SDK configuration.
+rDS :: Service
+rDS =
+    Service
+    { _svcAbbrev = "RDS"
+    , _svcSigner = v4
+    , _svcPrefix = "rds"
+    , _svcVersion = "2014-10-31"
+    , _svcEndpoint = defaultEndpoint rDS
+    , _svcTimeout = Just 70
+    , _svcCheck = statusSuccess
+    , _svcError = parseXMLError
+    , _svcRetry = retry
+    }
+  where
+    retry =
+        Exponential
+        { _retryBase = 5.0e-2
+        , _retryGrowth = 2
+        , _retryAttempts = 5
+        , _retryCheck = check
+        }
+    check e
+      | has (hasCode "ThrottlingException" . hasStatus 400) e =
+          Just "throttling_exception"
+      | has (hasCode "Throttling" . hasStatus 400) e = Just "throttling"
+      | has (hasStatus 503) e = Just "service_unavailable"
+      | has (hasStatus 500) e = Just "general_server_error"
+      | has (hasStatus 509) e = Just "limit_exceeded"
+      | otherwise = Nothing
 
 -- | /CertificateIdentifier/ does not refer to an existing certificate.
 _CertificateNotFoundFault :: AsError a => Getting (First ServiceError) a ServiceError
diff --git a/gen/Network/AWS/RDS/Types/Product.hs b/gen/Network/AWS/RDS/Types/Product.hs
--- a/gen/Network/AWS/RDS/Types/Product.hs
+++ b/gen/Network/AWS/RDS/Types/Product.hs
@@ -2,7 +2,6 @@
 {-# LANGUAGE DeriveGeneric      #-}
 {-# LANGUAGE OverloadedStrings  #-}
 {-# LANGUAGE RecordWildCards    #-}
-{-# LANGUAGE TypeFamilies       #-}
 
 {-# OPTIONS_GHC -fno-warn-unused-imports #-}
 
diff --git a/test/Test/AWS/Gen/RDS.hs b/test/Test/AWS/Gen/RDS.hs
--- a/test/Test/AWS/Gen/RDS.hs
+++ b/test/Test/AWS/Gen/RDS.hs
@@ -878,454 +878,530 @@
 testDescribeDBEngineVersionsResponse = res
     "DescribeDBEngineVersionsResponse"
     "fixture/DescribeDBEngineVersionsResponse"
+    rDS
     (Proxy :: Proxy DescribeDBEngineVersions)
 
 testDescribeDBClusterParameterGroupsResponse :: DescribeDBClusterParameterGroupsResponse -> TestTree
 testDescribeDBClusterParameterGroupsResponse = res
     "DescribeDBClusterParameterGroupsResponse"
     "fixture/DescribeDBClusterParameterGroupsResponse"
+    rDS
     (Proxy :: Proxy DescribeDBClusterParameterGroups)
 
 testPromoteReadReplicaResponse :: PromoteReadReplicaResponse -> TestTree
 testPromoteReadReplicaResponse = res
     "PromoteReadReplicaResponse"
     "fixture/PromoteReadReplicaResponse"
+    rDS
     (Proxy :: Proxy PromoteReadReplica)
 
 testModifyEventSubscriptionResponse :: ModifyEventSubscriptionResponse -> TestTree
 testModifyEventSubscriptionResponse = res
     "ModifyEventSubscriptionResponse"
     "fixture/ModifyEventSubscriptionResponse"
+    rDS
     (Proxy :: Proxy ModifyEventSubscription)
 
 testCopyDBSnapshotResponse :: CopyDBSnapshotResponse -> TestTree
 testCopyDBSnapshotResponse = res
     "CopyDBSnapshotResponse"
     "fixture/CopyDBSnapshotResponse"
+    rDS
     (Proxy :: Proxy CopyDBSnapshot)
 
 testAddSourceIdentifierToSubscriptionResponse :: AddSourceIdentifierToSubscriptionResponse -> TestTree
 testAddSourceIdentifierToSubscriptionResponse = res
     "AddSourceIdentifierToSubscriptionResponse"
     "fixture/AddSourceIdentifierToSubscriptionResponse"
+    rDS
     (Proxy :: Proxy AddSourceIdentifierToSubscription)
 
 testModifyDBInstanceResponse :: ModifyDBInstanceResponse -> TestTree
 testModifyDBInstanceResponse = res
     "ModifyDBInstanceResponse"
     "fixture/ModifyDBInstanceResponse"
+    rDS
     (Proxy :: Proxy ModifyDBInstance)
 
 testResetDBClusterParameterGroupResponse :: DBClusterParameterGroupNameMessage -> TestTree
 testResetDBClusterParameterGroupResponse = res
     "ResetDBClusterParameterGroupResponse"
     "fixture/ResetDBClusterParameterGroupResponse"
+    rDS
     (Proxy :: Proxy ResetDBClusterParameterGroup)
 
 testDescribeEventsResponse :: DescribeEventsResponse -> TestTree
 testDescribeEventsResponse = res
     "DescribeEventsResponse"
     "fixture/DescribeEventsResponse"
+    rDS
     (Proxy :: Proxy DescribeEvents)
 
 testDescribeEngineDefaultParametersResponse :: DescribeEngineDefaultParametersResponse -> TestTree
 testDescribeEngineDefaultParametersResponse = res
     "DescribeEngineDefaultParametersResponse"
     "fixture/DescribeEngineDefaultParametersResponse"
+    rDS
     (Proxy :: Proxy DescribeEngineDefaultParameters)
 
 testDescribeDBClustersResponse :: DescribeDBClustersResponse -> TestTree
 testDescribeDBClustersResponse = res
     "DescribeDBClustersResponse"
     "fixture/DescribeDBClustersResponse"
+    rDS
     (Proxy :: Proxy DescribeDBClusters)
 
 testModifyDBSubnetGroupResponse :: ModifyDBSubnetGroupResponse -> TestTree
 testModifyDBSubnetGroupResponse = res
     "ModifyDBSubnetGroupResponse"
     "fixture/ModifyDBSubnetGroupResponse"
+    rDS
     (Proxy :: Proxy ModifyDBSubnetGroup)
 
 testDescribeDBLogFilesResponse :: DescribeDBLogFilesResponse -> TestTree
 testDescribeDBLogFilesResponse = res
     "DescribeDBLogFilesResponse"
     "fixture/DescribeDBLogFilesResponse"
+    rDS
     (Proxy :: Proxy DescribeDBLogFiles)
 
 testListTagsForResourceResponse :: ListTagsForResourceResponse -> TestTree
 testListTagsForResourceResponse = res
     "ListTagsForResourceResponse"
     "fixture/ListTagsForResourceResponse"
+    rDS
     (Proxy :: Proxy ListTagsForResource)
 
 testDescribeOptionGroupsResponse :: DescribeOptionGroupsResponse -> TestTree
 testDescribeOptionGroupsResponse = res
     "DescribeOptionGroupsResponse"
     "fixture/DescribeOptionGroupsResponse"
+    rDS
     (Proxy :: Proxy DescribeOptionGroups)
 
 testDeleteDBClusterResponse :: DeleteDBClusterResponse -> TestTree
 testDeleteDBClusterResponse = res
     "DeleteDBClusterResponse"
     "fixture/DeleteDBClusterResponse"
+    rDS
     (Proxy :: Proxy DeleteDBCluster)
 
 testRemoveSourceIdentifierFromSubscriptionResponse :: RemoveSourceIdentifierFromSubscriptionResponse -> TestTree
 testRemoveSourceIdentifierFromSubscriptionResponse = res
     "RemoveSourceIdentifierFromSubscriptionResponse"
     "fixture/RemoveSourceIdentifierFromSubscriptionResponse"
+    rDS
     (Proxy :: Proxy RemoveSourceIdentifierFromSubscription)
 
 testCopyDBParameterGroupResponse :: CopyDBParameterGroupResponse -> TestTree
 testCopyDBParameterGroupResponse = res
     "CopyDBParameterGroupResponse"
     "fixture/CopyDBParameterGroupResponse"
+    rDS
     (Proxy :: Proxy CopyDBParameterGroup)
 
 testDescribeReservedDBInstancesResponse :: DescribeReservedDBInstancesResponse -> TestTree
 testDescribeReservedDBInstancesResponse = res
     "DescribeReservedDBInstancesResponse"
     "fixture/DescribeReservedDBInstancesResponse"
+    rDS
     (Proxy :: Proxy DescribeReservedDBInstances)
 
 testDeleteOptionGroupResponse :: DeleteOptionGroupResponse -> TestTree
 testDeleteOptionGroupResponse = res
     "DeleteOptionGroupResponse"
     "fixture/DeleteOptionGroupResponse"
+    rDS
     (Proxy :: Proxy DeleteOptionGroup)
 
 testDescribeEngineDefaultClusterParametersResponse :: DescribeEngineDefaultClusterParametersResponse -> TestTree
 testDescribeEngineDefaultClusterParametersResponse = res
     "DescribeEngineDefaultClusterParametersResponse"
     "fixture/DescribeEngineDefaultClusterParametersResponse"
+    rDS
     (Proxy :: Proxy DescribeEngineDefaultClusterParameters)
 
 testCreateEventSubscriptionResponse :: CreateEventSubscriptionResponse -> TestTree
 testCreateEventSubscriptionResponse = res
     "CreateEventSubscriptionResponse"
     "fixture/CreateEventSubscriptionResponse"
+    rDS
     (Proxy :: Proxy CreateEventSubscription)
 
 testRemoveTagsFromResourceResponse :: RemoveTagsFromResourceResponse -> TestTree
 testRemoveTagsFromResourceResponse = res
     "RemoveTagsFromResourceResponse"
     "fixture/RemoveTagsFromResourceResponse"
+    rDS
     (Proxy :: Proxy RemoveTagsFromResource)
 
 testCreateDBInstanceResponse :: CreateDBInstanceResponse -> TestTree
 testCreateDBInstanceResponse = res
     "CreateDBInstanceResponse"
     "fixture/CreateDBInstanceResponse"
+    rDS
     (Proxy :: Proxy CreateDBInstance)
 
 testRestoreDBInstanceFromDBSnapshotResponse :: RestoreDBInstanceFromDBSnapshotResponse -> TestTree
 testRestoreDBInstanceFromDBSnapshotResponse = res
     "RestoreDBInstanceFromDBSnapshotResponse"
     "fixture/RestoreDBInstanceFromDBSnapshotResponse"
+    rDS
     (Proxy :: Proxy RestoreDBInstanceFromDBSnapshot)
 
 testAuthorizeDBSecurityGroupIngressResponse :: AuthorizeDBSecurityGroupIngressResponse -> TestTree
 testAuthorizeDBSecurityGroupIngressResponse = res
     "AuthorizeDBSecurityGroupIngressResponse"
     "fixture/AuthorizeDBSecurityGroupIngressResponse"
+    rDS
     (Proxy :: Proxy AuthorizeDBSecurityGroupIngress)
 
 testDeleteDBClusterParameterGroupResponse :: DeleteDBClusterParameterGroupResponse -> TestTree
 testDeleteDBClusterParameterGroupResponse = res
     "DeleteDBClusterParameterGroupResponse"
     "fixture/DeleteDBClusterParameterGroupResponse"
+    rDS
     (Proxy :: Proxy DeleteDBClusterParameterGroup)
 
 testPurchaseReservedDBInstancesOfferingResponse :: PurchaseReservedDBInstancesOfferingResponse -> TestTree
 testPurchaseReservedDBInstancesOfferingResponse = res
     "PurchaseReservedDBInstancesOfferingResponse"
     "fixture/PurchaseReservedDBInstancesOfferingResponse"
+    rDS
     (Proxy :: Proxy PurchaseReservedDBInstancesOffering)
 
 testDescribeCertificatesResponse :: DescribeCertificatesResponse -> TestTree
 testDescribeCertificatesResponse = res
     "DescribeCertificatesResponse"
     "fixture/DescribeCertificatesResponse"
+    rDS
     (Proxy :: Proxy DescribeCertificates)
 
 testRestoreDBClusterFromSnapshotResponse :: RestoreDBClusterFromSnapshotResponse -> TestTree
 testRestoreDBClusterFromSnapshotResponse = res
     "RestoreDBClusterFromSnapshotResponse"
     "fixture/RestoreDBClusterFromSnapshotResponse"
+    rDS
     (Proxy :: Proxy RestoreDBClusterFromSnapshot)
 
 testCreateDBSnapshotResponse :: CreateDBSnapshotResponse -> TestTree
 testCreateDBSnapshotResponse = res
     "CreateDBSnapshotResponse"
     "fixture/CreateDBSnapshotResponse"
+    rDS
     (Proxy :: Proxy CreateDBSnapshot)
 
 testDeleteEventSubscriptionResponse :: DeleteEventSubscriptionResponse -> TestTree
 testDeleteEventSubscriptionResponse = res
     "DeleteEventSubscriptionResponse"
     "fixture/DeleteEventSubscriptionResponse"
+    rDS
     (Proxy :: Proxy DeleteEventSubscription)
 
 testDescribeDBParameterGroupsResponse :: DescribeDBParameterGroupsResponse -> TestTree
 testDescribeDBParameterGroupsResponse = res
     "DescribeDBParameterGroupsResponse"
     "fixture/DescribeDBParameterGroupsResponse"
+    rDS
     (Proxy :: Proxy DescribeDBParameterGroups)
 
 testDescribeOrderableDBInstanceOptionsResponse :: DescribeOrderableDBInstanceOptionsResponse -> TestTree
 testDescribeOrderableDBInstanceOptionsResponse = res
     "DescribeOrderableDBInstanceOptionsResponse"
     "fixture/DescribeOrderableDBInstanceOptionsResponse"
+    rDS
     (Proxy :: Proxy DescribeOrderableDBInstanceOptions)
 
 testCreateDBClusterParameterGroupResponse :: CreateDBClusterParameterGroupResponse -> TestTree
 testCreateDBClusterParameterGroupResponse = res
     "CreateDBClusterParameterGroupResponse"
     "fixture/CreateDBClusterParameterGroupResponse"
+    rDS
     (Proxy :: Proxy CreateDBClusterParameterGroup)
 
 testDescribeEventSubscriptionsResponse :: DescribeEventSubscriptionsResponse -> TestTree
 testDescribeEventSubscriptionsResponse = res
     "DescribeEventSubscriptionsResponse"
     "fixture/DescribeEventSubscriptionsResponse"
+    rDS
     (Proxy :: Proxy DescribeEventSubscriptions)
 
 testAddTagsToResourceResponse :: AddTagsToResourceResponse -> TestTree
 testAddTagsToResourceResponse = res
     "AddTagsToResourceResponse"
     "fixture/AddTagsToResourceResponse"
+    rDS
     (Proxy :: Proxy AddTagsToResource)
 
 testDescribeOptionGroupOptionsResponse :: DescribeOptionGroupOptionsResponse -> TestTree
 testDescribeOptionGroupOptionsResponse = res
     "DescribeOptionGroupOptionsResponse"
     "fixture/DescribeOptionGroupOptionsResponse"
+    rDS
     (Proxy :: Proxy DescribeOptionGroupOptions)
 
 testDescribeDBParametersResponse :: DescribeDBParametersResponse -> TestTree
 testDescribeDBParametersResponse = res
     "DescribeDBParametersResponse"
     "fixture/DescribeDBParametersResponse"
+    rDS
     (Proxy :: Proxy DescribeDBParameters)
 
 testDeleteDBClusterSnapshotResponse :: DeleteDBClusterSnapshotResponse -> TestTree
 testDeleteDBClusterSnapshotResponse = res
     "DeleteDBClusterSnapshotResponse"
     "fixture/DeleteDBClusterSnapshotResponse"
+    rDS
     (Proxy :: Proxy DeleteDBClusterSnapshot)
 
 testDescribeDBSnapshotsResponse :: DescribeDBSnapshotsResponse -> TestTree
 testDescribeDBSnapshotsResponse = res
     "DescribeDBSnapshotsResponse"
     "fixture/DescribeDBSnapshotsResponse"
+    rDS
     (Proxy :: Proxy DescribeDBSnapshots)
 
 testDescribeDBSubnetGroupsResponse :: DescribeDBSubnetGroupsResponse -> TestTree
 testDescribeDBSubnetGroupsResponse = res
     "DescribeDBSubnetGroupsResponse"
     "fixture/DescribeDBSubnetGroupsResponse"
+    rDS
     (Proxy :: Proxy DescribeDBSubnetGroups)
 
 testCreateDBParameterGroupResponse :: CreateDBParameterGroupResponse -> TestTree
 testCreateDBParameterGroupResponse = res
     "CreateDBParameterGroupResponse"
     "fixture/CreateDBParameterGroupResponse"
+    rDS
     (Proxy :: Proxy CreateDBParameterGroup)
 
 testCreateDBClusterSnapshotResponse :: CreateDBClusterSnapshotResponse -> TestTree
 testCreateDBClusterSnapshotResponse = res
     "CreateDBClusterSnapshotResponse"
     "fixture/CreateDBClusterSnapshotResponse"
+    rDS
     (Proxy :: Proxy CreateDBClusterSnapshot)
 
 testModifyOptionGroupResponse :: ModifyOptionGroupResponse -> TestTree
 testModifyOptionGroupResponse = res
     "ModifyOptionGroupResponse"
     "fixture/ModifyOptionGroupResponse"
+    rDS
     (Proxy :: Proxy ModifyOptionGroup)
 
 testModifyDBClusterResponse :: ModifyDBClusterResponse -> TestTree
 testModifyDBClusterResponse = res
     "ModifyDBClusterResponse"
     "fixture/ModifyDBClusterResponse"
+    rDS
     (Proxy :: Proxy ModifyDBCluster)
 
 testDescribeEventCategoriesResponse :: DescribeEventCategoriesResponse -> TestTree
 testDescribeEventCategoriesResponse = res
     "DescribeEventCategoriesResponse"
     "fixture/DescribeEventCategoriesResponse"
+    rDS
     (Proxy :: Proxy DescribeEventCategories)
 
 testModifyDBClusterParameterGroupResponse :: DBClusterParameterGroupNameMessage -> TestTree
 testModifyDBClusterParameterGroupResponse = res
     "ModifyDBClusterParameterGroupResponse"
     "fixture/ModifyDBClusterParameterGroupResponse"
+    rDS
     (Proxy :: Proxy ModifyDBClusterParameterGroup)
 
 testDescribePendingMaintenanceActionsResponse :: DescribePendingMaintenanceActionsResponse -> TestTree
 testDescribePendingMaintenanceActionsResponse = res
     "DescribePendingMaintenanceActionsResponse"
     "fixture/DescribePendingMaintenanceActionsResponse"
+    rDS
     (Proxy :: Proxy DescribePendingMaintenanceActions)
 
 testRestoreDBInstanceToPointInTimeResponse :: RestoreDBInstanceToPointInTimeResponse -> TestTree
 testRestoreDBInstanceToPointInTimeResponse = res
     "RestoreDBInstanceToPointInTimeResponse"
     "fixture/RestoreDBInstanceToPointInTimeResponse"
+    rDS
     (Proxy :: Proxy RestoreDBInstanceToPointInTime)
 
 testResetDBParameterGroupResponse :: DBParameterGroupNameMessage -> TestTree
 testResetDBParameterGroupResponse = res
     "ResetDBParameterGroupResponse"
     "fixture/ResetDBParameterGroupResponse"
+    rDS
     (Proxy :: Proxy ResetDBParameterGroup)
 
 testCopyDBClusterSnapshotResponse :: CopyDBClusterSnapshotResponse -> TestTree
 testCopyDBClusterSnapshotResponse = res
     "CopyDBClusterSnapshotResponse"
     "fixture/CopyDBClusterSnapshotResponse"
+    rDS
     (Proxy :: Proxy CopyDBClusterSnapshot)
 
 testModifyDBParameterGroupResponse :: DBParameterGroupNameMessage -> TestTree
 testModifyDBParameterGroupResponse = res
     "ModifyDBParameterGroupResponse"
     "fixture/ModifyDBParameterGroupResponse"
+    rDS
     (Proxy :: Proxy ModifyDBParameterGroup)
 
 testFailoverDBClusterResponse :: FailoverDBClusterResponse -> TestTree
 testFailoverDBClusterResponse = res
     "FailoverDBClusterResponse"
     "fixture/FailoverDBClusterResponse"
+    rDS
     (Proxy :: Proxy FailoverDBCluster)
 
 testCreateDBClusterResponse :: CreateDBClusterResponse -> TestTree
 testCreateDBClusterResponse = res
     "CreateDBClusterResponse"
     "fixture/CreateDBClusterResponse"
+    rDS
     (Proxy :: Proxy CreateDBCluster)
 
 testCreateOptionGroupResponse :: CreateOptionGroupResponse -> TestTree
 testCreateOptionGroupResponse = res
     "CreateOptionGroupResponse"
     "fixture/CreateOptionGroupResponse"
+    rDS
     (Proxy :: Proxy CreateOptionGroup)
 
 testApplyPendingMaintenanceActionResponse :: ApplyPendingMaintenanceActionResponse -> TestTree
 testApplyPendingMaintenanceActionResponse = res
     "ApplyPendingMaintenanceActionResponse"
     "fixture/ApplyPendingMaintenanceActionResponse"
+    rDS
     (Proxy :: Proxy ApplyPendingMaintenanceAction)
 
 testRevokeDBSecurityGroupIngressResponse :: RevokeDBSecurityGroupIngressResponse -> TestTree
 testRevokeDBSecurityGroupIngressResponse = res
     "RevokeDBSecurityGroupIngressResponse"
     "fixture/RevokeDBSecurityGroupIngressResponse"
+    rDS
     (Proxy :: Proxy RevokeDBSecurityGroupIngress)
 
 testDeleteDBSnapshotResponse :: DeleteDBSnapshotResponse -> TestTree
 testDeleteDBSnapshotResponse = res
     "DeleteDBSnapshotResponse"
     "fixture/DeleteDBSnapshotResponse"
+    rDS
     (Proxy :: Proxy DeleteDBSnapshot)
 
 testDescribeDBClusterParametersResponse :: DescribeDBClusterParametersResponse -> TestTree
 testDescribeDBClusterParametersResponse = res
     "DescribeDBClusterParametersResponse"
     "fixture/DescribeDBClusterParametersResponse"
+    rDS
     (Proxy :: Proxy DescribeDBClusterParameters)
 
 testCreateDBSecurityGroupResponse :: CreateDBSecurityGroupResponse -> TestTree
 testCreateDBSecurityGroupResponse = res
     "CreateDBSecurityGroupResponse"
     "fixture/CreateDBSecurityGroupResponse"
+    rDS
     (Proxy :: Proxy CreateDBSecurityGroup)
 
 testDeleteDBSubnetGroupResponse :: DeleteDBSubnetGroupResponse -> TestTree
 testDeleteDBSubnetGroupResponse = res
     "DeleteDBSubnetGroupResponse"
     "fixture/DeleteDBSubnetGroupResponse"
+    rDS
     (Proxy :: Proxy DeleteDBSubnetGroup)
 
 testDescribeAccountAttributesResponse :: DescribeAccountAttributesResponse -> TestTree
 testDescribeAccountAttributesResponse = res
     "DescribeAccountAttributesResponse"
     "fixture/DescribeAccountAttributesResponse"
+    rDS
     (Proxy :: Proxy DescribeAccountAttributes)
 
 testDeleteDBSecurityGroupResponse :: DeleteDBSecurityGroupResponse -> TestTree
 testDeleteDBSecurityGroupResponse = res
     "DeleteDBSecurityGroupResponse"
     "fixture/DeleteDBSecurityGroupResponse"
+    rDS
     (Proxy :: Proxy DeleteDBSecurityGroup)
 
 testRebootDBInstanceResponse :: RebootDBInstanceResponse -> TestTree
 testRebootDBInstanceResponse = res
     "RebootDBInstanceResponse"
     "fixture/RebootDBInstanceResponse"
+    rDS
     (Proxy :: Proxy RebootDBInstance)
 
 testDescribeDBClusterSnapshotsResponse :: DescribeDBClusterSnapshotsResponse -> TestTree
 testDescribeDBClusterSnapshotsResponse = res
     "DescribeDBClusterSnapshotsResponse"
     "fixture/DescribeDBClusterSnapshotsResponse"
+    rDS
     (Proxy :: Proxy DescribeDBClusterSnapshots)
 
 testCreateDBSubnetGroupResponse :: CreateDBSubnetGroupResponse -> TestTree
 testCreateDBSubnetGroupResponse = res
     "CreateDBSubnetGroupResponse"
     "fixture/CreateDBSubnetGroupResponse"
+    rDS
     (Proxy :: Proxy CreateDBSubnetGroup)
 
 testDescribeReservedDBInstancesOfferingsResponse :: DescribeReservedDBInstancesOfferingsResponse -> TestTree
 testDescribeReservedDBInstancesOfferingsResponse = res
     "DescribeReservedDBInstancesOfferingsResponse"
     "fixture/DescribeReservedDBInstancesOfferingsResponse"
+    rDS
     (Proxy :: Proxy DescribeReservedDBInstancesOfferings)
 
 testDeleteDBInstanceResponse :: DeleteDBInstanceResponse -> TestTree
 testDeleteDBInstanceResponse = res
     "DeleteDBInstanceResponse"
     "fixture/DeleteDBInstanceResponse"
+    rDS
     (Proxy :: Proxy DeleteDBInstance)
 
 testDescribeDBInstancesResponse :: DescribeDBInstancesResponse -> TestTree
 testDescribeDBInstancesResponse = res
     "DescribeDBInstancesResponse"
     "fixture/DescribeDBInstancesResponse"
+    rDS
     (Proxy :: Proxy DescribeDBInstances)
 
 testCopyOptionGroupResponse :: CopyOptionGroupResponse -> TestTree
 testCopyOptionGroupResponse = res
     "CopyOptionGroupResponse"
     "fixture/CopyOptionGroupResponse"
+    rDS
     (Proxy :: Proxy CopyOptionGroup)
 
 testDownloadDBLogFilePortionResponse :: DownloadDBLogFilePortionResponse -> TestTree
 testDownloadDBLogFilePortionResponse = res
     "DownloadDBLogFilePortionResponse"
     "fixture/DownloadDBLogFilePortionResponse"
+    rDS
     (Proxy :: Proxy DownloadDBLogFilePortion)
 
 testCreateDBInstanceReadReplicaResponse :: CreateDBInstanceReadReplicaResponse -> TestTree
 testCreateDBInstanceReadReplicaResponse = res
     "CreateDBInstanceReadReplicaResponse"
     "fixture/CreateDBInstanceReadReplicaResponse"
+    rDS
     (Proxy :: Proxy CreateDBInstanceReadReplica)
 
 testRestoreDBClusterToPointInTimeResponse :: RestoreDBClusterToPointInTimeResponse -> TestTree
 testRestoreDBClusterToPointInTimeResponse = res
     "RestoreDBClusterToPointInTimeResponse"
     "fixture/RestoreDBClusterToPointInTimeResponse"
+    rDS
     (Proxy :: Proxy RestoreDBClusterToPointInTime)
 
 testDeleteDBParameterGroupResponse :: DeleteDBParameterGroupResponse -> TestTree
 testDeleteDBParameterGroupResponse = res
     "DeleteDBParameterGroupResponse"
     "fixture/DeleteDBParameterGroupResponse"
+    rDS
     (Proxy :: Proxy DeleteDBParameterGroup)
 
 testDescribeDBSecurityGroupsResponse :: DescribeDBSecurityGroupsResponse -> TestTree
 testDescribeDBSecurityGroupsResponse = res
     "DescribeDBSecurityGroupsResponse"
     "fixture/DescribeDBSecurityGroupsResponse"
+    rDS
     (Proxy :: Proxy DescribeDBSecurityGroups)
