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-config.cabal b/amazonka-config.cabal
--- a/amazonka-config.cabal
+++ b/amazonka-config.cabal
@@ -1,7 +1,8 @@
 name:                  amazonka-config
-version:               1.2.0.1
+version:               1.2.0.2
 synopsis:              Amazon Config 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 Config
 
@@ -99,8 +99,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.Config
         , Test.AWS.Gen.Config
diff --git a/fixture/DeleteDeliveryChannel.yaml b/fixture/DeleteDeliveryChannel.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/DeleteDeliveryChannel.yaml
diff --git a/fixture/DeleteDeliveryChannelResponse.proto b/fixture/DeleteDeliveryChannelResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/DeleteDeliveryChannelResponse.proto
diff --git a/fixture/DeliverConfigSnapshot.yaml b/fixture/DeliverConfigSnapshot.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/DeliverConfigSnapshot.yaml
diff --git a/fixture/DeliverConfigSnapshotResponse.proto b/fixture/DeliverConfigSnapshotResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/DeliverConfigSnapshotResponse.proto
diff --git a/fixture/DescribeConfigurationRecorderStatus.yaml b/fixture/DescribeConfigurationRecorderStatus.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeConfigurationRecorderStatus.yaml
diff --git a/fixture/DescribeConfigurationRecorderStatusResponse.proto b/fixture/DescribeConfigurationRecorderStatusResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeConfigurationRecorderStatusResponse.proto
diff --git a/fixture/DescribeConfigurationRecorders.yaml b/fixture/DescribeConfigurationRecorders.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeConfigurationRecorders.yaml
diff --git a/fixture/DescribeConfigurationRecordersResponse.proto b/fixture/DescribeConfigurationRecordersResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeConfigurationRecordersResponse.proto
diff --git a/fixture/DescribeDeliveryChannelStatus.yaml b/fixture/DescribeDeliveryChannelStatus.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeDeliveryChannelStatus.yaml
diff --git a/fixture/DescribeDeliveryChannelStatusResponse.proto b/fixture/DescribeDeliveryChannelStatusResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeDeliveryChannelStatusResponse.proto
diff --git a/fixture/DescribeDeliveryChannels.yaml b/fixture/DescribeDeliveryChannels.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeDeliveryChannels.yaml
diff --git a/fixture/DescribeDeliveryChannelsResponse.proto b/fixture/DescribeDeliveryChannelsResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeDeliveryChannelsResponse.proto
diff --git a/fixture/GetResourceConfigHistory.yaml b/fixture/GetResourceConfigHistory.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/GetResourceConfigHistory.yaml
diff --git a/fixture/GetResourceConfigHistoryResponse.proto b/fixture/GetResourceConfigHistoryResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/GetResourceConfigHistoryResponse.proto
diff --git a/fixture/PutConfigurationRecorder.yaml b/fixture/PutConfigurationRecorder.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/PutConfigurationRecorder.yaml
diff --git a/fixture/PutConfigurationRecorderResponse.proto b/fixture/PutConfigurationRecorderResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/PutConfigurationRecorderResponse.proto
diff --git a/fixture/PutDeliveryChannel.yaml b/fixture/PutDeliveryChannel.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/PutDeliveryChannel.yaml
diff --git a/fixture/PutDeliveryChannelResponse.proto b/fixture/PutDeliveryChannelResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/PutDeliveryChannelResponse.proto
diff --git a/fixture/StartConfigurationRecorder.yaml b/fixture/StartConfigurationRecorder.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/StartConfigurationRecorder.yaml
diff --git a/fixture/StartConfigurationRecorderResponse.proto b/fixture/StartConfigurationRecorderResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/StartConfigurationRecorderResponse.proto
diff --git a/fixture/StopConfigurationRecorder.yaml b/fixture/StopConfigurationRecorder.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/StopConfigurationRecorder.yaml
diff --git a/fixture/StopConfigurationRecorderResponse.proto b/fixture/StopConfigurationRecorderResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/StopConfigurationRecorderResponse.proto
diff --git a/test/Test/AWS/Gen/Config.hs b/test/Test/AWS/Gen/Config.hs
--- a/test/Test/AWS/Gen/Config.hs
+++ b/test/Test/AWS/Gen/Config.hs
@@ -105,133 +105,133 @@
 testGetResourceConfigHistory :: GetResourceConfigHistory -> TestTree
 testGetResourceConfigHistory = req
     "GetResourceConfigHistory"
-    "fixture/GetResourceConfigHistory"
+    "fixture/GetResourceConfigHistory.yaml"
 
 testStopConfigurationRecorder :: StopConfigurationRecorder -> TestTree
 testStopConfigurationRecorder = req
     "StopConfigurationRecorder"
-    "fixture/StopConfigurationRecorder"
+    "fixture/StopConfigurationRecorder.yaml"
 
 testDeliverConfigSnapshot :: DeliverConfigSnapshot -> TestTree
 testDeliverConfigSnapshot = req
     "DeliverConfigSnapshot"
-    "fixture/DeliverConfigSnapshot"
+    "fixture/DeliverConfigSnapshot.yaml"
 
 testDescribeConfigurationRecorders :: DescribeConfigurationRecorders -> TestTree
 testDescribeConfigurationRecorders = req
     "DescribeConfigurationRecorders"
-    "fixture/DescribeConfigurationRecorders"
+    "fixture/DescribeConfigurationRecorders.yaml"
 
 testStartConfigurationRecorder :: StartConfigurationRecorder -> TestTree
 testStartConfigurationRecorder = req
     "StartConfigurationRecorder"
-    "fixture/StartConfigurationRecorder"
+    "fixture/StartConfigurationRecorder.yaml"
 
 testDescribeConfigurationRecorderStatus :: DescribeConfigurationRecorderStatus -> TestTree
 testDescribeConfigurationRecorderStatus = req
     "DescribeConfigurationRecorderStatus"
-    "fixture/DescribeConfigurationRecorderStatus"
+    "fixture/DescribeConfigurationRecorderStatus.yaml"
 
 testPutConfigurationRecorder :: PutConfigurationRecorder -> TestTree
 testPutConfigurationRecorder = req
     "PutConfigurationRecorder"
-    "fixture/PutConfigurationRecorder"
+    "fixture/PutConfigurationRecorder.yaml"
 
 testDeleteDeliveryChannel :: DeleteDeliveryChannel -> TestTree
 testDeleteDeliveryChannel = req
     "DeleteDeliveryChannel"
-    "fixture/DeleteDeliveryChannel"
+    "fixture/DeleteDeliveryChannel.yaml"
 
 testPutDeliveryChannel :: PutDeliveryChannel -> TestTree
 testPutDeliveryChannel = req
     "PutDeliveryChannel"
-    "fixture/PutDeliveryChannel"
+    "fixture/PutDeliveryChannel.yaml"
 
 testDescribeDeliveryChannelStatus :: DescribeDeliveryChannelStatus -> TestTree
 testDescribeDeliveryChannelStatus = req
     "DescribeDeliveryChannelStatus"
-    "fixture/DescribeDeliveryChannelStatus"
+    "fixture/DescribeDeliveryChannelStatus.yaml"
 
 testDescribeDeliveryChannels :: DescribeDeliveryChannels -> TestTree
 testDescribeDeliveryChannels = req
     "DescribeDeliveryChannels"
-    "fixture/DescribeDeliveryChannels"
+    "fixture/DescribeDeliveryChannels.yaml"
 
 -- Responses
 
 testGetResourceConfigHistoryResponse :: GetResourceConfigHistoryResponse -> TestTree
 testGetResourceConfigHistoryResponse = res
     "GetResourceConfigHistoryResponse"
-    "fixture/GetResourceConfigHistoryResponse"
+    "fixture/GetResourceConfigHistoryResponse.proto"
     config
     (Proxy :: Proxy GetResourceConfigHistory)
 
 testStopConfigurationRecorderResponse :: StopConfigurationRecorderResponse -> TestTree
 testStopConfigurationRecorderResponse = res
     "StopConfigurationRecorderResponse"
-    "fixture/StopConfigurationRecorderResponse"
+    "fixture/StopConfigurationRecorderResponse.proto"
     config
     (Proxy :: Proxy StopConfigurationRecorder)
 
 testDeliverConfigSnapshotResponse :: DeliverConfigSnapshotResponse -> TestTree
 testDeliverConfigSnapshotResponse = res
     "DeliverConfigSnapshotResponse"
-    "fixture/DeliverConfigSnapshotResponse"
+    "fixture/DeliverConfigSnapshotResponse.proto"
     config
     (Proxy :: Proxy DeliverConfigSnapshot)
 
 testDescribeConfigurationRecordersResponse :: DescribeConfigurationRecordersResponse -> TestTree
 testDescribeConfigurationRecordersResponse = res
     "DescribeConfigurationRecordersResponse"
-    "fixture/DescribeConfigurationRecordersResponse"
+    "fixture/DescribeConfigurationRecordersResponse.proto"
     config
     (Proxy :: Proxy DescribeConfigurationRecorders)
 
 testStartConfigurationRecorderResponse :: StartConfigurationRecorderResponse -> TestTree
 testStartConfigurationRecorderResponse = res
     "StartConfigurationRecorderResponse"
-    "fixture/StartConfigurationRecorderResponse"
+    "fixture/StartConfigurationRecorderResponse.proto"
     config
     (Proxy :: Proxy StartConfigurationRecorder)
 
 testDescribeConfigurationRecorderStatusResponse :: DescribeConfigurationRecorderStatusResponse -> TestTree
 testDescribeConfigurationRecorderStatusResponse = res
     "DescribeConfigurationRecorderStatusResponse"
-    "fixture/DescribeConfigurationRecorderStatusResponse"
+    "fixture/DescribeConfigurationRecorderStatusResponse.proto"
     config
     (Proxy :: Proxy DescribeConfigurationRecorderStatus)
 
 testPutConfigurationRecorderResponse :: PutConfigurationRecorderResponse -> TestTree
 testPutConfigurationRecorderResponse = res
     "PutConfigurationRecorderResponse"
-    "fixture/PutConfigurationRecorderResponse"
+    "fixture/PutConfigurationRecorderResponse.proto"
     config
     (Proxy :: Proxy PutConfigurationRecorder)
 
 testDeleteDeliveryChannelResponse :: DeleteDeliveryChannelResponse -> TestTree
 testDeleteDeliveryChannelResponse = res
     "DeleteDeliveryChannelResponse"
-    "fixture/DeleteDeliveryChannelResponse"
+    "fixture/DeleteDeliveryChannelResponse.proto"
     config
     (Proxy :: Proxy DeleteDeliveryChannel)
 
 testPutDeliveryChannelResponse :: PutDeliveryChannelResponse -> TestTree
 testPutDeliveryChannelResponse = res
     "PutDeliveryChannelResponse"
-    "fixture/PutDeliveryChannelResponse"
+    "fixture/PutDeliveryChannelResponse.proto"
     config
     (Proxy :: Proxy PutDeliveryChannel)
 
 testDescribeDeliveryChannelStatusResponse :: DescribeDeliveryChannelStatusResponse -> TestTree
 testDescribeDeliveryChannelStatusResponse = res
     "DescribeDeliveryChannelStatusResponse"
-    "fixture/DescribeDeliveryChannelStatusResponse"
+    "fixture/DescribeDeliveryChannelStatusResponse.proto"
     config
     (Proxy :: Proxy DescribeDeliveryChannelStatus)
 
 testDescribeDeliveryChannelsResponse :: DescribeDeliveryChannelsResponse -> TestTree
 testDescribeDeliveryChannelsResponse = res
     "DescribeDeliveryChannelsResponse"
-    "fixture/DescribeDeliveryChannelsResponse"
+    "fixture/DescribeDeliveryChannelsResponse.proto"
     config
     (Proxy :: Proxy DescribeDeliveryChannels)
