imap: Small variable rename in preparation for upcoming change

Renamed a couple of variables and updated some comments in
preparation for upcoming command id / response tag change.