rename and tidy up session