migrate to new function naming convention