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-cognito-identity.cabal b/amazonka-cognito-identity.cabal
--- a/amazonka-cognito-identity.cabal
+++ b/amazonka-cognito-identity.cabal
@@ -1,7 +1,8 @@
 name:                  amazonka-cognito-identity
-version:               1.2.0.1
+version:               1.2.0.2
 synopsis:              Amazon Cognito Identity 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 Cognito
 
@@ -114,8 +114,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.CognitoIdentity
         , Test.AWS.Gen.CognitoIdentity
diff --git a/fixture/CreateIdentityPool.yaml b/fixture/CreateIdentityPool.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/CreateIdentityPool.yaml
diff --git a/fixture/CreateIdentityPoolResponse.proto b/fixture/CreateIdentityPoolResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/CreateIdentityPoolResponse.proto
diff --git a/fixture/DeleteIdentities.yaml b/fixture/DeleteIdentities.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/DeleteIdentities.yaml
diff --git a/fixture/DeleteIdentitiesResponse.proto b/fixture/DeleteIdentitiesResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/DeleteIdentitiesResponse.proto
diff --git a/fixture/DeleteIdentityPool.yaml b/fixture/DeleteIdentityPool.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/DeleteIdentityPool.yaml
diff --git a/fixture/DeleteIdentityPoolResponse.proto b/fixture/DeleteIdentityPoolResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/DeleteIdentityPoolResponse.proto
diff --git a/fixture/DescribeIdentity.yaml b/fixture/DescribeIdentity.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeIdentity.yaml
diff --git a/fixture/DescribeIdentityPool.yaml b/fixture/DescribeIdentityPool.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeIdentityPool.yaml
diff --git a/fixture/DescribeIdentityPoolResponse.proto b/fixture/DescribeIdentityPoolResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeIdentityPoolResponse.proto
diff --git a/fixture/DescribeIdentityResponse.proto b/fixture/DescribeIdentityResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeIdentityResponse.proto
diff --git a/fixture/GetCredentialsForIdentity.yaml b/fixture/GetCredentialsForIdentity.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/GetCredentialsForIdentity.yaml
diff --git a/fixture/GetCredentialsForIdentityResponse.proto b/fixture/GetCredentialsForIdentityResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/GetCredentialsForIdentityResponse.proto
diff --git a/fixture/GetId.yaml b/fixture/GetId.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/GetId.yaml
diff --git a/fixture/GetIdResponse.proto b/fixture/GetIdResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/GetIdResponse.proto
diff --git a/fixture/GetIdentityPoolRoles.yaml b/fixture/GetIdentityPoolRoles.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/GetIdentityPoolRoles.yaml
diff --git a/fixture/GetIdentityPoolRolesResponse.proto b/fixture/GetIdentityPoolRolesResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/GetIdentityPoolRolesResponse.proto
diff --git a/fixture/GetOpenIdToken.yaml b/fixture/GetOpenIdToken.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/GetOpenIdToken.yaml
diff --git a/fixture/GetOpenIdTokenForDeveloperIdentity.yaml b/fixture/GetOpenIdTokenForDeveloperIdentity.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/GetOpenIdTokenForDeveloperIdentity.yaml
diff --git a/fixture/GetOpenIdTokenForDeveloperIdentityResponse.proto b/fixture/GetOpenIdTokenForDeveloperIdentityResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/GetOpenIdTokenForDeveloperIdentityResponse.proto
diff --git a/fixture/GetOpenIdTokenResponse.proto b/fixture/GetOpenIdTokenResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/GetOpenIdTokenResponse.proto
diff --git a/fixture/ListIdentities.yaml b/fixture/ListIdentities.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/ListIdentities.yaml
diff --git a/fixture/ListIdentitiesResponse.proto b/fixture/ListIdentitiesResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/ListIdentitiesResponse.proto
diff --git a/fixture/ListIdentityPools.yaml b/fixture/ListIdentityPools.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/ListIdentityPools.yaml
diff --git a/fixture/ListIdentityPoolsResponse.proto b/fixture/ListIdentityPoolsResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/ListIdentityPoolsResponse.proto
diff --git a/fixture/LookupDeveloperIdentity.yaml b/fixture/LookupDeveloperIdentity.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/LookupDeveloperIdentity.yaml
diff --git a/fixture/LookupDeveloperIdentityResponse.proto b/fixture/LookupDeveloperIdentityResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/LookupDeveloperIdentityResponse.proto
diff --git a/fixture/MergeDeveloperIdentities.yaml b/fixture/MergeDeveloperIdentities.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/MergeDeveloperIdentities.yaml
diff --git a/fixture/MergeDeveloperIdentitiesResponse.proto b/fixture/MergeDeveloperIdentitiesResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/MergeDeveloperIdentitiesResponse.proto
diff --git a/fixture/SetIdentityPoolRoles.yaml b/fixture/SetIdentityPoolRoles.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/SetIdentityPoolRoles.yaml
diff --git a/fixture/SetIdentityPoolRolesResponse.proto b/fixture/SetIdentityPoolRolesResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/SetIdentityPoolRolesResponse.proto
diff --git a/fixture/UnlinkDeveloperIdentity.yaml b/fixture/UnlinkDeveloperIdentity.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/UnlinkDeveloperIdentity.yaml
diff --git a/fixture/UnlinkDeveloperIdentityResponse.proto b/fixture/UnlinkDeveloperIdentityResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/UnlinkDeveloperIdentityResponse.proto
diff --git a/fixture/UnlinkIdentity.yaml b/fixture/UnlinkIdentity.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/UnlinkIdentity.yaml
diff --git a/fixture/UnlinkIdentityResponse.proto b/fixture/UnlinkIdentityResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/UnlinkIdentityResponse.proto
diff --git a/fixture/UpdateIdentityPool.yaml b/fixture/UpdateIdentityPool.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/UpdateIdentityPool.yaml
diff --git a/fixture/UpdateIdentityPoolResponse.proto b/fixture/UpdateIdentityPoolResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/UpdateIdentityPoolResponse.proto
diff --git a/test/Test/AWS/Gen/CognitoIdentity.hs b/test/Test/AWS/Gen/CognitoIdentity.hs
--- a/test/Test/AWS/Gen/CognitoIdentity.hs
+++ b/test/Test/AWS/Gen/CognitoIdentity.hs
@@ -147,217 +147,217 @@
 testGetOpenIdToken :: GetOpenIdToken -> TestTree
 testGetOpenIdToken = req
     "GetOpenIdToken"
-    "fixture/GetOpenIdToken"
+    "fixture/GetOpenIdToken.yaml"
 
 testDescribeIdentityPool :: DescribeIdentityPool -> TestTree
 testDescribeIdentityPool = req
     "DescribeIdentityPool"
-    "fixture/DescribeIdentityPool"
+    "fixture/DescribeIdentityPool.yaml"
 
 testGetOpenIdTokenForDeveloperIdentity :: GetOpenIdTokenForDeveloperIdentity -> TestTree
 testGetOpenIdTokenForDeveloperIdentity = req
     "GetOpenIdTokenForDeveloperIdentity"
-    "fixture/GetOpenIdTokenForDeveloperIdentity"
+    "fixture/GetOpenIdTokenForDeveloperIdentity.yaml"
 
 testUnlinkDeveloperIdentity :: UnlinkDeveloperIdentity -> TestTree
 testUnlinkDeveloperIdentity = req
     "UnlinkDeveloperIdentity"
-    "fixture/UnlinkDeveloperIdentity"
+    "fixture/UnlinkDeveloperIdentity.yaml"
 
 testGetCredentialsForIdentity :: GetCredentialsForIdentity -> TestTree
 testGetCredentialsForIdentity = req
     "GetCredentialsForIdentity"
-    "fixture/GetCredentialsForIdentity"
+    "fixture/GetCredentialsForIdentity.yaml"
 
 testListIdentityPools :: ListIdentityPools -> TestTree
 testListIdentityPools = req
     "ListIdentityPools"
-    "fixture/ListIdentityPools"
+    "fixture/ListIdentityPools.yaml"
 
 testGetIdentityPoolRoles :: GetIdentityPoolRoles -> TestTree
 testGetIdentityPoolRoles = req
     "GetIdentityPoolRoles"
-    "fixture/GetIdentityPoolRoles"
+    "fixture/GetIdentityPoolRoles.yaml"
 
 testDeleteIdentityPool :: DeleteIdentityPool -> TestTree
 testDeleteIdentityPool = req
     "DeleteIdentityPool"
-    "fixture/DeleteIdentityPool"
+    "fixture/DeleteIdentityPool.yaml"
 
 testUpdateIdentityPool :: UpdateIdentityPool -> TestTree
 testUpdateIdentityPool = req
     "UpdateIdentityPool"
-    "fixture/UpdateIdentityPool"
+    "fixture/UpdateIdentityPool.yaml"
 
 testGetId :: GetId -> TestTree
 testGetId = req
     "GetId"
-    "fixture/GetId"
+    "fixture/GetId.yaml"
 
 testDeleteIdentities :: DeleteIdentities -> TestTree
 testDeleteIdentities = req
     "DeleteIdentities"
-    "fixture/DeleteIdentities"
+    "fixture/DeleteIdentities.yaml"
 
 testSetIdentityPoolRoles :: SetIdentityPoolRoles -> TestTree
 testSetIdentityPoolRoles = req
     "SetIdentityPoolRoles"
-    "fixture/SetIdentityPoolRoles"
+    "fixture/SetIdentityPoolRoles.yaml"
 
 testListIdentities :: ListIdentities -> TestTree
 testListIdentities = req
     "ListIdentities"
-    "fixture/ListIdentities"
+    "fixture/ListIdentities.yaml"
 
 testLookupDeveloperIdentity :: LookupDeveloperIdentity -> TestTree
 testLookupDeveloperIdentity = req
     "LookupDeveloperIdentity"
-    "fixture/LookupDeveloperIdentity"
+    "fixture/LookupDeveloperIdentity.yaml"
 
 testUnlinkIdentity :: UnlinkIdentity -> TestTree
 testUnlinkIdentity = req
     "UnlinkIdentity"
-    "fixture/UnlinkIdentity"
+    "fixture/UnlinkIdentity.yaml"
 
 testDescribeIdentity :: DescribeIdentity -> TestTree
 testDescribeIdentity = req
     "DescribeIdentity"
-    "fixture/DescribeIdentity"
+    "fixture/DescribeIdentity.yaml"
 
 testCreateIdentityPool :: CreateIdentityPool -> TestTree
 testCreateIdentityPool = req
     "CreateIdentityPool"
-    "fixture/CreateIdentityPool"
+    "fixture/CreateIdentityPool.yaml"
 
 testMergeDeveloperIdentities :: MergeDeveloperIdentities -> TestTree
 testMergeDeveloperIdentities = req
     "MergeDeveloperIdentities"
-    "fixture/MergeDeveloperIdentities"
+    "fixture/MergeDeveloperIdentities.yaml"
 
 -- Responses
 
 testGetOpenIdTokenResponse :: GetOpenIdTokenResponse -> TestTree
 testGetOpenIdTokenResponse = res
     "GetOpenIdTokenResponse"
-    "fixture/GetOpenIdTokenResponse"
+    "fixture/GetOpenIdTokenResponse.proto"
     cognitoIdentity
     (Proxy :: Proxy GetOpenIdToken)
 
 testDescribeIdentityPoolResponse :: IdentityPool -> TestTree
 testDescribeIdentityPoolResponse = res
     "DescribeIdentityPoolResponse"
-    "fixture/DescribeIdentityPoolResponse"
+    "fixture/DescribeIdentityPoolResponse.proto"
     cognitoIdentity
     (Proxy :: Proxy DescribeIdentityPool)
 
 testGetOpenIdTokenForDeveloperIdentityResponse :: GetOpenIdTokenForDeveloperIdentityResponse -> TestTree
 testGetOpenIdTokenForDeveloperIdentityResponse = res
     "GetOpenIdTokenForDeveloperIdentityResponse"
-    "fixture/GetOpenIdTokenForDeveloperIdentityResponse"
+    "fixture/GetOpenIdTokenForDeveloperIdentityResponse.proto"
     cognitoIdentity
     (Proxy :: Proxy GetOpenIdTokenForDeveloperIdentity)
 
 testUnlinkDeveloperIdentityResponse :: UnlinkDeveloperIdentityResponse -> TestTree
 testUnlinkDeveloperIdentityResponse = res
     "UnlinkDeveloperIdentityResponse"
-    "fixture/UnlinkDeveloperIdentityResponse"
+    "fixture/UnlinkDeveloperIdentityResponse.proto"
     cognitoIdentity
     (Proxy :: Proxy UnlinkDeveloperIdentity)
 
 testGetCredentialsForIdentityResponse :: GetCredentialsForIdentityResponse -> TestTree
 testGetCredentialsForIdentityResponse = res
     "GetCredentialsForIdentityResponse"
-    "fixture/GetCredentialsForIdentityResponse"
+    "fixture/GetCredentialsForIdentityResponse.proto"
     cognitoIdentity
     (Proxy :: Proxy GetCredentialsForIdentity)
 
 testListIdentityPoolsResponse :: ListIdentityPoolsResponse -> TestTree
 testListIdentityPoolsResponse = res
     "ListIdentityPoolsResponse"
-    "fixture/ListIdentityPoolsResponse"
+    "fixture/ListIdentityPoolsResponse.proto"
     cognitoIdentity
     (Proxy :: Proxy ListIdentityPools)
 
 testGetIdentityPoolRolesResponse :: GetIdentityPoolRolesResponse -> TestTree
 testGetIdentityPoolRolesResponse = res
     "GetIdentityPoolRolesResponse"
-    "fixture/GetIdentityPoolRolesResponse"
+    "fixture/GetIdentityPoolRolesResponse.proto"
     cognitoIdentity
     (Proxy :: Proxy GetIdentityPoolRoles)
 
 testDeleteIdentityPoolResponse :: DeleteIdentityPoolResponse -> TestTree
 testDeleteIdentityPoolResponse = res
     "DeleteIdentityPoolResponse"
-    "fixture/DeleteIdentityPoolResponse"
+    "fixture/DeleteIdentityPoolResponse.proto"
     cognitoIdentity
     (Proxy :: Proxy DeleteIdentityPool)
 
 testUpdateIdentityPoolResponse :: IdentityPool -> TestTree
 testUpdateIdentityPoolResponse = res
     "UpdateIdentityPoolResponse"
-    "fixture/UpdateIdentityPoolResponse"
+    "fixture/UpdateIdentityPoolResponse.proto"
     cognitoIdentity
     (Proxy :: Proxy UpdateIdentityPool)
 
 testGetIdResponse :: GetIdResponse -> TestTree
 testGetIdResponse = res
     "GetIdResponse"
-    "fixture/GetIdResponse"
+    "fixture/GetIdResponse.proto"
     cognitoIdentity
     (Proxy :: Proxy GetId)
 
 testDeleteIdentitiesResponse :: DeleteIdentitiesResponse -> TestTree
 testDeleteIdentitiesResponse = res
     "DeleteIdentitiesResponse"
-    "fixture/DeleteIdentitiesResponse"
+    "fixture/DeleteIdentitiesResponse.proto"
     cognitoIdentity
     (Proxy :: Proxy DeleteIdentities)
 
 testSetIdentityPoolRolesResponse :: SetIdentityPoolRolesResponse -> TestTree
 testSetIdentityPoolRolesResponse = res
     "SetIdentityPoolRolesResponse"
-    "fixture/SetIdentityPoolRolesResponse"
+    "fixture/SetIdentityPoolRolesResponse.proto"
     cognitoIdentity
     (Proxy :: Proxy SetIdentityPoolRoles)
 
 testListIdentitiesResponse :: ListIdentitiesResponse -> TestTree
 testListIdentitiesResponse = res
     "ListIdentitiesResponse"
-    "fixture/ListIdentitiesResponse"
+    "fixture/ListIdentitiesResponse.proto"
     cognitoIdentity
     (Proxy :: Proxy ListIdentities)
 
 testLookupDeveloperIdentityResponse :: LookupDeveloperIdentityResponse -> TestTree
 testLookupDeveloperIdentityResponse = res
     "LookupDeveloperIdentityResponse"
-    "fixture/LookupDeveloperIdentityResponse"
+    "fixture/LookupDeveloperIdentityResponse.proto"
     cognitoIdentity
     (Proxy :: Proxy LookupDeveloperIdentity)
 
 testUnlinkIdentityResponse :: UnlinkIdentityResponse -> TestTree
 testUnlinkIdentityResponse = res
     "UnlinkIdentityResponse"
-    "fixture/UnlinkIdentityResponse"
+    "fixture/UnlinkIdentityResponse.proto"
     cognitoIdentity
     (Proxy :: Proxy UnlinkIdentity)
 
 testDescribeIdentityResponse :: IdentityDescription -> TestTree
 testDescribeIdentityResponse = res
     "DescribeIdentityResponse"
-    "fixture/DescribeIdentityResponse"
+    "fixture/DescribeIdentityResponse.proto"
     cognitoIdentity
     (Proxy :: Proxy DescribeIdentity)
 
 testCreateIdentityPoolResponse :: IdentityPool -> TestTree
 testCreateIdentityPoolResponse = res
     "CreateIdentityPoolResponse"
-    "fixture/CreateIdentityPoolResponse"
+    "fixture/CreateIdentityPoolResponse.proto"
     cognitoIdentity
     (Proxy :: Proxy CreateIdentityPool)
 
 testMergeDeveloperIdentitiesResponse :: MergeDeveloperIdentitiesResponse -> TestTree
 testMergeDeveloperIdentitiesResponse = res
     "MergeDeveloperIdentitiesResponse"
-    "fixture/MergeDeveloperIdentitiesResponse"
+    "fixture/MergeDeveloperIdentitiesResponse.proto"
     cognitoIdentity
     (Proxy :: Proxy MergeDeveloperIdentities)
