Add device name and type to data