Change C++ naming convention to match python