code cleanup (mainly renaming)

Signed-off-by: Jovi Zhangwei <jovi.zhangwei@gmail.com>