Be specific about which API using in each call.

This will allow mixing in v2 api calls in later commits.