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-cloudhsm.cabal b/amazonka-cloudhsm.cabal
--- a/amazonka-cloudhsm.cabal
+++ b/amazonka-cloudhsm.cabal
@@ -1,7 +1,8 @@
 name:                  amazonka-cloudhsm
-version:               1.2.0.1
+version:               1.2.0.2
 synopsis:              Amazon CloudHSM 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 CloudHSM Service
     .
@@ -77,8 +77,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.CloudHSM
         , Test.AWS.Gen.CloudHSM
diff --git a/fixture/CreateHAPG.yaml b/fixture/CreateHAPG.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/CreateHAPG.yaml
diff --git a/fixture/CreateHAPGResponse.proto b/fixture/CreateHAPGResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/CreateHAPGResponse.proto
diff --git a/fixture/CreateHSM.yaml b/fixture/CreateHSM.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/CreateHSM.yaml
diff --git a/fixture/CreateHSMResponse.proto b/fixture/CreateHSMResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/CreateHSMResponse.proto
diff --git a/fixture/CreateLunaClient.yaml b/fixture/CreateLunaClient.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/CreateLunaClient.yaml
diff --git a/fixture/CreateLunaClientResponse.proto b/fixture/CreateLunaClientResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/CreateLunaClientResponse.proto
diff --git a/fixture/DeleteHAPG.yaml b/fixture/DeleteHAPG.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/DeleteHAPG.yaml
diff --git a/fixture/DeleteHAPGResponse.proto b/fixture/DeleteHAPGResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/DeleteHAPGResponse.proto
diff --git a/fixture/DeleteHSM.yaml b/fixture/DeleteHSM.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/DeleteHSM.yaml
diff --git a/fixture/DeleteHSMResponse.proto b/fixture/DeleteHSMResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/DeleteHSMResponse.proto
diff --git a/fixture/DeleteLunaClient.yaml b/fixture/DeleteLunaClient.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/DeleteLunaClient.yaml
diff --git a/fixture/DeleteLunaClientResponse.proto b/fixture/DeleteLunaClientResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/DeleteLunaClientResponse.proto
diff --git a/fixture/DescribeHAPG.yaml b/fixture/DescribeHAPG.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeHAPG.yaml
diff --git a/fixture/DescribeHAPGResponse.proto b/fixture/DescribeHAPGResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeHAPGResponse.proto
diff --git a/fixture/DescribeHSM.yaml b/fixture/DescribeHSM.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeHSM.yaml
diff --git a/fixture/DescribeHSMResponse.proto b/fixture/DescribeHSMResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeHSMResponse.proto
diff --git a/fixture/DescribeLunaClient.yaml b/fixture/DescribeLunaClient.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeLunaClient.yaml
diff --git a/fixture/DescribeLunaClientResponse.proto b/fixture/DescribeLunaClientResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeLunaClientResponse.proto
diff --git a/fixture/GetConfig.yaml b/fixture/GetConfig.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/GetConfig.yaml
diff --git a/fixture/GetConfigResponse.proto b/fixture/GetConfigResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/GetConfigResponse.proto
diff --git a/fixture/ListAvailableZones.yaml b/fixture/ListAvailableZones.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/ListAvailableZones.yaml
diff --git a/fixture/ListAvailableZonesResponse.proto b/fixture/ListAvailableZonesResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/ListAvailableZonesResponse.proto
diff --git a/fixture/ListHAPGs.yaml b/fixture/ListHAPGs.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/ListHAPGs.yaml
diff --git a/fixture/ListHAPGsResponse.proto b/fixture/ListHAPGsResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/ListHAPGsResponse.proto
diff --git a/fixture/ListHSMs.yaml b/fixture/ListHSMs.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/ListHSMs.yaml
diff --git a/fixture/ListHSMsResponse.proto b/fixture/ListHSMsResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/ListHSMsResponse.proto
diff --git a/fixture/ListLunaClients.yaml b/fixture/ListLunaClients.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/ListLunaClients.yaml
diff --git a/fixture/ListLunaClientsResponse.proto b/fixture/ListLunaClientsResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/ListLunaClientsResponse.proto
diff --git a/fixture/ModifyHAPG.yaml b/fixture/ModifyHAPG.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/ModifyHAPG.yaml
diff --git a/fixture/ModifyHAPGResponse.proto b/fixture/ModifyHAPGResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/ModifyHAPGResponse.proto
diff --git a/fixture/ModifyHSM.yaml b/fixture/ModifyHSM.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/ModifyHSM.yaml
diff --git a/fixture/ModifyHSMResponse.proto b/fixture/ModifyHSMResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/ModifyHSMResponse.proto
diff --git a/fixture/ModifyLunaClient.yaml b/fixture/ModifyLunaClient.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/ModifyLunaClient.yaml
diff --git a/fixture/ModifyLunaClientResponse.proto b/fixture/ModifyLunaClientResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/ModifyLunaClientResponse.proto
diff --git a/test/Test/AWS/Gen/CloudHSM.hs b/test/Test/AWS/Gen/CloudHSM.hs
--- a/test/Test/AWS/Gen/CloudHSM.hs
+++ b/test/Test/AWS/Gen/CloudHSM.hs
@@ -141,205 +141,205 @@
 testListHAPGs :: ListHAPGs -> TestTree
 testListHAPGs = req
     "ListHAPGs"
-    "fixture/ListHAPGs"
+    "fixture/ListHAPGs.yaml"
 
 testListHSMs :: ListHSMs -> TestTree
 testListHSMs = req
     "ListHSMs"
-    "fixture/ListHSMs"
+    "fixture/ListHSMs.yaml"
 
 testDeleteHAPG :: DeleteHAPG -> TestTree
 testDeleteHAPG = req
     "DeleteHAPG"
-    "fixture/DeleteHAPG"
+    "fixture/DeleteHAPG.yaml"
 
 testModifyLunaClient :: ModifyLunaClient -> TestTree
 testModifyLunaClient = req
     "ModifyLunaClient"
-    "fixture/ModifyLunaClient"
+    "fixture/ModifyLunaClient.yaml"
 
 testDescribeLunaClient :: DescribeLunaClient -> TestTree
 testDescribeLunaClient = req
     "DescribeLunaClient"
-    "fixture/DescribeLunaClient"
+    "fixture/DescribeLunaClient.yaml"
 
 testCreateHSM :: CreateHSM -> TestTree
 testCreateHSM = req
     "CreateHSM"
-    "fixture/CreateHSM"
+    "fixture/CreateHSM.yaml"
 
 testCreateHAPG :: CreateHAPG -> TestTree
 testCreateHAPG = req
     "CreateHAPG"
-    "fixture/CreateHAPG"
+    "fixture/CreateHAPG.yaml"
 
 testCreateLunaClient :: CreateLunaClient -> TestTree
 testCreateLunaClient = req
     "CreateLunaClient"
-    "fixture/CreateLunaClient"
+    "fixture/CreateLunaClient.yaml"
 
 testDescribeHAPG :: DescribeHAPG -> TestTree
 testDescribeHAPG = req
     "DescribeHAPG"
-    "fixture/DescribeHAPG"
+    "fixture/DescribeHAPG.yaml"
 
 testListLunaClients :: ListLunaClients -> TestTree
 testListLunaClients = req
     "ListLunaClients"
-    "fixture/ListLunaClients"
+    "fixture/ListLunaClients.yaml"
 
 testGetConfig :: GetConfig -> TestTree
 testGetConfig = req
     "GetConfig"
-    "fixture/GetConfig"
+    "fixture/GetConfig.yaml"
 
 testDeleteHSM :: DeleteHSM -> TestTree
 testDeleteHSM = req
     "DeleteHSM"
-    "fixture/DeleteHSM"
+    "fixture/DeleteHSM.yaml"
 
 testDescribeHSM :: DescribeHSM -> TestTree
 testDescribeHSM = req
     "DescribeHSM"
-    "fixture/DescribeHSM"
+    "fixture/DescribeHSM.yaml"
 
 testModifyHAPG :: ModifyHAPG -> TestTree
 testModifyHAPG = req
     "ModifyHAPG"
-    "fixture/ModifyHAPG"
+    "fixture/ModifyHAPG.yaml"
 
 testListAvailableZones :: ListAvailableZones -> TestTree
 testListAvailableZones = req
     "ListAvailableZones"
-    "fixture/ListAvailableZones"
+    "fixture/ListAvailableZones.yaml"
 
 testModifyHSM :: ModifyHSM -> TestTree
 testModifyHSM = req
     "ModifyHSM"
-    "fixture/ModifyHSM"
+    "fixture/ModifyHSM.yaml"
 
 testDeleteLunaClient :: DeleteLunaClient -> TestTree
 testDeleteLunaClient = req
     "DeleteLunaClient"
-    "fixture/DeleteLunaClient"
+    "fixture/DeleteLunaClient.yaml"
 
 -- Responses
 
 testListHAPGsResponse :: ListHAPGsResponse -> TestTree
 testListHAPGsResponse = res
     "ListHAPGsResponse"
-    "fixture/ListHAPGsResponse"
+    "fixture/ListHAPGsResponse.proto"
     cloudHSM
     (Proxy :: Proxy ListHAPGs)
 
 testListHSMsResponse :: ListHSMsResponse -> TestTree
 testListHSMsResponse = res
     "ListHSMsResponse"
-    "fixture/ListHSMsResponse"
+    "fixture/ListHSMsResponse.proto"
     cloudHSM
     (Proxy :: Proxy ListHSMs)
 
 testDeleteHAPGResponse :: DeleteHAPGResponse -> TestTree
 testDeleteHAPGResponse = res
     "DeleteHAPGResponse"
-    "fixture/DeleteHAPGResponse"
+    "fixture/DeleteHAPGResponse.proto"
     cloudHSM
     (Proxy :: Proxy DeleteHAPG)
 
 testModifyLunaClientResponse :: ModifyLunaClientResponse -> TestTree
 testModifyLunaClientResponse = res
     "ModifyLunaClientResponse"
-    "fixture/ModifyLunaClientResponse"
+    "fixture/ModifyLunaClientResponse.proto"
     cloudHSM
     (Proxy :: Proxy ModifyLunaClient)
 
 testDescribeLunaClientResponse :: DescribeLunaClientResponse -> TestTree
 testDescribeLunaClientResponse = res
     "DescribeLunaClientResponse"
-    "fixture/DescribeLunaClientResponse"
+    "fixture/DescribeLunaClientResponse.proto"
     cloudHSM
     (Proxy :: Proxy DescribeLunaClient)
 
 testCreateHSMResponse :: CreateHSMResponse -> TestTree
 testCreateHSMResponse = res
     "CreateHSMResponse"
-    "fixture/CreateHSMResponse"
+    "fixture/CreateHSMResponse.proto"
     cloudHSM
     (Proxy :: Proxy CreateHSM)
 
 testCreateHAPGResponse :: CreateHAPGResponse -> TestTree
 testCreateHAPGResponse = res
     "CreateHAPGResponse"
-    "fixture/CreateHAPGResponse"
+    "fixture/CreateHAPGResponse.proto"
     cloudHSM
     (Proxy :: Proxy CreateHAPG)
 
 testCreateLunaClientResponse :: CreateLunaClientResponse -> TestTree
 testCreateLunaClientResponse = res
     "CreateLunaClientResponse"
-    "fixture/CreateLunaClientResponse"
+    "fixture/CreateLunaClientResponse.proto"
     cloudHSM
     (Proxy :: Proxy CreateLunaClient)
 
 testDescribeHAPGResponse :: DescribeHAPGResponse -> TestTree
 testDescribeHAPGResponse = res
     "DescribeHAPGResponse"
-    "fixture/DescribeHAPGResponse"
+    "fixture/DescribeHAPGResponse.proto"
     cloudHSM
     (Proxy :: Proxy DescribeHAPG)
 
 testListLunaClientsResponse :: ListLunaClientsResponse -> TestTree
 testListLunaClientsResponse = res
     "ListLunaClientsResponse"
-    "fixture/ListLunaClientsResponse"
+    "fixture/ListLunaClientsResponse.proto"
     cloudHSM
     (Proxy :: Proxy ListLunaClients)
 
 testGetConfigResponse :: GetConfigResponse -> TestTree
 testGetConfigResponse = res
     "GetConfigResponse"
-    "fixture/GetConfigResponse"
+    "fixture/GetConfigResponse.proto"
     cloudHSM
     (Proxy :: Proxy GetConfig)
 
 testDeleteHSMResponse :: DeleteHSMResponse -> TestTree
 testDeleteHSMResponse = res
     "DeleteHSMResponse"
-    "fixture/DeleteHSMResponse"
+    "fixture/DeleteHSMResponse.proto"
     cloudHSM
     (Proxy :: Proxy DeleteHSM)
 
 testDescribeHSMResponse :: DescribeHSMResponse -> TestTree
 testDescribeHSMResponse = res
     "DescribeHSMResponse"
-    "fixture/DescribeHSMResponse"
+    "fixture/DescribeHSMResponse.proto"
     cloudHSM
     (Proxy :: Proxy DescribeHSM)
 
 testModifyHAPGResponse :: ModifyHAPGResponse -> TestTree
 testModifyHAPGResponse = res
     "ModifyHAPGResponse"
-    "fixture/ModifyHAPGResponse"
+    "fixture/ModifyHAPGResponse.proto"
     cloudHSM
     (Proxy :: Proxy ModifyHAPG)
 
 testListAvailableZonesResponse :: ListAvailableZonesResponse -> TestTree
 testListAvailableZonesResponse = res
     "ListAvailableZonesResponse"
-    "fixture/ListAvailableZonesResponse"
+    "fixture/ListAvailableZonesResponse.proto"
     cloudHSM
     (Proxy :: Proxy ListAvailableZones)
 
 testModifyHSMResponse :: ModifyHSMResponse -> TestTree
 testModifyHSMResponse = res
     "ModifyHSMResponse"
-    "fixture/ModifyHSMResponse"
+    "fixture/ModifyHSMResponse.proto"
     cloudHSM
     (Proxy :: Proxy ModifyHSM)
 
 testDeleteLunaClientResponse :: DeleteLunaClientResponse -> TestTree
 testDeleteLunaClientResponse = res
     "DeleteLunaClientResponse"
-    "fixture/DeleteLunaClientResponse"
+    "fixture/DeleteLunaClientResponse.proto"
     cloudHSM
     (Proxy :: Proxy DeleteLunaClient)
