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-devicefarm.cabal b/amazonka-devicefarm.cabal
--- a/amazonka-devicefarm.cabal
+++ b/amazonka-devicefarm.cabal
@@ -1,7 +1,8 @@
 name:                  amazonka-devicefarm
-version:               1.2.0.1
+version:               1.2.0.2
 synopsis:              Amazon Device Farm 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 Device Farm is a service that enables mobile app developers to test
     Android, iOS, and Fire OS apps on physical phones, tablets, and other
@@ -87,8 +87,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.DeviceFarm
         , Test.AWS.Gen.DeviceFarm
diff --git a/fixture/CreateDevicePool.yaml b/fixture/CreateDevicePool.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/CreateDevicePool.yaml
diff --git a/fixture/CreateDevicePoolResponse.proto b/fixture/CreateDevicePoolResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/CreateDevicePoolResponse.proto
diff --git a/fixture/CreateProject.yaml b/fixture/CreateProject.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/CreateProject.yaml
diff --git a/fixture/CreateProjectResponse.proto b/fixture/CreateProjectResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/CreateProjectResponse.proto
diff --git a/fixture/CreateUpload.yaml b/fixture/CreateUpload.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/CreateUpload.yaml
diff --git a/fixture/CreateUploadResponse.proto b/fixture/CreateUploadResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/CreateUploadResponse.proto
diff --git a/fixture/GetAccountSettings.yaml b/fixture/GetAccountSettings.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/GetAccountSettings.yaml
diff --git a/fixture/GetAccountSettingsResponse.proto b/fixture/GetAccountSettingsResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/GetAccountSettingsResponse.proto
diff --git a/fixture/GetDevice.yaml b/fixture/GetDevice.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/GetDevice.yaml
diff --git a/fixture/GetDevicePool.yaml b/fixture/GetDevicePool.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/GetDevicePool.yaml
diff --git a/fixture/GetDevicePoolCompatibility.yaml b/fixture/GetDevicePoolCompatibility.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/GetDevicePoolCompatibility.yaml
diff --git a/fixture/GetDevicePoolCompatibilityResponse.proto b/fixture/GetDevicePoolCompatibilityResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/GetDevicePoolCompatibilityResponse.proto
diff --git a/fixture/GetDevicePoolResponse.proto b/fixture/GetDevicePoolResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/GetDevicePoolResponse.proto
diff --git a/fixture/GetDeviceResponse.proto b/fixture/GetDeviceResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/GetDeviceResponse.proto
diff --git a/fixture/GetJob.yaml b/fixture/GetJob.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/GetJob.yaml
diff --git a/fixture/GetJobResponse.proto b/fixture/GetJobResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/GetJobResponse.proto
diff --git a/fixture/GetProject.yaml b/fixture/GetProject.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/GetProject.yaml
diff --git a/fixture/GetProjectResponse.proto b/fixture/GetProjectResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/GetProjectResponse.proto
diff --git a/fixture/GetRun.yaml b/fixture/GetRun.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/GetRun.yaml
diff --git a/fixture/GetRunResponse.proto b/fixture/GetRunResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/GetRunResponse.proto
diff --git a/fixture/GetSuite.yaml b/fixture/GetSuite.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/GetSuite.yaml
diff --git a/fixture/GetSuiteResponse.proto b/fixture/GetSuiteResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/GetSuiteResponse.proto
diff --git a/fixture/GetTest.yaml b/fixture/GetTest.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/GetTest.yaml
diff --git a/fixture/GetTestResponse.proto b/fixture/GetTestResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/GetTestResponse.proto
diff --git a/fixture/GetUpload.yaml b/fixture/GetUpload.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/GetUpload.yaml
diff --git a/fixture/GetUploadResponse.proto b/fixture/GetUploadResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/GetUploadResponse.proto
diff --git a/fixture/ListArtifacts.yaml b/fixture/ListArtifacts.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/ListArtifacts.yaml
diff --git a/fixture/ListArtifactsResponse.proto b/fixture/ListArtifactsResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/ListArtifactsResponse.proto
diff --git a/fixture/ListDevicePools.yaml b/fixture/ListDevicePools.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/ListDevicePools.yaml
diff --git a/fixture/ListDevicePoolsResponse.proto b/fixture/ListDevicePoolsResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/ListDevicePoolsResponse.proto
diff --git a/fixture/ListDevices.yaml b/fixture/ListDevices.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/ListDevices.yaml
diff --git a/fixture/ListDevicesResponse.proto b/fixture/ListDevicesResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/ListDevicesResponse.proto
diff --git a/fixture/ListJobs.yaml b/fixture/ListJobs.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/ListJobs.yaml
diff --git a/fixture/ListJobsResponse.proto b/fixture/ListJobsResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/ListJobsResponse.proto
diff --git a/fixture/ListProjects.yaml b/fixture/ListProjects.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/ListProjects.yaml
diff --git a/fixture/ListProjectsResponse.proto b/fixture/ListProjectsResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/ListProjectsResponse.proto
diff --git a/fixture/ListRuns.yaml b/fixture/ListRuns.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/ListRuns.yaml
diff --git a/fixture/ListRunsResponse.proto b/fixture/ListRunsResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/ListRunsResponse.proto
diff --git a/fixture/ListSamples.yaml b/fixture/ListSamples.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/ListSamples.yaml
diff --git a/fixture/ListSamplesResponse.proto b/fixture/ListSamplesResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/ListSamplesResponse.proto
diff --git a/fixture/ListSuites.yaml b/fixture/ListSuites.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/ListSuites.yaml
diff --git a/fixture/ListSuitesResponse.proto b/fixture/ListSuitesResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/ListSuitesResponse.proto
diff --git a/fixture/ListTests.yaml b/fixture/ListTests.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/ListTests.yaml
diff --git a/fixture/ListTestsResponse.proto b/fixture/ListTestsResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/ListTestsResponse.proto
diff --git a/fixture/ListUniqueProblems.yaml b/fixture/ListUniqueProblems.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/ListUniqueProblems.yaml
diff --git a/fixture/ListUniqueProblemsResponse.proto b/fixture/ListUniqueProblemsResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/ListUniqueProblemsResponse.proto
diff --git a/fixture/ListUploads.yaml b/fixture/ListUploads.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/ListUploads.yaml
diff --git a/fixture/ListUploadsResponse.proto b/fixture/ListUploadsResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/ListUploadsResponse.proto
diff --git a/fixture/ScheduleRun.yaml b/fixture/ScheduleRun.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/ScheduleRun.yaml
diff --git a/fixture/ScheduleRunResponse.proto b/fixture/ScheduleRunResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/ScheduleRunResponse.proto
diff --git a/test/Test/AWS/Gen/DeviceFarm.hs b/test/Test/AWS/Gen/DeviceFarm.hs
--- a/test/Test/AWS/Gen/DeviceFarm.hs
+++ b/test/Test/AWS/Gen/DeviceFarm.hs
@@ -189,301 +189,301 @@
 testListProjects :: ListProjects -> TestTree
 testListProjects = req
     "ListProjects"
-    "fixture/ListProjects"
+    "fixture/ListProjects.yaml"
 
 testGetDevicePoolCompatibility :: GetDevicePoolCompatibility -> TestTree
 testGetDevicePoolCompatibility = req
     "GetDevicePoolCompatibility"
-    "fixture/GetDevicePoolCompatibility"
+    "fixture/GetDevicePoolCompatibility.yaml"
 
 testListTests :: ListTests -> TestTree
 testListTests = req
     "ListTests"
-    "fixture/ListTests"
+    "fixture/ListTests.yaml"
 
 testCreateUpload :: CreateUpload -> TestTree
 testCreateUpload = req
     "CreateUpload"
-    "fixture/CreateUpload"
+    "fixture/CreateUpload.yaml"
 
 testListArtifacts :: ListArtifacts -> TestTree
 testListArtifacts = req
     "ListArtifacts"
-    "fixture/ListArtifacts"
+    "fixture/ListArtifacts.yaml"
 
 testGetDevicePool :: GetDevicePool -> TestTree
 testGetDevicePool = req
     "GetDevicePool"
-    "fixture/GetDevicePool"
+    "fixture/GetDevicePool.yaml"
 
 testGetUpload :: GetUpload -> TestTree
 testGetUpload = req
     "GetUpload"
-    "fixture/GetUpload"
+    "fixture/GetUpload.yaml"
 
 testListDevicePools :: ListDevicePools -> TestTree
 testListDevicePools = req
     "ListDevicePools"
-    "fixture/ListDevicePools"
+    "fixture/ListDevicePools.yaml"
 
 testGetTest :: GetTest -> TestTree
 testGetTest = req
     "GetTest"
-    "fixture/GetTest"
+    "fixture/GetTest.yaml"
 
 testCreateDevicePool :: CreateDevicePool -> TestTree
 testCreateDevicePool = req
     "CreateDevicePool"
-    "fixture/CreateDevicePool"
+    "fixture/CreateDevicePool.yaml"
 
 testListRuns :: ListRuns -> TestTree
 testListRuns = req
     "ListRuns"
-    "fixture/ListRuns"
+    "fixture/ListRuns.yaml"
 
 testListJobs :: ListJobs -> TestTree
 testListJobs = req
     "ListJobs"
-    "fixture/ListJobs"
+    "fixture/ListJobs.yaml"
 
 testGetDevice :: GetDevice -> TestTree
 testGetDevice = req
     "GetDevice"
-    "fixture/GetDevice"
+    "fixture/GetDevice.yaml"
 
 testGetJob :: GetJob -> TestTree
 testGetJob = req
     "GetJob"
-    "fixture/GetJob"
+    "fixture/GetJob.yaml"
 
 testScheduleRun :: ScheduleRun -> TestTree
 testScheduleRun = req
     "ScheduleRun"
-    "fixture/ScheduleRun"
+    "fixture/ScheduleRun.yaml"
 
 testGetRun :: GetRun -> TestTree
 testGetRun = req
     "GetRun"
-    "fixture/GetRun"
+    "fixture/GetRun.yaml"
 
 testListSamples :: ListSamples -> TestTree
 testListSamples = req
     "ListSamples"
-    "fixture/ListSamples"
+    "fixture/ListSamples.yaml"
 
 testListSuites :: ListSuites -> TestTree
 testListSuites = req
     "ListSuites"
-    "fixture/ListSuites"
+    "fixture/ListSuites.yaml"
 
 testGetAccountSettings :: GetAccountSettings -> TestTree
 testGetAccountSettings = req
     "GetAccountSettings"
-    "fixture/GetAccountSettings"
+    "fixture/GetAccountSettings.yaml"
 
 testListUploads :: ListUploads -> TestTree
 testListUploads = req
     "ListUploads"
-    "fixture/ListUploads"
+    "fixture/ListUploads.yaml"
 
 testGetSuite :: GetSuite -> TestTree
 testGetSuite = req
     "GetSuite"
-    "fixture/GetSuite"
+    "fixture/GetSuite.yaml"
 
 testGetProject :: GetProject -> TestTree
 testGetProject = req
     "GetProject"
-    "fixture/GetProject"
+    "fixture/GetProject.yaml"
 
 testListDevices :: ListDevices -> TestTree
 testListDevices = req
     "ListDevices"
-    "fixture/ListDevices"
+    "fixture/ListDevices.yaml"
 
 testListUniqueProblems :: ListUniqueProblems -> TestTree
 testListUniqueProblems = req
     "ListUniqueProblems"
-    "fixture/ListUniqueProblems"
+    "fixture/ListUniqueProblems.yaml"
 
 testCreateProject :: CreateProject -> TestTree
 testCreateProject = req
     "CreateProject"
-    "fixture/CreateProject"
+    "fixture/CreateProject.yaml"
 
 -- Responses
 
 testListProjectsResponse :: ListProjectsResponse -> TestTree
 testListProjectsResponse = res
     "ListProjectsResponse"
-    "fixture/ListProjectsResponse"
+    "fixture/ListProjectsResponse.proto"
     deviceFarm
     (Proxy :: Proxy ListProjects)
 
 testGetDevicePoolCompatibilityResponse :: GetDevicePoolCompatibilityResponse -> TestTree
 testGetDevicePoolCompatibilityResponse = res
     "GetDevicePoolCompatibilityResponse"
-    "fixture/GetDevicePoolCompatibilityResponse"
+    "fixture/GetDevicePoolCompatibilityResponse.proto"
     deviceFarm
     (Proxy :: Proxy GetDevicePoolCompatibility)
 
 testListTestsResponse :: ListTestsResponse -> TestTree
 testListTestsResponse = res
     "ListTestsResponse"
-    "fixture/ListTestsResponse"
+    "fixture/ListTestsResponse.proto"
     deviceFarm
     (Proxy :: Proxy ListTests)
 
 testCreateUploadResponse :: CreateUploadResponse -> TestTree
 testCreateUploadResponse = res
     "CreateUploadResponse"
-    "fixture/CreateUploadResponse"
+    "fixture/CreateUploadResponse.proto"
     deviceFarm
     (Proxy :: Proxy CreateUpload)
 
 testListArtifactsResponse :: ListArtifactsResponse -> TestTree
 testListArtifactsResponse = res
     "ListArtifactsResponse"
-    "fixture/ListArtifactsResponse"
+    "fixture/ListArtifactsResponse.proto"
     deviceFarm
     (Proxy :: Proxy ListArtifacts)
 
 testGetDevicePoolResponse :: GetDevicePoolResponse -> TestTree
 testGetDevicePoolResponse = res
     "GetDevicePoolResponse"
-    "fixture/GetDevicePoolResponse"
+    "fixture/GetDevicePoolResponse.proto"
     deviceFarm
     (Proxy :: Proxy GetDevicePool)
 
 testGetUploadResponse :: GetUploadResponse -> TestTree
 testGetUploadResponse = res
     "GetUploadResponse"
-    "fixture/GetUploadResponse"
+    "fixture/GetUploadResponse.proto"
     deviceFarm
     (Proxy :: Proxy GetUpload)
 
 testListDevicePoolsResponse :: ListDevicePoolsResponse -> TestTree
 testListDevicePoolsResponse = res
     "ListDevicePoolsResponse"
-    "fixture/ListDevicePoolsResponse"
+    "fixture/ListDevicePoolsResponse.proto"
     deviceFarm
     (Proxy :: Proxy ListDevicePools)
 
 testGetTestResponse :: GetTestResponse -> TestTree
 testGetTestResponse = res
     "GetTestResponse"
-    "fixture/GetTestResponse"
+    "fixture/GetTestResponse.proto"
     deviceFarm
     (Proxy :: Proxy GetTest)
 
 testCreateDevicePoolResponse :: CreateDevicePoolResponse -> TestTree
 testCreateDevicePoolResponse = res
     "CreateDevicePoolResponse"
-    "fixture/CreateDevicePoolResponse"
+    "fixture/CreateDevicePoolResponse.proto"
     deviceFarm
     (Proxy :: Proxy CreateDevicePool)
 
 testListRunsResponse :: ListRunsResponse -> TestTree
 testListRunsResponse = res
     "ListRunsResponse"
-    "fixture/ListRunsResponse"
+    "fixture/ListRunsResponse.proto"
     deviceFarm
     (Proxy :: Proxy ListRuns)
 
 testListJobsResponse :: ListJobsResponse -> TestTree
 testListJobsResponse = res
     "ListJobsResponse"
-    "fixture/ListJobsResponse"
+    "fixture/ListJobsResponse.proto"
     deviceFarm
     (Proxy :: Proxy ListJobs)
 
 testGetDeviceResponse :: GetDeviceResponse -> TestTree
 testGetDeviceResponse = res
     "GetDeviceResponse"
-    "fixture/GetDeviceResponse"
+    "fixture/GetDeviceResponse.proto"
     deviceFarm
     (Proxy :: Proxy GetDevice)
 
 testGetJobResponse :: GetJobResponse -> TestTree
 testGetJobResponse = res
     "GetJobResponse"
-    "fixture/GetJobResponse"
+    "fixture/GetJobResponse.proto"
     deviceFarm
     (Proxy :: Proxy GetJob)
 
 testScheduleRunResponse :: ScheduleRunResponse -> TestTree
 testScheduleRunResponse = res
     "ScheduleRunResponse"
-    "fixture/ScheduleRunResponse"
+    "fixture/ScheduleRunResponse.proto"
     deviceFarm
     (Proxy :: Proxy ScheduleRun)
 
 testGetRunResponse :: GetRunResponse -> TestTree
 testGetRunResponse = res
     "GetRunResponse"
-    "fixture/GetRunResponse"
+    "fixture/GetRunResponse.proto"
     deviceFarm
     (Proxy :: Proxy GetRun)
 
 testListSamplesResponse :: ListSamplesResponse -> TestTree
 testListSamplesResponse = res
     "ListSamplesResponse"
-    "fixture/ListSamplesResponse"
+    "fixture/ListSamplesResponse.proto"
     deviceFarm
     (Proxy :: Proxy ListSamples)
 
 testListSuitesResponse :: ListSuitesResponse -> TestTree
 testListSuitesResponse = res
     "ListSuitesResponse"
-    "fixture/ListSuitesResponse"
+    "fixture/ListSuitesResponse.proto"
     deviceFarm
     (Proxy :: Proxy ListSuites)
 
 testGetAccountSettingsResponse :: GetAccountSettingsResponse -> TestTree
 testGetAccountSettingsResponse = res
     "GetAccountSettingsResponse"
-    "fixture/GetAccountSettingsResponse"
+    "fixture/GetAccountSettingsResponse.proto"
     deviceFarm
     (Proxy :: Proxy GetAccountSettings)
 
 testListUploadsResponse :: ListUploadsResponse -> TestTree
 testListUploadsResponse = res
     "ListUploadsResponse"
-    "fixture/ListUploadsResponse"
+    "fixture/ListUploadsResponse.proto"
     deviceFarm
     (Proxy :: Proxy ListUploads)
 
 testGetSuiteResponse :: GetSuiteResponse -> TestTree
 testGetSuiteResponse = res
     "GetSuiteResponse"
-    "fixture/GetSuiteResponse"
+    "fixture/GetSuiteResponse.proto"
     deviceFarm
     (Proxy :: Proxy GetSuite)
 
 testGetProjectResponse :: GetProjectResponse -> TestTree
 testGetProjectResponse = res
     "GetProjectResponse"
-    "fixture/GetProjectResponse"
+    "fixture/GetProjectResponse.proto"
     deviceFarm
     (Proxy :: Proxy GetProject)
 
 testListDevicesResponse :: ListDevicesResponse -> TestTree
 testListDevicesResponse = res
     "ListDevicesResponse"
-    "fixture/ListDevicesResponse"
+    "fixture/ListDevicesResponse.proto"
     deviceFarm
     (Proxy :: Proxy ListDevices)
 
 testListUniqueProblemsResponse :: ListUniqueProblemsResponse -> TestTree
 testListUniqueProblemsResponse = res
     "ListUniqueProblemsResponse"
-    "fixture/ListUniqueProblemsResponse"
+    "fixture/ListUniqueProblemsResponse.proto"
     deviceFarm
     (Proxy :: Proxy ListUniqueProblems)
 
 testCreateProjectResponse :: CreateProjectResponse -> TestTree
 testCreateProjectResponse = res
     "CreateProjectResponse"
-    "fixture/CreateProjectResponse"
+    "fixture/CreateProjectResponse.proto"
     deviceFarm
     (Proxy :: Proxy CreateProject)
