Rename some interfaces for consistency.