Modified some device names