Improved Mail Server Name Variables

It would be an improvement if the variables for mail server names would be standardized. Two problems exist:
First, the format for the two variables is different, as seen in the following examples:
$SMTP_HOST Outgoing Mail Server Name =
$IMAP_HOST POP3/IMAP Server Name =
If the mail server is given a name, then the second one has the proper format and the first one will never work correctly.

Second, the assumption of IMAP is misleading and out of place in a variable name.

Improvements here will help with usability by being more intuitive and consistent.

Nobody? Really?