Making types and function names consistent