change some API names
Finish changing API identifiers
Minor improvements
Merge pull request #1 from infinityb/master

API name changes and minor improvements