048aca5cce
Renamed symbols and added wrappers to keep API compatible with 2.0 branch.
Renamed symbols and added wrappers to keep API compatible with 2.0 branch.