Merge "Should be more clear for device name opt"