Device short name corrections to allow them to be viewed in XML output (nw)