diff --git a/druid/component.lua b/druid/component.lua
index 3c82000..d3b8ada 100644
--- a/druid/component.lua
+++ b/druid/component.lua
@@ -6,7 +6,7 @@ local helper = require("druid.helper")
 ---@field context table
 ---@field nodes table<hash, node>|nil
 ---@field style table|nil
----@field druid druid_instance
+---@field druid druid.instance
 ---@field input_enabled boolean
 ---@field children table
 ---@field parent druid.base_component|nil
@@ -20,7 +20,7 @@ local helper = require("druid.helper")
 ---@field _uid number
 
 ---@class druid.base_component
----@field druid druid_instance Druid instance to create inner components
+---@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
@@ -134,7 +134,7 @@ end
 ---Get Druid instance for inner component creation.
 ---@param template string|nil
 ---@param nodes table<hash, node>|nil
----@return druid_instance
+---@return druid.instance
 function M:get_druid(template, nodes)
 	local context = { _context = self }
 	local druid_instance = setmetatable(context, { __index = self._meta.druid })
@@ -239,7 +239,7 @@ end
 
 
 --- Setup component context and his style table
----@param druid_instance table The parent druid instance
+---@param druid_instance druid.instance The parent druid instance
 ---@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
diff --git a/druid/druid.lua b/druid/druid.lua
index dadb2f7..9489357 100644
--- a/druid/druid.lua
+++ b/druid/druid.lua
@@ -12,7 +12,7 @@ local M = {}
 ---Create a new Druid instance for creating GUI components.
 ---@param context table The Druid context. Usually, this is the self of the gui_script. It is passed into all Druid callbacks.
 ---@param style table|nil The Druid style table to override style parameters for this Druid instance.
----@return druid_instance druid_instance The new Druid instance
+---@return druid.instance druid_instance The new Druid instance
 function M.new(context, style)
 	if settings.default_style == nil then
 		M.set_default_style(default_style)
diff --git a/druid/extended/container.lua b/druid/extended/container.lua
index c9f07c9..f13decd 100644
--- a/druid/extended/container.lua
+++ b/druid/extended/container.lua
@@ -17,7 +17,7 @@ local event = require("event.event")
 
 ---@class druid.container: druid.base_component
 ---@field node node
----@field druid druid_instance
+---@field druid druid.instance
 ---@field node_offset vector4
 ---@field origin_size vector3
 ---@field size vector3
diff --git a/druid/system/druid_annotations.lua b/druid/system/druid_annotations.lua
index a08b449..0f6dc68 100644
--- a/druid/system/druid_annotations.lua
+++ b/druid/system/druid_annotations.lua
@@ -1,5 +1,5 @@
 ---@class druid.widget: druid.base_component
----@field druid druid_instance Ready to use druid instance
+---@field druid druid.instance Ready to use druid instance
 ---@field root node
 
 ---@class GUITextMetrics
diff --git a/druid/system/druid_instance.lua b/druid/system/druid_instance.lua
index 5478ed9..7c7c6c1 100755
--- a/druid/system/druid_instance.lua
+++ b/druid/system/druid_instance.lua
@@ -6,7 +6,7 @@ local helper = require("druid.helper")
 local settings = require("druid.system.settings")
 local base_component = require("druid.component")
 
----@class druid_instance
+---@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 url url
@@ -80,7 +80,7 @@ end
 local WIDGET_METATABLE = { __index = base_component }
 
 ---Create the Druid component instance
----@param self druid_instance
+---@param self druid.instance
 ---@param widget_class druid.base_component
 local function create_widget(self, widget_class)
 	local instance = setmetatable({}, {
@@ -124,7 +124,7 @@ end
 
 
 ---Before processing any input check if we need to update input stack
----@param self druid_instance
+---@param self druid.instance
 ---@param components table[]
 local function check_sort_input_stack(self, components)
 	if not components or #components == 0 then
@@ -421,7 +421,7 @@ end
 ---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
----@return druid_instance
+---@return druid.instance
 function M:set_whitelist(whitelist_components)
 	if whitelist_components and whitelist_components._component then
 		whitelist_components = { whitelist_components }
@@ -441,7 +441,7 @@ end
 ---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
----@return druid_instance
+---@return druid.instance
 function M:set_blacklist(blacklist_components)
 	if blacklist_components and blacklist_components._component then
 		blacklist_components = { blacklist_components }
diff --git a/druid/widget/properties_panel/properties/property_button.lua b/druid/widget/properties_panel/properties/property_button.lua
index eefa866..adfe914 100644
--- a/druid/widget/properties_panel/properties/property_button.lua
+++ b/druid/widget/properties_panel/properties/property_button.lua
@@ -6,7 +6,7 @@ local color = require("druid.color")
 ---@field text_name druid.text
 ---@field button druid.button
 ---@field text_button druid.text
----@field druid druid_instance
+---@field druid druid.instance
 local M = {}
 
 function M:init()
diff --git a/druid/widget/properties_panel/properties/property_checkbox.lua b/druid/widget/properties_panel/properties/property_checkbox.lua
index a0fc7ea..ae86097 100644
--- a/druid/widget/properties_panel/properties/property_checkbox.lua
+++ b/druid/widget/properties_panel/properties/property_checkbox.lua
@@ -2,7 +2,7 @@ local event = require("event.event")
 
 ---@class widget.property_checkbox: druid.widget
 ---@field root node
----@field druid druid_instance
+---@field druid druid.instance
 ---@field text_name druid.text
 ---@field button druid.button
 ---@field selected node
diff --git a/druid/widget/properties_panel/properties/property_input.lua b/druid/widget/properties_panel/properties/property_input.lua
index e09b1f0..0301ba8 100644
--- a/druid/widget/properties_panel/properties/property_input.lua
+++ b/druid/widget/properties_panel/properties/property_input.lua
@@ -3,7 +3,7 @@
 ---@field container druid.container
 ---@field text_name druid.text
 ---@field button druid.button
----@field druid druid_instance
+---@field druid druid.instance
 local M = {}
 
 function M:init()
diff --git a/druid/widget/properties_panel/properties/property_left_right_selector.lua b/druid/widget/properties_panel/properties/property_left_right_selector.lua
index 6cb79b5..fda5f01 100644
--- a/druid/widget/properties_panel/properties/property_left_right_selector.lua
+++ b/druid/widget/properties_panel/properties/property_left_right_selector.lua
@@ -2,7 +2,7 @@ local event = require("event.event")
 
 ---@class widget.property_left_right_selector: druid.widget
 ---@field root node
----@field druid druid_instance
+---@field druid druid.instance
 ---@field text_name druid.text
 ---@field button druid.button
 ---@field selected node
diff --git a/druid/widget/properties_panel/properties/property_slider.lua b/druid/widget/properties_panel/properties/property_slider.lua
index 844cb94..e31c9b9 100644
--- a/druid/widget/properties_panel/properties/property_slider.lua
+++ b/druid/widget/properties_panel/properties/property_slider.lua
@@ -4,7 +4,7 @@ local helper = require("druid.helper")
 ---@class widget.property_slider: druid.widget
 ---@field root node
 ---@field container druid.container
----@field druid druid_instance
+---@field druid druid.instance
 ---@field text_name druid.text
 ---@field text_value druid.text
 ---@field slider druid.slider
diff --git a/druid/widget/properties_panel/properties/property_vector3.lua b/druid/widget/properties_panel/properties/property_vector3.lua
index 56ccf9d..ed59fe2 100644
--- a/druid/widget/properties_panel/properties/property_vector3.lua
+++ b/druid/widget/properties_panel/properties/property_vector3.lua
@@ -6,7 +6,7 @@ local event = require("event.event")
 ---@field container druid.container
 ---@field text_name druid.text
 ---@field button druid.button
----@field druid druid_instance
+---@field druid druid.instance
 local M = {}
 
 function M:init()
diff --git a/example/components/druid_logo/druid_logo.lua b/example/components/druid_logo/druid_logo.lua
index c2eb7d2..e42d5bd 100644
--- a/example/components/druid_logo/druid_logo.lua
+++ b/example/components/druid_logo/druid_logo.lua
@@ -6,7 +6,7 @@ local druid_logo_panthera = require("example.components.druid_logo.druid_logo_pa
 ---@class druid_logo: druid.base_component
 ---@field root druid.container
 ---@field text_description druid.text
----@field druid druid_instance
+---@field druid druid.instance
 local DruidLogo = component.create("druid_logo")
 
 
diff --git a/example/components/example_scene/example_scene.lua b/example/components/example_scene/example_scene.lua
index 394ccc1..0d2ae21 100644
--- a/example/components/example_scene/example_scene.lua
+++ b/example/components/example_scene/example_scene.lua
@@ -4,7 +4,7 @@ local component = require("druid.component")
 ---@field root druid.container
 ---@field text_debug_info druid.text
 ---@field text_gui_path druid.text
----@field druid druid_instance
+---@field druid druid.instance
 local M = component.create("example_scene")
 
 
diff --git a/example/components/examples_list_view/examples_list_view.lua b/example/components/examples_list_view/examples_list_view.lua
index d5f98d2..8f3bad7 100644
--- a/example/components/examples_list_view/examples_list_view.lua
+++ b/example/components/examples_list_view/examples_list_view.lua
@@ -6,7 +6,7 @@ local examples_list_view_item = require("example.components.examples_list_view.e
 
 ---@class examples_list_view: druid.base_component
 ---@field root druid.container
----@field druid druid_instance
+---@field druid druid.instance
 ---@field scroll druid.scroll
 ---@field grid druid.grid
 local M = component.create("examples_list_view")
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 1b4edc1..5d9e98e 100644
--- a/example/components/examples_list_view/examples_list_view_item.lua
+++ b/example/components/examples_list_view/examples_list_view_item.lua
@@ -3,7 +3,7 @@ local component = require("druid.component")
 ---@class examples_list_view_item: druid.base_component
 ---@field root druid.container
 ---@field text druid.lang_text
----@field druid druid_instance
+---@field druid druid.instance
 ---@field on_click event
 local M = component.create("examples_list_view_item")
 
diff --git a/example/components/output_list/output_list.lua b/example/components/output_list/output_list.lua
index c7e0802..19c7262 100644
--- a/example/components/output_list/output_list.lua
+++ b/example/components/output_list/output_list.lua
@@ -4,7 +4,7 @@ local component = require("druid.component")
 ---@field root druid.container
 ---@field text_header druid.text
 ---@field scroll druid.scroll
----@field druid druid_instance
+---@field druid druid.instance
 local M = component.create("output_list")
 
 ---@param template string
diff --git a/example/components/panel_druid_profiler/panel_druid_profiler.lua b/example/components/panel_druid_profiler/panel_druid_profiler.lua
index 233e50b..3a17d99 100644
--- a/example/components/panel_druid_profiler/panel_druid_profiler.lua
+++ b/example/components/panel_druid_profiler/panel_druid_profiler.lua
@@ -5,7 +5,7 @@ local component = require("druid.component")
 
 ---@class panel_druid_profiler: druid.base_component
 ---@field root druid.container
----@field druid druid_instance
+---@field druid druid.instance
 local M = component.create("panel_druid_profiler")
 local FPS_SAMPLES = 60
 
diff --git a/example/components/panel_information/panel_information.lua b/example/components/panel_information/panel_information.lua
index cd799dd..ed8f12f 100644
--- a/example/components/panel_information/panel_information.lua
+++ b/example/components/panel_information/panel_information.lua
@@ -5,7 +5,7 @@ local component = require("druid.component")
 ---@field root druid.container
 ---@field text_header druid.lang_text
 ---@field rich_text druid.rich_text
----@field druid druid_instance
+---@field druid druid.instance
 local PanelInformation = component.create("panel_information")
 
 ---@param template string
diff --git a/example/components/properties_panel/properties/property_button.lua b/example/components/properties_panel/properties/property_button.lua
index 6dcc2ab..af01d9f 100644
--- a/example/components/properties_panel/properties/property_button.lua
+++ b/example/components/properties_panel/properties/property_button.lua
@@ -5,7 +5,7 @@ local component = require("druid.component")
 ---@field text_name druid.lang_text
 ---@field button druid.button
 ---@field text_button druid.text
----@field druid druid_instance
+---@field druid druid.instance
 local M = component.create("property_button")
 
 ---@param template string
diff --git a/example/components/properties_panel/properties/property_checkbox.lua b/example/components/properties_panel/properties/property_checkbox.lua
index d3e9ce8..c9b5386 100644
--- a/example/components/properties_panel/properties/property_checkbox.lua
+++ b/example/components/properties_panel/properties/property_checkbox.lua
@@ -1,7 +1,7 @@
 local component = require("druid.component")
 
 ---@class property_checkbox: druid.base_component
----@field druid druid_instance
+---@field druid druid.instance
 ---@field root druid.container
 ---@field text_name druid.lang_text
 ---@field button druid.button
diff --git a/example/components/properties_panel/properties/property_slider.lua b/example/components/properties_panel/properties/property_slider.lua
index 9784d24..577a3e8 100644
--- a/example/components/properties_panel/properties/property_slider.lua
+++ b/example/components/properties_panel/properties/property_slider.lua
@@ -1,7 +1,7 @@
 local component = require("druid.component")
 
 ---@class property_slider: druid.base_component
----@field druid druid_instance
+---@field druid druid.instance
 ---@field root druid.container
 ---@field text_name druid.lang_text
 ---@field text_value druid.text
diff --git a/example/components/properties_panel/properties_panel.lua b/example/components/properties_panel/properties_panel.lua
index 2d370d1..7f91228 100644
--- a/example/components/properties_panel/properties_panel.lua
+++ b/example/components/properties_panel/properties_panel.lua
@@ -8,7 +8,7 @@ local property_button = require("example.components.properties_panel.properties.
 ---@field root druid.container
 ---@field text_no_properties druid.lang_text
 ---@field scroll druid.scroll
----@field druid druid_instance
+---@field druid druid.instance
 local M = component.create("properties_panel")
 
 ---@param template string
diff --git a/example/examples/basic/back_handler/basic_back_handler.lua b/example/examples/basic/back_handler/basic_back_handler.lua
index 4b9ee3a..77429b4 100644
--- a/example/examples/basic/back_handler/basic_back_handler.lua
+++ b/example/examples/basic/back_handler/basic_back_handler.lua
@@ -1,7 +1,7 @@
 local component = require("druid.component")
 
 ---@class basic_back_handler: druid.base_component
----@field druid druid_instance
+---@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 57bcfc0..afc1374 100644
--- a/example/examples/basic/blocker/basic_blocker.lua
+++ b/example/examples/basic/blocker/basic_blocker.lua
@@ -1,7 +1,7 @@
 local component = require("druid.component")
 
 ---@class basic_blocker: druid.base_component
----@field druid druid_instance
+---@field druid druid.instance
 ---@field root node
 ---@field blocker druid.blocker
 local M = component.create("basic_blocker")
diff --git a/example/examples/basic/button/basic_button.lua b/example/examples/basic/button/basic_button.lua
index 79172d6..7898461 100644
--- a/example/examples/basic/button/basic_button.lua
+++ b/example/examples/basic/button/basic_button.lua
@@ -1,7 +1,7 @@
 local component = require("druid.component")
 
 ---@class basic_button: druid.base_component
----@field druid druid_instance
+---@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 1889fe5..9789824 100644
--- a/example/examples/basic/button/basic_button_double_click.lua
+++ b/example/examples/basic/button/basic_button_double_click.lua
@@ -1,7 +1,7 @@
 local component = require("druid.component")
 
 ---@class basic_button_double_click: druid.base_component
----@field druid druid_instance
+---@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 97d1a5b..22cfe67 100644
--- a/example/examples/basic/button/basic_button_hold.lua
+++ b/example/examples/basic/button/basic_button_hold.lua
@@ -4,7 +4,7 @@ local panthera = require("panthera.panthera")
 local animation = require("example.examples.basic.button.basic_button_hold_panthera")
 
 ---@class basic_button_hold: druid.base_component
----@field druid druid_instance
+---@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 cd27d26..686763d 100644
--- a/example/examples/basic/checkbox/checkbox.lua
+++ b/example/examples/basic/checkbox/checkbox.lua
@@ -2,7 +2,7 @@ local component = require("druid.component")
 local event = require("event.event")
 
 ---@class checkbox: druid.base_component
----@field druid druid_instance
+---@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 2ef54ce..56a998d 100644
--- a/example/examples/basic/checkbox_group/checkbox_group.lua
+++ b/example/examples/basic/checkbox_group/checkbox_group.lua
@@ -5,7 +5,7 @@ local component = require("druid.component")
 local checkbox = require("example.examples.basic.checkbox.checkbox")
 
 ---@class checkbox_group: druid.base_component
----@field druid druid_instance
+---@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 fa51ad4..55ed0df 100644
--- a/example/examples/basic/drag/drag.lua
+++ b/example/examples/basic/drag/drag.lua
@@ -1,7 +1,7 @@
 local component = require("druid.component")
 
 ---@class drag: druid.base_component
----@field druid druid_instance
+---@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 eb927f9..d7406c4 100644
--- a/example/examples/basic/drag/drag_to_node.lua
+++ b/example/examples/basic/drag/drag_to_node.lua
@@ -1,7 +1,7 @@
 local component = require("druid.component")
 
 ---@class drag_to_node: druid.base_component
----@field druid druid_instance
+---@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 db0bd16..08a46a7 100644
--- a/example/examples/basic/grid/grid.lua
+++ b/example/examples/basic/grid/grid.lua
@@ -3,7 +3,7 @@ local component = require("druid.component")
 ---@class grid: druid.base_component
 ---@field grid druid.grid
 ---@field text druid.text
----@field druid druid_instance
+---@field druid druid.instance
 local M = component.create("grid")
 
 
diff --git a/example/examples/basic/hotkey/basic_hotkey.lua b/example/examples/basic/hotkey/basic_hotkey.lua
index fec96aa..c860c77 100644
--- a/example/examples/basic/hotkey/basic_hotkey.lua
+++ b/example/examples/basic/hotkey/basic_hotkey.lua
@@ -1,7 +1,7 @@
 local component = require("druid.component")
 
 ---@class basic_hotkey: druid.base_component
----@field druid druid_instance
+---@field druid druid.instance
 ---@field root node
 ---@field text druid.text
 local M = component.create("basic_hotkey")
diff --git a/example/examples/basic/hover/hover.lua b/example/examples/basic/hover/hover.lua
index 3044b85..7d79540 100644
--- a/example/examples/basic/hover/hover.lua
+++ b/example/examples/basic/hover/hover.lua
@@ -1,7 +1,7 @@
 local component = require("druid.component")
 
 ---@class hover: druid.base_component
----@field druid druid_instance
+---@field druid druid.instance
 ---@field hover druid.hover
 ---@field hover_pressed druid.hover
 local M = component.create("hover")
diff --git a/example/examples/basic/input/basic_input.lua b/example/examples/basic/input/basic_input.lua
index 7be4813..c17f6a3 100644
--- a/example/examples/basic/input/basic_input.lua
+++ b/example/examples/basic/input/basic_input.lua
@@ -1,7 +1,7 @@
 local component = require("druid.component")
 
 ---@class basic_input: druid.base_component
----@field druid druid_instance
+---@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 014f1d7..f4c1b45 100644
--- a/example/examples/basic/input/input_password.lua
+++ b/example/examples/basic/input/input_password.lua
@@ -1,7 +1,7 @@
 local component = require("druid.component")
 
 ---@class input_password: druid.base_component
----@field druid druid_instance
+---@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 a7e04ab..95ad917 100644
--- a/example/examples/basic/input/rich_input.lua
+++ b/example/examples/basic/input/rich_input.lua
@@ -1,7 +1,7 @@
 local component = require("druid.component")
 
 ---@class rich_input: druid.base_component
----@field druid druid_instance
+---@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 fe85f93..6fff660 100644
--- a/example/examples/basic/progress_bar/basic_progress_bar.lua
+++ b/example/examples/basic/progress_bar/basic_progress_bar.lua
@@ -1,7 +1,7 @@
 local component = require("druid.component")
 
 ---@class basic_progress_bar: druid.base_component
----@field druid druid_instance
+---@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 2640001..ab7e14a 100644
--- a/example/examples/basic/progress_bar/basic_progress_bar_slice9.lua
+++ b/example/examples/basic/progress_bar/basic_progress_bar_slice9.lua
@@ -1,7 +1,7 @@
 local component = require("druid.component")
 
 ---@class basic_progress_bar_slice9: druid.base_component
----@field druid druid_instance
+---@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 b1ac9bb..dd245d2 100644
--- a/example/examples/basic/radio_group/radio_group.lua
+++ b/example/examples/basic/radio_group/radio_group.lua
@@ -5,7 +5,7 @@ local event = require("event.event")
 local checkbox = require("example.examples.basic.checkbox.checkbox")
 
 ---@class radio_group: druid.base_component
----@field druid druid_instance
+---@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 e61226b..cfeee0a 100644
--- a/example/examples/basic/rich_text/basic_rich_text.lua
+++ b/example/examples/basic/rich_text/basic_rich_text.lua
@@ -1,7 +1,7 @@
 local component = require("druid.component")
 
 ---@class basic_rich_text: druid.base_component
----@field druid druid_instance
+---@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 3e92a8f..722e4d8 100644
--- a/example/examples/basic/rich_text/rich_text_tags.lua
+++ b/example/examples/basic/rich_text/rich_text_tags.lua
@@ -2,7 +2,7 @@ local component = require("druid.component")
 local helper = require("druid.helper")
 
 ---@class rich_text_tags: druid.base_component
----@field druid druid_instance
+---@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 38adf14..c5baf76 100644
--- a/example/examples/basic/rich_text/rich_text_tags_custom.lua
+++ b/example/examples/basic/rich_text/rich_text_tags_custom.lua
@@ -3,7 +3,7 @@ local helper = require("druid.helper")
 local event = require("event.event")
 
 ---@class rich_text_tags_custom: druid.base_component
----@field druid druid_instance
+---@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 65efe8c..1217b8e 100644
--- a/example/examples/basic/scroll/scroll.lua
+++ b/example/examples/basic/scroll/scroll.lua
@@ -3,7 +3,7 @@ local component = require("druid.component")
 ---@class scroll: druid.base_component
 ---@field root node
 ---@field scroll druid.scroll
----@field druid druid_instance
+---@field druid druid.instance
 local M = component.create("scroll")
 
 ---@param template string
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 f026f74..378427b 100644
--- a/example/examples/basic/scroll_bind_grid/scroll_bind_grid.lua
+++ b/example/examples/basic/scroll_bind_grid/scroll_bind_grid.lua
@@ -4,7 +4,7 @@ local component = require("druid.component")
 ---@field scroll druid.scroll
 ---@field grid druid.grid
 ---@field text druid.text
----@field druid druid_instance
+---@field druid druid.instance
 local M = component.create("scroll_bind_grid")
 
 
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 7e26681..235e02a 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
@@ -4,7 +4,7 @@ local component = require("druid.component")
 ---@field scroll druid.scroll
 ---@field grid druid.grid
 ---@field text druid.text
----@field druid druid_instance
+---@field druid druid.instance
 local M = component.create("scroll_bind_grid_horizontal")
 
 
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 91f185a..e299e65 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
@@ -4,7 +4,7 @@ local component = require("druid.component")
 ---@field scroll druid.scroll
 ---@field grid druid.grid
 ---@field text druid.text
----@field druid druid_instance
+---@field druid druid.instance
 local M = component.create("scroll_bind_grid_points")
 
 
diff --git a/example/examples/basic/scroll_slider/scroll_slider.lua b/example/examples/basic/scroll_slider/scroll_slider.lua
index 0627f82..8683294 100644
--- a/example/examples/basic/scroll_slider/scroll_slider.lua
+++ b/example/examples/basic/scroll_slider/scroll_slider.lua
@@ -4,7 +4,7 @@ local component = require("druid.component")
 ---@field root node
 ---@field scroll druid.scroll
 ---@field slider druid.slider
----@field druid druid_instance
+---@field druid druid.instance
 local M = component.create("scroll_slider")
 
 ---@param template string
diff --git a/example/examples/basic/slider/basic_slider.lua b/example/examples/basic/slider/basic_slider.lua
index 73fe031..ace6a88 100644
--- a/example/examples/basic/slider/basic_slider.lua
+++ b/example/examples/basic/slider/basic_slider.lua
@@ -1,7 +1,7 @@
 local component = require("druid.component")
 
 ---@class basic_slider: druid.base_component
----@field druid druid_instance
+---@field druid druid.instance
 ---@field root node
 ---@field slider druid.slider
 local M = component.create("basic_slider")
diff --git a/example/examples/basic/slider/basic_slider_stepped.lua b/example/examples/basic/slider/basic_slider_stepped.lua
index 8a22642..f19b9f7 100644
--- a/example/examples/basic/slider/basic_slider_stepped.lua
+++ b/example/examples/basic/slider/basic_slider_stepped.lua
@@ -1,7 +1,7 @@
 local component = require("druid.component")
 
 ---@class basic_slider_stepped: druid.base_component
----@field druid druid_instance
+---@field druid druid.instance
 ---@field root node
 ---@field slider druid.slider
 local M = component.create("basic_slider_stepped")
diff --git a/example/examples/basic/slider/basic_slider_vertical.lua b/example/examples/basic/slider/basic_slider_vertical.lua
index bbeb019..782a931 100644
--- a/example/examples/basic/slider/basic_slider_vertical.lua
+++ b/example/examples/basic/slider/basic_slider_vertical.lua
@@ -1,7 +1,7 @@
 local component = require("druid.component")
 
 ---@class basic_slider_vertical: druid.base_component
----@field druid druid_instance
+---@field druid druid.instance
 ---@field root node
 ---@field slider druid.slider
 local M = component.create("basic_slider_vertical")
diff --git a/example/examples/basic/swipe/basic_swipe.lua b/example/examples/basic/swipe/basic_swipe.lua
index ca56596..4ffe926 100644
--- a/example/examples/basic/swipe/basic_swipe.lua
+++ b/example/examples/basic/swipe/basic_swipe.lua
@@ -1,7 +1,7 @@
 local component = require("druid.component")
 
 ---@class basic_swipe: druid.base_component
----@field druid druid_instance
+---@field druid druid.instance
 local M = component.create("basic_swipe")
 
 ---@param template string
diff --git a/example/examples/basic/text/basic_text.lua b/example/examples/basic/text/basic_text.lua
index dca1682..26b383e 100644
--- a/example/examples/basic/text/basic_text.lua
+++ b/example/examples/basic/text/basic_text.lua
@@ -2,7 +2,7 @@ local helper = require("druid.helper")
 local component = require("druid.component")
 
 ---@class basic_text: druid.base_component
----@field druid druid_instance
+---@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 d50de10..6838d3a 100644
--- a/example/examples/basic/text/multiline_text.lua
+++ b/example/examples/basic/text/multiline_text.lua
@@ -3,7 +3,7 @@ local component = require("druid.component")
 
 ---@class multiline_text: druid.base_component
 ---@field root node
----@field druid druid_instance
+---@field druid druid.instance
 local M = component.create("multiline_text")
 
 ---@param template string
diff --git a/example/examples/basic/timer/basic_timer.lua b/example/examples/basic/timer/basic_timer.lua
index 1687628..3cfd6d7 100644
--- a/example/examples/basic/timer/basic_timer.lua
+++ b/example/examples/basic/timer/basic_timer.lua
@@ -3,7 +3,7 @@ local event = require("event.event")
 local component = require("druid.component")
 
 ---@class basic_timer: druid.base_component
----@field druid druid_instance
+---@field druid druid.instance
 ---@field root node
 ---@field text druid.text
 local M = component.create("basic_timer")
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 b4ab3f6..16cff76 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
@@ -2,7 +2,7 @@ local event = require("event.event")
 local component = require("druid.component")
 
 ---@class data_list_add_remove_clear: druid.base_component
----@field druid druid_instance
+---@field druid druid.instance
 ---@field data_list druid.data_list
 local M = component.create("data_list_add_remove_clear")
 
diff --git a/example/examples/data_list/basic/data_list_basic.lua b/example/examples/data_list/basic/data_list_basic.lua
index f950b73..216544f 100644
--- a/example/examples/data_list/basic/data_list_basic.lua
+++ b/example/examples/data_list/basic/data_list_basic.lua
@@ -2,7 +2,7 @@ local event = require("event.event")
 local component = require("druid.component")
 
 ---@class data_list_basic: druid.base_component
----@field druid druid_instance
+---@field druid druid.instance
 local M = component.create("data_list_basic")
 
 
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 262bea1..0809ea0 100644
--- a/example/examples/data_list/basic/data_list_horizontal_basic.lua
+++ b/example/examples/data_list/basic/data_list_horizontal_basic.lua
@@ -1,7 +1,7 @@
 local component = require("druid.component")
 
 ---@class data_list_horizontal_basic: druid.base_component
----@field druid druid_instance
+---@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 4719caf..c84245c 100644
--- a/example/examples/data_list/cache_with_component/button_component.lua
+++ b/example/examples/data_list/cache_with_component/button_component.lua
@@ -2,7 +2,7 @@ local component = require("druid.component")
 
 ---@class button_component: druid.base_component
 ---@field root node
----@field druid druid_instance
+---@field druid druid.instance
 ---@field text druid.text
 ---@field data any
 local M = component.create("button_component")
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 1c2a0ac..b935d99 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
@@ -4,7 +4,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
----@field druid druid_instance
+---@field druid druid.instance
 local M = component.create("data_list_cache_with_component")
 
 
diff --git a/example/examples/gamepad/gamepad_tester/gamepad_tester.lua b/example/examples/gamepad/gamepad_tester/gamepad_tester.lua
index 4b807d4..9f4ac20 100644
--- a/example/examples/gamepad/gamepad_tester/gamepad_tester.lua
+++ b/example/examples/gamepad/gamepad_tester/gamepad_tester.lua
@@ -6,7 +6,7 @@ local component = require("druid.component")
 ---@field buttons_system druid.button
 ---@field button_left_bump druid.button
 ---@field button_right_bump druid.button
----@field druid druid_instance
+---@field druid druid.instance
 local M = component.create("gamepad_tester")
 
 local STICK_DISTANCE = 50
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 321c78f..a332cbb 100644
--- a/example/examples/gamepad/on_screen_control/on_screen_control.lua
+++ b/example/examples/gamepad/on_screen_control/on_screen_control.lua
@@ -2,7 +2,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
----@field druid druid_instance
+---@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 bb927a0..abee331 100644
--- a/example/examples/gamepad/on_screen_control/on_screen_input.lua
+++ b/example/examples/gamepad/on_screen_control/on_screen_input.lua
@@ -4,7 +4,7 @@ local helper = require("druid.helper")
 local component = require("druid.component")
 
 ---@class on_screen_input: druid.base_component
----@field druid druid_instance
+---@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
 ---@field on_movement_stop event @()
diff --git a/example/examples/layout/basic/basic_layout.lua b/example/examples/layout/basic/basic_layout.lua
index f6805e1..12863a1 100644
--- a/example/examples/layout/basic/basic_layout.lua
+++ b/example/examples/layout/basic/basic_layout.lua
@@ -3,7 +3,7 @@ local component = require("druid.component")
 local layout = require("druid.extended.layout")
 
 ---@class basic_layout: druid.base_component
----@field druid druid_instance
+---@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 2192db2..13378f2 100644
--- a/example/examples/panthera/animation_blend/animation_blend.lua
+++ b/example/examples/panthera/animation_blend/animation_blend.lua
@@ -7,7 +7,7 @@ local character_animation_blend = require("example.examples.panthera.animation_b
 
 ---@class animation_blend: druid.base_component
 ---@field root node
----@field druid druid_instance
+---@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 b179207..4a92ad0 100644
--- a/example/examples/panthera/basic_animation/basic_animation.lua
+++ b/example/examples/panthera/basic_animation/basic_animation.lua
@@ -4,7 +4,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
----@field druid druid_instance
+---@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 2cf4537..06598fc 100644
--- a/example/examples/widgets/hover_hint/hover_hint.lua
+++ b/example/examples/widgets/hover_hint/hover_hint.lua
@@ -3,7 +3,7 @@ local druid_const = require("druid.const")
 local component = require("druid.component")
 
 ---@class hover_hint: druid.base_component
----@field druid druid_instance
+---@field druid druid.instance
 ---@field root node
 ---@field panel_hint node
 ---@field text_hint druid.text
diff --git a/example/examples/widgets/hover_hint/hover_hint_example.lua b/example/examples/widgets/hover_hint/hover_hint_example.lua
index 28cf278..4169a3a 100644
--- a/example/examples/widgets/hover_hint/hover_hint_example.lua
+++ b/example/examples/widgets/hover_hint/hover_hint_example.lua
@@ -3,7 +3,7 @@ local hover_hint = require("example.examples.widgets.hover_hint.hover_hint")
 local component = require("druid.component")
 
 ---@class hover_hint_example: druid.base_component
----@field druid druid_instance
+---@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 f91b7a5..b7ffc58 100644
--- a/example/examples/windows/window_confirmation/window_confirmation.lua
+++ b/example/examples/windows/window_confirmation/window_confirmation.lua
@@ -4,7 +4,7 @@ local panthera = require("panthera.panthera")
 local window_animation_panthera = require("example.examples.windows.window_animation_panthera")
 
 ---@class window_confirmation: druid.base_component
----@field druid druid_instance
+---@field druid druid.instance
 ---@field text_header druid.lang_text
 ---@field text_button_accept druid.lang_text
 ---@field text_button_decline druid.lang_text
diff --git a/example/examples/windows/window_info/window_info.lua b/example/examples/windows/window_info/window_info.lua
index 3385176..56a6fbb 100644
--- a/example/examples/windows/window_info/window_info.lua
+++ b/example/examples/windows/window_info/window_info.lua
@@ -8,7 +8,7 @@ local window_animation_panthera = require("example.examples.windows.window_anima
 ---@field text_button_accept druid.lang_text
 ---@field text_description druid.lang_text
 ---@field button_close druid.button
----@field druid druid_instance
+---@field druid druid.instance
 local M = component.create("window_info")
 
 
diff --git a/example/examples/windows/window_language/window_language.lua b/example/examples/windows/window_language/window_language.lua
index 25c9bf4..5912553 100644
--- a/example/examples/windows/window_language/window_language.lua
+++ b/example/examples/windows/window_language/window_language.lua
@@ -9,7 +9,7 @@ local window_animation_panthera = require("example.examples.windows.window_anima
 ---@class window_language: druid.base_component
 ---@field text_header druid.text
 ---@field button_close druid.button
----@field druid druid_instance
+---@field druid druid.instance
 ---@field lang_buttons table<string, druid.button>
 ---@field grid druid.grid
 ---@field on_language_change event