rename some more uses of File instead of Data