Changed function names to match google C++ style guide