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-cognito-sync.cabal b/amazonka-cognito-sync.cabal
--- a/amazonka-cognito-sync.cabal
+++ b/amazonka-cognito-sync.cabal
@@ -1,7 +1,8 @@
 name:                  amazonka-cognito-sync
-version:               1.2.0.1
+version:               1.2.0.2
 synopsis:              Amazon Cognito Sync 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 Cognito Sync
 
@@ -100,8 +100,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.CognitoSync
         , Test.AWS.Gen.CognitoSync
diff --git a/fixture/BulkPublish.yaml b/fixture/BulkPublish.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/BulkPublish.yaml
diff --git a/fixture/BulkPublishResponse.proto b/fixture/BulkPublishResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/BulkPublishResponse.proto
diff --git a/fixture/DeleteDataset.yaml b/fixture/DeleteDataset.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/DeleteDataset.yaml
diff --git a/fixture/DeleteDatasetResponse.proto b/fixture/DeleteDatasetResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/DeleteDatasetResponse.proto
diff --git a/fixture/DescribeDataset.yaml b/fixture/DescribeDataset.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeDataset.yaml
diff --git a/fixture/DescribeDatasetResponse.proto b/fixture/DescribeDatasetResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeDatasetResponse.proto
diff --git a/fixture/DescribeIdentityPoolUsage.yaml b/fixture/DescribeIdentityPoolUsage.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeIdentityPoolUsage.yaml
diff --git a/fixture/DescribeIdentityPoolUsageResponse.proto b/fixture/DescribeIdentityPoolUsageResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeIdentityPoolUsageResponse.proto
diff --git a/fixture/DescribeIdentityUsage.yaml b/fixture/DescribeIdentityUsage.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeIdentityUsage.yaml
diff --git a/fixture/DescribeIdentityUsageResponse.proto b/fixture/DescribeIdentityUsageResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeIdentityUsageResponse.proto
diff --git a/fixture/GetBulkPublishDetails.yaml b/fixture/GetBulkPublishDetails.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/GetBulkPublishDetails.yaml
diff --git a/fixture/GetBulkPublishDetailsResponse.proto b/fixture/GetBulkPublishDetailsResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/GetBulkPublishDetailsResponse.proto
diff --git a/fixture/GetCognitoEvents.yaml b/fixture/GetCognitoEvents.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/GetCognitoEvents.yaml
diff --git a/fixture/GetCognitoEventsResponse.proto b/fixture/GetCognitoEventsResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/GetCognitoEventsResponse.proto
diff --git a/fixture/GetIdentityPoolConfiguration.yaml b/fixture/GetIdentityPoolConfiguration.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/GetIdentityPoolConfiguration.yaml
diff --git a/fixture/GetIdentityPoolConfigurationResponse.proto b/fixture/GetIdentityPoolConfigurationResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/GetIdentityPoolConfigurationResponse.proto
diff --git a/fixture/ListDatasets.yaml b/fixture/ListDatasets.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/ListDatasets.yaml
diff --git a/fixture/ListDatasetsResponse.proto b/fixture/ListDatasetsResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/ListDatasetsResponse.proto
diff --git a/fixture/ListIdentityPoolUsage.yaml b/fixture/ListIdentityPoolUsage.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/ListIdentityPoolUsage.yaml
diff --git a/fixture/ListIdentityPoolUsageResponse.proto b/fixture/ListIdentityPoolUsageResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/ListIdentityPoolUsageResponse.proto
diff --git a/fixture/ListRecords.yaml b/fixture/ListRecords.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/ListRecords.yaml
diff --git a/fixture/ListRecordsResponse.proto b/fixture/ListRecordsResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/ListRecordsResponse.proto
diff --git a/fixture/RegisterDevice.yaml b/fixture/RegisterDevice.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/RegisterDevice.yaml
diff --git a/fixture/RegisterDeviceResponse.proto b/fixture/RegisterDeviceResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/RegisterDeviceResponse.proto
diff --git a/fixture/SetCognitoEvents.yaml b/fixture/SetCognitoEvents.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/SetCognitoEvents.yaml
diff --git a/fixture/SetCognitoEventsResponse.proto b/fixture/SetCognitoEventsResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/SetCognitoEventsResponse.proto
diff --git a/fixture/SetIdentityPoolConfiguration.yaml b/fixture/SetIdentityPoolConfiguration.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/SetIdentityPoolConfiguration.yaml
diff --git a/fixture/SetIdentityPoolConfigurationResponse.proto b/fixture/SetIdentityPoolConfigurationResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/SetIdentityPoolConfigurationResponse.proto
diff --git a/fixture/SubscribeToDataset.yaml b/fixture/SubscribeToDataset.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/SubscribeToDataset.yaml
diff --git a/fixture/SubscribeToDatasetResponse.proto b/fixture/SubscribeToDatasetResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/SubscribeToDatasetResponse.proto
diff --git a/fixture/UnsubscribeFromDataset.yaml b/fixture/UnsubscribeFromDataset.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/UnsubscribeFromDataset.yaml
diff --git a/fixture/UnsubscribeFromDatasetResponse.proto b/fixture/UnsubscribeFromDatasetResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/UnsubscribeFromDatasetResponse.proto
diff --git a/fixture/UpdateRecords.yaml b/fixture/UpdateRecords.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/UpdateRecords.yaml
diff --git a/fixture/UpdateRecordsResponse.proto b/fixture/UpdateRecordsResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/UpdateRecordsResponse.proto
diff --git a/test/Test/AWS/Gen/CognitoSync.hs b/test/Test/AWS/Gen/CognitoSync.hs
--- a/test/Test/AWS/Gen/CognitoSync.hs
+++ b/test/Test/AWS/Gen/CognitoSync.hs
@@ -141,205 +141,205 @@
 testDescribeDataset :: DescribeDataset -> TestTree
 testDescribeDataset = req
     "DescribeDataset"
-    "fixture/DescribeDataset"
+    "fixture/DescribeDataset.yaml"
 
 testDescribeIdentityPoolUsage :: DescribeIdentityPoolUsage -> TestTree
 testDescribeIdentityPoolUsage = req
     "DescribeIdentityPoolUsage"
-    "fixture/DescribeIdentityPoolUsage"
+    "fixture/DescribeIdentityPoolUsage.yaml"
 
 testSetCognitoEvents :: SetCognitoEvents -> TestTree
 testSetCognitoEvents = req
     "SetCognitoEvents"
-    "fixture/SetCognitoEvents"
+    "fixture/SetCognitoEvents.yaml"
 
 testListIdentityPoolUsage :: ListIdentityPoolUsage -> TestTree
 testListIdentityPoolUsage = req
     "ListIdentityPoolUsage"
-    "fixture/ListIdentityPoolUsage"
+    "fixture/ListIdentityPoolUsage.yaml"
 
 testGetBulkPublishDetails :: GetBulkPublishDetails -> TestTree
 testGetBulkPublishDetails = req
     "GetBulkPublishDetails"
-    "fixture/GetBulkPublishDetails"
+    "fixture/GetBulkPublishDetails.yaml"
 
 testSetIdentityPoolConfiguration :: SetIdentityPoolConfiguration -> TestTree
 testSetIdentityPoolConfiguration = req
     "SetIdentityPoolConfiguration"
-    "fixture/SetIdentityPoolConfiguration"
+    "fixture/SetIdentityPoolConfiguration.yaml"
 
 testDeleteDataset :: DeleteDataset -> TestTree
 testDeleteDataset = req
     "DeleteDataset"
-    "fixture/DeleteDataset"
+    "fixture/DeleteDataset.yaml"
 
 testDescribeIdentityUsage :: DescribeIdentityUsage -> TestTree
 testDescribeIdentityUsage = req
     "DescribeIdentityUsage"
-    "fixture/DescribeIdentityUsage"
+    "fixture/DescribeIdentityUsage.yaml"
 
 testGetCognitoEvents :: GetCognitoEvents -> TestTree
 testGetCognitoEvents = req
     "GetCognitoEvents"
-    "fixture/GetCognitoEvents"
+    "fixture/GetCognitoEvents.yaml"
 
 testRegisterDevice :: RegisterDevice -> TestTree
 testRegisterDevice = req
     "RegisterDevice"
-    "fixture/RegisterDevice"
+    "fixture/RegisterDevice.yaml"
 
 testSubscribeToDataset :: SubscribeToDataset -> TestTree
 testSubscribeToDataset = req
     "SubscribeToDataset"
-    "fixture/SubscribeToDataset"
+    "fixture/SubscribeToDataset.yaml"
 
 testGetIdentityPoolConfiguration :: GetIdentityPoolConfiguration -> TestTree
 testGetIdentityPoolConfiguration = req
     "GetIdentityPoolConfiguration"
-    "fixture/GetIdentityPoolConfiguration"
+    "fixture/GetIdentityPoolConfiguration.yaml"
 
 testListRecords :: ListRecords -> TestTree
 testListRecords = req
     "ListRecords"
-    "fixture/ListRecords"
+    "fixture/ListRecords.yaml"
 
 testUnsubscribeFromDataset :: UnsubscribeFromDataset -> TestTree
 testUnsubscribeFromDataset = req
     "UnsubscribeFromDataset"
-    "fixture/UnsubscribeFromDataset"
+    "fixture/UnsubscribeFromDataset.yaml"
 
 testUpdateRecords :: UpdateRecords -> TestTree
 testUpdateRecords = req
     "UpdateRecords"
-    "fixture/UpdateRecords"
+    "fixture/UpdateRecords.yaml"
 
 testListDatasets :: ListDatasets -> TestTree
 testListDatasets = req
     "ListDatasets"
-    "fixture/ListDatasets"
+    "fixture/ListDatasets.yaml"
 
 testBulkPublish :: BulkPublish -> TestTree
 testBulkPublish = req
     "BulkPublish"
-    "fixture/BulkPublish"
+    "fixture/BulkPublish.yaml"
 
 -- Responses
 
 testDescribeDatasetResponse :: DescribeDatasetResponse -> TestTree
 testDescribeDatasetResponse = res
     "DescribeDatasetResponse"
-    "fixture/DescribeDatasetResponse"
+    "fixture/DescribeDatasetResponse.proto"
     cognitoSync
     (Proxy :: Proxy DescribeDataset)
 
 testDescribeIdentityPoolUsageResponse :: DescribeIdentityPoolUsageResponse -> TestTree
 testDescribeIdentityPoolUsageResponse = res
     "DescribeIdentityPoolUsageResponse"
-    "fixture/DescribeIdentityPoolUsageResponse"
+    "fixture/DescribeIdentityPoolUsageResponse.proto"
     cognitoSync
     (Proxy :: Proxy DescribeIdentityPoolUsage)
 
 testSetCognitoEventsResponse :: SetCognitoEventsResponse -> TestTree
 testSetCognitoEventsResponse = res
     "SetCognitoEventsResponse"
-    "fixture/SetCognitoEventsResponse"
+    "fixture/SetCognitoEventsResponse.proto"
     cognitoSync
     (Proxy :: Proxy SetCognitoEvents)
 
 testListIdentityPoolUsageResponse :: ListIdentityPoolUsageResponse -> TestTree
 testListIdentityPoolUsageResponse = res
     "ListIdentityPoolUsageResponse"
-    "fixture/ListIdentityPoolUsageResponse"
+    "fixture/ListIdentityPoolUsageResponse.proto"
     cognitoSync
     (Proxy :: Proxy ListIdentityPoolUsage)
 
 testGetBulkPublishDetailsResponse :: GetBulkPublishDetailsResponse -> TestTree
 testGetBulkPublishDetailsResponse = res
     "GetBulkPublishDetailsResponse"
-    "fixture/GetBulkPublishDetailsResponse"
+    "fixture/GetBulkPublishDetailsResponse.proto"
     cognitoSync
     (Proxy :: Proxy GetBulkPublishDetails)
 
 testSetIdentityPoolConfigurationResponse :: SetIdentityPoolConfigurationResponse -> TestTree
 testSetIdentityPoolConfigurationResponse = res
     "SetIdentityPoolConfigurationResponse"
-    "fixture/SetIdentityPoolConfigurationResponse"
+    "fixture/SetIdentityPoolConfigurationResponse.proto"
     cognitoSync
     (Proxy :: Proxy SetIdentityPoolConfiguration)
 
 testDeleteDatasetResponse :: DeleteDatasetResponse -> TestTree
 testDeleteDatasetResponse = res
     "DeleteDatasetResponse"
-    "fixture/DeleteDatasetResponse"
+    "fixture/DeleteDatasetResponse.proto"
     cognitoSync
     (Proxy :: Proxy DeleteDataset)
 
 testDescribeIdentityUsageResponse :: DescribeIdentityUsageResponse -> TestTree
 testDescribeIdentityUsageResponse = res
     "DescribeIdentityUsageResponse"
-    "fixture/DescribeIdentityUsageResponse"
+    "fixture/DescribeIdentityUsageResponse.proto"
     cognitoSync
     (Proxy :: Proxy DescribeIdentityUsage)
 
 testGetCognitoEventsResponse :: GetCognitoEventsResponse -> TestTree
 testGetCognitoEventsResponse = res
     "GetCognitoEventsResponse"
-    "fixture/GetCognitoEventsResponse"
+    "fixture/GetCognitoEventsResponse.proto"
     cognitoSync
     (Proxy :: Proxy GetCognitoEvents)
 
 testRegisterDeviceResponse :: RegisterDeviceResponse -> TestTree
 testRegisterDeviceResponse = res
     "RegisterDeviceResponse"
-    "fixture/RegisterDeviceResponse"
+    "fixture/RegisterDeviceResponse.proto"
     cognitoSync
     (Proxy :: Proxy RegisterDevice)
 
 testSubscribeToDatasetResponse :: SubscribeToDatasetResponse -> TestTree
 testSubscribeToDatasetResponse = res
     "SubscribeToDatasetResponse"
-    "fixture/SubscribeToDatasetResponse"
+    "fixture/SubscribeToDatasetResponse.proto"
     cognitoSync
     (Proxy :: Proxy SubscribeToDataset)
 
 testGetIdentityPoolConfigurationResponse :: GetIdentityPoolConfigurationResponse -> TestTree
 testGetIdentityPoolConfigurationResponse = res
     "GetIdentityPoolConfigurationResponse"
-    "fixture/GetIdentityPoolConfigurationResponse"
+    "fixture/GetIdentityPoolConfigurationResponse.proto"
     cognitoSync
     (Proxy :: Proxy GetIdentityPoolConfiguration)
 
 testListRecordsResponse :: ListRecordsResponse -> TestTree
 testListRecordsResponse = res
     "ListRecordsResponse"
-    "fixture/ListRecordsResponse"
+    "fixture/ListRecordsResponse.proto"
     cognitoSync
     (Proxy :: Proxy ListRecords)
 
 testUnsubscribeFromDatasetResponse :: UnsubscribeFromDatasetResponse -> TestTree
 testUnsubscribeFromDatasetResponse = res
     "UnsubscribeFromDatasetResponse"
-    "fixture/UnsubscribeFromDatasetResponse"
+    "fixture/UnsubscribeFromDatasetResponse.proto"
     cognitoSync
     (Proxy :: Proxy UnsubscribeFromDataset)
 
 testUpdateRecordsResponse :: UpdateRecordsResponse -> TestTree
 testUpdateRecordsResponse = res
     "UpdateRecordsResponse"
-    "fixture/UpdateRecordsResponse"
+    "fixture/UpdateRecordsResponse.proto"
     cognitoSync
     (Proxy :: Proxy UpdateRecords)
 
 testListDatasetsResponse :: ListDatasetsResponse -> TestTree
 testListDatasetsResponse = res
     "ListDatasetsResponse"
-    "fixture/ListDatasetsResponse"
+    "fixture/ListDatasetsResponse.proto"
     cognitoSync
     (Proxy :: Proxy ListDatasets)
 
 testBulkPublishResponse :: BulkPublishResponse -> TestTree
 testBulkPublishResponse = res
     "BulkPublishResponse"
-    "fixture/BulkPublishResponse"
+    "fixture/BulkPublishResponse.proto"
     cognitoSync
     (Proxy :: Proxy BulkPublish)
