diff --git a/pagetop-megamenu/src/component/item.rs b/pagetop-megamenu/src/component/item.rs
index 00038b4a..8e5e8101 100644
--- a/pagetop-megamenu/src/component/item.rs
+++ b/pagetop-megamenu/src/component/item.rs
@@ -12,8 +12,8 @@ pub enum MegaItemType {
     #[default]
     Void,
     Label(Label),
-    Link(Label, ContextualPath),
-    LinkBlank(Label, ContextualPath),
+    Link(Label, FnContextualPath),
+    LinkBlank(Label, FnContextualPath),
     Html(Content),
     Submenu(Label, MegaMenu),
     Separator,
@@ -84,14 +84,14 @@ impl MegaItem {
         }
     }
 
-    pub fn link(label: L10n, path: ContextualPath) -> Self {
+    pub fn link(label: L10n, path: FnContextualPath) -> Self {
         MegaItem {
             item_type: MegaItemType::Link(Label::with(label), path),
             ..Default::default()
         }
     }
 
-    pub fn link_blank(label: L10n, path: ContextualPath) -> Self {
+    pub fn link_blank(label: L10n, path: FnContextualPath) -> Self {
         MegaItem {
             item_type: MegaItemType::LinkBlank(Label::with(label), path),
             ..Default::default()
@@ -128,7 +128,7 @@ impl MegaItem {
     }
 
     #[fn_builder]
-    pub fn alter_renderable(&mut self, check: IsRenderable) -> &mut Self {
+    pub fn alter_renderable(&mut self, check: FnIsRenderable) -> &mut Self {
         self.renderable.check = check;
         self
     }
diff --git a/pagetop-minimal/src/component/anchor.rs b/pagetop-minimal/src/component/anchor.rs
index fc471a63..58b1a566 100644
--- a/pagetop-minimal/src/component/anchor.rs
+++ b/pagetop-minimal/src/component/anchor.rs
@@ -111,7 +111,7 @@ impl Anchor {
     }
 
     #[fn_builder]
-    pub fn alter_renderable(&mut self, check: IsRenderable) -> &mut Self {
+    pub fn alter_renderable(&mut self, check: FnIsRenderable) -> &mut Self {
         self.renderable.check = check;
         self
     }
diff --git a/pagetop-minimal/src/component/block.rs b/pagetop-minimal/src/component/block.rs
index 7d19f588..bc7bc440 100644
--- a/pagetop-minimal/src/component/block.rs
+++ b/pagetop-minimal/src/component/block.rs
@@ -76,7 +76,7 @@ impl Block {
     }
 
     #[fn_builder]
-    pub fn alter_renderable(&mut self, check: IsRenderable) -> &mut Self {
+    pub fn alter_renderable(&mut self, check: FnIsRenderable) -> &mut Self {
         self.renderable.check = check;
         self
     }
diff --git a/pagetop-minimal/src/component/form_element/button.rs b/pagetop-minimal/src/component/form_element/button.rs
index 1ccd670e..c34dbdfd 100644
--- a/pagetop-minimal/src/component/form_element/button.rs
+++ b/pagetop-minimal/src/component/form_element/button.rs
@@ -99,7 +99,7 @@ impl Button {
     }
 
     #[fn_builder]
-    pub fn alter_renderable(&mut self, check: IsRenderable) -> &mut Self {
+    pub fn alter_renderable(&mut self, check: FnIsRenderable) -> &mut Self {
         self.renderable.check = check;
         self
     }
diff --git a/pagetop-minimal/src/component/form_element/date.rs b/pagetop-minimal/src/component/form_element/date.rs
index d0c3bf2c..2a508d34 100644
--- a/pagetop-minimal/src/component/form_element/date.rs
+++ b/pagetop-minimal/src/component/form_element/date.rs
@@ -84,7 +84,7 @@ impl Date {
     }
 
     #[fn_builder]
-    pub fn alter_renderable(&mut self, check: IsRenderable) -> &mut Self {
+    pub fn alter_renderable(&mut self, check: FnIsRenderable) -> &mut Self {
         self.renderable.check = check;
         self
     }
diff --git a/pagetop-minimal/src/component/form_element/form.rs b/pagetop-minimal/src/component/form_element/form.rs
index 358e162d..1290e9da 100644
--- a/pagetop-minimal/src/component/form_element/form.rs
+++ b/pagetop-minimal/src/component/form_element/form.rs
@@ -85,7 +85,7 @@ impl Form {
     }
 
     #[fn_builder]
-    pub fn alter_renderable(&mut self, check: IsRenderable) -> &mut Self {
+    pub fn alter_renderable(&mut self, check: FnIsRenderable) -> &mut Self {
         self.renderable.check = check;
         self
     }
diff --git a/pagetop-minimal/src/component/form_element/input.rs b/pagetop-minimal/src/component/form_element/input.rs
index 81288a4c..aaf230dc 100644
--- a/pagetop-minimal/src/component/form_element/input.rs
+++ b/pagetop-minimal/src/component/form_element/input.rs
@@ -172,7 +172,7 @@ impl Input {
     }
 
     #[fn_builder]
-    pub fn alter_renderable(&mut self, check: IsRenderable) -> &mut Self {
+    pub fn alter_renderable(&mut self, check: FnIsRenderable) -> &mut Self {
         self.renderable.check = check;
         self
     }
diff --git a/pagetop-minimal/src/component/grid/column.rs b/pagetop-minimal/src/component/grid/column.rs
index 044260f1..f701af96 100644
--- a/pagetop-minimal/src/component/grid/column.rs
+++ b/pagetop-minimal/src/component/grid/column.rs
@@ -96,7 +96,7 @@ impl Column {
     }
 
     #[fn_builder]
-    pub fn alter_renderable(&mut self, check: IsRenderable) -> &mut Self {
+    pub fn alter_renderable(&mut self, check: FnIsRenderable) -> &mut Self {
         self.renderable.check = check;
         self
     }
diff --git a/pagetop-minimal/src/component/grid/row.rs b/pagetop-minimal/src/component/grid/row.rs
index 923910dc..5c261a89 100644
--- a/pagetop-minimal/src/component/grid/row.rs
+++ b/pagetop-minimal/src/component/grid/row.rs
@@ -65,7 +65,7 @@ impl Row {
     }
 
     #[fn_builder]
-    pub fn alter_renderable(&mut self, check: IsRenderable) -> &mut Self {
+    pub fn alter_renderable(&mut self, check: FnIsRenderable) -> &mut Self {
         self.renderable.check = check;
         self
     }
diff --git a/pagetop-minimal/src/component/heading.rs b/pagetop-minimal/src/component/heading.rs
index dd5444dc..d6f15ff7 100644
--- a/pagetop-minimal/src/component/heading.rs
+++ b/pagetop-minimal/src/component/heading.rs
@@ -121,7 +121,7 @@ impl Heading {
     }
 
     #[fn_builder]
-    pub fn alter_renderable(&mut self, check: IsRenderable) -> &mut Self {
+    pub fn alter_renderable(&mut self, check: FnIsRenderable) -> &mut Self {
         self.renderable.check = check;
         self
     }
diff --git a/pagetop-minimal/src/component/icon.rs b/pagetop-minimal/src/component/icon.rs
index 4aec341d..d3742520 100644
--- a/pagetop-minimal/src/component/icon.rs
+++ b/pagetop-minimal/src/component/icon.rs
@@ -53,7 +53,7 @@ impl Icon {
     }
 
     #[fn_builder]
-    pub fn alter_renderable(&mut self, check: IsRenderable) -> &mut Self {
+    pub fn alter_renderable(&mut self, check: FnIsRenderable) -> &mut Self {
         self.renderable.check = check;
         self
     }
diff --git a/pagetop-minimal/src/component/paragraph.rs b/pagetop-minimal/src/component/paragraph.rs
index c6b3e508..a88f07a7 100644
--- a/pagetop-minimal/src/component/paragraph.rs
+++ b/pagetop-minimal/src/component/paragraph.rs
@@ -72,7 +72,7 @@ impl Paragraph {
     }
 
     #[fn_builder]
-    pub fn alter_renderable(&mut self, check: IsRenderable) -> &mut Self {
+    pub fn alter_renderable(&mut self, check: FnIsRenderable) -> &mut Self {
         self.renderable.check = check;
         self
     }
diff --git a/pagetop-minimal/src/component/powered_by.rs b/pagetop-minimal/src/component/powered_by.rs
index 63eeb0bb..0e1e597c 100644
--- a/pagetop-minimal/src/component/powered_by.rs
+++ b/pagetop-minimal/src/component/powered_by.rs
@@ -95,7 +95,7 @@ impl PoweredBy {
     }
 
     #[fn_builder]
-    pub fn alter_renderable(&mut self, check: IsRenderable) -> &mut Self {
+    pub fn alter_renderable(&mut self, check: FnIsRenderable) -> &mut Self {
         self.renderable.check = check;
         self
     }
diff --git a/pagetop-minimal/src/component/site_branding.rs b/pagetop-minimal/src/component/site_branding.rs
index 82f5838e..5e3ab340 100644
--- a/pagetop-minimal/src/component/site_branding.rs
+++ b/pagetop-minimal/src/component/site_branding.rs
@@ -16,7 +16,7 @@ pub struct SiteBranding {
     name      : String,
     slogan    : SiteSlogan,
     logo      : SiteLogo,
-    frontpage : ContextualPath,
+    frontpage : FnContextualPath,
 }
 
 #[rustfmt::skip]
@@ -93,7 +93,7 @@ impl SiteBranding {
     }
 
     #[fn_builder]
-    pub fn alter_renderable(&mut self, check: IsRenderable) -> &mut Self {
+    pub fn alter_renderable(&mut self, check: FnIsRenderable) -> &mut Self {
         self.renderable.check = check;
         self
     }
@@ -117,7 +117,7 @@ impl SiteBranding {
     }
 
     #[fn_builder]
-    pub fn alter_frontpage(&mut self, frontpage: ContextualPath) -> &mut Self {
+    pub fn alter_frontpage(&mut self, frontpage: FnContextualPath) -> &mut Self {
         self.frontpage = frontpage;
         self
     }
@@ -136,7 +136,7 @@ impl SiteBranding {
         &self.logo
     }
 
-    pub fn frontpage(&self) -> &ContextualPath {
+    pub fn frontpage(&self) -> &FnContextualPath {
         &self.frontpage
     }
 }