Be more consistent with session var naming