Cleanup indef guards following the rename

Signed-off-by: Julien Desfossez <jdesfossez@efficios.com>
Add flag to create session and fix tests

Signed-off-by: Julien Desfossez <jdesfossez@efficios.com>