diff --git a/README.md b/README.md
--- a/README.md
+++ b/README.md
@@ -8,7 +8,7 @@
 
 ## Version
 
-`1.4.5`
+`1.5.0`
 
 
 ## Description
diff --git a/amazonka-budgets.cabal b/amazonka-budgets.cabal
--- a/amazonka-budgets.cabal
+++ b/amazonka-budgets.cabal
@@ -1,13 +1,13 @@
 name:                  amazonka-budgets
-version:               1.4.5
+version:               1.5.0
 synopsis:              Amazon Budgets SDK.
 homepage:              https://github.com/brendanhay/amazonka
 bug-reports:           https://github.com/brendanhay/amazonka/issues
-license:               OtherLicense
+license:               MPL-2.0
 license-file:          LICENSE
 author:                Brendan Hay
-maintainer:            Brendan Hay <brendan.g.hay@gmail.com>
-copyright:             Copyright (c) 2013-2016 Brendan Hay
+maintainer:            Brendan Hay <brendan.g.hay+amazonka@gmail.com>
+copyright:             Copyright (c) 2013-2017 Brendan Hay
 category:              Network, AWS, Cloud, Distributed Computing
 build-type:            Simple
 cabal-version:         >= 1.10
@@ -29,14 +29,19 @@
     to get started.
 
 source-repository head
-    type:     git
-    location: git://github.com/brendanhay/amazonka.git
+    type:              git
+    location:          git://github.com/brendanhay/amazonka.git
+    subdir:            amazonka-budgets
 
 library
     default-language:  Haskell2010
     hs-source-dirs:    src gen
 
-    ghc-options:       -Wall
+    ghc-options:
+        -Wall
+        -fwarn-incomplete-uni-patterns
+        -fwarn-incomplete-record-updates
+        -funbox-strict-fields
 
     exposed-modules:
           Network.AWS.Budgets
@@ -61,7 +66,7 @@
         , Network.AWS.Budgets.Types.Sum
 
     build-depends:
-          amazonka-core == 1.4.5.*
+          amazonka-core == 1.5.0.*
         , base          >= 4.7     && < 5
 
 test-suite amazonka-budgets-test
@@ -81,9 +86,9 @@
         , Test.AWS.Budgets.Internal
 
     build-depends:
-          amazonka-core == 1.4.5.*
-        , amazonka-test == 1.4.5.*
-        , amazonka-budgets == 1.4.5.*
+          amazonka-core == 1.5.0.*
+        , amazonka-test == 1.5.0.*
+        , amazonka-budgets
         , base
         , bytestring
         , tasty
diff --git a/gen/Network/AWS/Budgets.hs b/gen/Network/AWS/Budgets.hs
--- a/gen/Network/AWS/Budgets.hs
+++ b/gen/Network/AWS/Budgets.hs
@@ -5,9 +5,9 @@
 
 -- |
 -- Module      : Network.AWS.Budgets
--- Copyright   : (c) 2013-2016 Brendan Hay
+-- Copyright   : (c) 2013-2017 Brendan Hay
 -- License     : Mozilla Public License, v. 2.0.
--- Maintainer  : Brendan Hay <brendan.g.hay@gmail.com>
+-- Maintainer  : Brendan Hay <brendan.g.hay+amazonka@gmail.com>
 -- Stability   : auto-generated
 -- Portability : non-portable (GHC extensions)
 --
@@ -100,6 +100,9 @@
     -- ** SubscriptionType
     , SubscriptionType (..)
 
+    -- ** ThresholdType
+    , ThresholdType (..)
+
     -- ** TimeUnit
     , TimeUnit (..)
 
@@ -131,6 +134,7 @@
     -- ** Notification
     , Notification
     , notification
+    , nThresholdType
     , nNotificationType
     , nComparisonOperator
     , nThreshold
@@ -160,21 +164,21 @@
     , tpEnd
     ) where
 
-import           Network.AWS.Budgets.CreateBudget
-import           Network.AWS.Budgets.CreateNotification
-import           Network.AWS.Budgets.CreateSubscriber
-import           Network.AWS.Budgets.DeleteBudget
-import           Network.AWS.Budgets.DeleteNotification
-import           Network.AWS.Budgets.DeleteSubscriber
-import           Network.AWS.Budgets.DescribeBudget
-import           Network.AWS.Budgets.DescribeBudgets
-import           Network.AWS.Budgets.DescribeNotificationsForBudget
-import           Network.AWS.Budgets.DescribeSubscribersForNotification
-import           Network.AWS.Budgets.Types
-import           Network.AWS.Budgets.UpdateBudget
-import           Network.AWS.Budgets.UpdateNotification
-import           Network.AWS.Budgets.UpdateSubscriber
-import           Network.AWS.Budgets.Waiters
+import Network.AWS.Budgets.CreateBudget
+import Network.AWS.Budgets.CreateNotification
+import Network.AWS.Budgets.CreateSubscriber
+import Network.AWS.Budgets.DeleteBudget
+import Network.AWS.Budgets.DeleteNotification
+import Network.AWS.Budgets.DeleteSubscriber
+import Network.AWS.Budgets.DescribeBudget
+import Network.AWS.Budgets.DescribeBudgets
+import Network.AWS.Budgets.DescribeNotificationsForBudget
+import Network.AWS.Budgets.DescribeSubscribersForNotification
+import Network.AWS.Budgets.Types
+import Network.AWS.Budgets.UpdateBudget
+import Network.AWS.Budgets.UpdateNotification
+import Network.AWS.Budgets.UpdateSubscriber
+import Network.AWS.Budgets.Waiters
 
 {- $errors
 Error matchers are designed for use with the functions provided by
diff --git a/gen/Network/AWS/Budgets/CreateBudget.hs b/gen/Network/AWS/Budgets/CreateBudget.hs
--- a/gen/Network/AWS/Budgets/CreateBudget.hs
+++ b/gen/Network/AWS/Budgets/CreateBudget.hs
@@ -12,9 +12,9 @@
 
 -- |
 -- Module      : Network.AWS.Budgets.CreateBudget
--- Copyright   : (c) 2013-2016 Brendan Hay
+-- Copyright   : (c) 2013-2017 Brendan Hay
 -- License     : Mozilla Public License, v. 2.0.
--- Maintainer  : Brendan Hay <brendan.g.hay@gmail.com>
+-- Maintainer  : Brendan Hay <brendan.g.hay+amazonka@gmail.com>
 -- Stability   : auto-generated
 -- Portability : non-portable (GHC extensions)
 --
@@ -36,22 +36,23 @@
     , cbrsResponseStatus
     ) where
 
-import           Network.AWS.Budgets.Types
-import           Network.AWS.Budgets.Types.Product
-import           Network.AWS.Lens
-import           Network.AWS.Prelude
-import           Network.AWS.Request
-import           Network.AWS.Response
+import Network.AWS.Budgets.Types
+import Network.AWS.Budgets.Types.Product
+import Network.AWS.Lens
+import Network.AWS.Prelude
+import Network.AWS.Request
+import Network.AWS.Response
 
 -- | Request of CreateBudget
 --
 -- /See:/ 'createBudget' smart constructor.
 data CreateBudget = CreateBudget'
-    { _cbNotificationsWithSubscribers :: !(Maybe [NotificationWithSubscribers])
-    , _cbAccountId                    :: !Text
-    , _cbBudget                       :: !Budget
-    } deriving (Eq,Read,Show,Data,Typeable,Generic)
+  { _cbNotificationsWithSubscribers :: !(Maybe [NotificationWithSubscribers])
+  , _cbAccountId                    :: !Text
+  , _cbBudget                       :: !Budget
+  } deriving (Eq, Read, Show, Data, Typeable, Generic)
 
+
 -- | Creates a value of 'CreateBudget' with the minimum fields required to make a request.
 --
 -- Use one of the following lenses to modify other fields as desired:
@@ -66,12 +67,13 @@
     -> Budget -- ^ 'cbBudget'
     -> CreateBudget
 createBudget pAccountId_ pBudget_ =
-    CreateBudget'
-    { _cbNotificationsWithSubscribers = Nothing
-    , _cbAccountId = pAccountId_
-    , _cbBudget = pBudget_
-    }
+  CreateBudget'
+  { _cbNotificationsWithSubscribers = Nothing
+  , _cbAccountId = pAccountId_
+  , _cbBudget = pBudget_
+  }
 
+
 -- | Undocumented member.
 cbNotificationsWithSubscribers :: Lens' CreateBudget [NotificationWithSubscribers]
 cbNotificationsWithSubscribers = lens _cbNotificationsWithSubscribers (\ s a -> s{_cbNotificationsWithSubscribers = a}) . _Default . _Coerce;
@@ -92,9 +94,9 @@
               (\ s h x ->
                  CreateBudgetResponse' <$> (pure (fromEnum s)))
 
-instance Hashable CreateBudget
+instance Hashable CreateBudget where
 
-instance NFData CreateBudget
+instance NFData CreateBudget where
 
 instance ToHeaders CreateBudget where
         toHeaders
@@ -125,9 +127,10 @@
 --
 -- /See:/ 'createBudgetResponse' smart constructor.
 newtype CreateBudgetResponse = CreateBudgetResponse'
-    { _cbrsResponseStatus :: Int
-    } deriving (Eq,Read,Show,Data,Typeable,Generic)
+  { _cbrsResponseStatus :: Int
+  } deriving (Eq, Read, Show, Data, Typeable, Generic)
 
+
 -- | Creates a value of 'CreateBudgetResponse' with the minimum fields required to make a request.
 --
 -- Use one of the following lenses to modify other fields as desired:
@@ -137,12 +140,11 @@
     :: Int -- ^ 'cbrsResponseStatus'
     -> CreateBudgetResponse
 createBudgetResponse pResponseStatus_ =
-    CreateBudgetResponse'
-    { _cbrsResponseStatus = pResponseStatus_
-    }
+  CreateBudgetResponse' {_cbrsResponseStatus = pResponseStatus_}
 
+
 -- | -- | The response status code.
 cbrsResponseStatus :: Lens' CreateBudgetResponse Int
 cbrsResponseStatus = lens _cbrsResponseStatus (\ s a -> s{_cbrsResponseStatus = a});
 
-instance NFData CreateBudgetResponse
+instance NFData CreateBudgetResponse where
diff --git a/gen/Network/AWS/Budgets/CreateNotification.hs b/gen/Network/AWS/Budgets/CreateNotification.hs
--- a/gen/Network/AWS/Budgets/CreateNotification.hs
+++ b/gen/Network/AWS/Budgets/CreateNotification.hs
@@ -12,9 +12,9 @@
 
 -- |
 -- Module      : Network.AWS.Budgets.CreateNotification
--- Copyright   : (c) 2013-2016 Brendan Hay
+-- Copyright   : (c) 2013-2017 Brendan Hay
 -- License     : Mozilla Public License, v. 2.0.
--- Maintainer  : Brendan Hay <brendan.g.hay@gmail.com>
+-- Maintainer  : Brendan Hay <brendan.g.hay+amazonka@gmail.com>
 -- Stability   : auto-generated
 -- Portability : non-portable (GHC extensions)
 --
@@ -37,23 +37,24 @@
     , cnrsResponseStatus
     ) where
 
-import           Network.AWS.Budgets.Types
-import           Network.AWS.Budgets.Types.Product
-import           Network.AWS.Lens
-import           Network.AWS.Prelude
-import           Network.AWS.Request
-import           Network.AWS.Response
+import Network.AWS.Budgets.Types
+import Network.AWS.Budgets.Types.Product
+import Network.AWS.Lens
+import Network.AWS.Prelude
+import Network.AWS.Request
+import Network.AWS.Response
 
 -- | Request of CreateNotification
 --
 -- /See:/ 'createNotification' smart constructor.
 data CreateNotification = CreateNotification'
-    { _cnAccountId    :: !Text
-    , _cnBudgetName   :: !Text
-    , _cnNotification :: !Notification
-    , _cnSubscribers  :: !(List1 Subscriber)
-    } deriving (Eq,Read,Show,Data,Typeable,Generic)
+  { _cnAccountId    :: !Text
+  , _cnBudgetName   :: !Text
+  , _cnNotification :: !Notification
+  , _cnSubscribers  :: !(List1 Subscriber)
+  } deriving (Eq, Read, Show, Data, Typeable, Generic)
 
+
 -- | Creates a value of 'CreateNotification' with the minimum fields required to make a request.
 --
 -- Use one of the following lenses to modify other fields as desired:
@@ -72,13 +73,14 @@
     -> NonEmpty Subscriber -- ^ 'cnSubscribers'
     -> CreateNotification
 createNotification pAccountId_ pBudgetName_ pNotification_ pSubscribers_ =
-    CreateNotification'
-    { _cnAccountId = pAccountId_
-    , _cnBudgetName = pBudgetName_
-    , _cnNotification = pNotification_
-    , _cnSubscribers = _List1 # pSubscribers_
-    }
+  CreateNotification'
+  { _cnAccountId = pAccountId_
+  , _cnBudgetName = pBudgetName_
+  , _cnNotification = pNotification_
+  , _cnSubscribers = _List1 # pSubscribers_
+  }
 
+
 -- | Undocumented member.
 cnAccountId :: Lens' CreateNotification Text
 cnAccountId = lens _cnAccountId (\ s a -> s{_cnAccountId = a});
@@ -104,9 +106,9 @@
               (\ s h x ->
                  CreateNotificationResponse' <$> (pure (fromEnum s)))
 
-instance Hashable CreateNotification
+instance Hashable CreateNotification where
 
-instance NFData CreateNotification
+instance NFData CreateNotification where
 
 instance ToHeaders CreateNotification where
         toHeaders
@@ -137,9 +139,10 @@
 --
 -- /See:/ 'createNotificationResponse' smart constructor.
 newtype CreateNotificationResponse = CreateNotificationResponse'
-    { _cnrsResponseStatus :: Int
-    } deriving (Eq,Read,Show,Data,Typeable,Generic)
+  { _cnrsResponseStatus :: Int
+  } deriving (Eq, Read, Show, Data, Typeable, Generic)
 
+
 -- | Creates a value of 'CreateNotificationResponse' with the minimum fields required to make a request.
 --
 -- Use one of the following lenses to modify other fields as desired:
@@ -149,12 +152,11 @@
     :: Int -- ^ 'cnrsResponseStatus'
     -> CreateNotificationResponse
 createNotificationResponse pResponseStatus_ =
-    CreateNotificationResponse'
-    { _cnrsResponseStatus = pResponseStatus_
-    }
+  CreateNotificationResponse' {_cnrsResponseStatus = pResponseStatus_}
 
+
 -- | -- | The response status code.
 cnrsResponseStatus :: Lens' CreateNotificationResponse Int
 cnrsResponseStatus = lens _cnrsResponseStatus (\ s a -> s{_cnrsResponseStatus = a});
 
-instance NFData CreateNotificationResponse
+instance NFData CreateNotificationResponse where
diff --git a/gen/Network/AWS/Budgets/CreateSubscriber.hs b/gen/Network/AWS/Budgets/CreateSubscriber.hs
--- a/gen/Network/AWS/Budgets/CreateSubscriber.hs
+++ b/gen/Network/AWS/Budgets/CreateSubscriber.hs
@@ -12,9 +12,9 @@
 
 -- |
 -- Module      : Network.AWS.Budgets.CreateSubscriber
--- Copyright   : (c) 2013-2016 Brendan Hay
+-- Copyright   : (c) 2013-2017 Brendan Hay
 -- License     : Mozilla Public License, v. 2.0.
--- Maintainer  : Brendan Hay <brendan.g.hay@gmail.com>
+-- Maintainer  : Brendan Hay <brendan.g.hay+amazonka@gmail.com>
 -- Stability   : auto-generated
 -- Portability : non-portable (GHC extensions)
 --
@@ -37,23 +37,24 @@
     , csrsResponseStatus
     ) where
 
-import           Network.AWS.Budgets.Types
-import           Network.AWS.Budgets.Types.Product
-import           Network.AWS.Lens
-import           Network.AWS.Prelude
-import           Network.AWS.Request
-import           Network.AWS.Response
+import Network.AWS.Budgets.Types
+import Network.AWS.Budgets.Types.Product
+import Network.AWS.Lens
+import Network.AWS.Prelude
+import Network.AWS.Request
+import Network.AWS.Response
 
 -- | Request of CreateSubscriber
 --
 -- /See:/ 'createSubscriber' smart constructor.
 data CreateSubscriber = CreateSubscriber'
-    { _csAccountId    :: !Text
-    , _csBudgetName   :: !Text
-    , _csNotification :: !Notification
-    , _csSubscriber   :: !Subscriber
-    } deriving (Eq,Read,Show,Data,Typeable,Generic)
+  { _csAccountId    :: !Text
+  , _csBudgetName   :: !Text
+  , _csNotification :: !Notification
+  , _csSubscriber   :: !Subscriber
+  } deriving (Eq, Read, Show, Data, Typeable, Generic)
 
+
 -- | Creates a value of 'CreateSubscriber' with the minimum fields required to make a request.
 --
 -- Use one of the following lenses to modify other fields as desired:
@@ -72,13 +73,14 @@
     -> Subscriber -- ^ 'csSubscriber'
     -> CreateSubscriber
 createSubscriber pAccountId_ pBudgetName_ pNotification_ pSubscriber_ =
-    CreateSubscriber'
-    { _csAccountId = pAccountId_
-    , _csBudgetName = pBudgetName_
-    , _csNotification = pNotification_
-    , _csSubscriber = pSubscriber_
-    }
+  CreateSubscriber'
+  { _csAccountId = pAccountId_
+  , _csBudgetName = pBudgetName_
+  , _csNotification = pNotification_
+  , _csSubscriber = pSubscriber_
+  }
 
+
 -- | Undocumented member.
 csAccountId :: Lens' CreateSubscriber Text
 csAccountId = lens _csAccountId (\ s a -> s{_csAccountId = a});
@@ -103,9 +105,9 @@
               (\ s h x ->
                  CreateSubscriberResponse' <$> (pure (fromEnum s)))
 
-instance Hashable CreateSubscriber
+instance Hashable CreateSubscriber where
 
-instance NFData CreateSubscriber
+instance NFData CreateSubscriber where
 
 instance ToHeaders CreateSubscriber where
         toHeaders
@@ -136,9 +138,10 @@
 --
 -- /See:/ 'createSubscriberResponse' smart constructor.
 newtype CreateSubscriberResponse = CreateSubscriberResponse'
-    { _csrsResponseStatus :: Int
-    } deriving (Eq,Read,Show,Data,Typeable,Generic)
+  { _csrsResponseStatus :: Int
+  } deriving (Eq, Read, Show, Data, Typeable, Generic)
 
+
 -- | Creates a value of 'CreateSubscriberResponse' with the minimum fields required to make a request.
 --
 -- Use one of the following lenses to modify other fields as desired:
@@ -148,12 +151,11 @@
     :: Int -- ^ 'csrsResponseStatus'
     -> CreateSubscriberResponse
 createSubscriberResponse pResponseStatus_ =
-    CreateSubscriberResponse'
-    { _csrsResponseStatus = pResponseStatus_
-    }
+  CreateSubscriberResponse' {_csrsResponseStatus = pResponseStatus_}
 
+
 -- | -- | The response status code.
 csrsResponseStatus :: Lens' CreateSubscriberResponse Int
 csrsResponseStatus = lens _csrsResponseStatus (\ s a -> s{_csrsResponseStatus = a});
 
-instance NFData CreateSubscriberResponse
+instance NFData CreateSubscriberResponse where
diff --git a/gen/Network/AWS/Budgets/DeleteBudget.hs b/gen/Network/AWS/Budgets/DeleteBudget.hs
--- a/gen/Network/AWS/Budgets/DeleteBudget.hs
+++ b/gen/Network/AWS/Budgets/DeleteBudget.hs
@@ -12,9 +12,9 @@
 
 -- |
 -- Module      : Network.AWS.Budgets.DeleteBudget
--- Copyright   : (c) 2013-2016 Brendan Hay
+-- Copyright   : (c) 2013-2017 Brendan Hay
 -- License     : Mozilla Public License, v. 2.0.
--- Maintainer  : Brendan Hay <brendan.g.hay@gmail.com>
+-- Maintainer  : Brendan Hay <brendan.g.hay+amazonka@gmail.com>
 -- Stability   : auto-generated
 -- Portability : non-portable (GHC extensions)
 --
@@ -35,21 +35,22 @@
     , drsResponseStatus
     ) where
 
-import           Network.AWS.Budgets.Types
-import           Network.AWS.Budgets.Types.Product
-import           Network.AWS.Lens
-import           Network.AWS.Prelude
-import           Network.AWS.Request
-import           Network.AWS.Response
+import Network.AWS.Budgets.Types
+import Network.AWS.Budgets.Types.Product
+import Network.AWS.Lens
+import Network.AWS.Prelude
+import Network.AWS.Request
+import Network.AWS.Response
 
 -- | Request of DeleteBudget
 --
 -- /See:/ 'deleteBudget' smart constructor.
 data DeleteBudget = DeleteBudget'
-    { _dAccountId  :: !Text
-    , _dBudgetName :: !Text
-    } deriving (Eq,Read,Show,Data,Typeable,Generic)
+  { _dAccountId  :: !Text
+  , _dBudgetName :: !Text
+  } deriving (Eq, Read, Show, Data, Typeable, Generic)
 
+
 -- | Creates a value of 'DeleteBudget' with the minimum fields required to make a request.
 --
 -- Use one of the following lenses to modify other fields as desired:
@@ -62,11 +63,9 @@
     -> Text -- ^ 'dBudgetName'
     -> DeleteBudget
 deleteBudget pAccountId_ pBudgetName_ =
-    DeleteBudget'
-    { _dAccountId = pAccountId_
-    , _dBudgetName = pBudgetName_
-    }
+  DeleteBudget' {_dAccountId = pAccountId_, _dBudgetName = pBudgetName_}
 
+
 -- | Undocumented member.
 dAccountId :: Lens' DeleteBudget Text
 dAccountId = lens _dAccountId (\ s a -> s{_dAccountId = a});
@@ -83,9 +82,9 @@
               (\ s h x ->
                  DeleteBudgetResponse' <$> (pure (fromEnum s)))
 
-instance Hashable DeleteBudget
+instance Hashable DeleteBudget where
 
-instance NFData DeleteBudget
+instance NFData DeleteBudget where
 
 instance ToHeaders DeleteBudget where
         toHeaders
@@ -114,9 +113,10 @@
 --
 -- /See:/ 'deleteBudgetResponse' smart constructor.
 newtype DeleteBudgetResponse = DeleteBudgetResponse'
-    { _drsResponseStatus :: Int
-    } deriving (Eq,Read,Show,Data,Typeable,Generic)
+  { _drsResponseStatus :: Int
+  } deriving (Eq, Read, Show, Data, Typeable, Generic)
 
+
 -- | Creates a value of 'DeleteBudgetResponse' with the minimum fields required to make a request.
 --
 -- Use one of the following lenses to modify other fields as desired:
@@ -126,12 +126,11 @@
     :: Int -- ^ 'drsResponseStatus'
     -> DeleteBudgetResponse
 deleteBudgetResponse pResponseStatus_ =
-    DeleteBudgetResponse'
-    { _drsResponseStatus = pResponseStatus_
-    }
+  DeleteBudgetResponse' {_drsResponseStatus = pResponseStatus_}
 
+
 -- | -- | The response status code.
 drsResponseStatus :: Lens' DeleteBudgetResponse Int
 drsResponseStatus = lens _drsResponseStatus (\ s a -> s{_drsResponseStatus = a});
 
-instance NFData DeleteBudgetResponse
+instance NFData DeleteBudgetResponse where
diff --git a/gen/Network/AWS/Budgets/DeleteNotification.hs b/gen/Network/AWS/Budgets/DeleteNotification.hs
--- a/gen/Network/AWS/Budgets/DeleteNotification.hs
+++ b/gen/Network/AWS/Budgets/DeleteNotification.hs
@@ -12,9 +12,9 @@
 
 -- |
 -- Module      : Network.AWS.Budgets.DeleteNotification
--- Copyright   : (c) 2013-2016 Brendan Hay
+-- Copyright   : (c) 2013-2017 Brendan Hay
 -- License     : Mozilla Public License, v. 2.0.
--- Maintainer  : Brendan Hay <brendan.g.hay@gmail.com>
+-- Maintainer  : Brendan Hay <brendan.g.hay+amazonka@gmail.com>
 -- Stability   : auto-generated
 -- Portability : non-portable (GHC extensions)
 --
@@ -36,22 +36,23 @@
     , dnrsResponseStatus
     ) where
 
-import           Network.AWS.Budgets.Types
-import           Network.AWS.Budgets.Types.Product
-import           Network.AWS.Lens
-import           Network.AWS.Prelude
-import           Network.AWS.Request
-import           Network.AWS.Response
+import Network.AWS.Budgets.Types
+import Network.AWS.Budgets.Types.Product
+import Network.AWS.Lens
+import Network.AWS.Prelude
+import Network.AWS.Request
+import Network.AWS.Response
 
 -- | Request of DeleteNotification
 --
 -- /See:/ 'deleteNotification' smart constructor.
 data DeleteNotification = DeleteNotification'
-    { _dnAccountId    :: !Text
-    , _dnBudgetName   :: !Text
-    , _dnNotification :: !Notification
-    } deriving (Eq,Read,Show,Data,Typeable,Generic)
+  { _dnAccountId    :: !Text
+  , _dnBudgetName   :: !Text
+  , _dnNotification :: !Notification
+  } deriving (Eq, Read, Show, Data, Typeable, Generic)
 
+
 -- | Creates a value of 'DeleteNotification' with the minimum fields required to make a request.
 --
 -- Use one of the following lenses to modify other fields as desired:
@@ -67,12 +68,13 @@
     -> Notification -- ^ 'dnNotification'
     -> DeleteNotification
 deleteNotification pAccountId_ pBudgetName_ pNotification_ =
-    DeleteNotification'
-    { _dnAccountId = pAccountId_
-    , _dnBudgetName = pBudgetName_
-    , _dnNotification = pNotification_
-    }
+  DeleteNotification'
+  { _dnAccountId = pAccountId_
+  , _dnBudgetName = pBudgetName_
+  , _dnNotification = pNotification_
+  }
 
+
 -- | Undocumented member.
 dnAccountId :: Lens' DeleteNotification Text
 dnAccountId = lens _dnAccountId (\ s a -> s{_dnAccountId = a});
@@ -94,9 +96,9 @@
               (\ s h x ->
                  DeleteNotificationResponse' <$> (pure (fromEnum s)))
 
-instance Hashable DeleteNotification
+instance Hashable DeleteNotification where
 
-instance NFData DeleteNotification
+instance NFData DeleteNotification where
 
 instance ToHeaders DeleteNotification where
         toHeaders
@@ -126,9 +128,10 @@
 --
 -- /See:/ 'deleteNotificationResponse' smart constructor.
 newtype DeleteNotificationResponse = DeleteNotificationResponse'
-    { _dnrsResponseStatus :: Int
-    } deriving (Eq,Read,Show,Data,Typeable,Generic)
+  { _dnrsResponseStatus :: Int
+  } deriving (Eq, Read, Show, Data, Typeable, Generic)
 
+
 -- | Creates a value of 'DeleteNotificationResponse' with the minimum fields required to make a request.
 --
 -- Use one of the following lenses to modify other fields as desired:
@@ -138,12 +141,11 @@
     :: Int -- ^ 'dnrsResponseStatus'
     -> DeleteNotificationResponse
 deleteNotificationResponse pResponseStatus_ =
-    DeleteNotificationResponse'
-    { _dnrsResponseStatus = pResponseStatus_
-    }
+  DeleteNotificationResponse' {_dnrsResponseStatus = pResponseStatus_}
 
+
 -- | -- | The response status code.
 dnrsResponseStatus :: Lens' DeleteNotificationResponse Int
 dnrsResponseStatus = lens _dnrsResponseStatus (\ s a -> s{_dnrsResponseStatus = a});
 
-instance NFData DeleteNotificationResponse
+instance NFData DeleteNotificationResponse where
diff --git a/gen/Network/AWS/Budgets/DeleteSubscriber.hs b/gen/Network/AWS/Budgets/DeleteSubscriber.hs
--- a/gen/Network/AWS/Budgets/DeleteSubscriber.hs
+++ b/gen/Network/AWS/Budgets/DeleteSubscriber.hs
@@ -12,9 +12,9 @@
 
 -- |
 -- Module      : Network.AWS.Budgets.DeleteSubscriber
--- Copyright   : (c) 2013-2016 Brendan Hay
+-- Copyright   : (c) 2013-2017 Brendan Hay
 -- License     : Mozilla Public License, v. 2.0.
--- Maintainer  : Brendan Hay <brendan.g.hay@gmail.com>
+-- Maintainer  : Brendan Hay <brendan.g.hay+amazonka@gmail.com>
 -- Stability   : auto-generated
 -- Portability : non-portable (GHC extensions)
 --
@@ -37,23 +37,24 @@
     , dsrsResponseStatus
     ) where
 
-import           Network.AWS.Budgets.Types
-import           Network.AWS.Budgets.Types.Product
-import           Network.AWS.Lens
-import           Network.AWS.Prelude
-import           Network.AWS.Request
-import           Network.AWS.Response
+import Network.AWS.Budgets.Types
+import Network.AWS.Budgets.Types.Product
+import Network.AWS.Lens
+import Network.AWS.Prelude
+import Network.AWS.Request
+import Network.AWS.Response
 
 -- | Request of DeleteSubscriber
 --
 -- /See:/ 'deleteSubscriber' smart constructor.
 data DeleteSubscriber = DeleteSubscriber'
-    { _dsAccountId    :: !Text
-    , _dsBudgetName   :: !Text
-    , _dsNotification :: !Notification
-    , _dsSubscriber   :: !Subscriber
-    } deriving (Eq,Read,Show,Data,Typeable,Generic)
+  { _dsAccountId    :: !Text
+  , _dsBudgetName   :: !Text
+  , _dsNotification :: !Notification
+  , _dsSubscriber   :: !Subscriber
+  } deriving (Eq, Read, Show, Data, Typeable, Generic)
 
+
 -- | Creates a value of 'DeleteSubscriber' with the minimum fields required to make a request.
 --
 -- Use one of the following lenses to modify other fields as desired:
@@ -72,13 +73,14 @@
     -> Subscriber -- ^ 'dsSubscriber'
     -> DeleteSubscriber
 deleteSubscriber pAccountId_ pBudgetName_ pNotification_ pSubscriber_ =
-    DeleteSubscriber'
-    { _dsAccountId = pAccountId_
-    , _dsBudgetName = pBudgetName_
-    , _dsNotification = pNotification_
-    , _dsSubscriber = pSubscriber_
-    }
+  DeleteSubscriber'
+  { _dsAccountId = pAccountId_
+  , _dsBudgetName = pBudgetName_
+  , _dsNotification = pNotification_
+  , _dsSubscriber = pSubscriber_
+  }
 
+
 -- | Undocumented member.
 dsAccountId :: Lens' DeleteSubscriber Text
 dsAccountId = lens _dsAccountId (\ s a -> s{_dsAccountId = a});
@@ -103,9 +105,9 @@
               (\ s h x ->
                  DeleteSubscriberResponse' <$> (pure (fromEnum s)))
 
-instance Hashable DeleteSubscriber
+instance Hashable DeleteSubscriber where
 
-instance NFData DeleteSubscriber
+instance NFData DeleteSubscriber where
 
 instance ToHeaders DeleteSubscriber where
         toHeaders
@@ -136,9 +138,10 @@
 --
 -- /See:/ 'deleteSubscriberResponse' smart constructor.
 newtype DeleteSubscriberResponse = DeleteSubscriberResponse'
-    { _dsrsResponseStatus :: Int
-    } deriving (Eq,Read,Show,Data,Typeable,Generic)
+  { _dsrsResponseStatus :: Int
+  } deriving (Eq, Read, Show, Data, Typeable, Generic)
 
+
 -- | Creates a value of 'DeleteSubscriberResponse' with the minimum fields required to make a request.
 --
 -- Use one of the following lenses to modify other fields as desired:
@@ -148,12 +151,11 @@
     :: Int -- ^ 'dsrsResponseStatus'
     -> DeleteSubscriberResponse
 deleteSubscriberResponse pResponseStatus_ =
-    DeleteSubscriberResponse'
-    { _dsrsResponseStatus = pResponseStatus_
-    }
+  DeleteSubscriberResponse' {_dsrsResponseStatus = pResponseStatus_}
 
+
 -- | -- | The response status code.
 dsrsResponseStatus :: Lens' DeleteSubscriberResponse Int
 dsrsResponseStatus = lens _dsrsResponseStatus (\ s a -> s{_dsrsResponseStatus = a});
 
-instance NFData DeleteSubscriberResponse
+instance NFData DeleteSubscriberResponse where
diff --git a/gen/Network/AWS/Budgets/DescribeBudget.hs b/gen/Network/AWS/Budgets/DescribeBudget.hs
--- a/gen/Network/AWS/Budgets/DescribeBudget.hs
+++ b/gen/Network/AWS/Budgets/DescribeBudget.hs
@@ -12,9 +12,9 @@
 
 -- |
 -- Module      : Network.AWS.Budgets.DescribeBudget
--- Copyright   : (c) 2013-2016 Brendan Hay
+-- Copyright   : (c) 2013-2017 Brendan Hay
 -- License     : Mozilla Public License, v. 2.0.
--- Maintainer  : Brendan Hay <brendan.g.hay@gmail.com>
+-- Maintainer  : Brendan Hay <brendan.g.hay+amazonka@gmail.com>
 -- Stability   : auto-generated
 -- Portability : non-portable (GHC extensions)
 --
@@ -36,21 +36,22 @@
     , desrsResponseStatus
     ) where
 
-import           Network.AWS.Budgets.Types
-import           Network.AWS.Budgets.Types.Product
-import           Network.AWS.Lens
-import           Network.AWS.Prelude
-import           Network.AWS.Request
-import           Network.AWS.Response
+import Network.AWS.Budgets.Types
+import Network.AWS.Budgets.Types.Product
+import Network.AWS.Lens
+import Network.AWS.Prelude
+import Network.AWS.Request
+import Network.AWS.Response
 
 -- | Request of DescribeBudget
 --
 -- /See:/ 'describeBudget' smart constructor.
 data DescribeBudget = DescribeBudget'
-    { _desAccountId  :: !Text
-    , _desBudgetName :: !Text
-    } deriving (Eq,Read,Show,Data,Typeable,Generic)
+  { _desAccountId  :: !Text
+  , _desBudgetName :: !Text
+  } deriving (Eq, Read, Show, Data, Typeable, Generic)
 
+
 -- | Creates a value of 'DescribeBudget' with the minimum fields required to make a request.
 --
 -- Use one of the following lenses to modify other fields as desired:
@@ -63,11 +64,9 @@
     -> Text -- ^ 'desBudgetName'
     -> DescribeBudget
 describeBudget pAccountId_ pBudgetName_ =
-    DescribeBudget'
-    { _desAccountId = pAccountId_
-    , _desBudgetName = pBudgetName_
-    }
+  DescribeBudget' {_desAccountId = pAccountId_, _desBudgetName = pBudgetName_}
 
+
 -- | Undocumented member.
 desAccountId :: Lens' DescribeBudget Text
 desAccountId = lens _desAccountId (\ s a -> s{_desAccountId = a});
@@ -85,9 +84,9 @@
                  DescribeBudgetResponse' <$>
                    (x .?> "Budget") <*> (pure (fromEnum s)))
 
-instance Hashable DescribeBudget
+instance Hashable DescribeBudget where
 
-instance NFData DescribeBudget
+instance NFData DescribeBudget where
 
 instance ToHeaders DescribeBudget where
         toHeaders
@@ -116,10 +115,11 @@
 --
 -- /See:/ 'describeBudgetResponse' smart constructor.
 data DescribeBudgetResponse = DescribeBudgetResponse'
-    { _desrsBudget         :: !(Maybe Budget)
-    , _desrsResponseStatus :: !Int
-    } deriving (Eq,Read,Show,Data,Typeable,Generic)
+  { _desrsBudget         :: !(Maybe Budget)
+  , _desrsResponseStatus :: !Int
+  } deriving (Eq, Read, Show, Data, Typeable, Generic)
 
+
 -- | Creates a value of 'DescribeBudgetResponse' with the minimum fields required to make a request.
 --
 -- Use one of the following lenses to modify other fields as desired:
@@ -131,11 +131,10 @@
     :: Int -- ^ 'desrsResponseStatus'
     -> DescribeBudgetResponse
 describeBudgetResponse pResponseStatus_ =
-    DescribeBudgetResponse'
-    { _desrsBudget = Nothing
-    , _desrsResponseStatus = pResponseStatus_
-    }
+  DescribeBudgetResponse'
+  {_desrsBudget = Nothing, _desrsResponseStatus = pResponseStatus_}
 
+
 -- | Undocumented member.
 desrsBudget :: Lens' DescribeBudgetResponse (Maybe Budget)
 desrsBudget = lens _desrsBudget (\ s a -> s{_desrsBudget = a});
@@ -144,4 +143,4 @@
 desrsResponseStatus :: Lens' DescribeBudgetResponse Int
 desrsResponseStatus = lens _desrsResponseStatus (\ s a -> s{_desrsResponseStatus = a});
 
-instance NFData DescribeBudgetResponse
+instance NFData DescribeBudgetResponse where
diff --git a/gen/Network/AWS/Budgets/DescribeBudgets.hs b/gen/Network/AWS/Budgets/DescribeBudgets.hs
--- a/gen/Network/AWS/Budgets/DescribeBudgets.hs
+++ b/gen/Network/AWS/Budgets/DescribeBudgets.hs
@@ -12,9 +12,9 @@
 
 -- |
 -- Module      : Network.AWS.Budgets.DescribeBudgets
--- Copyright   : (c) 2013-2016 Brendan Hay
+-- Copyright   : (c) 2013-2017 Brendan Hay
 -- License     : Mozilla Public License, v. 2.0.
--- Maintainer  : Brendan Hay <brendan.g.hay@gmail.com>
+-- Maintainer  : Brendan Hay <brendan.g.hay+amazonka@gmail.com>
 -- Stability   : auto-generated
 -- Portability : non-portable (GHC extensions)
 --
@@ -38,22 +38,23 @@
     , dbrsResponseStatus
     ) where
 
-import           Network.AWS.Budgets.Types
-import           Network.AWS.Budgets.Types.Product
-import           Network.AWS.Lens
-import           Network.AWS.Prelude
-import           Network.AWS.Request
-import           Network.AWS.Response
+import Network.AWS.Budgets.Types
+import Network.AWS.Budgets.Types.Product
+import Network.AWS.Lens
+import Network.AWS.Prelude
+import Network.AWS.Request
+import Network.AWS.Response
 
 -- | Request of DescribeBudgets
 --
 -- /See:/ 'describeBudgets' smart constructor.
 data DescribeBudgets = DescribeBudgets'
-    { _dbNextToken  :: !(Maybe Text)
-    , _dbMaxResults :: !(Maybe Nat)
-    , _dbAccountId  :: !Text
-    } deriving (Eq,Read,Show,Data,Typeable,Generic)
+  { _dbNextToken  :: !(Maybe Text)
+  , _dbMaxResults :: !(Maybe Nat)
+  , _dbAccountId  :: !Text
+  } deriving (Eq, Read, Show, Data, Typeable, Generic)
 
+
 -- | Creates a value of 'DescribeBudgets' with the minimum fields required to make a request.
 --
 -- Use one of the following lenses to modify other fields as desired:
@@ -67,12 +68,10 @@
     :: Text -- ^ 'dbAccountId'
     -> DescribeBudgets
 describeBudgets pAccountId_ =
-    DescribeBudgets'
-    { _dbNextToken = Nothing
-    , _dbMaxResults = Nothing
-    , _dbAccountId = pAccountId_
-    }
+  DescribeBudgets'
+  {_dbNextToken = Nothing, _dbMaxResults = Nothing, _dbAccountId = pAccountId_}
 
+
 -- | Undocumented member.
 dbNextToken :: Lens' DescribeBudgets (Maybe Text)
 dbNextToken = lens _dbNextToken (\ s a -> s{_dbNextToken = a});
@@ -95,9 +94,9 @@
                    (x .?> "NextToken") <*> (x .?> "Budgets" .!@ mempty)
                      <*> (pure (fromEnum s)))
 
-instance Hashable DescribeBudgets
+instance Hashable DescribeBudgets where
 
-instance NFData DescribeBudgets
+instance NFData DescribeBudgets where
 
 instance ToHeaders DescribeBudgets where
         toHeaders
@@ -127,11 +126,12 @@
 --
 -- /See:/ 'describeBudgetsResponse' smart constructor.
 data DescribeBudgetsResponse = DescribeBudgetsResponse'
-    { _dbrsNextToken      :: !(Maybe Text)
-    , _dbrsBudgets        :: !(Maybe [Budget])
-    , _dbrsResponseStatus :: !Int
-    } deriving (Eq,Read,Show,Data,Typeable,Generic)
+  { _dbrsNextToken      :: !(Maybe Text)
+  , _dbrsBudgets        :: !(Maybe [Budget])
+  , _dbrsResponseStatus :: !Int
+  } deriving (Eq, Read, Show, Data, Typeable, Generic)
 
+
 -- | Creates a value of 'DescribeBudgetsResponse' with the minimum fields required to make a request.
 --
 -- Use one of the following lenses to modify other fields as desired:
@@ -145,12 +145,13 @@
     :: Int -- ^ 'dbrsResponseStatus'
     -> DescribeBudgetsResponse
 describeBudgetsResponse pResponseStatus_ =
-    DescribeBudgetsResponse'
-    { _dbrsNextToken = Nothing
-    , _dbrsBudgets = Nothing
-    , _dbrsResponseStatus = pResponseStatus_
-    }
+  DescribeBudgetsResponse'
+  { _dbrsNextToken = Nothing
+  , _dbrsBudgets = Nothing
+  , _dbrsResponseStatus = pResponseStatus_
+  }
 
+
 -- | Undocumented member.
 dbrsNextToken :: Lens' DescribeBudgetsResponse (Maybe Text)
 dbrsNextToken = lens _dbrsNextToken (\ s a -> s{_dbrsNextToken = a});
@@ -163,4 +164,4 @@
 dbrsResponseStatus :: Lens' DescribeBudgetsResponse Int
 dbrsResponseStatus = lens _dbrsResponseStatus (\ s a -> s{_dbrsResponseStatus = a});
 
-instance NFData DescribeBudgetsResponse
+instance NFData DescribeBudgetsResponse where
diff --git a/gen/Network/AWS/Budgets/DescribeNotificationsForBudget.hs b/gen/Network/AWS/Budgets/DescribeNotificationsForBudget.hs
--- a/gen/Network/AWS/Budgets/DescribeNotificationsForBudget.hs
+++ b/gen/Network/AWS/Budgets/DescribeNotificationsForBudget.hs
@@ -12,9 +12,9 @@
 
 -- |
 -- Module      : Network.AWS.Budgets.DescribeNotificationsForBudget
--- Copyright   : (c) 2013-2016 Brendan Hay
+-- Copyright   : (c) 2013-2017 Brendan Hay
 -- License     : Mozilla Public License, v. 2.0.
--- Maintainer  : Brendan Hay <brendan.g.hay@gmail.com>
+-- Maintainer  : Brendan Hay <brendan.g.hay+amazonka@gmail.com>
 -- Stability   : auto-generated
 -- Portability : non-portable (GHC extensions)
 --
@@ -39,23 +39,24 @@
     , dnfbrsResponseStatus
     ) where
 
-import           Network.AWS.Budgets.Types
-import           Network.AWS.Budgets.Types.Product
-import           Network.AWS.Lens
-import           Network.AWS.Prelude
-import           Network.AWS.Request
-import           Network.AWS.Response
+import Network.AWS.Budgets.Types
+import Network.AWS.Budgets.Types.Product
+import Network.AWS.Lens
+import Network.AWS.Prelude
+import Network.AWS.Request
+import Network.AWS.Response
 
 -- | Request of DescribeNotificationsForBudget
 --
 -- /See:/ 'describeNotificationsForBudget' smart constructor.
 data DescribeNotificationsForBudget = DescribeNotificationsForBudget'
-    { _dnfbNextToken  :: !(Maybe Text)
-    , _dnfbMaxResults :: !(Maybe Nat)
-    , _dnfbAccountId  :: !Text
-    , _dnfbBudgetName :: !Text
-    } deriving (Eq,Read,Show,Data,Typeable,Generic)
+  { _dnfbNextToken  :: !(Maybe Text)
+  , _dnfbMaxResults :: !(Maybe Nat)
+  , _dnfbAccountId  :: !Text
+  , _dnfbBudgetName :: !Text
+  } deriving (Eq, Read, Show, Data, Typeable, Generic)
 
+
 -- | Creates a value of 'DescribeNotificationsForBudget' with the minimum fields required to make a request.
 --
 -- Use one of the following lenses to modify other fields as desired:
@@ -72,13 +73,14 @@
     -> Text -- ^ 'dnfbBudgetName'
     -> DescribeNotificationsForBudget
 describeNotificationsForBudget pAccountId_ pBudgetName_ =
-    DescribeNotificationsForBudget'
-    { _dnfbNextToken = Nothing
-    , _dnfbMaxResults = Nothing
-    , _dnfbAccountId = pAccountId_
-    , _dnfbBudgetName = pBudgetName_
-    }
+  DescribeNotificationsForBudget'
+  { _dnfbNextToken = Nothing
+  , _dnfbMaxResults = Nothing
+  , _dnfbAccountId = pAccountId_
+  , _dnfbBudgetName = pBudgetName_
+  }
 
+
 -- | Undocumented member.
 dnfbNextToken :: Lens' DescribeNotificationsForBudget (Maybe Text)
 dnfbNextToken = lens _dnfbNextToken (\ s a -> s{_dnfbNextToken = a});
@@ -109,8 +111,9 @@
                      <*> (pure (fromEnum s)))
 
 instance Hashable DescribeNotificationsForBudget
+         where
 
-instance NFData DescribeNotificationsForBudget
+instance NFData DescribeNotificationsForBudget where
 
 instance ToHeaders DescribeNotificationsForBudget
          where
@@ -142,11 +145,12 @@
 --
 -- /See:/ 'describeNotificationsForBudgetResponse' smart constructor.
 data DescribeNotificationsForBudgetResponse = DescribeNotificationsForBudgetResponse'
-    { _dnfbrsNextToken      :: !(Maybe Text)
-    , _dnfbrsNotifications  :: !(Maybe [Notification])
-    , _dnfbrsResponseStatus :: !Int
-    } deriving (Eq,Read,Show,Data,Typeable,Generic)
+  { _dnfbrsNextToken      :: !(Maybe Text)
+  , _dnfbrsNotifications  :: !(Maybe [Notification])
+  , _dnfbrsResponseStatus :: !Int
+  } deriving (Eq, Read, Show, Data, Typeable, Generic)
 
+
 -- | Creates a value of 'DescribeNotificationsForBudgetResponse' with the minimum fields required to make a request.
 --
 -- Use one of the following lenses to modify other fields as desired:
@@ -160,12 +164,13 @@
     :: Int -- ^ 'dnfbrsResponseStatus'
     -> DescribeNotificationsForBudgetResponse
 describeNotificationsForBudgetResponse pResponseStatus_ =
-    DescribeNotificationsForBudgetResponse'
-    { _dnfbrsNextToken = Nothing
-    , _dnfbrsNotifications = Nothing
-    , _dnfbrsResponseStatus = pResponseStatus_
-    }
+  DescribeNotificationsForBudgetResponse'
+  { _dnfbrsNextToken = Nothing
+  , _dnfbrsNotifications = Nothing
+  , _dnfbrsResponseStatus = pResponseStatus_
+  }
 
+
 -- | Undocumented member.
 dnfbrsNextToken :: Lens' DescribeNotificationsForBudgetResponse (Maybe Text)
 dnfbrsNextToken = lens _dnfbrsNextToken (\ s a -> s{_dnfbrsNextToken = a});
@@ -179,4 +184,5 @@
 dnfbrsResponseStatus = lens _dnfbrsResponseStatus (\ s a -> s{_dnfbrsResponseStatus = a});
 
 instance NFData
-         DescribeNotificationsForBudgetResponse
+           DescribeNotificationsForBudgetResponse
+         where
diff --git a/gen/Network/AWS/Budgets/DescribeSubscribersForNotification.hs b/gen/Network/AWS/Budgets/DescribeSubscribersForNotification.hs
--- a/gen/Network/AWS/Budgets/DescribeSubscribersForNotification.hs
+++ b/gen/Network/AWS/Budgets/DescribeSubscribersForNotification.hs
@@ -12,9 +12,9 @@
 
 -- |
 -- Module      : Network.AWS.Budgets.DescribeSubscribersForNotification
--- Copyright   : (c) 2013-2016 Brendan Hay
+-- Copyright   : (c) 2013-2017 Brendan Hay
 -- License     : Mozilla Public License, v. 2.0.
--- Maintainer  : Brendan Hay <brendan.g.hay@gmail.com>
+-- Maintainer  : Brendan Hay <brendan.g.hay+amazonka@gmail.com>
 -- Stability   : auto-generated
 -- Portability : non-portable (GHC extensions)
 --
@@ -40,24 +40,25 @@
     , dsfnrsResponseStatus
     ) where
 
-import           Network.AWS.Budgets.Types
-import           Network.AWS.Budgets.Types.Product
-import           Network.AWS.Lens
-import           Network.AWS.Prelude
-import           Network.AWS.Request
-import           Network.AWS.Response
+import Network.AWS.Budgets.Types
+import Network.AWS.Budgets.Types.Product
+import Network.AWS.Lens
+import Network.AWS.Prelude
+import Network.AWS.Request
+import Network.AWS.Response
 
 -- | Request of DescribeSubscribersForNotification
 --
 -- /See:/ 'describeSubscribersForNotification' smart constructor.
 data DescribeSubscribersForNotification = DescribeSubscribersForNotification'
-    { _dsfnNextToken    :: !(Maybe Text)
-    , _dsfnMaxResults   :: !(Maybe Nat)
-    , _dsfnAccountId    :: !Text
-    , _dsfnBudgetName   :: !Text
-    , _dsfnNotification :: !Notification
-    } deriving (Eq,Read,Show,Data,Typeable,Generic)
+  { _dsfnNextToken    :: !(Maybe Text)
+  , _dsfnMaxResults   :: !(Maybe Nat)
+  , _dsfnAccountId    :: !Text
+  , _dsfnBudgetName   :: !Text
+  , _dsfnNotification :: !Notification
+  } deriving (Eq, Read, Show, Data, Typeable, Generic)
 
+
 -- | Creates a value of 'DescribeSubscribersForNotification' with the minimum fields required to make a request.
 --
 -- Use one of the following lenses to modify other fields as desired:
@@ -77,14 +78,15 @@
     -> Notification -- ^ 'dsfnNotification'
     -> DescribeSubscribersForNotification
 describeSubscribersForNotification pAccountId_ pBudgetName_ pNotification_ =
-    DescribeSubscribersForNotification'
-    { _dsfnNextToken = Nothing
-    , _dsfnMaxResults = Nothing
-    , _dsfnAccountId = pAccountId_
-    , _dsfnBudgetName = pBudgetName_
-    , _dsfnNotification = pNotification_
-    }
+  DescribeSubscribersForNotification'
+  { _dsfnNextToken = Nothing
+  , _dsfnMaxResults = Nothing
+  , _dsfnAccountId = pAccountId_
+  , _dsfnBudgetName = pBudgetName_
+  , _dsfnNotification = pNotification_
+  }
 
+
 -- | Undocumented member.
 dsfnNextToken :: Lens' DescribeSubscribersForNotification (Maybe Text)
 dsfnNextToken = lens _dsfnNextToken (\ s a -> s{_dsfnNextToken = a});
@@ -106,7 +108,8 @@
 dsfnNotification = lens _dsfnNotification (\ s a -> s{_dsfnNotification = a});
 
 instance AWSRequest
-         DescribeSubscribersForNotification where
+           DescribeSubscribersForNotification
+         where
         type Rs DescribeSubscribersForNotification =
              DescribeSubscribersForNotificationResponse
         request = postJSON budgets
@@ -118,8 +121,10 @@
                      (pure (fromEnum s)))
 
 instance Hashable DescribeSubscribersForNotification
+         where
 
 instance NFData DescribeSubscribersForNotification
+         where
 
 instance ToHeaders DescribeSubscribersForNotification
          where
@@ -155,11 +160,12 @@
 --
 -- /See:/ 'describeSubscribersForNotificationResponse' smart constructor.
 data DescribeSubscribersForNotificationResponse = DescribeSubscribersForNotificationResponse'
-    { _dsfnrsNextToken      :: !(Maybe Text)
-    , _dsfnrsSubscribers    :: !(Maybe (List1 Subscriber))
-    , _dsfnrsResponseStatus :: !Int
-    } deriving (Eq,Read,Show,Data,Typeable,Generic)
+  { _dsfnrsNextToken      :: !(Maybe Text)
+  , _dsfnrsSubscribers    :: !(Maybe (List1 Subscriber))
+  , _dsfnrsResponseStatus :: !Int
+  } deriving (Eq, Read, Show, Data, Typeable, Generic)
 
+
 -- | Creates a value of 'DescribeSubscribersForNotificationResponse' with the minimum fields required to make a request.
 --
 -- Use one of the following lenses to modify other fields as desired:
@@ -173,12 +179,13 @@
     :: Int -- ^ 'dsfnrsResponseStatus'
     -> DescribeSubscribersForNotificationResponse
 describeSubscribersForNotificationResponse pResponseStatus_ =
-    DescribeSubscribersForNotificationResponse'
-    { _dsfnrsNextToken = Nothing
-    , _dsfnrsSubscribers = Nothing
-    , _dsfnrsResponseStatus = pResponseStatus_
-    }
+  DescribeSubscribersForNotificationResponse'
+  { _dsfnrsNextToken = Nothing
+  , _dsfnrsSubscribers = Nothing
+  , _dsfnrsResponseStatus = pResponseStatus_
+  }
 
+
 -- | Undocumented member.
 dsfnrsNextToken :: Lens' DescribeSubscribersForNotificationResponse (Maybe Text)
 dsfnrsNextToken = lens _dsfnrsNextToken (\ s a -> s{_dsfnrsNextToken = a});
@@ -192,4 +199,5 @@
 dsfnrsResponseStatus = lens _dsfnrsResponseStatus (\ s a -> s{_dsfnrsResponseStatus = a});
 
 instance NFData
-         DescribeSubscribersForNotificationResponse
+           DescribeSubscribersForNotificationResponse
+         where
diff --git a/gen/Network/AWS/Budgets/Types.hs b/gen/Network/AWS/Budgets/Types.hs
--- a/gen/Network/AWS/Budgets/Types.hs
+++ b/gen/Network/AWS/Budgets/Types.hs
@@ -4,9 +4,9 @@
 
 -- |
 -- Module      : Network.AWS.Budgets.Types
--- Copyright   : (c) 2013-2016 Brendan Hay
+-- Copyright   : (c) 2013-2017 Brendan Hay
 -- License     : Mozilla Public License, v. 2.0.
--- Maintainer  : Brendan Hay <brendan.g.hay@gmail.com>
+-- Maintainer  : Brendan Hay <brendan.g.hay+amazonka@gmail.com>
 -- Stability   : auto-generated
 -- Portability : non-portable (GHC extensions)
 --
@@ -36,6 +36,9 @@
     -- * SubscriptionType
     , SubscriptionType (..)
 
+    -- * ThresholdType
+    , ThresholdType (..)
+
     -- * TimeUnit
     , TimeUnit (..)
 
@@ -67,6 +70,7 @@
     -- * Notification
     , Notification
     , notification
+    , nThresholdType
     , nNotificationType
     , nComparisonOperator
     , nThreshold
@@ -96,38 +100,40 @@
     , tpEnd
     ) where
 
-import           Network.AWS.Budgets.Types.Product
-import           Network.AWS.Budgets.Types.Sum
-import           Network.AWS.Lens
-import           Network.AWS.Prelude
-import           Network.AWS.Sign.V4
+import Network.AWS.Budgets.Types.Product
+import Network.AWS.Budgets.Types.Sum
+import Network.AWS.Lens
+import Network.AWS.Prelude
+import Network.AWS.Sign.V4
 
 -- | API version @2016-10-20@ of the Amazon Budgets SDK configuration.
 budgets :: Service
 budgets =
-    Service
-    { _svcAbbrev = "Budgets"
-    , _svcSigner = v4
-    , _svcPrefix = "budgets"
-    , _svcVersion = "2016-10-20"
-    , _svcEndpoint = defaultEndpoint budgets
-    , _svcTimeout = Just 70
-    , _svcCheck = statusSuccess
-    , _svcError = parseJSONError "Budgets"
-    , _svcRetry = retry
-    }
+  Service
+  { _svcAbbrev = "Budgets"
+  , _svcSigner = v4
+  , _svcPrefix = "budgets"
+  , _svcVersion = "2016-10-20"
+  , _svcEndpoint = defaultEndpoint budgets
+  , _svcTimeout = Just 70
+  , _svcCheck = statusSuccess
+  , _svcError = parseJSONError "Budgets"
+  , _svcRetry = retry
+  }
   where
     retry =
-        Exponential
-        { _retryBase = 5.0e-2
-        , _retryGrowth = 2
-        , _retryAttempts = 5
-        , _retryCheck = check
-        }
+      Exponential
+      { _retryBase = 5.0e-2
+      , _retryGrowth = 2
+      , _retryAttempts = 5
+      , _retryCheck = check
+      }
     check e
+      | has (hasCode "ThrottledException" . hasStatus 400) e =
+        Just "throttled_exception"
       | has (hasStatus 429) e = Just "too_many_requests"
       | has (hasCode "ThrottlingException" . hasStatus 400) e =
-          Just "throttling_exception"
+        Just "throttling_exception"
       | has (hasCode "Throttling" . hasStatus 400) e = Just "throttling"
       | has (hasStatus 504) e = Just "gateway_timeout"
       | has (hasStatus 502) e = Just "bad_gateway"
@@ -136,34 +142,43 @@
       | has (hasStatus 509) e = Just "limit_exceeded"
       | otherwise = Nothing
 
+
 -- | This exception is thrown if any request is given an invalid parameter. E.g., if a required Date field is null.
 _InvalidParameterException :: AsError a => Getting (First ServiceError) a ServiceError
 _InvalidParameterException =
-    _ServiceError . hasCode "InvalidParameterException"
+  _MatchServiceError budgets "InvalidParameterException"
 
+
 -- | This exception is thrown on an unknown internal failure.
 _InternalErrorException :: AsError a => Getting (First ServiceError) a ServiceError
-_InternalErrorException = _ServiceError . hasCode "InternalErrorException"
+_InternalErrorException = _MatchServiceError budgets "InternalErrorException"
 
+
 -- | This exception is thrown if the paging token is expired - past its TTL
 _ExpiredNextTokenException :: AsError a => Getting (First ServiceError) a ServiceError
 _ExpiredNextTokenException =
-    _ServiceError . hasCode "ExpiredNextTokenException"
+  _MatchServiceError budgets "ExpiredNextTokenException"
 
+
 -- | This exception is thrown if a requested entity is not found. E.g., if a budget id doesn't exist for an account ID.
 _NotFoundException :: AsError a => Getting (First ServiceError) a ServiceError
-_NotFoundException = _ServiceError . hasCode "NotFoundException"
+_NotFoundException = _MatchServiceError budgets "NotFoundException"
 
+
 -- | This exception is thrown if paging token signature didn't match the token, or the paging token isn't for this request
 _InvalidNextTokenException :: AsError a => Getting (First ServiceError) a ServiceError
 _InvalidNextTokenException =
-    _ServiceError . hasCode "InvalidNextTokenException"
+  _MatchServiceError budgets "InvalidNextTokenException"
 
+
 -- | The exception is thrown when customer tries to create a record (e.g. budget) that already exists.
 _DuplicateRecordException :: AsError a => Getting (First ServiceError) a ServiceError
-_DuplicateRecordException = _ServiceError . hasCode "DuplicateRecordException"
+_DuplicateRecordException =
+  _MatchServiceError budgets "DuplicateRecordException"
 
+
 -- | The exception is thrown when customer tries to create a record (e.g. budget), but the number this record already exceeds the limitation.
 _CreationLimitExceededException :: AsError a => Getting (First ServiceError) a ServiceError
 _CreationLimitExceededException =
-    _ServiceError . hasCode "CreationLimitExceededException"
+  _MatchServiceError budgets "CreationLimitExceededException"
+
diff --git a/gen/Network/AWS/Budgets/Types/Product.hs b/gen/Network/AWS/Budgets/Types/Product.hs
--- a/gen/Network/AWS/Budgets/Types/Product.hs
+++ b/gen/Network/AWS/Budgets/Types/Product.hs
@@ -9,32 +9,33 @@
 
 -- |
 -- Module      : Network.AWS.Budgets.Types.Product
--- Copyright   : (c) 2013-2016 Brendan Hay
+-- Copyright   : (c) 2013-2017 Brendan Hay
 -- License     : Mozilla Public License, v. 2.0.
--- Maintainer  : Brendan Hay <brendan.g.hay@gmail.com>
+-- Maintainer  : Brendan Hay <brendan.g.hay+amazonka@gmail.com>
 -- Stability   : auto-generated
 -- Portability : non-portable (GHC extensions)
 --
 module Network.AWS.Budgets.Types.Product where
 
-import           Network.AWS.Budgets.Types.Sum
-import           Network.AWS.Lens
-import           Network.AWS.Prelude
+import Network.AWS.Budgets.Types.Sum
+import Network.AWS.Lens
+import Network.AWS.Prelude
 
 -- | AWS Budget model
 --
 -- /See:/ 'budget' smart constructor.
 data Budget = Budget'
-    { _bCalculatedSpend :: !(Maybe CalculatedSpend)
-    , _bCostFilters     :: !(Maybe (Map Text [Text]))
-    , _bBudgetName      :: !Text
-    , _bBudgetLimit     :: !Spend
-    , _bCostTypes       :: !CostTypes
-    , _bTimeUnit        :: !TimeUnit
-    , _bTimePeriod      :: !TimePeriod
-    , _bBudgetType      :: !BudgetType
-    } deriving (Eq,Read,Show,Data,Typeable,Generic)
+  { _bCalculatedSpend :: !(Maybe CalculatedSpend)
+  , _bCostFilters     :: !(Maybe (Map Text [Text]))
+  , _bBudgetName      :: !Text
+  , _bBudgetLimit     :: !Spend
+  , _bCostTypes       :: !CostTypes
+  , _bTimeUnit        :: !TimeUnit
+  , _bTimePeriod      :: !TimePeriod
+  , _bBudgetType      :: !BudgetType
+  } deriving (Eq, Read, Show, Data, Typeable, Generic)
 
+
 -- | Creates a value of 'Budget' with the minimum fields required to make a request.
 --
 -- Use one of the following lenses to modify other fields as desired:
@@ -63,17 +64,18 @@
     -> BudgetType -- ^ 'bBudgetType'
     -> Budget
 budget pBudgetName_ pBudgetLimit_ pCostTypes_ pTimeUnit_ pTimePeriod_ pBudgetType_ =
-    Budget'
-    { _bCalculatedSpend = Nothing
-    , _bCostFilters = Nothing
-    , _bBudgetName = pBudgetName_
-    , _bBudgetLimit = pBudgetLimit_
-    , _bCostTypes = pCostTypes_
-    , _bTimeUnit = pTimeUnit_
-    , _bTimePeriod = pTimePeriod_
-    , _bBudgetType = pBudgetType_
-    }
+  Budget'
+  { _bCalculatedSpend = Nothing
+  , _bCostFilters = Nothing
+  , _bBudgetName = pBudgetName_
+  , _bBudgetLimit = pBudgetLimit_
+  , _bCostTypes = pCostTypes_
+  , _bTimeUnit = pTimeUnit_
+  , _bTimePeriod = pTimePeriod_
+  , _bBudgetType = pBudgetType_
+  }
 
+
 -- | Undocumented member.
 bCalculatedSpend :: Lens' Budget (Maybe CalculatedSpend)
 bCalculatedSpend = lens _bCalculatedSpend (\ s a -> s{_bCalculatedSpend = a});
@@ -120,9 +122,9 @@
                      <*> (x .: "TimePeriod")
                      <*> (x .: "BudgetType"))
 
-instance Hashable Budget
+instance Hashable Budget where
 
-instance NFData Budget
+instance NFData Budget where
 
 instance ToJSON Budget where
         toJSON Budget'{..}
@@ -137,14 +139,15 @@
                   Just ("TimePeriod" .= _bTimePeriod),
                   Just ("BudgetType" .= _bBudgetType)])
 
--- | A structure holds the actual and forecasted spend for a budget.
+-- | A structure that holds the actual and forecasted spend for a budget.
 --
 -- /See:/ 'calculatedSpend' smart constructor.
 data CalculatedSpend = CalculatedSpend'
-    { _csForecastedSpend :: !(Maybe Spend)
-    , _csActualSpend     :: !Spend
-    } deriving (Eq,Read,Show,Data,Typeable,Generic)
+  { _csForecastedSpend :: !(Maybe Spend)
+  , _csActualSpend     :: !Spend
+  } deriving (Eq, Read, Show, Data, Typeable, Generic)
 
+
 -- | Creates a value of 'CalculatedSpend' with the minimum fields required to make a request.
 --
 -- Use one of the following lenses to modify other fields as desired:
@@ -156,11 +159,10 @@
     :: Spend -- ^ 'csActualSpend'
     -> CalculatedSpend
 calculatedSpend pActualSpend_ =
-    CalculatedSpend'
-    { _csForecastedSpend = Nothing
-    , _csActualSpend = pActualSpend_
-    }
+  CalculatedSpend'
+  {_csForecastedSpend = Nothing, _csActualSpend = pActualSpend_}
 
+
 -- | Undocumented member.
 csForecastedSpend :: Lens' CalculatedSpend (Maybe Spend)
 csForecastedSpend = lens _csForecastedSpend (\ s a -> s{_csForecastedSpend = a});
@@ -176,9 +178,9 @@
                  CalculatedSpend' <$>
                    (x .:? "ForecastedSpend") <*> (x .: "ActualSpend"))
 
-instance Hashable CalculatedSpend
+instance Hashable CalculatedSpend where
 
-instance NFData CalculatedSpend
+instance NFData CalculatedSpend where
 
 instance ToJSON CalculatedSpend where
         toJSON CalculatedSpend'{..}
@@ -191,11 +193,12 @@
 --
 -- /See:/ 'costTypes' smart constructor.
 data CostTypes = CostTypes'
-    { _ctIncludeTax          :: !Bool
-    , _ctIncludeSubscription :: !Bool
-    , _ctUseBlended          :: !Bool
-    } deriving (Eq,Read,Show,Data,Typeable,Generic)
+  { _ctIncludeTax          :: !Bool
+  , _ctIncludeSubscription :: !Bool
+  , _ctUseBlended          :: !Bool
+  } deriving (Eq, Read, Show, Data, Typeable, Generic)
 
+
 -- | Creates a value of 'CostTypes' with the minimum fields required to make a request.
 --
 -- Use one of the following lenses to modify other fields as desired:
@@ -211,12 +214,13 @@
     -> Bool -- ^ 'ctUseBlended'
     -> CostTypes
 costTypes pIncludeTax_ pIncludeSubscription_ pUseBlended_ =
-    CostTypes'
-    { _ctIncludeTax = pIncludeTax_
-    , _ctIncludeSubscription = pIncludeSubscription_
-    , _ctUseBlended = pUseBlended_
-    }
+  CostTypes'
+  { _ctIncludeTax = pIncludeTax_
+  , _ctIncludeSubscription = pIncludeSubscription_
+  , _ctUseBlended = pUseBlended_
+  }
 
+
 -- | Undocumented member.
 ctIncludeTax :: Lens' CostTypes Bool
 ctIncludeTax = lens _ctIncludeTax (\ s a -> s{_ctIncludeTax = a});
@@ -237,9 +241,9 @@
                    (x .: "IncludeTax") <*> (x .: "IncludeSubscription")
                      <*> (x .: "UseBlended"))
 
-instance Hashable CostTypes
+instance Hashable CostTypes where
 
-instance NFData CostTypes
+instance NFData CostTypes where
 
 instance ToJSON CostTypes where
         toJSON CostTypes'{..}
@@ -254,15 +258,19 @@
 --
 -- /See:/ 'notification' smart constructor.
 data Notification = Notification'
-    { _nNotificationType   :: !NotificationType
-    , _nComparisonOperator :: !ComparisonOperator
-    , _nThreshold          :: !Double
-    } deriving (Eq,Read,Show,Data,Typeable,Generic)
+  { _nThresholdType      :: !(Maybe ThresholdType)
+  , _nNotificationType   :: !NotificationType
+  , _nComparisonOperator :: !ComparisonOperator
+  , _nThreshold          :: !Double
+  } deriving (Eq, Read, Show, Data, Typeable, Generic)
 
+
 -- | Creates a value of 'Notification' with the minimum fields required to make a request.
 --
 -- Use one of the following lenses to modify other fields as desired:
 --
+-- * 'nThresholdType' - Undocumented member.
+--
 -- * 'nNotificationType' - Undocumented member.
 --
 -- * 'nComparisonOperator' - Undocumented member.
@@ -274,13 +282,19 @@
     -> Double -- ^ 'nThreshold'
     -> Notification
 notification pNotificationType_ pComparisonOperator_ pThreshold_ =
-    Notification'
-    { _nNotificationType = pNotificationType_
-    , _nComparisonOperator = pComparisonOperator_
-    , _nThreshold = pThreshold_
-    }
+  Notification'
+  { _nThresholdType = Nothing
+  , _nNotificationType = pNotificationType_
+  , _nComparisonOperator = pComparisonOperator_
+  , _nThreshold = pThreshold_
+  }
 
+
 -- | Undocumented member.
+nThresholdType :: Lens' Notification (Maybe ThresholdType)
+nThresholdType = lens _nThresholdType (\ s a -> s{_nThresholdType = a});
+
+-- | Undocumented member.
 nNotificationType :: Lens' Notification NotificationType
 nNotificationType = lens _nNotificationType (\ s a -> s{_nNotificationType = a});
 
@@ -297,19 +311,20 @@
           = withObject "Notification"
               (\ x ->
                  Notification' <$>
-                   (x .: "NotificationType") <*>
-                     (x .: "ComparisonOperator")
+                   (x .:? "ThresholdType") <*> (x .: "NotificationType")
+                     <*> (x .: "ComparisonOperator")
                      <*> (x .: "Threshold"))
 
-instance Hashable Notification
+instance Hashable Notification where
 
-instance NFData Notification
+instance NFData Notification where
 
 instance ToJSON Notification where
         toJSON Notification'{..}
           = object
               (catMaybes
-                 [Just ("NotificationType" .= _nNotificationType),
+                 [("ThresholdType" .=) <$> _nThresholdType,
+                  Just ("NotificationType" .= _nNotificationType),
                   Just ("ComparisonOperator" .= _nComparisonOperator),
                   Just ("Threshold" .= _nThreshold)])
 
@@ -317,10 +332,11 @@
 --
 -- /See:/ 'notificationWithSubscribers' smart constructor.
 data NotificationWithSubscribers = NotificationWithSubscribers'
-    { _nwsNotification :: !Notification
-    , _nwsSubscribers  :: !(List1 Subscriber)
-    } deriving (Eq,Read,Show,Data,Typeable,Generic)
+  { _nwsNotification :: !Notification
+  , _nwsSubscribers  :: !(List1 Subscriber)
+  } deriving (Eq, Read, Show, Data, Typeable, Generic)
 
+
 -- | Creates a value of 'NotificationWithSubscribers' with the minimum fields required to make a request.
 --
 -- Use one of the following lenses to modify other fields as desired:
@@ -333,11 +349,10 @@
     -> NonEmpty Subscriber -- ^ 'nwsSubscribers'
     -> NotificationWithSubscribers
 notificationWithSubscribers pNotification_ pSubscribers_ =
-    NotificationWithSubscribers'
-    { _nwsNotification = pNotification_
-    , _nwsSubscribers = _List1 # pSubscribers_
-    }
+  NotificationWithSubscribers'
+  {_nwsNotification = pNotification_, _nwsSubscribers = _List1 # pSubscribers_}
 
+
 -- | Undocumented member.
 nwsNotification :: Lens' NotificationWithSubscribers Notification
 nwsNotification = lens _nwsNotification (\ s a -> s{_nwsNotification = a});
@@ -346,9 +361,9 @@
 nwsSubscribers :: Lens' NotificationWithSubscribers (NonEmpty Subscriber)
 nwsSubscribers = lens _nwsSubscribers (\ s a -> s{_nwsSubscribers = a}) . _List1;
 
-instance Hashable NotificationWithSubscribers
+instance Hashable NotificationWithSubscribers where
 
-instance NFData NotificationWithSubscribers
+instance NFData NotificationWithSubscribers where
 
 instance ToJSON NotificationWithSubscribers where
         toJSON NotificationWithSubscribers'{..}
@@ -357,14 +372,15 @@
                  [Just ("Notification" .= _nwsNotification),
                   Just ("Subscribers" .= _nwsSubscribers)])
 
--- | A structure represent either a cost spend or usage spend. Contains an amount and a unit.
+-- | A structure that represents either a cost spend or usage spend. Contains an amount and a unit.
 --
 -- /See:/ 'spend' smart constructor.
 data Spend = Spend'
-    { _sAmount :: !Text
-    , _sUnit   :: !Text
-    } deriving (Eq,Read,Show,Data,Typeable,Generic)
+  { _sAmount :: !Text
+  , _sUnit   :: !Text
+  } deriving (Eq, Read, Show, Data, Typeable, Generic)
 
+
 -- | Creates a value of 'Spend' with the minimum fields required to make a request.
 --
 -- Use one of the following lenses to modify other fields as desired:
@@ -376,12 +392,9 @@
     :: Text -- ^ 'sAmount'
     -> Text -- ^ 'sUnit'
     -> Spend
-spend pAmount_ pUnit_ =
-    Spend'
-    { _sAmount = pAmount_
-    , _sUnit = pUnit_
-    }
+spend pAmount_ pUnit_ = Spend' {_sAmount = pAmount_, _sUnit = pUnit_}
 
+
 -- | Undocumented member.
 sAmount :: Lens' Spend Text
 sAmount = lens _sAmount (\ s a -> s{_sAmount = a});
@@ -395,9 +408,9 @@
           = withObject "Spend"
               (\ x -> Spend' <$> (x .: "Amount") <*> (x .: "Unit"))
 
-instance Hashable Spend
+instance Hashable Spend where
 
-instance NFData Spend
+instance NFData Spend where
 
 instance ToJSON Spend where
         toJSON Spend'{..}
@@ -410,10 +423,11 @@
 --
 -- /See:/ 'subscriber' smart constructor.
 data Subscriber = Subscriber'
-    { _sSubscriptionType :: !SubscriptionType
-    , _sAddress          :: !Text
-    } deriving (Eq,Read,Show,Data,Typeable,Generic)
+  { _sSubscriptionType :: !SubscriptionType
+  , _sAddress          :: !Text
+  } deriving (Eq, Read, Show, Data, Typeable, Generic)
 
+
 -- | Creates a value of 'Subscriber' with the minimum fields required to make a request.
 --
 -- Use one of the following lenses to modify other fields as desired:
@@ -426,11 +440,9 @@
     -> Text -- ^ 'sAddress'
     -> Subscriber
 subscriber pSubscriptionType_ pAddress_ =
-    Subscriber'
-    { _sSubscriptionType = pSubscriptionType_
-    , _sAddress = pAddress_
-    }
+  Subscriber' {_sSubscriptionType = pSubscriptionType_, _sAddress = pAddress_}
 
+
 -- | Undocumented member.
 sSubscriptionType :: Lens' Subscriber SubscriptionType
 sSubscriptionType = lens _sSubscriptionType (\ s a -> s{_sSubscriptionType = a});
@@ -446,9 +458,9 @@
                  Subscriber' <$>
                    (x .: "SubscriptionType") <*> (x .: "Address"))
 
-instance Hashable Subscriber
+instance Hashable Subscriber where
 
-instance NFData Subscriber
+instance NFData Subscriber where
 
 instance ToJSON Subscriber where
         toJSON Subscriber'{..}
@@ -457,14 +469,15 @@
                  [Just ("SubscriptionType" .= _sSubscriptionType),
                   Just ("Address" .= _sAddress)])
 
--- | A time period indicated the start date and end date of a budget.
+-- | A time period indicating the start date and end date of a budget.
 --
 -- /See:/ 'timePeriod' smart constructor.
 data TimePeriod = TimePeriod'
-    { _tpStart :: !POSIX
-    , _tpEnd   :: !POSIX
-    } deriving (Eq,Read,Show,Data,Typeable,Generic)
+  { _tpStart :: !POSIX
+  , _tpEnd   :: !POSIX
+  } deriving (Eq, Read, Show, Data, Typeable, Generic)
 
+
 -- | Creates a value of 'TimePeriod' with the minimum fields required to make a request.
 --
 -- Use one of the following lenses to modify other fields as desired:
@@ -477,11 +490,9 @@
     -> UTCTime -- ^ 'tpEnd'
     -> TimePeriod
 timePeriod pStart_ pEnd_ =
-    TimePeriod'
-    { _tpStart = _Time # pStart_
-    , _tpEnd = _Time # pEnd_
-    }
+  TimePeriod' {_tpStart = _Time # pStart_, _tpEnd = _Time # pEnd_}
 
+
 -- | Undocumented member.
 tpStart :: Lens' TimePeriod UTCTime
 tpStart = lens _tpStart (\ s a -> s{_tpStart = a}) . _Time;
@@ -496,9 +507,9 @@
               (\ x ->
                  TimePeriod' <$> (x .: "Start") <*> (x .: "End"))
 
-instance Hashable TimePeriod
+instance Hashable TimePeriod where
 
-instance NFData TimePeriod
+instance NFData TimePeriod where
 
 instance ToJSON TimePeriod where
         toJSON TimePeriod'{..}
diff --git a/gen/Network/AWS/Budgets/Types/Sum.hs b/gen/Network/AWS/Budgets/Types/Sum.hs
--- a/gen/Network/AWS/Budgets/Types/Sum.hs
+++ b/gen/Network/AWS/Budgets/Types/Sum.hs
@@ -9,32 +9,36 @@
 
 -- |
 -- Module      : Network.AWS.Budgets.Types.Sum
--- Copyright   : (c) 2013-2016 Brendan Hay
+-- Copyright   : (c) 2013-2017 Brendan Hay
 -- License     : Mozilla Public License, v. 2.0.
--- Maintainer  : Brendan Hay <brendan.g.hay@gmail.com>
+-- Maintainer  : Brendan Hay <brendan.g.hay+amazonka@gmail.com>
 -- Stability   : auto-generated
 -- Portability : non-portable (GHC extensions)
 --
 module Network.AWS.Budgets.Types.Sum where
 
-import           Network.AWS.Prelude
+import Network.AWS.Prelude
 
--- | The type of a budget. Can be COST or USAGE.
+-- | The type of a budget. It should be COST, USAGE, or RI_UTILIZATION.
 data BudgetType
-    = Cost
-    | Usage
-    deriving (Eq,Ord,Read,Show,Enum,Bounded,Data,Typeable,Generic)
+  = Cost
+  | RiUtilization
+  | Usage
+  deriving (Eq, Ord, Read, Show, Enum, Bounded, Data, Typeable, Generic)
 
+
 instance FromText BudgetType where
     parser = takeLowerText >>= \case
         "cost" -> pure Cost
+        "ri_utilization" -> pure RiUtilization
         "usage" -> pure Usage
         e -> fromTextError $ "Failure parsing BudgetType from value: '" <> e
-           <> "'. Accepted values: cost, usage"
+           <> "'. Accepted values: cost, ri_utilization, usage"
 
 instance ToText BudgetType where
     toText = \case
         Cost -> "COST"
+        RiUtilization -> "RI_UTILIZATION"
         Usage -> "USAGE"
 
 instance Hashable     BudgetType
@@ -51,11 +55,12 @@
 
 -- | The comparison operator of a notification. Currently we support less than, equal to and greater than.
 data ComparisonOperator
-    = EqualTo
-    | GreaterThan
-    | LessThan
-    deriving (Eq,Ord,Read,Show,Enum,Bounded,Data,Typeable,Generic)
+  = EqualTo
+  | GreaterThan
+  | LessThan
+  deriving (Eq, Ord, Read, Show, Enum, Bounded, Data, Typeable, Generic)
 
+
 instance FromText ComparisonOperator where
     parser = takeLowerText >>= \case
         "equal_to" -> pure EqualTo
@@ -84,10 +89,11 @@
 
 -- | The type of a notification. It should be ACTUAL or FORECASTED.
 data NotificationType
-    = Actual
-    | Forecasted
-    deriving (Eq,Ord,Read,Show,Enum,Bounded,Data,Typeable,Generic)
+  = Actual
+  | Forecasted
+  deriving (Eq, Ord, Read, Show, Enum, Bounded, Data, Typeable, Generic)
 
+
 instance FromText NotificationType where
     parser = takeLowerText >>= \case
         "actual" -> pure Actual
@@ -114,10 +120,11 @@
 
 -- | The subscription type of the subscriber. It can be SMS or EMAIL.
 data SubscriptionType
-    = Email
-    | SNS
-    deriving (Eq,Ord,Read,Show,Enum,Bounded,Data,Typeable,Generic)
+  = Email
+  | SNS
+  deriving (Eq, Ord, Read, Show, Enum, Bounded, Data, Typeable, Generic)
 
+
 instance FromText SubscriptionType where
     parser = takeLowerText >>= \case
         "email" -> pure Email
@@ -142,24 +149,59 @@
 instance FromJSON SubscriptionType where
     parseJSON = parseJSONText "SubscriptionType"
 
--- | The time unit of the budget. e.g. weekly, monthly, etc.
+-- | The type of threshold for a notification. It can be PERCENTAGE or ABSOLUTE_VALUE.
+data ThresholdType
+  = AbsoluteValue
+  | Percentage
+  deriving (Eq, Ord, Read, Show, Enum, Bounded, Data, Typeable, Generic)
+
+
+instance FromText ThresholdType where
+    parser = takeLowerText >>= \case
+        "absolute_value" -> pure AbsoluteValue
+        "percentage" -> pure Percentage
+        e -> fromTextError $ "Failure parsing ThresholdType from value: '" <> e
+           <> "'. Accepted values: absolute_value, percentage"
+
+instance ToText ThresholdType where
+    toText = \case
+        AbsoluteValue -> "ABSOLUTE_VALUE"
+        Percentage -> "PERCENTAGE"
+
+instance Hashable     ThresholdType
+instance NFData       ThresholdType
+instance ToByteString ThresholdType
+instance ToQuery      ThresholdType
+instance ToHeader     ThresholdType
+
+instance ToJSON ThresholdType where
+    toJSON = toJSONText
+
+instance FromJSON ThresholdType where
+    parseJSON = parseJSONText "ThresholdType"
+
+-- | The time unit of the budget. e.g. MONTHLY, QUARTERLY, etc.
 data TimeUnit
-    = Annually
-    | Monthly
-    | Quarterly
-    deriving (Eq,Ord,Read,Show,Enum,Bounded,Data,Typeable,Generic)
+  = Annually
+  | Daily
+  | Monthly
+  | Quarterly
+  deriving (Eq, Ord, Read, Show, Enum, Bounded, Data, Typeable, Generic)
 
+
 instance FromText TimeUnit where
     parser = takeLowerText >>= \case
         "annually" -> pure Annually
+        "daily" -> pure Daily
         "monthly" -> pure Monthly
         "quarterly" -> pure Quarterly
         e -> fromTextError $ "Failure parsing TimeUnit from value: '" <> e
-           <> "'. Accepted values: annually, monthly, quarterly"
+           <> "'. Accepted values: annually, daily, monthly, quarterly"
 
 instance ToText TimeUnit where
     toText = \case
         Annually -> "ANNUALLY"
+        Daily -> "DAILY"
         Monthly -> "MONTHLY"
         Quarterly -> "QUARTERLY"
 
diff --git a/gen/Network/AWS/Budgets/UpdateBudget.hs b/gen/Network/AWS/Budgets/UpdateBudget.hs
--- a/gen/Network/AWS/Budgets/UpdateBudget.hs
+++ b/gen/Network/AWS/Budgets/UpdateBudget.hs
@@ -12,9 +12,9 @@
 
 -- |
 -- Module      : Network.AWS.Budgets.UpdateBudget
--- Copyright   : (c) 2013-2016 Brendan Hay
+-- Copyright   : (c) 2013-2017 Brendan Hay
 -- License     : Mozilla Public License, v. 2.0.
--- Maintainer  : Brendan Hay <brendan.g.hay@gmail.com>
+-- Maintainer  : Brendan Hay <brendan.g.hay+amazonka@gmail.com>
 -- Stability   : auto-generated
 -- Portability : non-portable (GHC extensions)
 --
@@ -35,21 +35,22 @@
     , ubrsResponseStatus
     ) where
 
-import           Network.AWS.Budgets.Types
-import           Network.AWS.Budgets.Types.Product
-import           Network.AWS.Lens
-import           Network.AWS.Prelude
-import           Network.AWS.Request
-import           Network.AWS.Response
+import Network.AWS.Budgets.Types
+import Network.AWS.Budgets.Types.Product
+import Network.AWS.Lens
+import Network.AWS.Prelude
+import Network.AWS.Request
+import Network.AWS.Response
 
 -- | Request of UpdateBudget
 --
 -- /See:/ 'updateBudget' smart constructor.
 data UpdateBudget = UpdateBudget'
-    { _ubAccountId :: !Text
-    , _ubNewBudget :: !Budget
-    } deriving (Eq,Read,Show,Data,Typeable,Generic)
+  { _ubAccountId :: !Text
+  , _ubNewBudget :: !Budget
+  } deriving (Eq, Read, Show, Data, Typeable, Generic)
 
+
 -- | Creates a value of 'UpdateBudget' with the minimum fields required to make a request.
 --
 -- Use one of the following lenses to modify other fields as desired:
@@ -62,11 +63,9 @@
     -> Budget -- ^ 'ubNewBudget'
     -> UpdateBudget
 updateBudget pAccountId_ pNewBudget_ =
-    UpdateBudget'
-    { _ubAccountId = pAccountId_
-    , _ubNewBudget = pNewBudget_
-    }
+  UpdateBudget' {_ubAccountId = pAccountId_, _ubNewBudget = pNewBudget_}
 
+
 -- | Undocumented member.
 ubAccountId :: Lens' UpdateBudget Text
 ubAccountId = lens _ubAccountId (\ s a -> s{_ubAccountId = a});
@@ -83,9 +82,9 @@
               (\ s h x ->
                  UpdateBudgetResponse' <$> (pure (fromEnum s)))
 
-instance Hashable UpdateBudget
+instance Hashable UpdateBudget where
 
-instance NFData UpdateBudget
+instance NFData UpdateBudget where
 
 instance ToHeaders UpdateBudget where
         toHeaders
@@ -114,9 +113,10 @@
 --
 -- /See:/ 'updateBudgetResponse' smart constructor.
 newtype UpdateBudgetResponse = UpdateBudgetResponse'
-    { _ubrsResponseStatus :: Int
-    } deriving (Eq,Read,Show,Data,Typeable,Generic)
+  { _ubrsResponseStatus :: Int
+  } deriving (Eq, Read, Show, Data, Typeable, Generic)
 
+
 -- | Creates a value of 'UpdateBudgetResponse' with the minimum fields required to make a request.
 --
 -- Use one of the following lenses to modify other fields as desired:
@@ -126,12 +126,11 @@
     :: Int -- ^ 'ubrsResponseStatus'
     -> UpdateBudgetResponse
 updateBudgetResponse pResponseStatus_ =
-    UpdateBudgetResponse'
-    { _ubrsResponseStatus = pResponseStatus_
-    }
+  UpdateBudgetResponse' {_ubrsResponseStatus = pResponseStatus_}
 
+
 -- | -- | The response status code.
 ubrsResponseStatus :: Lens' UpdateBudgetResponse Int
 ubrsResponseStatus = lens _ubrsResponseStatus (\ s a -> s{_ubrsResponseStatus = a});
 
-instance NFData UpdateBudgetResponse
+instance NFData UpdateBudgetResponse where
diff --git a/gen/Network/AWS/Budgets/UpdateNotification.hs b/gen/Network/AWS/Budgets/UpdateNotification.hs
--- a/gen/Network/AWS/Budgets/UpdateNotification.hs
+++ b/gen/Network/AWS/Budgets/UpdateNotification.hs
@@ -12,9 +12,9 @@
 
 -- |
 -- Module      : Network.AWS.Budgets.UpdateNotification
--- Copyright   : (c) 2013-2016 Brendan Hay
+-- Copyright   : (c) 2013-2017 Brendan Hay
 -- License     : Mozilla Public License, v. 2.0.
--- Maintainer  : Brendan Hay <brendan.g.hay@gmail.com>
+-- Maintainer  : Brendan Hay <brendan.g.hay+amazonka@gmail.com>
 -- Stability   : auto-generated
 -- Portability : non-portable (GHC extensions)
 --
@@ -37,23 +37,24 @@
     , unrsResponseStatus
     ) where
 
-import           Network.AWS.Budgets.Types
-import           Network.AWS.Budgets.Types.Product
-import           Network.AWS.Lens
-import           Network.AWS.Prelude
-import           Network.AWS.Request
-import           Network.AWS.Response
+import Network.AWS.Budgets.Types
+import Network.AWS.Budgets.Types.Product
+import Network.AWS.Lens
+import Network.AWS.Prelude
+import Network.AWS.Request
+import Network.AWS.Response
 
 -- | Request of UpdateNotification
 --
 -- /See:/ 'updateNotification' smart constructor.
 data UpdateNotification = UpdateNotification'
-    { _unAccountId       :: !Text
-    , _unBudgetName      :: !Text
-    , _unOldNotification :: !Notification
-    , _unNewNotification :: !Notification
-    } deriving (Eq,Read,Show,Data,Typeable,Generic)
+  { _unAccountId       :: !Text
+  , _unBudgetName      :: !Text
+  , _unOldNotification :: !Notification
+  , _unNewNotification :: !Notification
+  } deriving (Eq, Read, Show, Data, Typeable, Generic)
 
+
 -- | Creates a value of 'UpdateNotification' with the minimum fields required to make a request.
 --
 -- Use one of the following lenses to modify other fields as desired:
@@ -72,13 +73,14 @@
     -> Notification -- ^ 'unNewNotification'
     -> UpdateNotification
 updateNotification pAccountId_ pBudgetName_ pOldNotification_ pNewNotification_ =
-    UpdateNotification'
-    { _unAccountId = pAccountId_
-    , _unBudgetName = pBudgetName_
-    , _unOldNotification = pOldNotification_
-    , _unNewNotification = pNewNotification_
-    }
+  UpdateNotification'
+  { _unAccountId = pAccountId_
+  , _unBudgetName = pBudgetName_
+  , _unOldNotification = pOldNotification_
+  , _unNewNotification = pNewNotification_
+  }
 
+
 -- | Undocumented member.
 unAccountId :: Lens' UpdateNotification Text
 unAccountId = lens _unAccountId (\ s a -> s{_unAccountId = a});
@@ -104,9 +106,9 @@
               (\ s h x ->
                  UpdateNotificationResponse' <$> (pure (fromEnum s)))
 
-instance Hashable UpdateNotification
+instance Hashable UpdateNotification where
 
-instance NFData UpdateNotification
+instance NFData UpdateNotification where
 
 instance ToHeaders UpdateNotification where
         toHeaders
@@ -137,9 +139,10 @@
 --
 -- /See:/ 'updateNotificationResponse' smart constructor.
 newtype UpdateNotificationResponse = UpdateNotificationResponse'
-    { _unrsResponseStatus :: Int
-    } deriving (Eq,Read,Show,Data,Typeable,Generic)
+  { _unrsResponseStatus :: Int
+  } deriving (Eq, Read, Show, Data, Typeable, Generic)
 
+
 -- | Creates a value of 'UpdateNotificationResponse' with the minimum fields required to make a request.
 --
 -- Use one of the following lenses to modify other fields as desired:
@@ -149,12 +152,11 @@
     :: Int -- ^ 'unrsResponseStatus'
     -> UpdateNotificationResponse
 updateNotificationResponse pResponseStatus_ =
-    UpdateNotificationResponse'
-    { _unrsResponseStatus = pResponseStatus_
-    }
+  UpdateNotificationResponse' {_unrsResponseStatus = pResponseStatus_}
 
+
 -- | -- | The response status code.
 unrsResponseStatus :: Lens' UpdateNotificationResponse Int
 unrsResponseStatus = lens _unrsResponseStatus (\ s a -> s{_unrsResponseStatus = a});
 
-instance NFData UpdateNotificationResponse
+instance NFData UpdateNotificationResponse where
diff --git a/gen/Network/AWS/Budgets/UpdateSubscriber.hs b/gen/Network/AWS/Budgets/UpdateSubscriber.hs
--- a/gen/Network/AWS/Budgets/UpdateSubscriber.hs
+++ b/gen/Network/AWS/Budgets/UpdateSubscriber.hs
@@ -12,9 +12,9 @@
 
 -- |
 -- Module      : Network.AWS.Budgets.UpdateSubscriber
--- Copyright   : (c) 2013-2016 Brendan Hay
+-- Copyright   : (c) 2013-2017 Brendan Hay
 -- License     : Mozilla Public License, v. 2.0.
--- Maintainer  : Brendan Hay <brendan.g.hay@gmail.com>
+-- Maintainer  : Brendan Hay <brendan.g.hay+amazonka@gmail.com>
 -- Stability   : auto-generated
 -- Portability : non-portable (GHC extensions)
 --
@@ -38,24 +38,25 @@
     , usrsResponseStatus
     ) where
 
-import           Network.AWS.Budgets.Types
-import           Network.AWS.Budgets.Types.Product
-import           Network.AWS.Lens
-import           Network.AWS.Prelude
-import           Network.AWS.Request
-import           Network.AWS.Response
+import Network.AWS.Budgets.Types
+import Network.AWS.Budgets.Types.Product
+import Network.AWS.Lens
+import Network.AWS.Prelude
+import Network.AWS.Request
+import Network.AWS.Response
 
 -- | Request of UpdateSubscriber
 --
 -- /See:/ 'updateSubscriber' smart constructor.
 data UpdateSubscriber = UpdateSubscriber'
-    { _usAccountId     :: !Text
-    , _usBudgetName    :: !Text
-    , _usNotification  :: !Notification
-    , _usOldSubscriber :: !Subscriber
-    , _usNewSubscriber :: !Subscriber
-    } deriving (Eq,Read,Show,Data,Typeable,Generic)
+  { _usAccountId     :: !Text
+  , _usBudgetName    :: !Text
+  , _usNotification  :: !Notification
+  , _usOldSubscriber :: !Subscriber
+  , _usNewSubscriber :: !Subscriber
+  } deriving (Eq, Read, Show, Data, Typeable, Generic)
 
+
 -- | Creates a value of 'UpdateSubscriber' with the minimum fields required to make a request.
 --
 -- Use one of the following lenses to modify other fields as desired:
@@ -77,14 +78,15 @@
     -> Subscriber -- ^ 'usNewSubscriber'
     -> UpdateSubscriber
 updateSubscriber pAccountId_ pBudgetName_ pNotification_ pOldSubscriber_ pNewSubscriber_ =
-    UpdateSubscriber'
-    { _usAccountId = pAccountId_
-    , _usBudgetName = pBudgetName_
-    , _usNotification = pNotification_
-    , _usOldSubscriber = pOldSubscriber_
-    , _usNewSubscriber = pNewSubscriber_
-    }
+  UpdateSubscriber'
+  { _usAccountId = pAccountId_
+  , _usBudgetName = pBudgetName_
+  , _usNotification = pNotification_
+  , _usOldSubscriber = pOldSubscriber_
+  , _usNewSubscriber = pNewSubscriber_
+  }
 
+
 -- | Undocumented member.
 usAccountId :: Lens' UpdateSubscriber Text
 usAccountId = lens _usAccountId (\ s a -> s{_usAccountId = a});
@@ -113,9 +115,9 @@
               (\ s h x ->
                  UpdateSubscriberResponse' <$> (pure (fromEnum s)))
 
-instance Hashable UpdateSubscriber
+instance Hashable UpdateSubscriber where
 
-instance NFData UpdateSubscriber
+instance NFData UpdateSubscriber where
 
 instance ToHeaders UpdateSubscriber where
         toHeaders
@@ -147,9 +149,10 @@
 --
 -- /See:/ 'updateSubscriberResponse' smart constructor.
 newtype UpdateSubscriberResponse = UpdateSubscriberResponse'
-    { _usrsResponseStatus :: Int
-    } deriving (Eq,Read,Show,Data,Typeable,Generic)
+  { _usrsResponseStatus :: Int
+  } deriving (Eq, Read, Show, Data, Typeable, Generic)
 
+
 -- | Creates a value of 'UpdateSubscriberResponse' with the minimum fields required to make a request.
 --
 -- Use one of the following lenses to modify other fields as desired:
@@ -159,12 +162,11 @@
     :: Int -- ^ 'usrsResponseStatus'
     -> UpdateSubscriberResponse
 updateSubscriberResponse pResponseStatus_ =
-    UpdateSubscriberResponse'
-    { _usrsResponseStatus = pResponseStatus_
-    }
+  UpdateSubscriberResponse' {_usrsResponseStatus = pResponseStatus_}
 
+
 -- | -- | The response status code.
 usrsResponseStatus :: Lens' UpdateSubscriberResponse Int
 usrsResponseStatus = lens _usrsResponseStatus (\ s a -> s{_usrsResponseStatus = a});
 
-instance NFData UpdateSubscriberResponse
+instance NFData UpdateSubscriberResponse where
diff --git a/gen/Network/AWS/Budgets/Waiters.hs b/gen/Network/AWS/Budgets/Waiters.hs
--- a/gen/Network/AWS/Budgets/Waiters.hs
+++ b/gen/Network/AWS/Budgets/Waiters.hs
@@ -7,15 +7,15 @@
 
 -- |
 -- Module      : Network.AWS.Budgets.Waiters
--- Copyright   : (c) 2013-2016 Brendan Hay
+-- Copyright   : (c) 2013-2017 Brendan Hay
 -- License     : Mozilla Public License, v. 2.0.
--- Maintainer  : Brendan Hay <brendan.g.hay@gmail.com>
+-- Maintainer  : Brendan Hay <brendan.g.hay+amazonka@gmail.com>
 -- Stability   : auto-generated
 -- Portability : non-portable (GHC extensions)
 --
 module Network.AWS.Budgets.Waiters where
 
-import           Network.AWS.Budgets.Types
-import           Network.AWS.Lens
-import           Network.AWS.Prelude
-import           Network.AWS.Waiter
+import Network.AWS.Budgets.Types
+import Network.AWS.Lens
+import Network.AWS.Prelude
+import Network.AWS.Waiter
diff --git a/test/Main.hs b/test/Main.hs
--- a/test/Main.hs
+++ b/test/Main.hs
@@ -2,9 +2,9 @@
 
 -- |
 -- Module      : Main
--- Copyright   : (c) 2013-2016 Brendan Hay
+-- Copyright   : (c) 2013-2017 Brendan Hay
 -- License     : Mozilla Public License, v. 2.0.
--- Maintainer  : Brendan Hay <brendan.g.hay@gmail.com>
+-- Maintainer  : Brendan Hay <brendan.g.hay+amazonka@gmail.com>
 -- Stability   : auto-generated
 -- Portability : non-portable (GHC extensions)
 --
diff --git a/test/Test/AWS/Gen/Budgets.hs b/test/Test/AWS/Gen/Budgets.hs
--- a/test/Test/AWS/Gen/Budgets.hs
+++ b/test/Test/AWS/Gen/Budgets.hs
@@ -5,20 +5,20 @@
 
 -- |
 -- Module      : Test.AWS.Gen.Budgets
--- Copyright   : (c) 2013-2016 Brendan Hay
+-- Copyright   : (c) 2013-2017 Brendan Hay
 -- License     : Mozilla Public License, v. 2.0.
--- Maintainer  : Brendan Hay <brendan.g.hay@gmail.com>
+-- Maintainer  : Brendan Hay <brendan.g.hay+amazonka@gmail.com>
 -- Stability   : auto-generated
 -- Portability : non-portable (GHC extensions)
 --
 module Test.AWS.Gen.Budgets where
 
 import Data.Proxy
+import Network.AWS.Budgets
+import Test.AWS.Budgets.Internal
 import Test.AWS.Fixture
 import Test.AWS.Prelude
 import Test.Tasty
-import Network.AWS.Budgets
-import Test.AWS.Budgets.Internal
 
 -- Auto-generated: the actual test selection needs to be manually placed into
 -- the top-level so that real test data can be incrementally added.