JSON renaming to follow new API
Merge pull request #24 from loladiro/master

JSON renaming to follow new API