Rename was not sorting by entity

The lack of re-targeting PRs in GH is kinda annoying
Just FYI I decided to extract a different writable out for rename, felt cleaner this way