fix C++ naming solution