Update some comments. Change some function name.