Renamed fields for style & consistency.