renaming some fns to be more consistent