minor tweaks to function naming for future work