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-ds.cabal b/amazonka-ds.cabal
--- a/amazonka-ds.cabal
+++ b/amazonka-ds.cabal
@@ -1,7 +1,8 @@
 name:                  amazonka-ds
-version:               1.2.0.1
+version:               1.2.0.2
 synopsis:              Amazon Directory Service 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 Directory Service
 
@@ -81,8 +81,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.DirectoryService
         , Test.AWS.Gen.DirectoryService
diff --git a/fixture/ConnectDirectory.yaml b/fixture/ConnectDirectory.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/ConnectDirectory.yaml
diff --git a/fixture/ConnectDirectoryResponse.proto b/fixture/ConnectDirectoryResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/ConnectDirectoryResponse.proto
diff --git a/fixture/CreateAlias.yaml b/fixture/CreateAlias.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/CreateAlias.yaml
diff --git a/fixture/CreateAliasResponse.proto b/fixture/CreateAliasResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/CreateAliasResponse.proto
diff --git a/fixture/CreateComputer.yaml b/fixture/CreateComputer.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/CreateComputer.yaml
diff --git a/fixture/CreateComputerResponse.proto b/fixture/CreateComputerResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/CreateComputerResponse.proto
diff --git a/fixture/CreateDirectory.yaml b/fixture/CreateDirectory.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/CreateDirectory.yaml
diff --git a/fixture/CreateDirectoryResponse.proto b/fixture/CreateDirectoryResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/CreateDirectoryResponse.proto
diff --git a/fixture/CreateSnapshot.yaml b/fixture/CreateSnapshot.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/CreateSnapshot.yaml
diff --git a/fixture/CreateSnapshotResponse.proto b/fixture/CreateSnapshotResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/CreateSnapshotResponse.proto
diff --git a/fixture/DeleteDirectory.yaml b/fixture/DeleteDirectory.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/DeleteDirectory.yaml
diff --git a/fixture/DeleteDirectoryResponse.proto b/fixture/DeleteDirectoryResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/DeleteDirectoryResponse.proto
diff --git a/fixture/DeleteSnapshot.yaml b/fixture/DeleteSnapshot.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/DeleteSnapshot.yaml
diff --git a/fixture/DeleteSnapshotResponse.proto b/fixture/DeleteSnapshotResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/DeleteSnapshotResponse.proto
diff --git a/fixture/DescribeDirectories.yaml b/fixture/DescribeDirectories.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeDirectories.yaml
diff --git a/fixture/DescribeDirectoriesResponse.proto b/fixture/DescribeDirectoriesResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeDirectoriesResponse.proto
diff --git a/fixture/DescribeSnapshots.yaml b/fixture/DescribeSnapshots.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeSnapshots.yaml
diff --git a/fixture/DescribeSnapshotsResponse.proto b/fixture/DescribeSnapshotsResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeSnapshotsResponse.proto
diff --git a/fixture/DisableRadius.yaml b/fixture/DisableRadius.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/DisableRadius.yaml
diff --git a/fixture/DisableRadiusResponse.proto b/fixture/DisableRadiusResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/DisableRadiusResponse.proto
diff --git a/fixture/DisableSSO.yaml b/fixture/DisableSSO.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/DisableSSO.yaml
diff --git a/fixture/DisableSSOResponse.proto b/fixture/DisableSSOResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/DisableSSOResponse.proto
diff --git a/fixture/EnableRadius.yaml b/fixture/EnableRadius.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/EnableRadius.yaml
diff --git a/fixture/EnableRadiusResponse.proto b/fixture/EnableRadiusResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/EnableRadiusResponse.proto
diff --git a/fixture/EnableSSO.yaml b/fixture/EnableSSO.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/EnableSSO.yaml
diff --git a/fixture/EnableSSOResponse.proto b/fixture/EnableSSOResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/EnableSSOResponse.proto
diff --git a/fixture/GetDirectoryLimits.yaml b/fixture/GetDirectoryLimits.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/GetDirectoryLimits.yaml
diff --git a/fixture/GetDirectoryLimitsResponse.proto b/fixture/GetDirectoryLimitsResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/GetDirectoryLimitsResponse.proto
diff --git a/fixture/GetSnapshotLimits.yaml b/fixture/GetSnapshotLimits.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/GetSnapshotLimits.yaml
diff --git a/fixture/GetSnapshotLimitsResponse.proto b/fixture/GetSnapshotLimitsResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/GetSnapshotLimitsResponse.proto
diff --git a/fixture/RestoreFromSnapshot.yaml b/fixture/RestoreFromSnapshot.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/RestoreFromSnapshot.yaml
diff --git a/fixture/RestoreFromSnapshotResponse.proto b/fixture/RestoreFromSnapshotResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/RestoreFromSnapshotResponse.proto
diff --git a/fixture/UpdateRadius.yaml b/fixture/UpdateRadius.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/UpdateRadius.yaml
diff --git a/fixture/UpdateRadiusResponse.proto b/fixture/UpdateRadiusResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/UpdateRadiusResponse.proto
diff --git a/test/Test/AWS/Gen/DirectoryService.hs b/test/Test/AWS/Gen/DirectoryService.hs
--- a/test/Test/AWS/Gen/DirectoryService.hs
+++ b/test/Test/AWS/Gen/DirectoryService.hs
@@ -141,205 +141,205 @@
 testGetSnapshotLimits :: GetSnapshotLimits -> TestTree
 testGetSnapshotLimits = req
     "GetSnapshotLimits"
-    "fixture/GetSnapshotLimits"
+    "fixture/GetSnapshotLimits.yaml"
 
 testConnectDirectory :: ConnectDirectory -> TestTree
 testConnectDirectory = req
     "ConnectDirectory"
-    "fixture/ConnectDirectory"
+    "fixture/ConnectDirectory.yaml"
 
 testDescribeDirectories :: DescribeDirectories -> TestTree
 testDescribeDirectories = req
     "DescribeDirectories"
-    "fixture/DescribeDirectories"
+    "fixture/DescribeDirectories.yaml"
 
 testCreateAlias :: CreateAlias -> TestTree
 testCreateAlias = req
     "CreateAlias"
-    "fixture/CreateAlias"
+    "fixture/CreateAlias.yaml"
 
 testCreateDirectory :: CreateDirectory -> TestTree
 testCreateDirectory = req
     "CreateDirectory"
-    "fixture/CreateDirectory"
+    "fixture/CreateDirectory.yaml"
 
 testEnableSSO :: EnableSSO -> TestTree
 testEnableSSO = req
     "EnableSSO"
-    "fixture/EnableSSO"
+    "fixture/EnableSSO.yaml"
 
 testEnableRadius :: EnableRadius -> TestTree
 testEnableRadius = req
     "EnableRadius"
-    "fixture/EnableRadius"
+    "fixture/EnableRadius.yaml"
 
 testDisableRadius :: DisableRadius -> TestTree
 testDisableRadius = req
     "DisableRadius"
-    "fixture/DisableRadius"
+    "fixture/DisableRadius.yaml"
 
 testDescribeSnapshots :: DescribeSnapshots -> TestTree
 testDescribeSnapshots = req
     "DescribeSnapshots"
-    "fixture/DescribeSnapshots"
+    "fixture/DescribeSnapshots.yaml"
 
 testRestoreFromSnapshot :: RestoreFromSnapshot -> TestTree
 testRestoreFromSnapshot = req
     "RestoreFromSnapshot"
-    "fixture/RestoreFromSnapshot"
+    "fixture/RestoreFromSnapshot.yaml"
 
 testDeleteSnapshot :: DeleteSnapshot -> TestTree
 testDeleteSnapshot = req
     "DeleteSnapshot"
-    "fixture/DeleteSnapshot"
+    "fixture/DeleteSnapshot.yaml"
 
 testCreateSnapshot :: CreateSnapshot -> TestTree
 testCreateSnapshot = req
     "CreateSnapshot"
-    "fixture/CreateSnapshot"
+    "fixture/CreateSnapshot.yaml"
 
 testDeleteDirectory :: DeleteDirectory -> TestTree
 testDeleteDirectory = req
     "DeleteDirectory"
-    "fixture/DeleteDirectory"
+    "fixture/DeleteDirectory.yaml"
 
 testDisableSSO :: DisableSSO -> TestTree
 testDisableSSO = req
     "DisableSSO"
-    "fixture/DisableSSO"
+    "fixture/DisableSSO.yaml"
 
 testCreateComputer :: CreateComputer -> TestTree
 testCreateComputer = req
     "CreateComputer"
-    "fixture/CreateComputer"
+    "fixture/CreateComputer.yaml"
 
 testGetDirectoryLimits :: GetDirectoryLimits -> TestTree
 testGetDirectoryLimits = req
     "GetDirectoryLimits"
-    "fixture/GetDirectoryLimits"
+    "fixture/GetDirectoryLimits.yaml"
 
 testUpdateRadius :: UpdateRadius -> TestTree
 testUpdateRadius = req
     "UpdateRadius"
-    "fixture/UpdateRadius"
+    "fixture/UpdateRadius.yaml"
 
 -- Responses
 
 testGetSnapshotLimitsResponse :: GetSnapshotLimitsResponse -> TestTree
 testGetSnapshotLimitsResponse = res
     "GetSnapshotLimitsResponse"
-    "fixture/GetSnapshotLimitsResponse"
+    "fixture/GetSnapshotLimitsResponse.proto"
     directoryService
     (Proxy :: Proxy GetSnapshotLimits)
 
 testConnectDirectoryResponse :: ConnectDirectoryResponse -> TestTree
 testConnectDirectoryResponse = res
     "ConnectDirectoryResponse"
-    "fixture/ConnectDirectoryResponse"
+    "fixture/ConnectDirectoryResponse.proto"
     directoryService
     (Proxy :: Proxy ConnectDirectory)
 
 testDescribeDirectoriesResponse :: DescribeDirectoriesResponse -> TestTree
 testDescribeDirectoriesResponse = res
     "DescribeDirectoriesResponse"
-    "fixture/DescribeDirectoriesResponse"
+    "fixture/DescribeDirectoriesResponse.proto"
     directoryService
     (Proxy :: Proxy DescribeDirectories)
 
 testCreateAliasResponse :: CreateAliasResponse -> TestTree
 testCreateAliasResponse = res
     "CreateAliasResponse"
-    "fixture/CreateAliasResponse"
+    "fixture/CreateAliasResponse.proto"
     directoryService
     (Proxy :: Proxy CreateAlias)
 
 testCreateDirectoryResponse :: CreateDirectoryResponse -> TestTree
 testCreateDirectoryResponse = res
     "CreateDirectoryResponse"
-    "fixture/CreateDirectoryResponse"
+    "fixture/CreateDirectoryResponse.proto"
     directoryService
     (Proxy :: Proxy CreateDirectory)
 
 testEnableSSOResponse :: EnableSSOResponse -> TestTree
 testEnableSSOResponse = res
     "EnableSSOResponse"
-    "fixture/EnableSSOResponse"
+    "fixture/EnableSSOResponse.proto"
     directoryService
     (Proxy :: Proxy EnableSSO)
 
 testEnableRadiusResponse :: EnableRadiusResponse -> TestTree
 testEnableRadiusResponse = res
     "EnableRadiusResponse"
-    "fixture/EnableRadiusResponse"
+    "fixture/EnableRadiusResponse.proto"
     directoryService
     (Proxy :: Proxy EnableRadius)
 
 testDisableRadiusResponse :: DisableRadiusResponse -> TestTree
 testDisableRadiusResponse = res
     "DisableRadiusResponse"
-    "fixture/DisableRadiusResponse"
+    "fixture/DisableRadiusResponse.proto"
     directoryService
     (Proxy :: Proxy DisableRadius)
 
 testDescribeSnapshotsResponse :: DescribeSnapshotsResponse -> TestTree
 testDescribeSnapshotsResponse = res
     "DescribeSnapshotsResponse"
-    "fixture/DescribeSnapshotsResponse"
+    "fixture/DescribeSnapshotsResponse.proto"
     directoryService
     (Proxy :: Proxy DescribeSnapshots)
 
 testRestoreFromSnapshotResponse :: RestoreFromSnapshotResponse -> TestTree
 testRestoreFromSnapshotResponse = res
     "RestoreFromSnapshotResponse"
-    "fixture/RestoreFromSnapshotResponse"
+    "fixture/RestoreFromSnapshotResponse.proto"
     directoryService
     (Proxy :: Proxy RestoreFromSnapshot)
 
 testDeleteSnapshotResponse :: DeleteSnapshotResponse -> TestTree
 testDeleteSnapshotResponse = res
     "DeleteSnapshotResponse"
-    "fixture/DeleteSnapshotResponse"
+    "fixture/DeleteSnapshotResponse.proto"
     directoryService
     (Proxy :: Proxy DeleteSnapshot)
 
 testCreateSnapshotResponse :: CreateSnapshotResponse -> TestTree
 testCreateSnapshotResponse = res
     "CreateSnapshotResponse"
-    "fixture/CreateSnapshotResponse"
+    "fixture/CreateSnapshotResponse.proto"
     directoryService
     (Proxy :: Proxy CreateSnapshot)
 
 testDeleteDirectoryResponse :: DeleteDirectoryResponse -> TestTree
 testDeleteDirectoryResponse = res
     "DeleteDirectoryResponse"
-    "fixture/DeleteDirectoryResponse"
+    "fixture/DeleteDirectoryResponse.proto"
     directoryService
     (Proxy :: Proxy DeleteDirectory)
 
 testDisableSSOResponse :: DisableSSOResponse -> TestTree
 testDisableSSOResponse = res
     "DisableSSOResponse"
-    "fixture/DisableSSOResponse"
+    "fixture/DisableSSOResponse.proto"
     directoryService
     (Proxy :: Proxy DisableSSO)
 
 testCreateComputerResponse :: CreateComputerResponse -> TestTree
 testCreateComputerResponse = res
     "CreateComputerResponse"
-    "fixture/CreateComputerResponse"
+    "fixture/CreateComputerResponse.proto"
     directoryService
     (Proxy :: Proxy CreateComputer)
 
 testGetDirectoryLimitsResponse :: GetDirectoryLimitsResponse -> TestTree
 testGetDirectoryLimitsResponse = res
     "GetDirectoryLimitsResponse"
-    "fixture/GetDirectoryLimitsResponse"
+    "fixture/GetDirectoryLimitsResponse.proto"
     directoryService
     (Proxy :: Proxy GetDirectoryLimits)
 
 testUpdateRadiusResponse :: UpdateRadiusResponse -> TestTree
 testUpdateRadiusResponse = res
     "UpdateRadiusResponse"
-    "fixture/UpdateRadiusResponse"
+    "fixture/UpdateRadiusResponse.proto"
     directoryService
     (Proxy :: Proxy UpdateRadius)
