Fix device names