fixup! Rename was not sorting by entity