Add friendly name string to device info struct
Code refactoring