diff --git a/eigrpd/eigrp_network.c b/eigrpd/eigrp_network.c
index 6b3a0afc12..13db38ce91 100644
--- a/eigrpd/eigrp_network.c
+++ b/eigrpd/eigrp_network.c
@@ -69,8 +69,8 @@ int eigrp_sock_init(struct vrf *vrf)
 			AF_INET, SOCK_RAW, IPPROTO_EIGRPIGP, vrf->vrf_id,
 			vrf->vrf_id != VRF_DEFAULT ? vrf->name : NULL);
 		if (eigrp_sock < 0) {
-			zlog_err("eigrp_read_sock_init: socket: %s",
-				 safe_strerror(errno));
+			zlog_err("%s: socket: %s",
+				 __func__, safe_strerror(errno));
 			exit(1);
 		}
 
diff --git a/eigrpd/eigrp_packet.c b/eigrpd/eigrp_packet.c
index dd5ba8a164..1ea6f9813b 100644
--- a/eigrpd/eigrp_packet.c
+++ b/eigrpd/eigrp_packet.c
@@ -727,8 +727,8 @@ static struct stream *eigrp_recv_packet(struct eigrp *eigrp,
 	if ((unsigned int)ret < sizeof(*iph)) /* ret must be > 0 now */
 	{
 		zlog_warn(
-			"eigrp_recv_packet: discarding runt packet of length %d (ip header size is %u)",
-			ret, (unsigned int)sizeof(*iph));
+			"%s: discarding runt packet of length %d (ip header size is %u)",
+			__func__, ret, (unsigned int)sizeof(*iph));
 		return NULL;
 	}
 
@@ -772,8 +772,8 @@ static struct stream *eigrp_recv_packet(struct eigrp *eigrp,
 
 	if (ret != ip_len) {
 		zlog_warn(
-			"eigrp_recv_packet read length mismatch: ip_len is %d, but recvmsg returned %d",
-			ip_len, ret);
+			"%s read length mismatch: ip_len is %d, but recvmsg returned %d",
+			__func__, ip_len, ret);
 		return NULL;
 	}
 
diff --git a/eigrpd/eigrpd.c b/eigrpd/eigrpd.c
index 7bc7be9706..0ec9574813 100644
--- a/eigrpd/eigrpd.c
+++ b/eigrpd/eigrpd.c
@@ -163,7 +163,8 @@ static struct eigrp *eigrp_new(uint16_t as, vrf_id_t vrf_id)
 	if (eigrp->fd < 0) {
 		flog_err_sys(
 			EC_LIB_SOCKET,
-			"eigrp_new: fatal error: eigrp_sock_init was unable to open a socket");
+			"%s: fatal error: eigrp_sock_init was unable to open a socket",
+			__func__);
 		exit(1);
 	}