Also, can we do something with mac while we're at it? We have mac-address already, so it's also redundant (and confusing) and is also being used in almost every case to refer to the OS rather than a MAC address. I don't know if it should be synonymized or stay around to maybe refer to generic Mac (as in Apple) hardware, but currently it seems confusing. Maybe macintosh makes more sense? I'm not entirely privy to the naming conventions of Apple's hardware.