API consistency changes.
Doc update for API changes.