Rename device_types, work with new device creation process