fix session token naming conflict