Rename various fields in the internal API for clarity.
