Fix bug in device names