diff --git a/druid/base/back_handler.lua b/druid/base/back_handler.lua
index 534eae7..5aad593 100644
--- a/druid/base/back_handler.lua
+++ b/druid/base/back_handler.lua
@@ -2,7 +2,7 @@ local event = require("event.event")
 local const = require("druid.const")
 local component = require("druid.component")
 
----@class druid.back_handler: druid.base_component
+---@class druid.back_handler: druid.component
 ---@field on_back event Trigger on back handler action, fun(self, params)
 ---@field params any|nil Custom args to pass in the callback
 local M = component.create("back_handler")
diff --git a/druid/base/blocker.lua b/druid/base/blocker.lua
index bbd1890..3e536b0 100644
--- a/druid/base/blocker.lua
+++ b/druid/base/blocker.lua
@@ -1,7 +1,7 @@
 local const = require("druid.const")
 local component = require("druid.component")
 
----@class druid.blocker: druid.base_component
+---@class druid.blocker: druid.component
 ---@field node node
 ---@field private _is_enabled boolean
 local M = component.create("blocker")
diff --git a/druid/base/button.lua b/druid/base/button.lua
index a7c57ef..f454001 100755
--- a/druid/base/button.lua
+++ b/druid/base/button.lua
@@ -142,7 +142,7 @@ local helper = require("druid.helper")
 local component = require("druid.component")
 
 ---Clickable node with various interaction callbacks
----@class druid.button: druid.base_component
+---@class druid.button: druid.component
 ---@field on_click event function(self, custom_args, button_instance)
 ---@field on_pressed event
 ---@field on_repeated_click event
diff --git a/druid/base/drag.lua b/druid/base/drag.lua
index ee5a3dc..e5ca5a5 100644
--- a/druid/base/drag.lua
+++ b/druid/base/drag.lua
@@ -66,7 +66,7 @@ local component = require("druid.component")
 ---@field DRAG_DEADZONE number Distance in pixels to start dragging. Default: 10
 ---@field NO_USE_SCREEN_KOEF boolean If screen aspect ratio affects on drag values. Default: false
 
----@class druid.drag: druid.base_component
+---@class druid.drag: druid.component
 ---@field node node
 ---@field on_touch_start event
 ---@field on_touch_end event
diff --git a/druid/base/hover.lua b/druid/base/hover.lua
index 4ca0849..38282c5 100644
--- a/druid/base/hover.lua
+++ b/druid/base/hover.lua
@@ -21,7 +21,7 @@ local const = require("druid.const")
 local helper = require("druid.helper")
 local component = require("druid.component")
 
----@class druid.hover: druid.base_component
+---@class druid.hover: druid.component
 ---@field node node
 ---@field on_hover event
 ---@field on_mouse_hover event
diff --git a/druid/base/scroll.lua b/druid/base/scroll.lua
index 4bd7f75..cc212fa 100755
--- a/druid/base/scroll.lua
+++ b/druid/base/scroll.lua
@@ -90,7 +90,7 @@ local const = require("druid.const")
 local helper = require("druid.helper")
 local component = require("druid.component")
 
----@class druid.scroll: druid.base_component
+---@class druid.scroll: druid.component
 ---@field node node The root node
 ---@field click_zone node|nil Optional click zone to restrict scroll area
 ---@field on_scroll event Triggered on scroll move with (self, position)
diff --git a/druid/base/static_grid.lua b/druid/base/static_grid.lua
index a138fe2..96d51cd 100644
--- a/druid/base/static_grid.lua
+++ b/druid/base/static_grid.lua
@@ -82,7 +82,7 @@ local event = require("event.event")
 local helper = require("druid.helper")
 local component = require("druid.component")
 
----@class druid.grid: druid.base_component
+---@class druid.grid: druid.component
 ---@field on_add_item event
 ---@field on_remove_item event
 ---@field on_change_items event
diff --git a/druid/base/text.lua b/druid/base/text.lua
index a0cd877..3e1369e 100755
--- a/druid/base/text.lua
+++ b/druid/base/text.lua
@@ -83,7 +83,7 @@ local utf8_lua = require("druid.system.utf8")
 local component = require("druid.component")
 local utf8 = utf8 or utf8_lua --[[@as utf8]]
 
----@class druid.text: druid.base_component
+---@class druid.text: druid.component
 ---@field node node
 ---@field on_set_text event
 ---@field on_update_text_scale event
diff --git a/druid/component.lua b/druid/component.lua
index d3b8ada..6e709e7 100644
--- a/druid/component.lua
+++ b/druid/component.lua
@@ -1,7 +1,7 @@
 local const = require("druid.const")
 local helper = require("druid.helper")
 
----@class druid.base_component.meta
+---@class druid.component.meta
 ---@field template string
 ---@field context table
 ---@field nodes table<hash, node>|nil
@@ -9,32 +9,32 @@ local helper = require("druid.helper")
 ---@field druid druid.instance
 ---@field input_enabled boolean
 ---@field children table
----@field parent druid.base_component|nil
+---@field parent druid.component|nil
 ---@field instance_class table
 
----@class druid.base_component.component
+---@class druid.component.component
 ---@field name string
 ---@field input_priority number
 ---@field default_input_priority number
 ---@field _is_input_priority_changed boolean
 ---@field _uid number
 
----@class druid.base_component
+---@class druid.component
 ---@field druid druid.instance Druid instance to create inner components
----@field init fun(self:druid.base_component, ...)|nil
----@field update fun(self:druid.base_component, dt:number)|nil
----@field on_remove fun(self:druid.base_component)|nil
----@field on_input fun(self:druid.base_component, action_id:number, action:table)|nil
----@field on_message fun(self:druid.base_component, message_id:hash, message:table, sender:url)|nil
----@field on_late_init fun(self:druid.base_component)|nil
----@field on_focus_lost fun(self:druid.base_component)|nil
----@field on_focus_gained fun(self:druid.base_component)|nil
----@field on_style_change fun(self:druid.base_component, style: table)|nil
----@field on_layout_change fun(self:druid.base_component)|nil
----@field on_window_resized fun(self:druid.base_component)|nil
----@field on_language_change fun(self:druid.base_component)|nil
----@field private _component druid.base_component.component
----@field private _meta druid.base_component.meta
+---@field init fun(self:druid.component, ...)|nil
+---@field update fun(self:druid.component, dt:number)|nil
+---@field on_remove fun(self:druid.component)|nil
+---@field on_input fun(self:druid.component, action_id:number, action:table)|nil
+---@field on_message fun(self:druid.component, message_id:hash, message:table, sender:url)|nil
+---@field on_late_init fun(self:druid.component)|nil
+---@field on_focus_lost fun(self:druid.component)|nil
+---@field on_focus_gained fun(self:druid.component)|nil
+---@field on_style_change fun(self:druid.component, style: table)|nil
+---@field on_layout_change fun(self:druid.component)|nil
+---@field on_window_resized fun(self:druid.component)|nil
+---@field on_language_change fun(self:druid.component)|nil
+---@field private _component druid.component.component
+---@field private _meta druid.component.meta
 local M = {}
 
 local INTERESTS = {} -- Cache interests per component class in runtime
@@ -54,7 +54,7 @@ end
 ---@param druid_style table|nil
 ---@return T self The component itself for chaining
 function M:set_style(druid_style)
-	---@cast self druid.base_component
+	---@cast self druid.component
 
 	self._meta.style = druid_style or {}
 	local component_style = self._meta.style[self._component.name] or {}
@@ -75,7 +75,7 @@ end
 ---@param template string|nil
 ---@return T self The component itself for chaining
 function M:set_template(template)
-	---@cast self druid.base_component
+	---@cast self druid.component
 
 	template = template or ""
 
@@ -109,7 +109,7 @@ end
 
 ---Set current component nodes, returned from `gui.clone_tree` function.
 ---@param nodes table<hash, node>
----@return druid.base_component
+---@return druid.component
 function M:set_nodes(nodes)
 	self._meta.nodes = nodes
 	return self
@@ -176,7 +176,7 @@ end
 ---Set component input priority, the bigger number processed first. Default value: 10
 ---@param value number
 ---@param is_temporary boolean|nil If true, the reset input priority will return to previous value
----@return druid.base_component self The component itself for chaining
+---@return druid.component self The component itself for chaining
 function M:set_input_priority(value, is_temporary)
 	assert(value)
 
@@ -201,7 +201,7 @@ end
 
 
 ---Reset component input priority to it's default value, that was set in `create` function or `set_input_priority`
----@return druid.base_component self The component itself for chaining
+---@return druid.component self The component itself for chaining
 function M:reset_input_priority()
 	self:set_input_priority(self._component.default_input_priority)
 	return self
@@ -219,7 +219,7 @@ end
 ---If input is disabled, the component will not receive input events.
 ---Recursive for all children components.
 ---@param state boolean
----@return druid.base_component self The component itself for chaining
+---@return druid.component self The component itself for chaining
 function M:set_input_enabled(state)
 	self._meta.input_enabled = state
 
@@ -232,7 +232,7 @@ end
 
 
 ---Get parent component
----@return druid.base_component|nil parent The parent component if exist or nil
+---@return druid.component|nil parent The parent component if exist or nil
 function M:get_parent_component()
 	return self._meta.parent
 end
@@ -243,7 +243,7 @@ end
 ---@param context table Druid context. Usually it is self of script
 ---@param style table Druid style module
 ---@param instance_class table The component instance class
----@return druid.base_component BaseComponent itself
+---@return druid.component BaseComponent itself
 ---@private
 function M:setup_component(druid_instance, context, style, instance_class)
 	self._meta = {
@@ -254,7 +254,7 @@ function M:setup_component(druid_instance, context, style, instance_class)
 		druid = druid_instance,
 		input_enabled = true,
 		children = {},
-		parent = type(context) ~= "userdata" and context --[[@as druid.base_component]],
+		parent = type(context) ~= "userdata" and context --[[@as druid.component]],
 		instance_class = instance_class
 	}
 
@@ -319,7 +319,7 @@ end
 
 
 ---Add child to component children list
----@generic T: druid.base_component
+---@generic T: druid.component
 ---@param child T The druid component instance
 ---@return T self The component itself for chaining
 ---@private
@@ -332,7 +332,7 @@ end
 
 
 ---Remove child from component children list
----@generic T: druid.base_component
+---@generic T: druid.component
 ---@param child T The druid component instance
 ---@return boolean true if child was removed
 ---@private
@@ -367,7 +367,7 @@ end
 ---Сreate a new component class, which will inherit from the base Druid component.
 ---@param name string|nil The name of the component
 ---@param input_priority number|nil The input priority. The bigger number processed first. Default value: 10
----@return druid.base_component
+---@return druid.component
 function M.create(name, input_priority)
 	local new_class = setmetatable({}, {
 		__index = M,
diff --git a/druid/custom/rich_input/rich_input.lua b/druid/custom/rich_input/rich_input.lua
index fdc5f10..75170ca 100644
--- a/druid/custom/rich_input/rich_input.lua
+++ b/druid/custom/rich_input/rich_input.lua
@@ -43,7 +43,7 @@ local const  = require("druid.const")
 local utf8_lua = require("druid.system.utf8")
 local utf8 = utf8 or utf8_lua
 
----@class druid.rich_input: druid.base_component
+---@class druid.rich_input: druid.component
 ---@field root node
 ---@field input druid.input
 ---@field cursor node
diff --git a/druid/custom/rich_text/rich_text.lua b/druid/custom/rich_text/rich_text.lua
index acbc408..b056833 100644
--- a/druid/custom/rich_text/rich_text.lua
+++ b/druid/custom/rich_text/rich_text.lua
@@ -142,7 +142,7 @@ local rich_text = require("druid.custom.rich_text.module.rt")
 ---@field offset_y number|nil
 ---@field node_size vector3|nil
 
----@class druid.rich_text: druid.base_component
+---@class druid.rich_text: druid.component
 ---@field root node
 ---@field text_prefab node
 ---@field private _last_value string
diff --git a/druid/extended/container.lua b/druid/extended/container.lua
index f13decd..cdca841 100644
--- a/druid/extended/container.lua
+++ b/druid/extended/container.lua
@@ -15,7 +15,7 @@ local helper = require("druid.helper")
 local component = require("druid.component")
 local event = require("event.event")
 
----@class druid.container: druid.base_component
+---@class druid.container: druid.component
 ---@field node node
 ---@field druid druid.instance
 ---@field node_offset vector4
diff --git a/druid/extended/data_list.lua b/druid/extended/data_list.lua
index c7ece01..9ef996d 100644
--- a/druid/extended/data_list.lua
+++ b/druid/extended/data_list.lua
@@ -40,7 +40,7 @@ local helper = require("druid.helper")
 local component = require("druid.component")
 local event = require("event.event")
 
----@class druid.data_list: druid.base_component
+---@class druid.data_list: druid.component
 ---@field scroll druid.scroll
 ---@field grid druid.grid
 ---@field on_scroll_progress_change event
@@ -187,7 +187,7 @@ end
 
 
 --- Return all currenly created components in DataList
----@return druid.base_component[] List of created nodes
+---@return druid.component[] List of created nodes
 function M:get_created_components()
 	local components = {}
 
diff --git a/druid/extended/hotkey.lua b/druid/extended/hotkey.lua
index b06f1fe..b453374 100644
--- a/druid/extended/hotkey.lua
+++ b/druid/extended/hotkey.lua
@@ -28,7 +28,7 @@ local helper = require("druid.helper")
 local component = require("druid.component")
 local event = require("event.event")
 
----@class druid.hotkey: druid.base_component
+---@class druid.hotkey: druid.component
 ---@field on_hotkey_pressed event
 ---@field on_hotkey_released event
 ---@field style table
diff --git a/druid/extended/input.lua b/druid/extended/input.lua
index ae243a2..39c824c 100755
--- a/druid/extended/input.lua
+++ b/druid/extended/input.lua
@@ -87,7 +87,7 @@ local component = require("druid.component")
 local utf8_lua = require("druid.system.utf8")
 local utf8 = utf8 or utf8_lua
 
----@class druid.input: druid.base_component
+---@class druid.input: druid.component
 ---@field on_input_select event
 ---@field on_input_unselect event
 ---@field on_input_text event
diff --git a/druid/extended/lang_text.lua b/druid/extended/lang_text.lua
index 33109b5..b171bc5 100755
--- a/druid/extended/lang_text.lua
+++ b/druid/extended/lang_text.lua
@@ -32,7 +32,7 @@ local event = require("event.event")
 local settings = require("druid.system.settings")
 local component = require("druid.component")
 
----@class druid.lang_text: druid.base_component
+---@class druid.lang_text: druid.component
 ---@field text druid.text
 ---@field node node
 ---@field on_change event
diff --git a/druid/extended/layout.lua b/druid/extended/layout.lua
index 2482973..610e723 100644
--- a/druid/extended/layout.lua
+++ b/druid/extended/layout.lua
@@ -19,7 +19,7 @@ local component = require("druid.component")
 ---@field nodes_height table<node, number>
 ---@field rows druid.layout.row_data[]>
 
----@class druid.layout: druid.base_component
+---@class druid.layout: druid.component
 ---@field node node
 ---@field rows_data druid.layout.rows_data Last calculated rows data
 ---@field is_dirty boolean
diff --git a/druid/extended/progress.lua b/druid/extended/progress.lua
index bac6d3c..bad895a 100644
--- a/druid/extended/progress.lua
+++ b/druid/extended/progress.lua
@@ -49,7 +49,7 @@ local const = require("druid.const")
 local helper = require("druid.helper")
 local component = require("druid.component")
 
----@class druid.progress: druid.base_component
+---@class druid.progress: druid.component
 ---@field node node
 ---@field on_change event
 ---@field style table
diff --git a/druid/extended/slider.lua b/druid/extended/slider.lua
index 197d57f..31dd3f3 100644
--- a/druid/extended/slider.lua
+++ b/druid/extended/slider.lua
@@ -42,7 +42,7 @@ local helper = require("druid.helper")
 local const = require("druid.const")
 local component = require("druid.component")
 
----@class druid.slider: druid.base_component
+---@class druid.slider: druid.component
 ---@field node node
 ---@field on_change_value event
 ---@field style table
diff --git a/druid/extended/swipe.lua b/druid/extended/swipe.lua
index fb65293..89c4689 100644
--- a/druid/extended/swipe.lua
+++ b/druid/extended/swipe.lua
@@ -25,7 +25,7 @@ local const = require("druid.const")
 local helper = require("druid.helper")
 local component = require("druid.component")
 
----@class druid.swipe: druid.base_component
+---@class druid.swipe: druid.component
 ---@field node node
 ---@field on_swipe event function(side, dist, dt), side - "left", "right", "up", "down"
 ---@field style table
diff --git a/druid/extended/timer.lua b/druid/extended/timer.lua
index e4e95c4..9ce6210 100644
--- a/druid/extended/timer.lua
+++ b/druid/extended/timer.lua
@@ -2,7 +2,7 @@ local event = require("event.event")
 local helper = require("druid.helper")
 local component = require("druid.component")
 
----@class druid.timer: druid.base_component
+---@class druid.timer: druid.component
 ---@field on_tick event
 ---@field on_set_enabled event
 ---@field on_timer_end event
diff --git a/druid/system/druid_annotations.lua b/druid/system/druid_annotations.lua
index 0f6dc68..7318618 100644
--- a/druid/system/druid_annotations.lua
+++ b/druid/system/druid_annotations.lua
@@ -1,6 +1,6 @@
----@class druid.widget: druid.base_component
+---@class druid.widget: druid.component
 ---@field druid druid.instance Ready to use druid instance
----@field root node
+---@field root node Is it really needed?
 
 ---@class GUITextMetrics
 ---@field width number
diff --git a/druid/system/druid_instance.lua b/druid/system/druid_instance.lua
index 7c7c6c1..ddf5252 100755
--- a/druid/system/druid_instance.lua
+++ b/druid/system/druid_instance.lua
@@ -7,19 +7,19 @@ local settings = require("druid.system.settings")
 local base_component = require("druid.component")
 
 ---@class druid.instance
----@field components_all druid.base_component[] All created components
----@field components_interest table<string, druid.base_component[]> All components sorted by interest
+---@field components_all druid.component[] All created components
+---@field components_interest table<string, druid.component[]> All components sorted by interest
 ---@field url url
 ---@field private _context table Druid context
 ---@field private _style table Druid style table
 ---@field private _deleted boolean
 ---@field private _is_late_remove_enabled boolean
----@field private _late_remove druid.base_component[]
----@field private _input_blacklist druid.base_component[]|nil
----@field private _input_whitelist druid.base_component[]|nil
+---@field private _late_remove druid.component[]
+---@field private _input_blacklist druid.component[]|nil
+---@field private _input_whitelist druid.component[]|nil
 ---@field private input_inited boolean
 ---@field private _late_init_timer_id number
----@field private _input_components druid.base_component[]
+---@field private _input_components druid.component[]
 local M = {}
 
 local MSG_ADD_FOCUS = hash("acquire_input_focus")
@@ -81,7 +81,7 @@ local WIDGET_METATABLE = { __index = base_component }
 
 ---Create the Druid component instance
 ---@param self druid.instance
----@param widget_class druid.base_component
+---@param widget_class druid.component
 local function create_widget(self, widget_class)
 	local instance = setmetatable({}, {
 		__index = setmetatable(widget_class, WIDGET_METATABLE)
@@ -148,7 +148,7 @@ end
 
 
 ---Check whitelists and blacklists for input components
----@param component druid.base_component
+---@param component druid.component
 ---@return boolean
 function M:_can_use_input_component(component)
 	local can_by_whitelist = true
@@ -224,7 +224,7 @@ end
 
 
 ---Create new Druid component instance
----@generic T: druid.base_component
+---@generic T: druid.component
 ---@param component T
 ---@vararg any
 ---@return T
@@ -264,7 +264,7 @@ end
 --- Remove created component from Druid instance.
 --
 -- Component `on_remove` function will be invoked, if exist.
----@generic T: druid.base_component
+---@generic T: druid.component
 ---@param component T Component instance
 ---@return boolean True if component was removed
 function M:remove(component)
@@ -420,7 +420,7 @@ end
 ---Set whitelist components for input processing.
 ---If whitelist is not empty and component not contains in this list,
 ---component will be not processed on input step
----@param whitelist_components table|druid.base_component[] The array of component to whitelist
+---@param whitelist_components table|druid.component[] The array of component to whitelist
 ---@return druid.instance
 function M:set_whitelist(whitelist_components)
 	if whitelist_components and whitelist_components._component then
@@ -440,7 +440,7 @@ end
 ---Set blacklist components for input processing.
 ---If blacklist is not empty and component contains in this list,
 ---component will be not processed on input step DruidInstance
----@param blacklist_components table|druid.base_component[] The array of component to blacklist
+---@param blacklist_components table|druid.component[] The array of component to blacklist
 ---@return druid.instance
 function M:set_blacklist(blacklist_components)
 	if blacklist_components and blacklist_components._component then
@@ -472,7 +472,7 @@ end
 
 
 ---Create new Druid widget instance
----@generic T: druid.base_component
+---@generic T: druid.component
 ---@param widget T
 ---@param template string|nil The template name used by widget
 ---@param nodes table<hash, node>|node|nil The nodes table from gui.clone_tree or prefab node to use for clone
diff --git a/druid/templates/component_full.template.lua b/druid/templates/component_full.template.lua
index 81fd322..e657798 100644
--- a/druid/templates/component_full.template.lua
+++ b/druid/templates/component_full.template.lua
@@ -1,6 +1,6 @@
 local component = require("druid.component")
 
----@class new_component: druid.base_component
+---@class new_component: druid.component
 local M = component.create("new_component")
 
 -- Component constructor. Template name and nodes are optional. Pass it if you use it in your component
diff --git a/example/components/druid_logo/druid_logo.lua b/example/components/druid_logo/druid_logo.lua
index e42d5bd..d1d9efe 100644
--- a/example/components/druid_logo/druid_logo.lua
+++ b/example/components/druid_logo/druid_logo.lua
@@ -3,7 +3,7 @@ local component = require("druid.component")
 
 local druid_logo_panthera = require("example.components.druid_logo.druid_logo_panthera")
 
----@class druid_logo: druid.base_component
+---@class druid_logo: druid.component
 ---@field root druid.container
 ---@field text_description druid.text
 ---@field druid druid.instance
diff --git a/example/components/example_scene/example_scene.lua b/example/components/example_scene/example_scene.lua
index 0d2ae21..cc81eca 100644
--- a/example/components/example_scene/example_scene.lua
+++ b/example/components/example_scene/example_scene.lua
@@ -1,6 +1,6 @@
 local component = require("druid.component")
 
----@class example_scene: druid.base_component
+---@class example_scene: druid.component
 ---@field root druid.container
 ---@field text_debug_info druid.text
 ---@field text_gui_path druid.text
diff --git a/example/components/examples_list_view/examples_list_view.lua b/example/components/examples_list_view/examples_list_view.lua
index 8f3bad7..12e86e5 100644
--- a/example/components/examples_list_view/examples_list_view.lua
+++ b/example/components/examples_list_view/examples_list_view.lua
@@ -4,7 +4,7 @@ local storage = require("saver.storage")
 
 local examples_list_view_item = require("example.components.examples_list_view.examples_list_view_item")
 
----@class examples_list_view: druid.base_component
+---@class examples_list_view: druid.component
 ---@field root druid.container
 ---@field druid druid.instance
 ---@field scroll druid.scroll
diff --git a/example/components/examples_list_view/examples_list_view_item.lua b/example/components/examples_list_view/examples_list_view_item.lua
index 5d9e98e..26427b5 100644
--- a/example/components/examples_list_view/examples_list_view_item.lua
+++ b/example/components/examples_list_view/examples_list_view_item.lua
@@ -1,6 +1,6 @@
 local component = require("druid.component")
 
----@class examples_list_view_item: druid.base_component
+---@class examples_list_view_item: druid.component
 ---@field root druid.container
 ---@field text druid.lang_text
 ---@field druid druid.instance
diff --git a/example/components/output_list/output_list.lua b/example/components/output_list/output_list.lua
index 19c7262..13f997c 100644
--- a/example/components/output_list/output_list.lua
+++ b/example/components/output_list/output_list.lua
@@ -1,6 +1,6 @@
 local component = require("druid.component")
 
----@class output_list: druid.base_component
+---@class output_list: druid.component
 ---@field root druid.container
 ---@field text_header druid.text
 ---@field scroll druid.scroll
diff --git a/example/components/panel_druid_profiler/panel_druid_profiler.lua b/example/components/panel_druid_profiler/panel_druid_profiler.lua
index 3a17d99..3525a97 100644
--- a/example/components/panel_druid_profiler/panel_druid_profiler.lua
+++ b/example/components/panel_druid_profiler/panel_druid_profiler.lua
@@ -3,7 +3,7 @@ local helper = require("druid.helper")
 local component = require("druid.component")
 
 
----@class panel_druid_profiler: druid.base_component
+---@class panel_druid_profiler: druid.component
 ---@field root druid.container
 ---@field druid druid.instance
 local M = component.create("panel_druid_profiler")
diff --git a/example/components/panel_information/panel_information.lua b/example/components/panel_information/panel_information.lua
index ed8f12f..a190151 100644
--- a/example/components/panel_information/panel_information.lua
+++ b/example/components/panel_information/panel_information.lua
@@ -1,7 +1,7 @@
 local lang = require("lang.lang")
 local component = require("druid.component")
 
----@class panel_information: druid.base_component
+---@class panel_information: druid.component
 ---@field root druid.container
 ---@field text_header druid.lang_text
 ---@field rich_text druid.rich_text
diff --git a/example/components/properties_panel/properties/property_button.lua b/example/components/properties_panel/properties/property_button.lua
index af01d9f..08c3ece 100644
--- a/example/components/properties_panel/properties/property_button.lua
+++ b/example/components/properties_panel/properties/property_button.lua
@@ -1,6 +1,6 @@
 local component = require("druid.component")
 
----@class property_button: druid.base_component
+---@class property_button: druid.component
 ---@field root node
 ---@field text_name druid.lang_text
 ---@field button druid.button
diff --git a/example/components/properties_panel/properties/property_checkbox.lua b/example/components/properties_panel/properties/property_checkbox.lua
index c9b5386..52a1c55 100644
--- a/example/components/properties_panel/properties/property_checkbox.lua
+++ b/example/components/properties_panel/properties/property_checkbox.lua
@@ -1,6 +1,6 @@
 local component = require("druid.component")
 
----@class property_checkbox: druid.base_component
+---@class property_checkbox: druid.component
 ---@field druid druid.instance
 ---@field root druid.container
 ---@field text_name druid.lang_text
diff --git a/example/components/properties_panel/properties/property_slider.lua b/example/components/properties_panel/properties/property_slider.lua
index 577a3e8..fbe868c 100644
--- a/example/components/properties_panel/properties/property_slider.lua
+++ b/example/components/properties_panel/properties/property_slider.lua
@@ -1,6 +1,6 @@
 local component = require("druid.component")
 
----@class property_slider: druid.base_component
+---@class property_slider: druid.component
 ---@field druid druid.instance
 ---@field root druid.container
 ---@field text_name druid.lang_text
diff --git a/example/components/properties_panel/properties_panel.lua b/example/components/properties_panel/properties_panel.lua
index 7f91228..0664782 100644
--- a/example/components/properties_panel/properties_panel.lua
+++ b/example/components/properties_panel/properties_panel.lua
@@ -4,7 +4,7 @@ local property_checkbox = require("example.components.properties_panel.propertie
 local property_slider = require("example.components.properties_panel.properties.property_slider")
 local property_button = require("example.components.properties_panel.properties.property_button")
 
----@class properties_panel: druid.base_component
+---@class properties_panel: druid.component
 ---@field root druid.container
 ---@field text_no_properties druid.lang_text
 ---@field scroll druid.scroll
diff --git a/example/examples/basic/back_handler/basic_back_handler.lua b/example/examples/basic/back_handler/basic_back_handler.lua
index 77429b4..117e749 100644
--- a/example/examples/basic/back_handler/basic_back_handler.lua
+++ b/example/examples/basic/back_handler/basic_back_handler.lua
@@ -1,6 +1,6 @@
 local component = require("druid.component")
 
----@class basic_back_handler: druid.base_component
+---@class basic_back_handler: druid.component
 ---@field druid druid.instance
 local M = component.create("basic_back_handler")
 
diff --git a/example/examples/basic/blocker/basic_blocker.lua b/example/examples/basic/blocker/basic_blocker.lua
index afc1374..049476e 100644
--- a/example/examples/basic/blocker/basic_blocker.lua
+++ b/example/examples/basic/blocker/basic_blocker.lua
@@ -1,6 +1,6 @@
 local component = require("druid.component")
 
----@class basic_blocker: druid.base_component
+---@class basic_blocker: druid.component
 ---@field druid druid.instance
 ---@field root node
 ---@field blocker druid.blocker
diff --git a/example/examples/basic/button/basic_button.lua b/example/examples/basic/button/basic_button.lua
index 7898461..57aaa7f 100644
--- a/example/examples/basic/button/basic_button.lua
+++ b/example/examples/basic/button/basic_button.lua
@@ -1,6 +1,6 @@
 local component = require("druid.component")
 
----@class basic_button: druid.base_component
+---@class basic_button: druid.component
 ---@field druid druid.instance
 ---@field button druid.button
 local M = component.create("basic_button")
diff --git a/example/examples/basic/button/basic_button_double_click.lua b/example/examples/basic/button/basic_button_double_click.lua
index 9789824..b60c016 100644
--- a/example/examples/basic/button/basic_button_double_click.lua
+++ b/example/examples/basic/button/basic_button_double_click.lua
@@ -1,6 +1,6 @@
 local component = require("druid.component")
 
----@class basic_button_double_click: druid.base_component
+---@class basic_button_double_click: druid.component
 ---@field druid druid.instance
 ---@field button druid.button
 local M = component.create("basic_button_double_click")
diff --git a/example/examples/basic/button/basic_button_hold.lua b/example/examples/basic/button/basic_button_hold.lua
index 22cfe67..b0e69cf 100644
--- a/example/examples/basic/button/basic_button_hold.lua
+++ b/example/examples/basic/button/basic_button_hold.lua
@@ -3,7 +3,7 @@ local panthera = require("panthera.panthera")
 
 local animation = require("example.examples.basic.button.basic_button_hold_panthera")
 
----@class basic_button_hold: druid.base_component
+---@class basic_button_hold: druid.component
 ---@field druid druid.instance
 ---@field button druid.button
 local M = component.create("basic_button_hold")
diff --git a/example/examples/basic/checkbox/checkbox.lua b/example/examples/basic/checkbox/checkbox.lua
index 686763d..2c9065f 100644
--- a/example/examples/basic/checkbox/checkbox.lua
+++ b/example/examples/basic/checkbox/checkbox.lua
@@ -1,7 +1,7 @@
 local component = require("druid.component")
 local event = require("event.event")
 
----@class checkbox: druid.base_component
+---@class checkbox: druid.component
 ---@field druid druid.instance
 ---@field button druid.button
 local M = component.create("checkbox")
diff --git a/example/examples/basic/checkbox_group/checkbox_group.lua b/example/examples/basic/checkbox_group/checkbox_group.lua
index 56a998d..8577150 100644
--- a/example/examples/basic/checkbox_group/checkbox_group.lua
+++ b/example/examples/basic/checkbox_group/checkbox_group.lua
@@ -4,7 +4,7 @@ local component = require("druid.component")
 -- Require checkbox component from checkbox example
 local checkbox = require("example.examples.basic.checkbox.checkbox")
 
----@class checkbox_group: druid.base_component
+---@class checkbox_group: druid.component
 ---@field druid druid.instance
 ---@field button druid.button
 local M = component.create("checkbox_group")
diff --git a/example/examples/basic/drag/drag.lua b/example/examples/basic/drag/drag.lua
index 55ed0df..6646c3e 100644
--- a/example/examples/basic/drag/drag.lua
+++ b/example/examples/basic/drag/drag.lua
@@ -1,6 +1,6 @@
 local component = require("druid.component")
 
----@class drag: druid.base_component
+---@class drag: druid.component
 ---@field druid druid.instance
 local M = component.create("drag")
 
diff --git a/example/examples/basic/drag/drag_to_node.lua b/example/examples/basic/drag/drag_to_node.lua
index d7406c4..fd35f43 100644
--- a/example/examples/basic/drag/drag_to_node.lua
+++ b/example/examples/basic/drag/drag_to_node.lua
@@ -1,6 +1,6 @@
 local component = require("druid.component")
 
----@class drag_to_node: druid.base_component
+---@class drag_to_node: druid.component
 ---@field druid druid.instance
 local M = component.create("drag_to_node")
 
diff --git a/example/examples/basic/grid/grid.lua b/example/examples/basic/grid/grid.lua
index 08a46a7..a9840a8 100644
--- a/example/examples/basic/grid/grid.lua
+++ b/example/examples/basic/grid/grid.lua
@@ -1,6 +1,6 @@
 local component = require("druid.component")
 
----@class grid: druid.base_component
+---@class grid: druid.component
 ---@field grid druid.grid
 ---@field text druid.text
 ---@field druid druid.instance
diff --git a/example/examples/basic/hotkey/basic_hotkey.lua b/example/examples/basic/hotkey/basic_hotkey.lua
index c860c77..142cc33 100644
--- a/example/examples/basic/hotkey/basic_hotkey.lua
+++ b/example/examples/basic/hotkey/basic_hotkey.lua
@@ -1,6 +1,6 @@
 local component = require("druid.component")
 
----@class basic_hotkey: druid.base_component
+---@class basic_hotkey: druid.component
 ---@field druid druid.instance
 ---@field root node
 ---@field text druid.text
diff --git a/example/examples/basic/hover/hover.lua b/example/examples/basic/hover/hover.lua
index 7d79540..6961112 100644
--- a/example/examples/basic/hover/hover.lua
+++ b/example/examples/basic/hover/hover.lua
@@ -1,6 +1,6 @@
 local component = require("druid.component")
 
----@class hover: druid.base_component
+---@class hover: druid.component
 ---@field druid druid.instance
 ---@field hover druid.hover
 ---@field hover_pressed druid.hover
diff --git a/example/examples/basic/input/basic_input.lua b/example/examples/basic/input/basic_input.lua
index c17f6a3..e9afb7a 100644
--- a/example/examples/basic/input/basic_input.lua
+++ b/example/examples/basic/input/basic_input.lua
@@ -1,6 +1,6 @@
 local component = require("druid.component")
 
----@class basic_input: druid.base_component
+---@class basic_input: druid.component
 ---@field druid druid.instance
 ---@field input druid.input
 local M = component.create("basic_input")
diff --git a/example/examples/basic/input/input_password.lua b/example/examples/basic/input/input_password.lua
index f4c1b45..23877b2 100644
--- a/example/examples/basic/input/input_password.lua
+++ b/example/examples/basic/input/input_password.lua
@@ -1,6 +1,6 @@
 local component = require("druid.component")
 
----@class input_password: druid.base_component
+---@class input_password: druid.component
 ---@field druid druid.instance
 ---@field root node
 local M = component.create("input_password")
diff --git a/example/examples/basic/input/rich_input.lua b/example/examples/basic/input/rich_input.lua
index 95ad917..74fe39c 100644
--- a/example/examples/basic/input/rich_input.lua
+++ b/example/examples/basic/input/rich_input.lua
@@ -1,6 +1,6 @@
 local component = require("druid.component")
 
----@class rich_input: druid.base_component
+---@class rich_input: druid.component
 ---@field druid druid.instance
 ---@field rich_input druid.rich_input
 local M = component.create("rich_input")
diff --git a/example/examples/basic/progress_bar/basic_progress_bar.lua b/example/examples/basic/progress_bar/basic_progress_bar.lua
index 6fff660..c67d857 100644
--- a/example/examples/basic/progress_bar/basic_progress_bar.lua
+++ b/example/examples/basic/progress_bar/basic_progress_bar.lua
@@ -1,6 +1,6 @@
 local component = require("druid.component")
 
----@class basic_progress_bar: druid.base_component
+---@class basic_progress_bar: druid.component
 ---@field druid druid.instance
 ---@field progress druid.progress
 local M = component.create("basic_progress_bar")
diff --git a/example/examples/basic/progress_bar/basic_progress_bar_slice9.lua b/example/examples/basic/progress_bar/basic_progress_bar_slice9.lua
index ab7e14a..f44adf9 100644
--- a/example/examples/basic/progress_bar/basic_progress_bar_slice9.lua
+++ b/example/examples/basic/progress_bar/basic_progress_bar_slice9.lua
@@ -1,6 +1,6 @@
 local component = require("druid.component")
 
----@class basic_progress_bar_slice9: druid.base_component
+---@class basic_progress_bar_slice9: druid.component
 ---@field druid druid.instance
 ---@field progress druid.progress
 local M = component.create("basic_progress_bar_slice9")
diff --git a/example/examples/basic/radio_group/radio_group.lua b/example/examples/basic/radio_group/radio_group.lua
index dd245d2..cd61862 100644
--- a/example/examples/basic/radio_group/radio_group.lua
+++ b/example/examples/basic/radio_group/radio_group.lua
@@ -4,7 +4,7 @@ local event = require("event.event")
 -- Require checkbox component from checkbox example
 local checkbox = require("example.examples.basic.checkbox.checkbox")
 
----@class radio_group: druid.base_component
+---@class radio_group: druid.component
 ---@field druid druid.instance
 ---@field button druid.button
 local M = component.create("radio_group")
diff --git a/example/examples/basic/rich_text/basic_rich_text.lua b/example/examples/basic/rich_text/basic_rich_text.lua
index cfeee0a..96a3731 100644
--- a/example/examples/basic/rich_text/basic_rich_text.lua
+++ b/example/examples/basic/rich_text/basic_rich_text.lua
@@ -1,6 +1,6 @@
 local component = require("druid.component")
 
----@class basic_rich_text: druid.base_component
+---@class basic_rich_text: druid.component
 ---@field druid druid.instance
 ---@field rich_text druid.rich_text
 local M = component.create("basic_rich_text")
diff --git a/example/examples/basic/rich_text/rich_text_tags.lua b/example/examples/basic/rich_text/rich_text_tags.lua
index 722e4d8..8195c93 100644
--- a/example/examples/basic/rich_text/rich_text_tags.lua
+++ b/example/examples/basic/rich_text/rich_text_tags.lua
@@ -1,7 +1,7 @@
 local component = require("druid.component")
 local helper = require("druid.helper")
 
----@class rich_text_tags: druid.base_component
+---@class rich_text_tags: druid.component
 ---@field druid druid.instance
 ---@field rich_text druid.rich_text
 local M = component.create("rich_text_tags")
diff --git a/example/examples/basic/rich_text/rich_text_tags_custom.lua b/example/examples/basic/rich_text/rich_text_tags_custom.lua
index c5baf76..c347048 100644
--- a/example/examples/basic/rich_text/rich_text_tags_custom.lua
+++ b/example/examples/basic/rich_text/rich_text_tags_custom.lua
@@ -2,7 +2,7 @@ local component = require("druid.component")
 local helper = require("druid.helper")
 local event = require("event.event")
 
----@class rich_text_tags_custom: druid.base_component
+---@class rich_text_tags_custom: druid.component
 ---@field druid druid.instance
 ---@field rich_text druid.rich_text
 local M = component.create("rich_text_tags_custom")
diff --git a/example/examples/basic/scroll/scroll.lua b/example/examples/basic/scroll/scroll.lua
index 1217b8e..06492a8 100644
--- a/example/examples/basic/scroll/scroll.lua
+++ b/example/examples/basic/scroll/scroll.lua
@@ -1,6 +1,6 @@
 local component = require("druid.component")
 
----@class scroll: druid.base_component
+---@class scroll: druid.component
 ---@field root node
 ---@field scroll druid.scroll
 ---@field druid druid.instance
diff --git a/example/examples/basic/scroll_bind_grid/scroll_bind_grid.lua b/example/examples/basic/scroll_bind_grid/scroll_bind_grid.lua
index 378427b..6d26d05 100644
--- a/example/examples/basic/scroll_bind_grid/scroll_bind_grid.lua
+++ b/example/examples/basic/scroll_bind_grid/scroll_bind_grid.lua
@@ -1,6 +1,6 @@
 local component = require("druid.component")
 
----@class scroll_bind_grid: druid.base_component
+---@class scroll_bind_grid: druid.component
 ---@field scroll druid.scroll
 ---@field grid druid.grid
 ---@field text druid.text
diff --git a/example/examples/basic/scroll_bind_grid/scroll_bind_grid_horizontal.lua b/example/examples/basic/scroll_bind_grid/scroll_bind_grid_horizontal.lua
index 235e02a..d04e959 100644
--- a/example/examples/basic/scroll_bind_grid/scroll_bind_grid_horizontal.lua
+++ b/example/examples/basic/scroll_bind_grid/scroll_bind_grid_horizontal.lua
@@ -1,6 +1,6 @@
 local component = require("druid.component")
 
----@class scroll_bind_grid_horizontal: druid.base_component
+---@class scroll_bind_grid_horizontal: druid.component
 ---@field scroll druid.scroll
 ---@field grid druid.grid
 ---@field text druid.text
diff --git a/example/examples/basic/scroll_bind_grid/scroll_bind_grid_points.lua b/example/examples/basic/scroll_bind_grid/scroll_bind_grid_points.lua
index e299e65..506fb63 100644
--- a/example/examples/basic/scroll_bind_grid/scroll_bind_grid_points.lua
+++ b/example/examples/basic/scroll_bind_grid/scroll_bind_grid_points.lua
@@ -1,6 +1,6 @@
 local component = require("druid.component")
 
----@class scroll_bind_grid_points: druid.base_component
+---@class scroll_bind_grid_points: druid.component
 ---@field scroll druid.scroll
 ---@field grid druid.grid
 ---@field text druid.text
diff --git a/example/examples/basic/scroll_slider/scroll_slider.lua b/example/examples/basic/scroll_slider/scroll_slider.lua
index 8683294..02a6ebd 100644
--- a/example/examples/basic/scroll_slider/scroll_slider.lua
+++ b/example/examples/basic/scroll_slider/scroll_slider.lua
@@ -1,6 +1,6 @@
 local component = require("druid.component")
 
----@class scroll_slider: druid.base_component
+---@class scroll_slider: druid.component
 ---@field root node
 ---@field scroll druid.scroll
 ---@field slider druid.slider
diff --git a/example/examples/basic/slider/basic_slider.lua b/example/examples/basic/slider/basic_slider.lua
index ace6a88..665493c 100644
--- a/example/examples/basic/slider/basic_slider.lua
+++ b/example/examples/basic/slider/basic_slider.lua
@@ -1,6 +1,6 @@
 local component = require("druid.component")
 
----@class basic_slider: druid.base_component
+---@class basic_slider: druid.component
 ---@field druid druid.instance
 ---@field root node
 ---@field slider druid.slider
diff --git a/example/examples/basic/slider/basic_slider_stepped.lua b/example/examples/basic/slider/basic_slider_stepped.lua
index f19b9f7..525cfe9 100644
--- a/example/examples/basic/slider/basic_slider_stepped.lua
+++ b/example/examples/basic/slider/basic_slider_stepped.lua
@@ -1,6 +1,6 @@
 local component = require("druid.component")
 
----@class basic_slider_stepped: druid.base_component
+---@class basic_slider_stepped: druid.component
 ---@field druid druid.instance
 ---@field root node
 ---@field slider druid.slider
diff --git a/example/examples/basic/slider/basic_slider_vertical.lua b/example/examples/basic/slider/basic_slider_vertical.lua
index 782a931..f59409a 100644
--- a/example/examples/basic/slider/basic_slider_vertical.lua
+++ b/example/examples/basic/slider/basic_slider_vertical.lua
@@ -1,6 +1,6 @@
 local component = require("druid.component")
 
----@class basic_slider_vertical: druid.base_component
+---@class basic_slider_vertical: druid.component
 ---@field druid druid.instance
 ---@field root node
 ---@field slider druid.slider
diff --git a/example/examples/basic/swipe/basic_swipe.lua b/example/examples/basic/swipe/basic_swipe.lua
index 4ffe926..3f46354 100644
--- a/example/examples/basic/swipe/basic_swipe.lua
+++ b/example/examples/basic/swipe/basic_swipe.lua
@@ -1,6 +1,6 @@
 local component = require("druid.component")
 
----@class basic_swipe: druid.base_component
+---@class basic_swipe: druid.component
 ---@field druid druid.instance
 local M = component.create("basic_swipe")
 
diff --git a/example/examples/basic/text/basic_text.lua b/example/examples/basic/text/basic_text.lua
index 26b383e..43d6540 100644
--- a/example/examples/basic/text/basic_text.lua
+++ b/example/examples/basic/text/basic_text.lua
@@ -1,7 +1,7 @@
 local helper = require("druid.helper")
 local component = require("druid.component")
 
----@class basic_text: druid.base_component
+---@class basic_text: druid.component
 ---@field druid druid.instance
 ---@field text druid.text
 local M = component.create("basic_text")
diff --git a/example/examples/basic/text/multiline_text.lua b/example/examples/basic/text/multiline_text.lua
index 6838d3a..82b9502 100644
--- a/example/examples/basic/text/multiline_text.lua
+++ b/example/examples/basic/text/multiline_text.lua
@@ -1,7 +1,7 @@
 local helper = require("druid.helper")
 local component = require("druid.component")
 
----@class multiline_text: druid.base_component
+---@class multiline_text: druid.component
 ---@field root node
 ---@field druid druid.instance
 local M = component.create("multiline_text")
diff --git a/example/examples/basic/timer/basic_timer.lua b/example/examples/basic/timer/basic_timer.lua
index 3cfd6d7..3a425a7 100644
--- a/example/examples/basic/timer/basic_timer.lua
+++ b/example/examples/basic/timer/basic_timer.lua
@@ -2,7 +2,7 @@ local event = require("event.event")
 
 local component = require("druid.component")
 
----@class basic_timer: druid.base_component
+---@class basic_timer: druid.component
 ---@field druid druid.instance
 ---@field root node
 ---@field text druid.text
diff --git a/example/examples/data_list/add_remove_clear/data_list_add_remove_clear.lua b/example/examples/data_list/add_remove_clear/data_list_add_remove_clear.lua
index 16cff76..8e131a1 100644
--- a/example/examples/data_list/add_remove_clear/data_list_add_remove_clear.lua
+++ b/example/examples/data_list/add_remove_clear/data_list_add_remove_clear.lua
@@ -1,7 +1,7 @@
 local event = require("event.event")
 local component = require("druid.component")
 
----@class data_list_add_remove_clear: druid.base_component
+---@class data_list_add_remove_clear: druid.component
 ---@field druid druid.instance
 ---@field data_list druid.data_list
 local M = component.create("data_list_add_remove_clear")
@@ -31,7 +31,7 @@ end
 
 ---@param item_data table
 ---@param index number
----@return node, druid.base_component
+---@return node, druid.component
 function M:create_item_callback(item_data, index)
 	local nodes = gui.clone_tree(self.prefab)
 
diff --git a/example/examples/data_list/basic/data_list_basic.lua b/example/examples/data_list/basic/data_list_basic.lua
index 216544f..8afbe59 100644
--- a/example/examples/data_list/basic/data_list_basic.lua
+++ b/example/examples/data_list/basic/data_list_basic.lua
@@ -1,7 +1,7 @@
 local event = require("event.event")
 local component = require("druid.component")
 
----@class data_list_basic: druid.base_component
+---@class data_list_basic: druid.component
 ---@field druid druid.instance
 local M = component.create("data_list_basic")
 
@@ -30,7 +30,7 @@ end
 
 ---@param item_data table
 ---@param index number
----@return node, druid.base_component
+---@return node, druid.component
 function M:create_item_callback(item_data, index)
 	local nodes = gui.clone_tree(self.prefab)
 
diff --git a/example/examples/data_list/basic/data_list_horizontal_basic.lua b/example/examples/data_list/basic/data_list_horizontal_basic.lua
index 0809ea0..2b56959 100644
--- a/example/examples/data_list/basic/data_list_horizontal_basic.lua
+++ b/example/examples/data_list/basic/data_list_horizontal_basic.lua
@@ -1,6 +1,6 @@
 local component = require("druid.component")
 
----@class data_list_horizontal_basic: druid.base_component
+---@class data_list_horizontal_basic: druid.component
 ---@field druid druid.instance
 local M = component.create("data_list_horizontal_basic")
 
diff --git a/example/examples/data_list/cache_with_component/button_component.lua b/example/examples/data_list/cache_with_component/button_component.lua
index c84245c..3bdc43a 100644
--- a/example/examples/data_list/cache_with_component/button_component.lua
+++ b/example/examples/data_list/cache_with_component/button_component.lua
@@ -1,6 +1,6 @@
 local component = require("druid.component")
 
----@class button_component: druid.base_component
+---@class button_component: druid.component
 ---@field root node
 ---@field druid druid.instance
 ---@field text druid.text
diff --git a/example/examples/data_list/cache_with_component/cache_with_component.lua b/example/examples/data_list/cache_with_component/cache_with_component.lua
index b935d99..6298db0 100644
--- a/example/examples/data_list/cache_with_component/cache_with_component.lua
+++ b/example/examples/data_list/cache_with_component/cache_with_component.lua
@@ -3,7 +3,7 @@ local component = require("druid.component")
 
 local button_component = require("example.examples.data_list.cache_with_component.button_component")
 
----@class data_list_cache_with_component: druid.base_component
+---@class data_list_cache_with_component: druid.component
 ---@field druid druid.instance
 local M = component.create("data_list_cache_with_component")
 
@@ -35,7 +35,7 @@ end
 
 ---@param item_data table
 ---@param index number
----@return node, druid.base_component
+---@return node, druid.component
 function M:create_item_callback(item_data, index)
 	local nodes = gui.clone_tree(self.prefab)
 
diff --git a/example/examples/druid_examples.lua b/example/examples/druid_examples.lua
index 62ec6d2..e08cc62 100644
--- a/example/examples/druid_examples.lua
+++ b/example/examples/druid_examples.lua
@@ -18,11 +18,11 @@ local M = {}
 ---@field root string
 ---@field template string|nil
 ---@field code_url string|nil @URL to the source code
----@field component_class druid.base_component|nil
+---@field component_class druid.component|nil
 ---@field widget_class druid.widget|nil New way to create components
----@field on_create fun(instance: druid.base_component|druid.widget, output_list: output_list)|nil
----@field get_debug_info (fun(instance: druid.base_component):string)|nil
----@field properties_control (fun(instance: druid.base_component, properties_panel: properties_panel))|nil
+---@field on_create fun(instance: druid.component|druid.widget, output_list: output_list)|nil
+---@field get_debug_info (fun(instance: druid.component):string)|nil
+---@field properties_control (fun(instance: druid.component, properties_panel: properties_panel))|nil
 ---@field information_text_id string|nil
 
 
diff --git a/example/examples/gamepad/gamepad_tester/gamepad_tester.lua b/example/examples/gamepad/gamepad_tester/gamepad_tester.lua
index 9f4ac20..e4232e6 100644
--- a/example/examples/gamepad/gamepad_tester/gamepad_tester.lua
+++ b/example/examples/gamepad/gamepad_tester/gamepad_tester.lua
@@ -1,6 +1,6 @@
 local component = require("druid.component")
 
----@class gamepad_tester: druid.base_component
+---@class gamepad_tester: druid.component
 ---@field root node
 ---@field buttons druid.button
 ---@field buttons_system druid.button
diff --git a/example/examples/gamepad/on_screen_control/on_screen_control.lua b/example/examples/gamepad/on_screen_control/on_screen_control.lua
index a332cbb..96ef5ca 100644
--- a/example/examples/gamepad/on_screen_control/on_screen_control.lua
+++ b/example/examples/gamepad/on_screen_control/on_screen_control.lua
@@ -1,7 +1,7 @@
 local component = require("druid.component")
 local on_screen_input = require("example.examples.gamepad.on_screen_control.on_screen_input")
 
----@class on_screen_control: druid.base_component
+---@class on_screen_control: druid.component
 ---@field druid druid.instance
 ---@field on_screen_input on_screen_input
 local M = component.create("on_screen_control")
diff --git a/example/examples/gamepad/on_screen_control/on_screen_input.lua b/example/examples/gamepad/on_screen_control/on_screen_input.lua
index abee331..889a2f4 100644
--- a/example/examples/gamepad/on_screen_control/on_screen_input.lua
+++ b/example/examples/gamepad/on_screen_control/on_screen_input.lua
@@ -3,7 +3,7 @@ local event = require("event.event")
 local helper = require("druid.helper")
 local component = require("druid.component")
 
----@class on_screen_input: druid.base_component
+---@class on_screen_input: druid.component
 ---@field druid druid.instance
 ---@field on_action event @()
 ---@field on_movement event @(x: number, y: number, dt: number) X/Y values are in range -1..1
diff --git a/example/examples/intro/how_to_use_example/how_to_use_example.lua b/example/examples/intro/how_to_use_example/how_to_use_example.lua
index b797f98..24213e1 100644
--- a/example/examples/intro/how_to_use_example/how_to_use_example.lua
+++ b/example/examples/intro/how_to_use_example/how_to_use_example.lua
@@ -1,7 +1,7 @@
 local component = require("druid.component")
 local panthera = require("panthera.panthera")
 
----@class how_to_use_example: druid.base_component
+---@class how_to_use_example: druid.component
 ---@field root node
 local M = component.create("how_to_use_example")
 
diff --git a/example/examples/intro/intro/intro.lua b/example/examples/intro/intro/intro.lua
index 10ea849..26e27ad 100644
--- a/example/examples/intro/intro/intro.lua
+++ b/example/examples/intro/intro/intro.lua
@@ -2,7 +2,7 @@ local component = require("druid.component")
 local panthera = require("panthera.panthera")
 local intro_panthera = require("example.examples.intro.intro.intro_panthera")
 
----@class intro: druid.base_component
+---@class intro: druid.component
 ---@field root node
 local M = component.create("intro")
 
diff --git a/example/examples/layout/basic/basic_layout.lua b/example/examples/layout/basic/basic_layout.lua
index 12863a1..879f2d6 100644
--- a/example/examples/layout/basic/basic_layout.lua
+++ b/example/examples/layout/basic/basic_layout.lua
@@ -2,7 +2,7 @@ local helper = require("druid.helper")
 local component = require("druid.component")
 local layout = require("druid.extended.layout")
 
----@class basic_layout: druid.base_component
+---@class basic_layout: druid.component
 ---@field druid druid.instance
 ---@field root node
 local M = component.create("basic_layout")
diff --git a/example/examples/panthera/animation_blend/animation_blend.lua b/example/examples/panthera/animation_blend/animation_blend.lua
index 13378f2..6517498 100644
--- a/example/examples/panthera/animation_blend/animation_blend.lua
+++ b/example/examples/panthera/animation_blend/animation_blend.lua
@@ -5,7 +5,7 @@ local event = require("event.event")
 
 local character_animation_blend = require("example.examples.panthera.animation_blend.character_animation_blend")
 
----@class animation_blend: druid.base_component
+---@class animation_blend: druid.component
 ---@field root node
 ---@field druid druid.instance
 local M = component.create("animation_blend")
diff --git a/example/examples/panthera/basic_animation/basic_animation.lua b/example/examples/panthera/basic_animation/basic_animation.lua
index 4a92ad0..78ebed2 100644
--- a/example/examples/panthera/basic_animation/basic_animation.lua
+++ b/example/examples/panthera/basic_animation/basic_animation.lua
@@ -3,7 +3,7 @@ local component = require("druid.component")
 
 local basic_animation_panthera = require("example.examples.panthera.basic_animation.basic_animation_panthera")
 
----@class basic_animation: druid.base_component
+---@class basic_animation: druid.component
 ---@field druid druid.instance
 local M = component.create("basic_animation")
 
diff --git a/example/examples/widgets/hover_hint/hover_hint.lua b/example/examples/widgets/hover_hint/hover_hint.lua
index 06598fc..5b8aebd 100644
--- a/example/examples/widgets/hover_hint/hover_hint.lua
+++ b/example/examples/widgets/hover_hint/hover_hint.lua
@@ -2,7 +2,7 @@ local helper = require("druid.helper")
 local druid_const = require("druid.const")
 local component = require("druid.component")
 
----@class hover_hint: druid.base_component
+---@class hover_hint: druid.component
 ---@field druid druid.instance
 ---@field root node
 ---@field panel_hint node
diff --git a/example/examples/widgets/hover_hint/hover_hint_example.lua b/example/examples/widgets/hover_hint/hover_hint_example.lua
index 4169a3a..127924a 100644
--- a/example/examples/widgets/hover_hint/hover_hint_example.lua
+++ b/example/examples/widgets/hover_hint/hover_hint_example.lua
@@ -2,7 +2,7 @@ local hover_hint = require("example.examples.widgets.hover_hint.hover_hint")
 
 local component = require("druid.component")
 
----@class hover_hint_example: druid.base_component
+---@class hover_hint_example: druid.component
 ---@field druid druid.instance
 local M = component.create("hover_hint_example")
 
diff --git a/example/examples/windows/window_confirmation/window_confirmation.lua b/example/examples/windows/window_confirmation/window_confirmation.lua
index b7ffc58..b287dcc 100644
--- a/example/examples/windows/window_confirmation/window_confirmation.lua
+++ b/example/examples/windows/window_confirmation/window_confirmation.lua
@@ -3,7 +3,7 @@ local panthera = require("panthera.panthera")
 
 local window_animation_panthera = require("example.examples.windows.window_animation_panthera")
 
----@class window_confirmation: druid.base_component
+---@class window_confirmation: druid.component
 ---@field druid druid.instance
 ---@field text_header druid.lang_text
 ---@field text_button_accept druid.lang_text
diff --git a/example/examples/windows/window_info/window_info.lua b/example/examples/windows/window_info/window_info.lua
index 56a6fbb..a77c783 100644
--- a/example/examples/windows/window_info/window_info.lua
+++ b/example/examples/windows/window_info/window_info.lua
@@ -3,7 +3,7 @@ local panthera = require("panthera.panthera")
 
 local window_animation_panthera = require("example.examples.windows.window_animation_panthera")
 
----@class window_info: druid.base_component
+---@class window_info: druid.component
 ---@field text_header druid.lang_text
 ---@field text_button_accept druid.lang_text
 ---@field text_description druid.lang_text
diff --git a/example/examples/windows/window_language/window_language.lua b/example/examples/windows/window_language/window_language.lua
index 5912553..e166cb8 100644
--- a/example/examples/windows/window_language/window_language.lua
+++ b/example/examples/windows/window_language/window_language.lua
@@ -6,7 +6,7 @@ local panthera = require("panthera.panthera")
 
 local window_animation_panthera = require("example.examples.windows.window_animation_panthera")
 
----@class window_language: druid.base_component
+---@class window_language: druid.component
 ---@field text_header druid.text
 ---@field button_close druid.button
 ---@field druid druid.instance