diff --git a/crates/cgp-error/src/traits/can_raise_error.rs b/crates/cgp-error/src/traits/can_raise_error.rs
index 3be6da8f..2865b095 100644
--- a/crates/cgp-error/src/traits/can_raise_error.rs
+++ b/crates/cgp-error/src/traits/can_raise_error.rs
@@ -12,7 +12,7 @@ use crate::traits::has_error_type::HasErrorType;
     provider: ErrorRaiser,
     derive_delegate: UseDelegate<SourceError>,
 }]
-#[use_namespace(@cgp.core.error.ErrorRaiserComponent)]
+#[namespace(@cgp.core.error.ErrorRaiserComponent)]
 pub trait CanRaiseError<SourceError>: HasErrorType {
     fn raise_error(error: SourceError) -> Self::Error;
 }
diff --git a/crates/cgp-error/src/traits/can_wrap_error.rs b/crates/cgp-error/src/traits/can_wrap_error.rs
index c8defb99..1237f354 100644
--- a/crates/cgp-error/src/traits/can_wrap_error.rs
+++ b/crates/cgp-error/src/traits/can_wrap_error.rs
@@ -8,7 +8,7 @@ use crate::traits::HasErrorType;
     provider: ErrorWrapper,
     derive_delegate: UseDelegate<Detail>,
 }]
-#[use_namespace(@cgp.core.error.ErrorWrapperComponent)]
+#[namespace(@cgp.core.error.ErrorWrapperComponent)]
 pub trait CanWrapError<Detail>: HasErrorType {
     fn wrap_error(error: Self::Error, detail: Detail) -> Self::Error;
 }
diff --git a/crates/cgp-error/src/traits/has_error_type.rs b/crates/cgp-error/src/traits/has_error_type.rs
index 4cec7151..8c54d424 100644
--- a/crates/cgp-error/src/traits/has_error_type.rs
+++ b/crates/cgp-error/src/traits/has_error_type.rs
@@ -28,7 +28,7 @@ use cgp_type::{TypeProvider, UseType};
    <https://patterns.contextgeneric.dev/error-handling.html>
 */
 #[cgp_type]
-#[use_namespace(@cgp.core.error.ErrorTypeProviderComponent)]
+#[namespace(@cgp.core.error.ErrorTypeProviderComponent)]
 pub trait HasErrorType {
     type Error: Debug;
 }
diff --git a/crates/cgp-macro-lib/src/attributes/mod.rs b/crates/cgp-macro-lib/src/attributes/mod.rs
index 98a06299..278e2ae5 100644
--- a/crates/cgp-macro-lib/src/attributes/mod.rs
+++ b/crates/cgp-macro-lib/src/attributes/mod.rs
@@ -1,3 +1,3 @@
-mod use_namespace;
+mod namespace;
 
-pub use use_namespace::*;
+pub use namespace::*;
diff --git a/crates/cgp-macro-lib/src/attributes/use_namespace.rs b/crates/cgp-macro-lib/src/attributes/namespace.rs
similarity index 100%
rename from crates/cgp-macro-lib/src/attributes/use_namespace.rs
rename to crates/cgp-macro-lib/src/attributes/namespace.rs
diff --git a/crates/cgp-macro-lib/src/derive_component/attributes.rs b/crates/cgp-macro-lib/src/derive_component/attributes.rs
index 1ddee85d..ff8e5605 100644
--- a/crates/cgp-macro-lib/src/derive_component/attributes.rs
+++ b/crates/cgp-macro-lib/src/derive_component/attributes.rs
@@ -36,11 +36,11 @@ pub fn parse_component_attributes(
                 }
 
                 parsed_attributes.use_type.extend(use_type_specs);
-            } else if ident == "use_namespace" {
-                let use_namespace_specs = attribute.parse_args_with(
+            } else if ident == "namespace" {
+                let namespace_specs = attribute.parse_args_with(
                     Punctuated::<UseNamespaceAttribute, Comma>::parse_terminated,
                 )?;
-                parsed_attributes.use_namespace.extend(use_namespace_specs);
+                parsed_attributes.namespace.extend(namespace_specs);
             } else {
                 attributes.push(attribute);
             }
@@ -56,5 +56,5 @@ pub fn parse_component_attributes(
 pub struct ComponentAttributes {
     pub extend: Vec<TypeParamBound>,
     pub use_type: Vec<UseTypeSpec>,
-    pub use_namespace: Vec<UseNamespaceAttribute>,
+    pub namespace: Vec<UseNamespaceAttribute>,
 }
diff --git a/crates/cgp-macro-lib/src/derive_component/derive.rs b/crates/cgp-macro-lib/src/derive_component/derive.rs
index 75c0324a..1f024499 100644
--- a/crates/cgp-macro-lib/src/derive_component/derive.rs
+++ b/crates/cgp-macro-lib/src/derive_component/derive.rs
@@ -91,7 +91,7 @@ pub fn derive_component_with_ast(
         }
     }
 
-    let namespace_impls = derive_namespace_impls(&attributes.use_namespace, component_name)?;
+    let namespace_impls = derive_namespace_impls(&attributes.namespace, component_name)?;
     item_impls.extend(namespace_impls);
 
     let derived = DerivedComponent {
diff --git a/crates/cgp-tests/tests/namespace_tests/mod.rs b/crates/cgp-tests/tests/namespace_tests/mod.rs
index 5bb49d53..4745538f 100644
--- a/crates/cgp-tests/tests/namespace_tests/mod.rs
+++ b/crates/cgp-tests/tests/namespace_tests/mod.rs
@@ -1,5 +1,5 @@
 pub mod multi_param;
+pub mod namespace;
 pub mod namespace_macro;
 pub mod open;
 pub mod redirect;
-pub mod use_namespace;
diff --git a/crates/cgp-tests/tests/namespace_tests/multi_param.rs b/crates/cgp-tests/tests/namespace_tests/multi_param.rs
index 3397ef40..5fe681e5 100644
--- a/crates/cgp-tests/tests/namespace_tests/multi_param.rs
+++ b/crates/cgp-tests/tests/namespace_tests/multi_param.rs
@@ -1,7 +1,7 @@
 use cgp::prelude::*;
 
 #[cgp_component(FooProvider)]
-#[use_namespace(@app.FooProviderComponent)]
+#[namespace(@app.FooProviderComponent)]
 pub trait Foo<'a, T, U> {
     fn foo(&self, first: &'a T, second: U);
 }
diff --git a/crates/cgp-tests/tests/namespace_tests/use_namespace.rs b/crates/cgp-tests/tests/namespace_tests/namespace.rs
similarity index 87%
rename from crates/cgp-tests/tests/namespace_tests/use_namespace.rs
rename to crates/cgp-tests/tests/namespace_tests/namespace.rs
index 4f2ed515..3525f4f9 100644
--- a/crates/cgp-tests/tests/namespace_tests/use_namespace.rs
+++ b/crates/cgp-tests/tests/namespace_tests/namespace.rs
@@ -5,7 +5,7 @@ use cgp::prelude::*;
 pub struct MyComponents;
 
 #[cgp_component(FooProvider)]
-#[use_namespace(DefaultNamespace: @app.MyComponents.FooProviderComponent)]
+#[namespace(DefaultNamespace: @app.MyComponents.FooProviderComponent)]
 pub trait Foo {
     fn foo(&self);
 }
diff --git a/crates/cgp-tests/tests/namespace_tests/namespace_macro/basic.rs b/crates/cgp-tests/tests/namespace_tests/namespace_macro/basic.rs
index 24eaf4d0..4eb8080a 100644
--- a/crates/cgp-tests/tests/namespace_tests/namespace_macro/basic.rs
+++ b/crates/cgp-tests/tests/namespace_tests/namespace_macro/basic.rs
@@ -13,7 +13,7 @@ cgp_namespace! {
 }
 
 #[cgp_component(BarProvider)]
-#[use_namespace(MyNamespace: @MyBarComponent)]
+#[namespace(MyNamespace: @MyBarComponent)]
 pub trait Bar {
     fn bar(&self);
 }
diff --git a/crates/cgp-tests/tests/namespace_tests/namespace_macro/multi_namespace.rs b/crates/cgp-tests/tests/namespace_tests/namespace_macro/multi_namespace.rs
index e2d1856f..a0807142 100644
--- a/crates/cgp-tests/tests/namespace_tests/namespace_macro/multi_namespace.rs
+++ b/crates/cgp-tests/tests/namespace_tests/namespace_macro/multi_namespace.rs
@@ -22,8 +22,8 @@ cgp_namespace! {
 }
 
 #[cgp_component(BarProvider)]
-#[use_namespace(MyNamespace: @MyApp.MyBarComponent)]
-#[use_namespace(OtherNamespace: @my_app.MyBarComponent)]
+#[namespace(MyNamespace: @MyApp.MyBarComponent)]
+#[namespace(OtherNamespace: @my_app.MyBarComponent)]
 pub trait Bar {
     fn bar(&self);
 }
diff --git a/crates/cgp-tests/tests/namespace_tests/namespace_macro/symbol_path.rs b/crates/cgp-tests/tests/namespace_tests/namespace_macro/symbol_path.rs
index 35a114d8..684949db 100644
--- a/crates/cgp-tests/tests/namespace_tests/namespace_macro/symbol_path.rs
+++ b/crates/cgp-tests/tests/namespace_tests/namespace_macro/symbol_path.rs
@@ -13,7 +13,7 @@ cgp_namespace! {
 }
 
 #[cgp_component(BarProvider)]
-#[use_namespace(MyNamespace: @my_app.MyBarComponent)]
+#[namespace(MyNamespace: @my_app.MyBarComponent)]
 pub trait Bar {
     fn bar(&self);
 }
diff --git a/crates/cgp-tests/tests/namespace_tests/namespace_macro/type_path.rs b/crates/cgp-tests/tests/namespace_tests/namespace_macro/type_path.rs
index c8d01822..8b699987 100644
--- a/crates/cgp-tests/tests/namespace_tests/namespace_macro/type_path.rs
+++ b/crates/cgp-tests/tests/namespace_tests/namespace_macro/type_path.rs
@@ -15,7 +15,7 @@ cgp_namespace! {
 }
 
 #[cgp_component(BarProvider)]
-#[use_namespace(MyNamespace: @MyApp.MyBarComponent)]
+#[namespace(MyNamespace: @MyApp.MyBarComponent)]
 pub trait Bar {
     fn bar(&self);
 }
diff --git a/crates/cgp-tests/tests/namespace_tests/redirect.rs b/crates/cgp-tests/tests/namespace_tests/redirect.rs
index 03ed0aaf..e941395a 100644
--- a/crates/cgp-tests/tests/namespace_tests/redirect.rs
+++ b/crates/cgp-tests/tests/namespace_tests/redirect.rs
@@ -1,7 +1,7 @@
 use cgp::prelude::*;
 
 #[cgp_component(FooProvider)]
-#[use_namespace(@bar.baz.FooProviderComponent)]
+#[namespace(@bar.baz.FooProviderComponent)]
 pub trait CanDoFoo {
     fn foo();
 }