diff --git a/bgpd/bgp_attr_evpn.c b/bgpd/bgp_attr_evpn.c
index 929b4c17c3..f60784e708 100644
--- a/bgpd/bgp_attr_evpn.c
+++ b/bgpd/bgp_attr_evpn.c
@@ -171,7 +171,7 @@ char *ecom_mac2str(char *ecom_mac)
 
 	en = ecom_mac;
 	en += 2;
-	return mac2str(en, NULL, 0);
+	return prefix_mac2str(en, NULL, 0);
 }
 
 /* dst prefix must be AF_INET or AF_INET6 prefix, to forge EVPN prefix */
diff --git a/bgpd/bgp_route.c b/bgpd/bgp_route.c
index 3d23fa4ca6..55823a272f 100644
--- a/bgpd/bgp_route.c
+++ b/bgpd/bgp_route.c
@@ -4502,7 +4502,7 @@ bgp_static_set_safi (safi_t safi, struct vty *vty, const char *ip_str,
           vty_out (vty, "%% Malformed ESI%s", VTY_NEWLINE);
           return CMD_WARNING;
         }
-      if( routermac && str2mac (routermac, NULL) == 0)
+      if( routermac && prefix_str2mac (routermac, NULL) == 0)
         {
           vty_out (vty, "%% Malformed Router MAC%s", VTY_NEWLINE);
           return CMD_WARNING;
@@ -4568,7 +4568,7 @@ bgp_static_set_safi (safi_t safi, struct vty *vty, const char *ip_str,
           if( routermac)
             {
               bgp_static->router_mac = XCALLOC (MTYPE_ATTR, ETHER_ADDR_LEN+1);
-              str2mac (routermac, bgp_static->router_mac);
+              prefix_str2mac (routermac, bgp_static->router_mac);
             }
           if (gwip)
             prefix_copy (&bgp_static->gatewayIp, &gw_ip);
@@ -10531,7 +10531,7 @@ bgp_config_write_network_evpn (struct vty *vty, struct bgp *bgp,
             char *esi = NULL;
 
             if(bgp_static->router_mac)
-              macrouter = mac2str(bgp_static->router_mac, NULL, 0);
+              macrouter = prefix_mac2str(bgp_static->router_mac, NULL, 0);
             if(bgp_static->eth_s_id)
               esi = esi2str(bgp_static->eth_s_id);
 	    p = &rn->p;
diff --git a/bgpd/rfapi/rfapi_vty.c b/bgpd/rfapi/rfapi_vty.c
index be7fbc63a2..22489e87e2 100644
--- a/bgpd/rfapi/rfapi_vty.c
+++ b/bgpd/rfapi/rfapi_vty.c
@@ -314,7 +314,7 @@ rfapiL2o2Qprefix (struct rfapi_l2address_option *l2o, struct prefix *pfx)
 char *
 rfapiEthAddr2Str (const struct ethaddr *ea, char *buf, int bufsize)
 {
-  return mac2str (ea->octet, buf, bufsize);
+  return prefix_mac2str (ea->octet, buf, bufsize);
 }
 
 int