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-cloudtrail.cabal b/amazonka-cloudtrail.cabal
--- a/amazonka-cloudtrail.cabal
+++ b/amazonka-cloudtrail.cabal
@@ -1,7 +1,8 @@
 name:                  amazonka-cloudtrail
-version:               1.2.0.1
+version:               1.2.0.2
 synopsis:              Amazon CloudTrail 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 CloudTrail
 
@@ -90,8 +90,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.CloudTrail
         , Test.AWS.Gen.CloudTrail
diff --git a/fixture/CreateTrail.yaml b/fixture/CreateTrail.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/CreateTrail.yaml
diff --git a/fixture/CreateTrailResponse.proto b/fixture/CreateTrailResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/CreateTrailResponse.proto
diff --git a/fixture/DeleteTrail.yaml b/fixture/DeleteTrail.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/DeleteTrail.yaml
diff --git a/fixture/DeleteTrailResponse.proto b/fixture/DeleteTrailResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/DeleteTrailResponse.proto
diff --git a/fixture/DescribeTrails.yaml b/fixture/DescribeTrails.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeTrails.yaml
diff --git a/fixture/DescribeTrailsResponse.proto b/fixture/DescribeTrailsResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeTrailsResponse.proto
diff --git a/fixture/GetTrailStatus.yaml b/fixture/GetTrailStatus.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/GetTrailStatus.yaml
diff --git a/fixture/GetTrailStatusResponse.proto b/fixture/GetTrailStatusResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/GetTrailStatusResponse.proto
diff --git a/fixture/LookupEvents.yaml b/fixture/LookupEvents.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/LookupEvents.yaml
diff --git a/fixture/LookupEventsResponse.proto b/fixture/LookupEventsResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/LookupEventsResponse.proto
diff --git a/fixture/StartLogging.yaml b/fixture/StartLogging.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/StartLogging.yaml
diff --git a/fixture/StartLoggingResponse.proto b/fixture/StartLoggingResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/StartLoggingResponse.proto
diff --git a/fixture/StopLogging.yaml b/fixture/StopLogging.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/StopLogging.yaml
diff --git a/fixture/StopLoggingResponse.proto b/fixture/StopLoggingResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/StopLoggingResponse.proto
diff --git a/fixture/UpdateTrail.yaml b/fixture/UpdateTrail.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/UpdateTrail.yaml
diff --git a/fixture/UpdateTrailResponse.proto b/fixture/UpdateTrailResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/UpdateTrailResponse.proto
diff --git a/test/Test/AWS/Gen/CloudTrail.hs b/test/Test/AWS/Gen/CloudTrail.hs
--- a/test/Test/AWS/Gen/CloudTrail.hs
+++ b/test/Test/AWS/Gen/CloudTrail.hs
@@ -87,97 +87,97 @@
 testDescribeTrails :: DescribeTrails -> TestTree
 testDescribeTrails = req
     "DescribeTrails"
-    "fixture/DescribeTrails"
+    "fixture/DescribeTrails.yaml"
 
 testLookupEvents :: LookupEvents -> TestTree
 testLookupEvents = req
     "LookupEvents"
-    "fixture/LookupEvents"
+    "fixture/LookupEvents.yaml"
 
 testStopLogging :: StopLogging -> TestTree
 testStopLogging = req
     "StopLogging"
-    "fixture/StopLogging"
+    "fixture/StopLogging.yaml"
 
 testDeleteTrail :: DeleteTrail -> TestTree
 testDeleteTrail = req
     "DeleteTrail"
-    "fixture/DeleteTrail"
+    "fixture/DeleteTrail.yaml"
 
 testUpdateTrail :: UpdateTrail -> TestTree
 testUpdateTrail = req
     "UpdateTrail"
-    "fixture/UpdateTrail"
+    "fixture/UpdateTrail.yaml"
 
 testCreateTrail :: CreateTrail -> TestTree
 testCreateTrail = req
     "CreateTrail"
-    "fixture/CreateTrail"
+    "fixture/CreateTrail.yaml"
 
 testGetTrailStatus :: GetTrailStatus -> TestTree
 testGetTrailStatus = req
     "GetTrailStatus"
-    "fixture/GetTrailStatus"
+    "fixture/GetTrailStatus.yaml"
 
 testStartLogging :: StartLogging -> TestTree
 testStartLogging = req
     "StartLogging"
-    "fixture/StartLogging"
+    "fixture/StartLogging.yaml"
 
 -- Responses
 
 testDescribeTrailsResponse :: DescribeTrailsResponse -> TestTree
 testDescribeTrailsResponse = res
     "DescribeTrailsResponse"
-    "fixture/DescribeTrailsResponse"
+    "fixture/DescribeTrailsResponse.proto"
     cloudTrail
     (Proxy :: Proxy DescribeTrails)
 
 testLookupEventsResponse :: LookupEventsResponse -> TestTree
 testLookupEventsResponse = res
     "LookupEventsResponse"
-    "fixture/LookupEventsResponse"
+    "fixture/LookupEventsResponse.proto"
     cloudTrail
     (Proxy :: Proxy LookupEvents)
 
 testStopLoggingResponse :: StopLoggingResponse -> TestTree
 testStopLoggingResponse = res
     "StopLoggingResponse"
-    "fixture/StopLoggingResponse"
+    "fixture/StopLoggingResponse.proto"
     cloudTrail
     (Proxy :: Proxy StopLogging)
 
 testDeleteTrailResponse :: DeleteTrailResponse -> TestTree
 testDeleteTrailResponse = res
     "DeleteTrailResponse"
-    "fixture/DeleteTrailResponse"
+    "fixture/DeleteTrailResponse.proto"
     cloudTrail
     (Proxy :: Proxy DeleteTrail)
 
 testUpdateTrailResponse :: UpdateTrailResponse -> TestTree
 testUpdateTrailResponse = res
     "UpdateTrailResponse"
-    "fixture/UpdateTrailResponse"
+    "fixture/UpdateTrailResponse.proto"
     cloudTrail
     (Proxy :: Proxy UpdateTrail)
 
 testCreateTrailResponse :: CreateTrailResponse -> TestTree
 testCreateTrailResponse = res
     "CreateTrailResponse"
-    "fixture/CreateTrailResponse"
+    "fixture/CreateTrailResponse.proto"
     cloudTrail
     (Proxy :: Proxy CreateTrail)
 
 testGetTrailStatusResponse :: GetTrailStatusResponse -> TestTree
 testGetTrailStatusResponse = res
     "GetTrailStatusResponse"
-    "fixture/GetTrailStatusResponse"
+    "fixture/GetTrailStatusResponse.proto"
     cloudTrail
     (Proxy :: Proxy GetTrailStatus)
 
 testStartLoggingResponse :: StartLoggingResponse -> TestTree
 testStartLoggingResponse = res
     "StartLoggingResponse"
-    "fixture/StartLoggingResponse"
+    "fixture/StartLoggingResponse.proto"
     cloudTrail
     (Proxy :: Proxy StartLogging)
