Rename _session to session on all relevant objects