Better session name

Still needs additional work as well