Rename was not sorting by entity

Wow. I wasn't even close. :(

This relies on `SnapshotWritable` so I can only merge this after #262.