diff --git a/docs/config.ld b/docs/config.ld
index 8088b7401..172140148 100644
--- a/docs/config.ld
+++ b/docs/config.ld
@@ -93,6 +93,7 @@ sort_modules=true
 new_type("widgetmod"   , "Widgets"   , true)
 new_type("containermod", "Widget containers", true)
 new_type("layoutmod"   , "Widget layouts"   , true)
+new_type("coreclassmod", "Core components"  , true)
 
 file = {
     -- C parts of libraries
diff --git a/lib/awful/keygrabber.lua b/lib/awful/keygrabber.lua
index 928a6ecb3..82e1038e3 100644
--- a/lib/awful/keygrabber.lua
+++ b/lib/awful/keygrabber.lua
@@ -60,7 +60,7 @@
 -- @author Emmanuel Lepage Vallee <elv1313@gmail.com>
 -- @copyright 2012 dodo
 -- @copyright 2017 Emmanuel Lepage Vallee
--- @classmod awful.keygrabber
+-- @coreclassmod awful.keygrabber
 ---------------------------------------------------------------------------
 
 local ipairs = ipairs
@@ -731,7 +731,6 @@ end
 -- @return the given callback `g`.
 --
 -- @deprecated awful.keygrabber.run
--- @see keygrabber.run
 
 --- A lower level API to interact with the keygrabber directly.
 --
diff --git a/lib/gears/timer.lua b/lib/gears/timer.lua
index bcc692cf6..a955472ba 100644
--- a/lib/gears/timer.lua
+++ b/lib/gears/timer.lua
@@ -46,7 +46,7 @@
 --
 -- @author Uli Schlachter
 -- @copyright 2014 Uli Schlachter
--- @classmod gears.timer
+-- @coreclassmod gears.timer
 ---------------------------------------------------------------------------
 
 local capi = { awesome = awesome }
diff --git a/lib/naughty/notification.lua b/lib/naughty/notification.lua
index 792a4ae93..4be3b1644 100644
--- a/lib/naughty/notification.lua
+++ b/lib/naughty/notification.lua
@@ -13,7 +13,7 @@
 -- @author Emmanuel Lepage Vallee
 -- @copyright 2008 koniu
 -- @copyright 2017 Emmanuel Lepage Vallee
--- @classmod naughty.notification
+-- @coreclassmod naughty.notification
 ---------------------------------------------------------------------------
 local gobject = require("gears.object")
 local gtable  = require("gears.table")
diff --git a/lib/wibox/init.lua b/lib/wibox/init.lua
index 383cf50fa..0e59e9ebf 100644
--- a/lib/wibox/init.lua
+++ b/lib/wibox/init.lua
@@ -1,7 +1,7 @@
 ---------------------------------------------------------------------------
 -- @author Uli Schlachter
 -- @copyright 2010 Uli Schlachter
--- @classmod wibox
+-- @coreclassmod wibox
 ---------------------------------------------------------------------------
 
 local capi = {
diff --git a/mouse.c b/mouse.c
index d4c11bbad..3f2ccf897 100644
--- a/mouse.c
+++ b/mouse.c
@@ -57,7 +57,7 @@
  *
  * @author Julien Danjou <julien@danjou.info>
  * @copyright 2008-2009 Julien Danjou
- * @module mouse
+ * @coreclassmod mouse
  */
 
 #include "mouse.h"
diff --git a/mousegrabber.c b/mousegrabber.c
index 282c9d22a..5efe72052 100644
--- a/mousegrabber.c
+++ b/mousegrabber.c
@@ -22,7 +22,7 @@
 /** awesome mousegrabber API
  * @author Julien Danjou <julien@danjou.info>
  * @copyright 2008-2009 Julien Danjou
- * @module mousegrabber
+ * @coreclassmod mousegrabber
  */
 
 #include "mousegrabber.h"
diff --git a/objects/button.c b/objects/button.c
index 846ed7d4b..9670b4709 100644
--- a/objects/button.c
+++ b/objects/button.c
@@ -30,7 +30,7 @@
  *
  * @author Julien Danjou <julien@danjou.info>
  * @copyright 2008-2009 Julien Danjou
- * @classmod button
+ * @coreclassmod button
  */
 
 #include "button.h"
diff --git a/objects/client.c b/objects/client.c
index f38e1626b..40ba15259 100644
--- a/objects/client.c
+++ b/objects/client.c
@@ -84,7 +84,7 @@
  *
  * @author Julien Danjou <julien@danjou.info>
  * @copyright 2008-2009 Julien Danjou
- * @classmod client
+ * @coreclassmod client
  */
 
 #include "objects/client.h"
diff --git a/objects/drawable.c b/objects/drawable.c
index f041ecc07..89e750d6d 100644
--- a/objects/drawable.c
+++ b/objects/drawable.c
@@ -27,7 +27,7 @@
  *
  * @author Uli Schlachter <psychon@znc.in>
  * @copyright 2012 Uli Schlachter
- * @classmod drawable
+ * @coreclassmod drawable
  */
 
 #include "drawable.h"
diff --git a/objects/key.c b/objects/key.c
index 932921ca2..eca16c7f7 100644
--- a/objects/key.c
+++ b/objects/key.c
@@ -31,7 +31,7 @@
  *
  * @author Julien Danjou <julien@danjou.info>
  * @copyright 2008-2009 Julien Danjou
- * @classmod key
+ * @coreclassmod key
  */
 
 #include "objects/key.h"
diff --git a/objects/screen.c b/objects/screen.c
index 0800450fb..cbc57c539 100644
--- a/objects/screen.c
+++ b/objects/screen.c
@@ -42,7 +42,7 @@
  *
  * @author Julien Danjou <julien@danjou.info>
  * @copyright 2008-2009 Julien Danjou
- * @classmod screen
+ * @coreclassmod screen
  */
 
 #include "objects/screen.h"
diff --git a/objects/tag.c b/objects/tag.c
index 9b289deeb..7c95aecc5 100644
--- a/objects/tag.c
+++ b/objects/tag.c
@@ -180,7 +180,7 @@
  *
  * @author Julien Danjou <julien@danjou.info>
  * @copyright 2008-2009 Julien Danjou
- * @classmod tag
+ * @coreclassmod tag
  */
 
 #include "tag.h"
diff --git a/root.c b/root.c
index bc649c40a..9edef1d58 100644
--- a/root.c
+++ b/root.c
@@ -22,7 +22,7 @@
 /** awesome root window API
  * @author Julien Danjou <julien@danjou.info>
  * @copyright 2008-2009 Julien Danjou
- * @module root
+ * @coreclassmod root
  */
 
 #include "globalconf.h"