diff --git a/appinfo/routes.php b/appinfo/routes.php
index 5a19618a059..aea286b3b7c 100644
--- a/appinfo/routes.php
+++ b/appinfo/routes.php
@@ -30,20 +30,25 @@
 		],
 	],
 	'ocs' => [
+		/**
+		 * Signaling
+		 */
 		[
 			'name' => 'Signaling#signaling',
-			'url' => '/api/{apiVersion}/signaling',
+			'url' => '/api/{apiVersion}/signaling/{token}',
 			'verb' => 'POST',
 			'requirements' => [
 				'apiVersion' => 'v1',
+				'token' => '^[a-z0-9]{4,30}$',
 			],
 		],
 		[
 			'name' => 'Signaling#pullMessages',
-			'url' => '/api/{apiVersion}/signaling',
+			'url' => '/api/{apiVersion}/signaling/{token}',
 			'verb' => 'GET',
 			'requirements' => [
 				'apiVersion' => 'v1',
+				'token' => '^[a-z0-9]{4,30}$',
 			],
 		],
 		[
@@ -62,6 +67,10 @@
 				'apiVersion' => 'v1',
 			],
 		],
+
+		/**
+		 * Call
+		 */
 		[
 			'name' => 'Call#getPeersForCall',
 			'url' => '/api/{apiVersion}/call/{token}',
@@ -99,6 +108,9 @@
 			],
 		],
 
+		/**
+		 * Chat
+		 */
 		[
 			'name' => 'Chat#receiveMessages',
 			'url' => '/api/{apiVersion}/chat/{token}',
@@ -118,6 +130,9 @@
 			],
 		],
 
+		/**
+		 * Room
+		 */
 		[
 			'name' => 'Room#getRooms',
 			'url' => '/api/{apiVersion}/room',
@@ -239,7 +254,7 @@
 			],
 		],
 		[
-			'name' => 'Room#exitRoom',
+			'name' => 'Room#leaveRoom',
 			'url' => '/api/{apiVersion}/room/{token}/participants/active',
 			'verb' => 'DELETE',
 			'requirements' => [
@@ -265,6 +280,10 @@
 				'token' => '^[a-z0-9]{4,30}$',
 			],
 		],
+
+		/**
+		 * Guest
+		 */
 		[
 			'name' => 'Guest#setDisplayName',
 			'url' => '/api/{apiVersion}/guest/{token}/name',
diff --git a/css/style.scss b/css/style.scss
index f570fff2990..e9cbcff1936 100644
--- a/css/style.scss
+++ b/css/style.scss
@@ -1040,7 +1040,7 @@ video {
 #app-sidebar .participantWithList {
 	overflow-y: auto;
 	/* Add room for the popovermenu on last user */
-	padding-bottom: 50px;
+	padding-bottom: 64px;
 }
 
 /**
diff --git a/docs/api-v1.md b/docs/api-v1.md
index e00074dc825..009a2e71449 100644
--- a/docs/api-v1.md
+++ b/docs/api-v1.md
@@ -26,6 +26,8 @@
 - [Chat](#chat)
   * [Receive chat messages of a room](#receive-chat-messages-of-a-room)
   * [Sending a new chat message](#sending-a-new-chat-message)
+- [Guests](#guests)
+  * [Set display name](#set-display-name)
 - [Signaling](#signaling)
 
 
@@ -46,6 +48,21 @@ Base endpoint is: `/ocs/v2.php/apps/spreed/api/v1`
 * `5` user following a public link
 
 
+## Capabilities
+
+### 3.0 (Initial Talk release)
+* `audio` - audio is supported
+* `video` - video + screensharing is supported
+* `chat` - simple text chat is supported
+
+### 3.1
+* `guest-signaling` - Guests can do signaling via api endpoints
+* `empty-group-room` - Group rooms can be created without inviting a Nextcloud user group by default
+
+### 3.2
+* `guest-display-names` - Display names of guests are stored in the database, can be set via API (not WebRTC only) and are used on returned comments/participants/etc.
+* `multi-room-users` - Users can be in multiple rooms at the same time now, therefor signaling now also requires the room/call token on the URL
+
 
 ## Room management
 
diff --git a/js/app.js b/js/app.js
index 2e732c915ac..54279d83813 100644
--- a/js/app.js
+++ b/js/app.js
@@ -602,7 +602,7 @@
 			this.token = $('#app').attr('data-token');
 
 			$(window).unload(function () {
-				this.connection.leaveAllCalls();
+				this.connection.leaveCurrentRoom(false);
 				this.signaling.disconnect();
 			}.bind(this));
 
@@ -638,7 +638,7 @@
 			}
 		},
 		startLocalMedia: function(configuration) {
-			this.connection.showCamera();
+			$('.videoView').removeClass('hidden');
 			this.initAudioVideoSettings(configuration);
 			this.restoreEmptyContent();
 		},
diff --git a/js/connection.js b/js/connection.js
index f6fa10880be..868439acfae 100644
--- a/js/connection.js
+++ b/js/connection.js
@@ -20,11 +20,8 @@
 		});
 
 		this.app.signaling.on('roomChanged', function() {
-			this.leaveCurrentCall(false);
+			this.leaveCurrentRoom(false);
 		}.bind(this));
-
-		// Todo this blocks multi room support
-		this.leaveAllCalls();
 	}
 
 	OCA.Talk.Connection = Connection;
@@ -32,9 +29,6 @@
 		/** @property {OCA.Talk.Application} app */
 		app: null,
 
-		showCamera: function() {
-			$('.videoView').removeClass('hidden');
-		},
 		_createCallSuccessHandle: function(ocsResponse) {
 			var token = ocsResponse.ocs.data.token;
 			OC.Util.History.pushState({
@@ -97,12 +91,18 @@
 			this.app.signaling.joinRoom(token);
 			this.app.syncAndSetActiveRoom(token);
 		},
+		leaveCurrentRoom: function(deleter) {
+			this.app.signaling.leaveCurrentRoom();
+			OC.Util.History.pushState({}, OC.generateUrl('/apps/spreed'));
+			$('#app-content').removeClass('incall');
+			this.showRoomDeletedMessage(deleter);
+			roomsChannel.trigger('leaveCurrentCall');
+		},
 		joinCall: function(token) {
 			if (this.app.signaling.currentCallToken === token) {
 				return;
 			}
 
-			this.app.signaling.leaveCurrentCall();
 			this.app.signaling.joinCall(token);
 			this.app.signaling.syncRooms();
 
@@ -110,29 +110,11 @@
 
 			$('#emptycontent').hide();
 		},
-		leaveCall: function(token) {
-			if (this.app.signaling.currentCallToken !== token) {
-				return;
-			}
-
+		leaveCurrentCall: function() {
 			this.app.signaling.leaveCurrentCall();
 			this.app.signaling.syncRooms();
 			$('#app-content').removeClass('incall');
 		},
-		leaveCurrentCall: function(deleter) {
-			this.app.signaling.leaveCall();
-			OC.Util.History.pushState({}, OC.generateUrl('/apps/spreed'));
-			$('#app-content').removeClass('incall');
-			this.showRoomDeletedMessage(deleter);
-			roomsChannel.trigger('leaveCurrentCall');
-		},
-		leaveAllCalls: function() {
-			if (this.app.signaling) {
-				// We currently only support a single active call.
-				this.app.signaling.leaveCurrentCall();
-				this.app.signaling.leaveCurrentRoom();
-			}
-		},
 		showRoomDeletedMessage: function(deleter) {
 			if (deleter) {
 				this.app.setEmptyContentMessage(
diff --git a/js/models/roomcollection.js b/js/models/roomcollection.js
index 0d96e0783dc..65ba16b879b 100644
--- a/js/models/roomcollection.js
+++ b/js/models/roomcollection.js
@@ -29,7 +29,7 @@
 	var RoomCollection = Backbone.Collection.extend({
 		model: OCA.SpreedMe.Models.Room,
 		comparator: function(model) {
-			return -(model.get('lastPing'));
+			return [model.get('active') ? -1 : 0, -(model.get('lastPing'))];
 		},
 		url: OC.linkToOCS('apps/spreed/api/v1', 2) + 'room',
 		/**
diff --git a/js/signaling.js b/js/signaling.js
index 70d5a93023b..0e1ffeac1b7 100644
--- a/js/signaling.js
+++ b/js/signaling.js
@@ -116,10 +116,6 @@
 		}
 	};
 
-	OCA.Talk.Signaling.Base.prototype.leaveAllCalls = function() {
-		// Override if necessary.
-	};
-
 	OCA.Talk.Signaling.Base.prototype.setRoomCollection = function(rooms) {
 		this.roomCollection = rooms;
 		return this.syncRooms();
@@ -302,10 +298,6 @@
 
 	OCA.Talk.Signaling.Internal.prototype.disconnect = function() {
 		this.spreedArrayConnection = [];
-		if (this.source) {
-			this.source.close();
-			this.source = null;
-		}
 		if (this.sendInterval) {
 			window.clearInterval(this.sendInterval);
 			this.sendInterval = null;
@@ -349,7 +341,7 @@
 	OCA.Talk.Signaling.Internal.prototype._sendMessages = function(messages) {
 		var defer = $.Deferred();
 		$.ajax({
-			url: OC.linkToOCS('apps/spreed/api/v1', 2) + 'signaling',
+			url: OC.linkToOCS('apps/spreed/api/v1/signaling', 2) + this.currentRoomToken,
 			type: 'POST',
 			data: {messages: JSON.stringify(messages)},
 			beforeSend: function (request) {
@@ -378,7 +370,6 @@
 
 		if (token === this.currentRoomToken) {
 			this._stopPingCall();
-			this._closeEventSource();
 		}
 	};
 
@@ -414,24 +405,6 @@
 		}.bind(this), 10000);
 	};
 
-	/**
-	 * @private
-	 */
-	OCA.Talk.Signaling.Internal.prototype._getCallPeers = function(token) {
-		var defer = $.Deferred();
-		$.ajax({
-			beforeSend: function (request) {
-				request.setRequestHeader('Accept', 'application/json');
-			},
-			url: OC.linkToOCS('apps/spreed/api/v1/call', 2) + token,
-			success: function (result) {
-				var peers = result.ocs.data;
-				defer.resolve(peers);
-			}
-		});
-		return defer;
-	};
-
 	/**
 	 * @private
 	 */
@@ -444,7 +417,7 @@
 		// Connect to the messages endpoint and pull for new messages
 		this.pullMessagesRequest =
 		$.ajax({
-			url: OC.linkToOCS('apps/spreed/api/v1', 2) + 'signaling',
+			url: OC.linkToOCS('apps/spreed/api/v1/signaling', 2) + this.currentRoomToken,
 			type: 'GET',
 			dataType: 'json',
 			beforeSend: function (request) {
@@ -482,16 +455,6 @@
 		});
 	};
 
-	/**
-	 * @private
-	 */
-	OCA.Talk.Signaling.Internal.prototype._closeEventSource = function() {
-		if (this.source) {
-			this.source.close();
-			this.source = null;
-		}
-	};
-
 	/**
 	 * @private
 	 */
@@ -555,9 +518,7 @@
 				return;
 			}
 
-			// FIXME This was trying to call connection.leaveCurrentCall(false);
-			// FIXME UI is also not updated. But at least it stops pinging the room.
-			this.leaveCurrentRoom();
+			OCA.SpreedMe.app.connection.leaveCurrentRoom(false);
 		}.bind(this));
 	};
 
diff --git a/js/views/callinfoview.js b/js/views/callinfoview.js
index 093183fab58..e4e5ffa4699 100644
--- a/js/views/callinfoview.js
+++ b/js/views/callinfoview.js
@@ -291,7 +291,7 @@
 		},
 
 		leaveCall: function() {
-			OCA.SpreedMe.app.connection.leaveCall(this.model.get('token'));
+			OCA.SpreedMe.app.connection.leaveCurrentCall();
 		},
 
 		/**
diff --git a/js/views/roomlistview.js b/js/views/roomlistview.js
index 601df566a8a..936926eeb04 100644
--- a/js/views/roomlistview.js
+++ b/js/views/roomlistview.js
@@ -43,9 +43,9 @@
 						'<div class="app-navigation-entry-menu">'+
 							'<ul class="app-navigation-entry-menu-list">'+
 								'<li>'+
-									'<button class="leave-room-button">'+
+									'<button class="remove-room-button">'+
 										'<span class="{{#if isDeletable}}icon-close{{else}}icon-delete{{/if}}"></span>'+
-										'<span>'+t('spreed', 'Leave room')+'</span>'+
+										'<span>'+t('spreed', 'Remove room from list')+'</span>'+
 									'</button>'+
 								'</li>'+
 								'{{#if isDeletable}}'+
@@ -99,7 +99,7 @@
 		templateContext: function() {
 			return {
 				isDeletable: (this.model.get('participantType') === 1 || this.model.get('participantType') === 2) &&
-					(Object.keys(this.model.get('participants')).length > 2 || this.model.get('numGuests') > 0)
+					(Object.keys(this.model.get('participants')).length > 1 || this.model.get('numGuests') > 0)
 			};
 		},
 		onRender: function() {
@@ -128,7 +128,7 @@
 		},
 		events: {
 			'click .app-navigation-entry-utils-menu-button button': 'toggleMenu',
-			'click @ui.menu .leave-room-button': 'leaveRoom',
+			'click @ui.menu .remove-room-button': 'removeRoom',
 			'click @ui.menu .delete-room-button': 'deleteRoom',
 			'click @ui.room': 'joinRoom'
 		},
@@ -172,7 +172,7 @@
 				});
 			}
 		},
-		leaveRoom: function() {
+		removeRoom: function() {
 			this.cleanupIfActiveRoom();
 			this.$el.slideUp();
 
@@ -201,7 +201,7 @@
 			}
 
 			OCA.SpreedMe.app._chatView.$el.detach();
-			OCA.SpreedMe.app.connection.leaveCurrentCall(true);
+			OCA.SpreedMe.app.connection.leaveCurrentRoom(true);
 			OC.Util.History.pushState({}, OC.generateUrl('/apps/spreed'));
 		},
 		joinRoom: function(e) {
diff --git a/lib/AppInfo/Application.php b/lib/AppInfo/Application.php
index 980abc915cc..d3a46e64c52 100644
--- a/lib/AppInfo/Application.php
+++ b/lib/AppInfo/Application.php
@@ -86,8 +86,8 @@ protected function registerInternalSignalingHooks(EventDispatcherInterface $disp
 			$messages->addMessageForAllParticipants($room, 'refresh-participant-list');
 		};
 
-		$dispatcher->addListener(Room::class . '::postUserEnterRoom', $listener);
-		$dispatcher->addListener(Room::class . '::postGuestEnterRoom', $listener);
+		$dispatcher->addListener(Room::class . '::postJoinRoom', $listener);
+		$dispatcher->addListener(Room::class . '::postJoinRoomGuest', $listener);
 		$dispatcher->addListener(Room::class . '::postRemoveUser', $listener);
 		$dispatcher->addListener(Room::class . '::postRemoveBySession', $listener);
 		$dispatcher->addListener(Room::class . '::postUserDisconnectRoom', $listener);
diff --git a/lib/Capabilities.php b/lib/Capabilities.php
index a2d3d2d4059..5672725e65a 100644
--- a/lib/Capabilities.php
+++ b/lib/Capabilities.php
@@ -46,6 +46,8 @@ public function getCapabilities() {
 					'chat',
 					'guest-signaling',
 					'empty-group-room',
+					'guest-display-names',
+					'multi-room-users',
 				],
 			],
 		];
diff --git a/lib/Controller/CallController.php b/lib/Controller/CallController.php
index 5a4801d0667..773cbdebbfb 100644
--- a/lib/Controller/CallController.php
+++ b/lib/Controller/CallController.php
@@ -28,19 +28,17 @@
 use OCA\Spreed\Exceptions\ParticipantNotFoundException;
 use OCA\Spreed\Exceptions\RoomNotFoundException;
 use OCA\Spreed\Manager;
-use OCA\Spreed\Signaling\Messages;
+use OCA\Spreed\TalkSession;
 use OCP\AppFramework\Http;
 use OCP\AppFramework\Http\DataResponse;
 use OCP\AppFramework\OCSController;
-use OCP\ILogger;
 use OCP\IRequest;
-use OCP\ISession;
 use OCP\IUserManager;
 
 class CallController extends OCSController {
 	/** @var string */
 	private $userId;
-	/** @var ISession */
+	/** @var TalkSession */
 	private $session;
 	/** @var Manager */
 	private $manager;
@@ -50,14 +48,14 @@ class CallController extends OCSController {
 	 * @param string $UserId
 	 * @param IRequest $request
 	 * @param IUserManager $userManager
-	 * @param ISession $session
+	 * @param TalkSession $session
 	 * @param Manager $manager
 	 */
 	public function __construct($appName,
 								$UserId,
 								IRequest $request,
 								IUserManager $userManager,
-								ISession $session,
+								TalkSession $session,
 								Manager $manager) {
 		parent::__construct($appName, $request);
 		$this->userId = $UserId;
@@ -73,7 +71,7 @@ public function __construct($appName,
 	 */
 	public function getPeersForCall($token) {
 		try {
-			$room = $this->manager->getRoomForSession($this->userId, $this->session->get('spreed-session'));
+			$room = $this->manager->getRoomForSession($this->userId, $this->session->getSessionForRoom($token));
 		} catch (RoomNotFoundException $e) {
 			if ($this->userId === null) {
 				return new DataResponse([], Http::STATUS_NOT_FOUND);
@@ -143,12 +141,12 @@ public function joinCall($token) {
 		}
 
 		if ($this->userId === null) {
-			if (!$this->session->exists('spreed-session')) {
+			if ($this->session->getSessionForRoom($token) === null) {
 				return new DataResponse([], Http::STATUS_NOT_FOUND);
 			}
 
 			try {
-				$participant = $room->getParticipantBySession($this->session->get('spreed-session'));
+				$participant = $room->getParticipantBySession($this->session->getSessionForRoom($token));
 			} catch (ParticipantNotFoundException $e) {
 				return new DataResponse([], Http::STATUS_NOT_FOUND);
 			}
@@ -177,7 +175,7 @@ public function joinCall($token) {
 	 * @return DataResponse
 	 */
 	public function pingCall($token) {
-		if (!$this->session->exists('spreed-session')) {
+		if ($this->session->getSessionForRoom($token) === null) {
 			return new DataResponse([], Http::STATUS_NOT_FOUND);
 		}
 
@@ -187,7 +185,7 @@ public function pingCall($token) {
 			return new DataResponse([], Http::STATUS_NOT_FOUND);
 		}
 
-		$sessionId = $this->session->get('spreed-session');
+		$sessionId = $this->session->getSessionForRoom($token);
 		$room->ping($this->userId, $sessionId, time());
 
 		return new DataResponse();
@@ -208,12 +206,12 @@ public function leaveCall($token) {
 		}
 
 		if ($this->userId === null) {
-			if (!$this->session->exists('spreed-session')) {
+			if ($this->session->getSessionForRoom($token) === null) {
 				return new DataResponse();
 			}
 
 			try {
-				$participant = $room->getParticipantBySession($this->session->get('spreed-session'));
+				$participant = $room->getParticipantBySession($this->session->getSessionForRoom($token));
 			} catch (ParticipantNotFoundException $e) {
 				return new DataResponse([], Http::STATUS_NOT_FOUND);
 			}
diff --git a/lib/Controller/ChatController.php b/lib/Controller/ChatController.php
index e40143e9043..2de80845b93 100644
--- a/lib/Controller/ChatController.php
+++ b/lib/Controller/ChatController.php
@@ -28,12 +28,12 @@
 use OCA\Spreed\Exceptions\RoomNotFoundException;
 use OCA\Spreed\GuestManager;
 use OCA\Spreed\Manager;
+use OCA\Spreed\TalkSession;
 use OCP\AppFramework\Http;
 use OCP\AppFramework\Http\DataResponse;
 use OCP\AppFramework\OCSController;
 use OCP\Comments\IComment;
 use OCP\IRequest;
-use OCP\ISession;
 use OCP\IUser;
 use OCP\IUserManager;
 
@@ -45,7 +45,7 @@ class ChatController extends OCSController {
 	/** @var IUserManager */
 	private $userManager;
 
-	/** @var ISession */
+	/** @var TalkSession */
 	private $session;
 
 	/** @var Manager */
@@ -62,7 +62,7 @@ class ChatController extends OCSController {
 	 * @param string $UserId
 	 * @param IRequest $request
 	 * @param IUserManager $userManager
-	 * @param ISession $session
+	 * @param TalkSession $session
 	 * @param Manager $manager
 	 * @param ChatManager $chatManager
 	 * @param GuestManager $guestManager
@@ -71,7 +71,7 @@ public function __construct($appName,
 								$UserId,
 								IRequest $request,
 								IUserManager $userManager,
-								ISession $session,
+								TalkSession $session,
 								Manager $manager,
 								ChatManager $chatManager,
 								GuestManager $guestManager) {
@@ -97,7 +97,7 @@ public function __construct($appName,
 	 */
 	private function getRoom($token) {
 		try {
-			$room = $this->manager->getRoomForSession($this->userId, $this->session->get('spreed-session'));
+			$room = $this->manager->getRoomForSession($this->userId, $this->session->getSessionForRoom($token));
 		} catch (RoomNotFoundException $exception) {
 			if ($this->userId === null) {
 				return null;
@@ -141,7 +141,7 @@ public function sendMessage($token, $message, $actorDisplayName = '') {
 
 		if ($this->userId === null) {
 			$actorType = 'guests';
-			$sessionId = $this->session->get('spreed-session');
+			$sessionId = $this->session->getSessionForRoom($token);
 			// The character limit for actorId is 64, but the spreed-session is
 			// 256 characters long, so it has to be hashed to get an ID that
 			// fits (except if there is no session, as the actorId should be
diff --git a/lib/Controller/GuestController.php b/lib/Controller/GuestController.php
index 67bfd457aad..ca40e64383b 100644
--- a/lib/Controller/GuestController.php
+++ b/lib/Controller/GuestController.php
@@ -27,18 +27,18 @@
 use OCA\Spreed\Exceptions\RoomNotFoundException;
 use OCA\Spreed\GuestManager;
 use OCA\Spreed\Manager;
+use OCA\Spreed\TalkSession;
 use OCP\AppFramework\Http;
 use OCP\AppFramework\Http\DataResponse;
 use OCP\AppFramework\OCSController;
 use OCP\IRequest;
-use OCP\ISession;
 
 class GuestController extends OCSController {
 
 	/** @var string */
 	private $userId;
 
-	/** @var ISession */
+	/** @var TalkSession */
 	private $session;
 
 	/** @var Manager */
@@ -51,14 +51,14 @@ class GuestController extends OCSController {
 	 * @param string $appName
 	 * @param string $UserId
 	 * @param IRequest $request
-	 * @param ISession $session
+	 * @param TalkSession $session
 	 * @param Manager $roomManager
 	 * @param GuestManager $guestManager
 	 */
 	public function __construct($appName,
 								$UserId,
 								IRequest $request,
-								ISession $session,
+								TalkSession $session,
 								Manager $roomManager,
 								GuestManager $guestManager) {
 		parent::__construct($appName, $request);
@@ -82,10 +82,10 @@ public function setDisplayName($token, $displayName) {
 			return new DataResponse([], Http::STATUS_FORBIDDEN);
 		}
 
-		$sessionId = $this->session->get('spreed-session');
+		$sessionId = $this->session->getSessionForRoom($token);
 
 		try {
-			$room = $this->roomManager->getRoomForSession($this->userId, $this->session->get('spreed-session'));
+			$room = $this->roomManager->getRoomForSession($this->userId, $sessionId);
 		} catch (RoomNotFoundException $exception) {
 			return new DataResponse([], Http::STATUS_NOT_FOUND);
 		}
diff --git a/lib/Controller/PageController.php b/lib/Controller/PageController.php
index 3bec7e487ef..1ebd60567a6 100644
--- a/lib/Controller/PageController.php
+++ b/lib/Controller/PageController.php
@@ -30,6 +30,7 @@
 use OCA\Spreed\Manager;
 use OCA\Spreed\Participant;
 use OCA\Spreed\Room;
+use OCA\Spreed\TalkSession;
 use OCP\AppFramework\Controller;
 use OCP\AppFramework\Http;
 use OCP\AppFramework\Http\ContentSecurityPolicy;
@@ -37,7 +38,6 @@
 use OCP\AppFramework\Http\TemplateResponse;
 use OCP\ILogger;
 use OCP\IRequest;
-use OCP\ISession;
 use OCP\IURLGenerator;
 use OCP\Notification\IManager;
 
@@ -46,7 +46,7 @@ class PageController extends Controller {
 	private $userId;
 	/** @var RoomController */
 	private $api;
-	/** @var ISession */
+	/** @var TalkSession */
 	private $session;
 	/** @var ILogger */
 	private $logger;
@@ -63,7 +63,7 @@ class PageController extends Controller {
 	 * @param string $appName
 	 * @param IRequest $request
 	 * @param RoomController $api
-	 * @param ISession $session
+	 * @param TalkSession $session
 	 * @param string $UserId
 	 * @param ILogger $logger
 	 * @param Manager $manager
@@ -74,7 +74,7 @@ class PageController extends Controller {
 	public function __construct($appName,
 								IRequest $request,
 								RoomController $api,
-								ISession $session,
+								TalkSession $session,
 								$UserId,
 								ILogger $logger,
 								Manager $manager,
@@ -135,7 +135,7 @@ public function index($token = '', $callUser = '', $password = '') {
 				$token = '';
 			}
 
-			$this->session->remove('spreed-password');
+			$this->session->removePasswordForRoom($token);
 
 			if ($room instanceof Room && $room->hasPassword()) {
 				// If the user joined themselves or is not found, they need the password.
@@ -148,7 +148,7 @@ public function index($token = '', $callUser = '', $password = '') {
 
 				if ($requirePassword) {
 					if ($password !== '' && $room->verifyPassword($password)) {
-						$this->session->set('spreed-password', $token);
+						$this->session->setPasswordForRoom($token, $token);
 					} else {
 						return new TemplateResponse($this->appName, 'authenticate', [], 'guest');
 					}
@@ -192,10 +192,10 @@ protected function guestEnterRoom($token, $password) {
 			]));
 		}
 
-		$this->session->remove('spreed-password');
+		$this->session->removePasswordForRoom($token);
 		if ($room->hasPassword()) {
 			if ($password !== '' && $room->verifyPassword($password)) {
-				$this->session->set('spreed-password', $token);
+				$this->session->setPasswordForRoom($token, $token);
 			} else {
 				return new TemplateResponse($this->appName, 'authenticate', [], 'guest');
 			}
diff --git a/lib/Controller/RoomController.php b/lib/Controller/RoomController.php
index b1df54bc5e8..f2a042b27d9 100644
--- a/lib/Controller/RoomController.php
+++ b/lib/Controller/RoomController.php
@@ -32,14 +32,13 @@
 use OCA\Spreed\Manager;
 use OCA\Spreed\Participant;
 use OCA\Spreed\Room;
-use OCA\Spreed\Signaling\Messages;
+use OCA\Spreed\TalkSession;
 use OCP\AppFramework\Http;
 use OCP\AppFramework\Http\DataResponse;
 use OCP\AppFramework\OCSController;
 use OCP\IL10N;
 use OCP\ILogger;
 use OCP\IRequest;
-use OCP\ISession;
 use OCP\IUser;
 use OCP\IUserManager;
 use OCP\IGroup;
@@ -48,7 +47,7 @@
 class RoomController extends OCSController {
 	/** @var string */
 	private $userId;
-	/** @var ISession */
+	/** @var TalkSession */
 	private $session;
 	/** @var IUserManager */
 	private $userManager;
@@ -58,8 +57,6 @@ class RoomController extends OCSController {
 	private $logger;
 	/** @var Manager */
 	private $manager;
-	/** @var Messages */
-	private $messages;
 	/** @var GuestManager */
 	private $guestManager;
 	/** @var IL10N */
@@ -69,24 +66,22 @@ class RoomController extends OCSController {
 	 * @param string $appName
 	 * @param string $UserId
 	 * @param IRequest $request
-	 * @param ISession $session
+	 * @param TalkSession $session
 	 * @param IUserManager $userManager
 	 * @param IGroupManager $groupManager
 	 * @param ILogger $logger
 	 * @param Manager $manager
-	 * @param Messages $messages
 	 * @param GuestManager $guestManager
 	 * @param IL10N $l10n
 	 */
 	public function __construct($appName,
 								$UserId,
 								IRequest $request,
-								ISession $session,
+								TalkSession $session,
 								IUserManager $userManager,
 								IGroupManager $groupManager,
 								ILogger $logger,
 								Manager $manager,
-								Messages $messages,
 								GuestManager $guestManager,
 								IL10N $l10n) {
 		parent::__construct($appName, $request);
@@ -96,7 +91,6 @@ public function __construct($appName,
 		$this->groupManager = $groupManager;
 		$this->logger = $logger;
 		$this->manager = $manager;
-		$this->messages = $messages;
 		$this->guestManager = $guestManager;
 		$this->l10n = $l10n;
 	}
@@ -138,7 +132,7 @@ public function getRoom($token) {
 				$participant = $room->getParticipant($this->userId);
 			} catch (ParticipantNotFoundException $e) {
 				try {
-					$participant = $room->getParticipantBySession($this->session->get('spreed-session'));
+					$participant = $room->getParticipantBySession($this->session->getSessionForRoom($token));
 				} catch (ParticipantNotFoundException $e) {
 				}
 			}
@@ -771,7 +765,7 @@ public function setPassword($token, $password) {
 			$participant = $room->getParticipant($this->userId);
 		} catch (RoomNotFoundException $e) {
 			return new DataResponse([], Http::STATUS_NOT_FOUND);
-		} catch (\RuntimeException $e) {
+		} catch (ParticipantNotFoundException $e) {
 			return new DataResponse([], Http::STATUS_NOT_FOUND);
 		}
 
@@ -804,21 +798,16 @@ public function joinRoom($token, $password = '') {
 
 		try {
 			if ($this->userId !== null) {
-				$sessionIds = $this->manager->getSessionIdsForUser($this->userId);
-				$newSessionId = $room->enterRoomAsUser($this->userId, $password, $this->session->get('spreed-password') === $room->getToken());
-
-				if (!empty($sessionIds)) {
-					$this->messages->deleteMessages($sessionIds);
-				}
+				$newSessionId = $room->joinRoom($this->userId, $password, $this->session->getPasswordForRoom($token) === $room->getToken());
 			} else {
-				$newSessionId = $room->enterRoomAsGuest($password, $this->session->get('spreed-password') === $room->getToken());
+				$newSessionId = $room->joinRoomGuest($password, $this->session->getPasswordForRoom($token) === $room->getToken());
 			}
 		} catch (InvalidPasswordException $e) {
 			return new DataResponse([], Http::STATUS_FORBIDDEN);
 		}
 
-		$this->session->remove('spreed-password');
-		$this->session->set('spreed-session', $newSessionId);
+		$this->session->removePasswordForRoom($token);
+		$this->session->setSessionForRoom($token, $newSessionId);
 		$room->ping($this->userId, $newSessionId, time());
 
 		return new DataResponse([
@@ -833,9 +822,9 @@ public function joinRoom($token, $password = '') {
 	 * @param string $token
 	 * @return DataResponse
 	 */
-	public function exitRoom($token) {
-		$sessionId = $this->session->get('spreed-session');
-		$this->session->remove('spreed-session');
+	public function leaveRoom($token) {
+		$sessionId = $this->session->getSessionForRoom($token);
+		$this->session->removeSessionForRoom($token);
 
 		try {
 			$room = $this->manager->getRoomForParticipantByToken($token, $this->userId);
@@ -845,7 +834,7 @@ public function exitRoom($token) {
 				$room->removeParticipantBySession($participant);
 			} else {
 				$participant = $room->getParticipant($this->userId);
-				$room->disconnectUserFromAllRooms($participant->getUser());
+				$room->leaveRoom($participant->getUser());
 			}
 		} catch (RoomNotFoundException $e) {
 		} catch (ParticipantNotFoundException $e) {
diff --git a/lib/Controller/SignalingController.php b/lib/Controller/SignalingController.php
index 7b915912dab..05c3c07f235 100644
--- a/lib/Controller/SignalingController.php
+++ b/lib/Controller/SignalingController.php
@@ -26,24 +26,22 @@
 use OCA\Spreed\Config;
 use OCA\Spreed\Exceptions\RoomNotFoundException;
 use OCA\Spreed\Exceptions\ParticipantNotFoundException;
-use OCA\Spreed\GuestManager;
 use OCA\Spreed\Manager;
-use OCA\Spreed\Participant;
 use OCA\Spreed\Room;
 use OCA\Spreed\Signaling\Messages;
+use OCA\Spreed\TalkSession;
 use OCP\AppFramework\Http;
 use OCP\AppFramework\Http\DataResponse;
 use OCP\AppFramework\OCSController;
 use OCP\IDBConnection;
 use OCP\IRequest;
-use OCP\ISession;
 use OCP\IUser;
 use OCP\IUserManager;
 
 class SignalingController extends OCSController {
 	/** @var Config */
 	private $config;
-	/** @var ISession */
+	/** @var TalkSession */
 	private $session;
 	/** @var Manager */
 	private $manager;
@@ -60,7 +58,7 @@ class SignalingController extends OCSController {
 	 * @param string $appName
 	 * @param IRequest $request
 	 * @param Config $config
-	 * @param ISession $session
+	 * @param TalkSession $session
 	 * @param Manager $manager
 	 * @param IDBConnection $connection
 	 * @param Messages $messages
@@ -70,7 +68,7 @@ class SignalingController extends OCSController {
 	public function __construct($appName,
 								IRequest $request,
 								Config $config,
-								ISession $session,
+								TalkSession $session,
 								Manager $manager,
 								IDBConnection $connection,
 								Messages $messages,
@@ -101,10 +99,11 @@ public function getSettings() {
 	/**
 	 * @PublicPage
 	 *
+	 * @param string $token
 	 * @param string $messages
 	 * @return DataResponse
 	 */
-	public function signaling($messages) {
+	public function signaling($token, $messages) {
 		$signaling = $this->config->getSignalingServers();
 		if (!empty($signaling)) {
 			return new DataResponse('Internal signaling disabled.', Http::STATUS_BAD_REQUEST);
@@ -121,7 +120,7 @@ public function signaling($messages) {
 						break;
 					}
 					$decodedMessage = json_decode($fn, true);
-					if ($message['sessionId'] !== $this->session->get('spreed-session')) {
+					if ($message['sessionId'] !== $this->session->getSessionForRoom($token)) {
 						break;
 					}
 					$decodedMessage['from'] = $message['sessionId'];
@@ -137,9 +136,11 @@ public function signaling($messages) {
 
 	/**
 	 * @PublicPage
+	 *
+	 * @param string $token
 	 * @return DataResponse
 	 */
-	public function pullMessages() {
+	public function pullMessages($token) {
 		$signaling = $this->config->getSignalingServers();
 		if (!empty($signaling)) {
 			return new DataResponse('Internal signaling disabled.', Http::STATUS_BAD_REQUEST);
@@ -150,11 +151,7 @@ public function pullMessages() {
 		$sessionId = '';
 
 		while ($seconds > 0) {
-			if ($this->userId === null) {
-				$sessionId = $this->session->get('spreed-session');
-			} else {
-				$sessionId = $this->manager->getCurrentSessionId($this->userId);
-			}
+			$sessionId = $this->session->getSessionForRoom($token);
 
 			if ($sessionId === null) {
 				// User is not active anywhere
@@ -386,7 +383,7 @@ private function backendRoom($roomRequest) {
 		if (empty($participant)) {
 			// User was not invited to the room, check for access to public room.
 			try {
-				$participant = $room->getParticipantBySession($sessionId);
+				$room->getParticipantBySession($sessionId);
 			} catch (ParticipantNotFoundException $e) {
 				// Return generic error to avoid leaking which rooms exist.
 				return new DataResponse([
diff --git a/lib/Room.php b/lib/Room.php
index 69e94e95214..c1dc2d4d240 100644
--- a/lib/Room.php
+++ b/lib/Room.php
@@ -502,10 +502,8 @@ public function removeParticipantBySession(Participant $participant) {
 	 * @return string
 	 * @throws InvalidPasswordException
 	 */
-	public function enterRoomAsUser($userId, $password, $passedPasswordProtection = false) {
-		$this->dispatcher->dispatch(self::class . '::preUserEnterRoom', new GenericEvent($this));
-
-		$this->disconnectUserFromAllRooms($userId);
+	public function joinRoom($userId, $password, $passedPasswordProtection = false) {
+		$this->dispatcher->dispatch(self::class . '::preJoinRoom', new GenericEvent($this));
 
 		$query = $this->db->getQueryBuilder();
 		$query->update('talk_participants')
@@ -536,7 +534,7 @@ public function enterRoomAsUser($userId, $password, $passedPasswordProtection =
 			$query->execute();
 		}
 
-		$this->dispatcher->dispatch(self::class . '::postUserEnterRoom', new GenericEvent($this));
+		$this->dispatcher->dispatch(self::class . '::postJoinRoom', new GenericEvent($this));
 
 		return $sessionId;
 	}
@@ -544,7 +542,7 @@ public function enterRoomAsUser($userId, $password, $passedPasswordProtection =
 	/**
 	 * @param string $userId
 	 */
-	public function disconnectUserFromAllRooms($userId) {
+	public function leaveRoom($userId) {
 		$this->dispatcher->dispatch(self::class . '::preUserDisconnectRoom', new GenericEvent($this));
 
 		// Reset sessions on all normal rooms
@@ -553,6 +551,7 @@ public function disconnectUserFromAllRooms($userId) {
 			->set('session_id', $query->createNamedParameter('0'))
 			->set('in_call', $query->createNamedParameter(0, IQueryBuilder::PARAM_INT))
 			->where($query->expr()->eq('user_id', $query->createNamedParameter($userId)))
+			->andWhere($query->expr()->eq('room_id', $query->createNamedParameter($this->getId(), IQueryBuilder::PARAM_INT)))
 			->andWhere($query->expr()->neq('participant_type', $query->createNamedParameter(Participant::USER_SELF_JOINED, IQueryBuilder::PARAM_INT)));
 		$query->execute();
 
@@ -560,6 +559,7 @@ public function disconnectUserFromAllRooms($userId) {
 		$query = $this->db->getQueryBuilder();
 		$query->delete('talk_participants')
 			->where($query->expr()->eq('user_id', $query->createNamedParameter($userId)))
+			->andWhere($query->expr()->eq('room_id', $query->createNamedParameter($this->getId(), IQueryBuilder::PARAM_INT)))
 			->andWhere($query->expr()->eq('participant_type', $query->createNamedParameter(Participant::USER_SELF_JOINED, IQueryBuilder::PARAM_INT)));
 		$query->execute();
 
@@ -572,8 +572,8 @@ public function disconnectUserFromAllRooms($userId) {
 	 * @return string
 	 * @throws InvalidPasswordException
 	 */
-	public function enterRoomAsGuest($password, $passedPasswordProtection = false) {
-		$this->dispatcher->dispatch(self::class . '::preGuestEnterRoom', new GenericEvent($this));
+	public function joinRoomGuest($password, $passedPasswordProtection = false) {
+		$this->dispatcher->dispatch(self::class . '::preJoinRoomGuest', new GenericEvent($this));
 
 		if (!$passedPasswordProtection && !$this->verifyPassword($password)) {
 			throw new InvalidPasswordException();
@@ -590,7 +590,7 @@ public function enterRoomAsGuest($password, $passedPasswordProtection = false) {
 			$sessionId = $this->secureRandom->generate(255);
 		}
 
-		$this->dispatcher->dispatch(self::class . '::postGuestEnterRoom', new GenericEvent($this));
+		$this->dispatcher->dispatch(self::class . '::postJoinRoomGuest', new GenericEvent($this));
 
 		return $sessionId;
 	}
diff --git a/lib/TalkSession.php b/lib/TalkSession.php
new file mode 100644
index 00000000000..571e4404ab3
--- /dev/null
+++ b/lib/TalkSession.php
@@ -0,0 +1,132 @@
+<?php
+/**
+ * @copyright Copyright (c) 2018 Joas Schilling <coding@schilljs.com>
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+namespace OCA\Spreed;
+
+
+use OCP\ISession;
+
+class TalkSession {
+
+	/** @var ISession */
+	protected $session;
+
+	public function __construct(ISession $session) {
+		$this->session = $session;
+	}
+
+	/**
+	 * @param string $token
+	 * @return string|null
+	 */
+	public function getSessionForRoom($token) {
+		return $this->getValue('spreed-session', $token);
+	}
+
+	/**
+	 * @param string $token
+	 * @param string $sessionId
+	 */
+	public function setSessionForRoom($token, $sessionId) {
+		$this->setValue('spreed-session', $token, $sessionId);
+	}
+
+	/**
+	 * @param string $token
+	 */
+	public function removeSessionForRoom($token) {
+		$this->removeValue('spreed-session', $token);
+	}
+
+	/**
+	 * @param string $token
+	 * @return string|null
+	 */
+	public function getPasswordForRoom($token) {
+		return $this->getValue('spreed-password', $token);
+	}
+
+	/**
+	 * @param string $token
+	 * @param string $password
+	 */
+	public function setPasswordForRoom($token, $password) {
+		$this->setValue('spreed-password', $token, $password);
+	}
+
+	/**
+	 * @param string $token
+	 */
+	public function removePasswordForRoom($token) {
+		$this->removeValue('spreed-password', $token);
+	}
+
+	/**
+	 * @param string $key
+	 * @param string $token
+	 * @return string|null
+	 */
+	protected function getValue($key, $token) {
+		$values = $this->session->get($key);
+		$values = json_decode($values, true);
+		if ($values === null) {
+			return null;
+		}
+
+		if (!isset($values[$token])) {
+			return null;
+		}
+		return $values[$token];
+	}
+
+	/**
+	 * @param string $key
+	 * @param string $token
+	 * @param string $value
+	 */
+	protected function setValue($key, $token, $value) {
+		$values = $this->session->get($key);
+		$values = json_decode($values, true);
+		if ($values === null) {
+			$values = [];
+		}
+
+		$values[$token] = $value;
+		$this->session->set($key, json_encode($values));
+	}
+
+	/**
+	 * @param string $key
+	 * @param string $token
+	 */
+	protected function removeValue($key, $token) {
+		$values = $this->session->get($key);
+		$values = json_decode($values, true);
+		if ($values === null) {
+			$values = [];
+		} else {
+			unset($values[$token]);
+		}
+
+		$this->session->set($key, json_encode($values));
+	}
+
+}
diff --git a/tests/integration/features/bootstrap/FeatureContext.php b/tests/integration/features/bootstrap/FeatureContext.php
index 463121b2321..7dc42c55df3 100644
--- a/tests/integration/features/bootstrap/FeatureContext.php
+++ b/tests/integration/features/bootstrap/FeatureContext.php
@@ -203,7 +203,7 @@ public function userJoinsRoom($user, $identifier, $statusCode, TableNode $formDa
 	}
 
 	/**
-	 * @Then /^user "([^"]*)" exits room "([^"]*)" with (\d+)$/
+	 * @Then /^user "([^"]*)" leaves room "([^"]*)" with (\d+)$/
 	 *
 	 * @param string $user
 	 * @param string $identifier
@@ -216,7 +216,7 @@ public function userExitsRoom($user, $identifier, $statusCode) {
 	}
 
 	/**
-	 * @Then /^user "([^"]*)" leaves room "([^"]*)" with (\d+)$/
+	 * @Then /^user "([^"]*)" removes themselves from room "([^"]*)" with (\d+)$/
 	 *
 	 * @param string $user
 	 * @param string $identifier
diff --git a/tests/integration/features/callapi/group.feature b/tests/integration/features/callapi/group.feature
index f8e357fb0e4..8375e44b917 100644
--- a/tests/integration/features/callapi/group.feature
+++ b/tests/integration/features/callapi/group.feature
@@ -36,13 +36,13 @@ Feature: callapi/group
     Then user "participant1" leaves call "room" with 200
     Then user "participant1" sees 1 peers in call "room" with 200
     And user "participant2" sees 1 peers in call "room" with 200
-    Then user "participant1" exits room "room" with 200
+    Then user "participant1" leaves room "room" with 200
     Then user "participant1" sees 1 peers in call "room" with 200
     And user "participant2" sees 1 peers in call "room" with 200
     Then user "participant2" leaves call "room" with 200
     Then user "participant1" sees 0 peers in call "room" with 200
     And user "participant2" sees 0 peers in call "room" with 200
-    Then user "participant2" exits room "room" with 200
+    Then user "participant2" leaves room "room" with 200
     Then user "participant1" sees 0 peers in call "room" with 200
     And user "participant2" sees 0 peers in call "room" with 200
 
@@ -71,7 +71,7 @@ Feature: callapi/group
     Then user "participant3" leaves call "room" with 404
     Then user "participant1" sees 1 peers in call "room" with 200
     And user "participant3" sees 0 peers in call "room" with 404
-    Then user "participant3" exits room "room" with 200
+    Then user "participant3" leaves room "room" with 200
     Then user "participant1" sees 1 peers in call "room" with 200
     And user "participant3" sees 0 peers in call "room" with 404
     Then user "participant1" leaves call "room" with 200
@@ -100,7 +100,7 @@ Feature: callapi/group
     Then user "guest" leaves call "room" with 404
     Then user "participant1" sees 1 peers in call "room" with 200
     And user "guest" sees 0 peers in call "room" with 404
-    Then user "guest" exits room "room" with 200
+    Then user "guest" leaves room "room" with 200
     Then user "participant1" sees 1 peers in call "room" with 200
     And user "guest" sees 0 peers in call "room" with 404
     Then user "participant1" leaves call "room" with 200
diff --git a/tests/integration/features/callapi/one-to-one.feature b/tests/integration/features/callapi/one-to-one.feature
index c1ded59ce9a..a64a1b658b4 100644
--- a/tests/integration/features/callapi/one-to-one.feature
+++ b/tests/integration/features/callapi/one-to-one.feature
@@ -34,13 +34,13 @@ Feature: callapi/one-to-one
     Then user "participant1" leaves call "room" with 200
     Then user "participant1" sees 1 peers in call "room" with 200
     And user "participant2" sees 1 peers in call "room" with 200
-    Then user "participant1" exits room "room" with 200
+    Then user "participant1" leaves room "room" with 200
     Then user "participant1" sees 1 peers in call "room" with 200
     And user "participant2" sees 1 peers in call "room" with 200
     Then user "participant2" leaves call "room" with 200
     Then user "participant1" sees 0 peers in call "room" with 200
     And user "participant2" sees 0 peers in call "room" with 200
-    Then user "participant2" exits room "room" with 200
+    Then user "participant2" leaves room "room" with 200
     Then user "participant1" sees 0 peers in call "room" with 200
     And user "participant2" sees 0 peers in call "room" with 200
 
@@ -69,13 +69,13 @@ Feature: callapi/one-to-one
     Then user "participant3" leaves call "room" with 404
     Then user "participant1" sees 1 peers in call "room" with 200
     And user "participant3" sees 0 peers in call "room" with 404
-    Then user "participant3" exits room "room" with 200
+    Then user "participant3" leaves room "room" with 200
     Then user "participant1" sees 1 peers in call "room" with 200
     And user "participant3" sees 0 peers in call "room" with 404
     Then user "participant1" leaves call "room" with 200
     Then user "participant1" sees 0 peers in call "room" with 200
     And user "participant3" sees 0 peers in call "room" with 404
-    Then user "participant1" exits room "room" with 200
+    Then user "participant1" leaves room "room" with 200
     Then user "participant1" sees 0 peers in call "room" with 200
     And user "participant3" sees 0 peers in call "room" with 404
 
@@ -103,12 +103,12 @@ Feature: callapi/one-to-one
     Then user "guest" leaves call "room" with 404
     Then user "participant1" sees 1 peers in call "room" with 200
     And user "guest" sees 0 peers in call "room" with 404
-    Then user "guest" exits room "room" with 200
+    Then user "guest" leaves room "room" with 200
     Then user "participant1" sees 1 peers in call "room" with 200
     And user "guest" sees 0 peers in call "room" with 404
     Then user "participant1" leaves call "room" with 200
     Then user "participant1" sees 0 peers in call "room" with 200
     And user "guest" sees 0 peers in call "room" with 404
-    Then user "participant1" exits room "room" with 200
+    Then user "participant1" leaves room "room" with 200
     Then user "participant1" sees 0 peers in call "room" with 200
     And user "guest" sees 0 peers in call "room" with 404
diff --git a/tests/integration/features/callapi/password.feature b/tests/integration/features/callapi/password.feature
index edfce6fda9f..2a448f954ed 100644
--- a/tests/integration/features/callapi/password.feature
+++ b/tests/integration/features/callapi/password.feature
@@ -65,13 +65,13 @@ Feature: callapi/public
     Then user "participant3" leaves call "room" with 404
     Then user "participant1" sees 1 peers in call "room" with 200
     And user "participant3" sees 0 peers in call "room" with 404
-    Then user "participant3" exits room "room" with 200
+    Then user "participant3" leaves room "room" with 200
     Then user "participant1" sees 1 peers in call "room" with 200
     And user "participant3" sees 0 peers in call "room" with 404
     Then user "participant1" leaves call "room" with 200
     Then user "participant1" sees 0 peers in call "room" with 200
     And user "participant3" sees 0 peers in call "room" with 404
-    Then user "participant1" exits room "room" with 200
+    Then user "participant1" leaves room "room" with 200
     Then user "participant1" sees 0 peers in call "room" with 200
     And user "participant3" sees 0 peers in call "room" with 404
 
@@ -102,13 +102,13 @@ Feature: callapi/public
     Then user "participant3" leaves call "room" with 200
     Then user "participant1" sees 1 peers in call "room" with 200
     And user "participant3" sees 1 peers in call "room" with 200
-    Then user "participant3" exits room "room" with 200
+    Then user "participant3" leaves room "room" with 200
     Then user "participant1" sees 1 peers in call "room" with 200
     And user "participant3" sees 0 peers in call "room" with 404
     Then user "participant1" leaves call "room" with 200
     Then user "participant1" sees 0 peers in call "room" with 200
     And user "participant3" sees 0 peers in call "room" with 404
-    Then user "participant1" exits room "room" with 200
+    Then user "participant1" leaves room "room" with 200
     Then user "participant1" sees 0 peers in call "room" with 200
     And user "participant3" sees 0 peers in call "room" with 404
 
@@ -167,12 +167,12 @@ Feature: callapi/public
     Then user "guest" leaves call "room" with 200
     Then user "participant1" sees 1 peers in call "room" with 200
     And user "guest" sees 1 peers in call "room" with 200
-    Then user "guest" exits room "room" with 200
+    Then user "guest" leaves room "room" with 200
     Then user "participant1" sees 1 peers in call "room" with 200
     And user "guest" sees 0 peers in call "room" with 404
     Then user "participant1" leaves call "room" with 200
     Then user "participant1" sees 0 peers in call "room" with 200
     And user "guest" sees 0 peers in call "room" with 404
-    Then user "participant1" exits room "room" with 200
+    Then user "participant1" leaves room "room" with 200
     Then user "participant1" sees 0 peers in call "room" with 200
     And user "guest" sees 0 peers in call "room" with 404
diff --git a/tests/integration/features/callapi/public.feature b/tests/integration/features/callapi/public.feature
index 38293b0a7c8..35c5d911f9d 100644
--- a/tests/integration/features/callapi/public.feature
+++ b/tests/integration/features/callapi/public.feature
@@ -34,13 +34,13 @@ Feature: callapi/public
     Then user "participant1" leaves call "room" with 200
     Then user "participant1" sees 1 peers in call "room" with 200
     And user "participant2" sees 1 peers in call "room" with 200
-    Then user "participant1" exits room "room" with 200
+    Then user "participant1" leaves room "room" with 200
     Then user "participant1" sees 1 peers in call "room" with 200
     And user "participant2" sees 1 peers in call "room" with 200
     Then user "participant2" leaves call "room" with 200
     Then user "participant1" sees 0 peers in call "room" with 200
     And user "participant2" sees 0 peers in call "room" with 200
-    Then user "participant2" exits room "room" with 200
+    Then user "participant2" leaves room "room" with 200
     Then user "participant1" sees 0 peers in call "room" with 200
     And user "participant2" sees 0 peers in call "room" with 200
 
@@ -69,13 +69,13 @@ Feature: callapi/public
     Then user "participant3" leaves call "room" with 200
     Then user "participant1" sees 1 peers in call "room" with 200
     And user "participant3" sees 1 peers in call "room" with 200
-    Then user "participant3" exits room "room" with 200
+    Then user "participant3" leaves room "room" with 200
     Then user "participant1" sees 1 peers in call "room" with 200
     And user "participant3" sees 0 peers in call "room" with 404
     Then user "participant1" leaves call "room" with 200
     Then user "participant1" sees 0 peers in call "room" with 200
     And user "participant3" sees 0 peers in call "room" with 404
-    Then user "participant1" exits room "room" with 200
+    Then user "participant1" leaves room "room" with 200
     Then user "participant1" sees 0 peers in call "room" with 200
     And user "participant3" sees 0 peers in call "room" with 404
 
@@ -103,12 +103,12 @@ Feature: callapi/public
     Then user "guest" leaves call "room" with 200
     Then user "participant1" sees 1 peers in call "room" with 200
     And user "guest" sees 1 peers in call "room" with 200
-    Then user "guest" exits room "room" with 200
+    Then user "guest" leaves room "room" with 200
     Then user "participant1" sees 1 peers in call "room" with 200
     And user "guest" sees 0 peers in call "room" with 404
     Then user "participant1" leaves call "room" with 200
     Then user "participant1" sees 0 peers in call "room" with 200
     And user "guest" sees 0 peers in call "room" with 404
-    Then user "participant1" exits room "room" with 200
+    Then user "participant1" leaves room "room" with 200
     Then user "participant1" sees 0 peers in call "room" with 200
     And user "guest" sees 0 peers in call "room" with 404
diff --git a/tests/integration/features/one-to-one.feature b/tests/integration/features/one-to-one.feature
index 4426bac0a03..8d100d57512 100644
--- a/tests/integration/features/one-to-one.feature
+++ b/tests/integration/features/one-to-one.feature
@@ -35,7 +35,7 @@ Feature: one-to-one
       | invite   | participant2 |
     And user "participant1" is participant of room "room2"
     And user "participant2" is participant of room "room2"
-    When user "participant1" leaves room "room2" with 200
+    When user "participant1" removes themselves from room "room2" with 200
     Then user "participant1" is not participant of room "room2"
     And user "participant2" is not participant of room "room2"
 
diff --git a/tests/integration/features/leave-room.feature b/tests/integration/features/remove-self.feature
similarity index 80%
rename from tests/integration/features/leave-room.feature
rename to tests/integration/features/remove-self.feature
index 996d26b1f81..8900fb8ad11 100644
--- a/tests/integration/features/leave-room.feature
+++ b/tests/integration/features/remove-self.feature
@@ -4,7 +4,7 @@ Feature: public
     Given user "participant2" exists
     Given user "participant3" exists
 
-  Scenario: Owner leaves
+  Scenario: Owner removes the room from their room list
     Given user "participant1" creates room "room"
       | roomType | 3 |
     Then user "participant1" is participant of the following rooms
@@ -12,10 +12,10 @@ Feature: public
       | room | 3    | 1               | participant1-displayname |
     And user "participant2" is not participant of room "room"
     And user "participant3" is not participant of room "room"
-    When user "participant1" leaves room "room" with 200
+    When user "participant1" removes themselves from room "room" with 200
     Then user "participant1" is not participant of room "room"
 
-  Scenario: Moderator leaves
+  Scenario: Moderator removes the room from their room list
     Given user "participant1" creates room "room"
       | roomType | 3 |
     And user "participant1" adds "participant2" to room "room" with 200
@@ -25,11 +25,11 @@ Feature: public
       | room | 3    | 2               | participant1-displayname, participant2-displayname |
     And user "participant1" is participant of room "room"
     And user "participant2" is participant of room "room"
-    When user "participant2" leaves room "room" with 200
+    When user "participant2" removes themselves from room "room" with 200
     Then user "participant1" is participant of room "room"
     And user "participant2" is not participant of room "room"
 
-  Scenario: User leaves
+  Scenario: User removes the room from their room list
     Given user "participant1" creates room "room"
       | roomType | 3 |
     And user "participant1" adds "participant2" to room "room" with 200
@@ -38,15 +38,15 @@ Feature: public
       | room | 3    | 3               | participant1-displayname, participant2-displayname |
     And user "participant1" is participant of room "room"
     And user "participant2" is participant of room "room"
-    When user "participant2" leaves room "room" with 200
+    When user "participant2" removes themselves from room "room" with 200
     Then user "participant1" is participant of room "room"
     And user "participant2" is not participant of room "room"
 
-  Scenario: Stranger leaves
+  Scenario: Stranger removes the room from their room list
     Given user "participant1" creates room "room"
       | roomType | 3 |
     And user "participant1" is participant of room "room"
     And user "participant2" is not participant of room "room"
-    When user "participant2" leaves room "room" with 404
+    When user "participant2" removes themselves from room "room" with 404
     Then user "participant1" is participant of room "room"
     And user "participant2" is not participant of room "room"
diff --git a/tests/integration/features/set-password.feature b/tests/integration/features/set-password.feature
index 33b749e29b9..657f6413b1e 100644
--- a/tests/integration/features/set-password.feature
+++ b/tests/integration/features/set-password.feature
@@ -43,12 +43,12 @@ Feature: public
     And user "participant1" adds "participant2" to room "room" with 200
     When user "participant2" sets password "foobar" for room "room" with 403
     Then user "participant3" joins room "room" with 200
-    And user "participant3" leaves call "room" with 200
+    And user "participant3" leaves room "room" with 200
     When user "participant1" sets password "foobar" for room "room" with 200
     Then user "participant3" joins room "room" with 403
     Then user "participant3" joins room "room" with 200
       | password | foobar |
-    And user "participant3" leaves call "room" with 200
+    And user "participant3" leaves room "room" with 200
     When user "participant2" sets password "" for room "room" with 403
     Then user "participant3" joins room "room" with 403
 
@@ -60,11 +60,11 @@ Feature: public
       | room | 3    | 1               | participant1-displayname |
     When user "participant2" sets password "foobar" for room "room" with 404
     Then user "participant3" joins room "room" with 200
-    And user "participant3" leaves call "room" with 200
+    And user "participant3" leaves room "room" with 200
     When user "participant1" sets password "foobar" for room "room" with 200
     Then user "participant3" joins room "room" with 403
     Then user "participant3" joins room "room" with 200
       | password | foobar |
-    And user "participant3" leaves call "room" with 200
+    And user "participant3" leaves room "room" with 200
     When user "participant2" sets password "" for room "room" with 404
     Then user "participant3" joins room "room" with 403
diff --git a/tests/php/CapabilitiesTest.php b/tests/php/CapabilitiesTest.php
index b91c473dd2d..c2372f5d572 100644
--- a/tests/php/CapabilitiesTest.php
+++ b/tests/php/CapabilitiesTest.php
@@ -41,6 +41,8 @@ public function testGetCapabilities() {
 					'chat',
 					'guest-signaling',
 					'empty-group-room',
+					'guest-display-names',
+					'multi-room-users',
 				],
 			],
 		], $capabilities->getCapabilities());
diff --git a/tests/php/Controller/ChatControllerTest.php b/tests/php/Controller/ChatControllerTest.php
index 9f3d5040600..ad779da5132 100644
--- a/tests/php/Controller/ChatControllerTest.php
+++ b/tests/php/Controller/ChatControllerTest.php
@@ -30,10 +30,10 @@
 use OCA\Spreed\GuestManager;
 use OCA\Spreed\Manager;
 use OCA\Spreed\Room;
+use OCA\Spreed\TalkSession;
 use OCP\AppFramework\Http;
 use OCP\AppFramework\Http\DataResponse;
 use OCP\Comments\IComment;
-use OCP\ISession;
 use OCP\IUser;
 use OCP\IUserManager;
 
@@ -45,7 +45,7 @@ class ChatControllerTest extends \Test\TestCase {
 	/** @var IUserManager|\PHPUnit_Framework_MockObject_MockObject */
 	protected $userManager;
 
-	/** @var ISession|\PHPUnit_Framework_MockObject_MockObject */
+	/** @var TalkSession|\PHPUnit_Framework_MockObject_MockObject */
 	private $session;
 
 	/** @var Manager|\PHPUnit_Framework_MockObject_MockObject */
@@ -71,7 +71,7 @@ public function setUp() {
 
 		$this->userId = 'testUser';
 		$this->userManager = $this->createMock(IUserManager::class);
-		$this->session = $this->createMock(ISession::class);
+		$this->session = $this->createMock(TalkSession::class);
 		$this->manager = $this->createMock(Manager::class);
 		$this->chatManager = $this->createMock(ChatManager::class);
 		$this->guestManager = $this->createMock(GuestManager::class);
@@ -115,8 +115,8 @@ private function newComment($id, $actorType, $actorId, $creationDateTime, $messa
 
 	public function testSendMessageByUser() {
 		$this->session->expects($this->once())
-			->method('get')
-			->with('spreed-session')
+			->method('getSessionForRoom')
+			->with('testToken')
 			->willReturn('testSpreedSession');
 
 		$this->manager->expects($this->once())
@@ -148,14 +148,14 @@ public function testSendMessageByUser() {
 
 	public function testSendMessageByUserNotJoinedButInRoom() {
 		$this->session->expects($this->once())
-			->method('get')
-			->with('spreed-session')
+			->method('getSessionForRoom')
+			->with('testToken')
 			->willReturn(null);
 
 		$this->manager->expects($this->once())
 			->method('getRoomForSession')
 			->with($this->userId, null)
-			->will($this->throwException(new RoomNotFoundException()));
+			->willThrowException(new RoomNotFoundException());
 
 		$this->manager->expects($this->once())
 			->method('getRoomForParticipantByToken')
@@ -187,8 +187,8 @@ public function testSendMessageByUserNotJoinedButInRoom() {
 
 	public function testSendMessageByUserNotJoinedNorInRoom() {
 		$this->session->expects($this->once())
-			->method('get')
-			->with('spreed-session')
+			->method('getSessionForRoom')
+			->with('testToken')
 			->willReturn(null);
 
 		$this->manager->expects($this->once())
@@ -220,8 +220,8 @@ public function testSendMessageByGuest() {
 		$this->recreateChatController();
 
 		$this->session->expects($this->any())
-			->method('get')
-			->with('spreed-session')
+			->method('getSessionForRoom')
+			->with('testToken')
 			->willReturn('testSpreedSession');
 
 		$this->manager->expects($this->once())
@@ -256,8 +256,8 @@ public function testSendMessageByGuestNotJoined() {
 		$this->recreateChatController();
 
 		$this->session->expects($this->once())
-			->method('get')
-			->with('spreed-session')
+			->method('getSessionForRoom')
+			->with('testToken')
 			->willReturn(null);
 
 		$this->manager->expects($this->once())
@@ -279,8 +279,8 @@ public function testSendMessageByGuestNotJoined() {
 
 	public function testSendMessageToInvalidRoom() {
 		$this->session->expects($this->once())
-			->method('get')
-			->with('spreed-session')
+			->method('getSessionForRoom')
+			->with('testToken')
 			->willReturn(null);
 
 		$this->manager->expects($this->once())
@@ -304,8 +304,8 @@ public function testSendMessageToInvalidRoom() {
 
 	public function testReceiveMessagesByUser() {
 		$this->session->expects($this->once())
-			->method('get')
-			->with('spreed-session')
+			->method('getSessionForRoom')
+			->with('testToken')
 			->willReturn('testSpreedSession');
 
 		$this->manager->expects($this->once())
@@ -356,8 +356,8 @@ public function testReceiveMessagesByUser() {
 
 	public function testReceiveMessagesByUserNotJoinedButInRoom() {
 		$this->session->expects($this->once())
-			->method('get')
-			->with('spreed-session')
+			->method('getSessionForRoom')
+			->with('testToken')
 			->willReturn(null);
 
 		$this->manager->expects($this->once())
@@ -414,8 +414,8 @@ public function testReceiveMessagesByUserNotJoinedButInRoom() {
 
 	public function testReceiveMessagesByUserNotJoinedNorInRoom() {
 		$this->session->expects($this->once())
-			->method('get')
-			->with('spreed-session')
+			->method('getSessionForRoom')
+			->with('testToken')
 			->willReturn(null);
 
 		$this->manager->expects($this->once())
@@ -450,8 +450,8 @@ public function testReceiveMessagesByGuest() {
 		$this->recreateChatController();
 
 		$this->session->expects($this->any())
-			->method('get')
-			->with('spreed-session')
+			->method('getSessionForRoom')
+			->with('testToken')
 			->willReturn('testSpreedSession');
 
 		$this->manager->expects($this->once())
@@ -505,8 +505,8 @@ public function testReceiveMessagesByGuestNotJoined() {
 		$this->recreateChatController();
 
 		$this->session->expects($this->once())
-			->method('get')
-			->with('spreed-session')
+			->method('getSessionForRoom')
+			->with('testToken')
 			->willReturn(null);
 
 		$this->manager->expects($this->once())
@@ -531,8 +531,8 @@ public function testReceiveMessagesByGuestNotJoined() {
 
 	public function testReceiveMessagesTimeoutExpired() {
 		$this->session->expects($this->once())
-			->method('get')
-			->with('spreed-session')
+			->method('getSessionForRoom')
+			->with('testToken')
 			->willReturn('testSpreedSession');
 
 		$this->manager->expects($this->once())
@@ -563,8 +563,8 @@ public function testReceiveMessagesTimeoutExpired() {
 
 	public function testReceiveMessagesTimeoutTooLarge() {
 		$this->session->expects($this->once())
-			->method('get')
-			->with('spreed-session')
+			->method('getSessionForRoom')
+			->with('testToken')
 			->willReturn('testSpreedSession');
 
 		$this->manager->expects($this->once())
@@ -596,8 +596,8 @@ public function testReceiveMessagesTimeoutTooLarge() {
 
 	public function testReceiveMessagesFromInvalidRoom() {
 		$this->session->expects($this->once())
-			->method('get')
-			->with('spreed-session')
+			->method('getSessionForRoom')
+			->with('testToken')
 			->willReturn(null);
 
 		$this->manager->expects($this->once())
diff --git a/tests/php/Controller/SignalingControllerTest.php b/tests/php/Controller/SignalingControllerTest.php
index d3bffa9da84..3d0eb5f183d 100644
--- a/tests/php/Controller/SignalingControllerTest.php
+++ b/tests/php/Controller/SignalingControllerTest.php
@@ -30,13 +30,11 @@
 use OCA\Spreed\Participant;
 use OCA\Spreed\Room;
 use OCA\Spreed\Signaling\Messages;
+use OCA\Spreed\TalkSession;
 use OCP\AppFramework\Utility\ITimeFactory;
-use OCP\IConfig;
 use OCP\IDBConnection;
-use OCP\ISession;
 use OCP\IUser;
 use OCP\IUserManager;
-use OCP\Security\ISecureRandom;
 
 class CustomInputSignalingController extends SignalingController {
 
@@ -57,22 +55,22 @@ protected function getInputStream() {
  */
 class SignalingControllerTest extends \Test\TestCase {
 
-	/** @var OCA\Spreed\Config */
+	/** @var Config */
 	private $config;
 
-	/** @var \OCP\ISession|\PHPUnit_Framework_MockObject_MockObject */
+	/** @var TalkSession|\PHPUnit_Framework_MockObject_MockObject */
 	private $session;
 
-	/** @var \OCA\Spreed\Manager|\PHPUnit_Framework_MockObject_MockObject */
+	/** @var Manager|\PHPUnit_Framework_MockObject_MockObject */
 	protected $manager;
 
-	/** @var \OCP\IDBConnection|\PHPUnit_Framework_MockObject_MockObject */
+	/** @var IDBConnection|\PHPUnit_Framework_MockObject_MockObject */
 	protected $dbConnection;
 
-	/** @var \OCA\Spreed\Signaling\Messages|\PHPUnit_Framework_MockObject_MockObject */
+	/** @var Messages|\PHPUnit_Framework_MockObject_MockObject */
 	protected $messages;
 
-	/** @var \OCP\IUserManager|\PHPUnit_Framework_MockObject_MockObject */
+	/** @var IUserManager|\PHPUnit_Framework_MockObject_MockObject */
 	protected $userManager;
 
 	/** @var string */
@@ -94,7 +92,7 @@ public function setUp() {
 		$config->setAppValue('spreed', 'signaling_ticket_secret', 'the-app-ticket-secret');
 		$config->setUserValue($this->userId, 'spreed', 'signaling_ticket_secret', 'the-user-ticket-secret');
 		$this->config = new Config($config, $secureRandom, $timeFactory);
-		$this->session = $this->createMock(ISession::class);
+		$this->session = $this->createMock(TalkSession::class);
 		$this->dbConnection = \OC::$server->getDatabaseConnection();
 		$this->manager = $this->createMock(Manager::class);
 		$this->messages = $this->createMock(Messages::class);
diff --git a/tests/php/Signaling/BackendNotifierTest.php b/tests/php/Signaling/BackendNotifierTest.php
index 2c0d20e7d5a..06ba7fceb11 100644
--- a/tests/php/Signaling/BackendNotifierTest.php
+++ b/tests/php/Signaling/BackendNotifierTest.php
@@ -32,6 +32,7 @@
 use OCP\ILogger;
 use OCP\IUser;
 use OCP\Security\IHasher;
+use OCP\Security\ISecureRandom;
 
 class CustomBackendNotifier extends BackendNotifier {
 
@@ -73,7 +74,7 @@ protected function getBackendNotifier() {
  */
 class BackendNotifierTest extends \Test\TestCase {
 
-    /** @var OCA\Spreed\Config */
+    /** @var Config */
     private $config;
 
     /** @var ISecureRandom */
@@ -282,7 +283,7 @@ public function testRoomInCallChanged() {
         ], json_decode($body, true));
 
         $this->controller->clearLastRequest();
-        $guestSession = $room->enterRoomAsGuest('');
+        $guestSession = $room->joinRoomGuest('');
         $room->changeInCall($guestSession, true);
         $request = $this->controller->getLastRequest();
         $body = $this->validateBackendRequest($this->baseUrl . '/api/v1/room/' . $room->getToken(), $request);