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-efs.cabal b/amazonka-efs.cabal
--- a/amazonka-efs.cabal
+++ b/amazonka-efs.cabal
@@ -1,7 +1,8 @@
 name:                  amazonka-efs
-version:               1.2.0.1
+version:               1.2.0.2
 synopsis:              Amazon Elastic File System 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 Elastic File System
     .
@@ -71,8 +71,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.EFS
         , Test.AWS.Gen.EFS
diff --git a/fixture/CreateFileSystem.yaml b/fixture/CreateFileSystem.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/CreateFileSystem.yaml
diff --git a/fixture/CreateFileSystemResponse.proto b/fixture/CreateFileSystemResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/CreateFileSystemResponse.proto
diff --git a/fixture/CreateMountTarget.yaml b/fixture/CreateMountTarget.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/CreateMountTarget.yaml
diff --git a/fixture/CreateMountTargetResponse.proto b/fixture/CreateMountTargetResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/CreateMountTargetResponse.proto
diff --git a/fixture/CreateTags.yaml b/fixture/CreateTags.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/CreateTags.yaml
diff --git a/fixture/CreateTagsResponse.proto b/fixture/CreateTagsResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/CreateTagsResponse.proto
diff --git a/fixture/DeleteFileSystem.yaml b/fixture/DeleteFileSystem.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/DeleteFileSystem.yaml
diff --git a/fixture/DeleteFileSystemResponse.proto b/fixture/DeleteFileSystemResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/DeleteFileSystemResponse.proto
diff --git a/fixture/DeleteMountTarget.yaml b/fixture/DeleteMountTarget.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/DeleteMountTarget.yaml
diff --git a/fixture/DeleteMountTargetResponse.proto b/fixture/DeleteMountTargetResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/DeleteMountTargetResponse.proto
diff --git a/fixture/DeleteTags.yaml b/fixture/DeleteTags.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/DeleteTags.yaml
diff --git a/fixture/DeleteTagsResponse.proto b/fixture/DeleteTagsResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/DeleteTagsResponse.proto
diff --git a/fixture/DescribeFileSystems.yaml b/fixture/DescribeFileSystems.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeFileSystems.yaml
diff --git a/fixture/DescribeFileSystemsResponse.proto b/fixture/DescribeFileSystemsResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeFileSystemsResponse.proto
diff --git a/fixture/DescribeMountTargetSecurityGroups.yaml b/fixture/DescribeMountTargetSecurityGroups.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeMountTargetSecurityGroups.yaml
diff --git a/fixture/DescribeMountTargetSecurityGroupsResponse.proto b/fixture/DescribeMountTargetSecurityGroupsResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeMountTargetSecurityGroupsResponse.proto
diff --git a/fixture/DescribeMountTargets.yaml b/fixture/DescribeMountTargets.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeMountTargets.yaml
diff --git a/fixture/DescribeMountTargetsResponse.proto b/fixture/DescribeMountTargetsResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeMountTargetsResponse.proto
diff --git a/fixture/DescribeTags.yaml b/fixture/DescribeTags.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeTags.yaml
diff --git a/fixture/DescribeTagsResponse.proto b/fixture/DescribeTagsResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeTagsResponse.proto
diff --git a/fixture/ModifyMountTargetSecurityGroups.yaml b/fixture/ModifyMountTargetSecurityGroups.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/ModifyMountTargetSecurityGroups.yaml
diff --git a/fixture/ModifyMountTargetSecurityGroupsResponse.proto b/fixture/ModifyMountTargetSecurityGroupsResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/ModifyMountTargetSecurityGroupsResponse.proto
diff --git a/test/Test/AWS/Gen/EFS.hs b/test/Test/AWS/Gen/EFS.hs
--- a/test/Test/AWS/Gen/EFS.hs
+++ b/test/Test/AWS/Gen/EFS.hs
@@ -105,133 +105,133 @@
 testDescribeTags :: DescribeTags -> TestTree
 testDescribeTags = req
     "DescribeTags"
-    "fixture/DescribeTags"
+    "fixture/DescribeTags.yaml"
 
 testDescribeMountTargets :: DescribeMountTargets -> TestTree
 testDescribeMountTargets = req
     "DescribeMountTargets"
-    "fixture/DescribeMountTargets"
+    "fixture/DescribeMountTargets.yaml"
 
 testDeleteMountTarget :: DeleteMountTarget -> TestTree
 testDeleteMountTarget = req
     "DeleteMountTarget"
-    "fixture/DeleteMountTarget"
+    "fixture/DeleteMountTarget.yaml"
 
 testCreateTags :: CreateTags -> TestTree
 testCreateTags = req
     "CreateTags"
-    "fixture/CreateTags"
+    "fixture/CreateTags.yaml"
 
 testDescribeFileSystems :: DescribeFileSystems -> TestTree
 testDescribeFileSystems = req
     "DescribeFileSystems"
-    "fixture/DescribeFileSystems"
+    "fixture/DescribeFileSystems.yaml"
 
 testDeleteTags :: DeleteTags -> TestTree
 testDeleteTags = req
     "DeleteTags"
-    "fixture/DeleteTags"
+    "fixture/DeleteTags.yaml"
 
 testDescribeMountTargetSecurityGroups :: DescribeMountTargetSecurityGroups -> TestTree
 testDescribeMountTargetSecurityGroups = req
     "DescribeMountTargetSecurityGroups"
-    "fixture/DescribeMountTargetSecurityGroups"
+    "fixture/DescribeMountTargetSecurityGroups.yaml"
 
 testModifyMountTargetSecurityGroups :: ModifyMountTargetSecurityGroups -> TestTree
 testModifyMountTargetSecurityGroups = req
     "ModifyMountTargetSecurityGroups"
-    "fixture/ModifyMountTargetSecurityGroups"
+    "fixture/ModifyMountTargetSecurityGroups.yaml"
 
 testCreateFileSystem :: CreateFileSystem -> TestTree
 testCreateFileSystem = req
     "CreateFileSystem"
-    "fixture/CreateFileSystem"
+    "fixture/CreateFileSystem.yaml"
 
 testDeleteFileSystem :: DeleteFileSystem -> TestTree
 testDeleteFileSystem = req
     "DeleteFileSystem"
-    "fixture/DeleteFileSystem"
+    "fixture/DeleteFileSystem.yaml"
 
 testCreateMountTarget :: CreateMountTarget -> TestTree
 testCreateMountTarget = req
     "CreateMountTarget"
-    "fixture/CreateMountTarget"
+    "fixture/CreateMountTarget.yaml"
 
 -- Responses
 
 testDescribeTagsResponse :: DescribeTagsResponse -> TestTree
 testDescribeTagsResponse = res
     "DescribeTagsResponse"
-    "fixture/DescribeTagsResponse"
+    "fixture/DescribeTagsResponse.proto"
     eFS
     (Proxy :: Proxy DescribeTags)
 
 testDescribeMountTargetsResponse :: DescribeMountTargetsResponse -> TestTree
 testDescribeMountTargetsResponse = res
     "DescribeMountTargetsResponse"
-    "fixture/DescribeMountTargetsResponse"
+    "fixture/DescribeMountTargetsResponse.proto"
     eFS
     (Proxy :: Proxy DescribeMountTargets)
 
 testDeleteMountTargetResponse :: DeleteMountTargetResponse -> TestTree
 testDeleteMountTargetResponse = res
     "DeleteMountTargetResponse"
-    "fixture/DeleteMountTargetResponse"
+    "fixture/DeleteMountTargetResponse.proto"
     eFS
     (Proxy :: Proxy DeleteMountTarget)
 
 testCreateTagsResponse :: CreateTagsResponse -> TestTree
 testCreateTagsResponse = res
     "CreateTagsResponse"
-    "fixture/CreateTagsResponse"
+    "fixture/CreateTagsResponse.proto"
     eFS
     (Proxy :: Proxy CreateTags)
 
 testDescribeFileSystemsResponse :: DescribeFileSystemsResponse -> TestTree
 testDescribeFileSystemsResponse = res
     "DescribeFileSystemsResponse"
-    "fixture/DescribeFileSystemsResponse"
+    "fixture/DescribeFileSystemsResponse.proto"
     eFS
     (Proxy :: Proxy DescribeFileSystems)
 
 testDeleteTagsResponse :: DeleteTagsResponse -> TestTree
 testDeleteTagsResponse = res
     "DeleteTagsResponse"
-    "fixture/DeleteTagsResponse"
+    "fixture/DeleteTagsResponse.proto"
     eFS
     (Proxy :: Proxy DeleteTags)
 
 testDescribeMountTargetSecurityGroupsResponse :: DescribeMountTargetSecurityGroupsResponse -> TestTree
 testDescribeMountTargetSecurityGroupsResponse = res
     "DescribeMountTargetSecurityGroupsResponse"
-    "fixture/DescribeMountTargetSecurityGroupsResponse"
+    "fixture/DescribeMountTargetSecurityGroupsResponse.proto"
     eFS
     (Proxy :: Proxy DescribeMountTargetSecurityGroups)
 
 testModifyMountTargetSecurityGroupsResponse :: ModifyMountTargetSecurityGroupsResponse -> TestTree
 testModifyMountTargetSecurityGroupsResponse = res
     "ModifyMountTargetSecurityGroupsResponse"
-    "fixture/ModifyMountTargetSecurityGroupsResponse"
+    "fixture/ModifyMountTargetSecurityGroupsResponse.proto"
     eFS
     (Proxy :: Proxy ModifyMountTargetSecurityGroups)
 
 testCreateFileSystemResponse :: FileSystemDescription -> TestTree
 testCreateFileSystemResponse = res
     "CreateFileSystemResponse"
-    "fixture/CreateFileSystemResponse"
+    "fixture/CreateFileSystemResponse.proto"
     eFS
     (Proxy :: Proxy CreateFileSystem)
 
 testDeleteFileSystemResponse :: DeleteFileSystemResponse -> TestTree
 testDeleteFileSystemResponse = res
     "DeleteFileSystemResponse"
-    "fixture/DeleteFileSystemResponse"
+    "fixture/DeleteFileSystemResponse.proto"
     eFS
     (Proxy :: Proxy DeleteFileSystem)
 
 testCreateMountTargetResponse :: MountTargetDescription -> TestTree
 testCreateMountTargetResponse = res
     "CreateMountTargetResponse"
-    "fixture/CreateMountTargetResponse"
+    "fixture/CreateMountTargetResponse.proto"
     eFS
     (Proxy :: Proxy CreateMountTarget)
