rectification of device names