Renamed some APIs.
Renamed bunch of stuff.