Make function names consistent.