API Client renaming fixes
Merge pull request #223 from mozilla/client-fix

API Client renaming fixes