diff --git a/examples/examples/z_formats.rs b/examples/examples/z_formats.rs
index f2698b296b..aeadc8d55d 100644
--- a/examples/examples/z_formats.rs
+++ b/examples/examples/z_formats.rs
@@ -26,8 +26,8 @@ fn main() {
     let ke = zenoh::keformat!(formatter, user_id = 42, file).unwrap();
     println!("{formatter:?} => {ke}");
     // Parsing
-    let settings_ke = keyexpr::new("user_id/30/settings/dark_mode").unwrap();
+    let settings_ke = zenoh::keyexpr::new("user_id/30/settings/dark_mode").unwrap();
     let parsed = settings_format::parse(settings_ke).unwrap();
-    assert_eq!(parsed.user_id(), keyexpr::new("30").unwrap());
-    assert_eq!(parsed.setting(), keyexpr::new("dark_mode").ok());
+    assert_eq!(parsed.user_id(), zenoh::keyexpr::new("30").unwrap());
+    assert_eq!(parsed.setting(), zenoh::keyexpr::new("dark_mode").ok());
 }
diff --git a/examples/examples/z_pub_shm.rs b/examples/examples/z_pub_shm.rs
index 52dc52cce0..3d21d386b0 100644
--- a/examples/examples/z_pub_shm.rs
+++ b/examples/examples/z_pub_shm.rs
@@ -20,7 +20,7 @@ const N: usize = 10;
 const K: u32 = 3;
 
 #[tokio::main]
-async fn main() -> Result<(), zenoh::Error> {
+async fn main() -> Result<(), ZError> {
     // Initiate logging
     env_logger::init();
 
diff --git a/zenoh/src/prelude.rs b/zenoh/src/prelude.rs
index 87f67fe39c..1fc73d31b3 100644
--- a/zenoh/src/prelude.rs
+++ b/zenoh/src/prelude.rs
@@ -39,7 +39,7 @@
 pub(crate) mod flat {
     pub use crate::buffers::*;
     pub use crate::config::*;
-    pub use crate::core::{Error, Resolvable, Resolve, Result};
+    pub use crate::core::{Error as ZError, Resolvable, Resolve, Result as ZResult};
     pub use crate::encoding::*;
     pub use crate::handlers::*;
     pub use crate::key_expr::*;