Changed some device names