diff --git a/contrib/plugins/helloworld.py b/contrib/plugins/helloworld.py
index 73c4cc7c0..ccfdac161 100755
--- a/contrib/plugins/helloworld.py
+++ b/contrib/plugins/helloworld.py
@@ -31,13 +31,13 @@ def init(options, configuration, plugin, **kwargs):
 
 
 @plugin.subscribe("connect")
-def on_connect(plugin, id, address, **kwargs):
-    plugin.log("Received connect event for peer {}".format(id))
+def on_connect(plugin, connect, **kwargs):
+    plugin.log("Received connect event for peer {}".format(connect))
 
 
 @plugin.subscribe("disconnect")
-def on_disconnect(plugin, id, **kwargs):
-    plugin.log("Received disconnect event for peer {}".format(id))
+def on_disconnect(plugin, disconnect, **kwargs):
+    plugin.log("Received disconnect event for peer {}".format(disconnect))
 
 
 @plugin.subscribe("invoice_payment")
diff --git a/contrib/pylightning/README.md b/contrib/pylightning/README.md
index 4487607ac..e4303fa87 100644
--- a/contrib/pylightning/README.md
+++ b/contrib/pylightning/README.md
@@ -94,8 +94,8 @@ def init(options, configuration, plugin):
 
 
 @plugin.subscribe("connect")
-def on_connect(plugin, id, address):
-    plugin.log("Received connect event for peer {}".format(id))
+def on_connect(plugin, connect):
+    plugin.log("Received connect event for peer {}".format(connect))
 
 
 plugin.add_option('greeting', 'Hello', 'The greeting I should use.')
diff --git a/contrib/pyln-client/README.md b/contrib/pyln-client/README.md
index 2e781bddb..959127044 100644
--- a/contrib/pyln-client/README.md
+++ b/contrib/pyln-client/README.md
@@ -96,8 +96,8 @@ def init(options, configuration, plugin):
 
 
 @plugin.subscribe("connect")
-def on_connect(plugin, id, address, **kwargs):
-    plugin.log("Received connect event for peer {}".format(id))
+def on_connect(plugin, connect, **kwargs):
+    plugin.log("Received connect event for peer {}".format(connect))
 
 
 plugin.add_option('greeting', 'Hello', 'The greeting I should use.')
diff --git a/tests/plugins/block_added.py b/tests/plugins/block_added.py
index a85b288e6..eb9f5b62a 100755
--- a/tests/plugins/block_added.py
+++ b/tests/plugins/block_added.py
@@ -9,9 +9,9 @@ blocks_catched = []
 
 
 @plugin.subscribe("block_added")
-def notify_block_added(plugin, block, **kwargs):
+def notify_block_added(plugin, block_added, **kwargs):
     global blocks_catched
-    blocks_catched.append(block["height"])
+    blocks_catched.append(block_added["height"])
 
 
 @plugin.method("blockscatched")