Might be nice to keep `old_` and `new_` on one side of the name