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-lambda.cabal b/amazonka-lambda.cabal
--- a/amazonka-lambda.cabal
+++ b/amazonka-lambda.cabal
@@ -1,7 +1,8 @@
 name:                  amazonka-lambda
-version:               1.2.0.1
+version:               1.2.0.2
 synopsis:              Amazon Lambda 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 Lambda
 
@@ -85,8 +85,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.Lambda
         , Test.AWS.Gen.Lambda
diff --git a/fixture/AddPermission.yaml b/fixture/AddPermission.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/AddPermission.yaml
diff --git a/fixture/AddPermissionResponse.proto b/fixture/AddPermissionResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/AddPermissionResponse.proto
diff --git a/fixture/CreateEventSourceMapping.yaml b/fixture/CreateEventSourceMapping.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/CreateEventSourceMapping.yaml
diff --git a/fixture/CreateEventSourceMappingResponse.proto b/fixture/CreateEventSourceMappingResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/CreateEventSourceMappingResponse.proto
diff --git a/fixture/CreateFunction.yaml b/fixture/CreateFunction.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/CreateFunction.yaml
diff --git a/fixture/CreateFunctionResponse.proto b/fixture/CreateFunctionResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/CreateFunctionResponse.proto
diff --git a/fixture/DeleteEventSourceMapping.yaml b/fixture/DeleteEventSourceMapping.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/DeleteEventSourceMapping.yaml
diff --git a/fixture/DeleteEventSourceMappingResponse.proto b/fixture/DeleteEventSourceMappingResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/DeleteEventSourceMappingResponse.proto
diff --git a/fixture/DeleteFunction.yaml b/fixture/DeleteFunction.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/DeleteFunction.yaml
diff --git a/fixture/DeleteFunctionResponse.proto b/fixture/DeleteFunctionResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/DeleteFunctionResponse.proto
diff --git a/fixture/GetEventSourceMapping.yaml b/fixture/GetEventSourceMapping.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/GetEventSourceMapping.yaml
diff --git a/fixture/GetEventSourceMappingResponse.proto b/fixture/GetEventSourceMappingResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/GetEventSourceMappingResponse.proto
diff --git a/fixture/GetFunction.yaml b/fixture/GetFunction.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/GetFunction.yaml
diff --git a/fixture/GetFunctionConfiguration.yaml b/fixture/GetFunctionConfiguration.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/GetFunctionConfiguration.yaml
diff --git a/fixture/GetFunctionConfigurationResponse.proto b/fixture/GetFunctionConfigurationResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/GetFunctionConfigurationResponse.proto
diff --git a/fixture/GetFunctionResponse.proto b/fixture/GetFunctionResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/GetFunctionResponse.proto
diff --git a/fixture/GetPolicy.yaml b/fixture/GetPolicy.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/GetPolicy.yaml
diff --git a/fixture/GetPolicyResponse.proto b/fixture/GetPolicyResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/GetPolicyResponse.proto
diff --git a/fixture/Invoke.yaml b/fixture/Invoke.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/Invoke.yaml
diff --git a/fixture/InvokeResponse.proto b/fixture/InvokeResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/InvokeResponse.proto
diff --git a/fixture/ListEventSourceMappings.yaml b/fixture/ListEventSourceMappings.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/ListEventSourceMappings.yaml
diff --git a/fixture/ListEventSourceMappingsResponse.proto b/fixture/ListEventSourceMappingsResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/ListEventSourceMappingsResponse.proto
diff --git a/fixture/ListFunctions.yaml b/fixture/ListFunctions.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/ListFunctions.yaml
diff --git a/fixture/ListFunctionsResponse.proto b/fixture/ListFunctionsResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/ListFunctionsResponse.proto
diff --git a/fixture/RemovePermission.yaml b/fixture/RemovePermission.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/RemovePermission.yaml
diff --git a/fixture/RemovePermissionResponse.proto b/fixture/RemovePermissionResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/RemovePermissionResponse.proto
diff --git a/fixture/UpdateEventSourceMapping.yaml b/fixture/UpdateEventSourceMapping.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/UpdateEventSourceMapping.yaml
diff --git a/fixture/UpdateEventSourceMappingResponse.proto b/fixture/UpdateEventSourceMappingResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/UpdateEventSourceMappingResponse.proto
diff --git a/fixture/UpdateFunctionCode.yaml b/fixture/UpdateFunctionCode.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/UpdateFunctionCode.yaml
diff --git a/fixture/UpdateFunctionCodeResponse.proto b/fixture/UpdateFunctionCodeResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/UpdateFunctionCodeResponse.proto
diff --git a/fixture/UpdateFunctionConfiguration.yaml b/fixture/UpdateFunctionConfiguration.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/UpdateFunctionConfiguration.yaml
diff --git a/fixture/UpdateFunctionConfigurationResponse.proto b/fixture/UpdateFunctionConfigurationResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/UpdateFunctionConfigurationResponse.proto
diff --git a/test/Test/AWS/Gen/Lambda.hs b/test/Test/AWS/Gen/Lambda.hs
--- a/test/Test/AWS/Gen/Lambda.hs
+++ b/test/Test/AWS/Gen/Lambda.hs
@@ -135,193 +135,193 @@
 testGetFunctionConfiguration :: GetFunctionConfiguration -> TestTree
 testGetFunctionConfiguration = req
     "GetFunctionConfiguration"
-    "fixture/GetFunctionConfiguration"
+    "fixture/GetFunctionConfiguration.yaml"
 
 testUpdateEventSourceMapping :: UpdateEventSourceMapping -> TestTree
 testUpdateEventSourceMapping = req
     "UpdateEventSourceMapping"
-    "fixture/UpdateEventSourceMapping"
+    "fixture/UpdateEventSourceMapping.yaml"
 
 testDeleteEventSourceMapping :: DeleteEventSourceMapping -> TestTree
 testDeleteEventSourceMapping = req
     "DeleteEventSourceMapping"
-    "fixture/DeleteEventSourceMapping"
+    "fixture/DeleteEventSourceMapping.yaml"
 
 testRemovePermission :: RemovePermission -> TestTree
 testRemovePermission = req
     "RemovePermission"
-    "fixture/RemovePermission"
+    "fixture/RemovePermission.yaml"
 
 testInvoke :: Invoke -> TestTree
 testInvoke = req
     "Invoke"
-    "fixture/Invoke"
+    "fixture/Invoke.yaml"
 
 testGetEventSourceMapping :: GetEventSourceMapping -> TestTree
 testGetEventSourceMapping = req
     "GetEventSourceMapping"
-    "fixture/GetEventSourceMapping"
+    "fixture/GetEventSourceMapping.yaml"
 
 testCreateFunction :: CreateFunction -> TestTree
 testCreateFunction = req
     "CreateFunction"
-    "fixture/CreateFunction"
+    "fixture/CreateFunction.yaml"
 
 testCreateEventSourceMapping :: CreateEventSourceMapping -> TestTree
 testCreateEventSourceMapping = req
     "CreateEventSourceMapping"
-    "fixture/CreateEventSourceMapping"
+    "fixture/CreateEventSourceMapping.yaml"
 
 testGetFunction :: GetFunction -> TestTree
 testGetFunction = req
     "GetFunction"
-    "fixture/GetFunction"
+    "fixture/GetFunction.yaml"
 
 testListEventSourceMappings :: ListEventSourceMappings -> TestTree
 testListEventSourceMappings = req
     "ListEventSourceMappings"
-    "fixture/ListEventSourceMappings"
+    "fixture/ListEventSourceMappings.yaml"
 
 testAddPermission :: AddPermission -> TestTree
 testAddPermission = req
     "AddPermission"
-    "fixture/AddPermission"
+    "fixture/AddPermission.yaml"
 
 testDeleteFunction :: DeleteFunction -> TestTree
 testDeleteFunction = req
     "DeleteFunction"
-    "fixture/DeleteFunction"
+    "fixture/DeleteFunction.yaml"
 
 testUpdateFunctionConfiguration :: UpdateFunctionConfiguration -> TestTree
 testUpdateFunctionConfiguration = req
     "UpdateFunctionConfiguration"
-    "fixture/UpdateFunctionConfiguration"
+    "fixture/UpdateFunctionConfiguration.yaml"
 
 testListFunctions :: ListFunctions -> TestTree
 testListFunctions = req
     "ListFunctions"
-    "fixture/ListFunctions"
+    "fixture/ListFunctions.yaml"
 
 testUpdateFunctionCode :: UpdateFunctionCode -> TestTree
 testUpdateFunctionCode = req
     "UpdateFunctionCode"
-    "fixture/UpdateFunctionCode"
+    "fixture/UpdateFunctionCode.yaml"
 
 testGetPolicy :: GetPolicy -> TestTree
 testGetPolicy = req
     "GetPolicy"
-    "fixture/GetPolicy"
+    "fixture/GetPolicy.yaml"
 
 -- Responses
 
 testGetFunctionConfigurationResponse :: FunctionConfiguration -> TestTree
 testGetFunctionConfigurationResponse = res
     "GetFunctionConfigurationResponse"
-    "fixture/GetFunctionConfigurationResponse"
+    "fixture/GetFunctionConfigurationResponse.proto"
     lambda
     (Proxy :: Proxy GetFunctionConfiguration)
 
 testUpdateEventSourceMappingResponse :: EventSourceMappingConfiguration -> TestTree
 testUpdateEventSourceMappingResponse = res
     "UpdateEventSourceMappingResponse"
-    "fixture/UpdateEventSourceMappingResponse"
+    "fixture/UpdateEventSourceMappingResponse.proto"
     lambda
     (Proxy :: Proxy UpdateEventSourceMapping)
 
 testDeleteEventSourceMappingResponse :: EventSourceMappingConfiguration -> TestTree
 testDeleteEventSourceMappingResponse = res
     "DeleteEventSourceMappingResponse"
-    "fixture/DeleteEventSourceMappingResponse"
+    "fixture/DeleteEventSourceMappingResponse.proto"
     lambda
     (Proxy :: Proxy DeleteEventSourceMapping)
 
 testRemovePermissionResponse :: RemovePermissionResponse -> TestTree
 testRemovePermissionResponse = res
     "RemovePermissionResponse"
-    "fixture/RemovePermissionResponse"
+    "fixture/RemovePermissionResponse.proto"
     lambda
     (Proxy :: Proxy RemovePermission)
 
 testInvokeResponse :: InvokeResponse -> TestTree
 testInvokeResponse = res
     "InvokeResponse"
-    "fixture/InvokeResponse"
+    "fixture/InvokeResponse.proto"
     lambda
     (Proxy :: Proxy Invoke)
 
 testGetEventSourceMappingResponse :: EventSourceMappingConfiguration -> TestTree
 testGetEventSourceMappingResponse = res
     "GetEventSourceMappingResponse"
-    "fixture/GetEventSourceMappingResponse"
+    "fixture/GetEventSourceMappingResponse.proto"
     lambda
     (Proxy :: Proxy GetEventSourceMapping)
 
 testCreateFunctionResponse :: FunctionConfiguration -> TestTree
 testCreateFunctionResponse = res
     "CreateFunctionResponse"
-    "fixture/CreateFunctionResponse"
+    "fixture/CreateFunctionResponse.proto"
     lambda
     (Proxy :: Proxy CreateFunction)
 
 testCreateEventSourceMappingResponse :: EventSourceMappingConfiguration -> TestTree
 testCreateEventSourceMappingResponse = res
     "CreateEventSourceMappingResponse"
-    "fixture/CreateEventSourceMappingResponse"
+    "fixture/CreateEventSourceMappingResponse.proto"
     lambda
     (Proxy :: Proxy CreateEventSourceMapping)
 
 testGetFunctionResponse :: GetFunctionResponse -> TestTree
 testGetFunctionResponse = res
     "GetFunctionResponse"
-    "fixture/GetFunctionResponse"
+    "fixture/GetFunctionResponse.proto"
     lambda
     (Proxy :: Proxy GetFunction)
 
 testListEventSourceMappingsResponse :: ListEventSourceMappingsResponse -> TestTree
 testListEventSourceMappingsResponse = res
     "ListEventSourceMappingsResponse"
-    "fixture/ListEventSourceMappingsResponse"
+    "fixture/ListEventSourceMappingsResponse.proto"
     lambda
     (Proxy :: Proxy ListEventSourceMappings)
 
 testAddPermissionResponse :: AddPermissionResponse -> TestTree
 testAddPermissionResponse = res
     "AddPermissionResponse"
-    "fixture/AddPermissionResponse"
+    "fixture/AddPermissionResponse.proto"
     lambda
     (Proxy :: Proxy AddPermission)
 
 testDeleteFunctionResponse :: DeleteFunctionResponse -> TestTree
 testDeleteFunctionResponse = res
     "DeleteFunctionResponse"
-    "fixture/DeleteFunctionResponse"
+    "fixture/DeleteFunctionResponse.proto"
     lambda
     (Proxy :: Proxy DeleteFunction)
 
 testUpdateFunctionConfigurationResponse :: FunctionConfiguration -> TestTree
 testUpdateFunctionConfigurationResponse = res
     "UpdateFunctionConfigurationResponse"
-    "fixture/UpdateFunctionConfigurationResponse"
+    "fixture/UpdateFunctionConfigurationResponse.proto"
     lambda
     (Proxy :: Proxy UpdateFunctionConfiguration)
 
 testListFunctionsResponse :: ListFunctionsResponse -> TestTree
 testListFunctionsResponse = res
     "ListFunctionsResponse"
-    "fixture/ListFunctionsResponse"
+    "fixture/ListFunctionsResponse.proto"
     lambda
     (Proxy :: Proxy ListFunctions)
 
 testUpdateFunctionCodeResponse :: FunctionConfiguration -> TestTree
 testUpdateFunctionCodeResponse = res
     "UpdateFunctionCodeResponse"
-    "fixture/UpdateFunctionCodeResponse"
+    "fixture/UpdateFunctionCodeResponse.proto"
     lambda
     (Proxy :: Proxy UpdateFunctionCode)
 
 testGetPolicyResponse :: GetPolicyResponse -> TestTree
 testGetPolicyResponse = res
     "GetPolicyResponse"
-    "fixture/GetPolicyResponse"
+    "fixture/GetPolicyResponse.proto"
     lambda
     (Proxy :: Proxy GetPolicy)
