even more api changes
rename to enable better grammar
Merge pull request #94 from mikey179/master

more api changes