refatored device name