PIF: Rename conflicting "device" property.
VBD: Cleanup schema.