bug fix for device names