Misc changes. Removed extra identity. Added missing "reserved". Changed
repeated field names to plural.
Misc changes