Updated mail variable name to be uniform