Function naming clean up.