rename cpp files to fix build