Update to use new device id 330, and to just use the name in the G