 
     // MARK: - Forward addresses
 
-    func listForwardingAddresses(forUserId userId: String = "me") -> Observable<ForwardingAddressesListResponse> {
-        let query = ForwardingAddressesListQuery.query(withUserId: userId)
+    func listForwardingAddresses(forUserId userId: String = "me") -> Observable<ForwardingAddressListResponse> {
+        let query = ForwardingAddressListQuery.query(withUserId: userId)
         return listForwardingAddresses(query: query)
     }
 
-    func listForwardingAddresses(query: ForwardingAddressesListQuery) -> Observable<ForwardingAddressesListResponse> {
+    func listForwardingAddresses(query: ForwardingAddressListQuery) -> Observable<ForwardingAddressListResponse> {
         return execute(query: query)
     }
 


    // MARK: - Attachments
    func getAttachments(messageId: String, attachmentId: String, forUserId userId: String = "me") ->  Observable<MessagePartBody> {
        let query = AttachmentQuery.query(withUserId: userId, messageId: messageId, identifier: attachmentId)
        return getAttachments(query: query)
    }

    func getAttachments(query: AttachmentQuery) -> Observable<MessagePartBody> {
        return execute(query: query)
    }


    typealias MessageSendQuery = GTLRGmailQuery_UsersMessagesSend
    typealias MessageTrashQuery = GTLRGmailQuery_UsersMessagesTrash
    typealias MessageUntrashQuery = GTLRGmailQuery_UsersMessagesUntrash
    typealias MessageAttachmentQuery = GTLRGmailQuery_UsersMessagesAttachmentsGet

    typealias Profile = GTLRGmail_Profile
    typealias ProfileQuery = GTLRGmailQuery_UsersGetProfile

    typealias WatchRequest = GTLRGmail_WatchRequest
    typealias WatchResponse = GTLRGmail_WatchResponse
    typealias WatchStartQuery = GTLRGmailQuery_UsersWatch
    typealias WatchStopQuery = GTLRGmailQuery_UsersStop

    typealias Draft = GTLRGmail_Draft
    typealias DraftsCreateQuery = GTLRGmailQuery_UsersDraftsCreate
    typealias DraftsDeleteQuery = GTLRGmailQuery_UsersDraftsDelete
    typealias DraftsGetQuery = GTLRGmailQuery_UsersDraftsGet
    typealias DraftsListQuery = GTLRGmailQuery_UsersDraftsList
    typealias DraftsListResponse = GTLRGmail_ListDraftsResponse
    typealias DraftsSendQuery = GTLRGmailQuery_UsersDraftsSend
    typealias DraftsUpdateQuery = GTLRGmailQuery_UsersDraftsUpdate

    typealias HistoryQuery = GTLRGmailQuery_UsersHistoryList
    typealias HistoryResponse = GTLRGmail_ListHistoryResponse

    typealias SettingsAutoForwardingQuery = GTLRGmailQuery_UsersSettingsGetAutoForwarding
    typealias SettingsAutoForwarding = GTLRGmail_AutoForwarding
    typealias SettingsAutoForwardingUpdateQuery = GTLRGmailQuery_UsersSettingsUpdateAutoForwarding
