diff --git a/bgpd/bgp_nht.c b/bgpd/bgp_nht.c
index 64b10c0252..5d3667af1a 100644
--- a/bgpd/bgp_nht.c
+++ b/bgpd/bgp_nht.c
@@ -72,7 +72,7 @@ static void bgp_unlink_nexthop_check(struct bgp_nexthop_cache *bnc)
 	if (LIST_EMPTY(&(bnc->paths)) && !bnc->nht_info) {
 		if (BGP_DEBUG(nht, NHT)) {
 			char buf[PREFIX2STR_BUFFER];
-			zlog_debug("bgp_unlink_nexthop: freeing bnc %s(%u)(%s)",
+			zlog_debug("%s: freeing bnc %s(%u)(%s)", __func__,
 				   bnc_str(bnc, buf, PREFIX2STR_BUFFER),
 				   bnc->srte_color, bnc->bgp->name_pretty);
 		}
diff --git a/bgpd/bgp_route.c b/bgpd/bgp_route.c
index b6ae6dc064..6a5e1c6502 100644
--- a/bgpd/bgp_route.c
+++ b/bgpd/bgp_route.c
@@ -1836,8 +1836,7 @@ bool subgroup_announce_check(struct bgp_dest *dest, struct bgp_path_info *pi,
 	/* If community is not disabled check the no-export and local. */
 	if (!transparent && bgp_community_filter(peer, piattr)) {
 		if (bgp_debug_update(NULL, p, subgrp->update_group, 0))
-			zlog_debug(
-				"subgrpannouncecheck: community filter check fail");
+			zlog_debug("%s: community filter check fail", __func__);
 		return false;
 	}
 
diff --git a/bgpd/bgpd.c b/bgpd/bgpd.c
index b773c16b57..fd2c431eac 100644
--- a/bgpd/bgpd.c
+++ b/bgpd/bgpd.c
@@ -6975,8 +6975,8 @@ int peer_ttl_security_hops_set(struct peer *peer, int gtsm_hops)
 	struct listnode *node, *nnode;
 	int ret;
 
-	zlog_debug("peer_ttl_security_hops_set: set gtsm_hops to %d for %s",
-		   gtsm_hops, peer->host);
+	zlog_debug("%s: set gtsm_hops to %d for %s", __func__, gtsm_hops,
+		   peer->host);
 
 	/* We cannot configure ttl-security hops when ebgp-multihop is already
 	   set.  For non peer-groups, the check is simple.  For peer-groups,
@@ -7078,8 +7078,7 @@ int peer_ttl_security_hops_unset(struct peer *peer)
 	struct listnode *node, *nnode;
 	int ret = 0;
 
-	zlog_debug("peer_ttl_security_hops_unset: set gtsm_hops to zero for %s",
-		   peer->host);
+	zlog_debug("%s: set gtsm_hops to zero for %s", __func__, peer->host);
 
 	/* if a peer-group member, then reset to peer-group default rather than
 	 * 0 */