Improved consistency with function naming