#202 rename some functions