changed session to use class method names to fix #1004