diff --git a/README.md b/README.md
--- a/README.md
+++ b/README.md
@@ -8,7 +8,7 @@
 
 ## Version
 
-`1.2.0.1`
+`1.2.0.2`
 
 
 ## Description
diff --git a/amazonka-redshift.cabal b/amazonka-redshift.cabal
--- a/amazonka-redshift.cabal
+++ b/amazonka-redshift.cabal
@@ -1,7 +1,8 @@
 name:                  amazonka-redshift
-version:               1.2.0.1
+version:               1.2.0.2
 synopsis:              Amazon Redshift SDK.
 homepage:              https://github.com/brendanhay/amazonka
+bug-reports:           https://github.com/brendanhay/amazonka/issues
 license:               OtherLicense
 license-file:          LICENSE
 author:                Brendan Hay
@@ -9,9 +10,8 @@
 copyright:             Copyright (c) 2013-2015 Brendan Hay
 category:              Network, AWS, Cloud, Distributed Computing
 build-type:            Simple
-extra-source-files:    README.md
 cabal-version:         >= 1.10
-
+extra-source-files:    README.md fixture/*.yaml fixture/*.proto
 description:
     Amazon Redshift __Overview__
 
@@ -145,8 +145,9 @@
 
     ghc-options:       -Wall -threaded
 
-    -- This is not comprehensive if modules have manually been added.
-    -- It exists to ensure cabal 'somewhat' detects test module changes.
+    -- This section is encoded by the template and any modules added by
+    -- hand outside these namespaces will not correctly be added to the
+    -- distribution package.
     other-modules:
           Test.AWS.Redshift
         , Test.AWS.Gen.Redshift
diff --git a/fixture/AuthorizeClusterSecurityGroupIngress.yaml b/fixture/AuthorizeClusterSecurityGroupIngress.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/AuthorizeClusterSecurityGroupIngress.yaml
diff --git a/fixture/AuthorizeClusterSecurityGroupIngressResponse.proto b/fixture/AuthorizeClusterSecurityGroupIngressResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/AuthorizeClusterSecurityGroupIngressResponse.proto
diff --git a/fixture/AuthorizeSnapshotAccess.yaml b/fixture/AuthorizeSnapshotAccess.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/AuthorizeSnapshotAccess.yaml
diff --git a/fixture/AuthorizeSnapshotAccessResponse.proto b/fixture/AuthorizeSnapshotAccessResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/AuthorizeSnapshotAccessResponse.proto
diff --git a/fixture/CopyClusterSnapshot.yaml b/fixture/CopyClusterSnapshot.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/CopyClusterSnapshot.yaml
diff --git a/fixture/CopyClusterSnapshotResponse.proto b/fixture/CopyClusterSnapshotResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/CopyClusterSnapshotResponse.proto
diff --git a/fixture/CreateCluster.yaml b/fixture/CreateCluster.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/CreateCluster.yaml
diff --git a/fixture/CreateClusterParameterGroup.yaml b/fixture/CreateClusterParameterGroup.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/CreateClusterParameterGroup.yaml
diff --git a/fixture/CreateClusterParameterGroupResponse.proto b/fixture/CreateClusterParameterGroupResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/CreateClusterParameterGroupResponse.proto
diff --git a/fixture/CreateClusterResponse.proto b/fixture/CreateClusterResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/CreateClusterResponse.proto
diff --git a/fixture/CreateClusterSecurityGroup.yaml b/fixture/CreateClusterSecurityGroup.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/CreateClusterSecurityGroup.yaml
diff --git a/fixture/CreateClusterSecurityGroupResponse.proto b/fixture/CreateClusterSecurityGroupResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/CreateClusterSecurityGroupResponse.proto
diff --git a/fixture/CreateClusterSnapshot.yaml b/fixture/CreateClusterSnapshot.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/CreateClusterSnapshot.yaml
diff --git a/fixture/CreateClusterSnapshotResponse.proto b/fixture/CreateClusterSnapshotResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/CreateClusterSnapshotResponse.proto
diff --git a/fixture/CreateClusterSubnetGroup.yaml b/fixture/CreateClusterSubnetGroup.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/CreateClusterSubnetGroup.yaml
diff --git a/fixture/CreateClusterSubnetGroupResponse.proto b/fixture/CreateClusterSubnetGroupResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/CreateClusterSubnetGroupResponse.proto
diff --git a/fixture/CreateEventSubscription.yaml b/fixture/CreateEventSubscription.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/CreateEventSubscription.yaml
diff --git a/fixture/CreateEventSubscriptionResponse.proto b/fixture/CreateEventSubscriptionResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/CreateEventSubscriptionResponse.proto
diff --git a/fixture/CreateHSMClientCertificate.yaml b/fixture/CreateHSMClientCertificate.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/CreateHSMClientCertificate.yaml
diff --git a/fixture/CreateHSMClientCertificateResponse.proto b/fixture/CreateHSMClientCertificateResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/CreateHSMClientCertificateResponse.proto
diff --git a/fixture/CreateHSMConfiguration.yaml b/fixture/CreateHSMConfiguration.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/CreateHSMConfiguration.yaml
diff --git a/fixture/CreateHSMConfigurationResponse.proto b/fixture/CreateHSMConfigurationResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/CreateHSMConfigurationResponse.proto
diff --git a/fixture/CreateSnapshotCopyGrant.yaml b/fixture/CreateSnapshotCopyGrant.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/CreateSnapshotCopyGrant.yaml
diff --git a/fixture/CreateSnapshotCopyGrantResponse.proto b/fixture/CreateSnapshotCopyGrantResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/CreateSnapshotCopyGrantResponse.proto
diff --git a/fixture/CreateTags.yaml b/fixture/CreateTags.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/CreateTags.yaml
diff --git a/fixture/CreateTagsResponse.proto b/fixture/CreateTagsResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/CreateTagsResponse.proto
diff --git a/fixture/DeleteCluster.yaml b/fixture/DeleteCluster.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/DeleteCluster.yaml
diff --git a/fixture/DeleteClusterParameterGroup.yaml b/fixture/DeleteClusterParameterGroup.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/DeleteClusterParameterGroup.yaml
diff --git a/fixture/DeleteClusterParameterGroupResponse.proto b/fixture/DeleteClusterParameterGroupResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/DeleteClusterParameterGroupResponse.proto
diff --git a/fixture/DeleteClusterResponse.proto b/fixture/DeleteClusterResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/DeleteClusterResponse.proto
diff --git a/fixture/DeleteClusterSecurityGroup.yaml b/fixture/DeleteClusterSecurityGroup.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/DeleteClusterSecurityGroup.yaml
diff --git a/fixture/DeleteClusterSecurityGroupResponse.proto b/fixture/DeleteClusterSecurityGroupResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/DeleteClusterSecurityGroupResponse.proto
diff --git a/fixture/DeleteClusterSnapshot.yaml b/fixture/DeleteClusterSnapshot.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/DeleteClusterSnapshot.yaml
diff --git a/fixture/DeleteClusterSnapshotResponse.proto b/fixture/DeleteClusterSnapshotResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/DeleteClusterSnapshotResponse.proto
diff --git a/fixture/DeleteClusterSubnetGroup.yaml b/fixture/DeleteClusterSubnetGroup.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/DeleteClusterSubnetGroup.yaml
diff --git a/fixture/DeleteClusterSubnetGroupResponse.proto b/fixture/DeleteClusterSubnetGroupResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/DeleteClusterSubnetGroupResponse.proto
diff --git a/fixture/DeleteEventSubscription.yaml b/fixture/DeleteEventSubscription.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/DeleteEventSubscription.yaml
diff --git a/fixture/DeleteEventSubscriptionResponse.proto b/fixture/DeleteEventSubscriptionResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/DeleteEventSubscriptionResponse.proto
diff --git a/fixture/DeleteHSMClientCertificate.yaml b/fixture/DeleteHSMClientCertificate.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/DeleteHSMClientCertificate.yaml
diff --git a/fixture/DeleteHSMClientCertificateResponse.proto b/fixture/DeleteHSMClientCertificateResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/DeleteHSMClientCertificateResponse.proto
diff --git a/fixture/DeleteHSMConfiguration.yaml b/fixture/DeleteHSMConfiguration.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/DeleteHSMConfiguration.yaml
diff --git a/fixture/DeleteHSMConfigurationResponse.proto b/fixture/DeleteHSMConfigurationResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/DeleteHSMConfigurationResponse.proto
diff --git a/fixture/DeleteSnapshotCopyGrant.yaml b/fixture/DeleteSnapshotCopyGrant.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/DeleteSnapshotCopyGrant.yaml
diff --git a/fixture/DeleteSnapshotCopyGrantResponse.proto b/fixture/DeleteSnapshotCopyGrantResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/DeleteSnapshotCopyGrantResponse.proto
diff --git a/fixture/DeleteTags.yaml b/fixture/DeleteTags.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/DeleteTags.yaml
diff --git a/fixture/DeleteTagsResponse.proto b/fixture/DeleteTagsResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/DeleteTagsResponse.proto
diff --git a/fixture/DescribeClusterParameterGroups.yaml b/fixture/DescribeClusterParameterGroups.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeClusterParameterGroups.yaml
diff --git a/fixture/DescribeClusterParameterGroupsResponse.proto b/fixture/DescribeClusterParameterGroupsResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeClusterParameterGroupsResponse.proto
diff --git a/fixture/DescribeClusterParameters.yaml b/fixture/DescribeClusterParameters.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeClusterParameters.yaml
diff --git a/fixture/DescribeClusterParametersResponse.proto b/fixture/DescribeClusterParametersResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeClusterParametersResponse.proto
diff --git a/fixture/DescribeClusterSecurityGroups.yaml b/fixture/DescribeClusterSecurityGroups.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeClusterSecurityGroups.yaml
diff --git a/fixture/DescribeClusterSecurityGroupsResponse.proto b/fixture/DescribeClusterSecurityGroupsResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeClusterSecurityGroupsResponse.proto
diff --git a/fixture/DescribeClusterSnapshots.yaml b/fixture/DescribeClusterSnapshots.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeClusterSnapshots.yaml
diff --git a/fixture/DescribeClusterSnapshotsResponse.proto b/fixture/DescribeClusterSnapshotsResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeClusterSnapshotsResponse.proto
diff --git a/fixture/DescribeClusterSubnetGroups.yaml b/fixture/DescribeClusterSubnetGroups.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeClusterSubnetGroups.yaml
diff --git a/fixture/DescribeClusterSubnetGroupsResponse.proto b/fixture/DescribeClusterSubnetGroupsResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeClusterSubnetGroupsResponse.proto
diff --git a/fixture/DescribeClusterVersions.yaml b/fixture/DescribeClusterVersions.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeClusterVersions.yaml
diff --git a/fixture/DescribeClusterVersionsResponse.proto b/fixture/DescribeClusterVersionsResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeClusterVersionsResponse.proto
diff --git a/fixture/DescribeClusters.yaml b/fixture/DescribeClusters.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeClusters.yaml
diff --git a/fixture/DescribeClustersResponse.proto b/fixture/DescribeClustersResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeClustersResponse.proto
diff --git a/fixture/DescribeDefaultClusterParameters.yaml b/fixture/DescribeDefaultClusterParameters.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeDefaultClusterParameters.yaml
diff --git a/fixture/DescribeDefaultClusterParametersResponse.proto b/fixture/DescribeDefaultClusterParametersResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeDefaultClusterParametersResponse.proto
diff --git a/fixture/DescribeEventCategories.yaml b/fixture/DescribeEventCategories.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeEventCategories.yaml
diff --git a/fixture/DescribeEventCategoriesResponse.proto b/fixture/DescribeEventCategoriesResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeEventCategoriesResponse.proto
diff --git a/fixture/DescribeEventSubscriptions.yaml b/fixture/DescribeEventSubscriptions.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeEventSubscriptions.yaml
diff --git a/fixture/DescribeEventSubscriptionsResponse.proto b/fixture/DescribeEventSubscriptionsResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeEventSubscriptionsResponse.proto
diff --git a/fixture/DescribeEvents.yaml b/fixture/DescribeEvents.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeEvents.yaml
diff --git a/fixture/DescribeEventsResponse.proto b/fixture/DescribeEventsResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeEventsResponse.proto
diff --git a/fixture/DescribeHSMClientCertificates.yaml b/fixture/DescribeHSMClientCertificates.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeHSMClientCertificates.yaml
diff --git a/fixture/DescribeHSMClientCertificatesResponse.proto b/fixture/DescribeHSMClientCertificatesResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeHSMClientCertificatesResponse.proto
diff --git a/fixture/DescribeHSMConfigurations.yaml b/fixture/DescribeHSMConfigurations.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeHSMConfigurations.yaml
diff --git a/fixture/DescribeHSMConfigurationsResponse.proto b/fixture/DescribeHSMConfigurationsResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeHSMConfigurationsResponse.proto
diff --git a/fixture/DescribeLoggingStatus.yaml b/fixture/DescribeLoggingStatus.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeLoggingStatus.yaml
diff --git a/fixture/DescribeLoggingStatusResponse.proto b/fixture/DescribeLoggingStatusResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeLoggingStatusResponse.proto
diff --git a/fixture/DescribeOrderableClusterOptions.yaml b/fixture/DescribeOrderableClusterOptions.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeOrderableClusterOptions.yaml
diff --git a/fixture/DescribeOrderableClusterOptionsResponse.proto b/fixture/DescribeOrderableClusterOptionsResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeOrderableClusterOptionsResponse.proto
diff --git a/fixture/DescribeReservedNodeOfferings.yaml b/fixture/DescribeReservedNodeOfferings.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeReservedNodeOfferings.yaml
diff --git a/fixture/DescribeReservedNodeOfferingsResponse.proto b/fixture/DescribeReservedNodeOfferingsResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeReservedNodeOfferingsResponse.proto
diff --git a/fixture/DescribeReservedNodes.yaml b/fixture/DescribeReservedNodes.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeReservedNodes.yaml
diff --git a/fixture/DescribeReservedNodesResponse.proto b/fixture/DescribeReservedNodesResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeReservedNodesResponse.proto
diff --git a/fixture/DescribeResize.yaml b/fixture/DescribeResize.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeResize.yaml
diff --git a/fixture/DescribeResizeResponse.proto b/fixture/DescribeResizeResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeResizeResponse.proto
diff --git a/fixture/DescribeSnapshotCopyGrants.yaml b/fixture/DescribeSnapshotCopyGrants.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeSnapshotCopyGrants.yaml
diff --git a/fixture/DescribeSnapshotCopyGrantsResponse.proto b/fixture/DescribeSnapshotCopyGrantsResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeSnapshotCopyGrantsResponse.proto
diff --git a/fixture/DescribeTags.yaml b/fixture/DescribeTags.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeTags.yaml
diff --git a/fixture/DescribeTagsResponse.proto b/fixture/DescribeTagsResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeTagsResponse.proto
diff --git a/fixture/DisableLogging.yaml b/fixture/DisableLogging.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/DisableLogging.yaml
diff --git a/fixture/DisableLoggingResponse.proto b/fixture/DisableLoggingResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/DisableLoggingResponse.proto
diff --git a/fixture/DisableSnapshotCopy.yaml b/fixture/DisableSnapshotCopy.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/DisableSnapshotCopy.yaml
diff --git a/fixture/DisableSnapshotCopyResponse.proto b/fixture/DisableSnapshotCopyResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/DisableSnapshotCopyResponse.proto
diff --git a/fixture/EnableLogging.yaml b/fixture/EnableLogging.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/EnableLogging.yaml
diff --git a/fixture/EnableLoggingResponse.proto b/fixture/EnableLoggingResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/EnableLoggingResponse.proto
diff --git a/fixture/EnableSnapshotCopy.yaml b/fixture/EnableSnapshotCopy.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/EnableSnapshotCopy.yaml
diff --git a/fixture/EnableSnapshotCopyResponse.proto b/fixture/EnableSnapshotCopyResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/EnableSnapshotCopyResponse.proto
diff --git a/fixture/ModifyCluster.yaml b/fixture/ModifyCluster.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/ModifyCluster.yaml
diff --git a/fixture/ModifyClusterParameterGroup.yaml b/fixture/ModifyClusterParameterGroup.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/ModifyClusterParameterGroup.yaml
diff --git a/fixture/ModifyClusterParameterGroupResponse.proto b/fixture/ModifyClusterParameterGroupResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/ModifyClusterParameterGroupResponse.proto
diff --git a/fixture/ModifyClusterResponse.proto b/fixture/ModifyClusterResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/ModifyClusterResponse.proto
diff --git a/fixture/ModifyClusterSubnetGroup.yaml b/fixture/ModifyClusterSubnetGroup.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/ModifyClusterSubnetGroup.yaml
diff --git a/fixture/ModifyClusterSubnetGroupResponse.proto b/fixture/ModifyClusterSubnetGroupResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/ModifyClusterSubnetGroupResponse.proto
diff --git a/fixture/ModifyEventSubscription.yaml b/fixture/ModifyEventSubscription.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/ModifyEventSubscription.yaml
diff --git a/fixture/ModifyEventSubscriptionResponse.proto b/fixture/ModifyEventSubscriptionResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/ModifyEventSubscriptionResponse.proto
diff --git a/fixture/ModifySnapshotCopyRetentionPeriod.yaml b/fixture/ModifySnapshotCopyRetentionPeriod.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/ModifySnapshotCopyRetentionPeriod.yaml
diff --git a/fixture/ModifySnapshotCopyRetentionPeriodResponse.proto b/fixture/ModifySnapshotCopyRetentionPeriodResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/ModifySnapshotCopyRetentionPeriodResponse.proto
diff --git a/fixture/PurchaseReservedNodeOffering.yaml b/fixture/PurchaseReservedNodeOffering.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/PurchaseReservedNodeOffering.yaml
diff --git a/fixture/PurchaseReservedNodeOfferingResponse.proto b/fixture/PurchaseReservedNodeOfferingResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/PurchaseReservedNodeOfferingResponse.proto
diff --git a/fixture/RebootCluster.yaml b/fixture/RebootCluster.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/RebootCluster.yaml
diff --git a/fixture/RebootClusterResponse.proto b/fixture/RebootClusterResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/RebootClusterResponse.proto
diff --git a/fixture/ResetClusterParameterGroup.yaml b/fixture/ResetClusterParameterGroup.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/ResetClusterParameterGroup.yaml
diff --git a/fixture/ResetClusterParameterGroupResponse.proto b/fixture/ResetClusterParameterGroupResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/ResetClusterParameterGroupResponse.proto
diff --git a/fixture/RestoreFromClusterSnapshot.yaml b/fixture/RestoreFromClusterSnapshot.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/RestoreFromClusterSnapshot.yaml
diff --git a/fixture/RestoreFromClusterSnapshotResponse.proto b/fixture/RestoreFromClusterSnapshotResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/RestoreFromClusterSnapshotResponse.proto
diff --git a/fixture/RevokeClusterSecurityGroupIngress.yaml b/fixture/RevokeClusterSecurityGroupIngress.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/RevokeClusterSecurityGroupIngress.yaml
diff --git a/fixture/RevokeClusterSecurityGroupIngressResponse.proto b/fixture/RevokeClusterSecurityGroupIngressResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/RevokeClusterSecurityGroupIngressResponse.proto
diff --git a/fixture/RevokeSnapshotAccess.yaml b/fixture/RevokeSnapshotAccess.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/RevokeSnapshotAccess.yaml
diff --git a/fixture/RevokeSnapshotAccessResponse.proto b/fixture/RevokeSnapshotAccessResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/RevokeSnapshotAccessResponse.proto
diff --git a/fixture/RotateEncryptionKey.yaml b/fixture/RotateEncryptionKey.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/RotateEncryptionKey.yaml
diff --git a/fixture/RotateEncryptionKeyResponse.proto b/fixture/RotateEncryptionKeyResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/RotateEncryptionKeyResponse.proto
diff --git a/test/Test/AWS/Gen/Redshift.hs b/test/Test/AWS/Gen/Redshift.hs
--- a/test/Test/AWS/Gen/Redshift.hs
+++ b/test/Test/AWS/Gen/Redshift.hs
@@ -393,709 +393,709 @@
 testDescribeClusters :: DescribeClusters -> TestTree
 testDescribeClusters = req
     "DescribeClusters"
-    "fixture/DescribeClusters"
+    "fixture/DescribeClusters.yaml"
 
 testDescribeTags :: DescribeTags -> TestTree
 testDescribeTags = req
     "DescribeTags"
-    "fixture/DescribeTags"
+    "fixture/DescribeTags.yaml"
 
 testModifyEventSubscription :: ModifyEventSubscription -> TestTree
 testModifyEventSubscription = req
     "ModifyEventSubscription"
-    "fixture/ModifyEventSubscription"
+    "fixture/ModifyEventSubscription.yaml"
 
 testDisableLogging :: DisableLogging -> TestTree
 testDisableLogging = req
     "DisableLogging"
-    "fixture/DisableLogging"
+    "fixture/DisableLogging.yaml"
 
 testPurchaseReservedNodeOffering :: PurchaseReservedNodeOffering -> TestTree
 testPurchaseReservedNodeOffering = req
     "PurchaseReservedNodeOffering"
-    "fixture/PurchaseReservedNodeOffering"
+    "fixture/PurchaseReservedNodeOffering.yaml"
 
 testDeleteClusterSubnetGroup :: DeleteClusterSubnetGroup -> TestTree
 testDeleteClusterSubnetGroup = req
     "DeleteClusterSubnetGroup"
-    "fixture/DeleteClusterSubnetGroup"
+    "fixture/DeleteClusterSubnetGroup.yaml"
 
 testDeleteClusterSnapshot :: DeleteClusterSnapshot -> TestTree
 testDeleteClusterSnapshot = req
     "DeleteClusterSnapshot"
-    "fixture/DeleteClusterSnapshot"
+    "fixture/DeleteClusterSnapshot.yaml"
 
 testDescribeEvents :: DescribeEvents -> TestTree
 testDescribeEvents = req
     "DescribeEvents"
-    "fixture/DescribeEvents"
+    "fixture/DescribeEvents.yaml"
 
 testDescribeReservedNodeOfferings :: DescribeReservedNodeOfferings -> TestTree
 testDescribeReservedNodeOfferings = req
     "DescribeReservedNodeOfferings"
-    "fixture/DescribeReservedNodeOfferings"
+    "fixture/DescribeReservedNodeOfferings.yaml"
 
 testDescribeClusterParameterGroups :: DescribeClusterParameterGroups -> TestTree
 testDescribeClusterParameterGroups = req
     "DescribeClusterParameterGroups"
-    "fixture/DescribeClusterParameterGroups"
+    "fixture/DescribeClusterParameterGroups.yaml"
 
 testCreateClusterSubnetGroup :: CreateClusterSubnetGroup -> TestTree
 testCreateClusterSubnetGroup = req
     "CreateClusterSubnetGroup"
-    "fixture/CreateClusterSubnetGroup"
+    "fixture/CreateClusterSubnetGroup.yaml"
 
 testDescribeReservedNodes :: DescribeReservedNodes -> TestTree
 testDescribeReservedNodes = req
     "DescribeReservedNodes"
-    "fixture/DescribeReservedNodes"
+    "fixture/DescribeReservedNodes.yaml"
 
 testEnableLogging :: EnableLogging -> TestTree
 testEnableLogging = req
     "EnableLogging"
-    "fixture/EnableLogging"
+    "fixture/EnableLogging.yaml"
 
 testCreateTags :: CreateTags -> TestTree
 testCreateTags = req
     "CreateTags"
-    "fixture/CreateTags"
+    "fixture/CreateTags.yaml"
 
 testDescribeClusterSecurityGroups :: DescribeClusterSecurityGroups -> TestTree
 testDescribeClusterSecurityGroups = req
     "DescribeClusterSecurityGroups"
-    "fixture/DescribeClusterSecurityGroups"
+    "fixture/DescribeClusterSecurityGroups.yaml"
 
 testDeleteClusterParameterGroup :: DeleteClusterParameterGroup -> TestTree
 testDeleteClusterParameterGroup = req
     "DeleteClusterParameterGroup"
-    "fixture/DeleteClusterParameterGroup"
+    "fixture/DeleteClusterParameterGroup.yaml"
 
 testDeleteTags :: DeleteTags -> TestTree
 testDeleteTags = req
     "DeleteTags"
-    "fixture/DeleteTags"
+    "fixture/DeleteTags.yaml"
 
 testEnableSnapshotCopy :: EnableSnapshotCopy -> TestTree
 testEnableSnapshotCopy = req
     "EnableSnapshotCopy"
-    "fixture/EnableSnapshotCopy"
+    "fixture/EnableSnapshotCopy.yaml"
 
 testModifySnapshotCopyRetentionPeriod :: ModifySnapshotCopyRetentionPeriod -> TestTree
 testModifySnapshotCopyRetentionPeriod = req
     "ModifySnapshotCopyRetentionPeriod"
-    "fixture/ModifySnapshotCopyRetentionPeriod"
+    "fixture/ModifySnapshotCopyRetentionPeriod.yaml"
 
 testDescribeClusterSnapshots :: DescribeClusterSnapshots -> TestTree
 testDescribeClusterSnapshots = req
     "DescribeClusterSnapshots"
-    "fixture/DescribeClusterSnapshots"
+    "fixture/DescribeClusterSnapshots.yaml"
 
 testDescribeClusterSubnetGroups :: DescribeClusterSubnetGroups -> TestTree
 testDescribeClusterSubnetGroups = req
     "DescribeClusterSubnetGroups"
-    "fixture/DescribeClusterSubnetGroups"
+    "fixture/DescribeClusterSubnetGroups.yaml"
 
 testAuthorizeSnapshotAccess :: AuthorizeSnapshotAccess -> TestTree
 testAuthorizeSnapshotAccess = req
     "AuthorizeSnapshotAccess"
-    "fixture/AuthorizeSnapshotAccess"
+    "fixture/AuthorizeSnapshotAccess.yaml"
 
 testCreateEventSubscription :: CreateEventSubscription -> TestTree
 testCreateEventSubscription = req
     "CreateEventSubscription"
-    "fixture/CreateEventSubscription"
+    "fixture/CreateEventSubscription.yaml"
 
 testRebootCluster :: RebootCluster -> TestTree
 testRebootCluster = req
     "RebootCluster"
-    "fixture/RebootCluster"
+    "fixture/RebootCluster.yaml"
 
 testDescribeOrderableClusterOptions :: DescribeOrderableClusterOptions -> TestTree
 testDescribeOrderableClusterOptions = req
     "DescribeOrderableClusterOptions"
-    "fixture/DescribeOrderableClusterOptions"
+    "fixture/DescribeOrderableClusterOptions.yaml"
 
 testDeleteCluster :: DeleteCluster -> TestTree
 testDeleteCluster = req
     "DeleteCluster"
-    "fixture/DeleteCluster"
+    "fixture/DeleteCluster.yaml"
 
 testDeleteEventSubscription :: DeleteEventSubscription -> TestTree
 testDeleteEventSubscription = req
     "DeleteEventSubscription"
-    "fixture/DeleteEventSubscription"
+    "fixture/DeleteEventSubscription.yaml"
 
 testDescribeDefaultClusterParameters :: DescribeDefaultClusterParameters -> TestTree
 testDescribeDefaultClusterParameters = req
     "DescribeDefaultClusterParameters"
-    "fixture/DescribeDefaultClusterParameters"
+    "fixture/DescribeDefaultClusterParameters.yaml"
 
 testCreateCluster :: CreateCluster -> TestTree
 testCreateCluster = req
     "CreateCluster"
-    "fixture/CreateCluster"
+    "fixture/CreateCluster.yaml"
 
 testCreateHSMClientCertificate :: CreateHSMClientCertificate -> TestTree
 testCreateHSMClientCertificate = req
     "CreateHSMClientCertificate"
-    "fixture/CreateHSMClientCertificate"
+    "fixture/CreateHSMClientCertificate.yaml"
 
 testResetClusterParameterGroup :: ResetClusterParameterGroup -> TestTree
 testResetClusterParameterGroup = req
     "ResetClusterParameterGroup"
-    "fixture/ResetClusterParameterGroup"
+    "fixture/ResetClusterParameterGroup.yaml"
 
 testDescribeEventSubscriptions :: DescribeEventSubscriptions -> TestTree
 testDescribeEventSubscriptions = req
     "DescribeEventSubscriptions"
-    "fixture/DescribeEventSubscriptions"
+    "fixture/DescribeEventSubscriptions.yaml"
 
 testDescribeHSMClientCertificates :: DescribeHSMClientCertificates -> TestTree
 testDescribeHSMClientCertificates = req
     "DescribeHSMClientCertificates"
-    "fixture/DescribeHSMClientCertificates"
+    "fixture/DescribeHSMClientCertificates.yaml"
 
 testModifyClusterParameterGroup :: ModifyClusterParameterGroup -> TestTree
 testModifyClusterParameterGroup = req
     "ModifyClusterParameterGroup"
-    "fixture/ModifyClusterParameterGroup"
+    "fixture/ModifyClusterParameterGroup.yaml"
 
 testRevokeClusterSecurityGroupIngress :: RevokeClusterSecurityGroupIngress -> TestTree
 testRevokeClusterSecurityGroupIngress = req
     "RevokeClusterSecurityGroupIngress"
-    "fixture/RevokeClusterSecurityGroupIngress"
+    "fixture/RevokeClusterSecurityGroupIngress.yaml"
 
 testAuthorizeClusterSecurityGroupIngress :: AuthorizeClusterSecurityGroupIngress -> TestTree
 testAuthorizeClusterSecurityGroupIngress = req
     "AuthorizeClusterSecurityGroupIngress"
-    "fixture/AuthorizeClusterSecurityGroupIngress"
+    "fixture/AuthorizeClusterSecurityGroupIngress.yaml"
 
 testCreateClusterSecurityGroup :: CreateClusterSecurityGroup -> TestTree
 testCreateClusterSecurityGroup = req
     "CreateClusterSecurityGroup"
-    "fixture/CreateClusterSecurityGroup"
+    "fixture/CreateClusterSecurityGroup.yaml"
 
 testDescribeResize :: DescribeResize -> TestTree
 testDescribeResize = req
     "DescribeResize"
-    "fixture/DescribeResize"
+    "fixture/DescribeResize.yaml"
 
 testDescribeEventCategories :: DescribeEventCategories -> TestTree
 testDescribeEventCategories = req
     "DescribeEventCategories"
-    "fixture/DescribeEventCategories"
+    "fixture/DescribeEventCategories.yaml"
 
 testDeleteHSMConfiguration :: DeleteHSMConfiguration -> TestTree
 testDeleteHSMConfiguration = req
     "DeleteHSMConfiguration"
-    "fixture/DeleteHSMConfiguration"
+    "fixture/DeleteHSMConfiguration.yaml"
 
 testDeleteClusterSecurityGroup :: DeleteClusterSecurityGroup -> TestTree
 testDeleteClusterSecurityGroup = req
     "DeleteClusterSecurityGroup"
-    "fixture/DeleteClusterSecurityGroup"
+    "fixture/DeleteClusterSecurityGroup.yaml"
 
 testCreateHSMConfiguration :: CreateHSMConfiguration -> TestTree
 testCreateHSMConfiguration = req
     "CreateHSMConfiguration"
-    "fixture/CreateHSMConfiguration"
+    "fixture/CreateHSMConfiguration.yaml"
 
 testModifyCluster :: ModifyCluster -> TestTree
 testModifyCluster = req
     "ModifyCluster"
-    "fixture/ModifyCluster"
+    "fixture/ModifyCluster.yaml"
 
 testCreateClusterSnapshot :: CreateClusterSnapshot -> TestTree
 testCreateClusterSnapshot = req
     "CreateClusterSnapshot"
-    "fixture/CreateClusterSnapshot"
+    "fixture/CreateClusterSnapshot.yaml"
 
 testDescribeLoggingStatus :: DescribeLoggingStatus -> TestTree
 testDescribeLoggingStatus = req
     "DescribeLoggingStatus"
-    "fixture/DescribeLoggingStatus"
+    "fixture/DescribeLoggingStatus.yaml"
 
 testDescribeClusterParameters :: DescribeClusterParameters -> TestTree
 testDescribeClusterParameters = req
     "DescribeClusterParameters"
-    "fixture/DescribeClusterParameters"
+    "fixture/DescribeClusterParameters.yaml"
 
 testDisableSnapshotCopy :: DisableSnapshotCopy -> TestTree
 testDisableSnapshotCopy = req
     "DisableSnapshotCopy"
-    "fixture/DisableSnapshotCopy"
+    "fixture/DisableSnapshotCopy.yaml"
 
 testRestoreFromClusterSnapshot :: RestoreFromClusterSnapshot -> TestTree
 testRestoreFromClusterSnapshot = req
     "RestoreFromClusterSnapshot"
-    "fixture/RestoreFromClusterSnapshot"
+    "fixture/RestoreFromClusterSnapshot.yaml"
 
 testDescribeHSMConfigurations :: DescribeHSMConfigurations -> TestTree
 testDescribeHSMConfigurations = req
     "DescribeHSMConfigurations"
-    "fixture/DescribeHSMConfigurations"
+    "fixture/DescribeHSMConfigurations.yaml"
 
 testCreateClusterParameterGroup :: CreateClusterParameterGroup -> TestTree
 testCreateClusterParameterGroup = req
     "CreateClusterParameterGroup"
-    "fixture/CreateClusterParameterGroup"
+    "fixture/CreateClusterParameterGroup.yaml"
 
 testRevokeSnapshotAccess :: RevokeSnapshotAccess -> TestTree
 testRevokeSnapshotAccess = req
     "RevokeSnapshotAccess"
-    "fixture/RevokeSnapshotAccess"
+    "fixture/RevokeSnapshotAccess.yaml"
 
 testDeleteHSMClientCertificate :: DeleteHSMClientCertificate -> TestTree
 testDeleteHSMClientCertificate = req
     "DeleteHSMClientCertificate"
-    "fixture/DeleteHSMClientCertificate"
+    "fixture/DeleteHSMClientCertificate.yaml"
 
 testCreateSnapshotCopyGrant :: CreateSnapshotCopyGrant -> TestTree
 testCreateSnapshotCopyGrant = req
     "CreateSnapshotCopyGrant"
-    "fixture/CreateSnapshotCopyGrant"
+    "fixture/CreateSnapshotCopyGrant.yaml"
 
 testCopyClusterSnapshot :: CopyClusterSnapshot -> TestTree
 testCopyClusterSnapshot = req
     "CopyClusterSnapshot"
-    "fixture/CopyClusterSnapshot"
+    "fixture/CopyClusterSnapshot.yaml"
 
 testDescribeClusterVersions :: DescribeClusterVersions -> TestTree
 testDescribeClusterVersions = req
     "DescribeClusterVersions"
-    "fixture/DescribeClusterVersions"
+    "fixture/DescribeClusterVersions.yaml"
 
 testModifyClusterSubnetGroup :: ModifyClusterSubnetGroup -> TestTree
 testModifyClusterSubnetGroup = req
     "ModifyClusterSubnetGroup"
-    "fixture/ModifyClusterSubnetGroup"
+    "fixture/ModifyClusterSubnetGroup.yaml"
 
 testDeleteSnapshotCopyGrant :: DeleteSnapshotCopyGrant -> TestTree
 testDeleteSnapshotCopyGrant = req
     "DeleteSnapshotCopyGrant"
-    "fixture/DeleteSnapshotCopyGrant"
+    "fixture/DeleteSnapshotCopyGrant.yaml"
 
 testDescribeSnapshotCopyGrants :: DescribeSnapshotCopyGrants -> TestTree
 testDescribeSnapshotCopyGrants = req
     "DescribeSnapshotCopyGrants"
-    "fixture/DescribeSnapshotCopyGrants"
+    "fixture/DescribeSnapshotCopyGrants.yaml"
 
 testRotateEncryptionKey :: RotateEncryptionKey -> TestTree
 testRotateEncryptionKey = req
     "RotateEncryptionKey"
-    "fixture/RotateEncryptionKey"
+    "fixture/RotateEncryptionKey.yaml"
 
 -- Responses
 
 testDescribeClustersResponse :: DescribeClustersResponse -> TestTree
 testDescribeClustersResponse = res
     "DescribeClustersResponse"
-    "fixture/DescribeClustersResponse"
+    "fixture/DescribeClustersResponse.proto"
     redshift
     (Proxy :: Proxy DescribeClusters)
 
 testDescribeTagsResponse :: DescribeTagsResponse -> TestTree
 testDescribeTagsResponse = res
     "DescribeTagsResponse"
-    "fixture/DescribeTagsResponse"
+    "fixture/DescribeTagsResponse.proto"
     redshift
     (Proxy :: Proxy DescribeTags)
 
 testModifyEventSubscriptionResponse :: ModifyEventSubscriptionResponse -> TestTree
 testModifyEventSubscriptionResponse = res
     "ModifyEventSubscriptionResponse"
-    "fixture/ModifyEventSubscriptionResponse"
+    "fixture/ModifyEventSubscriptionResponse.proto"
     redshift
     (Proxy :: Proxy ModifyEventSubscription)
 
 testDisableLoggingResponse :: LoggingStatus -> TestTree
 testDisableLoggingResponse = res
     "DisableLoggingResponse"
-    "fixture/DisableLoggingResponse"
+    "fixture/DisableLoggingResponse.proto"
     redshift
     (Proxy :: Proxy DisableLogging)
 
 testPurchaseReservedNodeOfferingResponse :: PurchaseReservedNodeOfferingResponse -> TestTree
 testPurchaseReservedNodeOfferingResponse = res
     "PurchaseReservedNodeOfferingResponse"
-    "fixture/PurchaseReservedNodeOfferingResponse"
+    "fixture/PurchaseReservedNodeOfferingResponse.proto"
     redshift
     (Proxy :: Proxy PurchaseReservedNodeOffering)
 
 testDeleteClusterSubnetGroupResponse :: DeleteClusterSubnetGroupResponse -> TestTree
 testDeleteClusterSubnetGroupResponse = res
     "DeleteClusterSubnetGroupResponse"
-    "fixture/DeleteClusterSubnetGroupResponse"
+    "fixture/DeleteClusterSubnetGroupResponse.proto"
     redshift
     (Proxy :: Proxy DeleteClusterSubnetGroup)
 
 testDeleteClusterSnapshotResponse :: DeleteClusterSnapshotResponse -> TestTree
 testDeleteClusterSnapshotResponse = res
     "DeleteClusterSnapshotResponse"
-    "fixture/DeleteClusterSnapshotResponse"
+    "fixture/DeleteClusterSnapshotResponse.proto"
     redshift
     (Proxy :: Proxy DeleteClusterSnapshot)
 
 testDescribeEventsResponse :: DescribeEventsResponse -> TestTree
 testDescribeEventsResponse = res
     "DescribeEventsResponse"
-    "fixture/DescribeEventsResponse"
+    "fixture/DescribeEventsResponse.proto"
     redshift
     (Proxy :: Proxy DescribeEvents)
 
 testDescribeReservedNodeOfferingsResponse :: DescribeReservedNodeOfferingsResponse -> TestTree
 testDescribeReservedNodeOfferingsResponse = res
     "DescribeReservedNodeOfferingsResponse"
-    "fixture/DescribeReservedNodeOfferingsResponse"
+    "fixture/DescribeReservedNodeOfferingsResponse.proto"
     redshift
     (Proxy :: Proxy DescribeReservedNodeOfferings)
 
 testDescribeClusterParameterGroupsResponse :: DescribeClusterParameterGroupsResponse -> TestTree
 testDescribeClusterParameterGroupsResponse = res
     "DescribeClusterParameterGroupsResponse"
-    "fixture/DescribeClusterParameterGroupsResponse"
+    "fixture/DescribeClusterParameterGroupsResponse.proto"
     redshift
     (Proxy :: Proxy DescribeClusterParameterGroups)
 
 testCreateClusterSubnetGroupResponse :: CreateClusterSubnetGroupResponse -> TestTree
 testCreateClusterSubnetGroupResponse = res
     "CreateClusterSubnetGroupResponse"
-    "fixture/CreateClusterSubnetGroupResponse"
+    "fixture/CreateClusterSubnetGroupResponse.proto"
     redshift
     (Proxy :: Proxy CreateClusterSubnetGroup)
 
 testDescribeReservedNodesResponse :: DescribeReservedNodesResponse -> TestTree
 testDescribeReservedNodesResponse = res
     "DescribeReservedNodesResponse"
-    "fixture/DescribeReservedNodesResponse"
+    "fixture/DescribeReservedNodesResponse.proto"
     redshift
     (Proxy :: Proxy DescribeReservedNodes)
 
 testEnableLoggingResponse :: LoggingStatus -> TestTree
 testEnableLoggingResponse = res
     "EnableLoggingResponse"
-    "fixture/EnableLoggingResponse"
+    "fixture/EnableLoggingResponse.proto"
     redshift
     (Proxy :: Proxy EnableLogging)
 
 testCreateTagsResponse :: CreateTagsResponse -> TestTree
 testCreateTagsResponse = res
     "CreateTagsResponse"
-    "fixture/CreateTagsResponse"
+    "fixture/CreateTagsResponse.proto"
     redshift
     (Proxy :: Proxy CreateTags)
 
 testDescribeClusterSecurityGroupsResponse :: DescribeClusterSecurityGroupsResponse -> TestTree
 testDescribeClusterSecurityGroupsResponse = res
     "DescribeClusterSecurityGroupsResponse"
-    "fixture/DescribeClusterSecurityGroupsResponse"
+    "fixture/DescribeClusterSecurityGroupsResponse.proto"
     redshift
     (Proxy :: Proxy DescribeClusterSecurityGroups)
 
 testDeleteClusterParameterGroupResponse :: DeleteClusterParameterGroupResponse -> TestTree
 testDeleteClusterParameterGroupResponse = res
     "DeleteClusterParameterGroupResponse"
-    "fixture/DeleteClusterParameterGroupResponse"
+    "fixture/DeleteClusterParameterGroupResponse.proto"
     redshift
     (Proxy :: Proxy DeleteClusterParameterGroup)
 
 testDeleteTagsResponse :: DeleteTagsResponse -> TestTree
 testDeleteTagsResponse = res
     "DeleteTagsResponse"
-    "fixture/DeleteTagsResponse"
+    "fixture/DeleteTagsResponse.proto"
     redshift
     (Proxy :: Proxy DeleteTags)
 
 testEnableSnapshotCopyResponse :: EnableSnapshotCopyResponse -> TestTree
 testEnableSnapshotCopyResponse = res
     "EnableSnapshotCopyResponse"
-    "fixture/EnableSnapshotCopyResponse"
+    "fixture/EnableSnapshotCopyResponse.proto"
     redshift
     (Proxy :: Proxy EnableSnapshotCopy)
 
 testModifySnapshotCopyRetentionPeriodResponse :: ModifySnapshotCopyRetentionPeriodResponse -> TestTree
 testModifySnapshotCopyRetentionPeriodResponse = res
     "ModifySnapshotCopyRetentionPeriodResponse"
-    "fixture/ModifySnapshotCopyRetentionPeriodResponse"
+    "fixture/ModifySnapshotCopyRetentionPeriodResponse.proto"
     redshift
     (Proxy :: Proxy ModifySnapshotCopyRetentionPeriod)
 
 testDescribeClusterSnapshotsResponse :: DescribeClusterSnapshotsResponse -> TestTree
 testDescribeClusterSnapshotsResponse = res
     "DescribeClusterSnapshotsResponse"
-    "fixture/DescribeClusterSnapshotsResponse"
+    "fixture/DescribeClusterSnapshotsResponse.proto"
     redshift
     (Proxy :: Proxy DescribeClusterSnapshots)
 
 testDescribeClusterSubnetGroupsResponse :: DescribeClusterSubnetGroupsResponse -> TestTree
 testDescribeClusterSubnetGroupsResponse = res
     "DescribeClusterSubnetGroupsResponse"
-    "fixture/DescribeClusterSubnetGroupsResponse"
+    "fixture/DescribeClusterSubnetGroupsResponse.proto"
     redshift
     (Proxy :: Proxy DescribeClusterSubnetGroups)
 
 testAuthorizeSnapshotAccessResponse :: AuthorizeSnapshotAccessResponse -> TestTree
 testAuthorizeSnapshotAccessResponse = res
     "AuthorizeSnapshotAccessResponse"
-    "fixture/AuthorizeSnapshotAccessResponse"
+    "fixture/AuthorizeSnapshotAccessResponse.proto"
     redshift
     (Proxy :: Proxy AuthorizeSnapshotAccess)
 
 testCreateEventSubscriptionResponse :: CreateEventSubscriptionResponse -> TestTree
 testCreateEventSubscriptionResponse = res
     "CreateEventSubscriptionResponse"
-    "fixture/CreateEventSubscriptionResponse"
+    "fixture/CreateEventSubscriptionResponse.proto"
     redshift
     (Proxy :: Proxy CreateEventSubscription)
 
 testRebootClusterResponse :: RebootClusterResponse -> TestTree
 testRebootClusterResponse = res
     "RebootClusterResponse"
-    "fixture/RebootClusterResponse"
+    "fixture/RebootClusterResponse.proto"
     redshift
     (Proxy :: Proxy RebootCluster)
 
 testDescribeOrderableClusterOptionsResponse :: DescribeOrderableClusterOptionsResponse -> TestTree
 testDescribeOrderableClusterOptionsResponse = res
     "DescribeOrderableClusterOptionsResponse"
-    "fixture/DescribeOrderableClusterOptionsResponse"
+    "fixture/DescribeOrderableClusterOptionsResponse.proto"
     redshift
     (Proxy :: Proxy DescribeOrderableClusterOptions)
 
 testDeleteClusterResponse :: DeleteClusterResponse -> TestTree
 testDeleteClusterResponse = res
     "DeleteClusterResponse"
-    "fixture/DeleteClusterResponse"
+    "fixture/DeleteClusterResponse.proto"
     redshift
     (Proxy :: Proxy DeleteCluster)
 
 testDeleteEventSubscriptionResponse :: DeleteEventSubscriptionResponse -> TestTree
 testDeleteEventSubscriptionResponse = res
     "DeleteEventSubscriptionResponse"
-    "fixture/DeleteEventSubscriptionResponse"
+    "fixture/DeleteEventSubscriptionResponse.proto"
     redshift
     (Proxy :: Proxy DeleteEventSubscription)
 
 testDescribeDefaultClusterParametersResponse :: DescribeDefaultClusterParametersResponse -> TestTree
 testDescribeDefaultClusterParametersResponse = res
     "DescribeDefaultClusterParametersResponse"
-    "fixture/DescribeDefaultClusterParametersResponse"
+    "fixture/DescribeDefaultClusterParametersResponse.proto"
     redshift
     (Proxy :: Proxy DescribeDefaultClusterParameters)
 
 testCreateClusterResponse :: CreateClusterResponse -> TestTree
 testCreateClusterResponse = res
     "CreateClusterResponse"
-    "fixture/CreateClusterResponse"
+    "fixture/CreateClusterResponse.proto"
     redshift
     (Proxy :: Proxy CreateCluster)
 
 testCreateHSMClientCertificateResponse :: CreateHSMClientCertificateResponse -> TestTree
 testCreateHSMClientCertificateResponse = res
     "CreateHSMClientCertificateResponse"
-    "fixture/CreateHSMClientCertificateResponse"
+    "fixture/CreateHSMClientCertificateResponse.proto"
     redshift
     (Proxy :: Proxy CreateHSMClientCertificate)
 
 testResetClusterParameterGroupResponse :: ClusterParameterGroupNameMessage -> TestTree
 testResetClusterParameterGroupResponse = res
     "ResetClusterParameterGroupResponse"
-    "fixture/ResetClusterParameterGroupResponse"
+    "fixture/ResetClusterParameterGroupResponse.proto"
     redshift
     (Proxy :: Proxy ResetClusterParameterGroup)
 
 testDescribeEventSubscriptionsResponse :: DescribeEventSubscriptionsResponse -> TestTree
 testDescribeEventSubscriptionsResponse = res
     "DescribeEventSubscriptionsResponse"
-    "fixture/DescribeEventSubscriptionsResponse"
+    "fixture/DescribeEventSubscriptionsResponse.proto"
     redshift
     (Proxy :: Proxy DescribeEventSubscriptions)
 
 testDescribeHSMClientCertificatesResponse :: DescribeHSMClientCertificatesResponse -> TestTree
 testDescribeHSMClientCertificatesResponse = res
     "DescribeHSMClientCertificatesResponse"
-    "fixture/DescribeHSMClientCertificatesResponse"
+    "fixture/DescribeHSMClientCertificatesResponse.proto"
     redshift
     (Proxy :: Proxy DescribeHSMClientCertificates)
 
 testModifyClusterParameterGroupResponse :: ClusterParameterGroupNameMessage -> TestTree
 testModifyClusterParameterGroupResponse = res
     "ModifyClusterParameterGroupResponse"
-    "fixture/ModifyClusterParameterGroupResponse"
+    "fixture/ModifyClusterParameterGroupResponse.proto"
     redshift
     (Proxy :: Proxy ModifyClusterParameterGroup)
 
 testRevokeClusterSecurityGroupIngressResponse :: RevokeClusterSecurityGroupIngressResponse -> TestTree
 testRevokeClusterSecurityGroupIngressResponse = res
     "RevokeClusterSecurityGroupIngressResponse"
-    "fixture/RevokeClusterSecurityGroupIngressResponse"
+    "fixture/RevokeClusterSecurityGroupIngressResponse.proto"
     redshift
     (Proxy :: Proxy RevokeClusterSecurityGroupIngress)
 
 testAuthorizeClusterSecurityGroupIngressResponse :: AuthorizeClusterSecurityGroupIngressResponse -> TestTree
 testAuthorizeClusterSecurityGroupIngressResponse = res
     "AuthorizeClusterSecurityGroupIngressResponse"
-    "fixture/AuthorizeClusterSecurityGroupIngressResponse"
+    "fixture/AuthorizeClusterSecurityGroupIngressResponse.proto"
     redshift
     (Proxy :: Proxy AuthorizeClusterSecurityGroupIngress)
 
 testCreateClusterSecurityGroupResponse :: CreateClusterSecurityGroupResponse -> TestTree
 testCreateClusterSecurityGroupResponse = res
     "CreateClusterSecurityGroupResponse"
-    "fixture/CreateClusterSecurityGroupResponse"
+    "fixture/CreateClusterSecurityGroupResponse.proto"
     redshift
     (Proxy :: Proxy CreateClusterSecurityGroup)
 
 testDescribeResizeResponse :: DescribeResizeResponse -> TestTree
 testDescribeResizeResponse = res
     "DescribeResizeResponse"
-    "fixture/DescribeResizeResponse"
+    "fixture/DescribeResizeResponse.proto"
     redshift
     (Proxy :: Proxy DescribeResize)
 
 testDescribeEventCategoriesResponse :: DescribeEventCategoriesResponse -> TestTree
 testDescribeEventCategoriesResponse = res
     "DescribeEventCategoriesResponse"
-    "fixture/DescribeEventCategoriesResponse"
+    "fixture/DescribeEventCategoriesResponse.proto"
     redshift
     (Proxy :: Proxy DescribeEventCategories)
 
 testDeleteHSMConfigurationResponse :: DeleteHSMConfigurationResponse -> TestTree
 testDeleteHSMConfigurationResponse = res
     "DeleteHSMConfigurationResponse"
-    "fixture/DeleteHSMConfigurationResponse"
+    "fixture/DeleteHSMConfigurationResponse.proto"
     redshift
     (Proxy :: Proxy DeleteHSMConfiguration)
 
 testDeleteClusterSecurityGroupResponse :: DeleteClusterSecurityGroupResponse -> TestTree
 testDeleteClusterSecurityGroupResponse = res
     "DeleteClusterSecurityGroupResponse"
-    "fixture/DeleteClusterSecurityGroupResponse"
+    "fixture/DeleteClusterSecurityGroupResponse.proto"
     redshift
     (Proxy :: Proxy DeleteClusterSecurityGroup)
 
 testCreateHSMConfigurationResponse :: CreateHSMConfigurationResponse -> TestTree
 testCreateHSMConfigurationResponse = res
     "CreateHSMConfigurationResponse"
-    "fixture/CreateHSMConfigurationResponse"
+    "fixture/CreateHSMConfigurationResponse.proto"
     redshift
     (Proxy :: Proxy CreateHSMConfiguration)
 
 testModifyClusterResponse :: ModifyClusterResponse -> TestTree
 testModifyClusterResponse = res
     "ModifyClusterResponse"
-    "fixture/ModifyClusterResponse"
+    "fixture/ModifyClusterResponse.proto"
     redshift
     (Proxy :: Proxy ModifyCluster)
 
 testCreateClusterSnapshotResponse :: CreateClusterSnapshotResponse -> TestTree
 testCreateClusterSnapshotResponse = res
     "CreateClusterSnapshotResponse"
-    "fixture/CreateClusterSnapshotResponse"
+    "fixture/CreateClusterSnapshotResponse.proto"
     redshift
     (Proxy :: Proxy CreateClusterSnapshot)
 
 testDescribeLoggingStatusResponse :: LoggingStatus -> TestTree
 testDescribeLoggingStatusResponse = res
     "DescribeLoggingStatusResponse"
-    "fixture/DescribeLoggingStatusResponse"
+    "fixture/DescribeLoggingStatusResponse.proto"
     redshift
     (Proxy :: Proxy DescribeLoggingStatus)
 
 testDescribeClusterParametersResponse :: DescribeClusterParametersResponse -> TestTree
 testDescribeClusterParametersResponse = res
     "DescribeClusterParametersResponse"
-    "fixture/DescribeClusterParametersResponse"
+    "fixture/DescribeClusterParametersResponse.proto"
     redshift
     (Proxy :: Proxy DescribeClusterParameters)
 
 testDisableSnapshotCopyResponse :: DisableSnapshotCopyResponse -> TestTree
 testDisableSnapshotCopyResponse = res
     "DisableSnapshotCopyResponse"
-    "fixture/DisableSnapshotCopyResponse"
+    "fixture/DisableSnapshotCopyResponse.proto"
     redshift
     (Proxy :: Proxy DisableSnapshotCopy)
 
 testRestoreFromClusterSnapshotResponse :: RestoreFromClusterSnapshotResponse -> TestTree
 testRestoreFromClusterSnapshotResponse = res
     "RestoreFromClusterSnapshotResponse"
-    "fixture/RestoreFromClusterSnapshotResponse"
+    "fixture/RestoreFromClusterSnapshotResponse.proto"
     redshift
     (Proxy :: Proxy RestoreFromClusterSnapshot)
 
 testDescribeHSMConfigurationsResponse :: DescribeHSMConfigurationsResponse -> TestTree
 testDescribeHSMConfigurationsResponse = res
     "DescribeHSMConfigurationsResponse"
-    "fixture/DescribeHSMConfigurationsResponse"
+    "fixture/DescribeHSMConfigurationsResponse.proto"
     redshift
     (Proxy :: Proxy DescribeHSMConfigurations)
 
 testCreateClusterParameterGroupResponse :: CreateClusterParameterGroupResponse -> TestTree
 testCreateClusterParameterGroupResponse = res
     "CreateClusterParameterGroupResponse"
-    "fixture/CreateClusterParameterGroupResponse"
+    "fixture/CreateClusterParameterGroupResponse.proto"
     redshift
     (Proxy :: Proxy CreateClusterParameterGroup)
 
 testRevokeSnapshotAccessResponse :: RevokeSnapshotAccessResponse -> TestTree
 testRevokeSnapshotAccessResponse = res
     "RevokeSnapshotAccessResponse"
-    "fixture/RevokeSnapshotAccessResponse"
+    "fixture/RevokeSnapshotAccessResponse.proto"
     redshift
     (Proxy :: Proxy RevokeSnapshotAccess)
 
 testDeleteHSMClientCertificateResponse :: DeleteHSMClientCertificateResponse -> TestTree
 testDeleteHSMClientCertificateResponse = res
     "DeleteHSMClientCertificateResponse"
-    "fixture/DeleteHSMClientCertificateResponse"
+    "fixture/DeleteHSMClientCertificateResponse.proto"
     redshift
     (Proxy :: Proxy DeleteHSMClientCertificate)
 
 testCreateSnapshotCopyGrantResponse :: CreateSnapshotCopyGrantResponse -> TestTree
 testCreateSnapshotCopyGrantResponse = res
     "CreateSnapshotCopyGrantResponse"
-    "fixture/CreateSnapshotCopyGrantResponse"
+    "fixture/CreateSnapshotCopyGrantResponse.proto"
     redshift
     (Proxy :: Proxy CreateSnapshotCopyGrant)
 
 testCopyClusterSnapshotResponse :: CopyClusterSnapshotResponse -> TestTree
 testCopyClusterSnapshotResponse = res
     "CopyClusterSnapshotResponse"
-    "fixture/CopyClusterSnapshotResponse"
+    "fixture/CopyClusterSnapshotResponse.proto"
     redshift
     (Proxy :: Proxy CopyClusterSnapshot)
 
 testDescribeClusterVersionsResponse :: DescribeClusterVersionsResponse -> TestTree
 testDescribeClusterVersionsResponse = res
     "DescribeClusterVersionsResponse"
-    "fixture/DescribeClusterVersionsResponse"
+    "fixture/DescribeClusterVersionsResponse.proto"
     redshift
     (Proxy :: Proxy DescribeClusterVersions)
 
 testModifyClusterSubnetGroupResponse :: ModifyClusterSubnetGroupResponse -> TestTree
 testModifyClusterSubnetGroupResponse = res
     "ModifyClusterSubnetGroupResponse"
-    "fixture/ModifyClusterSubnetGroupResponse"
+    "fixture/ModifyClusterSubnetGroupResponse.proto"
     redshift
     (Proxy :: Proxy ModifyClusterSubnetGroup)
 
 testDeleteSnapshotCopyGrantResponse :: DeleteSnapshotCopyGrantResponse -> TestTree
 testDeleteSnapshotCopyGrantResponse = res
     "DeleteSnapshotCopyGrantResponse"
-    "fixture/DeleteSnapshotCopyGrantResponse"
+    "fixture/DeleteSnapshotCopyGrantResponse.proto"
     redshift
     (Proxy :: Proxy DeleteSnapshotCopyGrant)
 
 testDescribeSnapshotCopyGrantsResponse :: DescribeSnapshotCopyGrantsResponse -> TestTree
 testDescribeSnapshotCopyGrantsResponse = res
     "DescribeSnapshotCopyGrantsResponse"
-    "fixture/DescribeSnapshotCopyGrantsResponse"
+    "fixture/DescribeSnapshotCopyGrantsResponse.proto"
     redshift
     (Proxy :: Proxy DescribeSnapshotCopyGrants)
 
 testRotateEncryptionKeyResponse :: RotateEncryptionKeyResponse -> TestTree
 testRotateEncryptionKeyResponse = res
     "RotateEncryptionKeyResponse"
-    "fixture/RotateEncryptionKeyResponse"
+    "fixture/RotateEncryptionKeyResponse.proto"
     redshift
     (Proxy :: Proxy RotateEncryptionKey)
