Fixed automatic device name generation