diff --git a/lib/awful/client.lua b/lib/awful/client.lua
index ea5457cb0..59c769e1f 100644
--- a/lib/awful/client.lua
+++ b/lib/awful/client.lua
@@ -1236,7 +1236,7 @@ end
 -- @tparam[opt=nil] table hints Some hints.
 
 --- The client marked signal (deprecated).
--- @signal .marked
+-- @signal marked
 
 --- The client unmarked signal (deprecated).
 -- @signal unmarked
diff --git a/lib/gears/timer.lua b/lib/gears/timer.lua
index 3f88d70a3..2cc2bbb5d 100644
--- a/lib/gears/timer.lua
+++ b/lib/gears/timer.lua
@@ -72,13 +72,13 @@ local protected_call = require("gears.protected_call")
 -- @table timer
 
 --- When the timer is started.
--- @signal .start
+-- @signal start
 
 --- When the timer is stopped.
--- @signal .stop
+-- @signal stop
 
 --- When the timer had a timeout event.
--- @signal .timeout
+-- @signal timeout
 
 local timer = { mt = {} }
 
diff --git a/objects/button.c b/objects/button.c
index 76b96c3b9..3045cd4f2 100644
--- a/objects/button.c
+++ b/objects/button.c
@@ -60,7 +60,7 @@
 
 /** When bound mouse button + modifiers are pressed.
  * @param ... One or more arguments are possible
- * @signal .press
+ * @signal press
  */
 
 /** When property changes.
@@ -73,7 +73,7 @@
 
 /** When bound mouse button + modifiers are pressed.
  * @param ... One or more arguments are possible
- * @signal .release
+ * @signal release
  */
 
 /** Create a new mouse button bindings.
diff --git a/objects/client.c b/objects/client.c
index f267ec575..c7a0c8e82 100644
--- a/objects/client.c
+++ b/objects/client.c
@@ -112,21 +112,21 @@
  */
 
 /** When a client gains focus.
- * @signal .focus
+ * @signal focus
  */
 
 /** Before manage, after unmanage, and when clients swap.
- * @signal .list
+ * @signal list
  */
 
 /** When 2 clients are swapped
  * @tparam client client The other client
  * @tparam boolean is_source If self is the source or the destination of the swap
- * @signal .swapped
+ * @signal swapped
  */
 
 /** When a new client appears and gets managed by Awesome.
- * @signal .manage
+ * @signal manage
  */
 
 /**
@@ -207,29 +207,29 @@
  */
 
 /** When a client gets tagged.
- * @signal .tagged
+ * @signal tagged
  * @tag t The tag object.
  */
 
 /** When a client gets unfocused.
- * @signal .unfocus
+ * @signal unfocus
  */
 
 /**
- * @signal .unmanage
+ * @signal unmanage
  */
 
 /** When a client gets untagged.
- * @signal .untagged
+ * @signal untagged
  * @tag t The tag object.
  */
 
 /**
- * @signal .raised
+ * @signal raised
  */
 
 /**
- * @signal .lowered
+ * @signal lowered
  */
 
 /**
diff --git a/objects/key.c b/objects/key.c
index 3b40a835a..9f27488f8 100644
--- a/objects/key.c
+++ b/objects/key.c
@@ -56,7 +56,7 @@
  */
 
 /**
- * @signal .press
+ * @signal press
  */
 
 /**
@@ -68,7 +68,7 @@
  */
 
 /**
- * @signal .release
+ * @signal release
  */
 
 /** Get the number of instances.
diff --git a/objects/screen.c b/objects/screen.c
index 5ebb54bed..34e0f96ef 100644
--- a/objects/screen.c
+++ b/objects/screen.c
@@ -71,12 +71,12 @@
  */
 
 /**
- * @signal .primary_changed
+ * @signal primary_changed
  */
 
 /**
  * This signal is emitted when a new screen is added to the current setup.
- * @signal .added
+ * @signal added
  */
 
 /**
@@ -85,13 +85,13 @@
  */
 
 /** This signal is emitted when the list of available screens changes.
- * @signal .list
+ * @signal list
  */
 
 /** When 2 screens are swapped
  * @tparam screen screen The other screen
  * @tparam boolean is_source If self is the source or the destination of the swap
- * @signal .swapped
+ * @signal swapped
  */
 
  /**