Device shortname fixes to allow them to be listed in XML output (nw)