rename some functions to better reflect their purpose