renamed functions to be more consistent