Adding device name capability