Update file names to fix build issues