moved device.name outside of name field