Renamed functions to be the C++ standard naming