diff --git a/src/lib/types/conf.ts b/src/lib/types/conf.ts
index feb054c..3f2a228 100644
--- a/src/lib/types/conf.ts
+++ b/src/lib/types/conf.ts
@@ -8,7 +8,7 @@ export interface Conf {
 
 export interface ConfWS2P {
   address: string
-  expectedKey: string
+  expectedPubkey: string
   salt: string
   passwd: string
   currency: string
diff --git a/src/lib/watchers/ws2p/ws2p-watcher.ts b/src/lib/watchers/ws2p/ws2p-watcher.ts
index 5520d5d..68e675e 100644
--- a/src/lib/watchers/ws2p/ws2p-watcher.ts
+++ b/src/lib/watchers/ws2p/ws2p-watcher.ts
@@ -32,7 +32,7 @@ export function ws2pWatcher(conf: Conf) {
             connectionTimeout: conf.connectionTimeout,
             requestTimeout: 0 // No request anyway
           },
-          wserver.expectedKey
+          wserver.expectedPubkey
         )
 
         await c.connectAsInitiator()
@@ -42,20 +42,18 @@ export function ws2pWatcher(conf: Conf) {
 
       conf.reconnectionDelays,
 
-      mail.onEstablished(conf, wserver.expectedKey),
+      mail.onEstablished(conf, wserver.expectedPubkey),
 
       // When a disconnection is detected
-      mail.onDisconnect(conf, wserver.expectedKey),
+      mail.onDisconnect(conf, wserver.expectedPubkey),
 
       async () => {
-        console.log('Trying to connect to %s', wserver.expectedKey)
+        console.log('Trying to connect to %s', wserver.expectedPubkey)
       },
 
-      mail.onRestartSuccess(conf, wserver.expectedKey),
+      mail.onRestartSuccess(conf, wserver.expectedPubkey),
 
-      async (e) => {
-        console.error(e)
-      }
+      mail.onError(conf, wserver.expectedPubkey)
     )
 
   }