diff --git a/components/squad/commons/squad_row.lua b/components/squad/commons/squad_row.lua
index 74e0e67950c..5aea8c8f937 100644
--- a/components/squad/commons/squad_row.lua
+++ b/components/squad/commons/squad_row.lua
@@ -190,7 +190,7 @@ function SquadRow:newteam()
 	return self
 end
 
----@return WidgetTr
+---@return Widget
 function SquadRow:create()
 	-- Set row background for certain roles
 	local backgrounds = {'Player'}
diff --git a/components/squad/commons/squad_utils.lua b/components/squad/commons/squad_utils.lua
index 32aefa505e4..ff8e186229b 100644
--- a/components/squad/commons/squad_utils.lua
+++ b/components/squad/commons/squad_utils.lua
@@ -177,7 +177,7 @@ end
 
 ---@param frame table
 ---@param squadWidget SquadWidget
----@param rowCreator fun(player: table, squadType: integer):WidgetTr
+---@param rowCreator fun(player: table, squadType: integer):Widget
 ---@return Widget
 function SquadUtils.defaultRunManual(frame, squadWidget, rowCreator)
 	local args = Arguments.getArgs(frame)
@@ -204,7 +204,7 @@ end
 ---@param players table[]
 ---@param squadType SquadType
 ---@param squadWidget SquadWidget
----@param rowCreator fun(person: table, squadType: integer):WidgetTr
+---@param rowCreator fun(person: table, squadType: integer):Widget
 ---@param customTitle string?
 ---@param personMapper? fun(person: table): table
 ---@return Widget
@@ -226,7 +226,7 @@ function SquadUtils.defaultRunAuto(players, squadType, squadWidget, rowCreator,
 end
 
 ---@param squadRowClass SquadRow
----@return fun(person: table, squadType: integer):WidgetTr
+---@return fun(person: table, squadType: integer):Widget
 function SquadUtils.defaultRow(squadRowClass)
 	return function(person, squadType)
 		local squadPerson = SquadUtils.readSquadPersonArgs(Table.merge(person, {type = squadType}))
diff --git a/components/squad/wikis/overwatch/squad_custom.lua b/components/squad/wikis/overwatch/squad_custom.lua
index cab5e3537b0..3f0dbae1fee 100644
--- a/components/squad/wikis/overwatch/squad_custom.lua
+++ b/components/squad/wikis/overwatch/squad_custom.lua
@@ -79,7 +79,7 @@ end
 ---@param person table
 ---@param squadType integer
 ---@param showNumber boolean
----@return WidgetTr
+---@return Widget
 function CustomSquad._playerRow(person, squadType, showNumber)
 	local squadPerson = SquadUtils.readSquadPersonArgs(Table.merge(person, {type = squadType}))
 	squadPerson.extradata.number = person.number
diff --git a/components/squad/wikis/starcraft2/squad_custom.lua b/components/squad/wikis/starcraft2/squad_custom.lua
index 90703dd9432..95d60fe8b47 100644
--- a/components/squad/wikis/starcraft2/squad_custom.lua
+++ b/components/squad/wikis/starcraft2/squad_custom.lua
@@ -48,7 +48,7 @@ end
 
 ---@param person table
 ---@param squadType integer
----@return WidgetTr
+---@return Widget
 function CustomSquad._playerRow(person, squadType)
 	local squadPerson = SquadUtils.readSquadPersonArgs(Table.merge(person, {type = squadType}))
 	local squadArgs = Arguments.getArgs(mw.getCurrentFrame())
diff --git a/components/squad/wikis/stormgate/squad_custom.lua b/components/squad/wikis/stormgate/squad_custom.lua
index 99682ea3843..3c30c631227 100644
--- a/components/squad/wikis/stormgate/squad_custom.lua
+++ b/components/squad/wikis/stormgate/squad_custom.lua
@@ -47,7 +47,7 @@ end
 
 ---@param person table
 ---@param squadType integer
----@return WidgetTr
+---@return Widget
 function CustomSquad._playerRow(person, squadType)
 	local squadPerson = SquadUtils.readSquadPersonArgs(Table.merge(person, {type = squadType}))
 	if Logic.isEmpty(squadPerson.newteam) then
diff --git a/components/widget/squad/widget_squad_core.lua b/components/widget/squad/widget_squad_core.lua
index 03508875793..07dafa0453d 100644
--- a/components/widget/squad/widget_squad_core.lua
+++ b/components/widget/squad/widget_squad_core.lua
@@ -42,7 +42,7 @@ end
 
 ---@param type SquadType
 ---@param title string?
----@return WidgetTr?
+---@return Widget?
 function Squad:_title(type, title)
 	local defaultTitle
 	if type == SquadUtils.SquadType.FORMER or type == SquadUtils.SquadType.FORMER_INACTIVE then
@@ -63,7 +63,7 @@ function Squad:_title(type, title)
 end
 
 ---@param type SquadType
----@return WidgetTr
+---@return Widget
 function Squad:_header(type)
 	local isInactive = type == SquadUtils.SquadType.INACTIVE or type == SquadUtils.SquadType.FORMER_INACTIVE
 	local isFormer = type == SquadUtils.SquadType.FORMER or type == SquadUtils.SquadType.FORMER_INACTIVE
diff --git a/components/widget/squad/widget_squad_core_tldb.lua b/components/widget/squad/widget_squad_core_tldb.lua
index 41887be6ed9..1389af920f1 100644
--- a/components/widget/squad/widget_squad_core_tldb.lua
+++ b/components/widget/squad/widget_squad_core_tldb.lua
@@ -17,7 +17,7 @@ local SquadWidget = Lua.import('Module:Widget/Squad/Core')
 local SquadTldb = Class.new(SquadWidget)
 
 ---@param type SquadType
----@return WidgetTr
+---@return Widget
 function SquadTldb:header(type)
 	return Widgets.Tr{
 		classes = {'HeaderRow'},
@@ -33,7 +33,7 @@ end
 
 ---@param type SquadType
 ---@param title string?
----@return WidgetTr?
+---@return Widget?
 function SquadTldb:_title(type, title)
 	return nil
 end