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-support.cabal b/amazonka-support.cabal
--- a/amazonka-support.cabal
+++ b/amazonka-support.cabal
@@ -1,7 +1,8 @@
 name:                  amazonka-support
-version:               1.2.0.1
+version:               1.2.0.2
 synopsis:              Amazon Support 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 Support
 
@@ -126,8 +126,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.Support
         , Test.AWS.Gen.Support
diff --git a/fixture/AddAttachmentsToSet.yaml b/fixture/AddAttachmentsToSet.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/AddAttachmentsToSet.yaml
diff --git a/fixture/AddAttachmentsToSetResponse.proto b/fixture/AddAttachmentsToSetResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/AddAttachmentsToSetResponse.proto
diff --git a/fixture/AddCommunicationToCase.yaml b/fixture/AddCommunicationToCase.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/AddCommunicationToCase.yaml
diff --git a/fixture/AddCommunicationToCaseResponse.proto b/fixture/AddCommunicationToCaseResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/AddCommunicationToCaseResponse.proto
diff --git a/fixture/CreateCase.yaml b/fixture/CreateCase.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/CreateCase.yaml
diff --git a/fixture/CreateCaseResponse.proto b/fixture/CreateCaseResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/CreateCaseResponse.proto
diff --git a/fixture/DescribeAttachment.yaml b/fixture/DescribeAttachment.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeAttachment.yaml
diff --git a/fixture/DescribeAttachmentResponse.proto b/fixture/DescribeAttachmentResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeAttachmentResponse.proto
diff --git a/fixture/DescribeCases.yaml b/fixture/DescribeCases.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeCases.yaml
diff --git a/fixture/DescribeCasesResponse.proto b/fixture/DescribeCasesResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeCasesResponse.proto
diff --git a/fixture/DescribeCommunications.yaml b/fixture/DescribeCommunications.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeCommunications.yaml
diff --git a/fixture/DescribeCommunicationsResponse.proto b/fixture/DescribeCommunicationsResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeCommunicationsResponse.proto
diff --git a/fixture/DescribeServices.yaml b/fixture/DescribeServices.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeServices.yaml
diff --git a/fixture/DescribeServicesResponse.proto b/fixture/DescribeServicesResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeServicesResponse.proto
diff --git a/fixture/DescribeSeverityLevels.yaml b/fixture/DescribeSeverityLevels.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeSeverityLevels.yaml
diff --git a/fixture/DescribeSeverityLevelsResponse.proto b/fixture/DescribeSeverityLevelsResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeSeverityLevelsResponse.proto
diff --git a/fixture/DescribeTrustedAdvisorCheckRefreshStatuses.yaml b/fixture/DescribeTrustedAdvisorCheckRefreshStatuses.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeTrustedAdvisorCheckRefreshStatuses.yaml
diff --git a/fixture/DescribeTrustedAdvisorCheckRefreshStatusesResponse.proto b/fixture/DescribeTrustedAdvisorCheckRefreshStatusesResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeTrustedAdvisorCheckRefreshStatusesResponse.proto
diff --git a/fixture/DescribeTrustedAdvisorCheckResult.yaml b/fixture/DescribeTrustedAdvisorCheckResult.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeTrustedAdvisorCheckResult.yaml
diff --git a/fixture/DescribeTrustedAdvisorCheckResultResponse.proto b/fixture/DescribeTrustedAdvisorCheckResultResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeTrustedAdvisorCheckResultResponse.proto
diff --git a/fixture/DescribeTrustedAdvisorCheckSummaries.yaml b/fixture/DescribeTrustedAdvisorCheckSummaries.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeTrustedAdvisorCheckSummaries.yaml
diff --git a/fixture/DescribeTrustedAdvisorCheckSummariesResponse.proto b/fixture/DescribeTrustedAdvisorCheckSummariesResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeTrustedAdvisorCheckSummariesResponse.proto
diff --git a/fixture/DescribeTrustedAdvisorChecks.yaml b/fixture/DescribeTrustedAdvisorChecks.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeTrustedAdvisorChecks.yaml
diff --git a/fixture/DescribeTrustedAdvisorChecksResponse.proto b/fixture/DescribeTrustedAdvisorChecksResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeTrustedAdvisorChecksResponse.proto
diff --git a/fixture/RefreshTrustedAdvisorCheck.yaml b/fixture/RefreshTrustedAdvisorCheck.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/RefreshTrustedAdvisorCheck.yaml
diff --git a/fixture/RefreshTrustedAdvisorCheckResponse.proto b/fixture/RefreshTrustedAdvisorCheckResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/RefreshTrustedAdvisorCheckResponse.proto
diff --git a/fixture/ResolveCase.yaml b/fixture/ResolveCase.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/ResolveCase.yaml
diff --git a/fixture/ResolveCaseResponse.proto b/fixture/ResolveCaseResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/ResolveCaseResponse.proto
diff --git a/test/Test/AWS/Gen/Support.hs b/test/Test/AWS/Gen/Support.hs
--- a/test/Test/AWS/Gen/Support.hs
+++ b/test/Test/AWS/Gen/Support.hs
@@ -123,169 +123,169 @@
 testRefreshTrustedAdvisorCheck :: RefreshTrustedAdvisorCheck -> TestTree
 testRefreshTrustedAdvisorCheck = req
     "RefreshTrustedAdvisorCheck"
-    "fixture/RefreshTrustedAdvisorCheck"
+    "fixture/RefreshTrustedAdvisorCheck.yaml"
 
 testDescribeCases :: DescribeCases -> TestTree
 testDescribeCases = req
     "DescribeCases"
-    "fixture/DescribeCases"
+    "fixture/DescribeCases.yaml"
 
 testDescribeTrustedAdvisorCheckRefreshStatuses :: DescribeTrustedAdvisorCheckRefreshStatuses -> TestTree
 testDescribeTrustedAdvisorCheckRefreshStatuses = req
     "DescribeTrustedAdvisorCheckRefreshStatuses"
-    "fixture/DescribeTrustedAdvisorCheckRefreshStatuses"
+    "fixture/DescribeTrustedAdvisorCheckRefreshStatuses.yaml"
 
 testCreateCase :: CreateCase -> TestTree
 testCreateCase = req
     "CreateCase"
-    "fixture/CreateCase"
+    "fixture/CreateCase.yaml"
 
 testDescribeTrustedAdvisorCheckSummaries :: DescribeTrustedAdvisorCheckSummaries -> TestTree
 testDescribeTrustedAdvisorCheckSummaries = req
     "DescribeTrustedAdvisorCheckSummaries"
-    "fixture/DescribeTrustedAdvisorCheckSummaries"
+    "fixture/DescribeTrustedAdvisorCheckSummaries.yaml"
 
 testResolveCase :: ResolveCase -> TestTree
 testResolveCase = req
     "ResolveCase"
-    "fixture/ResolveCase"
+    "fixture/ResolveCase.yaml"
 
 testDescribeSeverityLevels :: DescribeSeverityLevels -> TestTree
 testDescribeSeverityLevels = req
     "DescribeSeverityLevels"
-    "fixture/DescribeSeverityLevels"
+    "fixture/DescribeSeverityLevels.yaml"
 
 testDescribeTrustedAdvisorChecks :: DescribeTrustedAdvisorChecks -> TestTree
 testDescribeTrustedAdvisorChecks = req
     "DescribeTrustedAdvisorChecks"
-    "fixture/DescribeTrustedAdvisorChecks"
+    "fixture/DescribeTrustedAdvisorChecks.yaml"
 
 testDescribeAttachment :: DescribeAttachment -> TestTree
 testDescribeAttachment = req
     "DescribeAttachment"
-    "fixture/DescribeAttachment"
+    "fixture/DescribeAttachment.yaml"
 
 testAddAttachmentsToSet :: AddAttachmentsToSet -> TestTree
 testAddAttachmentsToSet = req
     "AddAttachmentsToSet"
-    "fixture/AddAttachmentsToSet"
+    "fixture/AddAttachmentsToSet.yaml"
 
 testDescribeTrustedAdvisorCheckResult :: DescribeTrustedAdvisorCheckResult -> TestTree
 testDescribeTrustedAdvisorCheckResult = req
     "DescribeTrustedAdvisorCheckResult"
-    "fixture/DescribeTrustedAdvisorCheckResult"
+    "fixture/DescribeTrustedAdvisorCheckResult.yaml"
 
 testDescribeServices :: DescribeServices -> TestTree
 testDescribeServices = req
     "DescribeServices"
-    "fixture/DescribeServices"
+    "fixture/DescribeServices.yaml"
 
 testDescribeCommunications :: DescribeCommunications -> TestTree
 testDescribeCommunications = req
     "DescribeCommunications"
-    "fixture/DescribeCommunications"
+    "fixture/DescribeCommunications.yaml"
 
 testAddCommunicationToCase :: AddCommunicationToCase -> TestTree
 testAddCommunicationToCase = req
     "AddCommunicationToCase"
-    "fixture/AddCommunicationToCase"
+    "fixture/AddCommunicationToCase.yaml"
 
 -- Responses
 
 testRefreshTrustedAdvisorCheckResponse :: RefreshTrustedAdvisorCheckResponse -> TestTree
 testRefreshTrustedAdvisorCheckResponse = res
     "RefreshTrustedAdvisorCheckResponse"
-    "fixture/RefreshTrustedAdvisorCheckResponse"
+    "fixture/RefreshTrustedAdvisorCheckResponse.proto"
     support
     (Proxy :: Proxy RefreshTrustedAdvisorCheck)
 
 testDescribeCasesResponse :: DescribeCasesResponse -> TestTree
 testDescribeCasesResponse = res
     "DescribeCasesResponse"
-    "fixture/DescribeCasesResponse"
+    "fixture/DescribeCasesResponse.proto"
     support
     (Proxy :: Proxy DescribeCases)
 
 testDescribeTrustedAdvisorCheckRefreshStatusesResponse :: DescribeTrustedAdvisorCheckRefreshStatusesResponse -> TestTree
 testDescribeTrustedAdvisorCheckRefreshStatusesResponse = res
     "DescribeTrustedAdvisorCheckRefreshStatusesResponse"
-    "fixture/DescribeTrustedAdvisorCheckRefreshStatusesResponse"
+    "fixture/DescribeTrustedAdvisorCheckRefreshStatusesResponse.proto"
     support
     (Proxy :: Proxy DescribeTrustedAdvisorCheckRefreshStatuses)
 
 testCreateCaseResponse :: CreateCaseResponse -> TestTree
 testCreateCaseResponse = res
     "CreateCaseResponse"
-    "fixture/CreateCaseResponse"
+    "fixture/CreateCaseResponse.proto"
     support
     (Proxy :: Proxy CreateCase)
 
 testDescribeTrustedAdvisorCheckSummariesResponse :: DescribeTrustedAdvisorCheckSummariesResponse -> TestTree
 testDescribeTrustedAdvisorCheckSummariesResponse = res
     "DescribeTrustedAdvisorCheckSummariesResponse"
-    "fixture/DescribeTrustedAdvisorCheckSummariesResponse"
+    "fixture/DescribeTrustedAdvisorCheckSummariesResponse.proto"
     support
     (Proxy :: Proxy DescribeTrustedAdvisorCheckSummaries)
 
 testResolveCaseResponse :: ResolveCaseResponse -> TestTree
 testResolveCaseResponse = res
     "ResolveCaseResponse"
-    "fixture/ResolveCaseResponse"
+    "fixture/ResolveCaseResponse.proto"
     support
     (Proxy :: Proxy ResolveCase)
 
 testDescribeSeverityLevelsResponse :: DescribeSeverityLevelsResponse -> TestTree
 testDescribeSeverityLevelsResponse = res
     "DescribeSeverityLevelsResponse"
-    "fixture/DescribeSeverityLevelsResponse"
+    "fixture/DescribeSeverityLevelsResponse.proto"
     support
     (Proxy :: Proxy DescribeSeverityLevels)
 
 testDescribeTrustedAdvisorChecksResponse :: DescribeTrustedAdvisorChecksResponse -> TestTree
 testDescribeTrustedAdvisorChecksResponse = res
     "DescribeTrustedAdvisorChecksResponse"
-    "fixture/DescribeTrustedAdvisorChecksResponse"
+    "fixture/DescribeTrustedAdvisorChecksResponse.proto"
     support
     (Proxy :: Proxy DescribeTrustedAdvisorChecks)
 
 testDescribeAttachmentResponse :: DescribeAttachmentResponse -> TestTree
 testDescribeAttachmentResponse = res
     "DescribeAttachmentResponse"
-    "fixture/DescribeAttachmentResponse"
+    "fixture/DescribeAttachmentResponse.proto"
     support
     (Proxy :: Proxy DescribeAttachment)
 
 testAddAttachmentsToSetResponse :: AddAttachmentsToSetResponse -> TestTree
 testAddAttachmentsToSetResponse = res
     "AddAttachmentsToSetResponse"
-    "fixture/AddAttachmentsToSetResponse"
+    "fixture/AddAttachmentsToSetResponse.proto"
     support
     (Proxy :: Proxy AddAttachmentsToSet)
 
 testDescribeTrustedAdvisorCheckResultResponse :: DescribeTrustedAdvisorCheckResultResponse -> TestTree
 testDescribeTrustedAdvisorCheckResultResponse = res
     "DescribeTrustedAdvisorCheckResultResponse"
-    "fixture/DescribeTrustedAdvisorCheckResultResponse"
+    "fixture/DescribeTrustedAdvisorCheckResultResponse.proto"
     support
     (Proxy :: Proxy DescribeTrustedAdvisorCheckResult)
 
 testDescribeServicesResponse :: DescribeServicesResponse -> TestTree
 testDescribeServicesResponse = res
     "DescribeServicesResponse"
-    "fixture/DescribeServicesResponse"
+    "fixture/DescribeServicesResponse.proto"
     support
     (Proxy :: Proxy DescribeServices)
 
 testDescribeCommunicationsResponse :: DescribeCommunicationsResponse -> TestTree
 testDescribeCommunicationsResponse = res
     "DescribeCommunicationsResponse"
-    "fixture/DescribeCommunicationsResponse"
+    "fixture/DescribeCommunicationsResponse.proto"
     support
     (Proxy :: Proxy DescribeCommunications)
 
 testAddCommunicationToCaseResponse :: AddCommunicationToCaseResponse -> TestTree
 testAddCommunicationToCaseResponse = res
     "AddCommunicationToCaseResponse"
-    "fixture/AddCommunicationToCaseResponse"
+    "fixture/AddCommunicationToCaseResponse.proto"
     support
     (Proxy :: Proxy AddCommunicationToCase)
