API change.
Made names more expressive.