Now persists the host name instead of the MAC address