Merge "Simplify IM types to be consistent with Exchange"