improved function naming conventions