diff --git a/pagetop-macros/src/lib.rs b/pagetop-macros/src/lib.rs
index 8fc88251..ec1f9dfa 100644
--- a/pagetop-macros/src/lib.rs
+++ b/pagetop-macros/src/lib.rs
@@ -123,8 +123,8 @@ pub fn component_classes_derive(input: TokenStream) -> TokenStream {
     TokenStream::from(expanded)
 }
 
-#[proc_macro_derive(CrateHandle, attributes(handle))]
-pub fn crate_handle_derive(input: TokenStream) -> TokenStream {
+#[proc_macro_derive(BaseHandle, attributes(handle))]
+pub fn base_handle_derive(input: TokenStream) -> TokenStream {
     impl_handle(input, quote! { crate })
 }
 
diff --git a/pagetop/src/base/action/component/after_prepare_component.rs b/pagetop/src/base/action/component/after_prepare_component.rs
index 479cd123..67828e28 100644
--- a/pagetop/src/base/action/component/after_prepare_component.rs
+++ b/pagetop/src/base/action/component/after_prepare_component.rs
@@ -1,9 +1,9 @@
 use crate::prelude::*;
-use crate::CrateHandle;
+use crate::BaseHandle;
 
 use super::FnAction;
 
-#[derive(CrateHandle)]
+#[derive(BaseHandle)]
 pub struct AfterPrepareComponent<C: ComponentTrait> {
     f: FnAction<C>,
     referer_handle: Option<Handle>,
diff --git a/pagetop/src/base/action/component/before_prepare_component.rs b/pagetop/src/base/action/component/before_prepare_component.rs
index d81fe2d6..e4c876d1 100644
--- a/pagetop/src/base/action/component/before_prepare_component.rs
+++ b/pagetop/src/base/action/component/before_prepare_component.rs
@@ -1,9 +1,9 @@
 use crate::prelude::*;
-use crate::CrateHandle;
+use crate::BaseHandle;
 
 use super::FnAction;
 
-#[derive(CrateHandle)]
+#[derive(BaseHandle)]
 pub struct BeforePrepareComponent<C: ComponentTrait> {
     f: FnAction<C>,
     referer_handle: Option<Handle>,
diff --git a/pagetop/src/base/action/page/after_prepare_body.rs b/pagetop/src/base/action/page/after_prepare_body.rs
index 78bcf391..7b677bc5 100644
--- a/pagetop/src/base/action/page/after_prepare_body.rs
+++ b/pagetop/src/base/action/page/after_prepare_body.rs
@@ -1,9 +1,9 @@
 use crate::prelude::*;
-use crate::CrateHandle;
+use crate::BaseHandle;
 
 use super::FnActionPage;
 
-#[derive(CrateHandle)]
+#[derive(BaseHandle)]
 pub struct AfterPrepareBody {
     f: FnActionPage,
     weight: Weight,
diff --git a/pagetop/src/base/action/page/before_prepare_body.rs b/pagetop/src/base/action/page/before_prepare_body.rs
index b2f94c39..6debf70d 100644
--- a/pagetop/src/base/action/page/before_prepare_body.rs
+++ b/pagetop/src/base/action/page/before_prepare_body.rs
@@ -1,9 +1,9 @@
 use crate::prelude::*;
-use crate::CrateHandle;
+use crate::BaseHandle;
 
 use super::FnActionPage;
 
-#[derive(CrateHandle)]
+#[derive(BaseHandle)]
 pub struct BeforePrepareBody {
     f: FnActionPage,
     weight: Weight,
diff --git a/pagetop/src/base/component/block.rs b/pagetop/src/base/component/block.rs
index 4c1e409a..67953eff 100644
--- a/pagetop/src/base/component/block.rs
+++ b/pagetop/src/base/component/block.rs
@@ -1,8 +1,8 @@
 use crate::prelude::*;
-use crate::CrateHandle;
+use crate::BaseHandle;
 
 #[rustfmt::skip]
-#[derive(ComponentClasses, CrateHandle, SmartDefault)]
+#[derive(BaseHandle, ComponentClasses, SmartDefault)]
 pub struct Block {
     id        : OptionId,
     weight    : Weight,
diff --git a/pagetop/src/base/component/branding.rs b/pagetop/src/base/component/branding.rs
index 221a2f3d..c95f2bf8 100644
--- a/pagetop/src/base/component/branding.rs
+++ b/pagetop/src/base/component/branding.rs
@@ -1,8 +1,8 @@
 use crate::prelude::*;
-use crate::CrateHandle;
+use crate::BaseHandle;
 
 #[rustfmt::skip]
-#[derive(CrateHandle, SmartDefault)]
+#[derive(BaseHandle, SmartDefault)]
 pub struct Branding {
     id        : OptionId,
     weight    : Weight,
diff --git a/pagetop/src/base/component/button.rs b/pagetop/src/base/component/button.rs
index 3f43f21d..9778ce3e 100644
--- a/pagetop/src/base/component/button.rs
+++ b/pagetop/src/base/component/button.rs
@@ -1,5 +1,5 @@
 use crate::prelude::*;
-use crate::CrateHandle;
+use crate::BaseHandle;
 
 #[derive(SmartDefault)]
 pub enum ButtonType {
@@ -29,7 +29,7 @@ pub enum ButtonTarget {
 }
 
 #[rustfmt::skip]
-#[derive(ComponentClasses, CrateHandle, SmartDefault)]
+#[derive(BaseHandle, ComponentClasses, SmartDefault)]
 pub struct Button {
     id         : OptionId,
     weight     : Weight,
diff --git a/pagetop/src/base/component/flex/container.rs b/pagetop/src/base/component/flex/container.rs
index d2f5fb7c..d8846e2b 100644
--- a/pagetop/src/base/component/flex/container.rs
+++ b/pagetop/src/base/component/flex/container.rs
@@ -1,8 +1,8 @@
 use crate::prelude::*;
-use crate::CrateHandle;
+use crate::BaseHandle;
 
 #[rustfmt::skip]
-#[derive(ComponentClasses, CrateHandle, SmartDefault)]
+#[derive(BaseHandle, ComponentClasses, SmartDefault)]
 pub struct Container {
     id             : OptionId,
     weight         : Weight,
diff --git a/pagetop/src/base/component/flex/item.rs b/pagetop/src/base/component/flex/item.rs
index 3d1ea0d4..802b214b 100644
--- a/pagetop/src/base/component/flex/item.rs
+++ b/pagetop/src/base/component/flex/item.rs
@@ -1,8 +1,8 @@
 use crate::prelude::*;
-use crate::CrateHandle;
+use crate::BaseHandle;
 
 #[rustfmt::skip]
-#[derive(ComponentClasses, CrateHandle, SmartDefault)]
+#[derive(BaseHandle, ComponentClasses, SmartDefault)]
 pub struct Item {
     id           : OptionId,
     weight       : Weight,
diff --git a/pagetop/src/base/component/form/button.rs b/pagetop/src/base/component/form/button.rs
index d88dd19b..794e5318 100644
--- a/pagetop/src/base/component/form/button.rs
+++ b/pagetop/src/base/component/form/button.rs
@@ -1,5 +1,5 @@
 use crate::prelude::*;
-use crate::CrateHandle;
+use crate::BaseHandle;
 
 #[derive(SmartDefault)]
 pub enum ButtonType {
@@ -21,7 +21,7 @@ impl ToString for ButtonType {
 }
 
 #[rustfmt::skip]
-#[derive(ComponentClasses, CrateHandle, SmartDefault)]
+#[derive(BaseHandle, ComponentClasses, SmartDefault)]
 pub struct Button {
     weight     : Weight,
     renderable : Renderable,
diff --git a/pagetop/src/base/component/form/date.rs b/pagetop/src/base/component/form/date.rs
index fbadfe15..88e2f0a2 100644
--- a/pagetop/src/base/component/form/date.rs
+++ b/pagetop/src/base/component/form/date.rs
@@ -1,8 +1,8 @@
 use crate::prelude::*;
-use crate::CrateHandle;
+use crate::BaseHandle;
 
 #[rustfmt::skip]
-#[derive(ComponentClasses, CrateHandle, SmartDefault)]
+#[derive(BaseHandle, ComponentClasses, SmartDefault)]
 pub struct Date {
     weight      : Weight,
     renderable  : Renderable,
diff --git a/pagetop/src/base/component/form/form_main.rs b/pagetop/src/base/component/form/form_main.rs
index 7e7747b6..ce476583 100644
--- a/pagetop/src/base/component/form/form_main.rs
+++ b/pagetop/src/base/component/form/form_main.rs
@@ -1,5 +1,5 @@
 use crate::prelude::*;
-use crate::CrateHandle;
+use crate::BaseHandle;
 
 #[derive(SmartDefault)]
 pub enum FormMethod {
@@ -9,7 +9,7 @@ pub enum FormMethod {
 }
 
 #[rustfmt::skip]
-#[derive(ComponentClasses, CrateHandle, SmartDefault)]
+#[derive(BaseHandle, ComponentClasses, SmartDefault)]
 pub struct Form {
     id        : OptionId,
     weight    : Weight,
diff --git a/pagetop/src/base/component/form/hidden.rs b/pagetop/src/base/component/form/hidden.rs
index 9ed4ef6d..7ea32da0 100644
--- a/pagetop/src/base/component/form/hidden.rs
+++ b/pagetop/src/base/component/form/hidden.rs
@@ -1,8 +1,8 @@
 use crate::prelude::*;
-use crate::CrateHandle;
+use crate::BaseHandle;
 
 #[rustfmt::skip]
-#[derive(CrateHandle, SmartDefault)]
+#[derive(BaseHandle, SmartDefault)]
 pub struct Hidden {
     weight: Weight,
     name  : OptionName,
diff --git a/pagetop/src/base/component/form/input.rs b/pagetop/src/base/component/form/input.rs
index 0b62d969..f0df9aab 100644
--- a/pagetop/src/base/component/form/input.rs
+++ b/pagetop/src/base/component/form/input.rs
@@ -1,5 +1,5 @@
 use crate::prelude::*;
-use crate::CrateHandle;
+use crate::BaseHandle;
 
 #[derive(SmartDefault)]
 pub enum InputType {
@@ -13,7 +13,7 @@ pub enum InputType {
 }
 
 #[rustfmt::skip]
-#[derive(ComponentClasses, CrateHandle, SmartDefault)]
+#[derive(BaseHandle, ComponentClasses, SmartDefault)]
 pub struct Input {
     weight      : Weight,
     renderable  : Renderable,
diff --git a/pagetop/src/base/component/heading.rs b/pagetop/src/base/component/heading.rs
index 8b969f52..70d45bbf 100644
--- a/pagetop/src/base/component/heading.rs
+++ b/pagetop/src/base/component/heading.rs
@@ -1,5 +1,5 @@
 use crate::prelude::*;
-use crate::CrateHandle;
+use crate::BaseHandle;
 
 #[derive(SmartDefault)]
 pub enum HeadingType {
@@ -40,7 +40,7 @@ impl ToString for HeadingDisplay {
 }
 
 #[rustfmt::skip]
-#[derive(ComponentClasses, CrateHandle, SmartDefault)]
+#[derive(BaseHandle, ComponentClasses, SmartDefault)]
 pub struct Heading {
     id          : OptionId,
     weight      : Weight,
diff --git a/pagetop/src/base/component/html.rs b/pagetop/src/base/component/html.rs
index 8477ca5e..ab9781ef 100644
--- a/pagetop/src/base/component/html.rs
+++ b/pagetop/src/base/component/html.rs
@@ -1,7 +1,7 @@
 use crate::prelude::*;
-use crate::CrateHandle;
+use crate::BaseHandle;
 
-#[derive(CrateHandle, SmartDefault)]
+#[derive(BaseHandle, SmartDefault)]
 pub struct Html(Markup);
 
 impl ComponentTrait for Html {
diff --git a/pagetop/src/base/component/icon.rs b/pagetop/src/base/component/icon.rs
index 9a945185..db5634a8 100644
--- a/pagetop/src/base/component/icon.rs
+++ b/pagetop/src/base/component/icon.rs
@@ -1,8 +1,8 @@
 use crate::prelude::*;
-use crate::CrateHandle;
+use crate::BaseHandle;
 
 #[rustfmt::skip]
-#[derive(ComponentClasses, CrateHandle, SmartDefault)]
+#[derive(BaseHandle, ComponentClasses, SmartDefault)]
 pub struct Icon {
     weight    : Weight,
     renderable: Renderable,
diff --git a/pagetop/src/base/component/image.rs b/pagetop/src/base/component/image.rs
index 67657b02..2e8bf3dc 100644
--- a/pagetop/src/base/component/image.rs
+++ b/pagetop/src/base/component/image.rs
@@ -1,5 +1,5 @@
 use crate::prelude::*;
-use crate::CrateHandle;
+use crate::BaseHandle;
 
 const IMG_FLUID: &str = "pt-img__fluid";
 const IMG_FIXED: &str = "pt-img__fixed";
@@ -15,7 +15,7 @@ pub enum ImageSize {
 }
 
 #[rustfmt::skip]
-#[derive(ComponentClasses, CrateHandle, SmartDefault)]
+#[derive(BaseHandle, ComponentClasses, SmartDefault)]
 pub struct Image {
     id        : OptionId,
     weight    : Weight,
diff --git a/pagetop/src/base/component/menu/element.rs b/pagetop/src/base/component/menu/element.rs
index 04059f05..0ffcfa53 100644
--- a/pagetop/src/base/component/menu/element.rs
+++ b/pagetop/src/base/component/menu/element.rs
@@ -1,5 +1,5 @@
 use crate::prelude::*;
-use crate::CrateHandle;
+use crate::BaseHandle;
 
 use super::Submenu;
 
@@ -17,7 +17,7 @@ pub enum ElementType {
 // Element.
 
 #[rustfmt::skip]
-#[derive(CrateHandle, SmartDefault)]
+#[derive(BaseHandle, SmartDefault)]
 pub struct Element {
     weight      : Weight,
     renderable  : Renderable,
diff --git a/pagetop/src/base/component/menu/group.rs b/pagetop/src/base/component/menu/group.rs
index 2278a504..9b80a546 100644
--- a/pagetop/src/base/component/menu/group.rs
+++ b/pagetop/src/base/component/menu/group.rs
@@ -1,10 +1,10 @@
 use crate::prelude::*;
-use crate::CrateHandle;
+use crate::BaseHandle;
 
 use super::Element;
 
 #[rustfmt::skip]
-#[derive(CrateHandle, SmartDefault)]
+#[derive(BaseHandle, SmartDefault)]
 pub struct Group {
     id        : OptionId,
     weight    : Weight,
diff --git a/pagetop/src/base/component/menu/item.rs b/pagetop/src/base/component/menu/item.rs
index 42bcd935..15e4db4b 100644
--- a/pagetop/src/base/component/menu/item.rs
+++ b/pagetop/src/base/component/menu/item.rs
@@ -1,5 +1,5 @@
 use crate::prelude::*;
-use crate::CrateHandle;
+use crate::BaseHandle;
 
 use super::{Megamenu, Submenu};
 
@@ -23,7 +23,7 @@ pub enum ItemType {
 // Item.
 
 #[rustfmt::skip]
-#[derive(CrateHandle, SmartDefault)]
+#[derive(BaseHandle, SmartDefault)]
 pub struct Item {
     weight     : Weight,
     renderable : Renderable,
diff --git a/pagetop/src/base/component/menu/megamenu.rs b/pagetop/src/base/component/menu/megamenu.rs
index 7415f97d..777f8ca1 100644
--- a/pagetop/src/base/component/menu/megamenu.rs
+++ b/pagetop/src/base/component/menu/megamenu.rs
@@ -1,10 +1,10 @@
 use crate::prelude::*;
-use crate::CrateHandle;
+use crate::BaseHandle;
 
 use super::Group;
 
 #[rustfmt::skip]
-#[derive(CrateHandle, SmartDefault)]
+#[derive(BaseHandle, SmartDefault)]
 pub struct Megamenu {
     id        : OptionId,
     weight    : Weight,
diff --git a/pagetop/src/base/component/menu/menu_main.rs b/pagetop/src/base/component/menu/menu_main.rs
index adb56e50..d94eef94 100644
--- a/pagetop/src/base/component/menu/menu_main.rs
+++ b/pagetop/src/base/component/menu/menu_main.rs
@@ -1,10 +1,10 @@
 use crate::prelude::*;
-use crate::CrateHandle;
+use crate::BaseHandle;
 
 use super::Item;
 
 #[rustfmt::skip]
-#[derive(CrateHandle, SmartDefault)]
+#[derive(BaseHandle, SmartDefault)]
 pub struct Menu {
     id        : OptionId,
     weight    : Weight,
diff --git a/pagetop/src/base/component/menu/submenu.rs b/pagetop/src/base/component/menu/submenu.rs
index 2af93485..457556a3 100644
--- a/pagetop/src/base/component/menu/submenu.rs
+++ b/pagetop/src/base/component/menu/submenu.rs
@@ -1,10 +1,10 @@
 use crate::prelude::*;
-use crate::CrateHandle;
+use crate::BaseHandle;
 
 use super::Item;
 
 #[rustfmt::skip]
-#[derive(CrateHandle, SmartDefault)]
+#[derive(BaseHandle, SmartDefault)]
 pub struct Submenu {
     id        : OptionId,
     weight    : Weight,
diff --git a/pagetop/src/base/component/paragraph.rs b/pagetop/src/base/component/paragraph.rs
index e4ce4ab7..0fba5006 100644
--- a/pagetop/src/base/component/paragraph.rs
+++ b/pagetop/src/base/component/paragraph.rs
@@ -1,8 +1,8 @@
 use crate::prelude::*;
-use crate::CrateHandle;
+use crate::BaseHandle;
 
 #[rustfmt::skip]
-#[derive(ComponentClasses, CrateHandle, SmartDefault)]
+#[derive(BaseHandle, ComponentClasses, SmartDefault)]
 pub struct Paragraph {
     id        : OptionId,
     weight    : Weight,
diff --git a/pagetop/src/base/component/powered_by.rs b/pagetop/src/base/component/powered_by.rs
index 97b6af01..8b6739fc 100644
--- a/pagetop/src/base/component/powered_by.rs
+++ b/pagetop/src/base/component/powered_by.rs
@@ -1,5 +1,5 @@
 use crate::prelude::*;
-use crate::CrateHandle;
+use crate::BaseHandle;
 
 #[derive(Default, Eq, PartialEq)]
 pub enum PoweredByLogo {
@@ -12,7 +12,7 @@ pub enum PoweredByLogo {
 }
 
 #[rustfmt::skip]
-#[derive(CrateHandle, SmartDefault)]
+#[derive(BaseHandle, SmartDefault)]
 pub struct PoweredBy {
     weight    : Weight,
     renderable: Renderable,
diff --git a/pagetop/src/base/component/translate.rs b/pagetop/src/base/component/translate.rs
index bb6bb34e..9731a3df 100644
--- a/pagetop/src/base/component/translate.rs
+++ b/pagetop/src/base/component/translate.rs
@@ -1,7 +1,7 @@
 use crate::prelude::*;
-use crate::CrateHandle;
+use crate::BaseHandle;
 
-#[derive(CrateHandle, SmartDefault)]
+#[derive(BaseHandle, SmartDefault)]
 pub struct Translate(L10n);
 
 impl ComponentTrait for Translate {
diff --git a/pagetop/src/base/component/wrapper.rs b/pagetop/src/base/component/wrapper.rs
index 72e9744c..48f2eb36 100644
--- a/pagetop/src/base/component/wrapper.rs
+++ b/pagetop/src/base/component/wrapper.rs
@@ -1,5 +1,5 @@
 use crate::prelude::*;
-use crate::CrateHandle;
+use crate::BaseHandle;
 
 #[derive(SmartDefault)]
 pub enum WrapperType {
@@ -12,7 +12,7 @@ pub enum WrapperType {
 }
 
 #[rustfmt::skip]
-#[derive(ComponentClasses, CrateHandle, SmartDefault)]
+#[derive(BaseHandle, ComponentClasses, SmartDefault)]
 pub struct Wrapper {
     id           : OptionId,
     weight       : Weight,
diff --git a/pagetop/src/base/theme/basic.rs b/pagetop/src/base/theme/basic.rs
index 8e686915..87d2e713 100644
--- a/pagetop/src/base/theme/basic.rs
+++ b/pagetop/src/base/theme/basic.rs
@@ -1,7 +1,7 @@
 use crate::prelude::*;
-use crate::CrateHandle;
+use crate::BaseHandle;
 
-#[derive(CrateHandle)]
+#[derive(BaseHandle)]
 pub struct Basic;
 
 impl ModuleTrait for Basic {
diff --git a/pagetop/src/base/theme/chassis.rs b/pagetop/src/base/theme/chassis.rs
index 844c24c7..4619dc49 100644
--- a/pagetop/src/base/theme/chassis.rs
+++ b/pagetop/src/base/theme/chassis.rs
@@ -1,7 +1,7 @@
 use crate::prelude::*;
-use crate::CrateHandle;
+use crate::BaseHandle;
 
-#[derive(CrateHandle)]
+#[derive(BaseHandle)]
 pub struct Chassis;
 
 impl ModuleTrait for Chassis {
diff --git a/pagetop/src/base/theme/inception.rs b/pagetop/src/base/theme/inception.rs
index cf70c998..1ecda133 100644
--- a/pagetop/src/base/theme/inception.rs
+++ b/pagetop/src/base/theme/inception.rs
@@ -1,7 +1,7 @@
 use crate::prelude::*;
-use crate::CrateHandle;
+use crate::BaseHandle;
 
-#[derive(CrateHandle)]
+#[derive(BaseHandle)]
 pub struct Inception;
 
 impl ModuleTrait for Inception {
diff --git a/pagetop/src/lib.rs b/pagetop/src/lib.rs
index c55189ea..2f83a1fa 100644
--- a/pagetop/src/lib.rs
+++ b/pagetop/src/lib.rs
@@ -110,7 +110,7 @@ pub use smart_default::SmartDefault;
 
 pub use pagetop_macros::{fn_builder, main, test, AssignHandle, ComponentClasses};
 
-pub(crate) use pagetop_macros::CrateHandle;
+pub(crate) use pagetop_macros::BaseHandle;
 
 // *************************************************************************************************
 // GLOBAL.
diff --git a/pagetop/src/response/fatal_error/error403.rs b/pagetop/src/response/fatal_error/error403.rs
index e5c80218..906391ae 100644
--- a/pagetop/src/response/fatal_error/error403.rs
+++ b/pagetop/src/response/fatal_error/error403.rs
@@ -1,8 +1,8 @@
 use crate::core::component::{ComponentTrait, Context};
 use crate::html::{html, PrepareMarkup};
-use crate::CrateHandle;
+use crate::BaseHandle;
 
-#[derive(CrateHandle)]
+#[derive(BaseHandle)]
 pub struct Error403;
 
 impl ComponentTrait for Error403 {
diff --git a/pagetop/src/response/fatal_error/error404.rs b/pagetop/src/response/fatal_error/error404.rs
index 6000e9cc..cd41b34c 100644
--- a/pagetop/src/response/fatal_error/error404.rs
+++ b/pagetop/src/response/fatal_error/error404.rs
@@ -1,8 +1,8 @@
 use crate::core::component::{ComponentTrait, Context};
 use crate::html::{html, PrepareMarkup};
-use crate::CrateHandle;
+use crate::BaseHandle;
 
-#[derive(CrateHandle)]
+#[derive(BaseHandle)]
 pub struct Error404;
 
 impl ComponentTrait for Error404 {