Some renames for internal consistency.