diff --git a/docs/config.ld b/docs/config.ld
index 172140148..7b4eb69be 100644
--- a/docs/config.ld
+++ b/docs/config.ld
@@ -94,6 +94,7 @@ new_type("widgetmod"   , "Widgets"   , true)
 new_type("containermod", "Widget containers", true)
 new_type("layoutmod"   , "Widget layouts"   , true)
 new_type("coreclassmod", "Core components"  , true)
+new_type("popupmod"    , "Popups and bars"  , true)
 
 file = {
     -- C parts of libraries
diff --git a/lib/awful/hotkeys_popup/widget.lua b/lib/awful/hotkeys_popup/widget.lua
index f8efb46a6..044deae5f 100644
--- a/lib/awful/hotkeys_popup/widget.lua
+++ b/lib/awful/hotkeys_popup/widget.lua
@@ -3,7 +3,7 @@
 --
 -- @author Yauheni Kirylau <yawghen@gmail.com>
 -- @copyright 2014-2015 Yauheni Kirylau
--- @module awful.hotkeys_popup.widget
+-- @popupmod awful.hotkeys_popup.widget
 ---------------------------------------------------------------------------
 
 local capi = {
diff --git a/lib/awful/popup.lua b/lib/awful/popup.lua
index 7dc4e59fc..66efbf134 100644
--- a/lib/awful/popup.lua
+++ b/lib/awful/popup.lua
@@ -18,7 +18,7 @@
 --
 -- @author Emmanuel Lepage Vallee
 -- @copyright 2016 Emmanuel Lepage Vallee
--- @classmod awful.popup
+-- @popupmod awful.popup
 ---------------------------------------------------------------------------
 local wibox     = require( "wibox"           )
 local util      = require( "awful.util"      )
diff --git a/lib/awful/titlebar.lua b/lib/awful/titlebar.lua
index ed7b3054c..793abf204 100644
--- a/lib/awful/titlebar.lua
+++ b/lib/awful/titlebar.lua
@@ -9,7 +9,7 @@
 --
 -- @author Uli Schlachter
 -- @copyright 2012 Uli Schlachter
--- @classmod awful.titlebar
+-- @popupmod awful.titlebar
 ---------------------------------------------------------------------------
 
 local error = error
diff --git a/lib/awful/tooltip.lua b/lib/awful/tooltip.lua
index 5fb6db1f3..5cfbad24e 100644
--- a/lib/awful/tooltip.lua
+++ b/lib/awful/tooltip.lua
@@ -39,7 +39,7 @@
 --
 -- @author Sébastien Gross <seb•ɱɩɲʋʃ•awesome•ɑƬ•chezwam•ɖɵʈ•org>
 -- @copyright 2009 Sébastien Gross
--- @classmod awful.tooltip
+-- @popupmod awful.tooltip
 -------------------------------------------------------------------------
 
 local timer = require("gears.timer")
diff --git a/lib/awful/wibar.lua b/lib/awful/wibar.lua
index bdb3da889..bb7da67e0 100644
--- a/lib/awful/wibar.lua
+++ b/lib/awful/wibar.lua
@@ -5,7 +5,7 @@
 --
 -- @author Emmanuel Lepage Vallee <elv1313@gmail.com>
 -- @copyright 2016 Emmanuel Lepage Vallee
--- @classmod awful.wibar
+-- @popupmod awful.wibar
 ---------------------------------------------------------------------------
 
 -- Grab environment we need
diff --git a/lib/awful/widget/calendar_popup.lua b/lib/awful/widget/calendar_popup.lua
index df49c89ce..fe3fdc78d 100644
--- a/lib/awful/widget/calendar_popup.lua
+++ b/lib/awful/widget/calendar_popup.lua
@@ -22,7 +22,7 @@
 --
 -- @author getzze
 -- @copyright 2017 getzze
--- @classmod awful.widget.calendar_popup
+-- @popupmod awful.widget.calendar_popup
 ---------------------------------------------------------------------------
 
 local setmetatable = setmetatable
diff --git a/lib/naughty/layout/legacy.lua b/lib/naughty/layout/legacy.lua
index 530351c35..c09732906 100644
--- a/lib/naughty/layout/legacy.lua
+++ b/lib/naughty/layout/legacy.lua
@@ -17,7 +17,7 @@
 -- @author Emmanuel Lepage Vallee <elv1313@gmail.com>
 -- @copyright 2008 koniu
 -- @copyright 2017 Emmanuel Lepage Vallee
--- @classmod naughty.layout.legacy
+-- @popupmod naughty.layout.legacy
 ----------------------------------------------------------------------------
 
 local capi      = { screen = screen, awesome = awesome }
diff --git a/lib/wibox/init.lua b/lib/wibox/init.lua
index 0e59e9ebf..8335badfa 100644
--- a/lib/wibox/init.lua
+++ b/lib/wibox/init.lua
@@ -1,7 +1,7 @@
 ---------------------------------------------------------------------------
 -- @author Uli Schlachter
 -- @copyright 2010 Uli Schlachter
--- @coreclassmod wibox
+-- @popupmod wibox
 ---------------------------------------------------------------------------
 
 local capi = {