Propagate rename; tests pass again.