Improve sessions management methods naming and possibly improve performance - loosely refs BT#8157