rectified some device names and codenames