Fix case where the name_map doesn't include the Mac address