Better names for Session methods, close #1175