Rename was not sorting by entity

Wow. I wasn't even close. :(

This relies on `SnapshotWritable` so I can only merge this after #262.
The only major difference/addition. Not sure if I should move this in with `RenameJob` or leave it here.