Renamed methods and queries that handle session/state