diff --git a/prosody-modules/mod_s2s_peertubelivechat/mod_s2s_peertubelivechat.lua b/prosody-modules/mod_s2s_peertubelivechat/mod_s2s_peertubelivechat.lua
index 92f64aa9..92a889d7 100644
--- a/prosody-modules/mod_s2s_peertubelivechat/mod_s2s_peertubelivechat.lua
+++ b/prosody-modules/mod_s2s_peertubelivechat/mod_s2s_peertubelivechat.lua
@@ -149,7 +149,7 @@ function discover_websocket_s2s(event)
 		return;
 	end
 
-	local f_ws_proxy = io.open(path.join(server_infos_dir, to_host, 'ws-proxy'), "r");
+	local f_ws_proxy = io.open(path.join(server_infos_dir, to_host, 'ws-s2s'), "r");
 	if f_ws_proxy == nil then
 		module:log("debug", "Remote host %s is not a known remote Peertube, we will let legacy s2s module handle the connection", to_host);
 		return;
@@ -159,18 +159,18 @@ function discover_websocket_s2s(event)
 
 	local remote_ws_proxy_conf = json.decode(content);
 	if (not remote_ws_proxy_conf) then
-		module:log("error", "Remote host %s has empty ws-proxy configuration", to_host);
+		module:log("error", "Remote host %s has empty ws-s2s configuration", to_host);
 		return;
 	end
 	if (not remote_ws_proxy_conf['url']) then
-		module:log("error", "Remote host %s has missing Websocket url in ws-proxy configuration", to_host);
+		module:log("error", "Remote host %s has missing Websocket url in ws-s2s configuration", to_host);
 		return;
 	end
 
 	module:log("debug", "Found a Websocket endpoint to proxify s2s communications to remote host %s", to_host);
 	local properties = {};
 	properties["extra_headers"] = {
-		["peertube-livechat-ws-proxy-instance-url"] = instance_url;
+		["peertube-livechat-ws-s2s-instance-url"] = instance_url;
 	};
 	properties["url"] = remote_ws_proxy_conf["url"];
 	return properties;
@@ -186,7 +186,7 @@ function discover_websocket_s2s(event)
 
 	-- local ex = {};
 	-- ex.headers = {
-	-- 	["peertube-livechat-ws-proxy-instance-url"] = instance_url;
+	-- 	["peertube-livechat-ws-s2s-instance-url"] = instance_url;
 	-- 	["sec_websocket_protocol"] = 'xmpp';
 	-- }
 
diff --git a/prosody/launcher.lua b/prosody/launcher.lua
index f028adf5..056b42c4 100644
--- a/prosody/launcher.lua
+++ b/prosody/launcher.lua
@@ -13,6 +13,7 @@ if what == 'debug' then
   local dir_sep = package.config:sub(1,1);
   package.path = package.path..lua_path_sep..mobdebug_path..dir_sep.."?.lua";
   require "mobdebug".start(mobdebug_host, mobdebug_port);
+  require "mobdebug".coro();
   what = table.remove(arg, 1);
 end