Rename was not sorting by entity

The lack of re-targeting PRs in GH is kinda annoying
Any reason this isn't just a RawComparator?