api changes, update deprecated names
Merge pull request #1 from nyov/master

api changes, update deprecated names