I'm unsure about this. Should we have

 - `OldFilePath` and `FilePath`
 - `FilePath` and `NewFilePath`
 - `OldFilePath` and `NewFilePath`

/cc @dahlbyk @jamill @yorah