[Yujun] Renamed some mthods.