Rename OrigName/NewName to OldPath/NewPath

[sqs]

1. Old is shorter than Orig and at least equally common
2. Path makes it clear it's a path, not just a basename

[dmitshur]

I agree with that.