Made function names consistent.