add consistent function naming convention