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-elasticache.cabal b/amazonka-elasticache.cabal
--- a/amazonka-elasticache.cabal
+++ b/amazonka-elasticache.cabal
@@ -1,7 +1,8 @@
 name:                  amazonka-elasticache
-version:               1.2.0.1
+version:               1.2.0.2
 synopsis:              Amazon ElastiCache 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 ElastiCache
 
@@ -110,8 +110,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.ElastiCache
         , Test.AWS.Gen.ElastiCache
diff --git a/fixture/AddTagsToResource.yaml b/fixture/AddTagsToResource.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/AddTagsToResource.yaml
diff --git a/fixture/AddTagsToResourceResponse.proto b/fixture/AddTagsToResourceResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/AddTagsToResourceResponse.proto
diff --git a/fixture/AuthorizeCacheSecurityGroupIngress.yaml b/fixture/AuthorizeCacheSecurityGroupIngress.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/AuthorizeCacheSecurityGroupIngress.yaml
diff --git a/fixture/AuthorizeCacheSecurityGroupIngressResponse.proto b/fixture/AuthorizeCacheSecurityGroupIngressResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/AuthorizeCacheSecurityGroupIngressResponse.proto
diff --git a/fixture/CopySnapshot.yaml b/fixture/CopySnapshot.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/CopySnapshot.yaml
diff --git a/fixture/CopySnapshotResponse.proto b/fixture/CopySnapshotResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/CopySnapshotResponse.proto
diff --git a/fixture/CreateCacheCluster.yaml b/fixture/CreateCacheCluster.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/CreateCacheCluster.yaml
diff --git a/fixture/CreateCacheClusterResponse.proto b/fixture/CreateCacheClusterResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/CreateCacheClusterResponse.proto
diff --git a/fixture/CreateCacheParameterGroup.yaml b/fixture/CreateCacheParameterGroup.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/CreateCacheParameterGroup.yaml
diff --git a/fixture/CreateCacheParameterGroupResponse.proto b/fixture/CreateCacheParameterGroupResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/CreateCacheParameterGroupResponse.proto
diff --git a/fixture/CreateCacheSecurityGroup.yaml b/fixture/CreateCacheSecurityGroup.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/CreateCacheSecurityGroup.yaml
diff --git a/fixture/CreateCacheSecurityGroupResponse.proto b/fixture/CreateCacheSecurityGroupResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/CreateCacheSecurityGroupResponse.proto
diff --git a/fixture/CreateCacheSubnetGroup.yaml b/fixture/CreateCacheSubnetGroup.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/CreateCacheSubnetGroup.yaml
diff --git a/fixture/CreateCacheSubnetGroupResponse.proto b/fixture/CreateCacheSubnetGroupResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/CreateCacheSubnetGroupResponse.proto
diff --git a/fixture/CreateReplicationGroup.yaml b/fixture/CreateReplicationGroup.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/CreateReplicationGroup.yaml
diff --git a/fixture/CreateReplicationGroupResponse.proto b/fixture/CreateReplicationGroupResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/CreateReplicationGroupResponse.proto
diff --git a/fixture/CreateSnapshot.yaml b/fixture/CreateSnapshot.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/CreateSnapshot.yaml
diff --git a/fixture/CreateSnapshotResponse.proto b/fixture/CreateSnapshotResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/CreateSnapshotResponse.proto
diff --git a/fixture/DeleteCacheCluster.yaml b/fixture/DeleteCacheCluster.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/DeleteCacheCluster.yaml
diff --git a/fixture/DeleteCacheClusterResponse.proto b/fixture/DeleteCacheClusterResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/DeleteCacheClusterResponse.proto
diff --git a/fixture/DeleteCacheParameterGroup.yaml b/fixture/DeleteCacheParameterGroup.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/DeleteCacheParameterGroup.yaml
diff --git a/fixture/DeleteCacheParameterGroupResponse.proto b/fixture/DeleteCacheParameterGroupResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/DeleteCacheParameterGroupResponse.proto
diff --git a/fixture/DeleteCacheSecurityGroup.yaml b/fixture/DeleteCacheSecurityGroup.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/DeleteCacheSecurityGroup.yaml
diff --git a/fixture/DeleteCacheSecurityGroupResponse.proto b/fixture/DeleteCacheSecurityGroupResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/DeleteCacheSecurityGroupResponse.proto
diff --git a/fixture/DeleteCacheSubnetGroup.yaml b/fixture/DeleteCacheSubnetGroup.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/DeleteCacheSubnetGroup.yaml
diff --git a/fixture/DeleteCacheSubnetGroupResponse.proto b/fixture/DeleteCacheSubnetGroupResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/DeleteCacheSubnetGroupResponse.proto
diff --git a/fixture/DeleteReplicationGroup.yaml b/fixture/DeleteReplicationGroup.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/DeleteReplicationGroup.yaml
diff --git a/fixture/DeleteReplicationGroupResponse.proto b/fixture/DeleteReplicationGroupResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/DeleteReplicationGroupResponse.proto
diff --git a/fixture/DeleteSnapshot.yaml b/fixture/DeleteSnapshot.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/DeleteSnapshot.yaml
diff --git a/fixture/DeleteSnapshotResponse.proto b/fixture/DeleteSnapshotResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/DeleteSnapshotResponse.proto
diff --git a/fixture/DescribeCacheClusters.yaml b/fixture/DescribeCacheClusters.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeCacheClusters.yaml
diff --git a/fixture/DescribeCacheClustersResponse.proto b/fixture/DescribeCacheClustersResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeCacheClustersResponse.proto
diff --git a/fixture/DescribeCacheEngineVersions.yaml b/fixture/DescribeCacheEngineVersions.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeCacheEngineVersions.yaml
diff --git a/fixture/DescribeCacheEngineVersionsResponse.proto b/fixture/DescribeCacheEngineVersionsResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeCacheEngineVersionsResponse.proto
diff --git a/fixture/DescribeCacheParameterGroups.yaml b/fixture/DescribeCacheParameterGroups.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeCacheParameterGroups.yaml
diff --git a/fixture/DescribeCacheParameterGroupsResponse.proto b/fixture/DescribeCacheParameterGroupsResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeCacheParameterGroupsResponse.proto
diff --git a/fixture/DescribeCacheParameters.yaml b/fixture/DescribeCacheParameters.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeCacheParameters.yaml
diff --git a/fixture/DescribeCacheParametersResponse.proto b/fixture/DescribeCacheParametersResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeCacheParametersResponse.proto
diff --git a/fixture/DescribeCacheSecurityGroups.yaml b/fixture/DescribeCacheSecurityGroups.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeCacheSecurityGroups.yaml
diff --git a/fixture/DescribeCacheSecurityGroupsResponse.proto b/fixture/DescribeCacheSecurityGroupsResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeCacheSecurityGroupsResponse.proto
diff --git a/fixture/DescribeCacheSubnetGroups.yaml b/fixture/DescribeCacheSubnetGroups.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeCacheSubnetGroups.yaml
diff --git a/fixture/DescribeCacheSubnetGroupsResponse.proto b/fixture/DescribeCacheSubnetGroupsResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeCacheSubnetGroupsResponse.proto
diff --git a/fixture/DescribeEngineDefaultParameters.yaml b/fixture/DescribeEngineDefaultParameters.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeEngineDefaultParameters.yaml
diff --git a/fixture/DescribeEngineDefaultParametersResponse.proto b/fixture/DescribeEngineDefaultParametersResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeEngineDefaultParametersResponse.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/DescribeReplicationGroups.yaml b/fixture/DescribeReplicationGroups.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeReplicationGroups.yaml
diff --git a/fixture/DescribeReplicationGroupsResponse.proto b/fixture/DescribeReplicationGroupsResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeReplicationGroupsResponse.proto
diff --git a/fixture/DescribeReservedCacheNodes.yaml b/fixture/DescribeReservedCacheNodes.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeReservedCacheNodes.yaml
diff --git a/fixture/DescribeReservedCacheNodesOfferings.yaml b/fixture/DescribeReservedCacheNodesOfferings.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeReservedCacheNodesOfferings.yaml
diff --git a/fixture/DescribeReservedCacheNodesOfferingsResponse.proto b/fixture/DescribeReservedCacheNodesOfferingsResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeReservedCacheNodesOfferingsResponse.proto
diff --git a/fixture/DescribeReservedCacheNodesResponse.proto b/fixture/DescribeReservedCacheNodesResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeReservedCacheNodesResponse.proto
diff --git a/fixture/DescribeSnapshots.yaml b/fixture/DescribeSnapshots.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeSnapshots.yaml
diff --git a/fixture/DescribeSnapshotsResponse.proto b/fixture/DescribeSnapshotsResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeSnapshotsResponse.proto
diff --git a/fixture/ListTagsForResource.yaml b/fixture/ListTagsForResource.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/ListTagsForResource.yaml
diff --git a/fixture/ListTagsForResourceResponse.proto b/fixture/ListTagsForResourceResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/ListTagsForResourceResponse.proto
diff --git a/fixture/ModifyCacheCluster.yaml b/fixture/ModifyCacheCluster.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/ModifyCacheCluster.yaml
diff --git a/fixture/ModifyCacheClusterResponse.proto b/fixture/ModifyCacheClusterResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/ModifyCacheClusterResponse.proto
diff --git a/fixture/ModifyCacheParameterGroup.yaml b/fixture/ModifyCacheParameterGroup.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/ModifyCacheParameterGroup.yaml
diff --git a/fixture/ModifyCacheParameterGroupResponse.proto b/fixture/ModifyCacheParameterGroupResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/ModifyCacheParameterGroupResponse.proto
diff --git a/fixture/ModifyCacheSubnetGroup.yaml b/fixture/ModifyCacheSubnetGroup.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/ModifyCacheSubnetGroup.yaml
diff --git a/fixture/ModifyCacheSubnetGroupResponse.proto b/fixture/ModifyCacheSubnetGroupResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/ModifyCacheSubnetGroupResponse.proto
diff --git a/fixture/ModifyReplicationGroup.yaml b/fixture/ModifyReplicationGroup.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/ModifyReplicationGroup.yaml
diff --git a/fixture/ModifyReplicationGroupResponse.proto b/fixture/ModifyReplicationGroupResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/ModifyReplicationGroupResponse.proto
diff --git a/fixture/PurchaseReservedCacheNodesOffering.yaml b/fixture/PurchaseReservedCacheNodesOffering.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/PurchaseReservedCacheNodesOffering.yaml
diff --git a/fixture/PurchaseReservedCacheNodesOfferingResponse.proto b/fixture/PurchaseReservedCacheNodesOfferingResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/PurchaseReservedCacheNodesOfferingResponse.proto
diff --git a/fixture/RebootCacheCluster.yaml b/fixture/RebootCacheCluster.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/RebootCacheCluster.yaml
diff --git a/fixture/RebootCacheClusterResponse.proto b/fixture/RebootCacheClusterResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/RebootCacheClusterResponse.proto
diff --git a/fixture/RemoveTagsFromResource.yaml b/fixture/RemoveTagsFromResource.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/RemoveTagsFromResource.yaml
diff --git a/fixture/RemoveTagsFromResourceResponse.proto b/fixture/RemoveTagsFromResourceResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/RemoveTagsFromResourceResponse.proto
diff --git a/fixture/ResetCacheParameterGroup.yaml b/fixture/ResetCacheParameterGroup.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/ResetCacheParameterGroup.yaml
diff --git a/fixture/ResetCacheParameterGroupResponse.proto b/fixture/ResetCacheParameterGroupResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/ResetCacheParameterGroupResponse.proto
diff --git a/fixture/RevokeCacheSecurityGroupIngress.yaml b/fixture/RevokeCacheSecurityGroupIngress.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/RevokeCacheSecurityGroupIngress.yaml
diff --git a/fixture/RevokeCacheSecurityGroupIngressResponse.proto b/fixture/RevokeCacheSecurityGroupIngressResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/RevokeCacheSecurityGroupIngressResponse.proto
diff --git a/test/Test/AWS/Gen/ElastiCache.hs b/test/Test/AWS/Gen/ElastiCache.hs
--- a/test/Test/AWS/Gen/ElastiCache.hs
+++ b/test/Test/AWS/Gen/ElastiCache.hs
@@ -261,445 +261,445 @@
 testDeleteCacheSecurityGroup :: DeleteCacheSecurityGroup -> TestTree
 testDeleteCacheSecurityGroup = req
     "DeleteCacheSecurityGroup"
-    "fixture/DeleteCacheSecurityGroup"
+    "fixture/DeleteCacheSecurityGroup.yaml"
 
 testCreateReplicationGroup :: CreateReplicationGroup -> TestTree
 testCreateReplicationGroup = req
     "CreateReplicationGroup"
-    "fixture/CreateReplicationGroup"
+    "fixture/CreateReplicationGroup.yaml"
 
 testDeleteCacheCluster :: DeleteCacheCluster -> TestTree
 testDeleteCacheCluster = req
     "DeleteCacheCluster"
-    "fixture/DeleteCacheCluster"
+    "fixture/DeleteCacheCluster.yaml"
 
 testRebootCacheCluster :: RebootCacheCluster -> TestTree
 testRebootCacheCluster = req
     "RebootCacheCluster"
-    "fixture/RebootCacheCluster"
+    "fixture/RebootCacheCluster.yaml"
 
 testRevokeCacheSecurityGroupIngress :: RevokeCacheSecurityGroupIngress -> TestTree
 testRevokeCacheSecurityGroupIngress = req
     "RevokeCacheSecurityGroupIngress"
-    "fixture/RevokeCacheSecurityGroupIngress"
+    "fixture/RevokeCacheSecurityGroupIngress.yaml"
 
 testDescribeEvents :: DescribeEvents -> TestTree
 testDescribeEvents = req
     "DescribeEvents"
-    "fixture/DescribeEvents"
+    "fixture/DescribeEvents.yaml"
 
 testDescribeEngineDefaultParameters :: DescribeEngineDefaultParameters -> TestTree
 testDescribeEngineDefaultParameters = req
     "DescribeEngineDefaultParameters"
-    "fixture/DescribeEngineDefaultParameters"
+    "fixture/DescribeEngineDefaultParameters.yaml"
 
 testModifyCacheParameterGroup :: ModifyCacheParameterGroup -> TestTree
 testModifyCacheParameterGroup = req
     "ModifyCacheParameterGroup"
-    "fixture/ModifyCacheParameterGroup"
+    "fixture/ModifyCacheParameterGroup.yaml"
 
 testCreateCacheCluster :: CreateCacheCluster -> TestTree
 testCreateCacheCluster = req
     "CreateCacheCluster"
-    "fixture/CreateCacheCluster"
+    "fixture/CreateCacheCluster.yaml"
 
 testListTagsForResource :: ListTagsForResource -> TestTree
 testListTagsForResource = req
     "ListTagsForResource"
-    "fixture/ListTagsForResource"
+    "fixture/ListTagsForResource.yaml"
 
 testDeleteReplicationGroup :: DeleteReplicationGroup -> TestTree
 testDeleteReplicationGroup = req
     "DeleteReplicationGroup"
-    "fixture/DeleteReplicationGroup"
+    "fixture/DeleteReplicationGroup.yaml"
 
 testPurchaseReservedCacheNodesOffering :: PurchaseReservedCacheNodesOffering -> TestTree
 testPurchaseReservedCacheNodesOffering = req
     "PurchaseReservedCacheNodesOffering"
-    "fixture/PurchaseReservedCacheNodesOffering"
+    "fixture/PurchaseReservedCacheNodesOffering.yaml"
 
 testDescribeCacheClusters :: DescribeCacheClusters -> TestTree
 testDescribeCacheClusters = req
     "DescribeCacheClusters"
-    "fixture/DescribeCacheClusters"
+    "fixture/DescribeCacheClusters.yaml"
 
 testModifyReplicationGroup :: ModifyReplicationGroup -> TestTree
 testModifyReplicationGroup = req
     "ModifyReplicationGroup"
-    "fixture/ModifyReplicationGroup"
+    "fixture/ModifyReplicationGroup.yaml"
 
 testRemoveTagsFromResource :: RemoveTagsFromResource -> TestTree
 testRemoveTagsFromResource = req
     "RemoveTagsFromResource"
-    "fixture/RemoveTagsFromResource"
+    "fixture/RemoveTagsFromResource.yaml"
 
 testDescribeCacheParameters :: DescribeCacheParameters -> TestTree
 testDescribeCacheParameters = req
     "DescribeCacheParameters"
-    "fixture/DescribeCacheParameters"
+    "fixture/DescribeCacheParameters.yaml"
 
 testDescribeCacheSubnetGroups :: DescribeCacheSubnetGroups -> TestTree
 testDescribeCacheSubnetGroups = req
     "DescribeCacheSubnetGroups"
-    "fixture/DescribeCacheSubnetGroups"
+    "fixture/DescribeCacheSubnetGroups.yaml"
 
 testCreateCacheSecurityGroup :: CreateCacheSecurityGroup -> TestTree
 testCreateCacheSecurityGroup = req
     "CreateCacheSecurityGroup"
-    "fixture/CreateCacheSecurityGroup"
+    "fixture/CreateCacheSecurityGroup.yaml"
 
 testAddTagsToResource :: AddTagsToResource -> TestTree
 testAddTagsToResource = req
     "AddTagsToResource"
-    "fixture/AddTagsToResource"
+    "fixture/AddTagsToResource.yaml"
 
 testAuthorizeCacheSecurityGroupIngress :: AuthorizeCacheSecurityGroupIngress -> TestTree
 testAuthorizeCacheSecurityGroupIngress = req
     "AuthorizeCacheSecurityGroupIngress"
-    "fixture/AuthorizeCacheSecurityGroupIngress"
+    "fixture/AuthorizeCacheSecurityGroupIngress.yaml"
 
 testCopySnapshot :: CopySnapshot -> TestTree
 testCopySnapshot = req
     "CopySnapshot"
-    "fixture/CopySnapshot"
+    "fixture/CopySnapshot.yaml"
 
 testCreateCacheSubnetGroup :: CreateCacheSubnetGroup -> TestTree
 testCreateCacheSubnetGroup = req
     "CreateCacheSubnetGroup"
-    "fixture/CreateCacheSubnetGroup"
+    "fixture/CreateCacheSubnetGroup.yaml"
 
 testDescribeCacheParameterGroups :: DescribeCacheParameterGroups -> TestTree
 testDescribeCacheParameterGroups = req
     "DescribeCacheParameterGroups"
-    "fixture/DescribeCacheParameterGroups"
+    "fixture/DescribeCacheParameterGroups.yaml"
 
 testResetCacheParameterGroup :: ResetCacheParameterGroup -> TestTree
 testResetCacheParameterGroup = req
     "ResetCacheParameterGroup"
-    "fixture/ResetCacheParameterGroup"
+    "fixture/ResetCacheParameterGroup.yaml"
 
 testDescribeSnapshots :: DescribeSnapshots -> TestTree
 testDescribeSnapshots = req
     "DescribeSnapshots"
-    "fixture/DescribeSnapshots"
+    "fixture/DescribeSnapshots.yaml"
 
 testDescribeReservedCacheNodesOfferings :: DescribeReservedCacheNodesOfferings -> TestTree
 testDescribeReservedCacheNodesOfferings = req
     "DescribeReservedCacheNodesOfferings"
-    "fixture/DescribeReservedCacheNodesOfferings"
+    "fixture/DescribeReservedCacheNodesOfferings.yaml"
 
 testDeleteSnapshot :: DeleteSnapshot -> TestTree
 testDeleteSnapshot = req
     "DeleteSnapshot"
-    "fixture/DeleteSnapshot"
+    "fixture/DeleteSnapshot.yaml"
 
 testDescribeReplicationGroups :: DescribeReplicationGroups -> TestTree
 testDescribeReplicationGroups = req
     "DescribeReplicationGroups"
-    "fixture/DescribeReplicationGroups"
+    "fixture/DescribeReplicationGroups.yaml"
 
 testModifyCacheSubnetGroup :: ModifyCacheSubnetGroup -> TestTree
 testModifyCacheSubnetGroup = req
     "ModifyCacheSubnetGroup"
-    "fixture/ModifyCacheSubnetGroup"
+    "fixture/ModifyCacheSubnetGroup.yaml"
 
 testCreateSnapshot :: CreateSnapshot -> TestTree
 testCreateSnapshot = req
     "CreateSnapshot"
-    "fixture/CreateSnapshot"
+    "fixture/CreateSnapshot.yaml"
 
 testDescribeCacheSecurityGroups :: DescribeCacheSecurityGroups -> TestTree
 testDescribeCacheSecurityGroups = req
     "DescribeCacheSecurityGroups"
-    "fixture/DescribeCacheSecurityGroups"
+    "fixture/DescribeCacheSecurityGroups.yaml"
 
 testDeleteCacheParameterGroup :: DeleteCacheParameterGroup -> TestTree
 testDeleteCacheParameterGroup = req
     "DeleteCacheParameterGroup"
-    "fixture/DeleteCacheParameterGroup"
+    "fixture/DeleteCacheParameterGroup.yaml"
 
 testDescribeReservedCacheNodes :: DescribeReservedCacheNodes -> TestTree
 testDescribeReservedCacheNodes = req
     "DescribeReservedCacheNodes"
-    "fixture/DescribeReservedCacheNodes"
+    "fixture/DescribeReservedCacheNodes.yaml"
 
 testDescribeCacheEngineVersions :: DescribeCacheEngineVersions -> TestTree
 testDescribeCacheEngineVersions = req
     "DescribeCacheEngineVersions"
-    "fixture/DescribeCacheEngineVersions"
+    "fixture/DescribeCacheEngineVersions.yaml"
 
 testModifyCacheCluster :: ModifyCacheCluster -> TestTree
 testModifyCacheCluster = req
     "ModifyCacheCluster"
-    "fixture/ModifyCacheCluster"
+    "fixture/ModifyCacheCluster.yaml"
 
 testCreateCacheParameterGroup :: CreateCacheParameterGroup -> TestTree
 testCreateCacheParameterGroup = req
     "CreateCacheParameterGroup"
-    "fixture/CreateCacheParameterGroup"
+    "fixture/CreateCacheParameterGroup.yaml"
 
 testDeleteCacheSubnetGroup :: DeleteCacheSubnetGroup -> TestTree
 testDeleteCacheSubnetGroup = req
     "DeleteCacheSubnetGroup"
-    "fixture/DeleteCacheSubnetGroup"
+    "fixture/DeleteCacheSubnetGroup.yaml"
 
 -- Responses
 
 testDeleteCacheSecurityGroupResponse :: DeleteCacheSecurityGroupResponse -> TestTree
 testDeleteCacheSecurityGroupResponse = res
     "DeleteCacheSecurityGroupResponse"
-    "fixture/DeleteCacheSecurityGroupResponse"
+    "fixture/DeleteCacheSecurityGroupResponse.proto"
     elastiCache
     (Proxy :: Proxy DeleteCacheSecurityGroup)
 
 testCreateReplicationGroupResponse :: CreateReplicationGroupResponse -> TestTree
 testCreateReplicationGroupResponse = res
     "CreateReplicationGroupResponse"
-    "fixture/CreateReplicationGroupResponse"
+    "fixture/CreateReplicationGroupResponse.proto"
     elastiCache
     (Proxy :: Proxy CreateReplicationGroup)
 
 testDeleteCacheClusterResponse :: DeleteCacheClusterResponse -> TestTree
 testDeleteCacheClusterResponse = res
     "DeleteCacheClusterResponse"
-    "fixture/DeleteCacheClusterResponse"
+    "fixture/DeleteCacheClusterResponse.proto"
     elastiCache
     (Proxy :: Proxy DeleteCacheCluster)
 
 testRebootCacheClusterResponse :: RebootCacheClusterResponse -> TestTree
 testRebootCacheClusterResponse = res
     "RebootCacheClusterResponse"
-    "fixture/RebootCacheClusterResponse"
+    "fixture/RebootCacheClusterResponse.proto"
     elastiCache
     (Proxy :: Proxy RebootCacheCluster)
 
 testRevokeCacheSecurityGroupIngressResponse :: RevokeCacheSecurityGroupIngressResponse -> TestTree
 testRevokeCacheSecurityGroupIngressResponse = res
     "RevokeCacheSecurityGroupIngressResponse"
-    "fixture/RevokeCacheSecurityGroupIngressResponse"
+    "fixture/RevokeCacheSecurityGroupIngressResponse.proto"
     elastiCache
     (Proxy :: Proxy RevokeCacheSecurityGroupIngress)
 
 testDescribeEventsResponse :: DescribeEventsResponse -> TestTree
 testDescribeEventsResponse = res
     "DescribeEventsResponse"
-    "fixture/DescribeEventsResponse"
+    "fixture/DescribeEventsResponse.proto"
     elastiCache
     (Proxy :: Proxy DescribeEvents)
 
 testDescribeEngineDefaultParametersResponse :: DescribeEngineDefaultParametersResponse -> TestTree
 testDescribeEngineDefaultParametersResponse = res
     "DescribeEngineDefaultParametersResponse"
-    "fixture/DescribeEngineDefaultParametersResponse"
+    "fixture/DescribeEngineDefaultParametersResponse.proto"
     elastiCache
     (Proxy :: Proxy DescribeEngineDefaultParameters)
 
 testModifyCacheParameterGroupResponse :: CacheParameterGroupNameMessage -> TestTree
 testModifyCacheParameterGroupResponse = res
     "ModifyCacheParameterGroupResponse"
-    "fixture/ModifyCacheParameterGroupResponse"
+    "fixture/ModifyCacheParameterGroupResponse.proto"
     elastiCache
     (Proxy :: Proxy ModifyCacheParameterGroup)
 
 testCreateCacheClusterResponse :: CreateCacheClusterResponse -> TestTree
 testCreateCacheClusterResponse = res
     "CreateCacheClusterResponse"
-    "fixture/CreateCacheClusterResponse"
+    "fixture/CreateCacheClusterResponse.proto"
     elastiCache
     (Proxy :: Proxy CreateCacheCluster)
 
 testListTagsForResourceResponse :: TagListMessage -> TestTree
 testListTagsForResourceResponse = res
     "ListTagsForResourceResponse"
-    "fixture/ListTagsForResourceResponse"
+    "fixture/ListTagsForResourceResponse.proto"
     elastiCache
     (Proxy :: Proxy ListTagsForResource)
 
 testDeleteReplicationGroupResponse :: DeleteReplicationGroupResponse -> TestTree
 testDeleteReplicationGroupResponse = res
     "DeleteReplicationGroupResponse"
-    "fixture/DeleteReplicationGroupResponse"
+    "fixture/DeleteReplicationGroupResponse.proto"
     elastiCache
     (Proxy :: Proxy DeleteReplicationGroup)
 
 testPurchaseReservedCacheNodesOfferingResponse :: PurchaseReservedCacheNodesOfferingResponse -> TestTree
 testPurchaseReservedCacheNodesOfferingResponse = res
     "PurchaseReservedCacheNodesOfferingResponse"
-    "fixture/PurchaseReservedCacheNodesOfferingResponse"
+    "fixture/PurchaseReservedCacheNodesOfferingResponse.proto"
     elastiCache
     (Proxy :: Proxy PurchaseReservedCacheNodesOffering)
 
 testDescribeCacheClustersResponse :: DescribeCacheClustersResponse -> TestTree
 testDescribeCacheClustersResponse = res
     "DescribeCacheClustersResponse"
-    "fixture/DescribeCacheClustersResponse"
+    "fixture/DescribeCacheClustersResponse.proto"
     elastiCache
     (Proxy :: Proxy DescribeCacheClusters)
 
 testModifyReplicationGroupResponse :: ModifyReplicationGroupResponse -> TestTree
 testModifyReplicationGroupResponse = res
     "ModifyReplicationGroupResponse"
-    "fixture/ModifyReplicationGroupResponse"
+    "fixture/ModifyReplicationGroupResponse.proto"
     elastiCache
     (Proxy :: Proxy ModifyReplicationGroup)
 
 testRemoveTagsFromResourceResponse :: TagListMessage -> TestTree
 testRemoveTagsFromResourceResponse = res
     "RemoveTagsFromResourceResponse"
-    "fixture/RemoveTagsFromResourceResponse"
+    "fixture/RemoveTagsFromResourceResponse.proto"
     elastiCache
     (Proxy :: Proxy RemoveTagsFromResource)
 
 testDescribeCacheParametersResponse :: DescribeCacheParametersResponse -> TestTree
 testDescribeCacheParametersResponse = res
     "DescribeCacheParametersResponse"
-    "fixture/DescribeCacheParametersResponse"
+    "fixture/DescribeCacheParametersResponse.proto"
     elastiCache
     (Proxy :: Proxy DescribeCacheParameters)
 
 testDescribeCacheSubnetGroupsResponse :: DescribeCacheSubnetGroupsResponse -> TestTree
 testDescribeCacheSubnetGroupsResponse = res
     "DescribeCacheSubnetGroupsResponse"
-    "fixture/DescribeCacheSubnetGroupsResponse"
+    "fixture/DescribeCacheSubnetGroupsResponse.proto"
     elastiCache
     (Proxy :: Proxy DescribeCacheSubnetGroups)
 
 testCreateCacheSecurityGroupResponse :: CreateCacheSecurityGroupResponse -> TestTree
 testCreateCacheSecurityGroupResponse = res
     "CreateCacheSecurityGroupResponse"
-    "fixture/CreateCacheSecurityGroupResponse"
+    "fixture/CreateCacheSecurityGroupResponse.proto"
     elastiCache
     (Proxy :: Proxy CreateCacheSecurityGroup)
 
 testAddTagsToResourceResponse :: TagListMessage -> TestTree
 testAddTagsToResourceResponse = res
     "AddTagsToResourceResponse"
-    "fixture/AddTagsToResourceResponse"
+    "fixture/AddTagsToResourceResponse.proto"
     elastiCache
     (Proxy :: Proxy AddTagsToResource)
 
 testAuthorizeCacheSecurityGroupIngressResponse :: AuthorizeCacheSecurityGroupIngressResponse -> TestTree
 testAuthorizeCacheSecurityGroupIngressResponse = res
     "AuthorizeCacheSecurityGroupIngressResponse"
-    "fixture/AuthorizeCacheSecurityGroupIngressResponse"
+    "fixture/AuthorizeCacheSecurityGroupIngressResponse.proto"
     elastiCache
     (Proxy :: Proxy AuthorizeCacheSecurityGroupIngress)
 
 testCopySnapshotResponse :: CopySnapshotResponse -> TestTree
 testCopySnapshotResponse = res
     "CopySnapshotResponse"
-    "fixture/CopySnapshotResponse"
+    "fixture/CopySnapshotResponse.proto"
     elastiCache
     (Proxy :: Proxy CopySnapshot)
 
 testCreateCacheSubnetGroupResponse :: CreateCacheSubnetGroupResponse -> TestTree
 testCreateCacheSubnetGroupResponse = res
     "CreateCacheSubnetGroupResponse"
-    "fixture/CreateCacheSubnetGroupResponse"
+    "fixture/CreateCacheSubnetGroupResponse.proto"
     elastiCache
     (Proxy :: Proxy CreateCacheSubnetGroup)
 
 testDescribeCacheParameterGroupsResponse :: DescribeCacheParameterGroupsResponse -> TestTree
 testDescribeCacheParameterGroupsResponse = res
     "DescribeCacheParameterGroupsResponse"
-    "fixture/DescribeCacheParameterGroupsResponse"
+    "fixture/DescribeCacheParameterGroupsResponse.proto"
     elastiCache
     (Proxy :: Proxy DescribeCacheParameterGroups)
 
 testResetCacheParameterGroupResponse :: CacheParameterGroupNameMessage -> TestTree
 testResetCacheParameterGroupResponse = res
     "ResetCacheParameterGroupResponse"
-    "fixture/ResetCacheParameterGroupResponse"
+    "fixture/ResetCacheParameterGroupResponse.proto"
     elastiCache
     (Proxy :: Proxy ResetCacheParameterGroup)
 
 testDescribeSnapshotsResponse :: DescribeSnapshotsResponse -> TestTree
 testDescribeSnapshotsResponse = res
     "DescribeSnapshotsResponse"
-    "fixture/DescribeSnapshotsResponse"
+    "fixture/DescribeSnapshotsResponse.proto"
     elastiCache
     (Proxy :: Proxy DescribeSnapshots)
 
 testDescribeReservedCacheNodesOfferingsResponse :: DescribeReservedCacheNodesOfferingsResponse -> TestTree
 testDescribeReservedCacheNodesOfferingsResponse = res
     "DescribeReservedCacheNodesOfferingsResponse"
-    "fixture/DescribeReservedCacheNodesOfferingsResponse"
+    "fixture/DescribeReservedCacheNodesOfferingsResponse.proto"
     elastiCache
     (Proxy :: Proxy DescribeReservedCacheNodesOfferings)
 
 testDeleteSnapshotResponse :: DeleteSnapshotResponse -> TestTree
 testDeleteSnapshotResponse = res
     "DeleteSnapshotResponse"
-    "fixture/DeleteSnapshotResponse"
+    "fixture/DeleteSnapshotResponse.proto"
     elastiCache
     (Proxy :: Proxy DeleteSnapshot)
 
 testDescribeReplicationGroupsResponse :: DescribeReplicationGroupsResponse -> TestTree
 testDescribeReplicationGroupsResponse = res
     "DescribeReplicationGroupsResponse"
-    "fixture/DescribeReplicationGroupsResponse"
+    "fixture/DescribeReplicationGroupsResponse.proto"
     elastiCache
     (Proxy :: Proxy DescribeReplicationGroups)
 
 testModifyCacheSubnetGroupResponse :: ModifyCacheSubnetGroupResponse -> TestTree
 testModifyCacheSubnetGroupResponse = res
     "ModifyCacheSubnetGroupResponse"
-    "fixture/ModifyCacheSubnetGroupResponse"
+    "fixture/ModifyCacheSubnetGroupResponse.proto"
     elastiCache
     (Proxy :: Proxy ModifyCacheSubnetGroup)
 
 testCreateSnapshotResponse :: CreateSnapshotResponse -> TestTree
 testCreateSnapshotResponse = res
     "CreateSnapshotResponse"
-    "fixture/CreateSnapshotResponse"
+    "fixture/CreateSnapshotResponse.proto"
     elastiCache
     (Proxy :: Proxy CreateSnapshot)
 
 testDescribeCacheSecurityGroupsResponse :: DescribeCacheSecurityGroupsResponse -> TestTree
 testDescribeCacheSecurityGroupsResponse = res
     "DescribeCacheSecurityGroupsResponse"
-    "fixture/DescribeCacheSecurityGroupsResponse"
+    "fixture/DescribeCacheSecurityGroupsResponse.proto"
     elastiCache
     (Proxy :: Proxy DescribeCacheSecurityGroups)
 
 testDeleteCacheParameterGroupResponse :: DeleteCacheParameterGroupResponse -> TestTree
 testDeleteCacheParameterGroupResponse = res
     "DeleteCacheParameterGroupResponse"
-    "fixture/DeleteCacheParameterGroupResponse"
+    "fixture/DeleteCacheParameterGroupResponse.proto"
     elastiCache
     (Proxy :: Proxy DeleteCacheParameterGroup)
 
 testDescribeReservedCacheNodesResponse :: DescribeReservedCacheNodesResponse -> TestTree
 testDescribeReservedCacheNodesResponse = res
     "DescribeReservedCacheNodesResponse"
-    "fixture/DescribeReservedCacheNodesResponse"
+    "fixture/DescribeReservedCacheNodesResponse.proto"
     elastiCache
     (Proxy :: Proxy DescribeReservedCacheNodes)
 
 testDescribeCacheEngineVersionsResponse :: DescribeCacheEngineVersionsResponse -> TestTree
 testDescribeCacheEngineVersionsResponse = res
     "DescribeCacheEngineVersionsResponse"
-    "fixture/DescribeCacheEngineVersionsResponse"
+    "fixture/DescribeCacheEngineVersionsResponse.proto"
     elastiCache
     (Proxy :: Proxy DescribeCacheEngineVersions)
 
 testModifyCacheClusterResponse :: ModifyCacheClusterResponse -> TestTree
 testModifyCacheClusterResponse = res
     "ModifyCacheClusterResponse"
-    "fixture/ModifyCacheClusterResponse"
+    "fixture/ModifyCacheClusterResponse.proto"
     elastiCache
     (Proxy :: Proxy ModifyCacheCluster)
 
 testCreateCacheParameterGroupResponse :: CreateCacheParameterGroupResponse -> TestTree
 testCreateCacheParameterGroupResponse = res
     "CreateCacheParameterGroupResponse"
-    "fixture/CreateCacheParameterGroupResponse"
+    "fixture/CreateCacheParameterGroupResponse.proto"
     elastiCache
     (Proxy :: Proxy CreateCacheParameterGroup)
 
 testDeleteCacheSubnetGroupResponse :: DeleteCacheSubnetGroupResponse -> TestTree
 testDeleteCacheSubnetGroupResponse = res
     "DeleteCacheSubnetGroupResponse"
-    "fixture/DeleteCacheSubnetGroupResponse"
+    "fixture/DeleteCacheSubnetGroupResponse.proto"
     elastiCache
     (Proxy :: Proxy DeleteCacheSubnetGroup)
