Make pointer field names consistent.
Fix issue with optional field being required