Rename to minimize diffs