Correct some device shortname/longname conflicts that had surfaced (nw)