Renamed Mailbox -> MailboxAddress and Group -> GroupAddress