diff --git a/README.md b/README.md
--- a/README.md
+++ b/README.md
@@ -8,7 +8,7 @@
 
 ## Version
 
-`1.5.0`
+`1.6.0`
 
 
 ## Description
diff --git a/amazonka-athena.cabal b/amazonka-athena.cabal
--- a/amazonka-athena.cabal
+++ b/amazonka-athena.cabal
@@ -1,5 +1,5 @@
 name:                  amazonka-athena
-version:               1.5.0
+version:               1.6.0
 synopsis:              Amazon Athena SDK.
 homepage:              https://github.com/brendanhay/amazonka
 bug-reports:           https://github.com/brendanhay/amazonka/issues
@@ -7,7 +7,7 @@
 license-file:          LICENSE
 author:                Brendan Hay
 maintainer:            Brendan Hay <brendan.g.hay+amazonka@gmail.com>
-copyright:             Copyright (c) 2013-2017 Brendan Hay
+copyright:             Copyright (c) 2013-2018 Brendan Hay
 category:              Network, AWS, Cloud, Distributed Computing
 build-type:            Simple
 cabal-version:         >= 1.10
@@ -64,7 +64,7 @@
         , Network.AWS.Athena.Types.Sum
 
     build-depends:
-          amazonka-core == 1.5.0.*
+          amazonka-core == 1.6.0.*
         , base          >= 4.7     && < 5
 
 test-suite amazonka-athena-test
@@ -84,8 +84,8 @@
         , Test.AWS.Athena.Internal
 
     build-depends:
-          amazonka-core == 1.5.0.*
-        , amazonka-test == 1.5.0.*
+          amazonka-core == 1.6.0.*
+        , amazonka-test == 1.6.0.*
         , amazonka-athena
         , base
         , bytestring
diff --git a/gen/Network/AWS/Athena.hs b/gen/Network/AWS/Athena.hs
--- a/gen/Network/AWS/Athena.hs
+++ b/gen/Network/AWS/Athena.hs
@@ -5,7 +5,7 @@
 
 -- |
 -- Module      : Network.AWS.Athena
--- Copyright   : (c) 2013-2017 Brendan Hay
+-- Copyright   : (c) 2013-2018 Brendan Hay
 -- License     : Mozilla Public License, v. 2.0.
 -- Maintainer  : Brendan Hay <brendan.g.hay+amazonka@gmail.com>
 -- Stability   : auto-generated
diff --git a/gen/Network/AWS/Athena/BatchGetNamedQuery.hs b/gen/Network/AWS/Athena/BatchGetNamedQuery.hs
--- a/gen/Network/AWS/Athena/BatchGetNamedQuery.hs
+++ b/gen/Network/AWS/Athena/BatchGetNamedQuery.hs
@@ -12,7 +12,7 @@
 
 -- |
 -- Module      : Network.AWS.Athena.BatchGetNamedQuery
--- Copyright   : (c) 2013-2017 Brendan Hay
+-- Copyright   : (c) 2013-2018 Brendan Hay
 -- License     : Mozilla Public License, v. 2.0.
 -- Maintainer  : Brendan Hay <brendan.g.hay+amazonka@gmail.com>
 -- Stability   : auto-generated
@@ -65,7 +65,7 @@
 
 -- | An array of query IDs.
 bgnqNamedQueryIds :: Lens' BatchGetNamedQuery (NonEmpty Text)
-bgnqNamedQueryIds = lens _bgnqNamedQueryIds (\ s a -> s{_bgnqNamedQueryIds = a}) . _List1;
+bgnqNamedQueryIds = lens _bgnqNamedQueryIds (\ s a -> s{_bgnqNamedQueryIds = a}) . _List1
 
 instance AWSRequest BatchGetNamedQuery where
         type Rs BatchGetNamedQuery =
@@ -126,22 +126,22 @@
     -> BatchGetNamedQueryResponse
 batchGetNamedQueryResponse pResponseStatus_ =
   BatchGetNamedQueryResponse'
-  { _bgnqrsNamedQueries = Nothing
-  , _bgnqrsUnprocessedNamedQueryIds = Nothing
-  , _bgnqrsResponseStatus = pResponseStatus_
-  }
+    { _bgnqrsNamedQueries = Nothing
+    , _bgnqrsUnprocessedNamedQueryIds = Nothing
+    , _bgnqrsResponseStatus = pResponseStatus_
+    }
 
 
 -- | Information about the named query IDs submitted.
 bgnqrsNamedQueries :: Lens' BatchGetNamedQueryResponse [NamedQuery]
-bgnqrsNamedQueries = lens _bgnqrsNamedQueries (\ s a -> s{_bgnqrsNamedQueries = a}) . _Default . _Coerce;
+bgnqrsNamedQueries = lens _bgnqrsNamedQueries (\ s a -> s{_bgnqrsNamedQueries = a}) . _Default . _Coerce
 
 -- | Information about provided query IDs.
 bgnqrsUnprocessedNamedQueryIds :: Lens' BatchGetNamedQueryResponse [UnprocessedNamedQueryId]
-bgnqrsUnprocessedNamedQueryIds = lens _bgnqrsUnprocessedNamedQueryIds (\ s a -> s{_bgnqrsUnprocessedNamedQueryIds = a}) . _Default . _Coerce;
+bgnqrsUnprocessedNamedQueryIds = lens _bgnqrsUnprocessedNamedQueryIds (\ s a -> s{_bgnqrsUnprocessedNamedQueryIds = a}) . _Default . _Coerce
 
 -- | -- | The response status code.
 bgnqrsResponseStatus :: Lens' BatchGetNamedQueryResponse Int
-bgnqrsResponseStatus = lens _bgnqrsResponseStatus (\ s a -> s{_bgnqrsResponseStatus = a});
+bgnqrsResponseStatus = lens _bgnqrsResponseStatus (\ s a -> s{_bgnqrsResponseStatus = a})
 
 instance NFData BatchGetNamedQueryResponse where
diff --git a/gen/Network/AWS/Athena/BatchGetQueryExecution.hs b/gen/Network/AWS/Athena/BatchGetQueryExecution.hs
--- a/gen/Network/AWS/Athena/BatchGetQueryExecution.hs
+++ b/gen/Network/AWS/Athena/BatchGetQueryExecution.hs
@@ -12,7 +12,7 @@
 
 -- |
 -- Module      : Network.AWS.Athena.BatchGetQueryExecution
--- Copyright   : (c) 2013-2017 Brendan Hay
+-- Copyright   : (c) 2013-2018 Brendan Hay
 -- License     : Mozilla Public License, v. 2.0.
 -- Maintainer  : Brendan Hay <brendan.g.hay+amazonka@gmail.com>
 -- Stability   : auto-generated
@@ -61,12 +61,12 @@
     -> BatchGetQueryExecution
 batchGetQueryExecution pQueryExecutionIds_ =
   BatchGetQueryExecution'
-  {_bgqeQueryExecutionIds = _List1 # pQueryExecutionIds_}
+    {_bgqeQueryExecutionIds = _List1 # pQueryExecutionIds_}
 
 
 -- | An array of query execution IDs.
 bgqeQueryExecutionIds :: Lens' BatchGetQueryExecution (NonEmpty Text)
-bgqeQueryExecutionIds = lens _bgqeQueryExecutionIds (\ s a -> s{_bgqeQueryExecutionIds = a}) . _List1;
+bgqeQueryExecutionIds = lens _bgqeQueryExecutionIds (\ s a -> s{_bgqeQueryExecutionIds = a}) . _List1
 
 instance AWSRequest BatchGetQueryExecution where
         type Rs BatchGetQueryExecution =
@@ -129,22 +129,22 @@
     -> BatchGetQueryExecutionResponse
 batchGetQueryExecutionResponse pResponseStatus_ =
   BatchGetQueryExecutionResponse'
-  { _bgqersUnprocessedQueryExecutionIds = Nothing
-  , _bgqersQueryExecutions = Nothing
-  , _bgqersResponseStatus = pResponseStatus_
-  }
+    { _bgqersUnprocessedQueryExecutionIds = Nothing
+    , _bgqersQueryExecutions = Nothing
+    , _bgqersResponseStatus = pResponseStatus_
+    }
 
 
 -- | Information about the query executions that failed to run.
 bgqersUnprocessedQueryExecutionIds :: Lens' BatchGetQueryExecutionResponse [UnprocessedQueryExecutionId]
-bgqersUnprocessedQueryExecutionIds = lens _bgqersUnprocessedQueryExecutionIds (\ s a -> s{_bgqersUnprocessedQueryExecutionIds = a}) . _Default . _Coerce;
+bgqersUnprocessedQueryExecutionIds = lens _bgqersUnprocessedQueryExecutionIds (\ s a -> s{_bgqersUnprocessedQueryExecutionIds = a}) . _Default . _Coerce
 
 -- | Information about a query execution.
 bgqersQueryExecutions :: Lens' BatchGetQueryExecutionResponse [QueryExecution]
-bgqersQueryExecutions = lens _bgqersQueryExecutions (\ s a -> s{_bgqersQueryExecutions = a}) . _Default . _Coerce;
+bgqersQueryExecutions = lens _bgqersQueryExecutions (\ s a -> s{_bgqersQueryExecutions = a}) . _Default . _Coerce
 
 -- | -- | The response status code.
 bgqersResponseStatus :: Lens' BatchGetQueryExecutionResponse Int
-bgqersResponseStatus = lens _bgqersResponseStatus (\ s a -> s{_bgqersResponseStatus = a});
+bgqersResponseStatus = lens _bgqersResponseStatus (\ s a -> s{_bgqersResponseStatus = a})
 
 instance NFData BatchGetQueryExecutionResponse where
diff --git a/gen/Network/AWS/Athena/CreateNamedQuery.hs b/gen/Network/AWS/Athena/CreateNamedQuery.hs
--- a/gen/Network/AWS/Athena/CreateNamedQuery.hs
+++ b/gen/Network/AWS/Athena/CreateNamedQuery.hs
@@ -12,7 +12,7 @@
 
 -- |
 -- Module      : Network.AWS.Athena.CreateNamedQuery
--- Copyright   : (c) 2013-2017 Brendan Hay
+-- Copyright   : (c) 2013-2018 Brendan Hay
 -- License     : Mozilla Public License, v. 2.0.
 -- Maintainer  : Brendan Hay <brendan.g.hay+amazonka@gmail.com>
 -- Stability   : auto-generated
@@ -80,33 +80,33 @@
     -> CreateNamedQuery
 createNamedQuery pName_ pDatabase_ pQueryString_ =
   CreateNamedQuery'
-  { _cnqClientRequestToken = Nothing
-  , _cnqDescription = Nothing
-  , _cnqName = pName_
-  , _cnqDatabase = pDatabase_
-  , _cnqQueryString = pQueryString_
-  }
+    { _cnqClientRequestToken = Nothing
+    , _cnqDescription = Nothing
+    , _cnqName = pName_
+    , _cnqDatabase = pDatabase_
+    , _cnqQueryString = pQueryString_
+    }
 
 
 -- | A unique case-sensitive string used to ensure the request to create the query is idempotent (executes only once). If another @CreateNamedQuery@ request is received, the same response is returned and another query is not created. If a parameter has changed, for example, the @QueryString@ , an error is returned. /Important:/ This token is listed as not required because AWS SDKs (for example the AWS SDK for Java) auto-generate the token for users. If you are not using the AWS SDK or the AWS CLI, you must provide this token or the action will fail.
 cnqClientRequestToken :: Lens' CreateNamedQuery (Maybe Text)
-cnqClientRequestToken = lens _cnqClientRequestToken (\ s a -> s{_cnqClientRequestToken = a});
+cnqClientRequestToken = lens _cnqClientRequestToken (\ s a -> s{_cnqClientRequestToken = a})
 
 -- | A brief explanation of the query.
 cnqDescription :: Lens' CreateNamedQuery (Maybe Text)
-cnqDescription = lens _cnqDescription (\ s a -> s{_cnqDescription = a});
+cnqDescription = lens _cnqDescription (\ s a -> s{_cnqDescription = a})
 
 -- | The plain language name for the query.
 cnqName :: Lens' CreateNamedQuery Text
-cnqName = lens _cnqName (\ s a -> s{_cnqName = a});
+cnqName = lens _cnqName (\ s a -> s{_cnqName = a})
 
 -- | The database to which the query belongs.
 cnqDatabase :: Lens' CreateNamedQuery Text
-cnqDatabase = lens _cnqDatabase (\ s a -> s{_cnqDatabase = a});
+cnqDatabase = lens _cnqDatabase (\ s a -> s{_cnqDatabase = a})
 
 -- | The text of the query itself. In other words, all query statements.
 cnqQueryString :: Lens' CreateNamedQuery Text
-cnqQueryString = lens _cnqQueryString (\ s a -> s{_cnqQueryString = a});
+cnqQueryString = lens _cnqQueryString (\ s a -> s{_cnqQueryString = a})
 
 instance AWSRequest CreateNamedQuery where
         type Rs CreateNamedQuery = CreateNamedQueryResponse
@@ -166,15 +166,15 @@
     -> CreateNamedQueryResponse
 createNamedQueryResponse pResponseStatus_ =
   CreateNamedQueryResponse'
-  {_cnqrsNamedQueryId = Nothing, _cnqrsResponseStatus = pResponseStatus_}
+    {_cnqrsNamedQueryId = Nothing, _cnqrsResponseStatus = pResponseStatus_}
 
 
 -- | The unique ID of the query.
 cnqrsNamedQueryId :: Lens' CreateNamedQueryResponse (Maybe Text)
-cnqrsNamedQueryId = lens _cnqrsNamedQueryId (\ s a -> s{_cnqrsNamedQueryId = a});
+cnqrsNamedQueryId = lens _cnqrsNamedQueryId (\ s a -> s{_cnqrsNamedQueryId = a})
 
 -- | -- | The response status code.
 cnqrsResponseStatus :: Lens' CreateNamedQueryResponse Int
-cnqrsResponseStatus = lens _cnqrsResponseStatus (\ s a -> s{_cnqrsResponseStatus = a});
+cnqrsResponseStatus = lens _cnqrsResponseStatus (\ s a -> s{_cnqrsResponseStatus = a})
 
 instance NFData CreateNamedQueryResponse where
diff --git a/gen/Network/AWS/Athena/DeleteNamedQuery.hs b/gen/Network/AWS/Athena/DeleteNamedQuery.hs
--- a/gen/Network/AWS/Athena/DeleteNamedQuery.hs
+++ b/gen/Network/AWS/Athena/DeleteNamedQuery.hs
@@ -12,7 +12,7 @@
 
 -- |
 -- Module      : Network.AWS.Athena.DeleteNamedQuery
--- Copyright   : (c) 2013-2017 Brendan Hay
+-- Copyright   : (c) 2013-2018 Brendan Hay
 -- License     : Mozilla Public License, v. 2.0.
 -- Maintainer  : Brendan Hay <brendan.g.hay+amazonka@gmail.com>
 -- Stability   : auto-generated
@@ -65,7 +65,7 @@
 
 -- | The unique ID of the query to delete.
 dnqNamedQueryId :: Lens' DeleteNamedQuery Text
-dnqNamedQueryId = lens _dnqNamedQueryId (\ s a -> s{_dnqNamedQueryId = a});
+dnqNamedQueryId = lens _dnqNamedQueryId (\ s a -> s{_dnqNamedQueryId = a})
 
 instance AWSRequest DeleteNamedQuery where
         type Rs DeleteNamedQuery = DeleteNamedQueryResponse
@@ -120,6 +120,6 @@
 
 -- | -- | The response status code.
 dnqrsResponseStatus :: Lens' DeleteNamedQueryResponse Int
-dnqrsResponseStatus = lens _dnqrsResponseStatus (\ s a -> s{_dnqrsResponseStatus = a});
+dnqrsResponseStatus = lens _dnqrsResponseStatus (\ s a -> s{_dnqrsResponseStatus = a})
 
 instance NFData DeleteNamedQueryResponse where
diff --git a/gen/Network/AWS/Athena/GetNamedQuery.hs b/gen/Network/AWS/Athena/GetNamedQuery.hs
--- a/gen/Network/AWS/Athena/GetNamedQuery.hs
+++ b/gen/Network/AWS/Athena/GetNamedQuery.hs
@@ -12,7 +12,7 @@
 
 -- |
 -- Module      : Network.AWS.Athena.GetNamedQuery
--- Copyright   : (c) 2013-2017 Brendan Hay
+-- Copyright   : (c) 2013-2018 Brendan Hay
 -- License     : Mozilla Public License, v. 2.0.
 -- Maintainer  : Brendan Hay <brendan.g.hay+amazonka@gmail.com>
 -- Stability   : auto-generated
@@ -64,7 +64,7 @@
 
 -- | The unique ID of the query. Use 'ListNamedQueries' to get query IDs.
 gnqNamedQueryId :: Lens' GetNamedQuery Text
-gnqNamedQueryId = lens _gnqNamedQueryId (\ s a -> s{_gnqNamedQueryId = a});
+gnqNamedQueryId = lens _gnqNamedQueryId (\ s a -> s{_gnqNamedQueryId = a})
 
 instance AWSRequest GetNamedQuery where
         type Rs GetNamedQuery = GetNamedQueryResponse
@@ -119,15 +119,15 @@
     -> GetNamedQueryResponse
 getNamedQueryResponse pResponseStatus_ =
   GetNamedQueryResponse'
-  {_gnqrsNamedQuery = Nothing, _gnqrsResponseStatus = pResponseStatus_}
+    {_gnqrsNamedQuery = Nothing, _gnqrsResponseStatus = pResponseStatus_}
 
 
 -- | Information about the query.
 gnqrsNamedQuery :: Lens' GetNamedQueryResponse (Maybe NamedQuery)
-gnqrsNamedQuery = lens _gnqrsNamedQuery (\ s a -> s{_gnqrsNamedQuery = a});
+gnqrsNamedQuery = lens _gnqrsNamedQuery (\ s a -> s{_gnqrsNamedQuery = a})
 
 -- | -- | The response status code.
 gnqrsResponseStatus :: Lens' GetNamedQueryResponse Int
-gnqrsResponseStatus = lens _gnqrsResponseStatus (\ s a -> s{_gnqrsResponseStatus = a});
+gnqrsResponseStatus = lens _gnqrsResponseStatus (\ s a -> s{_gnqrsResponseStatus = a})
 
 instance NFData GetNamedQueryResponse where
diff --git a/gen/Network/AWS/Athena/GetQueryExecution.hs b/gen/Network/AWS/Athena/GetQueryExecution.hs
--- a/gen/Network/AWS/Athena/GetQueryExecution.hs
+++ b/gen/Network/AWS/Athena/GetQueryExecution.hs
@@ -12,7 +12,7 @@
 
 -- |
 -- Module      : Network.AWS.Athena.GetQueryExecution
--- Copyright   : (c) 2013-2017 Brendan Hay
+-- Copyright   : (c) 2013-2018 Brendan Hay
 -- License     : Mozilla Public License, v. 2.0.
 -- Maintainer  : Brendan Hay <brendan.g.hay+amazonka@gmail.com>
 -- Stability   : auto-generated
@@ -64,7 +64,7 @@
 
 -- | The unique ID of the query execution.
 gqeQueryExecutionId :: Lens' GetQueryExecution Text
-gqeQueryExecutionId = lens _gqeQueryExecutionId (\ s a -> s{_gqeQueryExecutionId = a});
+gqeQueryExecutionId = lens _gqeQueryExecutionId (\ s a -> s{_gqeQueryExecutionId = a})
 
 instance AWSRequest GetQueryExecution where
         type Rs GetQueryExecution = GetQueryExecutionResponse
@@ -119,15 +119,15 @@
     -> GetQueryExecutionResponse
 getQueryExecutionResponse pResponseStatus_ =
   GetQueryExecutionResponse'
-  {_gqersQueryExecution = Nothing, _gqersResponseStatus = pResponseStatus_}
+    {_gqersQueryExecution = Nothing, _gqersResponseStatus = pResponseStatus_}
 
 
 -- | Information about the query execution.
 gqersQueryExecution :: Lens' GetQueryExecutionResponse (Maybe QueryExecution)
-gqersQueryExecution = lens _gqersQueryExecution (\ s a -> s{_gqersQueryExecution = a});
+gqersQueryExecution = lens _gqersQueryExecution (\ s a -> s{_gqersQueryExecution = a})
 
 -- | -- | The response status code.
 gqersResponseStatus :: Lens' GetQueryExecutionResponse Int
-gqersResponseStatus = lens _gqersResponseStatus (\ s a -> s{_gqersResponseStatus = a});
+gqersResponseStatus = lens _gqersResponseStatus (\ s a -> s{_gqersResponseStatus = a})
 
 instance NFData GetQueryExecutionResponse where
diff --git a/gen/Network/AWS/Athena/GetQueryResults.hs b/gen/Network/AWS/Athena/GetQueryResults.hs
--- a/gen/Network/AWS/Athena/GetQueryResults.hs
+++ b/gen/Network/AWS/Athena/GetQueryResults.hs
@@ -12,7 +12,7 @@
 
 -- |
 -- Module      : Network.AWS.Athena.GetQueryResults
--- Copyright   : (c) 2013-2017 Brendan Hay
+-- Copyright   : (c) 2013-2018 Brendan Hay
 -- License     : Mozilla Public License, v. 2.0.
 -- Maintainer  : Brendan Hay <brendan.g.hay+amazonka@gmail.com>
 -- Stability   : auto-generated
@@ -72,23 +72,23 @@
     -> GetQueryResults
 getQueryResults pQueryExecutionId_ =
   GetQueryResults'
-  { _gqrNextToken = Nothing
-  , _gqrMaxResults = Nothing
-  , _gqrQueryExecutionId = pQueryExecutionId_
-  }
+    { _gqrNextToken = Nothing
+    , _gqrMaxResults = Nothing
+    , _gqrQueryExecutionId = pQueryExecutionId_
+    }
 
 
 -- | The token that specifies where to start pagination if a previous request was truncated.
 gqrNextToken :: Lens' GetQueryResults (Maybe Text)
-gqrNextToken = lens _gqrNextToken (\ s a -> s{_gqrNextToken = a});
+gqrNextToken = lens _gqrNextToken (\ s a -> s{_gqrNextToken = a})
 
 -- | The maximum number of results (rows) to return in this request.
 gqrMaxResults :: Lens' GetQueryResults (Maybe Natural)
-gqrMaxResults = lens _gqrMaxResults (\ s a -> s{_gqrMaxResults = a}) . mapping _Nat;
+gqrMaxResults = lens _gqrMaxResults (\ s a -> s{_gqrMaxResults = a}) . mapping _Nat
 
 -- | The unique ID of the query execution.
 gqrQueryExecutionId :: Lens' GetQueryResults Text
-gqrQueryExecutionId = lens _gqrQueryExecutionId (\ s a -> s{_gqrQueryExecutionId = a});
+gqrQueryExecutionId = lens _gqrQueryExecutionId (\ s a -> s{_gqrQueryExecutionId = a})
 
 instance AWSPager GetQueryResults where
         page rq rs
@@ -157,22 +157,22 @@
     -> GetQueryResultsResponse
 getQueryResultsResponse pResponseStatus_ =
   GetQueryResultsResponse'
-  { _gqrrsNextToken = Nothing
-  , _gqrrsResultSet = Nothing
-  , _gqrrsResponseStatus = pResponseStatus_
-  }
+    { _gqrrsNextToken = Nothing
+    , _gqrrsResultSet = Nothing
+    , _gqrrsResponseStatus = pResponseStatus_
+    }
 
 
 -- | A token to be used by the next request if this request is truncated.
 gqrrsNextToken :: Lens' GetQueryResultsResponse (Maybe Text)
-gqrrsNextToken = lens _gqrrsNextToken (\ s a -> s{_gqrrsNextToken = a});
+gqrrsNextToken = lens _gqrrsNextToken (\ s a -> s{_gqrrsNextToken = a})
 
 -- | The results of the query execution.
 gqrrsResultSet :: Lens' GetQueryResultsResponse (Maybe ResultSet)
-gqrrsResultSet = lens _gqrrsResultSet (\ s a -> s{_gqrrsResultSet = a});
+gqrrsResultSet = lens _gqrrsResultSet (\ s a -> s{_gqrrsResultSet = a})
 
 -- | -- | The response status code.
 gqrrsResponseStatus :: Lens' GetQueryResultsResponse Int
-gqrrsResponseStatus = lens _gqrrsResponseStatus (\ s a -> s{_gqrrsResponseStatus = a});
+gqrrsResponseStatus = lens _gqrrsResponseStatus (\ s a -> s{_gqrrsResponseStatus = a})
 
 instance NFData GetQueryResultsResponse where
diff --git a/gen/Network/AWS/Athena/ListNamedQueries.hs b/gen/Network/AWS/Athena/ListNamedQueries.hs
--- a/gen/Network/AWS/Athena/ListNamedQueries.hs
+++ b/gen/Network/AWS/Athena/ListNamedQueries.hs
@@ -12,7 +12,7 @@
 
 -- |
 -- Module      : Network.AWS.Athena.ListNamedQueries
--- Copyright   : (c) 2013-2017 Brendan Hay
+-- Copyright   : (c) 2013-2018 Brendan Hay
 -- License     : Mozilla Public License, v. 2.0.
 -- Maintainer  : Brendan Hay <brendan.g.hay+amazonka@gmail.com>
 -- Stability   : auto-generated
@@ -73,11 +73,11 @@
 
 -- | The token that specifies where to start pagination if a previous request was truncated.
 lnqNextToken :: Lens' ListNamedQueries (Maybe Text)
-lnqNextToken = lens _lnqNextToken (\ s a -> s{_lnqNextToken = a});
+lnqNextToken = lens _lnqNextToken (\ s a -> s{_lnqNextToken = a})
 
 -- | The maximum number of queries to return in this request.
 lnqMaxResults :: Lens' ListNamedQueries (Maybe Natural)
-lnqMaxResults = lens _lnqMaxResults (\ s a -> s{_lnqMaxResults = a}) . mapping _Nat;
+lnqMaxResults = lens _lnqMaxResults (\ s a -> s{_lnqMaxResults = a}) . mapping _Nat
 
 instance AWSPager ListNamedQueries where
         page rq rs
@@ -144,22 +144,22 @@
     -> ListNamedQueriesResponse
 listNamedQueriesResponse pResponseStatus_ =
   ListNamedQueriesResponse'
-  { _lnqrsNextToken = Nothing
-  , _lnqrsNamedQueryIds = Nothing
-  , _lnqrsResponseStatus = pResponseStatus_
-  }
+    { _lnqrsNextToken = Nothing
+    , _lnqrsNamedQueryIds = Nothing
+    , _lnqrsResponseStatus = pResponseStatus_
+    }
 
 
 -- | A token to be used by the next request if this request is truncated.
 lnqrsNextToken :: Lens' ListNamedQueriesResponse (Maybe Text)
-lnqrsNextToken = lens _lnqrsNextToken (\ s a -> s{_lnqrsNextToken = a});
+lnqrsNextToken = lens _lnqrsNextToken (\ s a -> s{_lnqrsNextToken = a})
 
 -- | The list of unique query IDs.
 lnqrsNamedQueryIds :: Lens' ListNamedQueriesResponse (Maybe (NonEmpty Text))
-lnqrsNamedQueryIds = lens _lnqrsNamedQueryIds (\ s a -> s{_lnqrsNamedQueryIds = a}) . mapping _List1;
+lnqrsNamedQueryIds = lens _lnqrsNamedQueryIds (\ s a -> s{_lnqrsNamedQueryIds = a}) . mapping _List1
 
 -- | -- | The response status code.
 lnqrsResponseStatus :: Lens' ListNamedQueriesResponse Int
-lnqrsResponseStatus = lens _lnqrsResponseStatus (\ s a -> s{_lnqrsResponseStatus = a});
+lnqrsResponseStatus = lens _lnqrsResponseStatus (\ s a -> s{_lnqrsResponseStatus = a})
 
 instance NFData ListNamedQueriesResponse where
diff --git a/gen/Network/AWS/Athena/ListQueryExecutions.hs b/gen/Network/AWS/Athena/ListQueryExecutions.hs
--- a/gen/Network/AWS/Athena/ListQueryExecutions.hs
+++ b/gen/Network/AWS/Athena/ListQueryExecutions.hs
@@ -12,7 +12,7 @@
 
 -- |
 -- Module      : Network.AWS.Athena.ListQueryExecutions
--- Copyright   : (c) 2013-2017 Brendan Hay
+-- Copyright   : (c) 2013-2018 Brendan Hay
 -- License     : Mozilla Public License, v. 2.0.
 -- Maintainer  : Brendan Hay <brendan.g.hay+amazonka@gmail.com>
 -- Stability   : auto-generated
@@ -73,11 +73,11 @@
 
 -- | The token that specifies where to start pagination if a previous request was truncated.
 lqeNextToken :: Lens' ListQueryExecutions (Maybe Text)
-lqeNextToken = lens _lqeNextToken (\ s a -> s{_lqeNextToken = a});
+lqeNextToken = lens _lqeNextToken (\ s a -> s{_lqeNextToken = a})
 
 -- | The maximum number of query executions to return in this request.
 lqeMaxResults :: Lens' ListQueryExecutions (Maybe Natural)
-lqeMaxResults = lens _lqeMaxResults (\ s a -> s{_lqeMaxResults = a}) . mapping _Nat;
+lqeMaxResults = lens _lqeMaxResults (\ s a -> s{_lqeMaxResults = a}) . mapping _Nat
 
 instance AWSPager ListQueryExecutions where
         page rq rs
@@ -145,22 +145,22 @@
     -> ListQueryExecutionsResponse
 listQueryExecutionsResponse pResponseStatus_ =
   ListQueryExecutionsResponse'
-  { _lqersQueryExecutionIds = Nothing
-  , _lqersNextToken = Nothing
-  , _lqersResponseStatus = pResponseStatus_
-  }
+    { _lqersQueryExecutionIds = Nothing
+    , _lqersNextToken = Nothing
+    , _lqersResponseStatus = pResponseStatus_
+    }
 
 
 -- | The unique IDs of each query execution as an array of strings.
 lqersQueryExecutionIds :: Lens' ListQueryExecutionsResponse (Maybe (NonEmpty Text))
-lqersQueryExecutionIds = lens _lqersQueryExecutionIds (\ s a -> s{_lqersQueryExecutionIds = a}) . mapping _List1;
+lqersQueryExecutionIds = lens _lqersQueryExecutionIds (\ s a -> s{_lqersQueryExecutionIds = a}) . mapping _List1
 
 -- | A token to be used by the next request if this request is truncated.
 lqersNextToken :: Lens' ListQueryExecutionsResponse (Maybe Text)
-lqersNextToken = lens _lqersNextToken (\ s a -> s{_lqersNextToken = a});
+lqersNextToken = lens _lqersNextToken (\ s a -> s{_lqersNextToken = a})
 
 -- | -- | The response status code.
 lqersResponseStatus :: Lens' ListQueryExecutionsResponse Int
-lqersResponseStatus = lens _lqersResponseStatus (\ s a -> s{_lqersResponseStatus = a});
+lqersResponseStatus = lens _lqersResponseStatus (\ s a -> s{_lqersResponseStatus = a})
 
 instance NFData ListQueryExecutionsResponse where
diff --git a/gen/Network/AWS/Athena/StartQueryExecution.hs b/gen/Network/AWS/Athena/StartQueryExecution.hs
--- a/gen/Network/AWS/Athena/StartQueryExecution.hs
+++ b/gen/Network/AWS/Athena/StartQueryExecution.hs
@@ -12,7 +12,7 @@
 
 -- |
 -- Module      : Network.AWS.Athena.StartQueryExecution
--- Copyright   : (c) 2013-2017 Brendan Hay
+-- Copyright   : (c) 2013-2018 Brendan Hay
 -- License     : Mozilla Public License, v. 2.0.
 -- Maintainer  : Brendan Hay <brendan.g.hay+amazonka@gmail.com>
 -- Stability   : auto-generated
@@ -75,28 +75,28 @@
     -> StartQueryExecution
 startQueryExecution pQueryString_ pResultConfiguration_ =
   StartQueryExecution'
-  { _sqeQueryExecutionContext = Nothing
-  , _sqeClientRequestToken = Nothing
-  , _sqeQueryString = pQueryString_
-  , _sqeResultConfiguration = pResultConfiguration_
-  }
+    { _sqeQueryExecutionContext = Nothing
+    , _sqeClientRequestToken = Nothing
+    , _sqeQueryString = pQueryString_
+    , _sqeResultConfiguration = pResultConfiguration_
+    }
 
 
 -- | The database within which the query executes.
 sqeQueryExecutionContext :: Lens' StartQueryExecution (Maybe QueryExecutionContext)
-sqeQueryExecutionContext = lens _sqeQueryExecutionContext (\ s a -> s{_sqeQueryExecutionContext = a});
+sqeQueryExecutionContext = lens _sqeQueryExecutionContext (\ s a -> s{_sqeQueryExecutionContext = a})
 
 -- | A unique case-sensitive string used to ensure the request to create the query is idempotent (executes only once). If another @StartQueryExecution@ request is received, the same response is returned and another query is not created. If a parameter has changed, for example, the @QueryString@ , an error is returned. /Important:/ This token is listed as not required because AWS SDKs (for example the AWS SDK for Java) auto-generate the token for users. If you are not using the AWS SDK or the AWS CLI, you must provide this token or the action will fail.
 sqeClientRequestToken :: Lens' StartQueryExecution (Maybe Text)
-sqeClientRequestToken = lens _sqeClientRequestToken (\ s a -> s{_sqeClientRequestToken = a});
+sqeClientRequestToken = lens _sqeClientRequestToken (\ s a -> s{_sqeClientRequestToken = a})
 
 -- | The SQL query statements to be executed.
 sqeQueryString :: Lens' StartQueryExecution Text
-sqeQueryString = lens _sqeQueryString (\ s a -> s{_sqeQueryString = a});
+sqeQueryString = lens _sqeQueryString (\ s a -> s{_sqeQueryString = a})
 
 -- | Specifies information about where and how to save the results of the query execution.
 sqeResultConfiguration :: Lens' StartQueryExecution ResultConfiguration
-sqeResultConfiguration = lens _sqeResultConfiguration (\ s a -> s{_sqeResultConfiguration = a});
+sqeResultConfiguration = lens _sqeResultConfiguration (\ s a -> s{_sqeResultConfiguration = a})
 
 instance AWSRequest StartQueryExecution where
         type Rs StartQueryExecution =
@@ -157,15 +157,15 @@
     -> StartQueryExecutionResponse
 startQueryExecutionResponse pResponseStatus_ =
   StartQueryExecutionResponse'
-  {_sqersQueryExecutionId = Nothing, _sqersResponseStatus = pResponseStatus_}
+    {_sqersQueryExecutionId = Nothing, _sqersResponseStatus = pResponseStatus_}
 
 
 -- | The unique ID of the query that ran as a result of this request.
 sqersQueryExecutionId :: Lens' StartQueryExecutionResponse (Maybe Text)
-sqersQueryExecutionId = lens _sqersQueryExecutionId (\ s a -> s{_sqersQueryExecutionId = a});
+sqersQueryExecutionId = lens _sqersQueryExecutionId (\ s a -> s{_sqersQueryExecutionId = a})
 
 -- | -- | The response status code.
 sqersResponseStatus :: Lens' StartQueryExecutionResponse Int
-sqersResponseStatus = lens _sqersResponseStatus (\ s a -> s{_sqersResponseStatus = a});
+sqersResponseStatus = lens _sqersResponseStatus (\ s a -> s{_sqersResponseStatus = a})
 
 instance NFData StartQueryExecutionResponse where
diff --git a/gen/Network/AWS/Athena/StopQueryExecution.hs b/gen/Network/AWS/Athena/StopQueryExecution.hs
--- a/gen/Network/AWS/Athena/StopQueryExecution.hs
+++ b/gen/Network/AWS/Athena/StopQueryExecution.hs
@@ -12,7 +12,7 @@
 
 -- |
 -- Module      : Network.AWS.Athena.StopQueryExecution
--- Copyright   : (c) 2013-2017 Brendan Hay
+-- Copyright   : (c) 2013-2018 Brendan Hay
 -- License     : Mozilla Public License, v. 2.0.
 -- Maintainer  : Brendan Hay <brendan.g.hay+amazonka@gmail.com>
 -- Stability   : auto-generated
@@ -65,7 +65,7 @@
 
 -- | The unique ID of the query execution to stop.
 sqeQueryExecutionId :: Lens' StopQueryExecution Text
-sqeQueryExecutionId = lens _sqeQueryExecutionId (\ s a -> s{_sqeQueryExecutionId = a});
+sqeQueryExecutionId = lens _sqeQueryExecutionId (\ s a -> s{_sqeQueryExecutionId = a})
 
 instance AWSRequest StopQueryExecution where
         type Rs StopQueryExecution =
@@ -121,6 +121,6 @@
 
 -- | -- | The response status code.
 srsResponseStatus :: Lens' StopQueryExecutionResponse Int
-srsResponseStatus = lens _srsResponseStatus (\ s a -> s{_srsResponseStatus = a});
+srsResponseStatus = lens _srsResponseStatus (\ s a -> s{_srsResponseStatus = a})
 
 instance NFData StopQueryExecutionResponse where
diff --git a/gen/Network/AWS/Athena/Types.hs b/gen/Network/AWS/Athena/Types.hs
--- a/gen/Network/AWS/Athena/Types.hs
+++ b/gen/Network/AWS/Athena/Types.hs
@@ -4,7 +4,7 @@
 
 -- |
 -- Module      : Network.AWS.Athena.Types
--- Copyright   : (c) 2013-2017 Brendan Hay
+-- Copyright   : (c) 2013-2018 Brendan Hay
 -- License     : Mozilla Public License, v. 2.0.
 -- Maintainer  : Brendan Hay <brendan.g.hay+amazonka@gmail.com>
 -- Stability   : auto-generated
@@ -139,24 +139,24 @@
 athena :: Service
 athena =
   Service
-  { _svcAbbrev = "Athena"
-  , _svcSigner = v4
-  , _svcPrefix = "athena"
-  , _svcVersion = "2017-05-18"
-  , _svcEndpoint = defaultEndpoint athena
-  , _svcTimeout = Just 70
-  , _svcCheck = statusSuccess
-  , _svcError = parseJSONError "Athena"
-  , _svcRetry = retry
-  }
+    { _svcAbbrev = "Athena"
+    , _svcSigner = v4
+    , _svcPrefix = "athena"
+    , _svcVersion = "2017-05-18"
+    , _svcEndpoint = defaultEndpoint athena
+    , _svcTimeout = Just 70
+    , _svcCheck = statusSuccess
+    , _svcError = parseJSONError "Athena"
+    , _svcRetry = retry
+    }
   where
     retry =
       Exponential
-      { _retryBase = 5.0e-2
-      , _retryGrowth = 2
-      , _retryAttempts = 5
-      , _retryCheck = check
-      }
+        { _retryBase = 5.0e-2
+        , _retryGrowth = 2
+        , _retryAttempts = 5
+        , _retryCheck = check
+        }
     check e
       | has (hasCode "ThrottledException" . hasStatus 400) e =
         Just "throttled_exception"
@@ -165,6 +165,8 @@
         Just "throttling_exception"
       | has (hasCode "Throttling" . hasStatus 400) e = Just "throttling"
       | has (hasStatus 504) e = Just "gateway_timeout"
+      | has (hasCode "RequestThrottledException" . hasStatus 400) e =
+        Just "request_throttled_exception"
       | has (hasStatus 502) e = Just "bad_gateway"
       | has (hasStatus 503) e = Just "service_unavailable"
       | has (hasStatus 500) e = Just "general_server_error"
diff --git a/gen/Network/AWS/Athena/Types/Product.hs b/gen/Network/AWS/Athena/Types/Product.hs
--- a/gen/Network/AWS/Athena/Types/Product.hs
+++ b/gen/Network/AWS/Athena/Types/Product.hs
@@ -9,7 +9,7 @@
 
 -- |
 -- Module      : Network.AWS.Athena.Types.Product
--- Copyright   : (c) 2013-2017 Brendan Hay
+-- Copyright   : (c) 2013-2018 Brendan Hay
 -- License     : Mozilla Public License, v. 2.0.
 -- Maintainer  : Brendan Hay <brendan.g.hay+amazonka@gmail.com>
 -- Stability   : auto-generated
@@ -69,58 +69,58 @@
     -> ColumnInfo
 columnInfo pName_ pType_ =
   ColumnInfo'
-  { _ciScale = Nothing
-  , _ciPrecision = Nothing
-  , _ciSchemaName = Nothing
-  , _ciCatalogName = Nothing
-  , _ciCaseSensitive = Nothing
-  , _ciLabel = Nothing
-  , _ciTableName = Nothing
-  , _ciNullable = Nothing
-  , _ciName = pName_
-  , _ciType = pType_
-  }
+    { _ciScale = Nothing
+    , _ciPrecision = Nothing
+    , _ciSchemaName = Nothing
+    , _ciCatalogName = Nothing
+    , _ciCaseSensitive = Nothing
+    , _ciLabel = Nothing
+    , _ciTableName = Nothing
+    , _ciNullable = Nothing
+    , _ciName = pName_
+    , _ciType = pType_
+    }
 
 
 -- | For @DECIMAL@ data types, specifies the total number of digits in the fractional part of the value. Defaults to 0.
 ciScale :: Lens' ColumnInfo (Maybe Int)
-ciScale = lens _ciScale (\ s a -> s{_ciScale = a});
+ciScale = lens _ciScale (\ s a -> s{_ciScale = a})
 
 -- | For @DECIMAL@ data types, specifies the total number of digits, up to 38. For performance reasons, we recommend up to 18 digits.
 ciPrecision :: Lens' ColumnInfo (Maybe Int)
-ciPrecision = lens _ciPrecision (\ s a -> s{_ciPrecision = a});
+ciPrecision = lens _ciPrecision (\ s a -> s{_ciPrecision = a})
 
 -- | The schema name (database name) to which the query results belong.
 ciSchemaName :: Lens' ColumnInfo (Maybe Text)
-ciSchemaName = lens _ciSchemaName (\ s a -> s{_ciSchemaName = a});
+ciSchemaName = lens _ciSchemaName (\ s a -> s{_ciSchemaName = a})
 
 -- | The catalog to which the query results belong.
 ciCatalogName :: Lens' ColumnInfo (Maybe Text)
-ciCatalogName = lens _ciCatalogName (\ s a -> s{_ciCatalogName = a});
+ciCatalogName = lens _ciCatalogName (\ s a -> s{_ciCatalogName = a})
 
 -- | Indicates whether values in the column are case-sensitive.
 ciCaseSensitive :: Lens' ColumnInfo (Maybe Bool)
-ciCaseSensitive = lens _ciCaseSensitive (\ s a -> s{_ciCaseSensitive = a});
+ciCaseSensitive = lens _ciCaseSensitive (\ s a -> s{_ciCaseSensitive = a})
 
 -- | A column label.
 ciLabel :: Lens' ColumnInfo (Maybe Text)
-ciLabel = lens _ciLabel (\ s a -> s{_ciLabel = a});
+ciLabel = lens _ciLabel (\ s a -> s{_ciLabel = a})
 
 -- | The table name for the query results.
 ciTableName :: Lens' ColumnInfo (Maybe Text)
-ciTableName = lens _ciTableName (\ s a -> s{_ciTableName = a});
+ciTableName = lens _ciTableName (\ s a -> s{_ciTableName = a})
 
 -- | Indicates the column's nullable status.
 ciNullable :: Lens' ColumnInfo (Maybe ColumnNullable)
-ciNullable = lens _ciNullable (\ s a -> s{_ciNullable = a});
+ciNullable = lens _ciNullable (\ s a -> s{_ciNullable = a})
 
 -- | The name of the column.
 ciName :: Lens' ColumnInfo Text
-ciName = lens _ciName (\ s a -> s{_ciName = a});
+ciName = lens _ciName (\ s a -> s{_ciName = a})
 
 -- | The data type of the column.
 ciType :: Lens' ColumnInfo Text
-ciType = lens _ciType (\ s a -> s{_ciType = a});
+ciType = lens _ciType (\ s a -> s{_ciType = a})
 
 instance FromJSON ColumnInfo where
         parseJSON
@@ -163,7 +163,7 @@
 
 -- | The value of the datum.
 dVarCharValue :: Lens' Datum (Maybe Text)
-dVarCharValue = lens _dVarCharValue (\ s a -> s{_dVarCharValue = a});
+dVarCharValue = lens _dVarCharValue (\ s a -> s{_dVarCharValue = a})
 
 instance FromJSON Datum where
         parseJSON
@@ -197,16 +197,16 @@
     -> EncryptionConfiguration
 encryptionConfiguration pEncryptionOption_ =
   EncryptionConfiguration'
-  {_ecKMSKey = Nothing, _ecEncryptionOption = pEncryptionOption_}
+    {_ecKMSKey = Nothing, _ecEncryptionOption = pEncryptionOption_}
 
 
 -- | For @SSE-KMS@ and @CSE-KMS@ , this is the KMS key ARN or ID.
 ecKMSKey :: Lens' EncryptionConfiguration (Maybe Text)
-ecKMSKey = lens _ecKMSKey (\ s a -> s{_ecKMSKey = a});
+ecKMSKey = lens _ecKMSKey (\ s a -> s{_ecKMSKey = a})
 
 -- | Indicates whether Amazon S3 server-side encryption with Amazon S3-managed keys (@SSE-S3@ ), server-side encryption with KMS-managed keys (@SSE-KMS@ ), or client-side encryption with KMS-managed keys (CSE-KMS) is used.
 ecEncryptionOption :: Lens' EncryptionConfiguration EncryptionOption
-ecEncryptionOption = lens _ecEncryptionOption (\ s a -> s{_ecEncryptionOption = a});
+ecEncryptionOption = lens _ecEncryptionOption (\ s a -> s{_ecEncryptionOption = a})
 
 instance FromJSON EncryptionConfiguration where
         parseJSON
@@ -260,33 +260,33 @@
     -> NamedQuery
 namedQuery pName_ pDatabase_ pQueryString_ =
   NamedQuery'
-  { _nqNamedQueryId = Nothing
-  , _nqDescription = Nothing
-  , _nqName = pName_
-  , _nqDatabase = pDatabase_
-  , _nqQueryString = pQueryString_
-  }
+    { _nqNamedQueryId = Nothing
+    , _nqDescription = Nothing
+    , _nqName = pName_
+    , _nqDatabase = pDatabase_
+    , _nqQueryString = pQueryString_
+    }
 
 
 -- | The unique identifier of the query.
 nqNamedQueryId :: Lens' NamedQuery (Maybe Text)
-nqNamedQueryId = lens _nqNamedQueryId (\ s a -> s{_nqNamedQueryId = a});
+nqNamedQueryId = lens _nqNamedQueryId (\ s a -> s{_nqNamedQueryId = a})
 
 -- | A brief description of the query.
 nqDescription :: Lens' NamedQuery (Maybe Text)
-nqDescription = lens _nqDescription (\ s a -> s{_nqDescription = a});
+nqDescription = lens _nqDescription (\ s a -> s{_nqDescription = a})
 
 -- | The plain-language name of the query.
 nqName :: Lens' NamedQuery Text
-nqName = lens _nqName (\ s a -> s{_nqName = a});
+nqName = lens _nqName (\ s a -> s{_nqName = a})
 
 -- | The database to which the query belongs.
 nqDatabase :: Lens' NamedQuery Text
-nqDatabase = lens _nqDatabase (\ s a -> s{_nqDatabase = a});
+nqDatabase = lens _nqDatabase (\ s a -> s{_nqDatabase = a})
 
 -- | The SQL query statements that comprise the query.
 nqQueryString :: Lens' NamedQuery Text
-nqQueryString = lens _nqQueryString (\ s a -> s{_nqQueryString = a});
+nqQueryString = lens _nqQueryString (\ s a -> s{_nqQueryString = a})
 
 instance FromJSON NamedQuery where
         parseJSON
@@ -336,38 +336,38 @@
     :: QueryExecution
 queryExecution =
   QueryExecution'
-  { _qeStatus = Nothing
-  , _qeQueryExecutionContext = Nothing
-  , _qeResultConfiguration = Nothing
-  , _qeQuery = Nothing
-  , _qeStatistics = Nothing
-  , _qeQueryExecutionId = Nothing
-  }
+    { _qeStatus = Nothing
+    , _qeQueryExecutionContext = Nothing
+    , _qeResultConfiguration = Nothing
+    , _qeQuery = Nothing
+    , _qeStatistics = Nothing
+    , _qeQueryExecutionId = Nothing
+    }
 
 
 -- | The completion date, current state, submission time, and state change reason (if applicable) for the query execution.
 qeStatus :: Lens' QueryExecution (Maybe QueryExecutionStatus)
-qeStatus = lens _qeStatus (\ s a -> s{_qeStatus = a});
+qeStatus = lens _qeStatus (\ s a -> s{_qeStatus = a})
 
 -- | The database in which the query execution occurred.
 qeQueryExecutionContext :: Lens' QueryExecution (Maybe QueryExecutionContext)
-qeQueryExecutionContext = lens _qeQueryExecutionContext (\ s a -> s{_qeQueryExecutionContext = a});
+qeQueryExecutionContext = lens _qeQueryExecutionContext (\ s a -> s{_qeQueryExecutionContext = a})
 
 -- | The location in Amazon S3 where query results were stored and the encryption option, if any, used for query results.
 qeResultConfiguration :: Lens' QueryExecution (Maybe ResultConfiguration)
-qeResultConfiguration = lens _qeResultConfiguration (\ s a -> s{_qeResultConfiguration = a});
+qeResultConfiguration = lens _qeResultConfiguration (\ s a -> s{_qeResultConfiguration = a})
 
 -- | The SQL query statements which the query execution ran.
 qeQuery :: Lens' QueryExecution (Maybe Text)
-qeQuery = lens _qeQuery (\ s a -> s{_qeQuery = a});
+qeQuery = lens _qeQuery (\ s a -> s{_qeQuery = a})
 
 -- | The amount of data scanned during the query execution and the amount of time that it took to execute.
 qeStatistics :: Lens' QueryExecution (Maybe QueryExecutionStatistics)
-qeStatistics = lens _qeStatistics (\ s a -> s{_qeStatistics = a});
+qeStatistics = lens _qeStatistics (\ s a -> s{_qeStatistics = a})
 
 -- | The unique identifier for each query execution.
 qeQueryExecutionId :: Lens' QueryExecution (Maybe Text)
-qeQueryExecutionId = lens _qeQueryExecutionId (\ s a -> s{_qeQueryExecutionId = a});
+qeQueryExecutionId = lens _qeQueryExecutionId (\ s a -> s{_qeQueryExecutionId = a})
 
 instance FromJSON QueryExecution where
         parseJSON
@@ -406,7 +406,7 @@
 
 -- | The name of the database.
 qecDatabase :: Lens' QueryExecutionContext (Maybe Text)
-qecDatabase = lens _qecDatabase (\ s a -> s{_qecDatabase = a});
+qecDatabase = lens _qecDatabase (\ s a -> s{_qecDatabase = a})
 
 instance FromJSON QueryExecutionContext where
         parseJSON
@@ -445,16 +445,18 @@
     :: QueryExecutionStatistics
 queryExecutionStatistics =
   QueryExecutionStatistics'
-  {_qesEngineExecutionTimeInMillis = Nothing, _qesDataScannedInBytes = Nothing}
+    { _qesEngineExecutionTimeInMillis = Nothing
+    , _qesDataScannedInBytes = Nothing
+    }
 
 
 -- | The number of milliseconds that the query took to execute.
 qesEngineExecutionTimeInMillis :: Lens' QueryExecutionStatistics (Maybe Integer)
-qesEngineExecutionTimeInMillis = lens _qesEngineExecutionTimeInMillis (\ s a -> s{_qesEngineExecutionTimeInMillis = a});
+qesEngineExecutionTimeInMillis = lens _qesEngineExecutionTimeInMillis (\ s a -> s{_qesEngineExecutionTimeInMillis = a})
 
 -- | The number of bytes in the data that was queried.
 qesDataScannedInBytes :: Lens' QueryExecutionStatistics (Maybe Integer)
-qesDataScannedInBytes = lens _qesDataScannedInBytes (\ s a -> s{_qesDataScannedInBytes = a});
+qesDataScannedInBytes = lens _qesDataScannedInBytes (\ s a -> s{_qesDataScannedInBytes = a})
 
 instance FromJSON QueryExecutionStatistics where
         parseJSON
@@ -496,28 +498,28 @@
     :: QueryExecutionStatus
 queryExecutionStatus =
   QueryExecutionStatus'
-  { _qesState = Nothing
-  , _qesStateChangeReason = Nothing
-  , _qesSubmissionDateTime = Nothing
-  , _qesCompletionDateTime = Nothing
-  }
+    { _qesState = Nothing
+    , _qesStateChangeReason = Nothing
+    , _qesSubmissionDateTime = Nothing
+    , _qesCompletionDateTime = Nothing
+    }
 
 
 -- | The state of query execution. @SUBMITTED@ indicates that the query is queued for execution. @RUNNING@ indicates that the query is scanning data and returning results. @SUCCEEDED@ indicates that the query completed without error. @FAILED@ indicates that the query experienced an error and did not complete processing. @CANCELLED@ indicates that user input interrupted query execution.
 qesState :: Lens' QueryExecutionStatus (Maybe QueryExecutionState)
-qesState = lens _qesState (\ s a -> s{_qesState = a});
+qesState = lens _qesState (\ s a -> s{_qesState = a})
 
 -- | Further detail about the status of the query.
 qesStateChangeReason :: Lens' QueryExecutionStatus (Maybe Text)
-qesStateChangeReason = lens _qesStateChangeReason (\ s a -> s{_qesStateChangeReason = a});
+qesStateChangeReason = lens _qesStateChangeReason (\ s a -> s{_qesStateChangeReason = a})
 
 -- | The date and time that the query was submitted.
 qesSubmissionDateTime :: Lens' QueryExecutionStatus (Maybe UTCTime)
-qesSubmissionDateTime = lens _qesSubmissionDateTime (\ s a -> s{_qesSubmissionDateTime = a}) . mapping _Time;
+qesSubmissionDateTime = lens _qesSubmissionDateTime (\ s a -> s{_qesSubmissionDateTime = a}) . mapping _Time
 
 -- | The date and time that the query completed.
 qesCompletionDateTime :: Lens' QueryExecutionStatus (Maybe UTCTime)
-qesCompletionDateTime = lens _qesCompletionDateTime (\ s a -> s{_qesCompletionDateTime = a}) . mapping _Time;
+qesCompletionDateTime = lens _qesCompletionDateTime (\ s a -> s{_qesCompletionDateTime = a}) . mapping _Time
 
 instance FromJSON QueryExecutionStatus where
         parseJSON
@@ -555,16 +557,16 @@
     -> ResultConfiguration
 resultConfiguration pOutputLocation_ =
   ResultConfiguration'
-  {_rcEncryptionConfiguration = Nothing, _rcOutputLocation = pOutputLocation_}
+    {_rcEncryptionConfiguration = Nothing, _rcOutputLocation = pOutputLocation_}
 
 
 -- | If query results are encrypted in S3, indicates the S3 encryption option used (for example, @SSE-KMS@ or @CSE-KMS@ and key information.
 rcEncryptionConfiguration :: Lens' ResultConfiguration (Maybe EncryptionConfiguration)
-rcEncryptionConfiguration = lens _rcEncryptionConfiguration (\ s a -> s{_rcEncryptionConfiguration = a});
+rcEncryptionConfiguration = lens _rcEncryptionConfiguration (\ s a -> s{_rcEncryptionConfiguration = a})
 
 -- | The location in S3 where query results are stored.
 rcOutputLocation :: Lens' ResultConfiguration Text
-rcOutputLocation = lens _rcOutputLocation (\ s a -> s{_rcOutputLocation = a});
+rcOutputLocation = lens _rcOutputLocation (\ s a -> s{_rcOutputLocation = a})
 
 instance FromJSON ResultConfiguration where
         parseJSON
@@ -611,11 +613,11 @@
 
 -- | The rows in the table.
 rsRows :: Lens' ResultSet [Row]
-rsRows = lens _rsRows (\ s a -> s{_rsRows = a}) . _Default . _Coerce;
+rsRows = lens _rsRows (\ s a -> s{_rsRows = a}) . _Default . _Coerce
 
 -- | The metadata that describes the column structure and data types of a table of query results.
 rsResultSetMetadata :: Lens' ResultSet (Maybe ResultSetMetadata)
-rsResultSetMetadata = lens _rsResultSetMetadata (\ s a -> s{_rsResultSetMetadata = a});
+rsResultSetMetadata = lens _rsResultSetMetadata (\ s a -> s{_rsResultSetMetadata = a})
 
 instance FromJSON ResultSet where
         parseJSON
@@ -651,7 +653,7 @@
 
 -- | Information about the columns in a query execution result.
 rsmColumnInfo :: Lens' ResultSetMetadata [ColumnInfo]
-rsmColumnInfo = lens _rsmColumnInfo (\ s a -> s{_rsmColumnInfo = a}) . _Default . _Coerce;
+rsmColumnInfo = lens _rsmColumnInfo (\ s a -> s{_rsmColumnInfo = a}) . _Default . _Coerce
 
 instance FromJSON ResultSetMetadata where
         parseJSON
@@ -686,7 +688,7 @@
 
 -- | The data that populates a row in a query result table.
 rowData :: Lens' Row [Datum]
-rowData = lens _rowData (\ s a -> s{_rowData = a}) . _Default . _Coerce;
+rowData = lens _rowData (\ s a -> s{_rowData = a}) . _Default . _Coerce
 
 instance FromJSON Row where
         parseJSON
@@ -722,23 +724,23 @@
     :: UnprocessedNamedQueryId
 unprocessedNamedQueryId =
   UnprocessedNamedQueryId'
-  { _unqiNamedQueryId = Nothing
-  , _unqiErrorCode = Nothing
-  , _unqiErrorMessage = Nothing
-  }
+    { _unqiNamedQueryId = Nothing
+    , _unqiErrorCode = Nothing
+    , _unqiErrorMessage = Nothing
+    }
 
 
 -- | The unique identifier of the named query.
 unqiNamedQueryId :: Lens' UnprocessedNamedQueryId (Maybe Text)
-unqiNamedQueryId = lens _unqiNamedQueryId (\ s a -> s{_unqiNamedQueryId = a});
+unqiNamedQueryId = lens _unqiNamedQueryId (\ s a -> s{_unqiNamedQueryId = a})
 
 -- | The error code returned when the processing request for the named query failed, if applicable.
 unqiErrorCode :: Lens' UnprocessedNamedQueryId (Maybe Text)
-unqiErrorCode = lens _unqiErrorCode (\ s a -> s{_unqiErrorCode = a});
+unqiErrorCode = lens _unqiErrorCode (\ s a -> s{_unqiErrorCode = a})
 
 -- | The error message returned when the processing request for the named query failed, if applicable.
 unqiErrorMessage :: Lens' UnprocessedNamedQueryId (Maybe Text)
-unqiErrorMessage = lens _unqiErrorMessage (\ s a -> s{_unqiErrorMessage = a});
+unqiErrorMessage = lens _unqiErrorMessage (\ s a -> s{_unqiErrorMessage = a})
 
 instance FromJSON UnprocessedNamedQueryId where
         parseJSON
@@ -777,23 +779,23 @@
     :: UnprocessedQueryExecutionId
 unprocessedQueryExecutionId =
   UnprocessedQueryExecutionId'
-  { _uqeiErrorCode = Nothing
-  , _uqeiQueryExecutionId = Nothing
-  , _uqeiErrorMessage = Nothing
-  }
+    { _uqeiErrorCode = Nothing
+    , _uqeiQueryExecutionId = Nothing
+    , _uqeiErrorMessage = Nothing
+    }
 
 
 -- | The error code returned when the query execution failed to process, if applicable.
 uqeiErrorCode :: Lens' UnprocessedQueryExecutionId (Maybe Text)
-uqeiErrorCode = lens _uqeiErrorCode (\ s a -> s{_uqeiErrorCode = a});
+uqeiErrorCode = lens _uqeiErrorCode (\ s a -> s{_uqeiErrorCode = a})
 
 -- | The unique identifier of the query execution.
 uqeiQueryExecutionId :: Lens' UnprocessedQueryExecutionId (Maybe Text)
-uqeiQueryExecutionId = lens _uqeiQueryExecutionId (\ s a -> s{_uqeiQueryExecutionId = a});
+uqeiQueryExecutionId = lens _uqeiQueryExecutionId (\ s a -> s{_uqeiQueryExecutionId = a})
 
 -- | The error message returned when the query execution failed to process, if applicable.
 uqeiErrorMessage :: Lens' UnprocessedQueryExecutionId (Maybe Text)
-uqeiErrorMessage = lens _uqeiErrorMessage (\ s a -> s{_uqeiErrorMessage = a});
+uqeiErrorMessage = lens _uqeiErrorMessage (\ s a -> s{_uqeiErrorMessage = a})
 
 instance FromJSON UnprocessedQueryExecutionId where
         parseJSON
diff --git a/gen/Network/AWS/Athena/Types/Sum.hs b/gen/Network/AWS/Athena/Types/Sum.hs
--- a/gen/Network/AWS/Athena/Types/Sum.hs
+++ b/gen/Network/AWS/Athena/Types/Sum.hs
@@ -9,7 +9,7 @@
 
 -- |
 -- Module      : Network.AWS.Athena.Types.Sum
--- Copyright   : (c) 2013-2017 Brendan Hay
+-- Copyright   : (c) 2013-2018 Brendan Hay
 -- License     : Mozilla Public License, v. 2.0.
 -- Maintainer  : Brendan Hay <brendan.g.hay+amazonka@gmail.com>
 -- Stability   : auto-generated
diff --git a/gen/Network/AWS/Athena/Waiters.hs b/gen/Network/AWS/Athena/Waiters.hs
--- a/gen/Network/AWS/Athena/Waiters.hs
+++ b/gen/Network/AWS/Athena/Waiters.hs
@@ -7,7 +7,7 @@
 
 -- |
 -- Module      : Network.AWS.Athena.Waiters
--- Copyright   : (c) 2013-2017 Brendan Hay
+-- Copyright   : (c) 2013-2018 Brendan Hay
 -- License     : Mozilla Public License, v. 2.0.
 -- Maintainer  : Brendan Hay <brendan.g.hay+amazonka@gmail.com>
 -- Stability   : auto-generated
diff --git a/test/Main.hs b/test/Main.hs
--- a/test/Main.hs
+++ b/test/Main.hs
@@ -2,7 +2,7 @@
 
 -- |
 -- Module      : Main
--- Copyright   : (c) 2013-2017 Brendan Hay
+-- Copyright   : (c) 2013-2018 Brendan Hay
 -- License     : Mozilla Public License, v. 2.0.
 -- Maintainer  : Brendan Hay <brendan.g.hay+amazonka@gmail.com>
 -- Stability   : auto-generated
diff --git a/test/Test/AWS/Athena.hs b/test/Test/AWS/Athena.hs
--- a/test/Test/AWS/Athena.hs
+++ b/test/Test/AWS/Athena.hs
@@ -1,6 +1,6 @@
 -- |
 -- Module      : Test.AWS.Athena
--- Copyright   : (c) 2013-2016 Brendan Hay
+-- Copyright   : (c) 2013-2018 Brendan Hay
 -- License     : Mozilla Public License, v. 2.0.
 -- Maintainer  : Brendan Hay <brendan.g.hay@gmail.com>
 -- Stability   : auto-generated
diff --git a/test/Test/AWS/Athena/Internal.hs b/test/Test/AWS/Athena/Internal.hs
--- a/test/Test/AWS/Athena/Internal.hs
+++ b/test/Test/AWS/Athena/Internal.hs
@@ -1,6 +1,6 @@
 -- |
 -- Module      : Test.AWS.Athena.Internal
--- Copyright   : (c) 2013-2016 Brendan Hay
+-- Copyright   : (c) 2013-2018 Brendan Hay
 -- License     : Mozilla Public License, v. 2.0.
 -- Maintainer  : Brendan Hay <brendan.g.hay@gmail.com>
 -- Stability   : auto-generated
diff --git a/test/Test/AWS/Gen/Athena.hs b/test/Test/AWS/Gen/Athena.hs
--- a/test/Test/AWS/Gen/Athena.hs
+++ b/test/Test/AWS/Gen/Athena.hs
@@ -5,7 +5,7 @@
 
 -- |
 -- Module      : Test.AWS.Gen.Athena
--- Copyright   : (c) 2013-2017 Brendan Hay
+-- Copyright   : (c) 2013-2018 Brendan Hay
 -- License     : Mozilla Public License, v. 2.0.
 -- Maintainer  : Brendan Hay <brendan.g.hay+amazonka@gmail.com>
 -- Stability   : auto-generated