[Yujun] Renamed some functions.