diff --git a/pagetop-bulmix/src/lib.rs b/pagetop-bulmix/src/lib.rs
index 144710b5..7bc372c3 100644
--- a/pagetop-bulmix/src/lib.rs
+++ b/pagetop-bulmix/src/lib.rs
@@ -49,7 +49,7 @@ impl ThemeTrait for Bulmix {
     ) {
         match component.handle() {
             COMPONENT_ANCHOR => {
-                let a = component_mut::<Anchor>(component);
+                let a = component_as_mut::<Anchor>(component);
                 a.alter_classes(
                     ClassesOp::SetDefault,
                     match a.anchor_type() {
@@ -59,7 +59,7 @@ impl ThemeTrait for Bulmix {
                 );
             }
             COMPONENT_HEADING => {
-                let h = component_mut::<Heading>(component);
+                let h = component_as_mut::<Heading>(component);
                 h.alter_classes(
                     ClassesOp::SetDefault,
                     match h.display() {
@@ -74,7 +74,7 @@ impl ThemeTrait for Bulmix {
                 );
             }
             COMPONENT_PARAGRAPH => {
-                let p = component_mut::<Paragraph>(component);
+                let p = component_as_mut::<Paragraph>(component);
                 p.alter_classes(
                     ClassesOp::SetDefault,
                     match p.display() {
@@ -88,7 +88,7 @@ impl ThemeTrait for Bulmix {
                 );
             }
             grid::COMPONENT_GRID_COLUMN => {
-                let col = component_mut::<grid::Column>(component);
+                let col = component_as_mut::<grid::Column>(component);
                 col.alter_classes(
                     ClassesOp::SetDefault,
                     concat_string!(
@@ -114,7 +114,7 @@ impl ThemeTrait for Bulmix {
                 );
             }
             grid::COMPONENT_GRID_ROW => {
-                let row = component_mut::<grid::Row>(component);
+                let row = component_as_mut::<grid::Row>(component);
                 row.alter_classes(ClassesOp::SetDefault, "columns");
             }
             _ => {}
@@ -128,7 +128,7 @@ impl ThemeTrait for Bulmix {
     ) -> Option<Markup> {
         match component.handle() {
             COMPONENT_ICON => {
-                let icon = component_ref::<Icon>(component);
+                let icon = component_as_ref::<Icon>(component);
                 Some(html! {
                     span class="icon" {
                         i class=[icon.classes().get()] {};
diff --git a/pagetop/src/core/component.rs b/pagetop/src/core/component.rs
index 32d742c3..d46f4786 100644
--- a/pagetop/src/core/component.rs
+++ b/pagetop/src/core/component.rs
@@ -3,7 +3,7 @@ pub use context::{Context, ContextOp};
 pub type FnContextualPath = fn(cx: &Context) -> &str;
 
 mod definition;
-pub use definition::{component_mut, component_ref, ComponentBase, ComponentTrait};
+pub use definition::{component_as_mut, component_as_ref, ComponentBase, ComponentTrait};
 
 mod arc;
 pub use arc::ComponentArc;
diff --git a/pagetop/src/core/component/definition.rs b/pagetop/src/core/component/definition.rs
index b17733e2..a6d99c1b 100644
--- a/pagetop/src/core/component/definition.rs
+++ b/pagetop/src/core/component/definition.rs
@@ -87,10 +87,10 @@ impl<C: ComponentTrait> ComponentBase for C {
     }
 }
 
-pub fn component_ref<C: ComponentTrait>(component: &dyn ComponentTrait) -> &C {
+pub fn component_as_ref<C: ComponentTrait>(component: &dyn ComponentTrait) -> &C {
     component.as_ref_any().downcast_ref::<C>().unwrap()
 }
 
-pub fn component_mut<C: ComponentTrait>(component: &mut dyn ComponentTrait) -> &mut C {
+pub fn component_as_mut<C: ComponentTrait>(component: &mut dyn ComponentTrait) -> &mut C {
     component.as_mut_any().downcast_mut::<C>().unwrap()
 }
diff --git a/pagetop/src/core/theme/definition.rs b/pagetop/src/core/theme/definition.rs
index aec9fe61..fd4b53a1 100644
--- a/pagetop/src/core/theme/definition.rs
+++ b/pagetop/src/core/theme/definition.rs
@@ -90,7 +90,7 @@ pub trait ThemeTrait: ModuleTrait + Send + Sync {
 
             match component.handle() {
                 BLOCK_COMPONENT => {
-                    let block = component_mut::<Block>(component);
+                    let block = component_as_mut::<Block>(component);
                     block.alter_title("New title");
                 },
                 _ => {},
@@ -110,7 +110,7 @@ pub trait ThemeTrait: ModuleTrait + Send + Sync {
 
             match component.handle() {
                 BLOCK_COMPONENT => {
-                    let block = component_mut::<Block>(component);
+                    let block = component_as_mut::<Block>(component);
                     block.alter_title("New title");
                 },
                 _ => {},
@@ -131,7 +131,7 @@ pub trait ThemeTrait: ModuleTrait + Send + Sync {
 
             match component.handle() {
                 BLOCK_COMPONENT => {
-                    let block = component_ref::<Block>(component);
+                    let block = component_as_ref::<Block>(component);
                     match block.template() {
                         "default" => Some(block_default(block)),
                         _ => None,