Changed C++ file to have name and class name