Rename folder => mailbox arguments according to API spec changes