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-emr.cabal b/amazonka-emr.cabal
--- a/amazonka-emr.cabal
+++ b/amazonka-emr.cabal
@@ -1,7 +1,8 @@
 name:                  amazonka-emr
-version:               1.2.0.1
+version:               1.2.0.2
 synopsis:              Amazon Elastic MapReduce 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 Elastic MapReduce (Amazon EMR) is a web service that makes it
     easy to process large amounts of data efficiently. Amazon EMR uses
@@ -80,8 +80,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.EMR
         , Test.AWS.Gen.EMR
diff --git a/fixture/AddInstanceGroups.yaml b/fixture/AddInstanceGroups.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/AddInstanceGroups.yaml
diff --git a/fixture/AddInstanceGroupsResponse.proto b/fixture/AddInstanceGroupsResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/AddInstanceGroupsResponse.proto
diff --git a/fixture/AddJobFlowSteps.yaml b/fixture/AddJobFlowSteps.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/AddJobFlowSteps.yaml
diff --git a/fixture/AddJobFlowStepsResponse.proto b/fixture/AddJobFlowStepsResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/AddJobFlowStepsResponse.proto
diff --git a/fixture/AddTags.yaml b/fixture/AddTags.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/AddTags.yaml
diff --git a/fixture/AddTagsResponse.proto b/fixture/AddTagsResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/AddTagsResponse.proto
diff --git a/fixture/DescribeCluster.yaml b/fixture/DescribeCluster.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeCluster.yaml
diff --git a/fixture/DescribeClusterResponse.proto b/fixture/DescribeClusterResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeClusterResponse.proto
diff --git a/fixture/DescribeStep.yaml b/fixture/DescribeStep.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeStep.yaml
diff --git a/fixture/DescribeStepResponse.proto b/fixture/DescribeStepResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeStepResponse.proto
diff --git a/fixture/ListBootstrapActions.yaml b/fixture/ListBootstrapActions.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/ListBootstrapActions.yaml
diff --git a/fixture/ListBootstrapActionsResponse.proto b/fixture/ListBootstrapActionsResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/ListBootstrapActionsResponse.proto
diff --git a/fixture/ListClusters.yaml b/fixture/ListClusters.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/ListClusters.yaml
diff --git a/fixture/ListClustersResponse.proto b/fixture/ListClustersResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/ListClustersResponse.proto
diff --git a/fixture/ListInstanceGroups.yaml b/fixture/ListInstanceGroups.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/ListInstanceGroups.yaml
diff --git a/fixture/ListInstanceGroupsResponse.proto b/fixture/ListInstanceGroupsResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/ListInstanceGroupsResponse.proto
diff --git a/fixture/ListInstances.yaml b/fixture/ListInstances.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/ListInstances.yaml
diff --git a/fixture/ListInstancesResponse.proto b/fixture/ListInstancesResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/ListInstancesResponse.proto
diff --git a/fixture/ListSteps.yaml b/fixture/ListSteps.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/ListSteps.yaml
diff --git a/fixture/ListStepsResponse.proto b/fixture/ListStepsResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/ListStepsResponse.proto
diff --git a/fixture/ModifyInstanceGroups.yaml b/fixture/ModifyInstanceGroups.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/ModifyInstanceGroups.yaml
diff --git a/fixture/ModifyInstanceGroupsResponse.proto b/fixture/ModifyInstanceGroupsResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/ModifyInstanceGroupsResponse.proto
diff --git a/fixture/RemoveTags.yaml b/fixture/RemoveTags.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/RemoveTags.yaml
diff --git a/fixture/RemoveTagsResponse.proto b/fixture/RemoveTagsResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/RemoveTagsResponse.proto
diff --git a/fixture/RunJobFlow.yaml b/fixture/RunJobFlow.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/RunJobFlow.yaml
diff --git a/fixture/RunJobFlowResponse.proto b/fixture/RunJobFlowResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/RunJobFlowResponse.proto
diff --git a/fixture/SetTerminationProtection.yaml b/fixture/SetTerminationProtection.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/SetTerminationProtection.yaml
diff --git a/fixture/SetTerminationProtectionResponse.proto b/fixture/SetTerminationProtectionResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/SetTerminationProtectionResponse.proto
diff --git a/fixture/SetVisibleToAllUsers.yaml b/fixture/SetVisibleToAllUsers.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/SetVisibleToAllUsers.yaml
diff --git a/fixture/SetVisibleToAllUsersResponse.proto b/fixture/SetVisibleToAllUsersResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/SetVisibleToAllUsersResponse.proto
diff --git a/fixture/TerminateJobFlows.yaml b/fixture/TerminateJobFlows.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/TerminateJobFlows.yaml
diff --git a/fixture/TerminateJobFlowsResponse.proto b/fixture/TerminateJobFlowsResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/TerminateJobFlowsResponse.proto
diff --git a/test/Test/AWS/Gen/EMR.hs b/test/Test/AWS/Gen/EMR.hs
--- a/test/Test/AWS/Gen/EMR.hs
+++ b/test/Test/AWS/Gen/EMR.hs
@@ -135,193 +135,193 @@
 testRunJobFlow :: RunJobFlow -> TestTree
 testRunJobFlow = req
     "RunJobFlow"
-    "fixture/RunJobFlow"
+    "fixture/RunJobFlow.yaml"
 
 testSetVisibleToAllUsers :: SetVisibleToAllUsers -> TestTree
 testSetVisibleToAllUsers = req
     "SetVisibleToAllUsers"
-    "fixture/SetVisibleToAllUsers"
+    "fixture/SetVisibleToAllUsers.yaml"
 
 testTerminateJobFlows :: TerminateJobFlows -> TestTree
 testTerminateJobFlows = req
     "TerminateJobFlows"
-    "fixture/TerminateJobFlows"
+    "fixture/TerminateJobFlows.yaml"
 
 testRemoveTags :: RemoveTags -> TestTree
 testRemoveTags = req
     "RemoveTags"
-    "fixture/RemoveTags"
+    "fixture/RemoveTags.yaml"
 
 testDescribeStep :: DescribeStep -> TestTree
 testDescribeStep = req
     "DescribeStep"
-    "fixture/DescribeStep"
+    "fixture/DescribeStep.yaml"
 
 testDescribeCluster :: DescribeCluster -> TestTree
 testDescribeCluster = req
     "DescribeCluster"
-    "fixture/DescribeCluster"
+    "fixture/DescribeCluster.yaml"
 
 testModifyInstanceGroups :: ModifyInstanceGroups -> TestTree
 testModifyInstanceGroups = req
     "ModifyInstanceGroups"
-    "fixture/ModifyInstanceGroups"
+    "fixture/ModifyInstanceGroups.yaml"
 
 testAddJobFlowSteps :: AddJobFlowSteps -> TestTree
 testAddJobFlowSteps = req
     "AddJobFlowSteps"
-    "fixture/AddJobFlowSteps"
+    "fixture/AddJobFlowSteps.yaml"
 
 testSetTerminationProtection :: SetTerminationProtection -> TestTree
 testSetTerminationProtection = req
     "SetTerminationProtection"
-    "fixture/SetTerminationProtection"
+    "fixture/SetTerminationProtection.yaml"
 
 testListSteps :: ListSteps -> TestTree
 testListSteps = req
     "ListSteps"
-    "fixture/ListSteps"
+    "fixture/ListSteps.yaml"
 
 testAddInstanceGroups :: AddInstanceGroups -> TestTree
 testAddInstanceGroups = req
     "AddInstanceGroups"
-    "fixture/AddInstanceGroups"
+    "fixture/AddInstanceGroups.yaml"
 
 testListInstanceGroups :: ListInstanceGroups -> TestTree
 testListInstanceGroups = req
     "ListInstanceGroups"
-    "fixture/ListInstanceGroups"
+    "fixture/ListInstanceGroups.yaml"
 
 testListBootstrapActions :: ListBootstrapActions -> TestTree
 testListBootstrapActions = req
     "ListBootstrapActions"
-    "fixture/ListBootstrapActions"
+    "fixture/ListBootstrapActions.yaml"
 
 testAddTags :: AddTags -> TestTree
 testAddTags = req
     "AddTags"
-    "fixture/AddTags"
+    "fixture/AddTags.yaml"
 
 testListInstances :: ListInstances -> TestTree
 testListInstances = req
     "ListInstances"
-    "fixture/ListInstances"
+    "fixture/ListInstances.yaml"
 
 testListClusters :: ListClusters -> TestTree
 testListClusters = req
     "ListClusters"
-    "fixture/ListClusters"
+    "fixture/ListClusters.yaml"
 
 -- Responses
 
 testRunJobFlowResponse :: RunJobFlowResponse -> TestTree
 testRunJobFlowResponse = res
     "RunJobFlowResponse"
-    "fixture/RunJobFlowResponse"
+    "fixture/RunJobFlowResponse.proto"
     eMR
     (Proxy :: Proxy RunJobFlow)
 
 testSetVisibleToAllUsersResponse :: SetVisibleToAllUsersResponse -> TestTree
 testSetVisibleToAllUsersResponse = res
     "SetVisibleToAllUsersResponse"
-    "fixture/SetVisibleToAllUsersResponse"
+    "fixture/SetVisibleToAllUsersResponse.proto"
     eMR
     (Proxy :: Proxy SetVisibleToAllUsers)
 
 testTerminateJobFlowsResponse :: TerminateJobFlowsResponse -> TestTree
 testTerminateJobFlowsResponse = res
     "TerminateJobFlowsResponse"
-    "fixture/TerminateJobFlowsResponse"
+    "fixture/TerminateJobFlowsResponse.proto"
     eMR
     (Proxy :: Proxy TerminateJobFlows)
 
 testRemoveTagsResponse :: RemoveTagsResponse -> TestTree
 testRemoveTagsResponse = res
     "RemoveTagsResponse"
-    "fixture/RemoveTagsResponse"
+    "fixture/RemoveTagsResponse.proto"
     eMR
     (Proxy :: Proxy RemoveTags)
 
 testDescribeStepResponse :: DescribeStepResponse -> TestTree
 testDescribeStepResponse = res
     "DescribeStepResponse"
-    "fixture/DescribeStepResponse"
+    "fixture/DescribeStepResponse.proto"
     eMR
     (Proxy :: Proxy DescribeStep)
 
 testDescribeClusterResponse :: DescribeClusterResponse -> TestTree
 testDescribeClusterResponse = res
     "DescribeClusterResponse"
-    "fixture/DescribeClusterResponse"
+    "fixture/DescribeClusterResponse.proto"
     eMR
     (Proxy :: Proxy DescribeCluster)
 
 testModifyInstanceGroupsResponse :: ModifyInstanceGroupsResponse -> TestTree
 testModifyInstanceGroupsResponse = res
     "ModifyInstanceGroupsResponse"
-    "fixture/ModifyInstanceGroupsResponse"
+    "fixture/ModifyInstanceGroupsResponse.proto"
     eMR
     (Proxy :: Proxy ModifyInstanceGroups)
 
 testAddJobFlowStepsResponse :: AddJobFlowStepsResponse -> TestTree
 testAddJobFlowStepsResponse = res
     "AddJobFlowStepsResponse"
-    "fixture/AddJobFlowStepsResponse"
+    "fixture/AddJobFlowStepsResponse.proto"
     eMR
     (Proxy :: Proxy AddJobFlowSteps)
 
 testSetTerminationProtectionResponse :: SetTerminationProtectionResponse -> TestTree
 testSetTerminationProtectionResponse = res
     "SetTerminationProtectionResponse"
-    "fixture/SetTerminationProtectionResponse"
+    "fixture/SetTerminationProtectionResponse.proto"
     eMR
     (Proxy :: Proxy SetTerminationProtection)
 
 testListStepsResponse :: ListStepsResponse -> TestTree
 testListStepsResponse = res
     "ListStepsResponse"
-    "fixture/ListStepsResponse"
+    "fixture/ListStepsResponse.proto"
     eMR
     (Proxy :: Proxy ListSteps)
 
 testAddInstanceGroupsResponse :: AddInstanceGroupsResponse -> TestTree
 testAddInstanceGroupsResponse = res
     "AddInstanceGroupsResponse"
-    "fixture/AddInstanceGroupsResponse"
+    "fixture/AddInstanceGroupsResponse.proto"
     eMR
     (Proxy :: Proxy AddInstanceGroups)
 
 testListInstanceGroupsResponse :: ListInstanceGroupsResponse -> TestTree
 testListInstanceGroupsResponse = res
     "ListInstanceGroupsResponse"
-    "fixture/ListInstanceGroupsResponse"
+    "fixture/ListInstanceGroupsResponse.proto"
     eMR
     (Proxy :: Proxy ListInstanceGroups)
 
 testListBootstrapActionsResponse :: ListBootstrapActionsResponse -> TestTree
 testListBootstrapActionsResponse = res
     "ListBootstrapActionsResponse"
-    "fixture/ListBootstrapActionsResponse"
+    "fixture/ListBootstrapActionsResponse.proto"
     eMR
     (Proxy :: Proxy ListBootstrapActions)
 
 testAddTagsResponse :: AddTagsResponse -> TestTree
 testAddTagsResponse = res
     "AddTagsResponse"
-    "fixture/AddTagsResponse"
+    "fixture/AddTagsResponse.proto"
     eMR
     (Proxy :: Proxy AddTags)
 
 testListInstancesResponse :: ListInstancesResponse -> TestTree
 testListInstancesResponse = res
     "ListInstancesResponse"
-    "fixture/ListInstancesResponse"
+    "fixture/ListInstancesResponse.proto"
     eMR
     (Proxy :: Proxy ListInstances)
 
 testListClustersResponse :: ListClustersResponse -> TestTree
 testListClustersResponse = res
     "ListClustersResponse"
-    "fixture/ListClustersResponse"
+    "fixture/ListClustersResponse.proto"
     eMR
     (Proxy :: Proxy ListClusters)
