changes to function names to reflect their usage better