remove kludge for device names