more consistent function names