Fix error where "Device" was not defined as a frame and collapse DeviceType into Device.