More descriptive function name.
Public API modifications and doc fixes.
Fix tests to work with modified API.