diff --git a/libnetutil/netutil.cc b/libnetutil/netutil.cc
index 221bc0188..84e1d50c9 100644
--- a/libnetutil/netutil.cc
+++ b/libnetutil/netutil.cc
@@ -459,27 +459,27 @@ int ip_is_reserved(struct in_addr *ip)
 }
 
 /* A trivial functon that maintains a cache of IP to MAC Address
-   entries.  If the command is ARPCACHE_GET, this func looks for the
+   entries.  If the command is MACCACHE_GET, this func looks for the
    IPv4 address in ss and fills in the 'mac' parameter and returns
    true if it is found.  Otherwise (not found), the function returns
-   false.  If the command is ARPCACHE_SET, the function adds an entry
+   false.  If the command is MACCACHE_SET, the function adds an entry
    with the given ip (ss) and mac address.  An existing entry for the
    IP ss will be overwritten with the new MAC address.  true is always
    returned for the set command. */
-#define ARPCACHE_GET 1
-#define ARPCACHE_SET 2
-static int do_arp_cache(int command, struct sockaddr_storage *ss, u8 *mac) {
-  struct ArpCache {
+#define MACCACHE_GET 1
+#define MACCACHE_SET 2
+static int do_mac_cache(int command, struct sockaddr_storage *ss, u8 *mac) {
+  struct MacCache {
     struct sockaddr_storage ip;
     u8 mac[6];
   };
-  static struct ArpCache *Cache = NULL;
-  static int ArpCapacity = 0;
-  static int ArpCacheSz = 0;
+  static struct MacCache *Cache = NULL;
+  static int MacCapacity = 0;
+  static int MacCacheSz = 0;
   int i;
 
-  if (command == ARPCACHE_GET) {
-    for (i = 0; i < ArpCacheSz; i++) {
+  if (command == MACCACHE_GET) {
+    for (i = 0; i < MacCacheSz; i++) {
       if (sockaddr_storage_cmp(&Cache[i].ip, ss) == 0) {
         memcpy(mac, Cache[i].mac, 6);
         return 1;
@@ -487,17 +487,17 @@ static int do_arp_cache(int command, struct sockaddr_storage *ss, u8 *mac) {
     }
     return 0;
   }
-  assert(command == ARPCACHE_SET);
-  if (ArpCacheSz == ArpCapacity) {
-    if (ArpCapacity == 0)
-      ArpCapacity = 32;
+  assert(command == MACCACHE_SET);
+  if (MacCacheSz == MacCapacity) {
+    if (MacCapacity == 0)
+      MacCapacity = 32;
     else
-      ArpCapacity <<= 2;
-    Cache = (struct ArpCache *) safe_realloc(Cache, ArpCapacity * sizeof(struct ArpCache));
+      MacCapacity <<= 2;
+    Cache = (struct MacCache *) safe_realloc(Cache, MacCapacity * sizeof(struct MacCache));
   }
 
   /* Ensure that it isn't already there ... */
-  for (i = 0; i < ArpCacheSz; i++) {
+  for (i = 0; i < MacCacheSz; i++) {
     if (sockaddr_storage_cmp(&Cache[i].ip, ss) == 0) {
       memcpy(Cache[i].mac, mac, 6);
       return 1;
@@ -507,26 +507,26 @@ static int do_arp_cache(int command, struct sockaddr_storage *ss, u8 *mac) {
   /* Add it to the end of the list */
   memcpy(&Cache[i].ip, ss, sizeof(struct sockaddr_storage));
   memcpy(Cache[i].mac, mac, 6);
-  ArpCacheSz++;
+  MacCacheSz++;
   return 1;
 }
 
 /* A couple of trivial functions that maintain a cache of IP to MAC
- * Address entries. Function arp_cache_get() looks for the IPv4 address
+ * Address entries. Function mac_cache_get() looks for the IPv4 address
  * in ss and fills in the 'mac' parameter and returns true if it is
  * found.  Otherwise (not found), the function returns false.
- * Function arp_cache_set() adds an entry with the given ip (ss) and
+ * Function mac_cache_set() adds an entry with the given ip (ss) and
  * mac address.  An existing entry for the IP ss will be overwritten
- * with the new MAC address.  arp_cache_set() always returns true.
+ * with the new MAC address.  mac_cache_set() always returns true.
  * WARNING: The caller must ensure that the supplied "ss" is of family
  * AF_INET. Otherwise the function will return 0 and there would be
  * no way for the caller to tell tell the difference between an error
  * or a cache miss.*/
-int arp_cache_get(struct sockaddr_storage *ss, u8 *mac){
-    return do_arp_cache(ARPCACHE_GET, ss, mac);
+int mac_cache_get(struct sockaddr_storage *ss, u8 *mac){
+    return do_mac_cache(MACCACHE_GET, ss, mac);
 }
-int arp_cache_set(struct sockaddr_storage *ss, u8 *mac){
-    return do_arp_cache(ARPCACHE_SET, ss, mac);
+int mac_cache_set(struct sockaddr_storage *ss, u8 *mac){
+    return do_mac_cache(MACCACHE_SET, ss, mac);
 }
 
 /* Standard BSD internet checksum routine. Uses libdnet helper functions. */
diff --git a/libnetutil/netutil.h b/libnetutil/netutil.h
index 69c22760c..7606af65e 100644
--- a/libnetutil/netutil.h
+++ b/libnetutil/netutil.h
@@ -183,14 +183,14 @@ int ip_is_reserved(struct in_addr *ip);
 
 
 /* A couple of trivial functions that maintain a cache of IP to MAC
- * Address entries. Function arp_cache_get() looks for the IPv4 address
+ * Address entries. Function mac_cache_get() looks for the IPv4 address
  * in ss and fills in the 'mac' parameter and returns true if it is
  * found.  Otherwise (not found), the function returns false.
- * Function arp_cache_set() adds an entry with the given ip (ss) and
+ * Function mac_cache_set() adds an entry with the given ip (ss) and
  * mac address.  An existing entry for the IP ss will be overwritten
- * with the new MAC address.  arp_cache_set() always returns true. */
-int arp_cache_get(struct sockaddr_storage *ss, u8 *mac);
-int arp_cache_set(struct sockaddr_storage *ss, u8 *mac);
+ * with the new MAC address.  mac_cache_set() always returns true. */
+int mac_cache_get(struct sockaddr_storage *ss, u8 *mac);
+int mac_cache_set(struct sockaddr_storage *ss, u8 *mac);
 
 const void *ip_get_data(const void *packet, unsigned int *len,
   struct abstract_ip_hdr *hdr);
diff --git a/tcpip.cc b/tcpip.cc
index c8aa630a3..cd103b4a7 100644
--- a/tcpip.cc
+++ b/tcpip.cc
@@ -1797,7 +1797,7 @@ bool setTargetNextHopMAC(Target *target) {
   }
 
   /* First, let us check the Nmap arp cache ... */
-  if (arp_cache_get(&targetss, mac)) {
+  if (mac_cache_get(&targetss, mac)) {
     target->setNextHopMACAddress(mac);
     return true;
   }
@@ -1806,7 +1806,7 @@ bool setTargetNextHopMAC(Target *target) {
   a = arp_open();
   addr_ston((sockaddr *) & targetss, &ae.arp_pa);
   if (arp_get(a, &ae) == 0) {
-    arp_cache_set(&targetss, ae.arp_ha.addr_eth.data);
+    mac_cache_set(&targetss, ae.arp_ha.addr_eth.data);
     target->setNextHopMACAddress(ae.arp_ha.addr_eth.data);
     arp_close(a);
     return true;
@@ -1819,7 +1819,7 @@ bool setTargetNextHopMAC(Target *target) {
   if (target->af() == AF_INET){
     if (doArp(target->deviceFullName(), target->SrcMACAddress(),
               &srcss, &targetss, mac, PacketTrace::traceArp)) {
-      arp_cache_set(&targetss, mac);
+      mac_cache_set(&targetss, mac);
       target->setNextHopMACAddress(mac);
       return true;
     }
@@ -1827,7 +1827,7 @@ bool setTargetNextHopMAC(Target *target) {
   else if (target->af() == AF_INET6){
     if (doND(target->deviceFullName(), target->SrcMACAddress(),
               &srcss, &targetss, mac, PacketTrace::traceND)) {
-      arp_cache_set(&targetss, mac);
+      mac_cache_set(&targetss, mac);
       target->setNextHopMACAddress(mac);
       return true;
     }
@@ -1846,14 +1846,14 @@ bool getNextHopMAC(char *iface, u8 *srcmac, struct sockaddr_storage *srcss,
   struct arp_entry ae;
 
   /* Nmap's ARP cache */
-  if (arp_cache_get(dstss, dstmac))
+  if (mac_cache_get(dstss, dstmac))
     return true;
 
   /* System ARP cache */
   a = arp_open();
   addr_ston((sockaddr *) dstss, &ae.arp_pa);
   if (arp_get(a, &ae) == 0) {
-    arp_cache_set(dstss, ae.arp_ha.addr_eth.data);
+    mac_cache_set(dstss, ae.arp_ha.addr_eth.data);
     memcpy(dstmac, ae.arp_ha.addr_eth.data, 6);
     arp_close(a);
     return true;
@@ -1862,7 +1862,7 @@ bool getNextHopMAC(char *iface, u8 *srcmac, struct sockaddr_storage *srcss,
 
   /* Send ARP */
   if (doArp(iface, srcmac, srcss, dstss, dstmac, PacketTrace::traceArp)) {
-    arp_cache_set(dstss, dstmac);
+    mac_cache_set(dstss, dstmac);
     return true;
   }