Device short name/description fixes to fix noted discrepancies between xml, devices and slots.  (nw)