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-kinesis.cabal b/amazonka-kinesis.cabal
--- a/amazonka-kinesis.cabal
+++ b/amazonka-kinesis.cabal
@@ -1,7 +1,8 @@
 name:                  amazonka-kinesis
-version:               1.2.0.1
+version:               1.2.0.2
 synopsis:              Amazon Kinesis 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 Kinesis Service API Reference
 
@@ -76,8 +76,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.Kinesis
         , Test.AWS.Gen.Kinesis
diff --git a/fixture/AddTagsToStream.yaml b/fixture/AddTagsToStream.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/AddTagsToStream.yaml
diff --git a/fixture/AddTagsToStreamResponse.proto b/fixture/AddTagsToStreamResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/AddTagsToStreamResponse.proto
diff --git a/fixture/CreateStream.yaml b/fixture/CreateStream.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/CreateStream.yaml
diff --git a/fixture/CreateStreamResponse.proto b/fixture/CreateStreamResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/CreateStreamResponse.proto
diff --git a/fixture/DeleteStream.yaml b/fixture/DeleteStream.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/DeleteStream.yaml
diff --git a/fixture/DeleteStreamResponse.proto b/fixture/DeleteStreamResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/DeleteStreamResponse.proto
diff --git a/fixture/DescribeStream.yaml b/fixture/DescribeStream.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeStream.yaml
diff --git a/fixture/DescribeStreamResponse.proto b/fixture/DescribeStreamResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeStreamResponse.proto
diff --git a/fixture/GetRecords.yaml b/fixture/GetRecords.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/GetRecords.yaml
diff --git a/fixture/GetRecordsResponse.proto b/fixture/GetRecordsResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/GetRecordsResponse.proto
diff --git a/fixture/GetShardIterator.yaml b/fixture/GetShardIterator.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/GetShardIterator.yaml
diff --git a/fixture/GetShardIteratorResponse.proto b/fixture/GetShardIteratorResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/GetShardIteratorResponse.proto
diff --git a/fixture/ListStreams.yaml b/fixture/ListStreams.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/ListStreams.yaml
diff --git a/fixture/ListStreamsResponse.proto b/fixture/ListStreamsResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/ListStreamsResponse.proto
diff --git a/fixture/ListTagsForStream.yaml b/fixture/ListTagsForStream.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/ListTagsForStream.yaml
diff --git a/fixture/ListTagsForStreamResponse.proto b/fixture/ListTagsForStreamResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/ListTagsForStreamResponse.proto
diff --git a/fixture/MergeShards.yaml b/fixture/MergeShards.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/MergeShards.yaml
diff --git a/fixture/MergeShardsResponse.proto b/fixture/MergeShardsResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/MergeShardsResponse.proto
diff --git a/fixture/PutRecord.yaml b/fixture/PutRecord.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/PutRecord.yaml
diff --git a/fixture/PutRecordResponse.proto b/fixture/PutRecordResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/PutRecordResponse.proto
diff --git a/fixture/PutRecords.yaml b/fixture/PutRecords.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/PutRecords.yaml
diff --git a/fixture/PutRecordsResponse.proto b/fixture/PutRecordsResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/PutRecordsResponse.proto
diff --git a/fixture/RemoveTagsFromStream.yaml b/fixture/RemoveTagsFromStream.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/RemoveTagsFromStream.yaml
diff --git a/fixture/RemoveTagsFromStreamResponse.proto b/fixture/RemoveTagsFromStreamResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/RemoveTagsFromStreamResponse.proto
diff --git a/fixture/SplitShard.yaml b/fixture/SplitShard.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/SplitShard.yaml
diff --git a/fixture/SplitShardResponse.proto b/fixture/SplitShardResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/SplitShardResponse.proto
diff --git a/test/Test/AWS/Gen/Kinesis.hs b/test/Test/AWS/Gen/Kinesis.hs
--- a/test/Test/AWS/Gen/Kinesis.hs
+++ b/test/Test/AWS/Gen/Kinesis.hs
@@ -117,157 +117,157 @@
 testPutRecord :: PutRecord -> TestTree
 testPutRecord = req
     "PutRecord"
-    "fixture/PutRecord"
+    "fixture/PutRecord.yaml"
 
 testMergeShards :: MergeShards -> TestTree
 testMergeShards = req
     "MergeShards"
-    "fixture/MergeShards"
+    "fixture/MergeShards.yaml"
 
 testGetRecords :: GetRecords -> TestTree
 testGetRecords = req
     "GetRecords"
-    "fixture/GetRecords"
+    "fixture/GetRecords.yaml"
 
 testGetShardIterator :: GetShardIterator -> TestTree
 testGetShardIterator = req
     "GetShardIterator"
-    "fixture/GetShardIterator"
+    "fixture/GetShardIterator.yaml"
 
 testListTagsForStream :: ListTagsForStream -> TestTree
 testListTagsForStream = req
     "ListTagsForStream"
-    "fixture/ListTagsForStream"
+    "fixture/ListTagsForStream.yaml"
 
 testAddTagsToStream :: AddTagsToStream -> TestTree
 testAddTagsToStream = req
     "AddTagsToStream"
-    "fixture/AddTagsToStream"
+    "fixture/AddTagsToStream.yaml"
 
 testPutRecords :: PutRecords -> TestTree
 testPutRecords = req
     "PutRecords"
-    "fixture/PutRecords"
+    "fixture/PutRecords.yaml"
 
 testDeleteStream :: DeleteStream -> TestTree
 testDeleteStream = req
     "DeleteStream"
-    "fixture/DeleteStream"
+    "fixture/DeleteStream.yaml"
 
 testRemoveTagsFromStream :: RemoveTagsFromStream -> TestTree
 testRemoveTagsFromStream = req
     "RemoveTagsFromStream"
-    "fixture/RemoveTagsFromStream"
+    "fixture/RemoveTagsFromStream.yaml"
 
 testListStreams :: ListStreams -> TestTree
 testListStreams = req
     "ListStreams"
-    "fixture/ListStreams"
+    "fixture/ListStreams.yaml"
 
 testCreateStream :: CreateStream -> TestTree
 testCreateStream = req
     "CreateStream"
-    "fixture/CreateStream"
+    "fixture/CreateStream.yaml"
 
 testSplitShard :: SplitShard -> TestTree
 testSplitShard = req
     "SplitShard"
-    "fixture/SplitShard"
+    "fixture/SplitShard.yaml"
 
 testDescribeStream :: DescribeStream -> TestTree
 testDescribeStream = req
     "DescribeStream"
-    "fixture/DescribeStream"
+    "fixture/DescribeStream.yaml"
 
 -- Responses
 
 testPutRecordResponse :: PutRecordResponse -> TestTree
 testPutRecordResponse = res
     "PutRecordResponse"
-    "fixture/PutRecordResponse"
+    "fixture/PutRecordResponse.proto"
     kinesis
     (Proxy :: Proxy PutRecord)
 
 testMergeShardsResponse :: MergeShardsResponse -> TestTree
 testMergeShardsResponse = res
     "MergeShardsResponse"
-    "fixture/MergeShardsResponse"
+    "fixture/MergeShardsResponse.proto"
     kinesis
     (Proxy :: Proxy MergeShards)
 
 testGetRecordsResponse :: GetRecordsResponse -> TestTree
 testGetRecordsResponse = res
     "GetRecordsResponse"
-    "fixture/GetRecordsResponse"
+    "fixture/GetRecordsResponse.proto"
     kinesis
     (Proxy :: Proxy GetRecords)
 
 testGetShardIteratorResponse :: GetShardIteratorResponse -> TestTree
 testGetShardIteratorResponse = res
     "GetShardIteratorResponse"
-    "fixture/GetShardIteratorResponse"
+    "fixture/GetShardIteratorResponse.proto"
     kinesis
     (Proxy :: Proxy GetShardIterator)
 
 testListTagsForStreamResponse :: ListTagsForStreamResponse -> TestTree
 testListTagsForStreamResponse = res
     "ListTagsForStreamResponse"
-    "fixture/ListTagsForStreamResponse"
+    "fixture/ListTagsForStreamResponse.proto"
     kinesis
     (Proxy :: Proxy ListTagsForStream)
 
 testAddTagsToStreamResponse :: AddTagsToStreamResponse -> TestTree
 testAddTagsToStreamResponse = res
     "AddTagsToStreamResponse"
-    "fixture/AddTagsToStreamResponse"
+    "fixture/AddTagsToStreamResponse.proto"
     kinesis
     (Proxy :: Proxy AddTagsToStream)
 
 testPutRecordsResponse :: PutRecordsResponse -> TestTree
 testPutRecordsResponse = res
     "PutRecordsResponse"
-    "fixture/PutRecordsResponse"
+    "fixture/PutRecordsResponse.proto"
     kinesis
     (Proxy :: Proxy PutRecords)
 
 testDeleteStreamResponse :: DeleteStreamResponse -> TestTree
 testDeleteStreamResponse = res
     "DeleteStreamResponse"
-    "fixture/DeleteStreamResponse"
+    "fixture/DeleteStreamResponse.proto"
     kinesis
     (Proxy :: Proxy DeleteStream)
 
 testRemoveTagsFromStreamResponse :: RemoveTagsFromStreamResponse -> TestTree
 testRemoveTagsFromStreamResponse = res
     "RemoveTagsFromStreamResponse"
-    "fixture/RemoveTagsFromStreamResponse"
+    "fixture/RemoveTagsFromStreamResponse.proto"
     kinesis
     (Proxy :: Proxy RemoveTagsFromStream)
 
 testListStreamsResponse :: ListStreamsResponse -> TestTree
 testListStreamsResponse = res
     "ListStreamsResponse"
-    "fixture/ListStreamsResponse"
+    "fixture/ListStreamsResponse.proto"
     kinesis
     (Proxy :: Proxy ListStreams)
 
 testCreateStreamResponse :: CreateStreamResponse -> TestTree
 testCreateStreamResponse = res
     "CreateStreamResponse"
-    "fixture/CreateStreamResponse"
+    "fixture/CreateStreamResponse.proto"
     kinesis
     (Proxy :: Proxy CreateStream)
 
 testSplitShardResponse :: SplitShardResponse -> TestTree
 testSplitShardResponse = res
     "SplitShardResponse"
-    "fixture/SplitShardResponse"
+    "fixture/SplitShardResponse.proto"
     kinesis
     (Proxy :: Proxy SplitShard)
 
 testDescribeStreamResponse :: DescribeStreamResponse -> TestTree
 testDescribeStreamResponse = res
     "DescribeStreamResponse"
-    "fixture/DescribeStreamResponse"
+    "fixture/DescribeStreamResponse.proto"
     kinesis
     (Proxy :: Proxy DescribeStream)
