rename login variables, now that they are generic