diff --git a/README.md b/README.md
--- a/README.md
+++ b/README.md
@@ -8,7 +8,7 @@
 
 ## Version
 
-`0.0.1`
+`0.1.0`
 
 
 ## Description
@@ -18,9 +18,9 @@
 
 ## Contribute
 
-For any problems, comments, or feedback please create an issue [here on GitHub](https://github.com/brendanhay/amazonka/issues).
+For any problems, comments, or feedback please create an issue [here on GitHub](https://github.com/brendanhay/gogol/issues).
 
-> _Note:_ this library is an auto-generated Haskell package. Please see `amazonka-gen` for more information.
+> _Note:_ this library is an auto-generated Haskell package. Please see `gogol-gen` for more information.
 
 
 ## Licence
diff --git a/gen/Network/Google/AppsCalendar.hs b/gen/Network/Google/AppsCalendar.hs
--- a/gen/Network/Google/AppsCalendar.hs
+++ b/gen/Network/Google/AppsCalendar.hs
@@ -7,19 +7,23 @@
 
 -- |
 -- Module      : Network.Google.AppsCalendar
--- Copyright   : (c) 2015 Brendan Hay
+-- Copyright   : (c) 2015-2016 Brendan Hay
 -- License     : Mozilla Public License, v. 2.0.
 -- Maintainer  : Brendan Hay <brendan.g.hay@gmail.com>
 -- Stability   : auto-generated
 -- Portability : non-portable (GHC extensions)
 --
--- Lets you manipulate events and other calendar data.
+-- Manipulates events and other calendar data.
 --
 -- /See:/ <https://developers.google.com/google-apps/calendar/firstapp Calendar API Reference>
 module Network.Google.AppsCalendar
     (
     -- * Service Configuration
       appsCalendarService
+
+    -- * OAuth Scopes
+    , calendarScope
+    , calendarReadOnlyScope
 
     -- * API Declaration
     , AppsCalendarAPI
diff --git a/gen/Network/Google/AppsCalendar/Types.hs b/gen/Network/Google/AppsCalendar/Types.hs
--- a/gen/Network/Google/AppsCalendar/Types.hs
+++ b/gen/Network/Google/AppsCalendar/Types.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE DataKinds          #-}
 {-# LANGUAGE DeriveDataTypeable #-}
 {-# LANGUAGE DeriveGeneric      #-}
 {-# LANGUAGE NoImplicitPrelude  #-}
@@ -7,7 +8,7 @@
 
 -- |
 -- Module      : Network.Google.AppsCalendar.Types
--- Copyright   : (c) 2015 Brendan Hay
+-- Copyright   : (c) 2015-2016 Brendan Hay
 -- License     : Mozilla Public License, v. 2.0.
 -- Maintainer  : Brendan Hay <brendan.g.hay@gmail.com>
 -- Stability   : auto-generated
@@ -20,7 +21,7 @@
 
     -- * OAuth Scopes
     , calendarScope
-    , calendarReadonlyScope
+    , calendarReadOnlyScope
 
     -- * CalendarListEntry
     , CalendarListEntry
@@ -388,15 +389,15 @@
 import           Network.Google.Prelude
 
 -- | Default request referring to version 'v3' of the Calendar API. This contains the host and root path used as a starting point for constructing service requests.
-appsCalendarService :: Service
+appsCalendarService :: ServiceConfig
 appsCalendarService
   = defaultService (ServiceId "calendar:v3")
       "www.googleapis.com"
 
 -- | Manage your calendars
-calendarScope :: OAuthScope
-calendarScope = "https://www.googleapis.com/auth/calendar";
+calendarScope :: Proxy '["https://www.googleapis.com/auth/calendar"]
+calendarScope = Proxy;
 
 -- | View your calendars
-calendarReadonlyScope :: OAuthScope
-calendarReadonlyScope = "https://www.googleapis.com/auth/calendar.readonly";
+calendarReadOnlyScope :: Proxy '["https://www.googleapis.com/auth/calendar.readonly"]
+calendarReadOnlyScope = Proxy;
diff --git a/gen/Network/Google/AppsCalendar/Types/Product.hs b/gen/Network/Google/AppsCalendar/Types/Product.hs
--- a/gen/Network/Google/AppsCalendar/Types/Product.hs
+++ b/gen/Network/Google/AppsCalendar/Types/Product.hs
@@ -9,7 +9,7 @@
 
 -- |
 -- Module      : Network.Google.AppsCalendar.Types.Product
--- Copyright   : (c) 2015 Brendan Hay
+-- Copyright   : (c) 2015-2016 Brendan Hay
 -- License     : Mozilla Public License, v. 2.0.
 -- Maintainer  : Brendan Hay <brendan.g.hay@gmail.com>
 -- Stability   : auto-generated
@@ -22,7 +22,7 @@
 
 --
 -- /See:/ 'calendarListEntry' smart constructor.
-data CalendarListEntry = CalendarListEntry
+data CalendarListEntry = CalendarListEntry'
     { _cleSummary              :: !(Maybe Text)
     , _cleEtag                 :: !(Maybe Text)
     , _cleLocation             :: !(Maybe Text)
@@ -85,7 +85,7 @@
 calendarListEntry
     :: CalendarListEntry
 calendarListEntry =
-    CalendarListEntry
+    CalendarListEntry'
     { _cleSummary = Nothing
     , _cleEtag = Nothing
     , _cleLocation = Nothing
@@ -231,7 +231,7 @@
         parseJSON
           = withObject "CalendarListEntry"
               (\ o ->
-                 CalendarListEntry <$>
+                 CalendarListEntry' <$>
                    (o .:? "summary") <*> (o .:? "etag") <*>
                      (o .:? "location")
                      <*> (o .:? "kind" .!= "calendar#calendarListEntry")
@@ -251,7 +251,7 @@
                      <*> (o .:? "description"))
 
 instance ToJSON CalendarListEntry where
-        toJSON CalendarListEntry{..}
+        toJSON CalendarListEntry'{..}
           = object
               (catMaybes
                  [("summary" .=) <$> _cleSummary,
@@ -275,7 +275,7 @@
 
 --
 -- /See:/ 'event' smart constructor.
-data Event = Event
+data Event = Event'
     { _eSummary                 :: !(Maybe Text)
     , _eOriginalStartTime       :: !(Maybe EventDateTime)
     , _eCreator                 :: !(Maybe EventCreator)
@@ -395,7 +395,7 @@
 event
     :: Event
 event =
-    Event
+    Event'
     { _eSummary = Nothing
     , _eOriginalStartTime = Nothing
     , _eCreator = Nothing
@@ -658,8 +658,8 @@
 eColorId :: Lens' Event (Maybe Text)
 eColorId = lens _eColorId (\ s a -> s{_eColorId = a})
 
--- | Whether anyone can invite themselves to the event. Optional. The default
--- is False.
+-- | Whether anyone can invite themselves to the event (currently works for
+-- Google+ events only). Optional. The default is False.
 eAnyoneCanAddSelf :: Lens' Event Bool
 eAnyoneCanAddSelf
   = lens _eAnyoneCanAddSelf
@@ -695,7 +695,7 @@
         parseJSON
           = withObject "Event"
               (\ o ->
-                 Event <$>
+                 Event' <$>
                    (o .:? "summary") <*> (o .:? "originalStartTime") <*>
                      (o .:? "creator")
                      <*> (o .:? "status")
@@ -734,7 +734,7 @@
                      <*> (o .:? "organizer"))
 
 instance ToJSON Event where
-        toJSON Event{..}
+        toJSON Event'{..}
           = object
               (catMaybes
                  [("summary" .=) <$> _eSummary,
@@ -780,7 +780,7 @@
 -- calendar.
 --
 -- /See:/ 'calendarListEntryNotificationSettings' smart constructor.
-newtype CalendarListEntryNotificationSettings = CalendarListEntryNotificationSettings
+newtype CalendarListEntryNotificationSettings = CalendarListEntryNotificationSettings'
     { _clensNotifications :: Maybe [CalendarNotification]
     } deriving (Eq,Show,Data,Typeable,Generic)
 
@@ -792,7 +792,7 @@
 calendarListEntryNotificationSettings
     :: CalendarListEntryNotificationSettings
 calendarListEntryNotificationSettings =
-    CalendarListEntryNotificationSettings
+    CalendarListEntryNotificationSettings'
     { _clensNotifications = Nothing
     }
 
@@ -809,12 +809,12 @@
         parseJSON
           = withObject "CalendarListEntryNotificationSettings"
               (\ o ->
-                 CalendarListEntryNotificationSettings <$>
+                 CalendarListEntryNotificationSettings' <$>
                    (o .:? "notifications" .!= mempty))
 
 instance ToJSON CalendarListEntryNotificationSettings
          where
-        toJSON CalendarListEntryNotificationSettings{..}
+        toJSON CalendarListEntryNotificationSettings'{..}
           = object
               (catMaybes
                  [("notifications" .=) <$> _clensNotifications])
@@ -822,7 +822,7 @@
 -- | The scope of the rule.
 --
 -- /See:/ 'aclRuleScope' smart constructor.
-data ACLRuleScope = ACLRuleScope
+data ACLRuleScope = ACLRuleScope'
     { _arsValue :: !(Maybe Text)
     , _arsType  :: !(Maybe Text)
     } deriving (Eq,Show,Data,Typeable,Generic)
@@ -837,7 +837,7 @@
 aclRuleScope
     :: ACLRuleScope
 aclRuleScope =
-    ACLRuleScope
+    ACLRuleScope'
     { _arsValue = Nothing
     , _arsType = Nothing
     }
@@ -859,10 +859,10 @@
         parseJSON
           = withObject "ACLRuleScope"
               (\ o ->
-                 ACLRuleScope <$> (o .:? "value") <*> (o .:? "type"))
+                 ACLRuleScope' <$> (o .:? "value") <*> (o .:? "type"))
 
 instance ToJSON ACLRuleScope where
-        toJSON ACLRuleScope{..}
+        toJSON ACLRuleScope'{..}
           = object
               (catMaybes
                  [("value" .=) <$> _arsValue,
@@ -873,7 +873,7 @@
 -- color field. Read-only.
 --
 -- /See:/ 'colorsEvent' smart constructor.
-newtype ColorsEvent = ColorsEvent
+newtype ColorsEvent = ColorsEvent'
     { _ceAddtional :: HashMap Text ColorDefinition
     } deriving (Eq,Show,Data,Typeable,Generic)
 
@@ -886,7 +886,7 @@
     :: HashMap Text ColorDefinition -- ^ 'ceAddtional'
     -> ColorsEvent
 colorsEvent pCeAddtional_ =
-    ColorsEvent
+    ColorsEvent'
     { _ceAddtional = _Coerce # pCeAddtional_
     }
 
@@ -899,14 +899,14 @@
 instance FromJSON ColorsEvent where
         parseJSON
           = withObject "ColorsEvent"
-              (\ o -> ColorsEvent <$> (parseJSONObject o))
+              (\ o -> ColorsEvent' <$> (parseJSONObject o))
 
 instance ToJSON ColorsEvent where
         toJSON = toJSON . _ceAddtional
 
 --
 -- /See:/ 'settings' smart constructor.
-data Settings = Settings
+data Settings = Settings'
     { _sEtag          :: !(Maybe Text)
     , _sNextPageToken :: !(Maybe Text)
     , _sKind          :: !Text
@@ -930,7 +930,7 @@
 settings
     :: Settings
 settings =
-    Settings
+    Settings'
     { _sEtag = Nothing
     , _sNextPageToken = Nothing
     , _sKind = "calendar#settings"
@@ -971,14 +971,14 @@
         parseJSON
           = withObject "Settings"
               (\ o ->
-                 Settings <$>
+                 Settings' <$>
                    (o .:? "etag") <*> (o .:? "nextPageToken") <*>
                      (o .:? "kind" .!= "calendar#settings")
                      <*> (o .:? "items" .!= mempty)
                      <*> (o .:? "nextSyncToken"))
 
 instance ToJSON Settings where
-        toJSON Settings{..}
+        toJSON Settings'{..}
           = object
               (catMaybes
                  [("etag" .=) <$> _sEtag,
@@ -988,7 +988,7 @@
 
 --
 -- /See:/ 'freeBusyRequestItem' smart constructor.
-newtype FreeBusyRequestItem = FreeBusyRequestItem
+newtype FreeBusyRequestItem = FreeBusyRequestItem'
     { _fbriId :: Maybe Text
     } deriving (Eq,Show,Data,Typeable,Generic)
 
@@ -1000,7 +1000,7 @@
 freeBusyRequestItem
     :: FreeBusyRequestItem
 freeBusyRequestItem =
-    FreeBusyRequestItem
+    FreeBusyRequestItem'
     { _fbriId = Nothing
     }
 
@@ -1011,15 +1011,15 @@
 instance FromJSON FreeBusyRequestItem where
         parseJSON
           = withObject "FreeBusyRequestItem"
-              (\ o -> FreeBusyRequestItem <$> (o .:? "id"))
+              (\ o -> FreeBusyRequestItem' <$> (o .:? "id"))
 
 instance ToJSON FreeBusyRequestItem where
-        toJSON FreeBusyRequestItem{..}
+        toJSON FreeBusyRequestItem'{..}
           = object (catMaybes [("id" .=) <$> _fbriId])
 
 --
 -- /See:/ 'eventAttachment' smart constructor.
-data EventAttachment = EventAttachment
+data EventAttachment = EventAttachment'
     { _eaFileURL  :: !(Maybe Text)
     , _eaIconLink :: !(Maybe Text)
     , _eaMimeType :: !(Maybe Text)
@@ -1043,7 +1043,7 @@
 eventAttachment
     :: EventAttachment
 eventAttachment =
-    EventAttachment
+    EventAttachment'
     { _eaFileURL = Nothing
     , _eaIconLink = Nothing
     , _eaMimeType = Nothing
@@ -1081,14 +1081,14 @@
         parseJSON
           = withObject "EventAttachment"
               (\ o ->
-                 EventAttachment <$>
+                 EventAttachment' <$>
                    (o .:? "fileUrl") <*> (o .:? "iconLink") <*>
                      (o .:? "mimeType")
                      <*> (o .:? "title")
                      <*> (o .:? "fileId"))
 
 instance ToJSON EventAttachment where
-        toJSON EventAttachment{..}
+        toJSON EventAttachment'{..}
           = object
               (catMaybes
                  [("fileUrl" .=) <$> _eaFileURL,
@@ -1099,7 +1099,7 @@
 
 --
 -- /See:/ 'timePeriod' smart constructor.
-data TimePeriod = TimePeriod
+data TimePeriod = TimePeriod'
     { _tpStart :: !(Maybe DateTime')
     , _tpEnd   :: !(Maybe DateTime')
     } deriving (Eq,Show,Data,Typeable,Generic)
@@ -1114,7 +1114,7 @@
 timePeriod
     :: TimePeriod
 timePeriod =
-    TimePeriod
+    TimePeriod'
     { _tpStart = Nothing
     , _tpEnd = Nothing
     }
@@ -1135,10 +1135,10 @@
         parseJSON
           = withObject "TimePeriod"
               (\ o ->
-                 TimePeriod <$> (o .:? "start") <*> (o .:? "end"))
+                 TimePeriod' <$> (o .:? "start") <*> (o .:? "end"))
 
 instance ToJSON TimePeriod where
-        toJSON TimePeriod{..}
+        toJSON TimePeriod'{..}
           = object
               (catMaybes
                  [("start" .=) <$> _tpStart, ("end" .=) <$> _tpEnd])
@@ -1146,7 +1146,7 @@
 -- | The creator of the event. Read-only.
 --
 -- /See:/ 'eventCreator' smart constructor.
-data EventCreator = EventCreator
+data EventCreator = EventCreator'
     { _ecEmail       :: !(Maybe Text)
     , _ecSelf        :: !Bool
     , _ecDisplayName :: !(Maybe Text)
@@ -1167,7 +1167,7 @@
 eventCreator
     :: EventCreator
 eventCreator =
-    EventCreator
+    EventCreator'
     { _ecEmail = Nothing
     , _ecSelf = False
     , _ecDisplayName = Nothing
@@ -1198,13 +1198,13 @@
         parseJSON
           = withObject "EventCreator"
               (\ o ->
-                 EventCreator <$>
+                 EventCreator' <$>
                    (o .:? "email") <*> (o .:? "self" .!= False) <*>
                      (o .:? "displayName")
                      <*> (o .:? "id"))
 
 instance ToJSON EventCreator where
-        toJSON EventCreator{..}
+        toJSON EventCreator'{..}
           = object
               (catMaybes
                  [("email" .=) <$> _ecEmail, Just ("self" .= _ecSelf),
@@ -1213,7 +1213,7 @@
 
 --
 -- /See:/ 'error'' smart constructor.
-data Error' = Error'
+data Error' = Error''
     { _eDomain :: !(Maybe Text)
     , _eReason :: !(Maybe Text)
     } deriving (Eq,Show,Data,Typeable,Generic)
@@ -1228,7 +1228,7 @@
 error'
     :: Error'
 error' =
-    Error'
+    Error''
     { _eDomain = Nothing
     , _eReason = Nothing
     }
@@ -1252,10 +1252,10 @@
         parseJSON
           = withObject "Error"
               (\ o ->
-                 Error' <$> (o .:? "domain") <*> (o .:? "reason"))
+                 Error'' <$> (o .:? "domain") <*> (o .:? "reason"))
 
 instance ToJSON Error' where
-        toJSON Error'{..}
+        toJSON Error''{..}
           = object
               (catMaybes
                  [("domain" .=) <$> _eDomain,
@@ -1263,7 +1263,7 @@
 
 --
 -- /See:/ 'colorDefinition' smart constructor.
-data ColorDefinition = ColorDefinition
+data ColorDefinition = ColorDefinition'
     { _cdForegRound :: !(Maybe Text)
     , _cdBackgRound :: !(Maybe Text)
     } deriving (Eq,Show,Data,Typeable,Generic)
@@ -1278,7 +1278,7 @@
 colorDefinition
     :: ColorDefinition
 colorDefinition =
-    ColorDefinition
+    ColorDefinition'
     { _cdForegRound = Nothing
     , _cdBackgRound = Nothing
     }
@@ -1298,11 +1298,11 @@
         parseJSON
           = withObject "ColorDefinition"
               (\ o ->
-                 ColorDefinition <$>
+                 ColorDefinition' <$>
                    (o .:? "foreground") <*> (o .:? "background"))
 
 instance ToJSON ColorDefinition where
-        toJSON ColorDefinition{..}
+        toJSON ColorDefinition'{..}
           = object
               (catMaybes
                  [("foreground" .=) <$> _cdForegRound,
@@ -1310,7 +1310,7 @@
 
 --
 -- /See:/ 'channel' smart constructor.
-data Channel = Channel
+data Channel = Channel'
     { _cResourceURI :: !(Maybe Text)
     , _cResourceId  :: !(Maybe Text)
     , _cKind        :: !Text
@@ -1349,7 +1349,7 @@
 channel
     :: Channel
 channel =
-    Channel
+    Channel'
     { _cResourceURI = Nothing
     , _cResourceId = Nothing
     , _cKind = "api#channel"
@@ -1414,7 +1414,7 @@
         parseJSON
           = withObject "Channel"
               (\ o ->
-                 Channel <$>
+                 Channel' <$>
                    (o .:? "resourceUri") <*> (o .:? "resourceId") <*>
                      (o .:? "kind" .!= "api#channel")
                      <*> (o .:? "expiration")
@@ -1426,7 +1426,7 @@
                      <*> (o .:? "type"))
 
 instance ToJSON Channel where
-        toJSON Channel{..}
+        toJSON Channel'{..}
           = object
               (catMaybes
                  [("resourceUri" .=) <$> _cResourceURI,
@@ -1441,7 +1441,7 @@
 
 --
 -- /See:/ 'freeBusyCalendar' smart constructor.
-data FreeBusyCalendar = FreeBusyCalendar
+data FreeBusyCalendar = FreeBusyCalendar'
     { _fbcBusy   :: !(Maybe [TimePeriod])
     , _fbcErrors :: !(Maybe [Error'])
     } deriving (Eq,Show,Data,Typeable,Generic)
@@ -1456,7 +1456,7 @@
 freeBusyCalendar
     :: FreeBusyCalendar
 freeBusyCalendar =
-    FreeBusyCalendar
+    FreeBusyCalendar'
     { _fbcBusy = Nothing
     , _fbcErrors = Nothing
     }
@@ -1479,12 +1479,12 @@
         parseJSON
           = withObject "FreeBusyCalendar"
               (\ o ->
-                 FreeBusyCalendar <$>
+                 FreeBusyCalendar' <$>
                    (o .:? "busy" .!= mempty) <*>
                      (o .:? "errors" .!= mempty))
 
 instance ToJSON FreeBusyCalendar where
-        toJSON FreeBusyCalendar{..}
+        toJSON FreeBusyCalendar'{..}
           = object
               (catMaybes
                  [("busy" .=) <$> _fbcBusy,
@@ -1492,7 +1492,7 @@
 
 --
 -- /See:/ 'setting' smart constructor.
-data Setting = Setting
+data Setting = Setting'
     { _setEtag  :: !(Maybe Text)
     , _setKind  :: !Text
     , _setValue :: !(Maybe Text)
@@ -1513,7 +1513,7 @@
 setting
     :: Setting
 setting =
-    Setting
+    Setting'
     { _setEtag = Nothing
     , _setKind = "calendar#setting"
     , _setValue = Nothing
@@ -1542,14 +1542,14 @@
         parseJSON
           = withObject "Setting"
               (\ o ->
-                 Setting <$>
+                 Setting' <$>
                    (o .:? "etag") <*>
                      (o .:? "kind" .!= "calendar#setting")
                      <*> (o .:? "value")
                      <*> (o .:? "id"))
 
 instance ToJSON Setting where
-        toJSON Setting{..}
+        toJSON Setting'{..}
           = object
               (catMaybes
                  [("etag" .=) <$> _setEtag, Just ("kind" .= _setKind),
@@ -1558,7 +1558,7 @@
 -- | Expansion of groups.
 --
 -- /See:/ 'freeBusyResponseGroups' smart constructor.
-newtype FreeBusyResponseGroups = FreeBusyResponseGroups
+newtype FreeBusyResponseGroups = FreeBusyResponseGroups'
     { _fbrgAddtional :: HashMap Text FreeBusyGroup
     } deriving (Eq,Show,Data,Typeable,Generic)
 
@@ -1571,7 +1571,7 @@
     :: HashMap Text FreeBusyGroup -- ^ 'fbrgAddtional'
     -> FreeBusyResponseGroups
 freeBusyResponseGroups pFbrgAddtional_ =
-    FreeBusyResponseGroups
+    FreeBusyResponseGroups'
     { _fbrgAddtional = _Coerce # pFbrgAddtional_
     }
 
@@ -1586,7 +1586,7 @@
         parseJSON
           = withObject "FreeBusyResponseGroups"
               (\ o ->
-                 FreeBusyResponseGroups <$> (parseJSONObject o))
+                 FreeBusyResponseGroups' <$> (parseJSONObject o))
 
 instance ToJSON FreeBusyResponseGroups where
         toJSON = toJSON . _fbrgAddtional
@@ -1594,7 +1594,7 @@
 -- | Information about the event\'s reminders for the authenticated user.
 --
 -- /See:/ 'eventReminders' smart constructor.
-data EventReminders = EventReminders
+data EventReminders = EventReminders'
     { _erOverrides  :: !(Maybe [EventReminder])
     , _erUseDefault :: !(Maybe Bool)
     } deriving (Eq,Show,Data,Typeable,Generic)
@@ -1609,7 +1609,7 @@
 eventReminders
     :: EventReminders
 eventReminders =
-    EventReminders
+    EventReminders'
     { _erOverrides = Nothing
     , _erUseDefault = Nothing
     }
@@ -1633,12 +1633,12 @@
         parseJSON
           = withObject "EventReminders"
               (\ o ->
-                 EventReminders <$>
+                 EventReminders' <$>
                    (o .:? "overrides" .!= mempty) <*>
                      (o .:? "useDefault"))
 
 instance ToJSON EventReminders where
-        toJSON EventReminders{..}
+        toJSON EventReminders'{..}
           = object
               (catMaybes
                  [("overrides" .=) <$> _erOverrides,
@@ -1649,7 +1649,7 @@
 -- IDs in its color field. Read-only.
 --
 -- /See:/ 'colorsCalendar' smart constructor.
-newtype ColorsCalendar = ColorsCalendar
+newtype ColorsCalendar = ColorsCalendar'
     { _ccAddtional :: HashMap Text ColorDefinition
     } deriving (Eq,Show,Data,Typeable,Generic)
 
@@ -1662,7 +1662,7 @@
     :: HashMap Text ColorDefinition -- ^ 'ccAddtional'
     -> ColorsCalendar
 colorsCalendar pCcAddtional_ =
-    ColorsCalendar
+    ColorsCalendar'
     { _ccAddtional = _Coerce # pCcAddtional_
     }
 
@@ -1675,14 +1675,14 @@
 instance FromJSON ColorsCalendar where
         parseJSON
           = withObject "ColorsCalendar"
-              (\ o -> ColorsCalendar <$> (parseJSONObject o))
+              (\ o -> ColorsCalendar' <$> (parseJSONObject o))
 
 instance ToJSON ColorsCalendar where
         toJSON = toJSON . _ccAddtional
 
 --
 -- /See:/ 'calendarNotification' smart constructor.
-data CalendarNotification = CalendarNotification
+data CalendarNotification = CalendarNotification'
     { _cnMethod :: !(Maybe Text)
     , _cnType   :: !(Maybe Text)
     } deriving (Eq,Show,Data,Typeable,Generic)
@@ -1697,7 +1697,7 @@
 calendarNotification
     :: CalendarNotification
 calendarNotification =
-    CalendarNotification
+    CalendarNotification'
     { _cnMethod = Nothing
     , _cnType = Nothing
     }
@@ -1724,11 +1724,11 @@
         parseJSON
           = withObject "CalendarNotification"
               (\ o ->
-                 CalendarNotification <$>
+                 CalendarNotification' <$>
                    (o .:? "method") <*> (o .:? "type"))
 
 instance ToJSON CalendarNotification where
-        toJSON CalendarNotification{..}
+        toJSON CalendarNotification'{..}
           = object
               (catMaybes
                  [("method" .=) <$> _cnMethod,
@@ -1738,7 +1738,7 @@
 -- this calendar.
 --
 -- /See:/ 'eventExtendedPropertiesPrivate' smart constructor.
-newtype EventExtendedPropertiesPrivate = EventExtendedPropertiesPrivate
+newtype EventExtendedPropertiesPrivate = EventExtendedPropertiesPrivate'
     { _eeppAddtional :: HashMap Text Text
     } deriving (Eq,Show,Data,Typeable,Generic)
 
@@ -1751,7 +1751,7 @@
     :: HashMap Text Text -- ^ 'eeppAddtional'
     -> EventExtendedPropertiesPrivate
 eventExtendedPropertiesPrivate pEeppAddtional_ =
-    EventExtendedPropertiesPrivate
+    EventExtendedPropertiesPrivate'
     { _eeppAddtional = _Coerce # pEeppAddtional_
     }
 
@@ -1767,7 +1767,7 @@
         parseJSON
           = withObject "EventExtendedPropertiesPrivate"
               (\ o ->
-                 EventExtendedPropertiesPrivate <$>
+                 EventExtendedPropertiesPrivate' <$>
                    (parseJSONObject o))
 
 instance ToJSON EventExtendedPropertiesPrivate where
@@ -1776,7 +1776,7 @@
 -- | Additional parameters controlling delivery channel behavior. Optional.
 --
 -- /See:/ 'channelParams' smart constructor.
-newtype ChannelParams = ChannelParams
+newtype ChannelParams = ChannelParams'
     { _cpAddtional :: HashMap Text Text
     } deriving (Eq,Show,Data,Typeable,Generic)
 
@@ -1789,7 +1789,7 @@
     :: HashMap Text Text -- ^ 'cpAddtional'
     -> ChannelParams
 channelParams pCpAddtional_ =
-    ChannelParams
+    ChannelParams'
     { _cpAddtional = _Coerce # pCpAddtional_
     }
 
@@ -1802,14 +1802,14 @@
 instance FromJSON ChannelParams where
         parseJSON
           = withObject "ChannelParams"
-              (\ o -> ChannelParams <$> (parseJSONObject o))
+              (\ o -> ChannelParams' <$> (parseJSONObject o))
 
 instance ToJSON ChannelParams where
         toJSON = toJSON . _cpAddtional
 
 --
 -- /See:/ 'events' smart constructor.
-data Events = Events
+data Events = Events'
     { _eveSummary          :: !(Maybe Text)
     , _eveEtag             :: !(Maybe Text)
     , _eveNextPageToken    :: !(Maybe Text)
@@ -1851,7 +1851,7 @@
 events
     :: Events
 events =
-    Events
+    Events'
     { _eveSummary = Nothing
     , _eveEtag = Nothing
     , _eveNextPageToken = Nothing
@@ -1947,7 +1947,7 @@
         parseJSON
           = withObject "Events"
               (\ o ->
-                 Events <$>
+                 Events' <$>
                    (o .:? "summary") <*> (o .:? "etag") <*>
                      (o .:? "nextPageToken")
                      <*> (o .:? "kind" .!= "calendar#events")
@@ -1960,7 +1960,7 @@
                      <*> (o .:? "description"))
 
 instance ToJSON Events where
-        toJSON Events{..}
+        toJSON Events'{..}
           = object
               (catMaybes
                  [("summary" .=) <$> _eveSummary,
@@ -1977,7 +1977,7 @@
 
 --
 -- /See:/ 'eventAttendee' smart constructor.
-data EventAttendee = EventAttendee
+data EventAttendee = EventAttendee'
     { _eaEmail            :: !(Maybe Text)
     , _eaResponseStatus   :: !(Maybe Text)
     , _eaSelf             :: !Bool
@@ -2016,7 +2016,7 @@
 eventAttendee
     :: EventAttendee
 eventAttendee =
-    EventAttendee
+    EventAttendee'
     { _eaEmail = Nothing
     , _eaResponseStatus = Nothing
     , _eaSelf = False
@@ -2093,7 +2093,7 @@
         parseJSON
           = withObject "EventAttendee"
               (\ o ->
-                 EventAttendee <$>
+                 EventAttendee' <$>
                    (o .:? "email") <*> (o .:? "responseStatus") <*>
                      (o .:? "self" .!= False)
                      <*> (o .:? "resource" .!= False)
@@ -2105,7 +2105,7 @@
                      <*> (o .:? "organizer"))
 
 instance ToJSON EventAttendee where
-        toJSON EventAttendee{..}
+        toJSON EventAttendee'{..}
           = object
               (catMaybes
                  [("email" .=) <$> _eaEmail,
@@ -2120,7 +2120,7 @@
 
 --
 -- /See:/ 'calendar' smart constructor.
-data Calendar = Calendar
+data Calendar = Calendar'
     { _calSummary     :: !(Maybe Text)
     , _calEtag        :: !(Maybe Text)
     , _calLocation    :: !(Maybe Text)
@@ -2150,7 +2150,7 @@
 calendar
     :: Calendar
 calendar =
-    Calendar
+    Calendar'
     { _calSummary = Nothing
     , _calEtag = Nothing
     , _calLocation = Nothing
@@ -2199,7 +2199,7 @@
         parseJSON
           = withObject "Calendar"
               (\ o ->
-                 Calendar <$>
+                 Calendar' <$>
                    (o .:? "summary") <*> (o .:? "etag") <*>
                      (o .:? "location")
                      <*> (o .:? "kind" .!= "calendar#calendar")
@@ -2208,7 +2208,7 @@
                      <*> (o .:? "description"))
 
 instance ToJSON Calendar where
-        toJSON Calendar{..}
+        toJSON Calendar'{..}
           = object
               (catMaybes
                  [("summary" .=) <$> _calSummary,
@@ -2220,7 +2220,7 @@
 
 --
 -- /See:/ 'freeBusyResponse' smart constructor.
-data FreeBusyResponse = FreeBusyResponse
+data FreeBusyResponse = FreeBusyResponse'
     { _fbrGroups    :: !(Maybe FreeBusyResponseGroups)
     , _fbrTimeMin   :: !(Maybe DateTime')
     , _fbrKind      :: !Text
@@ -2244,7 +2244,7 @@
 freeBusyResponse
     :: FreeBusyResponse
 freeBusyResponse =
-    FreeBusyResponse
+    FreeBusyResponse'
     { _fbrGroups = Nothing
     , _fbrTimeMin = Nothing
     , _fbrKind = "calendar#freeBusy"
@@ -2282,14 +2282,14 @@
         parseJSON
           = withObject "FreeBusyResponse"
               (\ o ->
-                 FreeBusyResponse <$>
+                 FreeBusyResponse' <$>
                    (o .:? "groups") <*> (o .:? "timeMin") <*>
                      (o .:? "kind" .!= "calendar#freeBusy")
                      <*> (o .:? "calendars")
                      <*> (o .:? "timeMax"))
 
 instance ToJSON FreeBusyResponse where
-        toJSON FreeBusyResponse{..}
+        toJSON FreeBusyResponse'{..}
           = object
               (catMaybes
                  [("groups" .=) <$> _fbrGroups,
@@ -2300,7 +2300,7 @@
 
 --
 -- /See:/ 'eventReminder' smart constructor.
-data EventReminder = EventReminder
+data EventReminder = EventReminder'
     { _erMethod  :: !(Maybe Text)
     , _erMinutes :: !(Maybe (Textual Int32))
     } deriving (Eq,Show,Data,Typeable,Generic)
@@ -2315,7 +2315,7 @@
 eventReminder
     :: EventReminder
 eventReminder =
-    EventReminder
+    EventReminder'
     { _erMethod = Nothing
     , _erMinutes = Nothing
     }
@@ -2339,11 +2339,11 @@
         parseJSON
           = withObject "EventReminder"
               (\ o ->
-                 EventReminder <$>
+                 EventReminder' <$>
                    (o .:? "method") <*> (o .:? "minutes"))
 
 instance ToJSON EventReminder where
-        toJSON EventReminder{..}
+        toJSON EventReminder'{..}
           = object
               (catMaybes
                  [("method" .=) <$> _erMethod,
@@ -2352,7 +2352,7 @@
 -- | Extended properties of the event.
 --
 -- /See:/ 'eventExtendedProperties' smart constructor.
-data EventExtendedProperties = EventExtendedProperties
+data EventExtendedProperties = EventExtendedProperties'
     { _eepPrivate :: !(Maybe EventExtendedPropertiesPrivate)
     , _eepShared  :: !(Maybe EventExtendedPropertiesShared)
     } deriving (Eq,Show,Data,Typeable,Generic)
@@ -2367,7 +2367,7 @@
 eventExtendedProperties
     :: EventExtendedProperties
 eventExtendedProperties =
-    EventExtendedProperties
+    EventExtendedProperties'
     { _eepPrivate = Nothing
     , _eepShared = Nothing
     }
@@ -2388,11 +2388,11 @@
         parseJSON
           = withObject "EventExtendedProperties"
               (\ o ->
-                 EventExtendedProperties <$>
+                 EventExtendedProperties' <$>
                    (o .:? "private") <*> (o .:? "shared"))
 
 instance ToJSON EventExtendedProperties where
-        toJSON EventExtendedProperties{..}
+        toJSON EventExtendedProperties'{..}
           = object
               (catMaybes
                  [("private" .=) <$> _eepPrivate,
@@ -2400,7 +2400,7 @@
 
 --
 -- /See:/ 'eventDateTime' smart constructor.
-data EventDateTime = EventDateTime
+data EventDateTime = EventDateTime'
     { _edtDate     :: !(Maybe Date')
     , _edtTimeZone :: !(Maybe Text)
     , _edtDateTime :: !(Maybe DateTime')
@@ -2418,7 +2418,7 @@
 eventDateTime
     :: EventDateTime
 eventDateTime =
-    EventDateTime
+    EventDateTime'
     { _edtDate = Nothing
     , _edtTimeZone = Nothing
     , _edtDateTime = Nothing
@@ -2451,12 +2451,12 @@
         parseJSON
           = withObject "EventDateTime"
               (\ o ->
-                 EventDateTime <$>
+                 EventDateTime' <$>
                    (o .:? "date") <*> (o .:? "timeZone") <*>
                      (o .:? "dateTime"))
 
 instance ToJSON EventDateTime where
-        toJSON EventDateTime{..}
+        toJSON EventDateTime'{..}
           = object
               (catMaybes
                  [("date" .=) <$> _edtDate,
@@ -2469,7 +2469,7 @@
 -- except when importing an event.
 --
 -- /See:/ 'eventOrganizer' smart constructor.
-data EventOrganizer = EventOrganizer
+data EventOrganizer = EventOrganizer'
     { _eoEmail       :: !(Maybe Text)
     , _eoSelf        :: !Bool
     , _eoDisplayName :: !(Maybe Text)
@@ -2490,7 +2490,7 @@
 eventOrganizer
     :: EventOrganizer
 eventOrganizer =
-    EventOrganizer
+    EventOrganizer'
     { _eoEmail = Nothing
     , _eoSelf = False
     , _eoDisplayName = Nothing
@@ -2522,13 +2522,13 @@
         parseJSON
           = withObject "EventOrganizer"
               (\ o ->
-                 EventOrganizer <$>
+                 EventOrganizer' <$>
                    (o .:? "email") <*> (o .:? "self" .!= False) <*>
                      (o .:? "displayName")
                      <*> (o .:? "id"))
 
 instance ToJSON EventOrganizer where
-        toJSON EventOrganizer{..}
+        toJSON EventOrganizer'{..}
           = object
               (catMaybes
                  [("email" .=) <$> _eoEmail, Just ("self" .= _eoSelf),
@@ -2537,7 +2537,7 @@
 
 --
 -- /See:/ 'calendarList' smart constructor.
-data CalendarList = CalendarList
+data CalendarList = CalendarList'
     { _clEtag          :: !(Maybe Text)
     , _clNextPageToken :: !(Maybe Text)
     , _clKind          :: !Text
@@ -2561,7 +2561,7 @@
 calendarList
     :: CalendarList
 calendarList =
-    CalendarList
+    CalendarList'
     { _clEtag = Nothing
     , _clNextPageToken = Nothing
     , _clKind = "calendar#calendarList"
@@ -2602,14 +2602,14 @@
         parseJSON
           = withObject "CalendarList"
               (\ o ->
-                 CalendarList <$>
+                 CalendarList' <$>
                    (o .:? "etag") <*> (o .:? "nextPageToken") <*>
                      (o .:? "kind" .!= "calendar#calendarList")
                      <*> (o .:? "items" .!= mempty)
                      <*> (o .:? "nextSyncToken"))
 
 instance ToJSON CalendarList where
-        toJSON CalendarList{..}
+        toJSON CalendarList'{..}
           = object
               (catMaybes
                  [("etag" .=) <$> _clEtag,
@@ -2620,7 +2620,7 @@
 -- | A gadget that extends this event.
 --
 -- /See:/ 'eventGadget' smart constructor.
-data EventGadget = EventGadget
+data EventGadget = EventGadget'
     { _egHeight      :: !(Maybe (Textual Int32))
     , _egDisplay     :: !(Maybe Text)
     , _egPreferences :: !(Maybe EventGadgetPreferences)
@@ -2653,7 +2653,7 @@
 eventGadget
     :: EventGadget
 eventGadget =
-    EventGadget
+    EventGadget'
     { _egHeight = Nothing
     , _egDisplay = Nothing
     , _egPreferences = Nothing
@@ -2712,7 +2712,7 @@
         parseJSON
           = withObject "EventGadget"
               (\ o ->
-                 EventGadget <$>
+                 EventGadget' <$>
                    (o .:? "height") <*> (o .:? "display") <*>
                      (o .:? "preferences")
                      <*> (o .:? "link")
@@ -2722,7 +2722,7 @@
                      <*> (o .:? "type"))
 
 instance ToJSON EventGadget where
-        toJSON EventGadget{..}
+        toJSON EventGadget'{..}
           = object
               (catMaybes
                  [("height" .=) <$> _egHeight,
@@ -2736,7 +2736,7 @@
 -- | Preferences.
 --
 -- /See:/ 'eventGadgetPreferences' smart constructor.
-newtype EventGadgetPreferences = EventGadgetPreferences
+newtype EventGadgetPreferences = EventGadgetPreferences'
     { _egpAddtional :: HashMap Text Text
     } deriving (Eq,Show,Data,Typeable,Generic)
 
@@ -2749,7 +2749,7 @@
     :: HashMap Text Text -- ^ 'egpAddtional'
     -> EventGadgetPreferences
 eventGadgetPreferences pEgpAddtional_ =
-    EventGadgetPreferences
+    EventGadgetPreferences'
     { _egpAddtional = _Coerce # pEgpAddtional_
     }
 
@@ -2763,14 +2763,14 @@
         parseJSON
           = withObject "EventGadgetPreferences"
               (\ o ->
-                 EventGadgetPreferences <$> (parseJSONObject o))
+                 EventGadgetPreferences' <$> (parseJSONObject o))
 
 instance ToJSON EventGadgetPreferences where
         toJSON = toJSON . _egpAddtional
 
 --
 -- /See:/ 'freeBusyRequest' smart constructor.
-data FreeBusyRequest = FreeBusyRequest
+data FreeBusyRequest = FreeBusyRequest'
     { _fCalendarExpansionMax :: !(Maybe (Textual Int32))
     , _fTimeMin              :: !(Maybe DateTime')
     , _fItems                :: !(Maybe [FreeBusyRequestItem])
@@ -2797,7 +2797,7 @@
 freeBusyRequest
     :: FreeBusyRequest
 freeBusyRequest =
-    FreeBusyRequest
+    FreeBusyRequest'
     { _fCalendarExpansionMax = Nothing
     , _fTimeMin = Nothing
     , _fItems = Nothing
@@ -2850,7 +2850,7 @@
         parseJSON
           = withObject "FreeBusyRequest"
               (\ o ->
-                 FreeBusyRequest <$>
+                 FreeBusyRequest' <$>
                    (o .:? "calendarExpansionMax") <*> (o .:? "timeMin")
                      <*> (o .:? "items" .!= mempty)
                      <*> (o .:? "groupExpansionMax")
@@ -2858,7 +2858,7 @@
                      <*> (o .:? "timeMax"))
 
 instance ToJSON FreeBusyRequest where
-        toJSON FreeBusyRequest{..}
+        toJSON FreeBusyRequest'{..}
           = object
               (catMaybes
                  [("calendarExpansionMax" .=) <$>
@@ -2871,7 +2871,7 @@
 
 --
 -- /See:/ 'aclRule' smart constructor.
-data ACLRule = ACLRule
+data ACLRule = ACLRule'
     { _arEtag  :: !(Maybe Text)
     , _arKind  :: !Text
     , _arRole  :: !(Maybe Text)
@@ -2895,7 +2895,7 @@
 aclRule
     :: ACLRule
 aclRule =
-    ACLRule
+    ACLRule'
     { _arEtag = Nothing
     , _arKind = "calendar#aclRule"
     , _arRole = Nothing
@@ -2935,7 +2935,7 @@
         parseJSON
           = withObject "ACLRule"
               (\ o ->
-                 ACLRule <$>
+                 ACLRule' <$>
                    (o .:? "etag") <*>
                      (o .:? "kind" .!= "calendar#aclRule")
                      <*> (o .:? "role")
@@ -2943,7 +2943,7 @@
                      <*> (o .:? "id"))
 
 instance ToJSON ACLRule where
-        toJSON ACLRule{..}
+        toJSON ACLRule'{..}
           = object
               (catMaybes
                  [("etag" .=) <$> _arEtag, Just ("kind" .= _arKind),
@@ -2954,7 +2954,7 @@
 -- attendees\' calendars.
 --
 -- /See:/ 'eventExtendedPropertiesShared' smart constructor.
-newtype EventExtendedPropertiesShared = EventExtendedPropertiesShared
+newtype EventExtendedPropertiesShared = EventExtendedPropertiesShared'
     { _eepsAddtional :: HashMap Text Text
     } deriving (Eq,Show,Data,Typeable,Generic)
 
@@ -2967,7 +2967,7 @@
     :: HashMap Text Text -- ^ 'eepsAddtional'
     -> EventExtendedPropertiesShared
 eventExtendedPropertiesShared pEepsAddtional_ =
-    EventExtendedPropertiesShared
+    EventExtendedPropertiesShared'
     { _eepsAddtional = _Coerce # pEepsAddtional_
     }
 
@@ -2982,7 +2982,7 @@
         parseJSON
           = withObject "EventExtendedPropertiesShared"
               (\ o ->
-                 EventExtendedPropertiesShared <$>
+                 EventExtendedPropertiesShared' <$>
                    (parseJSONObject o))
 
 instance ToJSON EventExtendedPropertiesShared where
@@ -2991,7 +2991,7 @@
 -- | List of free\/busy information for calendars.
 --
 -- /See:/ 'freeBusyResponseCalendars' smart constructor.
-newtype FreeBusyResponseCalendars = FreeBusyResponseCalendars
+newtype FreeBusyResponseCalendars = FreeBusyResponseCalendars'
     { _fbrcAddtional :: HashMap Text FreeBusyCalendar
     } deriving (Eq,Show,Data,Typeable,Generic)
 
@@ -3004,7 +3004,7 @@
     :: HashMap Text FreeBusyCalendar -- ^ 'fbrcAddtional'
     -> FreeBusyResponseCalendars
 freeBusyResponseCalendars pFbrcAddtional_ =
-    FreeBusyResponseCalendars
+    FreeBusyResponseCalendars'
     { _fbrcAddtional = _Coerce # pFbrcAddtional_
     }
 
@@ -3019,14 +3019,14 @@
         parseJSON
           = withObject "FreeBusyResponseCalendars"
               (\ o ->
-                 FreeBusyResponseCalendars <$> (parseJSONObject o))
+                 FreeBusyResponseCalendars' <$> (parseJSONObject o))
 
 instance ToJSON FreeBusyResponseCalendars where
         toJSON = toJSON . _fbrcAddtional
 
 --
 -- /See:/ 'acl' smart constructor.
-data ACL = ACL
+data ACL = ACL'
     { _aEtag          :: !(Maybe Text)
     , _aNextPageToken :: !(Maybe Text)
     , _aKind          :: !Text
@@ -3050,7 +3050,7 @@
 acl
     :: ACL
 acl =
-    ACL
+    ACL'
     { _aEtag = Nothing
     , _aNextPageToken = Nothing
     , _aKind = "calendar#acl"
@@ -3091,14 +3091,14 @@
         parseJSON
           = withObject "ACL"
               (\ o ->
-                 ACL <$>
+                 ACL' <$>
                    (o .:? "etag") <*> (o .:? "nextPageToken") <*>
                      (o .:? "kind" .!= "calendar#acl")
                      <*> (o .:? "items" .!= mempty)
                      <*> (o .:? "nextSyncToken"))
 
 instance ToJSON ACL where
-        toJSON ACL{..}
+        toJSON ACL'{..}
           = object
               (catMaybes
                  [("etag" .=) <$> _aEtag,
@@ -3108,7 +3108,7 @@
 
 --
 -- /See:/ 'colors' smart constructor.
-data Colors = Colors
+data Colors = Colors'
     { _colEvent    :: !(Maybe ColorsEvent)
     , _colKind     :: !Text
     , _colCalendar :: !(Maybe ColorsCalendar)
@@ -3129,7 +3129,7 @@
 colors
     :: Colors
 colors =
-    Colors
+    Colors'
     { _colEvent = Nothing
     , _colKind = "calendar#colors"
     , _colCalendar = Nothing
@@ -3164,14 +3164,14 @@
         parseJSON
           = withObject "Colors"
               (\ o ->
-                 Colors <$>
+                 Colors' <$>
                    (o .:? "event") <*>
                      (o .:? "kind" .!= "calendar#colors")
                      <*> (o .:? "calendar")
                      <*> (o .:? "updated"))
 
 instance ToJSON Colors where
-        toJSON Colors{..}
+        toJSON Colors'{..}
           = object
               (catMaybes
                  [("event" .=) <$> _colEvent,
@@ -3181,7 +3181,7 @@
 
 --
 -- /See:/ 'freeBusyGroup' smart constructor.
-data FreeBusyGroup = FreeBusyGroup
+data FreeBusyGroup = FreeBusyGroup'
     { _fbgCalendars :: !(Maybe [Text])
     , _fbgErrors    :: !(Maybe [Error'])
     } deriving (Eq,Show,Data,Typeable,Generic)
@@ -3196,7 +3196,7 @@
 freeBusyGroup
     :: FreeBusyGroup
 freeBusyGroup =
-    FreeBusyGroup
+    FreeBusyGroup'
     { _fbgCalendars = Nothing
     , _fbgErrors = Nothing
     }
@@ -3219,12 +3219,12 @@
         parseJSON
           = withObject "FreeBusyGroup"
               (\ o ->
-                 FreeBusyGroup <$>
+                 FreeBusyGroup' <$>
                    (o .:? "calendars" .!= mempty) <*>
                      (o .:? "errors" .!= mempty))
 
 instance ToJSON FreeBusyGroup where
-        toJSON FreeBusyGroup{..}
+        toJSON FreeBusyGroup'{..}
           = object
               (catMaybes
                  [("calendars" .=) <$> _fbgCalendars,
@@ -3235,7 +3235,7 @@
 -- scheme. Can only be seen or modified by the creator of the event.
 --
 -- /See:/ 'eventSource' smart constructor.
-data EventSource = EventSource
+data EventSource = EventSource'
     { _esURL   :: !(Maybe Text)
     , _esTitle :: !(Maybe Text)
     } deriving (Eq,Show,Data,Typeable,Generic)
@@ -3250,7 +3250,7 @@
 eventSource
     :: EventSource
 eventSource =
-    EventSource
+    EventSource'
     { _esURL = Nothing
     , _esTitle = Nothing
     }
@@ -3269,10 +3269,10 @@
         parseJSON
           = withObject "EventSource"
               (\ o ->
-                 EventSource <$> (o .:? "url") <*> (o .:? "title"))
+                 EventSource' <$> (o .:? "url") <*> (o .:? "title"))
 
 instance ToJSON EventSource where
-        toJSON EventSource{..}
+        toJSON EventSource'{..}
           = object
               (catMaybes
                  [("url" .=) <$> _esURL, ("title" .=) <$> _esTitle])
diff --git a/gen/Network/Google/AppsCalendar/Types/Sum.hs b/gen/Network/Google/AppsCalendar/Types/Sum.hs
--- a/gen/Network/Google/AppsCalendar/Types/Sum.hs
+++ b/gen/Network/Google/AppsCalendar/Types/Sum.hs
@@ -8,7 +8,7 @@
 
 -- |
 -- Module      : Network.Google.AppsCalendar.Types.Sum
--- Copyright   : (c) 2015 Brendan Hay
+-- Copyright   : (c) 2015-2016 Brendan Hay
 -- License     : Mozilla Public License, v. 2.0.
 -- Maintainer  : Brendan Hay <brendan.g.hay@gmail.com>
 -- Stability   : auto-generated
@@ -28,18 +28,18 @@
     | Updated
       -- ^ @updated@
       -- Order by last modification time (ascending).
-      deriving (Eq,Ord,Enum,Read,Show,Data,Typeable,Generic)
+      deriving (Eq, Ord, Enum, Read, Show, Data, Typeable, Generic)
 
 instance Hashable EventsListOrderBy
 
-instance FromText EventsListOrderBy where
-    fromText = \case
-        "startTime" -> Just StartTime
-        "updated" -> Just Updated
-        _ -> Nothing
+instance FromHttpApiData EventsListOrderBy where
+    parseQueryParam = \case
+        "startTime" -> Right StartTime
+        "updated" -> Right Updated
+        x -> Left ("Unable to parse EventsListOrderBy from: " <> x)
 
-instance ToText EventsListOrderBy where
-    toText = \case
+instance ToHttpApiData EventsListOrderBy where
+    toQueryParam = \case
         StartTime -> "startTime"
         Updated -> "updated"
 
@@ -64,20 +64,20 @@
     | Writer
       -- ^ @writer@
       -- The user can read and modify events.
-      deriving (Eq,Ord,Enum,Read,Show,Data,Typeable,Generic)
+      deriving (Eq, Ord, Enum, Read, Show, Data, Typeable, Generic)
 
 instance Hashable CalendarListListMinAccessRole
 
-instance FromText CalendarListListMinAccessRole where
-    fromText = \case
-        "freeBusyReader" -> Just FreeBusyReader
-        "owner" -> Just Owner
-        "reader" -> Just Reader
-        "writer" -> Just Writer
-        _ -> Nothing
+instance FromHttpApiData CalendarListListMinAccessRole where
+    parseQueryParam = \case
+        "freeBusyReader" -> Right FreeBusyReader
+        "owner" -> Right Owner
+        "reader" -> Right Reader
+        "writer" -> Right Writer
+        x -> Left ("Unable to parse CalendarListListMinAccessRole from: " <> x)
 
-instance ToText CalendarListListMinAccessRole where
-    toText = \case
+instance ToHttpApiData CalendarListListMinAccessRole where
+    toQueryParam = \case
         FreeBusyReader -> "freeBusyReader"
         Owner -> "owner"
         Reader -> "reader"
@@ -99,18 +99,18 @@
     | EWOBUpdated
       -- ^ @updated@
       -- Order by last modification time (ascending).
-      deriving (Eq,Ord,Enum,Read,Show,Data,Typeable,Generic)
+      deriving (Eq, Ord, Enum, Read, Show, Data, Typeable, Generic)
 
 instance Hashable EventsWatchOrderBy
 
-instance FromText EventsWatchOrderBy where
-    fromText = \case
-        "startTime" -> Just EWOBStartTime
-        "updated" -> Just EWOBUpdated
-        _ -> Nothing
+instance FromHttpApiData EventsWatchOrderBy where
+    parseQueryParam = \case
+        "startTime" -> Right EWOBStartTime
+        "updated" -> Right EWOBUpdated
+        x -> Left ("Unable to parse EventsWatchOrderBy from: " <> x)
 
-instance ToText EventsWatchOrderBy where
-    toText = \case
+instance ToHttpApiData EventsWatchOrderBy where
+    toQueryParam = \case
         EWOBStartTime -> "startTime"
         EWOBUpdated -> "updated"
 
@@ -135,20 +135,20 @@
     | CLWMARWriter
       -- ^ @writer@
       -- The user can read and modify events.
-      deriving (Eq,Ord,Enum,Read,Show,Data,Typeable,Generic)
+      deriving (Eq, Ord, Enum, Read, Show, Data, Typeable, Generic)
 
 instance Hashable CalendarListWatchMinAccessRole
 
-instance FromText CalendarListWatchMinAccessRole where
-    fromText = \case
-        "freeBusyReader" -> Just CLWMARFreeBusyReader
-        "owner" -> Just CLWMAROwner
-        "reader" -> Just CLWMARReader
-        "writer" -> Just CLWMARWriter
-        _ -> Nothing
+instance FromHttpApiData CalendarListWatchMinAccessRole where
+    parseQueryParam = \case
+        "freeBusyReader" -> Right CLWMARFreeBusyReader
+        "owner" -> Right CLWMAROwner
+        "reader" -> Right CLWMARReader
+        "writer" -> Right CLWMARWriter
+        x -> Left ("Unable to parse CalendarListWatchMinAccessRole from: " <> x)
 
-instance ToText CalendarListWatchMinAccessRole where
-    toText = \case
+instance ToHttpApiData CalendarListWatchMinAccessRole where
+    toQueryParam = \case
         CLWMARFreeBusyReader -> "freeBusyReader"
         CLWMAROwner -> "owner"
         CLWMARReader -> "reader"
diff --git a/gen/Network/Google/Resource/Calendar/ACL/Delete.hs b/gen/Network/Google/Resource/Calendar/ACL/Delete.hs
--- a/gen/Network/Google/Resource/Calendar/ACL/Delete.hs
+++ b/gen/Network/Google/Resource/Calendar/ACL/Delete.hs
@@ -14,7 +14,7 @@
 
 -- |
 -- Module      : Network.Google.Resource.Calendar.ACL.Delete
--- Copyright   : (c) 2015 Brendan Hay
+-- Copyright   : (c) 2015-2016 Brendan Hay
 -- License     : Mozilla Public License, v. 2.0.
 -- Maintainer  : Brendan Hay <brendan.g.hay@gmail.com>
 -- Stability   : auto-generated
@@ -54,7 +54,7 @@
 -- | Deletes an access control rule.
 --
 -- /See:/ 'aclDelete' smart constructor.
-data ACLDelete = ACLDelete
+data ACLDelete = ACLDelete'
     { _adCalendarId :: !Text
     , _adRuleId     :: !Text
     } deriving (Eq,Show,Data,Typeable,Generic)
@@ -71,7 +71,7 @@
     -> Text -- ^ 'adRuleId'
     -> ACLDelete
 aclDelete pAdCalendarId_ pAdRuleId_ =
-    ACLDelete
+    ACLDelete'
     { _adCalendarId = pAdCalendarId_
     , _adRuleId = pAdRuleId_
     }
@@ -89,7 +89,9 @@
 
 instance GoogleRequest ACLDelete where
         type Rs ACLDelete = ()
-        requestClient ACLDelete{..}
+        type Scopes ACLDelete =
+             '["https://www.googleapis.com/auth/calendar"]
+        requestClient ACLDelete'{..}
           = go _adCalendarId _adRuleId (Just AltJSON)
               appsCalendarService
           where go
diff --git a/gen/Network/Google/Resource/Calendar/ACL/Get.hs b/gen/Network/Google/Resource/Calendar/ACL/Get.hs
--- a/gen/Network/Google/Resource/Calendar/ACL/Get.hs
+++ b/gen/Network/Google/Resource/Calendar/ACL/Get.hs
@@ -14,7 +14,7 @@
 
 -- |
 -- Module      : Network.Google.Resource.Calendar.ACL.Get
--- Copyright   : (c) 2015 Brendan Hay
+-- Copyright   : (c) 2015-2016 Brendan Hay
 -- License     : Mozilla Public License, v. 2.0.
 -- Maintainer  : Brendan Hay <brendan.g.hay@gmail.com>
 -- Stability   : auto-generated
@@ -54,7 +54,7 @@
 -- | Returns an access control rule.
 --
 -- /See:/ 'aclGet' smart constructor.
-data ACLGet = ACLGet
+data ACLGet = ACLGet'
     { _agCalendarId :: !Text
     , _agRuleId     :: !Text
     } deriving (Eq,Show,Data,Typeable,Generic)
@@ -71,7 +71,7 @@
     -> Text -- ^ 'agRuleId'
     -> ACLGet
 aclGet pAgCalendarId_ pAgRuleId_ =
-    ACLGet
+    ACLGet'
     { _agCalendarId = pAgCalendarId_
     , _agRuleId = pAgRuleId_
     }
@@ -89,7 +89,10 @@
 
 instance GoogleRequest ACLGet where
         type Rs ACLGet = ACLRule
-        requestClient ACLGet{..}
+        type Scopes ACLGet =
+             '["https://www.googleapis.com/auth/calendar",
+               "https://www.googleapis.com/auth/calendar.readonly"]
+        requestClient ACLGet'{..}
           = go _agCalendarId _agRuleId (Just AltJSON)
               appsCalendarService
           where go
diff --git a/gen/Network/Google/Resource/Calendar/ACL/Insert.hs b/gen/Network/Google/Resource/Calendar/ACL/Insert.hs
--- a/gen/Network/Google/Resource/Calendar/ACL/Insert.hs
+++ b/gen/Network/Google/Resource/Calendar/ACL/Insert.hs
@@ -14,7 +14,7 @@
 
 -- |
 -- Module      : Network.Google.Resource.Calendar.ACL.Insert
--- Copyright   : (c) 2015 Brendan Hay
+-- Copyright   : (c) 2015-2016 Brendan Hay
 -- License     : Mozilla Public License, v. 2.0.
 -- Maintainer  : Brendan Hay <brendan.g.hay@gmail.com>
 -- Stability   : auto-generated
@@ -54,7 +54,7 @@
 -- | Creates an access control rule.
 --
 -- /See:/ 'aclInsert' smart constructor.
-data ACLInsert = ACLInsert
+data ACLInsert = ACLInsert'
     { _aiCalendarId :: !Text
     , _aiPayload    :: !ACLRule
     } deriving (Eq,Show,Data,Typeable,Generic)
@@ -71,7 +71,7 @@
     -> ACLRule -- ^ 'aiPayload'
     -> ACLInsert
 aclInsert pAiCalendarId_ pAiPayload_ =
-    ACLInsert
+    ACLInsert'
     { _aiCalendarId = pAiCalendarId_
     , _aiPayload = pAiPayload_
     }
@@ -90,7 +90,9 @@
 
 instance GoogleRequest ACLInsert where
         type Rs ACLInsert = ACLRule
-        requestClient ACLInsert{..}
+        type Scopes ACLInsert =
+             '["https://www.googleapis.com/auth/calendar"]
+        requestClient ACLInsert'{..}
           = go _aiCalendarId (Just AltJSON) _aiPayload
               appsCalendarService
           where go
diff --git a/gen/Network/Google/Resource/Calendar/ACL/List.hs b/gen/Network/Google/Resource/Calendar/ACL/List.hs
--- a/gen/Network/Google/Resource/Calendar/ACL/List.hs
+++ b/gen/Network/Google/Resource/Calendar/ACL/List.hs
@@ -14,7 +14,7 @@
 
 -- |
 -- Module      : Network.Google.Resource.Calendar.ACL.List
--- Copyright   : (c) 2015 Brendan Hay
+-- Copyright   : (c) 2015-2016 Brendan Hay
 -- License     : Mozilla Public License, v. 2.0.
 -- Maintainer  : Brendan Hay <brendan.g.hay@gmail.com>
 -- Stability   : auto-generated
@@ -60,7 +60,7 @@
 -- | Returns the rules in the access control list for the calendar.
 --
 -- /See:/ 'aclList' smart constructor.
-data ACLList = ACLList
+data ACLList = ACLList'
     { _alSyncToken   :: !(Maybe Text)
     , _alCalendarId  :: !Text
     , _alShowDeleted :: !(Maybe Bool)
@@ -85,7 +85,7 @@
     :: Text -- ^ 'alCalendarId'
     -> ACLList
 aclList pAlCalendarId_ =
-    ACLList
+    ACLList'
     { _alSyncToken = Nothing
     , _alCalendarId = pAlCalendarId_
     , _alShowDeleted = Nothing
@@ -136,7 +136,9 @@
 
 instance GoogleRequest ACLList where
         type Rs ACLList = ACL
-        requestClient ACLList{..}
+        type Scopes ACLList =
+             '["https://www.googleapis.com/auth/calendar"]
+        requestClient ACLList'{..}
           = go _alCalendarId _alSyncToken _alShowDeleted
               _alPageToken
               _alMaxResults
diff --git a/gen/Network/Google/Resource/Calendar/ACL/Patch.hs b/gen/Network/Google/Resource/Calendar/ACL/Patch.hs
--- a/gen/Network/Google/Resource/Calendar/ACL/Patch.hs
+++ b/gen/Network/Google/Resource/Calendar/ACL/Patch.hs
@@ -14,7 +14,7 @@
 
 -- |
 -- Module      : Network.Google.Resource.Calendar.ACL.Patch
--- Copyright   : (c) 2015 Brendan Hay
+-- Copyright   : (c) 2015-2016 Brendan Hay
 -- License     : Mozilla Public License, v. 2.0.
 -- Maintainer  : Brendan Hay <brendan.g.hay@gmail.com>
 -- Stability   : auto-generated
@@ -56,7 +56,7 @@
 -- | Updates an access control rule. This method supports patch semantics.
 --
 -- /See:/ 'aclPatch' smart constructor.
-data ACLPatch = ACLPatch
+data ACLPatch = ACLPatch'
     { _apCalendarId :: !Text
     , _apRuleId     :: !Text
     , _apPayload    :: !ACLRule
@@ -77,7 +77,7 @@
     -> ACLRule -- ^ 'apPayload'
     -> ACLPatch
 aclPatch pApCalendarId_ pApRuleId_ pApPayload_ =
-    ACLPatch
+    ACLPatch'
     { _apCalendarId = pApCalendarId_
     , _apRuleId = pApRuleId_
     , _apPayload = pApPayload_
@@ -101,7 +101,9 @@
 
 instance GoogleRequest ACLPatch where
         type Rs ACLPatch = ACLRule
-        requestClient ACLPatch{..}
+        type Scopes ACLPatch =
+             '["https://www.googleapis.com/auth/calendar"]
+        requestClient ACLPatch'{..}
           = go _apCalendarId _apRuleId (Just AltJSON)
               _apPayload
               appsCalendarService
diff --git a/gen/Network/Google/Resource/Calendar/ACL/Update.hs b/gen/Network/Google/Resource/Calendar/ACL/Update.hs
--- a/gen/Network/Google/Resource/Calendar/ACL/Update.hs
+++ b/gen/Network/Google/Resource/Calendar/ACL/Update.hs
@@ -14,7 +14,7 @@
 
 -- |
 -- Module      : Network.Google.Resource.Calendar.ACL.Update
--- Copyright   : (c) 2015 Brendan Hay
+-- Copyright   : (c) 2015-2016 Brendan Hay
 -- License     : Mozilla Public License, v. 2.0.
 -- Maintainer  : Brendan Hay <brendan.g.hay@gmail.com>
 -- Stability   : auto-generated
@@ -56,7 +56,7 @@
 -- | Updates an access control rule.
 --
 -- /See:/ 'aclUpdate' smart constructor.
-data ACLUpdate = ACLUpdate
+data ACLUpdate = ACLUpdate'
     { _auCalendarId :: !Text
     , _auRuleId     :: !Text
     , _auPayload    :: !ACLRule
@@ -77,7 +77,7 @@
     -> ACLRule -- ^ 'auPayload'
     -> ACLUpdate
 aclUpdate pAuCalendarId_ pAuRuleId_ pAuPayload_ =
-    ACLUpdate
+    ACLUpdate'
     { _auCalendarId = pAuCalendarId_
     , _auRuleId = pAuRuleId_
     , _auPayload = pAuPayload_
@@ -101,7 +101,9 @@
 
 instance GoogleRequest ACLUpdate where
         type Rs ACLUpdate = ACLRule
-        requestClient ACLUpdate{..}
+        type Scopes ACLUpdate =
+             '["https://www.googleapis.com/auth/calendar"]
+        requestClient ACLUpdate'{..}
           = go _auCalendarId _auRuleId (Just AltJSON)
               _auPayload
               appsCalendarService
diff --git a/gen/Network/Google/Resource/Calendar/ACL/Watch.hs b/gen/Network/Google/Resource/Calendar/ACL/Watch.hs
--- a/gen/Network/Google/Resource/Calendar/ACL/Watch.hs
+++ b/gen/Network/Google/Resource/Calendar/ACL/Watch.hs
@@ -14,7 +14,7 @@
 
 -- |
 -- Module      : Network.Google.Resource.Calendar.ACL.Watch
--- Copyright   : (c) 2015 Brendan Hay
+-- Copyright   : (c) 2015-2016 Brendan Hay
 -- License     : Mozilla Public License, v. 2.0.
 -- Maintainer  : Brendan Hay <brendan.g.hay@gmail.com>
 -- Stability   : auto-generated
@@ -63,7 +63,7 @@
 -- | Watch for changes to ACL resources.
 --
 -- /See:/ 'aclWatch' smart constructor.
-data ACLWatch = ACLWatch
+data ACLWatch = ACLWatch'
     { _awSyncToken   :: !(Maybe Text)
     , _awCalendarId  :: !Text
     , _awShowDeleted :: !(Maybe Bool)
@@ -92,7 +92,7 @@
     -> Channel -- ^ 'awPayload'
     -> ACLWatch
 aclWatch pAwCalendarId_ pAwPayload_ =
-    ACLWatch
+    ACLWatch'
     { _awSyncToken = Nothing
     , _awCalendarId = pAwCalendarId_
     , _awShowDeleted = Nothing
@@ -149,7 +149,9 @@
 
 instance GoogleRequest ACLWatch where
         type Rs ACLWatch = Channel
-        requestClient ACLWatch{..}
+        type Scopes ACLWatch =
+             '["https://www.googleapis.com/auth/calendar"]
+        requestClient ACLWatch'{..}
           = go _awCalendarId _awSyncToken _awShowDeleted
               _awPageToken
               _awMaxResults
diff --git a/gen/Network/Google/Resource/Calendar/CalendarList/Delete.hs b/gen/Network/Google/Resource/Calendar/CalendarList/Delete.hs
--- a/gen/Network/Google/Resource/Calendar/CalendarList/Delete.hs
+++ b/gen/Network/Google/Resource/Calendar/CalendarList/Delete.hs
@@ -14,7 +14,7 @@
 
 -- |
 -- Module      : Network.Google.Resource.Calendar.CalendarList.Delete
--- Copyright   : (c) 2015 Brendan Hay
+-- Copyright   : (c) 2015-2016 Brendan Hay
 -- License     : Mozilla Public License, v. 2.0.
 -- Maintainer  : Brendan Hay <brendan.g.hay@gmail.com>
 -- Stability   : auto-generated
@@ -53,7 +53,7 @@
 -- | Deletes an entry on the user\'s calendar list.
 --
 -- /See:/ 'calendarListDelete' smart constructor.
-newtype CalendarListDelete = CalendarListDelete
+newtype CalendarListDelete = CalendarListDelete'
     { _cldCalendarId :: Text
     } deriving (Eq,Show,Data,Typeable,Generic)
 
@@ -66,7 +66,7 @@
     :: Text -- ^ 'cldCalendarId'
     -> CalendarListDelete
 calendarListDelete pCldCalendarId_ =
-    CalendarListDelete
+    CalendarListDelete'
     { _cldCalendarId = pCldCalendarId_
     }
 
@@ -80,7 +80,9 @@
 
 instance GoogleRequest CalendarListDelete where
         type Rs CalendarListDelete = ()
-        requestClient CalendarListDelete{..}
+        type Scopes CalendarListDelete =
+             '["https://www.googleapis.com/auth/calendar"]
+        requestClient CalendarListDelete'{..}
           = go _cldCalendarId (Just AltJSON)
               appsCalendarService
           where go
diff --git a/gen/Network/Google/Resource/Calendar/CalendarList/Get.hs b/gen/Network/Google/Resource/Calendar/CalendarList/Get.hs
--- a/gen/Network/Google/Resource/Calendar/CalendarList/Get.hs
+++ b/gen/Network/Google/Resource/Calendar/CalendarList/Get.hs
@@ -14,7 +14,7 @@
 
 -- |
 -- Module      : Network.Google.Resource.Calendar.CalendarList.Get
--- Copyright   : (c) 2015 Brendan Hay
+-- Copyright   : (c) 2015-2016 Brendan Hay
 -- License     : Mozilla Public License, v. 2.0.
 -- Maintainer  : Brendan Hay <brendan.g.hay@gmail.com>
 -- Stability   : auto-generated
@@ -54,7 +54,7 @@
 -- | Returns an entry on the user\'s calendar list.
 --
 -- /See:/ 'calendarListGet' smart constructor.
-newtype CalendarListGet = CalendarListGet
+newtype CalendarListGet = CalendarListGet'
     { _clgCalendarId :: Text
     } deriving (Eq,Show,Data,Typeable,Generic)
 
@@ -67,7 +67,7 @@
     :: Text -- ^ 'clgCalendarId'
     -> CalendarListGet
 calendarListGet pClgCalendarId_ =
-    CalendarListGet
+    CalendarListGet'
     { _clgCalendarId = pClgCalendarId_
     }
 
@@ -81,7 +81,10 @@
 
 instance GoogleRequest CalendarListGet where
         type Rs CalendarListGet = CalendarListEntry
-        requestClient CalendarListGet{..}
+        type Scopes CalendarListGet =
+             '["https://www.googleapis.com/auth/calendar",
+               "https://www.googleapis.com/auth/calendar.readonly"]
+        requestClient CalendarListGet'{..}
           = go _clgCalendarId (Just AltJSON)
               appsCalendarService
           where go
diff --git a/gen/Network/Google/Resource/Calendar/CalendarList/Insert.hs b/gen/Network/Google/Resource/Calendar/CalendarList/Insert.hs
--- a/gen/Network/Google/Resource/Calendar/CalendarList/Insert.hs
+++ b/gen/Network/Google/Resource/Calendar/CalendarList/Insert.hs
@@ -14,7 +14,7 @@
 
 -- |
 -- Module      : Network.Google.Resource.Calendar.CalendarList.Insert
--- Copyright   : (c) 2015 Brendan Hay
+-- Copyright   : (c) 2015-2016 Brendan Hay
 -- License     : Mozilla Public License, v. 2.0.
 -- Maintainer  : Brendan Hay <brendan.g.hay@gmail.com>
 -- Stability   : auto-generated
@@ -56,7 +56,7 @@
 -- | Adds an entry to the user\'s calendar list.
 --
 -- /See:/ 'calendarListInsert' smart constructor.
-data CalendarListInsert = CalendarListInsert
+data CalendarListInsert = CalendarListInsert'
     { _cliPayload        :: !CalendarListEntry
     , _cliColorRgbFormat :: !(Maybe Bool)
     } deriving (Eq,Show,Data,Typeable,Generic)
@@ -72,7 +72,7 @@
     :: CalendarListEntry -- ^ 'cliPayload'
     -> CalendarListInsert
 calendarListInsert pCliPayload_ =
-    CalendarListInsert
+    CalendarListInsert'
     { _cliPayload = pCliPayload_
     , _cliColorRgbFormat = Nothing
     }
@@ -93,7 +93,9 @@
 
 instance GoogleRequest CalendarListInsert where
         type Rs CalendarListInsert = CalendarListEntry
-        requestClient CalendarListInsert{..}
+        type Scopes CalendarListInsert =
+             '["https://www.googleapis.com/auth/calendar"]
+        requestClient CalendarListInsert'{..}
           = go _cliColorRgbFormat (Just AltJSON) _cliPayload
               appsCalendarService
           where go
diff --git a/gen/Network/Google/Resource/Calendar/CalendarList/List.hs b/gen/Network/Google/Resource/Calendar/CalendarList/List.hs
--- a/gen/Network/Google/Resource/Calendar/CalendarList/List.hs
+++ b/gen/Network/Google/Resource/Calendar/CalendarList/List.hs
@@ -14,7 +14,7 @@
 
 -- |
 -- Module      : Network.Google.Resource.Calendar.CalendarList.List
--- Copyright   : (c) 2015 Brendan Hay
+-- Copyright   : (c) 2015-2016 Brendan Hay
 -- License     : Mozilla Public License, v. 2.0.
 -- Maintainer  : Brendan Hay <brendan.g.hay@gmail.com>
 -- Stability   : auto-generated
@@ -65,7 +65,7 @@
 -- | Returns entries on the user\'s calendar list.
 --
 -- /See:/ 'calendarListList' smart constructor.
-data CalendarListList = CalendarListList
+data CalendarListList = CalendarListList'
     { _cllSyncToken     :: !(Maybe Text)
     , _cllMinAccessRole :: !(Maybe CalendarListListMinAccessRole)
     , _cllShowDeleted   :: !(Maybe Bool)
@@ -92,7 +92,7 @@
 calendarListList
     :: CalendarListList
 calendarListList =
-    CalendarListList
+    CalendarListList'
     { _cllSyncToken = Nothing
     , _cllMinAccessRole = Nothing
     , _cllShowDeleted = Nothing
@@ -154,7 +154,10 @@
 
 instance GoogleRequest CalendarListList where
         type Rs CalendarListList = CalendarList
-        requestClient CalendarListList{..}
+        type Scopes CalendarListList =
+             '["https://www.googleapis.com/auth/calendar",
+               "https://www.googleapis.com/auth/calendar.readonly"]
+        requestClient CalendarListList'{..}
           = go _cllSyncToken _cllMinAccessRole _cllShowDeleted
               _cllShowHidden
               _cllPageToken
diff --git a/gen/Network/Google/Resource/Calendar/CalendarList/Patch.hs b/gen/Network/Google/Resource/Calendar/CalendarList/Patch.hs
--- a/gen/Network/Google/Resource/Calendar/CalendarList/Patch.hs
+++ b/gen/Network/Google/Resource/Calendar/CalendarList/Patch.hs
@@ -14,7 +14,7 @@
 
 -- |
 -- Module      : Network.Google.Resource.Calendar.CalendarList.Patch
--- Copyright   : (c) 2015 Brendan Hay
+-- Copyright   : (c) 2015-2016 Brendan Hay
 -- License     : Mozilla Public License, v. 2.0.
 -- Maintainer  : Brendan Hay <brendan.g.hay@gmail.com>
 -- Stability   : auto-generated
@@ -60,7 +60,7 @@
 -- patch semantics.
 --
 -- /See:/ 'calendarListPatch' smart constructor.
-data CalendarListPatch = CalendarListPatch
+data CalendarListPatch = CalendarListPatch'
     { _clpCalendarId     :: !Text
     , _clpPayload        :: !CalendarListEntry
     , _clpColorRgbFormat :: !(Maybe Bool)
@@ -80,7 +80,7 @@
     -> CalendarListEntry -- ^ 'clpPayload'
     -> CalendarListPatch
 calendarListPatch pClpCalendarId_ pClpPayload_ =
-    CalendarListPatch
+    CalendarListPatch'
     { _clpCalendarId = pClpCalendarId_
     , _clpPayload = pClpPayload_
     , _clpColorRgbFormat = Nothing
@@ -110,7 +110,9 @@
 
 instance GoogleRequest CalendarListPatch where
         type Rs CalendarListPatch = CalendarListEntry
-        requestClient CalendarListPatch{..}
+        type Scopes CalendarListPatch =
+             '["https://www.googleapis.com/auth/calendar"]
+        requestClient CalendarListPatch'{..}
           = go _clpCalendarId _clpColorRgbFormat (Just AltJSON)
               _clpPayload
               appsCalendarService
diff --git a/gen/Network/Google/Resource/Calendar/CalendarList/Update.hs b/gen/Network/Google/Resource/Calendar/CalendarList/Update.hs
--- a/gen/Network/Google/Resource/Calendar/CalendarList/Update.hs
+++ b/gen/Network/Google/Resource/Calendar/CalendarList/Update.hs
@@ -14,7 +14,7 @@
 
 -- |
 -- Module      : Network.Google.Resource.Calendar.CalendarList.Update
--- Copyright   : (c) 2015 Brendan Hay
+-- Copyright   : (c) 2015-2016 Brendan Hay
 -- License     : Mozilla Public License, v. 2.0.
 -- Maintainer  : Brendan Hay <brendan.g.hay@gmail.com>
 -- Stability   : auto-generated
@@ -58,7 +58,7 @@
 -- | Updates an entry on the user\'s calendar list.
 --
 -- /See:/ 'calendarListUpdate' smart constructor.
-data CalendarListUpdate = CalendarListUpdate
+data CalendarListUpdate = CalendarListUpdate'
     { _cluCalendarId     :: !Text
     , _cluPayload        :: !CalendarListEntry
     , _cluColorRgbFormat :: !(Maybe Bool)
@@ -78,7 +78,7 @@
     -> CalendarListEntry -- ^ 'cluPayload'
     -> CalendarListUpdate
 calendarListUpdate pCluCalendarId_ pCluPayload_ =
-    CalendarListUpdate
+    CalendarListUpdate'
     { _cluCalendarId = pCluCalendarId_
     , _cluPayload = pCluPayload_
     , _cluColorRgbFormat = Nothing
@@ -108,7 +108,9 @@
 
 instance GoogleRequest CalendarListUpdate where
         type Rs CalendarListUpdate = CalendarListEntry
-        requestClient CalendarListUpdate{..}
+        type Scopes CalendarListUpdate =
+             '["https://www.googleapis.com/auth/calendar"]
+        requestClient CalendarListUpdate'{..}
           = go _cluCalendarId _cluColorRgbFormat (Just AltJSON)
               _cluPayload
               appsCalendarService
diff --git a/gen/Network/Google/Resource/Calendar/CalendarList/Watch.hs b/gen/Network/Google/Resource/Calendar/CalendarList/Watch.hs
--- a/gen/Network/Google/Resource/Calendar/CalendarList/Watch.hs
+++ b/gen/Network/Google/Resource/Calendar/CalendarList/Watch.hs
@@ -14,7 +14,7 @@
 
 -- |
 -- Module      : Network.Google.Resource.Calendar.CalendarList.Watch
--- Copyright   : (c) 2015 Brendan Hay
+-- Copyright   : (c) 2015-2016 Brendan Hay
 -- License     : Mozilla Public License, v. 2.0.
 -- Maintainer  : Brendan Hay <brendan.g.hay@gmail.com>
 -- Stability   : auto-generated
@@ -68,7 +68,7 @@
 -- | Watch for changes to CalendarList resources.
 --
 -- /See:/ 'calendarListWatch' smart constructor.
-data CalendarListWatch = CalendarListWatch
+data CalendarListWatch = CalendarListWatch'
     { _clwSyncToken     :: !(Maybe Text)
     , _clwMinAccessRole :: !(Maybe CalendarListWatchMinAccessRole)
     , _clwShowDeleted   :: !(Maybe Bool)
@@ -99,7 +99,7 @@
     :: Channel -- ^ 'clwPayload'
     -> CalendarListWatch
 calendarListWatch pClwPayload_ =
-    CalendarListWatch
+    CalendarListWatch'
     { _clwSyncToken = Nothing
     , _clwMinAccessRole = Nothing
     , _clwShowDeleted = Nothing
@@ -167,7 +167,10 @@
 
 instance GoogleRequest CalendarListWatch where
         type Rs CalendarListWatch = Channel
-        requestClient CalendarListWatch{..}
+        type Scopes CalendarListWatch =
+             '["https://www.googleapis.com/auth/calendar",
+               "https://www.googleapis.com/auth/calendar.readonly"]
+        requestClient CalendarListWatch'{..}
           = go _clwSyncToken _clwMinAccessRole _clwShowDeleted
               _clwShowHidden
               _clwPageToken
diff --git a/gen/Network/Google/Resource/Calendar/Calendars/Clear.hs b/gen/Network/Google/Resource/Calendar/Calendars/Clear.hs
--- a/gen/Network/Google/Resource/Calendar/Calendars/Clear.hs
+++ b/gen/Network/Google/Resource/Calendar/Calendars/Clear.hs
@@ -14,7 +14,7 @@
 
 -- |
 -- Module      : Network.Google.Resource.Calendar.Calendars.Clear
--- Copyright   : (c) 2015 Brendan Hay
+-- Copyright   : (c) 2015-2016 Brendan Hay
 -- License     : Mozilla Public License, v. 2.0.
 -- Maintainer  : Brendan Hay <brendan.g.hay@gmail.com>
 -- Stability   : auto-generated
@@ -54,7 +54,7 @@
 -- with the primary calendar of an account.
 --
 -- /See:/ 'calendarsClear' smart constructor.
-newtype CalendarsClear = CalendarsClear
+newtype CalendarsClear = CalendarsClear'
     { _ccCalendarId :: Text
     } deriving (Eq,Show,Data,Typeable,Generic)
 
@@ -67,7 +67,7 @@
     :: Text -- ^ 'ccCalendarId'
     -> CalendarsClear
 calendarsClear pCcCalendarId_ =
-    CalendarsClear
+    CalendarsClear'
     { _ccCalendarId = pCcCalendarId_
     }
 
@@ -80,7 +80,9 @@
 
 instance GoogleRequest CalendarsClear where
         type Rs CalendarsClear = ()
-        requestClient CalendarsClear{..}
+        type Scopes CalendarsClear =
+             '["https://www.googleapis.com/auth/calendar"]
+        requestClient CalendarsClear'{..}
           = go _ccCalendarId (Just AltJSON) appsCalendarService
           where go
                   = buildClient (Proxy :: Proxy CalendarsClearResource)
diff --git a/gen/Network/Google/Resource/Calendar/Calendars/Delete.hs b/gen/Network/Google/Resource/Calendar/Calendars/Delete.hs
--- a/gen/Network/Google/Resource/Calendar/Calendars/Delete.hs
+++ b/gen/Network/Google/Resource/Calendar/Calendars/Delete.hs
@@ -14,7 +14,7 @@
 
 -- |
 -- Module      : Network.Google.Resource.Calendar.Calendars.Delete
--- Copyright   : (c) 2015 Brendan Hay
+-- Copyright   : (c) 2015-2016 Brendan Hay
 -- License     : Mozilla Public License, v. 2.0.
 -- Maintainer  : Brendan Hay <brendan.g.hay@gmail.com>
 -- Stability   : auto-generated
@@ -53,7 +53,7 @@
 -- events on primary calendars.
 --
 -- /See:/ 'calendarsDelete' smart constructor.
-newtype CalendarsDelete = CalendarsDelete
+newtype CalendarsDelete = CalendarsDelete'
     { _cdCalendarId :: Text
     } deriving (Eq,Show,Data,Typeable,Generic)
 
@@ -66,7 +66,7 @@
     :: Text -- ^ 'cdCalendarId'
     -> CalendarsDelete
 calendarsDelete pCdCalendarId_ =
-    CalendarsDelete
+    CalendarsDelete'
     { _cdCalendarId = pCdCalendarId_
     }
 
@@ -79,7 +79,9 @@
 
 instance GoogleRequest CalendarsDelete where
         type Rs CalendarsDelete = ()
-        requestClient CalendarsDelete{..}
+        type Scopes CalendarsDelete =
+             '["https://www.googleapis.com/auth/calendar"]
+        requestClient CalendarsDelete'{..}
           = go _cdCalendarId (Just AltJSON) appsCalendarService
           where go
                   = buildClient
diff --git a/gen/Network/Google/Resource/Calendar/Calendars/Get.hs b/gen/Network/Google/Resource/Calendar/Calendars/Get.hs
--- a/gen/Network/Google/Resource/Calendar/Calendars/Get.hs
+++ b/gen/Network/Google/Resource/Calendar/Calendars/Get.hs
@@ -14,7 +14,7 @@
 
 -- |
 -- Module      : Network.Google.Resource.Calendar.Calendars.Get
--- Copyright   : (c) 2015 Brendan Hay
+-- Copyright   : (c) 2015-2016 Brendan Hay
 -- License     : Mozilla Public License, v. 2.0.
 -- Maintainer  : Brendan Hay <brendan.g.hay@gmail.com>
 -- Stability   : auto-generated
@@ -51,7 +51,7 @@
 -- | Returns metadata for a calendar.
 --
 -- /See:/ 'calendarsGet' smart constructor.
-newtype CalendarsGet = CalendarsGet
+newtype CalendarsGet = CalendarsGet'
     { _cgCalendarId :: Text
     } deriving (Eq,Show,Data,Typeable,Generic)
 
@@ -64,7 +64,7 @@
     :: Text -- ^ 'cgCalendarId'
     -> CalendarsGet
 calendarsGet pCgCalendarId_ =
-    CalendarsGet
+    CalendarsGet'
     { _cgCalendarId = pCgCalendarId_
     }
 
@@ -77,7 +77,10 @@
 
 instance GoogleRequest CalendarsGet where
         type Rs CalendarsGet = Calendar
-        requestClient CalendarsGet{..}
+        type Scopes CalendarsGet =
+             '["https://www.googleapis.com/auth/calendar",
+               "https://www.googleapis.com/auth/calendar.readonly"]
+        requestClient CalendarsGet'{..}
           = go _cgCalendarId (Just AltJSON) appsCalendarService
           where go
                   = buildClient (Proxy :: Proxy CalendarsGetResource)
diff --git a/gen/Network/Google/Resource/Calendar/Calendars/Insert.hs b/gen/Network/Google/Resource/Calendar/Calendars/Insert.hs
--- a/gen/Network/Google/Resource/Calendar/Calendars/Insert.hs
+++ b/gen/Network/Google/Resource/Calendar/Calendars/Insert.hs
@@ -14,7 +14,7 @@
 
 -- |
 -- Module      : Network.Google.Resource.Calendar.Calendars.Insert
--- Copyright   : (c) 2015 Brendan Hay
+-- Copyright   : (c) 2015-2016 Brendan Hay
 -- License     : Mozilla Public License, v. 2.0.
 -- Maintainer  : Brendan Hay <brendan.g.hay@gmail.com>
 -- Stability   : auto-generated
@@ -51,7 +51,7 @@
 -- | Creates a secondary calendar.
 --
 -- /See:/ 'calendarsInsert' smart constructor.
-newtype CalendarsInsert = CalendarsInsert
+newtype CalendarsInsert = CalendarsInsert'
     { _ciPayload :: Calendar
     } deriving (Eq,Show,Data,Typeable,Generic)
 
@@ -64,7 +64,7 @@
     :: Calendar -- ^ 'ciPayload'
     -> CalendarsInsert
 calendarsInsert pCiPayload_ =
-    CalendarsInsert
+    CalendarsInsert'
     { _ciPayload = pCiPayload_
     }
 
@@ -75,7 +75,9 @@
 
 instance GoogleRequest CalendarsInsert where
         type Rs CalendarsInsert = Calendar
-        requestClient CalendarsInsert{..}
+        type Scopes CalendarsInsert =
+             '["https://www.googleapis.com/auth/calendar"]
+        requestClient CalendarsInsert'{..}
           = go (Just AltJSON) _ciPayload appsCalendarService
           where go
                   = buildClient
diff --git a/gen/Network/Google/Resource/Calendar/Calendars/Patch.hs b/gen/Network/Google/Resource/Calendar/Calendars/Patch.hs
--- a/gen/Network/Google/Resource/Calendar/Calendars/Patch.hs
+++ b/gen/Network/Google/Resource/Calendar/Calendars/Patch.hs
@@ -14,7 +14,7 @@
 
 -- |
 -- Module      : Network.Google.Resource.Calendar.Calendars.Patch
--- Copyright   : (c) 2015 Brendan Hay
+-- Copyright   : (c) 2015-2016 Brendan Hay
 -- License     : Mozilla Public License, v. 2.0.
 -- Maintainer  : Brendan Hay <brendan.g.hay@gmail.com>
 -- Stability   : auto-generated
@@ -53,7 +53,7 @@
 -- | Updates metadata for a calendar. This method supports patch semantics.
 --
 -- /See:/ 'calendarsPatch' smart constructor.
-data CalendarsPatch = CalendarsPatch
+data CalendarsPatch = CalendarsPatch'
     { _cpCalendarId :: !Text
     , _cpPayload    :: !Calendar
     } deriving (Eq,Show,Data,Typeable,Generic)
@@ -70,7 +70,7 @@
     -> Calendar -- ^ 'cpPayload'
     -> CalendarsPatch
 calendarsPatch pCpCalendarId_ pCpPayload_ =
-    CalendarsPatch
+    CalendarsPatch'
     { _cpCalendarId = pCpCalendarId_
     , _cpPayload = pCpPayload_
     }
@@ -89,7 +89,9 @@
 
 instance GoogleRequest CalendarsPatch where
         type Rs CalendarsPatch = Calendar
-        requestClient CalendarsPatch{..}
+        type Scopes CalendarsPatch =
+             '["https://www.googleapis.com/auth/calendar"]
+        requestClient CalendarsPatch'{..}
           = go _cpCalendarId (Just AltJSON) _cpPayload
               appsCalendarService
           where go
diff --git a/gen/Network/Google/Resource/Calendar/Calendars/Update.hs b/gen/Network/Google/Resource/Calendar/Calendars/Update.hs
--- a/gen/Network/Google/Resource/Calendar/Calendars/Update.hs
+++ b/gen/Network/Google/Resource/Calendar/Calendars/Update.hs
@@ -14,7 +14,7 @@
 
 -- |
 -- Module      : Network.Google.Resource.Calendar.Calendars.Update
--- Copyright   : (c) 2015 Brendan Hay
+-- Copyright   : (c) 2015-2016 Brendan Hay
 -- License     : Mozilla Public License, v. 2.0.
 -- Maintainer  : Brendan Hay <brendan.g.hay@gmail.com>
 -- Stability   : auto-generated
@@ -53,7 +53,7 @@
 -- | Updates metadata for a calendar.
 --
 -- /See:/ 'calendarsUpdate' smart constructor.
-data CalendarsUpdate = CalendarsUpdate
+data CalendarsUpdate = CalendarsUpdate'
     { _cuCalendarId :: !Text
     , _cuPayload    :: !Calendar
     } deriving (Eq,Show,Data,Typeable,Generic)
@@ -70,7 +70,7 @@
     -> Calendar -- ^ 'cuPayload'
     -> CalendarsUpdate
 calendarsUpdate pCuCalendarId_ pCuPayload_ =
-    CalendarsUpdate
+    CalendarsUpdate'
     { _cuCalendarId = pCuCalendarId_
     , _cuPayload = pCuPayload_
     }
@@ -89,7 +89,9 @@
 
 instance GoogleRequest CalendarsUpdate where
         type Rs CalendarsUpdate = Calendar
-        requestClient CalendarsUpdate{..}
+        type Scopes CalendarsUpdate =
+             '["https://www.googleapis.com/auth/calendar"]
+        requestClient CalendarsUpdate'{..}
           = go _cuCalendarId (Just AltJSON) _cuPayload
               appsCalendarService
           where go
diff --git a/gen/Network/Google/Resource/Calendar/Channels/Stop.hs b/gen/Network/Google/Resource/Calendar/Channels/Stop.hs
--- a/gen/Network/Google/Resource/Calendar/Channels/Stop.hs
+++ b/gen/Network/Google/Resource/Calendar/Channels/Stop.hs
@@ -14,7 +14,7 @@
 
 -- |
 -- Module      : Network.Google.Resource.Calendar.Channels.Stop
--- Copyright   : (c) 2015 Brendan Hay
+-- Copyright   : (c) 2015-2016 Brendan Hay
 -- License     : Mozilla Public License, v. 2.0.
 -- Maintainer  : Brendan Hay <brendan.g.hay@gmail.com>
 -- Stability   : auto-generated
@@ -52,7 +52,7 @@
 -- | Stop watching resources through this channel
 --
 -- /See:/ 'channelsStop' smart constructor.
-newtype ChannelsStop = ChannelsStop
+newtype ChannelsStop = ChannelsStop'
     { _csPayload :: Channel
     } deriving (Eq,Show,Data,Typeable,Generic)
 
@@ -65,7 +65,7 @@
     :: Channel -- ^ 'csPayload'
     -> ChannelsStop
 channelsStop pCsPayload_ =
-    ChannelsStop
+    ChannelsStop'
     { _csPayload = pCsPayload_
     }
 
@@ -76,7 +76,10 @@
 
 instance GoogleRequest ChannelsStop where
         type Rs ChannelsStop = ()
-        requestClient ChannelsStop{..}
+        type Scopes ChannelsStop =
+             '["https://www.googleapis.com/auth/calendar",
+               "https://www.googleapis.com/auth/calendar.readonly"]
+        requestClient ChannelsStop'{..}
           = go (Just AltJSON) _csPayload appsCalendarService
           where go
                   = buildClient (Proxy :: Proxy ChannelsStopResource)
diff --git a/gen/Network/Google/Resource/Calendar/Colors/Get.hs b/gen/Network/Google/Resource/Calendar/Colors/Get.hs
--- a/gen/Network/Google/Resource/Calendar/Colors/Get.hs
+++ b/gen/Network/Google/Resource/Calendar/Colors/Get.hs
@@ -14,7 +14,7 @@
 
 -- |
 -- Module      : Network.Google.Resource.Calendar.Colors.Get
--- Copyright   : (c) 2015 Brendan Hay
+-- Copyright   : (c) 2015-2016 Brendan Hay
 -- License     : Mozilla Public License, v. 2.0.
 -- Maintainer  : Brendan Hay <brendan.g.hay@gmail.com>
 -- Stability   : auto-generated
@@ -49,18 +49,21 @@
 --
 -- /See:/ 'colorsGet' smart constructor.
 data ColorsGet =
-    ColorsGet
+    ColorsGet'
     deriving (Eq,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'ColorsGet' with the minimum fields required to make a request.
 --
 colorsGet
     :: ColorsGet
-colorsGet = ColorsGet
+colorsGet = ColorsGet'
 
 instance GoogleRequest ColorsGet where
         type Rs ColorsGet = Colors
-        requestClient ColorsGet{}
+        type Scopes ColorsGet =
+             '["https://www.googleapis.com/auth/calendar",
+               "https://www.googleapis.com/auth/calendar.readonly"]
+        requestClient ColorsGet'{}
           = go (Just AltJSON) appsCalendarService
           where go
                   = buildClient (Proxy :: Proxy ColorsGetResource)
diff --git a/gen/Network/Google/Resource/Calendar/Events/Delete.hs b/gen/Network/Google/Resource/Calendar/Events/Delete.hs
--- a/gen/Network/Google/Resource/Calendar/Events/Delete.hs
+++ b/gen/Network/Google/Resource/Calendar/Events/Delete.hs
@@ -14,7 +14,7 @@
 
 -- |
 -- Module      : Network.Google.Resource.Calendar.Events.Delete
--- Copyright   : (c) 2015 Brendan Hay
+-- Copyright   : (c) 2015-2016 Brendan Hay
 -- License     : Mozilla Public License, v. 2.0.
 -- Maintainer  : Brendan Hay <brendan.g.hay@gmail.com>
 -- Stability   : auto-generated
@@ -56,7 +56,7 @@
 -- | Deletes an event.
 --
 -- /See:/ 'eventsDelete' smart constructor.
-data EventsDelete = EventsDelete
+data EventsDelete = EventsDelete'
     { _edCalendarId        :: !Text
     , _edSendNotifications :: !(Maybe Bool)
     , _edEventId           :: !Text
@@ -76,7 +76,7 @@
     -> Text -- ^ 'edEventId'
     -> EventsDelete
 eventsDelete pEdCalendarId_ pEdEventId_ =
-    EventsDelete
+    EventsDelete'
     { _edCalendarId = pEdCalendarId_
     , _edSendNotifications = Nothing
     , _edEventId = pEdEventId_
@@ -103,7 +103,9 @@
 
 instance GoogleRequest EventsDelete where
         type Rs EventsDelete = ()
-        requestClient EventsDelete{..}
+        type Scopes EventsDelete =
+             '["https://www.googleapis.com/auth/calendar"]
+        requestClient EventsDelete'{..}
           = go _edCalendarId _edEventId _edSendNotifications
               (Just AltJSON)
               appsCalendarService
diff --git a/gen/Network/Google/Resource/Calendar/Events/Get.hs b/gen/Network/Google/Resource/Calendar/Events/Get.hs
--- a/gen/Network/Google/Resource/Calendar/Events/Get.hs
+++ b/gen/Network/Google/Resource/Calendar/Events/Get.hs
@@ -14,7 +14,7 @@
 
 -- |
 -- Module      : Network.Google.Resource.Calendar.Events.Get
--- Copyright   : (c) 2015 Brendan Hay
+-- Copyright   : (c) 2015-2016 Brendan Hay
 -- License     : Mozilla Public License, v. 2.0.
 -- Maintainer  : Brendan Hay <brendan.g.hay@gmail.com>
 -- Stability   : auto-generated
@@ -60,7 +60,7 @@
 -- | Returns an event.
 --
 -- /See:/ 'eventsGet' smart constructor.
-data EventsGet = EventsGet
+data EventsGet = EventsGet'
     { _egCalendarId         :: !Text
     , _egMaxAttendees       :: !(Maybe (Textual Int32))
     , _egTimeZone           :: !(Maybe Text)
@@ -86,7 +86,7 @@
     -> Text -- ^ 'egEventId'
     -> EventsGet
 eventsGet pEgCalendarId_ pEgEventId_ =
-    EventsGet
+    EventsGet'
     { _egCalendarId = pEgCalendarId_
     , _egMaxAttendees = Nothing
     , _egTimeZone = Nothing
@@ -134,7 +134,10 @@
 
 instance GoogleRequest EventsGet where
         type Rs EventsGet = Event
-        requestClient EventsGet{..}
+        type Scopes EventsGet =
+             '["https://www.googleapis.com/auth/calendar",
+               "https://www.googleapis.com/auth/calendar.readonly"]
+        requestClient EventsGet'{..}
           = go _egCalendarId _egEventId _egMaxAttendees
               _egTimeZone
               _egAlwaysIncludeEmail
diff --git a/gen/Network/Google/Resource/Calendar/Events/Import.hs b/gen/Network/Google/Resource/Calendar/Events/Import.hs
--- a/gen/Network/Google/Resource/Calendar/Events/Import.hs
+++ b/gen/Network/Google/Resource/Calendar/Events/Import.hs
@@ -14,7 +14,7 @@
 
 -- |
 -- Module      : Network.Google.Resource.Calendar.Events.Import
--- Copyright   : (c) 2015 Brendan Hay
+-- Copyright   : (c) 2015-2016 Brendan Hay
 -- License     : Mozilla Public License, v. 2.0.
 -- Maintainer  : Brendan Hay <brendan.g.hay@gmail.com>
 -- Stability   : auto-generated
@@ -59,7 +59,7 @@
 -- existing event to a calendar.
 --
 -- /See:/ 'eventsImport' smart constructor.
-data EventsImport = EventsImport
+data EventsImport = EventsImport'
     { _eiCalendarId          :: !Text
     , _eiPayload             :: !Event
     , _eiSupportsAttachments :: !(Maybe Bool)
@@ -79,7 +79,7 @@
     -> Event -- ^ 'eiPayload'
     -> EventsImport
 eventsImport pEiCalendarId_ pEiPayload_ =
-    EventsImport
+    EventsImport'
     { _eiCalendarId = pEiCalendarId_
     , _eiPayload = pEiPayload_
     , _eiSupportsAttachments = Nothing
@@ -106,7 +106,9 @@
 
 instance GoogleRequest EventsImport where
         type Rs EventsImport = Event
-        requestClient EventsImport{..}
+        type Scopes EventsImport =
+             '["https://www.googleapis.com/auth/calendar"]
+        requestClient EventsImport'{..}
           = go _eiCalendarId _eiSupportsAttachments
               (Just AltJSON)
               _eiPayload
diff --git a/gen/Network/Google/Resource/Calendar/Events/Insert.hs b/gen/Network/Google/Resource/Calendar/Events/Insert.hs
--- a/gen/Network/Google/Resource/Calendar/Events/Insert.hs
+++ b/gen/Network/Google/Resource/Calendar/Events/Insert.hs
@@ -14,7 +14,7 @@
 
 -- |
 -- Module      : Network.Google.Resource.Calendar.Events.Insert
--- Copyright   : (c) 2015 Brendan Hay
+-- Copyright   : (c) 2015-2016 Brendan Hay
 -- License     : Mozilla Public License, v. 2.0.
 -- Maintainer  : Brendan Hay <brendan.g.hay@gmail.com>
 -- Stability   : auto-generated
@@ -60,7 +60,7 @@
 -- | Creates an event.
 --
 -- /See:/ 'eventsInsert' smart constructor.
-data EventsInsert = EventsInsert
+data EventsInsert = EventsInsert'
     { _eveCalendarId          :: !Text
     , _evePayload             :: !Event
     , _eveMaxAttendees        :: !(Maybe (Textual Int32))
@@ -86,7 +86,7 @@
     -> Event -- ^ 'evePayload'
     -> EventsInsert
 eventsInsert pEveCalendarId_ pEvePayload_ =
-    EventsInsert
+    EventsInsert'
     { _eveCalendarId = pEveCalendarId_
     , _evePayload = pEvePayload_
     , _eveMaxAttendees = Nothing
@@ -132,7 +132,9 @@
 
 instance GoogleRequest EventsInsert where
         type Rs EventsInsert = Event
-        requestClient EventsInsert{..}
+        type Scopes EventsInsert =
+             '["https://www.googleapis.com/auth/calendar"]
+        requestClient EventsInsert'{..}
           = go _eveCalendarId _eveMaxAttendees
               _eveSendNotifications
               _eveSupportsAttachments
diff --git a/gen/Network/Google/Resource/Calendar/Events/Instances.hs b/gen/Network/Google/Resource/Calendar/Events/Instances.hs
--- a/gen/Network/Google/Resource/Calendar/Events/Instances.hs
+++ b/gen/Network/Google/Resource/Calendar/Events/Instances.hs
@@ -14,7 +14,7 @@
 
 -- |
 -- Module      : Network.Google.Resource.Calendar.Events.Instances
--- Copyright   : (c) 2015 Brendan Hay
+-- Copyright   : (c) 2015-2016 Brendan Hay
 -- License     : Mozilla Public License, v. 2.0.
 -- Maintainer  : Brendan Hay <brendan.g.hay@gmail.com>
 -- Stability   : auto-generated
@@ -74,7 +74,7 @@
 -- | Returns instances of the specified recurring event.
 --
 -- /See:/ 'eventsInstances' smart constructor.
-data EventsInstances = EventsInstances
+data EventsInstances = EventsInstances'
     { _eCalendarId         :: !Text
     , _eTimeMin            :: !(Maybe DateTime')
     , _eShowDeleted        :: !(Maybe Bool)
@@ -118,7 +118,7 @@
     -> Text -- ^ 'eEventId'
     -> EventsInstances
 eventsInstances pECalendarId_ pEEventId_ =
-    EventsInstances
+    EventsInstances'
     { _eCalendarId = pECalendarId_
     , _eTimeMin = Nothing
     , _eShowDeleted = Nothing
@@ -213,7 +213,10 @@
 
 instance GoogleRequest EventsInstances where
         type Rs EventsInstances = Events
-        requestClient EventsInstances{..}
+        type Scopes EventsInstances =
+             '["https://www.googleapis.com/auth/calendar",
+               "https://www.googleapis.com/auth/calendar.readonly"]
+        requestClient EventsInstances'{..}
           = go _eCalendarId _eEventId _eTimeMin _eShowDeleted
               _eOriginalStart
               _eMaxAttendees
diff --git a/gen/Network/Google/Resource/Calendar/Events/List.hs b/gen/Network/Google/Resource/Calendar/Events/List.hs
--- a/gen/Network/Google/Resource/Calendar/Events/List.hs
+++ b/gen/Network/Google/Resource/Calendar/Events/List.hs
@@ -14,7 +14,7 @@
 
 -- |
 -- Module      : Network.Google.Resource.Calendar.Events.List
--- Copyright   : (c) 2015 Brendan Hay
+-- Copyright   : (c) 2015-2016 Brendan Hay
 -- License     : Mozilla Public License, v. 2.0.
 -- Maintainer  : Brendan Hay <brendan.g.hay@gmail.com>
 -- Stability   : auto-generated
@@ -92,7 +92,7 @@
 -- | Returns events on the specified calendar.
 --
 -- /See:/ 'eventsList' smart constructor.
-data EventsList = EventsList
+data EventsList = EventsList'
     { _elSyncToken               :: !(Maybe Text)
     , _elCalendarId              :: !Text
     , _elTimeMin                 :: !(Maybe DateTime')
@@ -156,7 +156,7 @@
     :: Text -- ^ 'elCalendarId'
     -> EventsList
 eventsList pElCalendarId_ =
-    EventsList
+    EventsList'
     { _elSyncToken = Nothing
     , _elCalendarId = pElCalendarId_
     , _elTimeMin = Nothing
@@ -333,7 +333,10 @@
 
 instance GoogleRequest EventsList where
         type Rs EventsList = Events
-        requestClient EventsList{..}
+        type Scopes EventsList =
+             '["https://www.googleapis.com/auth/calendar",
+               "https://www.googleapis.com/auth/calendar.readonly"]
+        requestClient EventsList'{..}
           = go _elCalendarId _elSyncToken _elTimeMin _elOrderBy
               _elSingleEvents
               (_elPrivateExtendedProperty ^. _Default)
diff --git a/gen/Network/Google/Resource/Calendar/Events/Move.hs b/gen/Network/Google/Resource/Calendar/Events/Move.hs
--- a/gen/Network/Google/Resource/Calendar/Events/Move.hs
+++ b/gen/Network/Google/Resource/Calendar/Events/Move.hs
@@ -14,7 +14,7 @@
 
 -- |
 -- Module      : Network.Google.Resource.Calendar.Events.Move
--- Copyright   : (c) 2015 Brendan Hay
+-- Copyright   : (c) 2015-2016 Brendan Hay
 -- License     : Mozilla Public License, v. 2.0.
 -- Maintainer  : Brendan Hay <brendan.g.hay@gmail.com>
 -- Stability   : auto-generated
@@ -59,7 +59,7 @@
 -- | Moves an event to another calendar, i.e. changes an event\'s organizer.
 --
 -- /See:/ 'eventsMove' smart constructor.
-data EventsMove = EventsMove
+data EventsMove = EventsMove'
     { _emDestination       :: !Text
     , _emCalendarId        :: !Text
     , _emSendNotifications :: !(Maybe Bool)
@@ -83,7 +83,7 @@
     -> Text -- ^ 'emEventId'
     -> EventsMove
 eventsMove pEmDestination_ pEmCalendarId_ pEmEventId_ =
-    EventsMove
+    EventsMove'
     { _emDestination = pEmDestination_
     , _emCalendarId = pEmCalendarId_
     , _emSendNotifications = Nothing
@@ -117,7 +117,9 @@
 
 instance GoogleRequest EventsMove where
         type Rs EventsMove = Event
-        requestClient EventsMove{..}
+        type Scopes EventsMove =
+             '["https://www.googleapis.com/auth/calendar"]
+        requestClient EventsMove'{..}
           = go _emCalendarId _emEventId (Just _emDestination)
               _emSendNotifications
               (Just AltJSON)
diff --git a/gen/Network/Google/Resource/Calendar/Events/Patch.hs b/gen/Network/Google/Resource/Calendar/Events/Patch.hs
--- a/gen/Network/Google/Resource/Calendar/Events/Patch.hs
+++ b/gen/Network/Google/Resource/Calendar/Events/Patch.hs
@@ -14,7 +14,7 @@
 
 -- |
 -- Module      : Network.Google.Resource.Calendar.Events.Patch
--- Copyright   : (c) 2015 Brendan Hay
+-- Copyright   : (c) 2015-2016 Brendan Hay
 -- License     : Mozilla Public License, v. 2.0.
 -- Maintainer  : Brendan Hay <brendan.g.hay@gmail.com>
 -- Stability   : auto-generated
@@ -64,7 +64,7 @@
 -- | Updates an event. This method supports patch semantics.
 --
 -- /See:/ 'eventsPatch' smart constructor.
-data EventsPatch = EventsPatch
+data EventsPatch = EventsPatch'
     { _epCalendarId          :: !Text
     , _epPayload             :: !Event
     , _epMaxAttendees        :: !(Maybe (Textual Int32))
@@ -97,7 +97,7 @@
     -> Text -- ^ 'epEventId'
     -> EventsPatch
 eventsPatch pEpCalendarId_ pEpPayload_ pEpEventId_ =
-    EventsPatch
+    EventsPatch'
     { _epCalendarId = pEpCalendarId_
     , _epPayload = pEpPayload_
     , _epMaxAttendees = Nothing
@@ -160,7 +160,9 @@
 
 instance GoogleRequest EventsPatch where
         type Rs EventsPatch = Event
-        requestClient EventsPatch{..}
+        type Scopes EventsPatch =
+             '["https://www.googleapis.com/auth/calendar"]
+        requestClient EventsPatch'{..}
           = go _epCalendarId _epEventId _epMaxAttendees
               _epSendNotifications
               _epSupportsAttachments
diff --git a/gen/Network/Google/Resource/Calendar/Events/QuickAdd.hs b/gen/Network/Google/Resource/Calendar/Events/QuickAdd.hs
--- a/gen/Network/Google/Resource/Calendar/Events/QuickAdd.hs
+++ b/gen/Network/Google/Resource/Calendar/Events/QuickAdd.hs
@@ -14,7 +14,7 @@
 
 -- |
 -- Module      : Network.Google.Resource.Calendar.Events.QuickAdd
--- Copyright   : (c) 2015 Brendan Hay
+-- Copyright   : (c) 2015-2016 Brendan Hay
 -- License     : Mozilla Public License, v. 2.0.
 -- Maintainer  : Brendan Hay <brendan.g.hay@gmail.com>
 -- Stability   : auto-generated
@@ -57,7 +57,7 @@
 -- | Creates an event based on a simple text string.
 --
 -- /See:/ 'eventsQuickAdd' smart constructor.
-data EventsQuickAdd = EventsQuickAdd
+data EventsQuickAdd = EventsQuickAdd'
     { _eqaCalendarId        :: !Text
     , _eqaText              :: !Text
     , _eqaSendNotifications :: !(Maybe Bool)
@@ -77,7 +77,7 @@
     -> Text -- ^ 'eqaText'
     -> EventsQuickAdd
 eventsQuickAdd pEqaCalendarId_ pEqaText_ =
-    EventsQuickAdd
+    EventsQuickAdd'
     { _eqaCalendarId = pEqaCalendarId_
     , _eqaText = pEqaText_
     , _eqaSendNotifications = Nothing
@@ -104,7 +104,9 @@
 
 instance GoogleRequest EventsQuickAdd where
         type Rs EventsQuickAdd = Event
-        requestClient EventsQuickAdd{..}
+        type Scopes EventsQuickAdd =
+             '["https://www.googleapis.com/auth/calendar"]
+        requestClient EventsQuickAdd'{..}
           = go _eqaCalendarId (Just _eqaText)
               _eqaSendNotifications
               (Just AltJSON)
diff --git a/gen/Network/Google/Resource/Calendar/Events/Update.hs b/gen/Network/Google/Resource/Calendar/Events/Update.hs
--- a/gen/Network/Google/Resource/Calendar/Events/Update.hs
+++ b/gen/Network/Google/Resource/Calendar/Events/Update.hs
@@ -14,7 +14,7 @@
 
 -- |
 -- Module      : Network.Google.Resource.Calendar.Events.Update
--- Copyright   : (c) 2015 Brendan Hay
+-- Copyright   : (c) 2015-2016 Brendan Hay
 -- License     : Mozilla Public License, v. 2.0.
 -- Maintainer  : Brendan Hay <brendan.g.hay@gmail.com>
 -- Stability   : auto-generated
@@ -64,7 +64,7 @@
 -- | Updates an event.
 --
 -- /See:/ 'eventsUpdate' smart constructor.
-data EventsUpdate = EventsUpdate
+data EventsUpdate = EventsUpdate'
     { _euCalendarId          :: !Text
     , _euPayload             :: !Event
     , _euMaxAttendees        :: !(Maybe (Textual Int32))
@@ -97,7 +97,7 @@
     -> Text -- ^ 'euEventId'
     -> EventsUpdate
 eventsUpdate pEuCalendarId_ pEuPayload_ pEuEventId_ =
-    EventsUpdate
+    EventsUpdate'
     { _euCalendarId = pEuCalendarId_
     , _euPayload = pEuPayload_
     , _euMaxAttendees = Nothing
@@ -160,7 +160,9 @@
 
 instance GoogleRequest EventsUpdate where
         type Rs EventsUpdate = Event
-        requestClient EventsUpdate{..}
+        type Scopes EventsUpdate =
+             '["https://www.googleapis.com/auth/calendar"]
+        requestClient EventsUpdate'{..}
           = go _euCalendarId _euEventId _euMaxAttendees
               _euSendNotifications
               _euSupportsAttachments
diff --git a/gen/Network/Google/Resource/Calendar/Events/Watch.hs b/gen/Network/Google/Resource/Calendar/Events/Watch.hs
--- a/gen/Network/Google/Resource/Calendar/Events/Watch.hs
+++ b/gen/Network/Google/Resource/Calendar/Events/Watch.hs
@@ -14,7 +14,7 @@
 
 -- |
 -- Module      : Network.Google.Resource.Calendar.Events.Watch
--- Copyright   : (c) 2015 Brendan Hay
+-- Copyright   : (c) 2015-2016 Brendan Hay
 -- License     : Mozilla Public License, v. 2.0.
 -- Maintainer  : Brendan Hay <brendan.g.hay@gmail.com>
 -- Stability   : auto-generated
@@ -97,7 +97,7 @@
 -- | Watch for changes to Events resources.
 --
 -- /See:/ 'eventsWatch' smart constructor.
-data EventsWatch = EventsWatch
+data EventsWatch = EventsWatch'
     { _ewSyncToken               :: !(Maybe Text)
     , _ewCalendarId              :: !Text
     , _ewTimeMin                 :: !(Maybe DateTime')
@@ -165,7 +165,7 @@
     -> Channel -- ^ 'ewPayload'
     -> EventsWatch
 eventsWatch pEwCalendarId_ pEwPayload_ =
-    EventsWatch
+    EventsWatch'
     { _ewSyncToken = Nothing
     , _ewCalendarId = pEwCalendarId_
     , _ewTimeMin = Nothing
@@ -348,7 +348,10 @@
 
 instance GoogleRequest EventsWatch where
         type Rs EventsWatch = Channel
-        requestClient EventsWatch{..}
+        type Scopes EventsWatch =
+             '["https://www.googleapis.com/auth/calendar",
+               "https://www.googleapis.com/auth/calendar.readonly"]
+        requestClient EventsWatch'{..}
           = go _ewCalendarId _ewSyncToken _ewTimeMin _ewOrderBy
               _ewSingleEvents
               (_ewPrivateExtendedProperty ^. _Default)
diff --git a/gen/Network/Google/Resource/Calendar/FreeBusy/Query.hs b/gen/Network/Google/Resource/Calendar/FreeBusy/Query.hs
--- a/gen/Network/Google/Resource/Calendar/FreeBusy/Query.hs
+++ b/gen/Network/Google/Resource/Calendar/FreeBusy/Query.hs
@@ -14,7 +14,7 @@
 
 -- |
 -- Module      : Network.Google.Resource.Calendar.FreeBusy.Query
--- Copyright   : (c) 2015 Brendan Hay
+-- Copyright   : (c) 2015-2016 Brendan Hay
 -- License     : Mozilla Public License, v. 2.0.
 -- Maintainer  : Brendan Hay <brendan.g.hay@gmail.com>
 -- Stability   : auto-generated
@@ -52,7 +52,7 @@
 -- | Returns free\/busy information for a set of calendars.
 --
 -- /See:/ 'freeBusyQuery' smart constructor.
-newtype FreeBusyQuery = FreeBusyQuery
+newtype FreeBusyQuery = FreeBusyQuery'
     { _fbqPayload :: FreeBusyRequest
     } deriving (Eq,Show,Data,Typeable,Generic)
 
@@ -65,7 +65,7 @@
     :: FreeBusyRequest -- ^ 'fbqPayload'
     -> FreeBusyQuery
 freeBusyQuery pFbqPayload_ =
-    FreeBusyQuery
+    FreeBusyQuery'
     { _fbqPayload = pFbqPayload_
     }
 
@@ -76,7 +76,10 @@
 
 instance GoogleRequest FreeBusyQuery where
         type Rs FreeBusyQuery = FreeBusyResponse
-        requestClient FreeBusyQuery{..}
+        type Scopes FreeBusyQuery =
+             '["https://www.googleapis.com/auth/calendar",
+               "https://www.googleapis.com/auth/calendar.readonly"]
+        requestClient FreeBusyQuery'{..}
           = go (Just AltJSON) _fbqPayload appsCalendarService
           where go
                   = buildClient (Proxy :: Proxy FreeBusyQueryResource)
diff --git a/gen/Network/Google/Resource/Calendar/Settings/Get.hs b/gen/Network/Google/Resource/Calendar/Settings/Get.hs
--- a/gen/Network/Google/Resource/Calendar/Settings/Get.hs
+++ b/gen/Network/Google/Resource/Calendar/Settings/Get.hs
@@ -14,7 +14,7 @@
 
 -- |
 -- Module      : Network.Google.Resource.Calendar.Settings.Get
--- Copyright   : (c) 2015 Brendan Hay
+-- Copyright   : (c) 2015-2016 Brendan Hay
 -- License     : Mozilla Public License, v. 2.0.
 -- Maintainer  : Brendan Hay <brendan.g.hay@gmail.com>
 -- Stability   : auto-generated
@@ -53,7 +53,7 @@
 -- | Returns a single user setting.
 --
 -- /See:/ 'settingsGet' smart constructor.
-newtype SettingsGet = SettingsGet
+newtype SettingsGet = SettingsGet'
     { _sgSetting :: Text
     } deriving (Eq,Show,Data,Typeable,Generic)
 
@@ -66,7 +66,7 @@
     :: Text -- ^ 'sgSetting'
     -> SettingsGet
 settingsGet pSgSetting_ =
-    SettingsGet
+    SettingsGet'
     { _sgSetting = pSgSetting_
     }
 
@@ -77,7 +77,10 @@
 
 instance GoogleRequest SettingsGet where
         type Rs SettingsGet = Setting
-        requestClient SettingsGet{..}
+        type Scopes SettingsGet =
+             '["https://www.googleapis.com/auth/calendar",
+               "https://www.googleapis.com/auth/calendar.readonly"]
+        requestClient SettingsGet'{..}
           = go _sgSetting (Just AltJSON) appsCalendarService
           where go
                   = buildClient (Proxy :: Proxy SettingsGetResource)
diff --git a/gen/Network/Google/Resource/Calendar/Settings/List.hs b/gen/Network/Google/Resource/Calendar/Settings/List.hs
--- a/gen/Network/Google/Resource/Calendar/Settings/List.hs
+++ b/gen/Network/Google/Resource/Calendar/Settings/List.hs
@@ -14,7 +14,7 @@
 
 -- |
 -- Module      : Network.Google.Resource.Calendar.Settings.List
--- Copyright   : (c) 2015 Brendan Hay
+-- Copyright   : (c) 2015-2016 Brendan Hay
 -- License     : Mozilla Public License, v. 2.0.
 -- Maintainer  : Brendan Hay <brendan.g.hay@gmail.com>
 -- Stability   : auto-generated
@@ -57,7 +57,7 @@
 -- | Returns all user settings for the authenticated user.
 --
 -- /See:/ 'settingsList' smart constructor.
-data SettingsList = SettingsList
+data SettingsList = SettingsList'
     { _slSyncToken  :: !(Maybe Text)
     , _slPageToken  :: !(Maybe Text)
     , _slMaxResults :: !(Maybe (Textual Int32))
@@ -75,7 +75,7 @@
 settingsList
     :: SettingsList
 settingsList =
-    SettingsList
+    SettingsList'
     { _slSyncToken = Nothing
     , _slPageToken = Nothing
     , _slMaxResults = Nothing
@@ -107,7 +107,10 @@
 
 instance GoogleRequest SettingsList where
         type Rs SettingsList = Settings
-        requestClient SettingsList{..}
+        type Scopes SettingsList =
+             '["https://www.googleapis.com/auth/calendar",
+               "https://www.googleapis.com/auth/calendar.readonly"]
+        requestClient SettingsList'{..}
           = go _slSyncToken _slPageToken _slMaxResults
               (Just AltJSON)
               appsCalendarService
diff --git a/gen/Network/Google/Resource/Calendar/Settings/Watch.hs b/gen/Network/Google/Resource/Calendar/Settings/Watch.hs
--- a/gen/Network/Google/Resource/Calendar/Settings/Watch.hs
+++ b/gen/Network/Google/Resource/Calendar/Settings/Watch.hs
@@ -14,7 +14,7 @@
 
 -- |
 -- Module      : Network.Google.Resource.Calendar.Settings.Watch
--- Copyright   : (c) 2015 Brendan Hay
+-- Copyright   : (c) 2015-2016 Brendan Hay
 -- License     : Mozilla Public License, v. 2.0.
 -- Maintainer  : Brendan Hay <brendan.g.hay@gmail.com>
 -- Stability   : auto-generated
@@ -60,7 +60,7 @@
 -- | Watch for changes to Settings resources.
 --
 -- /See:/ 'settingsWatch' smart constructor.
-data SettingsWatch = SettingsWatch
+data SettingsWatch = SettingsWatch'
     { _swSyncToken  :: !(Maybe Text)
     , _swPayload    :: !Channel
     , _swPageToken  :: !(Maybe Text)
@@ -82,7 +82,7 @@
     :: Channel -- ^ 'swPayload'
     -> SettingsWatch
 settingsWatch pSwPayload_ =
-    SettingsWatch
+    SettingsWatch'
     { _swSyncToken = Nothing
     , _swPayload = pSwPayload_
     , _swPageToken = Nothing
@@ -120,7 +120,10 @@
 
 instance GoogleRequest SettingsWatch where
         type Rs SettingsWatch = Channel
-        requestClient SettingsWatch{..}
+        type Scopes SettingsWatch =
+             '["https://www.googleapis.com/auth/calendar",
+               "https://www.googleapis.com/auth/calendar.readonly"]
+        requestClient SettingsWatch'{..}
           = go _swSyncToken _swPageToken _swMaxResults
               (Just AltJSON)
               _swPayload
diff --git a/gogol-apps-calendar.cabal b/gogol-apps-calendar.cabal
--- a/gogol-apps-calendar.cabal
+++ b/gogol-apps-calendar.cabal
@@ -1,5 +1,5 @@
 name:                  gogol-apps-calendar
-version:               0.0.1
+version:               0.1.0
 synopsis:              Google Calendar SDK.
 homepage:              https://github.com/brendanhay/gogol
 bug-reports:           https://github.com/brendanhay/gogol/issues
@@ -7,14 +7,14 @@
 license-file:          LICENSE
 author:                Brendan Hay
 maintainer:            Brendan Hay <brendan.g.hay@gmail.com>
-copyright:             Copyright (c) 2015 Brendan Hay
+copyright:             Copyright (c) 2015-2016 Brendan Hay
 category:              Network, Google, Cloud
 build-type:            Simple
 cabal-version:         >= 1.10
 extra-source-files:    README.md
 
 description:
-    Lets you manipulate events and other calendar data.
+    Manipulates events and other calendar data.
     .
     /Warning:/ This is an experimental prototype/preview release which is still
     under exploratory development and not intended for public use, caveat emptor!
@@ -78,5 +78,5 @@
         , Network.Google.AppsCalendar.Types.Sum
 
     build-depends:
-          gogol-core == 0.0.1.*
+          gogol-core == 0.1.0.*
         , base       >= 4.7 && < 5