Fixed DeviceName issue