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-directconnect.cabal b/amazonka-directconnect.cabal
--- a/amazonka-directconnect.cabal
+++ b/amazonka-directconnect.cabal
@@ -1,7 +1,8 @@
 name:                  amazonka-directconnect
-version:               1.2.0.1
+version:               1.2.0.2
 synopsis:              Amazon Direct Connect 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 Direct Connect makes it easy to establish a dedicated network
     connection from your premises to Amazon Web Services (AWS). Using AWS
@@ -99,8 +99,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.DirectConnect
         , Test.AWS.Gen.DirectConnect
diff --git a/fixture/AllocateConnectionOnInterconnect.yaml b/fixture/AllocateConnectionOnInterconnect.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/AllocateConnectionOnInterconnect.yaml
diff --git a/fixture/AllocateConnectionOnInterconnectResponse.proto b/fixture/AllocateConnectionOnInterconnectResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/AllocateConnectionOnInterconnectResponse.proto
diff --git a/fixture/AllocatePrivateVirtualInterface.yaml b/fixture/AllocatePrivateVirtualInterface.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/AllocatePrivateVirtualInterface.yaml
diff --git a/fixture/AllocatePrivateVirtualInterfaceResponse.proto b/fixture/AllocatePrivateVirtualInterfaceResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/AllocatePrivateVirtualInterfaceResponse.proto
diff --git a/fixture/AllocatePublicVirtualInterface.yaml b/fixture/AllocatePublicVirtualInterface.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/AllocatePublicVirtualInterface.yaml
diff --git a/fixture/AllocatePublicVirtualInterfaceResponse.proto b/fixture/AllocatePublicVirtualInterfaceResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/AllocatePublicVirtualInterfaceResponse.proto
diff --git a/fixture/ConfirmConnection.yaml b/fixture/ConfirmConnection.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/ConfirmConnection.yaml
diff --git a/fixture/ConfirmConnectionResponse.proto b/fixture/ConfirmConnectionResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/ConfirmConnectionResponse.proto
diff --git a/fixture/ConfirmPrivateVirtualInterface.yaml b/fixture/ConfirmPrivateVirtualInterface.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/ConfirmPrivateVirtualInterface.yaml
diff --git a/fixture/ConfirmPrivateVirtualInterfaceResponse.proto b/fixture/ConfirmPrivateVirtualInterfaceResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/ConfirmPrivateVirtualInterfaceResponse.proto
diff --git a/fixture/ConfirmPublicVirtualInterface.yaml b/fixture/ConfirmPublicVirtualInterface.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/ConfirmPublicVirtualInterface.yaml
diff --git a/fixture/ConfirmPublicVirtualInterfaceResponse.proto b/fixture/ConfirmPublicVirtualInterfaceResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/ConfirmPublicVirtualInterfaceResponse.proto
diff --git a/fixture/CreateConnection.yaml b/fixture/CreateConnection.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/CreateConnection.yaml
diff --git a/fixture/CreateConnectionResponse.proto b/fixture/CreateConnectionResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/CreateConnectionResponse.proto
diff --git a/fixture/CreateInterconnect.yaml b/fixture/CreateInterconnect.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/CreateInterconnect.yaml
diff --git a/fixture/CreateInterconnectResponse.proto b/fixture/CreateInterconnectResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/CreateInterconnectResponse.proto
diff --git a/fixture/CreatePrivateVirtualInterface.yaml b/fixture/CreatePrivateVirtualInterface.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/CreatePrivateVirtualInterface.yaml
diff --git a/fixture/CreatePrivateVirtualInterfaceResponse.proto b/fixture/CreatePrivateVirtualInterfaceResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/CreatePrivateVirtualInterfaceResponse.proto
diff --git a/fixture/CreatePublicVirtualInterface.yaml b/fixture/CreatePublicVirtualInterface.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/CreatePublicVirtualInterface.yaml
diff --git a/fixture/CreatePublicVirtualInterfaceResponse.proto b/fixture/CreatePublicVirtualInterfaceResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/CreatePublicVirtualInterfaceResponse.proto
diff --git a/fixture/DeleteConnection.yaml b/fixture/DeleteConnection.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/DeleteConnection.yaml
diff --git a/fixture/DeleteConnectionResponse.proto b/fixture/DeleteConnectionResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/DeleteConnectionResponse.proto
diff --git a/fixture/DeleteInterconnect.yaml b/fixture/DeleteInterconnect.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/DeleteInterconnect.yaml
diff --git a/fixture/DeleteInterconnectResponse.proto b/fixture/DeleteInterconnectResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/DeleteInterconnectResponse.proto
diff --git a/fixture/DeleteVirtualInterface.yaml b/fixture/DeleteVirtualInterface.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/DeleteVirtualInterface.yaml
diff --git a/fixture/DeleteVirtualInterfaceResponse.proto b/fixture/DeleteVirtualInterfaceResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/DeleteVirtualInterfaceResponse.proto
diff --git a/fixture/DescribeConnections.yaml b/fixture/DescribeConnections.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeConnections.yaml
diff --git a/fixture/DescribeConnectionsOnInterconnect.yaml b/fixture/DescribeConnectionsOnInterconnect.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeConnectionsOnInterconnect.yaml
diff --git a/fixture/DescribeConnectionsOnInterconnectResponse.proto b/fixture/DescribeConnectionsOnInterconnectResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeConnectionsOnInterconnectResponse.proto
diff --git a/fixture/DescribeConnectionsResponse.proto b/fixture/DescribeConnectionsResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeConnectionsResponse.proto
diff --git a/fixture/DescribeInterconnects.yaml b/fixture/DescribeInterconnects.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeInterconnects.yaml
diff --git a/fixture/DescribeInterconnectsResponse.proto b/fixture/DescribeInterconnectsResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeInterconnectsResponse.proto
diff --git a/fixture/DescribeLocations.yaml b/fixture/DescribeLocations.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeLocations.yaml
diff --git a/fixture/DescribeLocationsResponse.proto b/fixture/DescribeLocationsResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeLocationsResponse.proto
diff --git a/fixture/DescribeVirtualGateways.yaml b/fixture/DescribeVirtualGateways.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeVirtualGateways.yaml
diff --git a/fixture/DescribeVirtualGatewaysResponse.proto b/fixture/DescribeVirtualGatewaysResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeVirtualGatewaysResponse.proto
diff --git a/fixture/DescribeVirtualInterfaces.yaml b/fixture/DescribeVirtualInterfaces.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeVirtualInterfaces.yaml
diff --git a/fixture/DescribeVirtualInterfacesResponse.proto b/fixture/DescribeVirtualInterfacesResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeVirtualInterfacesResponse.proto
diff --git a/test/Test/AWS/Gen/DirectConnect.hs b/test/Test/AWS/Gen/DirectConnect.hs
--- a/test/Test/AWS/Gen/DirectConnect.hs
+++ b/test/Test/AWS/Gen/DirectConnect.hs
@@ -153,229 +153,229 @@
 testDescribeInterconnects :: DescribeInterconnects -> TestTree
 testDescribeInterconnects = req
     "DescribeInterconnects"
-    "fixture/DescribeInterconnects"
+    "fixture/DescribeInterconnects.yaml"
 
 testDeleteConnection :: DeleteConnection -> TestTree
 testDeleteConnection = req
     "DeleteConnection"
-    "fixture/DeleteConnection"
+    "fixture/DeleteConnection.yaml"
 
 testCreateConnection :: CreateConnection -> TestTree
 testCreateConnection = req
     "CreateConnection"
-    "fixture/CreateConnection"
+    "fixture/CreateConnection.yaml"
 
 testDescribeConnections :: DescribeConnections -> TestTree
 testDescribeConnections = req
     "DescribeConnections"
-    "fixture/DescribeConnections"
+    "fixture/DescribeConnections.yaml"
 
 testDeleteInterconnect :: DeleteInterconnect -> TestTree
 testDeleteInterconnect = req
     "DeleteInterconnect"
-    "fixture/DeleteInterconnect"
+    "fixture/DeleteInterconnect.yaml"
 
 testConfirmPrivateVirtualInterface :: ConfirmPrivateVirtualInterface -> TestTree
 testConfirmPrivateVirtualInterface = req
     "ConfirmPrivateVirtualInterface"
-    "fixture/ConfirmPrivateVirtualInterface"
+    "fixture/ConfirmPrivateVirtualInterface.yaml"
 
 testDescribeConnectionsOnInterconnect :: DescribeConnectionsOnInterconnect -> TestTree
 testDescribeConnectionsOnInterconnect = req
     "DescribeConnectionsOnInterconnect"
-    "fixture/DescribeConnectionsOnInterconnect"
+    "fixture/DescribeConnectionsOnInterconnect.yaml"
 
 testDescribeLocations :: DescribeLocations -> TestTree
 testDescribeLocations = req
     "DescribeLocations"
-    "fixture/DescribeLocations"
+    "fixture/DescribeLocations.yaml"
 
 testCreatePublicVirtualInterface :: CreatePublicVirtualInterface -> TestTree
 testCreatePublicVirtualInterface = req
     "CreatePublicVirtualInterface"
-    "fixture/CreatePublicVirtualInterface"
+    "fixture/CreatePublicVirtualInterface.yaml"
 
 testAllocatePrivateVirtualInterface :: AllocatePrivateVirtualInterface -> TestTree
 testAllocatePrivateVirtualInterface = req
     "AllocatePrivateVirtualInterface"
-    "fixture/AllocatePrivateVirtualInterface"
+    "fixture/AllocatePrivateVirtualInterface.yaml"
 
 testConfirmConnection :: ConfirmConnection -> TestTree
 testConfirmConnection = req
     "ConfirmConnection"
-    "fixture/ConfirmConnection"
+    "fixture/ConfirmConnection.yaml"
 
 testDescribeVirtualGateways :: DescribeVirtualGateways -> TestTree
 testDescribeVirtualGateways = req
     "DescribeVirtualGateways"
-    "fixture/DescribeVirtualGateways"
+    "fixture/DescribeVirtualGateways.yaml"
 
 testConfirmPublicVirtualInterface :: ConfirmPublicVirtualInterface -> TestTree
 testConfirmPublicVirtualInterface = req
     "ConfirmPublicVirtualInterface"
-    "fixture/ConfirmPublicVirtualInterface"
+    "fixture/ConfirmPublicVirtualInterface.yaml"
 
 testDescribeVirtualInterfaces :: DescribeVirtualInterfaces -> TestTree
 testDescribeVirtualInterfaces = req
     "DescribeVirtualInterfaces"
-    "fixture/DescribeVirtualInterfaces"
+    "fixture/DescribeVirtualInterfaces.yaml"
 
 testCreatePrivateVirtualInterface :: CreatePrivateVirtualInterface -> TestTree
 testCreatePrivateVirtualInterface = req
     "CreatePrivateVirtualInterface"
-    "fixture/CreatePrivateVirtualInterface"
+    "fixture/CreatePrivateVirtualInterface.yaml"
 
 testDeleteVirtualInterface :: DeleteVirtualInterface -> TestTree
 testDeleteVirtualInterface = req
     "DeleteVirtualInterface"
-    "fixture/DeleteVirtualInterface"
+    "fixture/DeleteVirtualInterface.yaml"
 
 testAllocatePublicVirtualInterface :: AllocatePublicVirtualInterface -> TestTree
 testAllocatePublicVirtualInterface = req
     "AllocatePublicVirtualInterface"
-    "fixture/AllocatePublicVirtualInterface"
+    "fixture/AllocatePublicVirtualInterface.yaml"
 
 testAllocateConnectionOnInterconnect :: AllocateConnectionOnInterconnect -> TestTree
 testAllocateConnectionOnInterconnect = req
     "AllocateConnectionOnInterconnect"
-    "fixture/AllocateConnectionOnInterconnect"
+    "fixture/AllocateConnectionOnInterconnect.yaml"
 
 testCreateInterconnect :: CreateInterconnect -> TestTree
 testCreateInterconnect = req
     "CreateInterconnect"
-    "fixture/CreateInterconnect"
+    "fixture/CreateInterconnect.yaml"
 
 -- Responses
 
 testDescribeInterconnectsResponse :: DescribeInterconnectsResponse -> TestTree
 testDescribeInterconnectsResponse = res
     "DescribeInterconnectsResponse"
-    "fixture/DescribeInterconnectsResponse"
+    "fixture/DescribeInterconnectsResponse.proto"
     directConnect
     (Proxy :: Proxy DescribeInterconnects)
 
 testDeleteConnectionResponse :: Connection -> TestTree
 testDeleteConnectionResponse = res
     "DeleteConnectionResponse"
-    "fixture/DeleteConnectionResponse"
+    "fixture/DeleteConnectionResponse.proto"
     directConnect
     (Proxy :: Proxy DeleteConnection)
 
 testCreateConnectionResponse :: Connection -> TestTree
 testCreateConnectionResponse = res
     "CreateConnectionResponse"
-    "fixture/CreateConnectionResponse"
+    "fixture/CreateConnectionResponse.proto"
     directConnect
     (Proxy :: Proxy CreateConnection)
 
 testDescribeConnectionsResponse :: Connections -> TestTree
 testDescribeConnectionsResponse = res
     "DescribeConnectionsResponse"
-    "fixture/DescribeConnectionsResponse"
+    "fixture/DescribeConnectionsResponse.proto"
     directConnect
     (Proxy :: Proxy DescribeConnections)
 
 testDeleteInterconnectResponse :: DeleteInterconnectResponse -> TestTree
 testDeleteInterconnectResponse = res
     "DeleteInterconnectResponse"
-    "fixture/DeleteInterconnectResponse"
+    "fixture/DeleteInterconnectResponse.proto"
     directConnect
     (Proxy :: Proxy DeleteInterconnect)
 
 testConfirmPrivateVirtualInterfaceResponse :: ConfirmPrivateVirtualInterfaceResponse -> TestTree
 testConfirmPrivateVirtualInterfaceResponse = res
     "ConfirmPrivateVirtualInterfaceResponse"
-    "fixture/ConfirmPrivateVirtualInterfaceResponse"
+    "fixture/ConfirmPrivateVirtualInterfaceResponse.proto"
     directConnect
     (Proxy :: Proxy ConfirmPrivateVirtualInterface)
 
 testDescribeConnectionsOnInterconnectResponse :: Connections -> TestTree
 testDescribeConnectionsOnInterconnectResponse = res
     "DescribeConnectionsOnInterconnectResponse"
-    "fixture/DescribeConnectionsOnInterconnectResponse"
+    "fixture/DescribeConnectionsOnInterconnectResponse.proto"
     directConnect
     (Proxy :: Proxy DescribeConnectionsOnInterconnect)
 
 testDescribeLocationsResponse :: DescribeLocationsResponse -> TestTree
 testDescribeLocationsResponse = res
     "DescribeLocationsResponse"
-    "fixture/DescribeLocationsResponse"
+    "fixture/DescribeLocationsResponse.proto"
     directConnect
     (Proxy :: Proxy DescribeLocations)
 
 testCreatePublicVirtualInterfaceResponse :: VirtualInterface -> TestTree
 testCreatePublicVirtualInterfaceResponse = res
     "CreatePublicVirtualInterfaceResponse"
-    "fixture/CreatePublicVirtualInterfaceResponse"
+    "fixture/CreatePublicVirtualInterfaceResponse.proto"
     directConnect
     (Proxy :: Proxy CreatePublicVirtualInterface)
 
 testAllocatePrivateVirtualInterfaceResponse :: VirtualInterface -> TestTree
 testAllocatePrivateVirtualInterfaceResponse = res
     "AllocatePrivateVirtualInterfaceResponse"
-    "fixture/AllocatePrivateVirtualInterfaceResponse"
+    "fixture/AllocatePrivateVirtualInterfaceResponse.proto"
     directConnect
     (Proxy :: Proxy AllocatePrivateVirtualInterface)
 
 testConfirmConnectionResponse :: ConfirmConnectionResponse -> TestTree
 testConfirmConnectionResponse = res
     "ConfirmConnectionResponse"
-    "fixture/ConfirmConnectionResponse"
+    "fixture/ConfirmConnectionResponse.proto"
     directConnect
     (Proxy :: Proxy ConfirmConnection)
 
 testDescribeVirtualGatewaysResponse :: DescribeVirtualGatewaysResponse -> TestTree
 testDescribeVirtualGatewaysResponse = res
     "DescribeVirtualGatewaysResponse"
-    "fixture/DescribeVirtualGatewaysResponse"
+    "fixture/DescribeVirtualGatewaysResponse.proto"
     directConnect
     (Proxy :: Proxy DescribeVirtualGateways)
 
 testConfirmPublicVirtualInterfaceResponse :: ConfirmPublicVirtualInterfaceResponse -> TestTree
 testConfirmPublicVirtualInterfaceResponse = res
     "ConfirmPublicVirtualInterfaceResponse"
-    "fixture/ConfirmPublicVirtualInterfaceResponse"
+    "fixture/ConfirmPublicVirtualInterfaceResponse.proto"
     directConnect
     (Proxy :: Proxy ConfirmPublicVirtualInterface)
 
 testDescribeVirtualInterfacesResponse :: DescribeVirtualInterfacesResponse -> TestTree
 testDescribeVirtualInterfacesResponse = res
     "DescribeVirtualInterfacesResponse"
-    "fixture/DescribeVirtualInterfacesResponse"
+    "fixture/DescribeVirtualInterfacesResponse.proto"
     directConnect
     (Proxy :: Proxy DescribeVirtualInterfaces)
 
 testCreatePrivateVirtualInterfaceResponse :: VirtualInterface -> TestTree
 testCreatePrivateVirtualInterfaceResponse = res
     "CreatePrivateVirtualInterfaceResponse"
-    "fixture/CreatePrivateVirtualInterfaceResponse"
+    "fixture/CreatePrivateVirtualInterfaceResponse.proto"
     directConnect
     (Proxy :: Proxy CreatePrivateVirtualInterface)
 
 testDeleteVirtualInterfaceResponse :: DeleteVirtualInterfaceResponse -> TestTree
 testDeleteVirtualInterfaceResponse = res
     "DeleteVirtualInterfaceResponse"
-    "fixture/DeleteVirtualInterfaceResponse"
+    "fixture/DeleteVirtualInterfaceResponse.proto"
     directConnect
     (Proxy :: Proxy DeleteVirtualInterface)
 
 testAllocatePublicVirtualInterfaceResponse :: VirtualInterface -> TestTree
 testAllocatePublicVirtualInterfaceResponse = res
     "AllocatePublicVirtualInterfaceResponse"
-    "fixture/AllocatePublicVirtualInterfaceResponse"
+    "fixture/AllocatePublicVirtualInterfaceResponse.proto"
     directConnect
     (Proxy :: Proxy AllocatePublicVirtualInterface)
 
 testAllocateConnectionOnInterconnectResponse :: Connection -> TestTree
 testAllocateConnectionOnInterconnectResponse = res
     "AllocateConnectionOnInterconnectResponse"
-    "fixture/AllocateConnectionOnInterconnectResponse"
+    "fixture/AllocateConnectionOnInterconnectResponse.proto"
     directConnect
     (Proxy :: Proxy AllocateConnectionOnInterconnect)
 
 testCreateInterconnectResponse :: Interconnect -> TestTree
 testCreateInterconnectResponse = res
     "CreateInterconnectResponse"
-    "fixture/CreateInterconnectResponse"
+    "fixture/CreateInterconnectResponse.proto"
     directConnect
     (Proxy :: Proxy CreateInterconnect)
