Rename the files (both are C++ files now)