diff --git a/drust/src/main.rs b/drust/src/main.rs
index 408e2e03..3dd60f73 100644
--- a/drust/src/main.rs
+++ b/drust/src/main.rs
@@ -1,6 +1,6 @@
 use pagetop::prelude::*;
 
-pub_handle!(APP_DRUST);
+define_handle!(APP_DRUST);
 
 struct Drust;
 
diff --git a/pagetop-admin/src/lib.rs b/pagetop-admin/src/lib.rs
index fbd906cc..1a7471ee 100644
--- a/pagetop-admin/src/lib.rs
+++ b/pagetop-admin/src/lib.rs
@@ -1,6 +1,6 @@
 use pagetop::prelude::*;
 
-pub_handle!(MODULE_ADMIN);
+define_handle!(MODULE_ADMIN);
 
 pub_locale!("src/locales");
 
diff --git a/pagetop-aliner/src/lib.rs b/pagetop-aliner/src/lib.rs
index c4fe9935..2b807254 100644
--- a/pagetop-aliner/src/lib.rs
+++ b/pagetop-aliner/src/lib.rs
@@ -1,6 +1,6 @@
 use pagetop::prelude::*;
 
-pub_handle!(THEME_ALINER);
+define_handle!(THEME_ALINER);
 
 include!(concat!(env!("OUT_DIR"), "/aliner.rs"));
 
diff --git a/pagetop-bootsier/src/lib.rs b/pagetop-bootsier/src/lib.rs
index 8edc582e..87eed0d6 100644
--- a/pagetop-bootsier/src/lib.rs
+++ b/pagetop-bootsier/src/lib.rs
@@ -1,6 +1,6 @@
 use pagetop::prelude::*;
 
-pub_handle!(THEME_BOOTSIER);
+define_handle!(THEME_BOOTSIER);
 
 pub_locale!("src/locales");
 
diff --git a/pagetop-bulmix/src/lib.rs b/pagetop-bulmix/src/lib.rs
index 5dbd14b7..ae12db5a 100644
--- a/pagetop-bulmix/src/lib.rs
+++ b/pagetop-bulmix/src/lib.rs
@@ -1,7 +1,7 @@
 use pagetop::prelude::*;
 use pagetop_minimal::component::*;
 
-pub_handle!(THEME_BULMIX);
+define_handle!(THEME_BULMIX);
 
 include!(concat!(env!("OUT_DIR"), "/bulmix.rs"));
 
diff --git a/pagetop-homedemo/src/lib.rs b/pagetop-homedemo/src/lib.rs
index 24f9093f..cba742d8 100644
--- a/pagetop-homedemo/src/lib.rs
+++ b/pagetop-homedemo/src/lib.rs
@@ -1,7 +1,7 @@
 use pagetop::prelude::*;
 use pagetop_minimal::component::*;
 
-pub_handle!(MODULE_DEMOHOME);
+define_handle!(MODULE_DEMOHOME);
 
 pub_locale!("src/locales");
 
diff --git a/pagetop-jquery/src/lib.rs b/pagetop-jquery/src/lib.rs
index 63322f49..5632b181 100644
--- a/pagetop-jquery/src/lib.rs
+++ b/pagetop-jquery/src/lib.rs
@@ -1,6 +1,6 @@
 use pagetop::prelude::*;
 
-pub_handle!(MODULE_JQUERY);
+define_handle!(MODULE_JQUERY);
 
 include!(concat!(env!("OUT_DIR"), "/jquery.rs"));
 
diff --git a/pagetop-megamenu/src/component.rs b/pagetop-megamenu/src/component.rs
index 96bc7f76..29177da2 100644
--- a/pagetop-megamenu/src/component.rs
+++ b/pagetop-megamenu/src/component.rs
@@ -1,6 +1,6 @@
 use pagetop::prelude::*;
 
-pub_handle!(COMPONENT_MEGAMENUITEM);
+define_handle!(COMPONENT_MEGAMENUITEM);
 
 #[derive(Default)]
 pub enum MegaMenuItemType {
@@ -148,7 +148,7 @@ impl MegaMenuItem {
 
 // MegaMenu.
 
-pub_handle!(COMPONENT_MEGAMENU);
+define_handle!(COMPONENT_MEGAMENU);
 
 hook_before_render_component!(HOOK_BEFORE_RENDER_MENU, MegaMenu);
 
diff --git a/pagetop-megamenu/src/lib.rs b/pagetop-megamenu/src/lib.rs
index 747c124c..c177d677 100644
--- a/pagetop-megamenu/src/lib.rs
+++ b/pagetop-megamenu/src/lib.rs
@@ -2,7 +2,7 @@ use pagetop::prelude::*;
 
 pub mod component;
 
-pub_handle!(MODULE_MEGAMENU);
+define_handle!(MODULE_MEGAMENU);
 
 include!(concat!(env!("OUT_DIR"), "/megamenu.rs"));
 
diff --git a/pagetop-minimal/src/component/anchor.rs b/pagetop-minimal/src/component/anchor.rs
index b2a59b5c..4e2381f9 100644
--- a/pagetop-minimal/src/component/anchor.rs
+++ b/pagetop-minimal/src/component/anchor.rs
@@ -2,7 +2,7 @@ use pagetop::prelude::*;
 
 use crate::component::Icon;
 
-pub_handle!(COMPONENT_ANCHOR);
+define_handle!(COMPONENT_ANCHOR);
 
 #[derive(Default)]
 pub enum AnchorType {
diff --git a/pagetop-minimal/src/component/block.rs b/pagetop-minimal/src/component/block.rs
index 8a18c613..18c92da3 100644
--- a/pagetop-minimal/src/component/block.rs
+++ b/pagetop-minimal/src/component/block.rs
@@ -1,6 +1,6 @@
 use pagetop::prelude::*;
 
-pub_handle!(COMPONENT_BLOCK);
+define_handle!(COMPONENT_BLOCK);
 
 hook_before_render_component!(HOOK_BEFORE_RENDER_BLOCK, Block);
 
diff --git a/pagetop-minimal/src/component/container.rs b/pagetop-minimal/src/component/container.rs
index 2fdac21a..20ffbe7d 100644
--- a/pagetop-minimal/src/component/container.rs
+++ b/pagetop-minimal/src/component/container.rs
@@ -1,6 +1,6 @@
 use pagetop::prelude::*;
 
-pub_handle!(COMPONENT_CONTAINER);
+define_handle!(COMPONENT_CONTAINER);
 
 hook_before_render_component!(HOOK_BEFORE_RENDER_CONTAINER, Container);
 
diff --git a/pagetop-minimal/src/component/form_element/button.rs b/pagetop-minimal/src/component/form_element/button.rs
index 50c977c3..ebf8c04b 100644
--- a/pagetop-minimal/src/component/form_element/button.rs
+++ b/pagetop-minimal/src/component/form_element/button.rs
@@ -1,6 +1,6 @@
 use pagetop::prelude::*;
 
-pub_handle!(COMPONENT_BUTTON);
+define_handle!(COMPONENT_BUTTON);
 
 #[derive(Default)]
 pub enum ButtonType {
diff --git a/pagetop-minimal/src/component/form_element/date.rs b/pagetop-minimal/src/component/form_element/date.rs
index b742f56d..5b1d0751 100644
--- a/pagetop-minimal/src/component/form_element/date.rs
+++ b/pagetop-minimal/src/component/form_element/date.rs
@@ -1,6 +1,6 @@
 use pagetop::prelude::*;
 
-pub_handle!(COMPONENT_DATE);
+define_handle!(COMPONENT_DATE);
 
 #[rustfmt::skip]
 #[derive(Default)]
diff --git a/pagetop-minimal/src/component/form_element/form.rs b/pagetop-minimal/src/component/form_element/form.rs
index dd9ef100..713f5a50 100644
--- a/pagetop-minimal/src/component/form_element/form.rs
+++ b/pagetop-minimal/src/component/form_element/form.rs
@@ -1,6 +1,6 @@
 use pagetop::prelude::*;
 
-pub_handle!(COMPONENT_FORM);
+define_handle!(COMPONENT_FORM);
 
 hook_before_render_component!(HOOK_BEFORE_RENDER_FORM, Form);
 
diff --git a/pagetop-minimal/src/component/form_element/hidden.rs b/pagetop-minimal/src/component/form_element/hidden.rs
index 14e4613c..f84ff07f 100644
--- a/pagetop-minimal/src/component/form_element/hidden.rs
+++ b/pagetop-minimal/src/component/form_element/hidden.rs
@@ -1,6 +1,6 @@
 use pagetop::prelude::*;
 
-pub_handle!(COMPONENT_HIDDEN);
+define_handle!(COMPONENT_HIDDEN);
 
 #[rustfmt::skip]
 #[derive(Default)]
diff --git a/pagetop-minimal/src/component/form_element/input.rs b/pagetop-minimal/src/component/form_element/input.rs
index 7391754b..6080313e 100644
--- a/pagetop-minimal/src/component/form_element/input.rs
+++ b/pagetop-minimal/src/component/form_element/input.rs
@@ -1,6 +1,6 @@
 use pagetop::prelude::*;
 
-pub_handle!(COMPONENT_INPUT);
+define_handle!(COMPONENT_INPUT);
 
 #[derive(Default)]
 pub enum InputType {
diff --git a/pagetop-minimal/src/component/grid/column.rs b/pagetop-minimal/src/component/grid/column.rs
index d27ac2c5..d3f35820 100644
--- a/pagetop-minimal/src/component/grid/column.rs
+++ b/pagetop-minimal/src/component/grid/column.rs
@@ -1,6 +1,6 @@
 use pagetop::prelude::*;
 
-pub_handle!(COMPONENT_COLUMN);
+define_handle!(COMPONENT_COLUMN);
 
 hook_before_render_component!(HOOK_BEFORE_RENDER_COLUMN, Column);
 
diff --git a/pagetop-minimal/src/component/grid/row.rs b/pagetop-minimal/src/component/grid/row.rs
index 24d946cf..4707fb83 100644
--- a/pagetop-minimal/src/component/grid/row.rs
+++ b/pagetop-minimal/src/component/grid/row.rs
@@ -2,7 +2,7 @@ use pagetop::prelude::*;
 
 use crate::component::grid;
 
-pub_handle!(COMPONENT_ROW);
+define_handle!(COMPONENT_ROW);
 
 hook_before_render_component!(HOOK_BEFORE_RENDER_ROW, Row);
 
diff --git a/pagetop-minimal/src/component/heading.rs b/pagetop-minimal/src/component/heading.rs
index 5d138d48..5264ac05 100644
--- a/pagetop-minimal/src/component/heading.rs
+++ b/pagetop-minimal/src/component/heading.rs
@@ -1,6 +1,6 @@
 use pagetop::prelude::*;
 
-pub_handle!(COMPONENT_HEADING);
+define_handle!(COMPONENT_HEADING);
 
 #[derive(Default)]
 pub enum HeadingType {
diff --git a/pagetop-minimal/src/component/html.rs b/pagetop-minimal/src/component/html.rs
index 468340ad..98d55182 100644
--- a/pagetop-minimal/src/component/html.rs
+++ b/pagetop-minimal/src/component/html.rs
@@ -1,6 +1,6 @@
 use pagetop::prelude::*;
 
-pub_handle!(COMPONENT_HTML);
+define_handle!(COMPONENT_HTML);
 
 #[rustfmt::skip]
 #[derive(Default)]
diff --git a/pagetop-minimal/src/component/icon.rs b/pagetop-minimal/src/component/icon.rs
index f5553bde..730cbcac 100644
--- a/pagetop-minimal/src/component/icon.rs
+++ b/pagetop-minimal/src/component/icon.rs
@@ -1,6 +1,6 @@
 use pagetop::prelude::*;
 
-pub_handle!(COMPONENT_ICON);
+define_handle!(COMPONENT_ICON);
 
 #[rustfmt::skip]
 #[derive(Default)]
diff --git a/pagetop-minimal/src/component/image.rs b/pagetop-minimal/src/component/image.rs
index fd15654e..2c87e0e8 100644
--- a/pagetop-minimal/src/component/image.rs
+++ b/pagetop-minimal/src/component/image.rs
@@ -1,6 +1,6 @@
 use pagetop::prelude::*;
 
-pub_handle!(COMPONENT_IMAGE);
+define_handle!(COMPONENT_IMAGE);
 
 #[rustfmt::skip]
 #[derive(Default)]
diff --git a/pagetop-minimal/src/component/paragraph.rs b/pagetop-minimal/src/component/paragraph.rs
index ef55df0c..89ea8f23 100644
--- a/pagetop-minimal/src/component/paragraph.rs
+++ b/pagetop-minimal/src/component/paragraph.rs
@@ -2,7 +2,7 @@ use pagetop::prelude::*;
 
 use crate::component::Html;
 
-pub_handle!(COMPONENT_PARAGRAPH);
+define_handle!(COMPONENT_PARAGRAPH);
 
 #[derive(Default)]
 pub enum ParagraphDisplay {
diff --git a/pagetop-minimal/src/lib.rs b/pagetop-minimal/src/lib.rs
index 690f0faf..fb5667f2 100644
--- a/pagetop-minimal/src/lib.rs
+++ b/pagetop-minimal/src/lib.rs
@@ -3,7 +3,7 @@ use pagetop::prelude::*;
 pub mod component;
 pub mod module;
 
-pub_handle!(MODULE_MINIMAL);
+define_handle!(MODULE_MINIMAL);
 
 include!(concat!(env!("OUT_DIR"), "/minimal.rs"));
 
diff --git a/pagetop-minimal/src/module/menu.rs b/pagetop-minimal/src/module/menu.rs
index 64d568e9..e54f89e2 100644
--- a/pagetop-minimal/src/module/menu.rs
+++ b/pagetop-minimal/src/module/menu.rs
@@ -1,6 +1,6 @@
 use pagetop::prelude::*;
 
-pub_handle!(MODULE_MENU);
+define_handle!(MODULE_MENU);
 
 pub_locale!("src/module/menu/locales");
 
diff --git a/pagetop-node/src/lib.rs b/pagetop-node/src/lib.rs
index f6a09d16..a98c8f6e 100644
--- a/pagetop-node/src/lib.rs
+++ b/pagetop-node/src/lib.rs
@@ -1,6 +1,6 @@
 use pagetop::prelude::*;
 
-pub_handle!(MODULE_NODE);
+define_handle!(MODULE_NODE);
 
 pub_locale!("src/locales");
 
diff --git a/pagetop-user/src/lib.rs b/pagetop-user/src/lib.rs
index 965b1ca0..948e74ad 100644
--- a/pagetop-user/src/lib.rs
+++ b/pagetop-user/src/lib.rs
@@ -1,7 +1,7 @@
 use pagetop::prelude::*;
 use pagetop_minimal::component::*;
 
-pub_handle!(MODULE_USER);
+define_handle!(MODULE_USER);
 
 pub_locale!("src/locales");
 
diff --git a/pagetop/src/core/basic.rs b/pagetop/src/core/basic.rs
index df0e6ec4..9613c87c 100644
--- a/pagetop/src/core/basic.rs
+++ b/pagetop/src/core/basic.rs
@@ -3,9 +3,9 @@ use crate::html::Favicon;
 use crate::response::page::Page;
 use crate::server;
 use crate::util::Handle;
-use crate::{pub_handle, serve_static_files};
+use crate::{define_handle, serve_static_files};
 
-pub_handle!(THEME_BASIC);
+define_handle!(THEME_BASIC);
 
 include!(concat!(env!("OUT_DIR"), "/theme.rs"));
 
diff --git a/pagetop/src/core/component/definition.rs b/pagetop/src/core/component/definition.rs
index 176651e0..a5be4358 100644
--- a/pagetop/src/core/component/definition.rs
+++ b/pagetop/src/core/component/definition.rs
@@ -76,7 +76,7 @@ pub fn component_mut<C: 'static>(component: &mut dyn ComponentTrait) -> &mut C {
 macro_rules! hook_before_render_component {
     ( $ACTION_HANDLE:ident, $Component:ty ) => {
         $crate::paste! {
-            $crate::pub_handle!($ACTION_HANDLE);
+            $crate::define_handle!($ACTION_HANDLE);
 
             type Action = fn(&$Component, &mut RenderContext);
 
diff --git a/pagetop/src/core/component/html_markup.rs b/pagetop/src/core/component/html_markup.rs
index 346b8352..6def47b2 100644
--- a/pagetop/src/core/component/html_markup.rs
+++ b/pagetop/src/core/component/html_markup.rs
@@ -1,9 +1,9 @@
 use crate::core::component::{AnyComponent, ComponentTrait, RenderContext};
 use crate::html::{html, Markup};
-use crate::pub_handle;
+use crate::define_handle;
 use crate::util::Handle;
 
-pub_handle!(HTML_MARKUP);
+define_handle!(HTML_MARKUP);
 
 pub struct HtmlMarkup {
     pub markup: Markup,
diff --git a/pagetop/src/prelude.rs b/pagetop/src/prelude.rs
index ea91276e..5c1a5f0c 100644
--- a/pagetop/src/prelude.rs
+++ b/pagetop/src/prelude.rs
@@ -2,7 +2,7 @@
 pub use crate::{concat_string, fn_builder, LazyStatic, ResultExt};
 
 // Macros.
-pub use crate::{args, paste, define_config, pub_handle, pub_locale, serve_static_files};
+pub use crate::{args, paste, define_config, define_handle, pub_locale, serve_static_files};
 
 // Helpers.
 pub use crate::util;
diff --git a/pagetop/src/response/page/hook.rs b/pagetop/src/response/page/hook.rs
index 0c01f27d..e385f01b 100644
--- a/pagetop/src/response/page/hook.rs
+++ b/pagetop/src/response/page/hook.rs
@@ -1,9 +1,9 @@
 use super::Page;
 use crate::core::hook::{AnyHookAction, HookActionTrait};
-use crate::pub_handle;
+use crate::define_handle;
 use crate::util::Handle;
 
-pub_handle!(HOOK_BEFORE_RENDER_PAGE);
+define_handle!(HOOK_BEFORE_RENDER_PAGE);
 
 type Hook = fn(&mut Page);
 
diff --git a/pagetop/src/util.rs b/pagetop/src/util.rs
index c743cf5d..d355f942 100644
--- a/pagetop/src/util.rs
+++ b/pagetop/src/util.rs
@@ -72,7 +72,7 @@ pub const fn handle(
 }
 
 #[macro_export]
-macro_rules! pub_handle {
+macro_rules! define_handle {
     ( $HANDLE:ident ) => {
         pub const $HANDLE: $crate::util::Handle =
             $crate::util::handle(module_path!(), file!(), line!(), column!());