Rename to make more consistent.