Change method names to C++ style