API renames.
API renames.
Merge pull request #37 from benma/master

API renames.