rename some functions to improve consistency