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-route53-domains.cabal b/amazonka-route53-domains.cabal
--- a/amazonka-route53-domains.cabal
+++ b/amazonka-route53-domains.cabal
@@ -1,7 +1,8 @@
 name:                  amazonka-route53-domains
-version:               1.2.0.1
+version:               1.2.0.2
 synopsis:              Amazon Route 53 Domains 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:
     Pending
     .
@@ -78,8 +78,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.Route53Domains
         , Test.AWS.Gen.Route53Domains
diff --git a/fixture/CheckDomainAvailability.yaml b/fixture/CheckDomainAvailability.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/CheckDomainAvailability.yaml
diff --git a/fixture/CheckDomainAvailabilityResponse.proto b/fixture/CheckDomainAvailabilityResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/CheckDomainAvailabilityResponse.proto
diff --git a/fixture/DeleteTagsForDomain.yaml b/fixture/DeleteTagsForDomain.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/DeleteTagsForDomain.yaml
diff --git a/fixture/DeleteTagsForDomainResponse.proto b/fixture/DeleteTagsForDomainResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/DeleteTagsForDomainResponse.proto
diff --git a/fixture/DisableDomainAutoRenew.yaml b/fixture/DisableDomainAutoRenew.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/DisableDomainAutoRenew.yaml
diff --git a/fixture/DisableDomainAutoRenewResponse.proto b/fixture/DisableDomainAutoRenewResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/DisableDomainAutoRenewResponse.proto
diff --git a/fixture/DisableDomainTransferLock.yaml b/fixture/DisableDomainTransferLock.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/DisableDomainTransferLock.yaml
diff --git a/fixture/DisableDomainTransferLockResponse.proto b/fixture/DisableDomainTransferLockResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/DisableDomainTransferLockResponse.proto
diff --git a/fixture/EnableDomainAutoRenew.yaml b/fixture/EnableDomainAutoRenew.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/EnableDomainAutoRenew.yaml
diff --git a/fixture/EnableDomainAutoRenewResponse.proto b/fixture/EnableDomainAutoRenewResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/EnableDomainAutoRenewResponse.proto
diff --git a/fixture/EnableDomainTransferLock.yaml b/fixture/EnableDomainTransferLock.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/EnableDomainTransferLock.yaml
diff --git a/fixture/EnableDomainTransferLockResponse.proto b/fixture/EnableDomainTransferLockResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/EnableDomainTransferLockResponse.proto
diff --git a/fixture/GetDomainDetail.yaml b/fixture/GetDomainDetail.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/GetDomainDetail.yaml
diff --git a/fixture/GetDomainDetailResponse.proto b/fixture/GetDomainDetailResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/GetDomainDetailResponse.proto
diff --git a/fixture/GetOperationDetail.yaml b/fixture/GetOperationDetail.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/GetOperationDetail.yaml
diff --git a/fixture/GetOperationDetailResponse.proto b/fixture/GetOperationDetailResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/GetOperationDetailResponse.proto
diff --git a/fixture/ListDomains.yaml b/fixture/ListDomains.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/ListDomains.yaml
diff --git a/fixture/ListDomainsResponse.proto b/fixture/ListDomainsResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/ListDomainsResponse.proto
diff --git a/fixture/ListOperations.yaml b/fixture/ListOperations.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/ListOperations.yaml
diff --git a/fixture/ListOperationsResponse.proto b/fixture/ListOperationsResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/ListOperationsResponse.proto
diff --git a/fixture/ListTagsForDomain.yaml b/fixture/ListTagsForDomain.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/ListTagsForDomain.yaml
diff --git a/fixture/ListTagsForDomainResponse.proto b/fixture/ListTagsForDomainResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/ListTagsForDomainResponse.proto
diff --git a/fixture/RegisterDomain.yaml b/fixture/RegisterDomain.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/RegisterDomain.yaml
diff --git a/fixture/RegisterDomainResponse.proto b/fixture/RegisterDomainResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/RegisterDomainResponse.proto
diff --git a/fixture/RetrieveDomainAuthCode.yaml b/fixture/RetrieveDomainAuthCode.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/RetrieveDomainAuthCode.yaml
diff --git a/fixture/RetrieveDomainAuthCodeResponse.proto b/fixture/RetrieveDomainAuthCodeResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/RetrieveDomainAuthCodeResponse.proto
diff --git a/fixture/TransferDomain.yaml b/fixture/TransferDomain.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/TransferDomain.yaml
diff --git a/fixture/TransferDomainResponse.proto b/fixture/TransferDomainResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/TransferDomainResponse.proto
diff --git a/fixture/UpdateDomainContact.yaml b/fixture/UpdateDomainContact.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/UpdateDomainContact.yaml
diff --git a/fixture/UpdateDomainContactPrivacy.yaml b/fixture/UpdateDomainContactPrivacy.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/UpdateDomainContactPrivacy.yaml
diff --git a/fixture/UpdateDomainContactPrivacyResponse.proto b/fixture/UpdateDomainContactPrivacyResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/UpdateDomainContactPrivacyResponse.proto
diff --git a/fixture/UpdateDomainContactResponse.proto b/fixture/UpdateDomainContactResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/UpdateDomainContactResponse.proto
diff --git a/fixture/UpdateDomainNameservers.yaml b/fixture/UpdateDomainNameservers.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/UpdateDomainNameservers.yaml
diff --git a/fixture/UpdateDomainNameserversResponse.proto b/fixture/UpdateDomainNameserversResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/UpdateDomainNameserversResponse.proto
diff --git a/fixture/UpdateTagsForDomain.yaml b/fixture/UpdateTagsForDomain.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/UpdateTagsForDomain.yaml
diff --git a/fixture/UpdateTagsForDomainResponse.proto b/fixture/UpdateTagsForDomainResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/UpdateTagsForDomainResponse.proto
diff --git a/test/Test/AWS/Gen/Route53Domains.hs b/test/Test/AWS/Gen/Route53Domains.hs
--- a/test/Test/AWS/Gen/Route53Domains.hs
+++ b/test/Test/AWS/Gen/Route53Domains.hs
@@ -147,217 +147,217 @@
 testListOperations :: ListOperations -> TestTree
 testListOperations = req
     "ListOperations"
-    "fixture/ListOperations"
+    "fixture/ListOperations.yaml"
 
 testGetDomainDetail :: GetDomainDetail -> TestTree
 testGetDomainDetail = req
     "GetDomainDetail"
-    "fixture/GetDomainDetail"
+    "fixture/GetDomainDetail.yaml"
 
 testUpdateDomainContactPrivacy :: UpdateDomainContactPrivacy -> TestTree
 testUpdateDomainContactPrivacy = req
     "UpdateDomainContactPrivacy"
-    "fixture/UpdateDomainContactPrivacy"
+    "fixture/UpdateDomainContactPrivacy.yaml"
 
 testGetOperationDetail :: GetOperationDetail -> TestTree
 testGetOperationDetail = req
     "GetOperationDetail"
-    "fixture/GetOperationDetail"
+    "fixture/GetOperationDetail.yaml"
 
 testEnableDomainAutoRenew :: EnableDomainAutoRenew -> TestTree
 testEnableDomainAutoRenew = req
     "EnableDomainAutoRenew"
-    "fixture/EnableDomainAutoRenew"
+    "fixture/EnableDomainAutoRenew.yaml"
 
 testDisableDomainAutoRenew :: DisableDomainAutoRenew -> TestTree
 testDisableDomainAutoRenew = req
     "DisableDomainAutoRenew"
-    "fixture/DisableDomainAutoRenew"
+    "fixture/DisableDomainAutoRenew.yaml"
 
 testUpdateDomainContact :: UpdateDomainContact -> TestTree
 testUpdateDomainContact = req
     "UpdateDomainContact"
-    "fixture/UpdateDomainContact"
+    "fixture/UpdateDomainContact.yaml"
 
 testEnableDomainTransferLock :: EnableDomainTransferLock -> TestTree
 testEnableDomainTransferLock = req
     "EnableDomainTransferLock"
-    "fixture/EnableDomainTransferLock"
+    "fixture/EnableDomainTransferLock.yaml"
 
 testRegisterDomain :: RegisterDomain -> TestTree
 testRegisterDomain = req
     "RegisterDomain"
-    "fixture/RegisterDomain"
+    "fixture/RegisterDomain.yaml"
 
 testDisableDomainTransferLock :: DisableDomainTransferLock -> TestTree
 testDisableDomainTransferLock = req
     "DisableDomainTransferLock"
-    "fixture/DisableDomainTransferLock"
+    "fixture/DisableDomainTransferLock.yaml"
 
 testCheckDomainAvailability :: CheckDomainAvailability -> TestTree
 testCheckDomainAvailability = req
     "CheckDomainAvailability"
-    "fixture/CheckDomainAvailability"
+    "fixture/CheckDomainAvailability.yaml"
 
 testListTagsForDomain :: ListTagsForDomain -> TestTree
 testListTagsForDomain = req
     "ListTagsForDomain"
-    "fixture/ListTagsForDomain"
+    "fixture/ListTagsForDomain.yaml"
 
 testUpdateDomainNameservers :: UpdateDomainNameservers -> TestTree
 testUpdateDomainNameservers = req
     "UpdateDomainNameservers"
-    "fixture/UpdateDomainNameservers"
+    "fixture/UpdateDomainNameservers.yaml"
 
 testRetrieveDomainAuthCode :: RetrieveDomainAuthCode -> TestTree
 testRetrieveDomainAuthCode = req
     "RetrieveDomainAuthCode"
-    "fixture/RetrieveDomainAuthCode"
+    "fixture/RetrieveDomainAuthCode.yaml"
 
 testTransferDomain :: TransferDomain -> TestTree
 testTransferDomain = req
     "TransferDomain"
-    "fixture/TransferDomain"
+    "fixture/TransferDomain.yaml"
 
 testDeleteTagsForDomain :: DeleteTagsForDomain -> TestTree
 testDeleteTagsForDomain = req
     "DeleteTagsForDomain"
-    "fixture/DeleteTagsForDomain"
+    "fixture/DeleteTagsForDomain.yaml"
 
 testUpdateTagsForDomain :: UpdateTagsForDomain -> TestTree
 testUpdateTagsForDomain = req
     "UpdateTagsForDomain"
-    "fixture/UpdateTagsForDomain"
+    "fixture/UpdateTagsForDomain.yaml"
 
 testListDomains :: ListDomains -> TestTree
 testListDomains = req
     "ListDomains"
-    "fixture/ListDomains"
+    "fixture/ListDomains.yaml"
 
 -- Responses
 
 testListOperationsResponse :: ListOperationsResponse -> TestTree
 testListOperationsResponse = res
     "ListOperationsResponse"
-    "fixture/ListOperationsResponse"
+    "fixture/ListOperationsResponse.proto"
     route53Domains
     (Proxy :: Proxy ListOperations)
 
 testGetDomainDetailResponse :: GetDomainDetailResponse -> TestTree
 testGetDomainDetailResponse = res
     "GetDomainDetailResponse"
-    "fixture/GetDomainDetailResponse"
+    "fixture/GetDomainDetailResponse.proto"
     route53Domains
     (Proxy :: Proxy GetDomainDetail)
 
 testUpdateDomainContactPrivacyResponse :: UpdateDomainContactPrivacyResponse -> TestTree
 testUpdateDomainContactPrivacyResponse = res
     "UpdateDomainContactPrivacyResponse"
-    "fixture/UpdateDomainContactPrivacyResponse"
+    "fixture/UpdateDomainContactPrivacyResponse.proto"
     route53Domains
     (Proxy :: Proxy UpdateDomainContactPrivacy)
 
 testGetOperationDetailResponse :: GetOperationDetailResponse -> TestTree
 testGetOperationDetailResponse = res
     "GetOperationDetailResponse"
-    "fixture/GetOperationDetailResponse"
+    "fixture/GetOperationDetailResponse.proto"
     route53Domains
     (Proxy :: Proxy GetOperationDetail)
 
 testEnableDomainAutoRenewResponse :: EnableDomainAutoRenewResponse -> TestTree
 testEnableDomainAutoRenewResponse = res
     "EnableDomainAutoRenewResponse"
-    "fixture/EnableDomainAutoRenewResponse"
+    "fixture/EnableDomainAutoRenewResponse.proto"
     route53Domains
     (Proxy :: Proxy EnableDomainAutoRenew)
 
 testDisableDomainAutoRenewResponse :: DisableDomainAutoRenewResponse -> TestTree
 testDisableDomainAutoRenewResponse = res
     "DisableDomainAutoRenewResponse"
-    "fixture/DisableDomainAutoRenewResponse"
+    "fixture/DisableDomainAutoRenewResponse.proto"
     route53Domains
     (Proxy :: Proxy DisableDomainAutoRenew)
 
 testUpdateDomainContactResponse :: UpdateDomainContactResponse -> TestTree
 testUpdateDomainContactResponse = res
     "UpdateDomainContactResponse"
-    "fixture/UpdateDomainContactResponse"
+    "fixture/UpdateDomainContactResponse.proto"
     route53Domains
     (Proxy :: Proxy UpdateDomainContact)
 
 testEnableDomainTransferLockResponse :: EnableDomainTransferLockResponse -> TestTree
 testEnableDomainTransferLockResponse = res
     "EnableDomainTransferLockResponse"
-    "fixture/EnableDomainTransferLockResponse"
+    "fixture/EnableDomainTransferLockResponse.proto"
     route53Domains
     (Proxy :: Proxy EnableDomainTransferLock)
 
 testRegisterDomainResponse :: RegisterDomainResponse -> TestTree
 testRegisterDomainResponse = res
     "RegisterDomainResponse"
-    "fixture/RegisterDomainResponse"
+    "fixture/RegisterDomainResponse.proto"
     route53Domains
     (Proxy :: Proxy RegisterDomain)
 
 testDisableDomainTransferLockResponse :: DisableDomainTransferLockResponse -> TestTree
 testDisableDomainTransferLockResponse = res
     "DisableDomainTransferLockResponse"
-    "fixture/DisableDomainTransferLockResponse"
+    "fixture/DisableDomainTransferLockResponse.proto"
     route53Domains
     (Proxy :: Proxy DisableDomainTransferLock)
 
 testCheckDomainAvailabilityResponse :: CheckDomainAvailabilityResponse -> TestTree
 testCheckDomainAvailabilityResponse = res
     "CheckDomainAvailabilityResponse"
-    "fixture/CheckDomainAvailabilityResponse"
+    "fixture/CheckDomainAvailabilityResponse.proto"
     route53Domains
     (Proxy :: Proxy CheckDomainAvailability)
 
 testListTagsForDomainResponse :: ListTagsForDomainResponse -> TestTree
 testListTagsForDomainResponse = res
     "ListTagsForDomainResponse"
-    "fixture/ListTagsForDomainResponse"
+    "fixture/ListTagsForDomainResponse.proto"
     route53Domains
     (Proxy :: Proxy ListTagsForDomain)
 
 testUpdateDomainNameserversResponse :: UpdateDomainNameserversResponse -> TestTree
 testUpdateDomainNameserversResponse = res
     "UpdateDomainNameserversResponse"
-    "fixture/UpdateDomainNameserversResponse"
+    "fixture/UpdateDomainNameserversResponse.proto"
     route53Domains
     (Proxy :: Proxy UpdateDomainNameservers)
 
 testRetrieveDomainAuthCodeResponse :: RetrieveDomainAuthCodeResponse -> TestTree
 testRetrieveDomainAuthCodeResponse = res
     "RetrieveDomainAuthCodeResponse"
-    "fixture/RetrieveDomainAuthCodeResponse"
+    "fixture/RetrieveDomainAuthCodeResponse.proto"
     route53Domains
     (Proxy :: Proxy RetrieveDomainAuthCode)
 
 testTransferDomainResponse :: TransferDomainResponse -> TestTree
 testTransferDomainResponse = res
     "TransferDomainResponse"
-    "fixture/TransferDomainResponse"
+    "fixture/TransferDomainResponse.proto"
     route53Domains
     (Proxy :: Proxy TransferDomain)
 
 testDeleteTagsForDomainResponse :: DeleteTagsForDomainResponse -> TestTree
 testDeleteTagsForDomainResponse = res
     "DeleteTagsForDomainResponse"
-    "fixture/DeleteTagsForDomainResponse"
+    "fixture/DeleteTagsForDomainResponse.proto"
     route53Domains
     (Proxy :: Proxy DeleteTagsForDomain)
 
 testUpdateTagsForDomainResponse :: UpdateTagsForDomainResponse -> TestTree
 testUpdateTagsForDomainResponse = res
     "UpdateTagsForDomainResponse"
-    "fixture/UpdateTagsForDomainResponse"
+    "fixture/UpdateTagsForDomainResponse.proto"
     route53Domains
     (Proxy :: Proxy UpdateTagsForDomain)
 
 testListDomainsResponse :: ListDomainsResponse -> TestTree
 testListDomainsResponse = res
     "ListDomainsResponse"
-    "fixture/ListDomainsResponse"
+    "fixture/ListDomainsResponse.proto"
     route53Domains
     (Proxy :: Proxy ListDomains)
