Assorted device name description fixes from MASH (nw)