function names consistent now