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-cloudformation.cabal b/amazonka-cloudformation.cabal
--- a/amazonka-cloudformation.cabal
+++ b/amazonka-cloudformation.cabal
@@ -1,7 +1,8 @@
 name:                  amazonka-cloudformation
-version:               1.2.0.1
+version:               1.2.0.2
 synopsis:              Amazon CloudFormation 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 CloudFormation
 
@@ -98,8 +98,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.CloudFormation
         , Test.AWS.Gen.CloudFormation
diff --git a/fixture/CancelUpdateStack.yaml b/fixture/CancelUpdateStack.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/CancelUpdateStack.yaml
diff --git a/fixture/CancelUpdateStackResponse.proto b/fixture/CancelUpdateStackResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/CancelUpdateStackResponse.proto
diff --git a/fixture/CreateStack.yaml b/fixture/CreateStack.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/CreateStack.yaml
diff --git a/fixture/CreateStackResponse.proto b/fixture/CreateStackResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/CreateStackResponse.proto
diff --git a/fixture/DeleteStack.yaml b/fixture/DeleteStack.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/DeleteStack.yaml
diff --git a/fixture/DeleteStackResponse.proto b/fixture/DeleteStackResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/DeleteStackResponse.proto
diff --git a/fixture/DescribeStackEvents.yaml b/fixture/DescribeStackEvents.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeStackEvents.yaml
diff --git a/fixture/DescribeStackEventsResponse.proto b/fixture/DescribeStackEventsResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeStackEventsResponse.proto
diff --git a/fixture/DescribeStackResource.yaml b/fixture/DescribeStackResource.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeStackResource.yaml
diff --git a/fixture/DescribeStackResourceResponse.proto b/fixture/DescribeStackResourceResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeStackResourceResponse.proto
diff --git a/fixture/DescribeStackResources.yaml b/fixture/DescribeStackResources.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeStackResources.yaml
diff --git a/fixture/DescribeStackResourcesResponse.proto b/fixture/DescribeStackResourcesResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeStackResourcesResponse.proto
diff --git a/fixture/DescribeStacks.yaml b/fixture/DescribeStacks.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeStacks.yaml
diff --git a/fixture/DescribeStacksResponse.proto b/fixture/DescribeStacksResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeStacksResponse.proto
diff --git a/fixture/EstimateTemplateCost.yaml b/fixture/EstimateTemplateCost.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/EstimateTemplateCost.yaml
diff --git a/fixture/EstimateTemplateCostResponse.proto b/fixture/EstimateTemplateCostResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/EstimateTemplateCostResponse.proto
diff --git a/fixture/GetStackPolicy.yaml b/fixture/GetStackPolicy.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/GetStackPolicy.yaml
diff --git a/fixture/GetStackPolicyResponse.proto b/fixture/GetStackPolicyResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/GetStackPolicyResponse.proto
diff --git a/fixture/GetTemplate.yaml b/fixture/GetTemplate.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/GetTemplate.yaml
diff --git a/fixture/GetTemplateResponse.proto b/fixture/GetTemplateResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/GetTemplateResponse.proto
diff --git a/fixture/GetTemplateSummary.yaml b/fixture/GetTemplateSummary.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/GetTemplateSummary.yaml
diff --git a/fixture/GetTemplateSummaryResponse.proto b/fixture/GetTemplateSummaryResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/GetTemplateSummaryResponse.proto
diff --git a/fixture/ListStackResources.yaml b/fixture/ListStackResources.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/ListStackResources.yaml
diff --git a/fixture/ListStackResourcesResponse.proto b/fixture/ListStackResourcesResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/ListStackResourcesResponse.proto
diff --git a/fixture/ListStacks.yaml b/fixture/ListStacks.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/ListStacks.yaml
diff --git a/fixture/ListStacksResponse.proto b/fixture/ListStacksResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/ListStacksResponse.proto
diff --git a/fixture/SetStackPolicy.yaml b/fixture/SetStackPolicy.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/SetStackPolicy.yaml
diff --git a/fixture/SetStackPolicyResponse.proto b/fixture/SetStackPolicyResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/SetStackPolicyResponse.proto
diff --git a/fixture/SignalResource.yaml b/fixture/SignalResource.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/SignalResource.yaml
diff --git a/fixture/SignalResourceResponse.proto b/fixture/SignalResourceResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/SignalResourceResponse.proto
diff --git a/fixture/UpdateStack.yaml b/fixture/UpdateStack.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/UpdateStack.yaml
diff --git a/fixture/UpdateStackResponse.proto b/fixture/UpdateStackResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/UpdateStackResponse.proto
diff --git a/fixture/ValidateTemplate.yaml b/fixture/ValidateTemplate.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/ValidateTemplate.yaml
diff --git a/fixture/ValidateTemplateResponse.proto b/fixture/ValidateTemplateResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/ValidateTemplateResponse.proto
diff --git a/test/Test/AWS/Gen/CloudFormation.hs b/test/Test/AWS/Gen/CloudFormation.hs
--- a/test/Test/AWS/Gen/CloudFormation.hs
+++ b/test/Test/AWS/Gen/CloudFormation.hs
@@ -141,205 +141,205 @@
 testDeleteStack :: DeleteStack -> TestTree
 testDeleteStack = req
     "DeleteStack"
-    "fixture/DeleteStack"
+    "fixture/DeleteStack.yaml"
 
 testUpdateStack :: UpdateStack -> TestTree
 testUpdateStack = req
     "UpdateStack"
-    "fixture/UpdateStack"
+    "fixture/UpdateStack.yaml"
 
 testGetTemplateSummary :: GetTemplateSummary -> TestTree
 testGetTemplateSummary = req
     "GetTemplateSummary"
-    "fixture/GetTemplateSummary"
+    "fixture/GetTemplateSummary.yaml"
 
 testListStackResources :: ListStackResources -> TestTree
 testListStackResources = req
     "ListStackResources"
-    "fixture/ListStackResources"
+    "fixture/ListStackResources.yaml"
 
 testDescribeStacks :: DescribeStacks -> TestTree
 testDescribeStacks = req
     "DescribeStacks"
-    "fixture/DescribeStacks"
+    "fixture/DescribeStacks.yaml"
 
 testGetStackPolicy :: GetStackPolicy -> TestTree
 testGetStackPolicy = req
     "GetStackPolicy"
-    "fixture/GetStackPolicy"
+    "fixture/GetStackPolicy.yaml"
 
 testValidateTemplate :: ValidateTemplate -> TestTree
 testValidateTemplate = req
     "ValidateTemplate"
-    "fixture/ValidateTemplate"
+    "fixture/ValidateTemplate.yaml"
 
 testCancelUpdateStack :: CancelUpdateStack -> TestTree
 testCancelUpdateStack = req
     "CancelUpdateStack"
-    "fixture/CancelUpdateStack"
+    "fixture/CancelUpdateStack.yaml"
 
 testSetStackPolicy :: SetStackPolicy -> TestTree
 testSetStackPolicy = req
     "SetStackPolicy"
-    "fixture/SetStackPolicy"
+    "fixture/SetStackPolicy.yaml"
 
 testDescribeStackEvents :: DescribeStackEvents -> TestTree
 testDescribeStackEvents = req
     "DescribeStackEvents"
-    "fixture/DescribeStackEvents"
+    "fixture/DescribeStackEvents.yaml"
 
 testSignalResource :: SignalResource -> TestTree
 testSignalResource = req
     "SignalResource"
-    "fixture/SignalResource"
+    "fixture/SignalResource.yaml"
 
 testListStacks :: ListStacks -> TestTree
 testListStacks = req
     "ListStacks"
-    "fixture/ListStacks"
+    "fixture/ListStacks.yaml"
 
 testCreateStack :: CreateStack -> TestTree
 testCreateStack = req
     "CreateStack"
-    "fixture/CreateStack"
+    "fixture/CreateStack.yaml"
 
 testDescribeStackResources :: DescribeStackResources -> TestTree
 testDescribeStackResources = req
     "DescribeStackResources"
-    "fixture/DescribeStackResources"
+    "fixture/DescribeStackResources.yaml"
 
 testEstimateTemplateCost :: EstimateTemplateCost -> TestTree
 testEstimateTemplateCost = req
     "EstimateTemplateCost"
-    "fixture/EstimateTemplateCost"
+    "fixture/EstimateTemplateCost.yaml"
 
 testGetTemplate :: GetTemplate -> TestTree
 testGetTemplate = req
     "GetTemplate"
-    "fixture/GetTemplate"
+    "fixture/GetTemplate.yaml"
 
 testDescribeStackResource :: DescribeStackResource -> TestTree
 testDescribeStackResource = req
     "DescribeStackResource"
-    "fixture/DescribeStackResource"
+    "fixture/DescribeStackResource.yaml"
 
 -- Responses
 
 testDeleteStackResponse :: DeleteStackResponse -> TestTree
 testDeleteStackResponse = res
     "DeleteStackResponse"
-    "fixture/DeleteStackResponse"
+    "fixture/DeleteStackResponse.proto"
     cloudFormation
     (Proxy :: Proxy DeleteStack)
 
 testUpdateStackResponse :: UpdateStackResponse -> TestTree
 testUpdateStackResponse = res
     "UpdateStackResponse"
-    "fixture/UpdateStackResponse"
+    "fixture/UpdateStackResponse.proto"
     cloudFormation
     (Proxy :: Proxy UpdateStack)
 
 testGetTemplateSummaryResponse :: GetTemplateSummaryResponse -> TestTree
 testGetTemplateSummaryResponse = res
     "GetTemplateSummaryResponse"
-    "fixture/GetTemplateSummaryResponse"
+    "fixture/GetTemplateSummaryResponse.proto"
     cloudFormation
     (Proxy :: Proxy GetTemplateSummary)
 
 testListStackResourcesResponse :: ListStackResourcesResponse -> TestTree
 testListStackResourcesResponse = res
     "ListStackResourcesResponse"
-    "fixture/ListStackResourcesResponse"
+    "fixture/ListStackResourcesResponse.proto"
     cloudFormation
     (Proxy :: Proxy ListStackResources)
 
 testDescribeStacksResponse :: DescribeStacksResponse -> TestTree
 testDescribeStacksResponse = res
     "DescribeStacksResponse"
-    "fixture/DescribeStacksResponse"
+    "fixture/DescribeStacksResponse.proto"
     cloudFormation
     (Proxy :: Proxy DescribeStacks)
 
 testGetStackPolicyResponse :: GetStackPolicyResponse -> TestTree
 testGetStackPolicyResponse = res
     "GetStackPolicyResponse"
-    "fixture/GetStackPolicyResponse"
+    "fixture/GetStackPolicyResponse.proto"
     cloudFormation
     (Proxy :: Proxy GetStackPolicy)
 
 testValidateTemplateResponse :: ValidateTemplateResponse -> TestTree
 testValidateTemplateResponse = res
     "ValidateTemplateResponse"
-    "fixture/ValidateTemplateResponse"
+    "fixture/ValidateTemplateResponse.proto"
     cloudFormation
     (Proxy :: Proxy ValidateTemplate)
 
 testCancelUpdateStackResponse :: CancelUpdateStackResponse -> TestTree
 testCancelUpdateStackResponse = res
     "CancelUpdateStackResponse"
-    "fixture/CancelUpdateStackResponse"
+    "fixture/CancelUpdateStackResponse.proto"
     cloudFormation
     (Proxy :: Proxy CancelUpdateStack)
 
 testSetStackPolicyResponse :: SetStackPolicyResponse -> TestTree
 testSetStackPolicyResponse = res
     "SetStackPolicyResponse"
-    "fixture/SetStackPolicyResponse"
+    "fixture/SetStackPolicyResponse.proto"
     cloudFormation
     (Proxy :: Proxy SetStackPolicy)
 
 testDescribeStackEventsResponse :: DescribeStackEventsResponse -> TestTree
 testDescribeStackEventsResponse = res
     "DescribeStackEventsResponse"
-    "fixture/DescribeStackEventsResponse"
+    "fixture/DescribeStackEventsResponse.proto"
     cloudFormation
     (Proxy :: Proxy DescribeStackEvents)
 
 testSignalResourceResponse :: SignalResourceResponse -> TestTree
 testSignalResourceResponse = res
     "SignalResourceResponse"
-    "fixture/SignalResourceResponse"
+    "fixture/SignalResourceResponse.proto"
     cloudFormation
     (Proxy :: Proxy SignalResource)
 
 testListStacksResponse :: ListStacksResponse -> TestTree
 testListStacksResponse = res
     "ListStacksResponse"
-    "fixture/ListStacksResponse"
+    "fixture/ListStacksResponse.proto"
     cloudFormation
     (Proxy :: Proxy ListStacks)
 
 testCreateStackResponse :: CreateStackResponse -> TestTree
 testCreateStackResponse = res
     "CreateStackResponse"
-    "fixture/CreateStackResponse"
+    "fixture/CreateStackResponse.proto"
     cloudFormation
     (Proxy :: Proxy CreateStack)
 
 testDescribeStackResourcesResponse :: DescribeStackResourcesResponse -> TestTree
 testDescribeStackResourcesResponse = res
     "DescribeStackResourcesResponse"
-    "fixture/DescribeStackResourcesResponse"
+    "fixture/DescribeStackResourcesResponse.proto"
     cloudFormation
     (Proxy :: Proxy DescribeStackResources)
 
 testEstimateTemplateCostResponse :: EstimateTemplateCostResponse -> TestTree
 testEstimateTemplateCostResponse = res
     "EstimateTemplateCostResponse"
-    "fixture/EstimateTemplateCostResponse"
+    "fixture/EstimateTemplateCostResponse.proto"
     cloudFormation
     (Proxy :: Proxy EstimateTemplateCost)
 
 testGetTemplateResponse :: GetTemplateResponse -> TestTree
 testGetTemplateResponse = res
     "GetTemplateResponse"
-    "fixture/GetTemplateResponse"
+    "fixture/GetTemplateResponse.proto"
     cloudFormation
     (Proxy :: Proxy GetTemplate)
 
 testDescribeStackResourceResponse :: DescribeStackResourceResponse -> TestTree
 testDescribeStackResourceResponse = res
     "DescribeStackResourceResponse"
-    "fixture/DescribeStackResourceResponse"
+    "fixture/DescribeStackResourceResponse.proto"
     cloudFormation
     (Proxy :: Proxy DescribeStackResource)
