diff --git a/src/bgp/bgp_attr.cc b/src/bgp/bgp_attr.cc
index 76561285084..907bc904c3e 100644
--- a/src/bgp/bgp_attr.cc
+++ b/src/bgp/bgp_attr.cc
@@ -983,7 +983,7 @@ uint32_t BgpAttr::sequence_number() const {
     return 0;
 }
 
-bool BgpAttr::sticky() const {
+bool BgpAttr::evpn_sticky_mac() const {
     if (!ext_community_)
         return 0;
     for (ExtCommunity::ExtCommunityList::const_iterator it =
@@ -997,7 +997,7 @@ bool BgpAttr::sticky() const {
     return 0;
 }
 
-bool BgpAttr::leaf() const {
+bool BgpAttr::etree_leaf() const {
     if (!ext_community_)
         return 0;
     for (ExtCommunity::ExtCommunityList::const_iterator it =
diff --git a/src/bgp/bgp_attr.h b/src/bgp/bgp_attr.h
index b1ccbb007e0..de9424e06ea 100644
--- a/src/bgp/bgp_attr.h
+++ b/src/bgp/bgp_attr.h
@@ -854,8 +854,8 @@ class BgpAttr {
     BgpOListPtr leaf_olist() const { return leaf_olist_; }
     BgpAttrDB *attr_db() const { return attr_db_; }
     uint32_t sequence_number() const;
-    bool sticky() const;
-    bool leaf() const;
+    bool evpn_sticky_mac() const;
+    bool etree_leaf() const;
     MacAddress mac_address() const;
 
 private:
diff --git a/src/bgp/bgp_path.cc b/src/bgp/bgp_path.cc
index a833374938b..a0218bb350c 100644
--- a/src/bgp/bgp_path.cc
+++ b/src/bgp/bgp_path.cc
@@ -62,10 +62,10 @@ int BgpPath::PathCompare(const BgpPath &rhs, bool allow_ecmp) const {
     KEY_COMPARE(rattr->local_pref(), attr_->local_pref());
 
     // ETree Root path first [compare in reverse order]
-    BOOL_COMPARE(rattr->leaf(), attr_->leaf());
+    BOOL_COMPARE(rattr->etree_leaf(), attr_->etree_leaf());
 
     // Sticky paths first
-    BOOL_COMPARE(rattr->sticky(), attr_->sticky());
+    BOOL_COMPARE(rattr->evpn_sticky_mac(), attr_->evpn_sticky_mac());
 
     // Compare sequence_number in reverse order as larger is better.
     KEY_COMPARE(rattr->sequence_number(), attr_->sequence_number());