GDS-1158 Issues with session expiration
Minor variable renaming