Renaming to fix build process