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-cloudwatch-logs.cabal b/amazonka-cloudwatch-logs.cabal
--- a/amazonka-cloudwatch-logs.cabal
+++ b/amazonka-cloudwatch-logs.cabal
@@ -1,7 +1,8 @@
 name:                  amazonka-cloudwatch-logs
-version:               1.2.0.1
+version:               1.2.0.2
 synopsis:              Amazon CloudWatch Logs 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 CloudWatch Logs API Reference
 
@@ -122,8 +122,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.CloudWatchLogs
         , Test.AWS.Gen.CloudWatchLogs
diff --git a/fixture/CreateLogGroup.yaml b/fixture/CreateLogGroup.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/CreateLogGroup.yaml
diff --git a/fixture/CreateLogGroupResponse.proto b/fixture/CreateLogGroupResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/CreateLogGroupResponse.proto
diff --git a/fixture/CreateLogStream.yaml b/fixture/CreateLogStream.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/CreateLogStream.yaml
diff --git a/fixture/CreateLogStreamResponse.proto b/fixture/CreateLogStreamResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/CreateLogStreamResponse.proto
diff --git a/fixture/DeleteDestination.yaml b/fixture/DeleteDestination.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/DeleteDestination.yaml
diff --git a/fixture/DeleteDestinationResponse.proto b/fixture/DeleteDestinationResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/DeleteDestinationResponse.proto
diff --git a/fixture/DeleteLogGroup.yaml b/fixture/DeleteLogGroup.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/DeleteLogGroup.yaml
diff --git a/fixture/DeleteLogGroupResponse.proto b/fixture/DeleteLogGroupResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/DeleteLogGroupResponse.proto
diff --git a/fixture/DeleteLogStream.yaml b/fixture/DeleteLogStream.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/DeleteLogStream.yaml
diff --git a/fixture/DeleteLogStreamResponse.proto b/fixture/DeleteLogStreamResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/DeleteLogStreamResponse.proto
diff --git a/fixture/DeleteMetricFilter.yaml b/fixture/DeleteMetricFilter.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/DeleteMetricFilter.yaml
diff --git a/fixture/DeleteMetricFilterResponse.proto b/fixture/DeleteMetricFilterResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/DeleteMetricFilterResponse.proto
diff --git a/fixture/DeleteRetentionPolicy.yaml b/fixture/DeleteRetentionPolicy.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/DeleteRetentionPolicy.yaml
diff --git a/fixture/DeleteRetentionPolicyResponse.proto b/fixture/DeleteRetentionPolicyResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/DeleteRetentionPolicyResponse.proto
diff --git a/fixture/DeleteSubscriptionFilter.yaml b/fixture/DeleteSubscriptionFilter.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/DeleteSubscriptionFilter.yaml
diff --git a/fixture/DeleteSubscriptionFilterResponse.proto b/fixture/DeleteSubscriptionFilterResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/DeleteSubscriptionFilterResponse.proto
diff --git a/fixture/DescribeDestinations.yaml b/fixture/DescribeDestinations.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeDestinations.yaml
diff --git a/fixture/DescribeDestinationsResponse.proto b/fixture/DescribeDestinationsResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeDestinationsResponse.proto
diff --git a/fixture/DescribeLogGroups.yaml b/fixture/DescribeLogGroups.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeLogGroups.yaml
diff --git a/fixture/DescribeLogGroupsResponse.proto b/fixture/DescribeLogGroupsResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeLogGroupsResponse.proto
diff --git a/fixture/DescribeLogStreams.yaml b/fixture/DescribeLogStreams.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeLogStreams.yaml
diff --git a/fixture/DescribeLogStreamsResponse.proto b/fixture/DescribeLogStreamsResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeLogStreamsResponse.proto
diff --git a/fixture/DescribeMetricFilters.yaml b/fixture/DescribeMetricFilters.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeMetricFilters.yaml
diff --git a/fixture/DescribeMetricFiltersResponse.proto b/fixture/DescribeMetricFiltersResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeMetricFiltersResponse.proto
diff --git a/fixture/DescribeSubscriptionFilters.yaml b/fixture/DescribeSubscriptionFilters.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeSubscriptionFilters.yaml
diff --git a/fixture/DescribeSubscriptionFiltersResponse.proto b/fixture/DescribeSubscriptionFiltersResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeSubscriptionFiltersResponse.proto
diff --git a/fixture/FilterLogEvents.yaml b/fixture/FilterLogEvents.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/FilterLogEvents.yaml
diff --git a/fixture/FilterLogEventsResponse.proto b/fixture/FilterLogEventsResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/FilterLogEventsResponse.proto
diff --git a/fixture/GetLogEvents.yaml b/fixture/GetLogEvents.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/GetLogEvents.yaml
diff --git a/fixture/GetLogEventsResponse.proto b/fixture/GetLogEventsResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/GetLogEventsResponse.proto
diff --git a/fixture/PutDestination.yaml b/fixture/PutDestination.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/PutDestination.yaml
diff --git a/fixture/PutDestinationPolicy.yaml b/fixture/PutDestinationPolicy.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/PutDestinationPolicy.yaml
diff --git a/fixture/PutDestinationPolicyResponse.proto b/fixture/PutDestinationPolicyResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/PutDestinationPolicyResponse.proto
diff --git a/fixture/PutDestinationResponse.proto b/fixture/PutDestinationResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/PutDestinationResponse.proto
diff --git a/fixture/PutLogEvents.yaml b/fixture/PutLogEvents.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/PutLogEvents.yaml
diff --git a/fixture/PutLogEventsResponse.proto b/fixture/PutLogEventsResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/PutLogEventsResponse.proto
diff --git a/fixture/PutMetricFilter.yaml b/fixture/PutMetricFilter.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/PutMetricFilter.yaml
diff --git a/fixture/PutMetricFilterResponse.proto b/fixture/PutMetricFilterResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/PutMetricFilterResponse.proto
diff --git a/fixture/PutRetentionPolicy.yaml b/fixture/PutRetentionPolicy.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/PutRetentionPolicy.yaml
diff --git a/fixture/PutRetentionPolicyResponse.proto b/fixture/PutRetentionPolicyResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/PutRetentionPolicyResponse.proto
diff --git a/fixture/PutSubscriptionFilter.yaml b/fixture/PutSubscriptionFilter.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/PutSubscriptionFilter.yaml
diff --git a/fixture/PutSubscriptionFilterResponse.proto b/fixture/PutSubscriptionFilterResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/PutSubscriptionFilterResponse.proto
diff --git a/fixture/TestMetricFilter.yaml b/fixture/TestMetricFilter.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/TestMetricFilter.yaml
diff --git a/fixture/TestMetricFilterResponse.proto b/fixture/TestMetricFilterResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/TestMetricFilterResponse.proto
diff --git a/test/Test/AWS/Gen/CloudWatchLogs.hs b/test/Test/AWS/Gen/CloudWatchLogs.hs
--- a/test/Test/AWS/Gen/CloudWatchLogs.hs
+++ b/test/Test/AWS/Gen/CloudWatchLogs.hs
@@ -171,265 +171,265 @@
 testDescribeDestinations :: DescribeDestinations -> TestTree
 testDescribeDestinations = req
     "DescribeDestinations"
-    "fixture/DescribeDestinations"
+    "fixture/DescribeDestinations.yaml"
 
 testDeleteDestination :: DeleteDestination -> TestTree
 testDeleteDestination = req
     "DeleteDestination"
-    "fixture/DeleteDestination"
+    "fixture/DeleteDestination.yaml"
 
 testPutDestination :: PutDestination -> TestTree
 testPutDestination = req
     "PutDestination"
-    "fixture/PutDestination"
+    "fixture/PutDestination.yaml"
 
 testDescribeSubscriptionFilters :: DescribeSubscriptionFilters -> TestTree
 testDescribeSubscriptionFilters = req
     "DescribeSubscriptionFilters"
-    "fixture/DescribeSubscriptionFilters"
+    "fixture/DescribeSubscriptionFilters.yaml"
 
 testGetLogEvents :: GetLogEvents -> TestTree
 testGetLogEvents = req
     "GetLogEvents"
-    "fixture/GetLogEvents"
+    "fixture/GetLogEvents.yaml"
 
 testDescribeLogGroups :: DescribeLogGroups -> TestTree
 testDescribeLogGroups = req
     "DescribeLogGroups"
-    "fixture/DescribeLogGroups"
+    "fixture/DescribeLogGroups.yaml"
 
 testFilterLogEvents :: FilterLogEvents -> TestTree
 testFilterLogEvents = req
     "FilterLogEvents"
-    "fixture/FilterLogEvents"
+    "fixture/FilterLogEvents.yaml"
 
 testDeleteLogStream :: DeleteLogStream -> TestTree
 testDeleteLogStream = req
     "DeleteLogStream"
-    "fixture/DeleteLogStream"
+    "fixture/DeleteLogStream.yaml"
 
 testCreateLogStream :: CreateLogStream -> TestTree
 testCreateLogStream = req
     "CreateLogStream"
-    "fixture/CreateLogStream"
+    "fixture/CreateLogStream.yaml"
 
 testCreateLogGroup :: CreateLogGroup -> TestTree
 testCreateLogGroup = req
     "CreateLogGroup"
-    "fixture/CreateLogGroup"
+    "fixture/CreateLogGroup.yaml"
 
 testPutLogEvents :: PutLogEvents -> TestTree
 testPutLogEvents = req
     "PutLogEvents"
-    "fixture/PutLogEvents"
+    "fixture/PutLogEvents.yaml"
 
 testDeleteSubscriptionFilter :: DeleteSubscriptionFilter -> TestTree
 testDeleteSubscriptionFilter = req
     "DeleteSubscriptionFilter"
-    "fixture/DeleteSubscriptionFilter"
+    "fixture/DeleteSubscriptionFilter.yaml"
 
 testPutSubscriptionFilter :: PutSubscriptionFilter -> TestTree
 testPutSubscriptionFilter = req
     "PutSubscriptionFilter"
-    "fixture/PutSubscriptionFilter"
+    "fixture/PutSubscriptionFilter.yaml"
 
 testDeleteLogGroup :: DeleteLogGroup -> TestTree
 testDeleteLogGroup = req
     "DeleteLogGroup"
-    "fixture/DeleteLogGroup"
+    "fixture/DeleteLogGroup.yaml"
 
 testTestMetricFilter :: TestMetricFilter -> TestTree
 testTestMetricFilter = req
     "TestMetricFilter"
-    "fixture/TestMetricFilter"
+    "fixture/TestMetricFilter.yaml"
 
 testDescribeMetricFilters :: DescribeMetricFilters -> TestTree
 testDescribeMetricFilters = req
     "DescribeMetricFilters"
-    "fixture/DescribeMetricFilters"
+    "fixture/DescribeMetricFilters.yaml"
 
 testDeleteMetricFilter :: DeleteMetricFilter -> TestTree
 testDeleteMetricFilter = req
     "DeleteMetricFilter"
-    "fixture/DeleteMetricFilter"
+    "fixture/DeleteMetricFilter.yaml"
 
 testPutRetentionPolicy :: PutRetentionPolicy -> TestTree
 testPutRetentionPolicy = req
     "PutRetentionPolicy"
-    "fixture/PutRetentionPolicy"
+    "fixture/PutRetentionPolicy.yaml"
 
 testDeleteRetentionPolicy :: DeleteRetentionPolicy -> TestTree
 testDeleteRetentionPolicy = req
     "DeleteRetentionPolicy"
-    "fixture/DeleteRetentionPolicy"
+    "fixture/DeleteRetentionPolicy.yaml"
 
 testPutMetricFilter :: PutMetricFilter -> TestTree
 testPutMetricFilter = req
     "PutMetricFilter"
-    "fixture/PutMetricFilter"
+    "fixture/PutMetricFilter.yaml"
 
 testPutDestinationPolicy :: PutDestinationPolicy -> TestTree
 testPutDestinationPolicy = req
     "PutDestinationPolicy"
-    "fixture/PutDestinationPolicy"
+    "fixture/PutDestinationPolicy.yaml"
 
 testDescribeLogStreams :: DescribeLogStreams -> TestTree
 testDescribeLogStreams = req
     "DescribeLogStreams"
-    "fixture/DescribeLogStreams"
+    "fixture/DescribeLogStreams.yaml"
 
 -- Responses
 
 testDescribeDestinationsResponse :: DescribeDestinationsResponse -> TestTree
 testDescribeDestinationsResponse = res
     "DescribeDestinationsResponse"
-    "fixture/DescribeDestinationsResponse"
+    "fixture/DescribeDestinationsResponse.proto"
     cloudWatchLogs
     (Proxy :: Proxy DescribeDestinations)
 
 testDeleteDestinationResponse :: DeleteDestinationResponse -> TestTree
 testDeleteDestinationResponse = res
     "DeleteDestinationResponse"
-    "fixture/DeleteDestinationResponse"
+    "fixture/DeleteDestinationResponse.proto"
     cloudWatchLogs
     (Proxy :: Proxy DeleteDestination)
 
 testPutDestinationResponse :: PutDestinationResponse -> TestTree
 testPutDestinationResponse = res
     "PutDestinationResponse"
-    "fixture/PutDestinationResponse"
+    "fixture/PutDestinationResponse.proto"
     cloudWatchLogs
     (Proxy :: Proxy PutDestination)
 
 testDescribeSubscriptionFiltersResponse :: DescribeSubscriptionFiltersResponse -> TestTree
 testDescribeSubscriptionFiltersResponse = res
     "DescribeSubscriptionFiltersResponse"
-    "fixture/DescribeSubscriptionFiltersResponse"
+    "fixture/DescribeSubscriptionFiltersResponse.proto"
     cloudWatchLogs
     (Proxy :: Proxy DescribeSubscriptionFilters)
 
 testGetLogEventsResponse :: GetLogEventsResponse -> TestTree
 testGetLogEventsResponse = res
     "GetLogEventsResponse"
-    "fixture/GetLogEventsResponse"
+    "fixture/GetLogEventsResponse.proto"
     cloudWatchLogs
     (Proxy :: Proxy GetLogEvents)
 
 testDescribeLogGroupsResponse :: DescribeLogGroupsResponse -> TestTree
 testDescribeLogGroupsResponse = res
     "DescribeLogGroupsResponse"
-    "fixture/DescribeLogGroupsResponse"
+    "fixture/DescribeLogGroupsResponse.proto"
     cloudWatchLogs
     (Proxy :: Proxy DescribeLogGroups)
 
 testFilterLogEventsResponse :: FilterLogEventsResponse -> TestTree
 testFilterLogEventsResponse = res
     "FilterLogEventsResponse"
-    "fixture/FilterLogEventsResponse"
+    "fixture/FilterLogEventsResponse.proto"
     cloudWatchLogs
     (Proxy :: Proxy FilterLogEvents)
 
 testDeleteLogStreamResponse :: DeleteLogStreamResponse -> TestTree
 testDeleteLogStreamResponse = res
     "DeleteLogStreamResponse"
-    "fixture/DeleteLogStreamResponse"
+    "fixture/DeleteLogStreamResponse.proto"
     cloudWatchLogs
     (Proxy :: Proxy DeleteLogStream)
 
 testCreateLogStreamResponse :: CreateLogStreamResponse -> TestTree
 testCreateLogStreamResponse = res
     "CreateLogStreamResponse"
-    "fixture/CreateLogStreamResponse"
+    "fixture/CreateLogStreamResponse.proto"
     cloudWatchLogs
     (Proxy :: Proxy CreateLogStream)
 
 testCreateLogGroupResponse :: CreateLogGroupResponse -> TestTree
 testCreateLogGroupResponse = res
     "CreateLogGroupResponse"
-    "fixture/CreateLogGroupResponse"
+    "fixture/CreateLogGroupResponse.proto"
     cloudWatchLogs
     (Proxy :: Proxy CreateLogGroup)
 
 testPutLogEventsResponse :: PutLogEventsResponse -> TestTree
 testPutLogEventsResponse = res
     "PutLogEventsResponse"
-    "fixture/PutLogEventsResponse"
+    "fixture/PutLogEventsResponse.proto"
     cloudWatchLogs
     (Proxy :: Proxy PutLogEvents)
 
 testDeleteSubscriptionFilterResponse :: DeleteSubscriptionFilterResponse -> TestTree
 testDeleteSubscriptionFilterResponse = res
     "DeleteSubscriptionFilterResponse"
-    "fixture/DeleteSubscriptionFilterResponse"
+    "fixture/DeleteSubscriptionFilterResponse.proto"
     cloudWatchLogs
     (Proxy :: Proxy DeleteSubscriptionFilter)
 
 testPutSubscriptionFilterResponse :: PutSubscriptionFilterResponse -> TestTree
 testPutSubscriptionFilterResponse = res
     "PutSubscriptionFilterResponse"
-    "fixture/PutSubscriptionFilterResponse"
+    "fixture/PutSubscriptionFilterResponse.proto"
     cloudWatchLogs
     (Proxy :: Proxy PutSubscriptionFilter)
 
 testDeleteLogGroupResponse :: DeleteLogGroupResponse -> TestTree
 testDeleteLogGroupResponse = res
     "DeleteLogGroupResponse"
-    "fixture/DeleteLogGroupResponse"
+    "fixture/DeleteLogGroupResponse.proto"
     cloudWatchLogs
     (Proxy :: Proxy DeleteLogGroup)
 
 testTestMetricFilterResponse :: TestMetricFilterResponse -> TestTree
 testTestMetricFilterResponse = res
     "TestMetricFilterResponse"
-    "fixture/TestMetricFilterResponse"
+    "fixture/TestMetricFilterResponse.proto"
     cloudWatchLogs
     (Proxy :: Proxy TestMetricFilter)
 
 testDescribeMetricFiltersResponse :: DescribeMetricFiltersResponse -> TestTree
 testDescribeMetricFiltersResponse = res
     "DescribeMetricFiltersResponse"
-    "fixture/DescribeMetricFiltersResponse"
+    "fixture/DescribeMetricFiltersResponse.proto"
     cloudWatchLogs
     (Proxy :: Proxy DescribeMetricFilters)
 
 testDeleteMetricFilterResponse :: DeleteMetricFilterResponse -> TestTree
 testDeleteMetricFilterResponse = res
     "DeleteMetricFilterResponse"
-    "fixture/DeleteMetricFilterResponse"
+    "fixture/DeleteMetricFilterResponse.proto"
     cloudWatchLogs
     (Proxy :: Proxy DeleteMetricFilter)
 
 testPutRetentionPolicyResponse :: PutRetentionPolicyResponse -> TestTree
 testPutRetentionPolicyResponse = res
     "PutRetentionPolicyResponse"
-    "fixture/PutRetentionPolicyResponse"
+    "fixture/PutRetentionPolicyResponse.proto"
     cloudWatchLogs
     (Proxy :: Proxy PutRetentionPolicy)
 
 testDeleteRetentionPolicyResponse :: DeleteRetentionPolicyResponse -> TestTree
 testDeleteRetentionPolicyResponse = res
     "DeleteRetentionPolicyResponse"
-    "fixture/DeleteRetentionPolicyResponse"
+    "fixture/DeleteRetentionPolicyResponse.proto"
     cloudWatchLogs
     (Proxy :: Proxy DeleteRetentionPolicy)
 
 testPutMetricFilterResponse :: PutMetricFilterResponse -> TestTree
 testPutMetricFilterResponse = res
     "PutMetricFilterResponse"
-    "fixture/PutMetricFilterResponse"
+    "fixture/PutMetricFilterResponse.proto"
     cloudWatchLogs
     (Proxy :: Proxy PutMetricFilter)
 
 testPutDestinationPolicyResponse :: PutDestinationPolicyResponse -> TestTree
 testPutDestinationPolicyResponse = res
     "PutDestinationPolicyResponse"
-    "fixture/PutDestinationPolicyResponse"
+    "fixture/PutDestinationPolicyResponse.proto"
     cloudWatchLogs
     (Proxy :: Proxy PutDestinationPolicy)
 
 testDescribeLogStreamsResponse :: DescribeLogStreamsResponse -> TestTree
 testDescribeLogStreamsResponse = res
     "DescribeLogStreamsResponse"
-    "fixture/DescribeLogStreamsResponse"
+    "fixture/DescribeLogStreamsResponse.proto"
     cloudWatchLogs
     (Proxy :: Proxy DescribeLogStreams)
