Changed field names to use the same terminology on Exchange installations