adjust handling of device names