Update for recent file removals/renames.