diff --git a/lib/caronte/passes/ws-incoming.js b/lib/caronte/passes/ws-incoming.js
index 3b5e1f5..0adab3d 100644
--- a/lib/caronte/passes/ws-incoming.js
+++ b/lib/caronte/passes/ws-incoming.js
@@ -55,7 +55,7 @@ function XHeaders(req, socket, options) {
   if(!options.xfwd) return;
 
   var values = {
-    for  : req.connection.remoteAddsockets || req.socket.remoteAddsockets,
+    for  : req.connection.remoteAddress || req.socket.remoteAddress,
     port : req.connection.remotePort || req.socket.remotePort,
     proto: req.connection.pair ? 'wss' : 'ws'
   };
diff --git a/test/lib-caronte-passes-web-test.js b/test/lib-caronte-passes-web-incoming-test.js
similarity index 100%
rename from test/lib-caronte-passes-web-test.js
rename to test/lib-caronte-passes-web-incoming-test.js
diff --git a/test/lib-caronte-passes-ws-test.js b/test/lib-caronte-passes-ws-incoming-test.js
similarity index 100%
rename from test/lib-caronte-passes-ws-test.js
rename to test/lib-caronte-passes-ws-incoming-test.js