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

API renames.
Merge branch 'master' into markets
Basic market tests