Added deviceName into choice