diff --git a/luadoc/awesome.lua b/luadoc/awesome.lua
index c206bae8c..31a0e981b 100644
--- a/luadoc/awesome.lua
+++ b/luadoc/awesome.lua
@@ -38,13 +38,13 @@ module("awesome")
 --- Add a global signal.
 -- @param name A string with the event name.
 -- @param func The function to call.
--- @name add_signal
+-- @name connect_signal
 -- @class function
 
 --- Remove a global signal.
 -- @param name A string with the event name.
 -- @param func The function to call.
--- @name remove_signal
+-- @name disconnect_signal
 -- @class function
 
 --- Emit a global signal.
diff --git a/luadoc/button.lua b/luadoc/button.lua
index 5adeb3fc4..20103e0a9 100644
--- a/luadoc/button.lua
+++ b/luadoc/button.lua
@@ -13,13 +13,13 @@ module("button")
 --- Add a signal.
 -- @param name A signal name.
 -- @param func A function to call when the signal is emitted.
--- @name add_signal
+-- @name connect_signal
 -- @class function
 
 --- Remove a signal.
 -- @param name A signal name.
 -- @param func A function to remove.
--- @name remove_signal
+-- @name disconnect_signal
 -- @class function
 
 --- Emit a signal.
diff --git a/luadoc/client.lua b/luadoc/client.lua
index 8e676ee65..ba0586a74 100644
--- a/luadoc/client.lua
+++ b/luadoc/client.lua
@@ -114,13 +114,13 @@ module("client")
 --- Add a signal.
 -- @param name A signal name.
 -- @param func A function to call when the signal is emitted.
--- @name add_signal
+-- @name connect_signal
 -- @class function
 
 --- Remove a signal.
 -- @param name A signal name.
 -- @param func A function to remove.
--- @name remove_signal
+-- @name disconnect_signal
 -- @class function
 
 --- Emit a signal.
diff --git a/luadoc/dbus.lua b/luadoc/dbus.lua
index 1e24ae1e6..98894a40a 100644
--- a/luadoc/dbus.lua
+++ b/luadoc/dbus.lua
@@ -33,11 +33,11 @@ module("dbus")
 --- Add a signal receiver on the D-Bus.
 -- @param interface A string with the interface name.
 -- @param func The function to call.
--- @name add_signal
+-- @name connect_signal
 -- @class function
 
 --- Remove a signal receiver on the D-Bus.
 -- @param interface A string with the interface name.
 -- @param func The function to call.
--- @name remove_signal
+-- @name disconnect_signal
 -- @class function
diff --git a/luadoc/image.lua b/luadoc/image.lua
index 834d2ed25..6e1edf6ce 100644
--- a/luadoc/image.lua
+++ b/luadoc/image.lua
@@ -114,13 +114,13 @@ module("image")
 --- Add a signal.
 -- @param name A signal name.
 -- @param func A function to call when the signal is emitted.
--- @name add_signal
+-- @name connect_signal
 -- @class function
 
 --- Remove a signal.
 -- @param name A signal name.
 -- @param func A function to remove.
--- @name remove_signal
+-- @name disconnect_signal
 -- @class function
 
 --- Emit a signal.
diff --git a/luadoc/key.lua b/luadoc/key.lua
index d166ad9a0..810f6e23b 100644
--- a/luadoc/key.lua
+++ b/luadoc/key.lua
@@ -16,13 +16,13 @@ module("key")
 --- Add a signal.
 -- @param name A signal name.
 -- @param func A function to call when the signal is emitted.
--- @name add_signal
+-- @name connect_signal
 -- @class function
 
 --- Remove a signal.
 -- @param name A signal name.
 -- @param func A function to remove.
--- @name remove_signal
+-- @name disconnect_signal
 -- @class function
 
 --- Emit a signal.
diff --git a/luadoc/screen.lua b/luadoc/screen.lua
index 488a3b45b..89626940e 100644
--- a/luadoc/screen.lua
+++ b/luadoc/screen.lua
@@ -20,13 +20,13 @@ module("screen")
 --- Add a signal to a screen.
 -- @param name A signal name.
 -- @param func A function to call when the signal is emitted.
--- @name add_signal
+-- @name connect_signal
 -- @class function
 
 --- Remove a signal to a screen.
 -- @param name A signal name.
 -- @param func A function to remove
--- @name remove_signal
+-- @name disconnect_signal
 -- @class function
 
 --- Emit a signal to a screen.
diff --git a/luadoc/tag.lua b/luadoc/tag.lua
index a6776cc6c..349d3f62e 100644
--- a/luadoc/tag.lua
+++ b/luadoc/tag.lua
@@ -19,13 +19,13 @@ module("tag")
 --- Add a signal.
 -- @param name A signal name.
 -- @param func A function to call when the signal is emitted.
--- @name add_signal
+-- @name connect_signal
 -- @class function
 
 --- Remove a signal.
 -- @param name A signal name.
 -- @param func A function to remove.
--- @name remove_signal
+-- @name disconnect_signal
 -- @class function
 
 --- Emit a signal.
diff --git a/luadoc/timer.lua b/luadoc/timer.lua
index d41baaae9..019b11138 100644
--- a/luadoc/timer.lua
+++ b/luadoc/timer.lua
@@ -24,13 +24,13 @@ module("timer")
 --- Add a signal.
 -- @param name A signal name.
 -- @param func A function to call when the signal is emitted.
--- @name add_signal
+-- @name connect_signal
 -- @class function
 
 --- Remove a signal.
 -- @param name A signal name.
 -- @param func A function to remove.
--- @name remove_signal
+-- @name disconnect_signal
 -- @class function
 
 --- Emit a signal.
diff --git a/luadoc/wibox.lua b/luadoc/wibox.lua
index 9b919cfd0..fc6a6e858 100644
--- a/luadoc/wibox.lua
+++ b/luadoc/wibox.lua
@@ -46,13 +46,13 @@ module("wibox")
 --- Add a signal.
 -- @param name A signal name.
 -- @param func A function to call when the signal is emitted.
--- @name add_signal
+-- @name connect_signal
 -- @class function
 
 --- Remove a signal.
 -- @param name A signal name.
 -- @param func A function to remove.
--- @name remove_signal
+-- @name disconnect_signal
 -- @class function
 
 --- Emit a signal.
diff --git a/luadoc/widget.lua b/luadoc/widget.lua
index e3a10baab..3aea44ee8 100644
--- a/luadoc/widget.lua
+++ b/luadoc/widget.lua
@@ -52,13 +52,13 @@ module("widget")
 --- Add a signal.
 -- @param name A signal name.
 -- @param func A function to call when the signal is emitted.
--- @name add_signal
+-- @name connect_signal
 -- @class function
 
 --- Remove a signal.
 -- @param name A signal name.
 -- @param func A function to remove.
--- @name remove_signal
+-- @name disconnect_signal
 -- @class function
 
 --- Emit a signal.