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-datapipeline.cabal b/amazonka-datapipeline.cabal
--- a/amazonka-datapipeline.cabal
+++ b/amazonka-datapipeline.cabal
@@ -1,7 +1,8 @@
 name:                  amazonka-datapipeline
-version:               1.2.0.1
+version:               1.2.0.2
 synopsis:              Amazon Data Pipeline 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:
     AWS Data Pipeline configures and manages a data-driven workflow called a
     pipeline. AWS Data Pipeline handles the details of scheduling and
@@ -101,8 +101,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.DataPipeline
         , Test.AWS.Gen.DataPipeline
diff --git a/fixture/ActivatePipeline.yaml b/fixture/ActivatePipeline.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/ActivatePipeline.yaml
diff --git a/fixture/ActivatePipelineResponse.proto b/fixture/ActivatePipelineResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/ActivatePipelineResponse.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/CreatePipeline.yaml b/fixture/CreatePipeline.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/CreatePipeline.yaml
diff --git a/fixture/CreatePipelineResponse.proto b/fixture/CreatePipelineResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/CreatePipelineResponse.proto
diff --git a/fixture/DeactivatePipeline.yaml b/fixture/DeactivatePipeline.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/DeactivatePipeline.yaml
diff --git a/fixture/DeactivatePipelineResponse.proto b/fixture/DeactivatePipelineResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/DeactivatePipelineResponse.proto
diff --git a/fixture/DeletePipeline.yaml b/fixture/DeletePipeline.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/DeletePipeline.yaml
diff --git a/fixture/DeletePipelineResponse.proto b/fixture/DeletePipelineResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/DeletePipelineResponse.proto
diff --git a/fixture/DescribeObjects.yaml b/fixture/DescribeObjects.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeObjects.yaml
diff --git a/fixture/DescribeObjectsResponse.proto b/fixture/DescribeObjectsResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeObjectsResponse.proto
diff --git a/fixture/DescribePipelines.yaml b/fixture/DescribePipelines.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/DescribePipelines.yaml
diff --git a/fixture/DescribePipelinesResponse.proto b/fixture/DescribePipelinesResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/DescribePipelinesResponse.proto
diff --git a/fixture/EvaluateExpression.yaml b/fixture/EvaluateExpression.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/EvaluateExpression.yaml
diff --git a/fixture/EvaluateExpressionResponse.proto b/fixture/EvaluateExpressionResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/EvaluateExpressionResponse.proto
diff --git a/fixture/GetPipelineDefinition.yaml b/fixture/GetPipelineDefinition.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/GetPipelineDefinition.yaml
diff --git a/fixture/GetPipelineDefinitionResponse.proto b/fixture/GetPipelineDefinitionResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/GetPipelineDefinitionResponse.proto
diff --git a/fixture/ListPipelines.yaml b/fixture/ListPipelines.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/ListPipelines.yaml
diff --git a/fixture/ListPipelinesResponse.proto b/fixture/ListPipelinesResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/ListPipelinesResponse.proto
diff --git a/fixture/PollForTask.yaml b/fixture/PollForTask.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/PollForTask.yaml
diff --git a/fixture/PollForTaskResponse.proto b/fixture/PollForTaskResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/PollForTaskResponse.proto
diff --git a/fixture/PutPipelineDefinition.yaml b/fixture/PutPipelineDefinition.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/PutPipelineDefinition.yaml
diff --git a/fixture/PutPipelineDefinitionResponse.proto b/fixture/PutPipelineDefinitionResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/PutPipelineDefinitionResponse.proto
diff --git a/fixture/QueryObjects.yaml b/fixture/QueryObjects.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/QueryObjects.yaml
diff --git a/fixture/QueryObjectsResponse.proto b/fixture/QueryObjectsResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/QueryObjectsResponse.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/ReportTaskProgress.yaml b/fixture/ReportTaskProgress.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/ReportTaskProgress.yaml
diff --git a/fixture/ReportTaskProgressResponse.proto b/fixture/ReportTaskProgressResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/ReportTaskProgressResponse.proto
diff --git a/fixture/ReportTaskRunnerHeartbeat.yaml b/fixture/ReportTaskRunnerHeartbeat.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/ReportTaskRunnerHeartbeat.yaml
diff --git a/fixture/ReportTaskRunnerHeartbeatResponse.proto b/fixture/ReportTaskRunnerHeartbeatResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/ReportTaskRunnerHeartbeatResponse.proto
diff --git a/fixture/SetStatus.yaml b/fixture/SetStatus.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/SetStatus.yaml
diff --git a/fixture/SetStatusResponse.proto b/fixture/SetStatusResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/SetStatusResponse.proto
diff --git a/fixture/SetTaskStatus.yaml b/fixture/SetTaskStatus.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/SetTaskStatus.yaml
diff --git a/fixture/SetTaskStatusResponse.proto b/fixture/SetTaskStatusResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/SetTaskStatusResponse.proto
diff --git a/fixture/ValidatePipelineDefinition.yaml b/fixture/ValidatePipelineDefinition.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/ValidatePipelineDefinition.yaml
diff --git a/fixture/ValidatePipelineDefinitionResponse.proto b/fixture/ValidatePipelineDefinitionResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/ValidatePipelineDefinitionResponse.proto
diff --git a/test/Test/AWS/Gen/DataPipeline.hs b/test/Test/AWS/Gen/DataPipeline.hs
--- a/test/Test/AWS/Gen/DataPipeline.hs
+++ b/test/Test/AWS/Gen/DataPipeline.hs
@@ -153,229 +153,229 @@
 testDescribePipelines :: DescribePipelines -> TestTree
 testDescribePipelines = req
     "DescribePipelines"
-    "fixture/DescribePipelines"
+    "fixture/DescribePipelines.yaml"
 
 testQueryObjects :: QueryObjects -> TestTree
 testQueryObjects = req
     "QueryObjects"
-    "fixture/QueryObjects"
+    "fixture/QueryObjects.yaml"
 
 testRemoveTags :: RemoveTags -> TestTree
 testRemoveTags = req
     "RemoveTags"
-    "fixture/RemoveTags"
+    "fixture/RemoveTags.yaml"
 
 testDeletePipeline :: DeletePipeline -> TestTree
 testDeletePipeline = req
     "DeletePipeline"
-    "fixture/DeletePipeline"
+    "fixture/DeletePipeline.yaml"
 
 testListPipelines :: ListPipelines -> TestTree
 testListPipelines = req
     "ListPipelines"
-    "fixture/ListPipelines"
+    "fixture/ListPipelines.yaml"
 
 testGetPipelineDefinition :: GetPipelineDefinition -> TestTree
 testGetPipelineDefinition = req
     "GetPipelineDefinition"
-    "fixture/GetPipelineDefinition"
+    "fixture/GetPipelineDefinition.yaml"
 
 testPollForTask :: PollForTask -> TestTree
 testPollForTask = req
     "PollForTask"
-    "fixture/PollForTask"
+    "fixture/PollForTask.yaml"
 
 testEvaluateExpression :: EvaluateExpression -> TestTree
 testEvaluateExpression = req
     "EvaluateExpression"
-    "fixture/EvaluateExpression"
+    "fixture/EvaluateExpression.yaml"
 
 testDeactivatePipeline :: DeactivatePipeline -> TestTree
 testDeactivatePipeline = req
     "DeactivatePipeline"
-    "fixture/DeactivatePipeline"
+    "fixture/DeactivatePipeline.yaml"
 
 testAddTags :: AddTags -> TestTree
 testAddTags = req
     "AddTags"
-    "fixture/AddTags"
+    "fixture/AddTags.yaml"
 
 testDescribeObjects :: DescribeObjects -> TestTree
 testDescribeObjects = req
     "DescribeObjects"
-    "fixture/DescribeObjects"
+    "fixture/DescribeObjects.yaml"
 
 testReportTaskRunnerHeartbeat :: ReportTaskRunnerHeartbeat -> TestTree
 testReportTaskRunnerHeartbeat = req
     "ReportTaskRunnerHeartbeat"
-    "fixture/ReportTaskRunnerHeartbeat"
+    "fixture/ReportTaskRunnerHeartbeat.yaml"
 
 testActivatePipeline :: ActivatePipeline -> TestTree
 testActivatePipeline = req
     "ActivatePipeline"
-    "fixture/ActivatePipeline"
+    "fixture/ActivatePipeline.yaml"
 
 testSetTaskStatus :: SetTaskStatus -> TestTree
 testSetTaskStatus = req
     "SetTaskStatus"
-    "fixture/SetTaskStatus"
+    "fixture/SetTaskStatus.yaml"
 
 testReportTaskProgress :: ReportTaskProgress -> TestTree
 testReportTaskProgress = req
     "ReportTaskProgress"
-    "fixture/ReportTaskProgress"
+    "fixture/ReportTaskProgress.yaml"
 
 testCreatePipeline :: CreatePipeline -> TestTree
 testCreatePipeline = req
     "CreatePipeline"
-    "fixture/CreatePipeline"
+    "fixture/CreatePipeline.yaml"
 
 testSetStatus :: SetStatus -> TestTree
 testSetStatus = req
     "SetStatus"
-    "fixture/SetStatus"
+    "fixture/SetStatus.yaml"
 
 testPutPipelineDefinition :: PutPipelineDefinition -> TestTree
 testPutPipelineDefinition = req
     "PutPipelineDefinition"
-    "fixture/PutPipelineDefinition"
+    "fixture/PutPipelineDefinition.yaml"
 
 testValidatePipelineDefinition :: ValidatePipelineDefinition -> TestTree
 testValidatePipelineDefinition = req
     "ValidatePipelineDefinition"
-    "fixture/ValidatePipelineDefinition"
+    "fixture/ValidatePipelineDefinition.yaml"
 
 -- Responses
 
 testDescribePipelinesResponse :: DescribePipelinesResponse -> TestTree
 testDescribePipelinesResponse = res
     "DescribePipelinesResponse"
-    "fixture/DescribePipelinesResponse"
+    "fixture/DescribePipelinesResponse.proto"
     dataPipeline
     (Proxy :: Proxy DescribePipelines)
 
 testQueryObjectsResponse :: QueryObjectsResponse -> TestTree
 testQueryObjectsResponse = res
     "QueryObjectsResponse"
-    "fixture/QueryObjectsResponse"
+    "fixture/QueryObjectsResponse.proto"
     dataPipeline
     (Proxy :: Proxy QueryObjects)
 
 testRemoveTagsResponse :: RemoveTagsResponse -> TestTree
 testRemoveTagsResponse = res
     "RemoveTagsResponse"
-    "fixture/RemoveTagsResponse"
+    "fixture/RemoveTagsResponse.proto"
     dataPipeline
     (Proxy :: Proxy RemoveTags)
 
 testDeletePipelineResponse :: DeletePipelineResponse -> TestTree
 testDeletePipelineResponse = res
     "DeletePipelineResponse"
-    "fixture/DeletePipelineResponse"
+    "fixture/DeletePipelineResponse.proto"
     dataPipeline
     (Proxy :: Proxy DeletePipeline)
 
 testListPipelinesResponse :: ListPipelinesResponse -> TestTree
 testListPipelinesResponse = res
     "ListPipelinesResponse"
-    "fixture/ListPipelinesResponse"
+    "fixture/ListPipelinesResponse.proto"
     dataPipeline
     (Proxy :: Proxy ListPipelines)
 
 testGetPipelineDefinitionResponse :: GetPipelineDefinitionResponse -> TestTree
 testGetPipelineDefinitionResponse = res
     "GetPipelineDefinitionResponse"
-    "fixture/GetPipelineDefinitionResponse"
+    "fixture/GetPipelineDefinitionResponse.proto"
     dataPipeline
     (Proxy :: Proxy GetPipelineDefinition)
 
 testPollForTaskResponse :: PollForTaskResponse -> TestTree
 testPollForTaskResponse = res
     "PollForTaskResponse"
-    "fixture/PollForTaskResponse"
+    "fixture/PollForTaskResponse.proto"
     dataPipeline
     (Proxy :: Proxy PollForTask)
 
 testEvaluateExpressionResponse :: EvaluateExpressionResponse -> TestTree
 testEvaluateExpressionResponse = res
     "EvaluateExpressionResponse"
-    "fixture/EvaluateExpressionResponse"
+    "fixture/EvaluateExpressionResponse.proto"
     dataPipeline
     (Proxy :: Proxy EvaluateExpression)
 
 testDeactivatePipelineResponse :: DeactivatePipelineResponse -> TestTree
 testDeactivatePipelineResponse = res
     "DeactivatePipelineResponse"
-    "fixture/DeactivatePipelineResponse"
+    "fixture/DeactivatePipelineResponse.proto"
     dataPipeline
     (Proxy :: Proxy DeactivatePipeline)
 
 testAddTagsResponse :: AddTagsResponse -> TestTree
 testAddTagsResponse = res
     "AddTagsResponse"
-    "fixture/AddTagsResponse"
+    "fixture/AddTagsResponse.proto"
     dataPipeline
     (Proxy :: Proxy AddTags)
 
 testDescribeObjectsResponse :: DescribeObjectsResponse -> TestTree
 testDescribeObjectsResponse = res
     "DescribeObjectsResponse"
-    "fixture/DescribeObjectsResponse"
+    "fixture/DescribeObjectsResponse.proto"
     dataPipeline
     (Proxy :: Proxy DescribeObjects)
 
 testReportTaskRunnerHeartbeatResponse :: ReportTaskRunnerHeartbeatResponse -> TestTree
 testReportTaskRunnerHeartbeatResponse = res
     "ReportTaskRunnerHeartbeatResponse"
-    "fixture/ReportTaskRunnerHeartbeatResponse"
+    "fixture/ReportTaskRunnerHeartbeatResponse.proto"
     dataPipeline
     (Proxy :: Proxy ReportTaskRunnerHeartbeat)
 
 testActivatePipelineResponse :: ActivatePipelineResponse -> TestTree
 testActivatePipelineResponse = res
     "ActivatePipelineResponse"
-    "fixture/ActivatePipelineResponse"
+    "fixture/ActivatePipelineResponse.proto"
     dataPipeline
     (Proxy :: Proxy ActivatePipeline)
 
 testSetTaskStatusResponse :: SetTaskStatusResponse -> TestTree
 testSetTaskStatusResponse = res
     "SetTaskStatusResponse"
-    "fixture/SetTaskStatusResponse"
+    "fixture/SetTaskStatusResponse.proto"
     dataPipeline
     (Proxy :: Proxy SetTaskStatus)
 
 testReportTaskProgressResponse :: ReportTaskProgressResponse -> TestTree
 testReportTaskProgressResponse = res
     "ReportTaskProgressResponse"
-    "fixture/ReportTaskProgressResponse"
+    "fixture/ReportTaskProgressResponse.proto"
     dataPipeline
     (Proxy :: Proxy ReportTaskProgress)
 
 testCreatePipelineResponse :: CreatePipelineResponse -> TestTree
 testCreatePipelineResponse = res
     "CreatePipelineResponse"
-    "fixture/CreatePipelineResponse"
+    "fixture/CreatePipelineResponse.proto"
     dataPipeline
     (Proxy :: Proxy CreatePipeline)
 
 testSetStatusResponse :: SetStatusResponse -> TestTree
 testSetStatusResponse = res
     "SetStatusResponse"
-    "fixture/SetStatusResponse"
+    "fixture/SetStatusResponse.proto"
     dataPipeline
     (Proxy :: Proxy SetStatus)
 
 testPutPipelineDefinitionResponse :: PutPipelineDefinitionResponse -> TestTree
 testPutPipelineDefinitionResponse = res
     "PutPipelineDefinitionResponse"
-    "fixture/PutPipelineDefinitionResponse"
+    "fixture/PutPipelineDefinitionResponse.proto"
     dataPipeline
     (Proxy :: Proxy PutPipelineDefinition)
 
 testValidatePipelineDefinitionResponse :: ValidatePipelineDefinitionResponse -> TestTree
 testValidatePipelineDefinitionResponse = res
     "ValidatePipelineDefinitionResponse"
-    "fixture/ValidatePipelineDefinitionResponse"
+    "fixture/ValidatePipelineDefinitionResponse.proto"
     dataPipeline
     (Proxy :: Proxy ValidatePipelineDefinition)
