     }
 
     func watchRequest(request: WatchRequest, forUserId userId: String = "me") -> Observable<WatchResponse> {
-        let query = WatchQuery.query(withObject: request, userId: userId)
+        let query = WatchStartQuery.query(withObject: request, userId: userId)
         return watchRequest(query: query)
     }
 
-    func watchRequest(query: WatchQuery) -> Observable<WatchResponse> {
+    func watchRequest(query: WatchStartQuery) -> Observable<WatchResponse> {
         return execute(query: query)
     }
 
     func stopNotifications(forUserId userId: String = "me") -> Observable<Void> {
-        let query = StopQuery.query(withUserId: userId)
+        let query = WatchStopQuery.query(withUserId: userId)
         return stopNotifications(query: query)
     }
 
-    func stopNotifications(query: StopQuery) -> Observable<Void> {
+    func stopNotifications(query: WatchStopQuery) -> Observable<Void> {
         return execute(query: query)
     }
 

    typealias LabelsGetQuery = GTLRGmailQuery_UsersLabelsGet
    typealias LabelsPatchQuery = GTLRGmailQuery_UsersLabelsPatch
    typealias LabelsUpdateQuery = GTLRGmailQuery_UsersLabelsUpdate
    typealias MessageListQuery = GTLRGmailQuery_UsersMessagesList
    typealias MessageListResponse = GTLRGmail_ListMessagesResponse
    typealias MessageBatchDeleteQuery = GTLRGmailQuery_UsersMessagesBatchDelete

    typealias SettingsVacationQuery = GTLRGmailQuery_UsersSettingsGetVacation
    typealias SettingsVacationUpdateQuery = GTLRGmailQuery_UsersSettingsUpdateVacation
    typealias SettingsVacation = GTLRGmail_VacationSettings

    typealias FilterCreateQuery = GTLRGmailQuery_UsersSettingsFiltersCreate
    typealias Filter = GTLRGmail_Filter
    typealias FilterGetQuery = GTLRGmailQuery_UsersSettingsFiltersGet
    typealias FilterDeleteQuery = GTLRGmailQuery_UsersSettingsFiltersDelete
    typealias FilterListQuery = GTLRGmailQuery_UsersSettingsFiltersList
    typealias FilterListResponse = GTLRGmail_ListFiltersResponse

    typealias ForwardingAddress = GTLRGmail_ForwardingAddress
    typealias ForwardingAddressGetQuery = GTLRGmailQuery_UsersSettingsForwardingAddressesGet
    typealias ForwardingAddressDeleteQuery = GTLRGmailQuery_UsersSettingsForwardingAddressesDelete
    typealias ForwardingAddressCreateQuery = GTLRGmailQuery_UsersSettingsForwardingAddressesCreate
    typealias ForwardingAddressListQuery = GTLRGmailQuery_UsersSettingsForwardingAddressesList
    typealias ForwardingAddressListResponse = GTLRGmail_ListForwardingAddressesResponse

    typealias SendAsAlias = GTLRGmail_SendAs
    typealias SendAsListResponse = GTLRGmail_ListSendAsResponse
    typealias SendAsGetQuery = GTLRGmailQuery_UsersSettingsSendAsGet
