Renamed everything to match IMAP convention