Some renaming for consistency.