Make naming with v2 and v3 consistent
Merge pull request #156 from danmcp/master

Make naming with v2 and v3 consistent