standardize function naming