Update function naming to be consistent with our style.