diff --git a/commons/zenoh-codec/src/network/request.rs b/commons/zenoh-codec/src/network/request.rs
index 00d8f902b8..e0ab72441c 100644
--- a/commons/zenoh-codec/src/network/request.rs
+++ b/commons/zenoh-codec/src/network/request.rs
@@ -95,7 +95,7 @@ where
         let mut header = id::REQUEST;
         let mut n_exts = ((ext_qos != &ext::QoSType::DEFAULT) as u8)
             + (ext_tstamp.is_some() as u8)
-            + ((ext_target != &ext::TargetType::default()) as u8)
+            + ((ext_target != &ext::TargetType::DEFAULT) as u8)
             + (ext_budget.is_some() as u8)
             + (ext_timeout.is_some() as u8)
             + ((ext_nodeid != &ext::NodeIdType::default()) as u8);
@@ -123,7 +123,7 @@ where
             n_exts -= 1;
             self.write(&mut *writer, (ts, n_exts != 0))?;
         }
-        if ext_target != &ext::TargetType::default() {
+        if ext_target != &ext::TargetType::DEFAULT {
             n_exts -= 1;
             self.write(&mut *writer, (ext_target, n_exts != 0))?;
         }
@@ -188,7 +188,7 @@ where
         let mut ext_qos = ext::QoSType::DEFAULT;
         let mut ext_tstamp = None;
         let mut ext_nodeid = ext::NodeIdType::default();
-        let mut ext_target = ext::TargetType::default();
+        let mut ext_target = ext::TargetType::DEFAULT;
         let mut ext_limit = None;
         let mut ext_timeout = None;
 
diff --git a/zenoh-ext/src/subscriber_ext.rs b/zenoh-ext/src/subscriber_ext.rs
index 8fd809495d..83de47779c 100644
--- a/zenoh-ext/src/subscriber_ext.rs
+++ b/zenoh-ext/src/subscriber_ext.rs
@@ -337,7 +337,7 @@ impl<'a, 'b, Handler> SubscriberBuilderExt<'a, 'b, Handler>
             reliability: Reliability::DEFAULT,
             origin: Locality::default(),
             query_selector: None,
-            query_target: QueryTarget::default(),
+            query_target: QueryTarget::DEFAULT,
             query_consolidation: QueryConsolidation::DEFAULT,
             query_accept_replies: ReplyKeyExpr::MatchingQuery,
             query_timeout: Duration::from_secs(10),
diff --git a/zenoh/src/liveliness.rs b/zenoh/src/liveliness.rs
index a41ef4ebc7..9dfe484253 100644
--- a/zenoh/src/liveliness.rs
+++ b/zenoh/src/liveliness.rs
@@ -747,7 +747,7 @@ where
             .query(
                 &self.key_expr?.into(),
                 &Some(KeyExpr::from(*KE_PREFIX_LIVELINESS)),
-                QueryTarget::default(),
+                QueryTarget::DEFAULT,
                 QueryConsolidation::DEFAULT,
                 Locality::default(),
                 self.timeout,
diff --git a/zenoh/src/session.rs b/zenoh/src/session.rs
index 7e618ec384..58baf4fe64 100644
--- a/zenoh/src/session.rs
+++ b/zenoh/src/session.rs
@@ -775,7 +775,7 @@ impl Session {
             session: self,
             selector,
             scope: Ok(None),
-            target: QueryTarget::default(),
+            target: QueryTarget::DEFAULT,
             consolidation: QueryConsolidation::DEFAULT,
             destination: Locality::default(),
             timeout,
@@ -1701,7 +1701,7 @@ impl Session {
                 ext_qos: ext::QoSType::REQUEST,
                 ext_tstamp: None,
                 ext_nodeid: ext::NodeIdType::default(),
-                ext_target: request::ext::TargetType::default(),
+                ext_target: request::ext::TargetType::DEFAULT,
                 ext_budget: None,
                 ext_timeout: None,
                 payload: RequestBody::Pull(Pull {