[CLEANUP] Unification of function naming