Rename to something more sensible. No functionality change.