updated property names to match new types
normalize DeviceType names