make function names consistent