Rectified some device names