diff --git a/lib/wibox/layout/align.lua b/lib/wibox/layout/align.lua
index afb12dba7..1271b7e4a 100644
--- a/lib/wibox/layout/align.lua
+++ b/lib/wibox/layout/align.lua
@@ -3,7 +3,7 @@
 --@DOC_wibox_layout_defaults_align_EXAMPLE@
 -- @author Uli Schlachter
 -- @copyright 2010 Uli Schlachter
--- @classmod wibox.layout.align
+-- @layoutmod wibox.layout.align
 ---------------------------------------------------------------------------
 
 local table = table
diff --git a/lib/wibox/layout/fixed.lua b/lib/wibox/layout/fixed.lua
index ee7a56ae9..5eec5861f 100644
--- a/lib/wibox/layout/fixed.lua
+++ b/lib/wibox/layout/fixed.lua
@@ -3,7 +3,7 @@
 --@DOC_wibox_layout_defaults_fixed_EXAMPLE@
 -- @author Uli Schlachter
 -- @copyright 2010 Uli Schlachter
--- @classmod wibox.layout.fixed
+-- @layoutmod wibox.layout.fixed
 ---------------------------------------------------------------------------
 
 local unpack = unpack or table.unpack -- luacheck: globals unpack (compatibility with Lua 5.1)
diff --git a/lib/wibox/layout/flex.lua b/lib/wibox/layout/flex.lua
index c09daa50d..490ff421a 100644
--- a/lib/wibox/layout/flex.lua
+++ b/lib/wibox/layout/flex.lua
@@ -3,7 +3,7 @@
 --@DOC_wibox_layout_defaults_flex_EXAMPLE@
 -- @author Uli Schlachter
 -- @copyright 2010 Uli Schlachter
--- @classmod wibox.layout.flex
+-- @layoutmod wibox.layout.flex
 ---------------------------------------------------------------------------
 
 local base = require("wibox.widget.base")
diff --git a/lib/wibox/layout/grid.lua b/lib/wibox/layout/grid.lua
index a0734614b..37bccc53e 100644
--- a/lib/wibox/layout/grid.lua
+++ b/lib/wibox/layout/grid.lua
@@ -13,7 +13,7 @@
 --@DOC_wibox_layout_defaults_grid_EXAMPLE@
 -- @author getzze
 -- @copyright 2017 getzze
--- @classmod wibox.layout.grid
+-- @layoutmod wibox.layout.grid
 ---------------------------------------------------------------------------
 
 local setmetatable = setmetatable
diff --git a/lib/wibox/layout/manual.lua b/lib/wibox/layout/manual.lua
index 4fe4aa3d4..d16a0bb5f 100644
--- a/lib/wibox/layout/manual.lua
+++ b/lib/wibox/layout/manual.lua
@@ -7,7 +7,7 @@
 --@DOC_wibox_layout_defaults_manual_EXAMPLE@
 -- @author Emmanuel Lepage Vallee
 -- @copyright 2016 Emmanuel Lepage Vallee
--- @classmod wibox.layout.manual
+-- @layoutmod wibox.layout.manual
 ---------------------------------------------------------------------------
 local gtable = require("gears.table")
 local base = require("wibox.widget.base")
diff --git a/lib/wibox/layout/ratio.lua b/lib/wibox/layout/ratio.lua
index 04828a6a0..de79be276 100644
--- a/lib/wibox/layout/ratio.lua
+++ b/lib/wibox/layout/ratio.lua
@@ -6,7 +6,7 @@
 --@DOC_wibox_layout_defaults_ratio_EXAMPLE@
 -- @author Emmanuel Lepage Vallee
 -- @copyright 2016 Emmanuel Lepage Vallee
--- @classmod wibox.layout.ratio
+-- @layoutmod wibox.layout.ratio
 ---------------------------------------------------------------------------
 
 local base  = require("wibox.widget.base" )
diff --git a/lib/wibox/layout/stack.lua b/lib/wibox/layout/stack.lua
index 7592c44d9..4cc8d6c2c 100644
--- a/lib/wibox/layout/stack.lua
+++ b/lib/wibox/layout/stack.lua
@@ -11,7 +11,7 @@
 --@DOC_wibox_layout_defaults_stack_EXAMPLE@
 -- @author Emmanuel Lepage Vallee
 -- @copyright 2016 Emmanuel Lepage Vallee
--- @classmod wibox.layout.stack
+-- @layoutmod wibox.layout.stack
 ---------------------------------------------------------------------------
 
 local base  = require("wibox.widget.base" )